www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www planetfeeds.zh-cn.html licenses/gpl-faq.zh-...


From: GNUN
Subject: www planetfeeds.zh-cn.html licenses/gpl-faq.zh-...
Date: Mon, 27 Feb 2023 08:30:49 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     23/02/27 08:30:49

Modified files:
        .              : planetfeeds.zh-cn.html 
        licenses       : gpl-faq.zh-cn.html 
        licenses/po    : gpl-faq.zh-cn-en.html gpl-faq.zh-cn.po 
        po             : planetfeeds.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/planetfeeds.zh-cn.html?cvsroot=www&r1=1.806&r2=1.807
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.zh-cn.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.zh-cn-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.zh-cn.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/po/planetfeeds.zh-cn.po?cvsroot=www&r1=1.14&r2=1.15

Patches:
Index: planetfeeds.zh-cn.html
===================================================================
RCS file: /web/www/www/planetfeeds.zh-cn.html,v
retrieving revision 1.806
retrieving revision 1.807
diff -u -b -r1.806 -r1.807
--- planetfeeds.zh-cn.html      27 Feb 2023 06:03:51 -0000      1.806
+++ planetfeeds.zh-cn.html      27 Feb 2023 13:30:44 -0000      1.807
@@ -6,37 +6,35 @@
 value="<a href='http://savannah.gnu.org/forum/forum.php?forum_id=10350'>" -->
 <!--#echo
 encoding="none" var="link" -->
-GNU Make 4.4.1 Released!<!--#echo encoding="none"
+GNU Make 4.4.1 发布!<!--#echo encoding="none"
 var="a_close" -->
 <!-- TRANSLATORS: 
 http://savannah.gnu.org/forum/forum.php?forum_id=10350 -->
-: The next stable version of GNU Make, version 4.4.1, has been released and
-is available for download from https://ftp.gnu.org/gnu/make/?C=M;O=D Please
-see the NEWS fi...
+:这是 GNU Make 的稳定版,版本 4.4.1。下载请至 
https://ftp.gnu.org/gnu/make/?C=M;O=D 详情参看
+NEWS......
 </p>
 <p>
 <!--#set var="link"
 value="<a href='http://www.fsf.org/events/fsd-20230303-irc'>" -->
 <!--#echo
 encoding="none" var="link" -->
-Free Software Directory meeting on IRC: Friday, March 03, starting at 12:00
-EST (17:00 UTC)<!--#echo encoding="none"
+自由软件目录 IRC 周会:周五,3 月 3 日,12:00 EST (17:00 UTC) 
开始<!--#echo encoding="none"
 var="a_close" -->
 <!-- TRANSLATORS: 
 http://www.fsf.org/events/fsd-20230303-irc -->
-: Join the FSF and friends on Friday, March 03, from 12:00 to 15:00 EST
-(17:00 to 20:00 UTC)  to help...
+:请朋友们一起和 FSF 在 3 月 3 日周五的 12:00 到 15:00 EST 
(17:00 to 20:00 UTC)
+加入会议,帮助......
 </p>
 <p>
 <!--#set var="link"
 value="<a href='http://savannah.gnu.org/forum/forum.php?forum_id=10349'>" -->
 <!--#echo
 encoding="none" var="link" -->
-Linux-libre turns 15!<!--#echo encoding="none"
+Linux-libre 15 岁了!<!--#echo encoding="none"
 var="a_close" -->
 <!-- TRANSLATORS: 
 http://savannah.gnu.org/forum/forum.php?forum_id=10349 -->
-: Linux-libre turns 15! Shared from
-&lt;http://www.fsfla.org/anuncio/2023-02-Linux-libre-15&gt; It was February
-2008 when Jeff Moe announced Linux-libre, a project to sha...
+:Linux-libre 15 岁了!来自
+&lt;http://www.fsfla.org/anuncio/2023-02-Linux-libre-15&gt; 
的分享。正是在 2008 年 2
+月 Jeff Moe 声明了 Linux-libre,这是一个......
 </p>

Index: licenses/gpl-faq.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.zh-cn.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- licenses/gpl-faq.zh-cn.html 29 Jan 2023 01:29:37 -0000      1.12
+++ licenses/gpl-faq.zh-cn.html 27 Feb 2023 13:30:47 -0000      1.13
@@ -483,6 +483,12 @@
 
     <li><a 
href="#SystemLibraryException">我是否可以用专有系统库连接一个GPL程序?</a></li>
 
+    <li><a href="#AGPLPL">我是否可以把使用 GPLv3 的模块和使用 
AGPLv3 的模块连接成一个可执行程序?</a></li>
+
+    <li><a href="#AGPLLibrary">我是否可以把使用 GPLv3 
的程序和使用 AGPLv3 的库连接起来?</a></li>
+
+    <li><a href="#AGPLAndGPLLibrary">我是否可以把使用 AGPLv3 
的程序和使用 GPLv3 的库连接起来?</a></li>
+
     <li><a href="#GPLIncompatibleLibs">GPL软件使用非GPLå…
¼å®¹åº“会有什么法律问题?</a></li>
   
     <li><a href="#WindowsRuntimeAndGPL">我使用Microsoft Visual
@@ -839,6 +845,25 @@
 <p>关于&ldquo;系统库&rdquo;的æ 
‡å‡†ï¼Œå„版GPL有所不同。GPLv3在第1节明确定义了&ldquo;系统库&rdquo;,以将之和&ldquo;相å
…³æºä»£ç 
&rdquo;区别开来。GPLv2的处理略微不同,放在在第3节。</p>
 </dd>
 
+<dt id="AGPLGPL">我是否可以把使用 GPLv3 的模块和使用 AGPLv3 
的模块连接成一个可执行程序?<span
+class="anchor-reference-id">(<a href="#AGPLGPL">#AGPLGPL</a>)</span></dt>
+<dd><p>
+你总是可以把使用 GPLv3 许可证的模块和使用 AGPLv3 
的模块连接起来。这是因为这两个许可证明确å…
è®¸äº’相连接。</p>
+</dd>
+
+<dt id="AGPLLibrary">我是否可以把使用 GPLv3 的程序和使用 AGPLv3 
的库连接起来?<span class="anchor-reference-id">(<a
+href="#AGPLLibrary">#AGPLLibrary</a>)</span></dt>
+<dd><p>
+你总是可以 <a href="#AGPLGPL">把使用 GPLv3 的模块和使用 AGPLv3 
的模块连接起来</a>,无论这些模块是否是库。</p>
+</dd>
+
+<dt id="AGPLAndGPLLibrary">我是否可以把使用 AGPLv3 的程序和使用 
GPLv3 的库连接起来?<span class="anchor-reference-id">(<a
+href="#AGPLAndGPLLibrary">#AGPLAndGPLLibrary</a>)</span></dt>
+<dd><p>
+你总是可以 <a href="#AGPLGPL">把使用 GPLv3 的模块和使用 AGPLv3 
的模块连接起来</a>,无论这些模块是否是库。</p>
+</dd>
+
+
 <dt id="GPLIncompatibleLibs">GPL软件使用非GPLå…
¼å®¹åº“会有什么法律问题?<span class="anchor-reference-id">(<a
 href="#GPLIncompatibleLibs" >#GPLIncompatibleLibs</a>)</span></dt>
 <dd>
@@ -2268,9 +2293,9 @@
 
 <p id="compat-matrix-footnote-1">1: 在这种情况下合并代码时,你必
须遵循 GPLv2 的条款。你不能利用 GPL 以后版的优势。</p>
 
-<p id="compat-matrix-footnote-2">2: 在这种情况下,你可以按照 GPLv2 
或者其以后版发布你的项目(无
论是原创还是改进),但是要注意你使用的其他代码必
须继续只使用 GPLv2
-许可证。只要你的项目还依赖于其他代码,你就不能把你
的项目许可证升级为 GPLv3 或者其以后版本,而整个作品(你
的项目和其他代码的组合)只能使用
-GPLv2 来输送。</p>
+<p id="compat-matrix-footnote-2">2: 你可以使用 GPLv2-or-later 发布你
的原创作品和/或修改版作品,而你使用的 GPLv2-only 代码则必
须保留为 GPLv2
+only。只要你的项目还依赖于这些代码,你就不能将你
自己代码的许可证升级到
+GPLv3-or-later,而且整个作品(你的项目和其他代ç 
çš„组合)只能使用 GPLv2 的条款来输送。</p>
 
 <p id="compat-matrix-footnote-3">3: 如果你能够按照 GPLv2 或者å…
¶ä»¥åŽç‰ˆæœ¬å‘布你的项目,那么你就可以选择使用 GPLv3
 或者其以后版本来发布&mdash;&mdash;一旦你这样做了,你
就可以组合其他按照 GPLv3 发布的代码。</p>
@@ -2343,7 +2368,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2001-2019, 2021 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001-2019, 2021, 2023 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -2359,7 +2384,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2023/01/29 01:29:37 $
+$Date: 2023/02/27 13:30:47 $
 
 <!-- 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- licenses/po/gpl-faq.zh-cn-en.html   28 Dec 2021 15:00:53 -0000      1.10
+++ licenses/po/gpl-faq.zh-cn-en.html   27 Feb 2023 13:30:47 -0000      1.11
@@ -668,6 +668,15 @@
     <li><a href="#SystemLibraryException">Can I link a GPL program with
     a proprietary system library?</a></li>
 
+    <li><a href="#AGPLPL">Can I link GPLv3-covered modules and
+    AGPLv3-covered modules into one executable?</a></li>
+
+    <li><a href="#AGPLLibrary">Can I link a GPLv3-covered program with
+    an AGPLv3-covered library?</a></li>
+
+    <li><a href="#AGPLAndGPLLibrary">Can I link an AGPLv3-covered program with
+    a GPLv3-covered library?</a></li>
+
     <li><a href="#GPLIncompatibleLibs">What legal issues come up if I
     use GPL-incompatible libraries with GPL software?</a></li>
   
@@ -1314,6 +1323,37 @@
 issue slightly differently, near the end of section 3.</p>
 </dd>
 
+<dt id="AGPLGPL">Can I link GPLv3-covered modules and
+    AGPLv3-covered modules into one executable?
+ <span class="anchor-reference-id">(<a
+href="#AGPLGPL">#AGPLGPL</a>)</span></dt>
+<dd><p>
+You can always link GPLv3-covered modules with AGPLv3-covered modules.
+That is because each of these licenses explicitly permits linking with
+code under the other license.</p>
+</dd>
+
+<dt id="AGPLLibrary">Can I link a GPLv3-covered program with
+    an AGPLv3-covered library?
+ <span class="anchor-reference-id">(<a
+href="#AGPLLibrary">#AGPLLibrary</a>)</span></dt>
+<dd><p>
+You can always <a href="#AGPLGPL">link GPLv3-covered modules with
+AGPLv3-covered modules</a>.  That is true regardless of whether some of
+the modules are libraries.</p>
+</dd>
+
+<dt id="AGPLAndGPLLibrary">Can I link an AGPLv3-covered program with
+    a GPLv3-covered library?
+ <span class="anchor-reference-id">(<a
+href="#AGPLAndGPLLibrary">#AGPLAndGPLLibrary</a>)</span></dt>
+<dd><p>
+You can always <a href="#AGPLGPL">link GPLv3-covered modules with
+AGPLv3-covered modules</a>.  That is true regardless of whether some of
+the modules are libraries.</p>
+</dd>
+
+
 <dt id="GPLIncompatibleLibs">What legal issues
     come up if I use GPL-incompatible libraries with GPL software?
  <span class="anchor-reference-id">(<a href="#GPLIncompatibleLibs"
@@ -2512,7 +2552,7 @@
 <dd><p>
 If the version has been released elsewhere, then the thief
 probably does have the right to make copies and redistribute them
-under the GPL, but if the thief is imprisoned for stealing the CD,
+under the GPL, but if thieves are imprisoned for stealing the CD,
 they may have to wait until their release before doing so.</p>
 
 <p>If the version in question is unpublished and considered by a company
@@ -3903,11 +3943,11 @@
 when incorporating the code in this case. You cannot take advantage of
 terms in later versions of the GPL.</p>
 
-<p id="compat-matrix-footnote-2">2: While you may release your project
-(either your original work and/or work that you received and modified)
-under GPLv2-or-later in this case, note that the other code you're
+<p id="compat-matrix-footnote-2">2: While you may release under
+GPLv2-or-later both your original work, and/or modified versions of
+work you received under GPLv2-or-later, the GPLv2-only code that you're
 using must remain under GPLv2 only.  As long as your project depends
-on that code, you won't be able to upgrade the license of your project
+on that code, you won't be able to upgrade the license of your own code
 to GPLv3-or-later, and the work as a whole (any combination of both
 your project and the other code) can only be conveyed under the terms
 of GPLv2.</p>
@@ -3994,7 +4034,7 @@
      Information document, www.gnu.org/prep/maintain. -->
 
 
-<p>Copyright &copy; 2001-2019, 2021 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001-2019, 2021, 2023 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
@@ -4004,7 +4044,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/12/28 15:00:53 $
+$Date: 2023/02/27 13:30:47 $
 <!-- 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.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- licenses/po/gpl-faq.zh-cn.po        27 Feb 2023 13:13:56 -0000      1.37
+++ licenses/po/gpl-faq.zh-cn.po        27 Feb 2023 13:30:48 -0000      1.38
@@ -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: 2023-02-24 21:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -1323,8 +1322,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"What does &ldquo;GPL&rdquo; stand for? <span class=\"anchor-reference-id"
-"\">(<a href=\"#WhatDoesGPLStandFor\" >#WhatDoesGPLStandFor</a>)</span>"
+"What does &ldquo;GPL&rdquo; stand for? <span class=\"anchor-reference-id\">"
+"(<a href=\"#WhatDoesGPLStandFor\" >#WhatDoesGPLStandFor</a>)</span>"
 msgstr ""
 "&ldquo;GPL&rdquo;代表什么?<span class=\"anchor-reference-id\">(<a href="
 "\"#WhatDoesGPLStandFor\" >#WhatDoesGPLStandFor</a>)</span>"
@@ -1342,8 +1341,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="
@@ -1438,8 +1437,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 ""
@@ -1565,8 +1564,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 ""
@@ -1675,8 +1674,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 ""
@@ -1890,8 +1889,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 ""
@@ -2010,8 +2009,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>"
@@ -2291,8 +2290,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 ""
@@ -2372,8 +2371,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 ""
@@ -2513,9 +2512,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通用公å…
±è®¸å¯è¯çš„条款会覆盖到整个合并的工"
@@ -2526,18 +2525,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的发布要求包
含了其他程序的源代码}"
 "使用的相关许可证。"
 
@@ -2694,8 +2693,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\" "
@@ -3005,8 +3004,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 ""
@@ -3613,8 +3612,8 @@
 "href=\"#MereAggregation\" >#MereAggregation</a>)</span>"
 msgstr ""
 "&ldquo;聚合版&rdquo;和å…
¶ä»–&ldquo;修改版&rdquo;有什么不同?<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 ""
@@ -3693,8 +3692,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 ""
@@ -3803,8 +3802,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 ""
@@ -3827,8 +3826,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>"
@@ -4009,11 +4008,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 ""
@@ -4133,8 +4132,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 ""
@@ -4471,8 +4470,8 @@
 "\"#InternalDistribution\" >#InternalDistribution</a>)</span>"
 msgstr ""
 "在组织或公司内部使用是不是&ldquo;发布&rdquo;? <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 ""
@@ -4580,8 +4579,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 ""
@@ -4800,11 +4799,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 ""
@@ -4916,8 +4915,8 @@
 msgstr ""
 "我在编写一个网站维护系统(有人称之为&ldquo;<a 
href=\"/philosophy/words-to-"
 "avoid.html#Content\">内容管理系统</a>&rdquo;),或者是å…
¶ä»–通过模板创建网页的"
-"应用。这些模板应该使用什么样的许可证呢?<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 ""
@@ -4987,8 +4986,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 ""
@@ -5221,8 +5220,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>"
@@ -5249,8 +5248,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 ""
@@ -5556,8 +5555,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 ""
@@ -5610,8 +5609,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 ""
@@ -5656,8 +5655,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 ""
@@ -5715,8 +5714,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>"
@@ -6057,8 +6056,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\" "
@@ -6298,8 +6297,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 ""
@@ -6764,13 +6763,13 @@
 "OK: Combination is under GPLv2 or later&nbsp;<a href=\"#compat-matrix-"
 "footnote-7\">[7]</a>"
 msgstr ""
-"可以:组合遵循 GPLv2 或者其以后版&nbsp;<a href=\"#compat-matrix-"
-"footnote-7\">[7]</a>"
+"可以:组合遵循 GPLv2 或者其以后版&nbsp;<a 
href=\"#compat-matrix-footnote-7\">"
+"[7]</a>"
 
 #. type: Content of: <table><tbody><tr><td>
 msgid ""
-"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-"
-"footnote-8\">[8]</a>"
+"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-footnote-8\">[8]"
+"</a>"
 msgstr ""
 "可以:组合遵循 GPLv3&nbsp;<a 
href=\"#compat-matrix-footnote-8\">[8]</a>"
 
@@ -6780,15 +6779,15 @@
 
 #. type: Content of: <table><tbody><tr><td>
 msgid ""
-"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-"
-"footnote-3\">[3]</a>"
+"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-footnote-3\">[3]"
+"</a>"
 msgstr ""
 "可以:组合遵循 GPLv3&nbsp;<a 
href=\"#compat-matrix-footnote-3\">[3]</a>"
 
 #. type: Content of: <table><tbody><tr><td>
 msgid ""
-"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-"
-"footnote-7\">[7]</a>"
+"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
+"</a>"
 msgstr ""
 "可以:组合遵循 GPLv3&nbsp;<a 
href=\"#compat-matrix-footnote-7\">[7]</a>"
 
@@ -6797,8 +6796,8 @@
 "OK: Convey copied code under GPLv2&nbsp;<a href=\"#compat-matrix-"
 "footnote-7\">[7]</a>"
 msgstr ""
-"可以:按照 GPLv2 输送复制的代码&nbsp;<a href=\"#compat-matrix-"
-"footnote-7\">[7]</a>"
+"可以:按照 GPLv2 输送复制的代码&nbsp;<a 
href=\"#compat-matrix-footnote-7\">"
+"[7]</a>"
 
 #. type: Content of: <table><tbody><tr><td>
 msgid ""
@@ -6825,16 +6824,16 @@
 "OK: Convey copied code under GPLv3&nbsp;<a href=\"#compat-matrix-"
 "footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
 msgstr ""
-"可以:按照 GPLv3 输送复制的代码&nbsp;<a href=\"#compat-matrix-"
-"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
+"可以:按照 GPLv3 输送复制的代码&nbsp;<a 
href=\"#compat-matrix-footnote-7\">"
+"[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
 
 #. type: Content of: <table><tbody><tr><td>
 msgid ""
 "OK: Convey copied code under GPLv2&nbsp;<a href=\"#compat-matrix-"
 "footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-1\">[1]</a>"
 msgstr ""
-"可以:按照 GPLv2 输送复制的代码&nbsp;<a href=\"#compat-matrix-"
-"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-1\">[1]</a>"
+"可以:按照 GPLv2 输送复制的代码&nbsp;<a 
href=\"#compat-matrix-footnote-7\">"
+"[7]</a><a href=\"#compat-matrix-footnote-1\">[1]</a>"
 
 #. type: Content of: <table><tbody><tr><td>
 msgid ""
@@ -6854,24 +6853,24 @@
 
 #. type: Content of: <table><tbody><tr><td>
 msgid ""
-"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-"
-"footnote-8\">[8]</a><a href=\"#compat-matrix-footnote-3\">[3]</a>"
+"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-footnote-8\">[8]"
+"</a><a href=\"#compat-matrix-footnote-3\">[3]</a>"
 msgstr ""
 "可以:组合遵循 GPLv3&nbsp;<a 
href=\"#compat-matrix-footnote-8\">[8]</a><a "
 "href=\"#compat-matrix-footnote-3\">[3]</a>"
 
 #. type: Content of: <table><tbody><tr><td>
 msgid ""
-"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-"
-"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
+"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
+"</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
 msgstr ""
 "可以:组合遵循 GPLv3&nbsp;<a 
href=\"#compat-matrix-footnote-7\">[7]</a><a "
 "href=\"#compat-matrix-footnote-8\">[8]</a>"
 
 #. type: Content of: <table><tbody><tr><td>
 msgid ""
-"OK: Combination is under LGPLv3&nbsp;<a href=\"#compat-matrix-"
-"footnote-4\">[4]</a>"
+"OK: Combination is under LGPLv3&nbsp;<a href=\"#compat-matrix-footnote-4\">"
+"[4]</a>"
 msgstr ""
 "可以:组合遵循 LGPLv3&nbsp;<a 
href=\"#compat-matrix-footnote-4\">[4]</a>"
 
@@ -6885,8 +6884,8 @@
 
 #. type: Content of: <table><tbody><tr><td>
 msgid ""
-"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-"
-"footnote-9\">[9]</a>"
+"OK: Combination is under GPLv3&nbsp;<a href=\"#compat-matrix-footnote-9\">[9]"
+"</a>"
 msgstr ""
 "可以:组合遵循 GPLv3&nbsp;<a 
href=\"#compat-matrix-footnote-9\">[9]</a>"
 
@@ -7091,8 +7090,8 @@
 #~ "footnote-7\">[7]</a>"
 
 #~ msgid ""
-#~ "OK: Convey code under GPLv3&nbsp;<a href=\"#compat-matrix-"
-#~ "footnote-7\">[7]</a>"
+#~ "OK: Convey code under GPLv3&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
+#~ "</a>"
 #~ msgstr ""
 #~ "可以:按照 GPLv3 输送代码&nbsp;<a 
href=\"#compat-matrix-footnote-7\">[7]</"
 #~ "a>"

Index: po/planetfeeds.zh-cn.po
===================================================================
RCS file: /web/www/www/po/planetfeeds.zh-cn.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/planetfeeds.zh-cn.po     27 Feb 2023 13:24:04 -0000      1.14
+++ po/planetfeeds.zh-cn.po     27 Feb 2023 13:30:49 -0000      1.15
@@ -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: 2023-02-20 05:58+0000\n"
 
 #. type: Content of: <p>
 msgid "GNU Make 4.4.1 Released!"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]