[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses/po license-compatibility.fr.po lic...
|
From: |
GNUN |
|
Subject: |
www/licenses/po license-compatibility.fr.po lic... |
|
Date: |
Fri, 20 Nov 2020 11:30:41 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 20/11/20 11:30:40
Modified files:
licenses/po : license-compatibility.fr.po
license-compatibility.it-diff.html
license-compatibility.it.po
license-compatibility.pot
license-compatibility.ru.po
license-compatibility.zh-cn.po
license-recommendations.es.po
license-recommendations.fr.po
license-recommendations.it-diff.html
license-recommendations.it.po
license-recommendations.ja.po
license-recommendations.pot
license-recommendations.pt-br.po
license-recommendations.ru.po
license-recommendations.tr.po
license-recommendations.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.fr.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.it-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.it.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.pot?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.es.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.fr.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.it-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.it.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ja.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.pot?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.pt-br.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ru.po?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.tr.po?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.18&r2=1.19
Patches:
Index: license-compatibility.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.fr.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- license-compatibility.fr.po 15 Sep 2018 12:14:04 -0000 1.9
+++ license-compatibility.fr.po 20 Nov 2020 16:30:39 -0000 1.10
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2018-09-14 12:56+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2018-09-15 14:13+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <trad-gnu@april.org>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-11-20 16:25+0000\n"
"X-Generator: Gtranslator 2.91.6\n"
#. type: Content of: <title>
@@ -183,18 +184,43 @@
"de la « licence BSD »</a>."
#. type: Content of: <p>
+# | In general, two different copyleft licenses are unavoidably incompatible
+# | unless they have explicit compatibility provisions. This is not due to a
+# | mistake in the details; it's inherent in the idea of copyleft. The idea
+# | of copyleft is that “Modified and extended versions must be under
+# | the same license.” If license A {+(on program P)+} says extended
+# | programs must be under license A, and license B {+(on program Q)+} says
+# | extended programs must be under license B, they have an irreconcilable
+# | disagreement; the license of the combined program {+which includes code
+# | from P plus code from Q+} would have to be A, <em>and</em> it would have
+# | to be B. [-This is why GPL version 2 is incompatible with GPL version 3;
+# | it could not be avoided. Likewise, the conditions of CC-BY-SA 4.0 would
+# | be inherently incompatible with those of CC-BY-SA 3.0, and the authors
+# | could not have avoided this.-]
+#, fuzzy
+#| msgid ""
+#| "In general, two different copyleft licenses are unavoidably incompatible "
+#| "unless they have explicit compatibility provisions. This is not due to a "
+#| "mistake in the details; it's inherent in the idea of copyleft. The idea "
+#| "of copyleft is that “Modified and extended versions must be under "
+#| "the same license.” If license A says extended programs must be "
+#| "under license A, and license B says extended programs must be under "
+#| "license B, they have an irreconcilable disagreement; the license of the "
+#| "combined program would have to be A, <em>and</em> it would have to be B. "
+#| "This is why GPL version 2 is incompatible with GPL version 3; it could "
+#| "not be avoided. Likewise, the conditions of CC-BY-SA 4.0 would be "
+#| "inherently incompatible with those of CC-BY-SA 3.0, and the authors could "
+#| "not have avoided this."
msgid ""
"In general, two different copyleft licenses are unavoidably incompatible "
"unless they have explicit compatibility provisions. This is not due to a "
"mistake in the details; it's inherent in the idea of copyleft. The idea of "
"copyleft is that “Modified and extended versions must be under the "
-"same license.” If license A says extended programs must be under "
-"license A, and license B says extended programs must be under license B, "
-"they have an irreconcilable disagreement; the license of the combined "
-"program would have to be A, <em>and</em> it would have to be B. This is why "
-"GPL version 2 is incompatible with GPL version 3; it could not be avoided. "
-"Likewise, the conditions of CC-BY-SA 4.0 would be inherently incompatible "
-"with those of CC-BY-SA 3.0, and the authors could not have avoided this."
+"same license.” If license A (on program P) says extended programs must "
+"be under license A, and license B (on program Q) says extended programs must "
+"be under license B, they have an irreconcilable disagreement; the license of "
+"the combined program which includes code from P plus code from Q would have "
+"to be A, <em>and</em> it would have to be B."
msgstr ""
"En général, deux licences à copyleft différentes sont inévitablement "
"incompatibles à moins qu'elles n'aient des clauses de compatibilité "
@@ -211,8 +237,23 @@
#. type: Content of: <p>
msgid ""
-"There are two approaches for smoothing out the incompatibility inherent in "
-"new versions of copyleft licenses."
+"This is why GPL version 2 is incompatible with GPL version 3; it could not "
+"be avoided. Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
+"incompatible with those of CC-BY-SA 3.0, and the authors could not have "
+"avoided this."
+msgstr ""
+
+#. type: Content of: <p>
+# | There are two approaches for [-smoothing out-] {+avoiding+} the
+# | incompatibility [-inherent in new-] {+problem caused by different+}
+# | versions of copyleft licenses.
+#, fuzzy
+#| msgid ""
+#| "There are two approaches for smoothing out the incompatibility inherent "
+#| "in new versions of copyleft licenses."
+msgid ""
+"There are two approaches for avoiding the incompatibility problem caused by "
+"different versions of copyleft licenses."
msgstr ""
"Il y a deux méthodes pour gommer l'incompatibilité inhérente aux nouvelles
"
"versions des licences à copyleft."
@@ -247,12 +288,26 @@
"avons besoin de cette version."
#. type: Content of: <p>
+# | The other approach is to make each version of the license explicitly allow
+# | upgrading to later versions. [-This is what-] {+The Mozilla Foundation
+# | uses this approach, as does PHP.+} Creative [-Commons does:-] {+Commons,
+# | uses it+} for [-instance, CC-BY-SA-] {+CC-BY-SA:+} version 4.0 (the
+# | current version) explicitly permits any user to upgrade to later versions
+# | of CC-BY-SA [-once those exist. The Mozilla Foundation also uses this
+# | approach.-] {+for modified works.+}
+#, fuzzy
+#| msgid ""
+#| "The other approach is to make each version of the license explicitly "
+#| "allow upgrading to later versions. This is what Creative Commons does: "
+#| "for instance, CC-BY-SA version 4.0 (the current version) explicitly "
+#| "permits any user to upgrade to later versions of CC-BY-SA once those "
+#| "exist. The Mozilla Foundation also uses this approach."
msgid ""
"The other approach is to make each version of the license explicitly allow "
-"upgrading to later versions. This is what Creative Commons does: for "
-"instance, CC-BY-SA version 4.0 (the current version) explicitly permits any "
-"user to upgrade to later versions of CC-BY-SA once those exist. The Mozilla "
-"Foundation also uses this approach."
+"upgrading to later versions. The Mozilla Foundation uses this approach, as "
+"does PHP. Creative Commons, uses it for CC-BY-SA: version 4.0 (the current "
+"version) explicitly permits any user to upgrade to later versions of CC-BY-"
+"SA for modified works."
msgstr ""
"L'autre méthode est de faire en sorte que chaque version de la licence "
"permette explicitement l'évolution vers les versions ultérieures. C'est ce "
@@ -279,12 +334,26 @@
"sous « GPL 1 seule » ou « GPL 1 ou ultérieure »."
#. type: Content of: <p>
+# | Since then, I have come to question the wisdom of that decision. Programs
+# | such as Linux, which allow only one GNU GPL version and reject license
+# | upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a>
+# | [-Perhaps-] {+If we ever make a GPL version 4, perhaps+} we should include
+# | an upgrade clause [-in GPL version 4, if we ever need a version 4.-]
+# | {+that automatically permits relicensing to higher-numbered versions, 5
+# | and up.+}
+#, fuzzy
+#| msgid ""
+#| "Since then, I have come to question the wisdom of that decision. "
+#| "Programs such as Linux, which allow only one GNU GPL version and reject "
+#| "license upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</"
+#| "a> Perhaps we should include an upgrade clause in GPL version 4, if we "
+#| "ever need a version 4."
msgid ""
"Since then, I have come to question the wisdom of that decision. Programs "
"such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> Perhaps "
-"we should include an upgrade clause in GPL version 4, if we ever need a "
-"version 4."
+"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
+"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"automatically permits relicensing to higher-numbered versions, 5 and up."
msgstr ""
"Depuis, j'en suis venu à me demander si cette décision était judicieuse.
Des "
"programmes comme Linux, qui ne permettent d'utiliser qu'une seule version de "
@@ -740,7 +809,11 @@
"README.translations.html\">guide de traduction</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2016, 2018 Free Software Foundation, Inc."
+# | Copyright © 2016, [-2018-] {+2018, 2020+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid "Copyright © 2016, 2018 Free Software Foundation, Inc."
+msgid "Copyright © 2016, 2018, 2020 Free Software Foundation, Inc."
msgstr "Copyright © 2016, 2018 Free Software Foundation, Inc."
#. type: Content of: <div><p>
Index: license-compatibility.it-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.it-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- license-compatibility.it-diff.html 15 Dec 2018 14:46:19 -0000 1.3
+++ license-compatibility.it-diff.html 20 Nov 2020 16:30:39 -0000 1.4
@@ -89,17 +89,22 @@
incompatible unless they have explicit compatibility provisions. This
is not due to a mistake in the details; it's inherent in the idea of
copyleft. The idea of copyleft is that “Modified and extended
-versions must be under the same license.” If license A says extended
-programs must be under license A, and license B says extended programs
-must be under license B, they have an irreconcilable disagreement; the
-license of the combined program would have to be A, <em>and</em>
it would
-have to be B. This is why GPL version 2 is incompatible with GPL
-version 3; it could not be avoided. Likewise, the conditions of
-CC-BY-SA 4.0 would be inherently incompatible with those of CC-BY-SA
-3.0, and the authors could not have avoided this.</p>
-
-<p>There are two approaches for smoothing out the incompatibility
-inherent in new versions of copyleft licenses.</p>
+versions must be under the same license.” If license A <span
class="inserted"><ins><em>(on
+program P)</em></ins></span> says extended programs must be under license A,
and license
+B <span class="inserted"><ins><em>(on program Q)</em></ins></span> says
extended programs must be under license B, they
+have an irreconcilable disagreement; the license of the combined
+program <span class="inserted"><ins><em>which includes code from P plus code
from Q</em></ins></span> would have to be
+A, <em>and</em> it would have to be <span
class="removed"><del><strong>B. This</strong></del></span> <span
class="inserted"><ins><em>B.</p>
+
+<p>This</em></ins></span> is why GPL version 2 is
+incompatible with GPL version 3; it could not be avoided. Likewise,
+the conditions of CC-BY-SA 4.0 would be inherently incompatible with
+those of CC-BY-SA 3.0, and the authors could not have avoided
+this.</p>
+
+<p>There are two approaches for <span
class="removed"><del><strong>smoothing out</strong></del></span> <span
class="inserted"><ins><em>avoiding</em></ins></span> the incompatibility
+<span class="removed"><del><strong>inherent in new</strong></del></span> <span
class="inserted"><ins><em>problem
+caused by different</em></ins></span> versions of copyleft licenses.</p>
<p>The FSF uses the approach of asking people to release programs under
“GNU GPL version N or any later version.” This licensing is
@@ -114,11 +119,13 @@
releasing your code under GNU GPL 3 or later, you permit your code to
upgrade to GNU GPL version 4 if we ever need one.</p>
-<p>The other approach is to make each version of the license explicitly
-allow upgrading to later versions. This is what Creative Commons
-does: for instance, CC-BY-SA version 4.0 (the current version)
-explicitly permits any user to upgrade to later versions of CC-BY-SA
-once those exist. The Mozilla Foundation also uses this approach.</p>
+<p>The other approach is to make each version of the license
+explicitly allow upgrading to later versions. <span
class="removed"><del><strong>This is what</strong></del></span> <span
class="inserted"><ins><em>The Mozilla Foundation
+uses this approach, as does PHP.</em></ins></span> Creative <span
class="removed"><del><strong>Commons
+does:</strong></del></span> <span class="inserted"><ins><em>Commons, uses
it</em></ins></span> for <span class="removed"><del><strong>instance,
CC-BY-SA</strong></del></span>
+<span class="inserted"><ins><em>CC-BY-SA:</em></ins></span> version 4.0 (the
current version) explicitly permits any
+user to upgrade to later versions of CC-BY-SA
+<span class="removed"><del><strong>once those exist. The Mozilla Foundation
also uses this approach.</p></strong></del></span> <span
class="inserted"><ins><em>for modified works.</p></em></ins></span>
<p>Only the GNU licenses give authors a choice about whether to permit
upgrades to future license versions. When I wrote the first version
@@ -131,8 +138,9 @@
<p>Since then, I have come to question the wisdom of that decision.
Programs such as Linux, which allow only one GNU GPL version and
reject license upgrades, cause practical
-incompatibility.<a <span
class="removed"><del><strong>href="#f3">(***)</a></strong></del></span>
<span
class="inserted"><ins><em>href="#f4">(****)</a></em></ins></span>
Perhaps we should include an
-upgrade clause in GPL version 4, if we ever need a version 4.</p>
+incompatibility.<a <span
class="removed"><del><strong>href="#f3">(***)</a>
Perhaps</strong></del></span> <span
class="inserted"><ins><em>href="#f4">(****)</a> If we ever make a GPL
version
+4, perhaps</em></ins></span> we should include an upgrade clause <span
class="removed"><del><strong>in GPL version 4, if we ever need a version
4.</p></strong></del></span> <span class="inserted"><ins><em>that
automatically
+permits relicensing to higher-numbered versions, 5 and
up.</p></em></ins></span>
<p>Some copyleft licenses allow cross-copyleft combinations with an
explicit relicensing clause giving permission to put the code under a
@@ -359,7 +367,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © <span
class="removed"><del><strong>2016</strong></del></span> <span
class="inserted"><ins><em>2016, 2018</em></ins></span> Free Software
Foundation, Inc.</p>
+<p>Copyright © <span
class="removed"><del><strong>2016</strong></del></span> <span
class="inserted"><ins><em>2016, 2018, 2020</em></ins></span> 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
@@ -369,7 +377,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/12/15 14:46:19 $
+$Date: 2020/11/20 16:30:39 $
<!-- timestamp end -->
</p>
</div>
Index: license-compatibility.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.it.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- license-compatibility.it.po 14 Sep 2018 13:58:06 -0000 1.7
+++ license-compatibility.it.po 20 Nov 2020 16:30:39 -0000 1.8
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2018-09-14 12:56+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2016-10-23 15:18+0100\n"
"Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
"Language-Team: Italian <www-it-traduzioni@gnu.org>\n"
@@ -216,18 +216,43 @@
"bsd.html\">non parlare “della” licenza BSD</a>."
#. type: Content of: <p>
+# | In general, two different copyleft licenses are unavoidably incompatible
+# | unless they have explicit compatibility provisions. This is not due to a
+# | mistake in the details; it's inherent in the idea of copyleft. The idea
+# | of copyleft is that “Modified and extended versions must be under
+# | the same license.” If license A {+(on program P)+} says extended
+# | programs must be under license A, and license B {+(on program Q)+} says
+# | extended programs must be under license B, they have an irreconcilable
+# | disagreement; the license of the combined program {+which includes code
+# | from P plus code from Q+} would have to be A, <em>and</em> it would have
+# | to be B. [-This is why GPL version 2 is incompatible with GPL version 3;
+# | it could not be avoided. Likewise, the conditions of CC-BY-SA 4.0 would
+# | be inherently incompatible with those of CC-BY-SA 3.0, and the authors
+# | could not have avoided this.-]
+#, fuzzy
+#| msgid ""
+#| "In general, two different copyleft licenses are unavoidably incompatible "
+#| "unless they have explicit compatibility provisions. This is not due to a "
+#| "mistake in the details; it's inherent in the idea of copyleft. The idea "
+#| "of copyleft is that “Modified and extended versions must be under "
+#| "the same license.” If license A says extended programs must be "
+#| "under license A, and license B says extended programs must be under "
+#| "license B, they have an irreconcilable disagreement; the license of the "
+#| "combined program would have to be A, <em>and</em> it would have to be B. "
+#| "This is why GPL version 2 is incompatible with GPL version 3; it could "
+#| "not be avoided. Likewise, the conditions of CC-BY-SA 4.0 would be "
+#| "inherently incompatible with those of CC-BY-SA 3.0, and the authors could "
+#| "not have avoided this."
msgid ""
"In general, two different copyleft licenses are unavoidably incompatible "
"unless they have explicit compatibility provisions. This is not due to a "
"mistake in the details; it's inherent in the idea of copyleft. The idea of "
"copyleft is that “Modified and extended versions must be under the "
-"same license.” If license A says extended programs must be under "
-"license A, and license B says extended programs must be under license B, "
-"they have an irreconcilable disagreement; the license of the combined "
-"program would have to be A, <em>and</em> it would have to be B. This is why "
-"GPL version 2 is incompatible with GPL version 3; it could not be avoided. "
-"Likewise, the conditions of CC-BY-SA 4.0 would be inherently incompatible "
-"with those of CC-BY-SA 3.0, and the authors could not have avoided this."
+"same license.” If license A (on program P) says extended programs must "
+"be under license A, and license B (on program Q) says extended programs must "
+"be under license B, they have an irreconcilable disagreement; the license of "
+"the combined program which includes code from P plus code from Q would have "
+"to be A, <em>and</em> it would have to be B."
msgstr ""
"Generalmente due diverse licenze copyleft sono inevitabilmente incompatibili "
"a meno che non siano provviste di esplicita clausola di compatibilità . Ciò "
@@ -245,8 +270,23 @@
#. type: Content of: <p>
msgid ""
-"There are two approaches for smoothing out the incompatibility inherent in "
-"new versions of copyleft licenses."
+"This is why GPL version 2 is incompatible with GPL version 3; it could not "
+"be avoided. Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
+"incompatible with those of CC-BY-SA 3.0, and the authors could not have "
+"avoided this."
+msgstr ""
+
+#. type: Content of: <p>
+# | There are two approaches for [-smoothing out-] {+avoiding+} the
+# | incompatibility [-inherent in new-] {+problem caused by different+}
+# | versions of copyleft licenses.
+#, fuzzy
+#| msgid ""
+#| "There are two approaches for smoothing out the incompatibility inherent "
+#| "in new versions of copyleft licenses."
+msgid ""
+"There are two approaches for avoiding the incompatibility problem caused by "
+"different versions of copyleft licenses."
msgstr ""
"Ci sono due modi per evitare l'incompatibilità intrinseca nelle nuove "
"versioni di licenze copyleft."
@@ -283,12 +323,26 @@
"mai un giorno ce ne sarà bisogno."
#. type: Content of: <p>
+# | The other approach is to make each version of the license explicitly allow
+# | upgrading to later versions. [-This is what-] {+The Mozilla Foundation
+# | uses this approach, as does PHP.+} Creative [-Commons does:-] {+Commons,
+# | uses it+} for [-instance, CC-BY-SA-] {+CC-BY-SA:+} version 4.0 (the
+# | current version) explicitly permits any user to upgrade to later versions
+# | of CC-BY-SA [-once those exist. The Mozilla Foundation also uses this
+# | approach.-] {+for modified works.+}
+#, fuzzy
+#| msgid ""
+#| "The other approach is to make each version of the license explicitly "
+#| "allow upgrading to later versions. This is what Creative Commons does: "
+#| "for instance, CC-BY-SA version 4.0 (the current version) explicitly "
+#| "permits any user to upgrade to later versions of CC-BY-SA once those "
+#| "exist. The Mozilla Foundation also uses this approach."
msgid ""
"The other approach is to make each version of the license explicitly allow "
-"upgrading to later versions. This is what Creative Commons does: for "
-"instance, CC-BY-SA version 4.0 (the current version) explicitly permits any "
-"user to upgrade to later versions of CC-BY-SA once those exist. The Mozilla "
-"Foundation also uses this approach."
+"upgrading to later versions. The Mozilla Foundation uses this approach, as "
+"does PHP. Creative Commons, uses it for CC-BY-SA: version 4.0 (the current "
+"version) explicitly permits any user to upgrade to later versions of CC-BY-"
+"SA for modified works."
msgstr ""
"L'altro approccio consiste nel fare in modo che ogni versione della licenza "
"permetta automaticamente l'aggiornamento alle versioni successive. Questo è "
@@ -319,9 +373,11 @@
#. type: Content of: <p>
# | Since then, I have come to question the wisdom of that decision. Programs
# | such as Linux, which allow only one GNU GPL version and reject license
-# | upgrades, cause practical incompatibility.<a [-href=\"#f3\">(***)</a>-]
-# | {+href=\"#f4\">(****)</a>+} Perhaps we should include an upgrade clause in
-# | GPL version 4, if we ever need a version 4.
+# | upgrades, cause practical incompatibility.<a [-href=\"#f3\">(***)</a>
+# | Perhaps-] {+href=\"#f4\">(****)</a> If we ever make a GPL version 4,
+# | perhaps+} we should include an upgrade clause [-in GPL version 4, if we
+# | ever need a version 4.-] {+that automatically permits relicensing to
+# | higher-numbered versions, 5 and up.+}
#, fuzzy
#| msgid ""
#| "Since then, I have come to question the wisdom of that decision. "
@@ -332,9 +388,9 @@
msgid ""
"Since then, I have come to question the wisdom of that decision. Programs "
"such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> Perhaps "
-"we should include an upgrade clause in GPL version 4, if we ever need a "
-"version 4."
+"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
+"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"automatically permits relicensing to higher-numbered versions, 5 and up."
msgstr ""
"Mi è capitato, da allora, di mettere in discussione la saggezza di quella "
"decisione. Programmi come Linux, che permettono una sola versione della GNU "
@@ -830,11 +886,11 @@
"traduzioni</a>."
#. type: Content of: <div><p>
-# | Copyright © [-2015, 2016-] {+2016, 2018+} Free Software Foundation,
-# | Inc.
+# | Copyright © [-2015, 2016-] {+2016, 2018, 2020+} Free Software
+# | Foundation, Inc.
#, fuzzy
#| msgid "Copyright © 2015, 2016 Free Software Foundation, Inc."
-msgid "Copyright © 2016, 2018 Free Software Foundation, Inc."
+msgid "Copyright © 2016, 2018, 2020 Free Software Foundation, Inc."
msgstr "Copyright © 2015, 2016 Free Software Foundation, Inc."
#. type: Content of: <div><p>
Index: license-compatibility.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.pot,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- license-compatibility.pot 14 Sep 2018 12:56:40 -0000 1.4
+++ license-compatibility.pot 20 Nov 2020 16:30:39 -0000 1.5
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2018-09-14 12:56+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -126,19 +126,25 @@
"unless they have explicit compatibility provisions. This is not due to a "
"mistake in the details; it's inherent in the idea of copyleft. The idea of "
"copyleft is that “Modified and extended versions must be under the "
-"same license.” If license A says extended programs must be under "
-"license A, and license B says extended programs must be under license B, "
-"they have an irreconcilable disagreement; the license of the combined "
-"program would have to be A, <em>and</em> it would have to be B. This is why "
-"GPL version 2 is incompatible with GPL version 3; it could not be avoided. "
-"Likewise, the conditions of CC-BY-SA 4.0 would be inherently incompatible "
-"with those of CC-BY-SA 3.0, and the authors could not have avoided this."
+"same license.” If license A (on program P) says extended programs must "
+"be under license A, and license B (on program Q) says extended programs must "
+"be under license B, they have an irreconcilable disagreement; the license of "
+"the combined program which includes code from P plus code from Q would have "
+"to be A, <em>and</em> it would have to be B."
msgstr ""
#. type: Content of: <p>
msgid ""
-"There are two approaches for smoothing out the incompatibility inherent in "
-"new versions of copyleft licenses."
+"This is why GPL version 2 is incompatible with GPL version 3; it could not "
+"be avoided. Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
+"incompatible with those of CC-BY-SA 3.0, and the authors could not have "
+"avoided this."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"There are two approaches for avoiding the incompatibility problem caused by "
+"different versions of copyleft licenses."
msgstr ""
#. type: Content of: <p>
@@ -162,10 +168,10 @@
#. type: Content of: <p>
msgid ""
"The other approach is to make each version of the license explicitly allow "
-"upgrading to later versions. This is what Creative Commons does: for "
-"instance, CC-BY-SA version 4.0 (the current version) explicitly permits any "
-"user to upgrade to later versions of CC-BY-SA once those exist. The Mozilla "
-"Foundation also uses this approach."
+"upgrading to later versions. The Mozilla Foundation uses this approach, as "
+"does PHP. Creative Commons, uses it for CC-BY-SA: version 4.0 (the current "
+"version) explicitly permits any user to upgrade to later versions of "
+"CC-BY-SA for modified works."
msgstr ""
#. type: Content of: <p>
@@ -182,9 +188,9 @@
msgid ""
"Since then, I have come to question the wisdom of that decision. Programs "
"such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> Perhaps "
-"we should include an upgrade clause in GPL version 4, if we ever need a "
-"version 4."
+"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
+"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"automatically permits relicensing to higher-numbered versions, 5 and up."
msgstr ""
#. type: Content of: <p>
@@ -474,7 +480,7 @@
msgstr ""
#. type: Content of: <div><p>
-msgid "Copyright © 2016, 2018 Free Software Foundation, Inc."
+msgid "Copyright © 2016, 2018, 2020 Free Software Foundation, Inc."
msgstr ""
#. type: Content of: <div><p>
Index: license-compatibility.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.ru.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- license-compatibility.ru.po 14 Sep 2018 16:58:49 -0000 1.6
+++ license-compatibility.ru.po 20 Nov 2020 16:30:39 -0000 1.7
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2018-09-14 12:56+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2018-09-14 10:17+0000\n"
"Last-Translator: Ineiev <ineiev@gnu.org>\n"
"Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-11-20 16:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -179,18 +180,43 @@
"единÑÑвенной”) лиÑензии BSD</a>."
#. type: Content of: <p>
+# | In general, two different copyleft licenses are unavoidably incompatible
+# | unless they have explicit compatibility provisions. This is not due to a
+# | mistake in the details; it's inherent in the idea of copyleft. The idea
+# | of copyleft is that “Modified and extended versions must be under
+# | the same license.” If license A {+(on program P)+} says extended
+# | programs must be under license A, and license B {+(on program Q)+} says
+# | extended programs must be under license B, they have an irreconcilable
+# | disagreement; the license of the combined program {+which includes code
+# | from P plus code from Q+} would have to be A, <em>and</em> it would have
+# | to be B. [-This is why GPL version 2 is incompatible with GPL version 3;
+# | it could not be avoided. Likewise, the conditions of CC-BY-SA 4.0 would
+# | be inherently incompatible with those of CC-BY-SA 3.0, and the authors
+# | could not have avoided this.-]
+#, fuzzy
+#| msgid ""
+#| "In general, two different copyleft licenses are unavoidably incompatible "
+#| "unless they have explicit compatibility provisions. This is not due to a "
+#| "mistake in the details; it's inherent in the idea of copyleft. The idea "
+#| "of copyleft is that “Modified and extended versions must be under "
+#| "the same license.” If license A says extended programs must be "
+#| "under license A, and license B says extended programs must be under "
+#| "license B, they have an irreconcilable disagreement; the license of the "
+#| "combined program would have to be A, <em>and</em> it would have to be B. "
+#| "This is why GPL version 2 is incompatible with GPL version 3; it could "
+#| "not be avoided. Likewise, the conditions of CC-BY-SA 4.0 would be "
+#| "inherently incompatible with those of CC-BY-SA 3.0, and the authors could "
+#| "not have avoided this."
msgid ""
"In general, two different copyleft licenses are unavoidably incompatible "
"unless they have explicit compatibility provisions. This is not due to a "
"mistake in the details; it's inherent in the idea of copyleft. The idea of "
"copyleft is that “Modified and extended versions must be under the "
-"same license.” If license A says extended programs must be under "
-"license A, and license B says extended programs must be under license B, "
-"they have an irreconcilable disagreement; the license of the combined "
-"program would have to be A, <em>and</em> it would have to be B. This is why "
-"GPL version 2 is incompatible with GPL version 3; it could not be avoided. "
-"Likewise, the conditions of CC-BY-SA 4.0 would be inherently incompatible "
-"with those of CC-BY-SA 3.0, and the authors could not have avoided this."
+"same license.” If license A (on program P) says extended programs must "
+"be under license A, and license B (on program Q) says extended programs must "
+"be under license B, they have an irreconcilable disagreement; the license of "
+"the combined program which includes code from P plus code from Q would have "
+"to be A, <em>and</em> it would have to be B."
msgstr ""
"РобÑем и Ñелом, две ÑазнÑе лиÑензии Ñ
авÑоÑÑким левом неизбежно "
"неÑовмеÑÑимÑ, еÑли ÑовмеÑÑимоÑÑÑ Ð½Ðµ
оговоÑена в ниÑ
ÑвнÑм обÑазом. ÐÑо не "
@@ -208,8 +234,23 @@
#. type: Content of: <p>
msgid ""
-"There are two approaches for smoothing out the incompatibility inherent in "
-"new versions of copyleft licenses."
+"This is why GPL version 2 is incompatible with GPL version 3; it could not "
+"be avoided. Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
+"incompatible with those of CC-BY-SA 3.0, and the authors could not have "
+"avoided this."
+msgstr ""
+
+#. type: Content of: <p>
+# | There are two approaches for [-smoothing out-] {+avoiding+} the
+# | incompatibility [-inherent in new-] {+problem caused by different+}
+# | versions of copyleft licenses.
+#, fuzzy
+#| msgid ""
+#| "There are two approaches for smoothing out the incompatibility inherent "
+#| "in new versions of copyleft licenses."
+msgid ""
+"There are two approaches for avoiding the incompatibility problem caused by "
+"different versions of copyleft licenses."
msgstr ""
"ЧÑÐ¾Ð±Ñ ÑгладиÑÑ Ð½ÐµÑовмеÑÑимоÑÑÑ, пÑиÑÑÑÑÑ
новÑм веÑÑиÑм лиÑензий Ñ Ð°Ð²ÑоÑÑким "
"левом, еÑÑÑ Ð´Ð²Ð° подÑ
ода."
@@ -244,12 +285,26 @@
"ÑазÑеÑаеÑе обновление до GNU GPL веÑÑии 4,
еÑли она нам поÑÑебÑеÑÑÑ."
#. type: Content of: <p>
+# | The other approach is to make each version of the license explicitly allow
+# | upgrading to later versions. [-This is what-] {+The Mozilla Foundation
+# | uses this approach, as does PHP.+} Creative [-Commons does:-] {+Commons,
+# | uses it+} for [-instance, CC-BY-SA-] {+CC-BY-SA:+} version 4.0 (the
+# | current version) explicitly permits any user to upgrade to later versions
+# | of CC-BY-SA [-once those exist. The Mozilla Foundation also uses this
+# | approach.-] {+for modified works.+}
+#, fuzzy
+#| msgid ""
+#| "The other approach is to make each version of the license explicitly "
+#| "allow upgrading to later versions. This is what Creative Commons does: "
+#| "for instance, CC-BY-SA version 4.0 (the current version) explicitly "
+#| "permits any user to upgrade to later versions of CC-BY-SA once those "
+#| "exist. The Mozilla Foundation also uses this approach."
msgid ""
"The other approach is to make each version of the license explicitly allow "
-"upgrading to later versions. This is what Creative Commons does: for "
-"instance, CC-BY-SA version 4.0 (the current version) explicitly permits any "
-"user to upgrade to later versions of CC-BY-SA once those exist. The Mozilla "
-"Foundation also uses this approach."
+"upgrading to later versions. The Mozilla Foundation uses this approach, as "
+"does PHP. Creative Commons, uses it for CC-BY-SA: version 4.0 (the current "
+"version) explicitly permits any user to upgrade to later versions of CC-BY-"
+"SA for modified works."
msgstr ""
"ÐÑÑгой подÑ
од ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑÐ¾Ð±Ñ Ð²
каждой веÑÑии лиÑензии ÑвнÑм обÑазом "
"допÑÑкаÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ до более поздниÑ
веÑÑий. ÐÑо-Ñо и Ð´ÐµÐ»Ð°ÐµÑ Creative "
@@ -276,12 +331,26 @@
"веÑÑии 1 или более поздней”."
#. type: Content of: <p>
+# | Since then, I have come to question the wisdom of that decision. Programs
+# | such as Linux, which allow only one GNU GPL version and reject license
+# | upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a>
+# | [-Perhaps-] {+If we ever make a GPL version 4, perhaps+} we should include
+# | an upgrade clause [-in GPL version 4, if we ever need a version 4.-]
+# | {+that automatically permits relicensing to higher-numbered versions, 5
+# | and up.+}
+#, fuzzy
+#| msgid ""
+#| "Since then, I have come to question the wisdom of that decision. "
+#| "Programs such as Linux, which allow only one GNU GPL version and reject "
+#| "license upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</"
+#| "a> Perhaps we should include an upgrade clause in GPL version 4, if we "
+#| "ever need a version 4."
msgid ""
"Since then, I have come to question the wisdom of that decision. Programs "
"such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> Perhaps "
-"we should include an upgrade clause in GPL version 4, if we ever need a "
-"version 4."
+"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
+"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"automatically permits relicensing to higher-numbered versions, 5 and up."
msgstr ""
"ÐÑоÑло вÑемÑ, и Ñ ÑÑал ÑомневаÑÑÑÑ Ð²
мÑдÑоÑÑи ÑÑого ÑеÑениÑ. Такие "
"пÑогÑаммÑ, как Linux, коÑоÑÑе допÑÑкаÑÑ
ÑолÑко Ð¾Ð´Ð½Ñ Ð²ÐµÑÑÐ¸Ñ GNU GPL и "
@@ -733,7 +802,11 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-msgid "Copyright © 2016, 2018 Free Software Foundation, Inc."
+# | Copyright © 2016, [-2018-] {+2018, 2020+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid "Copyright © 2016, 2018 Free Software Foundation, Inc."
+msgid "Copyright © 2016, 2018, 2020 Free Software Foundation, Inc."
msgstr "Copyright © 2016, 2018 Free Software Foundation, Inc."
#. type: Content of: <div><p>
Index: license-compatibility.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- license-compatibility.zh-cn.po 27 Jan 2020 14:30:58 -0000 1.4
+++ license-compatibility.zh-cn.po 20 Nov 2020 16:30:39 -0000 1.5
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-compatibility.html\n"
-"POT-Creation-Date: 2018-09-14 12:56+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2020-01-27 21:58+0800\n"
"Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
"Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-11-20 16:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -155,18 +156,30 @@
"a>ã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In general, two different copyleft licenses are unavoidably incompatible "
+#| "unless they have explicit compatibility provisions. This is not due to a "
+#| "mistake in the details; it's inherent in the idea of copyleft. The idea "
+#| "of copyleft is that “Modified and extended versions must be under "
+#| "the same license.” If license A says extended programs must be "
+#| "under license A, and license B says extended programs must be under "
+#| "license B, they have an irreconcilable disagreement; the license of the "
+#| "combined program would have to be A, <em>and</em> it would have to be B. "
+#| "This is why GPL version 2 is incompatible with GPL version 3; it could "
+#| "not be avoided. Likewise, the conditions of CC-BY-SA 4.0 would be "
+#| "inherently incompatible with those of CC-BY-SA 3.0, and the authors could "
+#| "not have avoided this."
msgid ""
"In general, two different copyleft licenses are unavoidably incompatible "
"unless they have explicit compatibility provisions. This is not due to a "
"mistake in the details; it's inherent in the idea of copyleft. The idea of "
"copyleft is that “Modified and extended versions must be under the "
-"same license.” If license A says extended programs must be under "
-"license A, and license B says extended programs must be under license B, "
-"they have an irreconcilable disagreement; the license of the combined "
-"program would have to be A, <em>and</em> it would have to be B. This is why "
-"GPL version 2 is incompatible with GPL version 3; it could not be avoided. "
-"Likewise, the conditions of CC-BY-SA 4.0 would be inherently incompatible "
-"with those of CC-BY-SA 3.0, and the authors could not have avoided this."
+"same license.” If license A (on program P) says extended programs must "
+"be under license A, and license B (on program Q) says extended programs must "
+"be under license B, they have an irreconcilable disagreement; the license of "
+"the combined program which includes code from P plus code from Q would have "
+"to be A, <em>and</em> it would have to be B."
msgstr ""
"ä¸è¬æ¥è¯´ï¼ä¸¤ä¸ªä¸åç copyleft 许å¯è¯æ¯æ å¯é¿å
çä¸å
¼å®¹ï¼é¤é两è
ä¹é´ææç¡®ç"
"å
¼å®¹æ¡æ¬¾ãè¿ä¸æ¯å 为ç»èæ误ï¼è¿æ¯ copyleft
ç念ä¸ç俱æ¥çç¹ç¹ãcopyleft çç"
@@ -178,8 +191,20 @@
#. type: Content of: <p>
msgid ""
-"There are two approaches for smoothing out the incompatibility inherent in "
-"new versions of copyleft licenses."
+"This is why GPL version 2 is incompatible with GPL version 3; it could not "
+"be avoided. Likewise, the conditions of CC-BY-SA 4.0 would be inherently "
+"incompatible with those of CC-BY-SA 3.0, and the authors could not have "
+"avoided this."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "There are two approaches for smoothing out the incompatibility inherent "
+#| "in new versions of copyleft licenses."
+msgid ""
+"There are two approaches for avoiding the incompatibility problem caused by "
+"different versions of copyleft licenses."
msgstr "æ两个æ¹æ³æ¥æè±æ°ç copyleft 许å¯è¯å¸¦æ¥çå
天ä¸å
¼å®¹æ§ã"
#. type: Content of: <p>
@@ -209,12 +234,19 @@
"å° GNU GPL v4ï¼ä¸æ¦æ们åå¸äº v4ã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The other approach is to make each version of the license explicitly "
+#| "allow upgrading to later versions. This is what Creative Commons does: "
+#| "for instance, CC-BY-SA version 4.0 (the current version) explicitly "
+#| "permits any user to upgrade to later versions of CC-BY-SA once those "
+#| "exist. The Mozilla Foundation also uses this approach."
msgid ""
"The other approach is to make each version of the license explicitly allow "
-"upgrading to later versions. This is what Creative Commons does: for "
-"instance, CC-BY-SA version 4.0 (the current version) explicitly permits any "
-"user to upgrade to later versions of CC-BY-SA once those exist. The Mozilla "
-"Foundation also uses this approach."
+"upgrading to later versions. The Mozilla Foundation uses this approach, as "
+"does PHP. Creative Commons, uses it for CC-BY-SA: version 4.0 (the current "
+"version) explicitly permits any user to upgrade to later versions of CC-BY-"
+"SA for modified works."
msgstr ""
"å¦ä¸ä¸ªæ¹æ³æ¯è®©æ¯ä¸ä¸ªçæ¬é½æç¡®å
许å级å°ä»¥åççæ¬ãè¿å°±æ¯ Creative Commons "
"éç¨çåæ³ï¼ä¾å¦ï¼CC-BY-SA 4.0 çï¼å½åçï¼æç¡®å
许任ä½ç¨æ·å°è®¸å¯è¯å级å°ä»¥å"
@@ -236,12 +268,19 @@
"å¸ã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Since then, I have come to question the wisdom of that decision. "
+#| "Programs such as Linux, which allow only one GNU GPL version and reject "
+#| "license upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</"
+#| "a> Perhaps we should include an upgrade clause in GPL version 4, if we "
+#| "ever need a version 4."
msgid ""
"Since then, I have come to question the wisdom of that decision. Programs "
"such as Linux, which allow only one GNU GPL version and reject license "
-"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> Perhaps "
-"we should include an upgrade clause in GPL version 4, if we ever need a "
-"version 4."
+"upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a> If we "
+"ever make a GPL version 4, perhaps we should include an upgrade clause that "
+"automatically permits relicensing to higher-numbered versions, 5 and up."
msgstr ""
"ä»é£æ¶èµ·ï¼æå°±å¨æéå½æ¶çå³å®æ¯å¦ææºãå Linux è¿æ
·çç¨åºï¼åªå
许ä¸ä¸ªçæ¬"
"ç GNU GPL 并æç»å级许å¯è¯ï¼è¿å°±å¯¼è´å®é
ä¸çä¸å
¼å®¹ã<a
href=\"#f4\">(****)</"
@@ -627,7 +666,9 @@
"a>ã"
#. type: Content of: <div><p>
-msgid "Copyright © 2016, 2018 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright © 2016, 2018 Free Software Foundation, Inc."
+msgid "Copyright © 2016, 2018, 2020 Free Software Foundation, Inc."
msgstr "Copyright © 2016, 2018 Free Software Foundation, Inc."
#. type: Content of: <div><p>
Index: license-recommendations.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.es.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- license-recommendations.es.po 29 Dec 2019 11:00:52 -0000 1.19
+++ license-recommendations.es.po 20 Nov 2020 16:30:39 -0000 1.20
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2019-12-28 07:57+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2019-12-29 11:42+0100\n"
"Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
"Language-Team: Spanish <www-es-general@gnu.org>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-11-20 16:25+0000\n"
"X-Generator: Poedit 2.2.1\n"
#. type: Content of: <title>
@@ -174,13 +175,37 @@
"generalmente se lo considera como la mejor estrategia de licenciamiento."
#. type: Content of: <p>
+# | For most programs, we recommend that you use the most recent version of
+# | the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a>
+# | for your project. Its strong copyleft is appropriate for all kinds of
+# | software, and includes numerous protections for users' freedom. [-Please
+# | give permission to use-] {+To allow for+} future license [-versions as
+# | well—in other words, make the license notice say-] {+upgrades, <a
+# | href=\"/licenses/identify-licenses-clearly.html\"> please specify
+# | “version 3 or any later version”</a> so+} that your program
+# | [-is covered by-] {+will be <a
+# | href=\"/licenses/license-compatibility.html\"> license-compatible</a> with
+# | code that may be released, in the future, under subsequent+} GPL [-version
+# | 3 or later.-] {+versions.+}
+#, fuzzy
+#| msgid ""
+#| "For most programs, we recommend that you use the most recent version of "
+#| "the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> "
+#| "for your project. Its strong copyleft is appropriate for all kinds of "
+#| "software, and includes numerous protections for users' freedom. Please "
+#| "give permission to use future license versions as well—in other "
+#| "words, make the license notice say that your program is covered by GPL "
+#| "version 3 or later."
msgid ""
"For most programs, we recommend that you use the most recent version of the "
"<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
"project. Its strong copyleft is appropriate for all kinds of software, and "
-"includes numerous protections for users' freedom. Please give permission to "
-"use future license versions as well—in other words, make the license "
-"notice say that your program is covered by GPL version 3 or later."
+"includes numerous protections for users' freedom. To allow for future "
+"license upgrades, <a href=\"/licenses/identify-licenses-clearly.html\"> "
+"please specify “version 3 or any later version”</a> so that your "
+"program will be <a href=\"/licenses/license-compatibility.html\"> license-"
+"compatible</a> with code that may be released, in the future, under "
+"subsequent GPL versions."
msgstr ""
"Para la mayorÃa de los programas recomendamos utilizar la versión más "
"reciente de la <a href=\"/licenses/gpl.html\">Licencia Pública General de "
@@ -226,15 +251,36 @@
"al software."
#. type: Content of: <p>
+# | For those programs, we recommend the <a
+# | href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License
+# | 2.0</a>. This is a [-pushover-] {+weak, lax, \"pushover\"+}
+# | (non-copyleft) software license that has terms to prevent contributors
+# | and distributors from suing for patent infringement. This doesn't make
+# | the software immune to threats from patents [-(a-] {+(no+} software
+# | license [-can't do-] {+can achieve+} that), but it does prevent patent
+# | holders from setting up a “bait and switch” where they release
+# | the software under free terms then require recipients to agree to nonfree
+# | terms in a patent license.
+#, fuzzy
+#| msgid ""
+#| "For those programs, we recommend the <a href=\"http://www.apache.org/";
+#| "licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
+#| "copyleft) software license that has terms to prevent contributors and "
+#| "distributors from suing for patent infringement. This doesn't make the "
+#| "software immune to threats from patents (a software license can't do "
+#| "that), but it does prevent patent holders from setting up a “bait "
+#| "and switch” where they release the software under free terms then "
+#| "require recipients to agree to nonfree terms in a patent license."
msgid ""
"For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
-"copyleft) software license that has terms to prevent contributors and "
-"distributors from suing for patent infringement. This doesn't make the "
-"software immune to threats from patents (a software license can't do that), "
-"but it does prevent patent holders from setting up a “bait and "
-"switch” where they release the software under free terms then require "
-"recipients to agree to nonfree terms in a patent license."
+"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a weak, lax, "
+"\"pushover\" (non-copyleft) software license that has terms to prevent "
+"contributors and distributors from suing for patent infringement. This "
+"doesn't make the software immune to threats from patents (no software "
+"license can achieve that), but it does prevent patent holders from setting "
+"up a “bait and switch” where they release the software under "
+"free terms then require recipients to agree to nonfree terms in a patent "
+"license."
msgstr ""
"Para esos programas recomendamos la <a href=\"http://www.apache.org/licenses/";
"LICENSE-2.0\">Licencia Apache 2.0</a>. Se trata de una licencia de software "
@@ -247,9 +293,17 @@
"son libres."
#. type: Content of: <p>
+# | Among the [-lax pushover-] {+weak (pushover)+} licenses, Apache 2.0 is
+# | best; so if you are going to use a [-lax pushover-] {+weak+} license,
+# | whatever the reason, we recommend using that one.
+#, fuzzy
+#| msgid ""
+#| "Among the lax pushover licenses, Apache 2.0 is best; so if you are going "
+#| "to use a lax pushover license, whatever the reason, we recommend using "
+#| "that one."
msgid ""
-"Among the lax pushover licenses, Apache 2.0 is best; so if you are going to "
-"use a lax pushover license, whatever the reason, we recommend using that one."
+"Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
+"to use a weak license, whatever the reason, we recommend using that one."
msgstr ""
"Entre las licencias permisivas, la Apache 2.0 es la mejor. Asà que, si por "
"cualquier motivo va a emplear una licencia permisiva, esta es la que "
@@ -583,9 +637,15 @@
"coordinación y el envÃo de traducciones de las páginas de este sitio web."
#. type: Content of: <div><p>
+# | Copyright © 2011, 2013, 2014, 2015, 2017, 2018, [-2019-] {+2019,
+# | 2020+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
msgid ""
-"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-"Foundation, Inc."
+"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
+"Software Foundation, Inc."
msgstr ""
"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
"Foundation, Inc."
Index: license-recommendations.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.fr.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- license-recommendations.fr.po 28 Dec 2019 13:19:52 -0000 1.41
+++ license-recommendations.fr.po 20 Nov 2020 16:30:39 -0000 1.42
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2019-12-28 07:57+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2019-12-28 14:18+0100\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <trad-gnu@april.org>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-11-20 16:25+0000\n"
"Plural-Forms: \n"
"X-Generator: Gtranslator 2.91.5\n"
@@ -175,13 +176,37 @@
"c'est généralement la meilleure stratégie en matière de licence."
#. type: Content of: <p>
+# | For most programs, we recommend that you use the most recent version of
+# | the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a>
+# | for your project. Its strong copyleft is appropriate for all kinds of
+# | software, and includes numerous protections for users' freedom. [-Please
+# | give permission to use-] {+To allow for+} future license [-versions as
+# | well—in other words, make the license notice say-] {+upgrades, <a
+# | href=\"/licenses/identify-licenses-clearly.html\"> please specify
+# | “version 3 or any later version”</a> so+} that your program
+# | [-is covered by-] {+will be <a
+# | href=\"/licenses/license-compatibility.html\"> license-compatible</a> with
+# | code that may be released, in the future, under subsequent+} GPL [-version
+# | 3 or later.-] {+versions.+}
+#, fuzzy
+#| msgid ""
+#| "For most programs, we recommend that you use the most recent version of "
+#| "the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> "
+#| "for your project. Its strong copyleft is appropriate for all kinds of "
+#| "software, and includes numerous protections for users' freedom. Please "
+#| "give permission to use future license versions as well—in other "
+#| "words, make the license notice say that your program is covered by GPL "
+#| "version 3 or later."
msgid ""
"For most programs, we recommend that you use the most recent version of the "
"<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
"project. Its strong copyleft is appropriate for all kinds of software, and "
-"includes numerous protections for users' freedom. Please give permission to "
-"use future license versions as well—in other words, make the license "
-"notice say that your program is covered by GPL version 3 or later."
+"includes numerous protections for users' freedom. To allow for future "
+"license upgrades, <a href=\"/licenses/identify-licenses-clearly.html\"> "
+"please specify “version 3 or any later version”</a> so that your "
+"program will be <a href=\"/licenses/license-compatibility.html\"> license-"
+"compatible</a> with code that may be released, in the future, under "
+"subsequent GPL versions."
msgstr ""
"Pour la plupart des programmes, nous vous recommandons d'utiliser la version "
"la plus récente de la <a href=\"/licenses/gpl.html\">licence publique "
@@ -227,15 +252,36 @@
"qu'une copie de la licence accompagne toujours le logiciel."
#. type: Content of: <p>
+# | For those programs, we recommend the <a
+# | href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License
+# | 2.0</a>. This is a [-pushover-] {+weak, lax, \"pushover\"+}
+# | (non-copyleft) software license that has terms to prevent contributors
+# | and distributors from suing for patent infringement. This doesn't make
+# | the software immune to threats from patents [-(a-] {+(no+} software
+# | license [-can't do-] {+can achieve+} that), but it does prevent patent
+# | holders from setting up a “bait and switch” where they release
+# | the software under free terms then require recipients to agree to nonfree
+# | terms in a patent license.
+#, fuzzy
+#| msgid ""
+#| "For those programs, we recommend the <a href=\"http://www.apache.org/";
+#| "licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
+#| "copyleft) software license that has terms to prevent contributors and "
+#| "distributors from suing for patent infringement. This doesn't make the "
+#| "software immune to threats from patents (a software license can't do "
+#| "that), but it does prevent patent holders from setting up a “bait "
+#| "and switch” where they release the software under free terms then "
+#| "require recipients to agree to nonfree terms in a patent license."
msgid ""
"For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
-"copyleft) software license that has terms to prevent contributors and "
-"distributors from suing for patent infringement. This doesn't make the "
-"software immune to threats from patents (a software license can't do that), "
-"but it does prevent patent holders from setting up a “bait and "
-"switch” where they release the software under free terms then require "
-"recipients to agree to nonfree terms in a patent license."
+"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a weak, lax, "
+"\"pushover\" (non-copyleft) software license that has terms to prevent "
+"contributors and distributors from suing for patent infringement. This "
+"doesn't make the software immune to threats from patents (no software "
+"license can achieve that), but it does prevent patent holders from setting "
+"up a “bait and switch” where they release the software under "
+"free terms then require recipients to agree to nonfree terms in a patent "
+"license."
msgstr ""
"Pour ces programmes, nous recommandons la <a href=\"http://www.apache.org/";
"licenses/LICENSE-2.0\">licence Apache 2.0</a>. C'est une licence de logiciel "
@@ -248,9 +294,17 @@
"de brevet."
#. type: Content of: <p>
+# | Among the [-lax pushover-] {+weak (pushover)+} licenses, Apache 2.0 is
+# | best; so if you are going to use a [-lax pushover-] {+weak+} license,
+# | whatever the reason, we recommend using that one.
+#, fuzzy
+#| msgid ""
+#| "Among the lax pushover licenses, Apache 2.0 is best; so if you are going "
+#| "to use a lax pushover license, whatever the reason, we recommend using "
+#| "that one."
msgid ""
-"Among the lax pushover licenses, Apache 2.0 is best; so if you are going to "
-"use a lax pushover license, whatever the reason, we recommend using that one."
+"Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
+"to use a weak license, whatever the reason, we recommend using that one."
msgstr ""
"La licence Apache 2.0 est la meilleure des licences très laxistes ; si donc
"
"vous allez utiliser une licence très laxiste pour une raison quelconque, "
@@ -590,9 +644,15 @@
"README.translations.html\">guide de traduction</a>."
#. type: Content of: <div><p>
+# | Copyright © 2011, 2013, 2014, 2015, 2017, 2018, [-2019-] {+2019,
+# | 2020+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
msgid ""
-"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-"Foundation, Inc."
+"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
+"Software Foundation, Inc."
msgstr ""
"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
"Foundation, Inc."
Index: license-recommendations.it-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.it-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- license-recommendations.it-diff.html 28 Dec 2019 08:02:02 -0000
1.4
+++ license-recommendations.it-diff.html 20 Nov 2020 16:30:39 -0000
1.5
@@ -95,9 +95,13 @@
version of the <a href="/licenses/gpl.html">GNU General Public License
(GPL)</a> for your project. Its strong copyleft is appropriate for
all kinds of software, and includes numerous protections for users'
-freedom. Please give permission to use future license versions as
-well—in other words, make the license notice say that your
-program is covered by GPL version 3 or later.</p>
+freedom. <span class="removed"><del><strong>Please give permission to
use</strong></del></span> <span class="inserted"><ins><em>To allow
for</em></ins></span> future license <span
class="removed"><del><strong>versions as
+well—in other words, make the license notice say</strong></del></span>
+<span class="inserted"><ins><em>upgrades, <a
href="/licenses/identify-licenses-clearly.html"> please
+specify “version 3 or any later version”</a>
so</em></ins></span> that your
+program <span class="removed"><del><strong>is covered by</strong></del></span>
<span class="inserted"><ins><em>will be <a
href="/licenses/license-compatibility.html">
+license-compatible</a> with code that may be released, in the future,
+under subsequent</em></ins></span> GPL <span
class="removed"><del><strong>version 3 or
later.</p></strong></del></span> <span
class="inserted"><ins><em>versions.</p></em></ins></span>
<p>Here is more advice about <a href="/licenses/gpl-howto.html">how
to release a program under the GNU GPL</a>.</p>
@@ -115,16 +119,17 @@
<p>For those programs, we recommend
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-License 2.0</a>. This is a pushover (non-copyleft) software license
+License 2.0</a>. This is a <span
class="removed"><del><strong>pushover</strong></del></span> <span
class="inserted"><ins><em>weak, lax, "pushover"</em></ins></span> (non-copyleft)
+software license
that has terms to prevent contributors and distributors from suing for
patent infringement. This doesn't make the software immune to threats
-from patents (a software license can't do that), but it does prevent
+from patents <span class="removed"><del><strong>(a</strong></del></span> <span
class="inserted"><ins><em>(no</em></ins></span> software license <span
class="removed"><del><strong>can't do</strong></del></span> <span
class="inserted"><ins><em>can achieve</em></ins></span> that), but it does
prevent
patent holders from setting up a “bait and switch” where
they release the software under free terms then require recipients to
agree to nonfree terms in a patent license.</p>
-<p>Among the lax pushover licenses, Apache 2.0 is best; so if you
-are going to use a lax pushover license, whatever the reason,
+<p>Among the <span class="removed"><del><strong>lax
pushover</strong></del></span> <span class="inserted"><ins><em>weak
(pushover)</em></ins></span> licenses, Apache 2.0 is best; so if you
+are going to use a <span class="removed"><del><strong>lax
pushover</strong></del></span> <span
class="inserted"><ins><em>weak</em></ins></span> license, whatever the reason,
we recommend using that one.</p>
<h4 id="libraries">Libraries</h4>
@@ -302,7 +307,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, <span
class="removed"><del><strong>2018</strong></del></span> <span
class="inserted"><ins><em>2018, 2019</em></ins></span> Free Software
Foundation, Inc.</p>
+<p>Copyright © 2011, 2013, 2014, 2015, 2017, <span
class="removed"><del><strong>2018</strong></del></span> <span
class="inserted"><ins><em>2018, 2019, 2020</em></ins></span> 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
@@ -312,7 +317,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/12/28 08:02:02 $
+$Date: 2020/11/20 16:30:39 $
<!-- timestamp end -->
</p>
</div>
Index: license-recommendations.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.it.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- license-recommendations.it.po 28 Dec 2019 08:02:02 -0000 1.19
+++ license-recommendations.it.po 20 Nov 2020 16:30:40 -0000 1.20
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2019-12-28 07:57+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2018-01-20 19:54+0100\n"
"Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
"Language-Team: Italian <www-it-traduzioni@gnu.org>\n"
@@ -177,13 +177,37 @@
"strategia di licenza."
#. type: Content of: <p>
+# | For most programs, we recommend that you use the most recent version of
+# | the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a>
+# | for your project. Its strong copyleft is appropriate for all kinds of
+# | software, and includes numerous protections for users' freedom. [-Please
+# | give permission to use-] {+To allow for+} future license [-versions as
+# | well—in other words, make the license notice say-] {+upgrades, <a
+# | href=\"/licenses/identify-licenses-clearly.html\"> please specify
+# | “version 3 or any later version”</a> so+} that your program
+# | [-is covered by-] {+will be <a
+# | href=\"/licenses/license-compatibility.html\"> license-compatible</a> with
+# | code that may be released, in the future, under subsequent+} GPL [-version
+# | 3 or later.-] {+versions.+}
+#, fuzzy
+#| msgid ""
+#| "For most programs, we recommend that you use the most recent version of "
+#| "the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> "
+#| "for your project. Its strong copyleft is appropriate for all kinds of "
+#| "software, and includes numerous protections for users' freedom. Please "
+#| "give permission to use future license versions as well—in other "
+#| "words, make the license notice say that your program is covered by GPL "
+#| "version 3 or later."
msgid ""
"For most programs, we recommend that you use the most recent version of the "
"<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
"project. Its strong copyleft is appropriate for all kinds of software, and "
-"includes numerous protections for users' freedom. Please give permission to "
-"use future license versions as well—in other words, make the license "
-"notice say that your program is covered by GPL version 3 or later."
+"includes numerous protections for users' freedom. To allow for future "
+"license upgrades, <a href=\"/licenses/identify-licenses-clearly.html\"> "
+"please specify “version 3 or any later version”</a> so that your "
+"program will be <a href=\"/licenses/license-compatibility.html\"> license-"
+"compatible</a> with code that may be released, in the future, under "
+"subsequent GPL versions."
msgstr ""
"Per la maggior parte dei programmi, consigliamo l'utilizzo della versione "
"più recente della <a href=\"/licenses/gpl.html\">GNU General Public License "
@@ -228,15 +252,36 @@
"sempre distribuito con una copia della licenza."
#. type: Content of: <p>
+# | For those programs, we recommend the <a
+# | href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License
+# | 2.0</a>. This is a [-pushover-] {+weak, lax, \"pushover\"+}
+# | (non-copyleft) software license that has terms to prevent contributors
+# | and distributors from suing for patent infringement. This doesn't make
+# | the software immune to threats from patents [-(a-] {+(no+} software
+# | license [-can't do-] {+can achieve+} that), but it does prevent patent
+# | holders from setting up a “bait and switch” where they release
+# | the software under free terms then require recipients to agree to nonfree
+# | terms in a patent license.
+#, fuzzy
+#| msgid ""
+#| "For those programs, we recommend the <a href=\"http://www.apache.org/";
+#| "licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
+#| "copyleft) software license that has terms to prevent contributors and "
+#| "distributors from suing for patent infringement. This doesn't make the "
+#| "software immune to threats from patents (a software license can't do "
+#| "that), but it does prevent patent holders from setting up a “bait "
+#| "and switch” where they release the software under free terms then "
+#| "require recipients to agree to nonfree terms in a patent license."
msgid ""
"For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
-"copyleft) software license that has terms to prevent contributors and "
-"distributors from suing for patent infringement. This doesn't make the "
-"software immune to threats from patents (a software license can't do that), "
-"but it does prevent patent holders from setting up a “bait and "
-"switch” where they release the software under free terms then require "
-"recipients to agree to nonfree terms in a patent license."
+"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a weak, lax, "
+"\"pushover\" (non-copyleft) software license that has terms to prevent "
+"contributors and distributors from suing for patent infringement. This "
+"doesn't make the software immune to threats from patents (no software "
+"license can achieve that), but it does prevent patent holders from setting "
+"up a “bait and switch” where they release the software under "
+"free terms then require recipients to agree to nonfree terms in a patent "
+"license."
msgstr ""
"Per quei programmi, consigliamo la <a href=\"http://www.apache.org/licenses/";
"LICENSE-2.0\">Licenza Apache 2.0</a>, una licenza non copyleft che ha il "
@@ -248,9 +293,17 @@
"termini non liberi nella licenza del brevetto."
#. type: Content of: <p>
+# | Among the [-lax pushover-] {+weak (pushover)+} licenses, Apache 2.0 is
+# | best; so if you are going to use a [-lax pushover-] {+weak+} license,
+# | whatever the reason, we recommend using that one.
+#, fuzzy
+#| msgid ""
+#| "Among the lax pushover licenses, Apache 2.0 is best; so if you are going "
+#| "to use a lax pushover license, whatever the reason, we recommend using "
+#| "that one."
msgid ""
-"Among the lax pushover licenses, Apache 2.0 is best; so if you are going to "
-"use a lax pushover license, whatever the reason, we recommend using that one."
+"Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
+"to use a weak license, whatever the reason, we recommend using that one."
msgstr ""
"Tra le licenze permissive, Apache 2.0 è la migliore; se avete deciso per un "
"qualsiasi motivo di usare una licenza permissiva, è questa che raccomandiamo
"
@@ -589,15 +642,15 @@
"traduzioni</a>."
#. type: Content of: <div><p>
-# | Copyright © 2011, 2013, 2014, 2015, 2017, [-2018-] {+2018, 2019+}
-# | Free Software Foundation, Inc.
+# | Copyright © 2011, 2013, 2014, 2015, 2017, [-2018-] {+2018, 2019,
+# | 2020+} Free Software Foundation, Inc.
#, fuzzy
#| msgid ""
#| "Copyright © 2011, 2013, 2014, 2015, 2017, 2018 Free Software "
#| "Foundation, Inc."
msgid ""
-"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-"Foundation, Inc."
+"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
+"Software Foundation, Inc."
msgstr ""
"Copyright © 2011, 2013, 2014, 2015, 2017, 2018 Free Software "
"Foundation, Inc."
Index: license-recommendations.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ja.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- license-recommendations.ja.po 31 Dec 2019 05:59:08 -0000 1.37
+++ license-recommendations.ja.po 20 Nov 2020 16:30:40 -0000 1.38
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2019-12-28 07:57+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2019-12-31 10:29+0900\n"
"Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
"Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-11-20 16:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -167,13 +168,25 @@
"ã«ããªããä¸è¬çã«ããããã£ã¨ãããã©ã¤ã»ã³ã¹ã®æ¦ç¥ãªã®ãã説æãã¾ãã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For most programs, we recommend that you use the most recent version of "
+#| "the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> "
+#| "for your project. Its strong copyleft is appropriate for all kinds of "
+#| "software, and includes numerous protections for users' freedom. Please "
+#| "give permission to use future license versions as well—in other "
+#| "words, make the license notice say that your program is covered by GPL "
+#| "version 3 or later."
msgid ""
"For most programs, we recommend that you use the most recent version of the "
"<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
"project. Its strong copyleft is appropriate for all kinds of software, and "
-"includes numerous protections for users' freedom. Please give permission to "
-"use future license versions as well—in other words, make the license "
-"notice say that your program is covered by GPL version 3 or later."
+"includes numerous protections for users' freedom. To allow for future "
+"license upgrades, <a href=\"/licenses/identify-licenses-clearly.html\"> "
+"please specify “version 3 or any later version”</a> so that your "
+"program will be <a href=\"/licenses/license-compatibility.html\"> license-"
+"compatible</a> with code that may be released, in the future, under "
+"subsequent GPL versions."
msgstr ""
"ã»ã¨ãã©ã®ããã°ã©ã
ã«ã¯ãããããã¡ã¯ææ°ã®ãã¼ã¸ã§ã³ã®<a href=\"/licenses/"
"gpl.html\">GNUä¸è¬å
¬è¡ã©ã¤ã»ã³ã¹(GPL)</a>ã使ããã¨ãæ¨å¥¨ãã¾ãããã®å¼·ãã³"
@@ -215,15 +228,26 @@
"ãããã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For those programs, we recommend the <a href=\"http://www.apache.org/";
+#| "licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
+#| "copyleft) software license that has terms to prevent contributors and "
+#| "distributors from suing for patent infringement. This doesn't make the "
+#| "software immune to threats from patents (a software license can't do "
+#| "that), but it does prevent patent holders from setting up a “bait "
+#| "and switch” where they release the software under free terms then "
+#| "require recipients to agree to nonfree terms in a patent license."
msgid ""
"For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
-"copyleft) software license that has terms to prevent contributors and "
-"distributors from suing for patent infringement. This doesn't make the "
-"software immune to threats from patents (a software license can't do that), "
-"but it does prevent patent holders from setting up a “bait and "
-"switch” where they release the software under free terms then require "
-"recipients to agree to nonfree terms in a patent license."
+"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a weak, lax, "
+"\"pushover\" (non-copyleft) software license that has terms to prevent "
+"contributors and distributors from suing for patent infringement. This "
+"doesn't make the software immune to threats from patents (no software "
+"license can achieve that), but it does prevent patent holders from setting "
+"up a “bait and switch” where they release the software under "
+"free terms then require recipients to agree to nonfree terms in a patent "
+"license."
msgstr ""
"ãã®ãããªããã°ã©ã ã«ã¯ã<a
href=\"http://www.apache.org/licenses/";
"LICENSE-2.0\">Apacheã©ã¤ã»ã³ã¹2.0</a>ãããããã¡ã¯æ¨å¥¨ãã¾ããããã¯çã(ã³"
@@ -235,9 +259,14 @@
"ãåæ³ããè¨å®ãããã¨ãé²ãã¾ãã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Among the lax pushover licenses, Apache 2.0 is best; so if you are going "
+#| "to use a lax pushover license, whatever the reason, we recommend using "
+#| "that one."
msgid ""
-"Among the lax pushover licenses, Apache 2.0 is best; so if you are going to "
-"use a lax pushover license, whatever the reason, we recommend using that one."
+"Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
+"to use a weak license, whatever the reason, we recommend using that one."
msgstr ""
"ç·©ãçãã©ã¤ã»ã³ã¹ã®ä¸ã§ãApache
2.0ããã£ã¨ããããã®ã§ããçç±ã¯ã¨ãããç·©"
"ãçãã©ã¤ã»ã³ã¹ã使ãå
´åã«ã¯ãããããã¡ã¯ãããã使ããã¨ãæ¨å¥¨ãã¾ãã"
@@ -546,9 +575,13 @@
"README.translations.html\">翻訳 README</a>ãã覧ãã ããã"
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
msgid ""
-"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-"Foundation, Inc."
+"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
+"Software Foundation, Inc."
msgstr ""
"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
"Foundation, Inc."
Index: license-recommendations.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.pot,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- license-recommendations.pot 28 Dec 2019 08:02:02 -0000 1.27
+++ license-recommendations.pot 20 Nov 2020 16:30:40 -0000 1.28
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2019-12-28 07:57+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -126,9 +126,12 @@
"For most programs, we recommend that you use the most recent version of the "
"<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
"project. Its strong copyleft is appropriate for all kinds of software, and "
-"includes numerous protections for users' freedom. Please give permission to "
-"use future license versions as well—in other words, make the license "
-"notice say that your program is covered by GPL version 3 or later."
+"includes numerous protections for users' freedom. To allow for future "
+"license upgrades, <a href=\"/licenses/identify-licenses-clearly.html\"> "
+"please specify “version 3 or any later version”</a> so that your "
+"program will be <a href=\"/licenses/license-compatibility.html\"> "
+"license-compatible</a> with code that may be released, in the future, under "
+"subsequent GPL versions."
msgstr ""
#. type: Content of: <p>
@@ -160,19 +163,19 @@
msgid ""
"For those programs, we recommend the <a "
"href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License 2.0</a>. "
-"This is a pushover (non-copyleft) software license that has terms to prevent "
-"contributors and distributors from suing for patent infringement. This "
-"doesn't make the software immune to threats from patents (a software license "
-"can't do that), but it does prevent patent holders from setting up a "
-"“bait and switch” where they release the software under free "
-"terms then require recipients to agree to nonfree terms in a patent license."
+"This is a weak, lax, \"pushover\" (non-copyleft) software license that has "
+"terms to prevent contributors and distributors from suing for patent "
+"infringement. This doesn't make the software immune to threats from patents "
+"(no software license can achieve that), but it does prevent patent holders "
+"from setting up a “bait and switch” where they release the "
+"software under free terms then require recipients to agree to nonfree terms "
+"in a patent license."
msgstr ""
#. type: Content of: <p>
msgid ""
-"Among the lax pushover licenses, Apache 2.0 is best; so if you are going to "
-"use a lax pushover license, whatever the reason, we recommend using that "
-"one."
+"Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
+"to use a weak license, whatever the reason, we recommend using that one."
msgstr ""
#. type: Content of: <h4>
@@ -386,8 +389,8 @@
#. type: Content of: <div><p>
msgid ""
-"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-"Foundation, Inc."
+"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
+"Software Foundation, Inc."
msgstr ""
#. type: Content of: <div><p>
Index: license-recommendations.pt-br.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.pt-br.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- license-recommendations.pt-br.po 22 May 2020 22:05:19 -0000 1.22
+++ license-recommendations.pt-br.po 20 Nov 2020 16:30:40 -0000 1.23
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2019-12-28 07:57+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2019-12-31 07:21-0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -13,6 +13,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-11-20 16:25+0000\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Virtaal 1.0.0-beta1\n"
@@ -172,13 +173,25 @@
"estratégia de licenciamento."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For most programs, we recommend that you use the most recent version of "
+#| "the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> "
+#| "for your project. Its strong copyleft is appropriate for all kinds of "
+#| "software, and includes numerous protections for users' freedom. Please "
+#| "give permission to use future license versions as well—in other "
+#| "words, make the license notice say that your program is covered by GPL "
+#| "version 3 or later."
msgid ""
"For most programs, we recommend that you use the most recent version of the "
"<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
"project. Its strong copyleft is appropriate for all kinds of software, and "
-"includes numerous protections for users' freedom. Please give permission to "
-"use future license versions as well—in other words, make the license "
-"notice say that your program is covered by GPL version 3 or later."
+"includes numerous protections for users' freedom. To allow for future "
+"license upgrades, <a href=\"/licenses/identify-licenses-clearly.html\"> "
+"please specify “version 3 or any later version”</a> so that your "
+"program will be <a href=\"/licenses/license-compatibility.html\"> license-"
+"compatible</a> with code that may be released, in the future, under "
+"subsequent GPL versions."
msgstr ""
"Para a maioria dos programas, nós recomendamos que você use a versão mais "
"recente da <a href=\"/licenses/gpl.html\">Licença Pública Geral GNU (GPL)</"
@@ -224,15 +237,26 @@
"software."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For those programs, we recommend the <a href=\"http://www.apache.org/";
+#| "licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
+#| "copyleft) software license that has terms to prevent contributors and "
+#| "distributors from suing for patent infringement. This doesn't make the "
+#| "software immune to threats from patents (a software license can't do "
+#| "that), but it does prevent patent holders from setting up a “bait "
+#| "and switch” where they release the software under free terms then "
+#| "require recipients to agree to nonfree terms in a patent license."
msgid ""
"For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
-"copyleft) software license that has terms to prevent contributors and "
-"distributors from suing for patent infringement. This doesn't make the "
-"software immune to threats from patents (a software license can't do that), "
-"but it does prevent patent holders from setting up a “bait and "
-"switch” where they release the software under free terms then require "
-"recipients to agree to nonfree terms in a patent license."
+"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a weak, lax, "
+"\"pushover\" (non-copyleft) software license that has terms to prevent "
+"contributors and distributors from suing for patent infringement. This "
+"doesn't make the software immune to threats from patents (no software "
+"license can achieve that), but it does prevent patent holders from setting "
+"up a “bait and switch” where they release the software under "
+"free terms then require recipients to agree to nonfree terms in a patent "
+"license."
msgstr ""
"Para aqueles programas, nós recomendamos a <a href=\"http://www.apache.org/";
"licenses/LICENSE-2.0\">Licença Apache 2.0</a>. Esta é um licença de
software "
@@ -244,9 +268,14 @@
"destinatário concorde com termos não livres em uma licença de patente."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Among the lax pushover licenses, Apache 2.0 is best; so if you are going "
+#| "to use a lax pushover license, whatever the reason, we recommend using "
+#| "that one."
msgid ""
-"Among the lax pushover licenses, Apache 2.0 is best; so if you are going to "
-"use a lax pushover license, whatever the reason, we recommend using that one."
+"Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
+"to use a weak license, whatever the reason, we recommend using that one."
msgstr ""
"Junto com licenças lenientes, Apache 2.0 é melhor; de forma que se você "
"pretende usar uma licença leniente, independente do motivo, recomendamos
usá-"
@@ -566,9 +595,13 @@
"envio de traduções das páginas deste site."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
msgid ""
-"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-"Foundation, Inc."
+"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
+"Software Foundation, Inc."
msgstr ""
"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
"Foundation, Inc."
Index: license-recommendations.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ru.po,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- license-recommendations.ru.po 8 Oct 2020 09:59:30 -0000 1.59
+++ license-recommendations.ru.po 20 Nov 2020 16:30:40 -0000 1.60
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2019-12-28 07:57+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2019-12-22 17:17+0000\n"
"Last-Translator: Ineiev <ineiev@gnu.org>\n"
"Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-11-20 16:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -178,13 +179,37 @@
"ÑÑо, как пÑавило, наилÑÑÑÐ°Ñ ÑÑÑаÑегиÑ
лиÑензиÑованиÑ."
#. type: Content of: <p>
+# | For most programs, we recommend that you use the most recent version of
+# | the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a>
+# | for your project. Its strong copyleft is appropriate for all kinds of
+# | software, and includes numerous protections for users' freedom. [-Please
+# | give permission to use-] {+To allow for+} future license [-versions as
+# | well—in other words, make the license notice say-] {+upgrades, <a
+# | href=\"/licenses/identify-licenses-clearly.html\"> please specify
+# | “version 3 or any later version”</a> so+} that your program
+# | [-is covered by-] {+will be <a
+# | href=\"/licenses/license-compatibility.html\"> license-compatible</a> with
+# | code that may be released, in the future, under subsequent+} GPL [-version
+# | 3 or later.-] {+versions.+}
+#, fuzzy
+#| msgid ""
+#| "For most programs, we recommend that you use the most recent version of "
+#| "the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> "
+#| "for your project. Its strong copyleft is appropriate for all kinds of "
+#| "software, and includes numerous protections for users' freedom. Please "
+#| "give permission to use future license versions as well—in other "
+#| "words, make the license notice say that your program is covered by GPL "
+#| "version 3 or later."
msgid ""
"For most programs, we recommend that you use the most recent version of the "
"<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
"project. Its strong copyleft is appropriate for all kinds of software, and "
-"includes numerous protections for users' freedom. Please give permission to "
-"use future license versions as well—in other words, make the license "
-"notice say that your program is covered by GPL version 3 or later."
+"includes numerous protections for users' freedom. To allow for future "
+"license upgrades, <a href=\"/licenses/identify-licenses-clearly.html\"> "
+"please specify “version 3 or any later version”</a> so that your "
+"program will be <a href=\"/licenses/license-compatibility.html\"> license-"
+"compatible</a> with code that may be released, in the future, under "
+"subsequent GPL versions."
msgstr ""
"ÐÐ»Ñ Ð±Ð¾Ð»ÑÑинÑÑва пÑогÑамм Ð¼Ñ ÑекомендÑем
вам пÑименÑÑÑ Ð´Ð»Ñ Ñвоего пÑоекÑа "
"поÑледнÑÑ Ð²ÐµÑÑÐ¸Ñ <a
href=\"/licenses/gpl.html\">СÑандаÑÑной обÑеÑÑвенной "
@@ -229,15 +254,36 @@
"вÑегда ÑопÑовождаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ ÐºÐ¾Ð¿Ð¸ÐµÐ¹
лиÑензии."
#. type: Content of: <p>
+# | For those programs, we recommend the <a
+# | href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License
+# | 2.0</a>. This is a [-pushover-] {+weak, lax, \"pushover\"+}
+# | (non-copyleft) software license that has terms to prevent contributors
+# | and distributors from suing for patent infringement. This doesn't make
+# | the software immune to threats from patents [-(a-] {+(no+} software
+# | license [-can't do-] {+can achieve+} that), but it does prevent patent
+# | holders from setting up a “bait and switch” where they release
+# | the software under free terms then require recipients to agree to nonfree
+# | terms in a patent license.
+#, fuzzy
+#| msgid ""
+#| "For those programs, we recommend the <a href=\"http://www.apache.org/";
+#| "licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
+#| "copyleft) software license that has terms to prevent contributors and "
+#| "distributors from suing for patent infringement. This doesn't make the "
+#| "software immune to threats from patents (a software license can't do "
+#| "that), but it does prevent patent holders from setting up a “bait "
+#| "and switch” where they release the software under free terms then "
+#| "require recipients to agree to nonfree terms in a patent license."
msgid ""
"For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
-"copyleft) software license that has terms to prevent contributors and "
-"distributors from suing for patent infringement. This doesn't make the "
-"software immune to threats from patents (a software license can't do that), "
-"but it does prevent patent holders from setting up a “bait and "
-"switch” where they release the software under free terms then require "
-"recipients to agree to nonfree terms in a patent license."
+"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a weak, lax, "
+"\"pushover\" (non-copyleft) software license that has terms to prevent "
+"contributors and distributors from suing for patent infringement. This "
+"doesn't make the software immune to threats from patents (no software "
+"license can achieve that), but it does prevent patent holders from setting "
+"up a “bait and switch” where they release the software under "
+"free terms then require recipients to agree to nonfree terms in a patent "
+"license."
msgstr ""
"ÐÐ»Ñ ÑÑиÑ
пÑогÑамм Ð¼Ñ ÑекомендÑем <a
href=\"http://www.apache.org/licenses/";
"LICENSE-2.0\">веÑÑÐ¸Ñ 2.0 ÐиÑензии Apache</a>. ÐÑо
безволÑÐ½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ "
@@ -250,9 +296,17 @@
"ÑоглаÑалиÑÑ Ð½Ð° неÑвободнÑе ÑÑÐ»Ð¾Ð²Ð¸Ñ Ð¸Ð·
паÑенÑной лиÑензии."
#. type: Content of: <p>
+# | Among the [-lax pushover-] {+weak (pushover)+} licenses, Apache 2.0 is
+# | best; so if you are going to use a [-lax pushover-] {+weak+} license,
+# | whatever the reason, we recommend using that one.
+#, fuzzy
+#| msgid ""
+#| "Among the lax pushover licenses, Apache 2.0 is best; so if you are going "
+#| "to use a lax pushover license, whatever the reason, we recommend using "
+#| "that one."
msgid ""
-"Among the lax pushover licenses, Apache 2.0 is best; so if you are going to "
-"use a lax pushover license, whatever the reason, we recommend using that one."
+"Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
+"to use a weak license, whatever the reason, we recommend using that one."
msgstr ""
"Apache 2.0 — лÑÑÑÐ°Ñ Ð¸Ð·
безволÑно-неогÑаниÑиÑелÑнÑÑ
лиÑензий; "
"Ñак ÑÑо еÑли Ð²Ñ ÑобиÑаеÑеÑÑ
воÑполÑзоваÑÑÑÑ
безволÑно-неогÑаниÑиÑелÑной "
@@ -581,9 +635,15 @@
"translations.html\">“Ð ÑководÑÑве по
пеÑеводам”</a>."
#. type: Content of: <div><p>
+# | Copyright © 2011, 2013, 2014, 2015, 2017, 2018, [-2019-] {+2019,
+# | 2020+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
msgid ""
-"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-"Foundation, Inc."
+"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
+"Software Foundation, Inc."
msgstr ""
"Copyright © 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019 Free "
"Software Foundation, Inc."
Index: license-recommendations.tr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.tr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- license-recommendations.tr.po 22 Aug 2020 07:15:36 -0000 1.3
+++ license-recommendations.tr.po 20 Nov 2020 16:30:40 -0000 1.4
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2019-12-28 07:57+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2020-08-22 08:35+0200\n"
"Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
"Language-Team: Turkish <www-tr-comm@gnu.org>\n"
@@ -13,6 +13,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-11-20 16:25+0000\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 2.3\n"
@@ -169,13 +170,25 @@
"açıklıyor."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For most programs, we recommend that you use the most recent version of "
+#| "the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> "
+#| "for your project. Its strong copyleft is appropriate for all kinds of "
+#| "software, and includes numerous protections for users' freedom. Please "
+#| "give permission to use future license versions as well—in other "
+#| "words, make the license notice say that your program is covered by GPL "
+#| "version 3 or later."
msgid ""
"For most programs, we recommend that you use the most recent version of the "
"<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
"project. Its strong copyleft is appropriate for all kinds of software, and "
-"includes numerous protections for users' freedom. Please give permission to "
-"use future license versions as well—in other words, make the license "
-"notice say that your program is covered by GPL version 3 or later."
+"includes numerous protections for users' freedom. To allow for future "
+"license upgrades, <a href=\"/licenses/identify-licenses-clearly.html\"> "
+"please specify “version 3 or any later version”</a> so that your "
+"program will be <a href=\"/licenses/license-compatibility.html\"> license-"
+"compatible</a> with code that may be released, in the future, under "
+"subsequent GPL versions."
msgstr ""
"ÃoÄu program için, projenizde <a href=\"/licenses/gpl.html\">GNU Genel
Kamu "
"Lisansı (GPL)</a>'nın en son sürümünü kullanmanızı öneririz.
Güçlü copyleft, "
@@ -219,15 +232,26 @@
"saÄlamanın zorluÄunu haklı çıkarmak için çok küçüktür."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For those programs, we recommend the <a href=\"http://www.apache.org/";
+#| "licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
+#| "copyleft) software license that has terms to prevent contributors and "
+#| "distributors from suing for patent infringement. This doesn't make the "
+#| "software immune to threats from patents (a software license can't do "
+#| "that), but it does prevent patent holders from setting up a “bait "
+#| "and switch” where they release the software under free terms then "
+#| "require recipients to agree to nonfree terms in a patent license."
msgid ""
"For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
-"copyleft) software license that has terms to prevent contributors and "
-"distributors from suing for patent infringement. This doesn't make the "
-"software immune to threats from patents (a software license can't do that), "
-"but it does prevent patent holders from setting up a “bait and "
-"switch” where they release the software under free terms then require "
-"recipients to agree to nonfree terms in a patent license."
+"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a weak, lax, "
+"\"pushover\" (non-copyleft) software license that has terms to prevent "
+"contributors and distributors from suing for patent infringement. This "
+"doesn't make the software immune to threats from patents (no software "
+"license can achieve that), but it does prevent patent holders from setting "
+"up a “bait and switch” where they release the software under "
+"free terms then require recipients to agree to nonfree terms in a patent "
+"license."
msgstr ""
"Bu programlar için <a href=\"http://www.apache.org/licenses/";
"LICENSE-2.0\">Apache Lisans 2.0</a> 'ı öneririz. Bu, katkıda bulunanların
ve "
@@ -240,9 +264,14 @@
"gerektirir."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Among the lax pushover licenses, Apache 2.0 is best; so if you are going "
+#| "to use a lax pushover license, whatever the reason, we recommend using "
+#| "that one."
msgid ""
-"Among the lax pushover licenses, Apache 2.0 is best; so if you are going to "
-"use a lax pushover license, whatever the reason, we recommend using that one."
+"Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
+"to use a weak license, whatever the reason, we recommend using that one."
msgstr ""
"GevÅek kolay lokma lisanslar arasında Apache 2.0 en iyisidir; bu nedenle, "
"nedeni ne olursa olsun, eÄer gevÅek kolay lokma bir lisans
kullanacaksanız, "
@@ -560,9 +589,13 @@
"\">çalıÅma sayfamızı</a> ziyaret edebilirsiniz."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
msgid ""
-"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-"Foundation, Inc."
+"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
+"Software Foundation, Inc."
msgstr ""
"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
"Foundation, Inc."
Index: license-recommendations.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.zh-cn.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- license-recommendations.zh-cn.po 1 Jan 2020 12:04:44 -0000 1.18
+++ license-recommendations.zh-cn.po 20 Nov 2020 16:30:40 -0000 1.19
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2019-12-28 07:57+0000\n"
+"POT-Creation-Date: 2020-11-20 16:25+0000\n"
"PO-Revision-Date: 2020-01-01 19:29+0800\n"
"Last-Translator: Hagb (éä¿ä½) <hagb_green@qq.com>\n"
"Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-11-20 16:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -153,13 +154,25 @@
"为ä»ä¹å®é常æ¯æ好ç许å¯æ¹æ¡"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For most programs, we recommend that you use the most recent version of "
+#| "the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> "
+#| "for your project. Its strong copyleft is appropriate for all kinds of "
+#| "software, and includes numerous protections for users' freedom. Please "
+#| "give permission to use future license versions as well—in other "
+#| "words, make the license notice say that your program is covered by GPL "
+#| "version 3 or later."
msgid ""
"For most programs, we recommend that you use the most recent version of the "
"<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
"project. Its strong copyleft is appropriate for all kinds of software, and "
-"includes numerous protections for users' freedom. Please give permission to "
-"use future license versions as well—in other words, make the license "
-"notice say that your program is covered by GPL version 3 or later."
+"includes numerous protections for users' freedom. To allow for future "
+"license upgrades, <a href=\"/licenses/identify-licenses-clearly.html\"> "
+"please specify “version 3 or any later version”</a> so that your "
+"program will be <a href=\"/licenses/license-compatibility.html\"> license-"
+"compatible</a> with code that may be released, in the future, under "
+"subsequent GPL versions."
msgstr ""
"对大å¤æ°ç¨åºï¼æ们æ¨èä½ ä¸ºä½ ç项ç®ä½¿ç¨ææ°çç <a
href=\"/licenses/gpl.html"
"\">GPL</a>ãå®å¼ºå¤§ç copyleft
éåææç±»åç软件ï¼å¹¶å¯¹ç¨æ·çèªç±æå¾å¤ä¿æ¤ã"
@@ -197,15 +210,26 @@
"软件çä¸ä¾¿ã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For those programs, we recommend the <a href=\"http://www.apache.org/";
+#| "licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
+#| "copyleft) software license that has terms to prevent contributors and "
+#| "distributors from suing for patent infringement. This doesn't make the "
+#| "software immune to threats from patents (a software license can't do "
+#| "that), but it does prevent patent holders from setting up a “bait "
+#| "and switch” where they release the software under free terms then "
+#| "require recipients to agree to nonfree terms in a patent license."
msgid ""
"For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a pushover (non-"
-"copyleft) software license that has terms to prevent contributors and "
-"distributors from suing for patent infringement. This doesn't make the "
-"software immune to threats from patents (a software license can't do that), "
-"but it does prevent patent holders from setting up a “bait and "
-"switch” where they release the software under free terms then require "
-"recipients to agree to nonfree terms in a patent license."
+"licenses/LICENSE-2.0\">Apache License 2.0</a>. This is a weak, lax, "
+"\"pushover\" (non-copyleft) software license that has terms to prevent "
+"contributors and distributors from suing for patent infringement. This "
+"doesn't make the software immune to threats from patents (no software "
+"license can achieve that), but it does prevent patent holders from setting "
+"up a “bait and switch” where they release the software under "
+"free terms then require recipients to agree to nonfree terms in a patent "
+"license."
msgstr ""
"对è¿äºç¨åºï¼æ们æ¨è <a href=\"http://www.apache.org/licenses/";
"LICENSE-2.0\">Apache 2.0 许å¯è¯</a>ãè¿æ¯ä¸ä¸ª
pushoverï¼écopyleftï¼è½¯ä»¶è®¸å¯"
@@ -215,9 +239,14 @@
"è
åæä¸å©è¯ä¹¦ä¸çéèªç±æ¡ç®ã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Among the lax pushover licenses, Apache 2.0 is best; so if you are going "
+#| "to use a lax pushover license, whatever the reason, we recommend using "
+#| "that one."
msgid ""
-"Among the lax pushover licenses, Apache 2.0 is best; so if you are going to "
-"use a lax pushover license, whatever the reason, we recommend using that one."
+"Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
+"to use a weak license, whatever the reason, we recommend using that one."
msgstr ""
"å¨ä¸ä¸¥æ ¼ç pushover 许å¯è¯ä¸ï¼Apache 2.0
æ¯æ好çï¼æ以å¦æä½ è¦ç¨ä¸ä¸ªä¸ä¸¥æ ¼"
"ç pushover 许å¯è¯ï¼ä¸è®ºä»ä¹åå ï¼æ们æ¨èç¨è¿ä¸ä¸ªã"
@@ -500,9 +529,13 @@
"a>ã"
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
msgid ""
-"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-"Foundation, Inc."
+"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
+"Software Foundation, Inc."
msgstr ""
"Copyright © 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
"Foundation, Inc."
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses/po license-compatibility.fr.po lic...,
GNUN <=