[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www distros/common-distros.zh-cn.html distros/d...
|
From: |
GNUN |
|
Subject: |
www distros/common-distros.zh-cn.html distros/d... |
|
Date: |
Wed, 3 Jan 2018 09:01:15 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 18/01/03 09:01:15
Modified files:
distros : common-distros.zh-cn.html distros.zh-cn.html
free-system-distribution-guidelines.zh-cn.html
distros/po : common-distros.zh-cn-en.html
common-distros.zh-cn.po distros.zh-cn-en.html
distros.zh-cn.po
free-system-distribution-guidelines.zh-cn-en.html
free-system-distribution-guidelines.zh-cn.po
licenses : copyleft.zh-cn.html
licenses/po : copyleft.zh-cn-en.html copyleft.zh-cn.po
philosophy : selling.zh-cn.html
surveillance-vs-democracy.zh-cn.html
philosophy/po : selling.zh-cn-en.html selling.zh-cn.po
surveillance-vs-democracy.zh-cn-en.html
surveillance-vs-democracy.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/distros.zh-cn.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-system-distribution-guidelines.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.zh-cn.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-system-distribution-guidelines.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-system-distribution-guidelines.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/copyleft.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/copyleft.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/copyleft.zh-cn.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/selling.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/surveillance-vs-democracy.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
Patches:
Index: distros/common-distros.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/common-distros.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- distros/common-distros.zh-cn.html 31 Dec 2017 08:24:30 -0000 1.2
+++ distros/common-distros.zh-cn.html 3 Jan 2018 14:01:14 -0000 1.3
@@ -163,9 +163,9 @@
<div id="footer">
<div class="unprintable">
-<p>请å°æå
³èªç±è½¯ä»¶åºéä¼(FSF) &
GNUçä¸è¬æ§é®é¢åéå°<a
+<p>请å°æå
³èªç±è½¯ä»¶åºéä¼ï¼FSFï¼&GNUçä¸è¬æ§é®é¢åéå°<a
href="mailto:address@hidden";><address@hidden></a>ãä¹å¯ä»¥éè¿<a
-href="/contact/">å
¶ä»èç³»æ¹æ³</a>èç³»èªç±è½¯ä»¶åºéä¼(FSF)ãæå
³å¤±æé¾æ¥æå
¶ä»é误å建议ï¼è¯·åéé®ä»¶å°<a
+href="/contact/">å
¶ä»èç³»æ¹æ³</a>èç³»èªç±è½¯ä»¶åºéä¼ï¼FSFï¼ãæå
³å¤±æé¾æ¥æå
¶ä»é误å建议ï¼è¯·åéé®ä»¶å°<a
href="mailto:address@hidden";><address@hidden></a>ã</p>
<p>
@@ -203,7 +203,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2016, 2017, 2018 Free Software Foundation,
Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -214,12 +214,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ï¼2018ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2017/12/31 08:24:30 $
+$Date: 2018/01/03 14:01:14 $
<!-- timestamp end -->
</p>
Index: distros/distros.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/distros.zh-cn.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- distros/distros.zh-cn.html 31 Dec 2017 08:24:30 -0000 1.17
+++ distros/distros.zh-cn.html 3 Jan 2018 14:01:14 -0000 1.18
@@ -4,29 +4,27 @@
<!-- Parent-Version: 1.84 -->
<!-- This file is automatically generated by GNUnited Nations! -->
-<title>GNU/Linux åè¡ç - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
-<link rel="alternate" title="èªç±ç GNU/Linux åè¡ç"
+<title>GNU/Linuxåè¡ç - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
+<link rel="alternate" title="èªç±çGNU/Linuxåè¡ç"
href="http://www.gnu.org/distros/distros.rss";
type="application/rss+xml" />
<!--#include virtual="/distros/po/distros.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
-<h2>GNU/Linux åè¡ç</h2>
+<h2>GNU/Linuxåè¡ç</h2>
<p>
èªç±ç<a
href="/gnu/linux-and-gnu.html">GNU/Linuxç³»ç»</a>åè¡çï¼æ“åè¡ç”ï¼åªå
å«ååè¡èªç±è½¯ä»¶ãä»ä»¬æç»åç§éèªç±çåºç¨ç¨åºãéèªç±çç¼ç¨å¹³å°ãéèªç±ç驱å¨ãéèªç±çåºä»¶“blobs”ï¼ä»¥åå
¶ä»åç§éèªç±ç软件åææ¡£ãå¦æä»ä»¬åç°é误å°å
å«äºè¿äºéèªç±çæåï¼ä»ä»¬ä¼ä¸»å¨å»é¤å®ã
</p>
-<h3 id="freeDistros">èªç±ç GNU/Linux åè¡ç</h3>
+<h3 id="freeDistros">èªç±çGNU/Linuxåè¡ç</h3>
<p>
-æ们æ¨èæ¨ä½¿ç¨èªç±ç GNU/Linux
-ç³»ç»åè¡çï¼é£äºä¸å
å«ä»»ä½ä¸æ软件çåè¡çãè¿æ
·ï¼æ¨å°±è½ç¡®å®èªå·±æ²¡æè¿è¡ä»»ä½éèªç±çç¨åºãè¿å¼
å表ååºäºè¿æ ·çåè¡çï¼<br />
-<a href="/distros/free-distros.html"> èªç±ç GNU/Linux åè¡ç</a>ã</p>
+æ们æ¨èæ¨ä½¿ç¨èªç±çGNU/Linuxç³»ç»åè¡çï¼é£äºä¸å
å«ä»»ä½ä¸æ软件çåè¡çãè¿æ
·ï¼æ¨å°±è½ç¡®å®èªå·±æ²¡æè¿è¡ä»»ä½éèªç±çç¨åºãè¿å¼
å表ååºäºè¿æ ·çåè¡çï¼<br />
+<a href="/distros/free-distros.html">èªç±çGNU/Linuxåè¡ç</a>ã</p>
<p>
-è¿äºç°æçåè¡çå
¨é¨é½å¨å¼åæ¹é¢éè¦æ´å¤ç帮å©ãå
æ¤ï¼å¦ææ¨å¸æææå°å¸®å©èªç±ç GNU/Linux
-åè¡çï¼é£ä¹æ们建议æ¨å å
¥è¿äºç°æåè¡ççå¼åéä¼ï¼èä¸æ¯åèªå·±ä»å¤´åä¸ä¸ªæ°çåè¡çã
+è¿äºç°æçåè¡çå
¨é¨é½å¨å¼åæ¹é¢éè¦æ´å¤ç帮å©ãå
æ¤ï¼å¦ææ¨å¸æææå°å¸®å©èªç±çGNU/Linuxåè¡çï¼é£ä¹æ们建议æ¨å
å
¥è¿äºç°æåè¡ççå¼åéä¼ï¼èä¸æ¯åèªå·±ä»å¤´åä¸ä¸ªæ°çåè¡çã
</p>
<h3 id="freeNonDistros">èªç±çéGNUåè¡ç</h3>
@@ -35,8 +33,7 @@
<a
href="/distros/free-non-gnu-distros.html">èªç±çéGNUåè¡ç</a>ã</p>
<p>
-è¿äºç°æçåè¡çå
¨é¨é½å¨å¼åæ¹é¢éè¦æ´å¤ç帮å©ãå
æ¤ï¼å¦ææ¨å¸æææå°å¸®å©èªç±ç GNU/Linux
-åè¡çï¼é£ä¹æ们建议æ¨å å
¥è¿äºç°æåè¡ççå¼åéä¼ï¼èä¸æ¯åèªå·±ä»å¤´åä¸ä¸ªæ°çåè¡çã
+è¿äºç°æçåè¡çå
¨é¨é½å¨å¼åæ¹é¢éè¦æ´å¤ç帮å©ãå
æ¤ï¼å¦ææ¨å¸æææå°å¸®å©èªç±çGNU/Linuxåè¡çï¼é£ä¹æ们建议æ¨å
å
¥è¿äºç°æåè¡ççå¼åéä¼ï¼èä¸æ¯åèªå·±ä»å¤´åä¸ä¸ªæ°çåè¡çã
</p>
<h3 id="distroGuidelines">èªç±åè¡çæå</h3>
@@ -46,8 +43,8 @@
<h3 id="otherDistros">常è§åè¡ç</h3>
<p>
-大å¤æ°å¸¸è§çåç¥åç GNU/Linux åè¡ç并ä¸è½æ»¡è¶³æ们å
³äºèªç±çè¦æ±ãè¿ç¯æç« ä¸ºæ¨å举äºå®ä»¬çä¸äºé®é¢ï¼<br />
-<a
href="/distros/common-distros.html">为ä»ä¹æ们ä¸è½æ¯æä¼å¤ç¥åç
GNU/Linux åè¡ç</a>ã</p>
+大å¤æ°å¸¸è§çåç¥åçGNU/Linuxåè¡ç并ä¸è½æ»¡è¶³æ们å
³äºèªç±çè¦æ±ãè¿ç¯æç« ä¸ºæ¨å举äºå®ä»¬çä¸äºé®é¢ï¼<br />
+<a
href="/distros/common-distros.html">为ä»ä¹æ们ä¸è½æ¯æä¼å¤ç¥åçGNU/Linuxåè¡ç</a>ã</p>
<p>
æ们å¼åè¿äºåè¡ççå¼å人åæå
¶ä¸éèªç±çé¨å移é¤ï¼è¿ç¨æ·ä¸ä¸ªå®å
¨èªç±çç³»ç»ã
@@ -94,9 +91,9 @@
<div id="footer">
<div class="unprintable">
-<p>请å°æå
³èªç±è½¯ä»¶åºéä¼(FSF) & GNU
çä¸è¬æ§é®é¢åéå°<a
-href="mailto:address@hidden";><address@hidden></a>ãä¹å¯ä»¥éè¿ <a
-href="/contact/">å
¶ä»èç³»æ¹æ³</a>
èç³»èªç±è½¯ä»¶åºéä¼(FSF)ãæå
³å¤±æé¾æ¥æå
¶ä»é误å建议ï¼è¯·åéé®ä»¶å°<a
+<p>请å°æå
³èªç±è½¯ä»¶åºéä¼ï¼FSFï¼&GNUçä¸è¬æ§é®é¢åéå°<a
+href="mailto:address@hidden";><address@hidden></a>ãä¹å¯ä»¥éè¿<a
+href="/contact/">å
¶ä»èç³»æ¹æ³</a>èç³»èªç±è½¯ä»¶åºéä¼ï¼FSFï¼ãæå
³å¤±æé¾æ¥æå
¶ä»é误å建议ï¼è¯·åéé®ä»¶å°<a
href="mailto:address@hidden";><address@hidden></a></p>
<p>
@@ -134,7 +131,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2017, 2018 Free Software Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -146,12 +143,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯</b>ï¼éæ¥ ï¼Nan Dengï¼ï¼2010ã<br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ï¼2018ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2017/12/31 08:24:30 $
+$Date: 2018/01/03 14:01:14 $
<!-- timestamp end -->
</p>
Index: distros/free-system-distribution-guidelines.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/free-system-distribution-guidelines.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- distros/free-system-distribution-guidelines.zh-cn.html 31 Dec 2017
08:24:30 -0000 1.2
+++ distros/free-system-distribution-guidelines.zh-cn.html 3 Jan 2018
14:01:14 -0000 1.3
@@ -162,7 +162,7 @@
<div id="footer">
<div class="unprintable">
-<p>请å°æå
³èªç±è½¯ä»¶åºéä¼(FSF) &
GNUçä¸è¬æ§é®é¢åéå°<a
+<p>请å°æå
³èªç±è½¯ä»¶åºéä¼ï¼FSFï¼&GNUçä¸è¬æ§é®é¢åéå°<a
href="mailto:address@hidden";><address@hidden></a>ãä¹å¯ä»¥éè¿<a
href="/contact/">å
¶ä»èç³»æ¹æ³</a>èç³»èªç±è½¯ä»¶åºéä¼(FSF)ãæå
³å¤±æé¾æ¥æå
¶ä»é误å建议ï¼è¯·åéé®ä»¶å°<a
href="mailto:address@hidden";><address@hidden></a>ã</p>
@@ -202,7 +202,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2017, 2018 Free Software Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -213,12 +213,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ï¼2018ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2017/12/31 08:24:30 $
+$Date: 2018/01/03 14:01:14 $
<!-- timestamp end -->
</p>
Index: distros/po/common-distros.zh-cn-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- distros/po/common-distros.zh-cn-en.html 31 Dec 2017 08:24:31 -0000
1.2
+++ distros/po/common-distros.zh-cn-en.html 3 Jan 2018 14:01:14 -0000
1.3
@@ -309,7 +309,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2016, 2017, 2018 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
@@ -319,7 +319,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/12/31 08:24:31 $
+$Date: 2018/01/03 14:01:14 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/common-distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- distros/po/common-distros.zh-cn.po 3 Jan 2018 13:22:13 -0000 1.4
+++ distros/po/common-distros.zh-cn.po 3 Jan 2018 14:01:14 -0000 1.5
@@ -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: 2018-01-01 05:56+0000\n"
#. type: Content of: <title>
msgid ""
@@ -196,8 +195,8 @@
"the installer in some cases recommends these nonfree firmware files for the "
"peripherals on the machine."
msgstr ""
-"Debian以åçåå¸å
æ¬å¸¦éèªç±blobsçLinuxå
æ
¸ãä»2011å¹´2æçDebian "
-"6.0３squeeze”ï¼åå¸èµ·ï¼è¿äºblobs被å
¶ä¸»åå¸ç§»é¤å°å离çéèªç±è½¯ä»¶"
+"Debian以åçåå¸å
æ¬å¸¦éèªç±blobsçLinuxå
æ
¸ãä»2011å¹´2æçDebian 6.0"
+"３squeeze”ï¼åå¸èµ·ï¼è¿äºblobs被å
¶ä¸»åå¸ç§»é¤å°å离çéèªç±è½¯ä»¶"
"åºãç¶èï¼é®é¢è¿æéçï¼å
¶å®è£
ç¨åºå¨æäºæ
åµä¸ä¼ä¸ºçµèçå¤è®¾æ¨èè¿äºéèªç±ç"
"åºä»¶ã"
Index: distros/po/distros.zh-cn-en.html
===================================================================
RCS file: /web/www/www/distros/po/distros.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- distros/po/distros.zh-cn-en.html 31 Dec 2017 08:24:31 -0000 1.3
+++ distros/po/distros.zh-cn-en.html 3 Jan 2018 14:01:14 -0000 1.4
@@ -161,7 +161,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2017, 2018 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
@@ -171,7 +171,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/12/31 08:24:31 $
+$Date: 2018/01/03 14:01:14 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/distros.zh-cn.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- distros/po/distros.zh-cn.po 3 Jan 2018 13:09:25 -0000 1.23
+++ distros/po/distros.zh-cn.po 3 Jan 2018 14:01:14 -0000 1.24
@@ -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: 2018-01-01 05:56+0000\n"
# type: Content of: <title>
#. type: Content of: <title>
Index: distros/po/free-system-distribution-guidelines.zh-cn-en.html
===================================================================
RCS file:
/web/www/www/distros/po/free-system-distribution-guidelines.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- distros/po/free-system-distribution-guidelines.zh-cn-en.html 31 Dec
2017 08:24:31 -0000 1.2
+++ distros/po/free-system-distribution-guidelines.zh-cn-en.html 3 Jan
2018 14:01:14 -0000 1.3
@@ -344,7 +344,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2017, 2018 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 +354,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/12/31 08:24:31 $
+$Date: 2018/01/03 14:01:14 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/free-system-distribution-guidelines.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/free-system-distribution-guidelines.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- distros/po/free-system-distribution-guidelines.zh-cn.po 3 Jan 2018
13:15:44 -0000 1.3
+++ distros/po/free-system-distribution-guidelines.zh-cn.po 3 Jan 2018
14:01:14 -0000 1.4
@@ -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: 2018-01-01 05:56+0000\n"
#. type: Content of: <title>
msgid ""
Index: licenses/copyleft.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/copyleft.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- licenses/copyleft.zh-cn.html 31 Dec 2017 08:24:38 -0000 1.7
+++ licenses/copyleft.zh-cn.html 3 Jan 2018 14:01:14 -0000 1.8
@@ -4,97 +4,85 @@
<!-- Parent-Version: 1.84 -->
<!-- This file is automatically generated by GNUnited Nations! -->
-<title>ä»ä¹æ¯Copyleftï¼ - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
-<meta http-equiv="Keywords"
content="GNUï¼FSFï¼èªç±è½¯ä»¶åºéä¼ï¼Linuxï¼Copyleft" />
+<title>ä»ä¹æ¯Copyleftï¼ - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
+<meta http-equiv="Keywords"
content="GNUãFSFãèªç±è½¯ä»¶åºéä¼ãLinuxãCopyleft" />
<!--#include virtual="/licenses/po/copyleft.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
<h2>ä»ä¹æ¯Copyleftï¼</h2>
<p>
-Copyleft æ¯ä¸ç§è®©ç¨åºæå
¶å®ä½åä¿æèªç±ï¼<a
+Copyleftæ¯ä¸ç§è®©ç¨åºæå
¶å®ä½åä¿æèªç±ï¼<a
href="/philosophy/free-sw.html">æ¯è¨è®ºèªç±çèªç±ï¼èä¸æ¯“é¶ä»·æ
¼”</a>ï¼çéç¨æ¹æ³ï¼å¹¶è¦æ±å¯¹Copyleftç¨åºçä»»ä½ä¿®æ¹åæ©å±é½ä¿æèªç±ã</p>
<p>
-让ç¨åºæ为èªç±è½¯ä»¶æç®åçæ¹æ³æ¯æ¾å¼å¯¹å®ççæ并æå®æ¾å°
<a
-href="/philosophy/categories.html#PublicDomainSoftware">å
Œ
񂛆</a>
-ä¸ãè¿ä½¿å¾ä»äººå¨éè¦çæ¶åå¯ä»¥å
±äº«è¿ä¸ªè½¯ä»¶åå
¶å¯¹å®çæ¹è¿ãä½è¿ä¹ä½¿å¾å
¶å®ä¸äºä¸æ¿åä½ç人æå®ä»¬è½¬åæ <a
-href="/philosophy/categories.html#ProprietarySoftware">ä¸æ软件</a>
-ãä»ä»¬å¯ä»¥æå¤æå°çè¿è¡ä¿®æ¹ï¼å¹¶æææä½ä¸ºåä¸äº§ååå¸ãè¿äºä¿®æ¹è¿çç¨åºä¸ååå®ä»¬çåå§ä½è
æææçé£æ ·å
许ç¨æ·èªç±ç使ç¨ï¼è¿ç§èªç±è¢«ä¸é´åå¥å¤ºäºã</p>
+让ç¨åºæ为èªç±è½¯ä»¶æç®åçæ¹æ³æ¯æ¾å¼å¯¹å®ççæ并æå®æ¾å°<a
+href="/philosophy/categories.html#PublicDomainSoftware">å
Œ
±é¢å</a>ä¸ãè¿ä½¿å¾ä»äººå¨éè¦çæ¶åå¯ä»¥å
±äº«è¿ä¸ªè½¯ä»¶åå
¶å¯¹å®çæ¹è¿ãä½è¿ä¹ä½¿å¾å
¶å®ä¸äºä¸æ¿åä½ç人æå®ä»¬è½¬åæ<a
+href="/philosophy/categories.html#ProprietarySoftware">ä¸æ软件</a>ãä»ä»¬å¯ä»¥æå¤æå°çè¿è¡ä¿®æ¹ï¼å¹¶æææä½ä¸ºåä¸äº§ååå¸ãè¿äºä¿®æ¹è¿çç¨åºä¸ååå®ä»¬çåå§ä½è
æææçé£æ ·å
许ç¨æ·èªç±ç使ç¨ï¼è¿ç§èªç±è¢«ä¸é´åå¥å¤ºäºã</p>
<p>
-å¨ <a href="/gnu/thegnuproject.html">GNU å·¥ç¨</a> ä¸ï¼æ们çç®æ
æ¯è®© <em>ææç</em>
-ç¨æ·å¯ä»¥èªç±å°éæ°åå¸æä¿®æ¹ GNU
-软件ãå¦æå
许ä¸é´åå¥å¤ºè¿ç§èªç±ï¼æ们ä¹è®¸ä¼ä»¥æ¤“è·å¾å¾å¤çç¨æ·”ï¼ä½è¿äºç¨æ·ä¾¿ä¸åæ¥æèªç±ãæ以æ们并ä¸æ
GNU
-软件åå¸å°å
Œ
±é¢åï¼æ们对å®ä¿ç“Copyleft”ãæè° Copyleft
-æ¯æä»»ä½äººé½å¯ä»¥éæ°åå软件ï¼ä¸ç®¡æ没æè¿è¡ä¿®æ¹ï¼ä½å¿
é¡»åæ¶ä¿ç软件æå
·æçèªç±ç¹æ§ãCopyleftæ¯ä¸ºäºä¿è¯ææç¨æ·é½æ¥æèªç±ã</p>
+å¨<a
+href="/gnu/thegnuproject.html">GNUå·¥ç¨</a>ä¸ï¼æ们çç®æ
æ¯è®©<em>ææç</em>ç¨æ·å¯ä»¥èªç±å°éæ°åå¸æä¿®æ¹GNU软件ãå¦æå
许ä¸é´åå¥å¤ºè¿ç§èªç±ï¼æ们ä¹è®¸ä¼ä»¥æ¤“è·å¾å¾å¤çç¨æ·”ï¼ä½è¿äºç¨æ·ä¾¿ä¸åæ¥æèªç±ãæ以æ们并ä¸æGNU软件åå¸å°å
Œ
±é¢åï¼æ们对å®ä¿ç“Copyleft”ãæè°Copyleftæ¯æä»»ä½äººé½å¯ä»¥éæ°åå软件ï¼ä¸ç®¡æ没æè¿è¡ä¿®æ¹ï¼ä½å¿
é¡»åæ¶ä¿ç软件æå
·æçèªç±ç¹æ§ãCopyleftæ¯ä¸ºäºä¿è¯ææç¨æ·é½æ¥æèªç±ã</p>
<p>
-Copyleft åæ¶ä¹ <a href="/philosophy/pragmatic.html">é¼å±</a>
-äºå
¶å®çç¨åºåå å
¥èªç±è½¯ä»¶å¼åçè¡åãå GNU C++
ç¼è¯å¨è¿æ ·çéè¦ç软件ä¹æ以åå¨ï¼ä¹æ¯ä¸ºäºè¿ä¸ç¹ã</p>
+Copyleftåæ¶ä¹<a
+href="/philosophy/pragmatic.html">é¼å±</a>äºå
¶å®çç¨åºåå å
¥èªç±è½¯ä»¶å¼åçè¡åãåGNU
+C++ç¼è¯å¨è¿æ
·çéè¦ç软件ä¹æ以åå¨ï¼ä¹æ¯ä¸ºäºè¿ä¸ç¹ã</p>
<p>
-é¤æ¤ä¹å¤ï¼Copyleft ä¹å¸®å©é£äºå¸æ对 <a
href="/prep/tasks.html">å®å</a> <a
-href="/philosophy/free-sw.html">èªç±è½¯ä»¶</a>
-ä½åºè´¡ç®çç¨åºåå¾å°è´¡ç®ç许å¯ãè¿äºç¨åºåé常æ¯ä¸ºé£äºä¸å¿æ³æ£é±çå
¬å¸æ大å¦å·¥ä½ãç¨åºåå¯è½å¸ææ她çåªåè´¡ç®å°èªç±è½¯ä»¶ç¤¾åºï¼ä½å
¶èæ¿å¯è½å¸ææè¿äºå·¥ä½åæåä¸è½¯ä»¶äº§åã</p>
+é¤æ¤ä¹å¤ï¼Copyleftä¹å¸®å©é£äºå¸æ对<a
href="/prep/tasks.html">å®å</a><a
+href="/philosophy/free-sw.html">èªç±è½¯ä»¶</a>ä½åºè´¡ç®çç¨åºåå¾å°è´¡ç®ç许å¯ãè¿äºç¨åºåé常æ¯ä¸ºé£äºä¸å¿æ³æ£é±çå
¬å¸æ大å¦å·¥ä½ãç¨åºåå¯è½å¸ææ她çåªåè´¡ç®å°èªç±è½¯ä»¶ç¤¾åºï¼ä½å
¶èæ¿å¯è½å¸ææè¿äºå·¥ä½åæåä¸è½¯ä»¶äº§åã</p>
<p>
å½æ们åèæ¿è§£é说å¦æä¸æè¿äºæ¹è¿ççæ¬ä½ä¸ºèªç±è½¯ä»¶åå¸æ¯éæ³çæ¶åï¼ä»ä»¬å¾å¾ä¼å³å®æå®ä»¬ä½ä¸ºèªç±è½¯ä»¶åå¸èä¸æ¯æå®ä»¬æå¼ã</p>
<p>
-ä¸ä¸ªç¨åºéµå¾ª
-Copyleftï¼æ们é¦å
声æå®æ¯æçæçï¼ç¶åï¼æ们ç»å®å
ä¸åå¸æ¡æ¬¾ï¼è¿ä¸ªæ¡æ¬¾å°±æ¯ä¸ä¸ªæ³å¾å£°æï¼å®èµäºææ人æ使ç¨ãä¿®æ¹åéæ°åå¸ç¨åºç代ç
-<em>åå
¶è¡çä½å</em>
çæå©ï¼ä½è¦æ±å¨è¿ä¸ªè¿ç¨ä¸ä¿æåå¸è§åä¸åãè¿æ
·çè¯ï¼ä»£ç åèªç±æå©å¨æ³å¾ä¸å°±ä¸å¯åå²äºã</p>
+ä¸ä¸ªç¨åºéµå¾ªCopyleftï¼æ们é¦å
声æå®æ¯æçæçï¼ç¶åï¼æ们ç»å®å
ä¸åå¸æ¡æ¬¾ï¼è¿ä¸ªæ¡æ¬¾å°±æ¯ä¸ä¸ªæ³å¾å£°æï¼å®èµäºææ人æ使ç¨ãä¿®æ¹åéæ°åå¸ç¨åºç代ç
<em>åå
¶è¡çä½å</em>çæå©ï¼ä½è¦æ±å¨è¿ä¸ªè¿ç¨ä¸ä¿æåå¸è§åä¸åãè¿æ
·çè¯ï¼ä»£ç åèªç±æå©å¨æ³å¾ä¸å°±ä¸å¯åå²äºã</p>
<p>
åä¸è½¯ä»¶å¼å人åéè¿çæå¥å¤ºäºç¨æ·çèªç±ï¼æ们使ç¨çææ¥ç»äºä»å®èªç±ãè¿å°±æ¯ä¸ºä»ä¹æ们æâçæ(Copyright)âæ¹ç§°ä¸ºâCopyleftâã</p>
<p>
-Copyleft
æ¯ä¸ç§å¯¹ç¨åºè¿è¡çæä¿æ¤çæ¹æ³ãå®å¹¶ä¸æ¯æ¾å¼çæï¼å
为è¿æ ·ä¼ä½¿ Copyleft
-åå¾ä¸å¯æä½ãâCopyleftâä¸çâleftâï¼å¹¶ä¸ä½¿ç¨å®å¨è±è¯ä¸âä¿çâçææï¼èæ¯æå®ï¼leftï¼å·¦ï¼ä¸é常çâçæ(Copyright)âä¸ç“rightï¼å³ï¼”å
·æéåçå
³ç³»ã</p>
+Copyleftæ¯ä¸ç§å¯¹ç¨åºè¿è¡çæä¿æ¤çæ¹æ³ãå®å¹¶ä¸æ¯æ¾å¼çæï¼å
为è¿æ
·ä¼ä½¿Copyleftåå¾ä¸å¯æä½ãâCopyleftâä¸çâleftâï¼å¹¶ä¸ä½¿ç¨å®å¨è±è¯ä¸âä¿çâçææï¼èæ¯æå®ï¼leftï¼å·¦ï¼ä¸é常çâçæ(Copyright)âä¸ç“rightï¼å³ï¼”å
·æéåçå
³ç³»ã</p>
<p>
-Copyleft æ¯ä¸ç§æ½è±¡çæ¦å¿µï¼æ½è±¡çæ¦å¿µæ¯æ
æ³ç´æ¥ä½¿ç¨çãåªæå®ç°è¿ä¸ªæ½è±¡æ¦å¿µï¼äººä»¬æè½ä½¿ç¨å®ãå¨
GNU
-项ç®ä¸ï¼æ们对大å¤æ°è½¯ä»¶ä½¿ç¨çä¸ç§å®ç°Copyleftçæ³å¾æ件æ¯<a
href="/licenses/gpl.html">GNU
-éç¨å
Œ
±è®¸å¯è¯</a>ãGNU éç¨å
Œ
±è®¸å¯è¯é常被ç®å为 GNU
GPL ãè¿éæä¸ä¸ªæå
³å®ç<a
-href="/licenses/gpl-faq.html">常è§é®é¢</a> 页é¢ãä½ ä¹å¯ä»¥åè <a
+Copyleftæ¯ä¸ç§æ½è±¡çæ¦å¿µï¼æ½è±¡çæ¦å¿µæ¯æ
æ³ç´æ¥ä½¿ç¨çãåªæå®ç°è¿ä¸ªæ½è±¡æ¦å¿µï¼äººä»¬æè½ä½¿ç¨å®ãå¨GNU项ç®ä¸ï¼æ们对大å¤æ°è½¯ä»¶ä½¿ç¨çä¸ç§å®ç°Copyleftçæ³å¾æ件æ¯<a
+href="/licenses/gpl.html">GNUéç¨å
Œ
±è®¸å¯è¯</a>ãGNUéç¨å
Œ
±è®¸å¯è¯é常被ç®å为GNU GPLãè¿éæä¸ä¸ªæå
³å®ç<a
+href="/licenses/gpl-faq.html">常è§é®é¢</a>页é¢ãä½ ä¹å¯ä»¥åè<a
href="/licenses/why-assign.html">为ä»ä¹FSFä»è½¯ä»¶ä½è
å¤è·å¾çæ转让</a>ã</p>
<p>
-å¦ä¸ç§å®ç°Copyleftçæ³å¾æ件ï¼æ¯<a
href="/licenses/agpl.html">Afferoéç¨å
Œ
±è®¸å¯è¯
-(AGPL)</a>ãè¿ä¸ªè®¸å¯è¯çç®æ
ç¨æ·æ¯é对æå¡å¨ç软件ãå¦æä¸ä¸ªä»¥AGPLææç软件被è¿è¡å¨åå
¬ä¼æä¾æå¡çæå¡å¨ä¸ï¼é£ä¹å¯¹è¯¥è½¯ä»¶çä»»ä½ä¿®æ¹ä¹å¿
é¡»è¦ä»¥æºä»£ç çå½¢å¼å¯¹å¤åå¸ã</p>
+å¦ä¸ç§å®ç°Copyleftçæ³å¾æ件ï¼æ¯<a
+href="/licenses/agpl.html">Afferoéç¨å
Œ
±è®¸å¯è¯ï¼AGPLï¼</a>ãè¿ä¸ªè®¸å¯è¯çç®æ
ç¨æ·æ¯é对æå¡å¨ç软件ãå¦æä¸ä¸ªä»¥AGPLææç软件被è¿è¡å¨åå
¬ä¼æä¾æå¡çæå¡å¨ä¸ï¼é£ä¹å¯¹è¯¥è½¯ä»¶çä»»ä½ä¿®æ¹ä¹å¿
é¡»è¦ä»¥æºä»£ç çå½¢å¼å¯¹å¤åå¸ã</p>
<p>
-é¤æ¤ä»¥å¤ï¼è¿æä¸ç§æ¯è¾ä¿å®çCopyleftç许å¯è¯ï¼<a
href="/licenses/lgpl.html">GNU 宽éç¨å
Œ
±è®¸å¯è¯
-(LGPL)</a>ï¼å®è¢«åºç¨äºä¸é¨åï¼ä¸æ¯ææçï¼GNU å½æ°åºã
è¿ä¸ªè®¸å¯è¯ä»¥å被称为âå½æ°åº
-GPLâï¼æ们修æ¹äºè®¸å¯è¯çååï¼åå
æ¯å®åæ¥çååé¼å±äºå¼å人åè¿å¤å°ä½¿ç¨è¿ä¸ªè®¸å¯è¯ã对äºè¿ä¸ªååæ¹åçå¿
è¦æ§ï¼è¯·åèè¿ç¯æç« ï¼<a
-href="/philosophy/why-not-lgpl.html"><cite>为ä»ä¹ä½ ä¸åºè¯¥å¯¹ä½
çä¸ä¸ä¸ªå½æ°åºåºç¨
-LGPL</cite></a>ã</p>
+é¤æ¤ä»¥å¤ï¼è¿æä¸ç§æ¯è¾ä¿å®çCopyleftç许å¯è¯ï¼<a
+href="/licenses/lgpl.html">GNU宽éç¨å
Œ
±è®¸å¯è¯ï¼LGPLï¼</a>ï¼å®è¢«åºç¨äºä¸é¨åï¼ä¸æ¯ææçï¼GNUå½æ°åºã
+è¿ä¸ªè®¸å¯è¯ä»¥å被称为âå½æ°åºGPLâï¼æ们修æ¹äºè®¸å¯è¯çååï¼åå
æ¯å®åæ¥çååé¼å±äºå¼å人åè¿å¤å°ä½¿ç¨è¿ä¸ªè®¸å¯è¯ã对äºè¿ä¸ªååæ¹åçå¿
è¦æ§ï¼è¯·åèè¿ç¯æç« ï¼<a
+href="/philosophy/why-not-lgpl.html"><cite>为ä»ä¹ä½ ä¸åºè¯¥å¯¹ä½
çä¸ä¸ä¸ªå½æ°åºåºç¨LGPL</cite></a>ã</p>
<p>
-<a href="/licenses/fdl.html">GNU èªç±æ档许å¯è¯
(FDL)</a>æ¯ä¸ç§é¢åæåãæç§ä¹¦ååç§ææ¡£ç Copyleft
-许å¯è¯ï¼å®ä¿è¯äºææ人é½å¯ä»¥èªç±çå¤å¶åéæ°åå¸è¿äºææ¡£ï¼ä¸ç®¡æ¯å¦è¿äºä¿®æ¹ï¼ä¹ä¸ç®¡æ¯åä¸çè¿æ¯éåä¸çã</p>
+<a
+href="/licenses/fdl.html">GNUèªç±æ档许å¯è¯ï¼FDLï¼</a>æ¯ä¸ç§é¢åæåãæç§ä¹¦ååç§ææ¡£çCopyleft许å¯è¯ï¼å®ä¿è¯äºææ人é½å¯ä»¥èªç±çå¤å¶åéæ°åå¸è¿äºææ¡£ï¼ä¸ç®¡æ¯å¦è¿äºä¿®æ¹ï¼ä¹ä¸ç®¡æ¯åä¸çè¿æ¯éåä¸çã</p>
<p>
-ç¸åºç许å¯è¯åºå½ä¸ææç GNU 软件æºä»£ç
åæåä¸ååå¸ã</p>
+ç¸åºç许å¯è¯åºå½ä¸ææçGNU软件æºä»£ç
åæåä¸ååå¸ã</p>
<p>
åå¦ä½
æ¯çæææ人ï¼ææè¿äºè®¸å¯è¯é½è¢«è®¾è®¡æå¾å®¹æè¿ç¨å°ä½
çä½åä¸ãä½ ä¸ç¨å»ä¿®æ¹è®¸å¯è¯ï¼ä½ åªéè¦å¨ä½ çä½åä¸å
å«è¿æ ·ä¸ä»½è®¸å¯è¯ææ¬ï¼å¹¶å¨æºä»£ç
æ件ä¸éå½ç表æå¼ç¨è¿ä¸ªè®¸å¯è¯å°±å¯ä»¥äºã</p>
<p>
-对å¾å¤ä¸åçç¨åºä½¿ç¨ç¸åçåå¸æ¡æ¬¾å¯ä»¥ä½¿å¾å¨è¿äºç¨åºä¸ç¸äºå¤å¶ä»£ç
åå¾å®¹æãå 为å®ä»¬é½å
·æç¸åçåå¸æ¡æ¬¾ï¼ä½
å°±ä¸éè¦å»èèè¿äºæ¡æ¬¾æ¯å¦ç¸äºå
¼å®¹ãLGPL
-第äºç许å¯è¯å
è®¸ä½ æåå¸æ¡æ¬¾æ¹ä¸ºæ åç GPL
许å¯è¯ï¼æä»¥ä½ å¯ä»¥æ LGPL ç代ç åºç¨å°å
¶å® GPL
çç¨åºä¸å»ãLGPL
-第ä¸çæ¯å为ä¸ä¸ªç¹ä¾å å
¥å° GPL
第ä¸çä¸ï¼æ以å®ä»¬ä¹æ¯ç¸äºå
¼å®¹çã</p>
+对å¾å¤ä¸åçç¨åºä½¿ç¨ç¸åçåå¸æ¡æ¬¾å¯ä»¥ä½¿å¾å¨è¿äºç¨åºä¸ç¸äºå¤å¶ä»£ç
åå¾å®¹æãå 为å®ä»¬é½å
·æç¸åçåå¸æ¡æ¬¾ï¼ä½
å°±ä¸éè¦å»èèè¿äºæ¡æ¬¾æ¯å¦ç¸äºå
¼å®¹ãLGPL第äºç许å¯è¯å
è®¸ä½ æåå¸æ¡æ¬¾æ¹ä¸ºæ åçGPL许å¯è¯ï¼æ以ä½
å¯ä»¥æLGPLç代ç åºç¨å°å
¶å®GPLçç¨åºä¸å»ãLGPL第ä¸çæ¯å为ä¸ä¸ªç¹ä¾å å
¥å°GPL第ä¸çä¸ï¼æ以å®ä»¬ä¹æ¯ç¸äºå
¼å®¹çã</p>
<p>
-å¦æä½ å¸æå¯¹ä½ çç¨åºéè¿åºç¨ GNU GPL æ GNU LGPL ä¿ç
Copyleft ï¼è¯·åè <a
+å¦æä½ å¸æå¯¹ä½ çç¨åºéè¿åºç¨GNU GPLæGNU
LGPLä¿çCopyleftï¼è¯·åè<a
href="/licenses/gpl-howto.html">许å¯è¯æå</a>
页é¢ä¸çå
容ã请注æï¼è®¸å¯è¯æ¯ä¸ä¸ªæ´ä½ï¼ä½
å¨ä½¿ç¨æ¶åªè½æ´ä½å¼ç¨ï¼åªå¼ç¨å
¶ä¸çä¸é¨åæ¯ä¸å
许çã</p>
<p>
-å¦æä½ å¸æå¯¹ä½ æ°åçæåéè¿åºç¨GNU FDLä¿ç
Copyleftï¼è¯·åèFDL <a
-href="/licenses/fdl.html#addendum">ç»å°¾é¨å</a> çå
容以å <a
-href="/licenses/fdl-howto.html">GFDLæå</a> 页é¢ä¸çå
容ãä¸GNU
+å¦æä½ å¸æå¯¹ä½ æ°åçæåéè¿åºç¨GNU
FDLä¿çCopyleftï¼è¯·åèFDL<a
+href="/licenses/fdl.html#addendum">ç»å°¾é¨å</a>çå
容以å<a
+href="/licenses/fdl-howto.html">GFDLæå</a>页é¢ä¸çå
容ãä¸GNU
GPLä¸æ ·ï¼ä½ å¿
须使ç¨æ´ä¸ªè®¸å¯è¯ï¼èä¸è½æ¯å
¶ä¸çä¸é¨åã</p>
<p>
@@ -116,9 +104,9 @@
<div id="footer">
<div class="unprintable">
-<p>请å°æå
³èªç±è½¯ä»¶åºéä¼(FSF) & GNU
çä¸è¬æ§é®é¢åéå°<a
-href="mailto:address@hidden";><address@hidden></a>ãä¹å¯ä»¥éè¿ <a
-href="/contact/">å
¶ä»èç³»æ¹æ³</a>
èç³»èªç±è½¯ä»¶åºéä¼(FSF)ãæå
³å¤±æé¾æ¥æå
¶ä»é误å建议ï¼è¯·åéé®ä»¶å°<a
+<p>请å°æå
³èªç±è½¯ä»¶åºéä¼ï¼FSFï¼&GNUçä¸è¬æ§é®é¢åéå°<a
+href="mailto:address@hidden";><address@hidden></a>ãä¹å¯ä»¥éè¿<a
+href="/contact/">å
¶ä»èç³»æ¹æ³</a>èç³»èªç±è½¯ä»¶åºéä¼(FSF)ãæå
³å¤±æé¾æ¥æå
¶ä»é误å建议ï¼è¯·åéé®ä»¶å°<a
href="mailto:address@hidden";><address@hidden></a>ã</p>
<p>
@@ -136,7 +124,7 @@
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
-请åè <a href="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>
+请åè<a href="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>
äºè§£æå
³åè°åæ交æç« ç¿»è¯çä¿¡æ¯ã</p>
</div>
@@ -157,8 +145,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2014, 2015, 2016, 2017 Free Software Foundation,
-Inc.</p>
+2006, 2007, 2008, 2009, 2014, 2015, 2016, 2017, 2018 Free Software
+Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -168,14 +156,14 @@
<div class="translators-credits">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-<b>ç¿»è¯</b>: æå¡å¸ 2007, 2008, 2009, 2010, 2011, 2012ã<br></br>
+<b>ç¿»è¯</b>ï¼æå¡å¸ 2007, 2008, 2009, 2010, 2011, 2012ã<br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ï¼2018ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2017/12/31 08:24:38 $
+$Date: 2018/01/03 14:01:14 $
<!-- timestamp end -->
</p>
Index: licenses/po/copyleft.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/copyleft.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/copyleft.zh-cn-en.html 31 Dec 2017 08:24:40 -0000 1.3
+++ licenses/po/copyleft.zh-cn-en.html 3 Jan 2018 14:01:14 -0000 1.4
@@ -210,7 +210,7 @@
Information document, www.gnu.org/prep/maintain. -->
<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2014, 2015, 2016, 2017 Free Software Foundation,
Inc.</p>
+2005, 2006, 2007, 2008, 2009, 2014, 2015, 2016, 2017, 2018 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
@@ -220,7 +220,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/12/31 08:24:40 $
+$Date: 2018/01/03 14:01:14 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/copyleft.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/copyleft.zh-cn.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- licenses/po/copyleft.zh-cn.po 3 Jan 2018 13:46:56 -0000 1.12
+++ licenses/po/copyleft.zh-cn.po 3 Jan 2018 14:01:14 -0000 1.13
@@ -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: 2018-01-01 05:57+0000\n"
"Plural-Forms: \n"
# type: Content of: <title>
Index: philosophy/selling.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/selling.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/selling.zh-cn.html 31 Dec 2017 08:24:46 -0000 1.4
+++ philosophy/selling.zh-cn.html 3 Jan 2018 14:01:14 -0000 1.5
@@ -116,9 +116,9 @@
<div id="footer">
<div class="unprintable">
-<p>请å°æå
³èªç±è½¯ä»¶åºéä¼(FSF) & GNU çä¸è¬æ§ &
é®é¢åéå°<a
-href="mailto:address@hidden";><address@hidden></a>ãä¹å¯ä»¥éè¿ <a
-href="/contact/">å
¶ä»èç³»æ¹æ³</a>
èç³»èªç±è½¯ä»¶åºéä¼(FSF)ã请å°æ æé¾æ¥ï¼å
¶ä»é误æ建议åéç»<a
+<p>请å°æå
³èªç±è½¯ä»¶åºéä¼ï¼FSFï¼&GNUçä¸è¬æ§é®é¢åéå°<a
+href="mailto:address@hidden";><address@hidden></a>ãä¹å¯ä»¥éè¿<a
+href="/contact/">å
¶ä»èç³»æ¹æ³</a>èç³»èªç±è½¯ä»¶åºéä¼(FSF)ã请å°æ æé¾æ¥ï¼å
¶ä»é误æ建议åéç»<a
href="mailto:address@hidden";><address@hidden></a>ã</p>
<p>
@@ -155,7 +155,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1996, 1997, 1998, 2001, 2007, 2015, 2016, 2017 Free
+<p>Copyright © 1996, 1997, 1998, 2001, 2007, 2015, 2016, 2017, 2018 Free
Software Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
@@ -171,12 +171,12 @@
<b>å®¡æ ¡</b>: åæå® <a
href="mailto:address@hidden";><address@hidden></a><br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ï¼2018ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2017/12/31 08:24:46 $
+$Date: 2018/01/03 14:01:14 $
<!-- timestamp end -->
</p>
Index: philosophy/surveillance-vs-democracy.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/surveillance-vs-democracy.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/surveillance-vs-democracy.zh-cn.html 31 Dec 2017 08:24:47
-0000 1.3
+++ philosophy/surveillance-vs-democracy.zh-cn.html 3 Jan 2018 14:01:15
-0000 1.4
@@ -276,9 +276,9 @@
<div id="footer">
<div class="unprintable">
-<p>请å°æå
³èªç±è½¯ä»¶åºéä¼(FSF) & GNU
çä¸è¬æ§é®é¢åéå°<a
-href="mailto:address@hidden";><address@hidden></a>ãä¹å¯ä»¥éè¿ <a
-href="/contact/">å
¶ä»èç³»æ¹æ³</a>
èç³»èªç±è½¯ä»¶åºéä¼(FSF)ãæå
³å¤±æé¾æ¥æå
¶ä»é误å建议ï¼è¯·åéé®ä»¶å°<a
+<p>请å°æå
³èªç±è½¯ä»¶åºéä¼ï¼FSFï¼&GNUçä¸è¬æ§é®é¢åéå°<a
+href="mailto:address@hidden";><address@hidden></a>ãä¹å¯ä»¥éè¿<a
+href="/contact/">å
¶ä»èç³»æ¹æ³</a>èç³»èªç±è½¯ä»¶åºéä¼ï¼FSFï¼ãæå
³å¤±æé¾æ¥æå
¶ä»é误å建议ï¼è¯·åéé®ä»¶å°<a
href="mailto:address@hidden";><address@hidden></a>ã</p>
<p>
@@ -316,7 +316,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2015, 2016, 2017 Richard Stallman</p>
+<p>Copyright © 2015, 2016, 2017, 2018 Richard Stallman</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -327,12 +327,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ï¼2018ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2017/12/31 08:24:47 $
+$Date: 2018/01/03 14:01:15 $
<!-- timestamp end -->
</p>
Index: philosophy/po/selling.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/selling.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/selling.zh-cn-en.html 31 Dec 2017 08:24:50 -0000 1.2
+++ philosophy/po/selling.zh-cn-en.html 3 Jan 2018 14:01:15 -0000 1.3
@@ -228,7 +228,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1996, 1997, 1998, 2001, 2007, 2015, 2016, 2017
+<p>Copyright © 1996, 1997, 1998, 2001, 2007, 2015, 2016, 2017, 2018
Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -239,7 +239,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/12/31 08:24:50 $
+$Date: 2018/01/03 14:01:15 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/selling.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/selling.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/selling.zh-cn.po 3 Jan 2018 13:52:34 -0000 1.3
+++ philosophy/po/selling.zh-cn.po 3 Jan 2018 14:01:15 -0000 1.4
@@ -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: 2018-01-01 05:58+0000\n"
#. type: Content of: <title>
msgid "Selling Free Software - GNU Project - Free Software Foundation"
Index: philosophy/po/surveillance-vs-democracy.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/surveillance-vs-democracy.zh-cn-en.html 31 Dec 2017
08:24:51 -0000 1.3
+++ philosophy/po/surveillance-vs-democracy.zh-cn-en.html 3 Jan 2018
14:01:15 -0000 1.4
@@ -578,7 +578,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2015, 2016, 2017 Richard Stallman</p>
+<p>Copyright © 2015, 2016, 2017, 2018 Richard Stallman</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -588,7 +588,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/12/31 08:24:51 $
+$Date: 2018/01/03 14:01:15 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/surveillance-vs-democracy.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/surveillance-vs-democracy.zh-cn.po 3 Jan 2018 13:00:50
-0000 1.7
+++ philosophy/po/surveillance-vs-democracy.zh-cn.po 3 Jan 2018 14:01:15
-0000 1.8
@@ -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: 2018-01-01 05:59+0000\n"
#. type: Content of: <title>
msgid ""
@@ -852,8 +851,8 @@
"a>”ï¼å 为è¿äºå¿ç»å¸¸åçï¼ç¹å«æ¯æå
³æè®®è
å<a
href=\"http://";
"photographyisnotacrime.com/\">æå½±è
</a>æ¶ãï¼å
å·çä¸ä¸ªåå¸è¦æ±è¦å¯å
¨ç¨ç©¿æ´"
"å½åæºï¼ç»ææ¯<a href=\"http://www.motherjones.com/kevin-drum/2013/08/";
-"ubiquitous-surveillance-police-edition\">è¦å¯ä½¿ç¨æ¦åçç°è±¡åå°60%</a>ã"
-"ACLUï¼ç¾å½å
¬æ°èªç±èçï¼å¾æ¯æè¿ä¸ªåæ³ã"
+"ubiquitous-surveillance-police-edition\">è¦å¯ä½¿ç¨æ¦åçç°è±¡åå°60%</a>ãACLU"
+"ï¼ç¾å½å
¬æ°èªç±èçï¼å¾æ¯æè¿ä¸ªåæ³ã"
#. type: Content of: <div><div><p>
msgid ""
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www distros/common-distros.zh-cn.html distros/d...,
GNUN <=