www-commits
[Top][All Lists]
Advanced

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

www/licenses/po license-list.de.po license-list...


From: GNUN
Subject: www/licenses/po license-list.de.po license-list...
Date: Sat, 16 Jan 2016 16:58:31 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/01/16 16:58:31

Modified files:
        licenses/po    : license-list.de.po license-list.es.po 
                         license-list.fr.po license-list.it.po 
                         license-list.ja.po license-list.pot 
                         license-list.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de.po?cvsroot=www&r1=1.222&r2=1.223
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es.po?cvsroot=www&r1=1.186&r2=1.187
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.295&r2=1.296
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.249&r2=1.250
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.122&r2=1.123
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.156&r2=1.157
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.227&r2=1.228

Patches:
Index: license-list.de.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de.po,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -b -r1.222 -r1.223
--- license-list.de.po  15 Jan 2016 10:28:44 -0000      1.222
+++ license-list.de.po  16 Jan 2016 16:58:29 -0000      1.223
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: license-list.html\n"
 "Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2016-01-13 14:55+0000\n"
+"POT-Creation-Date: 2016-01-16 16:55+0000\n"
 "PO-Revision-Date: 2016-01-15 02:14+0100\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: www-de <address@hidden>\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: 2016-01-16 16:55+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.6\n"
 
@@ -1183,10 +1184,46 @@
 "class=\"anchor-reference-id\">(<a href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a free software license.  Section 3.3 provides indirect
+# | compatibility between this license and the GNU GPL version 2.0, the GNU
+# | LGPL version 2.1, the GNU AGPL version [-3.0,-] {+3,+} and all later
+# | versions of those licenses.  When you receive work under MPL 2.0, you may
+# | make a &ldquo;Larger Work&rdquo; that combines that work with work under
+# | those GNU licenses.  When you do, section 3.3 gives you permission to
+# | distribute the MPL-covered work under the terms of the same GNU licenses,
+# | with one condition: you must make sure that the files that were originally
+# | under the MPL are still available under the MPL's terms as well.  In other
+# | words, when you make a combination this way, the files that were
+# | originally under the MPL will be dual licensed under the MPL and the GNU
+# | license(s).  The end result is that the Larger Work, as a whole, will be
+# | covered under the GNU license(s).  People who receive that combination
+# | from you will have the option to use any files that were originally
+# | covered by the MPL under that license's terms, or distribute the Larger
+# | Work in whole or in part under the GNU licenses' terms with no further
+# | restrictions.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  Section 3.3 provides indirect "
+#| "compatibility between this license and the GNU GPL version 2.0, the GNU "
+#| "LGPL version 2.1, the GNU AGPL version 3.0, and all later versions of "
+#| "those licenses.  When you receive work under MPL 2.0, you may make a "
+#| "&ldquo;Larger Work&rdquo; that combines that work with work under those "
+#| "GNU licenses.  When you do, section 3.3 gives you permission to "
+#| "distribute the MPL-covered work under the terms of the same GNU licenses, "
+#| "with one condition: you must make sure that the files that were "
+#| "originally under the MPL are still available under the MPL's terms as "
+#| "well.  In other words, when you make a combination this way, the files "
+#| "that were originally under the MPL will be dual licensed under the MPL "
+#| "and the GNU license(s).  The end result is that the Larger Work, as a "
+#| "whole, will be covered under the GNU license(s).  People who receive that "
+#| "combination from you will have the option to use any files that were "
+#| "originally covered by the MPL under that license's terms, or distribute "
+#| "the Larger Work in whole or in part under the GNU licenses' terms with no "
+#| "further restrictions."
 msgid ""
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
-"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"version 2.1, the GNU AGPL version 3, and all later versions of those "
 "licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
 "Work&rdquo; that combines that work with work under those GNU licenses.  "
 "When you do, section 3.3 gives you permission to distribute the MPL-covered "
@@ -4691,10 +4728,24 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#ccby\">#ccby</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a non-copyleft free license that is good for art and entertainment
+# | works, and educational works.  It is compatible with all versions of the
+# | GNU GPL; however, [-it is-] {+like all CC licenses, <a
+# | 
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
+# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
+# | {+software</em></a>.+}
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
 msgid ""
 "This is a non-copyleft free license that is good for art and entertainment "
 "works, and educational works.  It is compatible with all versions of the GNU "
-"GPL; however, it is not recommended for use on software."
+"GPL; however, like all CC licenses, <a href=\"https://creativecommons.org/";
+"faq/#can-i-apply-a-creative-commons-license-to-software\">it <em>should not "
+"be used on software</em></a>."
 msgstr ""
 "Eine freie Lizenz ohne Copyleft, empfohlen für künstlerische &amp; "
 "unterhaltene sowie pädagogische Werke. Sie ist zwar mit allen GPL-Versionen "
@@ -4737,12 +4788,49 @@
 "class=\"anchor-reference-id\">(<a href=\"#ccbysa\">#ccbysa</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-non-copyleft-] {+copyleft+} free license that is good for
+# | [-art-] {+artistic+} and entertainment works, and educational works.  [-It
+# | is compatible with-]  {+Like+} all [-versions of the GNU GPL; however, it
+# | is-] {+CC licenses, <a
+# | 
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
+# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
+# | {+software</em></a>.+}
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
 msgid ""
 "This is a copyleft free license that is good for artistic and entertainment "
-"works, and educational works. CC BY-SA 4.0 is one-way compatible with the "
-"GNU GPL version 3.0: this means you may license your modified versions of CC "
-"BY-SA 4.0 materials under GNU GPL version 3.0, but you may not relicense GNU "
-"GPL version 3.0 licensed works under CC BY-SA 4.0."
+"works, and educational works.  Like all CC licenses, <a href=\"https://";
+"creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software"
+"\">it <em>should not be used on software</em></a>."
+msgstr ""
+"Eine freie Lizenz ohne Copyleft, empfohlen für künstlerische &amp; "
+"unterhaltene sowie pädagogische Werke. Sie ist zwar mit allen GPL-Versionen "
+"vereinbar, deren Verwendung bei Software jedoch nicht empfohlen."
+
+#. type: Content of: <dl><dd><p>
+# | [-This is a copyleft free license that is good for artistic and
+# | entertainment works, and educational works.-]CC BY-SA 4.0 is one-way
+# | compatible with the GNU GPL version [-3.0:-] {+3:+} this means you may
+# | license your modified versions of CC BY-SA 4.0 materials under GNU GPL
+# | version [-3.0,-] {+3,+} but you may not relicense [-GNU-] GPL [-version
+# | 3.0-] {+3+} licensed works under CC BY-SA 4.0.
+#, fuzzy
+#| msgid ""
+#| "This is a copyleft free license that is good for artistic and "
+#| "entertainment works, and educational works. CC BY-SA 4.0 is one-way "
+#| "compatible with the GNU GPL version 3.0: this means you may license your "
+#| "modified versions of CC BY-SA 4.0 materials under GNU GPL version 3.0, "
+#| "but you may not relicense GNU GPL version 3.0 licensed works under CC BY-"
+#| "SA 4.0."
+msgid ""
+"CC BY-SA 4.0 is one-way compatible with the GNU GPL version 3: this means "
+"you may license your modified versions of CC BY-SA 4.0 materials under GNU "
+"GPL version 3, but you may not relicense GPL 3 licensed works under CC BY-SA "
+"4.0."
 msgstr ""
 "Dies ist eine freie Lizenz mit Copyleft, die bestens für künstlerische und "
 "unterhaltende sowie pädagogische Werke geeignet ist. Sie ist einseitig mit "
@@ -4752,16 +4840,50 @@
 "BY-SA 4.0-Lizenz relizenzieren."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
-"href=\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</"
-"a> list, it means that you can not license your adapted CC BY-SA works under "
+# | Because Creative Commons lists only version [-3.0-] {+3+} of the GNU GPL
+# | on its <a
+# | href=\"http://creativecommons.org/compatiblelicenses\";>compatible
+# | licenses</a> list, it means that you can not license your adapted CC BY-SA
+# | works under the terms of &ldquo;GNU GPL version 3, or (at your option) 
+# | any later version.&rdquo; However, Section 14 of the GNU GPL version
+# | [-3.0-] {+3+} allows licensors to specify a proxy to determine whether
+# | future versions of the GNU GPL can be used. Therefore, if someone adapts a
+# | CC BY-SA 4.0 work and incorporates it into a GNU GPL version [-3.0-] {+3+}
+# | licensed project, <a
+# | 
href=\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions\";>they
+# | can specify Creative Commons as their proxy</a> (via <a
+# | 
href=\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.org/compatiblelicenses</a>)
+# |  so that if and when Creative Commons determines that a future version of
+# | the GNU GPL is a compatible license, the adapted and combined work could
+# | be used under that later version of the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
+#| "href=\"http://creativecommons.org/compatiblelicenses\";>compatible "
+#| "licenses</a> list, it means that you can not license your adapted CC BY-"
+#| "SA works under the terms of &ldquo;GNU GPL version 3, or (at your "
+#| "option)  any later version.&rdquo; However, Section 14 of the GNU GPL "
+#| "version 3.0 allows licensors to specify a proxy to determine whether "
+#| "future versions of the GNU GPL can be used. Therefore, if someone adapts "
+#| "a CC BY-SA 4.0 work and incorporates it into a GNU GPL version 3.0 "
+#| "licensed project, <a href=\"https://wiki.creativecommons.org/wiki/";
+#| "ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions"
+#| "\">they can specify Creative Commons as their proxy</a> (via <a href="
+#| "\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.";
+#| "org/compatiblelicenses</a>)  so that if and when Creative Commons "
+#| "determines that a future version of the GNU GPL is a compatible license, "
+#| "the adapted and combined work could be used under that later version of "
+#| "the GNU GPL."
+msgid ""
+"Because Creative Commons lists only version 3 of the GNU GPL on its <a href="
+"\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</a> "
+"list, it means that you can not license your adapted CC BY-SA works under "
 "the terms of &ldquo;GNU GPL version 3, or (at your option)  any later "
-"version.&rdquo; However, Section 14 of the GNU GPL version 3.0 allows "
+"version.&rdquo; However, Section 14 of the GNU GPL version 3 allows "
 "licensors to specify a proxy to determine whether future versions of the GNU "
 "GPL can be used. Therefore, if someone adapts a CC BY-SA 4.0 work and "
-"incorporates it into a GNU GPL version 3.0 licensed project, <a href="
-"\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:";
+"incorporates it into a GNU GPL version 3 licensed project, <a href=\"https://";
+"wiki.creativecommons.org/wiki/ShareAlike_compatibility:"
 "_GPLv3#Option_to_comply_with_later_versions\">they can specify Creative "
 "Commons as their proxy</a> (via <a href=\"http://creativecommons.org/";
 "compatiblelicenses\">http://creativecommons.org/compatiblelicenses</a>)  so "

Index: license-list.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es.po,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- license-list.es.po  13 Jan 2016 21:27:18 -0000      1.186
+++ license-list.es.po  16 Jan 2016 16:58:30 -0000      1.187
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: license-list.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 22:18+0100\n"
+"POT-Creation-Date: 2016-01-16 16:55+0000\n"
 "PO-Revision-Date: 2016-01-13 22:16+0100\n"
 "Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -20,6 +20,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-01-16 16:55+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Spanish\n"
 
@@ -1275,10 +1276,46 @@
 "\"anchor-reference-id\">(<a href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a free software license.  Section 3.3 provides indirect
+# | compatibility between this license and the GNU GPL version 2.0, the GNU
+# | LGPL version 2.1, the GNU AGPL version [-3.0,-] {+3,+} and all later
+# | versions of those licenses.  When you receive work under MPL 2.0, you may
+# | make a &ldquo;Larger Work&rdquo; that combines that work with work under
+# | those GNU licenses.  When you do, section 3.3 gives you permission to
+# | distribute the MPL-covered work under the terms of the same GNU licenses,
+# | with one condition: you must make sure that the files that were originally
+# | under the MPL are still available under the MPL's terms as well.  In other
+# | words, when you make a combination this way, the files that were
+# | originally under the MPL will be dual licensed under the MPL and the GNU
+# | license(s).  The end result is that the Larger Work, as a whole, will be
+# | covered under the GNU license(s).  People who receive that combination
+# | from you will have the option to use any files that were originally
+# | covered by the MPL under that license's terms, or distribute the Larger
+# | Work in whole or in part under the GNU licenses' terms with no further
+# | restrictions.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  Section 3.3 provides indirect "
+#| "compatibility between this license and the GNU GPL version 2.0, the GNU "
+#| "LGPL version 2.1, the GNU AGPL version 3.0, and all later versions of "
+#| "those licenses.  When you receive work under MPL 2.0, you may make a "
+#| "&ldquo;Larger Work&rdquo; that combines that work with work under those "
+#| "GNU licenses.  When you do, section 3.3 gives you permission to "
+#| "distribute the MPL-covered work under the terms of the same GNU licenses, "
+#| "with one condition: you must make sure that the files that were "
+#| "originally under the MPL are still available under the MPL's terms as "
+#| "well.  In other words, when you make a combination this way, the files "
+#| "that were originally under the MPL will be dual licensed under the MPL "
+#| "and the GNU license(s).  The end result is that the Larger Work, as a "
+#| "whole, will be covered under the GNU license(s).  People who receive that "
+#| "combination from you will have the option to use any files that were "
+#| "originally covered by the MPL under that license's terms, or distribute "
+#| "the Larger Work in whole or in part under the GNU licenses' terms with no "
+#| "further restrictions."
 msgid ""
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
-"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"version 2.1, the GNU AGPL version 3, and all later versions of those "
 "licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
 "Work&rdquo; that combines that work with work under those GNU licenses.  "
 "When you do, section 3.3 gives you permission to distribute the MPL-covered "
@@ -4981,10 +5018,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a non-copyleft free license that is good for art and entertainment
+# | works, and educational works.  It is compatible with all versions of the
+# | GNU GPL; however, [-it is-] {+like all CC licenses, <a
+# | 
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
+# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
+# | {+software</em></a>.+}
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
 msgid ""
 "This is a non-copyleft free license that is good for art and entertainment "
 "works, and educational works.  It is compatible with all versions of the GNU "
-"GPL; however, it is not recommended for use on software."
+"GPL; however, like all CC licenses, <a href=\"https://creativecommons.org/";
+"faq/#can-i-apply-a-creative-commons-license-to-software\">it <em>should not "
+"be used on software</em></a>."
 msgstr ""
 "Esta es una licencia libre sin copyleft, adecuada para  obras artísticas, de 
"
 "entretenimiento y educativas. Aunque es compatible con todas las versiones "
@@ -5026,13 +5077,51 @@
 "(también conocida como CC&nbsp;BY-SA)  <span class=\"anchor-reference-id\"> "
 "(<a href=\"#ccbysa\">#ccbysa</a>)</span>"
 
+# type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a [-non-copyleft-] {+copyleft+} free license that is good for
+# | [-art-] {+artistic+} and entertainment works, and educational works.  [-It
+# | is compatible with-]  {+Like+} all [-versions of the GNU GPL; however, it
+# | is-] {+CC licenses, <a
+# | 
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
+# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
+# | {+software</em></a>.+}
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
 msgid ""
 "This is a copyleft free license that is good for artistic and entertainment "
-"works, and educational works. CC BY-SA 4.0 is one-way compatible with the "
-"GNU GPL version 3.0: this means you may license your modified versions of CC "
-"BY-SA 4.0 materials under GNU GPL version 3.0, but you may not relicense GNU "
-"GPL version 3.0 licensed works under CC BY-SA 4.0."
+"works, and educational works.  Like all CC licenses, <a href=\"https://";
+"creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software"
+"\">it <em>should not be used on software</em></a>."
+msgstr ""
+"Esta es una licencia libre sin copyleft, adecuada para  obras artísticas, de 
"
+"entretenimiento y educativas. Aunque es compatible con todas las versiones "
+"de la GPL de GNU, no se recomienda su uso para software."
+
+#. type: Content of: <dl><dd><p>
+# | [-This is a copyleft free license that is good for artistic and
+# | entertainment works, and educational works.-]CC BY-SA 4.0 is one-way
+# | compatible with the GNU GPL version [-3.0:-] {+3:+} this means you may
+# | license your modified versions of CC BY-SA 4.0 materials under GNU GPL
+# | version [-3.0,-] {+3,+} but you may not relicense [-GNU-] GPL [-version
+# | 3.0-] {+3+} licensed works under CC BY-SA 4.0.
+#, fuzzy
+#| msgid ""
+#| "This is a copyleft free license that is good for artistic and "
+#| "entertainment works, and educational works. CC BY-SA 4.0 is one-way "
+#| "compatible with the GNU GPL version 3.0: this means you may license your "
+#| "modified versions of CC BY-SA 4.0 materials under GNU GPL version 3.0, "
+#| "but you may not relicense GNU GPL version 3.0 licensed works under CC BY-"
+#| "SA 4.0."
+msgid ""
+"CC BY-SA 4.0 is one-way compatible with the GNU GPL version 3: this means "
+"you may license your modified versions of CC BY-SA 4.0 materials under GNU "
+"GPL version 3, but you may not relicense GPL 3 licensed works under CC BY-SA "
+"4.0."
 msgstr ""
 "Esta es una licencia libre con copyleft adecuada para obras artísticas, de "
 "entretenimiento y educativas. CC BY-SA 4.0 es compatible en una sola "
@@ -5043,16 +5132,50 @@
 "SA 4.0."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
-"href=\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</"
-"a> list, it means that you can not license your adapted CC BY-SA works under "
+# | Because Creative Commons lists only version [-3.0-] {+3+} of the GNU GPL
+# | on its <a
+# | href=\"http://creativecommons.org/compatiblelicenses\";>compatible
+# | licenses</a> list, it means that you can not license your adapted CC BY-SA
+# | works under the terms of &ldquo;GNU GPL version 3, or (at your option) 
+# | any later version.&rdquo; However, Section 14 of the GNU GPL version
+# | [-3.0-] {+3+} allows licensors to specify a proxy to determine whether
+# | future versions of the GNU GPL can be used. Therefore, if someone adapts a
+# | CC BY-SA 4.0 work and incorporates it into a GNU GPL version [-3.0-] {+3+}
+# | licensed project, <a
+# | 
href=\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions\";>they
+# | can specify Creative Commons as their proxy</a> (via <a
+# | 
href=\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.org/compatiblelicenses</a>)
+# |  so that if and when Creative Commons determines that a future version of
+# | the GNU GPL is a compatible license, the adapted and combined work could
+# | be used under that later version of the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
+#| "href=\"http://creativecommons.org/compatiblelicenses\";>compatible "
+#| "licenses</a> list, it means that you can not license your adapted CC BY-"
+#| "SA works under the terms of &ldquo;GNU GPL version 3, or (at your "
+#| "option)  any later version.&rdquo; However, Section 14 of the GNU GPL "
+#| "version 3.0 allows licensors to specify a proxy to determine whether "
+#| "future versions of the GNU GPL can be used. Therefore, if someone adapts "
+#| "a CC BY-SA 4.0 work and incorporates it into a GNU GPL version 3.0 "
+#| "licensed project, <a href=\"https://wiki.creativecommons.org/wiki/";
+#| "ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions"
+#| "\">they can specify Creative Commons as their proxy</a> (via <a href="
+#| "\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.";
+#| "org/compatiblelicenses</a>)  so that if and when Creative Commons "
+#| "determines that a future version of the GNU GPL is a compatible license, "
+#| "the adapted and combined work could be used under that later version of "
+#| "the GNU GPL."
+msgid ""
+"Because Creative Commons lists only version 3 of the GNU GPL on its <a href="
+"\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</a> "
+"list, it means that you can not license your adapted CC BY-SA works under "
 "the terms of &ldquo;GNU GPL version 3, or (at your option)  any later "
-"version.&rdquo; However, Section 14 of the GNU GPL version 3.0 allows "
+"version.&rdquo; However, Section 14 of the GNU GPL version 3 allows "
 "licensors to specify a proxy to determine whether future versions of the GNU "
 "GPL can be used. Therefore, if someone adapts a CC BY-SA 4.0 work and "
-"incorporates it into a GNU GPL version 3.0 licensed project, <a href="
-"\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:";
+"incorporates it into a GNU GPL version 3 licensed project, <a href=\"https://";
+"wiki.creativecommons.org/wiki/ShareAlike_compatibility:"
 "_GPLv3#Option_to_comply_with_later_versions\">they can specify Creative "
 "Commons as their proxy</a> (via <a href=\"http://creativecommons.org/";
 "compatiblelicenses\">http://creativecommons.org/compatiblelicenses</a>)  so "

Index: license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -b -r1.295 -r1.296
--- license-list.fr.po  13 Jan 2016 21:35:41 -0000      1.295
+++ license-list.fr.po  16 Jan 2016 16:58:30 -0000      1.296
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-01-13 14:55+0000\n"
+"POT-Creation-Date: 2016-01-16 16:55+0000\n"
 "PO-Revision-Date: 2016-01-13 22:16+0100\n"
 "Last-Translator: Thérèse godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -19,6 +19,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-01-16 16:55+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.6\n"
 
@@ -1187,10 +1188,46 @@
 "reference-id\">(<a href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a free software license.  Section 3.3 provides indirect
+# | compatibility between this license and the GNU GPL version 2.0, the GNU
+# | LGPL version 2.1, the GNU AGPL version [-3.0,-] {+3,+} and all later
+# | versions of those licenses.  When you receive work under MPL 2.0, you may
+# | make a &ldquo;Larger Work&rdquo; that combines that work with work under
+# | those GNU licenses.  When you do, section 3.3 gives you permission to
+# | distribute the MPL-covered work under the terms of the same GNU licenses,
+# | with one condition: you must make sure that the files that were originally
+# | under the MPL are still available under the MPL's terms as well.  In other
+# | words, when you make a combination this way, the files that were
+# | originally under the MPL will be dual licensed under the MPL and the GNU
+# | license(s).  The end result is that the Larger Work, as a whole, will be
+# | covered under the GNU license(s).  People who receive that combination
+# | from you will have the option to use any files that were originally
+# | covered by the MPL under that license's terms, or distribute the Larger
+# | Work in whole or in part under the GNU licenses' terms with no further
+# | restrictions.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  Section 3.3 provides indirect "
+#| "compatibility between this license and the GNU GPL version 2.0, the GNU "
+#| "LGPL version 2.1, the GNU AGPL version 3.0, and all later versions of "
+#| "those licenses.  When you receive work under MPL 2.0, you may make a "
+#| "&ldquo;Larger Work&rdquo; that combines that work with work under those "
+#| "GNU licenses.  When you do, section 3.3 gives you permission to "
+#| "distribute the MPL-covered work under the terms of the same GNU licenses, "
+#| "with one condition: you must make sure that the files that were "
+#| "originally under the MPL are still available under the MPL's terms as "
+#| "well.  In other words, when you make a combination this way, the files "
+#| "that were originally under the MPL will be dual licensed under the MPL "
+#| "and the GNU license(s).  The end result is that the Larger Work, as a "
+#| "whole, will be covered under the GNU license(s).  People who receive that "
+#| "combination from you will have the option to use any files that were "
+#| "originally covered by the MPL under that license's terms, or distribute "
+#| "the Larger Work in whole or in part under the GNU licenses' terms with no "
+#| "further restrictions."
 msgid ""
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
-"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"version 2.1, the GNU AGPL version 3, and all later versions of those "
 "licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
 "Work&rdquo; that combines that work with work under those GNU licenses.  "
 "When you do, section 3.3 gives you permission to distribute the MPL-covered "
@@ -4682,10 +4719,24 @@
 "a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a non-copyleft free license that is good for art and entertainment
+# | works, and educational works.  It is compatible with all versions of the
+# | GNU GPL; however, [-it is-] {+like all CC licenses, <a
+# | 
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
+# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
+# | {+software</em></a>.+}
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
 msgid ""
 "This is a non-copyleft free license that is good for art and entertainment "
 "works, and educational works.  It is compatible with all versions of the GNU "
-"GPL; however, it is not recommended for use on software."
+"GPL; however, like all CC licenses, <a href=\"https://creativecommons.org/";
+"faq/#can-i-apply-a-creative-commons-license-to-software\">it <em>should not "
+"be used on software</em></a>."
 msgstr ""
 "C'est une licence libre sans copyleft qui convient aux œuvres artistiques et 
"
 "de divertissement, ainsi qu'au matériel pédagogique. Elle est compatible "
@@ -4728,12 +4779,50 @@
 "\"anchor-reference-id\"> (<a href=\"#ccbysa\">#ccbysa</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-non-copyleft-] {+copyleft+} free license that is good for
+# | [-art-] {+artistic+} and entertainment works, and educational works.  [-It
+# | is compatible with-]  {+Like+} all [-versions of the GNU GPL; however, it
+# | is-] {+CC licenses, <a
+# | 
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
+# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
+# | {+software</em></a>.+}
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
 msgid ""
 "This is a copyleft free license that is good for artistic and entertainment "
-"works, and educational works. CC BY-SA 4.0 is one-way compatible with the "
-"GNU GPL version 3.0: this means you may license your modified versions of CC "
-"BY-SA 4.0 materials under GNU GPL version 3.0, but you may not relicense GNU "
-"GPL version 3.0 licensed works under CC BY-SA 4.0."
+"works, and educational works.  Like all CC licenses, <a href=\"https://";
+"creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software"
+"\">it <em>should not be used on software</em></a>."
+msgstr ""
+"C'est une licence libre sans copyleft qui convient aux œuvres artistiques et 
"
+"de divertissement, ainsi qu'au matériel pédagogique. Elle est compatible "
+"avec toutes les versions de la GPL ; cependant, elle n'est pas recommandée "
+"pour le logiciel."
+
+#. type: Content of: <dl><dd><p>
+# | [-This is a copyleft free license that is good for artistic and
+# | entertainment works, and educational works.-]CC BY-SA 4.0 is one-way
+# | compatible with the GNU GPL version [-3.0:-] {+3:+} this means you may
+# | license your modified versions of CC BY-SA 4.0 materials under GNU GPL
+# | version [-3.0,-] {+3,+} but you may not relicense [-GNU-] GPL [-version
+# | 3.0-] {+3+} licensed works under CC BY-SA 4.0.
+#, fuzzy
+#| msgid ""
+#| "This is a copyleft free license that is good for artistic and "
+#| "entertainment works, and educational works. CC BY-SA 4.0 is one-way "
+#| "compatible with the GNU GPL version 3.0: this means you may license your "
+#| "modified versions of CC BY-SA 4.0 materials under GNU GPL version 3.0, "
+#| "but you may not relicense GNU GPL version 3.0 licensed works under CC BY-"
+#| "SA 4.0."
+msgid ""
+"CC BY-SA 4.0 is one-way compatible with the GNU GPL version 3: this means "
+"you may license your modified versions of CC BY-SA 4.0 materials under GNU "
+"GPL version 3, but you may not relicense GPL 3 licensed works under CC BY-SA "
+"4.0."
 msgstr ""
 "C'est une licence libre à copyleft bien adaptée aux œuvres artistiques ou 
de "
 "divertissement, ainsi qu'au matériel pédagogique. La CC BY-SA 4.0 est "
@@ -4743,16 +4832,50 @@
 "pas relicencier des œuvres régies par la GNU GPL version 3.0 en CC BY-SA 
4.0."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
-"href=\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</"
-"a> list, it means that you can not license your adapted CC BY-SA works under "
+# | Because Creative Commons lists only version [-3.0-] {+3+} of the GNU GPL
+# | on its <a
+# | href=\"http://creativecommons.org/compatiblelicenses\";>compatible
+# | licenses</a> list, it means that you can not license your adapted CC BY-SA
+# | works under the terms of &ldquo;GNU GPL version 3, or (at your option) 
+# | any later version.&rdquo; However, Section 14 of the GNU GPL version
+# | [-3.0-] {+3+} allows licensors to specify a proxy to determine whether
+# | future versions of the GNU GPL can be used. Therefore, if someone adapts a
+# | CC BY-SA 4.0 work and incorporates it into a GNU GPL version [-3.0-] {+3+}
+# | licensed project, <a
+# | 
href=\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions\";>they
+# | can specify Creative Commons as their proxy</a> (via <a
+# | 
href=\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.org/compatiblelicenses</a>)
+# |  so that if and when Creative Commons determines that a future version of
+# | the GNU GPL is a compatible license, the adapted and combined work could
+# | be used under that later version of the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
+#| "href=\"http://creativecommons.org/compatiblelicenses\";>compatible "
+#| "licenses</a> list, it means that you can not license your adapted CC BY-"
+#| "SA works under the terms of &ldquo;GNU GPL version 3, or (at your "
+#| "option)  any later version.&rdquo; However, Section 14 of the GNU GPL "
+#| "version 3.0 allows licensors to specify a proxy to determine whether "
+#| "future versions of the GNU GPL can be used. Therefore, if someone adapts "
+#| "a CC BY-SA 4.0 work and incorporates it into a GNU GPL version 3.0 "
+#| "licensed project, <a href=\"https://wiki.creativecommons.org/wiki/";
+#| "ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions"
+#| "\">they can specify Creative Commons as their proxy</a> (via <a href="
+#| "\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.";
+#| "org/compatiblelicenses</a>)  so that if and when Creative Commons "
+#| "determines that a future version of the GNU GPL is a compatible license, "
+#| "the adapted and combined work could be used under that later version of "
+#| "the GNU GPL."
+msgid ""
+"Because Creative Commons lists only version 3 of the GNU GPL on its <a href="
+"\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</a> "
+"list, it means that you can not license your adapted CC BY-SA works under "
 "the terms of &ldquo;GNU GPL version 3, or (at your option)  any later "
-"version.&rdquo; However, Section 14 of the GNU GPL version 3.0 allows "
+"version.&rdquo; However, Section 14 of the GNU GPL version 3 allows "
 "licensors to specify a proxy to determine whether future versions of the GNU "
 "GPL can be used. Therefore, if someone adapts a CC BY-SA 4.0 work and "
-"incorporates it into a GNU GPL version 3.0 licensed project, <a href="
-"\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:";
+"incorporates it into a GNU GPL version 3 licensed project, <a href=\"https://";
+"wiki.creativecommons.org/wiki/ShareAlike_compatibility:"
 "_GPLv3#Option_to_comply_with_later_versions\">they can specify Creative "
 "Commons as their proxy</a> (via <a href=\"http://creativecommons.org/";
 "compatiblelicenses\">http://creativecommons.org/compatiblelicenses</a>)  so "

Index: license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- license-list.it.po  13 Jan 2016 15:00:45 -0000      1.249
+++ license-list.it.po  16 Jan 2016 16:58:30 -0000      1.250
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-01-13 14:55+0000\n"
+"POT-Creation-Date: 2016-01-16 16:55+0000\n"
 "PO-Revision-Date: 2015-12-23 23:37+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -1275,10 +1275,46 @@
 "\"anchor-reference-id\">(<a href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a free software license.  Section 3.3 provides indirect
+# | compatibility between this license and the GNU GPL version 2.0, the GNU
+# | LGPL version 2.1, the GNU AGPL version [-3.0,-] {+3,+} and all later
+# | versions of those licenses.  When you receive work under MPL 2.0, you may
+# | make a &ldquo;Larger Work&rdquo; that combines that work with work under
+# | those GNU licenses.  When you do, section 3.3 gives you permission to
+# | distribute the MPL-covered work under the terms of the same GNU licenses,
+# | with one condition: you must make sure that the files that were originally
+# | under the MPL are still available under the MPL's terms as well.  In other
+# | words, when you make a combination this way, the files that were
+# | originally under the MPL will be dual licensed under the MPL and the GNU
+# | license(s).  The end result is that the Larger Work, as a whole, will be
+# | covered under the GNU license(s).  People who receive that combination
+# | from you will have the option to use any files that were originally
+# | covered by the MPL under that license's terms, or distribute the Larger
+# | Work in whole or in part under the GNU licenses' terms with no further
+# | restrictions.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  Section 3.3 provides indirect "
+#| "compatibility between this license and the GNU GPL version 2.0, the GNU "
+#| "LGPL version 2.1, the GNU AGPL version 3.0, and all later versions of "
+#| "those licenses.  When you receive work under MPL 2.0, you may make a "
+#| "&ldquo;Larger Work&rdquo; that combines that work with work under those "
+#| "GNU licenses.  When you do, section 3.3 gives you permission to "
+#| "distribute the MPL-covered work under the terms of the same GNU licenses, "
+#| "with one condition: you must make sure that the files that were "
+#| "originally under the MPL are still available under the MPL's terms as "
+#| "well.  In other words, when you make a combination this way, the files "
+#| "that were originally under the MPL will be dual licensed under the MPL "
+#| "and the GNU license(s).  The end result is that the Larger Work, as a "
+#| "whole, will be covered under the GNU license(s).  People who receive that "
+#| "combination from you will have the option to use any files that were "
+#| "originally covered by the MPL under that license's terms, or distribute "
+#| "the Larger Work in whole or in part under the GNU licenses' terms with no "
+#| "further restrictions."
 msgid ""
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
-"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"version 2.1, the GNU AGPL version 3, and all later versions of those "
 "licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
 "Work&rdquo; that combines that work with work under those GNU licenses.  "
 "When you do, section 3.3 gives you permission to distribute the MPL-covered "
@@ -4950,10 +4986,24 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a non-copyleft free license that is good for art and entertainment
+# | works, and educational works.  It is compatible with all versions of the
+# | GNU GPL; however, [-it is-] {+like all CC licenses, <a
+# | 
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
+# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
+# | {+software</em></a>.+}
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
 msgid ""
 "This is a non-copyleft free license that is good for art and entertainment "
 "works, and educational works.  It is compatible with all versions of the GNU "
-"GPL; however, it is not recommended for use on software."
+"GPL; however, like all CC licenses, <a href=\"https://creativecommons.org/";
+"faq/#can-i-apply-a-creative-commons-license-to-software\">it <em>should not "
+"be used on software</em></a>."
 msgstr ""
 "Questa è una licenza libera senza copyleft adatta a lavori di arte e "
 "spettacolo, e lavori educativi. &Egrave; compatibile con tutte le versioni "
@@ -4994,14 +5044,40 @@
 "(CC&nbsp;BY-SA) <span class=\"anchor-reference-id\"> (<a href=\"#ccbysa"
 "\">#ccbysa</a>)</span>"
 
+# type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-# | This is a copyleft free license that is good for artistic and
-# | entertainment works, and educational works. [-It-] {+CC BY-SA 4.0+} is
-# | one-way compatible with the GNU GPL version [-3.0, which-] {+3.0: this+}
+# | This is a [-non-copyleft-] {+copyleft+} free license that is good for
+# | [-art-] {+artistic+} and entertainment works, and educational works.  [-It
+# | is compatible with-]  {+Like+} all [-versions of the GNU GPL; however, it
+# | is-] {+CC licenses, <a
+# | 
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
+# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
+# | {+software</em></a>.+}
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
+msgid ""
+"This is a copyleft free license that is good for artistic and entertainment "
+"works, and educational works.  Like all CC licenses, <a href=\"https://";
+"creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software"
+"\">it <em>should not be used on software</em></a>."
+msgstr ""
+"Questa è una licenza libera senza copyleft adatta a lavori di arte e "
+"spettacolo, e lavori educativi. &Egrave; compatibile con tutte le versioni "
+"della GNU GPL, ma non la consigliamo per il software."
+
+#. type: Content of: <dl><dd><p>
+# | [-This is a copyleft free license that is good for artistic and
+# | entertainment works, and educational works. It-]{+CC BY-SA 4.0+} is
+# | one-way compatible with the GNU GPL version [-3.0, which-] {+3: this+}
 # | means you may license your [-contributions to adaptations-] {+modified
 # | versions+} of CC BY-SA 4.0 materials under [-the terms of the-] GNU GPL
-# | version 3.0, but you may not [-license your-] {+relicense+} GNU GPL
-# | version 3.0 licensed works under [-the terms of-] CC BY-SA 4.0.
+# | version [-3.0,-] {+3,+} but you may not [-license your GNU-] {+relicense+}
+# | GPL [-version 3.0-] {+3+} licensed works under [-the terms of-] CC BY-SA
+# | 4.0.
 #, fuzzy
 #| msgid ""
 #| "This is a copyleft free license that is good for artistic and "
@@ -5011,11 +5087,10 @@
 #| "version 3.0, but you may not license your GNU GPL version 3.0 licensed "
 #| "works under the terms of CC BY-SA 4.0."
 msgid ""
-"This is a copyleft free license that is good for artistic and entertainment "
-"works, and educational works. CC BY-SA 4.0 is one-way compatible with the "
-"GNU GPL version 3.0: this means you may license your modified versions of CC "
-"BY-SA 4.0 materials under GNU GPL version 3.0, but you may not relicense GNU "
-"GPL version 3.0 licensed works under CC BY-SA 4.0."
+"CC BY-SA 4.0 is one-way compatible with the GNU GPL version 3: this means "
+"you may license your modified versions of CC BY-SA 4.0 materials under GNU "
+"GPL version 3, but you may not relicense GPL 3 licensed works under CC BY-SA "
+"4.0."
 msgstr ""
 "Questa è una licenza libera con copyleft, adatta per opere artistiche, di "
 "intrattenimento e didattiche. &Egrave; compatibile in una direzione con la "
@@ -5024,16 +5099,50 @@
 "l'operazione inversa."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
-"href=\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</"
-"a> list, it means that you can not license your adapted CC BY-SA works under "
+# | Because Creative Commons lists only version [-3.0-] {+3+} of the GNU GPL
+# | on its <a
+# | href=\"http://creativecommons.org/compatiblelicenses\";>compatible
+# | licenses</a> list, it means that you can not license your adapted CC BY-SA
+# | works under the terms of &ldquo;GNU GPL version 3, or (at your option) 
+# | any later version.&rdquo; However, Section 14 of the GNU GPL version
+# | [-3.0-] {+3+} allows licensors to specify a proxy to determine whether
+# | future versions of the GNU GPL can be used. Therefore, if someone adapts a
+# | CC BY-SA 4.0 work and incorporates it into a GNU GPL version [-3.0-] {+3+}
+# | licensed project, <a
+# | 
href=\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions\";>they
+# | can specify Creative Commons as their proxy</a> (via <a
+# | 
href=\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.org/compatiblelicenses</a>)
+# |  so that if and when Creative Commons determines that a future version of
+# | the GNU GPL is a compatible license, the adapted and combined work could
+# | be used under that later version of the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
+#| "href=\"http://creativecommons.org/compatiblelicenses\";>compatible "
+#| "licenses</a> list, it means that you can not license your adapted CC BY-"
+#| "SA works under the terms of &ldquo;GNU GPL version 3, or (at your "
+#| "option)  any later version.&rdquo; However, Section 14 of the GNU GPL "
+#| "version 3.0 allows licensors to specify a proxy to determine whether "
+#| "future versions of the GNU GPL can be used. Therefore, if someone adapts "
+#| "a CC BY-SA 4.0 work and incorporates it into a GNU GPL version 3.0 "
+#| "licensed project, <a href=\"https://wiki.creativecommons.org/wiki/";
+#| "ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions"
+#| "\">they can specify Creative Commons as their proxy</a> (via <a href="
+#| "\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.";
+#| "org/compatiblelicenses</a>)  so that if and when Creative Commons "
+#| "determines that a future version of the GNU GPL is a compatible license, "
+#| "the adapted and combined work could be used under that later version of "
+#| "the GNU GPL."
+msgid ""
+"Because Creative Commons lists only version 3 of the GNU GPL on its <a href="
+"\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</a> "
+"list, it means that you can not license your adapted CC BY-SA works under "
 "the terms of &ldquo;GNU GPL version 3, or (at your option)  any later "
-"version.&rdquo; However, Section 14 of the GNU GPL version 3.0 allows "
+"version.&rdquo; However, Section 14 of the GNU GPL version 3 allows "
 "licensors to specify a proxy to determine whether future versions of the GNU "
 "GPL can be used. Therefore, if someone adapts a CC BY-SA 4.0 work and "
-"incorporates it into a GNU GPL version 3.0 licensed project, <a href="
-"\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:";
+"incorporates it into a GNU GPL version 3 licensed project, <a href=\"https://";
+"wiki.creativecommons.org/wiki/ShareAlike_compatibility:"
 "_GPLv3#Option_to_comply_with_later_versions\">they can specify Creative "
 "Commons as their proxy</a> (via <a href=\"http://creativecommons.org/";
 "compatiblelicenses\">http://creativecommons.org/compatiblelicenses</a>)  so "

Index: license-list.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja.po,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- license-list.ja.po  13 Jan 2016 15:00:45 -0000      1.122
+++ license-list.ja.po  16 Jan 2016 16:58:30 -0000      1.123
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-01-13 14:55+0000\n"
+"POT-Creation-Date: 2016-01-16 16:55+0000\n"
 "PO-Revision-Date: 2015-12-29 14:50+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -1145,10 +1145,29 @@
 "\"anchor-reference-id\">(<a href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  Section 3.3 provides indirect "
+#| "compatibility between this license and the GNU GPL version 2.0, the GNU "
+#| "LGPL version 2.1, the GNU AGPL version 3.0, and all later versions of "
+#| "those licenses.  When you receive work under MPL 2.0, you may make a "
+#| "&ldquo;Larger Work&rdquo; that combines that work with work under those "
+#| "GNU licenses.  When you do, section 3.3 gives you permission to "
+#| "distribute the MPL-covered work under the terms of the same GNU licenses, "
+#| "with one condition: you must make sure that the files that were "
+#| "originally under the MPL are still available under the MPL's terms as "
+#| "well.  In other words, when you make a combination this way, the files "
+#| "that were originally under the MPL will be dual licensed under the MPL "
+#| "and the GNU license(s).  The end result is that the Larger Work, as a "
+#| "whole, will be covered under the GNU license(s).  People who receive that "
+#| "combination from you will have the option to use any files that were "
+#| "originally covered by the MPL under that license's terms, or distribute "
+#| "the Larger Work in whole or in part under the GNU licenses' terms with no "
+#| "further restrictions."
 msgid ""
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
-"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"version 2.1, the GNU AGPL version 3, and all later versions of those "
 "licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
 "Work&rdquo; that combines that work with work under those GNU licenses.  "
 "When you do, section 3.3 gives you permission to distribute the MPL-covered "
@@ -4515,10 +4534,18 @@
 "class=\"anchor-reference-id\">(<a href=\"#ccby\">#ccby</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
 msgid ""
 "This is a non-copyleft free license that is good for art and entertainment "
 "works, and educational works.  It is compatible with all versions of the GNU "
-"GPL; however, it is not recommended for use on software."
+"GPL; however, like all CC licenses, <a href=\"https://creativecommons.org/";
+"faq/#can-i-apply-a-creative-commons-license-to-software\">it <em>should not "
+"be used on software</em></a>."
 msgstr ""
 
"これは、コピーレフトではない自由ライセンスで、芸術や娯楽作品、教育作品に良い"
 "でしょう。GNU 
GPLのすべての版と両立しますが、ソフトウェアに使用することは推奨"
@@ -4561,6 +4588,23 @@
 #. type: Content of: <dl><dd><p>
 #, fuzzy
 #| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
+msgid ""
+"This is a copyleft free license that is good for artistic and entertainment "
+"works, and educational works.  Like all CC licenses, <a href=\"https://";
+"creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software"
+"\">it <em>should not be used on software</em></a>."
+msgstr ""
+"これは、コピーレフトではない自由ライセンスで、芸術や娯楽作品、教育作品に良い"
+"でしょう。GNU 
GPLのすべての版と両立しますが、ソフトウェアに使用することは推奨"
+"されません。"
+
+#. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
 #| "This is a copyleft free license that is good for artistic and "
 #| "entertainment works, and educational works. It is one-way compatible with "
 #| "the GNU GPL version 3.0, which means you may license your contributions "
@@ -4568,11 +4612,10 @@
 #| "version 3.0, but you may not license your GNU GPL version 3.0 licensed "
 #| "works under the terms of CC BY-SA 4.0."
 msgid ""
-"This is a copyleft free license that is good for artistic and entertainment "
-"works, and educational works. CC BY-SA 4.0 is one-way compatible with the "
-"GNU GPL version 3.0: this means you may license your modified versions of CC "
-"BY-SA 4.0 materials under GNU GPL version 3.0, but you may not relicense GNU "
-"GPL version 3.0 licensed works under CC BY-SA 4.0."
+"CC BY-SA 4.0 is one-way compatible with the GNU GPL version 3: this means "
+"you may license your modified versions of CC BY-SA 4.0 materials under GNU "
+"GPL version 3, but you may not relicense GPL 3 licensed works under CC BY-SA "
+"4.0."
 msgstr ""
 
"これはコピーレフトの自由なライセンスで、芸術や娯楽の作品、教育の作品に適して"
 "います。GNU 
GPLバージョン3.0と一方向に両立します。つまり、CC BY-SA 
4.0のもの"
@@ -4581,16 +4624,34 @@
 "はできない、ということです。"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
-"href=\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</"
-"a> list, it means that you can not license your adapted CC BY-SA works under "
+#, fuzzy
+#| msgid ""
+#| "Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
+#| "href=\"http://creativecommons.org/compatiblelicenses\";>compatible "
+#| "licenses</a> list, it means that you can not license your adapted CC BY-"
+#| "SA works under the terms of &ldquo;GNU GPL version 3, or (at your "
+#| "option)  any later version.&rdquo; However, Section 14 of the GNU GPL "
+#| "version 3.0 allows licensors to specify a proxy to determine whether "
+#| "future versions of the GNU GPL can be used. Therefore, if someone adapts "
+#| "a CC BY-SA 4.0 work and incorporates it into a GNU GPL version 3.0 "
+#| "licensed project, <a href=\"https://wiki.creativecommons.org/wiki/";
+#| "ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions"
+#| "\">they can specify Creative Commons as their proxy</a> (via <a href="
+#| "\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.";
+#| "org/compatiblelicenses</a>)  so that if and when Creative Commons "
+#| "determines that a future version of the GNU GPL is a compatible license, "
+#| "the adapted and combined work could be used under that later version of "
+#| "the GNU GPL."
+msgid ""
+"Because Creative Commons lists only version 3 of the GNU GPL on its <a href="
+"\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</a> "
+"list, it means that you can not license your adapted CC BY-SA works under "
 "the terms of &ldquo;GNU GPL version 3, or (at your option)  any later "
-"version.&rdquo; However, Section 14 of the GNU GPL version 3.0 allows "
+"version.&rdquo; However, Section 14 of the GNU GPL version 3 allows "
 "licensors to specify a proxy to determine whether future versions of the GNU "
 "GPL can be used. Therefore, if someone adapts a CC BY-SA 4.0 work and "
-"incorporates it into a GNU GPL version 3.0 licensed project, <a href="
-"\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:";
+"incorporates it into a GNU GPL version 3 licensed project, <a href=\"https://";
+"wiki.creativecommons.org/wiki/ShareAlike_compatibility:"
 "_GPLv3#Option_to_comply_with_later_versions\">they can specify Creative "
 "Commons as their proxy</a> (via <a href=\"http://creativecommons.org/";
 "compatiblelicenses\">http://creativecommons.org/compatiblelicenses</a>)  so "

Index: license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- license-list.pot    13 Jan 2016 15:00:45 -0000      1.156
+++ license-list.pot    16 Jan 2016 16:58:31 -0000      1.157
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-01-13 14:55+0000\n"
+"POT-Creation-Date: 2016-01-16 16:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -838,7 +838,7 @@
 msgid ""
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
-"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"version 2.1, the GNU AGPL version 3, and all later versions of those "
 "licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
 "Work&rdquo; that combines that work with work under those GNU licenses.  "
 "When you do, section 3.3 gives you permission to distribute the MPL-covered "
@@ -3215,7 +3215,9 @@
 msgid ""
 "This is a non-copyleft free license that is good for art and entertainment "
 "works, and educational works.  It is compatible with all versions of the GNU "
-"GPL; however, it is not recommended for use on software."
+"GPL; however, like all CC licenses, <a "
+"href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
 "
+"<em>should not be used on software</em></a>."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -3243,22 +3245,29 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is a copyleft free license that is good for artistic and entertainment "
-"works, and educational works. CC BY-SA 4.0 is one-way compatible with the "
-"GNU GPL version 3.0: this means you may license your modified versions of CC "
-"BY-SA 4.0 materials under GNU GPL version 3.0, but you may not relicense GNU "
-"GPL version 3.0 licensed works under CC BY-SA 4.0."
+"works, and educational works.  Like all CC licenses, <a "
+"href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
 "
+"<em>should not be used on software</em></a>."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
+"CC BY-SA 4.0 is one-way compatible with the GNU GPL version 3: this means "
+"you may license your modified versions of CC BY-SA 4.0 materials under GNU "
+"GPL version 3, but you may not relicense GPL 3 licensed works under CC BY-SA "
+"4.0."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Because Creative Commons lists only version 3 of the GNU GPL on its <a "
 "href=\"http://creativecommons.org/compatiblelicenses\";>compatible "
 "licenses</a> list, it means that you can not license your adapted CC BY-SA "
 "works under the terms of &ldquo;GNU GPL version 3, or (at your option)  any "
-"later version.&rdquo; However, Section 14 of the GNU GPL version 3.0 allows "
+"later version.&rdquo; However, Section 14 of the GNU GPL version 3 allows "
 "licensors to specify a proxy to determine whether future versions of the GNU "
 "GPL can be used. Therefore, if someone adapts a CC BY-SA 4.0 work and "
-"incorporates it into a GNU GPL version 3.0 licensed project, <a "
+"incorporates it into a GNU GPL version 3 licensed project, <a "
 
"href=\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions\";>they
 "
 "can specify Creative Commons as their proxy</a> (via <a "
 
"href=\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.org/compatiblelicenses</a>)
  "

Index: license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- license-list.ru.po  13 Jan 2016 18:01:28 -0000      1.227
+++ license-list.ru.po  16 Jan 2016 16:58:31 -0000      1.228
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-01-13 14:55+0000\n"
+"POT-Creation-Date: 2016-01-16 16:55+0000\n"
 "PO-Revision-Date: 2016-01-13 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\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: 2016-01-16 16:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -1179,10 +1180,46 @@
 "a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a free software license.  Section 3.3 provides indirect
+# | compatibility between this license and the GNU GPL version 2.0, the GNU
+# | LGPL version 2.1, the GNU AGPL version [-3.0,-] {+3,+} and all later
+# | versions of those licenses.  When you receive work under MPL 2.0, you may
+# | make a &ldquo;Larger Work&rdquo; that combines that work with work under
+# | those GNU licenses.  When you do, section 3.3 gives you permission to
+# | distribute the MPL-covered work under the terms of the same GNU licenses,
+# | with one condition: you must make sure that the files that were originally
+# | under the MPL are still available under the MPL's terms as well.  In other
+# | words, when you make a combination this way, the files that were
+# | originally under the MPL will be dual licensed under the MPL and the GNU
+# | license(s).  The end result is that the Larger Work, as a whole, will be
+# | covered under the GNU license(s).  People who receive that combination
+# | from you will have the option to use any files that were originally
+# | covered by the MPL under that license's terms, or distribute the Larger
+# | Work in whole or in part under the GNU licenses' terms with no further
+# | restrictions.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  Section 3.3 provides indirect "
+#| "compatibility between this license and the GNU GPL version 2.0, the GNU "
+#| "LGPL version 2.1, the GNU AGPL version 3.0, and all later versions of "
+#| "those licenses.  When you receive work under MPL 2.0, you may make a "
+#| "&ldquo;Larger Work&rdquo; that combines that work with work under those "
+#| "GNU licenses.  When you do, section 3.3 gives you permission to "
+#| "distribute the MPL-covered work under the terms of the same GNU licenses, "
+#| "with one condition: you must make sure that the files that were "
+#| "originally under the MPL are still available under the MPL's terms as "
+#| "well.  In other words, when you make a combination this way, the files "
+#| "that were originally under the MPL will be dual licensed under the MPL "
+#| "and the GNU license(s).  The end result is that the Larger Work, as a "
+#| "whole, will be covered under the GNU license(s).  People who receive that "
+#| "combination from you will have the option to use any files that were "
+#| "originally covered by the MPL under that license's terms, or distribute "
+#| "the Larger Work in whole or in part under the GNU licenses' terms with no "
+#| "further restrictions."
 msgid ""
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
-"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"version 2.1, the GNU AGPL version 3, and all later versions of those "
 "licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
 "Work&rdquo; that combines that work with work under those GNU licenses.  "
 "When you do, section 3.3 gives you permission to distribute the MPL-covered "
@@ -4686,10 +4723,24 @@
 "a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a non-copyleft free license that is good for art and entertainment
+# | works, and educational works.  It is compatible with all versions of the
+# | GNU GPL; however, [-it is-] {+like all CC licenses, <a
+# | 
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
+# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
+# | {+software</em></a>.+}
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
 msgid ""
 "This is a non-copyleft free license that is good for art and entertainment "
 "works, and educational works.  It is compatible with all versions of the GNU "
-"GPL; however, it is not recommended for use on software."
+"GPL; however, like all CC licenses, <a href=\"https://creativecommons.org/";
+"faq/#can-i-apply-a-creative-commons-license-to-software\">it <em>should not "
+"be used on software</em></a>."
 msgstr ""
 "Это свободная лицензия без авторского 
лева, она хороша для художественных, "
 "развлекательных и образовательных 
произведений. Она совместима со всеми "
@@ -4732,12 +4783,49 @@
 "href=\"#ccbysa\">#ccbysa</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a [-non-copyleft-] {+copyleft+} free license that is good for
+# | [-art-] {+artistic+} and entertainment works, and educational works.  [-It
+# | is compatible with-]  {+Like+} all [-versions of the GNU GPL; however, it
+# | is-] {+CC licenses, <a
+# | 
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
+# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
+# | {+software</em></a>.+}
+#, fuzzy
+#| msgid ""
+#| "This is a non-copyleft free license that is good for art and "
+#| "entertainment works, and educational works.  It is compatible with all "
+#| "versions of the GNU GPL; however, it is not recommended for use on "
+#| "software."
 msgid ""
 "This is a copyleft free license that is good for artistic and entertainment "
-"works, and educational works. CC BY-SA 4.0 is one-way compatible with the "
-"GNU GPL version 3.0: this means you may license your modified versions of CC "
-"BY-SA 4.0 materials under GNU GPL version 3.0, but you may not relicense GNU "
-"GPL version 3.0 licensed works under CC BY-SA 4.0."
+"works, and educational works.  Like all CC licenses, <a href=\"https://";
+"creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software"
+"\">it <em>should not be used on software</em></a>."
+msgstr ""
+"Это свободная лицензия без авторского 
лева, она хороша для художественных, "
+"развлекательных и образовательных 
произведений. Она совместима со всеми "
+"версиями GNU GPL; однако она не рекомендуется 
для программ."
+
+#. type: Content of: <dl><dd><p>
+# | [-This is a copyleft free license that is good for artistic and
+# | entertainment works, and educational works.-]CC BY-SA 4.0 is one-way
+# | compatible with the GNU GPL version [-3.0:-] {+3:+} this means you may
+# | license your modified versions of CC BY-SA 4.0 materials under GNU GPL
+# | version [-3.0,-] {+3,+} but you may not relicense [-GNU-] GPL [-version
+# | 3.0-] {+3+} licensed works under CC BY-SA 4.0.
+#, fuzzy
+#| msgid ""
+#| "This is a copyleft free license that is good for artistic and "
+#| "entertainment works, and educational works. CC BY-SA 4.0 is one-way "
+#| "compatible with the GNU GPL version 3.0: this means you may license your "
+#| "modified versions of CC BY-SA 4.0 materials under GNU GPL version 3.0, "
+#| "but you may not relicense GNU GPL version 3.0 licensed works under CC BY-"
+#| "SA 4.0."
+msgid ""
+"CC BY-SA 4.0 is one-way compatible with the GNU GPL version 3: this means "
+"you may license your modified versions of CC BY-SA 4.0 materials under GNU "
+"GPL version 3, but you may not relicense GPL 3 licensed works under CC BY-SA "
+"4.0."
 msgstr ""
 "Это свободная лицензия с авторским левом, 
которая хороша для художественных, "
 "развлекательных и образовательных 
произведений. CC&nbsp;BY-SA&nbsp;4.0 "
@@ -4748,16 +4836,50 @@
 "CC&nbsp;BY-SA&nbsp;4.0."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
-"href=\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</"
-"a> list, it means that you can not license your adapted CC BY-SA works under "
+# | Because Creative Commons lists only version [-3.0-] {+3+} of the GNU GPL
+# | on its <a
+# | href=\"http://creativecommons.org/compatiblelicenses\";>compatible
+# | licenses</a> list, it means that you can not license your adapted CC BY-SA
+# | works under the terms of &ldquo;GNU GPL version 3, or (at your option) 
+# | any later version.&rdquo; However, Section 14 of the GNU GPL version
+# | [-3.0-] {+3+} allows licensors to specify a proxy to determine whether
+# | future versions of the GNU GPL can be used. Therefore, if someone adapts a
+# | CC BY-SA 4.0 work and incorporates it into a GNU GPL version [-3.0-] {+3+}
+# | licensed project, <a
+# | 
href=\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions\";>they
+# | can specify Creative Commons as their proxy</a> (via <a
+# | 
href=\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.org/compatiblelicenses</a>)
+# |  so that if and when Creative Commons determines that a future version of
+# | the GNU GPL is a compatible license, the adapted and combined work could
+# | be used under that later version of the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
+#| "href=\"http://creativecommons.org/compatiblelicenses\";>compatible "
+#| "licenses</a> list, it means that you can not license your adapted CC BY-"
+#| "SA works under the terms of &ldquo;GNU GPL version 3, or (at your "
+#| "option)  any later version.&rdquo; However, Section 14 of the GNU GPL "
+#| "version 3.0 allows licensors to specify a proxy to determine whether "
+#| "future versions of the GNU GPL can be used. Therefore, if someone adapts "
+#| "a CC BY-SA 4.0 work and incorporates it into a GNU GPL version 3.0 "
+#| "licensed project, <a href=\"https://wiki.creativecommons.org/wiki/";
+#| "ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions"
+#| "\">they can specify Creative Commons as their proxy</a> (via <a href="
+#| "\"http://creativecommons.org/compatiblelicenses\";>http://creativecommons.";
+#| "org/compatiblelicenses</a>)  so that if and when Creative Commons "
+#| "determines that a future version of the GNU GPL is a compatible license, "
+#| "the adapted and combined work could be used under that later version of "
+#| "the GNU GPL."
+msgid ""
+"Because Creative Commons lists only version 3 of the GNU GPL on its <a href="
+"\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</a> "
+"list, it means that you can not license your adapted CC BY-SA works under "
 "the terms of &ldquo;GNU GPL version 3, or (at your option)  any later "
-"version.&rdquo; However, Section 14 of the GNU GPL version 3.0 allows "
+"version.&rdquo; However, Section 14 of the GNU GPL version 3 allows "
 "licensors to specify a proxy to determine whether future versions of the GNU "
 "GPL can be used. Therefore, if someone adapts a CC BY-SA 4.0 work and "
-"incorporates it into a GNU GPL version 3.0 licensed project, <a href="
-"\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:";
+"incorporates it into a GNU GPL version 3 licensed project, <a href=\"https://";
+"wiki.creativecommons.org/wiki/ShareAlike_compatibility:"
 "_GPLv3#Option_to_comply_with_later_versions\">they can specify Creative "
 "Commons as their proxy</a> (via <a href=\"http://creativecommons.org/";
 "compatiblelicenses\">http://creativecommons.org/compatiblelicenses</a>)  so "



reply via email to

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