[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www links/links.de.html links/po/links.de-en.ht...
|
From: |
GNUN |
|
Subject: |
www links/links.de.html links/po/links.de-en.ht... |
|
Date: |
Fri, 28 Jun 2013 11:30:40 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 13/06/28 11:30:40
Modified files:
links : links.de.html
links/po : links.de-en.html links.de.po links.es.po
links.fr.po links.ja.po links.pot
philosophy/po : assigning-copyright.translist
Added files:
philosophy : assigning-copyright.de.html
philosophy/po : assigning-copyright.de-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/links/links.de.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.de-en.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.de.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.es.po?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.fr.po?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.ja.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.pot?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/assigning-copyright.de.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/assigning-copyright.translist?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/assigning-copyright.de-en.html?cvsroot=www&rev=1.1
Patches:
Index: links/links.de.html
===================================================================
RCS file: /web/www/www/links/links.de.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- links/links.de.html 26 Jun 2013 19:59:12 -0000 1.38
+++ links/links.de.html 28 Jun 2013 11:30:30 -0000 1.39
@@ -3,6 +3,7 @@
<!-- Please do not change /links/links.html, without explicit instruction from
mattl or johnsu01 (or rms) -->
<!--#include virtual="/server/header.de.html" -->
+<!-- Parent-Version: 1.75 -->
<!-- This file is automatically generated by GNUnited Nations! -->
<!--#set var="ENGLISH_PAGE" value="/links/links.en.html" -->
@@ -385,27 +386,39 @@
dem GNU-Projekt (auf Spanisch).</li>
</ul>
-
<div style="font-size: small;">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
</div>
</div>
+<!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.de.html" -->
<div id="footer">
-<p>
-Bitte senden Sie allgemeine Fragen zur FSF & GNU an <a
+<p>Bitte senden Sie allgemeine Fragen zur FSF & GNU an <a
href="mailto:address@hidden";><address@hidden></a>. Sie können auch die
<a
href="/contact/"><span xml:lang="en" lang="en">Free Software
-Foundation</span> kontaktieren</a>.
-<br />
-Bitte senden Sie ungültige Verweise und andere Korrekturen oder Vorschläge
-an <a href="mailto:address@hidden";><address@hidden></a>.
-</p>
+Foundation</span> kontaktieren</a>. Ungültige Verweise und andere
+Korrekturen oder Vorschläge können an <a
+href="mailto:address@hidden";><address@hidden></a> gesendet
+werden.</p>
<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
Bei der Ãbersetzung dieses Werkes wurde mit gröÃter Sorgfalt
vorgegangen. Trotzdem können Fehler nicht völlig ausgeschlossen
werden. Sollten Sie Fehler bemerken oder Vorschläge, Kommentare oder
@@ -414,16 +427,14 @@
href="mailto:address@hidden@gnu.org";><address@hidden></a>.</p>
<p>Weitere Informationen über die Koordinierung und Einsendung von
Ãbersetzungen unserer Webseiten finden Sie in der <a
-href="/server/standards/README.translations">LIESMICH für Ãbersetzungen</a>.
-</p>
+href="/server/standards/README.translations">LIESMICH für
Ãbersetzungen</a>.</p>
+
+<p>Copyright © 2013 Free Software Foundation, Inc.</p>
-<p>
-Copyright © 2011 Free Software Foundation, Inc.</p>
<p>Dieses Werk steht unter einer <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.de";>Creative
Commons Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika
-Lizenz</a>.
-</p>
+Lizenz</a>.</p>
<!--#include virtual="/server/bottom-notes.de.html" -->
<div class="translators-credits">
@@ -435,12 +446,11 @@
<p><!-- timestamp start -->
Aktualisierung:
-$Date: 2013/06/26 19:59:12 $
+$Date: 2013/06/28 11:30:30 $
<!-- timestamp end -->
</p>
</div>
-
</div>
</body>
</html>
Index: links/po/links.de-en.html
===================================================================
RCS file: /web/www/www/links/po/links.de-en.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- links/po/links.de-en.html 26 Jun 2013 19:59:14 -0000 1.31
+++ links/po/links.de-en.html 28 Jun 2013 11:30:31 -0000 1.32
@@ -1,7 +1,9 @@
<!-- Please do not change /links/links.html, without explicit instruction from
mattl or johnsu01 (or rms) -->
<!--#include virtual="/server/header.html" -->
-<title>Links to Other Free Software Sites - GNU Project - Free Software
Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Links to Other Free Software Sites
+- GNU Project - Free Software Foundation</title>
<!--#include virtual="/links/po/links.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>Links to Other Free Software Sites</h2>
@@ -335,45 +337,47 @@
<li><a href="http://gnuticias.es.gnu.org";>GNUticias</a>, news about
free software and the GNU Project (in Spanish).</li>
</ul>
-
-</div>
-
+</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
-<p>
-Please send FSF & GNU inquiries to
-<a href="mailto:address@hidden";><address@hidden></a>.
-There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><address@hidden></a>.
-</p>
+<p>Please send general FSF & GNU inquiries to <a
+href="mailto:address@hidden";><address@hidden></a>. There are also <a
+href="/contact/">other ways to contact</a> the FSF. Broken links and other
+corrections or suggestions can be sent to <a
+href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations README</a> for
+information on coordinating and submitting translations of this article.</p>
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p>Copyright © 2013 Free Software Foundation, Inc.</p>
-<p>
-Copyright © 2011 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/06/26 19:59:14 $
+$Date: 2013/06/28 11:30:31 $
<!-- timestamp end -->
</p>
</div>
-
</div>
</body>
</html>
Index: links/po/links.de.po
===================================================================
RCS file: /web/www/www/links/po/links.de.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- links/po/links.de.po 26 Jun 2013 19:59:15 -0000 1.47
+++ links/po/links.de.po 28 Jun 2013 11:30:32 -0000 1.48
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: links.html\n"
-"POT-Creation-Date: 2013-06-25 07:33+0000\n"
+"POT-Creation-Date: 2013-06-28 11:27+0000\n"
"PO-Revision-Date: 2013-06-26 17:00+0200\n"
"Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
@@ -17,8 +17,7 @@
#. type: Content of: <title>
msgid ""
-"Links to Other Free Software Sites - GNU Project - Free Software Foundation "
-"(FSF)"
+"Links to Other Free Software Sites - GNU Project - Free Software Foundation"
msgstr ""
"Verweise zu anderen Webauftritten mit freier Software - GNU-Projekt - Free "
"Software Foundation"
@@ -822,26 +821,32 @@
msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
msgstr " "
-# Text not the very latest; doesnât correspond to boilerplate.
#. type: Content of: <div><p>
msgid ""
-"Please send FSF & GNU inquiries to <a href=\"mailto:address@hidden";><"
-"address@hidden></a>. There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF."
+"Please send general FSF & GNU inquiries to <a
href=\"mailto:address@hidden";
+"\"><address@hidden></a>. There are also <a href=\"/contact/\">other
ways "
+"to contact</a> the FSF. Broken links and other corrections or suggestions "
+"can be sent to <a href=\"mailto:address@hidden";><address@hidden"
+"org></a>."
msgstr ""
"Bitte senden Sie allgemeine Fragen zur FSF & GNU an <a href=\"mailto:";
"address@hidden"><address@hidden></a>. Sie können auch die <a href=\"/"
"contact/\"><span xml:lang=\"en\" lang=\"en\">Free Software Foundation</span> "
-"kontaktieren</a>."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";><address@hidden></a>."
-msgstr ""
-"Bitte senden Sie ungültige Verweise und andere Korrekturen oder Vorschläge "
-"an <a href=\"mailto:address@hidden";><address@hidden></a>."
-
+"kontaktieren</a>. Ungültige Verweise und andere Korrekturen oder Vorschläge
"
+"können an <a href=\"mailto:address@hidden";><address@hidden></"
+"a> gesendet werden."
+
+#. TRANSLATORS: Ignore the original text in this paragraph,
+#. replace it with the translation of these two:
+#. We work hard and do our best to provide accurate, good quality
+#. translations. However, we are not exempt from imperfection.
+#. Please send your comments and general suggestions in this regard
+#. to <a href="mailto:address@hidden";>
+#. <address@hidden></a>.</p>
+#. <p>For information on coordinating and submitting translations of
+#. our web pages, see <a
+#. href="/server/standards/README.translations.html">Translations
+#. README</a>.
#. type: Content of: <div><p>
msgid ""
"Please see the <a href=\"/server/standards/README.translations.html"
@@ -859,8 +864,8 @@
"standards/README.translations\">LIESMICH für Ãbersetzungen</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2011 Free Software Foundation, Inc."
-msgstr "Copyright © 2011 Free Software Foundation, Inc."
+msgid "Copyright © 2013 Free Software Foundation, Inc."
+msgstr "Copyright © 2013 Free Software Foundation, Inc."
#. type: Content of: <div><p>
msgid ""
@@ -885,11 +890,14 @@
#~ msgid ""
#~ "Links to Other Free Software Sites - GNU Project - Free Software "
-#~ "Foundation"
+#~ "Foundation (FSF)"
#~ msgstr ""
#~ "Verweise zu anderen Webauftritten mit freier Software - GNU-Projekt - "
#~ "Free Software Foundation"
+#~ msgid "Copyright © 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2011 Free Software Foundation, Inc."
+
#~ msgid ""
#~ "<a href=\"http://www.libertadinformacion.org/\";>Asociación por la "
#~ "Libertad de la Información</a>"
Index: links/po/links.es.po
===================================================================
RCS file: /web/www/www/links/po/links.es.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- links/po/links.es.po 26 Jun 2013 23:12:54 -0000 1.71
+++ links/po/links.es.po 28 Jun 2013 11:30:33 -0000 1.72
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: links.es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-27 01:00+0300\n"
+"POT-Creation-Date: 2013-06-28 11:27+0000\n"
"PO-Revision-Date: 2013-06-04 05:39+0100\n"
"Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
"Language-Team: Spanish <address@hidden>\n"
@@ -19,14 +19,20 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-28 11:27+0000\n"
"X-Poedit-Language: Spanish\n"
"X-Poedit-SourceCharset: utf-8\n"
# type: Content of: <title>
#. type: Content of: <title>
+# | Links to Other Free Software Sites - GNU Project - Free Software
+# | Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Links to Other Free Software Sites - GNU Project - Free Software "
+#| "Foundation (FSF)"
msgid ""
-"Links to Other Free Software Sites - GNU Project - Free Software Foundation "
-"(FSF)"
+"Links to Other Free Software Sites - GNU Project - Free Software Foundation"
msgstr ""
"Enlaces a otros sitios sobre software libre - Proyecto GNU - Free Software "
"Foundation (FSF)"
@@ -915,25 +921,30 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
msgid ""
-"Please send FSF & GNU inquiries to <a href=\"mailto:address@hidden";><"
-"address@hidden></a>. There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF."
+"Please send general FSF & GNU inquiries to <a
href=\"mailto:address@hidden";
+"\"><address@hidden></a>. There are also <a href=\"/contact/\">other
ways "
+"to contact</a> the FSF. Broken links and other corrections or suggestions "
+"can be sent to <a href=\"mailto:address@hidden";><address@hidden"
+"org></a>."
msgstr ""
"EnvÃe sus consultas acerca de la FSF y GNU a <a
href=\"mailto:address@hidden";
"\"><address@hidden></a>. Existen también <a href=\"/contact/\">otros "
-"medios para contactar</a> con la FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";><address@hidden></a>."
-msgstr ""
-"Para avisar de enlaces rotos y proponer otras correcciones o sugerencias, "
-"dirÃjase a <a href=\"mailto:address@hidden";><address@hidden></"
-"a>."
+"medios para contactar</a> con la FSF. <br /> Para avisar de enlaces rotos y "
+"proponer otras correcciones o sugerencias, dirÃjase a <a href=\"mailto:";
+"address@hidden"><address@hidden></a>."
#
+#. TRANSLATORS: Ignore the original text in this paragraph,
+#. replace it with the translation of these two:
+#. We work hard and do our best to provide accurate, good quality
+#. translations. However, we are not exempt from imperfection.
+#. Please send your comments and general suggestions in this regard
+#. to <a href="mailto:address@hidden";>
+#. <address@hidden></a>.</p>
+#. <p>For information on coordinating and submitting translations of
+#. our web pages, see <a
+#. href="/server/standards/README.translations.html">Translations
+#. README</a>.
#. type: Content of: <div><p>
msgid ""
"Please see the <a href=\"/server/standards/README.translations.html"
@@ -949,10 +960,12 @@
"información sobre la coordinación y el envÃo de traducciones de las
páginas "
"de este sitio web."
-# type: Content of: <div><p>
#. type: Content of: <div><p>
-msgid "Copyright © 2011 Free Software Foundation, Inc."
-msgstr "Copyright © 2011 Free Software Foundation, Inc."
+# || No change detected. The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Copyright © 2013 Free Software Foundation, Inc."
+msgid "Copyright © 2013 Free Software Foundation, Inc."
+msgstr "Copyright © 2013 Free Software Foundation, Inc."
#. type: Content of: <div><p>
msgid ""
@@ -976,6 +989,10 @@
msgid "Updated:"
msgstr "Ãltima actualización: "
+# type: Content of: <div><p>
+#~ msgid "Copyright © 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2011 Free Software Foundation, Inc."
+
# type: Content of: <ul><li>
#~ msgid "<a href=\"http://www.cipsga.org.br/\";>CIPSGA</a>"
#~ msgstr "<a href=\"http://www.cipsga.org.br/\";>CIPSGA</a>"
Index: links/po/links.fr.po
===================================================================
RCS file: /web/www/www/links/po/links.fr.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- links/po/links.fr.po 25 Jun 2013 07:38:56 -0000 1.71
+++ links/po/links.fr.po 28 Jun 2013 11:30:35 -0000 1.72
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: links.html\n"
-"POT-Creation-Date: 2013-06-25 07:33+0000\n"
+"POT-Creation-Date: 2013-06-28 11:27+0000\n"
"PO-Revision-Date: 2013-06-07 21:28+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -21,9 +21,14 @@
"X-Generator: Gtranslator 2.91.5\n"
#. type: Content of: <title>
+# | Links to Other Free Software Sites - GNU Project - Free Software
+# | Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Links to Other Free Software Sites - GNU Project - Free Software "
+#| "Foundation (FSF)"
msgid ""
-"Links to Other Free Software Sites - GNU Project - Free Software Foundation "
-"(FSF)"
+"Links to Other Free Software Sites - GNU Project - Free Software Foundation"
msgstr ""
"Liens vers d'autres sites en rapport avec le logiciel libre - Projet GNU - "
"Free Software Foundation (FSF)"
@@ -832,23 +837,29 @@
#. type: Content of: <div><p>
msgid ""
-"Please send FSF & GNU inquiries to <a href=\"mailto:address@hidden";><"
-"address@hidden></a>. There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF."
+"Please send general FSF & GNU inquiries to <a
href=\"mailto:address@hidden";
+"\"><address@hidden></a>. There are also <a href=\"/contact/\">other
ways "
+"to contact</a> the FSF. Broken links and other corrections or suggestions "
+"can be sent to <a href=\"mailto:address@hidden";><address@hidden"
+"org></a>."
msgstr ""
"Veuillez envoyer les requêtes concernant la FSF et GNU à <a href=\"mailto:";
"address@hidden"><address@hidden></a>. Il existe aussi <a
href=\"/contact/"
-"\">d'autres moyens de contacter</a> la FSF."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";><address@hidden></a>."
-msgstr ""
-"Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou "
-"suggestions à <a href=\"mailto:address@hidden";><address@hidden"
-"org></a>."
-
+"\">d'autres moyens de contacter</a> la FSF. Les liens orphelins et autres "
+"corrections ou suggestions peuvent être signalés à <a href=\"mailto:";
+"address@hidden"><address@hidden></a>."
+
+#. TRANSLATORS: Ignore the original text in this paragraph,
+#. replace it with the translation of these two:
+#. We work hard and do our best to provide accurate, good quality
+#. translations. However, we are not exempt from imperfection.
+#. Please send your comments and general suggestions in this regard
+#. to <a href="mailto:address@hidden";>
+#. <address@hidden></a>.</p>
+#. <p>For information on coordinating and submitting translations of
+#. our web pages, see <a
+#. href="/server/standards/README.translations.html">Translations
+#. README</a>.
#. type: Content of: <div><p>
msgid ""
"Please see the <a href=\"/server/standards/README.translations.html"
@@ -865,8 +876,11 @@
"README.translations.html\">guide de traduction</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2011 Free Software Foundation, Inc."
-msgstr "Copyright © 2011 Free Software Foundation, Inc."
+# || No change detected. The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Copyright © 2013 Free Software Foundation, Inc."
+msgid "Copyright © 2013 Free Software Foundation, Inc."
+msgstr "Copyright © 2013 Free Software Foundation, Inc."
#. type: Content of: <div><p>
msgid ""
@@ -891,6 +905,9 @@
msgid "Updated:"
msgstr "Dernière mise à jour :"
+#~ msgid "Copyright © 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2011 Free Software Foundation, Inc."
+
#~ msgid ""
#~ "<a href=\"http://www.belgeler.org/\";>Belgeler.org</a> - A very "
#~ "comprehensive Turkish Translation project including philosophical "
Index: links/po/links.ja.po
===================================================================
RCS file: /web/www/www/links/po/links.ja.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- links/po/links.ja.po 26 Jun 2013 05:22:17 -0000 1.9
+++ links/po/links.ja.po 28 Jun 2013 11:30:39 -0000 1.10
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: links.html\n"
-"POT-Creation-Date: 2013-06-25 07:33+0000\n"
+"POT-Creation-Date: 2013-06-28 11:27+0000\n"
"PO-Revision-Date: 2013-06-26 14:20+0900\n"
"Last-Translator: NIIBE Yutaka <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -14,11 +14,15 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-28 11:27+0000\n"
#. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "Links to Other Free Software Sites - GNU Project - Free Software "
+#| "Foundation (FSF)"
msgid ""
-"Links to Other Free Software Sites - GNU Project - Free Software Foundation "
-"(FSF)"
+"Links to Other Free Software Sites - GNU Project - Free Software Foundation"
msgstr ""
"ã»ãã®èªç±ã½ããã¦ã§ã¢ãµã¤ãã¸ã®ãªã³ã¯ -
GNUããã¸ã§ã¯ã - ããªã¼ã½ããã¦ã§ã¢"
"ãã¡ã¦ã³ãã¼ã·ã§ã³ (FSF)"
@@ -775,22 +779,28 @@
#. type: Content of: <div><p>
msgid ""
-"Please send FSF & GNU inquiries to <a href=\"mailto:address@hidden";><"
-"address@hidden></a>. There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF."
+"Please send general FSF & GNU inquiries to <a
href=\"mailto:address@hidden";
+"\"><address@hidden></a>. There are also <a href=\"/contact/\">other
ways "
+"to contact</a> the FSF. Broken links and other corrections or suggestions "
+"can be sent to <a href=\"mailto:address@hidden";><address@hidden"
+"org></a>."
msgstr ""
"FSFããã³GNUã«é¢ããåãåããã¯<a
href=\"mailto:address@hidden";><address@hidden"
"org></a>ã¾ã§ãé¡ããã¾ã(è±èª)ãFSFã¸ã®é£çµ¡ã¯<a
href=\"/contact/\">ä»ã®æ¹"
-"æ³</a>ãããã¾ãã"
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";><address@hidden></a>."
-msgstr ""
-"ãªã³ã¯åããä»ã®ä¿®æ£ãææ¡ã¯<a
href=\"mailto:address@hidden";><"
-"address@hidden></a>ã¾ã§ãéããã ããã"
+"æ³</a>ãããã¾ãããªã³ã¯åããä»ã®ä¿®æ£ãææ¡ã¯<a
href=\"mailto:";
+"address@hidden"><address@hidden></a>ã¾ã§ãéããã ããã"
+#. TRANSLATORS: Ignore the original text in this paragraph,
+#. replace it with the translation of these two:
+#. We work hard and do our best to provide accurate, good quality
+#. translations. However, we are not exempt from imperfection.
+#. Please send your comments and general suggestions in this regard
+#. to <a href="mailto:address@hidden";>
+#. <address@hidden></a>.</p>
+#. <p>For information on coordinating and submitting translations of
+#. our web pages, see <a
+#. href="/server/standards/README.translations.html">Translations
+#. README</a>.
#. type: Content of: <div><p>
msgid ""
"Please see the <a href=\"/server/standards/README.translations.html"
@@ -804,8 +814,10 @@
"translations.html\">翻訳 README</a>ãã覧ãã ããã"
#. type: Content of: <div><p>
-msgid "Copyright © 2011 Free Software Foundation, Inc."
-msgstr "Copyright © 2011 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright © 2013 Free Software Foundation, Inc."
+msgid "Copyright © 2013 Free Software Foundation, Inc."
+msgstr "Copyright © 2013 Free Software Foundation, Inc."
#. type: Content of: <div><p>
msgid ""
@@ -826,3 +838,6 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "æçµæ´æ°:"
+
+#~ msgid "Copyright © 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright © 2011 Free Software Foundation, Inc."
Index: links/po/links.pot
===================================================================
RCS file: /web/www/www/links/po/links.pot,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- links/po/links.pot 25 Jun 2013 07:39:05 -0000 1.38
+++ links/po/links.pot 28 Jun 2013 11:30:39 -0000 1.39
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: links.html\n"
-"POT-Creation-Date: 2013-06-25 07:33+0000\n"
+"POT-Creation-Date: 2013-06-28 11:27+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"
@@ -16,9 +16,7 @@
"Content-Transfer-Encoding: ENCODING"
#. type: Content of: <title>
-msgid ""
-"Links to Other Free Software Sites - GNU Project - Free Software Foundation "
-"(FSF)"
+msgid "Links to Other Free Software Sites - GNU Project - Free Software
Foundation"
msgstr ""
#. type: Content of: <h2>
@@ -610,17 +608,27 @@
#. type: Content of: <div><p>
msgid ""
-"Please send FSF & GNU inquiries to <a "
+"Please send general FSF & GNU inquiries to <a "
"href=\"mailto:address@hidden";><address@hidden></a>. There are also <a "
-"href=\"/contact/\">other ways to contact</a> the FSF."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a "
+"href=\"/contact/\">other ways to contact</a> the FSF. Broken links and "
+"other corrections or suggestions can be sent to <a "
"href=\"mailto:address@hidden";><address@hidden></a>."
msgstr ""
+#. TRANSLATORS: Ignore the original text in this paragraph,
+#. replace it with the translation of these two:
+#
+#. We work hard and do our best to provide accurate, good quality
+#. translations. However, we are not exempt from imperfection.
+#. Please send your comments and general suggestions in this regard
+#. to <a href="mailto:address@hidden";>
+#
+#. <address@hidden></a>.</p>
+#
+#. <p>For information on coordinating and submitting translations of
+#. our web pages, see <a
+#. href="/server/standards/README.translations.html">Translations
+#. README</a>.
#. type: Content of: <div><p>
msgid ""
"Please see the <a "
@@ -629,7 +637,7 @@
msgstr ""
#. type: Content of: <div><p>
-msgid "Copyright © 2011 Free Software Foundation, Inc."
+msgid "Copyright © 2013 Free Software Foundation, Inc."
msgstr ""
#. type: Content of: <div><p>
Index: philosophy/po/assigning-copyright.translist
===================================================================
RCS file: /web/www/www/philosophy/po/assigning-copyright.translist,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/assigning-copyright.translist 18 May 2013 06:43:03 -0000
1.8
+++ philosophy/po/assigning-copyright.translist 28 Jun 2013 11:30:40 -0000
1.9
@@ -3,6 +3,7 @@
value='<div id="translations">
<p>
<span dir="ltr" class="original"><a lang="en" hreflang="en"
href="/philosophy/assigning-copyright.en.html">English</a> [en]</span>
+<span dir="ltr"><a lang="de" hreflang="de"
href="/philosophy/assigning-copyright.de.html">Deutsch</a> [de]</span>
<span dir="ltr"><a lang="fr" hreflang="fr"
href="/philosophy/assigning-copyright.fr.html">français</a> [fr]</span>
<span dir="ltr"><a lang="ru" hreflang="ru"
href="/philosophy/assigning-copyright.ru.html">ÑÑÑÑкий</a> [ru]</span>
</p>
Index: philosophy/assigning-copyright.de.html
===================================================================
RCS file: philosophy/assigning-copyright.de.html
diff -N philosophy/assigning-copyright.de.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/assigning-copyright.de.html 28 Jun 2013 11:30:40 -0000
1.1
@@ -0,0 +1,202 @@
+
+<!--#include virtual="/server/header.de.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+ <!--#set var="ENGLISH_PAGE" value="/philosophy/assigning-copyright.en.html"
-->
+
+<title>Wenn ein Unternehmen nach Ihrem Copyright fragt - GNU-Projekt - Free
+Software Foundation</title>
+<link rel="canonical"
+ href="http://www.fsf.org/blogs/rms/assigning-copyright"; />
+
+<!--#include virtual="/philosophy/po/assigning-copyright.translist" -->
+<!--#include virtual="/server/banner.de.html" -->
+<h2>Wenn ein Unternehmen nach Ihrem Copyright fragt</h2>
+
+<p>Unternehmen, die freie Software entwickeln und unter der GNU GPL freigeben,
+verbreiten manchmal einige Kopien des Quellcodes auf anderen Wegen. Wenn sie
+den exakt gleichen Quellcode unter einer anderen Lizenz bestimmten
+Nutzern ‑ die dafür
+bezahlen ‑ typischerweise mit der Erlaubnis weitergeben, den
+Quellcode in proprietäre Programme einzubinden, nennen wir das <em>Verkauf
+von Ausnahmen</em>. Wenn sie irgendeine Version des Quellcodes einzig in
+proprietärer Manier [/Art] ausgeben, nennen wir das Freigabe einer rein
+proprietären Version des Programms.</p>
+
+<p>Der Artikel <a href="/philosophy/selling-exceptions"><em>Verkauf von
+Ausnahmen</em></a> erklärt, warum der Verkauf von Ausnahmen akzeptabel ist,
+wenn auch nur notdürftig [/gerade noch]. Die Freigabe einer rein
+proprietären Version ist im Gegensatz dazu geradezu falsch, wie jede andere
+proprietäre Software.</p>
+
+<p>Unternehmen verkaufen Ausnahmen normalerweise mit Quellcode, den sie selbst
+entwickelt haben. Da sie das Urheberrecht auf diesen Quellcode halten,
+können sie ihn rechtmäÃig auf beliebige Weise verbreiten, sogar auf
+mehrfache Weise parallel. Doch was passiert, wenn Sie eine modifizierte
+Version dieses freien Programms veröffentlichen und das Unternehmen die von
+Ihnen gemachten Ãnderungen in deren Version einbinden möchte?</p>
+
+<p>Da Sie das Programm unter der GPL erhielten, müssen Sie es, wenn Sie eine
+modifizierte Version verbreiten, unter der GPL lizenzieren. Wenn das
+Unternehmen eine Kopie erhält, wird es in der Lage sein, diese Ãnderungen
+unter der GPL zu nutzen; nicht zulässig ist es, Ihre Ãnderungen in diesem
+Programm einzubinden und Ausnahmen dafür zu verkaufen. Es wird auch nicht in
+der Lage sein, rein proprietäre Versionen freizugeben, die Ihren Quellcode
+enthalten. Wenn dies das von Ihnen gewünschte Ergebnis ist, erhalten Sie es
+standardmäÃig. Wenn das Unternehmen jedoch beabsichtigt Ausnahmen zu
+verkaufen, wird es sich wahrscheinlich dafür entscheiden, Ihre Ãnderungen
+nicht zu nutzen.</p>
+
+<p>Aber angenommen, dass Sie einem Verkauf von Ausnahmen nicht abgeneigt und
+bereit sind, dies dem Unternehmen, einschlieÃlich Ihrer Ãnderungen im
+Programm, so tun zu lassen. Sie können dem zustimmen, doch Sie müssen
+vorsichtig sein was Sie unterschreiben, oder Sie werden möglicherweise von
+den Ergebnissen überrascht werden.</p>
+
+<p>Das Unternehmen wird Sie wahrscheinlich auffordern, Ihr Copyright dem
+Unternehmen zuzuweisen oder zu lizenzieren. Das ist an sich nicht schlecht;
+viele GNU-Softwareentwickler haben beispielsweise Copyrights an die FSF
+zugewiesen. Die FSF verkauft jedoch niemals Ausnahmen, und ihre
+Abtretungsvereinbarungen umfassen eine Verpflichtung, den Quellcode des
+Beitragenden nur mit dem Quellcode und nur mit der Möglichkeit der
+Weiterverbreitung zu verbreiten.</p>
+
+<p>Der Vertrag, der vom Unternehmen vorgeschlagen wird, mag keine solche
+Verpflichtung beinhalten. Wenn Sie so etwas unterschreiben, kann das
+Unternehmen verschiedene Dinge mit Ihrem Quellcode anstellen. Es könnte
+weiterhin Ausnahmen verkaufen mit einem Programm, das Ihren Quellcode
+enthält. Es könnte rein proprietäre, modifizierte oder erweiterte Versionen,
+die Ihren Quellcode enthalten, freigeben. Es könnte Ihren Quellcode sogar
+<em>nur</em> für proprietäre Versionen verwenden. Ihr Beitrag könnte sich
+letztendlich als Spende für proprietäre Software herausstellen.</p>
+
+<p>Es liegt an Ihnen, welche dieser Aktivitäten Sie zulassen, aber hier die
+Empfehlungen der FSF: Wenn Sie planen, gröÃere Beiträge zu einem Projekt zu
+leisten, bestehen Sie darauf, dass die Vereinbarung voraussetzt, dass
+Softwareversionen, die Ihren Beitrag enthalten, der Ãffentlichkeit unter
+einer freien Softwarelizenz zugänglich sind. Dies wird dem Entwickler
+gestatten, Ausnahmen zu verkaufen, doch davon abhalten, Ihren Beitrag in
+Software zu verwenden, die nur unter einer proprietären Lizenz verfügbar
+ist.</p>
+
+<p>Wenn Ihre Beiträge kleiner sind, könnten Sie eine schwächere Bedingung
+akzeptieren, dass das Unternehmen Ihre Beiträge in einer
+Freie-Software-Freigabe sowie möglicherweise in unfreien Programmen
+verfügbar macht. Dies würde esdem Unternehmen einräumen, Ihre Beiträge in
+modifizierter Software, die nur unter einer proprietären Lizenz erhältlich
+ist, zu benutzen. Das Herausgeben von proprietärer Software ist niemals eine
+gute Sache, doch wenn Ihre Veränderungen kleiner sind, könnte es wichtiger
+sein, die freie Version zu verbessern als der unfreien Version zu
+widerstehen.</p>
+
+<p>Sie können diese Ergebnisse kontrollieren, indem Sie auf angemessene
+Bedingungen im Vertrag beharren. Um den Verkauf von Ausnahmen für das
+Programm zu erlauben, das Ihren Quellcode enthält, aber nicht zuzulassen,
+dass das Unternehmen rein proprietäre Versionen mit Ihren Quellcode
+enthalten, können Sie auf eine Bedingung mehr oder weniger wie dieser
+bestehen:</p>
+
+<blockquote>
+ <p>âJedes Programm, das auf Quellcode (wie in der <span xml:lang="en"
+lang="en">GNU General Public License</span>, Version 3, definiert) eines
+Hackers basiert, den <em>Foo</em> verbreitet, soll von <em>Foo</em>
+verfügbar gemacht werden unter a) der <em><span xml:lang="en" lang="en">GNU
+General Public License</span> (GPL), Version 2 oder höher</em>, oder b) der
+Lizensierung nach (a), aber mit durch jede vorhandene höhere
+GPL-Versionsnummer ersetzte <em>2</em>. Sofern <em>Foo</em> das Programm als
+Quellcode gratis der Ãffentlichkeit auf diese Weise verfügbar, kann das
+identische Programm an einige seiner Benutzer weitergegeben werden unter
+Bedingungen, die es ihnen gestatten, den Quellcode des Programms mit
+unfreiem Quellcode zu verbinden und die Kombination in Binärform unter einer
+selbst gewählten Lizenz herauszugeben.â</p>
+</blockquote>
+
+<p>Oder wenn Sie etwas dagegen haben, dass eine Variante <em>Ihres
+Quellcodes</em> in einer rein proprietären Version veröffentlicht werden
+könnte, können Sie auf eine Bedingung, die mehr oder weniger wie diese ist,
+bestehen:</p>
+
+<blockquote>
+ <p>Jedes Programm basierend auf (wie in der GNU General Public License
Version
+3 definiert) Quellcode von Hackern, den FOO vertreibt, soll von FOO
+verfügbar gemacht werden unter a) der <em>GNU General Public License (GPL),
+Version 2 oder später</em> oder b) der Lizensierung wie zuvor in (a), doch
+mit einer gegen jede höhere existierende Versionsnummer ersetzte
+<em>2</em>. Vorausgesetzt FOO macht das Programm auf diesem Wege als
+Quellcode gratis der Ãffentlichkeit verfügbar, kann es auch die selbe
+Version von Quellcode von Hackern in anderen Programmen unter anderen
+Lizenzen der eigenen Wahl verbreiten.</p>
+</blockquote>
+
+<p>Wenn das Programm unter der GNU Affero GPL herausgegeben wird, fügen Sie
+<em>Affero</em> hinzu vor <em>General</em>, ändern Sie <em>GPL</em> in
+<em>AGPL</em>, ändern Sie <em>2 oder</em> in <em>3 oder</em> um, und es
+könnte Sinn ergeben, <em>den FOO vertreibt</em> durch <em>den FOO vertreibt
+oder auf einem Server ablegt, der anderen Nutzern als FOO zugänglich
+ist</em> zu ersetzen.</p>
+
+<p>Die FSF hat diese Texte von einem Anwalt nachsehen lassen, doch Sie sollten
+selber Rechtsauskunft einholen, bevor sie sie nutzen.</p>
+
+<p>Wenn ein Unternehmen mitteilt, welche dieser Bedingungen es akzeptieren
+wird, wird dies zeigen, wie weit es plant, von den Prinzipien freier
+Software abzuweichen. Sie können dann antworten, um sicherzustellen, dass
+Ihre Arbeit ein Beitrag zur <em>Freie Software Gemeinde</em> sein wird und
+nicht in proprietäre Software abgeändert wird.</p>
+
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.de.html" -->
+<div id="footer">
+
+<p>Bitte senden Sie allgemeine Fragen zur FSF & GNU an <a
+href="mailto:address@hidden";><address@hidden></a>. Sie können auch die
<a
+href="/contact/"><span xml:lang="en" lang="en">Free Software
+Foundation</span> kontaktieren</a>.
+<br />
+Bitte senden Sie ungültige Verweise und andere Korrekturen oder Vorschläge
+an <a href="mailto:address@hidden";><address@hidden></a>.
+</p>
+
+<p>Bei der Ãbersetzung dieses Werkes wurde mit gröÃter Sorgfalt
+vorgegangen. Trotzdem können Fehler nicht völlig ausgeschlossen
+werden. Sollten Sie Fehler bemerken oder Vorschläge, Kommentare oder
+Anfragen zu dieser Webseite haben, kontaktieren Sie bitte unser
+Ãbersetzungsteam <a
+href="mailto:address@hidden@gnu.org";><address@hidden></a>.</p>
+<p>Weitere Informationen über die Koordinierung und Einsendung von
+Ãbersetzungen unserer Webseiten finden Sie in der <a
+href="/server/standards/README.translations">LIESMICH für
Ãbersetzungen</a>.</p>
+
+<p>Copyright © 2010 Free Software Foundation, Inc.</p>
+
+<p>Dieses Werk steht unter einer <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.de";>Creative
+Commons Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika
+Lizenz</a>.
+</p>
+
+<!--#include virtual="/server/bottom-notes.de.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<strong>Ãbersetzung:</strong> Roland Zowislo, 2013.</div>
+
+
+ <p><!-- timestamp start -->
+Aktualisierung:
+
+$Date: 2013/06/28 11:30:40 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+</div>
+</body>
+</html>
Index: philosophy/po/assigning-copyright.de-en.html
===================================================================
RCS file: philosophy/po/assigning-copyright.de-en.html
diff -N philosophy/po/assigning-copyright.de-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/po/assigning-copyright.de-en.html 28 Jun 2013 11:30:40
-0000 1.1
@@ -0,0 +1,163 @@
+<!--#include virtual="/server/header.html" -->
+<title>When a Company Asks For Your Copyright
+- GNU Project - Free Software Foundation</title>
+<link rel="canonical"
+ href="http://www.fsf.org/blogs/rms/assigning-copyright"; />
+<!--#include virtual="/philosophy/po/assigning-copyright.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>When a Company Asks For Your Copyright</h2>
+
+<p>Companies that develop free software and release it under the GNU GPL
+sometimes distribute some copies of the code in other ways. If they
+distribute the exact same code under a different license to certain
+users that pay for this, typically permitting including the code in
+proprietary programs, we call it “selling exceptions”. If they
+distribute some version of the code solely in a proprietary manner, we
+call that releasing a purely proprietary version of the program.</p>
+
+<p><a
href="http://www.gnu.org/philosophy/selling-exceptions.html";>http://www.gnu.org/philosophy/selling-exceptions.html</a>
explains why
+selling exceptions is acceptable, though only barely. By contrast,
+releasing a purely proprietary version is outright wrong, like
+any other proprietary software.</p>
+
+<p>Companies normally sell exceptions using code they themselves have
+developed. Since they hold the copyright on that code, they can
+legally distribute it in any manner, even in multiple manners in
+parallel. But what happens when you publish a modified version of
+that free program, and the company wants to include your changes in
+its version?</p>
+
+<p>Since you got the program under the GPL, when you distribute a
+modified version you have to license it under the GPL. If the company
+receives a copy, it will be able to use those changes under the GPL;
+it won't be allowed to include your changes in that program and sell
+exceptions for it. It also won't be able to release purely
+proprietary versions containing your code. If this is the outcome you
+want, you get it by default. However, if the company intends to sell
+exceptions, it will probably decide not to use your changes.</p>
+
+<p>Suppose, though, that you're not opposed to selling exceptions and
+you're willing to let the company do so while including your changes
+in the program. You can agree to this, but you need to be careful
+about what you sign, or you may be surprised by the results.</p>
+
+<p>The company will probably invite you to assign or license your
+copyright to the company. That in itself is not inherently bad; for
+instance, many GNU software developers have assigned copyrights
+to the FSF. However, the FSF never sells exceptions, and its
+assignment contracts include a commitment to distribute the
+contributor's code only with source and only permitting
+redistribution.</p>
+
+<p>The company's proposed contract may not include such a commitment. It
+might instead let the company use your changes any way it likes. If
+you sign that, the company could do various things with your code. It
+could keep selling exceptions for a program including your code. It
+could release purely proprietary modified or extended versions
+including your code. It could even include your code <em>only</em> in
+proprietary versions. Your contribution of code could turn out to be,
+in effect, a donation to proprietary software.</p>
+
+<p>It is up to you which of these activities to permit, but here are the
+FSF's recommendations. If you plan to make major contributions to the
+project, insist that the contribution agreement require that software
+versions including your contributions be available to the public under
+a free software license. This will allow the developer to sell
+exceptions, but prevent it from using your contributions in software
+that is only available under a proprietary license.</p>
+
+<p>If your contributions are smaller, you could accept a weaker
+condition, that the company make your contributions available in a
+free software release as well as possibly in nonfree programs.
+This would allow the company to use your contributions in
+modified software that's only available under a proprietary license.
+Releasing proprietary software is never a good thing, but if your
+changes are smaller, it might be more important to improve the free
+version than resist the nonfree versions.</p>
+
+<p>You can control these outcomes by insisting on the proper conditions
+in the contract. To allow selling exceptions for the program that
+contains your code, but refuse to let the company release purely
+proprietary versions containing your code, you can insist on a
+condition more or less like this:</p>
+
+<blockquote>
+ <p>Any program based on (as defined in GNU General Public License
+ version 3) Hacker's code that FOO distributes shall be made
+ available by FOO under a) the “GNU General Public License (GPL),
+ version 2 or later”, or b) the licensing in (a), above, but with
“2”
+ replaced by any higher existing GPL version number. Provided FOO
+ makes the program available as source code gratis to the public in
+ this way, it may also distribute the identical program to some of
+ its users under terms permitting them to link the program's code
+ with nonfree code and release the combination in binary form under a
+ license of their own choosing.</p>
+</blockquote>
+
+<p>Or, if what you object to is that some variant <em>of your code</em>
+might be released solely in a proprietary version, you can insist on a
+condition more or less like this:</p>
+
+<blockquote>
+ <p>Any program based on (as defined in GNU General Public License
+ version 3) Hacker's code that FOO distributes shall be made
+ available by FOO under a) the “GNU General Public License (GPL),
+ version 2 or later”, or b) the licensing in (a), above, but with
“2”
+ replaced by any higher existing GPL version number. Provided FOO
+ makes the program available as source code gratis to the public in
+ this way, it may also distribute the same version of Hacker's code
+ in other programs released under other licenses of its own choosing.</p>
+</blockquote>
+
+<p>If the program is released under the GNU Affero GPL, then add
“Affero”
+before “General”, change “GPL” to “AGPL”,
change “2 or” to “3 or”, and
+it could make sense to replace “that FOO distributes” with
“that FOO
+distributes, or deploys on a server accessible to users other than
+FOO”.</p>
+
+<p>The FSF has had these texts reviewed by a lawyer, but you should get
+your own legal advice before using them.</p>
+
+<p>When a company says which of these conditions it will accept, that
+will show you how far it plans to depart from the principles of free
+software. Then you can respond to ensure your work will contribute to
+the free software community and not be diverted into proprietary
+software.</p>
+
+</div>
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden";><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><address@hidden></a>.
+</p>
+
+<p>Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+
+<p>Copyright © 2010 Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.
+</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2013/06/28 11:30:40 $
+<!-- timestamp end -->
+</p>
+</div>
+
+</div>
+</body>
+</html>