[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www distros/po/common-distros.ar.po distros/po/...
|
From: |
GNUN |
|
Subject: |
www distros/po/common-distros.ar.po distros/po/... |
|
Date: |
Thu, 28 May 2015 17:29:33 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/05/28 17:29:33
Modified files:
distros/po : common-distros.ar.po common-distros.de.po
common-distros.es.po common-distros.fr.po
common-distros.hr-diff.html
common-distros.hr.po common-distros.it.po
common-distros.ja.po common-distros.pl.po
common-distros.pot
common-distros.pt-br-diff.html
common-distros.pt-br.po
common-distros.ro-diff.html
common-distros.ro.po common-distros.ru.po
common-distros.translist common-distros.uk.po
philosophy/po : copyright-versus-community.fr.po
copyright-versus-community.pl.po
copyright-versus-community.pot
copyright-versus-community.ru.po
words-to-avoid.ar-diff.html
words-to-avoid.ar.po words-to-avoid.de.po
words-to-avoid.es.po words-to-avoid.fr.po
words-to-avoid.it.po words-to-avoid.ja.po
words-to-avoid.pot words-to-avoid.ru.po
words-to-avoid.sq.po words-to-avoid.sr.po
words-to-avoid.tr.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ar.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.de.po?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.es.po?cvsroot=www&r1=1.98&r2=1.99
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.fr.po?cvsroot=www&r1=1.109&r2=1.110
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.hr-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.hr.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.it.po?cvsroot=www&r1=1.95&r2=1.96
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ja.po?cvsroot=www&r1=1.75&r2=1.76
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pl.po?cvsroot=www&r1=1.102&r2=1.103
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pot?cvsroot=www&r1=1.63&r2=1.64
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pt-br-diff.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pt-br.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ro-diff.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ro.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ru.po?cvsroot=www&r1=1.110&r2=1.111
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.translist?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.uk.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/copyright-versus-community.fr.po?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/copyright-versus-community.pl.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/copyright-versus-community.pot?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/copyright-versus-community.ru.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ar-diff.html?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ar.po?cvsroot=www&r1=1.80&r2=1.81
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.de.po?cvsroot=www&r1=1.119&r2=1.120
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.es.po?cvsroot=www&r1=1.187&r2=1.188
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.fr.po?cvsroot=www&r1=1.192&r2=1.193
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.it.po?cvsroot=www&r1=1.153&r2=1.154
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja.po?cvsroot=www&r1=1.94&r2=1.95
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.pot?cvsroot=www&r1=1.92&r2=1.93
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.117&r2=1.118
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sq.po?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sr.po?cvsroot=www&r1=1.100&r2=1.101
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.tr.po?cvsroot=www&r1=1.73&r2=1.74
Patches:
Index: distros/po/common-distros.ar.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ar.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- distros/po/common-distros.ar.po 1 May 2015 07:03:52 -0000 1.4
+++ distros/po/common-distros.ar.po 28 May 2015 17:29:26 -0000 1.5
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2015-02-04 21:24+0100\n"
"Last-Translator: faycal <address@hidden>\n"
"Language-Team: Arabic <>\n"
@@ -410,14 +410,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"تØظر سÙاسة اÙعÙاÙ
Ø© اÙتجارÙØ© ï»·ÙبÙت٠إعادة
اÙتÙزÙع اÙتجارÙØ© ÙÙÙسخ اÙÙ
طابÙØ© "
-"ï»·ÙبÙتÙØ Ù
ÙتÙÙØ© بذÙÙ ØÙا٠أساسÙاÙ."
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -444,6 +436,28 @@
"Ùذا اÙبرÙاÙ
ج اÙدعائ٠ÙØ´ÙÙ ÙاØدة Ù
Ù
اÙØاÙات اÙشاذة اÙت٠Ùصر ÙÙÙا Ù
Ø·Ùر "
"اÙبرÙ
جÙات اÙØرة عÙ٠اÙØÙاظ عÙÙ Ù
Ùزة خبÙثة
ÙÙ Ùسخة برÙاÙ
جÙ."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "تÙزÙعات أخرÙ"
@@ -606,10 +620,15 @@
"Foundation, Inc."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Ùذا اÙÙ
ÙصÙÙÙÙ Ù
رخص بÙ
Ùجب <a rel=\"license\"
href=\"http://creativecommons.org/";
"licenses/by-nd/3.0/us/deed.ar\">رخصة اÙÙ
شاع اÙإبداع٠Ùسب
اÙÙ
صÙÙ - Ù
Ùع "
@@ -625,6 +644,13 @@
msgid "Updated:"
msgstr "تØدÙØ«:"
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "تØظر سÙاسة اÙعÙاÙ
Ø© اÙتجارÙØ© ï»·ÙبÙتÙ
إعادة اÙتÙزÙع اÙتجارÙØ© ÙÙÙسخ اÙÙ
طابÙØ© "
+#~ "ï»·ÙبÙتÙØ Ù
ÙتÙÙØ© بذÙÙ ØÙا٠أساسÙاÙ."
+
#~ msgid "Here we discuss some systems that are not GNU/Linux."
#~ msgstr "سÙÙ Ùتطر٠ÙÙا Ø¥Ù٠بعض اÙتÙزÙعات اÙتÙ
Ùا تÙتÙ
٠إÙ٠غÙÙ/ÙÙÙÙس."
Index: distros/po/common-distros.de.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.de.po,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- distros/po/common-distros.de.po 4 May 2015 13:29:24 -0000 1.89
+++ distros/po/common-distros.de.po 28 May 2015 17:29:26 -0000 1.90
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2015-05-01 22:00+0200\n"
"Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
#. type: Content of: <title>
msgid ""
@@ -421,15 +422,6 @@
"enthält die in Ubuntu aufgenommene Version des Betriebssystemkerns Linux "
"Firmware-BLOBs."
-#. type: Content of: <p>
-msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"Ubuntus Markenzeichen-Richtlinie verbietet die kommerzielle "
-"Weiterverbreitung exakter Kopien von Ubuntu, verleugnet also eine wichtige "
-"Freiheit."
-
# ##Translation deviating slightly (for non-IT experts)
# Ubuntu [ab 12.10] überträgt standardmäÃig jeden eingegebenen Suchbegriff
# [zusammen mit der IP-Adresse des Rechners per HTTPS] an einen
Canonical-Server
@@ -468,6 +460,28 @@
"Freie-Software-Entwickler weiterhin darauf beharrt, eine böswillige Funktion
"
"in seiner Version eines Programms zu behalten."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Einige andere Distributionen"
@@ -663,10 +677,20 @@
msgstr "Copyright © <ins>2009-</ins>2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
@@ -685,6 +709,14 @@
msgid "Updated:"
msgstr "Aktualisierung:"
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "Ubuntus Markenzeichen-Richtlinie verbietet die kommerzielle "
+#~ "Weiterverbreitung exakter Kopien von Ubuntu, verleugnet also eine "
+#~ "wichtige Freiheit."
+
#~ msgid "Here we discuss some systems that are not GNU/Linux."
#~ msgstr "Hier behandeln wir einige Systeme, die nicht GNU/Linux sind."
Index: distros/po/common-distros.es.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.es.po,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- distros/po/common-distros.es.po 2 May 2015 09:21:00 -0000 1.98
+++ distros/po/common-distros.es.po 28 May 2015 17:29:26 -0000 1.99
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: common-distros.es.html\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-02 11:19+0300\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2015-05-02 10:58+0100\n"
"Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
"Language-Team: Spanish <address@hidden>\n"
@@ -19,6 +19,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
"X-Poedit-Language: Spanish\n"
"X-Poedit-SourceCharset: utf-8\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
@@ -472,14 +473,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"La polÃtica sobre la marca registrada de Ubuntu prohÃbe la redistribución "
-"comercial de copias exactas de Ubuntu, negando una importante libertad."
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -509,6 +502,28 @@
"raros casos en que un programador de software libre persiste en conservar "
"una funcionalidad maligna en una versión de un programa."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Otras distribuciones"
@@ -683,10 +698,20 @@
msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Esta página está bajo una <a rel=\"license\" href=\"http://creativecommons.";
"org/licenses/by-nd/3.0/us/deed.es\">licencia Creative Commons Atribución-"
@@ -704,6 +729,13 @@
msgid "Updated:"
msgstr "Ãltima actualización:"
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "La polÃtica sobre la marca registrada de Ubuntu prohÃbe la
redistribución "
+#~ "comercial de copias exactas de Ubuntu, negando una importante libertad."
+
#~ msgid "Here we discuss some systems that are not GNU/Linux."
#~ msgstr ""
#~ "A continuación nos referiremos a algunos sistemas que no son GNU/Linux."
Index: distros/po/common-distros.fr.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.fr.po,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- distros/po/common-distros.fr.po 3 May 2015 08:41:35 -0000 1.109
+++ distros/po/common-distros.fr.po 28 May 2015 17:29:27 -0000 1.110
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2015-05-03 10:19+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
"Plural-Forms: \n"
"X-Generator: Gtranslator 2.91.5\n"
@@ -433,15 +434,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"Les conditions d'utilisation de la marque Ubuntu interdisent la "
-"redistribution commerciale de copies exactes d'Ubuntu, refusant ainsi une "
-"liberté importante à l'utilisateur."
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -471,6 +463,28 @@
"persiste à garder une fonctionnalité malveillante dans sa version d'un "
"programme."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Quelques autres distributions"
@@ -639,10 +653,20 @@
msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Cette page peut être utilisée suivant les conditions de la licence <a rel="
"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";
@@ -660,3 +684,11 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "Les conditions d'utilisation de la marque Ubuntu interdisent la "
+#~ "redistribution commerciale de copies exactes d'Ubuntu, refusant ainsi une "
+#~ "liberté importante à l'utilisateur."
Index: distros/po/common-distros.hr-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.hr-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- distros/po/common-distros.hr-diff.html 19 May 2015 06:00:29 -0000
1.5
+++ distros/po/common-distros.hr-diff.html 28 May 2015 17:29:27 -0000
1.6
@@ -204,11 +204,11 @@
Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
<p>
-Ubuntu's trademark policy prohibits commercial redistribution of exact
+<span class="removed"><del><strong>Ubuntu's trademark policy prohibits
commercial redistribution of exact
copies of Ubuntu, denying an important freedom.
</p>
-<p>
+<p></strong></del></span>
As of October 2012, Ubuntu
<a
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law">
sends personal data about users' searches</a> to a server belonging to
@@ -222,6 +222,23 @@
developer persists in keeping a malicious feature in its version of a
program.</p>
+<span class="inserted"><ins><em><p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
+to permit commercial redistribution of exact copies with the
+trademarks</a>; removal of the trademarks is required only for
+modified versions. That is an acceptable policy for trademarks. The
+same page, further down, makes a vague and ominous statement about
+“Ubuntu patents,” without giving enough details to show
+whether that constitutes aggression or not.</p>
+
+<p>That page spreads confusion by using the misleading
+term <a href="/philosophy/not-ipr.html">"intellectual property
+rights"</a>, which falsely presumes that trademark law and patent law
+and several other laws belong in one single conceptual framework. Use
+of that term is harmful, without exception, so after making a
+reference to someone else's use of the term, we should always reject
+it. However, that is not a substantive issue about Ubuntu as a
+GNU/Linux distribution.</p></em></ins></span>
+
<h2>Some Other Distros</h2>
<p>Here we discuss some <span
class="removed"><del><strong>systems</strong></del></span> <span
class="inserted"><ins><em>well-known or significant non-GNU/Linux system
@@ -304,7 +321,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -322,14 +339,15 @@
<p>Copyright © <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/05/19 06:00:29 $
+$Date: 2015/05/28 17:29:27 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/common-distros.hr.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.hr.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- distros/po/common-distros.hr.po 1 May 2015 07:03:59 -0000 1.25
+++ distros/po/common-distros.hr.po 28 May 2015 17:29:27 -0000 1.26
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2014-04-10 23:22+0100\n"
"Last-Translator: Martina Bebek <address@hidden>\n"
"Language-Team: GNU Croatian Translation Team <address@hidden>\n"
@@ -427,14 +427,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"Ubuntuova politika oko zaštitnih znakova zabranjuje komercijalnu "
-"redistribuciju toÄne kopije Ubuntua, time osporavajuÄi važnu slobodu."
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -462,6 +454,28 @@
"razvijatelj slobodnog softvera ustraje u Äuvanju maliciozne znaÄajke u "
"svojoj inaÄici programa."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Neke druge distribucije"
@@ -624,10 +638,20 @@
msgstr "Copyright © 2010, 2013 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Ovo djelo je dano na korištenje pod licencom <a rel=\"license\" href="
"\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.hr\";> Creative "
@@ -643,6 +667,13 @@
msgid "Updated:"
msgstr "Vrijeme zadnje izmjene:"
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "Ubuntuova politika oko zaštitnih znakova zabranjuje komercijalnu "
+#~ "redistribuciju toÄne kopije Ubuntua, time osporavajuÄi važnu slobodu."
+
#~ msgid "Here we discuss some systems that are not GNU/Linux."
#~ msgstr "Ovdje raspravljamo o nekim sustavima koji nisu GNU/Linux."
Index: distros/po/common-distros.it.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.it.po,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- distros/po/common-distros.it.po 3 May 2015 15:27:16 -0000 1.95
+++ distros/po/common-distros.it.po 28 May 2015 17:29:27 -0000 1.96
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2015-05-03 17:10+0100\n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: Italian\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Content of: <title>
@@ -422,14 +423,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"La politica sui marchi di Ubuntu impedisce la redistribuzione commerciale di "
-"copie esatte di Ubuntu, negando così una importante libertà ."
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -457,6 +450,28 @@
"software libero persiste nel voler mantenere una funzionalità malevola nella
"
"sua versione di un programma."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Alcune altre distribuzioni"
@@ -623,10 +638,20 @@
msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Questa pagina è distribuita secondo i termini della licenza <a rel=\"license"
"\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.it";
@@ -645,6 +670,13 @@
msgid "Updated:"
msgstr "Ultimo aggiornamento:"
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "La politica sui marchi di Ubuntu impedisce la redistribuzione commerciale "
+#~ "di copie esatte di Ubuntu, negando così una importante libertà ."
+
#~ msgid "Here we discuss some systems that are not GNU/Linux."
#~ msgstr ""
#~ "Qui parliamo di alcuni sistemi che non rientrano nella categoria GNU/"
Index: distros/po/common-distros.ja.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ja.po,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- distros/po/common-distros.ja.po 7 May 2015 01:28:13 -0000 1.75
+++ distros/po/common-distros.ja.po 28 May 2015 17:29:27 -0000 1.76
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2015-05-07 09:53+0900\n"
"Last-Translator: NIIBE Yutaka <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
#. type: Content of: <title>
msgid ""
@@ -419,14 +420,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"Ubuntuã®åæ¨ããªã·ã¼ã¯Ubuntuã®ãã®ã¾ã¾ã®ã³ãã¼ã®åç¨åé
å¸ãç¦æ¢ãã¾ãããã"
-"ã¯éè¦ãªèªç±ãå¦å®ãã¦ãã¾ãã"
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -452,6 +445,28 @@
"ãã®ã¢ãã¦ã§ã¢ã¯èªç±ã½ããã¦ã§ã¢ã®éçºè
ããããããã°ã©ã ã®æ¹é ã«æªæããæ©"
"è½ãæããããã¨ã«å·çããã¾ããªã±ã¼ã¹ã®ä¸ã¤ã§ãã"
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "ãã®ã»ãã®ãã£ã¹ãã"
@@ -610,10 +625,15 @@
msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"ãã®ãã¼ã¸ã¯<a rel=\"license\"
href=\"http://creativecommons.org/licenses/by-";
"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
@@ -628,3 +648,10 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "æçµæ´æ°:"
+
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~
"Ubuntuã®åæ¨ããªã·ã¼ã¯Ubuntuã®ãã®ã¾ã¾ã®ã³ãã¼ã®åç¨åé
å¸ãç¦æ¢ãã¾ããã"
+#~ "ãã¯éè¦ãªèªç±ãå¦å®ãã¦ãã¾ãã"
Index: distros/po/common-distros.pl.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pl.po,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- distros/po/common-distros.pl.po 9 May 2015 21:07:01 -0000 1.102
+++ distros/po/common-distros.pl.po 28 May 2015 17:29:27 -0000 1.103
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: common-distros.html\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2015-05-09 14:47-0600\n"
"Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -17,6 +17,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Virtaal 0.7.1\n"
@@ -437,15 +438,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"Znak towarowy Ubuntu i jego polityka zakazujÄ
komercyjnego "
-"rozpowszechniania dokÅadnych kopii Ubuntu, zaprzeczajÄ
c tym samym ważnej "
-"wolnoÅci."
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -473,6 +465,28 @@
"deweloper wolnego oprogramowania utrzymuje niepożÄ
danÄ
cechÄ w jego "
"wersji programu."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Kilka pozostaÅych dystrybucji"
@@ -639,10 +653,20 @@
msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Ten utwór objÄty jest licencjÄ
Creative Commons Uznanie autorstwa-Bez "
"utworów zależnych 3.0 Stany Zjednoczone. Aby zobaczyÄ kopiÄ
niniejszej "
@@ -663,3 +687,11 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Aktualizowane:"
+
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "Znak towarowy Ubuntu i jego polityka zakazujÄ
komercyjnego "
+#~ "rozpowszechniania dokÅadnych kopii Ubuntu, zaprzeczajÄ
c tym samym
ważnej "
+#~ "wolnoÅci."
Index: distros/po/common-distros.pot
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pot,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- distros/po/common-distros.pot 30 Apr 2015 21:25:49 -0000 1.63
+++ distros/po/common-distros.pot 28 May 2015 17:29:28 -0000 1.64
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+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"
@@ -304,12 +304,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a "
"href=\"http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law\";>
"
"sends personal data about users' searches</a> to a server belonging to "
@@ -326,6 +320,28 @@
"persists in keeping a malicious feature in its version of a program."
msgstr ""
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a "
+"href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu\";>appears
"
+"to permit commercial redistribution of exact copies with the trademarks</a>; "
+"removal of the trademarks is required only for modified versions. That is "
+"an acceptable policy for trademarks. The same page, further down, makes a "
+"vague and ominous statement about “Ubuntu patents,” without "
+"giving enough details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a "
+"href=\"/philosophy/not-ipr.html\">\"intellectual property rights\"</a>, "
+"which falsely presumes that trademark law and patent law and several other "
+"laws belong in one single conceptual framework. Use of that term is "
+"harmful, without exception, so after making a reference to someone else's "
+"use of the term, we should always reject it. However, that is not a "
+"substantive issue about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr ""
@@ -452,8 +468,8 @@
#. type: Content of: <div><p>
msgid ""
"This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Attribution-NoDerivs 3.0 United States License</a>."
+"href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons "
+"Attribution-NoDerivatives 4.0 International License</a>."
msgstr ""
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
Index: distros/po/common-distros.pt-br-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pt-br-diff.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- distros/po/common-distros.pt-br-diff.html 19 May 2015 06:00:29 -0000
1.18
+++ distros/po/common-distros.pt-br-diff.html 28 May 2015 17:29:28 -0000
1.19
@@ -205,11 +205,11 @@
Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
<p>
-Ubuntu's trademark policy prohibits commercial redistribution of exact
+<span class="removed"><del><strong>Ubuntu's trademark policy prohibits
commercial redistribution of exact
copies of Ubuntu, denying an important freedom.
</p>
-<p>
+<p></strong></del></span>
As of October 2012, Ubuntu
<a
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law">
sends personal data about users' searches</a> to a server belonging to
@@ -223,6 +223,23 @@
developer persists in keeping a malicious feature in its version of a
program.</p>
+<span class="inserted"><ins><em><p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
+to permit commercial redistribution of exact copies with the
+trademarks</a>; removal of the trademarks is required only for
+modified versions. That is an acceptable policy for trademarks. The
+same page, further down, makes a vague and ominous statement about
+“Ubuntu patents,” without giving enough details to show
+whether that constitutes aggression or not.</p>
+
+<p>That page spreads confusion by using the misleading
+term <a href="/philosophy/not-ipr.html">"intellectual property
+rights"</a>, which falsely presumes that trademark law and patent law
+and several other laws belong in one single conceptual framework. Use
+of that term is harmful, without exception, so after making a
+reference to someone else's use of the term, we should always reject
+it. However, that is not a substantive issue about Ubuntu as a
+GNU/Linux distribution.</p></em></ins></span>
+
<h2>Some Other Distros</h2>
<p>Here we discuss some <span
class="removed"><del><strong>systems</strong></del></span> <span
class="inserted"><ins><em>well-known or significant non-GNU/Linux system
@@ -305,7 +322,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -323,8 +340,9 @@
<p>Copyright © <span
class="removed"><del><strong>2011</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
@@ -332,7 +350,7 @@
<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
<!-- timestamp start -->
-$Date: 2015/05/19 06:00:29 $
+$Date: 2015/05/28 17:29:28 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/common-distros.pt-br.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pt-br.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- distros/po/common-distros.pt-br.po 1 May 2015 07:04:00 -0000 1.22
+++ distros/po/common-distros.pt-br.po 28 May 2015 17:29:28 -0000 1.23
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2012-11-26 19:31-0200\n"
"Last-Translator: Rafael Beraldo <address@hidden>\n"
"Language-Team: Brazilian Portuguese <address@hidden>\n"
@@ -426,14 +426,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"A polÃtica da marca registrada do Ubuntu proÃbe a redistribuição
comercial "
-"de cópias exatas do Ubuntu, negando uma liberdade importante."
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -461,6 +453,28 @@
"Esse adware é uma das raras ocasiões na qual um desenvolvedor de software "
"livre persiste em manter funções maliciosas nas versões de um programa."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Algumas Outras Distros"
@@ -617,10 +631,15 @@
msgstr "Copyright © 2011, 2012 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Esta página está licenciada sob uma licença <a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/deed.pt_BR\">Creative Commons "
@@ -640,6 +659,13 @@
msgid "Updated:"
msgstr "Ãltima atualização: "
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "A polÃtica da marca registrada do Ubuntu proÃbe a redistribuição "
+#~ "comercial de cópias exatas do Ubuntu, negando uma liberdade importante."
+
#~ msgid "Here we discuss some systems that are not GNU/Linux."
#~ msgstr "Aqui discutimos alguns outros sistemas que não são o GNU/Linux."
Index: distros/po/common-distros.ro-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ro-diff.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- distros/po/common-distros.ro-diff.html 19 May 2015 06:00:29 -0000
1.14
+++ distros/po/common-distros.ro-diff.html 28 May 2015 17:29:28 -0000
1.15
@@ -204,11 +204,11 @@
Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
<p>
-Ubuntu's trademark policy prohibits commercial redistribution of exact
+<span class="removed"><del><strong>Ubuntu's trademark policy prohibits
commercial redistribution of exact
copies of Ubuntu, denying an important freedom.
</p>
-<p>
+<p></strong></del></span>
As of October 2012, Ubuntu
<a
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law">
sends personal data about users' searches</a> to a server belonging to
@@ -222,6 +222,23 @@
developer persists in keeping a malicious feature in its version of a
program.</p>
+<span class="inserted"><ins><em><p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
+to permit commercial redistribution of exact copies with the
+trademarks</a>; removal of the trademarks is required only for
+modified versions. That is an acceptable policy for trademarks. The
+same page, further down, makes a vague and ominous statement about
+“Ubuntu patents,” without giving enough details to show
+whether that constitutes aggression or not.</p>
+
+<p>That page spreads confusion by using the misleading
+term <a href="/philosophy/not-ipr.html">"intellectual property
+rights"</a>, which falsely presumes that trademark law and patent law
+and several other laws belong in one single conceptual framework. Use
+of that term is harmful, without exception, so after making a
+reference to someone else's use of the term, we should always reject
+it. However, that is not a substantive issue about Ubuntu as a
+GNU/Linux distribution.</p></em></ins></span>
+
<h2>Some Other Distros</h2>
<p>Here we discuss some <span
class="removed"><del><strong>systems</strong></del></span> <span
class="inserted"><ins><em>well-known or significant non-GNU/Linux system
@@ -304,7 +321,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -322,8 +339,9 @@
<p>Copyright © <span
class="removed"><del><strong>2011</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
@@ -331,7 +349,7 @@
<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
<!-- timestamp start -->
-$Date: 2015/05/19 06:00:29 $
+$Date: 2015/05/28 17:29:28 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/common-distros.ro.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ro.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- distros/po/common-distros.ro.po 1 May 2015 07:04:00 -0000 1.22
+++ distros/po/common-distros.ro.po 28 May 2015 17:29:28 -0000 1.23
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2013-12-11 12:59+0200\n"
"Last-Translator: Tiberiu C. Turbureanu <address@hidden>\n"
"Language-Team: Romanian <address@hidden>\n"
@@ -427,14 +427,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"Politica mÄrcii comerciale a lui Ubuntu interzice redistribuÈia comercialÄ
a "
-"copiilor exacte de Ubuntu, negând astfel o libertate importantÄ."
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -463,6 +455,28 @@
"dezvoltator de programe libere continuÄ sÄ pÄstreze o funcÈionalitate "
"maliÈioasÄ Ã®n versiunea sa de program."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "Câteva alte distribuÈii"
@@ -618,10 +632,15 @@
msgstr "Copyright © 2010, 2013 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"AceastÄ paginÄ este licenÈiatÄ sub licenÈa <a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Atribuire - "
@@ -639,6 +658,14 @@
msgid "Updated:"
msgstr "Actualizat la:"
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "Politica mÄrcii comerciale a lui Ubuntu interzice redistribuÈia "
+#~ "comercialÄ a copiilor exacte de Ubuntu, negând astfel o libertate "
+#~ "importantÄ."
+
#~ msgid "Here we discuss some systems that are not GNU/Linux."
#~ msgstr "Aici discutÄm despre unele sisteme care nu sunt GNU+Linux."
Index: distros/po/common-distros.ru.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ru.po,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- distros/po/common-distros.ru.po 1 May 2015 18:13:42 -0000 1.110
+++ distros/po/common-distros.ru.po 28 May 2015 17:29:28 -0000 1.111
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2015-05-01 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -463,14 +464,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"ÐолиÑика ÑоваÑнÑÑ
знаков Ubuntu запÑеÑаеÑ
коммеÑÑеÑкое пеÑеÑаÑпÑоÑÑÑанение "
-"ÑоÑнÑÑ
копий Ubuntu, оÑказÑÐ²Ð°Ñ Ñем ÑамÑм в
важной Ñвободе."
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -499,6 +492,28 @@
"ÑазÑабоÑÑик ÑвободнÑÑ
пÑогÑамм ÑпоÑно ÑоÑ
ÑанÑÐµÑ Ð²ÑедоноÑнÑÑ Ð¾ÑобенноÑÑÑ "
"в Ñвоей веÑÑии пÑогÑаммÑ."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "ÐекоÑоÑÑе дÑÑгие диÑÑÑибÑÑивÑ"
@@ -669,10 +684,20 @@
msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"ÐÑо пÑоизведение доÑÑÑпно по <a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/deed.ru\">лиÑензии Creative
"
@@ -694,5 +719,13 @@
msgid "Updated:"
msgstr "Ðбновлено:"
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "ÐолиÑика ÑоваÑнÑÑ
знаков Ubuntu запÑеÑаеÑ
коммеÑÑеÑкое "
+#~ "пеÑеÑаÑпÑоÑÑÑанение ÑоÑнÑÑ
копий Ubuntu,
оÑказÑÐ²Ð°Ñ Ñем ÑамÑм в важной "
+#~ "Ñвободе."
+
#~ msgid "Here we discuss some systems that are not GNU/Linux."
#~ msgstr "ÐдеÑÑ Ð¾Ð±ÑÑждаÑÑÑÑ Ð½ÐµÐºÐ¾ÑоÑÑе
ÑиÑÑемÑ, не ÑвлÑÑÑиеÑÑ GNU/Linux"
Index: distros/po/common-distros.translist
===================================================================
RCS file: /web/www/www/distros/po/common-distros.translist,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- distros/po/common-distros.translist 19 May 2015 06:00:30 -0000 1.17
+++ distros/po/common-distros.translist 28 May 2015 17:29:28 -0000 1.18
@@ -17,7 +17,7 @@
<span dir="ltr"><a lang="uk" hreflang="uk"
href="/distros/common-distros.uk.html">ÑкÑаÑнÑÑка</a> [uk]</span>
</p>
</div>' -->
-<link rel="alternate" type="text/html" href="/distros/common-distros.html "
hreflang="x-default" />
+<link rel="alternate" type="text/html" href="/distros/common-distros.html"
hreflang="x-default" />
<link rel="alternate" type="text/html" lang="en" hreflang="en"
href="/distros/common-distros.en.html" title="English" />
<link rel="alternate" type="text/html" lang="ar" hreflang="ar"
href="/distros/common-distros.ar.html" title="اÙعربÙØ©" />
<link rel="alternate" type="text/html" lang="de" hreflang="de"
href="/distros/common-distros.de.html" title="Deutsch" />
Index: distros/po/common-distros.uk.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.uk.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- distros/po/common-distros.uk.po 2 May 2015 12:28:29 -0000 1.25
+++ distros/po/common-distros.uk.po 28 May 2015 17:29:28 -0000 1.26
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2015-04-30 21:25+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2015-05-02 14:44+0300\n"
"Last-Translator: Andriy Bandura <address@hidden>\n"
"Language-Team: Ukrainian <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -420,15 +421,6 @@
#. type: Content of: <p>
msgid ""
-"Ubuntu's trademark policy prohibits commercial redistribution of exact "
-"copies of Ubuntu, denying an important freedom."
-msgstr ""
-"ÐолÑÑика ÑоваÑниÑ
знакÑв Ubuntu забоÑонÑÑ
комеÑÑÑйне ÑозповÑÑÐ´Ð¶ÐµÐ½Ð½Ñ ÑоÑниÑ
"
-"копÑй Ubuntu, Ñим Ñамим вона вÑдмовлÑÑ
коÑиÑÑÑваÑам Ñ Ð²Ð°Ð¶Ð»Ð¸Ð²Ð¾Ð¼Ñ ÐµÐ»ÐµÐ¼ÐµÐ½ÑÑ "
-"Ñвободи."
-
-#. type: Content of: <p>
-msgid ""
"As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/does-";
"ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
"searches</a> to a server belonging to Canonical, which sends back ads to buy "
@@ -455,6 +447,28 @@
"Ð¦Ñ ÑÐµÐºÐ»Ð°Ð¼Ð½Ñ Ð¿ÑогÑами - один з ÑÑдкÑÑниÑ
випадкÑв, коли ÑозÑобник вÑлÑниÑ
"
"пÑогÑам впеÑÑо збеÑÑÐ³Ð°Ñ ÑкÑдливÑ
оÑобливÑÑÑÑ Ñ ÑвоÑй веÑÑÑÑ Ð¿ÑогÑами."
+#. type: Content of: <p>
+msgid ""
+"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
+"property-policy#your-use-of-ubuntu\">appears to permit commercial "
+"redistribution of exact copies with the trademarks</a>; removal of the "
+"trademarks is required only for modified versions. That is an acceptable "
+"policy for trademarks. The same page, further down, makes a vague and "
+"ominous statement about “Ubuntu patents,” without giving enough "
+"details to show whether that constitutes aggression or not."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That page spreads confusion by using the misleading term <a href=\"/"
+"philosophy/not-ipr.html\">\"intellectual property rights\"</a>, which "
+"falsely presumes that trademark law and patent law and several other laws "
+"belong in one single conceptual framework. Use of that term is harmful, "
+"without exception, so after making a reference to someone else's use of the "
+"term, we should always reject it. However, that is not a substantive issue "
+"about Ubuntu as a GNU/Linux distribution."
+msgstr ""
+
#. type: Content of: <h2>
msgid "Some Other Distros"
msgstr "ÐеÑÐºÑ ÑнÑÑ Ð´Ð¸ÑÑÑибÑÑиви"
@@ -620,10 +634,15 @@
"Copyright © 2014, 2015 Фонд вÑлÑного пÑогÑамного
забезпеÑеннÑ, Inc."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/deed.uk\"> лÑÑензÑÑ
Creative "
@@ -641,6 +660,14 @@
msgid "Updated:"
msgstr "Ðновлено:"
+#~ msgid ""
+#~ "Ubuntu's trademark policy prohibits commercial redistribution of exact "
+#~ "copies of Ubuntu, denying an important freedom."
+#~ msgstr ""
+#~ "ÐолÑÑика ÑоваÑниÑ
знакÑв Ubuntu забоÑонÑÑ
комеÑÑÑйне ÑозповÑÑÐ´Ð¶ÐµÐ½Ð½Ñ "
+#~ "ÑоÑниÑ
копÑй Ubuntu, Ñим Ñамим вона
вÑдмовлÑÑ ÐºÐ¾ÑиÑÑÑваÑам Ñ Ð²Ð°Ð¶Ð»Ð¸Ð²Ð¾Ð¼Ñ "
+#~ "елеменÑÑ Ñвободи."
+
#~ msgid "Here we discuss some systems that are not GNU/Linux."
#~ msgstr "ТÑÑ Ð¾Ð±Ð³Ð¾Ð²Ð¾ÑÑÑÑÑÑÑ Ð´ÐµÑÐºÑ ÑиÑÑеми, Ñо
не вÑдноÑÑÑÑÑÑ Ð´Ð¾ GNU/Linux."
Index: philosophy/po/copyright-versus-community.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/copyright-versus-community.fr.po,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- philosophy/po/copyright-versus-community.fr.po 19 Apr 2014 12:21:56
-0000 1.50
+++ philosophy/po/copyright-versus-community.fr.po 28 May 2015 17:29:29
-0000 1.51
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: copyright-versus-community.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2014-04-19 13:57+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
"Plural-Forms: \n"
"X-Generator: Gtranslator 2.91.5\n"
@@ -1860,15 +1861,35 @@
"qui continue à être un système de copyright, je propose deux autres
méthodes."
#. type: Content of: <dl><dd><p>
-msgid ""
-"One is taxes—distribute tax money directly to artists. This could be "
-"a special tax, perhaps on Internet connectivity, or it could come from "
-"general revenue, because it won't be that much money in total, not if it's "
-"distributed in an efficient way. To distribute it efficiently to promote "
-"the arts means not in linear proportion to popularity. It should be based "
-"on popularity, because we don't want bureaucrats to have the discretion to "
-"decide which artists to support and which to ignore, but based on popularity "
-"does not imply linear proportion."
+# | [-One is taxes—distribute-]{+<a id=\"tax-money-for-artists\">One
+# | [works via] taxes</a>—distribute+} tax money directly to artists.
+# | This could be a special tax, perhaps on Internet connectivity, or it could
+# | come from general revenue, because it won't be that much money in total,
+# | not if it's distributed in an efficient way. To distribute it efficiently
+# | to promote the arts means not in linear proportion to popularity. It
+# | should be based on popularity, because we don't want bureaucrats to have
+# | the discretion to decide which artists to support and which to ignore, but
+# | based on popularity does not imply linear proportion.
+#, fuzzy
+#| msgid ""
+#| "One is taxes—distribute tax money directly to artists. This could "
+#| "be a special tax, perhaps on Internet connectivity, or it could come from "
+#| "general revenue, because it won't be that much money in total, not if "
+#| "it's distributed in an efficient way. To distribute it efficiently to "
+#| "promote the arts means not in linear proportion to popularity. It should "
+#| "be based on popularity, because we don't want bureaucrats to have the "
+#| "discretion to decide which artists to support and which to ignore, but "
+#| "based on popularity does not imply linear proportion."
+msgid ""
+"<a id=\"tax-money-for-artists\">One [works via] taxes</a>—distribute "
+"tax money directly to artists. This could be a special tax, perhaps on "
+"Internet connectivity, or it could come from general revenue, because it "
+"won't be that much money in total, not if it's distributed in an efficient "
+"way. To distribute it efficiently to promote the arts means not in linear "
+"proportion to popularity. It should be based on popularity, because we "
+"don't want bureaucrats to have the discretion to decide which artists to "
+"support and which to ignore, but based on popularity does not imply linear "
+"proportion."
msgstr ""
"La première est l'argent public : distribuer directement la recette d'une "
"taxe aux artistes. L'argent pourrait provenir d'une taxe spéciale,
peut-être "
@@ -2249,14 +2270,30 @@
"README.translations.html\">guide de traduction</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2001, 2007, 2009, 2014 Free Software Foundation, Inc."
+# | Copyright © 2001, 2007, 2009, [-2014-] {+2014, 2015+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2001, 2007, 2009, 2014 Free Software Foundation, Inc."
+msgid ""
+"Copyright © 2001, 2007, 2009, 2014, 2015 Free Software Foundation, Inc."
msgstr "Copyright © 2001, 2007, 2009, 2014 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Cette page peut être utilisée suivant les conditions de la licence <a rel="
"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";
Index: philosophy/po/copyright-versus-community.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/copyright-versus-community.pl.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/po/copyright-versus-community.pl.po 29 Apr 2014 04:31:59
-0000 1.21
+++ philosophy/po/copyright-versus-community.pl.po 28 May 2015 17:29:30
-0000 1.22
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: copyright-versus-community.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2014-04-28 22:06-0600\n"
"Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Virtaal 0.7.0\n"
@@ -1874,15 +1875,35 @@
"inne metody."
#. type: Content of: <dl><dd><p>
-msgid ""
-"One is taxes—distribute tax money directly to artists. This could be "
-"a special tax, perhaps on Internet connectivity, or it could come from "
-"general revenue, because it won't be that much money in total, not if it's "
-"distributed in an efficient way. To distribute it efficiently to promote "
-"the arts means not in linear proportion to popularity. It should be based "
-"on popularity, because we don't want bureaucrats to have the discretion to "
-"decide which artists to support and which to ignore, but based on popularity "
-"does not imply linear proportion."
+# | [-One is taxes—distribute-]{+<a id=\"tax-money-for-artists\">One
+# | [works via] taxes</a>—distribute+} tax money directly to artists.
+# | This could be a special tax, perhaps on Internet connectivity, or it could
+# | come from general revenue, because it won't be that much money in total,
+# | not if it's distributed in an efficient way. To distribute it efficiently
+# | to promote the arts means not in linear proportion to popularity. It
+# | should be based on popularity, because we don't want bureaucrats to have
+# | the discretion to decide which artists to support and which to ignore, but
+# | based on popularity does not imply linear proportion.
+#, fuzzy
+#| msgid ""
+#| "One is taxes—distribute tax money directly to artists. This could "
+#| "be a special tax, perhaps on Internet connectivity, or it could come from "
+#| "general revenue, because it won't be that much money in total, not if "
+#| "it's distributed in an efficient way. To distribute it efficiently to "
+#| "promote the arts means not in linear proportion to popularity. It should "
+#| "be based on popularity, because we don't want bureaucrats to have the "
+#| "discretion to decide which artists to support and which to ignore, but "
+#| "based on popularity does not imply linear proportion."
+msgid ""
+"<a id=\"tax-money-for-artists\">One [works via] taxes</a>—distribute "
+"tax money directly to artists. This could be a special tax, perhaps on "
+"Internet connectivity, or it could come from general revenue, because it "
+"won't be that much money in total, not if it's distributed in an efficient "
+"way. To distribute it efficiently to promote the arts means not in linear "
+"proportion to popularity. It should be based on popularity, because we "
+"don't want bureaucrats to have the discretion to decide which artists to "
+"support and which to ignore, but based on popularity does not imply linear "
+"proportion."
msgstr ""
"PierwszÄ
sÄ
podatki – rozpowszechnianie pieniÄdzy
z podatków "
"wprost do artystów. MógÅby to byÄ specjalny podatek, prawdopodobnie "
@@ -2237,14 +2258,30 @@
"translations.html\">tÅumaczeÅ</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2001, 2007, 2009, 2014 Free Software Foundation, Inc."
+# | Copyright © 2001, 2007, 2009, [-2014-] {+2014, 2015+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2001, 2007, 2009, 2014 Free Software Foundation, Inc."
+msgid ""
+"Copyright © 2001, 2007, 2009, 2014, 2015 Free Software Foundation, Inc."
msgstr "Copyright © 2001, 2007, 2009, 2014 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Ten utwór objÄty jest licencjÄ
Creative Commons Uznanie autorstwa-Bez "
"utworów zależnych 3.0 Stany Zjednoczone. Aby zobaczyÄ kopiÄ
niniejszej "
Index: philosophy/po/copyright-versus-community.pot
===================================================================
RCS file: /web/www/www/philosophy/po/copyright-versus-community.pot,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/copyright-versus-community.pot 5 Apr 2014 00:42:15
-0000 1.20
+++ philosophy/po/copyright-versus-community.pot 28 May 2015 17:29:30
-0000 1.21
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: copyright-versus-community.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+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"
@@ -1168,14 +1168,15 @@
#. type: Content of: <dl><dd><p>
msgid ""
-"One is taxes—distribute tax money directly to artists. This could be "
-"a special tax, perhaps on Internet connectivity, or it could come from "
-"general revenue, because it won't be that much money in total, not if it's "
-"distributed in an efficient way. To distribute it efficiently to promote "
-"the arts means not in linear proportion to popularity. It should be based "
-"on popularity, because we don't want bureaucrats to have the discretion to "
-"decide which artists to support and which to ignore, but based on popularity "
-"does not imply linear proportion."
+"<a id=\"tax-money-for-artists\">One [works via] taxes</a>—distribute "
+"tax money directly to artists. This could be a special tax, perhaps on "
+"Internet connectivity, or it could come from general revenue, because it "
+"won't be that much money in total, not if it's distributed in an efficient "
+"way. To distribute it efficiently to promote the arts means not in linear "
+"proportion to popularity. It should be based on popularity, because we "
+"don't want bureaucrats to have the discretion to decide which artists to "
+"support and which to ignore, but based on popularity does not imply linear "
+"proportion."
msgstr ""
#. type: Content of: <dl><dd><p>
@@ -1398,14 +1399,14 @@
msgstr ""
#. type: Content of: <div><p>
-msgid "Copyright © 2001, 2007, 2009, 2014 Free Software Foundation, Inc."
+msgid "Copyright © 2001, 2007, 2009, 2014, 2015 Free Software Foundation,
Inc."
msgstr ""
#. type: Content of: <div><p>
msgid ""
"This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Attribution-NoDerivs 3.0 United States License</a>."
+"href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons "
+"Attribution-NoDerivatives 4.0 International License</a>."
msgstr ""
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
Index: philosophy/po/copyright-versus-community.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/copyright-versus-community.ru.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/copyright-versus-community.ru.po 5 Apr 2014 05:47:35
-0000 1.9
+++ philosophy/po/copyright-versus-community.ru.po 28 May 2015 17:29:30
-0000 1.10
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: copyright-versus-community.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-05-28 17:26+0000\n"
"PO-Revision-Date: 2014-04-05 17:51+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:26+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1848,15 +1849,35 @@
"меÑода."
#. type: Content of: <dl><dd><p>
-msgid ""
-"One is taxes—distribute tax money directly to artists. This could be "
-"a special tax, perhaps on Internet connectivity, or it could come from "
-"general revenue, because it won't be that much money in total, not if it's "
-"distributed in an efficient way. To distribute it efficiently to promote "
-"the arts means not in linear proportion to popularity. It should be based "
-"on popularity, because we don't want bureaucrats to have the discretion to "
-"decide which artists to support and which to ignore, but based on popularity "
-"does not imply linear proportion."
+# | [-One is taxes—distribute-]{+<a id=\"tax-money-for-artists\">One
+# | [works via] taxes</a>—distribute+} tax money directly to artists.
+# | This could be a special tax, perhaps on Internet connectivity, or it could
+# | come from general revenue, because it won't be that much money in total,
+# | not if it's distributed in an efficient way. To distribute it efficiently
+# | to promote the arts means not in linear proportion to popularity. It
+# | should be based on popularity, because we don't want bureaucrats to have
+# | the discretion to decide which artists to support and which to ignore, but
+# | based on popularity does not imply linear proportion.
+#, fuzzy
+#| msgid ""
+#| "One is taxes—distribute tax money directly to artists. This could "
+#| "be a special tax, perhaps on Internet connectivity, or it could come from "
+#| "general revenue, because it won't be that much money in total, not if "
+#| "it's distributed in an efficient way. To distribute it efficiently to "
+#| "promote the arts means not in linear proportion to popularity. It should "
+#| "be based on popularity, because we don't want bureaucrats to have the "
+#| "discretion to decide which artists to support and which to ignore, but "
+#| "based on popularity does not imply linear proportion."
+msgid ""
+"<a id=\"tax-money-for-artists\">One [works via] taxes</a>—distribute "
+"tax money directly to artists. This could be a special tax, perhaps on "
+"Internet connectivity, or it could come from general revenue, because it "
+"won't be that much money in total, not if it's distributed in an efficient "
+"way. To distribute it efficiently to promote the arts means not in linear "
+"proportion to popularity. It should be based on popularity, because we "
+"don't want bureaucrats to have the discretion to decide which artists to "
+"support and which to ignore, but based on popularity does not imply linear "
+"proportion."
msgstr ""
"Ðдин меÑод — ÑÑо налоги:
ÑаÑпÑеделÑÑÑ ÑобÑаннÑе денÑги "
"непоÑÑедÑÑвенно Ð¼ÐµÐ¶Ð´Ñ Ð´ÐµÑÑелÑми
иÑкÑÑÑÑва. ÐÑо мог Ð±Ñ Ð±ÑÑÑ Ð¾ÑобÑй налог, "
@@ -2226,15 +2247,31 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-msgid "Copyright © 2001, 2007, 2009, 2014 Free Software Foundation, Inc."
+# | Copyright © 2001, 2007, 2009, [-2014-] {+2014, 2015+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2001, 2007, 2009, 2014 Free Software Foundation, Inc."
+msgid ""
+"Copyright © 2001, 2007, 2009, 2014, 2015 Free Software Foundation, Inc."
msgstr ""
"Copyright © 2001, 2007, 2009, 2012, 2014 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"ÐÑо пÑоизведение доÑÑÑпно по <a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/deed.ru\">лиÑензии Creative
"
Index: philosophy/po/words-to-avoid.ar-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ar-diff.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- philosophy/po/words-to-avoid.ar-diff.html 28 Mar 2015 16:57:39 -0000
1.52
+++ philosophy/po/words-to-avoid.ar-diff.html 28 May 2015 17:29:30 -0000
1.53
@@ -348,8 +348,9 @@
“Consume” refers to what we do with food: we ingest it, and use it
in
a way that uses it up. By analogy, we employ the same word to describe
using other things in a way that uses them up. However, it is
-erroneous to speak of “consuming” <span
class="removed"><del><strong>digital</strong></del></span> information, music,
<span class="inserted"><ins><em>books,</em></ins></span>
-software, etc., since using them does not <span
class="removed"><del><strong>consume them. See</strong></del></span> <span
class="inserted"><ins><em>use them up.</p>
+erroneous to <span class="removed"><del><strong>speak of
“consuming” digital information, music,
+software, etc., since using them does not consume them.
See</strong></del></span> <span class="inserted"><ins><em>speak of
“consuming” information, music, books,
+software, etc., since using them does not use them up.</p>
<p>Why is this perverse usage spreading? Some may feel that they
sound sophisticated using a fashionable term from economics. However,
@@ -496,13 +497,17 @@
<p>
Locks are not necessarily <span class="removed"><del><strong>an
injustice.</strong></del></span> <span class="inserted"><ins><em>oppressive or
bad.</em></ins></span> You probably own several
locks, and their keys or codes as well; you may find them useful or
-troublesome, but <span class="removed"><del><strong>either
way</strong></del></span> they don't oppress you, because you <span
class="removed"><del><strong>can</strong></del></span> <span
class="inserted"><ins><em>are in a position
-to</em></ins></span> open and close them.</p>
+troublesome, but <span class="removed"><del><strong>either
way</strong></del></span> they don't oppress you, because you <span
class="removed"><del><strong>can
+open and close them.</p></strong></del></span> <span
class="inserted"><ins><em>can open and
+close them. Likewise, we
+find <a
href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-">encryption</a>
+invaluable for protecting our digital files. That too is a kind
+of digital lock that you have control over.</p></em></ins></span>
<p>
DRM is like a lock placed on you by someone else, who refuses to give
you the key—in other words, like <span
class="removed"><del><strong>handcuffs.</strong></del></span> <span
class="inserted"><ins><em><em>handcuffs</em>.</em></ins></span>
Therefore,
-<span class="removed"><del><strong>we call</strong></del></span>
-<span class="inserted"><ins><em>the clear way to refer to</em></ins></span>
them <span class="inserted"><ins><em>is</em></ins></span> “digital <span
class="removed"><del><strong>handcuffs”,</strong></del></span> <span
class="inserted"><ins><em>handcuffs,”</em></ins></span> not
+<span class="removed"><del><strong>we call them</strong></del></span>
+<span class="inserted"><ins><em>the proper metaphor for DRM
is</em></ins></span> “digital <span
class="removed"><del><strong>handcuffs”,</strong></del></span> <span
class="inserted"><ins><em>handcuffs,”</em></ins></span> not
“digital
<span
class="removed"><del><strong>locks”.</p></strong></del></span>
<span class="inserted"><ins><em>locks.”</p></em></ins></span>
<p>
@@ -1101,7 +1106,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -1120,9 +1125,10 @@
2008, 2009, 2010, 2011, <span
class="removed"><del><strong>2012</strong></del></span> <span
class="inserted"><ins><em>2012, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States <span
class="removed"><del><strong>License</a>.
-</p></strong></del></span> <span
class="inserted"><ins><em>License</a>.</p></em></ins></span>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States License</a>.
+</p></strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 International
License</a>.</p></em></ins></span>
<!--#include virtual="/server/bottom-notes.html" -->
@@ -1130,7 +1136,7 @@
<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
<!-- timestamp start -->
-$Date: 2015/03/28 16:57:39 $
+$Date: 2015/05/28 17:29:30 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/words-to-avoid.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ar.po,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- philosophy/po/words-to-avoid.ar.po 28 Mar 2015 16:57:39 -0000 1.80
+++ philosophy/po/words-to-avoid.ar.po 28 May 2015 17:29:30 -0000 1.81
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-03-28 16:55+0000\n"
+"POT-Creation-Date: 2015-05-28 17:27+0000\n"
"PO-Revision-Date: 2013-01-16 14:00+0200\n"
"Last-Translator: Rafik E. Younan <address@hidden>\n"
"Language-Team: Arabic <>\n"
@@ -983,8 +983,12 @@
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a href=\"http://www.theguardian.com/";
+"technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
+"good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
+"digital files. That too is a kind of digital lock that you have control "
+"over."
msgstr ""
"اÙÙÙÙد ÙÙست باÙضررÙرة جائرة. Ù
٠اÙÙ
ØتÙ
٠أÙ
تÙ
تÙ٠بضعة ÙÙÙØ¯Ø Ù
ع Ù
ÙاتÙØÙÙ
Ø£Ù "
"Ø£ÙÙادÙÙ
Ø£ÙضاÙØ Ø±Ø¨Ù
ا تجد ÙÙÙÙ
Ø¥Ùادة أ٠سبب
Ø¥Ø²Ø¹Ø§Ø¬Ø ÙÙÙ ÙÙ ÙÙتا اÙØاÙتÙÙ Ùا "
@@ -998,9 +1002,9 @@
#| "“digital handcuffs”, not “digital locks”."
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not “"
+"digital locks.”"
msgstr ""
"إدارة اÙÙÙÙد اÙرÙÙ
ÙØ© DRM Ù
ث٠اÙÙÙد اÙÙ
ÙضÙع
بÙاسطة Ø¢Ø®Ø±Ø ÙÙرÙض Ø£Ù ÙعطÙÙ "
"اÙÙ
ÙØªØ§Ø - بÙÙÙ
ات أخرÙØ Ù
ث٠اÙأصÙاد. ÙØ°ÙÙ
ÙدعÙÙÙ
” اÙأصÙاد اÙرÙÙ
ÙØ© "
@@ -2160,10 +2164,15 @@
"2010Ø 2009,2010, 2011, 2012 Ù
ؤسسة اÙبرÙ
جÙات اÙØØ±Ø©Ø Ø§ÙÙ
ØدÙدة."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Ùذا اÙÙ
ÙصÙÙÙÙ Ù
رخص بÙ
Ùجب <a rel=\"license\"
href=\"http://creativecommons.org/";
"licenses/by-nd/3.0/us/deed.ar\">رخصة اÙÙ
شاع اÙإبداع٠Ùسب
اÙÙ
صÙÙ - Ù
Ùع "
Index: philosophy/po/words-to-avoid.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.de.po,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- philosophy/po/words-to-avoid.de.po 22 Apr 2015 17:31:27 -0000 1.119
+++ philosophy/po/words-to-avoid.de.po 28 May 2015 17:29:30 -0000 1.120
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-03-28 16:55+0000\n"
+"POT-Creation-Date: 2015-05-28 17:27+0000\n"
"PO-Revision-Date: 2015-04-04 22:00+0200\n"
"Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:27+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1007,11 +1008,28 @@
"übernahmen, durchdachten ihn nicht."
#. type: Content of: <p>
+# | Locks are not necessarily oppressive or bad. You probably own several
+# | locks, and their keys or codes as well; you may find them useful or
+# | troublesome, but they don't oppress you, because you [-are in a position
+# | to-] {+can+} open and close them. {+Likewise, we find <a
+# |
href=\"http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\";>encryption</a>
+# | invaluable for protecting our digital files. That too is a kind of
+# | digital lock that you have control over.+}
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad. You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you are in a position to "
+#| "open and close them."
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a href=\"http://www.theguardian.com/";
+"technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
+"good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
+"digital files. That too is a kind of digital lock that you have control "
+"over."
msgstr ""
"Schlösser sind nicht notwendigerweise repressiv oder schlecht. <ins>Auch </"
"ins>Sie besitzen wahrscheinlich mehrere Schlösser, wahrscheinlich auch deren
"
@@ -1020,11 +1038,21 @@
"verschlieÃen."
#. type: Content of: <p>
+# | DRM is like a lock placed on you by someone else, who refuses to give you
+# | the key—in other words, like <em>handcuffs</em>. Therefore, the
+# | [-clear way to refer to them-] {+proper metaphor for DRM+} is
+# | “digital handcuffs,” not “digital locks.”
+#, fuzzy
+#| msgid ""
+#| "DRM is like a lock placed on you by someone else, who refuses to give you "
+#| "the key—in other words, like <em>handcuffs</em>. Therefore, the "
+#| "clear way to refer to them is “digital handcuffs,” not “"
+#| "digital locks.”"
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not “"
+"digital locks.”"
msgstr ""
"DRM ist wie ein von jemand anderem auferlegtes Schloss, der sich weigert "
"einen den Schlüssel zu geben ‑ mit anderen Worten: wie "
@@ -2296,10 +2324,20 @@
"Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
Index: philosophy/po/words-to-avoid.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.es.po,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- philosophy/po/words-to-avoid.es.po 16 Apr 2015 18:44:14 -0000 1.187
+++ philosophy/po/words-to-avoid.es.po 28 May 2015 17:29:31 -0000 1.188
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-16 20:32+0300\n"
+"POT-Creation-Date: 2015-05-28 17:27+0000\n"
"PO-Revision-Date: 2015-04-16 20:31+0100\n"
"Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
"Language-Team: Spanish <address@hidden>\n"
@@ -23,6 +23,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:27+0000\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Poedit-Language: Spanish\n"
@@ -951,22 +952,49 @@
"reflexionado lo suficiente."
#. type: Content of: <p>
+# | Locks are not necessarily oppressive or bad. You probably own several
+# | locks, and their keys or codes as well; you may find them useful or
+# | troublesome, but they don't oppress you, because you [-are in a position
+# | to-] {+can+} open and close them. {+Likewise, we find <a
+# |
href=\"http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\";>encryption</a>
+# | invaluable for protecting our digital files. That too is a kind of
+# | digital lock that you have control over.+}
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad. You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you are in a position to "
+#| "open and close them."
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a href=\"http://www.theguardian.com/";
+"technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
+"good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
+"digital files. That too is a kind of digital lock that you have control "
+"over."
msgstr ""
"Los candados no son necesariamente opresivos o malignos. Es probable que "
"poseamos varios, con sus correspondientes llaves o las claves. Pueden ser "
"útiles o molestos, pero no nos oprimen, pues podemos abrirlos y cerrarlos."
#. type: Content of: <p>
+# | DRM is like a lock placed on you by someone else, who refuses to give you
+# | the key—in other words, like <em>handcuffs</em>. Therefore, the
+# | [-clear way to refer to them-] {+proper metaphor for DRM+} is
+# | “digital handcuffs,” not “digital locks.”
+#, fuzzy
+#| msgid ""
+#| "DRM is like a lock placed on you by someone else, who refuses to give you "
+#| "the key—in other words, like <em>handcuffs</em>. Therefore, the "
+#| "clear way to refer to them is “digital handcuffs,” not “"
+#| "digital locks.”"
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not “"
+"digital locks.”"
msgstr ""
"El DRM es como un candado que alguien nos pone, negándose a darnos la llave;
"
"en otras palabras, es como unas <em>esposas</em>. Por tanto, la expresión "
@@ -2202,10 +2230,20 @@
"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Esta página está bajo una <a rel=\"license\" href=\"http://creativecommons.";
"org/licenses/by-nd/3.0/us/deed.es\">licencia Creative Commons Atribución-"
Index: philosophy/po/words-to-avoid.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.fr.po,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -b -r1.192 -r1.193
--- philosophy/po/words-to-avoid.fr.po 17 May 2015 17:21:15 -0000 1.192
+++ philosophy/po/words-to-avoid.fr.po 28 May 2015 17:29:31 -0000 1.193
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-03-28 16:55+0000\n"
+"POT-Creation-Date: 2015-05-28 17:27+0000\n"
"PO-Revision-Date: 2015-05-17 19:18+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:27+0000\n"
"Plural-Forms: \n"
"X-Generator: Gtranslator 2.91.5\n"
@@ -887,11 +888,28 @@
"ont pas bien réfléchi."
#. type: Content of: <p>
+# | Locks are not necessarily oppressive or bad. You probably own several
+# | locks, and their keys or codes as well; you may find them useful or
+# | troublesome, but they don't oppress you, because you [-are in a position
+# | to-] {+can+} open and close them. {+Likewise, we find <a
+# |
href=\"http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\";>encryption</a>
+# | invaluable for protecting our digital files. That too is a kind of
+# | digital lock that you have control over.+}
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad. You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you are in a position to "
+#| "open and close them."
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a href=\"http://www.theguardian.com/";
+"technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
+"good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
+"digital files. That too is a kind of digital lock that you have control "
+"over."
msgstr ""
"Les verrous, de même que les serrures, ne sont pas nécessairement
oppressifs "
"ni mauvais. Vous en possédez probablement plusieurs, ainsi que leurs clés
ou "
@@ -900,11 +918,21 @@
"fermer."
#. type: Content of: <p>
+# | DRM is like a lock placed on you by someone else, who refuses to give you
+# | the key—in other words, like <em>handcuffs</em>. Therefore, the
+# | [-clear way to refer to them-] {+proper metaphor for DRM+} is
+# | “digital handcuffs,” not “digital locks.”
+#, fuzzy
+#| msgid ""
+#| "DRM is like a lock placed on you by someone else, who refuses to give you "
+#| "the key—in other words, like <em>handcuffs</em>. Therefore, the "
+#| "clear way to refer to them is “digital handcuffs,” not “"
+#| "digital locks.”"
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not “"
+"digital locks.”"
msgstr ""
"Un dispositif de DRM est comme un verrou (une serrure) placé(e) sur vous par
"
"une autre personne qui refuse de vous en donner la clé, autrement dit comme "
@@ -2068,10 +2096,20 @@
"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Cette page peut être utilisée suivant les conditions de la licence <a rel="
"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";
Index: philosophy/po/words-to-avoid.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.it.po,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- philosophy/po/words-to-avoid.it.po 1 Apr 2015 21:58:38 -0000 1.153
+++ philosophy/po/words-to-avoid.it.po 28 May 2015 17:29:31 -0000 1.154
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-03-28 16:55+0000\n"
+"POT-Creation-Date: 2015-05-28 17:27+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: \n"
@@ -17,6 +17,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:27+0000\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Content of: <title>
@@ -863,11 +864,28 @@
"abbastanza."
#. type: Content of: <p>
+# | Locks are not necessarily oppressive or bad. You probably own several
+# | locks, and their keys or codes as well; you may find them useful or
+# | troublesome, but they don't oppress you, because you [-are in a position
+# | to-] {+can+} open and close them. {+Likewise, we find <a
+# |
href=\"http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\";>encryption</a>
+# | invaluable for protecting our digital files. That too is a kind of
+# | digital lock that you have control over.+}
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad. You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you are in a position to "
+#| "open and close them."
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a href=\"http://www.theguardian.com/";
+"technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
+"good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
+"digital files. That too is a kind of digital lock that you have control "
+"over."
msgstr ""
"I lucchetti non sono necessariamente sbagliati o opprimenti. Tutti "
"probabilmente possediamo lucchetti, e le corrispondenti chiavi o codici; che "
@@ -875,11 +893,21 @@
"aprire e chiudere."
#. type: Content of: <p>
+# | DRM is like a lock placed on you by someone else, who refuses to give you
+# | the key—in other words, like <em>handcuffs</em>. Therefore, the
+# | [-clear way to refer to them-] {+proper metaphor for DRM+} is
+# | “digital handcuffs,” not “digital locks.”
+#, fuzzy
+#| msgid ""
+#| "DRM is like a lock placed on you by someone else, who refuses to give you "
+#| "the key—in other words, like <em>handcuffs</em>. Therefore, the "
+#| "clear way to refer to them is “digital handcuffs,” not “"
+#| "digital locks.”"
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not “"
+"digital locks.”"
msgstr ""
"La tecnologia DRM è invece un lucchetto messo a voi da qualcun altro che non
"
"vi dà la chiave: è più simile a delle <em>manette</em> che a un lucchetto.
"
@@ -2018,10 +2046,20 @@
"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Questa pagina è distribuita secondo i termini della licenza <a rel=\"license"
"\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.it";
Index: philosophy/po/words-to-avoid.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ja.po,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- philosophy/po/words-to-avoid.ja.po 30 Mar 2015 05:57:28 -0000 1.94
+++ philosophy/po/words-to-avoid.ja.po 28 May 2015 17:29:31 -0000 1.95
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-03-28 16:55+0000\n"
+"POT-Creation-Date: 2015-05-28 17:27+0000\n"
"PO-Revision-Date: 2015-03-30 14:10+0900\n"
"Last-Translator: NIIBE Yutaka <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:27+0000\n"
#. type: Content of: <title>
msgid ""
@@ -816,11 +817,21 @@
"ãã®ç¨èªãæ¡ç¨ãã人ã¯ãã®ããã«èããªãã§ãããã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad. You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you are in a position to "
+#| "open and close them."
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a href=\"http://www.theguardian.com/";
+"technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
+"good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
+"digital files. That too is a kind of digital lock that you have control "
+"over."
msgstr ""
"é ã¯å¿
ãããå§å¶çãããã¯æªã§ã¯ããã¾ãããããªãã¯ããããããã¤ãã®é
ã"
"æã£ã¦ãã®éµãçªå·ãåæ§ã«æã£ã¦ããã§ããããæç¨ã§ãã£ããåä»ã§ãã£ããã"
@@ -828,11 +839,17 @@
"ãããã®ã§ã¯ããã¾ããã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "DRM is like a lock placed on you by someone else, who refuses to give you "
+#| "the key—in other words, like <em>handcuffs</em>. Therefore, the "
+#| "clear way to refer to them is “digital handcuffs,” not “"
+#| "digital locks.”"
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not “"
+"digital locks.”"
msgstr ""
"DRMã¯ã»ãã®èª°ãã«ãã£ã¦ããªãã«ãããããé
ã®ãããªãã®ã§ããã®èª°ãã¯ãããªã"
"ã«éµãä¸ãããã¨ãæå¦ããã®ã§ããå¥ã®è¨èã§è¨ãã°ãããã¯<em>æé
</em>ã®ãã"
@@ -1920,10 +1937,15 @@
"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"ãã®ãã¼ã¸ã¯<a rel=\"license\"
href=\"http://creativecommons.org/licenses/by-";
"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
Index: philosophy/po/words-to-avoid.pot
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.pot,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- philosophy/po/words-to-avoid.pot 28 Mar 2015 16:57:40 -0000 1.92
+++ philosophy/po/words-to-avoid.pot 28 May 2015 17:29:31 -0000 1.93
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-03-28 16:55+0000\n"
+"POT-Creation-Date: 2015-05-28 17: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"
@@ -641,16 +641,19 @@
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a "
+"href=\"http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\";>encryption</a>
"
+"invaluable for protecting our digital files. That too is a kind of digital "
+"lock that you have control over."
msgstr ""
#. type: Content of: <p>
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not "
+"“digital locks.”"
msgstr ""
#. type: Content of: <p>
@@ -1434,8 +1437,8 @@
#. type: Content of: <div><p>
msgid ""
"This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Attribution-NoDerivs 3.0 United States License</a>."
+"href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons "
+"Attribution-NoDerivatives 4.0 International License</a>."
msgstr ""
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
Index: philosophy/po/words-to-avoid.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru.po,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- philosophy/po/words-to-avoid.ru.po 14 Apr 2015 13:05:20 -0000 1.117
+++ philosophy/po/words-to-avoid.ru.po 28 May 2015 17:29:32 -0000 1.118
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-03-28 16:55+0000\n"
+"POT-Creation-Date: 2015-05-28 17:27+0000\n"
"PO-Revision-Date: 2015-03-30 17:34+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-05-28 17:27+0000\n"
#. type: Content of: <title>
msgid ""
@@ -965,11 +966,28 @@
"ÑÑо вÑÑажение, не пÑодÑмали его."
#. type: Content of: <p>
+# | Locks are not necessarily oppressive or bad. You probably own several
+# | locks, and their keys or codes as well; you may find them useful or
+# | troublesome, but they don't oppress you, because you [-are in a position
+# | to-] {+can+} open and close them. {+Likewise, we find <a
+# |
href=\"http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\";>encryption</a>
+# | invaluable for protecting our digital files. That too is a kind of
+# | digital lock that you have control over.+}
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad. You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you are in a position to "
+#| "open and close them."
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a href=\"http://www.theguardian.com/";
+"technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
+"good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
+"digital files. That too is a kind of digital lock that you have control "
+"over."
msgstr ""
"Ðамки не обÑзаÑелÑно ознаÑаÑÑ ÑгнеÑение и
неÑпÑаведливоÑÑÑ. ÐÑ, веÑоÑÑно, "
"владееÑе неÑколÑкими замками, а Ñакже
клÑÑами или кодами к ним; Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе "
@@ -977,11 +995,21 @@
"поÑÐ¾Ð¼Ñ ÑÑо Ð²Ñ Ð²Ð¿Ñаве оÑпиÑаÑÑ Ð¸ запиÑаÑÑ
иÑ
."
#. type: Content of: <p>
+# | DRM is like a lock placed on you by someone else, who refuses to give you
+# | the key—in other words, like <em>handcuffs</em>. Therefore, the
+# | [-clear way to refer to them-] {+proper metaphor for DRM+} is
+# | “digital handcuffs,” not “digital locks.”
+#, fuzzy
+#| msgid ""
+#| "DRM is like a lock placed on you by someone else, who refuses to give you "
+#| "the key—in other words, like <em>handcuffs</em>. Therefore, the "
+#| "clear way to refer to them is “digital handcuffs,” not “"
+#| "digital locks.”"
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not “"
+"digital locks.”"
msgstr ""
"ЦиÑÑовое ÑпÑавление огÑаниÑениÑми поÑ
оже
на замок, поÑÑавленнÑй вам кем-Ñо "
"дÑÑгим, кÑо оÑказÑваеÑÑÑ Ð´Ð°ÑÑ Ð²Ð°Ð¼
клÑÑ — дÑÑгими Ñловами, поÑ
оже "
@@ -2201,10 +2229,20 @@
"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"ÐÑо пÑоизведение доÑÑÑпно по <a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/deed.ru\">лиÑензии Creative
"
Index: philosophy/po/words-to-avoid.sq.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sq.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- philosophy/po/words-to-avoid.sq.po 28 Mar 2015 16:57:40 -0000 1.46
+++ philosophy/po/words-to-avoid.sq.po 28 May 2015 17:29:32 -0000 1.47
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-03-28 16:55+0000\n"
+"POT-Creation-Date: 2015-05-28 17:27+0000\n"
"PO-Revision-Date: 2013-01-05 20:03+0200\n"
"Last-Translator: Besnik Bleta <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -646,16 +646,20 @@
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a href=\"http://www.theguardian.com/";
+"technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
+"good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
+"digital files. That too is a kind of digital lock that you have control "
+"over."
msgstr ""
#. type: Content of: <p>
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not “"
+"digital locks.”"
msgstr ""
#. type: Content of: <p>
@@ -1447,10 +1451,15 @@
"2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Kjo faqe mund të përdoret sipas një licence <a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
Index: philosophy/po/words-to-avoid.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sr.po,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- philosophy/po/words-to-avoid.sr.po 28 Mar 2015 16:57:41 -0000 1.100
+++ philosophy/po/words-to-avoid.sr.po 28 May 2015 17:29:32 -0000 1.101
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-03-28 16:55+0000\n"
+"POT-Creation-Date: 2015-05-28 17:27+0000\n"
"PO-Revision-Date: 2009-10-18 17:51+0200\n"
"Last-Translator: Strahinya Radich <address@hidden>\n"
"Language-Team: Serbian <address@hidden>\n"
@@ -944,16 +944,20 @@
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a href=\"http://www.theguardian.com/";
+"technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
+"good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
+"digital files. That too is a kind of digital lock that you have control "
+"over."
msgstr ""
#. type: Content of: <p>
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not “"
+"digital locks.”"
msgstr ""
#. type: Content of: <p>
@@ -2184,10 +2188,15 @@
"2002, 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Ðва ÑÑÑана Ñе лиÑенÑиÑана под ÑÑловима
лиÑенÑе <a rel=\"license\" href="
"\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.sr\";>Creative "
Index: philosophy/po/words-to-avoid.tr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.tr.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- philosophy/po/words-to-avoid.tr.po 28 Mar 2015 16:57:41 -0000 1.73
+++ philosophy/po/words-to-avoid.tr.po 28 May 2015 17:29:32 -0000 1.74
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-03-28 16:55+0000\n"
+"POT-Creation-Date: 2015-05-28 17:27+0000\n"
"PO-Revision-Date: 2010-01-25 16:11+0100\n"
"Last-Translator: Tahir Emre Kalaycı <address@hidden>\n"
"Language-Team: Turkish <address@hidden>\n"
@@ -941,16 +941,20 @@
msgid ""
"Locks are not necessarily oppressive or bad. You probably own several "
"locks, and their keys or codes as well; you may find them useful or "
-"troublesome, but they don't oppress you, because you are in a position to "
-"open and close them."
+"troublesome, but they don't oppress you, because you can open and close "
+"them. Likewise, we find <a href=\"http://www.theguardian.com/";
+"technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
+"good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
+"digital files. That too is a kind of digital lock that you have control "
+"over."
msgstr ""
#. type: Content of: <p>
msgid ""
"DRM is like a lock placed on you by someone else, who refuses to give you "
-"the key—in other words, like <em>handcuffs</em>. Therefore, the clear "
-"way to refer to them is “digital handcuffs,” not “digital "
-"locks.”"
+"the key—in other words, like <em>handcuffs</em>. Therefore, the "
+"proper metaphor for DRM is “digital handcuffs,” not “"
+"digital locks.”"
msgstr ""
#. type: Content of: <p>
@@ -2175,10 +2179,15 @@
"2009 Free Software Foundation, Inc."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
"Bu sayfa a <a rel=\"license\" href=\"http://creativecommons.org/licenses/by-";
"nd/3.0/us/deed.tr\">Creative Commons Attribution-NoDerivs 3.0 United States "