www-commits
[Top][All Lists]
Advanced

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

www/philosophy/po java-trap.bg.po java-trap.de....


From: GNUN
Subject: www/philosophy/po java-trap.bg.po java-trap.de....
Date: Sat, 03 Oct 2015 16:58:39 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/10/03 16:58:39

Modified files:
        philosophy/po  : java-trap.bg.po java-trap.de.po java-trap.el.po 
                         java-trap.es.po java-trap.fr.po java-trap.it.po 
                         java-trap.nl.po java-trap.pl.po java-trap.pot 
                         java-trap.ro.po java-trap.ru.po java-trap.sr.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.bg.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.de.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.el.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.es.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.fr.po?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.it.po?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.nl.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.pl.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.pot?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.ro.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.ru.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.sr.po?cvsroot=www&r1=1.26&r2=1.27

Patches:
Index: java-trap.bg.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.bg.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- java-trap.bg.po     29 Dec 2014 09:29:47 -0000      1.26
+++ java-trap.bg.po     3 Oct 2015 16:58:37 -0000       1.27
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+0000\n"
 "PO-Revision-Date: 2009-06-24 15:08+0300\n"
 "Last-Translator: Kaloian Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -52,11 +52,11 @@
 #| "platform can cause a similar problem. We must learn a lesson from the "
 #| "history of Java, so we can avoid other traps in the future."
 msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 "През декември 2006 г., „Сън“ вече са 
започнали да <a href=\"http://www.fsf.";
 "org/news/fsf-welcomes-gpl-java.html\">преиздават своята 
платформа на Джава "
@@ -74,12 +74,13 @@
 "other companies do so too."
 msgstr ""
 
-# type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 
 # type: Content of: <div><p>
@@ -90,14 +91,14 @@
 "be compatible, but they are not compatible 100 percent."
 msgstr ""
 
-# type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
 msgid ""
 "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 
 # type: Content of: <div><p>
@@ -510,19 +511,26 @@
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2004 Richard Stallman"
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr "Copyright &copy; 2004 Ричард Столман"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Richard Stallman is the founder of the Free Software Foundation.  You can "
+#| "copy and redistribute this article under the <a rel=\"license\" href="
+#| "\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
+#| "Attribution Noderivs 3.0 license</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
-"Може да копирате и разпространявате тази 
статия според условията на <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/";
-"\">Криейтив Комънс „Признание-Без 
производни произведения“ 3.0 САЩ</a>."
+"Ричард Столман е основателят на 
Фондацията за свободен софтуер.  Може да "
+"копирате и разпространявате тази статия 
според условията на <a rel=\"license"
+"\" 
href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Криейтив "
+"Комънс „Признание-Без производни 
произведения“ 3.0</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -537,3 +545,13 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Последно обновяване:"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Може да копирате и разпространявате 
тази статия според условията на <a "
+#~ "rel=\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/";
+#~ "\">Криейтив Комънс „Признание-Без 
производни произведения“ 3.0 САЩ</a>."

Index: java-trap.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.de.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- java-trap.de.po     10 Jul 2014 15:40:51 -0000      1.6
+++ java-trap.de.po     3 Oct 2015 16:58:37 -0000       1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+0000\n"
 "PO-Revision-Date: 2014-04-14 22:00+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <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: 2015-10-03 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -37,12 +38,25 @@
 msgstr " "
 
 #. type: Content of: <div><blockquote><p>
-msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+# | Since this article was first published, Sun {+(now part of Oracle)+}  has
+# | <a
+# | href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a>
+# | most of its Java platform reference implementation under the GNU General
+# | Public License, and there is now a free development environment for Java. 
+# | Thus, the Java language as such is no longer a trap.
+#, fuzzy
+#| msgid ""
+#| "Since this article was first published, Sun has <a href=\"http://www.fsf.";
+#| "org/news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java "
+#| "platform reference implementation under the GNU General Public License, "
+#| "and there is now a free development environment for Java.  Thus, the Java "
+#| "language as such is no longer a trap."
+msgid ""
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 "Seit dieser Artikel erstmals veröffentlicht wurde, hat Sun den größten 
Teil "
 "seiner Umsetzung der Java-Plattform-Referenz unter der GNU <span xml:lang="
@@ -62,10 +76,23 @@
 "andere Unternehmen tun dies auch."
 
 #. type: Content of: <div><blockquote><p>
+# | The free environment for Java is called IcedTea; the source code Sun freed
+# | is included in that.  So that is the one you should use.  Many GNU/Linux
+# | distributions come with IcedTea, but some include nonfree Java platforms.
+# | {+(Note, added 10/2015: The free implementation of Java is known as
+# | OpenJDK in many GNU/Linux distributions.)+}
+#, fuzzy
+#| msgid ""
+#| "The free environment for Java is called IcedTea; the source code Sun "
+#| "freed is included in that.  So that is the one you should use.  Many GNU/"
+#| "Linux distributions come with IcedTea, but some include nonfree Java "
+#| "platforms."
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 "Die freie Umgebung für Java wird <em>IcedTea</em> genannt; der von Sun "
 "freigegebene Quellcode ist darin enthalten. Somit sollten Sie diese nutzen. "
@@ -84,12 +111,26 @@
 "nicht 100%ig kompatibel."
 
 #. type: Content of: <div><blockquote><p>
+# | In addition, there are nonfree programs with &ldquo;Java&rdquo; in their
+# | name, such as JavaFX, and there are nonfree Java packages you might find
+# | tempting but need to reject.  So check the licenses of whatever packages
+# | you plan to use.  If you use Swing, make sure to use the free version,
+# | which comes with IcedTea. {+(Note, added 10/2015: A free replacement for
+# | JavaFX called OpenJFX has been released.)+}
+#, fuzzy
+#| msgid ""
+#| "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+#| "name, such as JavaFX, and there are nonfree Java packages you might find "
+#| "tempting but need to reject.  So check the licenses of whatever packages "
+#| "you plan to use.  If you use Swing, make sure to use the free version, "
+#| "which comes with IcedTea."
 msgid ""
 "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 "Darüber hinaus gibt es unfreie Programme mit dem Wort <em>Java</em> im "
 "Namen, wie JavaFX, und unfreie Java-Pakete, die Sie vielleicht verlockend "
@@ -473,14 +514,27 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+# | Copyright &copy; 2004, [-2010-] {+2010, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr "Copyright &copy; 2004, 2010 Richard Stallman."
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Dieses Werk steht unter einer <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "

Index: java-trap.el.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.el.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- java-trap.el.po     17 Apr 2015 18:57:39 -0000      1.3
+++ java-trap.el.po     3 Oct 2015 16:58:38 -0000       1.4
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+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"
@@ -38,11 +38,11 @@
 
 #. type: Content of: <div><blockquote><p>
 msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 
 #. type: Content of: <div><blockquote><p>
@@ -56,7 +56,9 @@
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 
 #. type: Content of: <div><blockquote><p>
@@ -72,7 +74,8 @@
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 
 #. type: Content of: <div><blockquote><p>
@@ -492,14 +495,19 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr "Copyright &copy; 2004 Richard Stallman"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Αυτή η σελίδα διατίθεται υπό την άδεια: <a 
rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/deed.el\">Creative Commons 
Αναφορά "

Index: java-trap.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.es.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- java-trap.es.po     5 Jun 2015 12:06:59 -0000       1.8
+++ java-trap.es.po     3 Oct 2015 16:58:38 -0000       1.9
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+0000\n"
 "PO-Revision-Date: 2013-03-17 13:17+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <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: 2015-10-03 16:56+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. type: Content of: <title>
@@ -41,12 +42,25 @@
 msgstr "Nota"
 
 #. type: Content of: <div><blockquote><p>
-msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+# | Since this article was first published, Sun {+(now part of Oracle)+}  has
+# | <a
+# | href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a>
+# | most of its Java platform reference implementation under the GNU General
+# | Public License, and there is now a free development environment for Java. 
+# | Thus, the Java language as such is no longer a trap.
+#, fuzzy
+#| msgid ""
+#| "Since this article was first published, Sun has <a href=\"http://www.fsf.";
+#| "org/news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java "
+#| "platform reference implementation under the GNU General Public License, "
+#| "and there is now a free development environment for Java.  Thus, the Java "
+#| "language as such is no longer a trap."
+msgid ""
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 "Después de que se publicara este artículo, Sun <a 
href=\"http://www.fsf.org/";
 "news/fsf-welcomes-gpl-java.html\">relicenció</a> la mayor parte de la "
@@ -65,10 +79,23 @@
 "también otras compañías lo hacen."
 
 #. type: Content of: <div><blockquote><p>
+# | The free environment for Java is called IcedTea; the source code Sun freed
+# | is included in that.  So that is the one you should use.  Many GNU/Linux
+# | distributions come with IcedTea, but some include nonfree Java platforms.
+# | {+(Note, added 10/2015: The free implementation of Java is known as
+# | OpenJDK in many GNU/Linux distributions.)+}
+#, fuzzy
+#| msgid ""
+#| "The free environment for Java is called IcedTea; the source code Sun "
+#| "freed is included in that.  So that is the one you should use.  Many GNU/"
+#| "Linux distributions come with IcedTea, but some include nonfree Java "
+#| "platforms."
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 "El entorno libre para Java se denomina «IcedTea» &mdash;que es donde se "
 "incluye el código fuente liberado por Sun&mdash;, de manera que es este el "
@@ -87,12 +114,26 @@
 "cien."
 
 #. type: Content of: <div><blockquote><p>
+# | In addition, there are nonfree programs with &ldquo;Java&rdquo; in their
+# | name, such as JavaFX, and there are nonfree Java packages you might find
+# | tempting but need to reject.  So check the licenses of whatever packages
+# | you plan to use.  If you use Swing, make sure to use the free version,
+# | which comes with IcedTea. {+(Note, added 10/2015: A free replacement for
+# | JavaFX called OpenJFX has been released.)+}
+#, fuzzy
+#| msgid ""
+#| "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+#| "name, such as JavaFX, and there are nonfree Java packages you might find "
+#| "tempting but need to reject.  So check the licenses of whatever packages "
+#| "you plan to use.  If you use Swing, make sure to use the free version, "
+#| "which comes with IcedTea."
 msgid ""
 "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 "Además, hay programas privativos que incluyen la palabra «Java» en el "
 "nombre, como sucede con JavaFX, y existen paquetes Java que uno podría "
@@ -463,18 +504,21 @@
 "de este sitio web."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+# | Copyright &copy; 2004, [-2010-] {+2010, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr "Copyright &copy; 2004, 2010 Richard Stallman"
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Esta página está bajo licencia <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.es_ES\">Creative Commons "
-"Reconocimiento-SinObraDerivada 3.0 Estados Unidos de América</a>."
+"creativecommons.org/licenses/by-nd/4.0/deed.es_ES\">Creative Commons "
+"Reconocimiento-SinObraDerivada 4.0 Internacional</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: java-trap.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.fr.po,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- java-trap.fr.po     29 Mar 2014 07:52:06 -0000      1.50
+++ java-trap.fr.po     3 Oct 2015 16:58:38 -0000       1.51
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+0000\n"
 "PO-Revision-Date: 2013-03-16 09:20+0100\n"
 "Last-Translator: Denis Barbier <address@hidden>\n"
 "Language-Team: French <address@hidden>\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: 2015-10-03 16:56+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -38,12 +39,25 @@
 msgstr "Note"
 
 #. type: Content of: <div><blockquote><p>
-msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+# | Since this article was first published, Sun {+(now part of Oracle)+}  has
+# | <a
+# | href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a>
+# | most of its Java platform reference implementation under the GNU General
+# | Public License, and there is now a free development environment for Java. 
+# | Thus, the Java language as such is no longer a trap.
+#, fuzzy
+#| msgid ""
+#| "Since this article was first published, Sun has <a href=\"http://www.fsf.";
+#| "org/news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java "
+#| "platform reference implementation under the GNU General Public License, "
+#| "and there is now a free development environment for Java.  Thus, the Java "
+#| "language as such is no longer a trap."
+msgid ""
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 "Depuis que cet article est paru, Sun a <a href=\"http://www.fsf.org/news/fsf-";
 "welcomes-gpl-java.html\">changé la licence</a> [en] de l'essentiel de "
@@ -63,10 +77,23 @@
 "qui n'est pas libre, et d'autres sociétés font de même."
 
 #. type: Content of: <div><blockquote><p>
+# | The free environment for Java is called IcedTea; the source code Sun freed
+# | is included in that.  So that is the one you should use.  Many GNU/Linux
+# | distributions come with IcedTea, but some include nonfree Java platforms.
+# | {+(Note, added 10/2015: The free implementation of Java is known as
+# | OpenJDK in many GNU/Linux distributions.)+}
+#, fuzzy
+#| msgid ""
+#| "The free environment for Java is called IcedTea; the source code Sun "
+#| "freed is included in that.  So that is the one you should use.  Many GNU/"
+#| "Linux distributions come with IcedTea, but some include nonfree Java "
+#| "platforms."
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 "L'environnement libre pour Java s'appelle IcedTea ; le code source libéré "
 "par Sun y est inclus. Aussi est-ce celui que vous devez utiliser. Beaucoup "
@@ -85,12 +112,26 @@
 "elles ne le sont pas à 100%."
 
 #. type: Content of: <div><blockquote><p>
+# | In addition, there are nonfree programs with &ldquo;Java&rdquo; in their
+# | name, such as JavaFX, and there are nonfree Java packages you might find
+# | tempting but need to reject.  So check the licenses of whatever packages
+# | you plan to use.  If you use Swing, make sure to use the free version,
+# | which comes with IcedTea. {+(Note, added 10/2015: A free replacement for
+# | JavaFX called OpenJFX has been released.)+}
+#, fuzzy
+#| msgid ""
+#| "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+#| "name, such as JavaFX, and there are nonfree Java packages you might find "
+#| "tempting but need to reject.  So check the licenses of whatever packages "
+#| "you plan to use.  If you use Swing, make sure to use the free version, "
+#| "which comes with IcedTea."
 msgid ""
 "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 "De plus, il y a des programmes non libres dont le nom contient « Java », "
 "comme JavaFX, et il y a des paquets Java non libres qui pourraient vous "
@@ -464,19 +505,22 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+# | Copyright &copy; 2004, [-2010-] {+2010, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr "Copyright &copy; 2004, 2010 Richard Stallman"
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Cette page peut être utilisée suivant les conditions de la licence <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";
-"\">Creative Commons attribution de paternité, pas de modification, 3.0 
États-"
-"Unis (CC BY-ND 3.0 US)</a>."
+"\"license\" href=\"http://creativecommons.org/licenses/by-nd/4.0/deed.fr";
+"\">Creative Commons attribution, pas de modification, 4.0 internationale "
+"(CC BY-ND 4.0)</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: java-trap.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.it.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- java-trap.it.po     29 Mar 2014 07:52:08 -0000      1.46
+++ java-trap.it.po     3 Oct 2015 16:58:38 -0000       1.47
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+0000\n"
 "PO-Revision-Date: 2013-03-16 23:02+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\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: 2015-10-03 16:56+0000\n"
 
 # type: Content of: <h2>
 #. type: Content of: <title>
@@ -39,12 +40,25 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
-msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+# | Since this article was first published, Sun {+(now part of Oracle)+}  has
+# | <a
+# | href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a>
+# | most of its Java platform reference implementation under the GNU General
+# | Public License, and there is now a free development environment for Java. 
+# | Thus, the Java language as such is no longer a trap.
+#, fuzzy
+#| msgid ""
+#| "Since this article was first published, Sun has <a href=\"http://www.fsf.";
+#| "org/news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java "
+#| "platform reference implementation under the GNU General Public License, "
+#| "and there is now a free development environment for Java.  Thus, the Java "
+#| "language as such is no longer a trap."
+msgid ""
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 "Dalla prima pubblicazione di questo articolo le cose sono cambiate: Sun ha "
 "<a href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>rilasciato "
@@ -65,10 +79,23 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
+# | The free environment for Java is called IcedTea; the source code Sun freed
+# | is included in that.  So that is the one you should use.  Many GNU/Linux
+# | distributions come with IcedTea, but some include nonfree Java platforms.
+# | {+(Note, added 10/2015: The free implementation of Java is known as
+# | OpenJDK in many GNU/Linux distributions.)+}
+#, fuzzy
+#| msgid ""
+#| "The free environment for Java is called IcedTea; the source code Sun "
+#| "freed is included in that.  So that is the one you should use.  Many GNU/"
+#| "Linux distributions come with IcedTea, but some include nonfree Java "
+#| "platforms."
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 "L'ambiente Java libero si chiama IcedTea e comprende il codice sorgente "
 "rilasciato da Sun.  Dovete quindi usare IcedTea, che è incluso in molte "
@@ -89,12 +116,26 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
+# | In addition, there are nonfree programs with &ldquo;Java&rdquo; in their
+# | name, such as JavaFX, and there are nonfree Java packages you might find
+# | tempting but need to reject.  So check the licenses of whatever packages
+# | you plan to use.  If you use Swing, make sure to use the free version,
+# | which comes with IcedTea. {+(Note, added 10/2015: A free replacement for
+# | JavaFX called OpenJFX has been released.)+}
+#, fuzzy
+#| msgid ""
+#| "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+#| "name, such as JavaFX, and there are nonfree Java packages you might find "
+#| "tempting but need to reject.  So check the licenses of whatever packages "
+#| "you plan to use.  If you use Swing, make sure to use the free version, "
+#| "which comes with IcedTea."
 msgid ""
 "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 "Inoltre ci sono molti programmi non liberi con &ldquo;Java&rdquo; nel nome, "
 "some JavaFX, e ci sono pacchetti Java non liberi che possono sembrare comodi "
@@ -482,19 +523,27 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+# | Copyright &copy; 2004, [-2010-] {+2010, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr "Copyright &copy; 2004, 2010 Richard Stallman"
 
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Questa pagina è distribuita secondo i termini della licenza <a rel=\"license"
-"\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.it";
-"\">Creative Commons Attribuzione - Non opere derivate 3.0 Stati Uniti</a> "
-"(CC BY-ND 3.0)."
+"\" href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons "
+"Attribuzione - Non opere derivate 3.0 internazionale</a> (CC BY-ND 4.0)."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -507,3 +556,13 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Questa pagina è distribuita secondo i termini della licenza <a rel="
+#~ "\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.";
+#~ "it\">Creative Commons Attribuzione - Non opere derivate 3.0 Stati Uniti</"
+#~ "a> (CC BY-ND 3.0)."

Index: java-trap.nl.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.nl.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- java-trap.nl.po     9 Feb 2015 20:30:34 -0000       1.9
+++ java-trap.nl.po     3 Oct 2015 16:58:38 -0000       1.10
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tom Uijldert <address@hidden>\n"
 "Language-Team: Dutch\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: 2015-10-03 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -36,12 +37,25 @@
 msgstr "Mededeling"
 
 #. type: Content of: <div><blockquote><p>
-msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+# | Since this article was first published, Sun {+(now part of Oracle)+}  has
+# | <a
+# | href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a>
+# | most of its Java platform reference implementation under the GNU General
+# | Public License, and there is now a free development environment for Java. 
+# | Thus, the Java language as such is no longer a trap.
+#, fuzzy
+#| msgid ""
+#| "Since this article was first published, Sun has <a href=\"http://www.fsf.";
+#| "org/news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java "
+#| "platform reference implementation under the GNU General Public License, "
+#| "and there is now a free development environment for Java.  Thus, the Java "
+#| "language as such is no longer a trap."
+msgid ""
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 "Sinds publicatie van dit artikel heeft Sun het grootste deel van zijn Java "
 "platform onder de GNU General Public License <a href=\"http://www.fsf.org/";
@@ -58,10 +72,23 @@
 "nog steeds een versie die niet vrij is, evenals andere bedrijven."
 
 #. type: Content of: <div><blockquote><p>
+# | The free environment for Java is called IcedTea; the source code Sun freed
+# | is included in that.  So that is the one you should use.  Many GNU/Linux
+# | distributions come with IcedTea, but some include nonfree Java platforms.
+# | {+(Note, added 10/2015: The free implementation of Java is known as
+# | OpenJDK in many GNU/Linux distributions.)+}
+#, fuzzy
+#| msgid ""
+#| "The free environment for Java is called IcedTea; the source code Sun "
+#| "freed is included in that.  So that is the one you should use.  Many GNU/"
+#| "Linux distributions come with IcedTea, but some include nonfree Java "
+#| "platforms."
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 "De vrij omgeving voor Java heet IcedTea; dit bevat ook de broncode die Sun "
 "vrij heeft gegeven. Die moet je dus gebruiken. Vele GNU/Linux uitgaven "
@@ -78,12 +105,26 @@
 "platformen uitwisselbaar moeten zijn maar dat is nooit voor 100 procent."
 
 #. type: Content of: <div><blockquote><p>
+# | In addition, there are nonfree programs with &ldquo;Java&rdquo; in their
+# | name, such as JavaFX, and there are nonfree Java packages you might find
+# | tempting but need to reject.  So check the licenses of whatever packages
+# | you plan to use.  If you use Swing, make sure to use the free version,
+# | which comes with IcedTea. {+(Note, added 10/2015: A free replacement for
+# | JavaFX called OpenJFX has been released.)+}
+#, fuzzy
+#| msgid ""
+#| "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+#| "name, such as JavaFX, and there are nonfree Java packages you might find "
+#| "tempting but need to reject.  So check the licenses of whatever packages "
+#| "you plan to use.  If you use Swing, make sure to use the free version, "
+#| "which comes with IcedTea."
 msgid ""
 "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 "Verder zijn er niet-vrije progrramma's in omloop met &ldquo;Java&rdquo; in "
 "hun naam, zoals JavaFX en zijn er niet-vrije Java paketten die je wellicht "
@@ -450,14 +491,27 @@
 "voor informatie over het onderhoud van vertalingen op deze website."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+# | Copyright &copy; 2004, [-2010-] {+2010, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr "Copyright &copy; 2004, 2010 Richard Stallman"
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Deze pagina valt onder de <a rel=\"license\" href=\"http://creativecommons.";
 "org/licenses/by-nd/3.0/us/deed.nl\">Creative Commons Attribution-NoDerivs "

Index: java-trap.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.pl.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- java-trap.pl.po     1 Apr 2014 02:02:56 -0000       1.28
+++ java-trap.pl.po     3 Oct 2015 16:58:38 -0000       1.29
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+0000\n"
 "PO-Revision-Date: 2013-03-18 15:05-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <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: 2015-10-03 16:56+0000\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.0\n"
@@ -42,12 +43,25 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
-msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+# | Since this article was first published, Sun {+(now part of Oracle)+}  has
+# | <a
+# | href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a>
+# | most of its Java platform reference implementation under the GNU General
+# | Public License, and there is now a free development environment for Java. 
+# | Thus, the Java language as such is no longer a trap.
+#, fuzzy
+#| msgid ""
+#| "Since this article was first published, Sun has <a href=\"http://www.fsf.";
+#| "org/news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java "
+#| "platform reference implementation under the GNU General Public License, "
+#| "and there is now a free development environment for Java.  Thus, the Java "
+#| "language as such is no longer a trap."
+msgid ""
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 "Od&nbsp;czasu gdy ten artykuł został opublikowany po&nbsp;raz pierwszy Sun "
 "<a href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>zmienił "
@@ -69,10 +83,23 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
+# | The free environment for Java is called IcedTea; the source code Sun freed
+# | is included in that.  So that is the one you should use.  Many GNU/Linux
+# | distributions come with IcedTea, but some include nonfree Java platforms.
+# | {+(Note, added 10/2015: The free implementation of Java is known as
+# | OpenJDK in many GNU/Linux distributions.)+}
+#, fuzzy
+#| msgid ""
+#| "The free environment for Java is called IcedTea; the source code Sun "
+#| "freed is included in that.  So that is the one you should use.  Many GNU/"
+#| "Linux distributions come with IcedTea, but some include nonfree Java "
+#| "platforms."
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 "Wolne środowisko dla Java nazywa się IcedTea i&nbsp;zawiera kod 
źródłowy, "
 "który uwolnił Sun. Właśnie tego powinno sie używać. Wiele dystrybucji 
GNU/"
@@ -92,12 +119,26 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
+# | In addition, there are nonfree programs with &ldquo;Java&rdquo; in their
+# | name, such as JavaFX, and there are nonfree Java packages you might find
+# | tempting but need to reject.  So check the licenses of whatever packages
+# | you plan to use.  If you use Swing, make sure to use the free version,
+# | which comes with IcedTea. {+(Note, added 10/2015: A free replacement for
+# | JavaFX called OpenJFX has been released.)+}
+#, fuzzy
+#| msgid ""
+#| "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+#| "name, such as JavaFX, and there are nonfree Java packages you might find "
+#| "tempting but need to reject.  So check the licenses of whatever packages "
+#| "you plan to use.  If you use Swing, make sure to use the free version, "
+#| "which comes with IcedTea."
 msgid ""
 "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 "Co więcej, istnieją niewolne programy zawierające &bdquo;Java&rdquo; 
w&nbsp;"
 "nazwie, takie jak JavaFX, a&nbsp;także niewolne pakiety Java, które mogą 
być "
@@ -495,21 +536,22 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+# | Copyright &copy; 2004, [-2010-] {+2010, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr "Copyright &copy; 2004, 2010 Richard Stallman"
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
-"Ten utwór objęty jest licencją Creative Commons Uznanie autorstwa-Bez "
-"utworów zależnych 3.0 Stany Zjednoczone. Aby&nbsp;zobaczyć kopię 
niniejszej "
-"licencji przejdź na&nbsp;stronę <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">http://creativecommons.org/";
-"licenses/by-nd/3.0/us/</a> lub&nbsp;napisz do&nbsp;Creative Commons, 171 "
-"Second Street, Suite 300, San Francisco, California 94105, USA."
+"Ta strona jest dostępna na&nbsp;<a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/4.0/deed.pl\">licencji Creative Commons "
+"Uznanie autorstwa&nbsp;&ndash; Bez&nbsp;utworów zależnych 4.0 "
+"Międzynarodowe</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: java-trap.pot
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.pot,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- java-trap.pot       29 Mar 2014 07:52:09 -0000      1.24
+++ java-trap.pot       3 Oct 2015 16:58:38 -0000       1.25
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
 msgid "Free but Shackled - The Java Trap - GNU Project - Free Software 
Foundation"
@@ -33,7 +34,7 @@
 
 #. type: Content of: <div><blockquote><p>
 msgid ""
-"Since this article was first published, Sun has <a "
+"Since this article was first published, Sun (now part of Oracle)  has <a "
 "href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
 "most of its Java platform reference implementation under the GNU General "
 "Public License, and there is now a free development environment for Java.  "
@@ -51,7 +52,9 @@
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java "
+"platforms. (Note, added 10/2015: The free implementation of Java is known as "
+"OpenJDK in many GNU/Linux distributions.)"
 msgstr ""
 
 #. type: Content of: <div><blockquote><p>
@@ -67,7 +70,8 @@
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 
 #. type: Content of: <div><blockquote><p>
@@ -294,14 +298,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Attribution-NoDerivs 3.0 United States License</a>."
+"href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons "
+"Attribution-NoDerivatives 4.0 International License</a>."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: java-trap.ro.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.ro.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- java-trap.ro.po     16 Mar 2015 10:05:12 -0000      1.1
+++ java-trap.ro.po     3 Oct 2015 16:58:38 -0000       1.2
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <address@hidden>\n"
@@ -37,11 +37,11 @@
 
 #. type: Content of: <div><blockquote><p>
 msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 
 #. type: Content of: <div><blockquote><p>
@@ -55,7 +55,9 @@
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 
 #. type: Content of: <div><blockquote><p>
@@ -71,7 +73,8 @@
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 
 #. type: Content of: <div><blockquote><p>
@@ -469,14 +472,19 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr "Copyright &copy; 2004 Richard Stallman"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Această pagină este licențiată sub licența <a rel=\"license\" 
href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Atribuire - "
@@ -491,3 +499,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Actualizat la:"
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Această pagină este licențiată sub licența <a rel=\"license\" href="
+#~ "\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
+#~ "Atribuire - Fără modificări 3.0 Statele Unite</a>."

Index: java-trap.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.ru.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- java-trap.ru.po     29 Mar 2014 07:52:10 -0000      1.14
+++ java-trap.ru.po     3 Oct 2015 16:58:39 -0000       1.15
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+0000\n"
 "PO-Revision-Date: 2013-03-16 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\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: 2015-10-03 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -38,12 +39,25 @@
 msgstr "Вводное замечание"
 
 #. type: Content of: <div><blockquote><p>
-msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+# | Since this article was first published, Sun {+(now part of Oracle)+}  has
+# | <a
+# | href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a>
+# | most of its Java platform reference implementation under the GNU General
+# | Public License, and there is now a free development environment for Java. 
+# | Thus, the Java language as such is no longer a trap.
+#, fuzzy
+#| msgid ""
+#| "Since this article was first published, Sun has <a href=\"http://www.fsf.";
+#| "org/news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java "
+#| "platform reference implementation under the GNU General Public License, "
+#| "and there is now a free development environment for Java.  Thus, the Java "
+#| "language as such is no longer a trap."
+msgid ""
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 "С тех пор, как была написана эта статья, 
компания Sun <a href=\"http://www.";
 "fsf.org/news/fsf-welcomes-gpl-java.html\">перевыпустила</a> 
почти всю свою "
@@ -62,10 +76,23 @@
 "которая не свободна, и другие компании 
тоже так поступают."
 
 #. type: Content of: <div><blockquote><p>
+# | The free environment for Java is called IcedTea; the source code Sun freed
+# | is included in that.  So that is the one you should use.  Many GNU/Linux
+# | distributions come with IcedTea, but some include nonfree Java platforms.
+# | {+(Note, added 10/2015: The free implementation of Java is known as
+# | OpenJDK in many GNU/Linux distributions.)+}
+#, fuzzy
+#| msgid ""
+#| "The free environment for Java is called IcedTea; the source code Sun "
+#| "freed is included in that.  So that is the one you should use.  Many GNU/"
+#| "Linux distributions come with IcedTea, but some include nonfree Java "
+#| "platforms."
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 "Свободная среда для Java называется IcedTea; 
она включает в себя исходный "
 "текст, освобожденный компанией Sun. Так что 
это та реализация, которой вам "
@@ -84,12 +111,26 @@
 "сто процентов."
 
 #. type: Content of: <div><blockquote><p>
+# | In addition, there are nonfree programs with &ldquo;Java&rdquo; in their
+# | name, such as JavaFX, and there are nonfree Java packages you might find
+# | tempting but need to reject.  So check the licenses of whatever packages
+# | you plan to use.  If you use Swing, make sure to use the free version,
+# | which comes with IcedTea. {+(Note, added 10/2015: A free replacement for
+# | JavaFX called OpenJFX has been released.)+}
+#, fuzzy
+#| msgid ""
+#| "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+#| "name, such as JavaFX, and there are nonfree Java packages you might find "
+#| "tempting but need to reject.  So check the licenses of whatever packages "
+#| "you plan to use.  If you use Swing, make sure to use the free version, "
+#| "which comes with IcedTea."
 msgid ""
 "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 "Кроме того, есть несвободные программы, в 
названии которых есть слово &ldquo;"
 "Java&rdquo;, такие, как JavaFX, и есть несвободные 
пакеты Java, которые вы, "
@@ -457,21 +498,30 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+# | Copyright &copy; 2004, [-2010-] {+2010, 2015+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2004, 2010 Richard Stallman</p><p>Copyright &copy; 2012, "
 "2013 Free Software Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Это произведение доступно по <a rel=\"license\" 
href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.ru\">лицензии Creative 
"
-"Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; Без 
производных "
-"произведений</em>) 3.0 США</a>."
+"creativecommons.org/licenses/by-nd/4.0/deed.ru\">лицензии Creative 
Commons "
+"Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; Без 
производных "
+"произведений</em>) 4.0 Всемирная</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: java-trap.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.sr.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- java-trap.sr.po     2 Dec 2014 11:01:47 -0000       1.26
+++ java-trap.sr.po     3 Oct 2015 16:58:39 -0000       1.27
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2014-03-29 07:43+0000\n"
+"POT-Creation-Date: 2015-10-03 16:56+0000\n"
 "PO-Revision-Date: 2009-07-05 20:52+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -52,11 +52,11 @@
 #| "platform can cause a similar problem. We must learn a lesson from the "
 #| "history of Java, so we can avoid other traps in the future."
 msgid ""
-"Since this article was first published, Sun has <a href=\"http://www.fsf.org/";
-"news/fsf-welcomes-gpl-java.html\">relicensed</a> most of its Java platform "
-"reference implementation under the GNU General Public License, and there is "
-"now a free development environment for Java.  Thus, the Java language as "
-"such is no longer a trap."
+"Since this article was first published, Sun (now part of Oracle)  has <a "
+"href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
+"most of its Java platform reference implementation under the GNU General "
+"Public License, and there is now a free development environment for Java.  "
+"Thus, the Java language as such is no longer a trap."
 msgstr ""
 "Од децембра 2006., у току је <a 
href=\"http://www.fsf.org/news/fsf-welcomes-";
 "gpl-java.html\">поновно објављивање платформе за 
Јаву под ГНУ-овом ОЈЛ</a> "
@@ -74,12 +74,13 @@
 "other companies do so too."
 msgstr ""
 
-# type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
 msgid ""
 "The free environment for Java is called IcedTea; the source code Sun freed "
 "is included in that.  So that is the one you should use.  Many GNU/Linux "
-"distributions come with IcedTea, but some include nonfree Java platforms."
+"distributions come with IcedTea, but some include nonfree Java platforms. "
+"(Note, added 10/2015: The free implementation of Java is known as OpenJDK in "
+"many GNU/Linux distributions.)"
 msgstr ""
 
 # type: Content of: <div><p>
@@ -90,14 +91,14 @@
 "be compatible, but they are not compatible 100 percent."
 msgstr ""
 
-# type: Content of: <div><p>
 #. type: Content of: <div><blockquote><p>
 msgid ""
 "In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
 "name, such as JavaFX, and there are nonfree Java packages you might find "
 "tempting but need to reject.  So check the licenses of whatever packages you "
 "plan to use.  If you use Swing, make sure to use the free version, which "
-"comes with IcedTea."
+"comes with IcedTea. (Note, added 10/2015: A free replacement for JavaFX "
+"called OpenJFX has been released.)"
 msgstr ""
 
 # type: Content of: <div><p>
@@ -505,14 +506,21 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+#, fuzzy
+#| msgid "Copyright &copy; 2004, 2010 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010, 2015 Richard Stallman"
 msgstr "<b>Ауторска права:</b><br />Copyright &copy; 2004 Richard 
Stallman"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Ова страна је лиценцирана под условима 
лиценце <a rel=\"license\" href="
 "\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.sr\";>Creative "
@@ -535,3 +543,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ажурирано:"
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Ова страна је лиценцирана под условима 
лиценце <a rel=\"license\" href="
+#~ "\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.sr\";>Creative "
+#~ "Commons Ауторство-Без прерада 3.0 САД</a>."



reply via email to

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