[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www home.zh-cn.html distros/free-distros.zh-cn....
|
From: |
GNUN |
|
Subject: |
www home.zh-cn.html distros/free-distros.zh-cn.... |
|
Date: |
Wed, 6 Nov 2019 07:28:58 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 19/11/06 07:28:58
Modified files:
. : home.zh-cn.html
distros : free-distros.zh-cn.html
distros/po : free-distros.zh-cn-en.html
free-distros.zh-cn.po
licenses : gpl-faq.zh-cn.html
licenses/po : gpl-faq.zh-cn-en.html gpl-faq.zh-cn.po
people : past-webmasters.zh-cn.html
people/po : past-webmasters.zh-cn-en.html
past-webmasters.zh-cn.po
po : home.zh-cn-en.html home.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.zh-cn.html?cvsroot=www&r1=1.230&r2=1.231
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-distros.zh-cn.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.zh-cn-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.zh-cn.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.zh-cn.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/people/past-webmasters.zh-cn.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/people/po/past-webmasters.zh-cn-en.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/people/po/past-webmasters.zh-cn.po?cvsroot=www&r1=1.114&r2=1.115
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn-en.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn.po?cvsroot=www&r1=1.336&r2=1.337
Patches:
Index: home.zh-cn.html
===================================================================
RCS file: /web/www/www/home.zh-cn.html,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -b -r1.230 -r1.231
--- home.zh-cn.html 6 Nov 2019 10:29:27 -0000 1.230
+++ home.zh-cn.html 6 Nov 2019 12:28:56 -0000 1.231
@@ -208,11 +208,10 @@
<div class="screenshot">
<a href="/distros/screenshots/dragora-ice.png"><img
src="/distros/screenshots/dragora-ice.png"
- alt=" [Screenshot of Dragora 3.0-beta1 with IceWM window
manager] " /></a>
+ alt=" [带æ IceWM çªå£ç®¡çå¨ç Dragora 3.0-beta1
æªå¾] " /></a>
</div>
-<p><small><a href="https://dragora.org/en/index.html";>
-Dragora 3.0-beta1</a> with customized <a href="https://ice-wm.org/";>
-IceWM</a> window manager</small></p>
+<p><small>带æèªå®ä¹ <a href="https://ice-wm.org/";>IceWM</a>
çªå£ç®¡çå¨ç <a
+href="https://dragora.org/en/index.html";>
Dragora 3.0-beta1</a></small></p>
<!--#endif
-->
<!--#if expr="$DISTRO = guix" -->
@@ -229,12 +228,12 @@
<div class="screenshot">
<a href="/distros/screenshots/hyperbola-i3.png"><img
src="/distros/screenshots/hyperbola-i3.png"
- alt=" [Screenshot of Hyperbola with i3 window manager] " /></a>
+ alt=" [带æ i3 çªå£ç®¡çå¨ç Hyperbola æªå¾] " /></a>
</div>
-<p><small><a href="https://www.hyperbola.info/?gnu-free-stros-page";>
-Hyperbola 0.3</a> with <a href="https://i3wm.org/";>i3 window
-manager</a>, cool-retro-term (terminal emulator), Gimp (image editor), and
-Iceweasel-UXP (web browser)</small></p>
+<p><small>带æ <a href="https://i3wm.org/";>i3
+çªå£ç®¡çå¨</a>ãcool-retro-termï¼ç»ç«¯æ¨¡æå¨ï¼ãGimpï¼å¾åç¼è¾å¨ï¼å
Iceweasel-UXPï¼ç½ç»æµè§å¨ï¼ç<a
+href="https://www.hyperbola.info/?gnu-free-stros-page";>
+Hyperbola 0.3</a></small></p>
<!--#endif
-->
<!--#if expr="$DISTRO = pureos" -->
@@ -263,13 +262,13 @@
<tr class="image">
<td><a href="/home.html?distro=dragora#gnu-linux"><img
src="/distros/screenshots/dragora-ice-thumb.jpg"
- alt=" [Screenshot of Dragora 3.0-beta1 with IceWM window
manager] " /></a></td>
+ alt=" [带æ IceWM çªå£ç®¡çå¨ç Dragora 3.0-beta1
æªå¾] " /></a></td>
<td><a href="/home.html?distro=guix#gnu-linux"><img
src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
alt=" [带æGNOME 3 æ¡é¢çGuix 0.15åè¡çæªå¾] "
/></a></td>
<td><a href="/home.html?distro=hyperbola#gnu-linux"><img
src="/distros/screenshots/hyperbola-i3-thumb.jpg"
- alt=" [Screenshot of Hyperbola 0.3 with i3 window manager] "
/></a></td>
+ alt=" [带æ i3 çªå£ç®¡çå¨ç Hyperbola 0.3 æªå¾] "
/></a></td>
<td><a href="/home.html?distro=pureos#gnu-linux"><img
src="/distros/screenshots/gnome3-thumb.jpg"
alt=" [带æGNOME 3 æ¡é¢çPureOS 8 GNU/Linuxåè¡çæªå¾] "
/></a></td>
@@ -511,7 +510,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/11/06 10:29:27 $
+$Date: 2019/11/06 12:28:56 $
<!-- timestamp end -->
</p>
Index: distros/free-distros.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/free-distros.zh-cn.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/free-distros.zh-cn.html 12 May 2019 04:59:43 -0000 1.10
+++ distros/free-distros.zh-cn.html 6 Nov 2019 12:28:57 -0000 1.11
@@ -105,7 +105,7 @@
ç³»ç»çä¸ä¸ªçº¯åè½æ§å
管çå¨ã </td></tr>
<tr class="even">
- <td class="icon"><a href="https://www.hyperbola.info/?gnu-free-stros-page";>
+ <td class="icon"><a href="https://www.hyperbola.info/";>
<img src="/graphics/distro-hyperbola.png" alt="Hyperbola" /></a></td>
<td>
Hyperbola GNU/Linux-libreï¼å®æ¯åºäºä¸æ³¨ç®çº¦çArch
GNU/Linuxåè¡ççé¿ææ¯æçã
@@ -276,7 +276,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/05/12 04:59:43 $
+$Date: 2019/11/06 12:28:57 $
<!-- timestamp end -->
</p>
Index: distros/po/free-distros.zh-cn-en.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.zh-cn-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/po/free-distros.zh-cn-en.html 12 May 2019 04:59:44 -0000
1.10
+++ distros/po/free-distros.zh-cn-en.html 6 Nov 2019 12:28:57 -0000
1.11
@@ -138,7 +138,7 @@
functional package manager for the GNU system. </td></tr>
<tr class="even">
- <td class="icon"><a href="https://www.hyperbola.info/?gnu-free-stros-page";>
+ <td class="icon"><a href="https://www.hyperbola.info/";>
<img src="/graphics/distro-hyperbola.png" alt="Hyperbola" /></a></td>
<td>
Hyperbola GNU/Linux-libre, a
@@ -336,7 +336,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/05/12 04:59:44 $
+$Date: 2019/11/06 12:28:57 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/free-distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.zh-cn.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- distros/po/free-distros.zh-cn.po 6 Nov 2019 11:59:14 -0000 1.31
+++ distros/po/free-distros.zh-cn.po 6 Nov 2019 12:28:57 -0000 1.32
@@ -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: 2019-11-05 23:55+0000\n"
#. type: Content of: <title>
msgid ""
Index: licenses/gpl-faq.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/gpl-faq.zh-cn.html 25 Aug 2019 04:29:10 -0000 1.3
+++ licenses/gpl-faq.zh-cn.html 6 Nov 2019 12:28:57 -0000 1.4
@@ -1,7 +1,7 @@
<!--#set var="ENGLISH_PAGE" value="/licenses/gpl-faq.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.90 -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>GNU许å¯è¯å¸¸è§é®é¢ - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
@@ -2141,7 +2141,7 @@
<td class="mok">å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-8">[8]</a></td>
<td class="mok">å¯ä»¥ï¼ç»åéµå¾ª LGPLv3 <a
href="#compat-matrix-footnote-4">[4]</a></td>
-<td class="ok">å¯ä»¥</td>
+<td class="mok">å¯ä»¥ï¼ç»åéµå¾ª LGPLv3</td>
</tr>
<tr class="gpl-matrix-use-type">
@@ -2304,7 +2304,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/08/25 04:29:10 $
+$Date: 2019/11/06 12:28:57 $
<!-- timestamp end -->
</p>
Index: licenses/po/gpl-faq.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/gpl-faq.zh-cn-en.html 25 Aug 2019 04:29:11 -0000 1.3
+++ licenses/po/gpl-faq.zh-cn-en.html 6 Nov 2019 12:28:57 -0000 1.4
@@ -1,5 +1,5 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.90 -->
<title>Frequently Asked Questions about the GNU Licenses
- GNU Project - Free Software Foundation</title>
<style type="text/css" media="screen">
@@ -3791,7 +3791,7 @@
<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
<td class="mok">OK: Combination is under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-8">[8]</a></td>
<td class="mok">OK: Combination is under LGPLv3 <a
href="#compat-matrix-footnote-4">[4]</a></td>
-<td class="ok">OK</td>
+<td class="mok">OK: Combination is under LGPLv3</td>
</tr>
<tr class="gpl-matrix-use-type">
@@ -3966,7 +3966,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/08/25 04:29:11 $
+$Date: 2019/11/06 12:28:57 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/gpl-faq.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.zh-cn.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- licenses/po/gpl-faq.zh-cn.po 6 Nov 2019 11:58:13 -0000 1.15
+++ licenses/po/gpl-faq.zh-cn.po 6 Nov 2019 12:28:57 -0000 1.16
@@ -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: 2019-11-05 08:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1299,8 +1298,8 @@
#. type: Content of: <dl><dt>
msgid ""
-"What does “GPL” stand for? <span class=\"anchor-reference-id"
-"\">(<a href=\"#WhatDoesGPLStandFor\" >#WhatDoesGPLStandFor</a>)</span>"
+"What does “GPL” stand for? <span class=\"anchor-reference-id\">"
+"(<a href=\"#WhatDoesGPLStandFor\" >#WhatDoesGPLStandFor</a>)</span>"
msgstr ""
"“GPL”代表ä»ä¹ï¼<span class=\"anchor-reference-id\">(<a href="
"\"#WhatDoesGPLStandFor\" >#WhatDoesGPLStandFor</a>)</span>"
@@ -1318,8 +1317,8 @@
#. type: Content of: <dl><dt>
msgid ""
-"Does free software mean using the GPL? <span class=\"anchor-reference-id"
-"\">(<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" "
+"Does free software mean using the GPL? <span class=\"anchor-reference-id\">"
+"(<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" "
">#DoesFreeSoftwareMeanUsingTheGPL</a>)</span>"
msgstr ""
"èªç±è½¯ä»¶æ¯ä¸æ¯å°±æå³çè¦ç¨GPLï¼<span
class=\"anchor-reference-id\">(<a href="
@@ -1414,8 +1413,8 @@
"\"anchor-reference-id\">(<a href=\"#ReportingViolation\" "
">#ReportingViolation</a>)</span>"
msgstr ""
-"å¦æåç°å¯è½è¿åGPLçæ
åµï¼æåºè¯¥æä¹åï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#ReportingViolation\" >#ReportingViolation</a>)</span>"
+"å¦æåç°å¯è½è¿åGPLçæ
åµï¼æåºè¯¥æä¹åï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#ReportingViolation\" >#ReportingViolation</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1541,8 +1540,8 @@
"\"#CanIDemandACopy\" >#CanIDemandACopy</a>)</span>"
msgstr ""
"å¦ææç¥éæ人æä¸ä»½GPL软件çæ·è´ï¼ææ¯å¦å¯ä»¥è¦æ±ä»ä»¬ç»æä¸ä»½ï¼<span
class="
-"\"anchor-reference-id\">(<a href=\"#CanIDemandACopy\" >#CanIDemandACopy</"
-"a>)</span>"
+"\"anchor-reference-id\">(<a href=\"#CanIDemandACopy\" >#CanIDemandACopy</a>)"
+"</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1651,8 +1650,8 @@
"language? <span class=\"anchor-reference-id\">(<a href=\"#TranslateCode\" "
">#TranslateCode</a>)</span>"
msgstr ""
-"GPL对æç¨åºæ¹åæå¦å¤çç¼ç¨è¯è¨æä¹è¯´ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#TranslateCode\" >#TranslateCode</a>)</span>"
+"GPL对æç¨åºæ¹åæå¦å¤çç¼ç¨è¯è¨æä¹è¯´ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#TranslateCode\" >#TranslateCode</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1866,8 +1865,8 @@
"agreement? <span class=\"anchor-reference-id\">(<a href="
"\"#DevelopChangesUnderNDA\" >#DevelopChangesUnderNDA</a>)</span>"
msgstr ""
-"GPLæ¯å¦å
许使ç¨ä¿å¯åè®®å¼åä¿®æ¹ç软件ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#DevelopChangesUnderNDA\" >#DevelopChangesUnderNDA</a>)</span>"
+"GPLæ¯å¦å
许使ç¨ä¿å¯åè®®å¼åä¿®æ¹ç软件ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#DevelopChangesUnderNDA\" >#DevelopChangesUnderNDA</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1986,8 +1985,8 @@
#. type: Content of: <dl><dt>
msgid ""
"Is it enough just to put a copy of the GNU GPL in my repository? <span class="
-"\"anchor-reference-id\">(<a href=\"#LicenseCopyOnly\" >#LicenseCopyOnly</"
-"a>)</span>"
+"\"anchor-reference-id\">(<a href=\"#LicenseCopyOnly\" >#LicenseCopyOnly</a>)"
+"</span>"
msgstr ""
"æGNU GPLçæ·è´æ¾å¨æç代ç
åºéæ¯ä¸æ¯å°±ç®åºç¨äºGPLï¼<span class=\"anchor-"
"reference-id\">(<a href=\"#LicenseCopyOnly\" >#LicenseCopyOnly</a>)</span>"
@@ -2267,8 +2266,8 @@
"\"anchor-reference-id\">(<a href=\"#SystemLibraryException"
"\">#SystemLibraryException</a>)</span>"
msgstr ""
-"ææ¯å¦å¯ä»¥ç¨ä¸æç³»ç»åºè¿æ¥ä¸ä¸ªGPLç¨åºï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#SystemLibraryException\">#SystemLibraryException</a>)</span>"
+"ææ¯å¦å¯ä»¥ç¨ä¸æç³»ç»åºè¿æ¥ä¸ä¸ªGPLç¨åºï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#SystemLibraryException\">#SystemLibraryException</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2302,8 +2301,8 @@
"software? <span class=\"anchor-reference-id\">(<a href=\"#GPLIncompatibleLibs"
"\" >#GPLIncompatibleLibs</a>)</span>"
msgstr ""
-"GPL软件使ç¨éGPLå
¼å®¹åºä¼æä»ä¹æ³å¾é®é¢ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#GPLIncompatibleLibs\" >#GPLIncompatibleLibs</a>)</span>"
+"GPL软件使ç¨éGPLå
¼å®¹åºä¼æä»ä¹æ³å¾é®é¢ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#GPLIncompatibleLibs\" >#GPLIncompatibleLibs</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2443,9 +2442,9 @@
#. type: Content of: <dl><dd><blockquote><p>
msgid ""
"Linking <var>[name of your program]</var> statically or dynamically with "
-"other modules is making a combined work based on <var>[name of your "
-"program]</var>. Thus, the terms and conditions of the GNU General Public "
-"License cover the whole combination."
+"other modules is making a combined work based on <var>[name of your program]"
+"</var>. Thus, the terms and conditions of the GNU General Public License "
+"cover the whole combination."
msgstr ""
"éææå¨ææ<var>[ä½ çç¨åºå称]</var>åå
¶ä»æ¨¡åè¿æ¥å¨ä¸èµ·å°±æ¯å¨<var>[ä½ çç¨åº"
"å称]</var>çåºç¡ä¸åå·¥ä½ãå æ¤ï¼GNUéç¨å
Œ
±è®¸å¯è¯çæ¡æ¬¾ä¼è¦çå°æ´ä¸ªå并çå·¥"
@@ -2456,18 +2455,18 @@
"In addition, as a special exception, the copyright holders of <var>[name of "
"your program]</var> give you permission to combine <var>[name of your "
"program]</var> with free software programs or libraries that are released "
-"under the GNU LGPL and with code included in the standard release of "
-"<var>[name of library]</var> under the <var>[name of library's license]</"
-"var> (or modified versions of such code, with unchanged license). You may "
-"copy and distribute such a system following the terms of the GNU GPL for "
-"<var>[name of your program]</var> and the licenses of the other code "
-"concerned{, provided that you include the source code of that other code "
-"when and as the GNU GPL requires distribution of source code}."
+"under the GNU LGPL and with code included in the standard release of <var>"
+"[name of library]</var> under the <var>[name of library's license]</var> (or "
+"modified versions of such code, with unchanged license). You may copy and "
+"distribute such a system following the terms of the GNU GPL for <var>[name "
+"of your program]</var> and the licenses of the other code concerned{, "
+"provided that you include the source code of that other code when and as the "
+"GNU GPL requires distribution of source code}."
msgstr ""
"å¦å¤ï¼ä½ä¸ºä¸ä¸ªç¹ä¾ï¼<var>[ä½
ç¨åºçå称]</var>ççæææè
èµäºä½ æ<var>[ä½ ç¨åº"
-"çå称]</var>åèªç±è½¯ä»¶ææç
§GNU
LGPLåå¸çåºå并çæå©ï¼å
¶ä¸<var>[åºçå"
-"称]</var>æ ååå¸ä»£ç 使ç¨<var>[åºç许å¯è¯]</var>ï¼æè
该代ç çä¿®æ¹çï¼è®¸å¯è¯"
-"ä¸åï¼ãä½ å¯ä»¥å¤å¶ååå¸è¯¥ç³»ç»ï¼å
¶è®¸å¯è¯æ¡æ¬¾æ¯<var>[ä½
ç¨åºçå称]</var>使ç¨ç"
+"çå称]</var>åèªç±è½¯ä»¶ææç
§GNU
LGPLåå¸çåºå并çæå©ï¼å
¶ä¸<var>[åºçå称]"
+"</var>æ ååå¸ä»£ç 使ç¨<var>[åºç许å¯è¯]</var>ï¼æè
该代ç
çä¿®æ¹çï¼è®¸å¯è¯ä¸"
+"åï¼ãä½ å¯ä»¥å¤å¶ååå¸è¯¥ç³»ç»ï¼å
¶è®¸å¯è¯æ¡æ¬¾æ¯<var>[ä½
ç¨åºçå称]</var>使ç¨ç"
"GNU GPL许å¯è¯åå
¶ä»ä»£ç {, åå®ä½ æç
§GNU GPLçåå¸è¦æ±å
å«äºå
¶ä»ç¨åºçæºä»£ç }"
"使ç¨çç¸å
³è®¸å¯è¯ã"
@@ -2624,8 +2623,8 @@
msgid ""
"I would like to release a program I wrote under the GNU GPL, but I would "
"like to use the same code in nonfree programs. <span class=\"anchor-"
-"reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</"
-"a>)</span>"
+"reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</a>)"
+"</span>"
msgstr ""
"ææ¿æææåçç¨åºæç
§GNU
GPLåå¸ï¼ä½æ¯æä¹æ³å¨éèªç±è½¯ä»¶é使ç¨åæ ·ç代ç ã"
"<span class=\"anchor-reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" "
@@ -2935,8 +2934,8 @@
"class=\"anchor-reference-id\">(<a href=\"#WhatCaseIsOutputGPL\" "
">#WhatCaseIsOutputGPL</a>)</span>"
msgstr ""
-"ä»ä¹æ
åµä¸GPL软件çè¾åºé¨åä¹è¦éµå¾ªGPLï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#WhatCaseIsOutputGPL\" >#WhatCaseIsOutputGPL</a>)</span>"
+"ä»ä¹æ
åµä¸GPL软件çè¾åºé¨åä¹è¦éµå¾ªGPLï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#WhatCaseIsOutputGPL\" >#WhatCaseIsOutputGPL</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3543,8 +3542,8 @@
"href=\"#MereAggregation\" >#MereAggregation</a>)</span>"
msgstr ""
"“èåç”åå
¶ä»“ä¿®æ¹ç”æä»ä¹ä¸åï¼<span class="
-"\"anchor-reference-id\">(<a href=\"#MereAggregation\" >#MereAggregation</"
-"a>)</span>"
+"\"anchor-reference-id\">(<a href=\"#MereAggregation\" >#MereAggregation</a>)"
+"</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3623,8 +3622,8 @@
"\"#AssignCopyright\" >#AssignCopyright</a>)</span>"
msgstr ""
"为ä»ä¹FSFè¦æ±å¯¹FSFæçæ软件çè´¡ç®è
æçæèµäºFSFï¼å¦æææGPL软件ççæï¼æ"
-"ä¹éè¦è¿æ ·ååï¼å¦æéè¦ï¼æåºè¯¥æä¹åï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#AssignCopyright\" >#AssignCopyright</a>)</span>"
+"ä¹éè¦è¿æ ·ååï¼å¦æéè¦ï¼æåºè¯¥æä¹åï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#AssignCopyright\" >#AssignCopyright</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3733,8 +3732,8 @@
"href=\"#GPLCommercially\" >#GPLCommercially</a>)</span>"
msgstr ""
"å¦ææéè¿GNU
GPLè·å¾äºä¸ä¸ªè½¯ä»¶ï¼é£ä¹ææ¯å¦å¯ä»¥ä¿®æ¹è¯¥è½¯ä»¶ç代ç
ï¼æå®åæä¸ä¸ª"
-"æ°çç¨åºï¼ç¶ååæç
§åä¸ç¨åºåè¡åéå®ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#GPLCommercially\" >#GPLCommercially</a>)</span>"
+"æ°çç¨åºï¼ç¶ååæç
§åä¸ç¨åºåè¡åéå®ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#GPLCommercially\" >#GPLCommercially</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3757,8 +3756,8 @@
#. type: Content of: <dl><dt>
msgid ""
"Can I use the GPL for something other than software? <span class=\"anchor-"
-"reference-id\">(<a href=\"#GPLOtherThanSoftware\" >#GPLOtherThanSoftware</"
-"a>)</span>"
+"reference-id\">(<a href=\"#GPLOtherThanSoftware\" >#GPLOtherThanSoftware</a>)"
+"</span>"
msgstr ""
"GPLå¯ä»¥ä¸ç¨äºè½¯ä»¶åï¼<span class=\"anchor-reference-id\">(<a href="
"\"#GPLOtherThanSoftware\" >#GPLOtherThanSoftware</a>)</span>"
@@ -3939,11 +3938,11 @@
#. type: Content of: <dl><dt>
msgid ""
"Where can I learn more about the GCC Runtime Library Exception? <span class="
-"\"anchor-reference-id\">(<a href=\"#LibGCCException\" >#LibGCCException</"
-"a>)</span>"
+"\"anchor-reference-id\">(<a href=\"#LibGCCException\" >#LibGCCException</a>)"
+"</span>"
msgstr ""
-"åªéå¯ä»¥äºè§£æ´å¤å
³äºGCCè¿è¡åºä¾å¤ç详æ
ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#LibGCCException\" >#LibGCCException</a>)</span>"
+"åªéå¯ä»¥äºè§£æ´å¤å
³äºGCCè¿è¡åºä¾å¤ç详æ
ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#LibGCCException\" >#LibGCCException</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4063,8 +4062,8 @@
"only? <span class=\"anchor-reference-id\">(<a href=\"#ModifiedJustBinary\" "
">#ModifiedJustBinary</a>)</span>"
msgstr ""
-"æå¯å¦åªåå¸GPLç¨åºä¿®æ¹ççäºè¿å¶å½¢å¼ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#ModifiedJustBinary\" >#ModifiedJustBinary</a>)</span>"
+"æå¯å¦åªåå¸GPLç¨åºä¿®æ¹ççäºè¿å¶å½¢å¼ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#ModifiedJustBinary\" >#ModifiedJustBinary</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4401,8 +4400,8 @@
"\"#InternalDistribution\" >#InternalDistribution</a>)</span>"
msgstr ""
"å¨ç»ç»æå
¬å¸å
é¨ä½¿ç¨æ¯ä¸æ¯“åå¸”ï¼ <span
class=\"anchor-"
-"reference-id\">(<a href=\"#InternalDistribution\" >#InternalDistribution</"
-"a>)</span>"
+"reference-id\">(<a href=\"#InternalDistribution\" >#InternalDistribution</a>)"
+"</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4510,8 +4509,8 @@
"\"#WhySomeGPLAndNotLGPL\" >#WhySomeGPLAndNotLGPL</a>)</span>"
msgstr ""
"为ä»ä¹æäºGNUåºæ¯æç
§æ®éçGPLåå¸ï¼èä¸æ¯æç
§LGPLåå¸ï¼<span class=\"anchor-"
-"reference-id\">(<a href=\"#WhySomeGPLAndNotLGPL\" >#WhySomeGPLAndNotLGPL</"
-"a>)</span>"
+"reference-id\">(<a href=\"#WhySomeGPLAndNotLGPL\" >#WhySomeGPLAndNotLGPL</a>)"
+"</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4730,11 +4729,11 @@
#. type: Content of: <dl><dt>
msgid ""
-"Why don't you use the GPL for manuals? <span class=\"anchor-reference-id"
-"\">(<a href=\"#WhyNotGPLForManuals\" >#WhyNotGPLForManuals</a>)</span>"
+"Why don't you use the GPL for manuals? <span class=\"anchor-reference-id\">"
+"(<a href=\"#WhyNotGPLForManuals\" >#WhyNotGPLForManuals</a>)</span>"
msgstr ""
-"WhyNotGPLForManuals\">为ä»ä¹æåä¸ç¨GPLï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#WhyNotGPLForManuals\" >#WhyNotGPLForManuals</a>)</span>"
+"WhyNotGPLForManuals\">为ä»ä¹æåä¸ç¨GPLï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#WhyNotGPLForManuals\" >#WhyNotGPLForManuals</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4846,8 +4845,8 @@
msgstr ""
"æå¨ç¼åä¸ä¸ªç½ç«ç»´æ¤ç³»ç»ï¼æ人称ä¹ä¸º“<a
href=\"/philosophy/words-to-"
"avoid.html#Content\">å
容管çç³»ç»</a>”ï¼ï¼æè
æ¯å
¶ä»éè¿æ¨¡æ¿å建ç½é¡µç"
-"åºç¨ãè¿äºæ¨¡æ¿åºè¯¥ä½¿ç¨ä»ä¹æ ·ç许å¯è¯å¢ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#WMS\" >#WMS</a>)</span>"
+"åºç¨ãè¿äºæ¨¡æ¿åºè¯¥ä½¿ç¨ä»ä¹æ ·ç许å¯è¯å¢ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#WMS\" >#WMS</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4917,8 +4916,8 @@
"<span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
">#NonFreeTools</a>)</span>"
msgstr ""
-"æè½å¦æç¨ä¸æå·¥å
·å¼åç软件æç
§GPLææï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#NonFreeTools\" >#NonFreeTools</a>)</span>"
+"æè½å¦æç¨ä¸æå·¥å
·å¼åç软件æç
§GPLææï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#NonFreeTools\" >#NonFreeTools</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -5151,8 +5150,8 @@
#. type: Content of: <dl><dt>
msgid ""
-"Who has the power to enforce the GPL? <span class=\"anchor-reference-id"
-"\">(<a href=\"#WhoHasThePower\" >#WhoHasThePower</a>)</span>"
+"Who has the power to enforce the GPL? <span class=\"anchor-reference-id\">"
+"(<a href=\"#WhoHasThePower\" >#WhoHasThePower</a>)</span>"
msgstr ""
"è°å¯ä»¥è¿è¡GPLæ§æ³ï¼<span class=\"anchor-reference-id\">(<a href="
"\"#WhoHasThePower\" >#WhoHasThePower</a>)</span>"
@@ -5179,8 +5178,8 @@
">#OOPLang</a>)</span>"
msgstr ""
"å¨ä¸ä¸ªé¢å对象çè¯è¨ï¼æ¯å¦Javaä¸ï¼å¦ææä¸å
ä¿®æ¹å°ä½¿ç¨äºä¸ä¸ªGPLç±»ï¼å¹¶åæäºå"
-"ç±»ï¼é£ä¹GPLä¼å¯¹æ´å¤§èå´çç¨åºæä»ä¹å½±åï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#OOPLang\" >#OOPLang</a>)</span>"
+"ç±»ï¼é£ä¹GPLä¼å¯¹æ´å¤§èå´çç¨åºæä»ä¹å½±åï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#OOPLang\" >#OOPLang</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -5486,8 +5485,8 @@
"\">(<a href=\"#SubscriptionFee\" >#SubscriptionFee</a>)</span>"
msgstr ""
"ææ¯å¦å¯ä»¥å¨ä¸ä¸ªç¨æ·ä¸ç»§ç»ä»è´¹å°±ä¸åå·¥ä½ç设å¤ä¸ä½¿ç¨GPL软件ï¼<span
class="
-"\"anchor-reference-id\">(<a href=\"#SubscriptionFee\" >#SubscriptionFee</"
-"a>)</span>"
+"\"anchor-reference-id\">(<a href=\"#SubscriptionFee\" >#SubscriptionFee</a>)"
+"</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -5540,8 +5539,8 @@
"How does GPLv3 make BitTorrent distribution easier? <span class=\"anchor-"
"reference-id\">(<a href=\"#BitTorrent\" >#BitTorrent</a>)</span>"
msgstr ""
-"GPLv3æ¯ææ ·è®©BitTorrentåè¡åå¾æ´å®¹æçï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#BitTorrent\" >#BitTorrent</a>)</span>"
+"GPLv3æ¯ææ ·è®©BitTorrentåè¡åå¾æ´å®¹æçï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#BitTorrent\" >#BitTorrent</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -5586,8 +5585,8 @@
"What is tivoization? How does GPLv3 prevent it? <span class=\"anchor-"
"reference-id\">(<a href=\"#Tivoization\" >#Tivoization</a>)</span>"
msgstr ""
-"tivoizationæçæ¯ä»ä¹ï¼GPLv3å¦ä½ç¦æ¢å®ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#Tivoization\" >#Tivoization</a>)</span>"
+"tivoizationæçæ¯ä»ä¹ï¼GPLv3å¦ä½ç¦æ¢å®ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#Tivoization\" >#Tivoization</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -5645,8 +5644,8 @@
#. type: Content of: <dl><dt>
msgid ""
-"Can I use the GPL to license hardware? <span class=\"anchor-reference-id"
-"\">(<a href=\"#GPLHardware\" >#GPLHardware</a>)</span>"
+"Can I use the GPL to license hardware? <span class=\"anchor-reference-id\">"
+"(<a href=\"#GPLHardware\" >#GPLHardware</a>)</span>"
msgstr ""
"è½å¦ç¨GPLä½ä¸ºç¡¬ä»¶è®¸å¯è¯ï¼<span class=\"anchor-reference-id\">(<a
href="
"\"#GPLHardware\" >#GPLHardware</a>)</span>"
@@ -5987,8 +5986,8 @@
#. type: Content of: <dl><dt>
msgid ""
"If I distribute a GPLv3-covered program, can I provide a warranty that is "
-"voided if the user modifies the program? <span class=\"anchor-reference-id"
-"\">(<a href=\"#v3ConditionalWarranty\" >#v3ConditionalWarranty</a>)</span>"
+"voided if the user modifies the program? <span class=\"anchor-reference-id\">"
+"(<a href=\"#v3ConditionalWarranty\" >#v3ConditionalWarranty</a>)</span>"
msgstr ""
"å¦ææåå¸GPLv3ç¨åºï¼ææ¯å¦å¯ä»¥è¯´å¦æç¨æ·ä¿®æ¹è¯¥ç¨åºï¼é£ä¹å®åä¿é就失æã"
"<span class=\"anchor-reference-id\">(<a href=\"#v3ConditionalWarranty\" "
@@ -6228,8 +6227,8 @@
"\"#SourceInCVS\" >#SourceInCVS</a>)</span>"
msgstr ""
"å¦ææå¨FTPæå¡å¨ä¸åå¸äºè¿å¶èåæ¶æä¾äºæºä»£ç
ççæ¬æ§å¶åºé¾æ¥ï¼æ¯å¦æ¯CVSæ"
-"Subversionï¼é£ä¹ææ¯å¦ä¹æ¯éµå®äºGPLv3ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#SourceInCVS\" >#SourceInCVS</a>)</span>"
+"Subversionï¼é£ä¹ææ¯å¦ä¹æ¯éµå®äºGPLv3ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#SourceInCVS\" >#SourceInCVS</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -6694,13 +6693,13 @@
"OK: Combination is under GPLv2 or later <a href=\"#compat-matrix-"
"footnote-7\">[7]</a>"
msgstr ""
-"å¯ä»¥ï¼ç»åéµå¾ª GPLv2 æè
å
¶ä»¥åç <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a>"
+"å¯ä»¥ï¼ç»åéµå¾ª GPLv2 æè
å
¶ä»¥åç <a
href=\"#compat-matrix-footnote-7\">"
+"[7]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-8\">[8]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-8\">[8]"
+"</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-8\">[8]</a>"
@@ -6710,15 +6709,15 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-3\">[3]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-3\">[3]"
+"</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-3\">[3]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-7\">[7]"
+"</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-7\">[7]</a>"
@@ -6727,8 +6726,8 @@
"OK: Convey copied code under GPLv2 <a href=\"#compat-matrix-"
"footnote-7\">[7]</a>"
msgstr ""
-"å¯ä»¥ï¼æç
§ GPLv2 è¾éå¤å¶ç代ç <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a>"
+"å¯ä»¥ï¼æç
§ GPLv2 è¾éå¤å¶ç代ç <a
href=\"#compat-matrix-footnote-7\">"
+"[7]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
@@ -6755,16 +6754,16 @@
"OK: Convey copied code under GPLv3 <a href=\"#compat-matrix-"
"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
msgstr ""
-"å¯ä»¥ï¼æç
§ GPLv3 è¾éå¤å¶ç代ç <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
+"å¯ä»¥ï¼æç
§ GPLv3 è¾éå¤å¶ç代ç <a
href=\"#compat-matrix-footnote-7\">"
+"[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
"OK: Convey copied code under GPLv2 <a href=\"#compat-matrix-"
"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-1\">[1]</a>"
msgstr ""
-"å¯ä»¥ï¼æç
§ GPLv2 è¾éå¤å¶ç代ç <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-1\">[1]</a>"
+"å¯ä»¥ï¼æç
§ GPLv2 è¾éå¤å¶ç代ç <a
href=\"#compat-matrix-footnote-7\">"
+"[7]</a><a href=\"#compat-matrix-footnote-1\">[1]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
@@ -6784,24 +6783,24 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-8\">[8]</a><a href=\"#compat-matrix-footnote-3\">[3]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-8\">[8]"
+"</a><a href=\"#compat-matrix-footnote-3\">[3]</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-8\">[8]</a><a "
"href=\"#compat-matrix-footnote-3\">[3]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-7\">[7]"
+"</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-7\">[7]</a><a "
"href=\"#compat-matrix-footnote-8\">[8]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under LGPLv3 <a href=\"#compat-matrix-"
-"footnote-4\">[4]</a>"
+"OK: Combination is under LGPLv3 <a href=\"#compat-matrix-footnote-4\">"
+"[4]</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª LGPLv3 <a
href=\"#compat-matrix-footnote-4\">[4]</a>"
@@ -6815,8 +6814,8 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-9\">[9]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-9\">[9]"
+"</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-9\">[9]</a>"
@@ -6991,8 +6990,8 @@
#~ "footnote-7\">[7]</a>"
#~ msgid ""
-#~ "OK: Convey code under GPLv3 <a href=\"#compat-matrix-"
-#~ "footnote-7\">[7]</a>"
+#~ "OK: Convey code under GPLv3 <a href=\"#compat-matrix-footnote-7\">[7]"
+#~ "</a>"
#~ msgstr ""
#~ "å¯ä»¥ï¼æç
§ GPLv3 è¾é代ç <a
href=\"#compat-matrix-footnote-7\">[7]</"
#~ "a>"
Index: people/past-webmasters.zh-cn.html
===================================================================
RCS file: /web/www/www/people/past-webmasters.zh-cn.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- people/past-webmasters.zh-cn.html 27 Oct 2019 23:59:32 -0000 1.34
+++ people/past-webmasters.zh-cn.html 6 Nov 2019 12:28:57 -0000 1.35
@@ -269,7 +269,7 @@
<dd>GNUå·¥ç¨çåèµ·è
ãèªç±è½¯ä»¶åºéä¼çååè
ãä»ä¹ä¸ºç½ç«å·¥ä½ã</dd>
- <dt><strong><a href="https://rob.m.usi.al";>Robert Musial</a>
</strong> <a
+ <dt><strong><a href="https://rmusial.com";>Robert Musial</a>
</strong> <a
href="mailto:address@hidden";><rmmm<b>@</b>gnu.org> </a></dt>
<dd><a href="/">GNU</a>ç½ç®¡ï¼èª2003å¹´å°±æ¯<a
href="http://www.fsf.org/";>FSF</a>ç<a
@@ -379,7 +379,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/10/27 23:59:32 $
+$Date: 2019/11/06 12:28:57 $
<!-- timestamp end -->
</p>
Index: people/po/past-webmasters.zh-cn-en.html
===================================================================
RCS file: /web/www/www/people/po/past-webmasters.zh-cn-en.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- people/po/past-webmasters.zh-cn-en.html 27 Oct 2019 23:59:33 -0000
1.32
+++ people/po/past-webmasters.zh-cn-en.html 6 Nov 2019 12:28:57 -0000
1.33
@@ -349,7 +349,7 @@
<dd>Founded the GNU Project and the Free Software Foundation.
He also works on the web pages.</dd>
- <dt><strong><a href="https://rob.m.usi.al";>Robert Musial</a>
+ <dt><strong><a href="https://rmusial.com";>Robert Musial</a>
</strong>
<a href="mailto:address@hidden";><rmmm<b>@</b>gnu.org>
</a></dt>
@@ -456,7 +456,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/10/27 23:59:33 $
+$Date: 2019/11/06 12:28:57 $
<!-- timestamp end -->
</p>
</div>
Index: people/po/past-webmasters.zh-cn.po
===================================================================
RCS file: /web/www/www/people/po/past-webmasters.zh-cn.po,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- people/po/past-webmasters.zh-cn.po 6 Nov 2019 11:58:40 -0000 1.114
+++ people/po/past-webmasters.zh-cn.po 6 Nov 2019 12:28:57 -0000 1.115
@@ -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: 2019-11-03 04:25+0000\n"
#. type: Content of: <title>
msgid "GNU's Webmasters - GNU Project - Free Software Foundation"
Index: po/home.zh-cn-en.html
===================================================================
RCS file: /web/www/www/po/home.zh-cn-en.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po/home.zh-cn-en.html 5 Nov 2019 18:29:43 -0000 1.26
+++ po/home.zh-cn-en.html 6 Nov 2019 12:28:58 -0000 1.27
@@ -2,7 +2,7 @@
<!-- Parent-Version: 1.86 -->
<!--#if expr="$QUERY_STRING = /distro=([^&#]+)/"
--><!--#set var="DISTRO" value="$1"
---><!--#else --><!--#set var="DISTRO" value="trisquel8"
+--><!--#else --><!--#set var="DISTRO" value="trisquel"
--><!--#endif -->
<title>The GNU Operating System and the Free Software Movement</title>
@@ -57,7 +57,6 @@
padding-bottom: .2em;
}
.thumbs td {
- width: 33.3%;
vertical-align: top;
padding: .1em;
border: 0;
@@ -202,15 +201,15 @@
<a href="/distros/free-distros.html">Try GNU/Linux</a></p>
<div style="clear: left"></div>
-<div id="gnu-linux"><!--#if expr="$DISTRO = trisquel8" -->
+<div id="gnu-linux"><!--#if expr="$DISTRO = dragora" -->
<div class="screenshot">
- <a href="/distros/screenshots/trisquel8-mate.jpg"><img
- src="/distros/screenshots/trisquel8-mate-medium.jpg"
- alt=" [Screenshot of Trisquel 8 with MATE desktop] " /></a>
-</div>
-<p><small><a href="https://trisquel.info";>Trisquel 8</a> with <a
-href="https://mate-desktop.org/";>MATE</a> desktop, Abrowser (web browser),
-and Inkscape (vector graphics editor)</small></p><!--#endif
+ <a href="/distros/screenshots/dragora-ice.png"><img
+ src="/distros/screenshots/dragora-ice.png"
+ alt=" [Screenshot of Dragora 3.0-beta1 with IceWM window
manager] " /></a>
+</div>
+<p><small><a href="https://dragora.org/en/index.html";>
+Dragora 3.0-beta1</a> with customized <a href="https://ice-wm.org/";>
+IceWM</a> window manager</small></p><!--#endif
--><!--#if expr="$DISTRO = guix" -->
<div class="screenshot">
<a href="/distros/screenshots/guixSD-gnome3.jpg"><img
@@ -220,7 +219,17 @@
<p><small><a href="/software/guix/">Guix 0.15</a> with <a
href="https://www.gnome.org/";>GNOME 3</a> desktop, Epiphany web
browser, Totem video player, and GNOME terminal emulator</small></p><!--#endif
---><!--#if expr="$DISTRO = pureos8" -->
+--><!--#if expr="$DISTRO = hyperbola" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/hyperbola-i3.png"><img
+ src="/distros/screenshots/hyperbola-i3.png"
+ alt=" [Screenshot of Hyperbola with i3 window manager] " /></a>
+</div>
+<p><small><a href="https://www.hyperbola.info/?gnu-free-stros-page";>
+Hyperbola 0.3</a> with <a href="https://i3wm.org/";>i3 window manager</a>,
+cool-retro-term (terminal emulator), Gimp (image editor), and Iceweasel-UXP
(web
+browser)</small></p><!--#endif
+--><!--#if expr="$DISTRO = pureos" -->
<div class="screenshot">
<a href="/distros/screenshots/pureos8-gnome3.jpg"><img
src="/distros/screenshots/gnome3-medium.jpg"
@@ -228,27 +237,44 @@
</div>
<p><small><a href="https://www.pureos.net/";>PureOS 8</a> with <a
href="https://www.gnome.org/";>GNOME 3</a> desktop,
-PureBrowser (web browser), and Gimp (image editor)</small></p><!--#endif -->
+PureBrowser (web browser), and Gimp (image editor)</small></p><!--#endif
+--><!--#if expr="$DISTRO = trisquel" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/trisquel8-mate.jpg"><img
+ src="/distros/screenshots/trisquel8-mate-medium.jpg"
+ alt=" [Screenshot of Trisquel 8 with MATE desktop] " /></a>
+</div>
+<p><small><a href="https://trisquel.info";>Trisquel 8</a> with <a
+href="https://mate-desktop.org/";>MATE</a> desktop, Abrowser (web browser),
+and Inkscape (vector graphics editor)</small></p><!--#endif -->
+</div>
<table class="thumbs">
<tr class="image">
- <td><a href="/home.html?distro=trisquel8#gnu-linux"><img
- src="/distros/screenshots/trisquel8-mate-thumb.jpg"
- alt=" [Screenshot of Trisquel 8 with MATE desktop] "
/></a></td>
+ <td><a href="/home.html?distro=dragora#gnu-linux"><img
+ src="/distros/screenshots/dragora-ice-thumb.jpg"
+ alt=" [Screenshot of Dragora 3.0-beta1 with IceWM window
manager] " /></a></td>
<td><a href="/home.html?distro=guix#gnu-linux"><img
src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
- alt=" [Screenshot of GuixSD 0.15 with GNOME 3
desktop] " /></a></td>
- <td><a href="/home.html?distro=pureos8#gnu-linux"><img
+ alt=" [Screenshot of Guix 0.15 with GNOME 3 desktop] "
/></a></td>
+ <td><a href="/home.html?distro=hyperbola#gnu-linux"><img
+ src="/distros/screenshots/hyperbola-i3-thumb.jpg"
+ alt=" [Screenshot of Hyperbola 0.3 with i3 window manager] "
/></a></td>
+ <td><a href="/home.html?distro=pureos#gnu-linux"><img
src="/distros/screenshots/gnome3-thumb.jpg"
alt=" [Screenshot of PureOS 8 with GNOME 3 desktop] "
/></a></td>
+ <td><a href="/home.html?distro=trisquel#gnu-linux"><img
+ src="/distros/screenshots/trisquel8-mate-thumb.jpg"
+ alt=" [Screenshot of Trisquel 8 with MATE desktop] "
/></a></td>
</tr>
<tr class="caption">
- <td><small>Trisquel 8 & MATE</small></td>
- <td><small>Guix & GNOME 3</small></td>
- <td><small>PureOS 8 & GNOME 3</small></td>
+ <td><small>Dragora / IceWM</small></td>
+ <td><small>Guix / GNOME3</small></td>
+ <td><small>Hyperbola / i3</small></td>
+ <td><small>PureOS / GNOME3</small></td>
+ <td><small>Trisquel / MATE</small></td>
</tr>
</table>
-</div>
<p class="button btn-right">
... or <a
@@ -499,7 +525,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/11/05 18:29:43 $
+$Date: 2019/11/06 12:28:58 $
<!-- timestamp end -->
</p>
</div>
Index: po/home.zh-cn.po
===================================================================
RCS file: /web/www/www/po/home.zh-cn.po,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -b -r1.336 -r1.337
--- po/home.zh-cn.po 6 Nov 2019 11:57:39 -0000 1.336
+++ po/home.zh-cn.po 6 Nov 2019 12:28:58 -0000 1.337
@@ -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: 2019-11-06 10:25+0000\n"
#. type: Content of: <title>
msgid "The GNU Operating System and the Free Software Movement"
@@ -138,10 +137,10 @@
"a>, cool-retro-term (terminal emulator), Gimp (image editor), and Iceweasel-"
"UXP (web browser)</small>"
msgstr ""
-"<small>带æ <a href=\"https://i3wm.org/\";>i3
çªå£ç®¡çå¨</a>ãcool-retro-"
-"termï¼ç»ç«¯æ¨¡æå¨ï¼ãGimpï¼å¾åç¼è¾å¨ï¼å
Iceweasel-UXPï¼ç½ç»æµè§å¨ï¼ç<a "
-"href=\"https://www.hyperbola.info/?gnu-free-stros-page\";> "
-"Hyperbola 0.3</a></small>"
+"<small>带æ <a href=\"https://i3wm.org/\";>i3
çªå£ç®¡çå¨</a>ãcool-retro-term"
+"ï¼ç»ç«¯æ¨¡æå¨ï¼ãGimpï¼å¾åç¼è¾å¨ï¼å
Iceweasel-UXPï¼ç½ç»æµè§å¨ï¼ç<a href="
+"\"https://www.hyperbola.info/?gnu-free-stros-page\";> Hyperbola 0.3</a></"
+"small>"
#. type: Content of: <div><div><div><div><a>
msgid "<a href=\"/distros/screenshots/pureos8-gnome3.jpg\">"
@@ -150,8 +149,8 @@
#. type: Attribute 'alt' of: <div><div><table><tr><td><a><img>
msgid " [Screenshot of PureOS 8 with GNOME 3 desktop] "
msgstr ""
-" [带æGNOME 3 æ¡é¢çPureOS 8 GNU/Linuxåè¡çæª"
-"å¾] "
+" [带æGNOME 3 æ¡é¢çPureOS 8 GNU/Linuxåè¡çæªå¾]"
+" "
#. type: Content of: <div><div><div><p>
msgid ""
@@ -686,8 +685,8 @@
#~ msgid ""
#~ " [Screenshot of Trisquel 7 with Gnome Classic desktop] "
#~ msgstr ""
-#~ " [带Gnome Classicæ¡é¢çTrisquel 7 GNU/Linuxåè¡çæª"
-#~ "å¾] "
+#~ " [带Gnome
Classicæ¡é¢çTrisquel 7 GNU/Linuxåè¡çæªå¾]"
+#~ " "
#~ msgid "<a href=\"/distros/screenshot.html\">"
#~ msgstr "<a href=\"/distros/screenshot.html\">"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www home.zh-cn.html distros/free-distros.zh-cn....,
GNUN <=