[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses license-recommendations.zh-cn.html...
|
From: |
GNUN |
|
Subject: |
www/licenses license-recommendations.zh-cn.html... |
|
Date: |
Tue, 15 Oct 2019 19:58:15 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 19/10/15 19:58:15
Modified files:
licenses : license-recommendations.zh-cn.html
licenses/po : license-recommendations.zh-cn-en.html
license-recommendations.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-recommendations.zh-cn.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.zh-cn.po?cvsroot=www&r1=1.9&r2=1.10
Patches:
Index: license-recommendations.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/license-recommendations.zh-cn.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- license-recommendations.zh-cn.html 28 Jul 2019 08:58:33 -0000 1.8
+++ license-recommendations.zh-cn.html 15 Oct 2019 23:58:14 -0000 1.9
@@ -72,10 +72,10 @@
<p>对äºåºï¼æ们åä¸ç§æ
å½¢ã</p>
<p>ä¸äºå®ç°äºèªç±æ åçåºä¸é£äºéå¶æ§æ åç«äºï¼ä¾å¦
Ogg Vorbisï¼å MP3 é³é¢ç«äºï¼å WebMï¼å MPEG-4
-è§é¢ç«äºï¼ã对äºè¿äºé¡¹ç®ï¼ä»£ç
ç广æ³ä½¿ç¨å¯¹äºæ¨è¿èªç±è½¯ä»¶äºä¸é常éè¦ï¼ä¼æ¯å¨é¡¹ç®ä»£ç
ä¸ç copyleft ææ´å¤ç好å¤ã</p>
+è§é¢ç«äºï¼ãèªç±æ
åçæåéè¦ä¼å¤ä¸æ软件è½å¤è¿æ¥å°èªç±æ
ååºæ¥å¤çæ°æ®ãä¾å¦ï¼æ们å¸æéèªç±çåªä½ææ¾å¨æ¢å¯ä»¥å¤ç
Ogg ä¹å¯ä»¥å¤ç MP3ã</p>
-<p>å¨è¿äºç¹æ®çæ
åµï¼æ们æ¨è <a
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache
-2.0 许å¯è¯</a>ã</p>
+<p>å¨è¿äºç¹æ®çæ
åµï¼æ们æ¨èè½å¤å¤çèªç±æ ¼å¼ç <a
+href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 2.0
许å¯è¯</a>ã</p>
<p>对ææå
¶ä»çåºï¼æ们æ¨èæç§ copyleft
许å¯è¯ãå¦æå¼åè
å·²ç»ä½¿ç¨ç°æç以éèªç±æä¸ä¸¥æ ¼ç
pushover 许å¯è¯åå¸çåºï¼é£ä¹æ们建议使ç¨
<a href="/licenses/lgpl.html">GNU 宽éç¨å
Œ
±è®¸å¯è¯ï¼LGPLï¼</a>ã</p>
@@ -181,7 +181,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 Free Software
+<p>Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software
Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
@@ -202,7 +202,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/07/28 08:58:33 $
+$Date: 2019/10/15 23:58:14 $
<!-- timestamp end -->
</p>
Index: po/license-recommendations.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/license-recommendations.zh-cn-en.html 15 Dec 2018 14:46:19 -0000
1.3
+++ po/license-recommendations.zh-cn-en.html 15 Oct 2019 23:58:14 -0000
1.4
@@ -119,14 +119,16 @@
<p>For libraries, we distinguish three kind of cases.</p>
-<p>Some libraries implement free standards that are competing against
-restricted standards, such as Ogg Vorbis (which competes against MP3
-audio) and WebM (which competes against MPEG-4 video). For these
-projects, widespread use of the code is vital for advancing the cause
-of free software, and does more good than a copyleft on the project's
-code would do.</p>
+<p>Some libraries implement free data formats that are competing
+against restricted data formats, such as Ogg Vorbis (which competes
+against MP3 audio) and WebM (which competes against MPEG-4 video).
+The success of the free format requires allowing many proprietary
+application programs to link in the code to handle the format.
+For instance, we would like nonfree media players to include the
+code for Ogg Vorbis as well as MP3.</p>
-<p>In these special situations, we recommend
+<p>In these special situations, we recommend licensing the library
+that handles the free format under
the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache
License 2.0</a>.</p>
@@ -278,7 +280,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 Free Software
Foundation, Inc.</p>
+<p>Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 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
@@ -288,7 +290,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/12/15 14:46:19 $
+$Date: 2019/10/15 23:58:14 $
<!-- timestamp end -->
</p>
</div>
Index: po/license-recommendations.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.zh-cn.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/license-recommendations.zh-cn.po 15 Oct 2019 23:29:06 -0000 1.9
+++ po/license-recommendations.zh-cn.po 15 Oct 2019 23:58:14 -0000 1.10
@@ -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-10-13 00:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -293,8 +292,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"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-recommendations.zh-cn.html...,
GNUN <=