[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www distros/common-distros.zh-cn.html distros/p...
|
From: |
GNUN |
|
Subject: |
www distros/common-distros.zh-cn.html distros/p... |
|
Date: |
Sun, 2 Dec 2018 04:58:03 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 18/12/02 04:58:03
Modified files:
distros : common-distros.zh-cn.html
distros/po : common-distros.zh-cn-en.html
common-distros.zh-cn.po
doc : other-free-books.zh-cn.html
doc/po : other-free-books.zh-cn-en.html
other-free-books.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.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-cn-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-cn.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/other-free-books.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/po/other-free-books.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/po/other-free-books.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7
Patches:
Index: distros/common-distros.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/common-distros.zh-cn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- distros/common-distros.zh-cn.html 19 Sep 2018 12:57:29 -0000 1.6
+++ distros/common-distros.zh-cn.html 2 Dec 2018 09:58:03 -0000 1.7
@@ -124,7 +124,7 @@
href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui";>é¾ä»¥å辨åªäºæ¯èªç±è½¯ä»¶</a>ï¼å
为å
è´¹ä¸è½½çä¸å±è½¯ä»¶è´´ç“èªç±ï¼freeï¼”çæ
ç¾ã</p>
<p>Ubuntu<a
-href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>æ¾ç¶å
许以å
¶åæ åå¸å®å
¨ä¸æ
·çåä¸æ·è´</a>ï¼åªæä¿®æ¹è¿ççæ¬æéè¦å»é¤å
¶åæ
ãè¿ä¸ªåæ
æ¿çå¯ä»¥æ¥åãå¨åä¸é¡µé¢ï¼å¾ä¸çï¼å¯ä»¥çå°å«ç³ä¸æç“Ubuntuä¸å©”声æï¼èå®å¹¶æªå°±ä»¥ä¸æ¯å¦ææä¾µæç»åºè¯¦å°½ç说æã</p>
+href="http://www.ubuntu.com/legal/intellectual-property-policy#your-use-of-ubuntu";>æ¾ç¶å
许以å
¶åæ åå¸å®å
¨ä¸æ
·çåä¸æ·è´</a>ï¼åªæä¿®æ¹è¿ççæ¬æéè¦å»é¤å
¶åæ
ãè¿ä¸ªåæ
æ¿çå¯ä»¥æ¥åãå¨åä¸é¡µé¢ï¼å¾ä¸çï¼å¯ä»¥çå°å«ç³ä¸æç“Ubuntuä¸å©”声æï¼èå®å¹¶æªå°±ä»¥ä¸æ¯å¦ææä¾µæç»åºè¯¦å°½ç说æã</p>
<p>该页é¢éè¿ä½¿ç¨<a
href="/philosophy/not-ipr.html">“ç¥è¯äº§ææå©”</a>è¿ä¸è¯¯å¯¼æ§æ¯è¯æ£å¸æ··ä¹±ï¼é误å°å设åæ
æ³ãä¸å©æ³åå
¶ä»ä¸äºæ³å¾å±äºåä¸æ¦å¿µæ§æ¡æ¶ã使ç¨è¯¥æ¯è¯æ¯æ害çï¼æ²¡æä¾å¤ï¼æ以é¤äºå¼ç¨å«äººå¯¹è¯¥æ¯è¯ç使ç¨ä¹å¤ï¼æ们åºè¯¥æç»ä½¿ç¨å®ãä½æ¯ï¼è¿å¹¶ä¸æ¯Ubuntuä½ä¸ºä¸ä¸ªGNU/Linuxåè¡çç主è¦é®é¢ã</p>
@@ -239,7 +239,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2018/09/19 12:57:29 $
+$Date: 2018/12/02 09:58:03 $
<!-- 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- distros/po/common-distros.zh-cn-en.html 19 Sep 2018 12:57:29 -0000
1.6
+++ distros/po/common-distros.zh-cn-en.html 2 Dec 2018 09:58:03 -0000
1.7
@@ -205,7 +205,7 @@
to tell which ones are free</a> since proprietary programs for
download at no charge are labelled “free”.</p>
-<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
+<p>Ubuntu <a
href="https://www.ubuntu.com/legal/intellectual-property-policy#your-use-of-ubuntu";>appears
to permit commercial redistribution of exact copies with the
trademarks</a>; removal of the trademarks is required only for
modified versions. That is an acceptable policy for trademarks. The
@@ -344,7 +344,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/09/19 12:57:29 $
+$Date: 2018/12/02 09:58:03 $
<!-- 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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- distros/po/common-distros.zh-cn.po 2 Dec 2018 09:33:51 -0000 1.17
+++ distros/po/common-distros.zh-cn.po 2 Dec 2018 09:58:03 -0000 1.18
@@ -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-12-01 18:26+0000\n"
#. type: Content of: <title>
msgid ""
@@ -204,8 +203,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: doc/other-free-books.zh-cn.html
===================================================================
RCS file: /web/www/www/doc/other-free-books.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- doc/other-free-books.zh-cn.html 1 Dec 2018 04:28:26 -0000 1.5
+++ doc/other-free-books.zh-cn.html 2 Dec 2018 09:58:03 -0000 1.6
@@ -240,10 +240,10 @@
</tr>
<tr>
-<td><a href="http://www.diveintopython.net/";>Dive Into Python</a></td>
+<td><a href="https://www.diveinto.org/python3/";>Dive Into Python 3</a></td>
<td>Mark Pilgrim</td>
<td>aPress</td>
-<td>1-59059-356-1</td>
+<td>978-1430224150</td>
<td><a href="/licenses/fdl.html">GNUèªç±æ档许å¯è¯</a></td>
</tr>
@@ -504,7 +504,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2018/12/01 04:28:26 $
+$Date: 2018/12/02 09:58:03 $
<!-- timestamp end -->
</p>
Index: doc/po/other-free-books.zh-cn-en.html
===================================================================
RCS file: /web/www/www/doc/po/other-free-books.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/po/other-free-books.zh-cn-en.html 1 Dec 2018 04:28:26 -0000
1.2
+++ doc/po/other-free-books.zh-cn-en.html 2 Dec 2018 09:58:03 -0000
1.3
@@ -254,11 +254,11 @@
</tr>
<tr>
-<td><a href="http://www.diveintopython.net/";>Dive Into
-Python</a></td>
+<td><a href="https://www.diveinto.org/python3/";>Dive Into
+Python 3</a></td>
<td>Mark Pilgrim</td>
<td>aPress</td>
-<td>1-59059-356-1</td>
+<td>978-1430224150</td>
<td><a href="/licenses/fdl.html">GNU Free Documentation License</a></td>
</tr>
@@ -516,7 +516,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/12/01 04:28:26 $
+$Date: 2018/12/02 09:58:03 $
<!-- timestamp end -->
</p>
</div>
Index: doc/po/other-free-books.zh-cn.po
===================================================================
RCS file: /web/www/www/doc/po/other-free-books.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- doc/po/other-free-books.zh-cn.po 2 Dec 2018 09:34:21 -0000 1.6
+++ doc/po/other-free-books.zh-cn.po 2 Dec 2018 09:58:03 -0000 1.7
@@ -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-12-01 18:26+0000\n"
#. type: Content of: <title>
msgid ""
@@ -502,8 +501,8 @@
"Open Publication License, Version 1.0 (no options exercised) <a href="
"\"#ALP_NOTE\">(See note below)</a>"
msgstr ""
-"Open Publication License, Version 1.0ï¼æ éæ©æï¼<a
href=\"#ALP_NOTE"
-"\">ï¼è¯·åç注解ï¼</a>"
+"Open Publication License, Version 1.0ï¼æ éæ©æï¼<a
href=\"#ALP_NOTE\">"
+"ï¼è¯·åç注解ï¼</a>"
#. type: Content of: <table><tr><td>
msgid ""
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www distros/common-distros.zh-cn.html distros/p...,
GNUN <=