[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www education/misc/edu-misc.zh-cn.html educatio...
|
From: |
GNUN |
|
Subject: |
www education/misc/edu-misc.zh-cn.html educatio... |
|
Date: |
Mon, 23 Nov 2020 23:29:50 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 20/11/23 23:29:50
Modified files:
education/misc : edu-misc.zh-cn.html
education/misc/po: edu-misc.zh-cn-en.html edu-misc.zh-cn.po
licenses : license-compatibility.zh-cn.html
license-recommendations.zh-cn.html
licenses/po : license-compatibility.zh-cn-en.html
license-compatibility.zh-cn.po
license-recommendations.zh-cn-en.html
license-recommendations.zh-cn.po
proprietary : proprietary.zh-cn.html
proprietary/po : proprietary.zh-cn-en.html proprietary.zh-cn.po
zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/misc/edu-misc.zh-cn.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/education/misc/po/edu-misc.zh-cn-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/education/misc/po/edu-misc.zh-cn.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-compatibility.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-recommendations.zh-cn.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.zh-cn-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.zh-cn.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary.zh-cn.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.zh-cn-en.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.zh-cn.po?cvsroot=www&r1=1.96&r2=1.97
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/zh-cn.po?cvsroot=www&r1=1.83&r2=1.84
Patches:
Index: education/misc/edu-misc.zh-cn.html
===================================================================
RCS file: /web/www/www/education/misc/edu-misc.zh-cn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- education/misc/edu-misc.zh-cn.html 20 Nov 2020 08:29:44 -0000 1.6
+++ education/misc/edu-misc.zh-cn.html 24 Nov 2020 04:29:49 -0000 1.7
@@ -85,47 +85,44 @@
<p><a href="/education/edu-software-tuxpaint.html">Tux Paint</a></p>
<ul>
- <li>Tux Paint çç®ä½ä¸æçé¢ï¼pngï¼<a
-href="/education/misc/tuxpaint-start-sm.zh-cn.png">30 KB</a>ã<a
-href="/education/misc/tuxpaint-start.zh-cn.png">86 KB</a></li>
+ <li>ç®ä½ä¸æçé¢ï¼pngï¼<a
href="/education/misc/tuxpaint-start-sm.zh-cn.png">30
+KB</a>ã<a href="/education/misc/tuxpaint-start.zh-cn.png">86 KB</a></li>
- <li>Tux Paint çè±è¯çé¢ï¼pngï¼<a
href="/education/misc/tuxpaint-start-sm.png">30
-KB</a>ã<a href="/education/misc/tuxpaint-start.png">83 KB</a></li>
+ <li>è±è¯çé¢ï¼pngï¼<a href="/education/misc/tuxpaint-start-sm.png">30
KB</a>ã<a
+href="/education/misc/tuxpaint-start.png">83 KB</a></li>
- <li>Tux Paintçå¾·è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.de.png">45
-KB</a>, <a href="/education/misc/tuxpaint-start.de.png">86 KB</a></li>
+ <li>å¾·è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.de.png">30 KB</a>, <a
+href="/education/misc/tuxpaint-start.de.png">83 KB</a></li>
- <li>Tux Paintçå¸è
è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.el.png">32
-KB</a>, <a href="/education/misc/tuxpaint-start.el.png">84 KB</a></li>
+ <li>å¸è
è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.el.png">32 KB</a>, <a
+href="/education/misc/tuxpaint-start.el.png">84 KB</a></li>
- <li>Tux Paintçæ³è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.fr.png">31
-KB</a>, <a href="/education/misc/tuxpaint-start.fr.png">86 KB</a></li>
+ <li>æ³è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.fr.png">31 KB</a>, <a
+href="/education/misc/tuxpaint-start.fr.png">86 KB</a></li>
- <li>Tux Paintçæ大å©è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.it.png">30
-KB</a>, <a href="/education/misc/tuxpaint-start.it.png">83 KB</a></li>
+ <li>æ大å©è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.it.png">30 KB</a>, <a
+href="/education/misc/tuxpaint-start.it.png">83 KB</a></li>
- <li>Tux Paintçæ¥è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.ja.png">30
-KB</a>, <a href="/education/misc/tuxpaint-start.ja.png">85 KB</a></li>
+ <li>æ¥è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.ja.png">30 KB</a>, <a
+href="/education/misc/tuxpaint-start.ja.png">85 KB</a></li>
- <li>Tux Paintçï¼å·´è¥¿ï¼è¡èçè¯çé¢ï¼png, <a
-href="/education/misc/tuxpaint-start-sm.pt-br.png">31 KB</a>, <a
-href="/education/misc/tuxpaint-start.pt-br.png">86 KB</a></li>
+ <li>ï¼å·´è¥¿ï¼è¡èçè¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.pt-br.png">31
+KB</a>, <a href="/education/misc/tuxpaint-start.pt-br.png">86 KB</a></li>
- <li>Tux Paint çä¿è¯çé¢ï¼pngï¼<a
href="/education/misc/tuxpaint-start-sm.ru.png">31
-KB</a>, <a href="/education/misc/tuxpaint-start.ru.png">86 KB</a></li>
+ <li>ä¿è¯çé¢ï¼pngï¼<a
href="/education/misc/tuxpaint-start-sm.ru.png">31 KB</a>, <a
+href="/education/misc/tuxpaint-start.ru.png">86 KB</a></li>
- <li>Tux Paintç西ççè¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.es.png">31
-KB</a>, <a href="/education/misc/tuxpaint-start.es.png">86 KB</a></li>
+ <li>西ççè¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.es.png">31 KB</a>, <a
+href="/education/misc/tuxpaint-start.es.png">86 KB</a></li>
- <li>Tux Paint çåè³å
¶è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.fr.png">31
-KB</a>, <a href="/education/misc/tuxpaint-start.fr.png">86 KB</a></li>
+ <li>åè³å
¶è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.fr.png">31 KB</a>, <a
+href="/education/misc/tuxpaint-start.fr.png">86 KB</a></li>
- <li>Tux Paint çä¹å
å
°è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.es.png">31
-KB</a>, <a href="/education/misc/tuxpaint-start.es.png">86 KB</a></li>
+ <li>ä¹å
å
°è¯çé¢ï¼png, <a
href="/education/misc/tuxpaint-start-sm.es.png">31 KB</a>, <a
+href="/education/misc/tuxpaint-start.es.png">86 KB</a></li>
- <li>Tux Paintç带å°ç« 马æäºæçè¯çé¢ï¼jpeg, <a
-href="/education/misc/tuxpaint-stamps-sm.jpg">65 KB</a>, <a
-href="/education/misc/tuxpaint-stamps.jpg">298 KB</a></li>
+ <li>带å°ç« 马æäºæçè¯çé¢ï¼jpeg, <a
href="/education/misc/tuxpaint-stamps-sm.jpg">65
+KB</a>, <a href="/education/misc/tuxpaint-stamps.jpg">298 KB</a></li>
<li>Appooppanthaadyè±ï¼jpeg, <a
href="/education/misc/appooppanthaady-sm.jpg">9
KB</a>, <a href="/education/misc/appooppanthaady.jpg">22 KB</a></li>
@@ -137,8 +134,41 @@
<p><a href="/education/edu-software-gcompris.html">GCompris</a></p>
<ul>
- <li>GComprisçé¢ï¼png <a href="/education/misc/gcompris-sm.png">28
KB</a>, <a
+ <li>ç¹ä½ä¸æçé¢ï¼pngï¼<a
href="/education/misc/gcompris-sm.zh-tw.png">23 KB</a>, <a
+href="/education/misc/gcompris.zh-tw.png">62 KB</a></li>
+
+ <li>è±æçé¢ï¼png <a href="/education/misc/gcompris-sm.png">28 KB</a>,
<a
href="/education/misc/gcompris.png">86 KB</a></li>
+
+ <li>å¾·è¯çé¢ï¼pngï¼<a href="/education/misc/gcompris-sm.de.png">24
KB</a>, <a
+href="/education/misc/gcompris.de.png">64 KB</a></li>
+
+ <li>æ³è¯çé¢ï¼png, <a href="/education/misc/gcompris-sm.fr.png">24
KB</a>, <a
+href="/education/misc/gcompris.fr.png">65 KB</a></li>
+
+ <li>æ大å©è¯çé¢ï¼png, <a
href="/education/misc/gcompris-sm.it.png">24 KB</a>, <a
+href="/education/misc/gcompris.it.png">64 KB</a></li>
+
+ <li>ç«é¶å®è¯çé¢ï¼png, <a
href="/education/misc/gcompris-sm.lt.png">24 KB</a>, <a
+href="/education/misc/gcompris.lt.png">64 KB</a></li>
+
+ <li>çæé
æçè¯çé¢ï¼png, <a
href="/education/misc/gcompris-sm.ml.png">24 KB</a>, <a
+href="/education/misc/gcompris.ml.png">64 KB</a></li>
+
+ <li>è¡èçè¯çé¢ï¼png, <a
href="/education/misc/gcompris-sm.pt.png">24 KB</a>, <a
+href="/education/misc/gcompris.pt.png">63 KB</a></li>
+
+ <li>ï¼å·´è¥¿ï¼è¡èçè¯çé¢ï¼png, <a
href="/education/misc/gcompris-sm.pt-br.png">24 KB</a>,
+<a href="/education/misc/gcompris.pt-br.png">64 KB</a></li>
+
+ <li>西ççè¯çé¢ï¼png, <a
href="/education/misc/gcompris-sm.es.png">23 KB</a>, <a
+href="/education/misc/gcompris.es.png">63 KB</a></li>
+
+ <li>åè³å
¶è¯çé¢ï¼png, <a
href="/education/misc/gcompris-sm.tr.png">28 KB</a>, <a
+href="/education/misc/gcompris.tr.png">64 KB</a></li>
+
+ <li>ä¹å
å
°è¯çé¢ï¼png, <a
href="/education/misc/gcompris-sm.uk.png">23 KB</a>, <a
+href="/education/misc/gcompris.uk.png">62 KB</a></li>
</ul>
<h3>è§é¢</h3>
@@ -363,7 +393,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/11/20 08:29:44 $
+$Date: 2020/11/24 04:29:49 $
<!-- timestamp end -->
</p>
Index: education/misc/po/edu-misc.zh-cn-en.html
===================================================================
RCS file: /web/www/www/education/misc/po/edu-misc.zh-cn-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- education/misc/po/edu-misc.zh-cn-en.html 20 Nov 2020 08:29:44 -0000
1.6
+++ education/misc/po/edu-misc.zh-cn-en.html 24 Nov 2020 04:29:49 -0000
1.7
@@ -87,55 +87,55 @@
<p><a href="/education/edu-software-tuxpaint.html">Tux Paint</a></p>
<ul>
- <li>Tux Paint interface Chinese (Simplified), png,
+ <li>Interface in Chinese (Simplified), png,
<a href="/education/misc/tuxpaint-start-sm.zh-cn.png">30 KB</a>,
<a href="/education/misc/tuxpaint-start.zh-cn.png">86 KB</a></li>
- <li>Tux Paint interface English, png,
+ <li>Interface in English, png,
<a href="/education/misc/tuxpaint-start-sm.png">30 KB</a>,
<a href="/education/misc/tuxpaint-start.png">83 KB</a></li>
- <li>Tux Paint interface German, png,
+ <li>Interface in German, png,
<a href="/education/misc/tuxpaint-start-sm.de.png">45 KB</a>,
<a href="/education/misc/tuxpaint-start.de.png">86 KB</a></li>
- <li>Tux Paint interface Greek, png,
+ <li>Interface in Greek, png,
<a href="/education/misc/tuxpaint-start-sm.el.png">32 KB</a>,
<a href="/education/misc/tuxpaint-start.el.png">84 KB</a></li>
- <li>Tux Paint interface French, png,
+ <li>Interface in French, png,
<a href="/education/misc/tuxpaint-start-sm.fr.png">31 KB</a>,
<a href="/education/misc/tuxpaint-start.fr.png">86 KB</a></li>
- <li>Tux Paint interface Italian, png,
+ <li>Interface in Italian, png,
<a href="/education/misc/tuxpaint-start-sm.it.png">30 KB</a>,
<a href="/education/misc/tuxpaint-start.it.png">83 KB</a></li>
- <li>Tux Paint interface Japanese, png,
+ <li>Interface in Japanese, png,
<a href="/education/misc/tuxpaint-start-sm.ja.png">30 KB</a>,
<a href="/education/misc/tuxpaint-start.ja.png">85 KB</a></li>
- <li>Tux Paint interface Portuguese (Brazilian), png,
+ <li>Interface in Portuguese (Brazilian), png,
<a href="/education/misc/tuxpaint-start-sm.pt-br.png">31 KB</a>,
<a href="/education/misc/tuxpaint-start.pt-br.png">86 KB</a></li>
- <li>Tux Paint interface Russian, png,
+ <li>Interface in Russian, png,
<a href="/education/misc/tuxpaint-start-sm.ru.png">31 KB</a>,
<a href="/education/misc/tuxpaint-start.ru.png">86 KB</a></li>
- <li>Tux Paint interface Spanish, png,
+ <li>Interface in Spanish, png,
<a href="/education/misc/tuxpaint-start-sm.es.png">31 KB</a>,
<a href="/education/misc/tuxpaint-start.es.png">86 KB</a></li>
- <li>Tux Paint interface Turkish, png,
+ <li>Interface in Turkish, png,
<a href="/education/misc/tuxpaint-start-sm.tr.png">31 KB</a>,
<a href="/education/misc/tuxpaint-start.tr.png">85 KB</a></li>
- <li>Tux Paint interface Ukranian, png,
+ <li>Interface in Ukranian, png,
<a href="/education/misc/tuxpaint-start-sm.uk.png">31 KB</a>,
<a href="/education/misc/tuxpaint-start.uk.png">87 KB</a></li>
- <li>Tux Paint interface in Malayalam with stamps, jpeg,
+ <li>Interface in Malayalam with stamps, jpeg,
<a href="/education/misc/tuxpaint-stamps-sm.jpg">65 KB</a>,
<a href="/education/misc/tuxpaint-stamps.jpg">298 KB</a></li>
@@ -151,9 +151,53 @@
<p><a href="/education/edu-software-gcompris.html">GCompris</a></p>
<ul>
- <li>GCompris interface, png
+ <li>Interface in Chinese (Traditional), png,
+ <a href="/education/misc/gcompris-sm.zh-tw.png">23 KB</a>,
+ <a href="/education/misc/gcompris.zh-tw.png">62 KB</a></li>
+
+ <li>Interface in English, png
<a href="/education/misc/gcompris-sm.png">28 KB</a>,
<a href="/education/misc/gcompris.png">86 KB</a></li>
+
+ <li>Interface in German, png,
+ <a href="/education/misc/gcompris-sm.de.png">24 KB</a>,
+ <a href="/education/misc/gcompris.de.png">64 KB</a></li>
+
+ <li>Interface in French, png,
+ <a href="/education/misc/gcompris-sm.fr.png">24 KB</a>,
+ <a href="/education/misc/gcompris.fr.png">65 KB</a></li>
+
+ <li>Interface in Italian, png,
+ <a href="/education/misc/gcompris-sm.it.png">24 KB</a>,
+ <a href="/education/misc/gcompris.it.png">64 KB</a></li>
+
+ <li>Interface in Lithuanian, png,
+ <a href="/education/misc/gcompris-sm.lt.png">24 KB</a>,
+ <a href="/education/misc/gcompris.lt.png">64 KB</a></li>
+
+ <li>Interface in Malayalam, png,
+ <a href="/education/misc/gcompris-sm.ml.png">24 KB</a>,
+ <a href="/education/misc/gcompris.ml.png">64 KB</a></li>
+
+ <li>Interface in Portuguese, png,
+ <a href="/education/misc/gcompris-sm.pt.png">24 KB</a>,
+ <a href="/education/misc/gcompris.pt.png">63 KB</a></li>
+
+ <li>Interface in Portuguese (Brazilian), png,
+ <a href="/education/misc/gcompris-sm.pt-br.png">24 KB</a>,
+ <a href="/education/misc/gcompris.pt-br.png">64 KB</a></li>
+
+ <li>Interface in Spanish, png,
+ <a href="/education/misc/gcompris-sm.es.png">23 KB</a>,
+ <a href="/education/misc/gcompris.es.png">63 KB</a></li>
+
+ <li>Interface in Turkish, png,
+ <a href="/education/misc/gcompris-sm.tr.png">28 KB</a>,
+ <a href="/education/misc/gcompris.tr.png">64 KB</a></li>
+
+ <li>Interface in Ukranian, png,
+ <a href="/education/misc/gcompris-sm.uk.png">23 KB</a>,
+ <a href="/education/misc/gcompris.uk.png">62 KB</a></li>
</ul>
<h3>Videos</h3>
@@ -387,7 +431,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/11/20 08:29:44 $
+$Date: 2020/11/24 04:29:49 $
<!-- timestamp end -->
</p>
</div>
Index: education/misc/po/edu-misc.zh-cn.po
===================================================================
RCS file: /web/www/www/education/misc/po/edu-misc.zh-cn.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- education/misc/po/edu-misc.zh-cn.po 24 Nov 2020 04:21:08 -0000 1.10
+++ education/misc/po/edu-misc.zh-cn.po 24 Nov 2020 04:29:49 -0000 1.11
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-11-20 19:55+0000\n"
#. type: Content of: <title>
msgid ""
Index: licenses/license-compatibility.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/license-compatibility.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- licenses/license-compatibility.zh-cn.html 27 Jan 2020 14:30:58 -0000
1.2
+++ licenses/license-compatibility.zh-cn.html 24 Nov 2020 04:29:49 -0000
1.3
@@ -44,13 +44,15 @@
BSD 代ç æç
§æ¤è®¸å¯è¯åå¸ãè¿æ ·å°±åºæ¬ä¸æ
¹é¤äºä¸é¢æ说çé®é¢ãç°å¨ï¼åå§ BSD
许å¯è¯ï¼æ幸ï¼å·²ç»å¾å°è¢«ä½¿ç¨äºï¼ä½æ¯æ们è¿æ¯å¿
é¡»å°å¿
<a
href="/licenses/bsd.html">é¿å
讨论 “该” BSD
许å¯è¯</a>ã</p>
-<p>ä¸è¬æ¥è¯´ï¼ä¸¤ä¸ªä¸åç copyleft 许å¯è¯æ¯æ å¯é¿å
çä¸å
¼å®¹ï¼é¤é两è
ä¹é´ææç¡®çå
¼å®¹æ¡æ¬¾ãè¿ä¸æ¯å
为ç»èæ误ï¼è¿æ¯ copyleft
-ç念ä¸ç俱æ¥çç¹ç¹ãcopyleft çç念æ¯
-“ä¿®æ¹åæ©å±ççæ¬å¿
须延ç¨åæ
·ç许å¯è¯ã”å¦æ使ç¨è®¸å¯è¯ç²çæ©å±ç¨åºå¿
须延ç¨è®¸å¯è¯ç²ï¼ä½¿ç¨è®¸å¯è¯ä¹çç¨åºå¿
须延ç¨è®¸å¯è¯ä¹ï¼é£ä¹å®ä»¬ä¹é´å°±æ¯ä¸å¯è°åï¼å¦æå并ç¨åºï¼è®¸å¯è¯å¿
é¡»æ¯ç²ï¼<em>ä¹</em>å¿
é¡»æ¯ä¹ãè¿å°±æ¯ä¸ºä»ä¹
-GPL v2 å GPL v3 ä¸å
¼å®¹ï¼è¿æ¯æ æ³é¿å
çãåæ ·å°ï¼CC-BY-SA 4.0
çè¦æ±å°±å¤©çå CC-BY-SA 3.0
-ä¸å
¼å®¹ï¼èä¸ä½è
ä¹æ æ³é¿å
è¿ä¸ç¹ã</p>
+<p>ä¸è¬æ¥è¯´ï¼ä¸¤ä¸ªä¸åç copyleft 许å¯è¯æ¯æ å¯é¿å
å°ä¸å
¼å®¹ï¼é¤é两è
ä¹é´ææç¡®çå
¼å®¹æ¡æ¬¾ãè¿ä¸æ¯å
为ç»èæ误ï¼è¿æ¯ copyleft
+ç念ä¸ç俱æ¥çç¹ç¹ãcopyleft çç念æ¯
“ä¿®æ¹åæ©å±ççæ¬å¿
须延ç¨åæ
·ç许å¯è¯ã”å¦æ使ç¨è®¸å¯è¯ç²çæ©å±ç¨åº A
+å¿
须延ç¨è®¸å¯è¯ç²ï¼ä½¿ç¨è®¸å¯è¯ä¹çç¨åº B å¿
须延ç¨è®¸å¯è¯ä¹ï¼é£ä¹å®ä»¬ä¹é´å°±æ¯ä¸å¯è°åï¼å¦æå并ç¨åºå
å« A å B
+ç代ç ï¼é£ä¹å并ç¨åºç许å¯è¯å¿
é¡»æ¯ç²ï¼<em>ä¹</em>å¿
é¡»æ¯ä¹ã</p>
-<p>æ两个æ¹æ³æ¥æè±æ°ç copyleft 许å¯è¯å¸¦æ¥çå
天ä¸å
¼å®¹æ§ã</p>
+<p>è¿å°±æ¯ä¸ºä»ä¹ GPL v2 å GPL v3 ä¸å
¼å®¹ï¼è¿ä¸ªæ æ³é¿å
ãåæ
·å°ï¼CC-BY-SA 4.0 çæ¡ä»¶ä¹å¤©ç¶ä¸å
¼å®¹ CC-BY-SA 3.0
+çæ¡ä»¶ï¼å
¶ä½è
ä¹æ æ³é¿å
è¿ä¸ç¹ã</p>
+
+<p>æ两个æ¹æ³æ¥æè±ä¸åçæ¬ copyleft 许å¯è¯å¸¦æ¥çå
天ä¸å
¼å®¹æ§ã</p>
<p>FSF 使ç¨è¯·æ±äººä»¬æç
§ “éµå¾ª GNU GPL çæ¬ N
æä»»ä½ä»¥åç欔
æ¥åå¸ç¨åºè¿ä¸æ¹æ³æ¥è§£å³æ¤å
¼å®¹æ§é®é¢ãè¿ç§ææå
¼å®¹çæ¬ Nï¼ä¹å
¼å®¹çæ¬ N+1ï¼å 为å®ç¡®è®¤çæ¬ N+1
æ¯å¯é项ï¼ãå½ä½ å°éµå¾ª “GPL 3
@@ -60,15 +62,15 @@
<p>æ们å¸ææ们åä¹ä¸ä¼æ GNU GPL v4ï¼ä½æ¯äººæ
å®äººãä¸äºé¾æï¼æ们æ æ³é¢è§ææçæ
åµãéè¿æç
§éµå¾ª
GNU GPL 3
æ以åçæ¬æ¥åå¸ç¨åºï¼ä½ å°±å
è®¸ä½ ç代ç 许å¯è¯å级å°
GNU GPL v4ï¼ä¸æ¦æ们åå¸äº v4ã</p>
-<p>å¦ä¸ä¸ªæ¹æ³æ¯è®©æ¯ä¸ä¸ªçæ¬é½æç¡®å
许å级å°ä»¥åççæ¬ãè¿å°±æ¯ Creative Commons
éç¨çåæ³ï¼ä¾å¦ï¼CC-BY-SA 4.0
-çï¼å½åçï¼æç¡®å
许任ä½ç¨æ·å°è®¸å¯è¯å级å°ä»¥åçæ¬ç
CC-BY-SAï¼ä¸æ¦æäºï¼ãMozilla åºéä¼ä¹æ¯ä½¿ç¨è¯¥æ¹æ³ã</p>
+<p>å¦ä¸ä¸ªæ¹æ³æ¯è®©æ¯ä¸ä¸ªçæ¬é½æç¡®å
许å级å°ä»¥åççæ¬ãMozilla åºéä¼ä½¿ç¨è¯¥æ¹æ³ï¼PHP
ä¹ä½¿ç¨è¯¥æ¹æ³ãCreative Commons 对
+CC-BY-SA 4.0 çï¼å½åçï¼ä½¿ç¨æ¤æ¹æ³ï¼æç¡®å
许任ä½ç¨æ·å°ä¿®æ¹çä½åç许å¯è¯å级å°ä»¥åçæ¬ç
CC-BY-SAã</p>
<p>åªæ GNU 许å¯è¯ç»äºä½è
éæ©æ¯å¦å
许å级å°æªæ¥è®¸å¯è¯çæ¬çæå©ãå½å¹´æç¼å第ä¸ä¸ª GNU GPL
çæ¬çæ¶åï¼é£æ¯ 1989
å¹´ï¼ææ¾ç»æ³è¿å
å«ä¸ä¸ªè®¸å¯è¯å级çé项ï¼å°±åç°å¨ç CC
许å¯è¯ä¸æ ·ï¼ä½æ¯æè§å¾æéæ©æ交ç»ä½è
æ´æ£å½ãè¿æ
·ï¼ä½è
å°±å¯ä»¥æå
¶ç¨åºæç
§ “åªç¨
GPL 1” æè
“ç¨ GPL 1 æ以åç” æ¥åå¸ã</p>
<p>ä»é£æ¶èµ·ï¼æå°±å¨æéå½æ¶çå³å®æ¯å¦ææºãå Linux è¿æ
·çç¨åºï¼åªå
许ä¸ä¸ªçæ¬ç GNU GPL
并æç»å级许å¯è¯ï¼è¿å°±å¯¼è´å®é
ä¸çä¸å
¼å®¹ã<a
-href="#f4">(****)</a>æ许æ们åºè¯¥å¨ GPL v4 çæ¶ä¾¯å
å«ä¸ä¸ªå级æ¡æ¬¾ï¼å¦ææ们éè¦çæ¬ 4 çè¯ã</p>
+href="#f4">(****)</a>æ许æ们åºè¯¥å¨ GPL v4 çæ¶ä¾¯å
å«ä¸ä¸ªèªå¨å级æ¡æ¬¾ï¼å¦ææ们éè¦çæ¬ 4 çè¯ã</p>
<p>æäº copyleft 许å¯è¯æä¸ä¸ªæç¡®çå次æææ¡æ¬¾ï¼è¯¥æ¡æ¬¾å
许å°ä»£ç æç
§ä¸åç copyleft 许å¯è¯ææï¼è¿æ ·å°±å
许äº
copyleft
许å¯è¯ä¹é´ç交åææãä¾å¦ï¼CeCILL 许å¯è¯æ确许å¯å°ä»£ç
æç
§ GNU GPL v2 æ以åçå次ææãå¦æç¨åº P ä½¿ç¨ CeCILL
@@ -216,7 +218,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright © 2016, 2018, 2020 Free Software Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨ <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -232,7 +234,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/01/27 14:30:58 $
+$Date: 2020/11/24 04:29:49 $
<!-- timestamp end -->
</p>
Index: licenses/license-recommendations.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/license-recommendations.zh-cn.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- licenses/license-recommendations.zh-cn.html 1 Jan 2020 12:04:44 -0000
1.12
+++ licenses/license-recommendations.zh-cn.html 24 Nov 2020 04:29:49 -0000
1.13
@@ -1,7 +1,8 @@
<!--#set var="ENGLISH_PAGE" value="/licenses/license-recommendations.en.html"
-->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.94 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>å¦ä½ä¸ºä½ çä½åéæ©ä¸ä»½è®¸å¯è¯ - GNU å·¥ç¨ -
èªç±è½¯ä»¶åºéä¼</title>
@@ -48,8 +49,11 @@
copyleft çæ¦å¿µï¼ä»¥å为ä»ä¹å®é常æ¯æ好ç许å¯æ¹æ¡</p>
<p>对大å¤æ°ç¨åºï¼æ们æ¨èä½ ä¸ºä½ ç项ç®ä½¿ç¨ææ°çç <a
href="/licenses/gpl.html">GPL</a>ãå®å¼ºå¤§ç copyleft
-éåææç±»åç软件ï¼å¹¶å¯¹ç¨æ·çèªç±æå¾å¤ä¿æ¤ãä¹è¯·å
è®¸ä½¿ç¨ GPL çæªæ¥ç欗æ¢å¥è¯è¯´ï¼å¨è®¸å¯å£°æä¸åä¸ä½
çç¨åºè¢« GPL v3
-æå
¶æ´æ°çæ¬è¦çã</p>
+éåææç±»åç软件ï¼å¹¶å¯¹ç¨æ·çèªç±æå¾å¤ä¿æ¤ã为äºå°æ¥è®¸å¯è¯çå级ï¼<a
+href="/licenses/identify-licenses-clearly.html">è¯·å£°æ “çæ¬ 3
+æè
ä»»ä½æ°ç欔</a>ï¼è¿æ ·ä½ çç¨åºå°± <a
+href="/licenses/license-compatibility.html">å¨è®¸å¯è¯å±é¢å
¼å®¹</a> å
¶ä»å°æ¥æç
§åç» GPL
+çæ¬åå¸çç¨åºã</p>
<p>æ¤å¤æå
³äº<a href="/licenses/gpl-howto.html">å¦ä½å¨ GNU GPL
ä¹ä¸åå¸ç¨åº</a>çæ´å¤å»ºè®®ã</p>
@@ -61,11 +65,10 @@
带æ¥ç好å¤é常太å°ï¼ä¸è¶³ä»¥å¯¹æç¡®ä¿è®¸å¯è¯çå¤æ¬æ»æ¯ä¼´é软件çä¸ä¾¿ã</p>
<p>对è¿äºç¨åºï¼æ们æ¨è <a
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 2.0
-许å¯è¯</a>ãè¿æ¯ä¸ä¸ª
-pushoverï¼écopyleftï¼è½¯ä»¶è®¸å¯è¯ï¼å®æç¨äºé¿å
è´¡ç®è
åååè
èµ·è¯ä¸å©ä¾µæçæ¡ç®ãè¿å¹¶ä¸ä¼è®©è½¯ä»¶é¿å
æ¥èªä¸å©çå¨èï¼ä¸ä¸ªè½¯ä»¶è®¸å¯è¯æ¯åä¸å°çï¼ï¼ä½å®é¿å
äºä¸å©ææè
æçèªç±çå¹ååå¸è½¯ä»¶ï¼è¿ç§æ
åµä¸ä¸å©ææè
ä¼ç¸å½äºåäºä¸æ¬¡“诱导转å”ï¼ç¶åè¦æ±æ¥åè
åæä¸å©è¯ä¹¦ä¸çéèªç±æ¡ç®ã</p>
+许å¯è¯</a>ãè¿æ¯ä¸ä¸ªå¼±çãæ¾æ£çã“顺ä»å”ï¼é
+copyleftï¼è½¯ä»¶è®¸å¯è¯ï¼å®æç¨äºé¿å
è´¡ç®è
åååè
èµ·è¯ä¸å©ä¾µæçæ¡ç®ãè¿å¹¶ä¸ä¼è®©è½¯ä»¶é¿å
æ¥èªä¸å©çå¨èï¼ä¸ä¸ªè½¯ä»¶è®¸å¯è¯æ¯åä¸å°çï¼ï¼ä½å®é¿å
äºä¸å©ææè
æçèªç±çå¹ååå¸è½¯ä»¶ï¼è¿ç§æ
åµä¸ä¸å©ææè
ä¼ç¸å½äºåäºä¸æ¬¡“诱导转å”ï¼ç¶åè¦æ±æ¥åè
åæä¸å©è¯ä¹¦ä¸çéèªç±æ¡ç®ã</p>
-<p>å¨ä¸ä¸¥æ ¼ç pushover 许å¯è¯ä¸ï¼Apache 2.0
æ¯æ好çï¼æ以å¦æä½ è¦ç¨ä¸ä¸ªä¸ä¸¥æ ¼ç pushover
-许å¯è¯ï¼ä¸è®ºä»ä¹åå ï¼æ们æ¨èç¨è¿ä¸ä¸ªã</p>
+<p>å¨ä¸ä¸¥æ ¼çï¼é¡ºä»åï¼è®¸å¯è¯ä¸ï¼Apache 2.0
æ¯æ好çï¼æ以å¦æä½ è¦ç¨ä¸ä¸ªä¸ä¸¥æ
¼ç许å¯è¯ï¼ä¸è®ºä»ä¹åå ï¼æ们æ¨èç¨è¿ä¸ä¸ªã</p>
<h4 id="libraries">åº</h4>
@@ -188,8 +191,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software
-Foundation, Inc.</p>
+<p>Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free
+Software Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -209,7 +212,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/01/01 12:04:44 $
+$Date: 2020/11/24 04:29:49 $
<!-- timestamp end -->
</p>
Index: licenses/po/license-compatibility.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/license-compatibility.zh-cn-en.html 24 Jan 2020 14:01:43
-0000 1.1
+++ licenses/po/license-compatibility.zh-cn-en.html 24 Nov 2020 04:29:49
-0000 1.2
@@ -77,17 +77,21 @@
incompatible unless they have explicit compatibility provisions. This
is not due to a mistake in the details; it's inherent in the idea of
copyleft. The idea of copyleft is that “Modified and extended
-versions must be under the same license.” If license A says extended
-programs must be under license A, and license B says extended programs
-must be under license B, they have an irreconcilable disagreement; the
-license of the combined program would have to be A, <em>and</em> it would
-have to be B. This is why GPL version 2 is incompatible with GPL
-version 3; it could not be avoided. Likewise, the conditions of
-CC-BY-SA 4.0 would be inherently incompatible with those of CC-BY-SA
-3.0, and the authors could not have avoided this.</p>
+versions must be under the same license.” If license A (on
+program P) says extended programs must be under license A, and license
+B (on program Q) says extended programs must be under license B, they
+have an irreconcilable disagreement; the license of the combined
+program which includes code from P plus code from Q would have to be
+A, <em>and</em> it would have to be B.</p>
+
+<p>This is why GPL version 2 is
+incompatible with GPL version 3; it could not be avoided. Likewise,
+the conditions of CC-BY-SA 4.0 would be inherently incompatible with
+those of CC-BY-SA 3.0, and the authors could not have avoided
+this.</p>
-<p>There are two approaches for smoothing out the incompatibility
-inherent in new versions of copyleft licenses.</p>
+<p>There are two approaches for avoiding the incompatibility problem
+caused by different versions of copyleft licenses.</p>
<p>The FSF uses the approach of asking people to release programs under
“GNU GPL version N or any later version.” This licensing is
@@ -102,11 +106,11 @@
releasing your code under GNU GPL 3 or later, you permit your code to
upgrade to GNU GPL version 4 if we ever need one.</p>
-<p>The other approach is to make each version of the license explicitly
-allow upgrading to later versions. This is what Creative Commons
-does: for instance, CC-BY-SA version 4.0 (the current version)
-explicitly permits any user to upgrade to later versions of CC-BY-SA
-once those exist. The Mozilla Foundation also uses this approach.</p>
+<p>The other approach is to make each version of the license
+explicitly allow upgrading to later versions. The Mozilla Foundation
+uses this approach, as does PHP. Creative Commons, uses it for
+CC-BY-SA: version 4.0 (the current version) explicitly permits any
+user to upgrade to later versions of CC-BY-SA for modified works.</p>
<p>Only the GNU licenses give authors a choice about whether to permit
upgrades to future license versions. When I wrote the first version
@@ -119,8 +123,9 @@
<p>Since then, I have come to question the wisdom of that decision.
Programs such as Linux, which allow only one GNU GPL version and
reject license upgrades, cause practical
-incompatibility.<a href="#f4">(****)</a> Perhaps we should include an
-upgrade clause in GPL version 4, if we ever need a version 4.</p>
+incompatibility.<a href="#f4">(****)</a> If we ever make a GPL version
+4, perhaps we should include an upgrade clause that automatically
+permits relicensing to higher-numbered versions, 5 and up.</p>
<p>Some copyleft licenses allow cross-copyleft combinations with an
explicit relicensing clause giving permission to put the code under a
@@ -344,7 +349,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright © 2016, 2018, 2020 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -354,7 +359,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/01/24 14:01:43 $
+$Date: 2020/11/24 04:29:49 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/license-compatibility.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- licenses/po/license-compatibility.zh-cn.po 24 Nov 2020 04:18:07 -0000
1.6
+++ licenses/po/license-compatibility.zh-cn.po 24 Nov 2020 04:29:49 -0000
1.7
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-11-20 16:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -42,8 +41,8 @@
#. type: Content of: <p>
msgid ""
"There is no problem merging programs that have the same license, if it is a "
-"reasonably behaved license, as nearly all free licenses are.<a href="
-"\"#f2\">(**)</a>"
+"reasonably behaved license, as nearly all free licenses are.<a href=\"#f2\">"
+"(**)</a>"
msgstr ""
"å¦æ两个软件使ç¨åæ
·ç许å¯è¯ï¼åºè¯¥æ²¡æé®é¢ï¼åå®è¯¥è®¸å¯è¯è±¡å
ä¹ææçèªç±è½¯ä»¶"
"许å¯è¯ä¸æ ·é¡ºçæç« ã<a href=\"#f2\">(**)</a>"
@@ -105,8 +104,8 @@
msgstr ""
"å¨æ使ç¨æ¾æ£å许å¯è¯ç代ç
åå¨ä¸èµ·æ¶ï¼ç»åç¨åºçæ¯ä¸ªé¨åé½å¸¦æèªå·±ç许å¯è¯ã"
"å½è¿äºä»£ç 交ç»å¨ä¸èµ·æ
æ³å辨æ¶ï¼ç»åç¨åºåºè¯¥å¸¦ä¸ææ代ç
ç许å¯è¯ãç±äºè¿äºè®¸"
-"å¯è¯é½æ¯æ¾æ£åçï¼æ以å
¨é½å¸¦ä¸é¤äºå¤ªé¿ä¹å¤ä¹æ²¡æå«çé®é¢ã<a href="
-"\"#f3\">(***)</a>"
+"å¯è¯é½æ¯æ¾æ£åçï¼æ以å
¨é½å¸¦ä¸é¤äºå¤ªé¿ä¹å¤ä¹æ²¡æå«çé®é¢ã<a href=\"#f3\">"
+"(***)</a>"
#. type: Content of: <p>
msgid ""
Index: licenses/po/license-recommendations.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.zh-cn-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- licenses/po/license-recommendations.zh-cn-en.html 1 Jan 2020 12:04:44
-0000 1.5
+++ licenses/po/license-recommendations.zh-cn-en.html 24 Nov 2020 04:29:49
-0000 1.6
@@ -1,5 +1,6 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.94 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
<title>How to choose a license for your own work
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/licenses/po/license-recommendations.translist" -->
@@ -83,9 +84,12 @@
version of the <a href="/licenses/gpl.html">GNU General Public License
(GPL)</a> for your project. Its strong copyleft is appropriate for
all kinds of software, and includes numerous protections for users'
-freedom. Please give permission to use future license versions as
-well—in other words, make the license notice say that your
-program is covered by GPL version 3 or later.</p>
+freedom. To allow for future license
+upgrades, <a href="/licenses/identify-licenses-clearly.html"> please
+specify “version 3 or any later version”</a> so that your
+program will be <a href="/licenses/license-compatibility.html">
+license-compatible</a> with code that may be released, in the future,
+under subsequent GPL versions.</p>
<p>Here is more advice about <a href="/licenses/gpl-howto.html">how
to release a program under the GNU GPL</a>.</p>
@@ -103,16 +107,17 @@
<p>For those programs, we recommend
the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache
-License 2.0</a>. This is a pushover (non-copyleft) software license
+License 2.0</a>. This is a weak, lax, “pushover” (non-copyleft)
+software license
that has terms to prevent contributors and distributors from suing for
patent infringement. This doesn't make the software immune to threats
-from patents (a software license can't do that), but it does prevent
+from patents (no software license can achieve that), but it does prevent
patent holders from setting up a “bait and switch” where
they release the software under free terms then require recipients to
agree to nonfree terms in a patent license.</p>
-<p>Among the lax pushover licenses, Apache 2.0 is best; so if you
-are going to use a lax pushover license, whatever the reason,
+<p>Among the weak (pushover) licenses, Apache 2.0 is best; so if you
+are going to use a weak license, whatever the reason,
we recommend using that one.</p>
<h4 id="libraries">Libraries</h4>
@@ -267,7 +272,7 @@
README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
of this article.</p>
</div>
@@ -288,7 +293,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software
Foundation, Inc.</p>
+<p>Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free
Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -298,7 +303,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/01/01 12:04:44 $
+$Date: 2020/11/24 04:29:49 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/license-recommendations.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.zh-cn.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- licenses/po/license-recommendations.zh-cn.po 24 Nov 2020 04:17:31
-0000 1.21
+++ licenses/po/license-recommendations.zh-cn.po 24 Nov 2020 04:29:49
-0000 1.22
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-11-20 16:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -315,8 +314,8 @@
"library”</a>."
msgstr ""
"对äºæä¾äºç¹å«è®¾è®¡ï¼å¹¶ä¸ä¸ä¼ä¸ç°æé copyleft
æéèªç±åºç«äºçï¼æ们æ¨è使ç¨"
-"åå§ç GNU GPLãè¦ç¥éåå ï¼è¯·é
读<a
href=\"/licenses/why-not-lgpl.html"
-"\">ã为ä»ä¹ä½ ä¸åºè¯¥å¨ä¸ä¸ä¸ªå½æ°åºä¸ä½¿ç¨ LGPLã</a>ã"
+"åå§ç GNU GPLãè¦ç¥éåå ï¼è¯·é
读<a
href=\"/licenses/why-not-lgpl.html\">"
+"ã为ä»ä¹ä½ ä¸åºè¯¥å¨ä¸ä¸ä¸ªå½æ°åºä¸ä½¿ç¨ LGPLã</a>ã"
#. type: Content of: <h4>
msgid "Server Software"
Index: proprietary/proprietary.zh-cn.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary.zh-cn.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- proprietary/proprietary.zh-cn.html 23 Nov 2020 09:30:12 -0000 1.23
+++ proprietary/proprietary.zh-cn.html 24 Nov 2020 04:29:49 -0000 1.24
@@ -161,6 +161,15 @@
<h3 id="latest">ææ°æ·»å </h3>
<ul class="blurbs">
+ <li id="M202011090">
+ <p>æ ¹æ® FTCï¼å¶é Zoom è§é¢ä¼è®®è½¯ä»¶çå
¬å¸å¤å¹´æ¥ä¸ç´ <a
+href="https://arstechnica.com/tech-policy/2020/11/zoom-lied-to-users-about-end-to-end-encryption-for-years-ftc-says/";>å°±å
¶ç¹å¯¹ç¹å å¯åç¨æ·æè°</a>ï¼è³å°ä»
+2016 å¹´èµ·ã</p>
+
+ <p>人们å¯ä»¥ä½¿ç¨å°éç¨æ·çèªç±ç¨åºï¼æ¯å¦ <a
href="https://directory.fsf.org/wiki/Jitsi";>Jitsi</a>
+æ
BigBlueButtonï¼å¦æè½å¤ä½¿ç¨ç±ç¨æ·èªå·±æ§å¶çæå¡å¨å°±æ´å¥½äºã</p>
+ </li>
+
<li id="M202004150">
<p>Riot 游æçæ°å欺éªåè½æ¯æ¶æ软件ï¼å®å¨ Windows
ç³»ç»ä¸ <a
href="https://www.extremetech.com/gaming/309320-riot-games-new-anti-cheat-system-runs-at-system-boot-uses-kernel-driver";>å¨ç³»ç»å¯å¨æ¶ä»¥å
æ ¸å±çº§è¿è¡</a>ãå®æ©å¤§äºæä½ç³»ç»è¢«æ»å»çå±é¢ï¼æ¯å®å
¨éæ£ã</p>
@@ -184,15 +193,6 @@
href="https://answers.microsoft.com/en-us/outlook_com/forum/all/why-does-my-new-e-mail-account-need-a-phone-number/70049eaf-3b66-4d02-87cc-79dc73c2ea08";>强å¶äººä»¬æä¾çµè¯å·ç
</a>
æ¥å建微软ç½ç»è´¦å·ã微软é¤äºéè¿æä¾éèªç±è½¯ä»¶æ¥ä¼¤å®³ç¨æ·ä¹å¤ï¼å强å
对ç¨æ·å¨çµèä¹å¤ç追踪并侵ç¯ä¸ªäººéç§ã</p>
</li>
-
- <li id="M202006120">
- <p>Zoom èåçå
¬å¸ä¸ä½éè¿å¼åè¿æ¬¾éèªç±è½¯ä»¶å¥å¤ºç¨æ·ç计ç®èªç±ï¼èä¸å®è¿éè¿æå¡æ¿åºç
<a
-href="https://www.theverge.com/2020/6/12/21288995/zoom-blocking-feature-chinese-government-censorship";>ç¦æ¢æ´»å¨ä»¥å审æ¥ç¨æ·</a>
-ä¾µç¯ç¨æ·çå
¬æ°æå©ã</p>
-
- <p>å°éç¨æ·çç¨åºï¼æ¯å¦ <a
href="https://directory.fsf.org/wiki/Jitsi";>Jitsi</a> æ
-BigBlueButton å¯ä»¥ä»£æ¿
Zoomï¼å¦æè½å¤ä½¿ç¨ç±ç¨æ·èªå·±æ§å¶çæå¡å¨å°±æ´å¥½äºã</p>
- </li>
</ul>
</div>
@@ -273,7 +273,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/11/23 09:30:12 $
+$Date: 2020/11/24 04:29:49 $
<!-- timestamp end -->
</p>
Index: proprietary/po/proprietary.zh-cn-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.zh-cn-en.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- proprietary/po/proprietary.zh-cn-en.html 23 Nov 2020 09:30:12 -0000
1.24
+++ proprietary/po/proprietary.zh-cn-en.html 24 Nov 2020 04:29:49 -0000
1.25
@@ -174,6 +174,18 @@
<h3 id="latest">Latest additions</h3>
<ul class="blurbs">
+ <li id="M202011090">
+ <p>According to FTC, the
+ company behind the Zoom conferencing software <a
+
href="https://arstechnica.com/tech-policy/2020/11/zoom-lied-to-users-about-end-to-end-encryption-for-years-ftc-says/";>has
+ lied to users about its end-to-end encryption</a> for years, at least
+ since 2016.</p>
+
+ <p>People can use free (as in freedom) programs such as <a
+ href="https://directory.fsf.org/wiki/Jitsi";>Jitsi</a> or BigBlueButton,
+ better still if installed in a server controlled by the users.</p>
+ </li>
+
<li id="M202004150">
<p>Riot Gamesâ new anti-cheat is malware; <a
href="https://www.extremetech.com/gaming/309320-riot-games-new-anti-cheat-system-runs-at-system-boot-uses-kernel-driver";>runs
@@ -208,19 +220,6 @@
nonfree software, Microsoft is tracking their lives outside the computer
and
violates their privacy.</p>
</li>
-
- <li id="M202006120">
- <p>The company behind Zoom does not only deny
- users' computer freedom by developing this piece
- of nonfree software, it also violates users' civil rights by <a
-
href="https://www.theverge.com/2020/6/12/21288995/zoom-blocking-feature-chinese-government-censorship";>banning
- events and censoring users</a> to serve the agenda of governments.</p>
-
- <p>Freedom respecting programs such as <a
- href="https://directory.fsf.org/wiki/Jitsi";>Jitsi</a> or BigBlueButton
- can be used instead, better still if installed in a server controlled
- by its users.</p>
- </li>
</ul>
</div>
@@ -283,7 +282,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/11/23 09:30:12 $
+$Date: 2020/11/24 04:29:49 $
<!-- timestamp end -->
</p>
</div>
Index: proprietary/po/proprietary.zh-cn.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.zh-cn.po,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- proprietary/po/proprietary.zh-cn.po 24 Nov 2020 04:19:31 -0000 1.96
+++ proprietary/po/proprietary.zh-cn.po 24 Nov 2020 04:29:49 -0000 1.97
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-11-23 11:55+0000\n"
"X-Generator: Poedit 2.3\n"
#. type: Content of: <title>
Index: proprietary/po/zh-cn.po
===================================================================
RCS file: /web/www/www/proprietary/po/zh-cn.po,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- proprietary/po/zh-cn.po 23 Nov 2020 14:35:49 -0000 1.83
+++ proprietary/po/zh-cn.po 24 Nov 2020 04:29:49 -0000 1.84
@@ -3999,6 +3999,10 @@
"to-end-encryption-for-years-ftc-says/\">has lied to users about its end-to-"
"end encryption</a> for years, at least since 2016."
msgstr ""
+"æ ¹æ® FTCï¼å¶é Zoom è§é¢ä¼è®®è½¯ä»¶çå
¬å¸å¤å¹´æ¥ä¸ç´ <a
href=\"https://";
+"arstechnica.com/tech-policy/2020/11/zoom-lied-to-users-about-end-to-end-"
+"encryption-for-years-ftc-says/\">å°±å
¶ç¹å¯¹ç¹å
å¯åç¨æ·æè°</a>ï¼è³å°ä» 2016 å¹´"
+"èµ·ã"
#. type: Content of: <div><div><ul><li><p>
#, fuzzy
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www education/misc/edu-misc.zh-cn.html educatio...,
GNUN <=