www-commits
[Top][All Lists]
Advanced

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

www/licenses old-licenses/po/gpl-2.0-faq.de.po ...


From: GNUN
Subject: www/licenses old-licenses/po/gpl-2.0-faq.de.po ...
Date: Sat, 11 Mar 2017 03:02:05 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     17/03/11 03:02:05

Modified files:
        licenses/old-licenses/po: gpl-2.0-faq.de.po gpl-2.0-faq.es.po 
                                  gpl-2.0-faq.fr.po gpl-2.0-faq.it.po 
                                  gpl-2.0-faq.ja.po gpl-2.0-faq.pot 
        licenses/po    : gpl-faq.es.po gpl-faq.fr.po gpl-faq.it.po 
                         gpl-faq.ja.po gpl-faq.pot gpl-faq.ru.po 
                         gpl-faq.ta.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.de.po?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.es.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.fr.po?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.it.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ja.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.pot?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.es.po?cvsroot=www&r1=1.78&r2=1.79
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.fr.po?cvsroot=www&r1=1.180&r2=1.181
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.it.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ja.po?cvsroot=www&r1=1.81&r2=1.82
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.pot?cvsroot=www&r1=1.75&r2=1.76
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru.po?cvsroot=www&r1=1.126&r2=1.127
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ta.po?cvsroot=www&r1=1.65&r2=1.66

Patches:
Index: old-licenses/po/gpl-2.0-faq.de.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.de.po,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- old-licenses/po/gpl-2.0-faq.de.po   10 Mar 2017 21:29:54 -0000      1.65
+++ old-licenses/po/gpl-2.0-faq.de.po   11 Mar 2017 08:02:03 -0000      1.66
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
 "Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2017-03-10 21:26+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2016-08-09 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: Deutsch <www-de <address@hidden>\n"
@@ -190,10 +190,18 @@
 "Quellcode modifizierter Versionen veröffentlicht wird?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLAndNonfreeOnSameMachine\"
+# | name=\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program
+# | and an unrelated non[---]free program on the same computer?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLAndNonfreeOnSameMachine\" name="
+#| "\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and "
+#| "an unrelated non-free program on the same computer?</a>"
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
-"\"> Can I have a GPL-covered program and an unrelated non-free program on "
-"the same computer?</a>"
+"\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
+"same computer?</a>"
 msgstr ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" id=\"TOCGPLAndNonfreeOnSameMachine"
 "\">Kann sich ein GPL lizenziertes Programm und ein damit nicht im Bezug "
@@ -438,10 +446,18 @@
 "Softwareprodukt aufnehmen möchte?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would
+# | like to release a program I wrote under the GNU GPL, but I would like to
+# | use the same code in non[---]free programs.</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a>"
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
-"the same code in non-free programs.</a>"
+"the same code in nonfree programs.</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\" id=\"TOCReleaseUnderGPLAndNF\">Ich möchte "
 "ein selbst geschriebenes Programm unter der GNU GPL freigeben, aber ich "
@@ -496,9 +512,15 @@
 "Internetseiten aus Vorlagen generiert.</ins>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program
+# | under the GPL which I developed using non[---]free tools?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a>"
 msgid ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program "
-"under the GPL which I developed using non-free tools?</a>"
+"under the GPL which I developed using nonfree tools?</a>"
 msgstr ""
 "<a href=\"#NonFreeTools\" id=\"TOCNonFreeTools\">Kann ein Programm unter der "
 "GPL freigegeben werden, welches mit unfreien Dienstprogrammen entwickelt "
@@ -697,10 +719,18 @@
 "Nutzen von GPL lizenzierten Programmen beim Schreiben anderer Programme"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I
+# | use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I "
+#| "use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a>"
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I use "
-"GPL-covered editors such as GNU Emacs to develop non-free programs? Can I "
-"use GPL-covered tools such as GCC to compile them?</a>"
+"GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
+"GPL-covered tools such as GCC to compile them?</a>"
 msgstr ""
 "<a href=\"#CanIUseGPLToolsForNF\" id=\"TOCCanIUseGPLToolsForNF\">Können mit "
 "GPL lizenzierten Editoren wie GNU Emacs unfreie Programme entwickelt werden? "
@@ -881,17 +911,29 @@
 "die Lizenzen eines Plug-in?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL
+# | when writing a plug-in for a non[---]free program?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL "
-"when writing a plug-in for a non-free program?</a>"
+"when writing a plug-in for a nonfree program?</a>"
 msgstr ""
 "<a href=\"#GPLPluginsInNF\" id=\"TOCGPLPluginsInNF\">Kann die GPL angewendet "
 "werden, wenn ein Plug-in für ein unfreies Programm geschrieben wird?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a
+# | non[---]free program that's designed to load a GPL-covered plug-in?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+#| "non-free program that's designed to load a GPL-covered plug-in?</a>"
 msgid ""
-"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a non-"
-"free program that's designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+"nonfree program that's designed to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a href=\"#NFUseGPLPlugins\" id=\"TOCNFUseGPLPlugins\">Kann ein unfreies "
 "Programm freigegeben werden, dass entworfen wurde, um ein GPL lizenziertes "
@@ -922,9 +964,15 @@
 "dem proprietären Teil stellt?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free
+# | software that uses non[---]free libraries?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
+#| "software that uses non-free libraries?</a>"
 msgid ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
-"software that uses non-free libraries?</a>"
+"software that uses nonfree libraries?</a>"
 msgstr ""
 "<a href=\"#FSWithNFLibs\" id=\"TOCFSWithNFLibs\">Kann Freie Software "
 "geschrieben werden, die unfreie Bibliotheken nutzt?</a>"
@@ -1332,10 +1380,18 @@
 "liegt aber bei Ihnen."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCGPLAndNonfreeOnSameMachine\"
+# | name=\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and
+# | an unrelated non[---]free program on the same computer?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
+#| "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
+#| "unrelated non-free program on the same computer?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
 "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
-"unrelated non-free program on the same computer?</a></b>"
+"unrelated nonfree program on the same computer?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" id=\"GPLAndNonfreeOnSameMachine"
 "\">Kann sich ein GPL lizenziertes Programm und ein damit nicht im Bezug "
@@ -1563,8 +1619,18 @@
 "ein Entgelt an mich bezahlen und/oder mich benachrichtigen muss?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | No.  In fact, a requirement like that would make the program non[---]free.
+# |  If people have to pay when they get a copy of a program, or if they have
+# | to notify anyone in particular, then the program is not free.  See the <a
+# | href=\"/philosophy/free-sw.html\"> definition of free software</a>.
+#, fuzzy
+#| msgid ""
+#| "No.  In fact, a requirement like that would make the program non-free.  "
+#| "If people have to pay when they get a copy of a program, or if they have "
+#| "to notify anyone in particular, then the program is not free.  See the <a "
+#| "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -1871,9 +1937,15 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free
+# | software that uses non[---]free libraries?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
+#| "software that uses non-free libraries?</a></b>"
 msgid ""
 "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
-"software that uses non-free libraries?</a></b>"
+"software that uses nonfree libraries?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCFSWithNFLibs\" id=\"FSWithNFLibs\">Kann Freie Software "
 "geschrieben werden, die unfreie Bibliotheken nutzt?</a></b>"
@@ -1881,8 +1953,8 @@
 #. type: Content of: <dl><dd>
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -1898,18 +1970,28 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
+# | Note that there may also be legal issues with combining certain
+# | non[---]free libraries with GPL-covered Free Software.  Please see <a
+# | href=\"#GPLIncompatibleLibs\">the question on GPL software with
+# | GPL-incompatible libraries</a> for more information.
+#, fuzzy
+#| msgid ""
+#| "Note that there may also be legal issues with combining certain non-free "
+#| "libraries with GPL-covered Free Software.  Please see <a href="
+#| "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-"
+#| "incompatible libraries</a> for more information."
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered Free Software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -2125,10 +2207,18 @@
 "ihre Entscheidung, ob sie dies tun. "
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+# | If the libraries you intend to link with are non[---]free, please also see
+# | <a href=\"#FSWithNFLibs\">the section on writing Free Software which uses
+# | non[---]free libraries</a>.
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are non-free, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
+msgid ""
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 "Wenn beabsichtigt ist eine Verbindung mit unfreien Bibliotheken "
 "herzustellen, siehe bitte auch <a href=\"#FSWithNFLibs\"><em>Kann Freie "
@@ -2259,10 +2349,18 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I
+# | would like to release a program I wrote under the GNU GPL, but I would
+# | like to use the same code in non[---]free programs.</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a></b>"
 msgid ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
 "would like to release a program I wrote under the GNU GPL, but I would like "
-"to use the same code in non-free programs.</a></b>"
+"to use the same code in nonfree programs.</a></b>"
 msgstr ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" id=\"ReleaseUnderGPLAndNF\">Ich "
 "möchte ein selbst geschriebenes Programm unter der GNU GPL freigeben, aber "
@@ -2270,7 +2368,7 @@
 
 #. type: Content of: <dl><dd>
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -2327,10 +2425,18 @@
 "unter der GPL, und dieses Recht kann nicht zurückgenommen werden."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can
+# | I use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can "
+#| "I use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a></b>"
 msgid ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can I "
-"use GPL-covered editors such as GNU Emacs to develop non-free programs? Can "
-"I use GPL-covered tools such as GCC to compile them?</a></b>"
+"use GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I "
+"use GPL-covered tools such as GCC to compile them?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" id=\"CanIUseGPLToolsForNF\">Können "
 "mit GPL lizenzierten Editoren wie GNU Emacs unfreie Programme entwickelt "
@@ -2360,11 +2466,11 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -2829,9 +2935,15 @@
 "müssen wenn diese Plug-ins verbreitet werden."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the
+# | GPL when writing a plug-in for a non[---]free program?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
-"GPL when writing a plug-in for a non-free program?</a></b>"
+"GPL when writing a plug-in for a nonfree program?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCGPLPluginsInNF\" id=\"GPLPluginsInNF\">Kann die GPL "
 "angewendet werden, wenn ein Plug-in für ein unfreies Programm geschrieben "
@@ -2847,24 +2959,37 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
+# | See also the question <a href=\"#FSWithNFLibs\">I am writing free software
+# | that uses a non[---]free library.</a>
+#, fuzzy
+#| msgid ""
+#| "See also the question <a href=\"#FSWithNFLibs\">I am writing free "
+#| "software that uses a non-free library.</a>"
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 "Siehe auch <a href=\"#FSWithNFLibs\"><em>Kann Freie Software geschrieben "
 "werden, die unfreie Bibliotheken nutzt?</em></a>"
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release
+# | a non[---]free program that's designed to load a GPL-covered
+# | plug-in?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release "
+#| "a non-free program that's designed to load a GPL-covered plug-in?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release a "
-"non-free program that's designed to load a GPL-covered plug-in?</a></b>"
+"nonfree program that's designed to load a GPL-covered plug-in?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" id=\"NFUseGPLPlugins\">Kann ein unfreies "
 "Programm freigegeben werden, dass entworfen wurde, um ein GPL lizenziertes "
@@ -3343,8 +3468,8 @@
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -3360,7 +3485,7 @@
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 
@@ -4310,9 +4435,15 @@
 "Lizenztextes mit."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a
+# | program under the GPL which I developed using non[---]free tools?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
-"program under the GPL which I developed using non-free tools?</a></b>"
+"program under the GPL which I developed using nonfree tools?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCNonFreeTools\" id=\"NonFreeTools\">Kann ein Programm unter "
 "der GPL freigegeben werden, welches mit unfreien Dienstprogrammen entwickelt "
@@ -4331,7 +4462,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -4613,8 +4744,8 @@
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>

Index: old-licenses/po/gpl-2.0-faq.es.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.es.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- old-licenses/po/gpl-2.0-faq.es.po   10 Mar 2017 21:29:55 -0000      1.31
+++ old-licenses/po/gpl-2.0-faq.es.po   11 Mar 2017 08:02:03 -0000      1.32
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:26+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2017-02-21 11:06+0100\n"
 "Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -185,10 +185,18 @@
 "las versiones modificadas se ponga a disposición del público?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLAndNonfreeOnSameMachine\"
+# | name=\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program
+# | and an unrelated non[---]free program on the same computer?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLAndNonfreeOnSameMachine\" name="
+#| "\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and "
+#| "an unrelated non-free program on the same computer?</a>"
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
-"\"> Can I have a GPL-covered program and an unrelated non-free program on "
-"the same computer?</a>"
+"\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
+"same computer?</a>"
 msgstr ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> ¿Puedo tener en el mismo ordenador un programa cubierto por la GPL y un "
@@ -433,10 +441,18 @@
 "privativo?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would
+# | like to release a program I wrote under the GNU GPL, but I would like to
+# | use the same code in non[---]free programs.</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a>"
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
-"the same code in non-free programs.</a>"
+"the same code in nonfree programs.</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">Me "
 "gustaría publicar bajo la GPL de GNU un programa que he escrito, pero "
@@ -486,9 +502,15 @@
 "plantillas de un sistema de mantenimiento de un sitio web?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program
+# | under the GPL which I developed using non[---]free tools?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a>"
 msgid ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program "
-"under the GPL which I developed using non-free tools?</a>"
+"under the GPL which I developed using nonfree tools?</a>"
 msgstr ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">¿Puedo publicar bajo la "
 "GPL un programa que he creado utilizando herramientas que no son libres?</a>"
@@ -684,10 +706,18 @@
 "programas"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I
+# | use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I "
+#| "use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a>"
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I use "
-"GPL-covered editors such as GNU Emacs to develop non-free programs? Can I "
-"use GPL-covered tools such as GCC to compile them?</a>"
+"GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
+"GPL-covered tools such as GCC to compile them?</a>"
 msgstr ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">¿Puedo "
 "emplear editores de texto cubiertos por la GPL tales como GNU Emacs para "
@@ -869,17 +899,29 @@
 "son los requisitos para las licencias de un accesorio?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL
+# | when writing a plug-in for a non[---]free program?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL "
-"when writing a plug-in for a non-free program?</a>"
+"when writing a plug-in for a nonfree program?</a>"
 msgstr ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">¿Puedo utilizar la "
 "GPL al escribir un accesorio para un programa que no es libre?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a
+# | non[---]free program that's designed to load a GPL-covered plug-in?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+#| "non-free program that's designed to load a GPL-covered plug-in?</a>"
 msgid ""
-"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a non-"
-"free program that's designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+"nonfree program that's designed to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">¿Puedo publicar un "
 "programa privativo que está diseñado para cargar un accesorio cubierto por "
@@ -910,9 +952,15 @@
 "parte privativa?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free
+# | software that uses non[---]free libraries?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
+#| "software that uses non-free libraries?</a>"
 msgid ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
-"software that uses non-free libraries?</a>"
+"software that uses nonfree libraries?</a>"
 msgstr ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\">¿Puedo escribir software "
 "libre que utilice bibliotecas que no son libres?</a>"
@@ -1321,10 +1369,18 @@
 "depende de usted."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCGPLAndNonfreeOnSameMachine\"
+# | name=\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and
+# | an unrelated non[---]free program on the same computer?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
+#| "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
+#| "unrelated non-free program on the same computer?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
 "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
-"unrelated non-free program on the same computer?</a></b>"
+"unrelated nonfree program on the same computer?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
 "\"GPLAndNonfreeOnSameMachine\"> ¿Puedo tener en el mismo ordenador un "
@@ -1546,8 +1602,18 @@
 "de abonarme alguna cantidad o notificármelo?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | No.  In fact, a requirement like that would make the program non[---]free.
+# |  If people have to pay when they get a copy of a program, or if they have
+# | to notify anyone in particular, then the program is not free.  See the <a
+# | href=\"/philosophy/free-sw.html\"> definition of free software</a>.
+#, fuzzy
+#| msgid ""
+#| "No.  In fact, a requirement like that would make the program non-free.  "
+#| "If people have to pay when they get a copy of a program, or if they have "
+#| "to notify anyone in particular, then the program is not free.  See the <a "
+#| "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -1892,18 +1958,36 @@
 "La otra licencia es compatible con la GPL si también lo permite."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free
+# | software that uses non[---]free libraries?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
+#| "software that uses non-free libraries?</a></b>"
 msgid ""
 "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
-"software that uses non-free libraries?</a></b>"
+"software that uses nonfree libraries?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">¿Puedo escribir "
 "software libre que utilice bibliotecas que no son libres?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | If you do this, your program won't be fully usable in a free environment.
+# | If your program depends on a non[---]free library to do a certain job, it
+# | cannot do that job in the Free World. If it depends on a non[---]free
+# | library to run at all, it cannot be part of a free operating system such
+# | as GNU; it is entirely off limits to the Free World.
+#, fuzzy
+#| msgid ""
+#| "If you do this, your program won't be fully usable in a free environment. "
+#| "If your program depends on a non-free library to do a certain job, it "
+#| "cannot do that job in the Free World. If it depends on a non-free library "
+#| "to run at all, it cannot be part of a free operating system such as GNU; "
+#| "it is entirely off limits to the Free World."
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -1924,14 +2008,32 @@
 "sustituto libre para esa biblioteca?"
 
 #. type: Content of: <dl><dd><p>
+# | If the program is already written using the non[---]free library, perhaps
+# | it is too late to change the decision. You may as well release the program
+# | as it stands, rather than not release it. But please mention in the README
+# | that the need for the non[---]free library is a drawback, and suggest the
+# | task of changing the program so that it does the same job without the
+# | non[---]free library.  Please suggest that anyone who thinks of doing
+# | substantial further work on the program first free it from dependence on
+# | the non[---]free library.
+#, fuzzy
+#| msgid ""
+#| "If the program is already written using the non-free library, perhaps it "
+#| "is too late to change the decision. You may as well release the program "
+#| "as it stands, rather than not release it. But please mention in the "
+#| "README that the need for the non-free library is a drawback, and suggest "
+#| "the task of changing the program so that it does the same job without the "
+#| "non-free library.  Please suggest that anyone who thinks of doing "
+#| "substantial further work on the program first free it from dependence on "
+#| "the non-free library."
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 "Si el programa está ya escrito haciendo uso de la biblioteca que no es "
 "libre, quizá sea demasiado tarde para cambiar la decisión. Puede también "
@@ -1943,8 +2045,18 @@
 "primer lugar de su dependencia de la biblioteca privativa."
 
 #. type: Content of: <dl><dd><p>
+# | Note that there may also be legal issues with combining certain
+# | non[---]free libraries with GPL-covered Free Software.  Please see <a
+# | href=\"#GPLIncompatibleLibs\">the question on GPL software with
+# | GPL-incompatible libraries</a> for more information.
+#, fuzzy
+#| msgid ""
+#| "Note that there may also be legal issues with combining certain non-free "
+#| "libraries with GPL-covered Free Software.  Please see <a href="
+#| "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-"
+#| "incompatible libraries</a> for more information."
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered Free Software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -2134,10 +2246,18 @@
 "excepción para su código; queda a su discreción hacerlo o no."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+# | If the libraries you intend to link with are non[---]free, please also see
+# | <a href=\"#FSWithNFLibs\">the section on writing Free Software which uses
+# | non[---]free libraries</a>.
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are non-free, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
+msgid ""
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 "Si las bibliotecas con las que intenta enlazar no son libres, consulte la <a "
 "href=\"#FSWithNFLibs\">sección acerca de escribir software libre que utiliza 
"
@@ -2303,18 +2423,36 @@
 "forma legítima, es la licencia aplicable a su copia."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I
+# | would like to release a program I wrote under the GNU GPL, but I would
+# | like to use the same code in non[---]free programs.</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a></b>"
 msgid ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
 "would like to release a program I wrote under the GNU GPL, but I would like "
-"to use the same code in non-free programs.</a></b>"
+"to use the same code in nonfree programs.</a></b>"
 msgstr ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">Me "
 "gustaría publicar bajo la GPL de GNU un programa que he escrito, pero "
 "quisiera usar el mismo código en programas que no son libres.</a></b>"
 
 #. type: Content of: <dl><dd>
+# | To release a non[---]free program is always ethically tainted, but legally
+# | there is no obstacle to your doing this.  If you are the copyright holder
+# | for the code, you can release it under various different non-exclusive
+# | licenses at various times.
+#, fuzzy
+#| msgid ""
+#| "To release a non-free program is always ethically tainted, but legally "
+#| "there is no obstacle to your doing this.  If you are the copyright holder "
+#| "for the code, you can release it under various different non-exclusive "
+#| "licenses at various times."
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -2378,10 +2516,18 @@
 "este derecho no puede ser revocado."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can
+# | I use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can "
+#| "I use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a></b>"
 msgid ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can I "
-"use GPL-covered editors such as GNU Emacs to develop non-free programs? Can "
-"I use GPL-covered tools such as GCC to compile them?</a></b>"
+"use GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I "
+"use GPL-covered tools such as GCC to compile them?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">¿Puedo 
"
 "emplear editores de texto cubiertos por la GPL tales como GNU Emacs para "
@@ -2415,12 +2561,24 @@
 "programa hereda los derechos de dichos datos."
 
 #. type: Content of: <dl><dd><p>
+# | As it happens, Bison can also be used to develop non[---]free programs. 
+# | This is because we decided to explicitly permit the use of the Bison
+# | standard parser program in Bison output files without restriction.  We
+# | made the decision because there were other tools comparable to Bison which
+# | already permitted use for non[---]free programs.
+#, fuzzy
+#| msgid ""
+#| "As it happens, Bison can also be used to develop non-free programs.  This "
+#| "is because we decided to explicitly permit the use of the Bison standard "
+#| "parser program in Bison output files without restriction.  We made the "
+#| "decision because there were other tools comparable to Bison which already "
+#| "permitted use for non-free programs."
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 "Como sucede de hecho, Bison puede utilizarse también para desarrollar "
 "programas que no son libres. Esto es así porque en su momento decidimos "
@@ -2951,9 +3109,15 @@
 "la GPL deben ser respetados."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the
+# | GPL when writing a plug-in for a non[---]free program?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
-"GPL when writing a plug-in for a non-free program?</a></b>"
+"GPL when writing a plug-in for a nonfree program?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">¿Puedo utilizar la 
"
 "GPL al escribir un accesorio para un programa que no es libre?</a></b>"
@@ -2970,10 +3134,10 @@
 # | to each other and share data structures, we believe-] they form a single
 # | [-program, which must be treated as an extension of both the main-]
 # | {+combined+} program [-and the plug-ins.  This-] {+this+} means that
-# | combination of the GPL-covered plug-in with the non-free main program
+# | combination of the GPL-covered plug-in with the non[---]free main program
 # | would violate the GPL. However, you can resolve that legal problem by
 # | adding an exception to your plug-in's license, giving permission to link
-# | it with the non-free main program.
+# | it with the non[---]free main program.
 #, fuzzy
 #| msgid ""
 #| "If the program dynamically links plug-ins, and they make function calls "
@@ -2985,9 +3149,9 @@
 #| "license, giving permission to link it with the non-free main program."
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 "Si el programa enlaza dinámicamente con los accesorios, llama a funciones de 
"
@@ -3000,17 +3164,30 @@
 "enlazarlo con el programa principal que no es libre."
 
 #. type: Content of: <dl><dd><p>
+# | See also the question <a href=\"#FSWithNFLibs\">I am writing free software
+# | that uses a non[---]free library.</a>
+#, fuzzy
+#| msgid ""
+#| "See also the question <a href=\"#FSWithNFLibs\">I am writing free "
+#| "software that uses a non-free library.</a>"
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 "Véase también la pregunta: <a href=\"#FSWithNFLibs\">¿Puedo escribir "
 "software libre que utilice bibliotecas que no son libres?</a>"
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release
+# | a non[---]free program that's designed to load a GPL-covered
+# | plug-in?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release "
+#| "a non-free program that's designed to load a GPL-covered plug-in?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release a "
-"non-free program that's designed to load a GPL-covered plug-in?</a></b>"
+"nonfree program that's designed to load a GPL-covered plug-in?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">¿Puedo publicar "
 "un programa privativo que está diseñado para cargar un accesorio cubierto "
@@ -3529,12 +3706,24 @@
 "¿Puedo hacerlo?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | You cannot incorporate GPL-covered software in a proprietary system.  The
+# | goal of the GPL is to grant everyone the freedom to copy, redistribute,
+# | understand, and modify a program.  If you could incorporate GPL-covered
+# | software into a non[---]free system, it would have the effect of making
+# | the GPL-covered software non[---]free too.
+#, fuzzy
+#| msgid ""
+#| "You cannot incorporate GPL-covered software in a proprietary system.  The "
+#| "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
+#| "understand, and modify a program.  If you could incorporate GPL-covered "
+#| "software into a non-free system, it would have the effect of making the "
+#| "GPL-covered software non-free too."
 msgid ""
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 "Usted no puede incorporar programas cubiertos por la GPL a un sistema "
 "privativo. El objetivo de la GPL consiste en garantizar a todo el mundo la "
@@ -3559,10 +3748,22 @@
 "también ellos las mejoras que hagan."
 
 #. type: Content of: <dl><dd><p>
+# | However, in many cases you can distribute the GPL-covered software
+# | alongside your proprietary system.  To do this validly, you must make sure
+# | that the free and non[---]free programs communicate at arms length, that
+# | they are not combined in a way that would make them effectively a single
+# | program.
+#, fuzzy
+#| msgid ""
+#| "However, in many cases you can distribute the GPL-covered software "
+#| "alongside your proprietary system.  To do this validly, you must make "
+#| "sure that the free and non-free programs communicate at arms length, that "
+#| "they are not combined in a way that would make them effectively a single "
+#| "program."
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 "De todos modos, en muchos casos usted puede distribuir el software cubierto "
@@ -4683,9 +4884,15 @@
 "oficial</a>."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a
+# | program under the GPL which I developed using non[---]free tools?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
-"program under the GPL which I developed using non-free tools?</a></b>"
+"program under the GPL which I developed using nonfree tools?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">¿Puedo publicar bajo "
 "la GPL un programa que he desarrollado utilizando herramientas que no son "
@@ -4702,8 +4909,22 @@
 "licencia de dicho código fuente."
 
 #. type: Content of: <dl><dd><p>
+# | However, if you link non[---]free libraries with the source code, that
+# | would be an issue you need to deal with.  It does not preclude releasing
+# | the source code under the GPL, but if the libraries don't fit under the
+# | &ldquo;system library&rdquo; exception, you should affix an explicit
+# | notice giving permission to link your program with them.  The FSF can give
+# | you advice on doing this.
+#, fuzzy
+#| msgid ""
+#| "However, if you link non-free libraries with the source code, that would "
+#| "be an issue you need to deal with.  It does not preclude releasing the "
+#| "source code under the GPL, but if the libraries don't fit under the "
+#| "&ldquo;system library&rdquo; exception, you should affix an explicit "
+#| "notice giving permission to link your program with them.  The FSF can "
+#| "give you advice on doing this."
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -5009,14 +5230,30 @@
 "software libre?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | In general, the answer is no&mdash;this is not a legal requirement.  In
+# | specific, the answer depends on which libraries you want to use and what
+# | their licenses are.  Most system libraries either use the <a
+# | href=\"/copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus
+# | an exception permitting linking the library with anything.  These
+# | libraries can be used in non[---]free programs; but in the case of the
+# | Lesser GPL, it does have some requirements you must follow.
+#, fuzzy
+#| msgid ""
+#| "In general, the answer is no&mdash;this is not a legal requirement.  In "
+#| "specific, the answer depends on which libraries you want to use and what "
+#| "their licenses are.  Most system libraries either use the <a href=\"/"
+#| "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
+#| "exception permitting linking the library with anything.  These libraries "
+#| "can be used in non-free programs; but in the case of the Lesser GPL, it "
+#| "does have some requirements you must follow."
 msgid ""
 "In general, the answer is no&mdash;this is not a legal requirement.  In "
 "specific, the answer depends on which libraries you want to use and what "
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 "En general, la respuesta es no: ese no es un requisito legal. En casos "
 "concretos, la respuesta depende de qué bibliotecas quiere usar y cuáles son 
"

Index: old-licenses/po/gpl-2.0-faq.fr.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.fr.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- old-licenses/po/gpl-2.0-faq.fr.po   10 Mar 2017 21:29:55 -0000      1.84
+++ old-licenses/po/gpl-2.0-faq.fr.po   11 Mar 2017 08:02:03 -0000      1.85
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:26+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2017-02-17 12:34+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -187,10 +187,18 @@
 "des versions modifiées soit porté à la connaissance du public ?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLAndNonfreeOnSameMachine\"
+# | name=\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program
+# | and an unrelated non[---]free program on the same computer?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLAndNonfreeOnSameMachine\" name="
+#| "\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and "
+#| "an unrelated non-free program on the same computer?</a>"
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
-"\"> Can I have a GPL-covered program and an unrelated non-free program on "
-"the same computer?</a>"
+"\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
+"same computer?</a>"
 msgstr ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
 "\">Puis-je avoir un programme régi par la GPL et un programme non libre "
@@ -438,10 +446,18 @@
 "\"TransNote1-rev\" href=\"#TransNote1\"><sup>1</sup></a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would
+# | like to release a program I wrote under the GNU GPL, but I would like to
+# | use the same code in non[---]free programs.</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a>"
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
-"the same code in non-free programs.</a>"
+"the same code in nonfree programs.</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">Je "
 "voudrais publier sous GNU GPL un programme que j'ai écrit, mais j'aimerais "
@@ -492,9 +508,15 @@
 "modèles de système de maintenance de sites web ?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program
+# | under the GPL which I developed using non[---]free tools?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a>"
 msgid ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program "
-"under the GPL which I developed using non-free tools?</a>"
+"under the GPL which I developed using nonfree tools?</a>"
 msgstr ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Puis-je publier sous GPL "
 "un programme que j'ai développé en utilisant des outils non libres ?</a>"
@@ -688,10 +710,18 @@
 msgstr "Utiliser des programmes sous GPL pour écrire d'autres programmes"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I
+# | use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I "
+#| "use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a>"
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I use "
-"GPL-covered editors such as GNU Emacs to develop non-free programs? Can I "
-"use GPL-covered tools such as GCC to compile them?</a>"
+"GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
+"GPL-covered tools such as GCC to compile them?</a>"
 msgstr ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Puis-je "
 "utiliser des éditeurs sous GPL comme GNU Emacs pour développer des "
@@ -876,17 +906,29 @@
 "licences qu'il m'est possible d'utiliser pour distribuer mon greffon ?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL
+# | when writing a plug-in for a non[---]free program?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL "
-"when writing a plug-in for a non-free program?</a>"
+"when writing a plug-in for a nonfree program?</a>"
 msgstr ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Puis-je utiliser la "
 "GPL pour un greffon dans un programme non libre ?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a
+# | non[---]free program that's designed to load a GPL-covered plug-in?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+#| "non-free program that's designed to load a GPL-covered plug-in?</a>"
 msgid ""
-"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a non-"
-"free program that's designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+"nonfree program that's designed to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Puis-je faire un "
 "programme non libre conçu pour charger un greffon régi par la GPL ?</a>"
@@ -916,9 +958,15 @@
 "par la GPL et la partie privatrice ?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free
+# | software that uses non[---]free libraries?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
+#| "software that uses non-free libraries?</a>"
 msgid ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
-"software that uses non-free libraries?</a>"
+"software that uses nonfree libraries?</a>"
 msgstr ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\">Puis-je écrire un "
 "logiciel libre qui utilise des bibliothèques non libres ?</a>"
@@ -1324,10 +1372,18 @@
 "regarde."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCGPLAndNonfreeOnSameMachine\"
+# | name=\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and
+# | an unrelated non[---]free program on the same computer?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
+#| "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
+#| "unrelated non-free program on the same computer?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
 "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
-"unrelated non-free program on the same computer?</a></b>"
+"unrelated nonfree program on the same computer?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
 "\"GPLAndNonfreeOnSameMachine\">Puis-je avoir un programme régi par la GPL et 
"
@@ -1556,8 +1612,18 @@
 "verse une redevance ou me le signale ?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | No.  In fact, a requirement like that would make the program non[---]free.
+# |  If people have to pay when they get a copy of a program, or if they have
+# | to notify anyone in particular, then the program is not free.  See the <a
+# | href=\"/philosophy/free-sw.html\"> definition of free software</a>.
+#, fuzzy
+#| msgid ""
+#| "No.  In fact, a requirement like that would make the program non-free.  "
+#| "If people have to pay when they get a copy of a program, or if they have "
+#| "to notify anyone in particular, then the program is not free.  See the <a "
+#| "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -1909,18 +1975,36 @@
 "permet cela aussi."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free
+# | software that uses non[---]free libraries?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
+#| "software that uses non-free libraries?</a></b>"
 msgid ""
 "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
-"software that uses non-free libraries?</a></b>"
+"software that uses nonfree libraries?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Puis-je écrire un "
 "logiciel libre qui utilise des bibliothèques non libres ?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | If you do this, your program won't be fully usable in a free environment.
+# | If your program depends on a non[---]free library to do a certain job, it
+# | cannot do that job in the Free World. If it depends on a non[---]free
+# | library to run at all, it cannot be part of a free operating system such
+# | as GNU; it is entirely off limits to the Free World.
+#, fuzzy
+#| msgid ""
+#| "If you do this, your program won't be fully usable in a free environment. "
+#| "If your program depends on a non-free library to do a certain job, it "
+#| "cannot do that job in the Free World. If it depends on a non-free library "
+#| "to run at all, it cannot be part of a free operating system such as GNU; "
+#| "it is entirely off limits to the Free World."
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -1941,14 +2025,32 @@
 "bibliothèque libre pour la remplacer ?"
 
 #. type: Content of: <dl><dd><p>
+# | If the program is already written using the non[---]free library, perhaps
+# | it is too late to change the decision. You may as well release the program
+# | as it stands, rather than not release it. But please mention in the README
+# | that the need for the non[---]free library is a drawback, and suggest the
+# | task of changing the program so that it does the same job without the
+# | non[---]free library.  Please suggest that anyone who thinks of doing
+# | substantial further work on the program first free it from dependence on
+# | the non[---]free library.
+#, fuzzy
+#| msgid ""
+#| "If the program is already written using the non-free library, perhaps it "
+#| "is too late to change the decision. You may as well release the program "
+#| "as it stands, rather than not release it. But please mention in the "
+#| "README that the need for the non-free library is a drawback, and suggest "
+#| "the task of changing the program so that it does the same job without the "
+#| "non-free library.  Please suggest that anyone who thinks of doing "
+#| "substantial further work on the program first free it from dependence on "
+#| "the non-free library."
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 "Si le programme est déjà écrit en utilisant la bibliothèque non libre, il 
"
 "est peut-être déjà trop tard pour changer de décision. Vous pouvez aussi "
@@ -1960,8 +2062,18 @@
 "programme le libère d'abord de sa dépendance à la bibliothèque non libre."
 
 #. type: Content of: <dl><dd><p>
+# | Note that there may also be legal issues with combining certain
+# | non[---]free libraries with GPL-covered Free Software.  Please see <a
+# | href=\"#GPLIncompatibleLibs\">the question on GPL software with
+# | GPL-incompatible libraries</a> for more information.
+#, fuzzy
+#| msgid ""
+#| "Note that there may also be legal issues with combining certain non-free "
+#| "libraries with GPL-covered Free Software.  Please see <a href="
+#| "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-"
+#| "incompatible libraries</a> for more information."
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered Free Software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -2149,10 +2261,18 @@
 "non."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+# | If the libraries you intend to link with are non[---]free, please also see
+# | <a href=\"#FSWithNFLibs\">the section on writing Free Software which uses
+# | non[---]free libraries</a>.
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are non-free, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
+msgid ""
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 "Si les bibliothèques que vous avez l'intention de lier ne sont pas libres, "
 "veuillez également consulter <a href=\"#FSWithNFLibs\">la section sur "
@@ -2320,18 +2440,36 @@
 "façon légitime, est la licence qui s'applique à votre copie."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I
+# | would like to release a program I wrote under the GNU GPL, but I would
+# | like to use the same code in non[---]free programs.</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a></b>"
 msgid ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
 "would like to release a program I wrote under the GNU GPL, but I would like "
-"to use the same code in non-free programs.</a></b>"
+"to use the same code in nonfree programs.</a></b>"
 msgstr ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">Je "
 "voudrais publier sous GNU GPL un programme que j'ai écrit, mais j'aimerais "
 "utiliser le même code dans un programme non libre.</a></b>"
 
 #. type: Content of: <dl><dd>
+# | To release a non[---]free program is always ethically tainted, but legally
+# | there is no obstacle to your doing this.  If you are the copyright holder
+# | for the code, you can release it under various different non-exclusive
+# | licenses at various times.
+#, fuzzy
+#| msgid ""
+#| "To release a non-free program is always ethically tainted, but legally "
+#| "there is no obstacle to your doing this.  If you are the copyright holder "
+#| "for the code, you can release it under various different non-exclusive "
+#| "licenses at various times."
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -2393,10 +2531,18 @@
 "la GPL, et que ce droit ne peut lui être retiré."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can
+# | I use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can "
+#| "I use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a></b>"
 msgid ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can I "
-"use GPL-covered editors such as GNU Emacs to develop non-free programs? Can "
-"I use GPL-covered tools such as GCC to compile them?</a></b>"
+"use GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I "
+"use GPL-covered tools such as GCC to compile them?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Puis-"
 "je utiliser des éditeurs sous GPL comme GNU Emacs pour développer des "
@@ -2430,12 +2576,24 @@
 "elle, du statut de copyright des données."
 
 #. type: Content of: <dl><dd><p>
+# | As it happens, Bison can also be used to develop non[---]free programs. 
+# | This is because we decided to explicitly permit the use of the Bison
+# | standard parser program in Bison output files without restriction.  We
+# | made the decision because there were other tools comparable to Bison which
+# | already permitted use for non[---]free programs.
+#, fuzzy
+#| msgid ""
+#| "As it happens, Bison can also be used to develop non-free programs.  This "
+#| "is because we decided to explicitly permit the use of the Bison standard "
+#| "parser program in Bison output files without restriction.  We made the "
+#| "decision because there were other tools comparable to Bison which already "
+#| "permitted use for non-free programs."
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 "Il se trouve que Bison peut aussi être utilisé pour développer des "
 "programmes non libres. C'est parce que nous avons décidé d'autoriser "
@@ -2967,9 +3125,15 @@
 "pour utiliser ces greffons."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the
+# | GPL when writing a plug-in for a non[---]free program?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
-"GPL when writing a plug-in for a non-free program?</a></b>"
+"GPL when writing a plug-in for a nonfree program?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Puis-je utiliser "
 "la GPL pour un greffon dans un programme non libre ?</a></b>"
@@ -2986,10 +3150,10 @@
 # | to each other and share data structures, we believe-] they form a single
 # | [-program, which must be treated as an extension of both the main-]
 # | {+combined+} program [-and the plug-ins.  This-] {+this+} means that
-# | combination of the GPL-covered plug-in with the non-free main program
+# | combination of the GPL-covered plug-in with the non[---]free main program
 # | would violate the GPL. However, you can resolve that legal problem by
 # | adding an exception to your plug-in's license, giving permission to link
-# | it with the non-free main program.
+# | it with the non[---]free main program.
 #, fuzzy
 #| msgid ""
 #| "If the program dynamically links plug-ins, and they make function calls "
@@ -3001,9 +3165,9 @@
 #| "license, giving permission to link it with the non-free main program."
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 "Si le programme est lié dynamiquement avec les greffons, et qu'ils font des "
@@ -3016,17 +3180,30 @@
 "qui autorise à le lier avec le programme principal non libre."
 
 #. type: Content of: <dl><dd><p>
+# | See also the question <a href=\"#FSWithNFLibs\">I am writing free software
+# | that uses a non[---]free library.</a>
+#, fuzzy
+#| msgid ""
+#| "See also the question <a href=\"#FSWithNFLibs\">I am writing free "
+#| "software that uses a non-free library.</a>"
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 "Voir aussi la question « <a href=\"#FSWithNFLibs\">Puis-je écrire un "
 "logiciel libre qui utilise des bibliothèques non libres ?</a> »"
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release
+# | a non[---]free program that's designed to load a GPL-covered
+# | plug-in?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release "
+#| "a non-free program that's designed to load a GPL-covered plug-in?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release a "
-"non-free program that's designed to load a GPL-covered plug-in?</a></b>"
+"nonfree program that's designed to load a GPL-covered plug-in?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Puis-je faire un "
 "programme non libre conçu pour charger un greffon régi par la GPL 
?</a></b>"
@@ -3552,12 +3729,24 @@
 "Est-ce possible ?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | You cannot incorporate GPL-covered software in a proprietary system.  The
+# | goal of the GPL is to grant everyone the freedom to copy, redistribute,
+# | understand, and modify a program.  If you could incorporate GPL-covered
+# | software into a non[---]free system, it would have the effect of making
+# | the GPL-covered software non[---]free too.
+#, fuzzy
+#| msgid ""
+#| "You cannot incorporate GPL-covered software in a proprietary system.  The "
+#| "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
+#| "understand, and modify a program.  If you could incorporate GPL-covered "
+#| "software into a non-free system, it would have the effect of making the "
+#| "GPL-covered software non-free too."
 msgid ""
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 "Vous ne pouvez pas incorporer de logiciel régi par la GPL dans un système "
 "privateur. L'objectif de la GPL est d'accorder à tous la liberté de copier, 
"
@@ -3581,10 +3770,22 @@
 "donner en échange les améliorations qu'ils ont pu apporter."
 
 #. type: Content of: <dl><dd><p>
+# | However, in many cases you can distribute the GPL-covered software
+# | alongside your proprietary system.  To do this validly, you must make sure
+# | that the free and non[---]free programs communicate at arms length, that
+# | they are not combined in a way that would make them effectively a single
+# | program.
+#, fuzzy
+#| msgid ""
+#| "However, in many cases you can distribute the GPL-covered software "
+#| "alongside your proprietary system.  To do this validly, you must make "
+#| "sure that the free and non-free programs communicate at arms length, that "
+#| "they are not combined in a way that would make them effectively a single "
+#| "program."
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 "Toutefois, dans de nombreux cas, vous pouvez distribuer un logiciel sous GPL "
@@ -4718,9 +4919,15 @@
 "your version.<a id=\"TransNote9-rev\" href=\"#TransNote9\"><sup>9</sup></a>"
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a
+# | program under the GPL which I developed using non[---]free tools?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
-"program under the GPL which I developed using non-free tools?</a></b>"
+"program under the GPL which I developed using nonfree tools?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Puis-je publier sous "
 "GPL un programme que j'ai développé en utilisant des outils non libres ?</"
@@ -4737,8 +4944,22 @@
 "code source."
 
 #. type: Content of: <dl><dd><p>
+# | However, if you link non[---]free libraries with the source code, that
+# | would be an issue you need to deal with.  It does not preclude releasing
+# | the source code under the GPL, but if the libraries don't fit under the
+# | &ldquo;system library&rdquo; exception, you should affix an explicit
+# | notice giving permission to link your program with them.  The FSF can give
+# | you advice on doing this.
+#, fuzzy
+#| msgid ""
+#| "However, if you link non-free libraries with the source code, that would "
+#| "be an issue you need to deal with.  It does not preclude releasing the "
+#| "source code under the GPL, but if the libraries don't fit under the "
+#| "&ldquo;system library&rdquo; exception, you should affix an explicit "
+#| "notice giving permission to link your program with them.  The FSF can "
+#| "give you advice on doing this."
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -5050,14 +5271,30 @@
 "licence de logiciel libre ?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | In general, the answer is no&mdash;this is not a legal requirement.  In
+# | specific, the answer depends on which libraries you want to use and what
+# | their licenses are.  Most system libraries either use the <a
+# | href=\"/copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus
+# | an exception permitting linking the library with anything.  These
+# | libraries can be used in non[---]free programs; but in the case of the
+# | Lesser GPL, it does have some requirements you must follow.
+#, fuzzy
+#| msgid ""
+#| "In general, the answer is no&mdash;this is not a legal requirement.  In "
+#| "specific, the answer depends on which libraries you want to use and what "
+#| "their licenses are.  Most system libraries either use the <a href=\"/"
+#| "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
+#| "exception permitting linking the library with anything.  These libraries "
+#| "can be used in non-free programs; but in the case of the Lesser GPL, it "
+#| "does have some requirements you must follow."
 msgid ""
 "In general, the answer is no&mdash;this is not a legal requirement.  In "
 "specific, the answer depends on which libraries you want to use and what "
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 "De manière générale, la réponse est non ; ce n'est pas une exigence 
légale. "
 "De manière plus spécifique, la réponse dépend des bibliothèques que vous 
"

Index: old-licenses/po/gpl-2.0-faq.it.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.it.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- old-licenses/po/gpl-2.0-faq.it.po   10 Mar 2017 21:29:55 -0000      1.37
+++ old-licenses/po/gpl-2.0-faq.it.po   11 Mar 2017 08:02:03 -0000      1.38
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:26+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2017-03-05 14:23+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -184,10 +184,18 @@
 "delle versioni modificate  di un programma sia reso pubblico?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLAndNonfreeOnSameMachine\"
+# | name=\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program
+# | and an unrelated non[---]free program on the same computer?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLAndNonfreeOnSameMachine\" name="
+#| "\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and "
+#| "an unrelated non-free program on the same computer?</a>"
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
-"\"> Can I have a GPL-covered program and an unrelated non-free program on "
-"the same computer?</a>"
+"\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
+"same computer?</a>"
 msgstr ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
 "\"> &Egrave; possibile avere sullo stesso computer un programma con licenza "
@@ -436,10 +444,18 @@
 "suo software proprietario?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would
+# | like to release a program I wrote under the GNU GPL, but I would like to
+# | use the same code in non[---]free programs.</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a>"
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
-"the same code in non-free programs.</a>"
+"the same code in nonfree programs.</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">Vorrei "
 "rilasciare un programma che ho  scritto sotto la GNU GPL, ma mi piacerebbe "
@@ -489,9 +505,15 @@
 "modelli da usare in sistemi di gestione dei siti web?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program
+# | under the GPL which I developed using non[---]free tools?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a>"
 msgid ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program "
-"under the GPL which I developed using non-free tools?</a>"
+"under the GPL which I developed using nonfree tools?</a>"
 msgstr ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">&Egrave; possibile "
 "rilasciare con licenza GPL un programma sviluppato utilizzando strumenti non "
@@ -684,10 +706,18 @@
 msgstr "Usare programma coperti da GPL quando si scrivono altri programmi"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I
+# | use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I "
+#| "use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a>"
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I use "
-"GPL-covered editors such as GNU Emacs to develop non-free programs? Can I "
-"use GPL-covered tools such as GCC to compile them?</a>"
+"GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
+"GPL-covered tools such as GCC to compile them?</a>"
 msgstr ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Posso    "
 "usare editor di testo protetti da GPL, come GNU Emacs, per sviluppare "
@@ -869,17 +899,29 @@
 "includere nelle    licenze di questi plug-in?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL
+# | when writing a plug-in for a non[---]free program?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL "
-"when writing a plug-in for a non-free program?</a>"
+"when writing a plug-in for a nonfree program?</a>"
 msgstr ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Posso usare la GPL "
 "per un plug-in destinato    ad un programma non libero?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a
+# | non[---]free program that's designed to load a GPL-covered plug-in?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+#| "non-free program that's designed to load a GPL-covered plug-in?</a>"
 msgid ""
-"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a non-"
-"free program that's designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+"nonfree program that's designed to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Posso rilasciare un "
 "programma non libero che ha come scopo quello di caricare un plug-in coperto "
@@ -909,9 +951,15 @@
 "licenza di X11) tra la parte coperta da GPL e la parte proprietaria?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free
+# | software that uses non[---]free libraries?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
+#| "software that uses non-free libraries?</a>"
 msgid ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
-"software that uses non-free libraries?</a>"
+"software that uses nonfree libraries?</a>"
 msgstr ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Posso scrivere    "
 "programmi liberi che fanno uso di librerie non libere?</a>"
@@ -1323,10 +1371,18 @@
 "em> pubblicare o no il software  rimane a chi ha effettuato le modifiche."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCGPLAndNonfreeOnSameMachine\"
+# | name=\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and
+# | an unrelated non[---]free program on the same computer?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
+#| "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
+#| "unrelated non-free program on the same computer?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
 "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
-"unrelated non-free program on the same computer?</a></b>"
+"unrelated nonfree program on the same computer?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
 "\"GPLAndNonfreeOnSameMachine\"> E' possibile avere sullo stesso computer un "
@@ -1550,8 +1606,18 @@
 "software debbano pagarmi una somma di denaro e/o farmelo  sapere?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | No.  In fact, a requirement like that would make the program non[---]free.
+# |  If people have to pay when they get a copy of a program, or if they have
+# | to notify anyone in particular, then the program is not free.  See the <a
+# | href=\"/philosophy/free-sw.html\"> definition of free software</a>.
+#, fuzzy
+#| msgid ""
+#| "No.  In fact, a requirement like that would make the program non-free.  "
+#| "If people have to pay when they get a copy of a program, or if they have "
+#| "to notify anyone in particular, then the program is not free.  See the <a "
+#| "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -1906,18 +1972,36 @@
 "se permette la stessa cosa."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free
+# | software that uses non[---]free libraries?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
+#| "software that uses non-free libraries?</a></b>"
 msgid ""
 "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
-"software that uses non-free libraries?</a></b>"
+"software that uses nonfree libraries?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Posso scrivere    "
 "programmi liberi che fanno uso di librerie non libere?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | If you do this, your program won't be fully usable in a free environment.
+# | If your program depends on a non[---]free library to do a certain job, it
+# | cannot do that job in the Free World. If it depends on a non[---]free
+# | library to run at all, it cannot be part of a free operating system such
+# | as GNU; it is entirely off limits to the Free World.
+#, fuzzy
+#| msgid ""
+#| "If you do this, your program won't be fully usable in a free environment. "
+#| "If your program depends on a non-free library to do a certain job, it "
+#| "cannot do that job in the Free World. If it depends on a non-free library "
+#| "to run at all, it cannot be part of a free operating system such as GNU; "
+#| "it is entirely off limits to the Free World."
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -1939,14 +2023,32 @@
 "scrivere un'alternativa a questa  libreria che sia libera?"
 
 #. type: Content of: <dl><dd><p>
+# | If the program is already written using the non[---]free library, perhaps
+# | it is too late to change the decision. You may as well release the program
+# | as it stands, rather than not release it. But please mention in the README
+# | that the need for the non[---]free library is a drawback, and suggest the
+# | task of changing the program so that it does the same job without the
+# | non[---]free library.  Please suggest that anyone who thinks of doing
+# | substantial further work on the program first free it from dependence on
+# | the non[---]free library.
+#, fuzzy
+#| msgid ""
+#| "If the program is already written using the non-free library, perhaps it "
+#| "is too late to change the decision. You may as well release the program "
+#| "as it stands, rather than not release it. But please mention in the "
+#| "README that the need for the non-free library is a drawback, and suggest "
+#| "the task of changing the program so that it does the same job without the "
+#| "non-free library.  Please suggest that anyone who thinks of doing "
+#| "substantial further work on the program first free it from dependence on "
+#| "the non-free library."
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 "Purtroppo se il programma è stato già scritto usando la  libreria "
 "proprietaria, allora probabilmente è troppo tardi per  cambiare idea. È "
@@ -1959,8 +2061,18 @@
 "chiunque intenda apportare modifiche sostanziali al programma."
 
 #. type: Content of: <dl><dd><p>
+# | Note that there may also be legal issues with combining certain
+# | non[---]free libraries with GPL-covered Free Software.  Please see <a
+# | href=\"#GPLIncompatibleLibs\">the question on GPL software with
+# | GPL-incompatible libraries</a> for more information.
+#, fuzzy
+#| msgid ""
+#| "Note that there may also be legal issues with combining certain non-free "
+#| "libraries with GPL-covered Free Software.  Please see <a href="
+#| "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-"
+#| "incompatible libraries</a> for more information."
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered Free Software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -2149,10 +2261,18 @@
 "loro lavoro -- possono  scegliere di farlo o di non farlo."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+# | If the libraries you intend to link with are non[---]free, please also see
+# | <a href=\"#FSWithNFLibs\">the section on writing Free Software which uses
+# | non[---]free libraries</a>.
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are non-free, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
+msgid ""
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 "Se le librerie a cui si desidera collegare il programma non sono libere, "
 "leggere anche la sezione riguardante la scrittura di <a href=\"#FSWithNFLibs"
@@ -2328,18 +2448,36 @@
 "suddetta copia."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I
+# | would like to release a program I wrote under the GNU GPL, but I would
+# | like to use the same code in non[---]free programs.</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a></b>"
 msgid ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
 "would like to release a program I wrote under the GNU GPL, but I would like "
-"to use the same code in non-free programs.</a></b>"
+"to use the same code in nonfree programs.</a></b>"
 msgstr ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF"
 "\">Vorrei  rilasciare un programma che ho scritto sotto la GNU GPL, ma mi  "
 "piacerebbe anche usare lo stesso codice in programmi non  liberi.</a></b>"
 
 #. type: Content of: <dl><dd>
+# | To release a non[---]free program is always ethically tainted, but legally
+# | there is no obstacle to your doing this.  If you are the copyright holder
+# | for the code, you can release it under various different non-exclusive
+# | licenses at various times.
+#, fuzzy
+#| msgid ""
+#| "To release a non-free program is always ethically tainted, but legally "
+#| "there is no obstacle to your doing this.  If you are the copyright holder "
+#| "for the code, you can release it under various different non-exclusive "
+#| "licenses at various times."
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -2401,10 +2539,18 @@
 "sotto la GPL, e questo diritto non può    essere ritirato."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can
+# | I use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can "
+#| "I use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a></b>"
 msgid ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can I "
-"use GPL-covered editors such as GNU Emacs to develop non-free programs? Can "
-"I use GPL-covered tools such as GCC to compile them?</a></b>"
+"use GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I "
+"use GPL-covered tools such as GCC to compile them?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Posso "
 "usare  editor di testo protetti da GPL, come GNU Emacs, per sviluppare "
@@ -2439,12 +2585,24 @@
 "copyright  dell'input."
 
 #. type: Content of: <dl><dd><p>
+# | As it happens, Bison can also be used to develop non[---]free programs. 
+# | This is because we decided to explicitly permit the use of the Bison
+# | standard parser program in Bison output files without restriction.  We
+# | made the decision because there were other tools comparable to Bison which
+# | already permitted use for non[---]free programs.
+#, fuzzy
+#| msgid ""
+#| "As it happens, Bison can also be used to develop non-free programs.  This "
+#| "is because we decided to explicitly permit the use of the Bison standard "
+#| "parser program in Bison output files without restriction.  We made the "
+#| "decision because there were other tools comparable to Bison which already "
+#| "permitted use for non-free programs."
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 "Ma nel caso di Bison, questo programma può essere usato anche  per "
 "sviluppare programmi non liberi. Questo perché abbiamo deciso  di permettere 
"
@@ -2975,9 +3133,15 @@
 "plug-in."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the
+# | GPL when writing a plug-in for a non[---]free program?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
-"GPL when writing a plug-in for a non-free program?</a></b>"
+"GPL when writing a plug-in for a nonfree program?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Posso usare la GPL "
 "per un plug-in destinato ad  un programma non libero?</a></b>"
@@ -2994,10 +3158,10 @@
 # | to each other and share data structures, we believe-] they form a single
 # | [-program, which must be treated as an extension of both the main-]
 # | {+combined+} program [-and the plug-ins.  This-] {+this+} means that
-# | combination of the GPL-covered plug-in with the non-free main program
+# | combination of the GPL-covered plug-in with the non[---]free main program
 # | would violate the GPL. However, you can resolve that legal problem by
 # | adding an exception to your plug-in's license, giving permission to link
-# | it with the non-free main program.
+# | it with the non[---]free main program.
 #, fuzzy
 #| msgid ""
 #| "If the program dynamically links plug-ins, and they make function calls "
@@ -3009,9 +3173,9 @@
 #| "license, giving permission to link it with the non-free main program."
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 "Se invece il programma effettua un collegamento dinamico dei  plug-in, ed "
@@ -3025,17 +3189,30 @@
 "libero in questione."
 
 #. type: Content of: <dl><dd><p>
+# | See also the question <a href=\"#FSWithNFLibs\">I am writing free software
+# | that uses a non[---]free library.</a>
+#, fuzzy
+#| msgid ""
+#| "See also the question <a href=\"#FSWithNFLibs\">I am writing free "
+#| "software that uses a non-free library.</a>"
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 "Vedere anche \"<a href=\"#FSWithNFLibs\">Posso scrivere    programmi liberi "
 "che fanno uso di librerie non libere?</a>\"."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release
+# | a non[---]free program that's designed to load a GPL-covered
+# | plug-in?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release "
+#| "a non-free program that's designed to load a GPL-covered plug-in?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release a "
-"non-free program that's designed to load a GPL-covered plug-in?</a></b>"
+"nonfree program that's designed to load a GPL-covered plug-in?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Posso rilasciare "
 "un programma non libero che ha come scopo quello di caricare un plug-in "
@@ -3551,12 +3728,24 @@
 "sistema proprietario. Lo posso fare?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | You cannot incorporate GPL-covered software in a proprietary system.  The
+# | goal of the GPL is to grant everyone the freedom to copy, redistribute,
+# | understand, and modify a program.  If you could incorporate GPL-covered
+# | software into a non[---]free system, it would have the effect of making
+# | the GPL-covered software non[---]free too.
+#, fuzzy
+#| msgid ""
+#| "You cannot incorporate GPL-covered software in a proprietary system.  The "
+#| "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
+#| "understand, and modify a program.  If you could incorporate GPL-covered "
+#| "software into a non-free system, it would have the effect of making the "
+#| "GPL-covered software non-free too."
 msgid ""
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 "Non è possibile incorporare del software rilasciato sotto    licenza GPL in "
 "un sistema proprietario. L'obiettivo della    licenza GPL è quello di "
@@ -3582,10 +3771,22 @@
 "miglioramenti che dovessero apportare."
 
 #. type: Content of: <dl><dd><p>
+# | However, in many cases you can distribute the GPL-covered software
+# | alongside your proprietary system.  To do this validly, you must make sure
+# | that the free and non[---]free programs communicate at arms length, that
+# | they are not combined in a way that would make them effectively a single
+# | program.
+#, fuzzy
+#| msgid ""
+#| "However, in many cases you can distribute the GPL-covered software "
+#| "alongside your proprietary system.  To do this validly, you must make "
+#| "sure that the free and non-free programs communicate at arms length, that "
+#| "they are not combined in a way that would make them effectively a single "
+#| "program."
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 "Comunque, in molti casi è possibile distribuire il software  coperto da GPL "
@@ -4713,9 +4914,15 @@
 "your version."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a
+# | program under the GPL which I developed using non[---]free tools?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
-"program under the GPL which I developed using non-free tools?</a></b>"
+"program under the GPL which I developed using nonfree tools?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">&Egrave; possibile "
 "rilasciare con licenza GPL un programma sviluppato utilizzando strumenti non "
@@ -4732,8 +4939,22 @@
 "registrare il codice stesso."
 
 #. type: Content of: <dl><dd><p>
+# | However, if you link non[---]free libraries with the source code, that
+# | would be an issue you need to deal with.  It does not preclude releasing
+# | the source code under the GPL, but if the libraries don't fit under the
+# | &ldquo;system library&rdquo; exception, you should affix an explicit
+# | notice giving permission to link your program with them.  The FSF can give
+# | you advice on doing this.
+#, fuzzy
+#| msgid ""
+#| "However, if you link non-free libraries with the source code, that would "
+#| "be an issue you need to deal with.  It does not preclude releasing the "
+#| "source code under the GPL, but if the libraries don't fit under the "
+#| "&ldquo;system library&rdquo; exception, you should affix an explicit "
+#| "notice giving permission to link your program with them.  The FSF can "
+#| "give you advice on doing this."
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -5041,14 +5262,30 @@
 "GPL o da qualche  altra licenza libera?</a></b>"
 
 #. type: Content of: <dl><dd>
+# | In general, the answer is no&mdash;this is not a legal requirement.  In
+# | specific, the answer depends on which libraries you want to use and what
+# | their licenses are.  Most system libraries either use the <a
+# | href=\"/copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus
+# | an exception permitting linking the library with anything.  These
+# | libraries can be used in non[---]free programs; but in the case of the
+# | Lesser GPL, it does have some requirements you must follow.
+#, fuzzy
+#| msgid ""
+#| "In general, the answer is no&mdash;this is not a legal requirement.  In "
+#| "specific, the answer depends on which libraries you want to use and what "
+#| "their licenses are.  Most system libraries either use the <a href=\"/"
+#| "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
+#| "exception permitting linking the library with anything.  These libraries "
+#| "can be used in non-free programs; but in the case of the Lesser GPL, it "
+#| "does have some requirements you must follow."
 msgid ""
 "In general, the answer is no&mdash;this is not a legal requirement.  In "
 "specific, the answer depends on which libraries you want to use and what "
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 "In generale, la risposta è no--non è un obbligo legale. Per    essere più "
 "specifici, la risposta dipende da quali librerie    intendete usare e quali "

Index: old-licenses/po/gpl-2.0-faq.ja.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ja.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- old-licenses/po/gpl-2.0-faq.ja.po   10 Mar 2017 21:29:55 -0000      1.37
+++ old-licenses/po/gpl-2.0-faq.ja.po   11 Mar 2017 08:02:03 -0000      1.38
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:26+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2015-09-18 08:45+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -180,10 +180,15 @@
 "ることを要求しますか?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLAndNonfreeOnSameMachine\" name="
+#| "\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and "
+#| "an unrelated non-free program on the same computer?</a>"
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
-"\"> Can I have a GPL-covered program and an unrelated non-free program on "
-"the same computer?</a>"
+"\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
+"same computer?</a>"
 msgstr ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
 "\">あるGPLの及ぶプログラム
と、それと関係のない不自由なプログラムを同じコン"
@@ -428,10 +433,15 @@
 "しましょう?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a>"
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
-"the same code in non-free programs.</a>"
+"the same code in nonfree programs.</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\" 
name=\"TOCReleaseUnderGPLAndNF\">自分が書い"
 "たプログラムをGNU 
GPLのもとでリリースしたいのですが、同じコードを自由ではない"
@@ -481,9 +491,13 @@
 "どのライセンスを使うべきでしょうか?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a>"
 msgid ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program "
-"under the GPL which I developed using non-free tools?</a>"
+"under the GPL which I developed using nonfree tools?</a>"
 msgstr ""
 "<a href=\"#NonFreeTools\" 
name=\"TOCNonFreeTools\">不自由なツールを用いて開発"
 "したプログラムをGPLでリリースできるでしょうか?</a>"
@@ -670,10 +684,15 @@
 msgstr "GPLのもとでリリースされたプログラム
を使って他のプログラムを書く"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I "
+#| "use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a>"
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I use "
-"GPL-covered editors such as GNU Emacs to develop non-free programs? Can I "
-"use GPL-covered tools such as GCC to compile them?</a>"
+"GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
+"GPL-covered tools such as GCC to compile them?</a>"
 msgstr ""
 "<a href=\"#CanIUseGPLToolsForNF\" 
name=\"TOCCanIUseGPLToolsForNF\">自由でない"
 "プログラムを開発するために、GNU 
EmacsのようなGPLの及ぶエディタを使っても良い"
@@ -845,17 +864,25 @@
 "な条件がありますか?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL "
-"when writing a plug-in for a non-free program?</a>"
+"when writing a plug-in for a nonfree program?</a>"
 msgstr ""
 "<a href=\"#GPLPluginsInNF\" 
name=\"TOCGPLPluginsInNF\">自由でないプログラム向"
 "けのプラグインにGPLを適用することはできますか?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+#| "non-free program that's designed to load a GPL-covered plug-in?</a>"
 msgid ""
-"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a non-"
-"free program that's designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+"nonfree program that's designed to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a href=\"#NFUseGPLPlugins\" 
name=\"TOCNFUseGPLPlugins\">GPLの及ぶプラグイン"
 "をロードするように設計された不自由なプログラム
をリリースすることはできるで"
@@ -885,9 +912,13 @@
 
"ような)の「ラッパー」モジュールをはさむことにより、これは可能ですか?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
+#| "software that uses non-free libraries?</a>"
 msgid ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
-"software that uses non-free libraries?</a>"
+"software that uses nonfree libraries?</a>"
 msgstr ""
 "<a href=\"#FSWithNFLibs\" 
name=\"TOCFSWithNFLibs\">自由でないライブラリを利用"
 "する自由ソフトウェアを書けますか?</a>"
@@ -1288,10 +1319,15 @@
 "かはあなた次第です。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
+#| "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
+#| "unrelated non-free program on the same computer?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
 "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
-"unrelated non-free program on the same computer?</a></b>"
+"unrelated nonfree program on the same computer?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
 "\"GPLAndNonfreeOnSameMachine\">あるGPLの及ぶプログラム
と、それと関係のない不"
@@ -1512,8 +1548,14 @@
 
"は、受け取った旨を通知することを義務づけることを許可していますか?</a></b>"
 
 #. type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "No.  In fact, a requirement like that would make the program non-free.  "
+#| "If people have to pay when they get a copy of a program, or if they have "
+#| "to notify anyone in particular, then the program is not free.  See the <a "
+#| "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -1854,18 +1896,29 @@
 "両立します。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
+#| "software that uses non-free libraries?</a></b>"
 msgid ""
 "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
-"software that uses non-free libraries?</a></b>"
+"software that uses nonfree libraries?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCFSWithNFLibs\" 
name=\"FSWithNFLibs\">自由でないライブラリを"
 "利用する自由ソフトウェアを書けますか?</a></b>"
 
 #. type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "If you do this, your program won't be fully usable in a free environment. "
+#| "If your program depends on a non-free library to do a certain job, it "
+#| "cannot do that job in the Free World. If it depends on a non-free library "
+#| "to run at all, it cannot be part of a free operating system such as GNU; "
+#| "it is entirely off limits to the Free World."
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -1887,14 +1940,24 @@
 "できませんか?"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If the program is already written using the non-free library, perhaps it "
+#| "is too late to change the decision. You may as well release the program "
+#| "as it stands, rather than not release it. But please mention in the "
+#| "README that the need for the non-free library is a drawback, and suggest "
+#| "the task of changing the program so that it does the same job without the "
+#| "non-free library.  Please suggest that anyone who thinks of doing "
+#| "substantial further work on the program first free it from dependence on "
+#| "the non-free library."
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 "もしプログラム
がすでに自由でないライブラリを利用して書かれていたならば、おそ"
 "らく決断を変えるには遅
すぎるでしょうから、リリースしないよりは、プログラム
を"
@@ -1905,8 +1968,14 @@
 
"由でないライブラリに対する依存から脱却することを提案してくã
 ã•ã„。"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Note that there may also be legal issues with combining certain non-free "
+#| "libraries with GPL-covered Free Software.  Please see <a href="
+#| "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-"
+#| "incompatible libraries</a> for more information."
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered Free Software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -2115,10 +2184,15 @@
 "る必
要はありません。そうするかどうかはかれらの選択に任されています。"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are non-free, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
+msgid ""
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 
"もし、ライブラリを不自由なものとリンクすることを考えているのであれば、<a
 "
 
"href=\"#FSWithNFLibs\">自由でないライブラリを利用する自由ソフトウェアを書くに"
@@ -2280,18 +2354,29 @@
 "に適用されるライセンスです。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a></b>"
 msgid ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
 "would like to release a program I wrote under the GNU GPL, but I would like "
-"to use the same code in non-free programs.</a></b>"
+"to use the same code in nonfree programs.</a></b>"
 msgstr ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" 
name=\"ReleaseUnderGPLAndNF\">自分が"
 "書いたプログラムをGNU 
GPLのもとでリリースしたいのですが、同じコードを自由では"
 "ないプログラムでも使いたいのです。</a></b>"
 
 #. type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "To release a non-free program is always ethically tainted, but legally "
+#| "there is no obstacle to your doing this.  If you are the copyright holder "
+#| "for the code, you can release it under various different non-exclusive "
+#| "licenses at various times."
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -2351,10 +2436,15 @@
 "権利を撤回することはできません。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can "
+#| "I use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a></b>"
 msgid ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can I "
-"use GPL-covered editors such as GNU Emacs to develop non-free programs? Can "
-"I use GPL-covered tools such as GCC to compile them?</a></b>"
+"use GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I "
+"use GPL-covered tools such as GCC to compile them?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" 
name=\"CanIUseGPLToolsForNF\">自由で"
 "ないプログラムを開発するために、GNU 
EmacsのようなGPLの及ぶエディタを使っても"
@@ -2387,12 +2477,19 @@
 "力から派生した出力結果の一部は入力側の著作権状æ…
‹ã‚’継承します。"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "As it happens, Bison can also be used to develop non-free programs.  This "
+#| "is because we decided to explicitly permit the use of the Bison standard "
+#| "parser program in Bison output files without restriction.  We made the "
+#| "decision because there were other tools comparable to Bison which already "
+#| "permitted use for non-free programs."
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 "たまたま、Bisonは自由でないプログラム
を開発するのにも使うことができます。これ"
 
"は、わたしたちがBisonの出力結果に含まれるBisonの標準パーザ・プログラãƒ
 ã¯åˆ¶é™"
@@ -2879,9 +2976,13 @@
 "めに配布される時には、GPLの条項
に従わなければならないということです。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
-"GPL when writing a plug-in for a non-free program?</a></b>"
+"GPL when writing a plug-in for a nonfree program?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCGPLPluginsInNF\" 
name=\"GPLPluginsInNF\">自由でないプログラ"
 "ム
向けのプラグインにGPLを適用することはできますか?</a></b>"
@@ -2905,9 +3006,9 @@
 #| "license, giving permission to link it with the non-free main program."
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 "プログラム
がプラグインと動的にリンクされ、お互いにファンクションコールを使っ"
@@ -2919,17 +3020,25 @@
 "ることで解決できます。"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "See also the question <a href=\"#FSWithNFLibs\">I am writing free "
+#| "software that uses a non-free library.</a>"
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 "質問、<a 
href=\"#FSWithNFLibs\">自由でないライブラリを利用する自由ソフトウェ"
 "アを書いています</a>もご覧ください。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release "
+#| "a non-free program that's designed to load a GPL-covered plug-in?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release a "
-"non-free program that's designed to load a GPL-covered plug-in?</a></b>"
+"nonfree program that's designed to load a GPL-covered plug-in?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" 
name=\"NFUseGPLPlugins\">GPLの及ぶプラグイ"
 "ンをロードするように設計された不自由なプログラム
をリリースすることはできるで"
@@ -3420,12 +3529,19 @@
 "が、それは可能ですか?</a></b>"
 
 #. type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "You cannot incorporate GPL-covered software in a proprietary system.  The "
+#| "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
+#| "understand, and modify a program.  If you could incorporate GPL-covered "
+#| "software into a non-free system, it would have the effect of making the "
+#| "GPL-covered software non-free too."
 msgid ""
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 "GPLの及ぶソフトウェアをプロプライエタリ・システム
に組み入れることはできませ"
 "ん。GPLの目標は、誰に対してもプログラムを複製や再é…
å¸ƒã€ç†è§£ã€æ”¹å¤‰ã™ã‚‹è‡ªç”±ã‚’与"
@@ -3448,10 +3564,17 @@
 "いうことです。"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "However, in many cases you can distribute the GPL-covered software "
+#| "alongside your proprietary system.  To do this validly, you must make "
+#| "sure that the free and non-free programs communicate at arms length, that "
+#| "they are not combined in a way that would make them effectively a single "
+#| "program."
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 "しかし多くのå 
´åˆã€GPLの及ぶソフトウェアをプロプライエタリ・システム
と一緒に配"
@@ -4553,9 +4676,13 @@
 "のバージョンから削除してください。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
-"program under the GPL which I developed using non-free tools?</a></b>"
+"program under the GPL which I developed using nonfree tools?</a></b>"
 msgstr ""
 "<b><a href=\"#TOCNonFreeTools\" 
name=\"NonFreeTools\">不自由なツールを用いて"
 "開発したプログラム
をGPLでリリースできるでしょうか?</a></b>"
@@ -4571,8 +4698,16 @@
 "の違いも与えません。"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "However, if you link non-free libraries with the source code, that would "
+#| "be an issue you need to deal with.  It does not preclude releasing the "
+#| "source code under the GPL, but if the libraries don't fit under the "
+#| "&ldquo;system library&rdquo; exception, you should affix an explicit "
+#| "notice giving permission to link your program with them.  The FSF can "
+#| "give you advice on doing this."
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -4874,14 +5009,23 @@
 "a></b>"
 
 #. type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "In general, the answer is no&mdash;this is not a legal requirement.  In "
+#| "specific, the answer depends on which libraries you want to use and what "
+#| "their licenses are.  Most system libraries either use the <a href=\"/"
+#| "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
+#| "exception permitting linking the library with anything.  These libraries "
+#| "can be used in non-free programs; but in the case of the Lesser GPL, it "
+#| "does have some requirements you must follow."
 msgid ""
 "In general, the answer is no&mdash;this is not a legal requirement.  In "
 "specific, the answer depends on which libraries you want to use and what "
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 
"一般的に言えば、答えはノーです。これは法的な要件ではありません。個ã€
…のケース"
 
"では、答えはあなたが使いたいライブラリとそのライセンスによります。多くのシス"

Index: old-licenses/po/gpl-2.0-faq.pot
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.pot,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- old-licenses/po/gpl-2.0-faq.pot     10 Mar 2017 21:29:55 -0000      1.26
+++ old-licenses/po/gpl-2.0-faq.pot     11 Mar 2017 08:02:04 -0000      1.27
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:26+0000\n"
+"POT-Creation-Date: 2017-03-11 07: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"
@@ -139,7 +139,7 @@
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" "
 "name=\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and "
-"an unrelated non-free program on the same computer?</a>"
+"an unrelated nonfree program on the same computer?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -317,7 +317,7 @@
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
-"the same code in non-free programs.</a>"
+"the same code in nonfree programs.</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -354,7 +354,7 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program "
-"under the GPL which I developed using non-free tools?</a>"
+"under the GPL which I developed using nonfree tools?</a>"
 msgstr ""
 
 #. type: Content of: <h4>
@@ -489,8 +489,8 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I use "
-"GPL-covered editors such as GNU Emacs to develop non-free programs? Can I "
-"use GPL-covered tools such as GCC to compile them?</a>"
+"GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
+"GPL-covered tools such as GCC to compile them?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -610,13 +610,13 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL "
-"when writing a plug-in for a non-free program?</a>"
+"when writing a plug-in for a nonfree program?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
-"non-free program that's designed to load a GPL-covered plug-in?</a>"
+"nonfree program that's designed to load a GPL-covered plug-in?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -638,7 +638,7 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
-"software that uses non-free libraries?</a>"
+"software that uses nonfree libraries?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -912,7 +912,7 @@
 msgid ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" "
 "name=\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
-"unrelated non-free program on the same computer?</a></b>"
+"unrelated nonfree program on the same computer?</a></b>"
 msgstr ""
 
 #. type: Content of: <dl><dd>
@@ -1063,7 +1063,7 @@
 
 #. type: Content of: <dl><dd>
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a "
 "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -1299,14 +1299,14 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
-"software that uses non-free libraries?</a></b>"
+"software that uses nonfree libraries?</a></b>"
 msgstr ""
 
 #. type: Content of: <dl><dd>
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -1319,18 +1319,18 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered Free Software.  Please see <a "
 "href=\"#GPLIncompatibleLibs\">the question on GPL software with "
 "GPL-incompatible libraries</a> for more information."
@@ -1455,9 +1455,9 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
+"If the libraries you intend to link with are nonfree, please also see <a "
 "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
-"non-free libraries</a>."
+"nonfree libraries</a>."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -1568,12 +1568,12 @@
 msgid ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
 "would like to release a program I wrote under the GNU GPL, but I would like "
-"to use the same code in non-free programs.</a></b>"
+"to use the same code in nonfree programs.</a></b>"
 msgstr ""
 
 #. type: Content of: <dl><dd>
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -1618,8 +1618,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can I "
-"use GPL-covered editors such as GNU Emacs to develop non-free programs? Can "
-"I use GPL-covered tools such as GCC to compile them?</a></b>"
+"use GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I "
+"use GPL-covered tools such as GCC to compile them?</a></b>"
 msgstr ""
 
 #. type: Content of: <dl><dd>
@@ -1641,11 +1641,11 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -1968,7 +1968,7 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
-"GPL when writing a plug-in for a non-free program?</a></b>"
+"GPL when writing a plug-in for a nonfree program?</a></b>"
 msgstr ""
 
 #. type: Content of: <dl><dd>
@@ -1981,22 +1981,22 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the "
+"GPL-covered plug-in with the nonfree main program would violate the "
 "GPL. However, you can resolve that legal problem by adding an exception to "
-"your plug-in's license, giving permission to link it with the non-free main "
+"your plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 
 #. type: Content of: <dl><dt>
 msgid ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release a "
-"non-free program that's designed to load a GPL-covered plug-in?</a></b>"
+"nonfree program that's designed to load a GPL-covered plug-in?</a></b>"
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -2319,8 +2319,8 @@
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the "
-"GPL-covered software non-free too."
+"software into a nonfree system, it would have the effect of making the "
+"GPL-covered software nonfree too."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -2336,7 +2336,7 @@
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 
@@ -3070,7 +3070,7 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
-"program under the GPL which I developed using non-free tools?</a></b>"
+"program under the GPL which I developed using nonfree tools?</a></b>"
 msgstr ""
 
 #. type: Content of: <dl><dd>
@@ -3082,7 +3082,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -3293,7 +3293,7 @@
 "their licenses are.  Most system libraries either use the <a "
 "href=\"/copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus "
 "an exception permitting linking the library with anything.  These libraries "
-"can be used in non-free programs; but in the case of the Lesser GPL, it does "
+"can be used in nonfree programs; but in the case of the Lesser GPL, it does "
 "have some requirements you must follow."
 msgstr ""
 

Index: po/gpl-faq.es.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.es.po,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- po/gpl-faq.es.po    10 Mar 2017 21:29:55 -0000      1.78
+++ po/gpl-faq.es.po    11 Mar 2017 08:02:04 -0000      1.79
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:25+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2017-02-21 11:00+0100\n"
 "Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -165,9 +165,15 @@
 "de las versiones modificadas se ponga a disposición del público?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program
+# | and an unrelated non[---]free program on the same computer?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program "
+#| "and an unrelated non-free program on the same computer?</a>"
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program and "
-"an unrelated non-free program on the same computer?</a>"
+"an unrelated nonfree program on the same computer?</a>"
 msgstr ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\">¿Puedo tener en el mismo ordenador "
 "un programa cubierto por la GPL y un programa distinto que no sea libre?</a>"
@@ -595,10 +601,18 @@
 "incluir mi programa entre sus productos de software privativo?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I
+# | wrote under the GNU GPL, but I would like to use the same code in
+# | non[---]free programs.</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I "
+#| "wrote under the GNU GPL, but I would like to use the same code in non-"
+#| "free programs.</a>"
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I wrote "
-"under the GNU GPL, but I would like to use the same code in non-free "
-"programs.</a>"
+"under the GNU GPL, but I would like to use the same code in nonfree programs."
+"</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\">Me gustaría publicar bajo la GPL de GNU un 
"
 "programa que he escrito, pero quisiera usar el mismo código en programas que 
"
@@ -673,9 +687,15 @@
 "de mantenimiento de un sitio web?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NonFreeTools\">Can I release a program under the GPL which I
+# | developed using non[---]free tools?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
+#| "developed using non-free tools?</a>"
 msgid ""
 "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
-"developed using non-free tools?</a>"
+"developed using nonfree tools?</a>"
 msgstr ""
 "<a href=\"#NonFreeTools\">¿Puedo publicar bajo la GPL un programa que he "
 "desarrolado utilizando herramientas que no son libres?</a>"
@@ -1015,9 +1035,17 @@
 "programas"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as
+# | GNU Emacs to develop non[---]free programs? Can I use GPL-covered tools
+# | such as GCC to compile them?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as "
+#| "GNU Emacs to develop non-free programs? Can I use GPL-covered tools such "
+#| "as GCC to compile them?</a>"
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as GNU "
-"Emacs to develop non-free programs? Can I use GPL-covered tools such as GCC "
+"Emacs to develop nonfree programs? Can I use GPL-covered tools such as GCC "
 "to compile them?</a>"
 msgstr ""
 "<a href=\"#CanIUseGPLToolsForNF\">¿Puedo emplear editores de texto cubiertos 
"
@@ -1223,17 +1251,29 @@
 "</a> "
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in for
+# | a non[---]free program?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in "
+#| "for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in for a "
-"non-free program?</a>"
+"nonfree program?</a>"
 msgstr ""
 "<a href=\"#GPLPluginsInNF\">¿Puedo utilizar la GPL si escribo un accesorio "
 "para un programa que no es libre?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NFUseGPLPlugins\">Can I release a non[---]free program that's
+# | designed to load a GPL-covered plug-in?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
+#| "designed to load a GPL-covered plug-in?</a>"
 msgid ""
-"<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
-"designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\">Can I release a nonfree program that's designed "
+"to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a href=\"#NFUseGPLPlugins\">¿Puedo publicar un programa privativo que está 
"
 "diseñado para cargar un accesorio cubierto por la GPL?</a>"
@@ -1251,8 +1291,14 @@
 "licencia X11), entre la parte cubierta por la GPL y la parte privativa?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#FSWithNFLibs\">Can I write free software that uses non[---]free
+# | libraries?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#FSWithNFLibs\">Can I write free software that uses non-free "
+#| "libraries?</a>"
 msgid ""
-"<a href=\"#FSWithNFLibs\">Can I write free software that uses non-free "
+"<a href=\"#FSWithNFLibs\">Can I write free software that uses nonfree "
 "libraries?</a>"
 msgstr ""
 "<a href=\"#FSWithNFLibs\">¿Puedo escribir software libre que utilice "
@@ -1709,8 +1755,17 @@
 "depende de usted."
 
 #. type: Content of: <dl><dt>
+# | Can I have a GPL-covered program and an unrelated non[---]free program on
+# | the same computer? <span class=\"anchor-reference-id\">(<a
+# | href=\"#GPLAndNonfreeOnSameMachine\"
+# | >#GPLAndNonfreeOnSameMachine</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I have a GPL-covered program and an unrelated non-free program on the "
+#| "same computer? <span class=\"anchor-reference-id\">(<a href="
+#| "\"#GPLAndNonfreeOnSameMachine\" >#GPLAndNonfreeOnSameMachine</a>)</span>"
 msgid ""
-"Can I have a GPL-covered program and an unrelated non-free program on the "
+"Can I have a GPL-covered program and an unrelated nonfree program on the "
 "same computer? <span class=\"anchor-reference-id\">(<a href="
 "\"#GPLAndNonfreeOnSameMachine\" >#GPLAndNonfreeOnSameMachine</a>)</span>"
 msgstr ""
@@ -1949,8 +2004,18 @@
 "span>"
 
 #. type: Content of: <dl><dd><p>
+# | No.  In fact, a requirement like that would make the program non[---]free.
+# |  If people have to pay when they get a copy of a program, or if they have
+# | to notify anyone in particular, then the program is not free.  See the <a
+# | href=\"/philosophy/free-sw.html\"> definition of free software</a>.
+#, fuzzy
+#| msgid ""
+#| "No.  In fact, a requirement like that would make the program non-free.  "
+#| "If people have to pay when they get a copy of a program, or if they have "
+#| "to notify anyone in particular, then the program is not free.  See the <a "
+#| "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -2466,8 +2531,16 @@
 "esto e incluye la lista de requisitos adicionales permitidos."
 
 #. type: Content of: <dl><dt>
+# | Can I write free software that uses non[---]free libraries? <span
+# | class=\"anchor-reference-id\">(<a href=\"#FSWithNFLibs\"
+# | >#FSWithNFLibs</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I write free software that uses non-free libraries? <span class="
+#| "\"anchor-reference-id\">(<a href=\"#FSWithNFLibs\" >#FSWithNFLibs</a>)</"
+#| "span>"
 msgid ""
-"Can I write free software that uses non-free libraries? <span class=\"anchor-"
+"Can I write free software that uses nonfree libraries? <span class=\"anchor-"
 "reference-id\">(<a href=\"#FSWithNFLibs\" >#FSWithNFLibs</a>)</span>"
 msgstr ""
 "¿Puedo escribir software libre que utilice bibliotecas que no son libres? "
@@ -2475,10 +2548,22 @@
 ">#FSWithNFLibs</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | If you do this, your program won't be fully usable in a free environment.
+# | If your program depends on a non[---]free library to do a certain job, it
+# | cannot do that job in the Free World. If it depends on a non[---]free
+# | library to run at all, it cannot be part of a free operating system such
+# | as GNU; it is entirely off limits to the Free World.
+#, fuzzy
+#| msgid ""
+#| "If you do this, your program won't be fully usable in a free environment. "
+#| "If your program depends on a non-free library to do a certain job, it "
+#| "cannot do that job in the Free World. If it depends on a non-free library "
+#| "to run at all, it cannot be part of a free operating system such as GNU; "
+#| "it is entirely off limits to the Free World."
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -2499,14 +2584,32 @@
 "sustitutivo libre para esa biblioteca?"
 
 #. type: Content of: <dl><dd><p>
+# | If the program is already written using the non[---]free library, perhaps
+# | it is too late to change the decision. You may as well release the program
+# | as it stands, rather than not release it. But please mention in the README
+# | that the need for the non[---]free library is a drawback, and suggest the
+# | task of changing the program so that it does the same job without the
+# | non[---]free library.  Please suggest that anyone who thinks of doing
+# | substantial further work on the program first free it from dependence on
+# | the non[---]free library.
+#, fuzzy
+#| msgid ""
+#| "If the program is already written using the non-free library, perhaps it "
+#| "is too late to change the decision. You may as well release the program "
+#| "as it stands, rather than not release it. But please mention in the "
+#| "README that the need for the non-free library is a drawback, and suggest "
+#| "the task of changing the program so that it does the same job without the "
+#| "non-free library.  Please suggest that anyone who thinks of doing "
+#| "substantial further work on the program first free it from dependence on "
+#| "the non-free library."
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 "Si el programa está ya escrito haciendo uso de la biblioteca que no es "
 "libre, quizá sea demasiado tarde para cambiar la decisión. Puede también "
@@ -2518,8 +2621,18 @@
 "de su dependencia de la biblioteca en cuestión."
 
 #. type: Content of: <dl><dd><p>
+# | Note that there may also be legal issues with combining certain
+# | non[---]free libraries with GPL-covered free software.  Please see <a
+# | href=\"#GPLIncompatibleLibs\">the question on GPL software with
+# | GPL-incompatible libraries</a> for more information.
+#, fuzzy
+#| msgid ""
+#| "Note that there may also be legal issues with combining certain non-free "
+#| "libraries with GPL-covered free software.  Please see <a href="
+#| "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-"
+#| "incompatible libraries</a> for more information."
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered free software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -2624,10 +2737,18 @@
 "excepción para su código; queda a su discreción hacerlo o no."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+# | If the libraries you intend to link with are non[---]free, please also see
+# | <a href=\"#FSWithNFLibs\">the section on writing Free Software which uses
+# | non[---]free libraries</a>.
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are non-free, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
+msgid ""
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 "Si las bibliotecas con las que tiene intención de enlazar no son libres, "
 "consulte la <a href=\"#FSWithNFLibs\">sección acerca de escribir software "
@@ -2952,9 +3073,19 @@
 "forma legítima, es la licencia aplicable a su copia."
 
 #. type: Content of: <dl><dt>
+# | I would like to release a program I wrote under the GNU GPL, but I would
+# | like to use the same code in non[---]free programs.  <span
+# | class=\"anchor-reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\"
+# | >#ReleaseUnderGPLAndNF</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "I would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.  <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</"
+#| "a>)</span>"
 msgid ""
 "I would like to release a program I wrote under the GNU GPL, but I would "
-"like to use the same code in non-free programs.  <span class=\"anchor-"
+"like to use the same code in nonfree programs.  <span class=\"anchor-"
 "reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</a>)"
 "</span>"
 msgstr ""
@@ -2964,8 +3095,18 @@
 ">#ReleaseUnderGPLAndNF</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | To release a non[---]free program is always ethically tainted, but legally
+# | there is no obstacle to your doing this.  If you are the copyright holder
+# | for the code, you can release it under various different non-exclusive
+# | licenses at various times.
+#, fuzzy
+#| msgid ""
+#| "To release a non-free program is always ethically tainted, but legally "
+#| "there is no obstacle to your doing this.  If you are the copyright holder "
+#| "for the code, you can release it under various different non-exclusive "
+#| "licenses at various times."
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -3030,10 +3171,20 @@
 "este derecho no puede ser revocado."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"Can I use GPL-covered editors such as GNU Emacs to develop non-free "
-"programs? Can I use GPL-covered tools such as GCC to compile them? <span "
-"class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
+# | Can I use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them? <span
+# | class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\"
+# | >#CanIUseGPLToolsForNF</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I use GPL-covered editors such as GNU Emacs to develop non-free "
+#| "programs? Can I use GPL-covered tools such as GCC to compile them? <span "
+#| "class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
+#| ">#CanIUseGPLToolsForNF</a>)</span>"
+msgid ""
+"Can I use GPL-covered editors such as GNU Emacs to develop nonfree programs? "
+"Can I use GPL-covered tools such as GCC to compile them? <span class="
+"\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
 ">#CanIUseGPLToolsForNF</a>)</span>"
 msgstr ""
 "¿Puedo emplear editores de texto cubiertos por la GPL, tales como GNU Emacs, 
"
@@ -3068,12 +3219,24 @@
 "programa hereda el copyright de dichos datos."
 
 #. type: Content of: <dl><dd><p>
+# | As it happens, Bison can also be used to develop non[---]free programs. 
+# | This is because we decided to explicitly permit the use of the Bison
+# | standard parser program in Bison output files without restriction.  We
+# | made the decision because there were other tools comparable to Bison which
+# | already permitted use for non[---]free programs.
+#, fuzzy
+#| msgid ""
+#| "As it happens, Bison can also be used to develop non-free programs.  This "
+#| "is because we decided to explicitly permit the use of the Bison standard "
+#| "parser program in Bison output files without restriction.  We made the "
+#| "decision because there were other tools comparable to Bison which already "
+#| "permitted use for non-free programs."
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 "Como sucede de hecho, Bison puede utilizarse también para desarrollar "
 "programas que no son libres. Esto es así porque en su momento decidimos "
@@ -3752,8 +3915,16 @@
 "respetando los términos de la GPL."
 
 #. type: Content of: <dl><dt>
+# | Can I apply the GPL when writing a plug-in for a non[---]free program?
+# | <span class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\"
+# | >#GPLPluginsInNF</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I apply the GPL when writing a plug-in for a non-free program? <span "
+#| "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" "
+#| ">#GPLPluginsInNF</a>)</span>"
 msgid ""
-"Can I apply the GPL when writing a plug-in for a non-free program? <span "
+"Can I apply the GPL when writing a plug-in for a nonfree program? <span "
 "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" >#GPLPluginsInNF</"
 "a>)</span>"
 msgstr ""
@@ -3773,10 +3944,10 @@
 # | to each other and share data structures, we believe-] they form a single
 # | [-program, which must be treated as an extension of both the main-]
 # | {+combined+} program [-and the plug-ins.  This-] {+this+} means that
-# | combination of the GPL-covered plug-in with the non-free main program
+# | combination of the GPL-covered plug-in with the non[---]free main program
 # | would violate the GPL. However, you can resolve that legal problem by
 # | adding an exception to your plug-in's license, giving permission to link
-# | it with the non-free main program.
+# | it with the non[---]free main program.
 #, fuzzy
 #| msgid ""
 #| "If the program dynamically links plug-ins, and they make function calls "
@@ -3788,9 +3959,9 @@
 #| "license, giving permission to link it with the non-free main program."
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 "Si el programa enlaza dinámicamente con los accesorios, se producen "
@@ -3803,16 +3974,30 @@
 "enlazarlo con el programa principal que no es libre."
 
 #. type: Content of: <dl><dd><p>
+# | See also the question <a href=\"#FSWithNFLibs\">I am writing free software
+# | that uses a non[---]free library.</a>
+#, fuzzy
+#| msgid ""
+#| "See also the question <a href=\"#FSWithNFLibs\">I am writing free "
+#| "software that uses a non-free library.</a>"
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 "Véase también la pregunta: <a href= \"#FSWithNFLibs\">¿Puedo escribir "
 "software libre que utilice bibliotecas que no son libres?</a>"
 
 #. type: Content of: <dl><dt>
+# | Can I release a non[---]free program that's designed to load a GPL-covered
+# | plug-in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins\"
+# | >#NFUseGPLPlugins</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I release a non-free program that's designed to load a GPL-covered "
+#| "plug-in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins"
+#| "\" >#NFUseGPLPlugins</a>)</span>"
 msgid ""
-"Can I release a non-free program that's designed to load a GPL-covered plug-"
+"Can I release a nonfree program that's designed to load a GPL-covered plug-"
 "in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins\" "
 ">#NFUseGPLPlugins</a>)</span>"
 msgstr ""
@@ -4118,11 +4303,27 @@
 "\" >#MereAggregation</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | An &ldquo;aggregate&rdquo; consists of a number of separate programs,
+# | distributed together on the same CD-ROM or other media.  The GPL permits
+# | you to create and distribute an aggregate, even when the licenses of the
+# | other software are non[---]free or GPL-incompatible.  The only condition
+# | is that you cannot release the aggregate under a license that prohibits
+# | users from exercising rights that each program's individual license would
+# | grant them.
+#, fuzzy
+#| msgid ""
+#| "An &ldquo;aggregate&rdquo; consists of a number of separate programs, "
+#| "distributed together on the same CD-ROM or other media.  The GPL permits "
+#| "you to create and distribute an aggregate, even when the licenses of the "
+#| "other software are non-free or GPL-incompatible.  The only condition is "
+#| "that you cannot release the aggregate under a license that prohibits "
+#| "users from exercising rights that each program's individual license would "
+#| "grant them."
 msgid ""
 "An &ldquo;aggregate&rdquo; consists of a number of separate programs, "
 "distributed together on the same CD-ROM or other media.  The GPL permits you "
 "to create and distribute an aggregate, even when the licenses of the other "
-"software are non-free or GPL-incompatible.  The only condition is that you "
+"software are nonfree or GPL-incompatible.  The only condition is that you "
 "cannot release the aggregate under a license that prohibits users from "
 "exercising rights that each program's individual license would grant them."
 msgstr ""
@@ -4430,12 +4631,24 @@
 "\"#GPLInProprietarySystem\" >#GPLInProprietarySystem</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | You cannot incorporate GPL-covered software in a proprietary system.  The
+# | goal of the GPL is to grant everyone the freedom to copy, redistribute,
+# | understand, and modify a program.  If you could incorporate GPL-covered
+# | software into a non[---]free system, it would have the effect of making
+# | the GPL-covered software non[---]free too.
+#, fuzzy
+#| msgid ""
+#| "You cannot incorporate GPL-covered software in a proprietary system.  The "
+#| "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
+#| "understand, and modify a program.  If you could incorporate GPL-covered "
+#| "software into a non-free system, it would have the effect of making the "
+#| "GPL-covered software non-free too."
 msgid ""
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 "Usted no puede incorporar programas cubiertos por la GPL a un sistema "
 "privativo. El objetivo de la GPL consiste en garantizar a todo el mundo la "
@@ -4460,10 +4673,22 @@
 "también ellos las mejoras que hagan."
 
 #. type: Content of: <dl><dd><p>
+# | However, in many cases you can distribute the GPL-covered software
+# | alongside your proprietary system.  To do this validly, you must make sure
+# | that the free and non[---]free programs communicate at arms length, that
+# | they are not combined in a way that would make them effectively a single
+# | program.
+#, fuzzy
+#| msgid ""
+#| "However, in many cases you can distribute the GPL-covered software "
+#| "alongside your proprietary system.  To do this validly, you must make "
+#| "sure that the free and non-free programs communicate at arms length, that "
+#| "they are not combined in a way that would make them effectively a single "
+#| "program."
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 "No obstante, en muchos casos usted puede distribuir el software cubierto por "
@@ -5625,9 +5850,17 @@
 "oficial</a>."
 
 #. type: Content of: <dl><dt>
+# | Can I release a program under the GPL which I developed using non[---]free
+# | tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\"
+# | >#NonFreeTools</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I release a program under the GPL which I developed using non-free "
+#| "tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+#| ">#NonFreeTools</a>)</span>"
 msgid ""
-"Can I release a program under the GPL which I developed using non-free "
-"tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+"Can I release a program under the GPL which I developed using nonfree tools? "
+"<span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
 ">#NonFreeTools</a>)</span>"
 msgstr ""
 "¿Puedo publicar bajo la GPL un programa que he desarrollado utilizando "
@@ -5645,8 +5878,24 @@
 "la licencia de dicho código fuente."
 
 #. type: Content of: <dl><dd><p>
+# | However, if you link non[---]free libraries with the source code, that
+# | would be an issue you need to deal with.  It does not preclude releasing
+# | the source code under the GPL, but if the libraries don't fit under the
+# | &ldquo;system library&rdquo; exception, you should affix an explicit
+# | notice giving permission to link your program with them.  <a
+# | href=\"#GPLIncompatibleLibs\">The FAQ entry about using GPL-incompatible
+# | libraries</a> provides more information about how to do that.
+#, fuzzy
+#| msgid ""
+#| "However, if you link non-free libraries with the source code, that would "
+#| "be an issue you need to deal with.  It does not preclude releasing the "
+#| "source code under the GPL, but if the libraries don't fit under the "
+#| "&ldquo;system library&rdquo; exception, you should affix an explicit "
+#| "notice giving permission to link your program with them.  <a href="
+#| "\"#GPLIncompatibleLibs\">The FAQ entry about using GPL-incompatible "
+#| "libraries</a> provides more information about how to do that."
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -5958,14 +6207,30 @@
 "\"#PortProgramToGL\" >#PortProgramToGL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | In general, the answer is no&mdash;this is not a legal requirement.  In
+# | specific, the answer depends on which libraries you want to use and what
+# | their licenses are.  Most system libraries either use the <a
+# | href=\"/licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus
+# | an exception permitting linking the library with anything.  These
+# | libraries can be used in non[---]free programs; but in the case of the
+# | Lesser GPL, it does have some requirements you must follow.
+#, fuzzy
+#| msgid ""
+#| "In general, the answer is no&mdash;this is not a legal requirement.  In "
+#| "specific, the answer depends on which libraries you want to use and what "
+#| "their licenses are.  Most system libraries either use the <a href=\"/"
+#| "licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
+#| "exception permitting linking the library with anything.  These libraries "
+#| "can be used in non-free programs; but in the case of the Lesser GPL, it "
+#| "does have some requirements you must follow."
 msgid ""
 "In general, the answer is no&mdash;this is not a legal requirement.  In "
 "specific, the answer depends on which libraries you want to use and what "
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 "En general, la respuesta es no: ese no es un requisito legal. En concreto, "
 "la respuesta depende de qué bibliotecas quiere usar y cuáles son sus "

Index: po/gpl-faq.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.fr.po,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- po/gpl-faq.fr.po    10 Mar 2017 21:29:55 -0000      1.180
+++ po/gpl-faq.fr.po    11 Mar 2017 08:02:04 -0000      1.181
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:25+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2017-02-17 12:34+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -167,9 +167,15 @@
 "source des versions modifiées soit porté à la connaissance du public 
?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program
+# | and an unrelated non[---]free program on the same computer?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program "
+#| "and an unrelated non-free program on the same computer?</a>"
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program and "
-"an unrelated non-free program on the same computer?</a>"
+"an unrelated nonfree program on the same computer?</a>"
 msgstr ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\">Puis-je avoir un programme régi par "
 "la GPL et un programme non libre indépendant sur le même ordinateur ?</a>"
@@ -602,10 +608,18 @@
 "\"TransNote1-rev\"><sup>a</sup></a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I
+# | wrote under the GNU GPL, but I would like to use the same code in
+# | non[---]free programs.</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I "
+#| "wrote under the GNU GPL, but I would like to use the same code in non-"
+#| "free programs.</a>"
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I wrote "
-"under the GNU GPL, but I would like to use the same code in non-free "
-"programs.</a>"
+"under the GNU GPL, but I would like to use the same code in nonfree programs."
+"</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\">Je voudrais publier sous GNU GPL un "
 "programme que j'ai écrit, mais j'aimerais utiliser le même code dans un "
@@ -681,9 +695,15 @@
 "de maintenance de sites web ?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NonFreeTools\">Can I release a program under the GPL which I
+# | developed using non[---]free tools?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
+#| "developed using non-free tools?</a>"
 msgid ""
 "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
-"developed using non-free tools?</a>"
+"developed using nonfree tools?</a>"
 msgstr ""
 "<a href=\"#NonFreeTools\">Puis-je publier sous GPL un programme que j'ai "
 "développé en utilisant des outils non libres ?</a>"
@@ -1023,9 +1043,17 @@
 "Utiliser des programmes sous licences GNU pour écrire d'autres programmes"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as
+# | GNU Emacs to develop non[---]free programs? Can I use GPL-covered tools
+# | such as GCC to compile them?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as "
+#| "GNU Emacs to develop non-free programs? Can I use GPL-covered tools such "
+#| "as GCC to compile them?</a>"
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as GNU "
-"Emacs to develop non-free programs? Can I use GPL-covered tools such as GCC "
+"Emacs to develop nonfree programs? Can I use GPL-covered tools such as GCC "
 "to compile them?</a>"
 msgstr ""
 "<a href=\"#CanIUseGPLToolsForNF\">Puis-je utiliser des éditeurs sous GPL "
@@ -1231,17 +1259,29 @@
 "possible d'utiliser pour distribuer mon greffon ?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in for
+# | a non[---]free program?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in "
+#| "for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in for a "
-"non-free program?</a>"
+"nonfree program?</a>"
 msgstr ""
 "<a href=\"#GPLPluginsInNF\">Puis-je utiliser la GPL pour un greffon dans un "
 "programme non libre ?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NFUseGPLPlugins\">Can I release a non[---]free program that's
+# | designed to load a GPL-covered plug-in?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
+#| "designed to load a GPL-covered plug-in?</a>"
 msgid ""
-"<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
-"designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\">Can I release a nonfree program that's designed "
+"to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a href=\"#NFUseGPLPlugins\">Puis-je faire un programme non libre conçu pour 
"
 "charger un greffon régi par la GPL ?</a>"
@@ -1260,8 +1300,14 @@
 "partie privatrice ?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#FSWithNFLibs\">Can I write free software that uses non[---]free
+# | libraries?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#FSWithNFLibs\">Can I write free software that uses non-free "
+#| "libraries?</a>"
 msgid ""
-"<a href=\"#FSWithNFLibs\">Can I write free software that uses non-free "
+"<a href=\"#FSWithNFLibs\">Can I write free software that uses nonfree "
 "libraries?</a>"
 msgstr ""
 "<a href=\"#FSWithNFLibs\">Puis-je écrire un logiciel libre qui utilise des "
@@ -1714,8 +1760,17 @@
 "regarde."
 
 #. type: Content of: <dl><dt>
+# | Can I have a GPL-covered program and an unrelated non[---]free program on
+# | the same computer? <span class=\"anchor-reference-id\">(<a
+# | href=\"#GPLAndNonfreeOnSameMachine\"
+# | >#GPLAndNonfreeOnSameMachine</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I have a GPL-covered program and an unrelated non-free program on the "
+#| "same computer? <span class=\"anchor-reference-id\">(<a href="
+#| "\"#GPLAndNonfreeOnSameMachine\" >#GPLAndNonfreeOnSameMachine</a>)</span>"
 msgid ""
-"Can I have a GPL-covered program and an unrelated non-free program on the "
+"Can I have a GPL-covered program and an unrelated nonfree program on the "
 "same computer? <span class=\"anchor-reference-id\">(<a href="
 "\"#GPLAndNonfreeOnSameMachine\" >#GPLAndNonfreeOnSameMachine</a>)</span>"
 msgstr ""
@@ -1961,8 +2016,18 @@
 "span>"
 
 #. type: Content of: <dl><dd><p>
+# | No.  In fact, a requirement like that would make the program non[---]free.
+# |  If people have to pay when they get a copy of a program, or if they have
+# | to notify anyone in particular, then the program is not free.  See the <a
+# | href=\"/philosophy/free-sw.html\"> definition of free software</a>.
+#, fuzzy
+#| msgid ""
+#| "No.  In fact, a requirement like that would make the program non-free.  "
+#| "If people have to pay when they get a copy of a program, or if they have "
+#| "to notify anyone in particular, then the program is not free.  See the <a "
+#| "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -2486,8 +2551,16 @@
 "qu'elle permet."
 
 #. type: Content of: <dl><dt>
+# | Can I write free software that uses non[---]free libraries? <span
+# | class=\"anchor-reference-id\">(<a href=\"#FSWithNFLibs\"
+# | >#FSWithNFLibs</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I write free software that uses non-free libraries? <span class="
+#| "\"anchor-reference-id\">(<a href=\"#FSWithNFLibs\" >#FSWithNFLibs</a>)</"
+#| "span>"
 msgid ""
-"Can I write free software that uses non-free libraries? <span class=\"anchor-"
+"Can I write free software that uses nonfree libraries? <span class=\"anchor-"
 "reference-id\">(<a href=\"#FSWithNFLibs\" >#FSWithNFLibs</a>)</span>"
 msgstr ""
 "Puis-je écrire un logiciel libre qui utilise des bibliothèques non libres 
? "
@@ -2495,10 +2568,22 @@
 ">#FSWithNFLibs</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | If you do this, your program won't be fully usable in a free environment.
+# | If your program depends on a non[---]free library to do a certain job, it
+# | cannot do that job in the Free World. If it depends on a non[---]free
+# | library to run at all, it cannot be part of a free operating system such
+# | as GNU; it is entirely off limits to the Free World.
+#, fuzzy
+#| msgid ""
+#| "If you do this, your program won't be fully usable in a free environment. "
+#| "If your program depends on a non-free library to do a certain job, it "
+#| "cannot do that job in the Free World. If it depends on a non-free library "
+#| "to run at all, it cannot be part of a free operating system such as GNU; "
+#| "it is entirely off limits to the Free World."
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -2519,14 +2604,32 @@
 "bibliothèque libre pour la remplacer ?"
 
 #. type: Content of: <dl><dd><p>
+# | If the program is already written using the non[---]free library, perhaps
+# | it is too late to change the decision. You may as well release the program
+# | as it stands, rather than not release it. But please mention in the README
+# | that the need for the non[---]free library is a drawback, and suggest the
+# | task of changing the program so that it does the same job without the
+# | non[---]free library.  Please suggest that anyone who thinks of doing
+# | substantial further work on the program first free it from dependence on
+# | the non[---]free library.
+#, fuzzy
+#| msgid ""
+#| "If the program is already written using the non-free library, perhaps it "
+#| "is too late to change the decision. You may as well release the program "
+#| "as it stands, rather than not release it. But please mention in the "
+#| "README that the need for the non-free library is a drawback, and suggest "
+#| "the task of changing the program so that it does the same job without the "
+#| "non-free library.  Please suggest that anyone who thinks of doing "
+#| "substantial further work on the program first free it from dependence on "
+#| "the non-free library."
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 "Si le programme est déjà écrit en utilisant la bibliothèque non libre, il 
"
 "est peut-être déjà trop tard pour changer de décision. Vous pouvez aussi "
@@ -2538,8 +2641,18 @@
 "programme le libère d'abord de sa dépendance à la bibliothèque non libre."
 
 #. type: Content of: <dl><dd><p>
+# | Note that there may also be legal issues with combining certain
+# | non[---]free libraries with GPL-covered free software.  Please see <a
+# | href=\"#GPLIncompatibleLibs\">the question on GPL software with
+# | GPL-incompatible libraries</a> for more information.
+#, fuzzy
+#| msgid ""
+#| "Note that there may also be legal issues with combining certain non-free "
+#| "libraries with GPL-covered free software.  Please see <a href="
+#| "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-"
+#| "incompatible libraries</a> for more information."
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered free software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -2646,10 +2759,18 @@
 "non."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+# | If the libraries you intend to link with are non[---]free, please also see
+# | <a href=\"#FSWithNFLibs\">the section on writing Free Software which uses
+# | non[---]free libraries</a>.
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are non-free, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
+msgid ""
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 "Si les bibliothèques que vous projetez de lier ne sont pas libres, veuillez "
 "également consulter <a href=\"#FSWithNFLibs\">la section sur l'écriture de "
@@ -2975,9 +3096,19 @@
 "façon légitime, est la licence qui s'applique à votre copie."
 
 #. type: Content of: <dl><dt>
+# | I would like to release a program I wrote under the GNU GPL, but I would
+# | like to use the same code in non[---]free programs.  <span
+# | class=\"anchor-reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\"
+# | >#ReleaseUnderGPLAndNF</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "I would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.  <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</"
+#| "a>)</span>"
 msgid ""
 "I would like to release a program I wrote under the GNU GPL, but I would "
-"like to use the same code in non-free programs.  <span class=\"anchor-"
+"like to use the same code in nonfree programs.  <span class=\"anchor-"
 "reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</a>)"
 "</span>"
 msgstr ""
@@ -2987,8 +3118,18 @@
 ">#ReleaseUnderGPLAndNF</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | To release a non[---]free program is always ethically tainted, but legally
+# | there is no obstacle to your doing this.  If you are the copyright holder
+# | for the code, you can release it under various different non-exclusive
+# | licenses at various times.
+#, fuzzy
+#| msgid ""
+#| "To release a non-free program is always ethically tainted, but legally "
+#| "there is no obstacle to your doing this.  If you are the copyright holder "
+#| "for the code, you can release it under various different non-exclusive "
+#| "licenses at various times."
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -3052,10 +3193,20 @@
 "la GPL, et ce droit ne peut lui être retiré."
 
 #. type: Content of: <dl><dt>
-msgid ""
-"Can I use GPL-covered editors such as GNU Emacs to develop non-free "
-"programs? Can I use GPL-covered tools such as GCC to compile them? <span "
-"class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
+# | Can I use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them? <span
+# | class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\"
+# | >#CanIUseGPLToolsForNF</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I use GPL-covered editors such as GNU Emacs to develop non-free "
+#| "programs? Can I use GPL-covered tools such as GCC to compile them? <span "
+#| "class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
+#| ">#CanIUseGPLToolsForNF</a>)</span>"
+msgid ""
+"Can I use GPL-covered editors such as GNU Emacs to develop nonfree programs? "
+"Can I use GPL-covered tools such as GCC to compile them? <span class="
+"\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
 ">#CanIUseGPLToolsForNF</a>)</span>"
 msgstr ""
 "Puis-je utiliser des éditeurs sous GPL comme GNU Emacs pour développer des "
@@ -3090,12 +3241,24 @@
 "elle, du statut de copyright des données."
 
 #. type: Content of: <dl><dd><p>
+# | As it happens, Bison can also be used to develop non[---]free programs. 
+# | This is because we decided to explicitly permit the use of the Bison
+# | standard parser program in Bison output files without restriction.  We
+# | made the decision because there were other tools comparable to Bison which
+# | already permitted use for non[---]free programs.
+#, fuzzy
+#| msgid ""
+#| "As it happens, Bison can also be used to develop non-free programs.  This "
+#| "is because we decided to explicitly permit the use of the Bison standard "
+#| "parser program in Bison output files without restriction.  We made the "
+#| "decision because there were other tools comparable to Bison which already "
+#| "permitted use for non-free programs."
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 "Il se trouve que Bison peut aussi être utilisé pour développer des "
 "programmes non libres. C'est parce que nous avons décidé d'autoriser "
@@ -3774,8 +3937,16 @@
 "code source en respectant les termes de la GPL."
 
 #. type: Content of: <dl><dt>
+# | Can I apply the GPL when writing a plug-in for a non[---]free program?
+# | <span class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\"
+# | >#GPLPluginsInNF</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I apply the GPL when writing a plug-in for a non-free program? <span "
+#| "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" "
+#| ">#GPLPluginsInNF</a>)</span>"
 msgid ""
-"Can I apply the GPL when writing a plug-in for a non-free program? <span "
+"Can I apply the GPL when writing a plug-in for a nonfree program? <span "
 "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" >#GPLPluginsInNF</"
 "a>)</span>"
 msgstr ""
@@ -3795,10 +3966,10 @@
 # | to each other and share data structures, we believe-] they form a single
 # | [-program, which must be treated as an extension of both the main-]
 # | {+combined+} program [-and the plug-ins.  This-] {+this+} means that
-# | combination of the GPL-covered plug-in with the non-free main program
+# | combination of the GPL-covered plug-in with the non[---]free main program
 # | would violate the GPL. However, you can resolve that legal problem by
 # | adding an exception to your plug-in's license, giving permission to link
-# | it with the non-free main program.
+# | it with the non[---]free main program.
 #, fuzzy
 #| msgid ""
 #| "If the program dynamically links plug-ins, and they make function calls "
@@ -3810,9 +3981,9 @@
 #| "license, giving permission to link it with the non-free main program."
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 "Si le programme est lié dynamiquement avec les greffons, et qu'ils font des "
@@ -3825,16 +3996,30 @@
 "autorise à le lier avec le programme principal non libre."
 
 #. type: Content of: <dl><dd><p>
+# | See also the question <a href=\"#FSWithNFLibs\">I am writing free software
+# | that uses a non[---]free library.</a>
+#, fuzzy
+#| msgid ""
+#| "See also the question <a href=\"#FSWithNFLibs\">I am writing free "
+#| "software that uses a non-free library.</a>"
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 "Voir aussi la question <a href=\"#FSWithNFLibs\">« Puis-je écrire un "
 "logiciel libre qui utilise des bibliothèques non libres ? »</a>"
 
 #. type: Content of: <dl><dt>
+# | Can I release a non[---]free program that's designed to load a GPL-covered
+# | plug-in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins\"
+# | >#NFUseGPLPlugins</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I release a non-free program that's designed to load a GPL-covered "
+#| "plug-in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins"
+#| "\" >#NFUseGPLPlugins</a>)</span>"
 msgid ""
-"Can I release a non-free program that's designed to load a GPL-covered plug-"
+"Can I release a nonfree program that's designed to load a GPL-covered plug-"
 "in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins\" "
 ">#NFUseGPLPlugins</a>)</span>"
 msgstr ""
@@ -4141,11 +4326,27 @@
 "\">(<a href=\"#MereAggregation\" >#MereAggregation</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | An &ldquo;aggregate&rdquo; consists of a number of separate programs,
+# | distributed together on the same CD-ROM or other media.  The GPL permits
+# | you to create and distribute an aggregate, even when the licenses of the
+# | other software are non[---]free or GPL-incompatible.  The only condition
+# | is that you cannot release the aggregate under a license that prohibits
+# | users from exercising rights that each program's individual license would
+# | grant them.
+#, fuzzy
+#| msgid ""
+#| "An &ldquo;aggregate&rdquo; consists of a number of separate programs, "
+#| "distributed together on the same CD-ROM or other media.  The GPL permits "
+#| "you to create and distribute an aggregate, even when the licenses of the "
+#| "other software are non-free or GPL-incompatible.  The only condition is "
+#| "that you cannot release the aggregate under a license that prohibits "
+#| "users from exercising rights that each program's individual license would "
+#| "grant them."
 msgid ""
 "An &ldquo;aggregate&rdquo; consists of a number of separate programs, "
 "distributed together on the same CD-ROM or other media.  The GPL permits you "
 "to create and distribute an aggregate, even when the licenses of the other "
-"software are non-free or GPL-incompatible.  The only condition is that you "
+"software are nonfree or GPL-incompatible.  The only condition is that you "
 "cannot release the aggregate under a license that prohibits users from "
 "exercising rights that each program's individual license would grant them."
 msgstr ""
@@ -4455,12 +4656,24 @@
 "\"#GPLInProprietarySystem\" >#GPLInProprietarySystem</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | You cannot incorporate GPL-covered software in a proprietary system.  The
+# | goal of the GPL is to grant everyone the freedom to copy, redistribute,
+# | understand, and modify a program.  If you could incorporate GPL-covered
+# | software into a non[---]free system, it would have the effect of making
+# | the GPL-covered software non[---]free too.
+#, fuzzy
+#| msgid ""
+#| "You cannot incorporate GPL-covered software in a proprietary system.  The "
+#| "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
+#| "understand, and modify a program.  If you could incorporate GPL-covered "
+#| "software into a non-free system, it would have the effect of making the "
+#| "GPL-covered software non-free too."
 msgid ""
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 "Vous ne pouvez pas incorporer de logiciel régi par la GPL dans un système "
 "privateur. L'objectif de la GPL est d'accorder à tous la liberté de copier, 
"
@@ -4484,10 +4697,22 @@
 "donner en échange les améliorations qu'ils ont pu apporter."
 
 #. type: Content of: <dl><dd><p>
+# | However, in many cases you can distribute the GPL-covered software
+# | alongside your proprietary system.  To do this validly, you must make sure
+# | that the free and non[---]free programs communicate at arms length, that
+# | they are not combined in a way that would make them effectively a single
+# | program.
+#, fuzzy
+#| msgid ""
+#| "However, in many cases you can distribute the GPL-covered software "
+#| "alongside your proprietary system.  To do this validly, you must make "
+#| "sure that the free and non-free programs communicate at arms length, that "
+#| "they are not combined in a way that would make them effectively a single "
+#| "program."
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 "Toutefois, dans de nombreux cas, vous pouvez distribuer un logiciel sous GPL "
@@ -5668,9 +5893,17 @@
 "your version.<a href=\"#TransNote9\" id=\"TransNote9-rev\"><sup>i</sup></a>"
 
 #. type: Content of: <dl><dt>
+# | Can I release a program under the GPL which I developed using non[---]free
+# | tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\"
+# | >#NonFreeTools</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I release a program under the GPL which I developed using non-free "
+#| "tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+#| ">#NonFreeTools</a>)</span>"
 msgid ""
-"Can I release a program under the GPL which I developed using non-free "
-"tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+"Can I release a program under the GPL which I developed using nonfree tools? "
+"<span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
 ">#NonFreeTools</a>)</span>"
 msgstr ""
 "Puis-je publier sous GPL un programme que j'ai développé en utilisant des "
@@ -5688,8 +5921,24 @@
 "code source."
 
 #. type: Content of: <dl><dd><p>
+# | However, if you link non[---]free libraries with the source code, that
+# | would be an issue you need to deal with.  It does not preclude releasing
+# | the source code under the GPL, but if the libraries don't fit under the
+# | &ldquo;system library&rdquo; exception, you should affix an explicit
+# | notice giving permission to link your program with them.  <a
+# | href=\"#GPLIncompatibleLibs\">The FAQ entry about using GPL-incompatible
+# | libraries</a> provides more information about how to do that.
+#, fuzzy
+#| msgid ""
+#| "However, if you link non-free libraries with the source code, that would "
+#| "be an issue you need to deal with.  It does not preclude releasing the "
+#| "source code under the GPL, but if the libraries don't fit under the "
+#| "&ldquo;system library&rdquo; exception, you should affix an explicit "
+#| "notice giving permission to link your program with them.  <a href="
+#| "\"#GPLIncompatibleLibs\">The FAQ entry about using GPL-incompatible "
+#| "libraries</a> provides more information about how to do that."
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -6007,14 +6256,30 @@
 "id\">(<a href=\"#PortProgramToGL\" >#PortProgramToGL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | In general, the answer is no&mdash;this is not a legal requirement.  In
+# | specific, the answer depends on which libraries you want to use and what
+# | their licenses are.  Most system libraries either use the <a
+# | href=\"/licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus
+# | an exception permitting linking the library with anything.  These
+# | libraries can be used in non[---]free programs; but in the case of the
+# | Lesser GPL, it does have some requirements you must follow.
+#, fuzzy
+#| msgid ""
+#| "In general, the answer is no&mdash;this is not a legal requirement.  In "
+#| "specific, the answer depends on which libraries you want to use and what "
+#| "their licenses are.  Most system libraries either use the <a href=\"/"
+#| "licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
+#| "exception permitting linking the library with anything.  These libraries "
+#| "can be used in non-free programs; but in the case of the Lesser GPL, it "
+#| "does have some requirements you must follow."
 msgid ""
 "In general, the answer is no&mdash;this is not a legal requirement.  In "
 "specific, the answer depends on which libraries you want to use and what "
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 "De manière générale, la réponse est non ; ce n'est pas une exigence 
légale. "
 "De manière plus spécifique, la réponse dépend des bibliothèques que vous 
"

Index: po/gpl-faq.it.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.it.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- po/gpl-faq.it.po    10 Mar 2017 21:29:56 -0000      1.30
+++ po/gpl-faq.it.po    11 Mar 2017 08:02:04 -0000      1.31
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:25+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2017-03-05 14:30+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian <address@hidden>\n"
@@ -163,9 +163,15 @@
 "sorgente delle versioni modificate di un programma sia reso pubblico?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program
+# | and an unrelated non[---]free program on the same computer?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program "
+#| "and an unrelated non-free program on the same computer?</a>"
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program and "
-"an unrelated non-free program on the same computer?</a>"
+"an unrelated nonfree program on the same computer?</a>"
 msgstr ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\">Posso avere un programma coperto da "
 "GPL ed un programma non libero non correlato sullo stesso computer?</a>"
@@ -588,10 +594,18 @@
 "intenzione di fare di un mio programma un suo software proprietario?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I
+# | wrote under the GNU GPL, but I would like to use the same code in
+# | non[---]free programs.</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I "
+#| "wrote under the GNU GPL, but I would like to use the same code in non-"
+#| "free programs.</a>"
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I wrote "
-"under the GNU GPL, but I would like to use the same code in non-free "
-"programs.</a>"
+"under the GNU GPL, but I would like to use the same code in nonfree programs."
+"</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\">Vorrei rilasciare un programma che ho "
 "scritto sotto la GNU GPL, ma mi piacerebbe anche usare lo stesso codice in "
@@ -665,9 +679,15 @@
 "a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NonFreeTools\">Can I release a program under the GPL which I
+# | developed using non[---]free tools?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
+#| "developed using non-free tools?</a>"
 msgid ""
 "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
-"developed using non-free tools?</a>"
+"developed using nonfree tools?</a>"
 msgstr ""
 "<a href=\"#NonFreeTools\">Posso rilasciare sotto la GPL un programma "
 "sviluppato usando strumenti non liberi?</a>"
@@ -1006,9 +1026,17 @@
 "Usare programmi rilasciati sotto le licenze di GNU nei propri programmi"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as
+# | GNU Emacs to develop non[---]free programs? Can I use GPL-covered tools
+# | such as GCC to compile them?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as "
+#| "GNU Emacs to develop non-free programs? Can I use GPL-covered tools such "
+#| "as GCC to compile them?</a>"
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as GNU "
-"Emacs to develop non-free programs? Can I use GPL-covered tools such as GCC "
+"Emacs to develop nonfree programs? Can I use GPL-covered tools such as GCC "
 "to compile them?</a>"
 msgstr ""
 "<a href=\"#CanIUseGPLToolsForNF\">Posso usare editor di testo protetti da "
@@ -1213,17 +1241,29 @@
 "distribuire il mio programma?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in for
+# | a non[---]free program?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in "
+#| "for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in for a "
-"non-free program?</a>"
+"nonfree program?</a>"
 msgstr ""
 "<a href=\"#GPLPluginsInNF\">Posso usare la GPL per un plug-in destinato ad "
 "un programma non libero?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NFUseGPLPlugins\">Can I release a non[---]free program that's
+# | designed to load a GPL-covered plug-in?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
+#| "designed to load a GPL-covered plug-in?</a>"
 msgid ""
-"<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
-"designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\">Can I release a nonfree program that's designed "
+"to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a href=\"#NFUseGPLPlugins\">Posso rilasciare un programma non libero che è "
 "progettato per caricare un plug-in coperto da GPL?</a>"
@@ -1241,8 +1281,14 @@
 "licenza X11) tra la parte coperta da GPL e quella proprietaria?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#FSWithNFLibs\">Can I write free software that uses non[---]free
+# | libraries?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#FSWithNFLibs\">Can I write free software that uses non-free "
+#| "libraries?</a>"
 msgid ""
-"<a href=\"#FSWithNFLibs\">Can I write free software that uses non-free "
+"<a href=\"#FSWithNFLibs\">Can I write free software that uses nonfree "
 "libraries?</a>"
 msgstr ""
 "<a href=\"#FSWithNFLibs\">Posso scrivere programmi liberi che fanno uso di "
@@ -1698,8 +1744,17 @@
 "a se pubblicare o no il software rimane a chi ha effettuato le modifiche."
 
 #. type: Content of: <dl><dt>
+# | Can I have a GPL-covered program and an unrelated non[---]free program on
+# | the same computer? <span class=\"anchor-reference-id\">(<a
+# | href=\"#GPLAndNonfreeOnSameMachine\"
+# | >#GPLAndNonfreeOnSameMachine</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I have a GPL-covered program and an unrelated non-free program on the "
+#| "same computer? <span class=\"anchor-reference-id\">(<a href="
+#| "\"#GPLAndNonfreeOnSameMachine\" >#GPLAndNonfreeOnSameMachine</a>)</span>"
 msgid ""
-"Can I have a GPL-covered program and an unrelated non-free program on the "
+"Can I have a GPL-covered program and an unrelated nonfree program on the "
 "same computer? <span class=\"anchor-reference-id\">(<a href="
 "\"#GPLAndNonfreeOnSameMachine\" >#GPLAndNonfreeOnSameMachine</a>)</span>"
 msgstr ""
@@ -1941,8 +1996,18 @@
 ">#DoesTheGPLAllowRequireFee</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | No.  In fact, a requirement like that would make the program non[---]free.
+# |  If people have to pay when they get a copy of a program, or if they have
+# | to notify anyone in particular, then the program is not free.  See the <a
+# | href=\"/philosophy/free-sw.html\"> definition of free software</a>.
+#, fuzzy
+#| msgid ""
+#| "No.  In fact, a requirement like that would make the program non-free.  "
+#| "If people have to pay when they get a copy of a program, or if they have "
+#| "to notify anyone in particular, then the program is not free.  See the <a "
+#| "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -2458,8 +2523,16 @@
 "riguardo, compresa una lista dei requisiti aggiuntivi consentiti."
 
 #. type: Content of: <dl><dt>
+# | Can I write free software that uses non[---]free libraries? <span
+# | class=\"anchor-reference-id\">(<a href=\"#FSWithNFLibs\"
+# | >#FSWithNFLibs</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I write free software that uses non-free libraries? <span class="
+#| "\"anchor-reference-id\">(<a href=\"#FSWithNFLibs\" >#FSWithNFLibs</a>)</"
+#| "span>"
 msgid ""
-"Can I write free software that uses non-free libraries? <span class=\"anchor-"
+"Can I write free software that uses nonfree libraries? <span class=\"anchor-"
 "reference-id\">(<a href=\"#FSWithNFLibs\" >#FSWithNFLibs</a>)</span>"
 msgstr ""
 "Posso scrivere programmi liberi che fanno uso di librerie non libere? <span "
@@ -2467,10 +2540,22 @@
 "</span>"
 
 #. type: Content of: <dl><dd><p>
+# | If you do this, your program won't be fully usable in a free environment.
+# | If your program depends on a non[---]free library to do a certain job, it
+# | cannot do that job in the Free World. If it depends on a non[---]free
+# | library to run at all, it cannot be part of a free operating system such
+# | as GNU; it is entirely off limits to the Free World.
+#, fuzzy
+#| msgid ""
+#| "If you do this, your program won't be fully usable in a free environment. "
+#| "If your program depends on a non-free library to do a certain job, it "
+#| "cannot do that job in the Free World. If it depends on a non-free library "
+#| "to run at all, it cannot be part of a free operating system such as GNU; "
+#| "it is entirely off limits to the Free World."
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -2490,14 +2575,32 @@
 "questa libreria? Si può scrivere un'alternativa libera a quella libreria?"
 
 #. type: Content of: <dl><dd><p>
+# | If the program is already written using the non[---]free library, perhaps
+# | it is too late to change the decision. You may as well release the program
+# | as it stands, rather than not release it. But please mention in the README
+# | that the need for the non[---]free library is a drawback, and suggest the
+# | task of changing the program so that it does the same job without the
+# | non[---]free library.  Please suggest that anyone who thinks of doing
+# | substantial further work on the program first free it from dependence on
+# | the non[---]free library.
+#, fuzzy
+#| msgid ""
+#| "If the program is already written using the non-free library, perhaps it "
+#| "is too late to change the decision. You may as well release the program "
+#| "as it stands, rather than not release it. But please mention in the "
+#| "README that the need for the non-free library is a drawback, and suggest "
+#| "the task of changing the program so that it does the same job without the "
+#| "non-free library.  Please suggest that anyone who thinks of doing "
+#| "substantial further work on the program first free it from dependence on "
+#| "the non-free library."
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 "Se il programma è già stato scritto facendo uso della libreria non libera, "
 "forse è troppo tardi per tornare sui propri passi. A quel punto sarebbe "
@@ -2510,8 +2613,18 @@
 "non libera."
 
 #. type: Content of: <dl><dd><p>
+# | Note that there may also be legal issues with combining certain
+# | non[---]free libraries with GPL-covered free software.  Please see <a
+# | href=\"#GPLIncompatibleLibs\">the question on GPL software with
+# | GPL-incompatible libraries</a> for more information.
+#, fuzzy
+#| msgid ""
+#| "Note that there may also be legal issues with combining certain non-free "
+#| "libraries with GPL-covered free software.  Please see <a href="
+#| "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-"
+#| "incompatible libraries</a> for more information."
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered free software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -2616,10 +2729,18 @@
 "stessa eccezione per il loro codice -- farlo o meno è a loro discrezione."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+# | If the libraries you intend to link with are non[---]free, please also see
+# | <a href=\"#FSWithNFLibs\">the section on writing Free Software which uses
+# | non[---]free libraries</a>.
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are non-free, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
+msgid ""
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 "Se le librerie con cui si vuole linkare sono non libere, si prega di fare "
 "riferimento alla <a href=\"#FSWithNFLibs\">sezione sulla creazione di "
@@ -2951,9 +3072,19 @@
 "copia in modo legittimo, è la licenza che si applica alla suddetta copia."
 
 #. type: Content of: <dl><dt>
+# | I would like to release a program I wrote under the GNU GPL, but I would
+# | like to use the same code in non[---]free programs.  <span
+# | class=\"anchor-reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\"
+# | >#ReleaseUnderGPLAndNF</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "I would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.  <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</"
+#| "a>)</span>"
 msgid ""
 "I would like to release a program I wrote under the GNU GPL, but I would "
-"like to use the same code in non-free programs.  <span class=\"anchor-"
+"like to use the same code in nonfree programs.  <span class=\"anchor-"
 "reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</a>)"
 "</span>"
 msgstr ""
@@ -2963,8 +3094,18 @@
 ">#ReleaseUnderGPLAndNF</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | To release a non[---]free program is always ethically tainted, but legally
+# | there is no obstacle to your doing this.  If you are the copyright holder
+# | for the code, you can release it under various different non-exclusive
+# | licenses at various times.
+#, fuzzy
+#| msgid ""
+#| "To release a non-free program is always ethically tainted, but legally "
+#| "there is no obstacle to your doing this.  If you are the copyright holder "
+#| "for the code, you can release it under various different non-exclusive "
+#| "licenses at various times."
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -3029,10 +3170,20 @@
 "sotto la GPL, e questo diritto non può essere ritirato."
 
 #. type: Content of: <dl><dt>
+# | Can I use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them? <span
+# | class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\"
+# | >#CanIUseGPLToolsForNF</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I use GPL-covered editors such as GNU Emacs to develop non-free "
+#| "programs? Can I use GPL-covered tools such as GCC to compile them? <span "
+#| "class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
+#| ">#CanIUseGPLToolsForNF</a>)</span>"
 msgid ""
-"Can I use GPL-covered editors such as GNU Emacs to develop non-free "
-"programs? Can I use GPL-covered tools such as GCC to compile them? <span "
-"class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
+"Can I use GPL-covered editors such as GNU Emacs to develop nonfree programs? "
+"Can I use GPL-covered tools such as GCC to compile them? <span class="
+"\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
 ">#CanIUseGPLToolsForNF</a>)</span>"
 msgstr ""
 "Posso usare editor di testo protetti da GPL per sviluppare programmi non "
@@ -3066,12 +3217,24 @@
 "copyright dell'input."
 
 #. type: Content of: <dl><dd><p>
+# | As it happens, Bison can also be used to develop non[---]free programs. 
+# | This is because we decided to explicitly permit the use of the Bison
+# | standard parser program in Bison output files without restriction.  We
+# | made the decision because there were other tools comparable to Bison which
+# | already permitted use for non[---]free programs.
+#, fuzzy
+#| msgid ""
+#| "As it happens, Bison can also be used to develop non-free programs.  This "
+#| "is because we decided to explicitly permit the use of the Bison standard "
+#| "parser program in Bison output files without restriction.  We made the "
+#| "decision because there were other tools comparable to Bison which already "
+#| "permitted use for non-free programs."
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 "Ma nel caso di Bison, questo programma può essere usato anche per sviluppare 
"
 "programmi non liberi. Questo perché abbiamo deciso di permettere "
@@ -3743,8 +3906,16 @@
 "licenza ad essa compatibile."
 
 #. type: Content of: <dl><dt>
+# | Can I apply the GPL when writing a plug-in for a non[---]free program?
+# | <span class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\"
+# | >#GPLPluginsInNF</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I apply the GPL when writing a plug-in for a non-free program? <span "
+#| "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" "
+#| ">#GPLPluginsInNF</a>)</span>"
 msgid ""
-"Can I apply the GPL when writing a plug-in for a non-free program? <span "
+"Can I apply the GPL when writing a plug-in for a nonfree program? <span "
 "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" >#GPLPluginsInNF</"
 "a>)</span>"
 msgstr ""
@@ -3764,10 +3935,10 @@
 # | to each other and share data structures, we believe-] they form a single
 # | [-program, which must be treated as an extension of both the main-]
 # | {+combined+} program [-and the plug-ins.  This-] {+this+} means that
-# | combination of the GPL-covered plug-in with the non-free main program
+# | combination of the GPL-covered plug-in with the non[---]free main program
 # | would violate the GPL. However, you can resolve that legal problem by
 # | adding an exception to your plug-in's license, giving permission to link
-# | it with the non-free main program.
+# | it with the non[---]free main program.
 #, fuzzy
 #| msgid ""
 #| "If the program dynamically links plug-ins, and they make function calls "
@@ -3779,9 +3950,9 @@
 #| "license, giving permission to link it with the non-free main program."
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 "Se invece il programma effettua un link dinamico dei plug-in, ed essi (il "
@@ -3794,16 +3965,30 @@
 "quale permetta di linkarlo col programma non libero in questione."
 
 #. type: Content of: <dl><dd><p>
+# | See also the question <a href=\"#FSWithNFLibs\">I am writing free software
+# | that uses a non[---]free library.</a>
+#, fuzzy
+#| msgid ""
+#| "See also the question <a href=\"#FSWithNFLibs\">I am writing free "
+#| "software that uses a non-free library.</a>"
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 "Per ulteriori dettagli, si veda la domanda <a href=\"#FSWithNFLibs\">Se "
 "scrivo programmi che fanno uso di librerie non libere</a>."
 
 #. type: Content of: <dl><dt>
+# | Can I release a non[---]free program that's designed to load a GPL-covered
+# | plug-in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins\"
+# | >#NFUseGPLPlugins</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I release a non-free program that's designed to load a GPL-covered "
+#| "plug-in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins"
+#| "\" >#NFUseGPLPlugins</a>)</span>"
 msgid ""
-"Can I release a non-free program that's designed to load a GPL-covered plug-"
+"Can I release a nonfree program that's designed to load a GPL-covered plug-"
 "in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins\" "
 ">#NFUseGPLPlugins</a>)</span>"
 msgstr ""
@@ -4107,11 +4292,27 @@
 "\" >#MereAggregation</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | An &ldquo;aggregate&rdquo; consists of a number of separate programs,
+# | distributed together on the same CD-ROM or other media.  The GPL permits
+# | you to create and distribute an aggregate, even when the licenses of the
+# | other software are non[---]free or GPL-incompatible.  The only condition
+# | is that you cannot release the aggregate under a license that prohibits
+# | users from exercising rights that each program's individual license would
+# | grant them.
+#, fuzzy
+#| msgid ""
+#| "An &ldquo;aggregate&rdquo; consists of a number of separate programs, "
+#| "distributed together on the same CD-ROM or other media.  The GPL permits "
+#| "you to create and distribute an aggregate, even when the licenses of the "
+#| "other software are non-free or GPL-incompatible.  The only condition is "
+#| "that you cannot release the aggregate under a license that prohibits "
+#| "users from exercising rights that each program's individual license would "
+#| "grant them."
 msgid ""
 "An &ldquo;aggregate&rdquo; consists of a number of separate programs, "
 "distributed together on the same CD-ROM or other media.  The GPL permits you "
 "to create and distribute an aggregate, even when the licenses of the other "
-"software are non-free or GPL-incompatible.  The only condition is that you "
+"software are nonfree or GPL-incompatible.  The only condition is that you "
 "cannot release the aggregate under a license that prohibits users from "
 "exercising rights that each program's individual license would grant them."
 msgstr ""
@@ -4416,12 +4617,24 @@
 "\"#GPLInProprietarySystem\" >#GPLInProprietarySystem</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | You cannot incorporate GPL-covered software in a proprietary system.  The
+# | goal of the GPL is to grant everyone the freedom to copy, redistribute,
+# | understand, and modify a program.  If you could incorporate GPL-covered
+# | software into a non[---]free system, it would have the effect of making
+# | the GPL-covered software non[---]free too.
+#, fuzzy
+#| msgid ""
+#| "You cannot incorporate GPL-covered software in a proprietary system.  The "
+#| "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
+#| "understand, and modify a program.  If you could incorporate GPL-covered "
+#| "software into a non-free system, it would have the effect of making the "
+#| "GPL-covered software non-free too."
 msgid ""
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 "Non è possibile incorporare del software rilasciato sotto licenza GPL in un "
 "sistema proprietario. L'obiettivo della licenza GPL è quello di garantire a "
@@ -4447,10 +4660,22 @@
 "dovessero apportare."
 
 #. type: Content of: <dl><dd><p>
+# | However, in many cases you can distribute the GPL-covered software
+# | alongside your proprietary system.  To do this validly, you must make sure
+# | that the free and non[---]free programs communicate at arms length, that
+# | they are not combined in a way that would make them effectively a single
+# | program.
+#, fuzzy
+#| msgid ""
+#| "However, in many cases you can distribute the GPL-covered software "
+#| "alongside your proprietary system.  To do this validly, you must make "
+#| "sure that the free and non-free programs communicate at arms length, that "
+#| "they are not combined in a way that would make them effectively a single "
+#| "program."
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 "Comunque, in molti casi è possibile distribuire il software coperto da GPL "
@@ -5634,9 +5859,17 @@
 "your version."
 
 #. type: Content of: <dl><dt>
+# | Can I release a program under the GPL which I developed using non[---]free
+# | tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\"
+# | >#NonFreeTools</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "Can I release a program under the GPL which I developed using non-free "
+#| "tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+#| ">#NonFreeTools</a>)</span>"
 msgid ""
-"Can I release a program under the GPL which I developed using non-free "
-"tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+"Can I release a program under the GPL which I developed using nonfree tools? "
+"<span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
 ">#NonFreeTools</a>)</span>"
 msgstr ""
 "Posso rilasciare sotto la GPL un programma sviluppato usando strumenti non "
@@ -5654,8 +5887,24 @@
 "particolare codice sorgente."
 
 #. type: Content of: <dl><dd><p>
+# | However, if you link non[---]free libraries with the source code, that
+# | would be an issue you need to deal with.  It does not preclude releasing
+# | the source code under the GPL, but if the libraries don't fit under the
+# | &ldquo;system library&rdquo; exception, you should affix an explicit
+# | notice giving permission to link your program with them.  <a
+# | href=\"#GPLIncompatibleLibs\">The FAQ entry about using GPL-incompatible
+# | libraries</a> provides more information about how to do that.
+#, fuzzy
+#| msgid ""
+#| "However, if you link non-free libraries with the source code, that would "
+#| "be an issue you need to deal with.  It does not preclude releasing the "
+#| "source code under the GPL, but if the libraries don't fit under the "
+#| "&ldquo;system library&rdquo; exception, you should affix an explicit "
+#| "notice giving permission to link your program with them.  <a href="
+#| "\"#GPLIncompatibleLibs\">The FAQ entry about using GPL-incompatible "
+#| "libraries</a> provides more information about how to do that."
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -5966,14 +6215,30 @@
 "</span>"
 
 #. type: Content of: <dl><dd><p>
+# | In general, the answer is no&mdash;this is not a legal requirement.  In
+# | specific, the answer depends on which libraries you want to use and what
+# | their licenses are.  Most system libraries either use the <a
+# | href=\"/licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus
+# | an exception permitting linking the library with anything.  These
+# | libraries can be used in non[---]free programs; but in the case of the
+# | Lesser GPL, it does have some requirements you must follow.
+#, fuzzy
+#| msgid ""
+#| "In general, the answer is no&mdash;this is not a legal requirement.  In "
+#| "specific, the answer depends on which libraries you want to use and what "
+#| "their licenses are.  Most system libraries either use the <a href=\"/"
+#| "licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
+#| "exception permitting linking the library with anything.  These libraries "
+#| "can be used in non-free programs; but in the case of the Lesser GPL, it "
+#| "does have some requirements you must follow."
 msgid ""
 "In general, the answer is no&mdash;this is not a legal requirement.  In "
 "specific, the answer depends on which libraries you want to use and what "
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 "In generale, la risposta è no -- non è un obbligo legale. Per essere più "
 "specifici, la risposta dipende da quali librerie intendete usare e quali "

Index: po/gpl-faq.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ja.po,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- po/gpl-faq.ja.po    10 Mar 2017 21:29:56 -0000      1.81
+++ po/gpl-faq.ja.po    11 Mar 2017 08:02:04 -0000      1.82
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:25+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2017-01-11 09:42+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -159,9 +159,13 @@
 "公開することを要求しますか?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program "
+#| "and an unrelated non-free program on the same computer?</a>"
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program and "
-"an unrelated non-free program on the same computer?</a>"
+"an unrelated nonfree program on the same computer?</a>"
 msgstr ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\">あるGPLの及ぶプログラム
と、それと関係"
 "のない不自由なプログラム
を同じコンピュータに置いても問題ありませんか?</a>"
@@ -578,10 +582,15 @@
 
"プライエタリ・ソフトウェア製品にしたいと思ったらどうしましょう?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I "
+#| "wrote under the GNU GPL, but I would like to use the same code in non-"
+#| "free programs.</a>"
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I wrote "
-"under the GNU GPL, but I would like to use the same code in non-free "
-"programs.</a>"
+"under the GNU GPL, but I would like to use the same code in nonfree programs."
+"</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\">自分が書いたプログラムをGNU 
GPLのもとでリ"
 
"リースしたいのですが、同じコードを自由ではないプログラãƒ
 ã§ã‚‚使いたいのです。"
@@ -654,9 +663,13 @@
 "使うべきでしょうか?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
+#| "developed using non-free tools?</a>"
 msgid ""
 "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
-"developed using non-free tools?</a>"
+"developed using nonfree tools?</a>"
 msgstr ""
 "<a 
href=\"#NonFreeTools\">不自由なツールを用いて開発したプログラãƒ
 ã‚’GPLでリ"
 "リースできるでしょうか?</a>"
@@ -986,9 +999,14 @@
 msgstr "GPLのもとでリリースされたプログラム
を使って他のプログラムを書く"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as "
+#| "GNU Emacs to develop non-free programs? Can I use GPL-covered tools such "
+#| "as GCC to compile them?</a>"
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as GNU "
-"Emacs to develop non-free programs? Can I use GPL-covered tools such as GCC "
+"Emacs to develop nonfree programs? Can I use GPL-covered tools such as GCC "
 "to compile them?</a>"
 msgstr ""
 "<a href=\"#CanIUseGPLToolsForNF\">自由でないプログラム
を開発するために、GNU "
@@ -1187,17 +1205,25 @@
 "はどのような要請がありますか?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in "
+#| "for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in for a "
-"non-free program?</a>"
+"nonfree program?</a>"
 msgstr ""
 "<a href=\"#GPLPluginsInNF\">自由でないプログラム
向けのプラグインにGPLを適用す"
 "ることはできますか?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
+#| "designed to load a GPL-covered plug-in?</a>"
 msgid ""
-"<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
-"designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\">Can I release a nonfree program that's designed "
+"to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a 
href=\"#NFUseGPLPlugins\">GPLの及ぶプラグインをロードするように設計された"
 "不自由なプログラム
をリリースすることはできるでしょうか?</a>"
@@ -1215,8 +1241,12 @@
 "ジュールをはさむことにより、これは可能ですか?</a>"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#FSWithNFLibs\">Can I write free software that uses non-free "
+#| "libraries?</a>"
 msgid ""
-"<a href=\"#FSWithNFLibs\">Can I write free software that uses non-free "
+"<a href=\"#FSWithNFLibs\">Can I write free software that uses nonfree "
 "libraries?</a>"
 msgstr ""
 "<a 
href=\"#FSWithNFLibs\">自由でないライブラリを利用する自由ソフトウェアを書"
@@ -1660,8 +1690,13 @@
 "かはあなた次第です。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Can I have a GPL-covered program and an unrelated non-free program on the "
+#| "same computer? <span class=\"anchor-reference-id\">(<a href="
+#| "\"#GPLAndNonfreeOnSameMachine\" >#GPLAndNonfreeOnSameMachine</a>)</span>"
 msgid ""
-"Can I have a GPL-covered program and an unrelated non-free program on the "
+"Can I have a GPL-covered program and an unrelated nonfree program on the "
 "same computer? <span class=\"anchor-reference-id\">(<a href="
 "\"#GPLAndNonfreeOnSameMachine\" >#GPLAndNonfreeOnSameMachine</a>)</span>"
 msgstr ""
@@ -1898,8 +1933,14 @@
 ">#DoesTheGPLAllowRequireFee</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "No.  In fact, a requirement like that would make the program non-free.  "
+#| "If people have to pay when they get a copy of a program, or if they have "
+#| "to notify anyone in particular, then the program is not free.  See the <a "
+#| "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -2402,18 +2443,30 @@
 "もっと情報があり、許される追加
の要求の一覧もあります。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Can I write free software that uses non-free libraries? <span class="
+#| "\"anchor-reference-id\">(<a href=\"#FSWithNFLibs\" >#FSWithNFLibs</a>)</"
+#| "span>"
 msgid ""
-"Can I write free software that uses non-free libraries? <span class=\"anchor-"
+"Can I write free software that uses nonfree libraries? <span class=\"anchor-"
 "reference-id\">(<a href=\"#FSWithNFLibs\" >#FSWithNFLibs</a>)</span>"
 msgstr ""
 
"自由でないライブラリを利用する自由ソフトウェアを書けますか?
 <span class="
 "\"anchor-reference-id\">(<a href=\"#FSWithNFLibs\" >#FSWithNFLibs</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If you do this, your program won't be fully usable in a free environment. "
+#| "If your program depends on a non-free library to do a certain job, it "
+#| "cannot do that job in the Free World. If it depends on a non-free library "
+#| "to run at all, it cannot be part of a free operating system such as GNU; "
+#| "it is entirely off limits to the Free World."
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -2435,14 +2488,24 @@
 "できませんか?"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "If the program is already written using the non-free library, perhaps it "
+#| "is too late to change the decision. You may as well release the program "
+#| "as it stands, rather than not release it. But please mention in the "
+#| "README that the need for the non-free library is a drawback, and suggest "
+#| "the task of changing the program so that it does the same job without the "
+#| "non-free library.  Please suggest that anyone who thinks of doing "
+#| "substantial further work on the program first free it from dependence on "
+#| "the non-free library."
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 "もしプログラム
がすでに自由でないライブラリを利用して書かれていたならば、おそ"
 "らく決断を変えるには遅
すぎるでしょうから、リリースしないよりは、プログラム
を"
@@ -2453,8 +2516,14 @@
 
"由でないライブラリに対する依存から脱却することを提案してくã
 ã•ã„。"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Note that there may also be legal issues with combining certain non-free "
+#| "libraries with GPL-covered free software.  Please see <a href="
+#| "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-"
+#| "incompatible libraries</a> for more information."
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered free software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -2553,10 +2622,15 @@
 "ける必
要はありません。そうするかどうかはかれらの選択に任されています。"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are non-free, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
+msgid ""
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 
"もし、ライブラリを不自由なものとリンクすることを考えているのであれば、<a
 "
 
"href=\"#FSWithNFLibs\">自由でないライブラリを利用する自由ソフトウェアを書くに"
@@ -2913,9 +2987,15 @@
 "に適用されるライセンスです。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "I would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.  <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</"
+#| "a>)</span>"
 msgid ""
 "I would like to release a program I wrote under the GNU GPL, but I would "
-"like to use the same code in non-free programs.  <span class=\"anchor-"
+"like to use the same code in nonfree programs.  <span class=\"anchor-"
 "reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</a>)"
 "</span>"
 msgstr ""
@@ -2924,8 +3004,14 @@
 "(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "To release a non-free program is always ethically tainted, but legally "
+#| "there is no obstacle to your doing this.  If you are the copyright holder "
+#| "for the code, you can release it under various different non-exclusive "
+#| "licenses at various times."
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -2986,10 +3072,16 @@
 "権利を撤回することはできません。"
 
 #. type: Content of: <dl><dt>
-msgid ""
-"Can I use GPL-covered editors such as GNU Emacs to develop non-free "
-"programs? Can I use GPL-covered tools such as GCC to compile them? <span "
-"class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
+#, fuzzy
+#| msgid ""
+#| "Can I use GPL-covered editors such as GNU Emacs to develop non-free "
+#| "programs? Can I use GPL-covered tools such as GCC to compile them? <span "
+#| "class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
+#| ">#CanIUseGPLToolsForNF</a>)</span>"
+msgid ""
+"Can I use GPL-covered editors such as GNU Emacs to develop nonfree programs? "
+"Can I use GPL-covered tools such as GCC to compile them? <span class="
+"\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
 ">#CanIUseGPLToolsForNF</a>)</span>"
 msgstr ""
 "自由でないプログラムを開発するために、GNU 
EmacsのようなGPLの及ぶエディタを"
@@ -3023,12 +3115,19 @@
 "力から派生した出力結果の一部は入力側の著作権状æ…
‹ã‚’継承します。"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "As it happens, Bison can also be used to develop non-free programs.  This "
+#| "is because we decided to explicitly permit the use of the Bison standard "
+#| "parser program in Bison output files without restriction.  We made the "
+#| "decision because there were other tools comparable to Bison which already "
+#| "permitted use for non-free programs."
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 "たまたま、Bisonは自由でないプログラム
を開発するのにも使うことができます。これ"
 
"は、わたしたちがBisonの出力結果に含まれるBisonの標準パーザ・プログラãƒ
 ã¯åˆ¶é™"
@@ -3653,8 +3752,13 @@
 "に従ってソースコードとともに配布する必
要があります。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Can I apply the GPL when writing a plug-in for a non-free program? <span "
+#| "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" "
+#| ">#GPLPluginsInNF</a>)</span>"
 msgid ""
-"Can I apply the GPL when writing a plug-in for a non-free program? <span "
+"Can I apply the GPL when writing a plug-in for a nonfree program? <span "
 "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" >#GPLPluginsInNF</"
 "a>)</span>"
 msgstr ""
@@ -3681,9 +3785,9 @@
 #| "license, giving permission to link it with the non-free main program."
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 "プログラム
がプラグインと動的にリンクされ、お互いにファンクションコールを使っ"
@@ -3695,16 +3799,25 @@
 "ることで解決できます。"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "See also the question <a href=\"#FSWithNFLibs\">I am writing free "
+#| "software that uses a non-free library.</a>"
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 "質問、<a 
href=\"#FSWithNFLibs\">自由でないライブラリを利用する自由ソフトウェ"
 "アを書いています</a>もご覧ください。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Can I release a non-free program that's designed to load a GPL-covered "
+#| "plug-in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins"
+#| "\" >#NFUseGPLPlugins</a>)</span>"
 msgid ""
-"Can I release a non-free program that's designed to load a GPL-covered plug-"
+"Can I release a nonfree program that's designed to load a GPL-covered plug-"
 "in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins\" "
 ">#NFUseGPLPlugins</a>)</span>"
 msgstr ""
@@ -4014,11 +4127,20 @@
 ">#MereAggregation</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "An &ldquo;aggregate&rdquo; consists of a number of separate programs, "
+#| "distributed together on the same CD-ROM or other media.  The GPL permits "
+#| "you to create and distribute an aggregate, even when the licenses of the "
+#| "other software are non-free or GPL-incompatible.  The only condition is "
+#| "that you cannot release the aggregate under a license that prohibits "
+#| "users from exercising rights that each program's individual license would "
+#| "grant them."
 msgid ""
 "An &ldquo;aggregate&rdquo; consists of a number of separate programs, "
 "distributed together on the same CD-ROM or other media.  The GPL permits you "
 "to create and distribute an aggregate, even when the licenses of the other "
-"software are non-free or GPL-incompatible.  The only condition is that you "
+"software are nonfree or GPL-incompatible.  The only condition is that you "
 "cannot release the aggregate under a license that prohibits users from "
 "exercising rights that each program's individual license would grant them."
 msgstr ""
@@ -4314,12 +4436,19 @@
 "href=\"#GPLInProprietarySystem\" >#GPLInProprietarySystem</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "You cannot incorporate GPL-covered software in a proprietary system.  The "
+#| "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
+#| "understand, and modify a program.  If you could incorporate GPL-covered "
+#| "software into a non-free system, it would have the effect of making the "
+#| "GPL-covered software non-free too."
 msgid ""
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 "GPLの及ぶソフトウェアをプロプライエタリ・システム
に組み入れることはできませ"
 "ん。GPLの目標は、誰に対してもプログラムを複製や再é…
å¸ƒã€ç†è§£ã€æ”¹å¤‰ã™ã‚‹è‡ªç”±ã‚’与"
@@ -4342,10 +4471,17 @@
 "いうことです。"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "However, in many cases you can distribute the GPL-covered software "
+#| "alongside your proprietary system.  To do this validly, you must make "
+#| "sure that the free and non-free programs communicate at arms length, that "
+#| "they are not combined in a way that would make them effectively a single "
+#| "program."
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 "しかし多くのå 
´åˆã€GPLの及ぶソフトウェアをプロプライエタリ・システム
と一緒に配"
@@ -5489,9 +5625,14 @@
 "のバージョンから削除してください。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Can I release a program under the GPL which I developed using non-free "
+#| "tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+#| ">#NonFreeTools</a>)</span>"
 msgid ""
-"Can I release a program under the GPL which I developed using non-free "
-"tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+"Can I release a program under the GPL which I developed using nonfree tools? "
+"<span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
 ">#NonFreeTools</a>)</span>"
 msgstr ""
 "不自由なツールを用いて開発したプログラム
をGPLでリリースできるでしょうか? "
@@ -5509,8 +5650,17 @@
 "の違いも与えません。"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "However, if you link non-free libraries with the source code, that would "
+#| "be an issue you need to deal with.  It does not preclude releasing the "
+#| "source code under the GPL, but if the libraries don't fit under the "
+#| "&ldquo;system library&rdquo; exception, you should affix an explicit "
+#| "notice giving permission to link your program with them.  <a href="
+#| "\"#GPLIncompatibleLibs\">The FAQ entry about using GPL-incompatible "
+#| "libraries</a> provides more information about how to do that."
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -5816,14 +5966,23 @@
 "\" >#PortProgramToGL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "In general, the answer is no&mdash;this is not a legal requirement.  In "
+#| "specific, the answer depends on which libraries you want to use and what "
+#| "their licenses are.  Most system libraries either use the <a href=\"/"
+#| "licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
+#| "exception permitting linking the library with anything.  These libraries "
+#| "can be used in non-free programs; but in the case of the Lesser GPL, it "
+#| "does have some requirements you must follow."
 msgid ""
 "In general, the answer is no&mdash;this is not a legal requirement.  In "
 "specific, the answer depends on which libraries you want to use and what "
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 
"一般的に言えば、答えはノーです。これは法的な要件ではありません。個ã€
…のケース"
 
"では、答えはあなたが使いたいライブラリとそのライセンスによります。多くのシス"

Index: po/gpl-faq.pot
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.pot,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- po/gpl-faq.pot      10 Mar 2017 21:29:56 -0000      1.75
+++ po/gpl-faq.pot      11 Mar 2017 08:02:04 -0000      1.76
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:25+0000\n"
+"POT-Creation-Date: 2017-03-11 07: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"
@@ -126,7 +126,7 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program and "
-"an unrelated non-free program on the same computer?</a>"
+"an unrelated nonfree program on the same computer?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -434,7 +434,7 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I wrote "
-"under the GNU GPL, but I would like to use the same code in non-free "
+"under the GNU GPL, but I would like to use the same code in nonfree "
 "programs.</a>"
 msgstr ""
 
@@ -490,7 +490,7 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
-"developed using non-free tools?</a>"
+"developed using nonfree tools?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -726,7 +726,7 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as GNU "
-"Emacs to develop non-free programs? Can I use GPL-covered tools such as GCC "
+"Emacs to develop nonfree programs? Can I use GPL-covered tools such as GCC "
 "to compile them?</a>"
 msgstr ""
 
@@ -867,13 +867,13 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in for a "
-"non-free program?</a>"
+"nonfree program?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
-"designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\">Can I release a nonfree program that's designed "
+"to load a GPL-covered plug-in?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -886,7 +886,7 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"#FSWithNFLibs\">Can I write free software that uses non-free "
+"<a href=\"#FSWithNFLibs\">Can I write free software that uses nonfree "
 "libraries?</a>"
 msgstr ""
 
@@ -1196,7 +1196,7 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"Can I have a GPL-covered program and an unrelated non-free program on the "
+"Can I have a GPL-covered program and an unrelated nonfree program on the "
 "same computer? <span class=\"anchor-reference-id\">(<a "
 "href=\"#GPLAndNonfreeOnSameMachine\" "
 ">#GPLAndNonfreeOnSameMachine</a>)</span>"
@@ -1361,7 +1361,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a "
 "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -1701,7 +1701,7 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"Can I write free software that uses non-free libraries? <span "
+"Can I write free software that uses nonfree libraries? <span "
 "class=\"anchor-reference-id\">(<a href=\"#FSWithNFLibs\" "
 ">#FSWithNFLibs</a>)</span>"
 msgstr ""
@@ -1709,8 +1709,8 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -1723,18 +1723,18 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered free software.  Please see <a "
 "href=\"#GPLIncompatibleLibs\">the question on GPL software with "
 "GPL-incompatible libraries</a> for more information."
@@ -1801,9 +1801,9 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
+"If the libraries you intend to link with are nonfree, please also see <a "
 "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
-"non-free libraries</a>."
+"nonfree libraries</a>."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -2016,14 +2016,14 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "I would like to release a program I wrote under the GNU GPL, but I would "
-"like to use the same code in non-free programs.  <span "
+"like to use the same code in nonfree programs.  <span "
 "class=\"anchor-reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" "
 ">#ReleaseUnderGPLAndNF</a>)</span>"
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -2068,8 +2068,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"Can I use GPL-covered editors such as GNU Emacs to develop non-free "
-"programs? Can I use GPL-covered tools such as GCC to compile them? <span "
+"Can I use GPL-covered editors such as GNU Emacs to develop nonfree programs? "
+"Can I use GPL-covered tools such as GCC to compile them? <span "
 "class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
 ">#CanIUseGPLToolsForNF</a>)</span>"
 msgstr ""
@@ -2093,11 +2093,11 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -2509,7 +2509,7 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"Can I apply the GPL when writing a plug-in for a non-free program? <span "
+"Can I apply the GPL when writing a plug-in for a nonfree program? <span "
 "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" "
 ">#GPLPluginsInNF</a>)</span>"
 msgstr ""
@@ -2524,21 +2524,21 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the "
+"GPL-covered plug-in with the nonfree main program would violate the "
 "GPL. However, you can resolve that legal problem by adding an exception to "
-"your plug-in's license, giving permission to link it with the non-free main "
+"your plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 
 #. type: Content of: <dl><dt>
 msgid ""
-"Can I release a non-free program that's designed to load a GPL-covered "
+"Can I release a nonfree program that's designed to load a GPL-covered "
 "plug-in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins\" "
 ">#NFUseGPLPlugins</a>)</span>"
 msgstr ""
@@ -2731,7 +2731,7 @@
 "An &ldquo;aggregate&rdquo; consists of a number of separate programs, "
 "distributed together on the same CD-ROM or other media.  The GPL permits you "
 "to create and distribute an aggregate, even when the licenses of the other "
-"software are non-free or GPL-incompatible.  The only condition is that you "
+"software are nonfree or GPL-incompatible.  The only condition is that you "
 "cannot release the aggregate under a license that prohibits users from "
 "exercising rights that each program's individual license would grant them."
 msgstr ""
@@ -2937,8 +2937,8 @@
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the "
-"GPL-covered software non-free too."
+"software into a nonfree system, it would have the effect of making the "
+"GPL-covered software nonfree too."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -2954,7 +2954,7 @@
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 
@@ -3711,8 +3711,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"Can I release a program under the GPL which I developed using non-free "
-"tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+"Can I release a program under the GPL which I developed using nonfree tools? "
+"<span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
 ">#NonFreeTools</a>)</span>"
 msgstr ""
 
@@ -3725,7 +3725,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -3940,8 +3940,8 @@
 "their licenses are.  Most system libraries either use the <a "
 "href=\"/licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>

Index: po/gpl-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru.po,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- po/gpl-faq.ru.po    11 Mar 2017 07:48:40 -0000      1.126
+++ po/gpl-faq.ru.po    11 Mar 2017 08:02:04 -0000      1.127
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:25+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2017-03-11 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -590,8 +590,8 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I wrote "
-"under the GNU GPL, but I would like to use the same code in nonfree "
-"programs.</a>"
+"under the GNU GPL, but I would like to use the same code in nonfree programs."
+"</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\">Мне хотелось бы 
выпустить написанную мной "
 "программу под GNU GPL, но я хочу использовать 
те же исходные тексты в "
@@ -1191,18 +1191,12 @@
 "</a>"
 
 #. type: Content of: <ul><li>
-# | <a [-href=\"#GPLPluginsInNF\">Can I apply the GPL when writing-]
-# | {+href=\"#GPLPlugins\">When are+} a [-plug-in for-] {+program and its
-# | plug-ins considered+} a [-nonfree-] {+single combined+} program?</a>
-#| msgid ""
-#| "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in "
-#| "for a nonfree program?</a>"
 msgid ""
 "<a href=\"#GPLPlugins\">When are a program and its plug-ins considered a "
 "single combined program?</a>"
 msgstr ""
-"<a href=\"#GPLPlugins\">Когда программа и ее внешние 
модули считаются "
-"единой комбинированной программой?</a>"
+"<a href=\"#GPLPlugins\">Когда программа и ее внешние 
модули считаются единой "
+"комбинированной программой?</a>"
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -1224,8 +1218,8 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"#NFUseGPLPlugins\">Can I release a nonfree program that's "
-"designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\">Can I release a nonfree program that's designed "
+"to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a href=\"#NFUseGPLPlugins\">Могу я выпустить 
несвободную программу, "
 "составленную так, чтобы подгружать 
внешний модуль под GPL?</a>"
@@ -2608,10 +2602,18 @@
 "для своих текстов&nbsp;&mdash; они сами решают, 
сделать ли это."
 
 #. type: Content of: <dl><dd><p>
+# | If the libraries you intend to link with are nonfree, please also see <a
+# | href=\"#FSWithNFLibs\">the section on writing Free Software which uses
+# | non[---]free libraries</a>.
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are nonfree, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
 msgid ""
 "If the libraries you intend to link with are nonfree, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 "Если библиотеки, с которыми вы 
собираетесь компоновать программу, "
 "несвободны, прочтите, пожалуйста, <a 
href=\"#FSWithNFLibs\">ответ на вопрос "
@@ -3020,9 +3022,9 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"Can I use GPL-covered editors such as GNU Emacs to develop nonfree "
-"programs? Can I use GPL-covered tools such as GCC to compile them? <span "
-"class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
+"Can I use GPL-covered editors such as GNU Emacs to develop nonfree programs? "
+"Can I use GPL-covered tools such as GCC to compile them? <span class="
+"\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
 ">#CanIUseGPLToolsForNF</a>)</span>"
 msgstr ""
 "Можно мне пользоваться редакторами под GPL, 
такими, как GNU Emacs, для "
@@ -3613,24 +3615,14 @@
 "В пересмотренной лицензии BSD пункта о 
рекламе нет, что устраняет проблему."
 
 #. type: Content of: <dl><dt>
-# | [-Can I apply the GPL when writing-]{+When are+} a [-plug-in for-]
-# | {+program and its plug-ins considered+} a [-nonfree-] {+single combined+}
-# | program? <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#GPLPluginsInNF\" >#GPLPluginsInNF</a>)</span>-]
-# | {+href=\"#GPLPlugins\" >#GPLPlugins</a>)</span>+}
-#| msgid ""
-#| "Can I apply the GPL when writing a plug-in for a nonfree program? <span "
-#| "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" "
-#| ">#GPLPluginsInNF</a>)</span>"
 msgid ""
 "When are a program and its plug-ins considered a single combined program? "
 "<span class=\"anchor-reference-id\">(<a href=\"#GPLPlugins\" >#GPLPlugins</"
 "a>)</span>"
 msgstr ""
-"Когда программа и ее внешние модули 
считаются "
-"единой комбинированной программой? "
-"<span class=\"anchor-reference-id\">(<a href=\"#GPLPlugins\" >#GPLPlugins</"
-"a>)</span>"
+"Когда программа и ее внешние модули 
считаются единой комбинированной "
+"программой? <span class=\"anchor-reference-id\">(<a 
href=\"#GPLPlugins\" "
+">#GPLPlugins</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3644,30 +3636,13 @@
 msgstr ""
 "Это зависит от того, как главная программа 
вызывает свои внешние модули. "
 "Если главная программа использует для 
этого fork и exec и они завязывают "
-"тесное общение через сложные структуры 
данных, общие или передаваемые "
-"туда и обратно, то они становятся единой 
комбинированной программой. Когда главная "
-"программа использует для вызова внешних 
модулей просто fork и exec, "
-"не завязывая тесного общения с ними, 
внешние модули остаются отдельными "
+"тесное общение через сложные структуры 
данных, общие или передаваемые туда и "
+"обратно, то они становятся единой 
комбинированной программой. Когда главная "
+"программа использует для вызова внешних 
модулей просто fork и exec, не "
+"завязывая тесного общения с ними, внешние 
модули остаются отдельными "
 "программами."
 
 #. type: Content of: <dl><dd><p>
-# | If the {+main+} program dynamically links plug-ins, and they make function
-# | calls to each other and share data structures, we believe they form a
-# | single {+combined+} program, which must be treated as an extension of both
-# | the main program and the plug-ins.  [-This means you must license-] {+If+}
-# | the [-plug-in under-] {+main program dynamically links plug-ins, but+} the
-# | [-GPL or a GPL-compatible free software license-] {+communication between
-# | them is limited to invoking the &lsquo;main&rsquo; function of the plug-in
-# | with some options+} and [-distribute-] {+waiting for+} it [-with source
-# | code in-] {+to return, that is+} a [-GPL-compliant way.-] {+borderline
-# | case.+}
-#| msgid ""
-#| "If the program dynamically links plug-ins, and they make function calls "
-#| "to each other and share data structures, we believe they form a single "
-#| "program, which must be treated as an extension of both the main program "
-#| "and the plug-ins.  This means you must license the plug-in under the GPL "
-#| "or a GPL-compatible free software license and distribute it with source "
-#| "code in a GPL-compliant way."
 msgid ""
 "If the main program dynamically links plug-ins, and they make function calls "
 "to each other and share data structures, we believe they form a single "
@@ -3677,13 +3652,13 @@
 "main&rsquo; function of the plug-in with some options and waiting for it to "
 "return, that is a borderline case."
 msgstr ""
-"Если главная программа динамически 
компонуется с модулями и они вызывают 
функции "
-"друг из друга и разделяют общие структуры 
данных, мы убеждены, что они "
-"формируют единую комбинированную 
программу, которая должна рассматриваться 
как расширение и "
-"главной программы, и модулей. Если главная 
программа динамически компонуется "
-"с модулями, но взаимодействие между ними 
ограничено вызовом &ldquo;главной&rdquo; "
-"процедуры модуля с какими-то параметрами 
и ожиданием результата, то это "
-"предельный случай."
+"Если главная программа динамически 
компонуется с модулями и они вызывают "
+"функции друг из друга и разделяют общие 
структуры данных, мы убеждены, что "
+"они формируют единую комбинированную 
программу, которая должна "
+"рассматриваться как расширение и главной 
программы, и модулей. Если главная "
+"программа динамически компонуется с 
модулями, но взаимодействие между ними "
+"ограничено вызовом &ldquo;главной&rdquo; 
процедуры модуля с какими-то "
+"параметрами и ожиданием результата, то 
это предельный случай."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3716,21 +3691,6 @@
 "или раздельными произведениями</a>."
 
 #. type: Content of: <dl><dd><p>
-# | If the {+main+} program [-dynamically links plug-ins, and they make
-# | function calls to each other-] and [-share data structures, we believe
-# | they form-] {+the plugins are+} a single [-program, which must be treated
-# | as an extension of both the main-] {+combined+} program [-and the
-# | plug-ins.  This-] {+then this+} means you must license the plug-in under
-# | the GPL or a GPL-compatible free software license and distribute it with
-# | source code in a GPL-compliant way. {+A main program that is separate from
-# | its plug-ins makes no requirements for the plug-ins.+}
-#| msgid ""
-#| "If the program dynamically links plug-ins, and they make function calls "
-#| "to each other and share data structures, we believe they form a single "
-#| "program, which must be treated as an extension of both the main program "
-#| "and the plug-ins.  This means you must license the plug-in under the GPL "
-#| "or a GPL-compatible free software license and distribute it with source "
-#| "code in a GPL-compliant way."
 msgid ""
 "If the main program and the plugins are a single combined program then this "
 "means you must license the plug-in under the GPL or a GPL-compatible free "
@@ -3739,10 +3699,10 @@
 "the plug-ins."
 msgstr ""
 "Если главная программа и модули 
составляют комбинированную программу, то 
это "
-"значит, что вы должны выпускать модуль под 
"
-"GPL или совместимой с ней лицензией 
свободных программ и распространять его "
-"с исходным текстом так, чтобы это было 
совместимо с GPL. Если главная программа "
-"отдельна от внешних модулей, то это не 
налагает требований на внешние модули."
+"значит, что вы должны выпускать модуль под 
GPL или совместимой с ней "
+"лицензией свободных программ и 
распространять его с исходным текстом так, "
+"чтобы это было совместимо с GPL. Если 
главная программа отдельна от внешних "
+"модулей, то это не налагает требований на 
внешние модули."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -3765,22 +3725,6 @@
 "или раздельными программами</a>."
 
 #. type: Content of: <dl><dd><p>
-# | If [-the program dynamically links plug-ins, and they make function calls
-# | to each other and share data structures, we believe-] they form a single
-# | [-program, which must be treated as an extension of both the main-]
-# | {+combined+} program [-and the plug-ins.  This-] {+this+} means that
-# | combination of the GPL-covered plug-in with the nonfree main program
-# | would violate the GPL. However, you can resolve that legal problem by
-# | adding an exception to your plug-in's license, giving permission to link
-# | it with the nonfree main program.
-#| msgid ""
-#| "If the program dynamically links plug-ins, and they make function calls "
-#| "to each other and share data structures, we believe they form a single "
-#| "program, which must be treated as an extension of both the main program "
-#| "and the plug-ins.  This means that combination of the GPL-covered plug-in "
-#| "with the nonfree main program would violate the GPL.  However, you can "
-#| "resolve that legal problem by adding an exception to your plug-in's "
-#| "license, giving permission to link it with the nonfree main program."
 msgid ""
 "If they form a single combined program this means that combination of the "
 "GPL-covered plug-in with the nonfree main program would violate the GPL. "
@@ -3788,10 +3732,11 @@
 "plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
-"Если они формируют единую 
комбинированную программу, это значит, что 
объединение модуля под GPL с "
-"несвободной программой нарушало бы GPL. 
Однако вы можете решить эту "
-"юридическую проблему, добавив исключение 
к лицензии своего модуля, в котором "
-"дается разрешение компоновать его с 
несвободной главной программой."
+"Если они формируют единую 
комбинированную программу, это значит, что "
+"объединение модуля под GPL с несвободной 
программой нарушало бы GPL. Однако "
+"вы можете решить эту юридическую 
проблему, добавив исключение к лицензии "
+"своего модуля, в котором дается 
разрешение компоновать его с несвободной "
+"главной программой."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3812,32 +3757,15 @@
 "\"#NFUseGPLPlugins\" >#NFUseGPLPlugins</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-# | If [-the program dynamically links plug-ins, and they make function calls
-# | to each other and share data structures, we believe-] they form a single
-# | [-program, which must be treated as an extension of both the main-]
-# | {+combined+} program [-and the plug-ins.  In order to use the GPL-covered
-# | plug-ins,-] {+then+} the main program must be released under the GPL or a
-# | GPL-compatible free software license, and [-that-] the terms of the GPL
-# | must be followed when the main program is distributed for use with these
-# | plug-ins.
-#| msgid ""
-#| "If the program dynamically links plug-ins, and they make function calls "
-#| "to each other and share data structures, we believe they form a single "
-#| "program, which must be treated as an extension of both the main program "
-#| "and the plug-ins.  In order to use the GPL-covered plug-ins, the main "
-#| "program must be released under the GPL or a GPL-compatible free software "
-#| "license, and that the terms of the GPL must be followed when the main "
-#| "program is distributed for use with these plug-ins."
 msgid ""
 "If they form a single combined program then the main program must be "
 "released under the GPL or a GPL-compatible free software license, and the "
 "terms of the GPL must be followed when the main program is distributed for "
 "use with these plug-ins."
 msgstr ""
-"Если они "
-"формируют единую комбинированную 
программу, то главная программа должна "
-"выпускаться под GPL или совместимой с ней 
лицензией свободных программ, "
-"и при распространении главной программы 
для пользования с этими "
+"Если они формируют единую 
комбинированную программу, то главная 
программа "
+"должна выпускаться под GPL или совместимой 
с ней лицензией свободных "
+"программ, и при распространении главной 
программы для пользования с этими "
 "модулями должны соблюдаться условия GPL."
 
 #. type: Content of: <dl><dd><p>
@@ -3845,8 +3773,8 @@
 "However, if they are separate works then the license of the plug-in makes no "
 "requirements about the main program."
 msgstr ""
-"Однако если это раздельные произведения, 
то лицензия на модули не "
-"налагает требований на главную программу."
+"Однако если это раздельные произведения, 
то лицензия на модули не налагает "
+"требований на главную программу."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -5620,8 +5548,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"Can I release a program under the GPL which I developed using nonfree "
-"tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+"Can I release a program under the GPL which I developed using nonfree tools? "
+"<span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
 ">#NonFreeTools</a>)</span>"
 msgstr ""
 "Могу я выпустить программу, которую я 
разработал с помощью несвободных "
@@ -5953,8 +5881,8 @@
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in nonfree programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 "Вообще говоря, нет&nbsp;&mdash; это не является 
юридическим требованием. В "
 "конкретном случае это зависит от того, 
какими библиотеками вы хотите "

Index: po/gpl-faq.ta.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ta.po,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- po/gpl-faq.ta.po    10 Mar 2017 21:29:56 -0000      1.65
+++ po/gpl-faq.ta.po    11 Mar 2017 08:02:04 -0000      1.66
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:25+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2010-06-20 15:55+0530\n"
 "Last-Translator: Amachu <address@hidden>\n"
 "Language-Team: Tamil <address@hidden>\n"
@@ -155,7 +155,7 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program and "
-"an unrelated non-free program on the same computer?</a>"
+"an unrelated nonfree program on the same computer?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -464,8 +464,8 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I wrote "
-"under the GNU GPL, but I would like to use the same code in non-free "
-"programs.</a>"
+"under the GNU GPL, but I would like to use the same code in nonfree programs."
+"</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -520,7 +520,7 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
-"developed using non-free tools?</a>"
+"developed using nonfree tools?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -756,7 +756,7 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as GNU "
-"Emacs to develop non-free programs? Can I use GPL-covered tools such as GCC "
+"Emacs to develop nonfree programs? Can I use GPL-covered tools such as GCC "
 "to compile them?</a>"
 msgstr ""
 
@@ -897,13 +897,13 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#GPLPluginsInNF\">Can I apply the GPL when writing a plug-in for a "
-"non-free program?</a>"
+"nonfree program?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
-"designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\">Can I release a nonfree program that's designed "
+"to load a GPL-covered plug-in?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -916,7 +916,7 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a href=\"#FSWithNFLibs\">Can I write free software that uses non-free "
+"<a href=\"#FSWithNFLibs\">Can I write free software that uses nonfree "
 "libraries?</a>"
 msgstr ""
 
@@ -1233,11 +1233,19 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Can I use the GPL for something other than software? <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#GPLOtherThanSoftware\" >#GPLOtherThanSoftware</"
+#| "a>)</span>"
 msgid ""
-"Can I have a GPL-covered program and an unrelated non-free program on the "
+"Can I have a GPL-covered program and an unrelated nonfree program on the "
 "same computer? <span class=\"anchor-reference-id\">(<a href="
 "\"#GPLAndNonfreeOnSameMachine\" >#GPLAndNonfreeOnSameMachine</a>)</span>"
 msgstr ""
+"மென்பொருள் நீங்கலாக வேறு 
எதற்காகவாவது என்னால் GPLஐ 
பயன்படுத்த முடியுமா? <span class="
+"\"anchor-reference-id\">(<a href=\"#GPLOtherThanSoftware\" "
+">#GPLOtherThanSoftware</a></span>)"
 
 #. type: Content of: <dl><dd><p>
 msgid "Yes."
@@ -1396,7 +1404,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -1734,16 +1742,23 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Why should I use the GNU GPL rather than other free software licenses? "
+#| "<span class=\"anchor-reference-id\">(<a href=\"#WhyUseGPL\" >#WhyUseGPL</"
+#| "a>)</span>"
 msgid ""
-"Can I write free software that uses non-free libraries? <span class=\"anchor-"
+"Can I write free software that uses nonfree libraries? <span class=\"anchor-"
 "reference-id\">(<a href=\"#FSWithNFLibs\" >#FSWithNFLibs</a>)</span>"
 msgstr ""
+"ஏனைய கட்டற்ற உரிமங்களை 
காட்டிலும் நான் ஏன் GNU GPLஐ 
பயன்படுத்த வேண்டும்? <span class="
+"\"anchor-reference-id\">(<a href=\"#WhyUseGPL\" >#WhyUseGPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -1756,18 +1771,18 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered free software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -1834,9 +1849,9 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -2047,16 +2062,23 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Why should I use the GNU GPL rather than other free software licenses? "
+#| "<span class=\"anchor-reference-id\">(<a href=\"#WhyUseGPL\" >#WhyUseGPL</"
+#| "a>)</span>"
 msgid ""
 "I would like to release a program I wrote under the GNU GPL, but I would "
-"like to use the same code in non-free programs.  <span class=\"anchor-"
+"like to use the same code in nonfree programs.  <span class=\"anchor-"
 "reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</a>)"
 "</span>"
 msgstr ""
+"ஏனைய கட்டற்ற உரிமங்களை 
காட்டிலும் நான் ஏன் GNU GPLஐ 
பயன்படுத்த வேண்டும்? <span class="
+"\"anchor-reference-id\">(<a href=\"#WhyUseGPL\" >#WhyUseGPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -2100,9 +2122,9 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"Can I use GPL-covered editors such as GNU Emacs to develop non-free "
-"programs? Can I use GPL-covered tools such as GCC to compile them? <span "
-"class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
+"Can I use GPL-covered editors such as GNU Emacs to develop nonfree programs? "
+"Can I use GPL-covered tools such as GCC to compile them? <span class="
+"\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\" "
 ">#CanIUseGPLToolsForNF</a>)</span>"
 msgstr ""
 
@@ -2125,11 +2147,11 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -2542,11 +2564,18 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Are there translations of the GPL into other languages? <span class="
+#| "\"anchor-reference-id\">(<a href=\"#GPLTranslations\" >#GPLTranslations</"
+#| "a>)</span>"
 msgid ""
-"Can I apply the GPL when writing a plug-in for a non-free program? <span "
+"Can I apply the GPL when writing a plug-in for a nonfree program? <span "
 "class=\"anchor-reference-id\">(<a href=\"#GPLPluginsInNF\" >#GPLPluginsInNF</"
 "a>)</span>"
 msgstr ""
+"GPLஇன் மொழிபெயர்ப்புகள் பிற 
மொழிகளில் கிடைக்கிறதா? <span 
class=\"anchor-reference-"
+"id\">(<a href=\"#GPLTranslations\" >#GPLTranslations</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2558,24 +2587,31 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Are there translations of the GPL into other languages? <span class="
+#| "\"anchor-reference-id\">(<a href=\"#GPLTranslations\" >#GPLTranslations</"
+#| "a>)</span>"
 msgid ""
-"Can I release a non-free program that's designed to load a GPL-covered plug-"
+"Can I release a nonfree program that's designed to load a GPL-covered plug-"
 "in? <span class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins\" "
 ">#NFUseGPLPlugins</a>)</span>"
 msgstr ""
+"GPLஇன் மொழிபெயர்ப்புகள் பிற 
மொழிகளில் கிடைக்கிறதா? <span 
class=\"anchor-reference-"
+"id\">(<a href=\"#GPLTranslations\" >#GPLTranslations</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2765,7 +2801,7 @@
 "An &ldquo;aggregate&rdquo; consists of a number of separate programs, "
 "distributed together on the same CD-ROM or other media.  The GPL permits you "
 "to create and distribute an aggregate, even when the licenses of the other "
-"software are non-free or GPL-incompatible.  The only condition is that you "
+"software are nonfree or GPL-incompatible.  The only condition is that you "
 "cannot release the aggregate under a license that prohibits users from "
 "exercising rights that each program's individual license would grant them."
 msgstr ""
@@ -2971,8 +3007,8 @@
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -2988,7 +3024,7 @@
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 
@@ -3744,11 +3780,18 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "Are there translations of the GPL into other languages? <span class="
+#| "\"anchor-reference-id\">(<a href=\"#GPLTranslations\" >#GPLTranslations</"
+#| "a>)</span>"
 msgid ""
-"Can I release a program under the GPL which I developed using non-free "
-"tools? <span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
+"Can I release a program under the GPL which I developed using nonfree tools? "
+"<span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
 ">#NonFreeTools</a>)</span>"
 msgstr ""
+"GPLஇன் மொழிபெயர்ப்புகள் பிற 
மொழிகளில் கிடைக்கிறதா? <span 
class=\"anchor-reference-"
+"id\">(<a href=\"#GPLTranslations\" >#GPLTranslations</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3759,7 +3802,7 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -3976,8 +4019,8 @@
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "licenses/lgpl.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>



reply via email to

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