www-commits
[Top][All Lists]
Advanced

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

www licenses/po/javascript-labels.fr.po license...


From: GNUN
Subject: www licenses/po/javascript-labels.fr.po license...
Date: Mon, 05 Jan 2015 13:57:35 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/01/05 13:57:35

Modified files:
        licenses/po    : javascript-labels.fr.po javascript-labels.ja.po 
                         javascript-labels.ru.po 
        philosophy/po  : surveillance-vs-democracy.es.po 
                         surveillance-vs-democracy.fr.po 
                         surveillance-vs-democracy.it.po 
                         surveillance-vs-democracy.pot 
                         surveillance-vs-democracy.ru.po 
                         surveillance-vs-democracy.sq.po 
                         surveillance-vs-democracy.uk.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/licenses/po/javascript-labels.fr.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/javascript-labels.ja.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/javascript-labels.ru.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.es.po?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.fr.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.it.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.pot?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.ru.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.sq.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.uk.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ar-diff.html?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ar.po?cvsroot=www&r1=1.75&r2=1.76
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.de.po?cvsroot=www&r1=1.106&r2=1.107
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.es.po?cvsroot=www&r1=1.162&r2=1.163
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.fr.po?cvsroot=www&r1=1.182&r2=1.183
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.it.po?cvsroot=www&r1=1.142&r2=1.143
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja.po?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.pot?cvsroot=www&r1=1.87&r2=1.88
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.99&r2=1.100
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sq.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sr.po?cvsroot=www&r1=1.95&r2=1.96
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.tr.po?cvsroot=www&r1=1.66&r2=1.67

Patches:
Index: licenses/po/javascript-labels.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/javascript-labels.fr.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- licenses/po/javascript-labels.fr.po 5 Apr 2014 07:22:27 -0000       1.16
+++ licenses/po/javascript-labels.fr.po 5 Jan 2015 13:57:29 -0000       1.17
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: javascript-labels.html\n"
-"POT-Creation-Date: 2014-04-05 00:01+0000\n"
+"POT-Creation-Date: 2015-01-05 13:27+0000\n"
 "PO-Revision-Date: 2014-04-05 09:19+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-01-05 13:27+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -28,18 +29,38 @@
 msgstr "Étiquettes web de licence pour JavaScript"
 
 #. type: Content of: <p>
+# | If you are a webmaster deploying minified JavaScript on a site, here's a
+# | method for stating their licenses and source code locations without
+# | altering [-those files.-] {+the minified files themselves.+}  It's
+# | especially helpful in cases where the JavaScript is under one of the GNU
+# | licenses, but does not include the exception proposed in <a
+# | href=\"/philosophy/javascript-trap.html#AppendixA\"> Appendix A of
+# | &ldquo;The JavaScript Trap.&rdquo;</a> [-This method presents the
+# | information prominently enough to comply with the relevant conditions in
+# | the GNU software licenses, and it's specific enough that software can
+# | confirm the correctness of the information on a site.  For more
+# | explanation of why we designed this format, see the <a
+# | href=\"/licenses/javascript-labels-rationale.html\"> rationale</a>.-]
+#, fuzzy
+#| msgid ""
+#| "If you are a webmaster deploying minified JavaScript on a site, here's a "
+#| "method for stating their licenses and source code locations without "
+#| "altering those files.  It's especially helpful in cases where the "
+#| "JavaScript is under one of the GNU licenses, but does not include the "
+#| "exception proposed in <a href=\"/philosophy/javascript-trap.html#AppendixA"
+#| "\"> Appendix A of &ldquo;The JavaScript Trap.&rdquo;</a> This method "
+#| "presents the information prominently enough to comply with the relevant "
+#| "conditions in the GNU software licenses, and it's specific enough that "
+#| "software can confirm the correctness of the information on a site.  For "
+#| "more explanation of why we designed this format, see the <a href=\"/"
+#| "licenses/javascript-labels-rationale.html\"> rationale</a>."
 msgid ""
 "If you are a webmaster deploying minified JavaScript on a site, here's a "
 "method for stating their licenses and source code locations without altering "
-"those files.  It's especially helpful in cases where the JavaScript is under "
-"one of the GNU licenses, but does not include the exception proposed in <a "
-"href=\"/philosophy/javascript-trap.html#AppendixA\"> Appendix A of &ldquo;"
-"The JavaScript Trap.&rdquo;</a> This method presents the information "
-"prominently enough to comply with the relevant conditions in the GNU "
-"software licenses, and it's specific enough that software can confirm the "
-"correctness of the information on a site.  For more explanation of why we "
-"designed this format, see the <a href=\"/licenses/javascript-labels-"
-"rationale.html\"> rationale</a>."
+"the minified files themselves.  It's especially helpful in cases where the "
+"JavaScript is under one of the GNU licenses, but does not include the "
+"exception proposed in <a href=\"/philosophy/javascript-trap.html#AppendixA"
+"\"> Appendix A of &ldquo;The JavaScript Trap.&rdquo;</a>"
 msgstr ""
 "Si vous êtes webmestre et que vous déployez du JavaScript compacté sur un "
 "site, voici une méthode qui vous permettra d'étiqueter ces fichiers avec 
les "
@@ -55,11 +76,24 @@
 "\">document d'explication</a>."
 
 #. type: Content of: <p>
+# | The JavaScript license web labels method is meant for files of minified
+# | JavaScript code.  [-You can also use-]  {+This method complies with the
+# | relevant conditions in the GNU software licenses, and+} it [-for
+# | non-minified JavaScript source files if you wish; but if you're not
+# | aiming-] {+enables LibreJS+} to [-make-] {+confirm+} the [-files small,
+# | you might as well put a copy-] {+correctness+} of the [-license in the
+# | source file.-] {+information on a site.+}
+#, fuzzy
+#| msgid ""
+#| "The JavaScript license web labels method is meant for files of minified "
+#| "JavaScript code.  You can also use it for non-minified JavaScript source "
+#| "files if you wish; but if you're not aiming to make the files small, you "
+#| "might as well put a copy of the license in the source file."
 msgid ""
 "The JavaScript license web labels method is meant for files of minified "
-"JavaScript code.  You can also use it for non-minified JavaScript source "
-"files if you wish; but if you're not aiming to make the files small, you "
-"might as well put a copy of the license in the source file."
+"JavaScript code.  This method complies with the relevant conditions in the "
+"GNU software licenses, and it enables LibreJS to confirm the correctness of "
+"the information on a site."
 msgstr ""
 "La méthode des étiquettes web pour JavaScript est destinée aux fichiers de 
"
 "code JavaScript compacté. Vous pouvez aussi l'utiliser pour les fichiers "
@@ -68,7 +102,34 @@
 
 #. type: Content of: <p>
 msgid ""
-"The web label method is not applicable to inline JavaScript included "
+"Using web labels presumes that the corresponding JavaScript source files "
+"carry license notices that properly release them under a free license.  The "
+"compiled code isn't free unless its souce code is, and indicating the "
+"license is essential for proper release of free source code.  If you haven't "
+"done that, you should do that first."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"You can use web labels to machine-readably indicate the licenses of non-"
+"minified JavaScript files too; but these are source files, so please don't "
+"fail to give them human-readable license notices.  Omitting those creates "
+"uncertainty about their legal status."
+msgstr ""
+
+#. type: Content of: <p>
+# | The web label{+s+} method is not applicable to inline JavaScript included
+# | directly in HTML pages &mdash; their license information should be <a
+# | href=\"/philosophy/javascript-trap.html#AppendixA\"> stated directly in
+# | those pages</a>.
+#, fuzzy
+#| msgid ""
+#| "The web label method is not applicable to inline JavaScript included "
+#| "directly in HTML pages &mdash; their license information should be <a "
+#| "href=\"/philosophy/javascript-trap.html#AppendixA\"> stated directly in "
+#| "those pages</a>."
+msgid ""
+"The web labels method is not applicable to inline JavaScript included "
 "directly in HTML pages &mdash; their license information should be <a href="
 "\"/philosophy/javascript-trap.html#AppendixA\"> stated directly in those "
 "pages</a>."
@@ -78,6 +139,12 @@
 "licence doivent être donnés <a href=\"/philosophy/javascript-trap."
 "html#AppendixA\">directement sur ces pages</a>."
 
+#. type: Content of: <p>
+msgid ""
+"For more explanation of why we designed this format, see the <a href=\"/"
+"licenses/javascript-labels-rationale.html\">rationale</a>."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Writing the labels page"
 msgstr "Rédaction de la page d'étiquettes"
@@ -352,7 +419,10 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+# | Copyright &copy; 201[-4-]{+5+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>

Index: licenses/po/javascript-labels.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/javascript-labels.ja.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- licenses/po/javascript-labels.ja.po 28 Apr 2014 07:26:43 -0000      1.9
+++ licenses/po/javascript-labels.ja.po 5 Jan 2015 13:57:30 -0000       1.10
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: javascript-labels.html\n"
-"POT-Creation-Date: 2014-04-05 00:01+0000\n"
+"POT-Creation-Date: 2015-01-05 13:27+0000\n"
 "PO-Revision-Date: 2014-04-28 16:05+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-01-05 13:27+0000\n"
 
 #. type: Content of: <title>
 msgid "JavaScript License Web Labels - GNU Project - Free Software Foundation"
@@ -26,18 +27,26 @@
 msgstr "JavaScriptのライセンス・ウェブ・ラベル"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If you are a webmaster deploying minified JavaScript on a site, here's a "
+#| "method for stating their licenses and source code locations without "
+#| "altering those files.  It's especially helpful in cases where the "
+#| "JavaScript is under one of the GNU licenses, but does not include the "
+#| "exception proposed in <a href=\"/philosophy/javascript-trap.html#AppendixA"
+#| "\"> Appendix A of &ldquo;The JavaScript Trap.&rdquo;</a> This method "
+#| "presents the information prominently enough to comply with the relevant "
+#| "conditions in the GNU software licenses, and it's specific enough that "
+#| "software can confirm the correctness of the information on a site.  For "
+#| "more explanation of why we designed this format, see the <a href=\"/"
+#| "licenses/javascript-labels-rationale.html\"> rationale</a>."
 msgid ""
 "If you are a webmaster deploying minified JavaScript on a site, here's a "
 "method for stating their licenses and source code locations without altering "
-"those files.  It's especially helpful in cases where the JavaScript is under "
-"one of the GNU licenses, but does not include the exception proposed in <a "
-"href=\"/philosophy/javascript-trap.html#AppendixA\"> Appendix A of &ldquo;"
-"The JavaScript Trap.&rdquo;</a> This method presents the information "
-"prominently enough to comply with the relevant conditions in the GNU "
-"software licenses, and it's specific enough that software can confirm the "
-"correctness of the information on a site.  For more explanation of why we "
-"designed this format, see the <a href=\"/licenses/javascript-labels-"
-"rationale.html\"> rationale</a>."
+"the minified files themselves.  It's especially helpful in cases where the "
+"JavaScript is under one of the GNU licenses, but does not include the "
+"exception proposed in <a href=\"/philosophy/javascript-trap.html#AppendixA"
+"\"> Appendix A of &ldquo;The JavaScript Trap.&rdquo;</a>"
 msgstr ""
 "最小化したJavaScriptをサイトで採用するウェブマスタのå 
´åˆã¯ã€ãã†ã„ったファイ"
 
"ルを変更することなく、そのライセンスとソースコードの位置を示す方法を以下に示"
@@ -51,11 +60,17 @@
 "さい。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The JavaScript license web labels method is meant for files of minified "
+#| "JavaScript code.  You can also use it for non-minified JavaScript source "
+#| "files if you wish; but if you're not aiming to make the files small, you "
+#| "might as well put a copy of the license in the source file."
 msgid ""
 "The JavaScript license web labels method is meant for files of minified "
-"JavaScript code.  You can also use it for non-minified JavaScript source "
-"files if you wish; but if you're not aiming to make the files small, you "
-"might as well put a copy of the license in the source file."
+"JavaScript code.  This method complies with the relevant conditions in the "
+"GNU software licenses, and it enables LibreJS to confirm the correctness of "
+"the information on a site."
 msgstr ""
 
"JavaScriptのライセンス・ウェブ・ラベルの方法は最小化されたJavaScriptのコード"
 
"のファイルのためです。望むならば、最小化されていないJavaScriptソースファイル"
@@ -64,7 +79,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"The web label method is not applicable to inline JavaScript included "
+"Using web labels presumes that the corresponding JavaScript source files "
+"carry license notices that properly release them under a free license.  The "
+"compiled code isn't free unless its souce code is, and indicating the "
+"license is essential for proper release of free source code.  If you haven't "
+"done that, you should do that first."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"You can use web labels to machine-readably indicate the licenses of non-"
+"minified JavaScript files too; but these are source files, so please don't "
+"fail to give them human-readable license notices.  Omitting those creates "
+"uncertainty about their legal status."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The web label method is not applicable to inline JavaScript included "
+#| "directly in HTML pages &mdash; their license information should be <a "
+#| "href=\"/philosophy/javascript-trap.html#AppendixA\"> stated directly in "
+#| "those pages</a>."
+msgid ""
+"The web labels method is not applicable to inline JavaScript included "
 "directly in HTML pages &mdash; their license information should be <a href="
 "\"/philosophy/javascript-trap.html#AppendixA\"> stated directly in those "
 "pages</a>."
@@ -74,6 +112,12 @@
 
"javascript-trap.html#AppendixA\">そのページで直接述べられる</a>必
要がありま"
 "す。"
 
+#. type: Content of: <p>
+msgid ""
+"For more explanation of why we designed this format, see the <a href=\"/"
+"licenses/javascript-labels-rationale.html\">rationale</a>."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Writing the labels page"
 msgstr "ラベルのページを書く"
@@ -340,8 +384,10 @@
 "translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2012 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2012 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -363,9 +409,6 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
-#~ msgid "Copyright &copy; 2012 Free Software Foundation, Inc."
-#~ msgstr "Copyright &copy; 2012 Free Software Foundation, Inc."
-
 #~ msgid ""
 #~ "<a href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5\";>Modified-BSD</"
 #~ "a>"

Index: licenses/po/javascript-labels.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/javascript-labels.ru.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- licenses/po/javascript-labels.ru.po 5 Apr 2014 05:47:28 -0000       1.15
+++ licenses/po/javascript-labels.ru.po 5 Jan 2015 13:57:30 -0000       1.16
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: javascript-labels.html\n"
-"POT-Creation-Date: 2014-04-05 00:01+0000\n"
+"POT-Creation-Date: 2015-01-05 13:27+0000\n"
 "PO-Revision-Date: 2014-04-05 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-01-05 13:27+0000\n"
 
 #. type: Content of: <title>
 msgid "JavaScript License Web Labels - GNU Project - Free Software Foundation"
@@ -27,18 +28,38 @@
 msgstr "Лицензионные пометы о JavaScript на сайте"
 
 #. type: Content of: <p>
+# | If you are a webmaster deploying minified JavaScript on a site, here's a
+# | method for stating their licenses and source code locations without
+# | altering [-those files.-] {+the minified files themselves.+}  It's
+# | especially helpful in cases where the JavaScript is under one of the GNU
+# | licenses, but does not include the exception proposed in <a
+# | href=\"/philosophy/javascript-trap.html#AppendixA\"> Appendix A of
+# | &ldquo;The JavaScript Trap.&rdquo;</a> [-This method presents the
+# | information prominently enough to comply with the relevant conditions in
+# | the GNU software licenses, and it's specific enough that software can
+# | confirm the correctness of the information on a site.  For more
+# | explanation of why we designed this format, see the <a
+# | href=\"/licenses/javascript-labels-rationale.html\"> rationale</a>.-]
+#, fuzzy
+#| msgid ""
+#| "If you are a webmaster deploying minified JavaScript on a site, here's a "
+#| "method for stating their licenses and source code locations without "
+#| "altering those files.  It's especially helpful in cases where the "
+#| "JavaScript is under one of the GNU licenses, but does not include the "
+#| "exception proposed in <a href=\"/philosophy/javascript-trap.html#AppendixA"
+#| "\"> Appendix A of &ldquo;The JavaScript Trap.&rdquo;</a> This method "
+#| "presents the information prominently enough to comply with the relevant "
+#| "conditions in the GNU software licenses, and it's specific enough that "
+#| "software can confirm the correctness of the information on a site.  For "
+#| "more explanation of why we designed this format, see the <a href=\"/"
+#| "licenses/javascript-labels-rationale.html\"> rationale</a>."
 msgid ""
 "If you are a webmaster deploying minified JavaScript on a site, here's a "
 "method for stating their licenses and source code locations without altering "
-"those files.  It's especially helpful in cases where the JavaScript is under "
-"one of the GNU licenses, but does not include the exception proposed in <a "
-"href=\"/philosophy/javascript-trap.html#AppendixA\"> Appendix A of &ldquo;"
-"The JavaScript Trap.&rdquo;</a> This method presents the information "
-"prominently enough to comply with the relevant conditions in the GNU "
-"software licenses, and it's specific enough that software can confirm the "
-"correctness of the information on a site.  For more explanation of why we "
-"designed this format, see the <a href=\"/licenses/javascript-labels-"
-"rationale.html\"> rationale</a>."
+"the minified files themselves.  It's especially helpful in cases where the "
+"JavaScript is under one of the GNU licenses, but does not include the "
+"exception proposed in <a href=\"/philosophy/javascript-trap.html#AppendixA"
+"\"> Appendix A of &ldquo;The JavaScript Trap.&rdquo;</a>"
 msgstr ""
 "Если вы разрабатываете сайт и применяете 
на нем минимизированный JavaScript, "
 "вот метод для того, чтобы объявлять о 
лицензиях и местоположении исходных "
@@ -54,11 +75,24 @@
 "rationale.html\"> пояснительном документе</a>."
 
 #. type: Content of: <p>
+# | The JavaScript license web labels method is meant for files of minified
+# | JavaScript code.  [-You can also use-]  {+This method complies with the
+# | relevant conditions in the GNU software licenses, and+} it [-for
+# | non-minified JavaScript source files if you wish; but if you're not
+# | aiming-] {+enables LibreJS+} to [-make-] {+confirm+} the [-files small,
+# | you might as well put a copy-] {+correctness+} of the [-license in the
+# | source file.-] {+information on a site.+}
+#, fuzzy
+#| msgid ""
+#| "The JavaScript license web labels method is meant for files of minified "
+#| "JavaScript code.  You can also use it for non-minified JavaScript source "
+#| "files if you wish; but if you're not aiming to make the files small, you "
+#| "might as well put a copy of the license in the source file."
 msgid ""
 "The JavaScript license web labels method is meant for files of minified "
-"JavaScript code.  You can also use it for non-minified JavaScript source "
-"files if you wish; but if you're not aiming to make the files small, you "
-"might as well put a copy of the license in the source file."
+"JavaScript code.  This method complies with the relevant conditions in the "
+"GNU software licenses, and it enables LibreJS to confirm the correctness of "
+"the information on a site."
 msgstr ""
 "Метод лицензионных помет о JavaScript 
предназначен для файлов "
 "минимизированных программ на JavaScript. При 
желании его можно применять "
@@ -68,7 +102,34 @@
 
 #. type: Content of: <p>
 msgid ""
-"The web label method is not applicable to inline JavaScript included "
+"Using web labels presumes that the corresponding JavaScript source files "
+"carry license notices that properly release them under a free license.  The "
+"compiled code isn't free unless its souce code is, and indicating the "
+"license is essential for proper release of free source code.  If you haven't "
+"done that, you should do that first."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"You can use web labels to machine-readably indicate the licenses of non-"
+"minified JavaScript files too; but these are source files, so please don't "
+"fail to give them human-readable license notices.  Omitting those creates "
+"uncertainty about their legal status."
+msgstr ""
+
+#. type: Content of: <p>
+# | The web label{+s+} method is not applicable to inline JavaScript included
+# | directly in HTML pages &mdash; their license information should be <a
+# | href=\"/philosophy/javascript-trap.html#AppendixA\"> stated directly in
+# | those pages</a>.
+#, fuzzy
+#| msgid ""
+#| "The web label method is not applicable to inline JavaScript included "
+#| "directly in HTML pages &mdash; their license information should be <a "
+#| "href=\"/philosophy/javascript-trap.html#AppendixA\"> stated directly in "
+#| "those pages</a>."
+msgid ""
+"The web labels method is not applicable to inline JavaScript included "
 "directly in HTML pages &mdash; their license information should be <a href="
 "\"/philosophy/javascript-trap.html#AppendixA\"> stated directly in those "
 "pages</a>."
@@ -78,6 +139,12 @@
 "должна быть <a href=\"/philosophy/javascript-trap.html#AppendixA\"> 
указана "
 "прямо в этих страницах</a>."
 
+#. type: Content of: <p>
+msgid ""
+"For more explanation of why we designed this format, see the <a href=\"/"
+"licenses/javascript-labels-rationale.html\">rationale</a>."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Writing the labels page"
 msgstr "Оформление страницы с пометами"
@@ -356,7 +423,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+# | Copyright &copy; 201[-4-]{+5+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>

Index: philosophy/po/surveillance-vs-democracy.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.es.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- philosophy/po/surveillance-vs-democracy.es.po       7 Dec 2014 04:27:53 
-0000       1.39
+++ philosophy/po/surveillance-vs-democracy.es.po       5 Jan 2015 13:57:30 
-0000       1.40
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: surveillance-vs-democracy.html\n"
-"POT-Creation-Date: 2014-12-05 11:25+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2014-12-07 02:07+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <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-01-05 13:55+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Spanish\n"
 
@@ -497,15 +498,34 @@
 msgstr "Remedio para la recolección de datos: dejarlos dispersos"
 
 #. type: Content of: <p>
+# | One way to make monitoring safe for privacy is to <a
+# | name=\"dispersal\">keep the data dispersed and inconvenient to access</a>.
+# |  Old-fashioned security cameras were no threat to [-privacy.-]
+# | {+privacy(<a href=\"#privatespace\">*</a>).+}  The recording was stored on
+# | the premises, and kept for a few weeks at most.  Because of the
+# | inconvenience of accessing these recordings, it was never done massively;
+# | they were accessed only in the places where someone reported a crime.  It
+# | would not be feasible to physically collect millions of tapes every day
+# | and watch them or copy them.
+#, fuzzy
+#| msgid ""
+#| "One way to make monitoring safe for privacy is to <a name=\"dispersal"
+#| "\">keep the data dispersed and inconvenient to access</a>.  Old-fashioned "
+#| "security cameras were no threat to privacy.  The recording was stored on "
+#| "the premises, and kept for a few weeks at most.  Because of the "
+#| "inconvenience of accessing these recordings, it was never done massively; "
+#| "they were accessed only in the places where someone reported a crime.  It "
+#| "would not be feasible to physically collect millions of tapes every day "
+#| "and watch them or copy them."
 msgid ""
 "One way to make monitoring safe for privacy is to <a name=\"dispersal\">keep "
 "the data dispersed and inconvenient to access</a>.  Old-fashioned security "
-"cameras were no threat to privacy.  The recording was stored on the "
-"premises, and kept for a few weeks at most.  Because of the inconvenience of "
-"accessing these recordings, it was never done massively; they were accessed "
-"only in the places where someone reported a crime.  It would not be feasible "
-"to physically collect millions of tapes every day and watch them or copy "
-"them."
+"cameras were no threat to privacy(<a href=\"#privatespace\">*</a>).  The "
+"recording was stored on the premises, and kept for a few weeks at most.  "
+"Because of the inconvenience of accessing these recordings, it was never "
+"done massively; they were accessed only in the places where someone reported "
+"a crime.  It would not be feasible to physically collect millions of tapes "
+"every day and watch them or copy them."
 msgstr ""
 "Una manera de hacer que el monitoreo no invada la privacidad es <a name="
 "\"dispersal\">mantener los datos dispersos y de difícil acceso</a>. Las "
@@ -554,6 +574,14 @@
 "video ocasionalmente, pero se debe limitar la acumulación sistemática de "
 "tales datos en Internet."
 
+#. type: Content of: <p>
+msgid ""
+"<a name=\"privatespace\"><b>*</b></a>I assume here that the security camera "
+"points at the inside of a store, or at the street.  Any camera pointed at "
+"someone's private space by someone else violates privacy, but that is "
+"another issue."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Remedy for Internet Commerce Surveillance"
 msgstr "Remedio para la vigilancia del comercio en Internet"
@@ -1048,7 +1076,10 @@
 "de este sitio web."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2013 Richard Stallman"
+# | Copyright &copy; 201[-3-]{+5+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Richard Stallman"
+msgid "Copyright &copy; 2015 Richard Stallman"
 msgstr "Copyright &copy; 2013 Richard Stallman"
 
 #. type: Content of: <div><p>

Index: philosophy/po/surveillance-vs-democracy.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.fr.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- philosophy/po/surveillance-vs-democracy.fr.po       5 Dec 2014 16:31:47 
-0000       1.55
+++ philosophy/po/surveillance-vs-democracy.fr.po       5 Jan 2015 13:57:31 
-0000       1.56
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: surveillance-vs-democracy.html\n"
-"POT-Creation-Date: 2014-12-05 11:25+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2014-08-14 23:00+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <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-01-05 13:55+0000\n"
 "X-Generator: Gtranslator 2.91.5\n"
 "Plural-Forms: \n"
 
@@ -498,15 +499,34 @@
 msgstr "Remède à la collecte de données : les garder dispersées"
 
 #. type: Content of: <p>
+# | One way to make monitoring safe for privacy is to <a
+# | name=\"dispersal\">keep the data dispersed and inconvenient to access</a>.
+# |  Old-fashioned security cameras were no threat to [-privacy.-]
+# | {+privacy(<a href=\"#privatespace\">*</a>).+}  The recording was stored on
+# | the premises, and kept for a few weeks at most.  Because of the
+# | inconvenience of accessing these recordings, it was never done massively;
+# | they were accessed only in the places where someone reported a crime.  It
+# | would not be feasible to physically collect millions of tapes every day
+# | and watch them or copy them.
+#, fuzzy
+#| msgid ""
+#| "One way to make monitoring safe for privacy is to <a name=\"dispersal"
+#| "\">keep the data dispersed and inconvenient to access</a>.  Old-fashioned "
+#| "security cameras were no threat to privacy.  The recording was stored on "
+#| "the premises, and kept for a few weeks at most.  Because of the "
+#| "inconvenience of accessing these recordings, it was never done massively; "
+#| "they were accessed only in the places where someone reported a crime.  It "
+#| "would not be feasible to physically collect millions of tapes every day "
+#| "and watch them or copy them."
 msgid ""
 "One way to make monitoring safe for privacy is to <a name=\"dispersal\">keep "
 "the data dispersed and inconvenient to access</a>.  Old-fashioned security "
-"cameras were no threat to privacy.  The recording was stored on the "
-"premises, and kept for a few weeks at most.  Because of the inconvenience of "
-"accessing these recordings, it was never done massively; they were accessed "
-"only in the places where someone reported a crime.  It would not be feasible "
-"to physically collect millions of tapes every day and watch them or copy "
-"them."
+"cameras were no threat to privacy(<a href=\"#privatespace\">*</a>).  The "
+"recording was stored on the premises, and kept for a few weeks at most.  "
+"Because of the inconvenience of accessing these recordings, it was never "
+"done massively; they were accessed only in the places where someone reported "
+"a crime.  It would not be feasible to physically collect millions of tapes "
+"every day and watch them or copy them."
 msgstr ""
 "Pour rendre la surveillance possible sans porter atteinte à la vie privée, "
 "l'un des moyens est de <a name=\"dispersal\">conserver les données de "
@@ -556,6 +576,14 @@
 "photos et des enregistrements vidéo une fois de temps en temps, mais on doit 
"
 "limiter l'accumulation systématique de ces données."
 
+#. type: Content of: <p>
+msgid ""
+"<a name=\"privatespace\"><b>*</b></a>I assume here that the security camera "
+"points at the inside of a store, or at the street.  Any camera pointed at "
+"someone's private space by someone else violates privacy, but that is "
+"another issue."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Remedy for Internet Commerce Surveillance"
 msgstr "Remède à la surveillance du commerce sur Internet"
@@ -1070,7 +1098,10 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2013 Richard Stallman"
+# | Copyright &copy; 201[-3-]{+5+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Richard Stallman"
+msgid "Copyright &copy; 2015 Richard Stallman"
 msgstr "Copyright &copy; 2013 Richard Stallman"
 
 #. type: Content of: <div><p>

Index: philosophy/po/surveillance-vs-democracy.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.it.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- philosophy/po/surveillance-vs-democracy.it.po       7 Dec 2014 10:56:48 
-0000       1.34
+++ philosophy/po/surveillance-vs-democracy.it.po       5 Jan 2015 13:57:31 
-0000       1.35
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: surveillance-vs-democracy.html\n"
-"POT-Creation-Date: 2014-12-05 11:25+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2014-12-07 11:23+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\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-01-05 13:55+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
@@ -475,15 +476,34 @@
 msgstr "Un rimedio alla raccolta dei dati: lasciarli dispersi"
 
 #. type: Content of: <p>
+# | One way to make monitoring safe for privacy is to <a
+# | name=\"dispersal\">keep the data dispersed and inconvenient to access</a>.
+# |  Old-fashioned security cameras were no threat to [-privacy.-]
+# | {+privacy(<a href=\"#privatespace\">*</a>).+}  The recording was stored on
+# | the premises, and kept for a few weeks at most.  Because of the
+# | inconvenience of accessing these recordings, it was never done massively;
+# | they were accessed only in the places where someone reported a crime.  It
+# | would not be feasible to physically collect millions of tapes every day
+# | and watch them or copy them.
+#, fuzzy
+#| msgid ""
+#| "One way to make monitoring safe for privacy is to <a name=\"dispersal"
+#| "\">keep the data dispersed and inconvenient to access</a>.  Old-fashioned "
+#| "security cameras were no threat to privacy.  The recording was stored on "
+#| "the premises, and kept for a few weeks at most.  Because of the "
+#| "inconvenience of accessing these recordings, it was never done massively; "
+#| "they were accessed only in the places where someone reported a crime.  It "
+#| "would not be feasible to physically collect millions of tapes every day "
+#| "and watch them or copy them."
 msgid ""
 "One way to make monitoring safe for privacy is to <a name=\"dispersal\">keep "
 "the data dispersed and inconvenient to access</a>.  Old-fashioned security "
-"cameras were no threat to privacy.  The recording was stored on the "
-"premises, and kept for a few weeks at most.  Because of the inconvenience of "
-"accessing these recordings, it was never done massively; they were accessed "
-"only in the places where someone reported a crime.  It would not be feasible "
-"to physically collect millions of tapes every day and watch them or copy "
-"them."
+"cameras were no threat to privacy(<a href=\"#privatespace\">*</a>).  The "
+"recording was stored on the premises, and kept for a few weeks at most.  "
+"Because of the inconvenience of accessing these recordings, it was never "
+"done massively; they were accessed only in the places where someone reported "
+"a crime.  It would not be feasible to physically collect millions of tapes "
+"every day and watch them or copy them."
 msgstr ""
 "Un modo per rendere il monitoraggio sicuro dal punto di vista della privacy "
 "è quello di <a name=\"dispersal\">tenere i dati dispersi e rendere scomodo "
@@ -530,6 +550,14 @@
 "devono essere liberi di pubblicare foto e video ogni tanto, ma "
 "l’accumulazione sistematica di tali dati su Internet dev’essere limitata."
 
+#. type: Content of: <p>
+msgid ""
+"<a name=\"privatespace\"><b>*</b></a>I assume here that the security camera "
+"points at the inside of a store, or at the street.  Any camera pointed at "
+"someone's private space by someone else violates privacy, but that is "
+"another issue."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Remedy for Internet Commerce Surveillance"
 msgstr "Un rimedio alla sorveglianza dell’e-commerce"
@@ -1008,7 +1036,10 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2013 Richard Stallman"
+# | Copyright &copy; 201[-3-]{+5+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Richard Stallman"
+msgid "Copyright &copy; 2015 Richard Stallman"
 msgstr "Copyright &copy; 2013 Richard Stallman"
 
 #. type: Content of: <div><p>

Index: philosophy/po/surveillance-vs-democracy.pot
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.pot,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/surveillance-vs-democracy.pot 5 Dec 2014 11:27:03 -0000       
1.19
+++ philosophy/po/surveillance-vs-democracy.pot 5 Jan 2015 13:57:31 -0000       
1.20
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: surveillance-vs-democracy.html\n"
-"POT-Creation-Date: 2014-12-05 11:25+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -317,12 +317,12 @@
 msgid ""
 "One way to make monitoring safe for privacy is to <a name=\"dispersal\">keep "
 "the data dispersed and inconvenient to access</a>.  Old-fashioned security "
-"cameras were no threat to privacy.  The recording was stored on the "
-"premises, and kept for a few weeks at most.  Because of the inconvenience of "
-"accessing these recordings, it was never done massively; they were accessed "
-"only in the places where someone reported a crime.  It would not be feasible "
-"to physically collect millions of tapes every day and watch them or copy "
-"them."
+"cameras were no threat to privacy(<a href=\"#privatespace\">*</a>).  The "
+"recording was stored on the premises, and kept for a few weeks at most.  "
+"Because of the inconvenience of accessing these recordings, it was never "
+"done massively; they were accessed only in the places where someone reported "
+"a crime.  It would not be feasible to physically collect millions of tapes "
+"every day and watch them or copy them."
 msgstr ""
 
 #. type: Content of: <p>
@@ -347,6 +347,14 @@
 "such data on the Internet must be limited."
 msgstr ""
 
+#. type: Content of: <p>
+msgid ""
+"<a name=\"privatespace\"><b>*</b></a>I assume here that the security camera "
+"points at the inside of a store, or at the street.  Any camera pointed at "
+"someone's private space by someone else violates privacy, but that is "
+"another issue."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Remedy for Internet Commerce Surveillance"
 msgstr ""
@@ -646,7 +654,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2013 Richard Stallman"
+msgid "Copyright &copy; 2015 Richard Stallman"
 msgstr ""
 
 #. type: Content of: <div><p>

Index: philosophy/po/surveillance-vs-democracy.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.ru.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/surveillance-vs-democracy.ru.po       16 Dec 2014 08:43:15 
-0000      1.24
+++ philosophy/po/surveillance-vs-democracy.ru.po       5 Jan 2015 13:57:31 
-0000       1.25
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: surveillance-vs-democracy.html\n"
-"POT-Creation-Date: 2014-12-05 11:25+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2014-12-16 09:27+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-01-05 13:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -480,15 +481,34 @@
 msgstr "Мера против сбора данных: оставлять их 
рассредоточенными"
 
 #. type: Content of: <p>
+# | One way to make monitoring safe for privacy is to <a
+# | name=\"dispersal\">keep the data dispersed and inconvenient to access</a>.
+# |  Old-fashioned security cameras were no threat to [-privacy.-]
+# | {+privacy(<a href=\"#privatespace\">*</a>).+}  The recording was stored on
+# | the premises, and kept for a few weeks at most.  Because of the
+# | inconvenience of accessing these recordings, it was never done massively;
+# | they were accessed only in the places where someone reported a crime.  It
+# | would not be feasible to physically collect millions of tapes every day
+# | and watch them or copy them.
+#, fuzzy
+#| msgid ""
+#| "One way to make monitoring safe for privacy is to <a name=\"dispersal"
+#| "\">keep the data dispersed and inconvenient to access</a>.  Old-fashioned "
+#| "security cameras were no threat to privacy.  The recording was stored on "
+#| "the premises, and kept for a few weeks at most.  Because of the "
+#| "inconvenience of accessing these recordings, it was never done massively; "
+#| "they were accessed only in the places where someone reported a crime.  It "
+#| "would not be feasible to physically collect millions of tapes every day "
+#| "and watch them or copy them."
 msgid ""
 "One way to make monitoring safe for privacy is to <a name=\"dispersal\">keep "
 "the data dispersed and inconvenient to access</a>.  Old-fashioned security "
-"cameras were no threat to privacy.  The recording was stored on the "
-"premises, and kept for a few weeks at most.  Because of the inconvenience of "
-"accessing these recordings, it was never done massively; they were accessed "
-"only in the places where someone reported a crime.  It would not be feasible "
-"to physically collect millions of tapes every day and watch them or copy "
-"them."
+"cameras were no threat to privacy(<a href=\"#privatespace\">*</a>).  The "
+"recording was stored on the premises, and kept for a few weeks at most.  "
+"Because of the inconvenience of accessing these recordings, it was never "
+"done massively; they were accessed only in the places where someone reported "
+"a crime.  It would not be feasible to physically collect millions of tapes "
+"every day and watch them or copy them."
 msgstr ""
 "<a name=\"dispersal\"></a>Один из способов сделать 
наблюдение безопасным для "
 "конфиденциальности&nbsp;&mdash; оставлять 
данные  рассредоточенными, без "
@@ -535,6 +555,14 @@
 "иногда фото- и видеозаписи, но 
систематическое накопление таких данных в "
 "Интернете должно ограничиваться."
 
+#. type: Content of: <p>
+msgid ""
+"<a name=\"privatespace\"><b>*</b></a>I assume here that the security camera "
+"points at the inside of a store, or at the street.  Any camera pointed at "
+"someone's private space by someone else violates privacy, but that is "
+"another issue."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Remedy for Internet Commerce Surveillance"
 msgstr "Меры против коммерческой слежки в 
Интернете"
@@ -1012,7 +1040,10 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2013 Richard Stallman"
+# | Copyright &copy; 201[-3-]{+5+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Richard Stallman"
+msgid "Copyright &copy; 2015 Richard Stallman"
 msgstr "Copyright &copy; 2013 Richard Stallman"
 
 #. type: Content of: <div><p>

Index: philosophy/po/surveillance-vs-democracy.sq.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.sq.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/surveillance-vs-democracy.sq.po       10 Dec 2014 18:29:56 
-0000      1.24
+++ philosophy/po/surveillance-vs-democracy.sq.po       5 Jan 2015 13:57:31 
-0000       1.25
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: surveillance-vs-democracy.html\n"
-"POT-Creation-Date: 2014-12-05 11:25+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Besnik Bleta <address@hidden>\n"
 "Language-Team: \n"
@@ -483,15 +483,25 @@
 msgstr "Kurë për Grumbullimin e të Dhënave: Të Lihen të Hapërdara"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "One way to make monitoring safe for privacy is to <a name=\"dispersal"
+#| "\">keep the data dispersed and inconvenient to access</a>.  Old-fashioned "
+#| "security cameras were no threat to privacy.  The recording was stored on "
+#| "the premises, and kept for a few weeks at most.  Because of the "
+#| "inconvenience of accessing these recordings, it was never done massively; "
+#| "they were accessed only in the places where someone reported a crime.  It "
+#| "would not be feasible to physically collect millions of tapes every day "
+#| "and watch them or copy them."
 msgid ""
 "One way to make monitoring safe for privacy is to <a name=\"dispersal\">keep "
 "the data dispersed and inconvenient to access</a>.  Old-fashioned security "
-"cameras were no threat to privacy.  The recording was stored on the "
-"premises, and kept for a few weeks at most.  Because of the inconvenience of "
-"accessing these recordings, it was never done massively; they were accessed "
-"only in the places where someone reported a crime.  It would not be feasible "
-"to physically collect millions of tapes every day and watch them or copy "
-"them."
+"cameras were no threat to privacy(<a href=\"#privatespace\">*</a>).  The "
+"recording was stored on the premises, and kept for a few weeks at most.  "
+"Because of the inconvenience of accessing these recordings, it was never "
+"done massively; they were accessed only in the places where someone reported "
+"a crime.  It would not be feasible to physically collect millions of tapes "
+"every day and watch them or copy them."
 msgstr ""
 "Një rrugë për ta bërë mbikëqyrjen të parrezikshme për privatësinë 
është të "
 "<a name=\"dispersal\">mbahen të dhënat të shpërndara dhe në mënyrë të 
tillë "
@@ -539,6 +549,14 @@
 "raste, foto dhe regjistrime video, por grumbullimi sistematik në Internet i "
 "të dhënave të tilla duhet të kufizohet."
 
+#. type: Content of: <p>
+msgid ""
+"<a name=\"privatespace\"><b>*</b></a>I assume here that the security camera "
+"points at the inside of a store, or at the street.  Any camera pointed at "
+"someone's private space by someone else violates privacy, but that is "
+"another issue."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Remedy for Internet Commerce Surveillance"
 msgstr "Kurë për Përgjim Internet Nga Tregtia"
@@ -1017,7 +1035,7 @@
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright 2013 Richard Stallman"
-msgid "Copyright &copy; 2013 Richard Stallman"
+msgid "Copyright &copy; 2015 Richard Stallman"
 msgstr "Të drejta kopjimi &copy; 2013 Richard Stallman"
 
 #. type: Content of: <div><p>

Index: philosophy/po/surveillance-vs-democracy.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.uk.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/po/surveillance-vs-democracy.uk.po       1 Jan 2015 20:58:25 
-0000       1.18
+++ philosophy/po/surveillance-vs-democracy.uk.po       5 Jan 2015 13:57:31 
-0000       1.19
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: surveillance-vs-democracy.html\n"
-"POT-Creation-Date: 2014-12-05 11:25+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2015-01-01 22:23+0200\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: ENCODINGLanguage: uk\n"
+"X-Outdated-Since: 2015-01-05 13:55+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"
@@ -476,15 +477,25 @@
 msgstr "Захід проти збору даних: залишайте їх 
розосередженими"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "One way to make monitoring safe for privacy is to <a name=\"dispersal"
+#| "\">keep the data dispersed and inconvenient to access</a>.  Old-fashioned "
+#| "security cameras were no threat to privacy.  The recording was stored on "
+#| "the premises, and kept for a few weeks at most.  Because of the "
+#| "inconvenience of accessing these recordings, it was never done massively; "
+#| "they were accessed only in the places where someone reported a crime.  It "
+#| "would not be feasible to physically collect millions of tapes every day "
+#| "and watch them or copy them."
 msgid ""
 "One way to make monitoring safe for privacy is to <a name=\"dispersal\">keep "
 "the data dispersed and inconvenient to access</a>.  Old-fashioned security "
-"cameras were no threat to privacy.  The recording was stored on the "
-"premises, and kept for a few weeks at most.  Because of the inconvenience of "
-"accessing these recordings, it was never done massively; they were accessed "
-"only in the places where someone reported a crime.  It would not be feasible "
-"to physically collect millions of tapes every day and watch them or copy "
-"them."
+"cameras were no threat to privacy(<a href=\"#privatespace\">*</a>).  The "
+"recording was stored on the premises, and kept for a few weeks at most.  "
+"Because of the inconvenience of accessing these recordings, it was never "
+"done massively; they were accessed only in the places where someone reported "
+"a crime.  It would not be feasible to physically collect millions of tapes "
+"every day and watch them or copy them."
 msgstr ""
 "Один зі способів зробити безпечною для 
спостереження конфіденційність <a "
 "name=\"dispersal\">залишати дані розосередженими, 
</a>без зручного доступу. "
@@ -531,6 +542,14 @@
 "відеозаписи, але систематичне 
накопичення таких даних у Інтернеті 
повинне "
 "обмежуватися."
 
+#. type: Content of: <p>
+msgid ""
+"<a name=\"privatespace\"><b>*</b></a>I assume here that the security camera "
+"points at the inside of a store, or at the street.  Any camera pointed at "
+"someone's private space by someone else violates privacy, but that is "
+"another issue."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Remedy for Internet Commerce Surveillance"
 msgstr "Заходи проти комерційного стеження в 
Інтернеті"
@@ -1001,7 +1020,9 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2013 Richard Stallman"
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Richard Stallman"
+msgid "Copyright &copy; 2015 Richard Stallman"
 msgstr "Copyright &copy; 2013 Річард Столмен"
 
 #. type: Content of: <div><p>

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.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- philosophy/po/words-to-avoid.ar-diff.html   30 Nov 2014 09:57:52 -0000      
1.47
+++ philosophy/po/words-to-avoid.ar-diff.html   5 Jan 2015 13:57:31 -0000       
1.48
@@ -161,14 +161,14 @@
 
 &lt;h4 id="Alternative"&gt;&ldquo;Alternative&rdquo;&lt;/h4&gt;
 &lt;p&gt;
-We don't <span class="removed"><del><strong>present</strong></del></span> 
<span class="inserted"><ins><em>describe</em></ins></span> free software as an 
<span 
class="removed"><del><strong>&ldquo;alternative&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;alternative,&rdquo;</em></ins></span>
-because <span class="removed"><del><strong>it
-presents a goal of having</strong></del></span> <span 
class="inserted"><ins><em>that presumes that other &ldquo;alternatives&rdquo; 
to</em></ins></span> free
-software <span class="removed"><del><strong>alongside proprietary
-software.</strong></del></span> <span class="inserted"><ins><em>are legitimate 
and we should coexist with them.</em></ins></span>  That <span 
class="removed"><del><strong>presupposes</strong></del></span> <span 
class="inserted"><ins><em>word
-frames an issue with the assumption</em></ins></span> that <span 
class="removed"><del><strong>proprietary software</strong></del></span> <span 
class="inserted"><ins><em>it</em></ins></span> is
-<span class="removed"><del><strong>legitimate.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>good to have lots of
-&ldquo;alternatives&rdquo; to choose from.&lt;/p&gt;</em></ins></span>
+We don't <span class="removed"><del><strong>present</strong></del></span> 
<span class="inserted"><ins><em>describe</em></ins></span> free software as an 
<span 
class="removed"><del><strong>&ldquo;alternative&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;alternative&rdquo; to
+proprietary,</em></ins></span> because <span class="inserted"><ins><em>that 
word presumes all the &ldquo;alternatives&rdquo; are
+legitimate and each additional one makes users better off.  In 
effect,</em></ins></span>
+it
+<span class="removed"><del><strong>presents a goal of 
having</strong></del></span> <span class="inserted"><ins><em>assumes 
that</em></ins></span> free software <span 
class="removed"><del><strong>alongside proprietary
+software.  That presupposes that proprietary</strong></del></span> <span 
class="inserted"><ins><em>ought to coexist with</em></ins></span> software 
<span class="removed"><del><strong>is
+legitimate.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>that does
+not respect users' freedom.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 We believe that <span class="inserted"><ins><em>distribution as free software 
is</em></ins></span> the only ethical way
@@ -179,9 +179,9 @@
 software&lt;/a&gt;
 and &lt;a href="/philosophy/who-does-that-server-really-serve.html"&gt;Service
 as</em></ins></span> a <span class="removed"><del><strong>world where all 
programs are free, so that
-all</strong></del></span> <span class="inserted"><ins><em>Software 
Substitute&lt;/a&gt; subjugate</em></ins></span> their <span 
class="removed"><del><strong>users are free.</strong></del></span> <span 
class="inserted"><ins><em>users.  We do not think
-that those should continue to exist as &ldquo;alternatives&rdquo; to
-free software.</em></ins></span>
+all</strong></del></span> <span class="inserted"><ins><em>Software 
Substitute&lt;/a&gt; subjugate</em></ins></span> their <span 
class="inserted"><ins><em>users.  We do not think
+it is good to offer</em></ins></span> users <span 
class="removed"><del><strong>are free.</strong></del></span> <span 
class="inserted"><ins><em>those &ldquo;alternatives&rdquo; to free
+software.</em></ins></span>
 &lt;/p&gt;
 
 &lt;h4 id="BSD-style"&gt;&ldquo;BSD-style&rdquo;&lt;/h4&gt;
@@ -1085,7 +1085,7 @@
      Information document, www.gnu.org/prep/maintain. --&gt;
 
 &lt;p&gt;Copyright</em></ins></span> &copy; 1996, 1997, 1998, 1999, 2001, 
2002, 2003, 2004, 2007,
-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.&lt;/p&gt;
+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.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
@@ -1098,7 +1098,7 @@
 
 <span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2014/11/30 09:57:52 $
+$Date: 2015/01/05 13:57:31 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy/po/words-to-avoid.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ar.po,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- philosophy/po/words-to-avoid.ar.po  30 Nov 2014 09:57:52 -0000      1.75
+++ philosophy/po/words-to-avoid.ar.po  5 Jan 2015 13:57:32 -0000       1.76
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2013-01-16 14:00+0200\n"
 "Last-Translator: Rafik E. Younan <address@hidden>\n"
 "Language-Team: Arabic <>\n"
@@ -314,11 +314,11 @@
 #| "it presents a goal of having free software alongside proprietary "
 #| "software.  That presupposes that proprietary software is legitimate."
 msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 "نحن لا نقدم البرمجيات الحرة &rdquo;كبديل&ldquo;، 
لأنها بذلك تروج لهدف زائف "
 "وهو وجدود البرمجيات الحرة متلازمة مع البرم
جيات الاحتكارية. وذلك بزعم أن "
@@ -336,8 +336,8 @@
 "make software available for others to use.  The other methods, <a href=\"/"
 "philosophy/free-software-even-more-important.html\">nonfree software</a> and "
 "<a href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 "نحن نؤمن بأن الطريقة الوحيدة الأخلاقية 
لتداول البرمجيات هي من خلال كونها "
 "برمجيات حرة. لذا، فنحن نهدف لجعل البرمجيات 
الحرة أكثر من مجرد بديل. هدفنا "
@@ -2104,7 +2104,7 @@
 #, fuzzy
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996، 1997، 1998، 1999، 2001، 2002، 2003، 2004، 
2007، 2008، "
 "2010، 2009,2010, 2011, 2012 مؤسسة البرمجيات الحرة، الم
حدودة."

Index: philosophy/po/words-to-avoid.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.de.po,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- philosophy/po/words-to-avoid.de.po  2 Dec 2014 03:29:27 -0000       1.106
+++ philosophy/po/words-to-avoid.de.po  5 Jan 2015 13:57:32 -0000       1.107
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2014-12-01 22:00+0100\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-01-05 13:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -336,12 +337,27 @@
 msgstr "<em>Alternative</em>"
 
 #. type: Content of: <p>
-msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+# | We don't describe free software as an [-&ldquo;alternative,&rdquo;-]
+# | {+&ldquo;alternative&rdquo; to proprietary,+} because that {+word+}
+# | presumes [-that other-] {+all the+} &ldquo;alternatives&rdquo; [-to free
+# | software-] are legitimate and [-we should-] {+each additional one makes
+# | users better off.  In effect, it assumes that free software ought to+}
+# | coexist with [-them.  That word frames an issue with the assumption-]
+# | {+software+} that [-it is good to have lots of &ldquo;alternatives&rdquo;
+# | to choose from.-] {+does not respect users' freedom.+}
+#, fuzzy
+#| msgid ""
+#| "We don't describe free software as an &ldquo;alternative,&rdquo; because "
+#| "that presumes that other &ldquo;alternatives&rdquo; to free software are "
+#| "legitimate and we should coexist with them.  That word frames an issue "
+#| "with the assumption that it is good to have lots of &ldquo;"
+#| "alternatives&rdquo; to choose from."
+msgid ""
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 "Wir beschreiben Freie Software nicht als eine <em>„Alternative“</em>, 
denn "
 "das setzt voraus, dass andere <em>„Alternativen“</em> zu freier Software "
@@ -350,13 +366,30 @@
 "zu haben."
 
 #. type: Content of: <p>
+# | We believe that distribution as free software is the only ethical way to
+# | make software available for others to use.  The other methods, <a
+# | href=\"/philosophy/free-software-even-more-important.html\">nonfree
+# | software</a> and <a
+# | href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a
+# | Software Substitute</a> subjugate their users.  We do not think [-that
+# | those should continue-] {+it is good+} to [-exist as-] {+offer users
+# | those+} &ldquo;alternatives&rdquo; to free software.
+#, fuzzy
+#| msgid ""
+#| "We believe that distribution as free software is the only ethical way to "
+#| "make software available for others to use.  The other methods, <a href=\"/"
+#| "philosophy/free-software-even-more-important.html\">nonfree software</a> "
+#| "and <a href=\"/philosophy/who-does-that-server-really-serve.html"
+#| "\">Service as a Software Substitute</a> subjugate their users.  We do not "
+#| "think that those should continue to exist as &ldquo;alternatives&rdquo; "
+#| "to free software."
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
 "philosophy/free-software-even-more-important.html\">nonfree software</a> and "
 "<a href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 "Wir sind der Meinung, dass die Verbreitung als Freie Software die einzig "
 "ethische Möglichkeit ist, um Software nutzbar für andere bereitzustellen. "
@@ -2216,9 +2249,16 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
+# | 2008, 2009, 2010, 2011, [-2012-] {+2012, 2015+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#| "2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
 "2009, 2010, 2011, 2012<ins>, 2013, 2014</ins> Free Software Foundation, Inc."

Index: philosophy/po/words-to-avoid.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.es.po,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -b -r1.162 -r1.163
--- philosophy/po/words-to-avoid.es.po  27 Dec 2014 20:57:41 -0000      1.162
+++ philosophy/po/words-to-avoid.es.po  5 Jan 2015 13:57:32 -0000       1.163
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2014-12-27 21:17+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-01-05 13:55+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Spanish\n"
 
@@ -294,12 +295,27 @@
 msgstr "«Alternativo»"
 
 #. type: Content of: <p>
-msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+# | We don't describe free software as an [-&ldquo;alternative,&rdquo;-]
+# | {+&ldquo;alternative&rdquo; to proprietary,+} because that {+word+}
+# | presumes [-that other-] {+all the+} &ldquo;alternatives&rdquo; [-to free
+# | software-] are legitimate and [-we should-] {+each additional one makes
+# | users better off.  In effect, it assumes that free software ought to+}
+# | coexist with [-them.  That word frames an issue with the assumption-]
+# | {+software+} that [-it is good to have lots of &ldquo;alternatives&rdquo;
+# | to choose from.-] {+does not respect users' freedom.+}
+#, fuzzy
+#| msgid ""
+#| "We don't describe free software as an &ldquo;alternative,&rdquo; because "
+#| "that presumes that other &ldquo;alternatives&rdquo; to free software are "
+#| "legitimate and we should coexist with them.  That word frames an issue "
+#| "with the assumption that it is good to have lots of &ldquo;"
+#| "alternatives&rdquo; to choose from."
+msgid ""
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 "No decimos que el software libre es una «alternativa» porque eso supondría 
"
 "que otras «alternativas» al software libre son legítimas y deberían "
@@ -307,13 +323,30 @@
 "contar con muchas «alternativas» para elegir."
 
 #. type: Content of: <p>
+# | We believe that distribution as free software is the only ethical way to
+# | make software available for others to use.  The other methods, <a
+# | href=\"/philosophy/free-software-even-more-important.html\">nonfree
+# | software</a> and <a
+# | href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a
+# | Software Substitute</a> subjugate their users.  We do not think [-that
+# | those should continue-] {+it is good+} to [-exist as-] {+offer users
+# | those+} &ldquo;alternatives&rdquo; to free software.
+#, fuzzy
+#| msgid ""
+#| "We believe that distribution as free software is the only ethical way to "
+#| "make software available for others to use.  The other methods, <a href=\"/"
+#| "philosophy/free-software-even-more-important.html\">nonfree software</a> "
+#| "and <a href=\"/philosophy/who-does-that-server-really-serve.html"
+#| "\">Service as a Software Substitute</a> subjugate their users.  We do not "
+#| "think that those should continue to exist as &ldquo;alternatives&rdquo; "
+#| "to free software."
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
 "philosophy/free-software-even-more-important.html\">nonfree software</a> and "
 "<a href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 "Creemos que distribuir el software como software libre es la única manera "
 "ética de ponerlo a disposición de los demás. Los otros métodos, el <a 
href="
@@ -2132,9 +2165,16 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
+# | 2008, 2009, 2010, 2011, [-2012-] {+2012, 2015+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#| "2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
 "2009, 2010, 2011, 2012 Free Software Foundation, Inc."

Index: philosophy/po/words-to-avoid.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.fr.po,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -b -r1.182 -r1.183
--- philosophy/po/words-to-avoid.fr.po  30 Nov 2014 11:13:31 -0000      1.182
+++ philosophy/po/words-to-avoid.fr.po  5 Jan 2015 13:57:32 -0000       1.183
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2014-11-30 12:11+0100\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-01-05 13:55+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -254,12 +255,27 @@
 msgstr "« Alternative »"
 
 #. type: Content of: <p>
-msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+# | We don't describe free software as an [-&ldquo;alternative,&rdquo;-]
+# | {+&ldquo;alternative&rdquo; to proprietary,+} because that {+word+}
+# | presumes [-that other-] {+all the+} &ldquo;alternatives&rdquo; [-to free
+# | software-] are legitimate and [-we should-] {+each additional one makes
+# | users better off.  In effect, it assumes that free software ought to+}
+# | coexist with [-them.  That word frames an issue with the assumption-]
+# | {+software+} that [-it is good to have lots of &ldquo;alternatives&rdquo;
+# | to choose from.-] {+does not respect users' freedom.+}
+#, fuzzy
+#| msgid ""
+#| "We don't describe free software as an &ldquo;alternative,&rdquo; because "
+#| "that presumes that other &ldquo;alternatives&rdquo; to free software are "
+#| "legitimate and we should coexist with them.  That word frames an issue "
+#| "with the assumption that it is good to have lots of &ldquo;"
+#| "alternatives&rdquo; to choose from."
+msgid ""
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 "Nous ne décrivons pas le logiciel libre comme une « alternative », car 
cela "
 "implique l'existence d'« alternatives » légitimes au logiciel libre, 
avec "
@@ -268,13 +284,30 @@
 "d'« alternatives »."
 
 #. type: Content of: <p>
+# | We believe that distribution as free software is the only ethical way to
+# | make software available for others to use.  The other methods, <a
+# | href=\"/philosophy/free-software-even-more-important.html\">nonfree
+# | software</a> and <a
+# | href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a
+# | Software Substitute</a> subjugate their users.  We do not think [-that
+# | those should continue-] {+it is good+} to [-exist as-] {+offer users
+# | those+} &ldquo;alternatives&rdquo; to free software.
+#, fuzzy
+#| msgid ""
+#| "We believe that distribution as free software is the only ethical way to "
+#| "make software available for others to use.  The other methods, <a href=\"/"
+#| "philosophy/free-software-even-more-important.html\">nonfree software</a> "
+#| "and <a href=\"/philosophy/who-does-that-server-really-serve.html"
+#| "\">Service as a Software Substitute</a> subjugate their users.  We do not "
+#| "think that those should continue to exist as &ldquo;alternatives&rdquo; "
+#| "to free software."
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
 "philosophy/free-software-even-more-important.html\">nonfree software</a> and "
 "<a href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 "Nous croyons que la distribution de logiciel en tant que logiciel libre est "
 "la seule manière éthique de le rendre disponible aux autres. Les autres "
@@ -2006,9 +2039,16 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
+# | 2008, 2009, 2010, 2011, [-2012-] {+2012, 2015+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#| "2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
 "2009, 2010, 2011, 2012 Free Software Foundation, Inc."

Index: philosophy/po/words-to-avoid.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.it.po,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- philosophy/po/words-to-avoid.it.po  1 Dec 2014 09:01:20 -0000       1.142
+++ philosophy/po/words-to-avoid.it.po  5 Jan 2015 13:57:34 -0000       1.143
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2014-12-01 09:43+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\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-01-05 13:55+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
@@ -253,12 +254,27 @@
 msgstr "&ldquo;Alternativa&rdquo;"
 
 #. type: Content of: <p>
-msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+# | We don't describe free software as an [-&ldquo;alternative,&rdquo;-]
+# | {+&ldquo;alternative&rdquo; to proprietary,+} because that {+word+}
+# | presumes [-that other-] {+all the+} &ldquo;alternatives&rdquo; [-to free
+# | software-] are legitimate and [-we should-] {+each additional one makes
+# | users better off.  In effect, it assumes that free software ought to+}
+# | coexist with [-them.  That word frames an issue with the assumption-]
+# | {+software+} that [-it is good to have lots of &ldquo;alternatives&rdquo;
+# | to choose from.-] {+does not respect users' freedom.+}
+#, fuzzy
+#| msgid ""
+#| "We don't describe free software as an &ldquo;alternative,&rdquo; because "
+#| "that presumes that other &ldquo;alternatives&rdquo; to free software are "
+#| "legitimate and we should coexist with them.  That word frames an issue "
+#| "with the assumption that it is good to have lots of &ldquo;"
+#| "alternatives&rdquo; to choose from."
+msgid ""
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 "Non descriviamo il software libero come \"alternativa\", perché questo "
 "presuppone che esistano altre legittime alternative al software libero e che "
@@ -267,13 +283,30 @@
 "cui scegliere."
 
 #. type: Content of: <p>
+# | We believe that distribution as free software is the only ethical way to
+# | make software available for others to use.  The other methods, <a
+# | href=\"/philosophy/free-software-even-more-important.html\">nonfree
+# | software</a> and <a
+# | href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a
+# | Software Substitute</a> subjugate their users.  We do not think [-that
+# | those should continue-] {+it is good+} to [-exist as-] {+offer users
+# | those+} &ldquo;alternatives&rdquo; to free software.
+#, fuzzy
+#| msgid ""
+#| "We believe that distribution as free software is the only ethical way to "
+#| "make software available for others to use.  The other methods, <a href=\"/"
+#| "philosophy/free-software-even-more-important.html\">nonfree software</a> "
+#| "and <a href=\"/philosophy/who-does-that-server-really-serve.html"
+#| "\">Service as a Software Substitute</a> subjugate their users.  We do not "
+#| "think that those should continue to exist as &ldquo;alternatives&rdquo; "
+#| "to free software."
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
 "philosophy/free-software-even-more-important.html\">nonfree software</a> and "
 "<a href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 "Noi riteniamo che la sola modalità etica di distribuzione del software sia "
 "il software libero. Gli altri metodi, come <a href=\"/philosophy/free-"
@@ -1957,9 +1990,16 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
+# | 2008, 2009, 2010, 2011, [-2012-] {+2012, 2015+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#| "2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
 "2009, 2010, 2011, 2012 Free Software Foundation, Inc."

Index: philosophy/po/words-to-avoid.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ja.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- philosophy/po/words-to-avoid.ja.po  1 Dec 2014 03:30:36 -0000       1.84
+++ philosophy/po/words-to-avoid.ja.po  5 Jan 2015 13:57:34 -0000       1.85
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2014-12-01 11:58+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-01-05 13:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -240,12 +241,19 @@
 msgstr "「代替物」"
 
 #. type: Content of: <p>
-msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+#, fuzzy
+#| msgid ""
+#| "We don't describe free software as an &ldquo;alternative,&rdquo; because "
+#| "that presumes that other &ldquo;alternatives&rdquo; to free software are "
+#| "legitimate and we should coexist with them.  That word frames an issue "
+#| "with the assumption that it is good to have lots of &ldquo;"
+#| "alternatives&rdquo; to choose from."
+msgid ""
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 
"わたしたちは自由ソフトウェアを「代替物」とは呼びません。なぜなら、それでは自"
 
"由ソフトウェアのほかの「代替物」は妥当であって、それらとå
…±å­˜ã™ã¹ãã¨å‰æã™ã‚‹"
@@ -253,13 +261,22 @@
 "う仮定の問題があります。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We believe that distribution as free software is the only ethical way to "
+#| "make software available for others to use.  The other methods, <a href=\"/"
+#| "philosophy/free-software-even-more-important.html\">nonfree software</a> "
+#| "and <a href=\"/philosophy/who-does-that-server-really-serve.html"
+#| "\">Service as a Software Substitute</a> subjugate their users.  We do not "
+#| "think that those should continue to exist as &ldquo;alternatives&rdquo; "
+#| "to free software."
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
 "philosophy/free-software-even-more-important.html\">nonfree software</a> and "
 "<a href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 
"わたしたちは、ほかの人が使うようにソフトウェアを提供するには、自由ソフトウェ"
 "アとしてのé…
å¸ƒãŒå”¯ä¸€ã®å€«ç†çš„な方法であると信じています。ほかの方法、<a
 href="
@@ -1860,9 +1877,13 @@
 "translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#| "2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
 "2009, 2010, 2011, 2012 Free Software Foundation, Inc."

Index: philosophy/po/words-to-avoid.pot
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.pot,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- philosophy/po/words-to-avoid.pot    30 Nov 2014 09:57:54 -0000      1.87
+++ philosophy/po/words-to-avoid.pot    5 Jan 2015 13:57:34 -0000       1.88
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -227,11 +227,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 
 #. type: Content of: <p>
@@ -241,8 +241,8 @@
 "href=\"/philosophy/free-software-even-more-important.html\">nonfree "
 "software</a> and <a "
 "href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 
 #. type: Content of: <h4>
@@ -1389,7 +1389,7 @@
 #. type: Content of: <div><p>
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: philosophy/po/words-to-avoid.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru.po,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- philosophy/po/words-to-avoid.ru.po  30 Nov 2014 17:27:39 -0000      1.99
+++ philosophy/po/words-to-avoid.ru.po  5 Jan 2015 13:57:34 -0000       1.100
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+0000\n"
 "PO-Revision-Date: 2014-11-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-01-05 13:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -322,12 +323,27 @@
 "&rdquo;"
 
 #. type: Content of: <p>
-msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+# | We don't describe free software as an [-&ldquo;alternative,&rdquo;-]
+# | {+&ldquo;alternative&rdquo; to proprietary,+} because that {+word+}
+# | presumes [-that other-] {+all the+} &ldquo;alternatives&rdquo; [-to free
+# | software-] are legitimate and [-we should-] {+each additional one makes
+# | users better off.  In effect, it assumes that free software ought to+}
+# | coexist with [-them.  That word frames an issue with the assumption-]
+# | {+software+} that [-it is good to have lots of &ldquo;alternatives&rdquo;
+# | to choose from.-] {+does not respect users' freedom.+}
+#, fuzzy
+#| msgid ""
+#| "We don't describe free software as an &ldquo;alternative,&rdquo; because "
+#| "that presumes that other &ldquo;alternatives&rdquo; to free software are "
+#| "legitimate and we should coexist with them.  That word frames an issue "
+#| "with the assumption that it is good to have lots of &ldquo;"
+#| "alternatives&rdquo; to choose from."
+msgid ""
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 "Мы не описываем свободные программы как 
&ldquo;альтернативу&rdquo;, потому "
 "что это подразумевает, что другие 
&ldquo;альтернативы&rdquo; свободным "
@@ -336,13 +352,30 @@
 "множество &ldquo;альтернатив&rdquo; хорошо."
 
 #. type: Content of: <p>
+# | We believe that distribution as free software is the only ethical way to
+# | make software available for others to use.  The other methods, <a
+# | href=\"/philosophy/free-software-even-more-important.html\">nonfree
+# | software</a> and <a
+# | href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a
+# | Software Substitute</a> subjugate their users.  We do not think [-that
+# | those should continue-] {+it is good+} to [-exist as-] {+offer users
+# | those+} &ldquo;alternatives&rdquo; to free software.
+#, fuzzy
+#| msgid ""
+#| "We believe that distribution as free software is the only ethical way to "
+#| "make software available for others to use.  The other methods, <a href=\"/"
+#| "philosophy/free-software-even-more-important.html\">nonfree software</a> "
+#| "and <a href=\"/philosophy/who-does-that-server-really-serve.html"
+#| "\">Service as a Software Substitute</a> subjugate their users.  We do not "
+#| "think that those should continue to exist as &ldquo;alternatives&rdquo; "
+#| "to free software."
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
 "philosophy/free-software-even-more-important.html\">nonfree software</a> and "
 "<a href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 "Мы убеждены, что единственным этичным 
способом распространения программ "
 "являются свободные программы. Другие 
методы, <a href=\"/philosophy/free-"
@@ -2132,9 +2165,16 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
+# | 2008, 2009, 2010, 2011, [-2012-] {+2012, 2015+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#| "2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
 "2009, 2010, 2011, 2012 Free Software Foundation, Inc."

Index: philosophy/po/words-to-avoid.sq.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sq.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- philosophy/po/words-to-avoid.sq.po  10 Dec 2014 18:29:56 -0000      1.41
+++ philosophy/po/words-to-avoid.sq.po  5 Jan 2015 13:57:35 -0000       1.42
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+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"
@@ -236,11 +236,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 
 #. type: Content of: <p>
@@ -249,8 +249,8 @@
 "make software available for others to use.  The other methods, <a href=\"/"
 "philosophy/free-software-even-more-important.html\">nonfree software</a> and "
 "<a href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 
 #. type: Content of: <h4>
@@ -1397,9 +1397,13 @@
 "standards/README.translations.html\">README për përkthimet</a>."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#| "2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 "Të drejta Kopjimi &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, "
 "2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."

Index: philosophy/po/words-to-avoid.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sr.po,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- philosophy/po/words-to-avoid.sr.po  2 Dec 2014 11:01:48 -0000       1.95
+++ philosophy/po/words-to-avoid.sr.po  5 Jan 2015 13:57:35 -0000       1.96
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+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"
@@ -307,11 +307,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 
 #. type: Content of: <p>
@@ -320,8 +320,8 @@
 "make software available for others to use.  The other methods, <a href=\"/"
 "philosophy/free-software-even-more-important.html\">nonfree software</a> and "
 "<a href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 
 # type: Content of: <h4>
@@ -2128,7 +2128,7 @@
 #| "2008, 2009 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 "<b>Ауторска права:</b><br />Copyright &copy; 1996, 1997, 1998, 
1999, 2001, "
 "2002, 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc."

Index: philosophy/po/words-to-avoid.tr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.tr.po,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- philosophy/po/words-to-avoid.tr.po  30 Nov 2014 09:57:55 -0000      1.66
+++ philosophy/po/words-to-avoid.tr.po  5 Jan 2015 13:57:35 -0000       1.67
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-11-30 09:55+0000\n"
+"POT-Creation-Date: 2015-01-05 13:55+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"
@@ -392,11 +392,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"We don't describe free software as an &ldquo;alternative,&rdquo; because "
-"that presumes that other &ldquo;alternatives&rdquo; to free software are "
-"legitimate and we should coexist with them.  That word frames an issue with "
-"the assumption that it is good to have lots of &ldquo;alternatives&rdquo; to "
-"choose from."
+"We don't describe free software as an &ldquo;alternative&rdquo; to "
+"proprietary, because that word presumes all the &ldquo;alternatives&rdquo; "
+"are legitimate and each additional one makes users better off.  In effect, "
+"it assumes that free software ought to coexist with software that does not "
+"respect users' freedom."
 msgstr ""
 
 #. type: Content of: <p>
@@ -405,8 +405,8 @@
 "make software available for others to use.  The other methods, <a href=\"/"
 "philosophy/free-software-even-more-important.html\">nonfree software</a> and "
 "<a href=\"/philosophy/who-does-that-server-really-serve.html\">Service as a "
-"Software Substitute</a> subjugate their users.  We do not think that those "
-"should continue to exist as &ldquo;alternatives&rdquo; to free software."
+"Software Substitute</a> subjugate their users.  We do not think it is good "
+"to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 
 # type: Content of: <h4>
@@ -2260,7 +2260,7 @@
 #| "2008, 2009 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+"2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
 "2009 Free Software Foundation, Inc."



reply via email to

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