Merge branch 'master' into master

README.md

@@ -2,7 +2,7 @@
 =======
 * [中文版](./README_CN.md)
 
-The name `996.ICU` refers to **"Work by '996', sick in ICU"**, an ironic saying among Chinese programmers, which means that by following the "996" work schedule, you are risking yourself getting into the ICU (Intensive Care Unit).
+The name `996.ICU` refers to **"Work by '996', sick in ICU"**, an ironic saying among Chinese developers, which means that by following the "996" work schedule, you are risking yourself getting into the ICU (Intensive Care Unit).
 
 [![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
 [![Badge](https://img.shields.io/badge/link-996.icu-red.svg)](https://996.icu/#/zh_CN)

awesomelist/projects.md

@@ -35,7 +35,7 @@ Projects under Anti 996ICU License. Thanks for your support!
 | - | [easy-filter](https://github.com/PsChina/easy-filter) | [Github](https://github.com/PsChina) / [npm](https://www.npmjs.com/package/easy-filter) | vue2.x 过滤器插件 |
 | - | [Vueg](https://github.com/jaweii/Vueg----page-transition-plugin) | [Github](https://github.com/jaweii/Vueg----page-transition-plugin) | Page level transition plugin for vue-router|
 | - | [one](https://github.com/lizhichao/one) | [Github](https://github.com/lizhichao/one) | 一个极简的高性能常驻内存php框架|
-| - | [vue-color-ui](https://github.com/martin-yin/vue-color-ui) | [Github](https://github.com/martin-yin/vue-color-ui) | 微信小程序color-ui的vue版本 |
+| <img src="https://raw.githubusercontent.com/martin-yin/Pipi-Dinosaur/master/src/assets/logo.png" width="60"> | [Pipi-Dinosaur](https://github.com/martin-yin/Pipi-Dinosaur) | [Github](https://github.com/martin-yin/Pipi-Dinosaur) |皮皮🦖 微信小程序color-ui的vue版本 |
 | - | [WxJava](https://github.com/Wechat-Group/WxJava) | [Github](https://github.com/Wechat-Group/WxJava) | 微信开发 Java SDK|
 | - | [cyclone](https://github.com/simpleapples/cyclone) | [Github](https://github.com/simpleapples/cyclone) | Cyclone is a go package to spawn, reuse and manage a number of goroutines by a pool. |
 | - | [NumbCube](https://github.com/KirosHan/NumbCube) | [Github](https://github.com/KirosHan/NumbCube) | NumbCube流媒体直播解决方案 |

blacklist/blacklist.md

@@ -1,7 +1,5 @@
-**请注意：维护本列表的目的在于为《中华人民共和国劳动法》的执行提供参考依据。**
 
-996（或其他违法加班制度）公司名单
+**请注意：维护本列表的目的在于为《中华人民共和国劳动法》的执行提供参考依据。**
-===
 违法加班制度是指违反相关法律法规及劳动合同，未经与工会和劳动者协商便强制加班加点<sup>1</sup>，或加班加点超出法定时限（每日三小时或每月三十六小时）<sup>2</sup>，或未足额支付加班加点工资报酬（不低于工资的百分之一百五十）<sup>3</sup>的非法用工制度。
 
 1. [《中华人民共和国劳动法》](http://www.npc.gov.cn/npc/xinwen/2019-01/07/content_2070261.htm)第四章第四十一条
@@ -82,5 +80,6 @@
 |上海|[依图网络科技有限公司](http://www.yitutech.com/)|2019年4月5日|996|[知乎](https://www.zhihu.com/question/300132949/answer/606529193)|
 |深圳|[深圳市环球易购电子商务有限公司](https://www.globalegrow.com/)|2007年5月|大小周、经常996、偶尔通宵|[劳动合同](img/globalegrow_labor_contract.jpg)、[Offer](img/globalegrow_offer.jpg)+亲历|
 
+
 更多不良公司（包括但不限于违法加班）请参见：
 [程序员找工作黑名单](https://github.com/shengxinjing/programmer-job-blacklist)

externals/news.md

@@ -2,6 +2,7 @@
 
 ## 中文媒体
 - 人民日报： [工作996生病ICU，劳动监察部门应积极介入](https://m.weibo.cn/status/4357697258275940)
+- 光明网： [莫让“996工作制”成了职场明规则](http://guancha.gmw.cn/2019-04/06/content_32719988.htm)
 - 人民网：[“996工作制”是谁的如意算盘？](http://opinion.people.com.cn/n1/2019/0402/c119388-31009768.html)
 - 南方日报：[正视年轻人压力“爆棚”的危险](http://epaper.southcn.com/nfdaily/html/2019-04/03/content_7790850.htm)
 - 广州日报：[“996工作制”不可持续](http://gzdaily.dayoo.com/pc/html/2019-04/03/content_108225_594534.htm)
@@ -20,6 +21,8 @@
 - 观察者：[程序员们揭露“996ICU” 互联网公司：华为阿里等上榜](https://www.guancha.cn/politics/2019_04_05_496491_s.shtml)
 - 21财经：[工作996，生病ICU！程序员们这次忍不了了，弄出个大项目](https://m.21jingji.com/article/20190404/herald/23b634af7003164f1ca6f602772a5c71.html)
 - 新浪资讯：[沉默or抵制? 多家互联网公司被指实行996工作制](https://zx.sina.cn/2019-04-06/zx-ihvhiqax0377991.d.html?wm=3049_0015)
+- 爱范儿：[病态的 996 早需改变，而且不应该只从程序员开始](https://mp.weixin.qq.com/s/4YVDRAHl3E4AF163xhDKjA)（[Wayback Machine](https://web.archive.org/web/20190406123533/https://mp.weixin.qq.com/s/4YVDRAHl3E4AF163xhDKjA)）
+
 ### 非中国媒体
 - BBC中文网：[中国程序员GitHub上抗议“996”血汗加班走红网络](https://www.bbc.com/zhongwen/simp/chinese-news-47824716)
 - 美国之音：[中国科技工作者在线抗议“996”工作制](https://www.voachinese.com/a/china-tech-labor-996-20190404/4862315.html)

proposal/proposal_To_Request_Github_Official_Including_996ICU_License.md

@@ -24,10 +24,10 @@ To Request Github Official Including 996ICU License <br/>
 ## Community Value
 ## 社区价值
 
-Remarkable 996ICU License badge <br/>
+Highlight 996ICU License badge <br/>
 让 996ICU License badge 更显眼 <br/>
 
-Let 996ICU License be chosen easily <br/>
+Promote adoption of 996ICU License <br/>
 让 996ICU License 更易用 <br/>
 
 ## Problems
@@ -87,7 +87,7 @@ Feel free to fill here.
 
 Right now there is more than 1600 repos  using 996 license  by  [github code search](https://github.com/search?q=996+filename%3ALICENSE&type=code) .  
 
-So Item No.3 has **Fitted**, but the consensus in 996 licenses are not.
+So the 3rd requirement is satisfied, but the consensus in 996 licenses are not.
 
 As for Item No.4,  there is [996.ICU](https://github.com/996icu/996.ICU), [955.WLB](https://github.com/formulahendry/955.WLB) and [Anti-996-License](https://github.com/kattgu7/Anti-996-License/issues?q=is%3Aopen+is%3Aissue) and a lot of repos with stars more than 3k.  I am not sure about the word "notable ".  I think  Item No.4 is **fitted**.