www-commits
[Top][All Lists]
Advanced

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

www help/po/evaluation.de.po help/po/evaluation...


From: GNUN
Subject: www help/po/evaluation.de.po help/po/evaluation...
Date: Sat, 06 Jun 2015 10:28:25 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/06/06 10:28:25

Modified files:
        help/po        : evaluation.de.po evaluation.es.po 
                         evaluation.fr.po evaluation.pot 
        philosophy     : open-source-misses-the-point.nl.html 
                         words-to-avoid.ru.html 
        philosophy/po  : open-source-misses-the-point.nl-en.html 
                         open-source-misses-the-point.nl.po 
                         words-to-avoid.ru-en.html words-to-avoid.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/help/po/evaluation.de.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/help/po/evaluation.es.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/help/po/evaluation.fr.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/help/po/evaluation.pot?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/open-source-misses-the-point.nl.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.ru.html?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.nl-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.nl.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru-en.html?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.122&r2=1.123

Patches:
Index: help/po/evaluation.de.po
===================================================================
RCS file: /web/www/www/help/po/evaluation.de.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- help/po/evaluation.de.po    5 Feb 2015 16:04:29 -0000       1.41
+++ help/po/evaluation.de.po    6 Jun 2015 10:28:16 -0000       1.42
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evaluation.html\n"
-"POT-Creation-Date: 2014-11-05 18:57+0000\n"
+"POT-Creation-Date: 2015-06-06 10:25+0000\n"
 "PO-Revision-Date: 2014-11-24 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-06-06 10:25+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU Software Evaluation - GNU Project - Free Software Foundation"
@@ -41,11 +42,23 @@
 "können."
 
 #. type: Content of: <p>
+# | Please take your time filling out the questionnaire.  We've written it as
+# | preformatted text so you can copy it to your system and fill it out with
+# | some care.  When you're done, please email it to <a
+# | [-href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>-]
+# | {+href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>+} (as plain
+# | text).
+#, fuzzy
+#| msgid ""
+#| "Please take your time filling out the questionnaire.  We've written it as "
+#| "preformatted text so you can copy it to your system and fill it out with "
+#| "some care.  When you're done, please email it to <a href=\"mailto:gnueval-";
+#| "address@hidden">&lt;address@hidden&gt;</a> (as plain text)."
 msgid ""
 "Please take your time filling out the questionnaire.  We've written it as "
 "preformatted text so you can copy it to your system and fill it out with "
-"some care.  When you're done, please email it to <a href=\"mailto:gnueval-";
-"address@hidden">&lt;address@hidden&gt;</a> (as plain text)."
+"some care.  When you're done, please email it to <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a> (as plain text)."
 msgstr ""
 "Bitte nehmen Sie sich einen Augenblick Zeit, den Fragebogen auszufüllen. Der 
"
 "vorformatierten Text kann kopiert und auf Ihrem System ausgefüllt werden. "
@@ -590,20 +603,35 @@
 "Übersetzungen unserer Webseiten finden Sie in der <a href=\"/server/"
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
+# (C) 2011, 2012 FSF (formerly)
+# [-2010, 2013-] {+2014, 2015+} 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+# | This page is licensed under a <a rel=\"license\"
+# | [-href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative-]
+# | {+href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative+}
+# | Commons [-Attribution-NoDerivs 3.0 United States-]
+# | {+Attribution-NoDerivatives 4.0 International+} License</a>.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
-"Dieses Werk steht unter einer <a rel=\"license\" href=\"http://";
+"Dieses Werk ist lizenziert unter einer <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
-"Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika Lizenz</"
-"a>."
+"Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika</a>-"
+"Lizenz."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -617,6 +645,19 @@
 msgid "Updated:"
 msgstr "Aktualisierung:"
 
+#~ msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
+
+#~ msgid ""
+#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
+#~ "NoDerivs 3.0 United States License</a>."
+#~ msgstr ""
+#~ "Dieses Werk steht unter einer <a rel=\"license\" href=\"http://";
+#~ "creativecommons.org/licenses/by-nd/3.0/us/deed.de\">Creative Commons "
+#~ "Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika "
+#~ "Lizenz</a>."
+
 #~ msgid ""
 #~ "So, in addition to the questionnaire, please read the GNU policies in the "
 #~ "<a href=\"/prep/maintain_toc.html\">Information for Maintainers of GNU "

Index: help/po/evaluation.es.po
===================================================================
RCS file: /web/www/www/help/po/evaluation.es.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- help/po/evaluation.es.po    5 Jun 2015 12:06:35 -0000       1.6
+++ help/po/evaluation.es.po    6 Jun 2015 10:28:16 -0000       1.7
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evaluation.html\n"
-"POT-Creation-Date: 2014-11-05 18:57+0000\n"
+"POT-Creation-Date: 2015-06-06 10:25+0000\n"
 "PO-Revision-Date: 2014-12-07 20:05+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <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-06-06 10:25+0000\n"
 "X-Poedit-Language: Spanish\n"
 
 #. type: Content of: <title>
@@ -44,11 +45,23 @@
 "la información necesaria para evaluarlo lo antes posible."
 
 #. type: Content of: <p>
+# | Please take your time filling out the questionnaire.  We've written it as
+# | preformatted text so you can copy it to your system and fill it out with
+# | some care.  When you're done, please email it to <a
+# | [-href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>-]
+# | {+href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>+} (as plain
+# | text).
+#, fuzzy
+#| msgid ""
+#| "Please take your time filling out the questionnaire.  We've written it as "
+#| "preformatted text so you can copy it to your system and fill it out with "
+#| "some care.  When you're done, please email it to <a href=\"mailto:gnueval-";
+#| "address@hidden">&lt;address@hidden&gt;</a> (as plain text)."
 msgid ""
 "Please take your time filling out the questionnaire.  We've written it as "
 "preformatted text so you can copy it to your system and fill it out with "
-"some care.  When you're done, please email it to <a href=\"mailto:gnueval-";
-"address@hidden">&lt;address@hidden&gt;</a> (as plain text)."
+"some care.  When you're done, please email it to <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a> (as plain text)."
 msgstr ""
 "Tómese por favor el tiempo necesario para rellenar el cuestionario <a href="
 "\"#TransNote1\" id=\"TransNote1-rev\"><sup>[1]</sup></a>. Lo hemos escrito "
@@ -644,18 +657,21 @@
 "de este sitio web."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Esta página está bajo licencia <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/deed.es_ES\">Creative Commons "
-"Reconocimiento-SinObraDerivada 3.0 Estados Unidos de América</a>."
+"creativecommons.org/licenses/by-nd/4.0/deed.es_ES\">Creative Commons "
+"Reconocimiento-SinObraDerivada 4.0 Internacional</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -668,3 +684,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización:"
+
+#~ msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."

Index: help/po/evaluation.fr.po
===================================================================
RCS file: /web/www/www/help/po/evaluation.fr.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- help/po/evaluation.fr.po    7 Feb 2015 14:17:15 -0000       1.41
+++ help/po/evaluation.fr.po    6 Jun 2015 10:28:16 -0000       1.42
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evaluation\n"
-"POT-Creation-Date: 2014-11-05 18:57+0000\n"
+"POT-Creation-Date: 2015-06-06 10:25+0000\n"
 "PO-Revision-Date: 2015-02-07 15:10+0100\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-06-06 10:25+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -42,11 +43,23 @@
 "dans les meilleurs délais."
 
 #. type: Content of: <p>
+# | Please take your time filling out the questionnaire.  We've written it as
+# | preformatted text so you can copy it to your system and fill it out with
+# | some care.  When you're done, please email it to <a
+# | [-href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>-]
+# | {+href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>+} (as plain
+# | text).
+#, fuzzy
+#| msgid ""
+#| "Please take your time filling out the questionnaire.  We've written it as "
+#| "preformatted text so you can copy it to your system and fill it out with "
+#| "some care.  When you're done, please email it to <a href=\"mailto:gnueval-";
+#| "address@hidden">&lt;address@hidden&gt;</a> (as plain text)."
 msgid ""
 "Please take your time filling out the questionnaire.  We've written it as "
 "preformatted text so you can copy it to your system and fill it out with "
-"some care.  When you're done, please email it to <a href=\"mailto:gnueval-";
-"address@hidden">&lt;address@hidden&gt;</a> (as plain text)."
+"some care.  When you're done, please email it to <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a> (as plain text)."
 msgstr ""
 "Prenez votre temps pour remplir ce questionnaire. Nous l'avons écrit en "
 "texte préformaté pour que vous puissiez le copier sur votre système et le "
@@ -592,19 +605,28 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "This page is licensed under a <a rel=\"license\" href=\"http://";
+#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-"NoDerivs 3.0 United States License</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Cette page peut être utilisée suivant les conditions de la licence <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";
-"\">Creative Commons attribution de paternité, pas de modification, 3.0 
États-"
-"Unis (CC BY-ND 3.0 US)</a>."
+"\"license\" href=\"http://creativecommons.org/licenses/by-nd/4.0/deed.fr";
+"\">Creative Commons attribution, pas de modification, 4.0 international "
+"(CC BY-ND 4.0)</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -617,3 +639,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."

Index: help/po/evaluation.pot
===================================================================
RCS file: /web/www/www/help/po/evaluation.pot,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- help/po/evaluation.pot      5 Nov 2014 19:01:11 -0000       1.23
+++ help/po/evaluation.pot      6 Jun 2015 10:28:16 -0000       1.24
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evaluation.html\n"
-"POT-Creation-Date: 2014-11-05 18:57+0000\n"
+"POT-Creation-Date: 2015-06-06 10:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
 msgid "GNU Software Evaluation - GNU Project - Free Software Foundation"
@@ -40,8 +41,7 @@
 "Please take your time filling out the questionnaire.  We've written it as "
 "preformatted text so you can copy it to your system and fill it out with "
 "some care.  When you're done, please email it to <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> (as "
-"plain text)."
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> (as plain text)."
 msgstr ""
 
 #. type: Content of: <p>
@@ -373,14 +373,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Attribution-NoDerivs 3.0 United States License</a>."
+"href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons "
+"Attribution-NoDerivatives 4.0 International License</a>."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: philosophy/open-source-misses-the-point.nl.html
===================================================================
RCS file: /web/www/www/philosophy/open-source-misses-the-point.nl.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/open-source-misses-the-point.nl.html     9 Feb 2015 20:35:06 
-0000       1.15
+++ philosophy/open-source-misses-the-point.nl.html     6 Jun 2015 10:28:17 
-0000       1.16
@@ -1,9 +1,3 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/open-source-misses-the-point.nl.po">
- http://www.gnu.org/philosophy/po/open-source-misses-the-point.nl.po</a>'
- --><!--#set var="ORIGINAL_FILE" 
value="/philosophy/open-source-misses-the-point.html"
- --><!--#set var="DIFF_FILE" 
value="/philosophy/po/open-source-misses-the-point.nl-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2013-02-11" -->
 <!--#set var="ENGLISH_PAGE" 
value="/philosophy/open-source-misses-the-point.en.html" -->
 
 <!--#include virtual="/server/header.nl.html" -->
@@ -15,7 +9,6 @@
 
 <!--#include virtual="/philosophy/po/open-source-misses-the-point.translist" 
-->
 <!--#include virtual="/server/banner.nl.html" -->
-<!--#include virtual="/server/outdated.nl.html" -->
 <h2>Waarom &ldquo;Open Bron&rdquo; de essentie van Vrije Software niet 
begrijpt.</h2>
 
 <p>door <strong>Richard Stallman</strong></p>
@@ -79,12 +72,19 @@
 software essentieel omdat alleen dit de vrijheid van gebruikers
 waarborgt. Open bron daarentegen gaat het alleen om hoe software
 &ldquo;beter&rdquo; te maken &mdash; alleen vanuit een praktisch oogpunt.
-Het beweert dat niet-vrije software een niet-optimale oplossing is. Voor de
-vrije software beweging echter is niet-vrije software een sociaal probleem
-en de overgang naar vrije software de oplossing.</p>
-
-<p>&ldquo;Vrije software&rdquo;. &ldquo;Open bron&rdquo;. Het is dezelfde
-software, maakt het uit welke benaming je gebruikt? Jazeker, want ze
+Het beweert dat niet-vrije software een niet-optimale oplossing is. De
+discussie binnen &ldquo;open bron&rdquo; gaat niet over goed of slecht maar
+alleen over populariteit en succes; hier een <a
+href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>typerend
+voorbeeld</a>.</p>
+
+<p>Voor de vrije software beweging echter is niet-vrije software een sociaal
+probleem wat je oplost met het niet gebruiken ervan en een vrij alternatief
+ervan in gebruik te nemen.</p>
+
+<p>&ldquo;Vrije software&rdquo;. &ldquo;Open bron&rdquo;. Als het dezelfde
+software is (<a href="/philosophy/free-open-overlap.html">of bijna</a>),
+maakt het dan uit welke benaming je gebruikt? Jazeker, want ze
 vertegenwoordigen verschillende principes. Want hoewel ieder vrij programma
 je die vrijheid nu geeft, zal het niet blijvend zijn wanneer je mensen dat
 vrijheidsgevoel niet bijbrengt. Als je dat belangrijk vindt kun je maar
@@ -101,21 +101,25 @@
 minder strikte criteria dan vrije software. Voor zover wij weten voldoet
 alle vrije software ook aan de criteria van open source. Bijna alle open
 source software is vrije software maar er zijn uitzonderingen. Allereerst
-zijn er open source licenties die teveel beperkingen bevatten waardoor ze
-geen vrije software licenties zijn. Gelukkig zijn er slechts weinig
-programma's die een dergelijke licentie gebruiken.</p>
+zijn er licenties die teveel beperkingen bevatten waardoor ze geen vrije
+software licenties zijn. Bijvoorbeeld &ldquo;Open Watcom&rdquo; is niet vrij
+want de licentie staat het veranderen van de code voor eigen gebruik niet
+toe. Gelukkig zijn er slechts weinig programma's die een dergelijke licentie
+gebruiken.</p>
 
 <p>Ten tweede, en veel belangrijker, bevatten veel apparaten met computers erin
-(ook veel Android apparaten) uitvoerbare programma's afkomstig uit vrije
-software broncode waarbij deze apparaten het niet toelaten dat de gebruiker
-zelf gewijzigde versies van die programma's gaan installeren; alleen
-&eacute;&eacute;n speicaal bedrijf kan dit doen. We noemen die apparaten
-&ldquo;tirannen&rdquo;  en in de praktijk noemen we dit
-&ldquo;tivoization&rdquo;, genoemd naar het apparaat waar we het voor het
-eerst constateerden. Deze uitvoerbare programma's zijn geen vrije software,
-ook al is de broncode waar het van afstamt wel. De voorwaarden voor open
-source onderkennen dit probleem niet; men maakt zich alleen druk om de
-licenties van de broncode.</p>
+uitvoerbare programma's afkomstig uit vrije software broncode waarbij deze
+apparaten het niet toelaten dat de gebruiker zelf gewijzigde versies van die
+programma's gaan installeren; alleen &eacute;&eacute;n speciaal bedrijf kan
+dit doen. We noemen die apparaten &ldquo;tirannen&rdquo;  en in de praktijk
+noemen we dit &ldquo;tivoization&rdquo;, genoemd naar het apparaat waar we
+het voor het eerst constateerden (de Tivo). Deze uitvoerbare programma's
+zijn geen vrije software, ook al is de broncode waar het van afstamt wel.</p>
+
+<p>Open bron erkennen dit probleem niet; het gaat ze alleen om het licenseren
+van de broncode. Daardoor zijn deze niet te wijzigen programma's, ook al
+zijn ze gebouwd op vrije code zoals Linux wel open bron maar niet vrij. Veel
+Android producten hebben dergelijke  niet-vrije programma's van Linux.</p>
 
 <h3>Misverstanden over &ldquo;vrije software&rdquo; en &ldquo;open 
bron&rdquo;</h3>
 
@@ -188,10 +192,13 @@
 software licenties</a> naast de GNU GPL.</p>
 
 <p>Het begrip &ldquo;open bron&rdquo; is verder opgerekt door toepassingen op
-ander terreinen zoals overheid, onderwijs en wetenschap, waar men gene
+ander terreinen zoals overheid, onderwijs en wetenschap, waar men geen
 broncode kent en de criteria voor software licenties niet gelden. Het enige
 wat ze gemeen hebben is dat ze mensen uitnodigen deel te nemen. De betekenis
-wordt zo opgerekt dat het alleen nog &ldquo;meedoen&rdquo; betekent.</p>
+wordt zover opgerekt dat het alleen nog &ldquo;meedoen&rdquo; betekent. Het
+is verworden tot een <a
+href="http://www.nytimes.com/2013/03/17/opinion/sunday/morozov-open-and-closed.html";>
+modewoord</a>.</p>
 
 <h3>Verschillende uitgangspunten kunnen tot dezelfde conclusies
 leiden&hellip;maar niet altijd</h3>
@@ -250,12 +257,13 @@
 
 <p>Met steun van de film- en muziek-industrie wordt meer en meer software
 gemaakt die juist ontworpen is om gebruikers te beperken. Deze kwade opzet
-noemt men ook wel DRM of Digital Rights Management (Digitaal Rechten Beheer)
-(zie <a href="http://defectivebydesign.org/";>DefectiveByDesign.org</a>), en
-is de tegenpool van de vrijheid die vrije software wil bewerkstelligen. En
-niet beperkt tot het gedachtengoed: het doel van DRM is immers het inperken
-van je vrijheid en DRM ontwikkelaars proberen het moeilijk of zelfs illegaal
-te maken om software te wijzigen die DRM implementeert.</p>
+noemt men ook wel DRM of Digital Restrictions Management (digitaal
+toegangsbeheer - zie <a
+href="http://defectivebydesign.org/";>DefectiveByDesign.org</a>), en is de
+tegenpool van de vrijheid die vrije software wil bewerkstelligen. En niet
+beperkt tot het gedachtengoed: het doel van DRM is immers het inperken van
+je vrijheid en DRM ontwikkelaars proberen het moeilijk of zelfs illegaal te
+maken om software te wijzigen die DRM implementeert.</p>
 
 <p>Sommige voorstanders hebben zelfs voorgesteld &ldquo;open bron DRM&rdquo; te
 ontwikkelen. Het idee daarbij is dat, met het publiceren van de broncode en
@@ -319,6 +327,38 @@
 niet over vrijheid reppen.  Om deze neiging te onderdrukken moeten we het
 m&eacute;&eacute;r over vrijheid hebben, niet minder.</p>
 
+<h3>&ldquo;FLOSS&rdquo; and &ldquo;FOSS&rdquo;</h3>
+
+<p> De begrippen &ldquo;FLOSS&rdquo; en &ldquo;FOSS&rdquo; waren <a
+href="/philosophy/floss-and-foss.html"> inwisselbaar tussen vrije software
+en open bron</a>.  Wanneer je neutraal wilt blijven kun je beter
+&ldquo;FLOSS&rdquo; gebruiken. Maar wanneer je op wilt komen voor je
+vrijheid moet je geen neutrale termen gebruiken. Dan moet je mensen laten
+zien dat je die steunt.</p>
+
+<h3>Rivalen voor bewustzijn</h3>
+
+<p>&ldquo;Vrij&rdquo; en &ldquo;open&rdquo; zijn rivalen voor bewustzijn bij de
+consument.  &ldquo;Vrije Software&rdquo; en &ldquo;open bron&rdquo; zijn
+verschillende ideeën maar, concurreren bij het innemen van dezelfde
+conceptuele ruimte die de meeste mensen hebben als zij naar software
+kijken.  Wanneer mensen gewend raken om &ldquo;open bron&rdquo; te zeggen en
+te denken dan vormt dat voor hen een obstakel voor het begrijpen van de
+filosofie van de Vrije Softwarebeweging en het denken erover. Als ze ons en
+onze software al associëren met het woord &ldquo;open,&rdquo; dan zouden we
+ze wellicht intellectueel moeten shockeren voordat zij inzien dat wij voor
+iets <em>anders</em> staan. Iedere activiteit die het woord
+&ldquo;open&rdquo; promoot heeft de neiging om het gordijn te verlengen dat
+de ideeën van de Vrije Softwarebeweging verbergt.</p>
+
+<p>En dus adviseren we aan Vrije Software-activisten om te weigeren mee te
+werken aan activiteiten die zichzelf &ldquo;open&rdquo; noemen. Ook al is de
+activiteit van zichzelf goed, ieder bijdrage daaraan doet ook een beetje
+kwaad. Er zijn meer dan voldoende andere goede activiteiten die
+zichzelf&ldquo;vrij&rdquo; of &ldquo;libre&rdquo; noemen. Ieder bijdrage aan
+deze projecten brengt iets extra goeds met zich mee. Waarom zou je dan niet
+voor een van deze goede en nuttige projecten kiezen?</p>
+
 <h3>Conclusie</h3>
 
 <p>Terwijl voorstanders van open bron meer gebruikers onze gemeenschap in
@@ -387,7 +427,7 @@
 website.</p>
 </div>
 
-<p>Copyright &copy; 2007, 2010, 2012 Richard Stallman</p>
+<p>Copyright &copy; 2007, 2010, 2012, 2015 Richard Stallman</p>
 
 <p>Deze pagina valt onder de <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.nl";>Creative
@@ -402,7 +442,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2015/02/09 20:35:06 $
+$Date: 2015/06/06 10:28:17 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/words-to-avoid.ru.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.ru.html,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- philosophy/words-to-avoid.ru.html   29 May 2015 07:52:25 -0000      1.61
+++ philosophy/words-to-avoid.ru.html   6 Jun 2015 10:28:17 -0000       1.62
@@ -68,14 +68,21 @@
 economy</span> (экономика обмена)</a>&rdquo; | &ldquo;<a 
href="#Skype"><span xml:lang="en" lang="en">Skype</span> (общаться
 по Скайпу)</a>&rdquo; | &ldquo;<a href="#SoftwareIndustry"><span 
xml:lang="en" lang="en">Software
 Industry</span> (программная индустрия)</a>&rdquo; | 
&ldquo;<a href="#SourceModel"><span xml:lang="en" lang="en">Source
-model</span> (модель исходного текста)</a>&rdquo; | 
&ldquo;<a href="#Theft"><span xml:lang="en" lang="en">Theft</span>
+model</span> (модель исходного текста)</a>&rdquo; |
+
+<!--#if expr="$LANGUAGE_SUFFIX = /^.()$/" -->
+<!-- TRANSLATORS: translate if this word is used often in your
+     language to refer to mobile computers; otherwise,
+     fill the translation with a space. -->
+  <!--#endif -->
+&ldquo;<a href="#Theft"><span xml:lang="en" lang="en">Theft</span>
 (воровство)</a>&rdquo; | &ldquo;<a href="#TrustedComputing"><span 
xml:lang="en" lang="en">Trusted
 Computing</span> (доверенные вычисления)</a>&rdquo; | 
&ldquo;<a href="#Vendor"><span xml:lang="en" lang="en">Vendor</span>
 (товаропроизводитель)</a>&rdquo;
 </p>
 
-<h4 id="Alternative">&ldquo;<span xml:lang="en" lang="en">Alternative</span>
-(альтернативный)&rdquo;</h4>
+<h3 id="Alternative">&ldquo;<span xml:lang="en" lang="en">Alternative</span>
+(альтернативный)&rdquo;</h3>
 <p>
 Мы не описываем свободные программы как 
&ldquo;альтернативу&rdquo;
 несвободным, потому что это слово 
подразумевает, что все
@@ -94,7 +101,7 @@
 пользователям такие &ldquo;альтернативы&rdquo; 
свободным программам хорошо.
 </p>
 
-<h4 id="BSD-style">&ldquo;<span xml:lang="en" lang="en">BSD-style</span> (в 
стиле BSD)&rdquo;</h4>
+<h3 id="BSD-style">&ldquo;<span xml:lang="en" lang="en">BSD-style</span> (в 
стиле BSD)&rdquo;</h3>
 <p>
 Выражение &ldquo;лицензия в стиле BSD&rdquo; 
приводит к путанице, потому что
 она <a href="/philosophy/bsd.html"> сваливает в одну кучу 
лицензии, у
@@ -107,7 +114,7 @@
 речь</a> и избегать расплывчатого выражения 
&ldquo;в стиле BSD&rdquo;.</p>
 
 
-<h4 id="Closed">&ldquo;<span xml:lang="en" lang="en">Closed</span> 
(закрытый)&rdquo;</h4>
+<h3 id="Closed">&ldquo;<span xml:lang="en" lang="en">Closed</span> 
(закрытый)&rdquo;</h3>
 <p>
 Описание несвободных программ как 
&ldquo;закрытых&rdquo; отсылает к термину
 &ldquo;открытый исходный текст&rdquo;. Мы, 
участники движения за свободное
@@ -120,8 +127,8 @@
 
href="/philosophy/categories.html#ProprietarySoftware">несвободными</a>&rdquo;.</p>
 
 
-<h4 id="CloudComputing">&ldquo;<span xml:lang="en" lang="en">Cloud 
Computing</span> (облачные
-вычисления)&rdquo;</h4>
+<h3 id="CloudComputing">&ldquo;<span xml:lang="en" lang="en">Cloud 
Computing</span> (облачные
+вычисления)&rdquo;</h3>
 <p>
 Выражение &ldquo;облачные вычисления&rdquo; (или 
просто <a
 name="Cloud">&ldquo;облако&rdquo;</a> в контексте 
вычислительной
@@ -197,7 +204,7 @@
 которые мотивируют нас.
 </p>
 
-<h4 id="Commercial">&ldquo;<span xml:lang="en" lang="en">Commercial</span> 
(коммерческий)&rdquo;</h4>
+<h3 id="Commercial">&ldquo;<span xml:lang="en" lang="en">Commercial</span> 
(коммерческий)&rdquo;</h3>
 <p>
 Пожалуйста, не употребляйте слово 
&ldquo;коммерческий&rdquo; как синоним
 слова &ldquo;несвободный&rdquo;. Это смешивает 
две совершенно разных вещи.</p>
@@ -226,8 +233,8 @@
 &ldquo;коммерческий&rdquo; в этом смысле.</p>
 
 
-<h4 id="Compensation">&ldquo;<span xml:lang="en" lang="en">Compensation</span>
-(компенсация)&rdquo;</h4>
+<h3 id="Compensation">&ldquo;<span xml:lang="en" lang="en">Compensation</span>
+(компенсация)&rdquo;</h3>
 <p>
 Разговоры о &ldquo;компенсации авторам&rdquo; в 
связи с авторским правом
 несут предположение, что (1) авторское 
право существует ради авторов и (2)
@@ -243,7 +250,7 @@
 тех же издательских компаний, которые 
навязывают нам несправедливые законы.
 </p>
 
-<h4 id="Consume">&ldquo;<span xml:lang="en" lang="en">Consume</span> 
(потреблять)&rdquo;</h4>
+<h3 id="Consume">&ldquo;<span xml:lang="en" lang="en">Consume</span> 
(потреблять)&rdquo;</h3>
 <p>
 &ldquo;Потребление&rdquo; указывает на то, что мы 
делаем с пищей: мы
 перевариваем ее и пользуемся ею так, что 
она расходуется. По аналогии мы
@@ -262,7 +269,7 @@
 
 <p>См. также следующию статью.</p>
 
-<h4 id="Consumer">&ldquo;<span xml:lang="en" lang="en">Consumer</span> 
(потребитель)&rdquo;</h4>
+<h3 id="Consumer">&ldquo;<span xml:lang="en" lang="en">Consumer</span> 
(потребитель)&rdquo;</h3>
 <p>
 Слово &ldquo;потребитель&rdquo;, при 
употреблении в отношении пользователей
 вычислительной техники, нагружается 
предположениями, которые нам следует
@@ -303,7 +310,7 @@
 отмечалась и ранее</a>.
 </p>
 
-<h4 id="Content">&ldquo;<span xml:lang="en" lang="en">Content</span> 
(контент)&rdquo;</h4>
+<h3 id="Content">&ldquo;<span xml:lang="en" lang="en">Content</span> 
(контент)&rdquo;</h3>
 <p>
 Если вы хотите описать ощущение удобства и 
удовлетворения, употребляйте,
 пожалуйста, это слово по отношению к себе 
сколько угодно<a
@@ -344,8 +351,8 @@
 &ldquo;система редактирования сайтов&rdquo;.</p>
 
 
-<h4 id="CreativeCommonsLicensed">&ldquo;<span xml:lang="en" lang="en">Creative 
Commons licensed</span> (под
-лицензией Creative Commons)&rdquo;</h4>
+<h3 id="CreativeCommonsLicensed">&ldquo;<span xml:lang="en" lang="en">Creative 
Commons licensed</span> (под
+лицензией Creative Commons)&rdquo;</h3>
 <p>
 Самая важная лицензионная характеристика 
произведения&nbsp;&mdash; является
 ли оно свободным. Creative Commons публикует семь 
лицензий; три из них
@@ -363,7 +370,7 @@
 говорите.
 </p>
 
-<h4 id="Creator">&ldquo;<span xml:lang="en" lang="en">Creator</span> 
(создатель)&rdquo;</h4>
+<h3 id="Creator">&ldquo;<span xml:lang="en" lang="en">Creator</span> 
(создатель)&rdquo;</h3>
 <p>
 Слово &ldquo;создатель&rdquo; применительно к 
авторам неявно сравнивает их с
 божеством. Слово употребляется 
издателями, чтобы поднять моральную 
позицию
@@ -375,8 +382,8 @@
 выражения не эквивалентны: часто 
правообладатель не является автором.</p>
 
 
-<h4 id="DigitalGoods">&ldquo;<span xml:lang="en" lang="en">Digital 
Goods</span> (цифровые
-товары)&rdquo;</h4>
+<h3 id="DigitalGoods">&ldquo;<span xml:lang="en" lang="en">Digital 
Goods</span> (цифровые
+товары)&rdquo;</h3>
 <p>
 Выражение &ldquo;цифровые товары&rdquo; 
применительно к копиям авторских
 произведений идентифицирует их как 
физические товары&nbsp;&mdash; которые
@@ -388,8 +395,8 @@
 ценности которых не включают в себя 
свободу и сообщество.</p>
 
 
-<h4 id="DigitalLocks">&ldquo;<span xml:lang="en" lang="en">Digital 
Locks</span> (цифровые
-замки)&rdquo;</h4>
+<h3 id="DigitalLocks">&ldquo;<span xml:lang="en" lang="en">Digital 
Locks</span> (цифровые
+замки)&rdquo;</h3>
 <p>
 Выражение &ldquo;цифровые замки&rdquo; 
употребляется для обозначения
 цифрового управления ограничениями 
некоторыми его критиков. Проблема этого
@@ -420,8 +427,8 @@
 говорим, почему мы так поступаем.</p>
 
 
-<h4 id="DigitalRightsManagement">&ldquo;<span xml:lang="en" lang="en">Digital 
Rights Management</span>
-(цифровое управление правами)&rdquo;</h4>
+<h3 id="DigitalRightsManagement">&ldquo;<span xml:lang="en" lang="en">Digital 
Rights Management</span>
+(цифровое управление правами)&rdquo;</h3>
 <p>
 &ldquo;Цифровое управление правами&rdquo; (DRM) 
относится к техническим
 механизмам, спроектированным, чтобы 
налагать ограничения на пользователей
@@ -438,7 +445,7 @@
 href="http://DefectiveByDesign.org/";> кампании за 
упразднение цифрового
 управления ограничениями</a>.</p>
 
-<h4 id="Ecosystem">&ldquo;<span xml:lang="en" lang="en">Ecosystem</span> 
(экосистема)&rdquo;</h4>
+<h3 id="Ecosystem">&ldquo;<span xml:lang="en" lang="en">Ecosystem</span> 
(экосистема)&rdquo;</h3>
 <p>
 Не рекомендуется описывать сообщество 
свободного программного обеспечения
 или любое другое человеческое сообщество 
как &ldquo;экосистему&rdquo;,
@@ -462,7 +469,7 @@
 исчезающие виды, народные промыслы... и 
свободу пользователей компьютеров.
 </p>
 
-<h4 id="FLOSS">&ldquo;FLOSS&rdquo;</h4>
+<h3 id="FLOSS">&ldquo;FLOSS&rdquo;</h3>
 <p>
 Выражение &ldquo;FLOSS&rdquo;<a href="#tf4">[4]</a> 
придумано как способ <a
 href="/philosophy/floss-and-foss.html"> сохранять 
нейтралитет между
@@ -471,7 +478,7 @@
 &ldquo;FLOSS&rdquo;. Но если вы хотите показать, что 
отстаиваете свободу, не
 пользуйтесь нейтральным выражением.</p>
 
-<h4 id="ForFree">&ldquo;<span xml:lang="en" lang="en">For Free</span> 
(бесплатно)&rdquo;</h4>
+<h3 id="ForFree">&ldquo;<span xml:lang="en" lang="en">For Free</span> 
(бесплатно)&rdquo;</h3>
 <p>
 Если вы хотите сказать, что программа 
свободна, не говорите, пожалуйста, что
 она доступна &ldquo;бесплатно&rdquo;. Это 
выражение в точности означает
@@ -487,7 +494,7 @@
 Чтобы избежать путаницы, вы можете 
говорить, что программа доступна
 &ldquo;как свободная программа&rdquo;.</p>
 
-<h4 id="FOSS">&ldquo;FOSS&rdquo;</h4>
+<h3 id="FOSS">&ldquo;FOSS&rdquo;</h3>
 <p>
 Выражение &ldquo;FOSS&rdquo;<a href="#tf5">[5]</a> придумано 
как способ <a
 href="/philosophy/floss-and-foss.html"> сохранять 
нейтралитет между
@@ -496,8 +503,8 @@
 нейтралитет, то выражение &ldquo;FLOSS&ldquo; 
лучше. Но если вы хотите
 показать, что отстаиваете свободу, не 
пользуйтесь нейтральным выражением.</p>
 
-<h4 id="FreelyAvailable">&ldquo;<span xml:lang="en" lang="en">Freely 
Available</span> (свободно
-доступный)&rdquo;</h4>
+<h3 id="FreelyAvailable">&ldquo;<span xml:lang="en" lang="en">Freely 
Available</span> (свободно
+доступный)&rdquo;</h3>
 <p>
 Не употребляйте слова &ldquo;свободно 
доступные программы&rdquo; как синоним
 выражения &ldquo;свободные программы&rdquo;. Эти 
выражения не
@@ -508,8 +515,8 @@
 </p>
 
 
-<h4 id="Freeware">&ldquo;<span xml:lang="en" lang="en">Freeware</span> 
(бесплатные
-программы)&rdquo;</h4>
+<h3 id="Freeware">&ldquo;<span xml:lang="en" lang="en">Freeware</span> 
(бесплатные
+программы)&rdquo;</h3>
 <p>
 Не употребляйте, пожалуйста, выражение 
&ldquo;бесплатные программы&rdquo;
 как синоним &ldquo;свободных программ&rdquo;. 
Выражение &ldquo;бесплатная
@@ -536,8 +543,8 @@
 </p>
 
 
-<h4 id="GiveAwaySoftware">&ldquo;<span xml:lang="en" lang="en">Give Away 
Software</span> (раздавать
-программы)&rdquo;</h4>
+<h3 id="GiveAwaySoftware">&ldquo;<span xml:lang="en" lang="en">Give Away 
Software</span> (раздавать
+программы)&rdquo;</h3>
 <p>
 Употребление выражения &ldquo;раздавать&rdquo; 
в значении
 &ldquo;распространять программу в качестве 
свободной&rdquo; вводит в
@@ -547,7 +554,7 @@
 говорить &ldquo;выпускать в качестве 
свободной программы&rdquo;.</p>
 
 
-<h4 id="Google">&ldquo;<span xml:lang="en" lang="en">Google</span> 
(гуглить)&rdquo;</h4>
+<h3 id="Google">&ldquo;<span xml:lang="en" lang="en">Google</span> 
(гуглить)&rdquo;</h3>
 <p>
 Избегайте, пожалуйста, выражения 
&ldquo;гуглить&rdquo; в значении
 &ldquo;искать что-то по Интернету&rdquo;. 
&ldquo;Google&rdquo;&nbsp;&mdash;
@@ -559,7 +566,7 @@
 подтвердить.</p>
 
 
-<h4 id="Hacker">&ldquo;<span xml:lang="en" lang="en">Hacker</span> (х
акер)&rdquo;</h4>
+<h3 id="Hacker">&ldquo;<span xml:lang="en" lang="en">Hacker</span> (х
акер)&rdquo;</h3>
 <p>
 Хакер&nbsp;&mdash; это тот, кто <a
 href="http://stallman.org/articles/on-hacking.html";> получает 
удовольствие
@@ -575,8 +582,8 @@
 системы безопасности&nbsp;&mdash; это 
&ldquo;взломщики&rdquo;.</p>
 
 
-<h4 id="IntellectualProperty">&ldquo;<span xml:lang="en" 
lang="en">Intellectual Property</span>
-(интеллектуальная собственность)&rdquo;</h4>
+<h3 id="IntellectualProperty">&ldquo;<span xml:lang="en" 
lang="en">Intellectual Property</span>
+(интеллектуальная собственность)&rdquo;</h3>
 <p>
 Издатели и юристы любят описывать 
авторское право как
 &ldquo;интеллектуальную 
собственность&rdquo;&nbsp;&mdash; выражение,
@@ -607,8 +614,8 @@
 собственности&rdquo;</a>.</p>
 
 
-<h4 id="LAMP">&ldquo;<span xml:lang="en" lang="en">LAMP System</span> 
(система
-LAMP)&rdquo;</h4>
+<h3 id="LAMP">&ldquo;<span xml:lang="en" lang="en">LAMP System</span> 
(система
+LAMP)&rdquo;</h3>
 <p>
 &ldquo;LAMP&rdquo; означает &ldquo;Linux, Apache, MySQL,
 PHP&rdquo;&nbsp;&mdash; обычная комбинация программ 
для применения на
@@ -619,8 +626,8 @@
 </p>
 
 
-<h4 id="Linux">&ldquo;<span xml:lang="en" lang="en">Linux System</span> 
(система
-Linux)&rdquo;</h4>
+<h3 id="Linux">&ldquo;<span xml:lang="en" lang="en">Linux System</span> 
(система
+Linux)&rdquo;</h3>
 <p>
 Linux&nbsp;&mdash; название ядра, которое Линус 
Торвальдс разрабатывал
 начиная с&nbsp;1991&nbsp;года. Операционная 
система, в которой применяется
@@ -633,7 +640,7 @@
 </p>
 
 
-<h4 id="Market">&ldquo;<span xml:lang="en" lang="en">Market</span> 
(рынок)&rdquo;</h4>
+<h3 id="Market">&ldquo;<span xml:lang="en" lang="en">Market</span> 
(рынок)&rdquo;</h3>
 <p>
 Описание пользователей свободных 
программ или пользователей программ вообще
 как &ldquo;рынок&rdquo; вводит в заблуждение.</p>
@@ -652,8 +659,8 @@
 отрицать важность свободы и оправдывать 
несвободное программное обеспечение.</p>
 
 
-<h4 id="Monetize">&ldquo;<span xml:lang="en" lang="en">Monetize</span> 
(реализовывать,
-обращать в деньги)&rdquo;</h4>
+<h3 id="Monetize">&ldquo;<span xml:lang="en" lang="en">Monetize</span> 
(реализовывать,
+обращать в деньги)&rdquo;</h3>
 <p>
 Правильное определение понятия 
&ldquo;обращать в деньги&rdquo;&nbsp;&mdash;
 &ldquo;пользоваться чем-то в качестве 
валюты&rdquo;. Например, человеческие
@@ -673,8 +680,8 @@
 оно подчиняет прибыли все остальное, то 
оно едва ли останется этичным.</p>
 
 
-<h4 id="MP3Player">&ldquo;<span xml:lang="en" lang="en">MP3 Player</span> 
(проигрыватель
-MP3)&rdquo;</h4>
+<h3 id="MP3Player">&ldquo;<span xml:lang="en" lang="en">MP3 Player</span> 
(проигрыватель
+MP3)&rdquo;</h3>
 <p>
 В конце девяностых годов XX&nbsp;века стало 
возможным производство
 портативных твердотельных цифровых 
проигрывателей звука. Большинство из них
@@ -688,7 +695,7 @@
 звука&rdquo;, если это допускает контекст.</p>
 
 
-<h4 id="Open">&ldquo;<span xml:lang="en" lang="en">Open</span> 
(открытый)&rdquo;</h4>
+<h3 id="Open">&ldquo;<span xml:lang="en" lang="en">Open</span> 
(открытый)&rdquo;</h3>
 <p>
 Избегайте, пожалуйста, употребления слов 
&ldquo;открытый&rdquo; или
 &ldquo;открытый исходный текст&rdquo; как замены 
выражения &ldquo;свободная
@@ -701,7 +708,7 @@
 нас или нашу работу&nbsp;&mdash; это заставляет 
людей думать, что мы
 разделяем эти взгляды.</p>
 
-<h4 id="PC">&ldquo;<span xml:lang="en" lang="en">PC</span> (ПК)&rdquo;</h4>
+<h3 id="PC">&ldquo;<span xml:lang="en" lang="en">PC</span> (ПК)&rdquo;</h3>
 <p>
 Вполне допустимо употреблять сокращение 
&ldquo;ПК&rdquo; для указания на
 определенного рода вычислительную тех
нику, но не употребляйте его,
@@ -713,7 +720,7 @@
 Для компьютера под управлением Windows 
предложено сокращение &ldquo;<span
 xml:lang="en" lang="en">WC</span>&rdquo;.</p>
 
-<h4 id="Photoshop">&ldquo;<span xml:lang="en" 
lang="en">Photoshop</span>&rdquo;</h4>
+<h3 id="Photoshop">&ldquo;<span xml:lang="en" 
lang="en">Photoshop</span>&rdquo;</h3>
 <p>
 Избегайте, пожалуйста, употребления слова 
&ldquo;photoshop&rdquo; в качестве
 глагола, означающего любого рода 
манипуляции с фотографиями или
@@ -723,7 +730,7 @@
 программ для редактирования изображений, 
таких, как <a
 href="/software/gimp">GIMP</a>.</p>
 
-<h4 id="Piracy">&ldquo;<span xml:lang="en" lang="en">Piracy</span> 
(пиратство)&rdquo;</h4>
+<h3 id="Piracy">&ldquo;<span xml:lang="en" lang="en">Piracy</span> 
(пиратство)&rdquo;</h3>
 <p>
 Издатели часто указывают на копирование, 
которое они не одобрили, как на
 &ldquo;пиратство&rdquo;. Таким образом, они 
подразумевают, что это этически
@@ -750,7 +757,7 @@
 &ldquo;пиратство&rdquo; и &ldquo;кража&rdquo;&nbsp;&mdash; 
грязные
 выражения</a>.</p>
 
-<h4 id="PowerPoint">&ldquo;<span xml:lang="en" 
lang="en">PowerPoint</span>&rdquo;</h4>
+<h3 id="PowerPoint">&ldquo;<span xml:lang="en" 
lang="en">PowerPoint</span>&rdquo;</h3>
 <p>
 Избегайте, пожалуйста, употребления слова 
&ldquo;PowerPoint&rdquo; в
 значении любого рода программы для 
слайдовых
@@ -761,7 +768,7 @@
 системы TeX или программа Impress из пакета 
LibreOffice.org.</p>
 
 
-<h4 id="Protection">&ldquo;<span xml:lang="en" lang="en">Protection</span> 
(защита)&rdquo;</h4>
+<h3 id="Protection">&ldquo;<span xml:lang="en" lang="en">Protection</span> 
(защита)&rdquo;</h3>
 <p>
 Юристы издателей любят употреблять слово 
&ldquo;защита&rdquo; применительно
 к&nbsp;авторскому праву. Это слово 
подразумевает предотвращение разрушения
@@ -792,8 +799,8 @@
 управлением ограничениями (DRM)&nbsp;&mdash; см. 
сайт кампании &ldquo;<a
 href="http://DefectiveByDesign.org";>Дефект 
гарантирован</a>&rdquo;.</p>
 
-<h4 id="RAND">&ldquo;<span xml:lang="en" lang="en">RAND (Reasonable and
-Non-Discriminatory)</span> (обоснованный и 
недискриминационный)&rdquo;</h4>
+<h3 id="RAND">&ldquo;<span xml:lang="en" lang="en">RAND (Reasonable and
+Non-Discriminatory)</span> (обоснованный и 
недискриминационный)&rdquo;</h3>
 <p>
 В органах стандартизации, которые издают 
ограниченные патентами стандарты,
 запрещающие свободные программы, обычно 
есть правила получения патентных
@@ -823,7 +830,7 @@
 условием для этих лицензий является 
единообразные лицензионные отчисления.</p>
 
 
-<h4 id="SaaS">&ldquo;SaaS&rdquo; или 
&ldquo;программа-услуга&rdquo;</h4>
+<h3 id="SaaS">&ldquo;SaaS&rdquo; или 
&ldquo;программа-услуга&rdquo;</h3>
 <p>
 Раньше мы говорили, что SaaS (сокращение слов
 &ldquo;программа-услуга&rdquo;) представляет 
несправедливость, но потом мы
@@ -843,8 +850,8 @@
 vicio</span>&rdquo; слишком хороша, чтобы от нее 
отказываться.</p>
 
 
-<h4 id="SellSoftware">&ldquo;<span xml:lang="en" lang="en">Sell 
Software</span> (продавать
-программы)&rdquo;</h4>
+<h3 id="SellSoftware">&ldquo;<span xml:lang="en" lang="en">Sell 
Software</span> (продавать
+программы)&rdquo;</h3>
 <p>
 Выражение &ldquo;продавать программы&rdquo; 
неоднозначно. Строго говоря,
 обмен копии свободной программы на 
какую-то сумму денег является <a
@@ -859,8 +866,8 @@
 href="/philosophy/selling.html">Продажа свободных 
программ</a>&rdquo;.</p>
 
 
-<h4 id="SharingEconomy">&ldquo;<span xml:lang="en" lang="en">Sharing 
economy</span> (экономика
-обмена)&rdquo;</h4>
+<h3 id="SharingEconomy">&ldquo;<span xml:lang="en" lang="en">Sharing 
economy</span> (экономика
+обмена)&rdquo;</h3>
 <p>
 Выражение &ldquo;экономика обмена&rdquo; не 
очень подходит для обозначения
 таких услуг, как Uber или Airbnb, которые 
организуют деловые операции между
@@ -874,8 +881,8 @@
 сдельных услуг&rdquo;.</p>
 
 
-<h4 id="Skype">&ldquo;<span xml:lang="en" lang="en">Skype</span> 
(общаться по
-Скайпу)&rdquo;</h4>
+<h3 id="Skype">&ldquo;<span xml:lang="en" lang="en">Skype</span> 
(общаться по
+Скайпу)&rdquo;</h3>
 <p>
 Избегайте, пожалуйста, выражения 
&ldquo;общаться по Скайпу&rdquo; для
 обозначения любой видео- или телефонной 
связи по
@@ -889,8 +896,8 @@
 Скайпа</a>.</p>
 
 
-<h4 id="SoftwareIndustry">&ldquo;<span xml:lang="en" lang="en">Software 
Industry</span> (программная
-индустрия)&rdquo;</h4>
+<h3 id="SoftwareIndustry">&ldquo;<span xml:lang="en" lang="en">Software 
Industry</span> (программная
+индустрия)&rdquo;</h3>
 <p>
 Выражение &ldquo;программная индустрия&rdquo; 
поощряет людей представлять
 себе, что программы всегда 
разрабатываются чем-то вроде завода, а 
потом
@@ -910,8 +917,8 @@
 &ldquo;индустрию&rdquo; как 
&ldquo;автоматизированное производство
 материальных благ&rdquo;</a>.</p>
 
-<h4 id="SourceModel">&ldquo;<span xml:lang="en" lang="en">Source model</span> 
(модель исходного
-текста)&rdquo;</h4>
+<h3 id="SourceModel">&ldquo;<span xml:lang="en" lang="en">Source model</span> 
(модель исходного
+текста)&rdquo;</h3>
 <p>
 В Википедии выражение &ldquo;модель исх
одного текста&rdquo; употребляется
 неоднозначным и непонятным образом. Оно 
как будто относится к тому, как
@@ -924,7 +931,16 @@
 связной информации, но оно дает 
возможность сказать &ldquo;открытый исходный
 текст&rdquo; на страницах, описывающих 
свободные программы для компьютеров.</p>
 
-<h4 id="Theft">&ldquo;<span xml:lang="en" lang="en">Theft</span> 
(воровство)&rdquo;</h4>
+<!--#if expr="$LANGUAGE_SUFFIX = /^.()$/" -->
+<!-- TRANSLATORS: translate if this word is used often in your
+     language to refer to mobile computers; otherwise,
+     fill the translation with a space. -->
+<h3 id="Terminal"> </h3>
+
+<p> </p>
+
+<!--#endif -->
+<h3 id="Theft">&ldquo;<span xml:lang="en" lang="en">Theft</span> 
(воровство)&rdquo;</h3>
 <p>
 Сторонники чрезмерно жесткой, 
репрессивной формы авторского права часто
 употребляют такие слова, как 
&ldquo;краденый&rdquo; и
@@ -955,8 +971,8 @@
 &ldquo;пиратство&rdquo; и &ldquo;кража&rdquo;&nbsp;&mdash; 
грязные
 выражения</a>.</p>
 
-<h4 id="TrustedComputing">&ldquo;<span xml:lang="en" lang="en">Trusted 
Computing</span> (доверенные
-вычисления)&rdquo;</h4>
+<h3 id="TrustedComputing">&ldquo;<span xml:lang="en" lang="en">Trusted 
Computing</span> (доверенные
+вычисления)&rdquo;</h3>
 <p>
 <a href="/philosophy/can-you-trust.html"> &ldquo;Доверенные
 вычисления&rdquo;</a>&nbsp;&mdash; авторское 
название схемы переорганизации
@@ -967,8 +983,8 @@
 </p>
 
 
-<h4 id="Vendor">&ldquo;<span xml:lang="en" lang="en">Vendor</span>
-(товаропроизводитель)&rdquo;</h4>
+<h3 id="Vendor">&ldquo;<span xml:lang="en" lang="en">Vendor</span>
+(товаропроизводитель)&rdquo;</h3>
 <p>
 Не употребляйте, пожалуйста, слово 
&ldquo;товаропроизводитель&rdquo; для
 указания вообще на всех, кто разрабатывает 
программы или оформляет их в виде
@@ -1090,7 +1106,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/29 07:52:25 $
+$Date: 2015/06/06 10:28:17 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/open-source-misses-the-point.nl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.nl-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/open-source-misses-the-point.nl-en.html       9 Feb 2013 
07:49:44 -0000       1.4
+++ philosophy/po/open-source-misses-the-point.nl-en.html       6 Jun 2015 
10:28:18 -0000       1.5
@@ -1,12 +1,9 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.70 -->
-
+<!-- Parent-Version: 1.77 -->
 <title>Why Open Source Misses the Point of Free Software - GNU Project - 
-Free Software Foundation (FSF)</title>
-
+Free Software Foundation</title>
+<!--#include virtual="/philosophy/po/open-source-misses-the-point.translist" 
-->
 <!--#include virtual="/server/banner.html" -->
- <!--#include virtual="/philosophy/po/open-source-misses-the-point.translist" 
-->
-
 <h2>Why Open Source misses the point of Free Software</h2>
 
 <p>by <strong>Richard Stallman</strong></p>
@@ -73,17 +70,22 @@
 the philosophy of open source considers issues in terms of how to make
 software &ldquo;better&rdquo;&mdash;in a practical sense only.  It
 says that nonfree software is an inferior solution to the practical
-problem at hand.  For the free software movement, however, nonfree
-software is a social problem, and the solution is to stop using it and
-move to free software.</p>
+problem at hand.  Most discussion of &ldquo;open source&rdquo; pays no
+attention to right and wrong, only to popularity and success; here's
+a <a 
href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>
+typical example</a>.</p>
+
+<p>For the free software movement, however, nonfree software is a
+social problem, and the solution is to stop using it and move to free
+software.</p>
 
 <p>&ldquo;Free software.&rdquo; &ldquo;Open source.&rdquo; If it's the same 
-software (or nearly so), does it matter which name you use?  Yes, because 
-different words convey different ideas.  While a free program by any other 
-name would give you the same freedom today, establishing freedom in a 
-lasting way depends above all on teaching people to value freedom.  If you 
-want to help do this, it is essential to speak of 
-&ldquo;free software.&rdquo;</p>
+software (<a href="/philosophy/free-open-overlap.html">or nearly so</a>), 
+does it matter which name you use?  Yes, because different words convey 
+different ideas.  While a free program by any other name would give you the 
+same freedom today, establishing freedom in a lasting way depends above all 
+on teaching people to value freedom.  If you want to help do this, it is 
+essential to speak of &ldquo;free software.&rdquo;</p>
 
 <p>We in the free software movement don't think of the open source
 camp as an enemy; the enemy is proprietary (nonfree) software.  But
@@ -96,19 +98,26 @@
 those of free software.  As far as we know, all existing free software
 would qualify as open source.  Nearly all open source software is free
 software, but there are exceptions.  First, some open source licenses
-are too restrictive, so they do not qualify as free licenses.
-Fortunately, few programs use those licenses.</p>
-
-<p>Second, and more important, many products containing computers
-(including many Android devices) come with executable programs that
-correspond to free software source code, but the devices do not allow
-the user to install modified versions of those executables; only one
-special company has the power to modify them.  We call these devices
-&ldquo;tyrants&rdquo;, and the practice is called
-&ldquo;tivoization&rdquo; after the product where we first saw it.
-These executables are not free software even though their source code
-is free software.  The criteria for open source do not recognize this
-issue; they are concerned solely with the licensing of the source code.</p>
+are too restrictive, so they do not qualify as free licenses.  For
+example, &ldquo;Open Watcom&rdquo; is nonfree because its license does
+not allow making a modified version and using it privately.
+Fortunately, few programs use such licenses.</p>
+
+<p>Second, and more important in practice, many products containing
+computers check signatures on their executable programs to block users
+from installing different executables; only one privileged company can
+make executables that can run in the device or can access its full
+capabilities.  We call these devices &ldquo;tyrants&rdquo;, and the
+practice is called &ldquo;tivoization&rdquo; after the product (Tivo)
+where we first saw it.  Even if the executable is made from free
+source code, the users cannot run modified versions of it, so the
+executable is nonfree.</p>
+
+<p>The criteria for open source do not recognize this issue; they are
+concerned solely with the licensing of the source code.  Thus, these
+unmodifiable executables, when made from source code such as Linux
+that is open source and free, are open source but not free.  Many
+Android products contain nonfree tivoized executables of Linux.</p>
 
 <h3>Common Misunderstandings of &ldquo;Free Software&rdquo; and
 &ldquo;Open Source&rdquo;</h3>
@@ -194,8 +203,11 @@
 and science, where there is no such thing as source code, and where
 criteria for software licensing are simply not pertinent.  The only
 thing these activities have in common is that they somehow invite
-people to participate.  They stretch the term so far that it only means
-&ldquo;participatory&rdquo;.</p>
+people to participate.  They stretch the term so far that it only
+means &ldquo;participatory&rdquo; or &ldquo;transparent&rdquo;, or
+less than that.  At worst, it
+has <a 
href="http://www.nytimes.com/2013/03/17/opinion/sunday/morozov-open-and-closed.html";>
+become a vacuous buzzword</a>.</p>
 
 <h3>Different Values Can Lead to Similar Conclusions&hellip;but Not Always</h3>
 
@@ -234,10 +246,10 @@
 schemes that take away our freedom, leading to its loss.</p>
 
 <p>The free software activist will say, &ldquo;Your program is very
-attractive, but I value my freedom more.  So I reject your program.
-Instead I will support a project to develop a free
-replacement.&rdquo;  If we value our freedom, we can act to maintain and
-defend it.</p>
+attractive, but I value my freedom more.  So I reject your program.  I
+will get my work done some other way, and support a project to develop
+a free replacement.&rdquo; If we value our freedom, we can act to
+maintain and defend it.</p>
 
 <h3>Powerful, Reliable Software Can Be Bad</h3>
 
@@ -332,6 +344,40 @@
 about freedom go hand in hand, each promoting the other.  To overcome
 this tendency, we need more, not less, talk about freedom.</p>
 
+<h3>&ldquo;FLOSS&rdquo; and &ldquo;FOSS&rdquo;</h3>
+
+<p> The terms &ldquo;FLOSS&rdquo; and &ldquo;FOSS&rdquo; are used to
+be <a href="/philosophy/floss-and-foss.html"> neutral between free
+software and open source</a>.  If neutrality is your goal,
+&ldquo;FLOSS&rdquo; is the better of the two, since it really is
+neutral.  But if you want to stand up for freedom, using a neutral
+term isn't the way.  Standing up for freedom entails showing people
+your support for freedom.</p>
+
+<h3>Rivals for Mindshare</h3>
+
+<p>&ldquo;Free&rdquo; and &ldquo;open&rdquo; are rivals for mindshare.
+&ldquo;Free software&rdquo; and &ldquo;open source&rdquo; are
+different ideas but, in most people's way of looking at software, they
+compete for the same conceptual slot.  When people become habituated
+to saying and thinking &ldquo;open source,&rdquo; that is an obstacle
+to their grasping the free software movement's philosophy and thinking
+about it.  If they have already come to associate us and our software
+with the word &ldquo;open,&rdquo; we may need to shock them intellectually
+before they recognize that we stand for something <em>else</em>.
+Any activity that promotes the word &ldquo;open&rdquo; tends to
+extend the curtain that hides the ideas of the free software
+movement.</p>
+
+<p>Thus, free software activists are well advised to decline to work
+on an activity that calls itself &ldquo;open.&rdquo;  Even if the
+activity is good in and of itself, each contribution you make does a
+little harm on the side.  There are plenty of other good activities
+which call themselves &ldquo;free&rdquo; or &ldquo;libre.&rdquo; Each
+contribution to those projects does a little extra good on the side.
+With so many useful projects to choose from, why not choose one
+which does extra good?</p>
+
 <h3>Conclusion</h3>
 
 <p>As the advocates of open source draw new users into our community,
@@ -339,7 +385,7 @@
 of freedom to their attention.  We have to say, &ldquo;It's
 free software and it gives you freedom!&rdquo;&mdash;more and louder
 than ever.  Every time you say &ldquo;free software&rdquo; rather than
-&ldquo;open source,&rdquo; you help our campaign.</p>
+&ldquo;open source,&rdquo; you help our cause.</p>
 
 <h4>Notes</h4>
 
@@ -363,12 +409,13 @@
 <!--#include virtual="/server/footer.html" -->
 
 <div id="footer">
+<div class="unprintable">
 
-<p>Please send general FSF &amp; GNU inquiries to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-There are also <a href="/contact/">other ways to contact</a>
-the FSF.  Broken links and other corrections or suggestions can be sent
-to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+<p>Please send general FSF &amp; GNU inquiries to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a
+href="/contact/">other ways to contact</a> the FSF.  Broken links and other
+corrections or suggestions can be sent to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p><!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -388,8 +435,9 @@
 href="/server/standards/README.translations.html">Translations
 README</a> for information on coordinating and submitting translations
 of this article.</p>
+</div>
 
-<p>Copyright &copy; 2007, 2010, 2012 Richard Stallman</p>
+<p>Copyright &copy; 2007, 2010, 2012, 2015 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
@@ -397,9 +445,9 @@
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/09 07:49:44 $
+$Date: 2015/06/06 10:28:18 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/open-source-misses-the-point.nl.po
===================================================================
RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.nl.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- philosophy/po/open-source-misses-the-point.nl.po    6 Jun 2015 10:06:12 
-0000       1.28
+++ philosophy/po/open-source-misses-the-point.nl.po    6 Jun 2015 10:28:23 
-0000       1.29
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-02-11 02:34-0500\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
@@ -776,17 +775,18 @@
 "open&rdquo; tends to extend the curtain that hides the ideas of the free "
 "software movement."
 msgstr ""
-"&ldquo;Vrij&rdquo; en &ldquo;open&rdquo; zijn rivalen voor bewustzijn bij de 
consument.  &ldquo;"
-"Vrije Software&rdquo; en &ldquo;open bron&rdquo; zijn verschillende ideeën 
maar, "
-"concurreren bij het innemen van dezelfde conceptuele ruimte die de meeste 
mensen hebben als zij naar "
-"software kijken.  Wanneer mensen gewend raken om "
-"&ldquo;open bron&rdquo; te zeggen en te denken dan vormt dat voor hen een 
obstakel voor het begrijpen van de "
-"filosofie van de Vrije Softwarebeweging en het denken erover. Als ze ons en 
onze software "
-"al associëren met het woord &ldquo;open,&rdquo; dan "
-"zouden we ze wellicht intellectueel moeten shockeren voordat zij inzien dat 
wij voor "
+"&ldquo;Vrij&rdquo; en &ldquo;open&rdquo; zijn rivalen voor bewustzijn bij de "
+"consument.  &ldquo;Vrije Software&rdquo; en &ldquo;open bron&rdquo; zijn "
+"verschillende ideeën maar, concurreren bij het innemen van dezelfde "
+"conceptuele ruimte die de meeste mensen hebben als zij naar software "
+"kijken.  Wanneer mensen gewend raken om &ldquo;open bron&rdquo; te zeggen en "
+"te denken dan vormt dat voor hen een obstakel voor het begrijpen van de "
+"filosofie van de Vrije Softwarebeweging en het denken erover. Als ze ons en "
+"onze software al associëren met het woord &ldquo;open,&rdquo; dan zouden we "
+"ze wellicht intellectueel moeten shockeren voordat zij inzien dat wij voor "
 "iets <em>anders</em> staan. Iedere activiteit die het woord &ldquo;"
-"open&rdquo; promoot heeft de neiging om het gordijn te verlengen dat de 
ideeën van de "
-"Vrije Softwarebeweging verbergt."
+"open&rdquo; promoot heeft de neiging om het gordijn te verlengen dat de "
+"ideeën van de Vrije Softwarebeweging verbergt."
 
 #. type: Content of: <p>
 msgid ""
@@ -798,13 +798,13 @@
 "projects does a little extra good on the side.  With so many useful projects "
 "to choose from, why not choose one which does extra good?"
 msgstr ""
-"En dus adviseren we aan Vrije Software-activisten om te weigeren mee te 
werken "
-"aan activiteiten die zichzelf &ldquo;open&rdquo; noemen. Ook al is "
-"de activiteit van zichzelf goed, ieder bijdrage daaraan doet "
-"ook een beetje kwaad. Er zijn meer dan voldoende andere goede activiteiten 
die zichzelf"
-"&ldquo;"
-"vrij&rdquo; of &ldquo;libre&rdquo; noemen. Ieder bijdrage aan deze projecten 
brengt iets "
-"extra goeds met zich mee. Waarom zou je dan niet voor een van deze goede en 
nuttige projecten kiezen?"
+"En dus adviseren we aan Vrije Software-activisten om te weigeren mee te "
+"werken aan activiteiten die zichzelf &ldquo;open&rdquo; noemen. Ook al is de "
+"activiteit van zichzelf goed, ieder bijdrage daaraan doet ook een beetje "
+"kwaad. Er zijn meer dan voldoende andere goede activiteiten die "
+"zichzelf&ldquo;vrij&rdquo; of &ldquo;libre&rdquo; noemen. Ieder bijdrage aan "
+"deze projecten brengt iets extra goeds met zich mee. Waarom zou je dan niet "
+"voor een van deze goede en nuttige projecten kiezen?"
 
 #. type: Content of: <h3>
 msgid "Conclusion"

Index: philosophy/po/words-to-avoid.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru-en.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- philosophy/po/words-to-avoid.ru-en.html     29 May 2015 07:52:27 -0000      
1.53
+++ philosophy/po/words-to-avoid.ru-en.html     6 Jun 2015 10:28:24 -0000       
1.54
@@ -105,7 +105,13 @@
        href="#SoftwareIndustry">Software Industry</a>&rdquo;
 |<span class="gnun-split"></span> &ldquo;<a
        href="#SourceModel">Source model</a>&rdquo;
-|<span class="gnun-split"></span> &ldquo;<a
+|<span class="gnun-split"></span><!--#if expr="$LANGUAGE_SUFFIX        = 
/^.()$/" -->
+<!-- TRANSLATORS: translate if this word is used often in your
+     language to refer to mobile computers; otherwise,
+     fill the translation with a space. -->
+&ldquo;<a
+       href="#Terminal">Terminal</a>&rdquo;
+|<span class="gnun-split"></span><!--#endif --> &ldquo;<a
        href="#Theft">Theft</a>&rdquo;
 |<span class="gnun-split"></span> &ldquo;<a
        href="#TrustedComputing">Trusted Computing</a>&rdquo;
@@ -113,7 +119,7 @@
        href="#Vendor">Vendor</a>&rdquo;
 </p>
 
-<h4 id="Alternative">&ldquo;Alternative&rdquo;</h4>
+<h3 id="Alternative">&ldquo;Alternative&rdquo;</h3>
 <p>
 We don't describe free software as an &ldquo;alternative&rdquo; to
 proprietary, because that word presumes all the &ldquo;alternatives&rdquo; are
@@ -132,7 +138,7 @@
 software.
 </p>
 
-<h4 id="BSD-style">&ldquo;BSD-style&rdquo;</h4>
+<h3 id="BSD-style">&ldquo;BSD-style&rdquo;</h3>
 <p>
 The expression &ldquo;BSD-style license&rdquo; leads to confusion because it
 <a href="/philosophy/bsd.html">lumps together licenses that have
@@ -146,7 +152,7 @@
 question</a> and avoid the vague term &ldquo;BSD-style.&rdquo;</p>
 
 
-<h4 id="Closed">&ldquo;Closed&rdquo;</h4>
+<h3 id="Closed">&ldquo;Closed&rdquo;</h3>
 <p>
 Describing nonfree software as &ldquo;closed&rdquo; clearly refers to
 the term &ldquo;open source.&rdquo;  In the free software movement,
@@ -159,7 +165,7 @@
 &ldquo;proprietary&rdquo;</a>.</p>
 
 
-<h4 id="CloudComputing">&ldquo;Cloud Computing&rdquo;</h4>
+<h3 id="CloudComputing">&ldquo;Cloud Computing&rdquo;</h3>
 <p>
 The term &ldquo;cloud computing&rdquo; (or
 just <a name="Cloud">&ldquo;cloud&rdquo;</a>, in the context of
@@ -230,7 +236,7 @@
 developer, he isn't motivated by the same ideals as we are.
 </p>
 
-<h4 id="Commercial">&ldquo;Commercial&rdquo;</h4>
+<h3 id="Commercial">&ldquo;Commercial&rdquo;</h3>
 <p>
 Please don't use &ldquo;commercial&rdquo; as a synonym for
 &ldquo;nonfree.&rdquo; That confuses two entirely different
@@ -257,7 +263,7 @@
 to use the word &ldquo;commercial&rdquo; in that way.</p>
 
 
-<h4 id="Compensation">&ldquo;Compensation&rdquo;</h4>
+<h3 id="Compensation">&ldquo;Compensation&rdquo;</h3>
 <p>
 To speak of &ldquo;compensation for authors&rdquo; in connection with
 copyright carries the assumptions that (1) copyright exists for the
@@ -274,7 +280,7 @@
 same publishing companies that are pushing unjust laws on us.
 </p>
 
-<h4 id="Consume">&ldquo;Consume&rdquo;</h4>
+<h3 id="Consume">&ldquo;Consume&rdquo;</h3>
 <p>
 &ldquo;Consume&rdquo; refers to what we do with food: we ingest it, and use it 
in
 a way that uses it up.  By analogy, we employ the same word to describe
@@ -291,7 +297,7 @@
 
 <p>See also the following entry.</p>
 
-<h4 id="Consumer">&ldquo;Consumer&rdquo;</h4>
+<h3 id="Consumer">&ldquo;Consumer&rdquo;</h3>
 <p>
 The term &ldquo;consumer,&rdquo; when used to refer to the users of
 computing, is loaded with assumptions we should reject.  Playing a
@@ -330,7 +336,7 @@
 noted before</a>.
 </p>
 
-<h4 id="Content">&ldquo;Content&rdquo;</h4>
+<h3 id="Content">&ldquo;Content&rdquo;</h3>
 <p>
 If you want to describe a feeling of comfort and satisfaction, by all
 means say you are &ldquo;content,&rdquo; but using the word as a
@@ -369,7 +375,7 @@
 system&rdquo; (WRS).</p>
 
 
-<h4 id="CreativeCommonsLicensed">&ldquo;Creative Commons licensed&rdquo;</h4>
+<h3 id="CreativeCommonsLicensed">&ldquo;Creative Commons licensed&rdquo;</h3>
 <p>
 The most important licensing characteristic of a work is whether it is
 free.  Creative Commons publishes seven licenses; three are free
@@ -388,7 +394,7 @@
 statement.
 </p>
 
-<h4 id="Creator">&ldquo;Creator&rdquo;</h4>
+<h3 id="Creator">&ldquo;Creator&rdquo;</h3>
 <p>
 The term &ldquo;creator&rdquo; as applied to authors implicitly
 compares them to a deity (&ldquo;the creator&rdquo;).  The term is
@@ -401,7 +407,7 @@
 author.</p>
 
 
-<h4 id="DigitalGoods">&ldquo;Digital Goods&rdquo;</h4>
+<h3 id="DigitalGoods">&ldquo;Digital Goods&rdquo;</h3>
 <p>
 The term &ldquo;digital goods,&rdquo; as applied to copies of works of
 authorship, identifies them with physical goods&mdash;which cannot be
@@ -412,7 +418,7 @@
 shallow and limited values don't include freedom and community.</p>
 
 
-<h4 id="DigitalLocks">&ldquo;Digital Locks&rdquo;</h4>
+<h3 id="DigitalLocks">&ldquo;Digital Locks&rdquo;</h3>
 <p>
 &ldquo;Digital locks&rdquo; is used to refer to Digital Restrictions
 Management by some who criticize it.  The problem with this term is
@@ -440,7 +446,7 @@
 replace the term with &ldquo;digital handcuffs&rdquo; and say why.</p>
 
 
-<h4 id="DigitalRightsManagement">&ldquo;Digital Rights Management&rdquo;</h4>
+<h3 id="DigitalRightsManagement">&ldquo;Digital Rights Management&rdquo;</h3>
 <p>
 &ldquo;Digital Rights Management&rdquo; (abbreviated
 &ldquo;DRM&rdquo;) refers to technical mechanisms designed to impose
@@ -456,7 +462,7 @@
 Please sign up to support our <a href="http://DefectiveByDesign.org/";>
 campaign to abolish DRM</a>.</p>
 
-<h4 id="Ecosystem">&ldquo;Ecosystem&rdquo;</h4>
+<h3 id="Ecosystem">&ldquo;Ecosystem&rdquo;</h3>
 <p>
 It is inadvisable to describe the free software community, or any human
 community, as an &ldquo;ecosystem,&rdquo; because that word implies
@@ -482,7 +488,7 @@
 freedom.
 </p>
 
-<h4 id="FLOSS">&ldquo;FLOSS&rdquo;</h4>
+<h3 id="FLOSS">&ldquo;FLOSS&rdquo;</h3>
 <p>
 The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open
 Source Software,&rdquo; was coined as a way
@@ -491,7 +497,7 @@
 &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you want to
 show you stand for freedom, don't use a neutral term.</p>
 
-<h4 id="ForFree">&ldquo;For free&rdquo;</h4>
+<h3 id="ForFree">&ldquo;For free&rdquo;</h3>
 <p>
 If you want to say that a program is free software, please don't say
 that it is available &ldquo;for free.&rdquo; That term specifically
@@ -507,7 +513,7 @@
 To avoid confusion, you can say that the program is available
 &ldquo;as free software.&rdquo;</p>
 
-<h4 id="FOSS">&ldquo;FOSS&rdquo;</h4>
+<h3 id="FOSS">&ldquo;FOSS&rdquo;</h3>
 <p>
 The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source
 Software,&rdquo; was coined as a way
@@ -516,7 +522,7 @@
 neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  But if you
 want to show you stand for freedom, don't use a neutral term.</p>
 
-<h4 id="FreelyAvailable">&ldquo;Freely available&rdquo;</h4>
+<h3 id="FreelyAvailable">&ldquo;Freely available&rdquo;</h3>
 <p>
 Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;free
 software.&rdquo; The terms are not equivalent.  Software is &ldquo;freely
@@ -526,7 +532,7 @@
 </p>
 
 
-<h4 id="Freeware">&ldquo;Freeware&rdquo;</h4>
+<h3 id="Freeware">&ldquo;Freeware&rdquo;</h3>
 <p>
 Please don't use the term &ldquo;freeware&rdquo; as a synonym for
 &ldquo;free software.&rdquo; The term &ldquo;freeware&rdquo; was used
@@ -550,7 +556,7 @@
 </p>
 
 
-<h4 id="GiveAwaySoftware">&ldquo;Give away software&rdquo;</h4>
+<h3 id="GiveAwaySoftware">&ldquo;Give away software&rdquo;</h3>
 <p>
 It's misleading to use the term &ldquo;give away&rdquo; to mean
 &ldquo;distribute a program as free software.&rdquo;
@@ -560,7 +566,7 @@
 free software.&rdquo;</p>
 
 
-<h4 id="Google">&ldquo;Google&rdquo;</h4>
+<h3 id="Google">&ldquo;Google&rdquo;</h3>
 <p>
 Please avoid using the term &ldquo;google&rdquo; as a verb, meaning to
 search for something on the internet. &ldquo;Google&rdquo; is just the
@@ -571,7 +577,7 @@
 its users, although we cannot confirm.</p>
 
 
-<h4 id="Hacker">&ldquo;Hacker&rdquo;</h4>
+<h3 id="Hacker">&ldquo;Hacker&rdquo;</h3>
 <p>
 A hacker is someone
 who <a href="http://stallman.org/articles/on-hacking.html";> enjoys
@@ -587,7 +593,7 @@
 People who break security are &ldquo;crackers.&rdquo;</p>
 
 
-<h4 id="IntellectualProperty">&ldquo;Intellectual property&rdquo;</h4>
+<h3 id="IntellectualProperty">&ldquo;Intellectual property&rdquo;</h3>
 <p>
 Publishers and lawyers like to describe copyright as
 &ldquo;intellectual property&rdquo;&mdash;a term also applied to
@@ -617,7 +623,7 @@
 Organization embarrassed</a>.</p>
 
 
-<h4 id="LAMP">&ldquo;LAMP system&rdquo;</h4>
+<h3 id="LAMP">&ldquo;LAMP system&rdquo;</h3>
 <p>
 &ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and
 PHP&rdquo;&mdash;a common combination of software to use on a web
@@ -628,7 +634,7 @@
 </p>
 
 
-<h4 id="Linux">&ldquo;Linux system&rdquo;</h4>
+<h3 id="Linux">&ldquo;Linux system&rdquo;</h3>
 <p>
 Linux is the name of the kernel that Linus Torvalds developed starting
 in 1991.  The operating system in which Linux is used is basically GNU
@@ -640,7 +646,7 @@
 </p>
 
 
-<h4 id="Market">&ldquo;Market&rdquo;</h4>
+<h3 id="Market">&ldquo;Market&rdquo;</h3>
 <p>
 It is misleading to describe the users of free software, or the
 software users in general, as a &ldquo;market.&rdquo;</p>
@@ -659,7 +665,7 @@
 and legitimize proprietary software.</p>
 
 
-<h4 id="Monetize">&ldquo;Monetize&rdquo;</h4>
+<h3 id="Monetize">&ldquo;Monetize&rdquo;</h3>
 <p>
 The proper definition of &ldquo;monetize&rdquo; is &ldquo;to use
 something as currency.&rdquo; For instance, human societies have
@@ -679,7 +685,7 @@
 ethical.</p>
 
 
-<h4 id="MP3Player">&ldquo;MP3 Player&rdquo;</h4>
+<h3 id="MP3Player">&ldquo;MP3 Player&rdquo;</h3>
 <p>
 In the late 1990s it became feasible to make portable, solid-state
 digital audio players. Most support the patented MP3 codec, but not
@@ -691,7 +697,7 @@
 or simply &ldquo;audio player&rdquo; if context permits.</p>
 
 
-<h4 id="Open">&ldquo;Open&rdquo;</h4>
+<h3 id="Open">&ldquo;Open&rdquo;</h3>
 <p>
 Please avoid using the term &ldquo;open&rdquo; or &ldquo;open
 source&rdquo; as a substitute for &ldquo;free software.&rdquo;  Those terms
@@ -703,7 +709,7 @@
 appropriate; but please do not use it to label us or our work&mdash;that
 leads people to think we share those views.</p>
 
-<h4 id="PC">&ldquo;PC&rdquo;</h4>
+<h3 id="PC">&ldquo;PC&rdquo;</h3>
 <p>
 It's OK to use the abbreviation &ldquo;PC&rdquo; to refer to a certain
 kind of computer hardware, but please don't use it with the
@@ -714,7 +720,7 @@
 The term &ldquo;WC&rdquo; has been suggested for a computer running
 Windows.</p>
 
-<h4 id="Photoshop">&ldquo;Photoshop&rdquo;</h4>
+<h3 id="Photoshop">&ldquo;Photoshop&rdquo;</h3>
 <p>
 Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning
 any kind of photo manipulation or image editing in general.  Photoshop
@@ -722,7 +728,7 @@
 be avoided since it is proprietary.  There are plenty of free programs
 for editing images, such as the <a href="/software/gimp">GIMP</a>.</p>
 
-<h4 id="Piracy">&ldquo;Piracy&rdquo;</h4>
+<h3 id="Piracy">&ldquo;Piracy&rdquo;</h3>
 <p>
 Publishers often refer to copying they don't approve of as
 &ldquo;piracy.&rdquo; In this way, they imply that it is ethically
@@ -747,7 +753,7 @@
 <a 
href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/";>&ldquo;piracy&rdquo;
 and &ldquo;theft&rdquo; are smear-words.</a></p>
 
-<h4 id="PowerPoint">&ldquo;PowerPoint&rdquo;</h4>
+<h3 id="PowerPoint">&ldquo;PowerPoint&rdquo;</h3>
 <p>
 Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind
 of slide presentation.  &ldquo;PowerPoint&rdquo; is just the name of
@@ -757,7 +763,7 @@
 class and LibreOffice.org's Impress.</p>
 
 
-<h4 id="Protection">&ldquo;Protection&rdquo;</h4>
+<h3 id="Protection">&ldquo;Protection&rdquo;</h3>
 <p>
 Publishers' lawyers love to use the term &ldquo;protection&rdquo; to
 describe copyright.  This word carries the implication of preventing
@@ -788,7 +794,7 @@
 <a href="http://DefectiveByDesign.org";> Defective by Design</a>
 campaign.</p>
 
-<h4 id="RAND">&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;</h4>
+<h3 id="RAND">&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;</h3>
 <p>
 Standards bodies that promulgate patent-restricted standards that
 prohibit free software typically have a policy of obtaining patent
@@ -816,7 +822,7 @@
 the only condition in these licenses is a uniform royalty fee.</p>
 
 
-<h4 id="SaaS">&ldquo;SaaS&rdquo; or &ldquo;Software as a Service&rdquo;</h4>
+<h3 id="SaaS">&ldquo;SaaS&rdquo; or &ldquo;Software as a Service&rdquo;</h3>
 <p>
 We used to say that SaaS (short for &ldquo;Software as a
 Service&rdquo;) is an injustice, but then we found that there was a
@@ -835,7 +841,7 @@
 to give up.</p>
 
 
-<h4 id="SellSoftware">&ldquo;Sell software&rdquo;</h4>
+<h3 id="SellSoftware">&ldquo;Sell software&rdquo;</h3>
 <p>
 The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking,
 exchanging a copy of a free program for a sum of money
@@ -851,7 +857,7 @@
 further discussion of this issue.</p>
 
 
-<h4 id="SharingEconomy">&ldquo;Sharing economy&rdquo;</h4>
+<h3 id="SharingEconomy">&ldquo;Sharing economy&rdquo;</h3>
 <p>
 The term &ldquo;sharing economy&rdquo; is not a good way to refer to
 services such as Uber and Airbnb that arrange business transactions
@@ -865,7 +871,7 @@
 &ldquo;piecework service economy.&rdquo;</p>
 
 
-<h4 id="Skype">&ldquo;Skype&rdquo;</h4>
+<h3 id="Skype">&ldquo;Skype&rdquo;</h3>
 <p>
 Please avoid using the term &ldquo;Skype&rdquo; as a verb, meaning any
 kind of video communication or telephony over the Internet in general.
@@ -878,7 +884,7 @@
 numerous free Skype replacements</a>.</p>
 
 
-<h4 id="SoftwareIndustry">&ldquo;Software Industry&rdquo;</h4>
+<h3 id="SoftwareIndustry">&ldquo;Software Industry&rdquo;</h3>
 <p>
 The term &ldquo;software industry&rdquo; encourages people to imagine
 that software is always developed by a sort of factory and then
@@ -896,7 +902,7 @@
 define &ldquo;industry&rdquo; as &ldquo;automated production of
 material goods.&rdquo;</a></p>
 
-<h4 id="SourceModel">&ldquo;Source model&rdquo;</h4>
+<h3 id="SourceModel">&ldquo;Source model&rdquo;</h3>
 <p>
 Wikipedia uses the term &ldquo;source model&rdquo; in a confused and
 ambiguous way.  Ostensibly it refers to how a program's source is
@@ -909,7 +915,20 @@
 opportunity to say &ldquo;open source&rdquo; in pages describing free
 software programs.</p>
 
-<h4 id="Theft">&ldquo;Theft&rdquo;</h4>
+<!--#if expr="$LANGUAGE_SUFFIX = /^.()$/" -->
+<!-- TRANSLATORS: translate if this word is used often in your
+     language to refer to mobile computers; otherwise,
+     fill the translation with a space. -->
+
+<h3 id="Terminal">&ldquo;Terminal&rdquo;</h3>
+
+<p>Mobile phones and tablets are computers, and people should be
+able to do their computing on them using free software.
+To call them &ldquo;terminals&rdquo; supposes that all they are good for
+is to connect to servers, which is a bad way to do your own computing.</p>
+<!--#endif -->
+
+<h3 id="Theft">&ldquo;Theft&rdquo;</h3>
 <p>
 The supporters of a too-strict, repressive form of copyright often use
 words like &ldquo;stolen&rdquo; and &ldquo;theft&rdquo; to refer to
@@ -939,7 +958,7 @@
 <a 
href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/";>&ldquo;piracy&rdquo;
 and &ldquo;theft&rdquo; are smear-words.</a></p>
 
-<h4 id="TrustedComputing">&ldquo;Trusted Computing&rdquo;</h4>
+<h3 id="TrustedComputing">&ldquo;Trusted Computing&rdquo;</h3>
 <p>
 <a href="/philosophy/can-you-trust.html">&ldquo;Trusted computing&rdquo;</a> is
 the proponents' name for a scheme to redesign computers so that
@@ -949,7 +968,7 @@
 </p>
 
 
-<h4 id="Vendor">&ldquo;Vendor&rdquo;</h4>
+<h3 id="Vendor">&ldquo;Vendor&rdquo;</h3>
 <p>
 Please don't use the term &ldquo;vendor&rdquo; to refer generally to
 anyone that develops or packages software.  Many programs
@@ -1032,7 +1051,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/05/29 07:52:27 $
+$Date: 2015/06/06 10:28:24 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/words-to-avoid.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru.po,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- philosophy/po/words-to-avoid.ru.po  6 Jun 2015 10:05:04 -0000       1.122
+++ philosophy/po/words-to-avoid.ru.po  6 Jun 2015 10:28:25 -0000       1.123
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-06 09:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -315,9 +314,6 @@
 #.      language to refer to mobile computers; otherwise,
 #.      fill the translation with a space. 
 #. type: Content of: <p>
-# | &ldquo;<a [-href=\"#Commercial\">Commercial</a>&rdquo;-]
-# | {+href=\"#Terminal\">Terminal</a>&rdquo;+} |
-#| msgid "&ldquo;<a href=\"#Commercial\">Commercial</a>&rdquo; |"
 msgid "&ldquo;<a href=\"#Terminal\">Terminal</a>&rdquo; |"
 msgstr " "
 
@@ -2037,8 +2033,6 @@
 "текст&rdquo; на страницах, описывающих 
свободные программы для компьютеров."
 
 #. type: Content of: <h3>
-# | [-&ldquo;Commercial&rdquo;-]{+&ldquo;Terminal&rdquo;+}
-#| msgid "&ldquo;Commercial&rdquo;"
 msgid "&ldquo;Terminal&rdquo;"
 msgstr " "
 



reply via email to

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