www-commits
[Top][All Lists]
Advanced

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

www/philosophy/po free-sw.af.po free-sw.ar.po f...


From: GNUN
Subject: www/philosophy/po free-sw.af.po free-sw.ar.po f...
Date: Tue, 18 Jun 2013 05:30:01 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     13/06/18 05:30:00

Modified files:
        philosophy/po  : free-sw.af.po free-sw.ar.po free-sw.bg.po 
                         free-sw.de.po free-sw.es.po free-sw.fr.po 
                         free-sw.hr.po free-sw.it.po free-sw.ja.po 
                         free-sw.nl.po free-sw.pl.po free-sw.pot 
                         free-sw.pt-br.po free-sw.ru.po free-sw.sk.po 
                         free-sw.sr.po free-sw.tr.po free-sw.zh-tw.po 
                         is-ever-good-use-nonfree-program.fr.po 
                         philosophy.ar.po philosophy.bg.po 
                         philosophy.ca.po philosophy.cs.po 
                         philosophy.de.po philosophy.el-diff.html 
                         philosophy.el.po philosophy.es.po 
                         philosophy.fr.po philosophy.hr.po 
                         philosophy.ja.po philosophy.pl.po 
                         philosophy.pot philosophy.pt-br.po 
                         philosophy.ro.po philosophy.ru.po 
                         philosophy.sq.po philosophy.sr.po 
                         philosophy.zh-cn-diff.html philosophy.zh-cn.po 
                         proprietary-surveillance.de.po 
                         proprietary-surveillance.fr.po 
                         proprietary-surveillance.pot rms-kol.fr.po 
                         rms-kol.pot rms-kol.translist 
                         who-does-that-server-really-serve.ar.po 
                         who-does-that-server-really-serve.es.po 
                         who-does-that-server-really-serve.fr.po 
                         who-does-that-server-really-serve.hr.po 
                         who-does-that-server-really-serve.ja.po 
                         who-does-that-server-really-serve.ko-diff.html 
                         who-does-that-server-really-serve.ko.po 
                         who-does-that-server-really-serve.pl.po 
                         who-does-that-server-really-serve.pot 
                         who-does-that-server-really-serve.ro.po 
                         who-does-that-server-really-serve.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.af.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ar.po?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.bg.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.de.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.es.po?cvsroot=www&r1=1.72&r2=1.73
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.fr.po?cvsroot=www&r1=1.70&r2=1.71
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.hr.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.it.po?cvsroot=www&r1=1.92&r2=1.93
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ja.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.nl.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pl.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pot?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pt-br.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ru.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sk.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sr.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.tr.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-tw.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/is-ever-good-use-nonfree-program.fr.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.ar.po?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.bg.po?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.ca.po?cvsroot=www&r1=1.68&r2=1.69
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.cs.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.de.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.el-diff.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.el.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.es.po?cvsroot=www&r1=1.91&r2=1.92
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.fr.po?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.hr.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.ja.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.pl.po?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.pot?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.pt-br.po?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.ro.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.ru.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.sq.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.sr.po?cvsroot=www&r1=1.62&r2=1.63
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.zh-cn-diff.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.zh-cn.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/proprietary-surveillance.de.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/proprietary-surveillance.fr.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/proprietary-surveillance.pot?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rms-kol.fr.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rms-kol.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rms-kol.translist?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.ar.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.es.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.fr.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.hr.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.ja.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.ko-diff.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.ko.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.pl.po?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.pot?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.ro.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.ru.po?cvsroot=www&r1=1.25&r2=1.26

Patches:
Index: free-sw.af.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.af.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- free-sw.af.po       27 May 2013 03:59:14 -0000      1.36
+++ free-sw.af.po       18 Jun 2013 05:29:55 -0000      1.37
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2008-02-19 07:45+0200\n"
 "Last-Translator: Renier Maritz <address@hidden>\n"
 "Language-Team: \n"
@@ -22,7 +22,7 @@
 #| msgid ""
 #| "The Free Software Definition - GNU Project - Free Software Foundation "
 #| "(FSF)"
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Die Vrye Sagteware Definisie - GNU Projek - Free Software Foundation (FSF)"
 
@@ -452,8 +452,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "<a id=\"exportcontrol\">Soms stel regerings uitvoerbeheermaatre&euml;ls</a> "
 "en handelsanksies in wat jou vryheid om sagteware internasionaal te versprei "
@@ -463,6 +463,16 @@
 "hierdie manier sal die beperkinge nie mense buite die jurisdiksie van "
 "hierdie regerings beïnvloed nie."
 
+#. type: Content of: <p>
+msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -719,6 +729,14 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
 "saying that only retroactive <em>restrictions</em> are unacceptable.  The "
 "copyright holders can always grant additional <em>permission</em> for use of "
@@ -904,23 +922,18 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Please send 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."
-msgstr ""
-"Stuur vrae oor die FSF &amp; GNU (in engels!) na <a 
href=\"mailto:address@hidden";
-"\"><em>address@hidden</em></a>. Ander <a href=\"/home.html#ContactInfo"
-"\">maniere om kontak te maak</a> met die FSF.<br /> Stuur gebroke skakels en "
-"ander regstellings (of voorstelle) aan <a href=\"mailto:address@hidden";
-"org\"><em>address@hidden</em></a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&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>."
+msgid ""
+"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"
+"org&gt;</a>."
 msgstr ""
 "Stuur vrae oor die FSF &amp; GNU (in engels!) na <a 
href=\"mailto:address@hidden";
 "\"><em>address@hidden</em></a>. Ander <a href=\"/home.html#ContactInfo"
@@ -929,6 +942,17 @@
 "org\"><em>address@hidden</em></a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -944,7 +968,7 @@
 #, fuzzy
 #| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Kopiereg &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
@@ -974,6 +998,31 @@
 # type: Content of: <div><p>
 #, fuzzy
 #~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Stuur vrae oor die FSF &amp; GNU (in engels!) na <a 
href=\"mailto:address@hidden";
+#~ "org\"><em>address@hidden</em></a>. Ander <a href=\"/home.html#ContactInfo"
+#~ "\">maniere om kontak te maak</a> met die FSF.<br /> Stuur gebroke skakels "
+#~ "en ander regstellings (of voorstelle) aan <a href=\"mailto:web-";
+#~ "address@hidden"><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Stuur vrae oor die FSF &amp; GNU (in engels!) na <a 
href=\"mailto:address@hidden";
+#~ "org\"><em>address@hidden</em></a>. Ander <a href=\"/home.html#ContactInfo"
+#~ "\">maniere om kontak te maak</a> met die FSF.<br /> Stuur gebroke skakels "
+#~ "en ander regstellings (of voorstelle) aan <a href=\"mailto:web-";
+#~ "address@hidden"><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~ msgid ""
 #~ "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, "
 #~ "2006, 2007, 2009, 2010 Free Software Foundation, Inc."
 #~ msgstr ""

Index: free-sw.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ar.po,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- free-sw.ar.po       27 May 2013 03:59:14 -0000      1.57
+++ free-sw.ar.po       18 Jun 2013 05:29:55 -0000      1.58
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-01-14 16:32+0200\n"
 "Last-Translator: Rafik E. Younan <address@hidden>\n"
 "Language-Team: Arabic <address@hidden>\n"
@@ -22,7 +22,10 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr "ما هي البرمجيات الحرة؟ - مشروع غنو - م
ؤسسة البرمجيات الحرة (FSF)"
 
 # type: Attribute 'content' of: <meta>
@@ -446,6 +449,17 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -454,8 +468,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "تصدر الحكومة أحيانًا <a id=\"exportcontrol\">قوانين 
تنظيم للتصدير</a> ومراسيم "
 "تجارة قد تقيد حريتك في توزيع نُسَخ من 
البرامج دوليًا. لا يملك مطوروا البرمجيات "
@@ -464,6 +478,16 @@
 "القيود على النشاطات والأشخاص خارج نطاق 
سلطة هذه الحكومات. لذلك، يجب ألا تطلب "
 "تراخيص البرمجيات الحرة الالتزام بأي قانون 
تصدير كشرط لأي من الحريات الرئيسة."
 
+#. type: Content of: <p>
+msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -664,6 +688,23 @@
 "روابط لتوضيح ما عُدّل تحديدًا."
 
 # type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">الإصدار 1.23</a>: توضيح م
شاكل محتملة "
+"متعلقة بالتراخيص المبنية على العقود."
+
+# type: Content of: <ul><li>
 # | <a
 # | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77\";>Version
 # | 1.77</a>:-]
@@ -943,25 +984,38 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Please send 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."
-msgstr ""
-"يرجى إرسال استفساراتك عن مؤسسة البرمجيات 
الحرة (FSF) ومشروع غنو إلى <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. توجد <a 
href=\"/contact/"
-"\">طرق أخرى للاتصال</a> بمؤسسة البرمجيات 
الحرة أيضًا."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"يرجى إرسال الروابط المقطوعة وأية تصحيحات 
أو اقتراحات أخرى إلى <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>."
+msgid ""
+"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"
+"org&gt;</a>."
+msgstr ""
+"من فضلك أرسل لإف&#8204;إس&#8204;إف ولاستفسارات 
غنو ل<a href=\"mailto:address@hidden";
+"org\"><em>address@hidden</em></a>. يوجد أيضا <a 
href=\"/contact/\">طرق أخرى "
+"للاتصال</a> بالإف&#8204;إس&#8204;إف.  <br /> من فضلك 
أرسلالوصلات المنقطعة "
+"وأي تصحيحات أو اقتراحات إلى <a 
href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -973,8 +1027,12 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "<span dir=\"ltr\">Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 "
@@ -1011,3 +1069,21 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "حُدّثت بتاريخ:"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "يرجى إرسال استفساراتك عن مؤسسة البرم
جيات الحرة (FSF) ومشروع غنو إلى <a "
+#~ "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. توجد <a 
href=\"/"
+#~ "contact/\">طرق أخرى للاتصال</a> بمؤسسة البرم
جيات الحرة أيضًا."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "يرجى إرسال الروابط المقطوعة وأية 
تصحيحات أو اقتراحات أخرى إلى <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."

Index: free-sw.bg.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.bg.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- free-sw.bg.po       27 May 2013 03:59:14 -0000      1.36
+++ free-sw.bg.po       18 Jun 2013 05:29:55 -0000      1.37
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2008-03-21 13:34+0200\n"
 "Last-Translator: Yavor Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -23,7 +23,7 @@
 #| msgid ""
 #| "The Free Software Definition - GNU Project - Free Software Foundation "
 #| "(FSF)"
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Определение на свободен софтуер — 
Проектът GNU — Фондация за свободен "
 "софтуер (ФСС)"
@@ -458,8 +458,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Понякога наложените от правителства <a 
id=\"exportcontrol\">външнотърговски "
 "режими</a> и търговски санкции могат да 
ограничат свободата ви да "
@@ -469,6 +469,16 @@
 "ползване на програмата.  По този начин 
ограниченията няма да засегнат "
 "дейностите и хората извън юридическата 
власт на тези правителства."
 
+#. type: Content of: <p>
+msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -726,6 +736,14 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
 "saying that only retroactive <em>restrictions</em> are unacceptable.  The "
 "copyright holders can always grant additional <em>permission</em> for use of "
@@ -929,31 +947,37 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Please send 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."
-msgstr ""
-"Моля, отправяйте въпроси относно ФСС и GNU 
по е-поща: <a href=\"mailto:";
-"address@hidden"><em>address@hidden</em></a>.  Има и други 
начини за <a href=\"/"
-"contact/\">връзка</a> с ФСС.  <br /> Моля, изпращайте 
доклади за счупени "
-"хипервръзки и други корекции или 
предложения на е-поща: <a href=\"mailto:web-";
-"address@hidden"><em>address@hidden</em></a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>."
+msgid ""
+"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"
+"org&gt;</a>."
 msgstr ""
 "Моля, отправяйте въпроси относно ФСС и GNU 
по е-поща: <a href=\"mailto:";
 "address@hidden"><em>address@hidden</em></a>.  Има и други 
начини за <a href=\"/"
 "contact/\">връзка</a> с ФСС.  <br /> Моля, изпращайте 
доклади за счупени "
-"хипервръзки и други корекции или 
предложения на е-поща: <a href=\"mailto:web-";
-"address@hidden"><em>address@hidden</em></a>."
+"хипервръзки и други корекции (или 
предложения) на е-поща: <a href=\"mailto:";
+"address@hidden"><em>address@hidden</em></a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -971,7 +995,7 @@
 #| "Copyright &copy; 2004, 2005, 2006, 2007, 2008, 2009 Free Software "
 #| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Авторски права &copy; 2004, 2005, 2006, 2007, 2008, 2009 
Фондация за "
@@ -1012,6 +1036,31 @@
 # type: Content of: <div><p>
 #, fuzzy
 #~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Моля, отправяйте въпроси относно ФСС и GNU 
по е-поща: <a href=\"mailto:";
+#~ "address@hidden"><em>address@hidden</em></a>.  Има и други 
начини за <a href=\"/"
+#~ "contact/\">връзка</a> с ФСС.  <br /> Моля, 
изпращайте доклади за счупени "
+#~ "хипервръзки и други корекции или 
предложения на е-поща: <a href=\"mailto:";
+#~ "address@hidden"><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Моля, отправяйте въпроси относно ФСС и GNU 
по е-поща: <a href=\"mailto:";
+#~ "address@hidden"><em>address@hidden</em></a>.  Има и други 
начини за <a href=\"/"
+#~ "contact/\">връзка</a> с ФСС.  <br /> Моля, 
изпращайте доклади за счупени "
+#~ "хипервръзки и други корекции или 
предложения на е-поща: <a href=\"mailto:";
+#~ "address@hidden"><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~ msgid ""
 #~ "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, "
 #~ "2006, 2007, 2009, 2010 Free Software Foundation, Inc."
 #~ msgstr ""

Index: free-sw.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.de.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- free-sw.de.po       29 May 2013 21:23:35 -0000      1.33
+++ free-sw.de.po       18 Jun 2013 05:29:55 -0000      1.34
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-05-29 22:00+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -15,9 +15,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+# | What is free software? - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr "Was ist Freie Software? - GNU-Projekt - Free Software Foundation"
 
 #. type: Attribute 'content' of: <meta>
@@ -427,6 +432,26 @@
 "aufeinander beziehen)."
 
 #. type: Content of: <p>
+# | Sometimes government <a id=\"exportcontrol\">export control
+# | regulations</a> and trade sanctions can constrain your freedom to
+# | distribute copies of programs internationally.  Software developers do not
+# | have the power to eliminate or override these restrictions, but what they
+# | can and must do is refuse to impose them as conditions of use of the
+# | program.  In this way, the restrictions will not affect activities and
+# | people outside the jurisdictions of these governments.  Thus, free
+# | software licenses must not require obedience to any {+nontrivial+} export
+# | regulations as a condition of {+exercising+} any of the essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -435,8 +460,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Mitunter können staatliche <a id=\"exportcontrol"
 "\">Ausfuhrkontrollbestimmungen</a> und Handelssanktionen die Freiheit "
@@ -451,6 +476,16 @@
 
 #. type: Content of: <p>
 msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
 "based license respects freedom in the ways described above, it is unlikely "
@@ -640,6 +675,29 @@
 "geändert wurde."
 
 #. type: Content of: <ul><li>
+# | <a
+# | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23\";>Version
+# | 1.23</a>: Address-]
+# | 
{+href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122\";>Version
+# | 1.122</a>: An export control requirement is a real problem if the
+# | requirement is nontrivial; otherwise it is only a+} potential [-problems
+# | related to contract-based licenses.-] {+problem.+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\" hreflang=\"en\">Version 1.23</a>: "
+"Potenzielle Probleme im Zusammenhang mit vertragsbasierten Lizenzen."
+
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -892,26 +950,32 @@
 "\">EFI</abbr>-Bootloader ausgeführt werden.</li>\n"
 "</ol>"
 
-# Text not the very latest; doesn’t correspond to boilerplate.
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Bitte senden Sie allgemeine Fragen zur FSF &amp; GNU an <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Sie können auch die <a href=\"/"
 "contact/\"><span xml:lang=\"en\" lang=\"en\">Free Software Foundation</span> "
-"kontaktieren</a>."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Bitte senden Sie ungültige Verweise und andere Korrekturen oder Vorschläge "
-"an <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-
+"kontaktieren</a>. Ungültige Verweise und andere Korrekturen oder Vorschläge 
"
+"können an <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
+"a> gesendet werden."
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -929,8 +993,14 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, [-2012-] {+2012, 2013+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "

Index: free-sw.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.es.po,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- free-sw.es.po       27 May 2013 17:35:35 -0000      1.72
+++ free-sw.es.po       18 Jun 2013 05:29:55 -0000      1.73
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.es.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-27 19:05+0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-05-27 18:58+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -18,11 +18,16 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+# | What is free software? - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "¿Qué es Software Libre? - Proyecto GNU - Free Software Foundation (FSF)"
 
@@ -457,6 +462,26 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | Sometimes government <a id=\"exportcontrol\">export control
+# | regulations</a> and trade sanctions can constrain your freedom to
+# | distribute copies of programs internationally.  Software developers do not
+# | have the power to eliminate or override these restrictions, but what they
+# | can and must do is refuse to impose them as conditions of use of the
+# | program.  In this way, the restrictions will not affect activities and
+# | people outside the jurisdictions of these governments.  Thus, free
+# | software licenses must not require obedience to any {+nontrivial+} export
+# | regulations as a condition of {+exercising+} any of the essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -465,8 +490,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "En algunos casos <a id=\"exportcontrol\">las regulaciones de control de "
 "exportación</a> y las sanciones comerciales pueden limitar sus libertades de 
"
@@ -479,6 +504,16 @@
 "requerir la obediencia a ninguna regulación de exportaciones como condición 
"
 "de cualquiera de las libertades esenciales."
 
+#. type: Content of: <p>
+msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -683,6 +718,30 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+# | <a
+# | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23\";>Version
+# | 1.23</a>: Address-]
+# | 
{+href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122\";>Version
+# | 1.122</a>: An export control requirement is a real problem if the
+# | requirement is nontrivial; otherwise it is only a+} potential [-problems
+# | related to contract-based licenses.-] {+problem.+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Versión 1.23</a>: Mencionar posibles "
+"problemas con las licencias basadas en contratos."
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -951,25 +1010,30 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Envíe sus consultas acerca de la FSF  y GNU a <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>. Existen también <a href=\"/contact/\">otros "
-"medios para contactar</a> con la FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Para avisar de enlaces rotos y proponer otras correcciones o sugerencias, "
-"diríjase a <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
-"a>."
+"medios para contactar</a> con la FSF. <br /> Para avisar de enlaces rotos y "
+"proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
 
 #
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -986,8 +1050,14 @@
 "de este sitio web."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, [-2012-] {+2012, 2013+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "

Index: free-sw.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.fr.po,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- free-sw.fr.po       31 May 2013 20:03:53 -0000      1.70
+++ free-sw.fr.po       18 Jun 2013 05:29:55 -0000      1.71
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-05-31 19:53+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -17,11 +17,16 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+# | What is free software? - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Qu'est-ce que le logiciel libre ? - Projet GNU - Free Software Foundation "
 "(FSF)"
@@ -438,6 +443,26 @@
 "catégories de logiciel)."
 
 #. type: Content of: <p>
+# | Sometimes government <a id=\"exportcontrol\">export control
+# | regulations</a> and trade sanctions can constrain your freedom to
+# | distribute copies of programs internationally.  Software developers do not
+# | have the power to eliminate or override these restrictions, but what they
+# | can and must do is refuse to impose them as conditions of use of the
+# | program.  In this way, the restrictions will not affect activities and
+# | people outside the jurisdictions of these governments.  Thus, free
+# | software licenses must not require obedience to any {+nontrivial+} export
+# | regulations as a condition of {+exercising+} any of the essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -446,8 +471,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Parfois <a id=\"exportcontrol\">les règles du contrôle des 
exportations</a>, "
 "ou bien des sanctions économiques, peuvent restreindre votre liberté de "
@@ -463,6 +488,16 @@
 
 #. type: Content of: <p>
 msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
 "based license respects freedom in the ways described above, it is unlikely "
@@ -656,6 +691,29 @@
 "liens, pour montrer exactement ce qui a changé."
 
 #. type: Content of: <ul><li>
+# | <a
+# | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23\";>Version
+# | 1.23</a>: Address-]
+# | 
{+href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122\";>Version
+# | 1.122</a>: An export control requirement is a real problem if the
+# | requirement is nontrivial; otherwise it is only a+} potential [-problems
+# | related to contract-based licenses.-] {+problem.+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a> : s'intéresse aux "
+"problèmes potentiels relatifs aux licences basées sur des contrats."
+
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -918,23 +976,29 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Veuillez envoyer les requêtes concernant la FSF et GNU à <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Il existe aussi <a 
href=\"/contact/"
-"\">d'autres moyens de contacter</a> la FSF."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou "
-"suggestions à <a href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>."
-
+"\">d'autres moyens de contacter</a> la FSF. Les liens orphelins et autres "
+"corrections ou suggestions peuvent être signalés à <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -951,8 +1015,14 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, [-2012-] {+2012, 2013+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "

Index: free-sw.hr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.hr.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- free-sw.hr.po       8 Jun 2013 16:58:35 -0000       1.15
+++ free-sw.hr.po       18 Jun 2013 05:29:55 -0000      1.16
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-06-08 18:37+0100\n"
 "Last-Translator: Martina Bebek <address@hidden>\n"
 "Language-Team: GNU Croatian Translation Team <address@hidden>\n"
@@ -16,13 +16,18 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Croatian\n"
 "X-Poedit-Country: CROATIA\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+# | What is free software? - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Å to je slobodan softver? - Projekt GNU - Zaklada za slobodan softver (FSF)"
 
@@ -419,6 +424,26 @@
 "odnose jedna prema drugoj.)"
 
 #. type: Content of: <p>
+# | Sometimes government <a id=\"exportcontrol\">export control
+# | regulations</a> and trade sanctions can constrain your freedom to
+# | distribute copies of programs internationally.  Software developers do not
+# | have the power to eliminate or override these restrictions, but what they
+# | can and must do is refuse to impose them as conditions of use of the
+# | program.  In this way, the restrictions will not affect activities and
+# | people outside the jurisdictions of these governments.  Thus, free
+# | software licenses must not require obedience to any {+nontrivial+} export
+# | regulations as a condition of {+exercising+} any of the essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -427,8 +452,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Ponekad vladini <a id=\"exportcontrol\">propisi o kontroli izvoza</a> i "
 "odobrenja za trgovinu mogu ograničiti vašu slobodu da distribuirate kopije "
@@ -441,6 +466,16 @@
 
 #. type: Content of: <p>
 msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
 "based license respects freedom in the ways described above, it is unlikely "
@@ -628,6 +663,29 @@
 "točno mijenjano."
 
 #. type: Content of: <ul><li>
+# | <a
+# | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23\";>Version
+# | 1.23</a>: Address-]
+# | 
{+href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122\";>Version
+# | 1.122</a>: An export control requirement is a real problem if the
+# | requirement is nontrivial; otherwise it is only a+} potential [-problems
+# | related to contract-based licenses.-] {+problem.+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Inačica 1.23</a>: Adresiraj potencijalne "
+"probleme vezane uz licence bazirane na ugovoru. "
+
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -868,23 +926,38 @@
 "li></ol> "
 
 #. type: Content of: <div><p>
-msgid ""
-"Please send 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."
-msgstr ""
-"Molimo vas, općenite upite o FSF &amp; GNU šaljite na <a href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>. Postoje i <a 
href=\"/contact/\">drugi "
-"načini kontaktiranja</a> FSF-a."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Prekinute poveznice i ostale ispravke ili prijedloge možete poslati na <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&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>."
+msgid ""
+"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"
+"org&gt;</a>."
+msgstr ""
+"Molim vas šaljite općenite FSF &amp; GNU upite na <a 
href=\"mailto:address@hidden";
+"org\">&lt;address@hidden&gt;</a>.  Postoje isto i <a href=\"/contact/\">drugi 
"
+"načini kontaktiranja</a> FSF-a. Prekinute poveznice i drugi ispravci ili "
+"prijedlozi mogu biti poslani na <a href=\"mailto:address@hidden";>&lt;"
+"address@hidden&gt;</a>. "
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -900,8 +973,14 @@
 "za prijevode</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, [-2012-] {+2012, 2013+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
@@ -928,3 +1007,19 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Zadnji put promijenjeno:"
+
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Molimo vas, općenite upite o FSF &amp; GNU šaljite na <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>. Postoje i <a href=\"/contact/"
+#~ "\">drugi načini kontaktiranja</a> FSF-a."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Prekinute poveznice i ostale ispravke ili prijedloge možete poslati na <a 
"
+#~ "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."

Index: free-sw.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.it.po,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- free-sw.it.po       28 May 2013 08:58:46 -0000      1.92
+++ free-sw.it.po       18 Jun 2013 05:29:56 -0000      1.93
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-05-28 10:23+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -14,10 +14,15 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+# | What is free software? - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Cos'è il Software Libero? - Progetto GNU - Free Software Foundation (FSF)"
 
@@ -458,6 +463,26 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | Sometimes government <a id=\"exportcontrol\">export control
+# | regulations</a> and trade sanctions can constrain your freedom to
+# | distribute copies of programs internationally.  Software developers do not
+# | have the power to eliminate or override these restrictions, but what they
+# | can and must do is refuse to impose them as conditions of use of the
+# | program.  In this way, the restrictions will not affect activities and
+# | people outside the jurisdictions of these governments.  Thus, free
+# | software licenses must not require obedience to any {+nontrivial+} export
+# | regulations as a condition of {+exercising+} any of the essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -466,8 +491,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Qualche volta le <a id=\"exportcontrol\">leggi sul controllo delle "
 "esportazioni</a> e le sanzioni sul commercio possono limitare la libertà di "
@@ -480,6 +505,16 @@
 "il rispetto di qualsiasi controllo sulle esportazioni come condizione su una "
 "qualsiasi delle libertà essenziali."
 
+#. type: Content of: <p>
+msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -687,6 +722,30 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+# | <a
+# | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23\";>Version
+# | 1.23</a>: Address-]
+# | 
{+href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122\";>Version
+# | 1.122</a>: An export control requirement is a real problem if the
+# | requirement is nontrivial; otherwise it is only a+} potential [-problems
+# | related to contract-based licenses.-] {+problem.+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Versione 1.23</a>: Risolti potenziali "
+"problemi legati alle licenze basate sui contratti."
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -946,27 +1005,39 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Please send 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."
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&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>."
+msgid ""
+"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"
+"org&gt;</a>."
 msgstr ""
 "Per informazioni su FSF e GNU rivolgetevi, possibilmente in inglese, a <a "
-"href=\"mailto:address@hidden";>address@hidden</a>. Ci sono anche <a href=\"/"
-"contact/\">altri modi di contattare</a> la FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. Ci sono anche <a 
href="
+"\"/contact/\">altri modi di contattare</a> la FSF. Inviate segnalazioni di "
+"link non funzionanti e altri suggerimenti relativi alle pagine web a <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Inviate segnalazioni di link non funzionanti e altri suggerimenti relativi "
-"alle pagine web a <a href=\"mailto:address@hidden";>address@hidden</"
-"a>. Grazie."
 
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -984,8 +1055,14 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, [-2012-] {+2012, 2013+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
@@ -1016,3 +1093,22 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Per informazioni su FSF e GNU rivolgetevi, possibilmente in inglese, a <a "
+#~ "href=\"mailto:address@hidden";>address@hidden</a>. Ci sono anche <a 
href=\"/"
+#~ "contact/\">altri modi di contattare</a> la FSF."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Inviate segnalazioni di link non funzionanti e altri suggerimenti "
+#~ "relativi alle pagine web a <a href=\"mailto:address@hidden";
+#~ "\">address@hidden</a>. Grazie."

Index: free-sw.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ja.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- free-sw.ja.po       3 Jun 2013 02:21:54 -0000       1.32
+++ free-sw.ja.po       18 Jun 2013 05:29:56 -0000      1.33
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-06-03 10:35+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -15,9 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "自由ソフトウェアとは? - GNUプロジェクト - 
フリーソフトウェアファウンデーショ"
 "ン (FSF)"
@@ -409,6 +413,17 @@
 "ウェアの分類</a>をご覧ください。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -417,8 +432,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "ときとして、政府による<a 
id=\"exportcontrol\">輸出規制</a>と貿易制裁があなた"
 "が国際的にプログラムのコピーをé…
å¸ƒã™ã‚‹è‡ªç”±ã‚’束縛することがあります。ソフト"
@@ -431,6 +446,16 @@
 
 #. type: Content of: <p>
 msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
 "based license respects freedom in the ways described above, it is unlikely "
@@ -613,6 +638,22 @@
 
"かわかるリンクとともに主要な改訂のリストを示します。"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: 
契約にもとづくライセンス"
+"に関して潜在的な問題について扱った。"
+
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -849,22 +890,28 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "FSFおよびGNUに関する問い合わせは<a 
href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>までお願いします(英語)。FSFへの連絡は<a 
href=\"/contact/\">他の方"
-"法</a>もあります。"
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"リンク切れや他の修正、提案は<a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>までお送りください。"
+"法</a>もあります。リンク切れや他の修正、提案は<a 
href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>までお送りください。"
 
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -878,8 +925,12 @@
 "translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "

Index: free-sw.nl.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.nl.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- free-sw.nl.po       27 May 2013 03:59:15 -0000      1.8
+++ free-sw.nl.po       18 Jun 2013 05:29:56 -0000      1.9
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tom Uijldert <address@hidden>\n"
 "Language-Team: \n"
@@ -17,7 +17,11 @@
 "Outdated-Since: 2013-05-27 03:55+0000\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+# | What is free software? - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Wat is vrije software? - Het GNU project - Free Software Foundation (FSF)"
 
@@ -413,6 +417,26 @@
 "beschrijving hoe de diverse soorten software zich tot elkaar verhouden.)"
 
 #. type: Content of: <p>
+# | Sometimes government <a id=\"exportcontrol\">export control
+# | regulations</a> and trade sanctions can constrain your freedom to
+# | distribute copies of programs internationally.  Software developers do not
+# | have the power to eliminate or override these restrictions, but what they
+# | can and must do is refuse to impose them as conditions of use of the
+# | program.  In this way, the restrictions will not affect activities and
+# | people outside the jurisdictions of these governments.  Thus, free
+# | software licenses must not require obedience to any {+nontrivial+} export
+# | regulations as a condition of {+exercising+} any of the essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -421,8 +445,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Soms kunnen <a name=\"exportcontrol\">exportregels</a> en handelsboycotten "
 "van de overheid de vrijheid om op internationaal niveau software te "
@@ -436,6 +460,16 @@
 
 #. type: Content of: <p>
 msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
 "based license respects freedom in the ways described above, it is unlikely "
@@ -624,6 +658,29 @@
 "wijzigingen met daarbij verwijzingen naar wat er precies is veranderd."
 
 #. type: Content of: <ul><li>
+# | <a
+# | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23\";>Version
+# | 1.23</a>: Address-]
+# | 
{+href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122\";>Version
+# | 1.122</a>: An export control requirement is a real problem if the
+# | requirement is nontrivial; otherwise it is only a+} potential [-problems
+# | related to contract-based licenses.-] {+problem.+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
+"problems related to contract-based licenses."
+
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -863,25 +920,38 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Please send 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."
+# | 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>.+}
+#, fuzzy
+#| msgid ""
+#| "Please send 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."
+msgid ""
+"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"
+"org&gt;</a>."
 msgstr ""
 "Gelieve vragen over FSF &amp; GNU te sturen naar <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>. Er zijn ook nog <a href=\"/contact/\">andere "
 "manieren om in contact te komen</a> met de FSF."
 
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Gelieve meldingen van verkeerde links en andere verbeteringen (of "
-"suggesties) te sturen aan: <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>."
-
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -894,8 +964,14 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, [-2012-] {+2012, 2013+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
@@ -921,3 +997,22 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Bijgewerkt:"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Gelieve vragen over FSF &amp; GNU te sturen naar <a 
href=\"mailto:address@hidden";
+#~ "org\">&lt;address@hidden&gt;</a>. Er zijn ook nog <a href=\"/contact/"
+#~ "\">andere manieren om in contact te komen</a> met de FSF."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Gelieve meldingen van verkeerde links en andere verbeteringen (of "
+#~ "suggesties) te sturen aan: <a href=\"mailto:address@hidden";>&lt;"
+#~ "address@hidden&gt;</a>."

Index: free-sw.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pl.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- free-sw.pl.po       4 Jun 2013 17:46:43 -0000       1.55
+++ free-sw.pl.po       18 Jun 2013 05:29:56 -0000      1.56
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-06-04 11:36-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <address@hidden>\n"
@@ -17,13 +17,18 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.0\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+# | What is free software? - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Co to Wolne Oprogramowanie? - Projekt GNU - Fundacja Wolnego Oprogramowania "
 "(FSF)"
@@ -457,6 +462,26 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | Sometimes government <a id=\"exportcontrol\">export control
+# | regulations</a> and trade sanctions can constrain your freedom to
+# | distribute copies of programs internationally.  Software developers do not
+# | have the power to eliminate or override these restrictions, but what they
+# | can and must do is refuse to impose them as conditions of use of the
+# | program.  In this way, the restrictions will not affect activities and
+# | people outside the jurisdictions of these governments.  Thus, free
+# | software licenses must not require obedience to any {+nontrivial+} export
+# | regulations as a condition of {+exercising+} any of the essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -465,8 +490,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Czasami rządowe <a id=\"exportcontrol\">przepisy kontroli eksportu</a> "
 "i&nbsp;sankcje handlowe mogą ograniczać waszą wolność rozpowszechniania "
@@ -479,6 +504,16 @@
 "przepisom eksportowym jako warunek dla którejkolwiek z&nbsp;podstawowych "
 "wolności."
 
+#. type: Content of: <p>
+msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -692,6 +727,30 @@
 "Tutaj znajduje się lista znacznych modyfikacji wraz z&nbsp;odnośnikami, by "
 "zilustrować co dokładnie uległo zmianom."
 
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+# | <a
+# | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23\";>Version
+# | 1.23</a>: Address-]
+# | 
{+href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122\";>Version
+# | 1.122</a>: An export control requirement is a real problem if the
+# | requirement is nontrivial; otherwise it is only a+} potential [-problems
+# | related to contract-based licenses.-] {+problem.+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Wersja 1.23</a>: Zwrócenie uwagi na&nbsp;"
+"potencjalne problemy związane z&nbsp;licencjami opartymi na&nbsp;umowach."
+
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
@@ -958,25 +1017,31 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Pytania dotyczące GNU i&nbsp;FSF prosimy kierować na&nbsp;adres <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. Istnieją także <a 
href=\"/"
-"contact/contact.html\">inne sposoby skontaktowania się</a> z&nbsp;FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Informacje o&nbsp;niedziałających odnośnikach oraz&nbsp;inne poprawki (lub 
"
+"contact/contact.html\">inne sposoby skontaktowania się</a> z&nbsp;FSF. <br /"
+"> Informacje o niedziałających odnośnikach oraz&nbsp;inne poprawki (lub "
 "propozycje) prosimy wysyłać na&nbsp;adres <a href=\"mailto:web-";
 "address@hidden">&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -993,8 +1058,14 @@
 "translations.html\">tłumaczeń</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, [-2012-] {+2012, 2013+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "

Index: free-sw.pot
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pot,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- free-sw.pot 18 Jun 2013 04:55:55 -0000      1.40
+++ free-sw.pot 18 Jun 2013 05:29:56 -0000      1.41
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-06-18 04:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05: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"
@@ -16,7 +16,7 @@
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 
 #. type: Attribute 'content' of: <meta>
@@ -608,17 +608,27 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a "
+"href=\"/contact/\">other ways to contact</a> the FSF.  Broken links and "
+"other corrections or suggestions can be sent to <a "
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#
+#.         &lt;address@hidden&gt;</a>.</p>
+#
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a "
@@ -628,7 +638,7 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 

Index: free-sw.pt-br.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pt-br.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- free-sw.pt-br.po    27 May 2013 03:59:15 -0000      1.8
+++ free-sw.pt-br.po    18 Jun 2013 05:29:56 -0000      1.9
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-11-23 00:53-0200\n"
 "Last-Translator: Rafael Ferreira <address@hidden>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -23,7 +23,10 @@
 "X-Poedit-Country: Brazil\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "O que é o software livre? - Projeto GNU - Free Software Foundation (FSF)"
 
@@ -427,6 +430,17 @@
 "umas com as outras.)"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -435,8 +449,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Algumas vezes, as <a id=\"exportcontrol\">regulamentações de controle de "
 "exportação</a> governamentais e sanções comerciais podem reprimir sua "
@@ -451,6 +465,16 @@
 
 #. type: Content of: <p>
 msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
 "based license respects freedom in the ways described above, it is unlikely "
@@ -644,6 +668,22 @@
 "foi modificado."
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Versão 1.23</a>: Discute problemas "
+"potenciais relacionados a licenças baseadas em contratos."
+
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -895,24 +935,30 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
-msgstr ""
-"Envie suas perguntas sobre a FSF e o GNU para <a href=\"mailto:address@hidden";
-"\">&lt;address@hidden&gt;</a>. Também existem <a href=\"/contact/\">outros "
-"meios de contatar</a> a FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Envie links quebrados e outras correções ou sugestões para <a 
href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>."
+"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"
+"org&gt;</a>."
+msgstr ""
+"Envie perguntas em geral sobre a FSF e o GNU para <a 
href=\"mailto:address@hidden";
+"org\">&lt;address@hidden&gt;</a>. Também existem <a 
href=\"/contact/\">outros "
+"meios de contatar</a> a FSF.  Links quebrados e outras correções ou "
+"sugestões podem ser enviadas para <a href=\"mailto:address@hidden";>&lt;"
+"address@hidden&gt;</a>."
 
 #
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -928,8 +974,12 @@
 "envio de traduções das páginas desse site."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "

Index: free-sw.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ru.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- free-sw.ru.po       27 May 2013 04:28:35 -0000      1.34
+++ free-sw.ru.po       18 Jun 2013 05:29:56 -0000      1.35
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-05-27 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -16,10 +16,15 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+# | What is free software? - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Что такое свободная программа? - Проект GNU - 
Фонд свободного программного "
 "обеспечения"
@@ -452,6 +457,26 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | Sometimes government <a id=\"exportcontrol\">export control
+# | regulations</a> and trade sanctions can constrain your freedom to
+# | distribute copies of programs internationally.  Software developers do not
+# | have the power to eliminate or override these restrictions, but what they
+# | can and must do is refuse to impose them as conditions of use of the
+# | program.  In this way, the restrictions will not affect activities and
+# | people outside the jurisdictions of these governments.  Thus, free
+# | software licenses must not require obedience to any {+nontrivial+} export
+# | regulations as a condition of {+exercising+} any of the essential freedoms.
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -460,8 +485,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Иногда государственный <a 
id=\"exportcontrol\">контроль экспорта</a> и "
 "торговые санкции могут ограничить вашу 
свободу передавать копии программ на "
@@ -472,6 +497,16 @@
 "требовать подчинения каким бы то ни было 
правилам экспорта как условия "
 "предоставления любой из существенных 
свобод."
 
+#. type: Content of: <p>
+msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -682,6 +717,30 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
+# | <a
+# | 
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23\";>Version
+# | 1.23</a>: Address-]
+# | 
{+href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122\";>Version
+# | 1.122</a>: An export control requirement is a real problem if the
+# | requirement is nontrivial; otherwise it is only a+} potential [-problems
+# | related to contract-based licenses.-] {+problem.+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Версия 1.23</a>: Указание 
на "
+"потенциальные проблемы, связанные с 
лицензиями, основанными на контрактах."
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -945,23 +1004,29 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
-"Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a href=\"mailto:";
+"Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Есть также <a 
href=\"/contact/"
-"\">другие способы связаться</a> с фондом."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или 
"
-"предложения по адресу <a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>."
-
+"\">другие способы связаться</a> с фондом. 
Отчеты о неработающих ссылках и "
+"другие поправки или предложения можно 
присылать по адресу <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -976,8 +1041,14 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, [-2012-] {+2012, 2013+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "

Index: free-sw.sk.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sk.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- free-sw.sk.po       27 May 2013 03:59:15 -0000      1.36
+++ free-sw.sk.po       18 Jun 2013 05:29:56 -0000      1.37
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2009-09-27 17:27+0200\n"
 "Last-Translator: Dominik Smatana <address@hidden>\n"
 "Language-Team: Slovak <address@hidden>\n"
@@ -24,7 +24,7 @@
 #| msgid ""
 #| "The Free Software Definition - GNU Project - Free Software Foundation "
 #| "(FSF)"
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Definícia slobodného softvéru - Projekt GNU - Nadácia pre slobodný 
softvér "
 "(FSF)"
@@ -523,6 +523,17 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -531,8 +542,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Niekedy môžu vládne <a id=\"exportcontrol\">nariadenia obmedzujúce 
export</"
 "a> alebo iné obchodné sankcie obmedziť vašu slobodu šíriť kópie 
programov v "
@@ -543,6 +554,16 @@
 "slobodného softvéru teda nesmú vyžadovať podriadenie sa žiadnym 
nariadeniam "
 "obmedzujúcim export ako podmienku pre žiadnu so základných slobôd."
 
+#. type: Content of: <p>
+msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -810,6 +831,23 @@
 #, fuzzy
 #| msgid ""
 #| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Verzia 1.23</a>: Uvedenie možných "
+"problémov pri používaní zmluvne založených licencií."
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
 #| "html?root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that "
 #| "all retroactive changes to the license are unacceptable, even if it's not "
 #| "described as a complete replacement."
@@ -1113,28 +1151,11 @@
 #| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
 #| "address@hidden&gt;</a>."
 msgid ""
-"Please send 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."
-msgstr ""
-"Vaše otázky pre FSF &amp; GNU posielajte prosím na <a 
href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>.  Môžete tiež využiť <a 
href=\"/contact/\">iné "
-"spôsoby ako kontaktovať</a> FSF.  <br /> Prosím upozornite nás na 
nefunkčné "
-"odkazy, chyby a možné vylepšenia na <a href=\"mailto:address@hidden";
-"\">&lt;address@hidden&gt;</a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send 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.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Vaše otázky pre FSF &amp; GNU posielajte prosím na <a 
href=\"mailto:address@hidden";
 "org\">&lt;address@hidden&gt;</a>.  Môžete tiež využiť <a 
href=\"/contact/\">iné "
@@ -1143,6 +1164,17 @@
 "\">&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -1160,7 +1192,7 @@
 #| "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, "
 #| "2005, 2006, 2007, 2009 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
@@ -1188,6 +1220,43 @@
 msgid "Updated:"
 msgstr "Aktualizované:"
 
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send 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.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
+#~| "address@hidden&gt;</a>."
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Vaše otázky pre FSF &amp; GNU posielajte prosím na <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>.  Môžete tiež využiť <a 
href=\"/"
+#~ "contact/\">iné spôsoby ako kontaktovať</a> FSF.  <br /> Prosím 
upozornite "
+#~ "nás na nefunkčné odkazy, chyby a možné vylepšenia na <a 
href=\"mailto:web-";
+#~ "address@hidden">&lt;address@hidden&gt;</a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send 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.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
+#~| "address@hidden&gt;</a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Vaše otázky pre FSF &amp; GNU posielajte prosím na <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>.  Môžete tiež využiť <a 
href=\"/"
+#~ "contact/\">iné spôsoby ako kontaktovať</a> FSF.  <br /> Prosím 
upozornite "
+#~ "nás na nefunkčné odkazy, chyby a možné vylepšenia na <a 
href=\"mailto:web-";
+#~ "address@hidden">&lt;address@hidden&gt;</a>."
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "Preklady tejto stránky"

Index: free-sw.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sr.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- free-sw.sr.po       27 May 2013 03:59:15 -0000      1.37
+++ free-sw.sr.po       18 Jun 2013 05:29:56 -0000      1.38
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2008-07-16 17:03+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -22,7 +22,7 @@
 #| msgid ""
 #| "The Free Software Definition - GNU Project - Free Software Foundation "
 #| "(FSF)"
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr ""
 "Дефиниција слободног софтвера — Пројекат 
ГНУ — Задужбина за слободни софтвер "
 "(ЗСС)"
@@ -450,8 +450,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Понекад <a id=\"exportcontrol\">прописи о контроли 
извоза</a> владе одређене "
 "земље и трговинске санкције могу да 
ограниче вашу слободу међународне "
@@ -460,6 +460,16 @@
 "одбију да их наметну као услове употребе 
програма. На тај начин, ограничења "
 "неће утицати на употребу и људе ван 
јурисдикције тих влада."
 
+#. type: Content of: <p>
+msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -714,6 +724,14 @@
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
 "saying that only retroactive <em>restrictions</em> are unacceptable.  The "
 "copyright holders can always grant additional <em>permission</em> for use of "
@@ -899,23 +917,18 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Please send 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."
-msgstr ""
-"Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
-"\"mailto:address@hidden";><em>address@hidden</em></a>. Постоје и <a 
href=\"/"
-"contact/\">други начини да се обратите</a> 
ЗСС-у.<br />Молимо вас да шаљете "
-"неисправне везе и друге исправке (или 
предлоге) на адресу <a href=\"mailto:";
-"address@hidden"><em>address@hidden</em></a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>."
+msgid ""
+"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"
+"org&gt;</a>."
 msgstr ""
 "Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
 "\"mailto:address@hidden";><em>address@hidden</em></a>. Постоје и <a 
href=\"/"
@@ -924,6 +937,17 @@
 "address@hidden"><em>address@hidden</em></a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -941,7 +965,7 @@
 #| "Copyright &copy; 2004, 2005, 2006, 2007, 2008, 2009 Free Software "
 #| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "<b>Ауторска права:</b><br />Copyright &copy; 2004, 2005, 2006, 
2007, 2008, "
@@ -975,6 +999,31 @@
 # type: Content of: <div><p>
 #, fuzzy
 #~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
+#~ "\"mailto:address@hidden";><em>address@hidden</em></a>. Постоје и <a 
href=\"/"
+#~ "contact/\">други начини да се обратите</a> 
ЗСС-у.<br />Молимо вас да "
+#~ "шаљете неисправне везе и друге исправке 
(или предлоге) на адресу <a href="
+#~ "\"mailto:address@hidden";><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
+#~ "\"mailto:address@hidden";><em>address@hidden</em></a>. Постоје и <a 
href=\"/"
+#~ "contact/\">други начини да се обратите</a> 
ЗСС-у.<br />Молимо вас да "
+#~ "шаљете неисправне везе и друге исправке 
(или предлоге) на адресу <a href="
+#~ "\"mailto:address@hidden";><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~ msgid ""
 #~ "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, "
 #~ "2006, 2007, 2009, 2010 Free Software Foundation, Inc."
 #~ msgstr ""

Index: free-sw.tr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.tr.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- free-sw.tr.po       27 May 2013 03:59:15 -0000      1.47
+++ free-sw.tr.po       18 Jun 2013 05:29:56 -0000      1.48
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2009-09-17 19:55+0200\n"
 "Last-Translator: Ali Servet Dönmez <address@hidden>\n"
 "Language-Team: Turkish <address@hidden>\n"
@@ -27,7 +27,7 @@
 #| msgid ""
 #| "The Free Software Definition - GNU Project - Free Software Foundation "
 #| "(FSF)"
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr "Özgür Yazılım Tanımı - GNU Projesi - Özgür Yazılım Vakfı 
(FSF)"
 
 # type: Attribute 'content' of: <meta>
@@ -517,6 +517,17 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -525,8 +536,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "Bazen devletin <a id=\"exportcontrol\">ihracat kontrolü yasaları</a> ve "
 "ticari yaptırımlar, yazılımınızın kopyalarını uluslararası 
dağıtma "
@@ -538,6 +549,16 @@
 "nedenle, özgür yazılım lisansları hiçbir ihracat kontrolü yasasına 
uyma "
 "zorunluluğunu olmazsa olmaz özgürlüklere koşul koymamalıdır."
 
+#. type: Content of: <p>
+msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -803,6 +824,23 @@
 #, fuzzy
 #| msgid ""
 #| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Sürüm 1.23</a>: Kontrat tabanlı 
lisanslar "
+"hakkındaki olası sorunlara işaret et."
+
+# type: Content of: <ul><li>
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
 #| "html?root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that "
 #| "all retroactive changes to the license are unacceptable, even if it's not "
 #| "described as a complete replacement."
@@ -1121,36 +1159,30 @@
 #| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
 #| "address@hidden&gt;</a>."
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Lütfen FSF ve GNU ile ilgili sorularınızı <a 
href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a> adresine iletin. FSF ile iletişim kurmanın <a 
href=\"/"
-"contact/\">başka yolları</a> da vardır.<br />Lütfen çalışmayan 
bağlantıları "
-"ve başka düzeltmeleri veya önerilerinizi <a href=\"mailto:address@hidden";
-"\">&lt;address@hidden&gt;</a> adresine gönderin."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send 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.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Lütfen FSF ve GNU ile ilgili sorularınızı <a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a> adresine iletin. FSF ile iletişim kurmanın <a 
href=\"/"
-"contact/\">başka yolları</a> da vardır.<br />Lütfen çalışmayan 
bağlantıları "
-"ve başka düzeltmeleri veya önerilerinizi <a href=\"mailto:address@hidden";
+"contact/\">başka yolları</a> da vardır. Lütfen çalışmayan 
bağlantıları ve "
+"başka düzeltmeleri veya önerilerinizi <a href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a> adresine gönderin."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -1166,7 +1198,7 @@
 #, fuzzy
 #| msgid "Copyright &copy; 2006, 2007 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr "Copyright &copy; 2006, 2007 Free Software Foundation, Inc."
 
@@ -1221,6 +1253,43 @@
 # type: Content of: <div><p>
 #, fuzzy
 #~| msgid ""
+#~| "Please send 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.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
+#~| "address@hidden&gt;</a>."
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Lütfen FSF ve GNU ile ilgili sorularınızı <a 
href=\"mailto:address@hidden";
+#~ "\">&lt;address@hidden&gt;</a> adresine iletin. FSF ile iletişim kurmanın 
<a "
+#~ "href=\"/contact/\">başka yolları</a> da vardır.<br />Lütfen 
çalışmayan "
+#~ "bağlantıları ve başka düzeltmeleri veya önerilerinizi <a 
href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a> adresine gönderin."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send 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.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
+#~| "address@hidden&gt;</a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Lütfen FSF ve GNU ile ilgili sorularınızı <a 
href=\"mailto:address@hidden";
+#~ "\">&lt;address@hidden&gt;</a> adresine iletin. FSF ile iletişim kurmanın 
<a "
+#~ "href=\"/contact/\">başka yolları</a> da vardır.<br />Lütfen 
çalışmayan "
+#~ "bağlantıları ve başka düzeltmeleri veya önerilerinizi <a 
href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a> adresine gönderin."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
 #~| "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, "
 #~| "2005, 2006, 2007, 2009 Free Software Foundation, Inc."
 #~ msgid ""

Index: free-sw.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-tw.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- free-sw.zh-tw.po    27 May 2013 03:59:15 -0000      1.16
+++ free-sw.zh-tw.po    18 Jun 2013 05:29:56 -0000      1.17
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2013-05-27 03:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-03-03 13:54+0800\n"
 "Last-Translator: Karl Lam <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
@@ -18,7 +18,10 @@
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
-msgid "What is free software? - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "What is free software? - GNU Project - Free Software Foundation (FSF)"
+msgid "What is free software? - GNU Project - Free Software Foundation"
 msgstr "甚麼是自由軟體? - GNU 項目 - 自由軟體基金會 (FSF)"
 
 #. type: Attribute 'content' of: <meta>
@@ -347,6 +350,17 @@
 "類軟體的關係。)"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Sometimes government <a id=\"exportcontrol\">export control regulations</"
+#| "a> and trade sanctions can constrain your freedom to distribute copies of "
+#| "programs internationally.  Software developers do not have the power to "
+#| "eliminate or override these restrictions, but what they can and must do "
+#| "is refuse to impose them as conditions of use of the program.  In this "
+#| "way, the restrictions will not affect activities and people outside the "
+#| "jurisdictions of these governments.  Thus, free software licenses must "
+#| "not require obedience to any export regulations as a condition of any of "
+#| "the essential freedoms."
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
 "and trade sanctions can constrain your freedom to distribute copies of "
@@ -355,8 +369,8 @@
 "refuse to impose them as conditions of use of the program.  In this way, the "
 "restrictions will not affect activities and people outside the jurisdictions "
 "of these governments.  Thus, free software licenses must not require "
-"obedience to any export regulations as a condition of any of the essential "
-"freedoms."
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
 "  有些政府的<a 
id=\"exportcontrol\">出口控制條款</a>和貿易制裁會限制你在國"
 "際發佈軟體的自由。軟體開發者
沒有權力消除這些限制,但他們一定不要把這些限制成"
@@ -365,6 +379,16 @@
 
 #. type: Content of: <p>
 msgid ""
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
 "what kinds of requirements can be imposed through copyright.  If a copyright-"
 "based license respects freedom in the ways described above, it is unlikely "
@@ -525,6 +549,22 @@
 "結。"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.";
+#| "html?root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address "
+#| "potential problems related to contract-based licenses."
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
+msgstr ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">版本 
1.23</a>。指出基於合約的許可證潛在的"
+"問題。"
+
+#. type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
 "root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
@@ -753,23 +793,33 @@
 "的字眼</li></ol>"
 
 #. type: Content of: <div><p>
-msgid ""
-"Please send 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."
+#, fuzzy
+#| msgid ""
+#| "Please send 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."
+msgid ""
+"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"
+"org&gt;</a>."
 msgstr ""
 "請來郵 <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>查詢「自由軟體基"
 "金會」及「GNU 計畫」的事宜。或者<a href=\"/contact/\">透過å…
¶ä»–方式</a>聯絡自"
 "由軟體基金會。"
 
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"請來郵<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>告"
-"訴我們任何失效的連結、錯誤和建議。"
-
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -780,8 +830,12 @@
 "解有關協助翻譯本文的事情。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 Free Software "
 "Foundation, Inc."
 msgstr ""
 "版權所有 &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 
自由軟體基金會"
@@ -807,3 +861,19 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "更新時間︰"
+
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "請來郵 <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>查詢「自由軟"
+#~ "體基金會」及「GNU 計畫」的事宜。或者<a 
href=\"/contact/\">透過其他方式</a>"
+#~ "聯絡自由軟體基金會。"
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "請來郵<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>"
+#~ "告訴我們任何失效的連結、錯誤和建議。"

Index: is-ever-good-use-nonfree-program.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/is-ever-good-use-nonfree-program.fr.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- is-ever-good-use-nonfree-program.fr.po      22 May 2013 11:52:10 -0000      
1.1
+++ is-ever-good-use-nonfree-program.fr.po      18 Jun 2013 05:29:56 -0000      
1.2
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: is-ever-good-use-nonfree-program.html\n"
-"POT-Creation-Date: 2013-05-21 05:56+0000\n"
+"POT-Creation-Date: 2013-06-18 04:55+0000\n"
 "PO-Revision-Date: 2013-05-22 12:02+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"
+"Outdated-Since: 2013-06-18 04:55+0000\n"
 "Plural-Forms: \n"
 
 #. type: Content of: <title>
@@ -141,15 +142,36 @@
 "besoin existe toujours."
 
 #. type: Content of: <p>
+# | However, there are other nonfree programs we still need to replace, and
+# | the analogous question often arises. Should you run the nonfree driver for
+# | a peripheral to help you develop a free replacement driver? Yes, by all
+# | means. Is it ok to run the <a
+# | href=\"http://www.gnu.org/philosophy/javascript-trap.html\";>nonfree
+# | JavaScript</a> on a web site in order to file [-a-] complaint [-about-]
+# | {+asking the webmasters to free+} that [-nonfree-] JavaScript [-code?-]
+# | {+code, or make the site work without it?+} Definitely&mdash;but other
+# | than that, you should have <a
+# | href=\"https://www.gnu.org/software/librejs/\";>LibreJS</a> block it for
+# | you.
+#, fuzzy
+#| msgid ""
+#| "However, there are other nonfree programs we still need to replace, and "
+#| "the analogous question often arises. Should you run the nonfree driver "
+#| "for a peripheral to help you develop a free replacement driver? Yes, by "
+#| "all means. Is it ok to run the <a href=\"http://www.gnu.org/philosophy/";
+#| "javascript-trap.html\">nonfree JavaScript</a> on a web site in order to "
+#| "file a complaint about that nonfree JavaScript code? Definitely&mdash;but "
+#| "other than that, you should have <a href=\"https://www.gnu.org/software/";
+#| "librejs/\">LibreJS</a> block it for you."
 msgid ""
 "However, there are other nonfree programs we still need to replace, and the "
 "analogous question often arises. Should you run the nonfree driver for a "
 "peripheral to help you develop a free replacement driver? Yes, by all means. "
 "Is it ok to run the <a href=\"http://www.gnu.org/philosophy/javascript-trap.";
-"html\">nonfree JavaScript</a> on a web site in order to file a complaint "
-"about that nonfree JavaScript code? Definitely&mdash;but other than that, "
-"you should have <a href=\"https://www.gnu.org/software/librejs/\";>LibreJS</"
-"a> block it for you."
+"html\">nonfree JavaScript</a> on a web site in order to file complaint "
+"asking the webmasters to free that JavaScript code, or make the site work "
+"without it? Definitely&mdash;but other than that, you should have <a href="
+"\"https://www.gnu.org/software/librejs/\";>LibreJS</a> block it for you."
 msgstr ""
 "Cela dit, il reste d'autres programmes privateurs qui ont besoin d'être "
 "remplacés, et des questions analogues se posent souvent. Faut-il que vous "

Index: philosophy.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.ar.po,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- philosophy.ar.po    21 Jan 2013 12:58:00 -0000      1.45
+++ philosophy.ar.po    18 Jun 2013 05:29:56 -0000      1.46
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-01-16 19:10+0200\n"
 "Last-Translator: Rafik E. Younan <address@hidden>\n"
 "Language-Team: Arabic <address@hidden>\n"
@@ -13,14 +13,18 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "X-Poedit-Language: Arabic\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr "(فلسفة مشروع غنو -- مشروع غنو -- مؤسسة 
البرمجيات الحرة (إف إس إف"
 
 # type: Content of: <h2>
@@ -28,6 +32,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "فلسفة مشروع غنو"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -185,25 +195,38 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Please send 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."
-msgstr ""
-"من فضلك أرسل لإف‌إس‌إف واستفسارات غنو 
إلى <a href=\"mailto:address@hidden";
-"\"><em>address@hidden</em></a>.  و ايضاً  <a href=\"/contact/\">طرق 
أخرى "
-"للاتصال</a> بالإف‌إس‌إف. "
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"من فضلك أرسل الروابط المنقطعة وأي تصحيحات 
أو اقتراحات إلى  <a href=\"mailto:";
-"address@hidden"><em>address@hidden</em></a>."
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>."
+msgid ""
+"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"
+"org&gt;</a>."
+msgstr ""
+"من فضلك أرسل لإف&#8204;إس&#8204;إف ولاستفسارات 
غنو ل<a href=\"mailto:address@hidden";
+"org\"><em>address@hidden</em></a>. يوجد أيضا <a 
href=\"/contact/\">طرق أخرى "
+"للاتصال</a> بالإف&#8204;إس&#8204;إف.  <br /> من فضلك 
أرسلالوصلات المنقطعة "
+"وأي تصحيحات أو اقتراحات إلى <a 
href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -213,10 +236,16 @@
 "من فضلك راجع <a 
href=\"/server/standards/README.translations.ar.html"
 "\">تعليمات الترجمة</a> لمعلومات حول تنسيق 
وتسليم ترجمات هذه المقالة."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2004, 2005, 2006, 2007, 2008, 2009 Free Software "
+#| "Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
 msgstr ""
-"حقوق النشر &copy; 2011 مؤسسة البرمجيات الحرة Free 
Software Foundation, Inc."
+"حقوق النشر &copy; 2004، 2005، 2006، 2007، 2008، 2009 مؤسسة 
البرمجيات الحرة، "
+"المحدودة،"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -242,6 +271,29 @@
 msgid "Updated:"
 msgstr ":تحديث"
 
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "من فضلك أرسل لإف‌إس‌إف واستفسارات غنو 
إلى <a href=\"mailto:address@hidden";
+#~ "\"><em>address@hidden</em></a>.  و ايضاً  <a 
href=\"/contact/\">طرق أخرى "
+#~ "للاتصال</a> بالإف‌إس‌إف. "
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "من فضلك أرسل الروابط المنقطعة وأي 
تصحيحات أو اقتراحات إلى  <a href="
+#~ "\"mailto:address@hidden";><em>address@hidden</em></a>."
+
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "حقوق النشر &copy; 2011 مؤسسة البرمجيات الحرة 
Free Software Foundation, "
+#~ "Inc."
+
 # type: Content of: <p>
 #, fuzzy
 #~| msgid ""

Index: philosophy.bg.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.bg.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- philosophy.bg.po    2 Oct 2012 00:29:37 -0000       1.71
+++ philosophy.bg.po    18 Jun 2013 05:29:57 -0000      1.72
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2009-10-28 15:01+0200\n"
 "Last-Translator: Yavor Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -18,8 +18,11 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Философия на проекта GNU - Проектът GNU - 
Фондация за свободен софтуер (ФСС)"
 
@@ -28,6 +31,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Философия на проекта GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -220,40 +229,30 @@
 #| "corrections or suggestions to <a href=\"mailto:address@hidden";
 #| "\"><em>address@hidden</em></a>."
 msgid ""
-"Please send 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."
-msgstr ""
-"Моля, отправяйте въпроси относно ФСС и GNU 
по е-поща: <a href=\"mailto:";
-"address@hidden"><em>address@hidden</em></a>.  Има и други 
начини за <a href=\"/"
-"contact/\">връзка</a> с ФСС.\n"
-"<br />\n"
-"Моля, изпращайте доклади за счупени х
ипервръзки и други корекции (или "
-"предложения) на е-поща: <a 
href=\"mailto:address@hidden";><em>web-"
-"address@hidden</em></a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
-#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Моля, отправяйте въпроси относно ФСС и GNU 
по е-поща: <a href=\"mailto:";
 "address@hidden"><em>address@hidden</em></a>.  Има и други 
начини за <a href=\"/"
-"contact/\">връзка</a> с ФСС.\n"
-"<br />\n"
-"Моля, изпращайте доклади за счупени х
ипервръзки и други корекции (или "
-"предложения) на е-поща: <a 
href=\"mailto:address@hidden";><em>web-"
-"address@hidden</em></a>."
+"contact/\">връзка</a> с ФСС.  <br /> Моля, изпращайте 
доклади за счупени "
+"хипервръзки и други корекции (или 
предложения) на е-поща: <a href=\"mailto:";
+"address@hidden"><em>address@hidden</em></a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -264,16 +263,30 @@
 "за преводачи</a> за информация за 
координирането и подаването на преводи на "
 "тази статия."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr ""
+#, fuzzy
+#| msgid "Copyright &copy; 2007, 2008 Free Software Foundation, Inc.,"
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Авторски права &copy; 2007, 2008 Фондация за 
свободен софтуер"
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Richard Stallman is the founder of the Free Software Foundation.  You can "
+#| "copy and redistribute this article under the <a rel=\"license\" href="
+#| "\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
+#| "Attribution Noderivs 3.0 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>."
 msgstr ""
+"Ричард Столман е основателят на 
Фондацията за свободен софтуер.  Може да "
+"копирате и разпространявате тази статия 
според условията на <a rel=\"license"
+"\" 
href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Криейтив "
+"Комънс „Признание-Без производни 
произведения“ 3.0</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -292,6 +305,47 @@
 # type: Content of: <div><p>
 #, fuzzy
 #~| msgid ""
+#~| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#~| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#~| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#~| "\"><em>address@hidden</em></a>."
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Моля, отправяйте въпроси относно ФСС и GNU 
по е-поща: <a href=\"mailto:";
+#~ "address@hidden"><em>address@hidden</em></a>.  Има и други 
начини за <a href=\"/"
+#~ "contact/\">връзка</a> с ФСС.\n"
+#~ "<br />\n"
+#~ "Моля, изпращайте доклади за счупени х
ипервръзки и други корекции (или "
+#~ "предложения) на е-поща: <a href=\"mailto:address@hidden";
+#~ "\"><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#~| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#~| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#~| "\"><em>address@hidden</em></a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Моля, отправяйте въпроси относно ФСС и GNU 
по е-поща: <a href=\"mailto:";
+#~ "address@hidden"><em>address@hidden</em></a>.  Има и други 
начини за <a href=\"/"
+#~ "contact/\">връзка</a> с ФСС.\n"
+#~ "<br />\n"
+#~ "Моля, изпращайте доклади за счупени х
ипервръзки и други корекции (или "
+#~ "предложения) на е-поща: <a href=\"mailto:address@hidden";
+#~ "\"><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
 #~| "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, "
 #~| "2005, 2006, 2007, 2008 Free Software Foundation, Inc.,"
 #~ msgid ""

Index: philosophy.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.ca.po,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- philosophy.ca.po    29 Nov 2012 10:57:13 -0000      1.68
+++ philosophy.ca.po    18 Jun 2013 05:29:57 -0000      1.69
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: philosophy.ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-11-29 11:27+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -15,11 +15,15 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Filosofia del Projecte GNU - Projecte GNU - Free Software Foundation (FSF)"
 
@@ -28,6 +32,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Filosofia del Projecte GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -191,27 +201,39 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&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>."
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Envieu les vostres preguntes sobre la FSF i GNU a <a 
href=\"mailto:address@hidden";
-"org\">address@hidden</a>. També hi ha <a href=\"/contact/contact.ca.html"
-"\">altres formes de contactar</a> amb la FSF. "
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Envieu els enllaços trencats i d'altres correccions o suggeriments a <a 
href="
-"\"mailto:address@hidden";>address@hidden</a>."
+"org\">&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/contact/contact.ca."
+"html\">altres formes de contactar</a> amb la FSF. Envieu els enllaços "
+"trencats i altres correccions o suggeriments a <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -225,8 +247,10 @@
 "traducció al català del web de GNU."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -252,6 +276,27 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Envieu les vostres preguntes sobre la FSF i GNU a <a href=\"mailto:";
+#~ "address@hidden">address@hidden</a>. També hi ha <a 
href=\"/contact/contact.ca."
+#~ "html\">altres formes de contactar</a> amb la FSF. "
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Envieu els enllaços trencats i d'altres correccions o suggeriments a <a "
+#~ "href=\"mailto:address@hidden";>address@hidden</a>."
+
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+
 #
 #
 #

Index: philosophy.cs.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.cs.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy.cs.po    2 Jan 2013 22:31:53 -0000       1.8
+++ philosophy.cs.po    18 Jun 2013 05:29:57 -0000      1.9
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2013-01-01 00:20+0100\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-01-02 23:29+0100\n"
 "Last-Translator: František Kučera <address@hidden>\n"
 "Language-Team: Czech <address@hidden>\n"
@@ -14,13 +14,17 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Filosofie projektu GNU – Projekt GNU – Nadace pro svobodný software 
(FSF)"
 
@@ -29,6 +33,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Filosofie projektu GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -186,27 +196,39 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Please send 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."
+#, fuzzy
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&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>."
+msgid ""
+"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"
+"org&gt;</a>."
 msgstr ""
 "Dotazy ohledně FSF a GNU prosím posílejte na <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>.  Jsou tu i <a href=\"/contact/\">další 
možnosti "
-"jak kontaktovat</a> nadaci FSF. "
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Ohledně nefunkčních odkazů, jiných oprav a návrhů se prosím obracejte 
na <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+"jak kontaktovat</a> nadaci FSF. Ohledně nefunkčních odkazů a dalších 
návrhů "
+"nebo oprav se prosím obracejte na <a href=\"mailto:address@hidden";>&lt;"
+"address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -218,7 +240,9 @@
 "posílat překlady tohoto článku."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -243,6 +267,27 @@
 msgid "Updated:"
 msgstr "Aktualizováno:"
 
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Dotazy ohledně FSF a GNU prosím posílejte na <a 
href=\"mailto:address@hidden";
+#~ "\">&lt;address@hidden&gt;</a>.  Jsou tu i <a href=\"/contact/\">další "
+#~ "možnosti jak kontaktovat</a> nadaci FSF. "
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Ohledně nefunkčních odkazů, jiných oprav a návrhů se prosím 
obracejte na "
+#~ "<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+
 #
 #
 #

Index: philosophy.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.de.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- philosophy.de.po    7 Feb 2013 15:39:36 -0000       1.55
+++ philosophy.de.po    18 Jun 2013 05:29:57 -0000      1.56
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-01-09 17:00+0100\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -15,16 +15,28 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+# | Philosophy of the GNU Project - GNU Project - Free Software Foundation
+# | [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr "Philosophie des GNU-Projekts - GNU-Projekt - Free Software Foundation"
 
 #. type: Content of: <div><h2>
 msgid "Philosophy of the GNU Project"
 msgstr "Philosophie des GNU-Projekts"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -168,26 +180,32 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
-# Text not the very latest; doesn’t correspond to boilerplate.
 #. type: Content of: <div><p>
 msgid ""
-"Please send FSF &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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Bitte senden Sie allgemeine Fragen zur FSF &amp; GNU an <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Sie können auch die <a href=\"/"
 "contact/\"><span xml:lang=\"en\" lang=\"en\">Free Software Foundation</span> "
-"kontaktieren</a>."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Bitte senden Sie ungültige Verweise und andere Korrekturen oder Vorschläge "
-"an <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-
+"kontaktieren</a>. Ungültige Verweise und andere Korrekturen oder Vorschläge 
"
+"können an <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
+"a> gesendet werden."
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -205,8 +223,8 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -231,6 +249,9 @@
 msgid "Updated:"
 msgstr "Aktualisierung:"
 
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "Our development of the GNU free software operating system is motivated by "
 #~ "the philosophy of the free software movement.  This page provides an "

Index: philosophy.el-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.el-diff.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy.el-diff.html     28 Feb 2013 19:12:52 -0000      1.7
+++ philosophy.el-diff.html     18 Jun 2013 05:29:57 -0000      1.8
@@ -11,8 +11,9 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-
-&lt;title&gt;Philosophy of the GNU Project - GNU Project - Free Software 
Foundation (FSF)&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.75 
--&gt;</em></ins></span>
+&lt;title&gt;Philosophy of the GNU Project
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
 
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/banner.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/philosophy/po/philosophy.translist"</em></ins></span>
 --&gt;
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/philosophy/po/philosophy.translist"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/banner.html"</em></ins></span> --&gt;
@@ -24,6 +25,11 @@
 
 &lt;/div&gt; &lt;!-- id="education-content" --&gt;
 
+<span class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;
+See &lt;a href="http://audio-video.gnu.org/"&gt;audio-video.gnu.org&lt;/a&gt;
+for recordings of Richard Stallman's speeches.
+&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
+
 &lt;p&gt;&lt;em&gt;Free software&lt;/em&gt; means that the software's users 
have
 freedom.  (The issue is not about price.)  We developed the GNU
 operating system so that users can have freedom in their
@@ -83,47 +89,84 @@
 that Work for Freedom in
 Computer Development and Electronic Communications&lt;/a&gt;.&lt;/p&gt;
 
-&lt;!-- If needed, change the copyright block at the bottom. In general,
+<span class="removed"><del><strong>&lt;!-- If needed, change the copyright 
block at the bottom. In general,
      pages on the GNU web server should be under CC BY-ND 3.0 US.
      Please do NOT change or remove this without talking
      with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the document
-     and that it is like this: "2001, 2002", not this: "2001-2002". --&gt;
+     and that it is like this: "2001, 2002", not this: "2001-2002". 
--&gt;</strong></del></span>
+
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
-&lt;p&gt;
-Please send FSF &amp; GNU inquiries to
+<span class="removed"><del><strong>&lt;p&gt;
+Please</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
 &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
 the FSF.
-&lt;br /&gt;
-Please send broken links and other corrections or suggestions to
-&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+<span class="removed"><del><strong>&lt;br /&gt;
+Please send broken</strong></del></span>  <span 
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections 
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
+to &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 &lt;/p&gt;
 
-&lt;p&gt;
-Please see the
-&lt;a href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting
-translations of this article.
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;</em></ins></span>
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this <span class="removed"><del><strong>article.
 &lt;/p&gt;
 
 &lt;p&gt;
-Copyright &copy; 2011 Free Software Foundation, Inc.&lt;/p&gt;
+Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+
+&lt;!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. --&gt;
+
+&lt;p&gt;Copyright</em></ins></span> &copy; <span 
class="removed"><del><strong>2011</strong></del></span> <span 
class="inserted"><ins><em>2013</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
-Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.
+Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
 &lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;
-Updated:</strong></del></span>
+&lt;p&gt;
+Updated:</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;!--#include 
virtual="/server/bottom-notes.html" --&gt;
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
 &lt;p&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2013/02/28 19:12:52 $
+$Date: 2013/06/18 05:29:57 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy.el.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.el.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- philosophy.el.po    2 Oct 2012 00:29:38 -0000       1.34
+++ philosophy.el.po    18 Jun 2013 05:29:57 -0000      1.35
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: www-el_v0.2.0\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-03-01 18:52+0200\n"
 "Last-Translator: Georgios Zarkadas <address@hidden>\n"
 "Language-Team: Greek <address@hidden>\n"
@@ -19,8 +19,11 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr "Φιλοσοφία του Έργου GNU - Έργο GNU - Ίδρυμα 
Ελεύθερου Λογισμικού (ΙΕΛ)"
 
 # type: Content of: <h2>
@@ -28,6 +31,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Φιλοσοφία του Έργου GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -198,22 +207,29 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Παρακαλούμε στείλτε ερωτήσεις για τα ΙΕΛ 
&amp; GNU στο <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>.  Υπάρχουν επίσης <a 
href=\"/contact/"
-"\">άλλοι τρόποι για να επικοινωνήσετε</a> με 
το ΙΕΛ."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Παρακαλούμε στείλτε ανενεργούς συνδέσμου
ς και άλλες διορθώσεις ή προτάσεις "
-"στο <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-
+"\">άλλοι τρόποι για να επικοινωνήσετε</a> με 
το ΙΕΛ. Ανενεργοί σύνδεσμοι και "
+"άλλες διορθώσεις ή προτάσεις μπορούν να 
σταλούν στο <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -225,8 +241,10 @@
 "υποβολή μεταφράσεων αυτού του άρθρου."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "Πνευματικά δικαιώματα &copy; 2011 Ίδρυμα 
Ελεύθερου Λογισμικού, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Πνευματικά δικαιώματα &copy; 2010 Ίδρυμα 
Ελεύθερου Λογισμικού, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.es.po,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- philosophy.es.po    18 Jan 2013 13:33:26 -0000      1.91
+++ philosophy.es.po    18 Jun 2013 05:29:57 -0000      1.92
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-10-03 21:51+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -26,12 +26,18 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+# | Philosophy of the GNU Project - GNU Project - Free Software Foundation
+# | [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Filosofía del Proyecto GNU - Proyecto GNU - Free Software Foundation (FSF)"
 
@@ -40,6 +46,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Filosofía del Proyecto GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -203,25 +215,30 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Envíe sus consultas acerca de la FSF  y GNU a <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>. Existen también <a href=\"/contact/\">otros "
-"medios para contactar</a> con la FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Para avisar de enlaces rotos y proponer otras correcciones o sugerencias, "
-"diríjase a <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
-"a>."
+"medios para contactar</a> con la FSF. <br /> Para avisar de enlaces rotos y "
+"proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
 
 #
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -238,8 +255,11 @@
 "de este sitio web."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -262,3 +282,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización: "
+
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."

Index: philosophy.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.fr.po,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- philosophy.fr.po    13 Feb 2013 21:06:16 -0000      1.89
+++ philosophy.fr.po    18 Jun 2013 05:29:57 -0000      1.90
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-10-26 22:48+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -16,12 +16,18 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "Plural-Forms:  \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+# | Philosophy of the GNU Project - GNU Project - Free Software Foundation
+# | [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Philosophie du projet GNU - Projet GNU - Free Software Foundation (FSF)"
 
@@ -29,6 +35,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Philosophie du projet GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -186,23 +198,29 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Veuillez envoyer les requêtes concernant la FSF et GNU à <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Il existe aussi <a 
href=\"/contact/"
-"\">d'autres moyens de contacter</a> la FSF."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou "
-"suggestions à <a href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>."
-
+"\">d'autres moyens de contacter</a> la FSF. Les liens orphelins et autres "
+"corrections ou suggestions peuvent être signalés à <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -219,8 +237,11 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -244,3 +265,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."

Index: philosophy.hr.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.hr.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy.hr.po    8 Jun 2013 08:58:46 -0000       1.2
+++ philosophy.hr.po    18 Jun 2013 05:29:57 -0000      1.3
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-06-08 10:21+0100\n"
 "Last-Translator: Martina Bebek <address@hidden>\n"
 "Language-Team: www-hr <address@hidden>\n"
@@ -14,13 +14,19 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+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: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+# | Philosophy of the GNU Project - GNU Project - Free Software Foundation
+# | [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Filozofija Projekta GNU - Projekt GNU - Zaklada za slobodan softver (FSF)"
 
@@ -28,6 +34,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Filozofija Projekta GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -181,23 +193,38 @@
 "li></ol>"
 
 #. type: Content of: <div><p>
-msgid ""
-"Please send 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."
-msgstr ""
-"Molimo vas, općenite upite o FSF &amp; GNU šaljite na <a href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>. Postoje i <a 
href=\"/contact/\">drugi "
-"načini kontaktiranja</a> FSF-a."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-" Prekinute poveznice i ostale ispravke ili prijedloge možete poslati na <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&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>."
+msgid ""
+"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"
+"org&gt;</a>."
+msgstr ""
+"Molim vas šaljite općenite FSF &amp; GNU upite na <a 
href=\"mailto:address@hidden";
+"org\">&lt;address@hidden&gt;</a>.  Postoje isto i <a href=\"/contact/\">drugi 
"
+"načini kontaktiranja</a> FSF-a. Prekinute poveznice i drugi ispravci ili "
+"prijedlozi mogu biti poslani na <a href=\"mailto:address@hidden";>&lt;"
+"address@hidden&gt;</a>. "
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -213,8 +240,12 @@
 "za prijevode</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+# | [-The-]{+Copyright &copy; 2013+} Free Software [-Foundation-]
+# | {+Foundation, Inc.+}
+#, fuzzy
+#| msgid "The Free Software Foundation"
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Zaklada za slobodan softver"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -235,3 +266,22 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Vrijeme zadnje izmjene:"
+
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Molimo vas, općenite upite o FSF &amp; GNU šaljite na <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>. Postoje i <a href=\"/contact/"
+#~ "\">drugi načini kontaktiranja</a> FSF-a."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ " Prekinute poveznice i ostale ispravke ili prijedloge možete poslati na "
+#~ "<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."

Index: philosophy.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.ja.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy.ja.po    29 Jan 2013 01:01:23 -0000      1.17
+++ philosophy.ja.po    18 Jun 2013 05:29:57 -0000      1.18
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-12-03 11:55+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -15,10 +15,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "GNUプロジェクトの理念 - GNUプロジェクト - 
フリーソフトウェアファウンデーショ"
 "ン (FSF)"
@@ -27,6 +31,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "GNUプロジェクトの理念"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -173,22 +183,28 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "FSFおよびGNUに関する問い合わせは<a 
href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>までお願いします(英語)。FSFへの連絡は<a 
href=\"/contact/\">他の方"
-"法</a>もあります。"
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"リンク切れや他の修正、提案は<a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>までお送りください。"
+"法</a>もあります。リンク切れや他の修正、提案は<a 
href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>までお送りください。"
 
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -202,8 +218,10 @@
 "translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -225,6 +243,9 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "Our development of the GNU free software operating system is motivated by "
 #~ "the philosophy of the free software movement.  This page provides an "

Index: philosophy.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.pl.po,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- philosophy.pl.po    18 May 2013 21:47:21 -0000      1.54
+++ philosophy.pl.po    18 Jun 2013 05:29:57 -0000      1.55
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: philosophy/philosophy.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-05-18 15:46-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <address@hidden>\n"
@@ -15,14 +15,20 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.0\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+# | Philosophy of the GNU Project - GNU Project - Free Software Foundation
+# | [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Filozofia Projektu GNU - Projekt GNU - Fundacja Wolnego Oprogramowania (FSF)"
 
@@ -31,6 +37,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Filozofia Projektu GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -197,25 +209,31 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Pytania dotyczące GNU i&nbsp;FSF prosimy kierować na&nbsp;adres <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. Istnieją także <a 
href=\"/"
-"contact/contact.html\">inne sposoby skontaktowania się</a> z&nbsp;FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Informacje o&nbsp;niedziałających odnośnikach oraz&nbsp;inne poprawki (lub 
"
+"contact/contact.html\">inne sposoby skontaktowania się</a> z&nbsp;FSF. <br /"
+"> Informacje o niedziałających odnośnikach oraz&nbsp;inne poprawki (lub "
 "propozycje) prosimy wysyłać na&nbsp;adres <a href=\"mailto:web-";
 "address@hidden">&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -232,8 +250,8 @@
 "translations.html\">tłumaczeń</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -261,3 +279,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Aktualizowane:"
+
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."

Index: philosophy.pot
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.pot,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- philosophy.pot      2 Oct 2012 00:29:38 -0000       1.58
+++ philosophy.pot      18 Jun 2013 05:29:58 -0000      1.59
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05: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"
@@ -16,13 +16,19 @@
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <title>
-msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation 
(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 
 #. type: Content of: <div><h2>
 msgid "Philosophy of the GNU Project"
 msgstr ""
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -138,17 +144,27 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a "
+"href=\"/contact/\">other ways to contact</a> the FSF.  Broken links and "
+"other corrections or suggestions can be sent to <a "
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#
+#.         &lt;address@hidden&gt;</a>.</p>
+#
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a "
@@ -157,7 +173,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: philosophy.pt-br.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.pt-br.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- philosophy.pt-br.po 28 May 2013 16:58:20 -0000      1.52
+++ philosophy.pt-br.po 18 Jun 2013 05:29:58 -0000      1.53
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-05-28 12:44-0300\n"
 "Last-Translator: Rafael Ferreira <address@hidden>\n"
 "Language-Team: Brazilian Portuguese <address@hidden>\n"
@@ -21,10 +21,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Filosofia do Projeto GNU - Projeto GNU - Free Software Foundation (FSF)"
 
@@ -32,6 +36,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Filosofia do Projeto GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -179,24 +189,30 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
-msgstr ""
-"Envie suas perguntas sobre a FSF e o GNU para <a href=\"mailto:address@hidden";
-"\">&lt;address@hidden&gt;</a>. Também existem <a href=\"/contact/\">outros "
-"meios de contatar</a> a FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Envie links quebrados e outras correções ou sugestões para <a 
href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>."
+"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"
+"org&gt;</a>."
+msgstr ""
+"Envie perguntas em geral sobre a FSF e o GNU para <a 
href=\"mailto:address@hidden";
+"org\">&lt;address@hidden&gt;</a>. Também existem <a 
href=\"/contact/\">outros "
+"meios de contatar</a> a FSF.  Links quebrados e outras correções ou "
+"sugestões podem ser enviadas para <a href=\"mailto:address@hidden";>&lt;"
+"address@hidden&gt;</a>."
 
 #
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -212,7 +228,9 @@
 "envio de traduções das páginas desse site."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
@@ -242,6 +260,9 @@
 msgid "Updated:"
 msgstr "Última atualização: "
 
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+
 # type: Content of: <ul><li>
 #, fuzzy
 #~ msgid ""

Index: philosophy.ro.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.ro.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy.ro.po    2 Oct 2012 00:29:38 -0000       1.24
+++ philosophy.ro.po    18 Jun 2013 05:29:58 -0000      1.25
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.ro.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2010-12-03 22:33+0200\n"
 "Last-Translator: Cătălin Frâncu <address@hidden>\n"
 "Language-Team: Romanian <address@hidden>\n"
@@ -16,8 +16,11 @@
 "Outdated-Since: 2011-08-29 04:25-0300\n"
 
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Filozofia Proiectului GNU - Proiectul GNU - Fundația pentru Software Liber "
 "(FSF)"
@@ -26,6 +29,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Filozofia Proiectului GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -195,9 +204,11 @@
 #| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
 #| "address@hidden&gt;</a>."
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Vă rugăm să adresați întrebările dumneavoastră despre FSF și GNU la 
<a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. Există și <a 
href=\"/contact/"
@@ -205,15 +216,17 @@
 "semnalați legăturile rupte și alte corecturi sau sugestii la <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Vă rugăm să semnalați legăturile rupte și alte corecturi sau sugestii 
la <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;"
-"</a>."
-
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -224,9 +237,12 @@
 "ul despre traduceri</a> pentru informații despre coordonarea și trimiterea "
 "traducerilor pentru acest articol."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr ""
+#, fuzzy
+#| msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2010 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -249,6 +265,33 @@
 
 #, fuzzy
 #~| msgid ""
+#~| "Please send 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.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
+#~| "address@hidden&gt;</a>."
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Vă rugăm să adresați întrebările dumneavoastră despre FSF și GNU 
la <a "
+#~ "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. Există și <a 
href=\"/"
+#~ "contact/\">alte modalități pentru a lua contact</a> cu FSF. <br /> Vă "
+#~ "rugăm să semnalați legăturile rupte și alte corecturi sau sugestii la 
<a "
+#~ "href=\"mailto:address@hidden";>&lt;address@hidden"
+#~ "org&gt;</a>."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Vă rugăm să semnalați legăturile rupte și alte corecturi sau 
sugestii la "
+#~ "<a href=\"mailto:address@hidden";>&lt;address@hidden"
+#~ "org&gt;</a>."
+
+#, fuzzy
+#~| msgid ""
 #~| "Our development of the GNU free software operating system is motivated "
 #~| "by the philosophy of the free software movement. This page provides an "
 #~| "introduction to that philosophy, links to the latest articles we have on "

Index: philosophy.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.ru.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy.ru.po    2 Oct 2012 08:29:27 -0000       1.15
+++ philosophy.ru.po    18 Jun 2013 05:29:58 -0000      1.16
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-10-02 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,12 +15,18 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+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"
 
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+# | Philosophy of the GNU Project - GNU Project - Free Software Foundation
+# | [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Философия проекта GNU - Проект GNU - Фонд 
свободного программного обеспечения"
 
@@ -28,6 +34,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Философия проекта GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -183,23 +195,29 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
-"Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a href=\"mailto:";
+"Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Есть также <a 
href=\"/contact/"
-"\">другие способы связаться</a> с фондом."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или 
"
-"предложения по адресу <a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>."
-
+"\">другие способы связаться</a> с фондом. 
Отчеты о неработающих ссылках и "
+"другие поправки или предложения можно 
присылать по адресу <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -213,9 +231,13 @@
 "предложениям переводов наших статей см. в 
<a href=\"/server/standards/README."
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -243,6 +265,9 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "Our development of the GNU free software operating system is motivated by "
 #~ "the philosophy of the free software movement.  This page provides an "

Index: philosophy.sq.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.sq.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy.sq.po    20 Feb 2013 13:46:50 -0000      1.17
+++ philosophy.sq.po    18 Jun 2013 05:29:58 -0000      1.18
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-11-01 11:23+0200\n"
 "Last-Translator: Besnik Bleta <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -14,10 +14,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Filozofia e Projektit GNU - Projekti GNU - Free Software Foundation (FSF)"
 
@@ -25,6 +29,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Filozofia e Projektit GNU"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -176,23 +186,30 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
-msgstr ""
-"Ju lutemi, pyetjet për FSF &amp; GNU dërgojini te <a 
href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>.  Ka gjithashtu edhe <a href=\"/contact/"
-"\">mënyra të tjera për t'u lidhur me</a> FSF-në."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+"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"
+"org&gt;</a>."
 msgstr ""
-"Ju lutemi, për lidhje të dëmtuara dhe ndreqje të tjera apo këshilla "
-"shkruajuni te <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"Ju lutemi, pyetjet dhe kërkesat e përgjithshme rreth FSF-së &amp; GNU-së "
+"dërgojini te <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  
Ka "
+"gjithashtu <a href=\"/contact/\">mënyra të tjera për t'u lidhur me</a> 
FSF-"
+"në.  Njoftimet për lidhje të dëmtuara dhe ndreqje apo këshilla të tjera 
mund "
+"të dërgohen te <a href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>."
 
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -204,8 +221,10 @@
 "html\">README për përkthimet</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "Të drejta Kopjimi &copy; 2011 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "Të drejta Kopjimi &copy; 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -226,3 +245,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "U përditësua më:"
+
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "Të drejta Kopjimi &copy; 2011 Free Software Foundation, Inc."

Index: philosophy.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.sr.po,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- philosophy.sr.po    2 Oct 2012 00:29:38 -0000       1.62
+++ philosophy.sr.po    18 Jun 2013 05:29:58 -0000      1.63
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2009-07-05 21:52+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -18,8 +18,11 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr ""
 "Филозофија Пројекта ГНУ — Пројекат ГНУ — 
Задужбина за слободни софтвер (ЗСС)"
 
@@ -28,6 +31,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "Филозофија Пројекта ГНУ"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -216,28 +225,11 @@
 #| "corrections or suggestions to <a href=\"mailto:address@hidden";
 #| "\"><em>address@hidden</em></a>."
 msgid ""
-"Please send 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."
-msgstr ""
-"Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
-"\"mailto:address@hidden";><em>address@hidden</em></a>. Постоје и <a 
href=\"/"
-"contact/\">други начини да се обратите</a> 
ЗСС-у.<br />Молимо вас да шаљете "
-"неисправне везе и друге исправке (или 
предлоге) на адресу <a href=\"mailto:";
-"address@hidden"><em>address@hidden</em></a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
-#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
 "\"mailto:address@hidden";><em>address@hidden</em></a>. Постоје и <a 
href=\"/"
@@ -246,6 +238,17 @@
 "address@hidden"><em>address@hidden</em></a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -256,9 +259,14 @@
 "\">ПРОЧИТАЈМЕ за преводе</a> за више 
информација о координисању и слању "
 "превода овог чланка."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2007, 2008 Free Software Foundation, Inc.,"
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
 msgstr ""
+"<b>Ауторска права:</b><br />Copyright &copy; 2007, 2008 Free 
Software "
+"Foundation, Inc.,"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -288,6 +296,43 @@
 # type: Content of: <div><p>
 #, fuzzy
 #~| msgid ""
+#~| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#~| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#~| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#~| "\"><em>address@hidden</em></a>."
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
+#~ "\"mailto:address@hidden";><em>address@hidden</em></a>. Постоје и <a 
href=\"/"
+#~ "contact/\">други начини да се обратите</a> 
ЗСС-у.<br />Молимо вас да "
+#~ "шаљете неисправне везе и друге исправке 
(или предлоге) на адресу <a href="
+#~ "\"mailto:address@hidden";><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#~| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#~| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#~| "\"><em>address@hidden</em></a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
+#~ "\"mailto:address@hidden";><em>address@hidden</em></a>. Постоје и <a 
href=\"/"
+#~ "contact/\">други начини да се обратите</a> 
ЗСС-у.<br />Молимо вас да "
+#~ "шаљете неисправне везе и друге исправке 
(или предлоге) на адресу <a href="
+#~ "\"mailto:address@hidden";><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
 #~| "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, "
 #~| "2005, 2006, 2007, 2008 Free Software Foundation, Inc.,"
 #~ msgid ""

Index: philosophy.zh-cn-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.zh-cn-diff.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy.zh-cn-diff.html  28 Feb 2013 19:12:52 -0000      1.15
+++ philosophy.zh-cn-diff.html  18 Jun 2013 05:29:58 -0000      1.16
@@ -11,8 +11,9 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-
-&lt;title&gt;Philosophy of the GNU Project - GNU Project - Free Software 
Foundation (FSF)&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.75 
--&gt;</em></ins></span>
+&lt;title&gt;Philosophy of the GNU Project
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
 
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/banner.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/philosophy/po/philosophy.translist"</em></ins></span>
 --&gt;
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/philosophy/po/philosophy.translist"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/banner.html"</em></ins></span> --&gt;
@@ -24,9 +25,14 @@
 
 &lt;/div&gt; &lt;!-- id="education-content" --&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Our development 
of</strong></del></span>
+<span class="removed"><del><strong>&lt;p&gt;Our 
development</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;
+See &lt;a href="http://audio-video.gnu.org/"&gt;audio-video.gnu.org&lt;/a&gt;
+for recordings</em></ins></span> of <span class="inserted"><ins><em>Richard 
Stallman's speeches.
+&lt;/p&gt;&lt;/blockquote&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;&lt;em&gt;Free software&lt;/em&gt; 
means that the software's users have
+&lt;p&gt;&lt;em&gt;Free software&lt;/em&gt; means that the software's users 
have
 freedom.  (The issue is not about price.)  We developed</em></ins></span> the 
GNU <span class="removed"><del><strong>free software</strong></del></span>
 operating system <span class="removed"><del><strong>is motivated
 by the philosophy of the</strong></del></span> <span 
class="inserted"><ins><em>so that users can have freedom in their
@@ -91,47 +97,84 @@
 that Work for Freedom in
 Computer Development and Electronic Communications&lt;/a&gt;.&lt;/p&gt;
 
-&lt;!-- If needed, change the copyright block at the bottom. In general,
+<span class="removed"><del><strong>&lt;!-- If needed, change the copyright 
block at the bottom. In general,
      pages on the GNU web server should be under CC BY-ND 3.0 US.
      Please do NOT change or remove this without talking
      with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the document
-     and that it is like this: "2001, 2002", not this: "2001-2002". --&gt;
+     and that it is like this: "2001, 2002", not this: "2001-2002". 
--&gt;</strong></del></span>
+
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
-&lt;p&gt;
-Please send FSF &amp; GNU inquiries to
+<span class="removed"><del><strong>&lt;p&gt;
+Please</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
 &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
 the FSF.
-&lt;br /&gt;
-Please send broken links and other corrections or suggestions to
-&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+<span class="removed"><del><strong>&lt;br /&gt;
+Please send broken</strong></del></span>  <span 
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections 
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
+to &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 &lt;/p&gt;
 
-&lt;p&gt;
-Please see the
-&lt;a href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting
-translations of this article.
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;</em></ins></span>
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this <span class="removed"><del><strong>article.
 &lt;/p&gt;
 
 &lt;p&gt;
-Copyright &copy; 2011 Free Software Foundation, Inc.&lt;/p&gt;
+Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+
+&lt;!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. --&gt;
+
+&lt;p&gt;Copyright</em></ins></span> &copy; <span 
class="removed"><del><strong>2011</strong></del></span> <span 
class="inserted"><ins><em>2013</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
-Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.
+Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
 &lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;
-Updated:</strong></del></span>
+&lt;p&gt;
+Updated:</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;!--#include 
virtual="/server/bottom-notes.html" --&gt;
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
 &lt;p&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2013/02/28 19:12:52 $
+$Date: 2013/06/18 05:29:58 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.zh-cn.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- philosophy.zh-cn.po 2 Oct 2012 00:29:39 -0000       1.29
+++ philosophy.zh-cn.po 18 Jun 2013 05:29:58 -0000      1.30
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2012-10-01 20:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-02-15 16:59+0800\n"
 "Last-Translator: Li Fanxi <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
@@ -18,8 +18,11 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid ""
-"Philosophy of the GNU Project - GNU Project - Free Software Foundation (FSF)"
+#, fuzzy
+#| msgid ""
+#| "Philosophy of the GNU Project - GNU Project - Free Software Foundation "
+#| "(FSF)"
+msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
 msgstr "GNU 工程的哲学 - GNU 工程 - 自由软件基金会 (FSF)"
 
 # type: Content of: <h2>
@@ -27,6 +30,12 @@
 msgid "Philosophy of the GNU Project"
 msgstr "GNU 工程的哲学"
 
+#. type: Content of: <blockquote><p>
+msgid ""
+"See <a href=\"http://audio-video.gnu.org/\";>audio-video.gnu.org</a> for "
+"recordings of Richard Stallman's speeches."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "<em>Free software</em> means that the software's users have freedom.  (The "
@@ -187,25 +196,34 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Please send 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."
-msgstr ""
-"请将有关自由软件基金会与 GNU 
的查询与问题(以英语)发送到<a href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
-"它方法</a> 联系自由软件基金会。"
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方(或任何建议),请发送邮件至 <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
+#, fuzzy
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
+#| "\">other ways to contact</a> the FSF."
+msgid ""
+"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"
+"org&gt;</a>."
+msgstr ""
+"请将有关自由软件基金会(FSF) &amp; GNU 的查询 &amp; 
问题发送到<a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。也可以通过 <a 
href=\"/"
+"contact/\">其他联系方法</a> 联系自由软件基金会(FSF)。"
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -216,8 +234,10 @@
 "\">翻译手册</a> 获取有关协调和提交翻译的相关事项。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
-msgstr "版板所有 &copy; 2011 自由软件基金会"
+#, fuzzy
+#| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
+msgstr "版权所有 &copy; 2011 自由软件基金会"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -243,6 +263,27 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "请将有关自由软件基金会与 GNU 
的查询与问题(以英语)发送到<a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>。您也可以通过 <a 
href=\"/contact/\">"
+#~ "其它方法</a> 联系自由软件基金会。"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方(或任何建议),请发送邮件至 <a "
+#~ "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
+
+#~ msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+#~ msgstr "版板所有 &copy; 2011 自由软件基金会"
+
 # type: Content of: <p>
 #~ msgid ""
 #~ "Our development of the GNU free software operating system is motivated by "

Index: proprietary-surveillance.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/proprietary-surveillance.de.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- proprietary-surveillance.de.po      15 Jun 2013 23:19:05 -0000      1.5
+++ proprietary-surveillance.de.po      18 Jun 2013 05:29:58 -0000      1.6
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: proprietary-surveillance.html\n"
-"POT-Creation-Date: 2013-06-12 14:25+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-06-16 00:00+0200\n"
 "Last-Translator: Joerg Kohne <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"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Proprietary Surveillance - GNU Project - Free Software Foundation"
@@ -100,13 +101,28 @@
 "net/2012/12/29/your-cisco-phone-is-listening.html</a>."
 
 #. type: Content of: <ul><li>
+# | [-Most portable-]{+Portable+} phones {+with GPS+} will send their GPS
+# | location on remote command and users cannot stop them: <a
+# | 
href=\"http://www.aclu.org/government-location-tracking-cell-phones-gps-devices-and-license-plate-readers\";>
+# | 
http://www.aclu.org/government-location-tracking-cell-phones-gps-devices-and-license-plate-readers</a>.
+# |  (The US [-requires-] {+says it will eventually require+} all new portable
+# | phones to have [-GPS; this requirement has existed for many years.)-]
+# | {+GPS.)+}
+#, fuzzy
+#| msgid ""
+#| "Most portable phones will send their GPS location on remote command and "
+#| "users cannot stop them: <a href=\"http://www.aclu.org/government-location-";
+#| "tracking-cell-phones-gps-devices-and-license-plate-readers\"> http://www.";
+#| "aclu.org/government-location-tracking-cell-phones-gps-devices-and-license-"
+#| "plate-readers</a>.  (The US requires all new portable phones to have GPS; "
+#| "this requirement has existed for many years.)"
 msgid ""
-"Most portable phones will send their GPS location on remote command and "
+"Portable phones with GPS will send their GPS location on remote command and "
 "users cannot stop them: <a href=\"http://www.aclu.org/government-location-";
 "tracking-cell-phones-gps-devices-and-license-plate-readers\"> http://www.";
 "aclu.org/government-location-tracking-cell-phones-gps-devices-and-license-"
-"plate-readers</a>.  (The US requires all new portable phones to have GPS; "
-"this requirement has existed for many years.)"
+"plate-readers</a>.  (The US says it will eventually require all new portable "
+"phones to have GPS.)"
 msgstr ""
 "Die meisten mobilen Telefone senden per Remotebefehl ihren GPS-Standort und "
 "Benutzer können es nicht verhindern: <a href=\"http://www.aclu.org/";

Index: proprietary-surveillance.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/proprietary-surveillance.fr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- proprietary-surveillance.fr.po      17 Jun 2013 04:36:49 -0000      1.3
+++ proprietary-surveillance.fr.po      18 Jun 2013 05:29:58 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: proprietary-surveillance.html\n"
-"POT-Creation-Date: 2013-06-12 14:25+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-06-15 12:32+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"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -102,13 +103,28 @@
 "\">http://boingboing.net/2012/12/29/your-cisco-phone-is-listening.html</a>) 
;"
 
 #. type: Content of: <ul><li>
+# | [-Most portable-]{+Portable+} phones {+with GPS+} will send their GPS
+# | location on remote command and users cannot stop them: <a
+# | 
href=\"http://www.aclu.org/government-location-tracking-cell-phones-gps-devices-and-license-plate-readers\";>
+# | 
http://www.aclu.org/government-location-tracking-cell-phones-gps-devices-and-license-plate-readers</a>.
+# |  (The US [-requires-] {+says it will eventually require+} all new portable
+# | phones to have [-GPS; this requirement has existed for many years.)-]
+# | {+GPS.)+}
+#, fuzzy
+#| msgid ""
+#| "Most portable phones will send their GPS location on remote command and "
+#| "users cannot stop them: <a href=\"http://www.aclu.org/government-location-";
+#| "tracking-cell-phones-gps-devices-and-license-plate-readers\"> http://www.";
+#| "aclu.org/government-location-tracking-cell-phones-gps-devices-and-license-"
+#| "plate-readers</a>.  (The US requires all new portable phones to have GPS; "
+#| "this requirement has existed for many years.)"
 msgid ""
-"Most portable phones will send their GPS location on remote command and "
+"Portable phones with GPS will send their GPS location on remote command and "
 "users cannot stop them: <a href=\"http://www.aclu.org/government-location-";
 "tracking-cell-phones-gps-devices-and-license-plate-readers\"> http://www.";
 "aclu.org/government-location-tracking-cell-phones-gps-devices-and-license-"
-"plate-readers</a>.  (The US requires all new portable phones to have GPS; "
-"this requirement has existed for many years.)"
+"plate-readers</a>.  (The US says it will eventually require all new portable "
+"phones to have GPS.)"
 msgstr ""
 "la plupart des téléphones portables envoient des données de 
géolocalisation "
 "par GPS sur commande à distance, et les utilisateurs ne peuvent pas les en "

Index: proprietary-surveillance.pot
===================================================================
RCS file: /web/www/www/philosophy/po/proprietary-surveillance.pot,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- proprietary-surveillance.pot        12 Jun 2013 14:29:21 -0000      1.4
+++ proprietary-surveillance.pot        18 Jun 2013 05:29:58 -0000      1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: proprietary-surveillance.html\n"
-"POT-Creation-Date: 2013-06-12 14:25+0000\n"
+"POT-Creation-Date: 2013-06-18 05: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"
@@ -73,12 +73,12 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"Most portable phones will send their GPS location on remote command and "
+"Portable phones with GPS will send their GPS location on remote command and "
 "users cannot stop them: <a "
 
"href=\"http://www.aclu.org/government-location-tracking-cell-phones-gps-devices-and-license-plate-readers\";>
 "
 
"http://www.aclu.org/government-location-tracking-cell-phones-gps-devices-and-license-plate-readers</a>.
  "
-"(The US requires all new portable phones to have GPS; this requirement has "
-"existed for many years.)"
+"(The US says it will eventually require all new portable phones to have "
+"GPS.)"
 msgstr ""
 
 #. type: Content of: <p>

Index: rms-kol.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/rms-kol.fr.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- rms-kol.fr.po       19 Jan 2013 22:52:59 -0000      1.27
+++ rms-kol.fr.po       18 Jun 2013 05:29:58 -0000      1.28
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-kol.html\n"
-"POT-Creation-Date: 2012-10-03 12:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-11-07 12:56+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -15,12 +15,19 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "Plural-Forms: \n"
 
 #. type: Content of: <title>
+# | Richard Stallman's speech in Kolkata (Calcutta), August 2006 - GNU Project
+# | - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Richard Stallman's speech in Kolkata (Calcutta), August 2006 - GNU "
+#| "Project - Free Software Foundation (FSF)"
 msgid ""
 "Richard Stallman's speech in Kolkata (Calcutta), August 2006 - GNU Project - "
-"Free Software Foundation (FSF)"
+"Free Software Foundation"
 msgstr ""
 "Discours de Richard Stallman à Kolkata (Calcutta), août 2006 - Projet GNU - 
"
 "Free Software Foundation (FSF)"
@@ -77,12 +84,24 @@
 "(liberté 3) aider votre communauté en distribuant vos versions modifiées."
 
 #. type: Content of: <p>
+# | With these 4 Freedoms, you can live an upright life with your community. 
+# | If you use non[---]free, proprietary software, the developer has the power
+# | to decide what you can do. He can use that power over you. Like Microsoft.
+# | That game is evil. Nobody should play it. So it{+'+}s not a question of
+# | beating Microsoft at its game. I set out to get away from that game.
+#, fuzzy
+#| msgid ""
+#| "With these 4 Freedoms, you can live an upright life with your community.  "
+#| "If you use non-free, proprietary software, the developer has the power to "
+#| "decide what you can do. He can use that power over you. Like Microsoft. "
+#| "That game is evil. Nobody should play it. So its not a question of "
+#| "beating Microsoft at its game. I set out to get away from that game."
 msgid ""
 "With these 4 Freedoms, you can live an upright life with your community.  If "
-"you use non-free, proprietary software, the developer has the power to "
-"decide what you can do. He can use that power over you. Like Microsoft. That "
-"game is evil. Nobody should play it. So its not a question of beating "
-"Microsoft at its game. I set out to get away from that game."
+"you use nonfree, proprietary software, the developer has the power to decide "
+"what you can do. He can use that power over you. Like Microsoft. That game "
+"is evil. Nobody should play it. So it's not a question of beating Microsoft "
+"at its game. I set out to get away from that game."
 msgstr ""
 "Avec ces quatre libertés, vous pouvez vivre une vie intègre au milieu de "
 "votre communauté. Si vous utilisez des logiciels non libres, privateurs,<a "
@@ -239,8 +258,40 @@
 "l'indépendance pour chaque région et chaque pays."
 
 #. type: Content of: <p>
+# | Proprietary software is a colonial system. It{+'+}s electronic
+# | colonialism. And not by a country, but by a corporation. Electronic
+# | colonial powers keep people divided and helpless. Look at the end-user
+# | licensing agreement. You don't have the source code, you are helpless. You
+# | can't share, and so you are kept divided. National colonial powers recruit
+# | local elites and pay them and keep them above the rest of the people,
+# | working for the colonial masters. Today we see electronic colonial powers
+# | recruit native zamindars to keep the system intact. Microsoft sets up a
+# | research facility and in exchange it keeps its grip firmly on everyone
+# | else. Govts and schools are in their grip. They know how to do this. They
+# | know how to buy govt support. But what's the govt buying? Dependency, not
+# | development. Only Free Software constitutes development. It enables any
+# | activity to be fully under the control of the people doing it. Free
+# | Software is appropriate technology. Proprietary software is not
+# | appropriate for any use.
+#, fuzzy
+#| msgid ""
+#| "Proprietary software is a colonial system. Its electronic colonialism. "
+#| "And not by a country, but by a corporation. Electronic colonial powers "
+#| "keep people divided and helpless. Look at the end-user licensing "
+#| "agreement. You don't have the source code, you are helpless. You can't "
+#| "share, and so you are kept divided. National colonial powers recruit "
+#| "local elites and pay them and keep them above the rest of the people, "
+#| "working for the colonial masters. Today we see electronic colonial powers "
+#| "recruit native zamindars to keep the system intact. Microsoft sets up a "
+#| "research facility and in exchange it keeps its grip firmly on everyone "
+#| "else. Govts and schools are in their grip. They know how to do this. They "
+#| "know how to buy govt support. But what's the govt buying? Dependency, not "
+#| "development. Only Free Software constitutes development. It enables any "
+#| "activity to be fully under the control of the people doing it. Free "
+#| "Software is appropriate technology. Proprietary software is not "
+#| "appropriate for any use."
 msgid ""
-"Proprietary software is a colonial system. Its electronic colonialism. And "
+"Proprietary software is a colonial system. It's electronic colonialism. And "
 "not by a country, but by a corporation. Electronic colonial powers keep "
 "people divided and helpless. Look at the end-user licensing agreement. You "
 "don't have the source code, you are helpless. You can't share, and so you "
@@ -276,6 +327,38 @@
 "aucun usage."
 
 #. type: Content of: <p>
+# | The West Bengal govt has an opportunity to adopt a policy of firm
+# | leadership in this regard. This will give a boost to human resource
+# | development. Free Software respects people's freedom. Govt has an
+# | influence on the future of society. Choosing which software to teach
+# | students: if you teach them Windows, they will be Windows users. For
+# | something else, they need to learn, and make the effort to learn something
+# | else. Microsoft knows this. So it donates Windows to schools. Addiction
+# | (through using unauthorised software use) only helps them. They didn't
+# | want to leave anything to choice, so they give Windows free to schools.
+# | Like injecting a dose. The first dose is gratis. Afterwards it{+'+}s not
+# | gratis, either for them or their employers. This is a way to impose their
+# | power on the rest of society and its future. Schools have a mission to
+# | society. This mission requires teaching students to live in freedom,
+# | teaching skills to make it easy to live in freedom. This means using Free
+# | Software.
+#, fuzzy
+#| msgid ""
+#| "The West Bengal govt has an opportunity to adopt a policy of firm "
+#| "leadership in this regard. This will give a boost to human resource "
+#| "development. Free Software respects people's freedom. Govt has an "
+#| "influence on the future of society. Choosing which software to teach "
+#| "students: if you teach them Windows, they will be Windows users. For "
+#| "something else, they need to learn, and make the effort to learn "
+#| "something else. Microsoft knows this. So it donates Windows to schools. "
+#| "Addiction (through using unauthorised software use) only helps them. They "
+#| "didn't want to leave anything to choice, so they give Windows free to "
+#| "schools. Like injecting a dose. The first dose is gratis. Afterwards its "
+#| "not gratis, either for them or their employers. This is a way to impose "
+#| "their power on the rest of society and its future. Schools have a mission "
+#| "to society. This mission requires teaching students to live in freedom, "
+#| "teaching skills to make it easy to live in freedom. This means using Free "
+#| "Software."
 msgid ""
 "The West Bengal govt has an opportunity to adopt a policy of firm leadership "
 "in this regard. This will give a boost to human resource development. Free "
@@ -286,7 +369,7 @@
 "donates Windows to schools. Addiction (through using unauthorised software "
 "use) only helps them. They didn't want to leave anything to choice, so they "
 "give Windows free to schools. Like injecting a dose. The first dose is "
-"gratis. Afterwards its not gratis, either for them or their employers. This "
+"gratis. Afterwards it's not gratis, either for them or their employers. This "
 "is a way to impose their power on the rest of society and its future. "
 "Schools have a mission to society. This mission requires teaching students "
 "to live in freedom, teaching skills to make it easy to live in freedom. This "
@@ -311,10 +394,26 @@
 "vie en liberté. Cela signifie d'utiliser des logiciels libres."
 
 #. type: Content of: <p>
+# | Free Software is good for computer science education, to maximise the
+# | potential of natural programmers. It gives students the opportunity to
+# | really learn. It{+'+}s good for the natural programmers. If you have
+# | proprietary software, the teacher says &ldquo;I don't know&rdquo;,
+# | &ldquo;You are not allowed to know, it's a secret.&rdquo; So the
+# | alternative is to give him the source codes and let him read it all. They
+# | will then learn to be really good programmers.
+#, fuzzy
+#| msgid ""
+#| "Free Software is good for computer science education, to maximise the "
+#| "potential of natural programmers. It gives students the opportunity to "
+#| "really learn. Its good for the natural programmers. If you have "
+#| "proprietary software, the teacher says &ldquo;I don't know&rdquo;, &ldquo;"
+#| "You are not allowed to know, it's a secret.&rdquo; So the alternative is "
+#| "to give him the source codes and let him read it all. They will then "
+#| "learn to be really good programmers."
 msgid ""
 "Free Software is good for computer science education, to maximise the "
 "potential of natural programmers. It gives students the opportunity to "
-"really learn. Its good for the natural programmers. If you have proprietary "
+"really learn. It's good for the natural programmers. If you have proprietary "
 "software, the teacher says &ldquo;I don't know&rdquo;, &ldquo;You are not "
 "allowed to know, it's a secret.&rdquo; So the alternative is to give him the "
 "source codes and let him read it all. They will then learn to be really good "
@@ -329,6 +428,28 @@
 "entièrement. Ils apprendront alors à être de vraiment bons programmeurs."
 
 #. type: Content of: <p>
+# | But the most crucial reason is for the sake of moral education. Teaching
+# | them to be good corporations and benevolent, helpful citizens. This has to
+# | be taught. School has to teach by example. If you bring software to class,
+# | you must share this with other kids. Or don't bring it. Schools must
+# | follow their own rule, by bringing Free Software to class.  Schools should
+# | use 100% Free Software. No proprietary software should be used in schools.
+# | Public agencies, after a migration period, should use Free Software. All
+# | software development must run on Free Software platforms. And if it{+'+}s
+# | released to the public, it must be Free Software. (Free: as in free
+# | speech, not free beer.)
+#, fuzzy
+#| msgid ""
+#| "But the most crucial reason is for the sake of moral education. Teaching "
+#| "them to be good corporations and benevolent, helpful citizens. This has "
+#| "to be taught. School has to teach by example. If you bring software to "
+#| "class, you must share this with other kids. Or don't bring it. Schools "
+#| "must follow their own rule, by bringing Free Software to class.  Schools "
+#| "should use 100% Free Software. No proprietary software should be used in "
+#| "schools. Public agencies, after a migration period, should use Free "
+#| "Software. All software development must run on Free Software platforms. "
+#| "And if its released to the public, it must be Free Software. (Free: as in "
+#| "free speech, not free beer.)"
 msgid ""
 "But the most crucial reason is for the sake of moral education. Teaching "
 "them to be good corporations and benevolent, helpful citizens. This has to "
@@ -337,7 +458,7 @@
 "their own rule, by bringing Free Software to class.  Schools should use 100% "
 "Free Software. No proprietary software should be used in schools. Public "
 "agencies, after a migration period, should use Free Software. All software "
-"development must run on Free Software platforms. And if its released to the "
+"development must run on Free Software platforms. And if it's released to the "
 "public, it must be Free Software. (Free: as in free speech, not free beer.)"
 msgstr ""
 "Mais la raison la plus cruciale, c'est l'éducation morale : leur enseigner 
à "
@@ -412,23 +533,29 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-"\"><em>address@hidden</em></a>.  There are also <a href=\"/contact/\">other "
-"ways to contact</a> the FSF."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Veuillez envoyer les requêtes concernant la FSF et GNU à <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Il existe aussi <a 
href=\"/contact/"
-"\">d'autres moyens de contacter</a> la FSF."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";><em>address@hidden</em></a>."
-msgstr ""
-"Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou "
-"suggestions à <a href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>."
-
+"\">d'autres moyens de contacter</a> la FSF. Les liens orphelins et autres "
+"corrections ou suggestions peuvent être signalés à <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"

Index: rms-kol.pot
===================================================================
RCS file: /web/www/www/philosophy/po/rms-kol.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- rms-kol.pot 3 Oct 2012 16:29:38 -0000       1.10
+++ rms-kol.pot 18 Jun 2013 05:29:59 -0000      1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-kol.html\n"
-"POT-Creation-Date: 2012-10-03 12:25-0300\n"
+"POT-Creation-Date: 2013-06-18 05: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"
@@ -18,7 +18,7 @@
 #. type: Content of: <title>
 msgid ""
 "Richard Stallman's speech in Kolkata (Calcutta), August 2006 - GNU Project - "
-"Free Software Foundation (FSF)"
+"Free Software Foundation"
 msgstr ""
 
 #. type: Content of: <h2>
@@ -64,10 +64,10 @@
 #. type: Content of: <p>
 msgid ""
 "With these 4 Freedoms, you can live an upright life with your community.  If "
-"you use non-free, proprietary software, the developer has the power to "
-"decide what you can do. He can use that power over you. Like Microsoft. That "
-"game is evil. Nobody should play it. So its not a question of beating "
-"Microsoft at its game. I set out to get away from that game."
+"you use nonfree, proprietary software, the developer has the power to decide "
+"what you can do. He can use that power over you. Like Microsoft. That game "
+"is evil. Nobody should play it. So it's not a question of beating Microsoft "
+"at its game. I set out to get away from that game."
 msgstr ""
 
 #. type: Content of: <p>
@@ -152,7 +152,7 @@
 
 #. type: Content of: <p>
 msgid ""
-"Proprietary software is a colonial system. Its electronic colonialism. And "
+"Proprietary software is a colonial system. It's electronic colonialism. And "
 "not by a country, but by a corporation. Electronic colonial powers keep "
 "people divided and helpless. Look at the end-user licensing agreement. You "
 "don't have the source code, you are helpless. You can't share, and so you "
@@ -179,7 +179,7 @@
 "donates Windows to schools. Addiction (through using unauthorised software "
 "use) only helps them. They didn't want to leave anything to choice, so they "
 "give Windows free to schools. Like injecting a dose. The first dose is "
-"gratis. Afterwards its not gratis, either for them or their employers. This "
+"gratis. Afterwards it's not gratis, either for them or their employers. This "
 "is a way to impose their power on the rest of society and its "
 "future. Schools have a mission to society. This mission requires teaching "
 "students to live in freedom, teaching skills to make it easy to live in "
@@ -190,7 +190,7 @@
 msgid ""
 "Free Software is good for computer science education, to maximise the "
 "potential of natural programmers. It gives students the opportunity to "
-"really learn. Its good for the natural programmers. If you have proprietary "
+"really learn. It's good for the natural programmers. If you have proprietary "
 "software, the teacher says &ldquo;I don't know&rdquo;, &ldquo;You are not "
 "allowed to know, it's a secret.&rdquo; So the alternative is to give him the "
 "source codes and let him read it all. They will then learn to be really good "
@@ -206,7 +206,7 @@
 "their own rule, by bringing Free Software to class.  Schools should use 100% "
 "Free Software. No proprietary software should be used in schools. Public "
 "agencies, after a migration period, should use Free Software. All software "
-"development must run on Free Software platforms. And if its released to the "
+"development must run on Free Software platforms. And if it's released to the "
 "public, it must be Free Software. (Free: as in free speech, not free beer.)"
 msgstr ""
 
@@ -237,17 +237,27 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>.  There are also <a 
"
-"href=\"/contact/\">other ways to contact</a> the FSF."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>."
-msgstr ""
-
+"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>."
+msgstr ""
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#
+#.         &lt;address@hidden&gt;</a>.</p>
+#
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a "

Index: rms-kol.translist
===================================================================
RCS file: /web/www/www/philosophy/po/rms-kol.translist,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- rms-kol.translist   1 Mar 2013 04:11:52 -0000       1.7
+++ rms-kol.translist   18 Jun 2013 05:29:59 -0000      1.8
@@ -2,8 +2,8 @@
 <!--#set var="TRANSLATION_LIST"
 value='<div id="translations">
 <p>
-<span dir="ltr" class="original"><a 
href="/philosophy/rms-kol.en.html">English</a>&nbsp;[en]</span>&nbsp;&nbsp;
-<span dir="ltr"><a 
href="/philosophy/rms-kol.fr.html">français</a>&nbsp;[fr]</span>&nbsp;&nbsp;
+<span dir="ltr" class="original"><a lang="en" hreflang="en" 
href="/philosophy/rms-kol.en.html">English</a>&nbsp;[en]</span>&nbsp;&nbsp;
+<span dir="ltr"><a lang="fr" hreflang="fr" 
href="/philosophy/rms-kol.fr.html">français</a>&nbsp;[fr]</span>&nbsp;&nbsp;
 </p>
 </div>' -->
 <!--#if expr="$HTML_BODY = yes" -->

Index: who-does-that-server-really-serve.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/who-does-that-server-really-serve.ar.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- who-does-that-server-really-serve.ar.po     6 Jun 2013 17:00:36 -0000       
1.29
+++ who-does-that-server-really-serve.ar.po     18 Jun 2013 05:29:59 -0000      
1.30
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: who does that server really server\n"
-"POT-Creation-Date: 2013-06-06 16:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2010-09-06 19:35+0300\n"
 "Last-Translator: Osama Khalid <address@hidden>\n"
 "Language-Team: Arabic <>\n"
@@ -26,8 +26,7 @@
 #| "Who does that server really serve? - GNU Project - Free Software "
 #| "Foundation (FSF)"
 msgid ""
-"Who Does That Server Really Serve? - GNU Project - Free Software Foundation "
-"(FSF)"
+"Who Does That Server Really Serve? - GNU Project - Free Software Foundation"
 msgstr ""
 "من يخدم هذا الخادوم فعلا؟ - مشروع غنو - م
ؤسسة البرمجيات الحرة (إف&#8203;"
 "إس&#8203;إل)"
@@ -43,28 +42,44 @@
 msgstr "بقلم <strong>ريتشارد ستولمن</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid ""
 #| "(First published by <a href=\"http://bostonreview.net/BR35.2/stallman.php";
 #| "\"> Boston Review</a>.)"
 msgid ""
-"(First published by <a href=\"http://www.bostonreview.net/richard-stallman-";
-"free-software-DRM\"> Boston Review</a>.)"
+"(The first version was published in <a href=\"http://www.bostonreview.net/";
+"richard-stallman-free-software-DRM\"> Boston Review</a>.)"
 msgstr ""
 "(نشر هذا المقال أول مرة <a 
href=\"http://bostonreview.net/BR35.2/stallman.php";
 "\">Boston Review</a>.)"
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<strong>On the Internet, proprietary software isn't the only way to lose "
+#| "your freedom.  Software as a Service is another way to let someone else "
+#| "have power over your computing.</strong>"
 msgid ""
 "<strong>On the Internet, proprietary software isn't the only way to lose "
-"your freedom.  Software as a Service is another way to let someone else have "
-"power over your computing.</strong>"
+"your freedom.  Service as a Software Substitute, or SaaSS, is another way to "
+"let someone else have power over your computing.</strong>"
 msgstr ""
 "<strong>لا تعد البرمجيات المحتكرة الوسيلة 
الوحيدة لفقد الحرية على الإنترنت، "
 "فالبرمجيات الخدمية وسيلة أخرى لإعطاء 
الآخرين التحكم بحوسبتك.</strong>"
 
+#. type: Content of: outside any tag (error?)
+msgid ""
+"SaaSS means using a service implemented by someone else as a substitute for "
+"running your copy of a program.  The term is ours; articles and ads won't "
+"use it, and they won't tell you whether a service is SaaSS.  Instead they "
+"will probably use the vague and distracting term &ldquo;cloud&rdquo;, which "
+"lumps SaaSS together with various other practices, some abusive and some "
+"ok.  With the explanation and examples in this page, you can tell whether a "
+"service is SaaSS."
+msgstr ""
+
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Background: How Proprietary Software Takes Away Your Freedom"
@@ -108,12 +123,19 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "With free software, we, the users, take back control of our computing.  "
+#| "Proprietary software still exists, but we can exclude it from our lives "
+#| "and many of us have done so.  However, we now face a new threat to our "
+#| "control over our computing: Software as a Service.  For our freedom's "
+#| "sake, we have to reject that too."
 msgid ""
 "With free software, we, the users, take back control of our computing.  "
 "Proprietary software still exists, but we can exclude it from our lives and "
 "many of us have done so.  However, we now face a new threat to our control "
-"over our computing: Software as a Service.  For our freedom's sake, we have "
-"to reject that too."
+"over our computing: Service as a Software Substitute (SaaSS).  For our "
+"freedom's sake, we have to reject that too."
 msgstr ""
 "لقد استعدنا عبر البرمجيات الحرة التحكم 
بحواسيبنا. صحيح أن البرمجيات المحتكرة "
 "لا تزال موجودة، إلا أننا يمكن أن نخلص 
أنفسنا منها، ولقد قام كثير منا بذلك. "
@@ -122,18 +144,30 @@
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
-msgid "How Software as a Service Takes Away Your Freedom"
+#, fuzzy
+#| msgid "How Software as a Service Takes Away Your Freedom"
+msgid "How Service as a Software Substitute Takes Away Your Freedom"
 msgstr "كيف تسلب البرمجيات الخدمية حريتك"
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"Software as a Service (SaaS) means that someone sets up a network server "
-"that does certain computing tasks&mdash;running spreadsheets, word "
-"processing, translating text into another language, etc.&mdash;then invites "
-"users to do their computing on that server.  Users send their data to the "
-"server, which does their computing on the data thus provided, then sends the "
-"results back or acts on them directly."
+#, fuzzy
+#| msgid ""
+#| "Software as a Service (SaaS) means that someone sets up a network server "
+#| "that does certain computing tasks&mdash;running spreadsheets, word "
+#| "processing, translating text into another language, etc.&mdash;then "
+#| "invites users to do their computing on that server.  Users send their "
+#| "data to the server, which does their computing on the data thus provided, "
+#| "then sends the results back or acts on them directly."
+msgid ""
+"Service as a Software Substitute (SaaSS) means using a service as a "
+"substitute for running your copy of a program.  Concretely, it means that "
+"someone sets up a network server that does certain computing tasks&mdash;for "
+"instance, modifying a photo, translating text into another language, etc."
+"&mdash;then invites users to do computing via that server.  A user of the "
+"server would send her data to the server, which does <em>her own computing</"
+"em> on the data thus provided, then sends the results back to her or acts "
+"directly on her behalf."
 msgstr ""
 "البرمجيات الخدمية (Software as a Service: SaaS) تعني أن 
يقوم شخص ما بتجهيز "
 "خادوم على الشبكة للقيام بمهمة حاسوبية م
عينة (مثل إدارة الجداول الحسابية أو "
@@ -141,14 +175,29 @@
 "يقوموا بتلك المهمة على ذلك الخادوم. يرسل 
المستخدمون بياناتهم  إلى الخادوم "
 "الذي يعالج البيانات المعطاة ثم يعيد 
النتائج أو يتصرف بناءً عليها."
 
+#. type: Content of: <p>
+msgid ""
+"The computing is <em>her own</em> because, by assumption, she could, in "
+"principle, have done it by running a program on her own computer (whether or "
+"not that program is available to her at present).  When this assumption is "
+"not so, it isn't SaaSS."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These servers wrest control from the users even more inexorably than "
+#| "proprietary software.  With proprietary software, users typically get an "
+#| "executable file but not the source code.  That makes it hard for "
+#| "programmers to study the code that is running, so it's hard to determine "
+#| "what the program really does, and hard to change it."
 msgid ""
 "These servers wrest control from the users even more inexorably than "
 "proprietary software.  With proprietary software, users typically get an "
-"executable file but not the source code.  That makes it hard for programmers "
-"to study the code that is running, so it's hard to determine what the "
-"program really does, and hard to change it."
+"executable file but not the source code.  That makes it hard to study the "
+"code that is running, so it's hard to determine what the program really "
+"does, and hard to change it."
 msgstr ""
 "إن تلك الخوادم أشد نزعًا لتحكم المستخدمين 
من البرمجيات المحتكرة. يحصل مستخدمو "
 "البرمجيات المحتكرة عادة على ملف تنفيذي م
جرّد من الكود المصدري، وهو الأمر الذي "
@@ -157,24 +206,44 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"With SaaS, the users do not have even the executable file: it is on the "
-"server, where the users can't see or touch it.  Thus it is impossible for "
-"them to ascertain what it really does, and impossible to change it."
+#, fuzzy
+#| msgid ""
+#| "With SaaS, the users do not have even the executable file: it is on the "
+#| "server, where the users can't see or touch it.  Thus it is impossible for "
+#| "them to ascertain what it really does, and impossible to change it."
+msgid ""
+"With SaaSS, the users do not have even the executable file that does their "
+"computing: it is on someone else's server, where the users can't see or "
+"touch it.  Thus it is impossible for them to ascertain what it really does, "
+"and impossible to change it."
 msgstr ""
 "أما مستخدمو البرمجيات الخدمية فلا يملكون 
حتى الملف التنفيذي لأنه على "
 "الخادوم، ولا يمكن للمستخدمين الاطلاع عليه 
أو الاقتراب منه؛ ولذا فمن المستحيل "
 "التحقق من مهمته الحقيقية ومن المستحيل 
تغييرها."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Furthermore, SaaS automatically leads to harmful consequences equivalent to "
-"the malicious features of certain proprietary software.  For instance, some "
-"proprietary programs are &ldquo;spyware&rdquo;: the program sends out data "
-"about users' computing activities.  Microsoft Windows sends information "
-"about users' activities to Microsoft.  Windows Media Player and RealPlayer "
-"report what each user watches or listens to."
+"Furthermore, SaaSS automatically leads to consequences equivalent to the "
+"malicious features of certain proprietary software."
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Furthermore, SaaS automatically leads to harmful consequences equivalent "
+#| "to the malicious features of certain proprietary software.  For instance, "
+#| "some proprietary programs are &ldquo;spyware&rdquo;: the program sends "
+#| "out data about users' computing activities.  Microsoft Windows sends "
+#| "information about users' activities to Microsoft.  Windows Media Player "
+#| "and RealPlayer report what each user watches or listens to."
+msgid ""
+"For instance, some proprietary programs are &ldquo;spyware&rdquo;: the "
+"program sends out data about users' computing activities.  Microsoft Windows "
+"sends information about users' activities to Microsoft.  Windows Media "
+"Player reports what each user watches or listens to.  The Amazon Kindle "
+"reports which pages of which books the user looks at, and when.  Angry Birds "
+"reports the user's geolocation history."
 msgstr ""
 "بل إن البرمجيات الخدمية تسبب عواقب وخيمة م
ماثلة للخصائص الخبيثة لبعض "
 "البرمجيات المحتكرة، فعلى سبيل المثال، بعض 
البرمجيات المحتكرة تعد &rdquo;"
@@ -184,70 +253,103 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"Unlike proprietary software, SaaS does not require covert code to obtain the "
-"user's data.  Instead, users must send their data to the server in order to "
-"use it.  This has the same effect as spyware: the server operator gets the "
-"data.  He gets it with no special effort, by the nature of SaaS."
+#, fuzzy
+#| msgid ""
+#| "Unlike proprietary software, SaaS does not require covert code to obtain "
+#| "the user's data.  Instead, users must send their data to the server in "
+#| "order to use it.  This has the same effect as spyware: the server "
+#| "operator gets the data.  He gets it with no special effort, by the nature "
+#| "of SaaS."
+msgid ""
+"Unlike proprietary software, SaaSS does not require covert code to obtain "
+"the user's data.  Instead, users must send their data to the server in order "
+"to use it.  This has the same effect as spyware: the server operator gets "
+"the data&mdash;with no special effort, by the nature of SaaSS."
 msgstr ""
 "وبعكس البرمجيات المحتكرة، فالبرمجيات 
الخدمية لا تحتاج إلى كود مخفي لتجمع "
 "بيانات المستخدمين؛ بل يجب على المستخدمين 
أن يرسلوا بيانتهم ليستخدموها. إن "
 "لهذا نفس أثر برامج التجسس وهو أن مُشغّل 
الخادوم يتلقى البيانات، لكنه يتلقاها "
 "دون أدنى جهد لأن هذه هي طبيعة البرمجيات 
الخدمية."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Some proprietary programs can mistreat users under remote command.  For "
-"instance, Windows has a back door with which Microsoft can forcibly change "
-"any software on the machine.  The Amazon Kindle e-book reader (whose name "
-"suggests it's intended to burn people's books) has an Orwellian back door "
-"that Amazon used in 2009 to <a href=\"http://www.nytimes.com/2009/07/18/";
-"technology/companies/18amazon.html\" >remotely delete</a> Kindle copies of "
-"Orwell's books <cite>1984</cite> and <cite>Animal Farm</cite> which the "
-"users had purchased from Amazon."
+"Some proprietary operating systems have a universal back door, permitting "
+"someone to remotely install software changes.  For instance, Windows has a "
+"universal back door with which Microsoft can forcibly change any software on "
+"the machine.  Nearly all portable phones have them, too.  Some proprietary "
+"applications also have universal back doors; for instance, the Steam client "
+"for GNU/Linux allows the developer to remotely install modified versions."
 msgstr ""
-"يمكن لبعض البرمجيات المحتكرة أن تسيء إلى 
المستخدمين بأمر خارجي. على سبيل "
-"المثال، يحتوي ويندوز على باب خلفي يُمكّن م
ايكروسوفت من فرض أي تغيير على أي "
-"برنامج على الجهاز. يحتوي قارئ الكتب Amazon 
Kindle &rdquo;مُشغل أمازون&ldquo; -"
-"الذي يوحي اسمه أن غرضه حرق كتبنا- على مدخل 
خلفي أورويلي [-معاد للصالح "
-"العام-] استخدمته أمازون في عام 2009 ل<a 
href=\"http://www.nytimes.";
-"com/2009/07/18/technology/companies/18amazon.html\" >حذف</a> الكثير 
من نُسخ "
-"Kindle من كتابي <cite>1984</cite> و <cite>Animal Farm</cite> لOrwell 
الذين "
-"اشتراهما الناس من أمازون."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"SaaS inherently gives the server operator the power to change the software "
-"in use, or the users' data being operated on.  Once again, no special code "
-"is needed to do this."
+"With SaaSS, the server operator can change the software in use on the "
+"server.  He ought to be able to do this, since it's his computer; but the "
+"result is the same as using a proprietary application program with a "
+"universal back door: someone has the power to silently impose changes in how "
+"the user's computing gets done."
 msgstr ""
-"تمنح البرمجيات الخدمية مُشغّل الخادوم الم
قدرة على تغيير البرمجيات المُستخدمة "
-"وبيانات المستخدمين التي تُعالج. وهنا 
أيضًا لا حاجة لكود خاص للقيام بذلك."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"Thus, SaaS is equivalent to total spyware and a gaping wide back door, and "
-"gives the server operator unjust power over the user.  We can't accept that."
+#, fuzzy
+#| msgid ""
+#| "Thus, SaaS is equivalent to total spyware and a gaping wide back door, "
+#| "and gives the server operator unjust power over the user.  We can't "
+#| "accept that."
+msgid ""
+"Thus, SaaSS is equivalent to running proprietary software with spyware and a "
+"universal back door.  It gives the server operator unjust power over the "
+"user, and that power is something we must resist."
 msgstr ""
 "ولهذه الأسباب فإن البرمجيات الخدمية تكافئ 
تمامًا برمجيات التجسس وتعد مدخلًا "
 "خلفيًا خطيرًا وهي تعطي مُشغّل الخادوم 
سلطة ظالمة على المستخدم، ولا يمكن أن نقبل "
 "ذلك."
 
+#. type: Content of: <h3>
+msgid "SaaSS and SaaS"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Originally we referred to this problematical practice as &ldquo; SaaS "
+"&rdquo;, which stands for &ldquo; Software as a Service &rdquo;.  It's a "
+"commonly used term for setting up software on a server rather than offering "
+"copies of it to users, and we thought it described precisely the cases where "
+"this problem occurs."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Subsequently we became aware that the term SaaS is sometimes used for "
+"communication services&mdash;activities for which this issue is not "
+"applicable.  In addition, the term &ldquo; Software as a Service &rdquo; "
+"doesn't explain <em>why</em> the practice is bad.  So we coined the term "
+"&ldquo; Service as a Software Substitute &rdquo;, which defines the bad "
+"practice more clearly and says what is bad about it."
+msgstr ""
+
 # type: Content of: <h3>
 #. type: Content of: <h3>
-msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
+#, fuzzy
+#| msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
+msgid "Untangling the SaaSS Issue from the Proprietary Software Issue"
 msgstr "فصل قضية البرمجيات الخدمية عن قضية 
البرمجيات المحتكرة"
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"SaaS and proprietary software lead to similar harmful results, but the "
-"causal mechanisms are different.  With proprietary software, the cause is "
-"that you have and use a copy which is difficult or illegal to change.  With "
-"SaaS, the cause is that you use a copy you don't have."
+#, fuzzy
+#| msgid ""
+#| "SaaS and proprietary software lead to similar harmful results, but the "
+#| "causal mechanisms are different.  With proprietary software, the cause is "
+#| "that you have and use a copy which is difficult or illegal to change.  "
+#| "With SaaS, the cause is that you use a copy you don't have."
+msgid ""
+"SaaSS and proprietary software lead to similar harmful results, but the "
+"mechanisms are different.  With proprietary software, the mechanism is that "
+"you have and use a copy which is difficult and/or illegal to change.  With "
+"SaaSS, the mechanism is that you don't have the copy that's doing your "
+"computing."
 msgstr ""
 "إن البرمجيات الخدمية والبرمجيات المحتكرة 
يسببان النتائج السيئة ذاتها باختلاف "
 "الوسائل. السبب في البرمجيات المحتكرة أنك 
تملك نسخة يصعب تغييرها أو من غير "
@@ -256,15 +358,25 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These two issues are often confused, and not only by accident.  Web "
+#| "developers use the vague term &ldquo;web application&rdquo; to lump the "
+#| "server software together with programs run on your machine in your "
+#| "browser.  Some web pages install nontrivial or even large JavaScript "
+#| "programs temporarily into your browser without informing you.  <a href=\"/"
+#| "philosophy/javascript-trap.html\">When these JavaScript programs are "
+#| "nonfree</a>, they are as bad as any other nonfree software.  Here, "
+#| "however, we are concerned with the problem of the server software itself."
 msgid ""
 "These two issues are often confused, and not only by accident.  Web "
 "developers use the vague term &ldquo;web application&rdquo; to lump the "
 "server software together with programs run on your machine in your browser.  "
-"Some web pages install nontrivial or even large JavaScript programs "
-"temporarily into your browser without informing you.  <a href=\"/philosophy/"
-"javascript-trap.html\">When these JavaScript programs are nonfree</a>, they "
-"are as bad as any other nonfree software.  Here, however, we are concerned "
-"with the problem of the server software itself."
+"Some web pages install nontrivial, even large JavaScript programs into your "
+"browser without informing you.  <a href=\"/philosophy/javascript-trap.html"
+"\">When these JavaScript programs are nonfree</a>, they are the same sort of "
+"problem as any other nonfree software.  Here, however, we are concerned with "
+"the problem of the server software itself."
 msgstr ""
 "إن هاتين المشكلتان محيرتان، وهذا لم ينشئ م
ن محض الصدفة، فمطورو الوب يستخدمون "
 "المصطلح المضلل &rdquo;تطبيقات الوب&ldquo; ليجم
عون بين تطبيقات الخادوم "
@@ -276,14 +388,25 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"Many free software supporters assume that the problem of SaaS will be solved "
-"by developing free software for servers.  For the server operator's sake, "
-"the programs on the server had better be free; if they are proprietary, "
-"their owners have power over the server.  That's unfair to the operator, and "
-"doesn't help you at all.  But if the programs on the server are free, that "
-"doesn't protect you <em>as the server's user</em> from the effects of SaaS.  "
-"They give freedom to the operator, but not to you."
+#, fuzzy
+#| msgid ""
+#| "Many free software supporters assume that the problem of SaaS will be "
+#| "solved by developing free software for servers.  For the server "
+#| "operator's sake, the programs on the server had better be free; if they "
+#| "are proprietary, their owners have power over the server.  That's unfair "
+#| "to the operator, and doesn't help you at all.  But if the programs on the "
+#| "server are free, that doesn't protect you <em>as the server's user</em> "
+#| "from the effects of SaaS.  They give freedom to the operator, but not to "
+#| "you."
+msgid ""
+"Many free software supporters assume that the problem of SaaSS will be "
+"solved by developing free software for servers.  For the server operator's "
+"sake, the programs on the server had better be free; if they are "
+"proprietary, their owners have power over the server.  That's unfair to the "
+"operator, and doesn't help the users at all.  But if the programs on the "
+"server are free, that doesn't protect <em>the server's users</em> from the "
+"effects of SaaSS.  These programs liberate the server operator, but not the "
+"server's users."
 msgstr ""
 "يعتقد كثير من داعمي البرمجيات الحرة أن م
شكلة البرمجيات الخدمية ستعالج بتطوير "
 "برمجيات حرة للخوادم. إن من صالح مُشغّل 
الخادوم أن تكون برامج الخادوم حرة لأنها "
@@ -291,16 +414,34 @@
 "أبدًا. لكن إن كانت البرمجيات حرة فإن هذا لا 
يحميك <em>كمستخدم للخادوم</em> من "
 "آثر البرمجيات الخدمية، لأن الحرية للُم
شغّل وليست لك [كمستخدم]."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Releasing the server software source code does benefit the community: "
-"suitably skilled users can set up similar servers, perhaps changing the "
-"software.  But none of these servers would give you control over computing "
-"you do on it, unless it's <em>your</em> server.  The rest would all be "
-"SaaS.  SaaS always subjects you to the power of the server operator, and the "
-"only remedy is, <em>Don't use SaaS!</em> Don't use someone else's server to "
-"do your own computing on data provided by you."
+"Releasing the server software source code does benefit the community: it "
+"enables suitably skilled users to set up similar servers, perhaps changing "
+"the software.  <a href=\"/licenses/license-recommendations.html\"> We "
+"recommend using the GNU Affero GPL</a> as the license for programs often "
+"used on servers."
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Releasing the server software source code does benefit the community: "
+#| "suitably skilled users can set up similar servers, perhaps changing the "
+#| "software.  But none of these servers would give you control over "
+#| "computing you do on it, unless it's <em>your</em> server.  The rest would "
+#| "all be SaaS.  SaaS always subjects you to the power of the server "
+#| "operator, and the only remedy is, <em>Don't use SaaS!</em> Don't use "
+#| "someone else's server to do your own computing on data provided by you."
+msgid ""
+"But none of these servers would give you control over computing you do on "
+"it, unless it's <em>your</em> server.  It may be OK to trust your friend's "
+"server for some jobs, just as you might let your friend maintain the "
+"software on your own computer.  Outside of that, all these servers would be "
+"SaaSS for you.  SaaSS always subjects you to the power of the server "
+"operator, and the only remedy is, <em>Don't use SaaSS!</em> Don't use "
+"someone else's server to do your own computing on data provided by you."
 msgstr ""
 "إن لإصدار الكود المصدري لبرمجيات الخادوم 
فائدة للمجتمع. يمكن للمستخدمين "
 "الذين يمتلكون المهارة اللازمة تجهيز خوادم 
مشابهة، وحتى تغيير البرمجيات. لكن "
@@ -311,9 +452,30 @@
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
-msgid "Distinguishing SaaS from Other Network Services"
+#, fuzzy
+#| msgid "Distinguishing SaaS from Other Network Services"
+msgid "Distinguishing SaaSS from Other Network Services"
 msgstr "التفريق بين البرمجيات الخدميات والخدم
ات الشبكية الأخرى"
 
+#. type: Content of: <p>
+msgid ""
+"Which online services are SaaSS? The clearest example is a translation "
+"service, which translates (say) English text into Spanish text.  Translating "
+"a text for you is computing that is purely yours.  You could do it by "
+"running a program on your own computer, if only you had the right program.  "
+"(To be ethical, that program should be free.)  The translation service "
+"substitutes for that program, so it is Service as a Software Substitute, or "
+"SaaSS.  Since it denies you control over your computing, it does you wrong."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Another clear example is using a service such as Flickr or Instagram to "
+"modify a photo.  Modifying photos is an activity that people have done in "
+"their own computers for decades; doing it in a server instead of your own "
+"computer is SaaSS."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -322,9 +484,9 @@
 #| "Most servers do not raise this issue, because the job you do with them "
 #| "isn't your own computing except in a trivial sense."
 msgid ""
-"Does avoiding SaaS mean you refuse to use any network servers run by anyone "
-"other than you? Not at all.  Most servers do not raise this issue, because "
-"the job you do with them isn't your own computing except in a trivial sense."
+"Rejecting SaaSS does not mean refusing to use any network servers run by "
+"anyone other than you.  Most servers are not SaaSS because the jobs they do "
+"are not the user's own computing."
 msgstr ""
 "هل رفض البرمجيات الخدمية يعني رفض كل خوادم 
الشبكة؟ أبدًا، فليس الأمر كذلك. "
 "معظم الخوادم لا تسبب هذه المشكلة لأن 
الوظيفة التي تؤيدها  عليها ليست معالجة "
@@ -332,17 +494,28 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"The original purpose of web servers wasn't to do computing for you, it was "
-"to publish information for you to access.  Even today this is what most web "
-"sites do, and it doesn't pose the SaaS problem, because accessing someone's "
-"published information isn't a matter of doing your own computing.  Neither "
-"is publishing your own materials via a blog site or a microblogging service "
-"such as Twitter or identi.ca.  The same goes for communication not meant to "
-"be private, such as chat groups.  Social networking can extend into SaaS; "
-"however, at root it is just a method of communication and publication, not "
-"SaaS.  If you use the service for minor editing of what you're going to "
-"communicate, that is not a significant issue."
+#, fuzzy
+#| msgid ""
+#| "The original purpose of web servers wasn't to do computing for you, it "
+#| "was to publish information for you to access.  Even today this is what "
+#| "most web sites do, and it doesn't pose the SaaS problem, because "
+#| "accessing someone's published information isn't a matter of doing your "
+#| "own computing.  Neither is publishing your own materials via a blog site "
+#| "or a microblogging service such as Twitter or identi.ca.  The same goes "
+#| "for communication not meant to be private, such as chat groups.  Social "
+#| "networking can extend into SaaS; however, at root it is just a method of "
+#| "communication and publication, not SaaS.  If you use the service for "
+#| "minor editing of what you're going to communicate, that is not a "
+#| "significant issue."
+msgid ""
+"The original idea of web servers wasn't to do computing for you, it was to "
+"publish information for you to access.  Even today this is what most web "
+"sites do, and it doesn't pose the SaaSS problem, because accessing someone's "
+"published information isn't doing your own computing.  Neither is publishing "
+"your own materials via a blog site or a microblogging service such as "
+"Twitter or StatusNet.  (These services may have other problems, of course.)  "
+"The same goes for other communication not meant to be private, such as chat "
+"groups."
 msgstr ""
 "إن غرض خوادم الوب الأساسي لم يكن معالجة 
بياناتك بل نشر معلومات لتصل إليها. "
 "معظم المواقع إلى اليوم تقوم بذلك ولا تسبب م
شكلة البرمجيات الخدمية لأن الوصول "
@@ -353,15 +526,53 @@
 "والنشر، وليست برمجيات خدمية. لا مشكلة 
حقيقة في استخدام خدمة لتعديل البيانات "
 "التي ستتواصل بها مع الناس بشكل طفيف."
 
+#. type: Content of: <p>
+msgid ""
+"In its essence, social networking is a form of communication and "
+"publication, not SaaSS.  However, a service whose main facility is social "
+"networking can have features or extensions which are SaaSS."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If a service is not SaaS, that does not mean it is OK.  There are other "
+#| "bad things a service can do.  For instance, Facebook distributes video in "
+#| "Flash, which pressures users to run nonfree software, and it gives users "
+#| "a misleading impression of privacy.  Those are important issues too, but "
+#| "this article's concern is the issue of SaaS."
+msgid ""
+"If a service is not SaaSS, that does not mean it is OK.  There are other "
+"ethical issues about services.  For instance, Facebook distributes video in "
+"Flash, which pressures users to run nonfree software; it requires running "
+"nonfree JavaScript code; and it gives users a misleading impression of "
+"privacy while luring them into baring their lives to Facebook.  Those are "
+"important issues, different from the SaaSS issue."
+msgstr ""
+"إذا لم تكن الخدمة برنامجًا خدميًا فهذا لا 
يعني بالضرورة أنها مقبولة. يمكن أن "
+"تقوم الخدمات بأمور سيئة أخرى. على سبيل الم
ثال، ينشر فيسبوك الفيديو بنسق فلاش "
+"وهو الأمر الذي يدفع المستخدمين إلى تشغيل 
برمجيات غير حرة، هذا بالإضافة إلى "
+"أن فيسبوك يضلل مستخدميه في طبيعة الخصوصية. 
إن هذه مشاكل أساسية، لكن غرض "
+"المقالة هو البرمجيات الخدمية."
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Services such as search engines collect data from around the web and let "
+#| "you examine it.  Looking through their collection of data isn't your own "
+#| "computing in the usual sense&mdash;you didn't provide that "
+#| "collection&mdash;so using such a service to search the web is not SaaS.  "
+#| "(However, using someone else's search engine to implement a search "
+#| "facility for your own site <em>is</em> SaaS.)"
 msgid ""
 "Services such as search engines collect data from around the web and let you "
 "examine it.  Looking through their collection of data isn't your own "
 "computing in the usual sense&mdash;you didn't provide that collection&mdash;"
-"so using such a service to search the web is not SaaS.  (However, using "
-"someone else's search engine to implement a search facility for your own "
-"site <em>is</em> SaaS.)"
+"so using such a service to search the web is not SaaSS.  However, using "
+"someone else's server to implement a search facility for your own site "
+"<em>is</em> SaaSS."
 msgstr ""
 "بعض الخدمات مثل محركات البحث تجمع 
البيانات وتجعلك تبحث فيها. إن البحث في "
 "البيانات التي جمعتها تلك الخدمات ليس من م
عالجة بياناتك بالمعنى التقليدي؛ "
@@ -379,109 +590,60 @@
 #| "issue in E-commerce is whether you trust the other party with your money "
 #| "and personal information."
 msgid ""
-"E-commerce is not SaaS, because the computing isn't solely yours; rather, it "
-"is done jointly for you and another party.  So there's no particular reason "
-"why you alone should expect to control that computing.  The real issue in e-"
-"commerce is whether you trust the other party with your money and personal "
-"information."
+"Purchasing online is not SaaSS, because the computing isn't <em>your own</"
+"em>; rather, it is done jointly by and for you and the store.  The real "
+"issue in online shopping is whether you trust the other party with your "
+"money and other personal information (starting with your name)."
 msgstr ""
 "التجارة الإلكترونية ليست قائمة على برم
جيات خدمية، لأن المعالجة ليست خاصة بك، "
 "بل إنها تجرى لك مع طرف آخر. ولذا فلا يوجد 
سبب لاستئثارك بالمعالجة. السؤال "
 "المطروح في التجارة الإلكترونية هو فيما 
إذا كنت تثق الطرف الآخر بمالك وبيانات "
 "الشخصية."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Using a joint project's servers isn't SaaS because the computing you do in "
-"this way isn't yours personally.  For instance, if you edit pages on "
-"Wikipedia, you are not doing your own computing; rather, you are "
-"collaborating in Wikipedia's computing."
-msgstr ""
-"استخدام خوادم المشاريع التعاونية ليس 
حوسبة خدمية لأن المعالجة التي تقوم بها "
-"ليست خاصة بك. على سبيل المثال، إذا عدّلت 
صفحات ويكيبيديا فلست تقوم بحوسبتك "
-"الخاصة، بل بالمساهمة في معالجة محتويات 
ويكيبيديا."
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Wikipedia controls its own servers, but groups can face the problem of SaaS "
-"if they do their group activities on someone else's server.  Fortunately, "
-"development hosting sites such as Savannah and SourceForge don't pose the "
-"SaaS problem, because what groups do there is mainly publication and public "
-"communication, rather than their own private computing."
-msgstr ""
-"تدير ويكيبيديا خوادمها، قد يواجه البعض م
شكلة البرمجيات الخدمية إذا كانوا "
-"يقومون بنشاطات جماعية على خادوم شخص آخر، 
لكن لحسن الحظ مواقع استضافة البرامج "
-"مثل سافانا و SourceForge لا تسبب مشكلة البرم
جيات الخدمية لأن غرض المستضافين "
-"الأساسي هو النشر والتواصل العلني، وليس الم
عالجة الخاصة."
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Multiplayer games are a group activity carried out on someone else's server, "
-"which makes them SaaS.  But where the data involved is just the state of "
-"play and the score, the worst wrong the operator might commit is "
-"favoritism.  You might well ignore that risk, since it seems unlikely and "
-"very little is at stake.  On the other hand, when the game becomes more than "
-"just a game, the issue changes."
-msgstr ""
-"تعد الألعاب الجماعية نشاطًا جماعيًا يجري 
على خادوم شخص آخر، الأمر الذي يجعلها "
-"حوسبة خدمية، وبينما قد تقتصر البيانات على 
حالة اللعب والدرجات، إلا أن مُشغّل "
-"الخادوم قد يرتكب خطأ المحاباة والتحيز. لك 
أن تتجاهل هذا الخطر، لأنه نادر "
-"وقلما يشكل مشكلة حقيقة. في المقابل، عندما 
تتحول اللعبة إلى أكثر من مجرد "
-"لعبة، فإن القضية تتغير."
-
-#. type: Content of: <p>
-msgid ""
-"&ldquo;Backend as a Service&rdquo;, or BaaS, is a kind of SaaS, because it "
-"involves running your own web service on top of software that you can't "
-"control.  If you set up a service using BaaS, the BaaS platform may well "
-"collect information about your users as well as you."
+"Repository sites such as as Savannah and SourceForge are not inherently "
+"SaaSS, because a repository's job is publication of data supplied to it."
 msgstr ""
 
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "Which online services are SaaS? Google Docs is a clear example.  Its "
-#| "basic activity is editing, and Google encourages people to use it for "
-#| "their own editing; this is SaaS.  It offers the added feature of "
-#| "collaborative editing, but adding participants doesn't alter the fact "
-#| "that editing on the server is SaaS.  (In addition, Google Docs is "
-#| "unacceptable because it installs a large nonfree JavaScript program into "
-#| "the users' browsers.)  If using a service for communication or "
-#| "collaboration requires doing substantial parts of your own computing with "
-#| "it too, that computing is SaaS even if the communication is not."
-msgid ""
-"Which online services are SaaS? Google Docs is a clear example.  Its basic "
-"activity is editing, and Google encourages people to use it for their own "
-"editing; this is SaaS.  It offers the added feature of collaborative "
-"editing, but adding participants doesn't alter the fact that editing on the "
-"server is SaaS.  (In addition, Google Docs is unacceptable because it "
-"installs a large <a href=\"/philosophy/javascript-trap.html\"> nonfree "
-"JavaScript program</a> into the user's browser.)  If using a service for "
-"communication or collaboration requires doing substantial parts of your own "
-"computing with it too, that computing is SaaS even if the communication is "
-"not."
+#| "Using a joint project's servers isn't SaaS because the computing you do "
+#| "in this way isn't yours personally.  For instance, if you edit pages on "
+#| "Wikipedia, you are not doing your own computing; rather, you are "
+#| "collaborating in Wikipedia's computing."
+msgid ""
+"Using a joint project's servers isn't SaaSS because the computing you do in "
+"this way isn't your own.  For instance, if you edit pages on Wikipedia, you "
+"are not doing your own computing; rather, you are collaborating in "
+"Wikipedia's computing.  Wikipedia controls its own servers, but "
+"organizations as well as individuals encounter the problem of SaaSS if they "
+"do their computing in someone else's server."
 msgstr ""
-"ماهي الخدمات التي تعد برمجيات خدمية؟ إن م
سنتدات غوغل (Google Docs) مثال "
-"واضح، غرضها الأساسي هو التحرير وتدعو غوغل 
الناس إلى استخدامها لتحرير "
-"مستنداتهم الخاصة؛ ولذا فإنها برنامج خدمي. 
توفر الخدمة أيضًا ميزة التحرير "
-"التعاوني، لكن إضافة مشاركين آخرين لا يلغي 
حقيقة أن التعديل على الخادوم نوع "
-"من الحوسبة الخدمية. (مستندات غوغل مرفوضة 
أيضًا لأنها تُثبّت برنامج جافاسكربت "
-"غير حر في متصفحات المستخدمين). إذا كانت خدم
ة التواصل أو التعاون تتطلب القيام "
-"بجزء أساسي من معالجتك عليها، فإن المعالجة 
نوع من البرمجيات الخدمية حتى لو لم "
-"يكن التواصل كذلك."
+"استخدام خوادم المشاريع التعاونية ليس 
حوسبة خدمية لأن المعالجة التي تقوم بها "
+"ليست خاصة بك. على سبيل المثال، إذا عدّلت 
صفحات ويكيبيديا فلست تقوم بحوسبتك "
+"الخاصة، بل بالمساهمة في معالجة محتويات 
ويكيبيديا."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"Some sites offer multiple services, and if one is not SaaS, another may be "
-"SaaS.  For instance, the main service of Facebook is social networking, and "
-"that is not SaaS; however, it supports third-party applications, some of "
-"which may be SaaS.  Flickr's main service is distributing photos, which is "
-"not SaaS, but it also has features for editing photos, which is SaaS."
+#, fuzzy
+#| msgid ""
+#| "Some sites offer multiple services, and if one is not SaaS, another may "
+#| "be SaaS.  For instance, the main service of Facebook is social "
+#| "networking, and that is not SaaS; however, it supports third-party "
+#| "applications, some of which may be SaaS.  Flickr's main service is "
+#| "distributing photos, which is not SaaS, but it also has features for "
+#| "editing photos, which is SaaS."
+msgid ""
+"Some sites offer multiple services, and if one is not SaaSS, another may be "
+"SaaSS.  For instance, the main service of Facebook is social networking, and "
+"that is not SaaSS; however, it supports third-party applications, some of "
+"which are SaaSS.  Flickr's main service is distributing photos, which is not "
+"SaaSS, but it also has features for editing photos, which is SaaSS.  "
+"Likewise, using Instagram to post a photo is not SaaSS, but using it to "
+"transform the photo is SaaSS."
 msgstr ""
 "توفر بعض المواقع خدمات عديدة، فإذا كان 
أحدها ليس حوسبة خدمية فقد يكون الآخر "
 "كذلك. على سبيل المثال، هدف فيسبوك الرئيسي 
هو التواصل الاجتماعي، وهذا ليس "
@@ -489,42 +651,59 @@
 "فإن هدف فلكر الأساسي هو توزيع ونشر الصور، 
وهذه ليست حوسبة خدمية، لكنه يحتوي "
 "أيضًا على مزايا لتعديل الصور التي تعتبر 
حوسبة خدمية"
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Some sites whose main service is publication and communication extend it "
-"with &ldquo;contact management&rdquo;: keeping track of people you have "
-"relationships with.  Sending mail to those people for you is not SaaS, but "
-"keeping track of your dealings with them, if substantial, is SaaS."
+"Google Docs shows how complex the evaluation of a single service can "
+"become.  It invites people to edit a document by running a large <a href=\"/"
+"philosophy/javascript-trap.html\">nonfree JavaScript program</a>, clearly "
+"wrong.  However, it offers an API for uploading and downloading documents in "
+"standard formats.  A free software editor can do so through this API.  This "
+"usage scenario is not SaaSS, because it uses Google Docs as a mere "
+"repository.  Showing all your data to a company is bad, but that is a matter "
+"of privacy, not SaaSS; depending on a service for access to your data is "
+"bad, but that is a matter of risk, not SaaSS.  On the other hand, using the "
+"service for converting document formats <em>is</em> SaaSS, because it's "
+"something you could have done by running a suitable program (free, one "
+"hopes) in your own computer."
 msgstr ""
-"بعض المواقع التي يعد التواصل هدفها الرئيس 
تتوسع في &rdquo;إدارة "
-"المراسلين&ldquo; عبر تتبع الذين تتواصل معهم. 
إن إرسال الرسائل إلى هؤلاء "
-"لأشخاص على مثل هذه الخدمات ليس حوسبة خدم
ية، لكن التتبع (إن كان واسعًا) يعد "
-"كذلك."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"If a service is not SaaS, that does not mean it is OK.  There are other bad "
-"things a service can do.  For instance, Facebook distributes video in Flash, "
-"which pressures users to run nonfree software, and it gives users a "
-"misleading impression of privacy.  Those are important issues too, but this "
-"article's concern is the issue of SaaS."
+"Using Google Docs through a free editor is rare, of course.  Most often, "
+"people use it through the nonfree JavaScript program, which is bad like any "
+"nonfree program.  This scenario might involve SaaSS, too; that depends on "
+"what part of the editing is done in the JavaScript program and what part in "
+"the server.  We don't know, but since SaaSS and proprietary software do "
+"similar wrong to the user, it is not crucial to know."
 msgstr ""
-"إذا لم تكن الخدمة برنامجًا خدميًا فهذا لا 
يعني بالضرورة أنها مقبولة. يمكن أن "
-"تقوم الخدمات بأمور سيئة أخرى. على سبيل الم
ثال، ينشر فيسبوك الفيديو بنسق فلاش "
-"وهو الأمر الذي يدفع المستخدمين إلى تشغيل 
برمجيات غير حرة، هذا بالإضافة إلى "
-"أن فيسبوك يضلل مستخدميه في طبيعة الخصوصية. 
إن هذه مشاكل أساسية، لكن غرض "
-"المقالة هو البرمجيات الخدمية."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"The IT industry discourages users from considering these distinctions.  "
-"That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is "
-"so nebulous that it could refer to almost any use of the Internet.  It "
-"includes SaaS and it includes nearly everything else.  The term only lends "
-"itself to uselessly broad statements."
+"Publishing via someone else's repository does not raise privacy issues, but "
+"publishing through Google Docs has a special problem: it is impossible even "
+"to <em>view the text</em> of a Google Docs document in a browser without "
+"running the nonfree JavaScript code.  Thus, you should not use Google Docs "
+"to publish anything&mdash;but the reason is not a matter of SaaSS."
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The IT industry discourages users from considering these distinctions.  "
+#| "That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term "
+#| "is so nebulous that it could refer to almost any use of the Internet.  It "
+#| "includes SaaS and it includes nearly everything else.  The term only "
+#| "lends itself to uselessly broad statements."
+msgid ""
+"The IT industry discourages users from making these distinctions.  That's "
+"what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is so "
+"nebulous that it could refer to almost any use of the Internet.  It includes "
+"SaaSS as well as many other network usage practices.  In any given context, "
+"an author who writes &ldquo;cloud&rdquo; (if a technical person) probably "
+"has a specific meaning in mind, but usually does not explain that in other "
+"articles the term has other specific meanings.  The term leads people to "
+"generalize about practices they ought to consider individually."
 msgstr ""
 "إن شركات تقنية المعلومات تشجع المستخدمين 
على عدم التفكير في هذه المشاكل، "
 "وهذا هو غرض كلمة &rdquo;الحوسبة السحابية&ldquo; 
الرنانة. إن هذا المصطلح غامض "
@@ -533,13 +712,24 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"The real meaning of &ldquo;cloud computing&rdquo; is to suggest a devil-may-"
-"care approach towards your computing.  It says, &ldquo;Don't ask questions, "
-"just trust every business without hesitation.  Don't worry about who "
+#, fuzzy
+#| msgid ""
+#| "The real meaning of &ldquo;cloud computing&rdquo; is to suggest a devil-"
+#| "may-care approach towards your computing.  It says, &ldquo;Don't ask "
+#| "questions, just trust every business without hesitation.  Don't worry "
+#| "about who controls your computing or who holds your data.  Don't check "
+#| "for a hook hidden inside our service before you swallow it.&rdquo; In "
+#| "other words, &ldquo;Think like a sucker.&rdquo; I prefer to avoid the "
+#| "term."
+msgid ""
+"If &ldquo;cloud computing&rdquo; has a meaning, it is not a way of doing "
+"computing, but rather a way of thinking about computing: a devil-may-care "
+"approach which says, &ldquo;Don't ask questions.  Don't worry about who "
 "controls your computing or who holds your data.  Don't check for a hook "
-"hidden inside our service before you swallow it.&rdquo; In other words, "
-"&ldquo;Think like a sucker.&rdquo; I prefer to avoid the term."
+"hidden inside our service before you swallow it.  Trust companies without "
+"hesitation.&rdquo; In other words, &ldquo;Be a sucker.&rdquo; A cloud in the "
+"mind is an obstacle to clear thinking.  For the sake of clear thinking about "
+"computing, let's avoid the term &ldquo;cloud.&rdquo;"
 msgstr ""
 "إن معنى &rdquo;الحوسبة السحابية&ldquo; الحقيقي 
هو طرح اقتراح خطير يهدد "
 "حوسبتك. إنها تعني &rdquo;لا تسأل، ثِق بكل 
الشركات دون تردد. لا تخف من قضية من "
@@ -548,26 +738,42 @@
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
-msgid "Dealing with the SaaS Problem"
+#, fuzzy
+#| msgid "Dealing with the SaaS Problem"
+msgid "Dealing with the SaaSS Problem"
 msgstr "معالجة مشكلة البرمجيات الخدمية"
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Only a small fraction of all web sites do SaaS; most don't raise the "
+#| "issue.  But what should we do about the ones that raise it?"
 msgid ""
-"Only a small fraction of all web sites do SaaS; most don't raise the issue.  "
-"But what should we do about the ones that raise it?"
+"Only a small fraction of all web sites do SaaSS; most don't raise the "
+"issue.  But what should we do about the ones that raise it?"
 msgstr ""
 "قليل من المواقع تقوم بحوسبة خدمية، ومعظم 
المواقع لا تسبب المشكلة. لكن ماذا "
 "نفعل بخصوص المواقع التي تسببها؟"
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For the simple case, where you are doing your own computing on data in "
+#| "your own hands, the solution is simple: use your own copy of a free "
+#| "software application.  Do your text editing with your copy of a free text "
+#| "editor such as GNU Emacs or a free word processor.  Do your photo editing "
+#| "with your copy of free software such as GIMP."
 msgid ""
 "For the simple case, where you are doing your own computing on data in your "
 "own hands, the solution is simple: use your own copy of a free software "
 "application.  Do your text editing with your copy of a free text editor such "
 "as GNU Emacs or a free word processor.  Do your photo editing with your copy "
-"of free software such as GIMP."
+"of free software such as GIMP.  What if there is no free program available? "
+"A proprietary program or SaaSS would take away your freedom, so you "
+"shouldn't use those.  You can contribute your time or your money to "
+"development of a free replacement."
 msgstr ""
 "للحالات البسيطة التي تقوم فيها بمعالجة 
بياناتك الخاصة، الحل سهل: استخدم نسخة "
 "خاصة بك من تطبيق حر. حرّر نصوصك باستخدام 
نسختك من مُحرّر نصوص حر مثل غنو إيماكس "
@@ -576,17 +782,30 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"But what about collaborating with other individuals? It may be hard to do "
-"this at present without using a server.  If you use one, don't trust a "
-"server run by a company.  A mere contract as a customer is no protection "
-"unless you could detect a breach and could really sue, and the company "
-"probably writes its contracts to permit a broad range of abuses.  Police can "
-"subpoena your data from the company with less basis than required to "
-"subpoena them from you, supposing the company doesn't volunteer them like "
-"the US phone companies that illegally wiretapped their customers for Bush.  "
-"If you must use a server, use a server whose operators give you a basis for "
-"trust beyond a mere commercial relationship."
+#, fuzzy
+#| msgid ""
+#| "But what about collaborating with other individuals? It may be hard to do "
+#| "this at present without using a server.  If you use one, don't trust a "
+#| "server run by a company.  A mere contract as a customer is no protection "
+#| "unless you could detect a breach and could really sue, and the company "
+#| "probably writes its contracts to permit a broad range of abuses.  Police "
+#| "can subpoena your data from the company with less basis than required to "
+#| "subpoena them from you, supposing the company doesn't volunteer them like "
+#| "the US phone companies that illegally wiretapped their customers for "
+#| "Bush.  If you must use a server, use a server whose operators give you a "
+#| "basis for trust beyond a mere commercial relationship."
+msgid ""
+"What about collaborating with other individuals as a group? It may be hard "
+"to do this at present without using a server, and your group may not know "
+"how to run its own server.  If you use someone else's server, at least don't "
+"trust a server run by a company.  A mere contract as a customer is no "
+"protection unless you could detect a breach and could really sue, and the "
+"company probably writes its contracts to permit a broad range of abuses.  "
+"The state can subpoena your data from the company along with everyone "
+"else's, as Obama has done to phone companies, supposing the company doesn't "
+"volunteer them like the US phone companies that illegally wiretapped their "
+"customers for Bush.  If you must use a server, use a server whose operators "
+"give you a basis for trust beyond a mere commercial relationship."
 msgstr ""
 "لكن ماذا عن التعاون مع الآخرين؟ قد يكون 
التعاون في الوقت الراهن صعبًا بدون "
 "استخدام خادوم. إذا استخدمت خادومًا، فلا 
تثق بخادوم تُديره شركة، حتى التعاقد "
@@ -622,13 +841,21 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In the meantime, if a company invites you to use its server to do your "
+#| "own computing tasks, don't yield; don't use SaaS.  Don't buy or install "
+#| "&ldquo;thin clients&rdquo;, which are simply computers so weak they make "
+#| "you do the real work on a server, unless you're going to use them with "
+#| "<em>your</em> server.  Use a real computer and keep your data there.  Do "
+#| "your work with your own copy of a free program, for your freedom's sake."
 msgid ""
 "In the meantime, if a company invites you to use its server to do your own "
-"computing tasks, don't yield; don't use SaaS.  Don't buy or install &ldquo;"
+"computing tasks, don't yield; don't use SaaSS.  Don't buy or install &ldquo;"
 "thin clients&rdquo;, which are simply computers so weak they make you do the "
 "real work on a server, unless you're going to use them with <em>your</em> "
-"server.  Use a real computer and keep your data there.  Do your work with "
-"your own copy of a free program, for your freedom's sake."
+"server.  Use a real computer and keep your data there.  Do your own "
+"computing with your own copy of a free program, for your freedom's sake."
 msgstr ""
 "في الوقت الراهن، إن دعتك شركة لاستخدام 
خادومها للقيام بمهامك الحاسوبية "
 "الخاصة، فلا تستسلم، ولا تستخدم البرمجيات 
الخدمية. لا تشترِ ولا تُثبّت &rdquo;"
@@ -657,42 +884,36 @@
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
-#| "Please send 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.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
-msgid ""
-"Please send 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."
-msgstr ""
-"من فضلك أرسل لإف&#8204;إس&#8204;إف ولاستفسارات 
غنو ل<a href=\"mailto:address@hidden";
-"org\"><em>address@hidden</em></a>. يوجد أيضا <a 
href=\"/contact/\">طرق أخرى "
-"للاتصال</a> بإف&#8204;إس&#8204;إف.  <br /> من فضلك 
أرسل الوصلات المنقطعة وأي "
-"تصحيحات أو اقتراحات إلى <a 
href=\"mailto:address@hidden";><em>web-"
-"address@hidden</em></a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send 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.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>."
+msgid ""
+"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"
+"org&gt;</a>."
 msgstr ""
 "من فضلك أرسل لإف&#8204;إس&#8204;إف ولاستفسارات 
غنو ل<a href=\"mailto:address@hidden";
 "org\"><em>address@hidden</em></a>. يوجد أيضا <a 
href=\"/contact/\">طرق أخرى "
-"للاتصال</a> بإف&#8204;إس&#8204;إف.  <br /> من فضلك 
أرسل الوصلات المنقطعة وأي "
-"تصحيحات أو اقتراحات إلى <a 
href=\"mailto:address@hidden";><em>web-"
-"address@hidden</em></a>."
+"للاتصال</a> بالإف&#8204;إس&#8204;إف.  <br /> من فضلك 
أرسلالوصلات المنقطعة "
+"وأي تصحيحات أو اقتراحات إلى <a 
href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>."
 
 # type: Content of: <div><p>
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -703,8 +924,12 @@
 "\">تعليمات الترجمة</a> لمعلومات حول تنسيق 
وتسليم ترجمات هذه المقالة."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010 Richard Stallman"
+#, fuzzy
+#| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2010, 2013 Richard Stallman"
 msgstr ""
+"حقوق النشر &copy; 2011, 2012  مؤسسة البرمجيات 
الحرة Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 #, fuzzy
@@ -735,6 +960,146 @@
 msgid "Updated:"
 msgstr "حُدّثت:"
 
+# type: Content of: <p>
+#~ msgid ""
+#~ "Some proprietary programs can mistreat users under remote command.  For "
+#~ "instance, Windows has a back door with which Microsoft can forcibly "
+#~ "change any software on the machine.  The Amazon Kindle e-book reader "
+#~ "(whose name suggests it's intended to burn people's books) has an "
+#~ "Orwellian back door that Amazon used in 2009 to <a href=\"http://www.";
+#~ "nytimes.com/2009/07/18/technology/companies/18amazon.html\" >remotely "
+#~ "delete</a> Kindle copies of Orwell's books <cite>1984</cite> and "
+#~ "<cite>Animal Farm</cite> which the users had purchased from Amazon."
+#~ msgstr ""
+#~ "يمكن لبعض البرمجيات المحتكرة أن تسيء إلى 
المستخدمين بأمر خارجي. على سبيل "
+#~ "المثال، يحتوي ويندوز على باب خلفي يُمكّن 
مايكروسوفت من فرض أي تغيير على أي "
+#~ "برنامج على الجهاز. يحتوي قارئ الكتب Amazon 
Kindle &rdquo;مُشغل "
+#~ "أمازون&ldquo; -الذي يوحي اسمه أن غرضه حرق 
كتبنا- على مدخل خلفي أورويلي [-"
+#~ "معاد للصالح العام-] استخدمته أمازون في 
عام 2009 ل<a href=\"http://www.";
+#~ "nytimes.com/2009/07/18/technology/companies/18amazon.html\" >حذف</a> "
+#~ "الكثير من نُسخ Kindle من كتابي <cite>1984</cite> و 
<cite>Animal Farm</"
+#~ "cite> لOrwell الذين اشتراهما الناس من أمازون."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "SaaS inherently gives the server operator the power to change the "
+#~ "software in use, or the users' data being operated on.  Once again, no "
+#~ "special code is needed to do this."
+#~ msgstr ""
+#~ "تمنح البرمجيات الخدمية مُشغّل الخادوم 
المقدرة على تغيير البرمجيات المُستخدمة "
+#~ "وبيانات المستخدمين التي تُعالج. وهنا 
أيضًا لا حاجة لكود خاص للقيام بذلك."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Wikipedia controls its own servers, but groups can face the problem of "
+#~ "SaaS if they do their group activities on someone else's server.  "
+#~ "Fortunately, development hosting sites such as Savannah and SourceForge "
+#~ "don't pose the SaaS problem, because what groups do there is mainly "
+#~ "publication and public communication, rather than their own private "
+#~ "computing."
+#~ msgstr ""
+#~ "تدير ويكيبيديا خوادمها، قد يواجه البعض م
شكلة البرمجيات الخدمية إذا كانوا "
+#~ "يقومون بنشاطات جماعية على خادوم شخص آخر، 
لكن لحسن الحظ مواقع استضافة "
+#~ "البرامج مثل سافانا و SourceForge لا تسبب مشكلة 
البرمجيات الخدمية لأن غرض "
+#~ "المستضافين الأساسي هو النشر والتواصل 
العلني، وليس المعالجة الخاصة."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Multiplayer games are a group activity carried out on someone else's "
+#~ "server, which makes them SaaS.  But where the data involved is just the "
+#~ "state of play and the score, the worst wrong the operator might commit is "
+#~ "favoritism.  You might well ignore that risk, since it seems unlikely and "
+#~ "very little is at stake.  On the other hand, when the game becomes more "
+#~ "than just a game, the issue changes."
+#~ msgstr ""
+#~ "تعد الألعاب الجماعية نشاطًا جماعيًا 
يجري على خادوم شخص آخر، الأمر الذي "
+#~ "يجعلها حوسبة خدمية، وبينما قد تقتصر 
البيانات على حالة اللعب والدرجات، إلا "
+#~ "أن مُشغّل الخادوم قد يرتكب خطأ المحاباة 
والتحيز. لك أن تتجاهل هذا الخطر، "
+#~ "لأنه نادر وقلما يشكل مشكلة حقيقة. في الم
قابل، عندما تتحول اللعبة إلى أكثر "
+#~ "من مجرد لعبة، فإن القضية تتغير."
+
+# type: Content of: <p>
+#, fuzzy
+#~| msgid ""
+#~| "Which online services are SaaS? Google Docs is a clear example.  Its "
+#~| "basic activity is editing, and Google encourages people to use it for "
+#~| "their own editing; this is SaaS.  It offers the added feature of "
+#~| "collaborative editing, but adding participants doesn't alter the fact "
+#~| "that editing on the server is SaaS.  (In addition, Google Docs is "
+#~| "unacceptable because it installs a large nonfree JavaScript program into "
+#~| "the users' browsers.)  If using a service for communication or "
+#~| "collaboration requires doing substantial parts of your own computing "
+#~| "with it too, that computing is SaaS even if the communication is not."
+#~ msgid ""
+#~ "Which online services are SaaS? Google Docs is a clear example.  Its "
+#~ "basic activity is editing, and Google encourages people to use it for "
+#~ "their own editing; this is SaaS.  It offers the added feature of "
+#~ "collaborative editing, but adding participants doesn't alter the fact "
+#~ "that editing on the server is SaaS.  (In addition, Google Docs is "
+#~ "unacceptable because it installs a large <a href=\"/philosophy/javascript-"
+#~ "trap.html\"> nonfree JavaScript program</a> into the user's browser.)  If "
+#~ "using a service for communication or collaboration requires doing "
+#~ "substantial parts of your own computing with it too, that computing is "
+#~ "SaaS even if the communication is not."
+#~ msgstr ""
+#~ "ماهي الخدمات التي تعد برمجيات خدمية؟ إن م
سنتدات غوغل (Google Docs) مثال "
+#~ "واضح، غرضها الأساسي هو التحرير وتدعو 
غوغل الناس إلى استخدامها لتحرير "
+#~ "مستنداتهم الخاصة؛ ولذا فإنها برنامج خدم
ي. توفر الخدمة أيضًا ميزة التحرير "
+#~ "التعاوني، لكن إضافة مشاركين آخرين لا 
يلغي حقيقة أن التعديل على الخادوم "
+#~ "نوع من الحوسبة الخدمية. (مستندات غوغل م
رفوضة أيضًا لأنها تُثبّت برنامج "
+#~ "جافاسكربت غير حر في متصفحات المستخدمين). 
إذا كانت خدمة التواصل أو التعاون "
+#~ "تتطلب القيام بجزء أساسي من معالجتك 
عليها، فإن المعالجة نوع من البرمجيات "
+#~ "الخدمية حتى لو لم يكن التواصل كذلك."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Some sites whose main service is publication and communication extend it "
+#~ "with &ldquo;contact management&rdquo;: keeping track of people you have "
+#~ "relationships with.  Sending mail to those people for you is not SaaS, "
+#~ "but keeping track of your dealings with them, if substantial, is SaaS."
+#~ msgstr ""
+#~ "بعض المواقع التي يعد التواصل هدفها 
الرئيس تتوسع في &rdquo;إدارة "
+#~ "المراسلين&ldquo; عبر تتبع الذين تتواصل معهم
. إن إرسال الرسائل إلى هؤلاء "
+#~ "لأشخاص على مثل هذه الخدمات ليس حوسبة خدم
ية، لكن التتبع (إن كان واسعًا) يعد "
+#~ "كذلك."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send 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.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
+#~| "address@hidden&gt;</a>."
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "من فضلك أرسل لإف&#8204;إس&#8204;إف ولاستفسارات 
غنو ل<a href=\"mailto:";
+#~ "address@hidden"><em>address@hidden</em></a>. يوجد أيضا <a 
href=\"/contact/"
+#~ "\">طرق أخرى للاتصال</a> بإف&#8204;إس&#8204;إف.  <br 
/> من فضلك أرسل "
+#~ "الوصلات المنقطعة وأي تصحيحات أو 
اقتراحات إلى <a href=\"mailto:web-";
+#~ "address@hidden"><em>address@hidden</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send 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.  <br /> Please send broken links and other "
+#~| "corrections or suggestions to <a href=\"mailto:address@hidden";>&lt;"
+#~| "address@hidden&gt;</a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "من فضلك أرسل لإف&#8204;إس&#8204;إف ولاستفسارات 
غنو ل<a href=\"mailto:";
+#~ "address@hidden"><em>address@hidden</em></a>. يوجد أيضا <a 
href=\"/contact/"
+#~ "\">طرق أخرى للاتصال</a> بإف&#8204;إس&#8204;إف.  <br 
/> من فضلك أرسل "
+#~ "الوصلات المنقطعة وأي تصحيحات أو 
اقتراحات إلى <a href=\"mailto:web-";
+#~ "address@hidden"><em>address@hidden</em></a>."
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "ترجمات هذه الصفحة"

Index: who-does-that-server-really-serve.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/who-does-that-server-really-serve.es.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- who-does-that-server-really-serve.es.po     6 Jun 2013 18:19:21 -0000       
1.26
+++ who-does-that-server-really-serve.es.po     18 Jun 2013 05:29:59 -0000      
1.27
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2013-06-06 20:07+0300\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-06-06 20:06+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -17,12 +17,18 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
+# | Who Does That Server Really Serve? - GNU Project - Free Software
+# | Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Who Does That Server Really Serve? - GNU Project - Free Software "
+#| "Foundation (FSF)"
 msgid ""
-"Who Does That Server Really Serve? - GNU Project - Free Software Foundation "
-"(FSF)"
+"Who Does That Server Really Serve? - GNU Project - Free Software Foundation"
 msgstr ""
 "¿A quién sirve realmente ese servidor? - Proyecto GNU - Free Software "
 "Foundation (FSF)"
@@ -38,25 +44,52 @@
 msgstr "por <strong>Richard Stallman</strong>"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <blockquote><p>
+# | [-(First-]{+(The first version was+} published [-by-] {+in+} <a
+# | href=\"http://www.bostonreview.net/richard-stallman-free-software-DRM\";>
+# | Boston Review</a>.)
+#, fuzzy
+#| msgid ""
+#| "(First published by <a href=\"http://www.bostonreview.net/richard-";
+#| "stallman-free-software-DRM\"> Boston Review</a>.)"
 msgid ""
-"(First published by <a href=\"http://www.bostonreview.net/richard-stallman-";
-"free-software-DRM\"> Boston Review</a>.)"
+"(The first version was published in <a href=\"http://www.bostonreview.net/";
+"richard-stallman-free-software-DRM\"> Boston Review</a>.)"
 msgstr ""
 "(Publicado por primera vez en <a href=\"http://www.bostonreview.net/richard-";
 "stallman-free-software-DRM\">Boston Review</a>, en inglés)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | <strong>On the Internet, proprietary software isn't the only way to lose
+# | your freedom.  [-Software-]  {+Service+} as a [-Service-] {+Software
+# | Substitute, or SaaSS,+} is another way to let someone else have power over
+# | your computing.</strong>
+#, fuzzy
+#| msgid ""
+#| "<strong>On the Internet, proprietary software isn't the only way to lose "
+#| "your freedom.  Software as a Service is another way to let someone else "
+#| "have power over your computing.</strong>"
 msgid ""
 "<strong>On the Internet, proprietary software isn't the only way to lose "
-"your freedom.  Software as a Service is another way to let someone else have "
-"power over your computing.</strong>"
+"your freedom.  Service as a Software Substitute, or SaaSS, is another way to "
+"let someone else have power over your computing.</strong>"
 msgstr ""
 "<strong>En Internet, el software privativo no es la única manera de perder "
 "su libertad. El software como un servicio es otra forma de otorgar a otra "
 "persona el poder sobre su ordenador.</strong>"
 
+#. type: Content of: outside any tag (error?)
+msgid ""
+"SaaSS means using a service implemented by someone else as a substitute for "
+"running your copy of a program.  The term is ours; articles and ads won't "
+"use it, and they won't tell you whether a service is SaaSS.  Instead they "
+"will probably use the vague and distracting term &ldquo;cloud&rdquo;, which "
+"lumps SaaSS together with various other practices, some abusive and some "
+"ok.  With the explanation and examples in this page, you can tell whether a "
+"service is SaaSS."
+msgstr ""
+
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Background: How Proprietary Software Takes Away Your Freedom"
@@ -106,12 +139,25 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | With free software, we, the users, take back control of our computing. 
+# | Proprietary software still exists, but we can exclude it from our lives
+# | and many of us have done so.  However, we now face a new threat to our
+# | control over our computing: [-Software-] {+Service+} as a [-Service.-]
+# | {+Software Substitute (SaaSS).+}  For our freedom's sake, we have to
+# | reject that too.
+#, fuzzy
+#| msgid ""
+#| "With free software, we, the users, take back control of our computing.  "
+#| "Proprietary software still exists, but we can exclude it from our lives "
+#| "and many of us have done so.  However, we now face a new threat to our "
+#| "control over our computing: Software as a Service.  For our freedom's "
+#| "sake, we have to reject that too."
 msgid ""
 "With free software, we, the users, take back control of our computing.  "
 "Proprietary software still exists, but we can exclude it from our lives and "
 "many of us have done so.  However, we now face a new threat to our control "
-"over our computing: Software as a Service.  For our freedom's sake, we have "
-"to reject that too."
+"over our computing: Service as a Software Substitute (SaaSS).  For our "
+"freedom's sake, we have to reject that too."
 msgstr ""
 "Con el software libre nosotros, los usuarios, tomamos el control de nuestras "
 "tareas de computación. Aún existe el software privativo, pero podemos "
@@ -122,18 +168,43 @@
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
-msgid "How Software as a Service Takes Away Your Freedom"
+# | How [-Software-] {+Service+} as a [-Service-] {+Software Substitute+}
+# | Takes Away Your Freedom
+#, fuzzy
+#| msgid "How Software as a Service Takes Away Your Freedom"
+msgid "How Service as a Software Substitute Takes Away Your Freedom"
 msgstr "De qué manera el <i>software como servicio</i> le quita la libertad"
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"Software as a Service (SaaS) means that someone sets up a network server "
-"that does certain computing tasks&mdash;running spreadsheets, word "
-"processing, translating text into another language, etc.&mdash;then invites "
-"users to do their computing on that server.  Users send their data to the "
-"server, which does their computing on the data thus provided, then sends the "
-"results back or acts on them directly."
+# | {+Service as a+} Software {+Substitute (SaaSS) means using a service+} as
+# | a [-Service (SaaS)-] {+substitute for running your copy of a program. 
+# | Concretely, it+} means that someone sets up a network server that does
+# | certain computing [-tasks&mdash;running spreadsheets, word processing,-]
+# | {+tasks&mdash;for instance, modifying a photo,+} translating text into
+# | another language, etc.&mdash;then invites users to do [-their-] computing
+# | [-on-] {+via+} that server.  [-Users-]  {+A user of the server would+}
+# | send [-their-] {+her+} data to the server, which does [-their computing-]
+# | {+<em>her own computing</em>+} on the data thus provided, then sends the
+# | results back {+to her+} or acts {+directly+} on [-them directly.-] {+her
+# | behalf.+}
+#, fuzzy
+#| msgid ""
+#| "Software as a Service (SaaS) means that someone sets up a network server "
+#| "that does certain computing tasks&mdash;running spreadsheets, word "
+#| "processing, translating text into another language, etc.&mdash;then "
+#| "invites users to do their computing on that server.  Users send their "
+#| "data to the server, which does their computing on the data thus provided, "
+#| "then sends the results back or acts on them directly."
+msgid ""
+"Service as a Software Substitute (SaaSS) means using a service as a "
+"substitute for running your copy of a program.  Concretely, it means that "
+"someone sets up a network server that does certain computing tasks&mdash;for "
+"instance, modifying a photo, translating text into another language, etc."
+"&mdash;then invites users to do computing via that server.  A user of the "
+"server would send her data to the server, which does <em>her own computing</"
+"em> on the data thus provided, then sends the results back to her or acts "
+"directly on her behalf."
 msgstr ""
 "«Software como servicio» (<abbr title=\"Software As A 
Service\">SaaS</abbr>) "
 "significa que alguien establece un servidor en la red que hace ciertas "
@@ -144,14 +215,34 @@
 "información proporcionada y luego restituye los resultados o actúa "
 "directamente sobre los mismos."
 
+#. type: Content of: <p>
+msgid ""
+"The computing is <em>her own</em> because, by assumption, she could, in "
+"principle, have done it by running a program on her own computer (whether or "
+"not that program is available to her at present).  When this assumption is "
+"not so, it isn't SaaSS."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
+# | These servers wrest control from the users even more inexorably than
+# | proprietary software.  With proprietary software, users typically get an
+# | executable file but not the source code.  That makes it hard [-for
+# | programmers-] to study the code that is running, so it's hard to determine
+# | what the program really does, and hard to change it.
+#, fuzzy
+#| msgid ""
+#| "These servers wrest control from the users even more inexorably than "
+#| "proprietary software.  With proprietary software, users typically get an "
+#| "executable file but not the source code.  That makes it hard for "
+#| "programmers to study the code that is running, so it's hard to determine "
+#| "what the program really does, and hard to change it."
 msgid ""
 "These servers wrest control from the users even more inexorably than "
 "proprietary software.  With proprietary software, users typically get an "
-"executable file but not the source code.  That makes it hard for programmers "
-"to study the code that is running, so it's hard to determine what the "
-"program really does, and hard to change it."
+"executable file but not the source code.  That makes it hard to study the "
+"code that is running, so it's hard to determine what the program really "
+"does, and hard to change it."
 msgstr ""
 "Estos servidores arrebatan el control de los usuarios de forma todavía más "
 "inexorable que el software privativo. Con el software privativo los usuarios "
@@ -162,25 +253,57 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"With SaaS, the users do not have even the executable file: it is on the "
-"server, where the users can't see or touch it.  Thus it is impossible for "
-"them to ascertain what it really does, and impossible to change it."
+# | With SaaS{+S+}, the users do not have even the executable [-file:-] {+file
+# | that does their computing:+} it is on [-the-] {+someone else's+} server,
+# | where the users can't see or touch it.  Thus it is impossible for them to
+# | ascertain what it really does, and impossible to change it.
+#, fuzzy
+#| msgid ""
+#| "With SaaS, the users do not have even the executable file: it is on the "
+#| "server, where the users can't see or touch it.  Thus it is impossible for "
+#| "them to ascertain what it really does, and impossible to change it."
+msgid ""
+"With SaaSS, the users do not have even the executable file that does their "
+"computing: it is on someone else's server, where the users can't see or "
+"touch it.  Thus it is impossible for them to ascertain what it really does, "
+"and impossible to change it."
 msgstr ""
 "Con el <i>software como servicio</i>, los usuarios ni siquiera obtienen el "
 "archivo ejecutable: este archivo está en el servidor, donde no pueden verlo "
 "ni tocarlo. De manera que es imposible verificar qué es lo que realmente "
 "hace e imposible modificarlo."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Furthermore, SaaS automatically leads to harmful consequences equivalent to "
-"the malicious features of certain proprietary software.  For instance, some "
-"proprietary programs are &ldquo;spyware&rdquo;: the program sends out data "
-"about users' computing activities.  Microsoft Windows sends information "
-"about users' activities to Microsoft.  Windows Media Player and RealPlayer "
-"report what each user watches or listens to."
+"Furthermore, SaaSS automatically leads to consequences equivalent to the "
+"malicious features of certain proprietary software."
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+# | [-Furthermore, SaaS automatically leads to harmful consequences equivalent
+# | to the malicious features of certain proprietary software.-]For instance,
+# | some proprietary programs are &ldquo;spyware&rdquo;: the program sends out
+# | data about users' computing activities.  Microsoft Windows sends
+# | information about users' activities to Microsoft.  Windows Media Player
+# | [-and RealPlayer report-] {+reports+} what each user watches or listens
+# | to.  {+The Amazon Kindle reports which pages of which books the user looks
+# | at, and when.  Angry Birds reports the user's geolocation history.+}
+#, fuzzy
+#| msgid ""
+#| "Furthermore, SaaS automatically leads to harmful consequences equivalent "
+#| "to the malicious features of certain proprietary software.  For instance, "
+#| "some proprietary programs are &ldquo;spyware&rdquo;: the program sends "
+#| "out data about users' computing activities.  Microsoft Windows sends "
+#| "information about users' activities to Microsoft.  Windows Media Player "
+#| "and RealPlayer report what each user watches or listens to."
+msgid ""
+"For instance, some proprietary programs are &ldquo;spyware&rdquo;: the "
+"program sends out data about users' computing activities.  Microsoft Windows "
+"sends information about users' activities to Microsoft.  Windows Media "
+"Player reports what each user watches or listens to.  The Amazon Kindle "
+"reports which pages of which books the user looks at, and when.  Angry Birds "
+"reports the user's geolocation history."
 msgstr ""
 "Además, el software como servicio nos lleva a consecuencias dañinas "
 "equivalentes a las funcionalidades maliciosas de cierto software privativo. "
@@ -192,11 +315,23 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"Unlike proprietary software, SaaS does not require covert code to obtain the "
-"user's data.  Instead, users must send their data to the server in order to "
-"use it.  This has the same effect as spyware: the server operator gets the "
-"data.  He gets it with no special effort, by the nature of SaaS."
+# | Unlike proprietary software, SaaS{+S+} does not require covert code to
+# | obtain the user's data.  Instead, users must send their data to the server
+# | in order to use it.  This has the same effect as spyware: the server
+# | operator gets the [-data.  He gets it with-] {+data&mdash;with+} no
+# | special effort, by the nature of SaaS{+S+}.
+#, fuzzy
+#| msgid ""
+#| "Unlike proprietary software, SaaS does not require covert code to obtain "
+#| "the user's data.  Instead, users must send their data to the server in "
+#| "order to use it.  This has the same effect as spyware: the server "
+#| "operator gets the data.  He gets it with no special effort, by the nature "
+#| "of SaaS."
+msgid ""
+"Unlike proprietary software, SaaSS does not require covert code to obtain "
+"the user's data.  Instead, users must send their data to the server in order "
+"to use it.  This has the same effect as spyware: the server operator gets "
+"the data&mdash;with no special effort, by the nature of SaaSS."
 msgstr ""
 "A diferencia del software privativo, el software como servicio no requiere "
 "código oculto para obtener la información de los usuarios. En su lugar, los 
"
@@ -205,64 +340,98 @@
 "servidor obtiene la información. La obtiene sin ningún tipo de esfuerzo en "
 "virtud de la naturaleza misma del software como servicio."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Some proprietary programs can mistreat users under remote command.  For "
-"instance, Windows has a back door with which Microsoft can forcibly change "
-"any software on the machine.  The Amazon Kindle e-book reader (whose name "
-"suggests it's intended to burn people's books) has an Orwellian back door "
-"that Amazon used in 2009 to <a href=\"http://www.nytimes.com/2009/07/18/";
-"technology/companies/18amazon.html\" >remotely delete</a> Kindle copies of "
-"Orwell's books <cite>1984</cite> and <cite>Animal Farm</cite> which the "
-"users had purchased from Amazon."
+"Some proprietary operating systems have a universal back door, permitting "
+"someone to remotely install software changes.  For instance, Windows has a "
+"universal back door with which Microsoft can forcibly change any software on "
+"the machine.  Nearly all portable phones have them, too.  Some proprietary "
+"applications also have universal back doors; for instance, the Steam client "
+"for GNU/Linux allows the developer to remotely install modified versions."
 msgstr ""
-"Algunos programas privativos pueden atacar al usuario mediante el mando a "
-"distancia. Por ejemplo, Windows tiene una puerta trasera con la que "
-"Microsoft puede forzar el cambio de cualquier programa en una computadora. "
-"El lector de libros electrónicos Amazon Kindle (cuyo nombre en inglés "
-"sugiere que está hecho para «quemar» los libros de la gente) tiene una "
-"puerta trasera Orwelliana que Amazon usó en el 2009 para <a href=\"http://";
-"www.nytimes.com/2009/07/18/technology/companies/18amazon.html\" >borrar de "
-"forma remota</a> copias de los libros de Orwell <cite>1984</cite> y "
-"<cite>Rebelión en la Granja</cite>, que los usuarios habían comprado a "
-"Amazon y tenían en su Kindle."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"SaaS inherently gives the server operator the power to change the software "
-"in use, or the users' data being operated on.  Once again, no special code "
-"is needed to do this."
+"With SaaSS, the server operator can change the software in use on the "
+"server.  He ought to be able to do this, since it's his computer; but the "
+"result is the same as using a proprietary application program with a "
+"universal back door: someone has the power to silently impose changes in how "
+"the user's computing gets done."
 msgstr ""
-"El software como servicio inherentemente da al administrador del servidor el "
-"poder de cambiar el software en uso, o la información de los usuarios "
-"procesada. Repetimos, no hay necesidad de código especial para hacer esto."
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | Thus, SaaS{+S+} is equivalent to [-total-] {+running proprietary software
+# | with+} spyware and a [-gaping wide-] {+universal+} back [-door, and-]
+# | {+door.  It+} gives the server operator unjust power over the [-user.  We
+# | can't accept that.-] {+user, and that power is something we must resist.+}
+#, fuzzy
+#| msgid ""
+#| "Thus, SaaS is equivalent to total spyware and a gaping wide back door, "
+#| "and gives the server operator unjust power over the user.  We can't "
+#| "accept that."
 msgid ""
-"Thus, SaaS is equivalent to total spyware and a gaping wide back door, and "
-"gives the server operator unjust power over the user.  We can't accept that."
+"Thus, SaaSS is equivalent to running proprietary software with spyware and a "
+"universal back door.  It gives the server operator unjust power over the "
+"user, and that power is something we must resist."
 msgstr ""
 "De esta manera, el software como servicio equivale a un software espía "
 "completo y a una puerta trasera amplia, y da al operador del servidor un "
 "poder injusto sobre los usuarios. No podemos aceptarlo."
 
+#. type: Content of: <h3>
+msgid "SaaSS and SaaS"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Originally we referred to this problematical practice as &ldquo; SaaS "
+"&rdquo;, which stands for &ldquo; Software as a Service &rdquo;.  It's a "
+"commonly used term for setting up software on a server rather than offering "
+"copies of it to users, and we thought it described precisely the cases where "
+"this problem occurs."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Subsequently we became aware that the term SaaS is sometimes used for "
+"communication services&mdash;activities for which this issue is not "
+"applicable.  In addition, the term &ldquo; Software as a Service &rdquo; "
+"doesn't explain <em>why</em> the practice is bad.  So we coined the term "
+"&ldquo; Service as a Software Substitute &rdquo;, which defines the bad "
+"practice more clearly and says what is bad about it."
+msgstr ""
+
 # type: Content of: <h3>
 #. type: Content of: <h3>
-msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
+# | Untangling the SaaS{+S+} Issue from the Proprietary Software Issue
+#, fuzzy
+#| msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
+msgid "Untangling the SaaSS Issue from the Proprietary Software Issue"
 msgstr ""
 "Separando el problema del <i>software como servicio</i> del problema del "
 "<i>software privativo</i>"
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"SaaS and proprietary software lead to similar harmful results, but the "
-"causal mechanisms are different.  With proprietary software, the cause is "
-"that you have and use a copy which is difficult or illegal to change.  With "
-"SaaS, the cause is that you use a copy you don't have."
+# | SaaS{+S+} and proprietary software lead to similar harmful results, but
+# | the [-causal-] mechanisms are different.  With proprietary software, the
+# | [-cause-] {+mechanism+} is that you have and use a copy which is difficult
+# | [-or-] {+and/or+} illegal to change.  With SaaS{+S+}, the [-cause-]
+# | {+mechanism+} is that you [-use a copy you-] don't [-have.-] {+have the
+# | copy that's doing your computing.+}
+#, fuzzy
+#| msgid ""
+#| "SaaS and proprietary software lead to similar harmful results, but the "
+#| "causal mechanisms are different.  With proprietary software, the cause is "
+#| "that you have and use a copy which is difficult or illegal to change.  "
+#| "With SaaS, the cause is that you use a copy you don't have."
+msgid ""
+"SaaSS and proprietary software lead to similar harmful results, but the "
+"mechanisms are different.  With proprietary software, the mechanism is that "
+"you have and use a copy which is difficult and/or illegal to change.  With "
+"SaaSS, the mechanism is that you don't have the copy that's doing your "
+"computing."
 msgstr ""
 "El software como servicio y el software privativo llevan a resultados "
 "dañinos similares, pero los mecanismos causantes son diferentes. Con el "
@@ -272,15 +441,34 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | These two issues are often confused, and not only by accident.  Web
+# | developers use the vague term &ldquo;web application&rdquo; to lump the
+# | server software together with programs run on your machine in your
+# | browser.  Some web pages install [-nontrivial or-] {+nontrivial,+} even
+# | large JavaScript programs [-temporarily-] into your browser without
+# | informing you.  <a href=\"/philosophy/javascript-trap.html\">When these
+# | JavaScript programs are nonfree</a>, they are [-as bad-] {+the same sort
+# | of problem+} as any other nonfree software.  Here, however, we are
+# | concerned with the problem of the server software itself.
+#, fuzzy
+#| msgid ""
+#| "These two issues are often confused, and not only by accident.  Web "
+#| "developers use the vague term &ldquo;web application&rdquo; to lump the "
+#| "server software together with programs run on your machine in your "
+#| "browser.  Some web pages install nontrivial or even large JavaScript "
+#| "programs temporarily into your browser without informing you.  <a href=\"/"
+#| "philosophy/javascript-trap.html\">When these JavaScript programs are "
+#| "nonfree</a>, they are as bad as any other nonfree software.  Here, "
+#| "however, we are concerned with the problem of the server software itself."
 msgid ""
 "These two issues are often confused, and not only by accident.  Web "
 "developers use the vague term &ldquo;web application&rdquo; to lump the "
 "server software together with programs run on your machine in your browser.  "
-"Some web pages install nontrivial or even large JavaScript programs "
-"temporarily into your browser without informing you.  <a href=\"/philosophy/"
-"javascript-trap.html\">When these JavaScript programs are nonfree</a>, they "
-"are as bad as any other nonfree software.  Here, however, we are concerned "
-"with the problem of the server software itself."
+"Some web pages install nontrivial, even large JavaScript programs into your "
+"browser without informing you.  <a href=\"/philosophy/javascript-trap.html"
+"\">When these JavaScript programs are nonfree</a>, they are the same sort of "
+"problem as any other nonfree software.  Here, however, we are concerned with "
+"the problem of the server software itself."
 msgstr ""
 "Estas dos situaciones se confunden habitualmente, y no sólo por accidente. "
 "Los desarrolladores web usan el término impreciso «aplicación web» para "
@@ -294,14 +482,34 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"Many free software supporters assume that the problem of SaaS will be solved "
-"by developing free software for servers.  For the server operator's sake, "
-"the programs on the server had better be free; if they are proprietary, "
-"their owners have power over the server.  That's unfair to the operator, and "
-"doesn't help you at all.  But if the programs on the server are free, that "
-"doesn't protect you <em>as the server's user</em> from the effects of SaaS.  "
-"They give freedom to the operator, but not to you."
+# | Many free software supporters assume that the problem of SaaS{+S+} will be
+# | solved by developing free software for servers.  For the server operator's
+# | sake, the programs on the server had better be free; if they are
+# | proprietary, their owners have power over the server.  That's unfair to
+# | the operator, and doesn't help [-you-] {+the users+} at all.  But if the
+# | programs on the server are free, that doesn't protect [-you <em>as the-]
+# | {+<em>the+} server's user{+s+}</em> from the effects of [-SaaS.  They give
+# | freedom to-] {+SaaSS.  These programs liberate+} the {+server+} operator,
+# | but not [-to you.-] {+the server's users.+}
+#, fuzzy
+#| msgid ""
+#| "Many free software supporters assume that the problem of SaaS will be "
+#| "solved by developing free software for servers.  For the server "
+#| "operator's sake, the programs on the server had better be free; if they "
+#| "are proprietary, their owners have power over the server.  That's unfair "
+#| "to the operator, and doesn't help you at all.  But if the programs on the "
+#| "server are free, that doesn't protect you <em>as the server's user</em> "
+#| "from the effects of SaaS.  They give freedom to the operator, but not to "
+#| "you."
+msgid ""
+"Many free software supporters assume that the problem of SaaSS will be "
+"solved by developing free software for servers.  For the server operator's "
+"sake, the programs on the server had better be free; if they are "
+"proprietary, their owners have power over the server.  That's unfair to the "
+"operator, and doesn't help the users at all.  But if the programs on the "
+"server are free, that doesn't protect <em>the server's users</em> from the "
+"effects of SaaSS.  These programs liberate the server operator, but not the "
+"server's users."
 msgstr ""
 "Muchos partidarios del software libre suponen que el problema del software "
 "como servicio se solucionará al desarrollar software libre para los "
@@ -313,16 +521,44 @@
 "efectos del software como servicio. Le brindan libertad al operador, pero no "
 "a usted."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Releasing the server software source code does benefit the community: "
-"suitably skilled users can set up similar servers, perhaps changing the "
-"software.  But none of these servers would give you control over computing "
-"you do on it, unless it's <em>your</em> server.  The rest would all be "
-"SaaS.  SaaS always subjects you to the power of the server operator, and the "
-"only remedy is, <em>Don't use SaaS!</em> Don't use someone else's server to "
-"do your own computing on data provided by you."
+"Releasing the server software source code does benefit the community: it "
+"enables suitably skilled users to set up similar servers, perhaps changing "
+"the software.  <a href=\"/licenses/license-recommendations.html\"> We "
+"recommend using the GNU Affero GPL</a> as the license for programs often "
+"used on servers."
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+# | [-Releasing the server software source code does benefit the community:
+# | suitably skilled users can set up similar servers, perhaps changing the
+# | software.-]But none of these servers would give you control over computing
+# | you do on it, unless it's <em>your</em> server.  [-The rest would-]  {+It
+# | may be OK to trust your friend's server for some jobs, just as you might
+# | let your friend maintain the software on your own computer.  Outside of
+# | that,+} all {+these servers would+} be [-SaaS.  SaaS-] {+SaaSS for you. 
+# | SaaSS+} always subjects you to the power of the server operator, and the
+# | only remedy is, <em>Don't use SaaS{+S+}!</em> Don't use someone else's
+# | server to do your own computing on data provided by you.
+#, fuzzy
+#| msgid ""
+#| "Releasing the server software source code does benefit the community: "
+#| "suitably skilled users can set up similar servers, perhaps changing the "
+#| "software.  But none of these servers would give you control over "
+#| "computing you do on it, unless it's <em>your</em> server.  The rest would "
+#| "all be SaaS.  SaaS always subjects you to the power of the server "
+#| "operator, and the only remedy is, <em>Don't use SaaS!</em> Don't use "
+#| "someone else's server to do your own computing on data provided by you."
+msgid ""
+"But none of these servers would give you control over computing you do on "
+"it, unless it's <em>your</em> server.  It may be OK to trust your friend's "
+"server for some jobs, just as you might let your friend maintain the "
+"software on your own computer.  Outside of that, all these servers would be "
+"SaaSS for you.  SaaSS always subjects you to the power of the server "
+"operator, and the only remedy is, <em>Don't use SaaSS!</em> Don't use "
+"someone else's server to do your own computing on data provided by you."
 msgstr ""
 "Publicar el código fuente del software de un servidor beneficia a la "
 "comunidad: usuarios con las habilidades necesarias pueden establecer "
@@ -336,16 +572,50 @@
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
-msgid "Distinguishing SaaS from Other Network Services"
+# | Distinguishing SaaS{+S+} from Other Network Services
+#, fuzzy
+#| msgid "Distinguishing SaaS from Other Network Services"
+msgid "Distinguishing SaaSS from Other Network Services"
 msgstr ""
 "Distinguir el <i>software como servicio</i> de otros servicios en la red"
 
+#. type: Content of: <p>
+msgid ""
+"Which online services are SaaSS? The clearest example is a translation "
+"service, which translates (say) English text into Spanish text.  Translating "
+"a text for you is computing that is purely yours.  You could do it by "
+"running a program on your own computer, if only you had the right program.  "
+"(To be ethical, that program should be free.)  The translation service "
+"substitutes for that program, so it is Service as a Software Substitute, or "
+"SaaSS.  Since it denies you control over your computing, it does you wrong."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Another clear example is using a service such as Flickr or Instagram to "
+"modify a photo.  Modifying photos is an activity that people have done in "
+"their own computers for decades; doing it in a server instead of your own "
+"computer is SaaSS."
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
+# | [-Does avoiding SaaS-]{+Rejecting SaaSS does not+} mean [-you refuse-]
+# | {+refusing+} to use any network servers run by anyone other than [-you?
+# | Not at all.-] {+you.+}  Most servers [-do-] {+are+} not [-raise this
+# | issue,-] {+SaaSS+} because the [-job you-] {+jobs they+} do [-with them
+# | isn't your-] {+are not the user's+} own [-computing except in a trivial
+# | sense.-] {+computing.+}
+#, fuzzy
+#| msgid ""
+#| "Does avoiding SaaS mean you refuse to use any network servers run by "
+#| "anyone other than you? Not at all.  Most servers do not raise this issue, "
+#| "because the job you do with them isn't your own computing except in a "
+#| "trivial sense."
 msgid ""
-"Does avoiding SaaS mean you refuse to use any network servers run by anyone "
-"other than you? Not at all.  Most servers do not raise this issue, because "
-"the job you do with them isn't your own computing except in a trivial sense."
+"Rejecting SaaSS does not mean refusing to use any network servers run by "
+"anyone other than you.  Most servers are not SaaSS because the jobs they do "
+"are not the user's own computing."
 msgstr ""
 "¿El evitar el software como servicio significa rechazar todos los servidores 
"
 "que no controle usted mismo?. Para nada. La mayoría de los servidores no "
@@ -354,17 +624,40 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"The original purpose of web servers wasn't to do computing for you, it was "
-"to publish information for you to access.  Even today this is what most web "
-"sites do, and it doesn't pose the SaaS problem, because accessing someone's "
-"published information isn't a matter of doing your own computing.  Neither "
-"is publishing your own materials via a blog site or a microblogging service "
-"such as Twitter or identi.ca.  The same goes for communication not meant to "
-"be private, such as chat groups.  Social networking can extend into SaaS; "
-"however, at root it is just a method of communication and publication, not "
-"SaaS.  If you use the service for minor editing of what you're going to "
-"communicate, that is not a significant issue."
+# | The original [-purpose-] {+idea+} of web servers wasn't to do computing
+# | for you, it was to publish information for you to access.  Even today this
+# | is what most web sites do, and it doesn't pose the SaaS{+S+} problem,
+# | because accessing someone's published information isn't [-a matter of-]
+# | doing your own computing.  Neither is publishing your own materials via a
+# | blog site or a microblogging service such as Twitter or [-identi.ca.-]
+# | {+StatusNet.  (These services may have other problems, of course.)+}  The
+# | same goes for {+other+} communication not meant to be private, such as
+# | chat groups.  [-Social networking can extend into SaaS; however, at root
+# | it is just a method of communication and publication, not SaaS.  If you
+# | use the service for minor editing of what you're going to communicate,
+# | that is not a significant issue.-]
+#, fuzzy
+#| msgid ""
+#| "The original purpose of web servers wasn't to do computing for you, it "
+#| "was to publish information for you to access.  Even today this is what "
+#| "most web sites do, and it doesn't pose the SaaS problem, because "
+#| "accessing someone's published information isn't a matter of doing your "
+#| "own computing.  Neither is publishing your own materials via a blog site "
+#| "or a microblogging service such as Twitter or identi.ca.  The same goes "
+#| "for communication not meant to be private, such as chat groups.  Social "
+#| "networking can extend into SaaS; however, at root it is just a method of "
+#| "communication and publication, not SaaS.  If you use the service for "
+#| "minor editing of what you're going to communicate, that is not a "
+#| "significant issue."
+msgid ""
+"The original idea of web servers wasn't to do computing for you, it was to "
+"publish information for you to access.  Even today this is what most web "
+"sites do, and it doesn't pose the SaaSS problem, because accessing someone's "
+"published information isn't doing your own computing.  Neither is publishing "
+"your own materials via a blog site or a microblogging service such as "
+"Twitter or StatusNet.  (These services may have other problems, of course.)  "
+"The same goes for other communication not meant to be private, such as chat "
+"groups."
 msgstr ""
 "El propósito original de los servidores web no era realizar tareas de "
 "cómputo sino publicar información para que se tuviese acceso a ella. 
Incluso "
@@ -380,15 +673,69 @@
 "para ediciones menores de lo que va a comunicar, no es un asunto "
 "significativo."
 
+#. type: Content of: <p>
+msgid ""
+"In its essence, social networking is a form of communication and "
+"publication, not SaaSS.  However, a service whose main facility is social "
+"networking can have features or extensions which are SaaSS."
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+# | If a service is not SaaS{+S+}, that does not mean it is OK.  There are
+# | other [-bad things a service can do.-] {+ethical issues about services.+} 
+# | For instance, Facebook distributes video in Flash, which pressures users
+# | to run nonfree [-software,-] {+software; it requires running nonfree
+# | JavaScript code;+} and it gives users a misleading impression of
+# | [-privacy.-] {+privacy while luring them into baring their lives to
+# | Facebook.+}  Those are important [-issues too, but this article's concern
+# | is-] {+issues, different from+} the [-issue of SaaS.-] {+SaaSS issue.+}
+#, fuzzy
+#| msgid ""
+#| "If a service is not SaaS, that does not mean it is OK.  There are other "
+#| "bad things a service can do.  For instance, Facebook distributes video in "
+#| "Flash, which pressures users to run nonfree software, and it gives users "
+#| "a misleading impression of privacy.  Those are important issues too, but "
+#| "this article's concern is the issue of SaaS."
+msgid ""
+"If a service is not SaaSS, that does not mean it is OK.  There are other "
+"ethical issues about services.  For instance, Facebook distributes video in "
+"Flash, which pressures users to run nonfree software; it requires running "
+"nonfree JavaScript code; and it gives users a misleading impression of "
+"privacy while luring them into baring their lives to Facebook.  Those are "
+"important issues, different from the SaaSS issue."
+msgstr ""
+"Que un servicio no sea software como servicio no implica que esté bien. "
+"Existen otras cosas negativas que un servicio puede hacer. Por ejemplo, "
+"Facebook distribuye vídeo en Flash, lo cual presiona a los usuarios a "
+"ejecutar software que no es libre, y da a los usuarios una falsa impresión "
+"de privacidad. Esos también son temas importantes, pero este articulo trata "
+"del software como servicio."
+
 # type: Content of: <p>
 #. type: Content of: <p>
+# | Services such as search engines collect data from around the web and let
+# | you examine it.  Looking through their collection of data isn't your own
+# | computing in the usual sense&mdash;you didn't provide that
+# | collection&mdash;so using such a service to search the web is not [-SaaS. 
+# | (However,-] {+SaaSS.  However,+} using someone else's [-search engine-]
+# | {+server+} to implement a search facility for your own site <em>is</em>
+# | [-SaaS.)-] {+SaaSS.+}
+#, fuzzy
+#| msgid ""
+#| "Services such as search engines collect data from around the web and let "
+#| "you examine it.  Looking through their collection of data isn't your own "
+#| "computing in the usual sense&mdash;you didn't provide that "
+#| "collection&mdash;so using such a service to search the web is not SaaS.  "
+#| "(However, using someone else's search engine to implement a search "
+#| "facility for your own site <em>is</em> SaaS.)"
 msgid ""
 "Services such as search engines collect data from around the web and let you "
 "examine it.  Looking through their collection of data isn't your own "
 "computing in the usual sense&mdash;you didn't provide that collection&mdash;"
-"so using such a service to search the web is not SaaS.  (However, using "
-"someone else's search engine to implement a search facility for your own "
-"site <em>is</em> SaaS.)"
+"so using such a service to search the web is not SaaSS.  However, using "
+"someone else's server to implement a search facility for your own site "
+"<em>is</em> SaaSS."
 msgstr ""
 "Los servicios como los motores de búsqueda recolectan información de la red 
"
 "y le permiten a usted examinarla. Buscar dentro de la colección de datos de "
@@ -400,12 +747,25 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"E-commerce is not SaaS, because the computing isn't solely yours; rather, it "
-"is done jointly for you and another party.  So there's no particular reason "
-"why you alone should expect to control that computing.  The real issue in e-"
-"commerce is whether you trust the other party with your money and personal "
-"information."
+# | [-E-commerce-]{+Purchasing online+} is not SaaS{+S+}, because the
+# | computing isn't [-solely yours;-] {+<em>your own</em>;+} rather, it is
+# | done jointly {+by and+} for you and [-another party.  So there's no
+# | particular reason why you alone should expect to control that computing.-]
+# | {+the store.+}  The real issue in [-e-commerce-] {+online shopping+} is
+# | whether you trust the other party with your money and {+other+} personal
+# | [-information.-] {+information (starting with your name).+}
+#, fuzzy
+#| msgid ""
+#| "E-commerce is not SaaS, because the computing isn't solely yours; rather, "
+#| "it is done jointly for you and another party.  So there's no particular "
+#| "reason why you alone should expect to control that computing.  The real "
+#| "issue in e-commerce is whether you trust the other party with your money "
+#| "and personal information."
+msgid ""
+"Purchasing online is not SaaSS, because the computing isn't <em>your own</"
+"em>; rather, it is done jointly by and for you and the store.  The real "
+"issue in online shopping is whether you trust the other party with your "
+"money and other personal information (starting with your name)."
 msgstr ""
 "El comercio electrónico no es software como servicio porque el cómputo no 
es "
 "únicamente suyo sino que se hace conjuntamente entre usted y la otra parte, "
@@ -414,13 +774,33 @@
 "electrónico es si le confía usted a la otra parte su dinero y su 
información "
 "personal."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Using a joint project's servers isn't SaaS because the computing you do in "
-"this way isn't yours personally.  For instance, if you edit pages on "
-"Wikipedia, you are not doing your own computing; rather, you are "
-"collaborating in Wikipedia's computing."
+"Repository sites such as as Savannah and SourceForge are not inherently "
+"SaaSS, because a repository's job is publication of data supplied to it."
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+# | Using a joint project's servers isn't SaaS{+S+} because the computing you
+# | do in this way isn't [-yours personally.-] {+your own.+}  For instance, if
+# | you edit pages on Wikipedia, you are not doing your own computing; rather,
+# | you are collaborating in Wikipedia's computing.  {+Wikipedia controls its
+# | own servers, but organizations as well as individuals encounter the
+# | problem of SaaSS if they do their computing in someone else's server.+}
+#, fuzzy
+#| msgid ""
+#| "Using a joint project's servers isn't SaaS because the computing you do "
+#| "in this way isn't yours personally.  For instance, if you edit pages on "
+#| "Wikipedia, you are not doing your own computing; rather, you are "
+#| "collaborating in Wikipedia's computing."
+msgid ""
+"Using a joint project's servers isn't SaaSS because the computing you do in "
+"this way isn't your own.  For instance, if you edit pages on Wikipedia, you "
+"are not doing your own computing; rather, you are collaborating in "
+"Wikipedia's computing.  Wikipedia controls its own servers, but "
+"organizations as well as individuals encounter the problem of SaaSS if they "
+"do their computing in someone else's server."
 msgstr ""
 "Usar los servidores de un proyecto colectivo no es software como servicio, "
 "porque las tareas de cómputo que realiza de esa manera no son suyas "
@@ -430,88 +810,30 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"Wikipedia controls its own servers, but groups can face the problem of SaaS "
-"if they do their group activities on someone else's server.  Fortunately, "
-"development hosting sites such as Savannah and SourceForge don't pose the "
-"SaaS problem, because what groups do there is mainly publication and public "
-"communication, rather than their own private computing."
-msgstr ""
-"Wikipedia controla sus propios servidores, pero los grupos pueden "
-"encontrarse con el problema del software como servicio si realizan sus "
-"actividades en servidores que no les pertenecen. Afortunadamente, sitios de "
-"hospedaje para el desarrollo de software como Savannah y SourceForge no "
-"presentan el problema del software como servicio porque lo que los grupos "
-"hacen ahí es principalmente publicación y comunicación, no sus propias "
-"tareas de cómputo privadas."
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Multiplayer games are a group activity carried out on someone else's server, "
-"which makes them SaaS.  But where the data involved is just the state of "
-"play and the score, the worst wrong the operator might commit is "
-"favoritism.  You might well ignore that risk, since it seems unlikely and "
-"very little is at stake.  On the other hand, when the game becomes more than "
-"just a game, the issue changes."
-msgstr ""
-"Los juegos en los que participan varios jugadores son una actividad grupal "
-"llevada a cabo en el servidor de otros, lo que los hace software como "
-"servicio. Pero los datos involucrados tratan del estado del juego o la "
-"puntuación, el peor mal que el operador podría cometer es tener 
favoritismo. "
-"Usted podría incluso ignorar ese riesgo, ya que parece poco probable y se "
-"arriesga muy poco. Por otra parte, cuando un juego se convierte en algo más "
-"que un simple juego el asunto cambia."
-
-#. type: Content of: <p>
-msgid ""
-"&ldquo;Backend as a Service&rdquo;, or BaaS, is a kind of SaaS, because it "
-"involves running your own web service on top of software that you can't "
-"control.  If you set up a service using BaaS, the BaaS platform may well "
-"collect information about your users as well as you."
-msgstr ""
-"«Backend como servicio», o <abbr title=\"Backend as a 
Service\">BaaS</abbr>, "
-"es un tipo de software como servicio (<abbr title=\"Software as a Service"
-"\">SaaS</abbr>) porque involucra operar su propio servicio web sobre "
-"software que usted no puede controlar. Si usted configura un servicio usando "
-"BaaS, la plataforma BaaS &mdash;sobre la cual se ejecutan las "
-"aplicaciones&mdash; puede recopilar información suya, así como de los "
-"usuarios."
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Which online services are SaaS? Google Docs is a clear example.  Its basic "
-"activity is editing, and Google encourages people to use it for their own "
-"editing; this is SaaS.  It offers the added feature of collaborative "
-"editing, but adding participants doesn't alter the fact that editing on the "
-"server is SaaS.  (In addition, Google Docs is unacceptable because it "
-"installs a large <a href=\"/philosophy/javascript-trap.html\"> nonfree "
-"JavaScript program</a> into the user's browser.)  If using a service for "
-"communication or collaboration requires doing substantial parts of your own "
-"computing with it too, that computing is SaaS even if the communication is "
-"not."
-msgstr ""
-"¿Cuáles servicios en línea son software como servicio? Google Docs es un "
-"ejemplo claro. Su actividad básica es la edición, y Google alienta a la "
-"gente a usarlo para hacer sus propias tareas de edición; esto es software "
-"como servicio. Ofrece la característica de la edición colaborativa, pero "
-"agregar participantes no altera el hecho de que la edición en el servidor es 
"
-"software como servicio (además Google Docs es inaceptable porque instala un "
-"grande <a href=\"/philosophy/javascript-trap.html\">programa JavaScript que "
-"no es libre</a> en el navegador del usuario). Si para usar un servicio de "
-"comunicación o colaboración también tiene usted que realizar en él partes 
"
-"sustanciales de sus propias tareas de cómputo, eso es software como servicio 
"
-"incluso si la comunicación no lo es."
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Some sites offer multiple services, and if one is not SaaS, another may be "
-"SaaS.  For instance, the main service of Facebook is social networking, and "
-"that is not SaaS; however, it supports third-party applications, some of "
-"which may be SaaS.  Flickr's main service is distributing photos, which is "
-"not SaaS, but it also has features for editing photos, which is SaaS."
+# | Some sites offer multiple services, and if one is not SaaS{+S+}, another
+# | may be SaaS{+S+}.  For instance, the main service of Facebook is social
+# | networking, and that is not SaaS{+S+}; however, it supports third-party
+# | applications, some of which [-may be SaaS.-] {+are SaaSS.+}  Flickr's main
+# | service is distributing photos, which is not SaaS{+S+}, but it also has
+# | features for editing photos, which is [-SaaS.-] {+SaaSS.  Likewise, using
+# | Instagram to post a photo is not SaaSS, but using it to transform the
+# | photo is SaaSS.+}
+#, fuzzy
+#| msgid ""
+#| "Some sites offer multiple services, and if one is not SaaS, another may "
+#| "be SaaS.  For instance, the main service of Facebook is social "
+#| "networking, and that is not SaaS; however, it supports third-party "
+#| "applications, some of which may be SaaS.  Flickr's main service is "
+#| "distributing photos, which is not SaaS, but it also has features for "
+#| "editing photos, which is SaaS."
+msgid ""
+"Some sites offer multiple services, and if one is not SaaSS, another may be "
+"SaaSS.  For instance, the main service of Facebook is social networking, and "
+"that is not SaaSS; however, it supports third-party applications, some of "
+"which are SaaSS.  Flickr's main service is distributing photos, which is not "
+"SaaSS, but it also has features for editing photos, which is SaaSS.  "
+"Likewise, using Instagram to post a photo is not SaaSS, but using it to "
+"transform the photo is SaaSS."
 msgstr ""
 "Algunos sitios ofrecen servicios múltiples, y si uno de ellos no es software 
"
 "como servicio otro puede que lo sea. Por ejemplo, el principal servicio de "
@@ -522,44 +844,70 @@
 "también tiene funciones para editar fotos, lo cual sí es software como "
 "servicio."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Some sites whose main service is publication and communication extend it "
-"with &ldquo;contact management&rdquo;: keeping track of people you have "
-"relationships with.  Sending mail to those people for you is not SaaS, but "
-"keeping track of your dealings with them, if substantial, is SaaS."
+"Google Docs shows how complex the evaluation of a single service can "
+"become.  It invites people to edit a document by running a large <a href=\"/"
+"philosophy/javascript-trap.html\">nonfree JavaScript program</a>, clearly "
+"wrong.  However, it offers an API for uploading and downloading documents in "
+"standard formats.  A free software editor can do so through this API.  This "
+"usage scenario is not SaaSS, because it uses Google Docs as a mere "
+"repository.  Showing all your data to a company is bad, but that is a matter "
+"of privacy, not SaaSS; depending on a service for access to your data is "
+"bad, but that is a matter of risk, not SaaSS.  On the other hand, using the "
+"service for converting document formats <em>is</em> SaaSS, because it's "
+"something you could have done by running a suitable program (free, one "
+"hopes) in your own computer."
 msgstr ""
-"Algunos sitios cuyo principal servicio es la publicación y la comunicación "
-"se extienden con la «administración de contactos», manteniendo un registro 
"
-"de las personas con las que usted se relaciona. Enviar un correo a esas "
-"personas no es software como servicio, pero mantener un registro de sus "
-"tratos con ellas, si es sustancial, sí es software como servicio."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"If a service is not SaaS, that does not mean it is OK.  There are other bad "
-"things a service can do.  For instance, Facebook distributes video in Flash, "
-"which pressures users to run nonfree software, and it gives users a "
-"misleading impression of privacy.  Those are important issues too, but this "
-"article's concern is the issue of SaaS."
+"Using Google Docs through a free editor is rare, of course.  Most often, "
+"people use it through the nonfree JavaScript program, which is bad like any "
+"nonfree program.  This scenario might involve SaaSS, too; that depends on "
+"what part of the editing is done in the JavaScript program and what part in "
+"the server.  We don't know, but since SaaSS and proprietary software do "
+"similar wrong to the user, it is not crucial to know."
 msgstr ""
-"Que un servicio no sea software como servicio no implica que esté bien. "
-"Existen otras cosas negativas que un servicio puede hacer. Por ejemplo, "
-"Facebook distribuye vídeo en Flash, lo cual presiona a los usuarios a "
-"ejecutar software que no es libre, y da a los usuarios una falsa impresión "
-"de privacidad. Esos también son temas importantes, pero este articulo trata "
-"del software como servicio."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"The IT industry discourages users from considering these distinctions.  "
-"That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is "
-"so nebulous that it could refer to almost any use of the Internet.  It "
-"includes SaaS and it includes nearly everything else.  The term only lends "
-"itself to uselessly broad statements."
+"Publishing via someone else's repository does not raise privacy issues, but "
+"publishing through Google Docs has a special problem: it is impossible even "
+"to <em>view the text</em> of a Google Docs document in a browser without "
+"running the nonfree JavaScript code.  Thus, you should not use Google Docs "
+"to publish anything&mdash;but the reason is not a matter of SaaSS."
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+# | The IT industry discourages users from [-considering-] {+making+} these
+# | distinctions.  That's what the buzzword &ldquo;cloud computing&rdquo; is
+# | for.  This term is so nebulous that it could refer to almost any use of
+# | the Internet.  It includes [-SaaS and it includes nearly everything
+# | else.-] {+SaaSS as well as many other network usage practices.  In any
+# | given context, an author who writes &ldquo;cloud&rdquo; (if a technical
+# | person) probably has a specific meaning in mind, but usually does not
+# | explain that in other articles the term has other specific meanings.+} 
+# | The term [-only lends itself-] {+leads people to generalize about
+# | practices they ought+} to [-uselessly broad statements.-] {+consider
+# | individually.+}
+#, fuzzy
+#| msgid ""
+#| "The IT industry discourages users from considering these distinctions.  "
+#| "That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term "
+#| "is so nebulous that it could refer to almost any use of the Internet.  It "
+#| "includes SaaS and it includes nearly everything else.  The term only "
+#| "lends itself to uselessly broad statements."
+msgid ""
+"The IT industry discourages users from making these distinctions.  That's "
+"what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is so "
+"nebulous that it could refer to almost any use of the Internet.  It includes "
+"SaaSS as well as many other network usage practices.  In any given context, "
+"an author who writes &ldquo;cloud&rdquo; (if a technical person) probably "
+"has a specific meaning in mind, but usually does not explain that in other "
+"articles the term has other specific meanings.  The term leads people to "
+"generalize about practices they ought to consider individually."
 msgstr ""
 "La industria de las TI disuade a los usuarios de considerar estas "
 "distinciones. Para eso sirve el término de moda «computación en la nube». 
El "
@@ -569,13 +917,36 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"The real meaning of &ldquo;cloud computing&rdquo; is to suggest a devil-may-"
-"care approach towards your computing.  It says, &ldquo;Don't ask questions, "
-"just trust every business without hesitation.  Don't worry about who "
+# | [-The real meaning of-]{+If+} &ldquo;cloud computing&rdquo; {+has a
+# | meaning, it+} is [-to suggest-] {+not a way of doing computing, but rather
+# | a way of thinking about computing:+} a devil-may-care approach [-towards
+# | your computing.  It-] {+which+} says, &ldquo;Don't ask [-questions, just
+# | trust every business without hesitation.-] {+questions.+}  Don't worry
+# | about who controls your computing or who holds your data.  Don't check for
+# | a hook hidden inside our service before you swallow [-it.&rdquo;-] {+it. 
+# | Trust companies without hesitation.&rdquo;+} In other words,
+# | [-&ldquo;Think like-] {+&ldquo;Be+} a sucker.&rdquo; [-I prefer-] {+A
+# | cloud in the mind is an obstacle+} to {+clear thinking.  For the sake of
+# | clear thinking about computing, let's+} avoid the [-term.-] {+term
+# | &ldquo;cloud.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The real meaning of &ldquo;cloud computing&rdquo; is to suggest a devil-"
+#| "may-care approach towards your computing.  It says, &ldquo;Don't ask "
+#| "questions, just trust every business without hesitation.  Don't worry "
+#| "about who controls your computing or who holds your data.  Don't check "
+#| "for a hook hidden inside our service before you swallow it.&rdquo; In "
+#| "other words, &ldquo;Think like a sucker.&rdquo; I prefer to avoid the "
+#| "term."
+msgid ""
+"If &ldquo;cloud computing&rdquo; has a meaning, it is not a way of doing "
+"computing, but rather a way of thinking about computing: a devil-may-care "
+"approach which says, &ldquo;Don't ask questions.  Don't worry about who "
 "controls your computing or who holds your data.  Don't check for a hook "
-"hidden inside our service before you swallow it.&rdquo; In other words, "
-"&ldquo;Think like a sucker.&rdquo; I prefer to avoid the term."
+"hidden inside our service before you swallow it.  Trust companies without "
+"hesitation.&rdquo; In other words, &ldquo;Be a sucker.&rdquo; A cloud in the "
+"mind is an obstacle to clear thinking.  For the sake of clear thinking about "
+"computing, let's avoid the term &ldquo;cloud.&rdquo;"
 msgstr ""
 "El verdadero significado de «computación en la nube» es sugerir una "
 "aproximación del tipo «¿a quien demonios le importa?» hacia sus tareas "
@@ -587,14 +958,23 @@
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
-msgid "Dealing with the SaaS Problem"
+# | Dealing with the SaaS{+S+} Problem
+#, fuzzy
+#| msgid "Dealing with the SaaS Problem"
+msgid "Dealing with the SaaSS Problem"
 msgstr "Lidiar con el problema del <i>software como servicio</i>"
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | Only a small fraction of all web sites do SaaS{+S+}; most don't raise the
+# | issue.  But what should we do about the ones that raise it?
+#, fuzzy
+#| msgid ""
+#| "Only a small fraction of all web sites do SaaS; most don't raise the "
+#| "issue.  But what should we do about the ones that raise it?"
 msgid ""
-"Only a small fraction of all web sites do SaaS; most don't raise the issue.  "
-"But what should we do about the ones that raise it?"
+"Only a small fraction of all web sites do SaaSS; most don't raise the "
+"issue.  But what should we do about the ones that raise it?"
 msgstr ""
 "Sólo una pequeña parte de todos los sitios web ofrecen el software como "
 "servicio. La mayoría de ellos no presenta esta situación, pero ¿qué 
debemos "
@@ -602,12 +982,30 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | For the simple case, where you are doing your own computing on data in
+# | your own hands, the solution is simple: use your own copy of a free
+# | software application.  Do your text editing with your copy of a free text
+# | editor such as GNU Emacs or a free word processor.  Do your photo editing
+# | with your copy of free software such as GIMP.  {+What if there is no free
+# | program available? A proprietary program or SaaSS would take away your
+# | freedom, so you shouldn't use those.  You can contribute your time or your
+# | money to development of a free replacement.+}
+#, fuzzy
+#| msgid ""
+#| "For the simple case, where you are doing your own computing on data in "
+#| "your own hands, the solution is simple: use your own copy of a free "
+#| "software application.  Do your text editing with your copy of a free text "
+#| "editor such as GNU Emacs or a free word processor.  Do your photo editing "
+#| "with your copy of free software such as GIMP."
 msgid ""
 "For the simple case, where you are doing your own computing on data in your "
 "own hands, the solution is simple: use your own copy of a free software "
 "application.  Do your text editing with your copy of a free text editor such "
 "as GNU Emacs or a free word processor.  Do your photo editing with your copy "
-"of free software such as GIMP."
+"of free software such as GIMP.  What if there is no free program available? "
+"A proprietary program or SaaSS would take away your freedom, so you "
+"shouldn't use those.  You can contribute your time or your money to "
+"development of a free replacement."
 msgstr ""
 "Para el caso sencillo en el cual usted realiza sus propias tareas de cómputo 
"
 "con datos que están en sus propias manos, la solución es sencilla: use su "
@@ -618,17 +1016,44 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"But what about collaborating with other individuals? It may be hard to do "
-"this at present without using a server.  If you use one, don't trust a "
-"server run by a company.  A mere contract as a customer is no protection "
-"unless you could detect a breach and could really sue, and the company "
-"probably writes its contracts to permit a broad range of abuses.  Police can "
-"subpoena your data from the company with less basis than required to "
-"subpoena them from you, supposing the company doesn't volunteer them like "
-"the US phone companies that illegally wiretapped their customers for Bush.  "
-"If you must use a server, use a server whose operators give you a basis for "
-"trust beyond a mere commercial relationship."
+# | [-But what-]{+What+} about collaborating with other [-individuals?-]
+# | {+individuals as a group?+} It may be hard to do this at present without
+# | using a {+server, and your group may not know how to run its own+} server.
+# |  If you use [-one,-] {+someone else's server, at least+} don't trust a
+# | server run by a company.  A mere contract as a customer is no protection
+# | unless you could detect a breach and could really sue, and the company
+# | probably writes its contracts to permit a broad range of abuses. 
+# | [-Police-]  {+The state+} can subpoena your data from the company
+# | {+along+} with [-less basis than required-] {+everyone else's, as Obama
+# | has done+} to [-subpoena them from you,-] {+phone companies,+} supposing
+# | the company doesn't volunteer them like the US phone companies that
+# | illegally wiretapped their customers for Bush.  If you must use a server,
+# | use a server whose operators give you a basis for trust beyond a mere
+# | commercial relationship.
+#, fuzzy
+#| msgid ""
+#| "But what about collaborating with other individuals? It may be hard to do "
+#| "this at present without using a server.  If you use one, don't trust a "
+#| "server run by a company.  A mere contract as a customer is no protection "
+#| "unless you could detect a breach and could really sue, and the company "
+#| "probably writes its contracts to permit a broad range of abuses.  Police "
+#| "can subpoena your data from the company with less basis than required to "
+#| "subpoena them from you, supposing the company doesn't volunteer them like "
+#| "the US phone companies that illegally wiretapped their customers for "
+#| "Bush.  If you must use a server, use a server whose operators give you a "
+#| "basis for trust beyond a mere commercial relationship."
+msgid ""
+"What about collaborating with other individuals as a group? It may be hard "
+"to do this at present without using a server, and your group may not know "
+"how to run its own server.  If you use someone else's server, at least don't "
+"trust a server run by a company.  A mere contract as a customer is no "
+"protection unless you could detect a breach and could really sue, and the "
+"company probably writes its contracts to permit a broad range of abuses.  "
+"The state can subpoena your data from the company along with everyone "
+"else's, as Obama has done to phone companies, supposing the company doesn't "
+"volunteer them like the US phone companies that illegally wiretapped their "
+"customers for Bush.  If you must use a server, use a server whose operators "
+"give you a basis for trust beyond a mere commercial relationship."
 msgstr ""
 "¿Pero qué pasa cuando se colabora con otras personas? Es posible que sea "
 "difícil hacer esto hoy en día sin usar un servidor. Si lo usa, no confíe 
en "
@@ -670,13 +1095,28 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+# | In the meantime, if a company invites you to use its server to do your own
+# | computing tasks, don't yield; don't use SaaS{+S+}.  Don't buy or install
+# | &ldquo;thin clients&rdquo;, which are simply computers so weak they make
+# | you do the real work on a server, unless you're going to use them with
+# | <em>your</em> server.  Use a real computer and keep your data there.  Do
+# | your [-work-] {+own computing+} with your own copy of a free program, for
+# | your freedom's sake.
+#, fuzzy
+#| msgid ""
+#| "In the meantime, if a company invites you to use its server to do your "
+#| "own computing tasks, don't yield; don't use SaaS.  Don't buy or install "
+#| "&ldquo;thin clients&rdquo;, which are simply computers so weak they make "
+#| "you do the real work on a server, unless you're going to use them with "
+#| "<em>your</em> server.  Use a real computer and keep your data there.  Do "
+#| "your work with your own copy of a free program, for your freedom's sake."
 msgid ""
 "In the meantime, if a company invites you to use its server to do your own "
-"computing tasks, don't yield; don't use SaaS.  Don't buy or install &ldquo;"
+"computing tasks, don't yield; don't use SaaSS.  Don't buy or install &ldquo;"
 "thin clients&rdquo;, which are simply computers so weak they make you do the "
 "real work on a server, unless you're going to use them with <em>your</em> "
-"server.  Use a real computer and keep your data there.  Do your work with "
-"your own copy of a free program, for your freedom's sake."
+"server.  Use a real computer and keep your data there.  Do your own "
+"computing with your own copy of a free program, for your freedom's sake."
 msgstr ""
 "Mientras tanto, si una empresa le invita a usar un servidor para hacer sus "
 "propias tareas de cómputo, no lo haga, no use el software como servicio. No "
@@ -707,25 +1147,30 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Envíe sus consultas acerca de la FSF  y GNU a <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>. Existen también <a href=\"/contact/\">otros "
-"medios para contactar</a> con la FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Para avisar de enlaces rotos y proponer otras correcciones o sugerencias, "
-"diríjase a <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
-"a>."
+"medios para contactar</a> con la FSF. <br /> Para avisar de enlaces rotos y "
+"proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
 
 #
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -742,7 +1187,10 @@
 "de este sitio web."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010 Richard Stallman"
+# | Copyright &copy; [-2010-] {+2010, 2013+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2010 Richard Stallman"
+msgid "Copyright &copy; 2010, 2013 Richard Stallman"
 msgstr "Copyright &copy; 2010 Richard Stallman"
 
 #. type: Content of: <div><p>
@@ -766,3 +1214,122 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización: "
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Some proprietary programs can mistreat users under remote command.  For "
+#~ "instance, Windows has a back door with which Microsoft can forcibly "
+#~ "change any software on the machine.  The Amazon Kindle e-book reader "
+#~ "(whose name suggests it's intended to burn people's books) has an "
+#~ "Orwellian back door that Amazon used in 2009 to <a href=\"http://www.";
+#~ "nytimes.com/2009/07/18/technology/companies/18amazon.html\" >remotely "
+#~ "delete</a> Kindle copies of Orwell's books <cite>1984</cite> and "
+#~ "<cite>Animal Farm</cite> which the users had purchased from Amazon."
+#~ msgstr ""
+#~ "Algunos programas privativos pueden atacar al usuario mediante el mando a "
+#~ "distancia. Por ejemplo, Windows tiene una puerta trasera con la que "
+#~ "Microsoft puede forzar el cambio de cualquier programa en una "
+#~ "computadora. El lector de libros electrónicos Amazon Kindle (cuyo nombre "
+#~ "en inglés sugiere que está hecho para «quemar» los libros de la gente) 
"
+#~ "tiene una puerta trasera Orwelliana que Amazon usó en el 2009 para <a "
+#~ "href=\"http://www.nytimes.com/2009/07/18/technology/companies/18amazon.";
+#~ "html\" >borrar de forma remota</a> copias de los libros de Orwell "
+#~ "<cite>1984</cite> y <cite>Rebelión en la Granja</cite>, que los usuarios "
+#~ "habían comprado a Amazon y tenían en su Kindle."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "SaaS inherently gives the server operator the power to change the "
+#~ "software in use, or the users' data being operated on.  Once again, no "
+#~ "special code is needed to do this."
+#~ msgstr ""
+#~ "El software como servicio inherentemente da al administrador del servidor "
+#~ "el poder de cambiar el software en uso, o la información de los usuarios "
+#~ "procesada. Repetimos, no hay necesidad de código especial para hacer 
esto."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Wikipedia controls its own servers, but groups can face the problem of "
+#~ "SaaS if they do their group activities on someone else's server.  "
+#~ "Fortunately, development hosting sites such as Savannah and SourceForge "
+#~ "don't pose the SaaS problem, because what groups do there is mainly "
+#~ "publication and public communication, rather than their own private "
+#~ "computing."
+#~ msgstr ""
+#~ "Wikipedia controla sus propios servidores, pero los grupos pueden "
+#~ "encontrarse con el problema del software como servicio si realizan sus "
+#~ "actividades en servidores que no les pertenecen. Afortunadamente, sitios "
+#~ "de hospedaje para el desarrollo de software como Savannah y SourceForge "
+#~ "no presentan el problema del software como servicio porque lo que los "
+#~ "grupos hacen ahí es principalmente publicación y comunicación, no sus "
+#~ "propias tareas de cómputo privadas."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Multiplayer games are a group activity carried out on someone else's "
+#~ "server, which makes them SaaS.  But where the data involved is just the "
+#~ "state of play and the score, the worst wrong the operator might commit is "
+#~ "favoritism.  You might well ignore that risk, since it seems unlikely and "
+#~ "very little is at stake.  On the other hand, when the game becomes more "
+#~ "than just a game, the issue changes."
+#~ msgstr ""
+#~ "Los juegos en los que participan varios jugadores son una actividad "
+#~ "grupal llevada a cabo en el servidor de otros, lo que los hace software "
+#~ "como servicio. Pero los datos involucrados tratan del estado del juego o "
+#~ "la puntuación, el peor mal que el operador podría cometer es tener "
+#~ "favoritismo. Usted podría incluso ignorar ese riesgo, ya que parece poco "
+#~ "probable y se arriesga muy poco. Por otra parte, cuando un juego se "
+#~ "convierte en algo más que un simple juego el asunto cambia."
+
+#~ msgid ""
+#~ "&ldquo;Backend as a Service&rdquo;, or BaaS, is a kind of SaaS, because "
+#~ "it involves running your own web service on top of software that you "
+#~ "can't control.  If you set up a service using BaaS, the BaaS platform may "
+#~ "well collect information about your users as well as you."
+#~ msgstr ""
+#~ "«Backend como servicio», o <abbr title=\"Backend as a Service\">BaaS</"
+#~ "abbr>, es un tipo de software como servicio (<abbr title=\"Software as a "
+#~ "Service\">SaaS</abbr>) porque involucra operar su propio servicio web "
+#~ "sobre software que usted no puede controlar. Si usted configura un "
+#~ "servicio usando BaaS, la plataforma BaaS &mdash;sobre la cual se ejecutan "
+#~ "las aplicaciones&mdash; puede recopilar información suya, así como de 
los "
+#~ "usuarios."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Which online services are SaaS? Google Docs is a clear example.  Its "
+#~ "basic activity is editing, and Google encourages people to use it for "
+#~ "their own editing; this is SaaS.  It offers the added feature of "
+#~ "collaborative editing, but adding participants doesn't alter the fact "
+#~ "that editing on the server is SaaS.  (In addition, Google Docs is "
+#~ "unacceptable because it installs a large <a href=\"/philosophy/javascript-"
+#~ "trap.html\"> nonfree JavaScript program</a> into the user's browser.)  If "
+#~ "using a service for communication or collaboration requires doing "
+#~ "substantial parts of your own computing with it too, that computing is "
+#~ "SaaS even if the communication is not."
+#~ msgstr ""
+#~ "¿Cuáles servicios en línea son software como servicio? Google Docs es 
un "
+#~ "ejemplo claro. Su actividad básica es la edición, y Google alienta a la "
+#~ "gente a usarlo para hacer sus propias tareas de edición; esto es software 
"
+#~ "como servicio. Ofrece la característica de la edición colaborativa, pero 
"
+#~ "agregar participantes no altera el hecho de que la edición en el servidor 
"
+#~ "es software como servicio (además Google Docs es inaceptable porque "
+#~ "instala un grande <a href=\"/philosophy/javascript-trap.html\">programa "
+#~ "JavaScript que no es libre</a> en el navegador del usuario). Si para usar "
+#~ "un servicio de comunicación o colaboración también tiene usted que "
+#~ "realizar en él partes sustanciales de sus propias tareas de cómputo, eso 
"
+#~ "es software como servicio incluso si la comunicación no lo es."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Some sites whose main service is publication and communication extend it "
+#~ "with &ldquo;contact management&rdquo;: keeping track of people you have "
+#~ "relationships with.  Sending mail to those people for you is not SaaS, "
+#~ "but keeping track of your dealings with them, if substantial, is SaaS."
+#~ msgstr ""
+#~ "Algunos sitios cuyo principal servicio es la publicación y la "
+#~ "comunicación se extienden con la «administración de contactos», "
+#~ "manteniendo un registro de las personas con las que usted se relaciona. "
+#~ "Enviar un correo a esas personas no es software como servicio, pero "
+#~ "mantener un registro de sus tratos con ellas, si es sustancial, sí es "
+#~ "software como servicio."

Index: who-does-that-server-really-serve.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/who-does-that-server-really-serve.fr.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- who-does-that-server-really-serve.fr.po     9 Jun 2013 22:06:32 -0000       
1.25
+++ who-does-that-server-really-serve.fr.po     18 Jun 2013 05:29:59 -0000      
1.26
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: who-does-that-server-really-serve.html\n"
-"POT-Creation-Date: 2013-06-06 16:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-06-08 11:03+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -15,13 +15,19 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 "X-Generator: Gtranslator 2.91.5\n"
 "Plural-Forms: \n"
 
 #. type: Content of: <title>
+# | Who Does That Server Really Serve? - GNU Project - Free Software
+# | Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Who Does That Server Really Serve? - GNU Project - Free Software "
+#| "Foundation (FSF)"
 msgid ""
-"Who Does That Server Really Serve? - GNU Project - Free Software Foundation "
-"(FSF)"
+"Who Does That Server Really Serve? - GNU Project - Free Software Foundation"
 msgstr ""
 "Qui ce serveur sert-il, franchement ? - Projet GNU - Free Software "
 "Foundation (FSF)"
@@ -34,25 +40,52 @@
 msgid "by <strong>Richard Stallman</strong>"
 msgstr "par <strong>Richard Stallman</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <blockquote><p>
+# | [-(First-]{+(The first version was+} published [-by-] {+in+} <a
+# | href=\"http://www.bostonreview.net/richard-stallman-free-software-DRM\";>
+# | Boston Review</a>.)
+#, fuzzy
+#| msgid ""
+#| "(First published by <a href=\"http://www.bostonreview.net/richard-";
+#| "stallman-free-software-DRM\"> Boston Review</a>.)"
 msgid ""
-"(First published by <a href=\"http://www.bostonreview.net/richard-stallman-";
-"free-software-DRM\"> Boston Review</a>.)"
+"(The first version was published in <a href=\"http://www.bostonreview.net/";
+"richard-stallman-free-software-DRM\"> Boston Review</a>.)"
 msgstr ""
 "(Publié initialement dans la <a href=\"http://www.bostonreview.net/richard-";
 "stallman-free-software-DRM\"><cite>Boston Review</cite></a>.)"
 
 #. type: Content of: <p>
+# | <strong>On the Internet, proprietary software isn't the only way to lose
+# | your freedom.  [-Software-]  {+Service+} as a [-Service-] {+Software
+# | Substitute, or SaaSS,+} is another way to let someone else have power over
+# | your computing.</strong>
+#, fuzzy
+#| msgid ""
+#| "<strong>On the Internet, proprietary software isn't the only way to lose "
+#| "your freedom.  Software as a Service is another way to let someone else "
+#| "have power over your computing.</strong>"
 msgid ""
 "<strong>On the Internet, proprietary software isn't the only way to lose "
-"your freedom.  Software as a Service is another way to let someone else have "
-"power over your computing.</strong>"
+"your freedom.  Service as a Software Substitute, or SaaSS, is another way to "
+"let someone else have power over your computing.</strong>"
 msgstr ""
 "<strong>Sur Internet, utiliser du logiciel privateur<a id=\"TransNote1-rev\" "
 "href=\"#TransNote1\"><sup>1</sup></a> n'est pas le seul moyen de perdre "
 "votre liberté. Il existe une autre façon de donner à un tiers du pouvoir 
sur "
 "votre informatique : le logiciel en tant que service.</strong>"
 
+#. type: Content of: outside any tag (error?)
+msgid ""
+"SaaSS means using a service implemented by someone else as a substitute for "
+"running your copy of a program.  The term is ours; articles and ads won't "
+"use it, and they won't tell you whether a service is SaaSS.  Instead they "
+"will probably use the vague and distracting term &ldquo;cloud&rdquo;, which "
+"lumps SaaSS together with various other practices, some abusive and some "
+"ok.  With the explanation and examples in this page, you can tell whether a "
+"service is SaaSS."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Background: How Proprietary Software Takes Away Your Freedom"
 msgstr "Contexte : comment le logiciel privateur vous enlève votre liberté"
@@ -100,12 +133,25 @@
 "philosophy/free-sw.html\">définition du logiciel libre</a>)."
 
 #. type: Content of: <p>
+# | With free software, we, the users, take back control of our computing. 
+# | Proprietary software still exists, but we can exclude it from our lives
+# | and many of us have done so.  However, we now face a new threat to our
+# | control over our computing: [-Software-] {+Service+} as a [-Service.-]
+# | {+Software Substitute (SaaSS).+}  For our freedom's sake, we have to
+# | reject that too.
+#, fuzzy
+#| msgid ""
+#| "With free software, we, the users, take back control of our computing.  "
+#| "Proprietary software still exists, but we can exclude it from our lives "
+#| "and many of us have done so.  However, we now face a new threat to our "
+#| "control over our computing: Software as a Service.  For our freedom's "
+#| "sake, we have to reject that too."
 msgid ""
 "With free software, we, the users, take back control of our computing.  "
 "Proprietary software still exists, but we can exclude it from our lives and "
 "many of us have done so.  However, we now face a new threat to our control "
-"over our computing: Software as a Service.  For our freedom's sake, we have "
-"to reject that too."
+"over our computing: Service as a Software Substitute (SaaSS).  For our "
+"freedom's sake, we have to reject that too."
 msgstr ""
 "Avec le logiciel libre, nous, les utilisateurs, récupérons le contrôle de "
 "notre informatique. Les logiciels privateurs continueront d'exister, mais "
@@ -115,17 +161,42 @@
 "service. Par souci de notre liberté, nous devons le rejeter également."
 
 #. type: Content of: <h3>
-msgid "How Software as a Service Takes Away Your Freedom"
+# | How [-Software-] {+Service+} as a [-Service-] {+Software Substitute+}
+# | Takes Away Your Freedom
+#, fuzzy
+#| msgid "How Software as a Service Takes Away Your Freedom"
+msgid "How Service as a Software Substitute Takes Away Your Freedom"
 msgstr "Comment le logiciel en tant que service vous enlève votre liberté"
 
 #. type: Content of: <p>
-msgid ""
-"Software as a Service (SaaS) means that someone sets up a network server "
-"that does certain computing tasks&mdash;running spreadsheets, word "
-"processing, translating text into another language, etc.&mdash;then invites "
-"users to do their computing on that server.  Users send their data to the "
-"server, which does their computing on the data thus provided, then sends the "
-"results back or acts on them directly."
+# | {+Service as a+} Software {+Substitute (SaaSS) means using a service+} as
+# | a [-Service (SaaS)-] {+substitute for running your copy of a program. 
+# | Concretely, it+} means that someone sets up a network server that does
+# | certain computing [-tasks&mdash;running spreadsheets, word processing,-]
+# | {+tasks&mdash;for instance, modifying a photo,+} translating text into
+# | another language, etc.&mdash;then invites users to do [-their-] computing
+# | [-on-] {+via+} that server.  [-Users-]  {+A user of the server would+}
+# | send [-their-] {+her+} data to the server, which does [-their computing-]
+# | {+<em>her own computing</em>+} on the data thus provided, then sends the
+# | results back {+to her+} or acts {+directly+} on [-them directly.-] {+her
+# | behalf.+}
+#, fuzzy
+#| msgid ""
+#| "Software as a Service (SaaS) means that someone sets up a network server "
+#| "that does certain computing tasks&mdash;running spreadsheets, word "
+#| "processing, translating text into another language, etc.&mdash;then "
+#| "invites users to do their computing on that server.  Users send their "
+#| "data to the server, which does their computing on the data thus provided, "
+#| "then sends the results back or acts on them directly."
+msgid ""
+"Service as a Software Substitute (SaaSS) means using a service as a "
+"substitute for running your copy of a program.  Concretely, it means that "
+"someone sets up a network server that does certain computing tasks&mdash;for "
+"instance, modifying a photo, translating text into another language, etc."
+"&mdash;then invites users to do computing via that server.  A user of the "
+"server would send her data to the server, which does <em>her own computing</"
+"em> on the data thus provided, then sends the results back to her or acts "
+"directly on her behalf."
 msgstr ""
 "« Logiciel en tant que service » (<abbr title=\"Software as a Service"
 "\">SaaS</abbr>) signifie que quelqu'un met en place sur le réseau un serveur 
"
@@ -137,11 +208,31 @@
 
 #. type: Content of: <p>
 msgid ""
+"The computing is <em>her own</em> because, by assumption, she could, in "
+"principle, have done it by running a program on her own computer (whether or "
+"not that program is available to her at present).  When this assumption is "
+"not so, it isn't SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+# | These servers wrest control from the users even more inexorably than
+# | proprietary software.  With proprietary software, users typically get an
+# | executable file but not the source code.  That makes it hard [-for
+# | programmers-] to study the code that is running, so it's hard to determine
+# | what the program really does, and hard to change it.
+#, fuzzy
+#| msgid ""
+#| "These servers wrest control from the users even more inexorably than "
+#| "proprietary software.  With proprietary software, users typically get an "
+#| "executable file but not the source code.  That makes it hard for "
+#| "programmers to study the code that is running, so it's hard to determine "
+#| "what the program really does, and hard to change it."
+msgid ""
 "These servers wrest control from the users even more inexorably than "
 "proprietary software.  With proprietary software, users typically get an "
-"executable file but not the source code.  That makes it hard for programmers "
-"to study the code that is running, so it's hard to determine what the "
-"program really does, and hard to change it."
+"executable file but not the source code.  That makes it hard to study the "
+"code that is running, so it's hard to determine what the program really "
+"does, and hard to change it."
 msgstr ""
 "Ces serveurs arrachent le contrôle des mains des utilisateurs encore plus "
 "inexorablement que le logiciel privateur. Avec le logiciel privateur, les "
@@ -151,10 +242,20 @@
 "le modifier."
 
 #. type: Content of: <p>
-msgid ""
-"With SaaS, the users do not have even the executable file: it is on the "
-"server, where the users can't see or touch it.  Thus it is impossible for "
-"them to ascertain what it really does, and impossible to change it."
+# | With SaaS{+S+}, the users do not have even the executable [-file:-] {+file
+# | that does their computing:+} it is on [-the-] {+someone else's+} server,
+# | where the users can't see or touch it.  Thus it is impossible for them to
+# | ascertain what it really does, and impossible to change it.
+#, fuzzy
+#| msgid ""
+#| "With SaaS, the users do not have even the executable file: it is on the "
+#| "server, where the users can't see or touch it.  Thus it is impossible for "
+#| "them to ascertain what it really does, and impossible to change it."
+msgid ""
+"With SaaSS, the users do not have even the executable file that does their "
+"computing: it is on someone else's server, where the users can't see or "
+"touch it.  Thus it is impossible for them to ascertain what it really does, "
+"and impossible to change it."
 msgstr ""
 "Avec le SaaS, les utilisateurs n'ont même pas de fichier exécutable : 
celui-"
 "ci est sur le serveur, où les utilisateurs ne peuvent le voir ni le toucher. 
"
@@ -163,12 +264,34 @@
 
 #. type: Content of: <p>
 msgid ""
-"Furthermore, SaaS automatically leads to harmful consequences equivalent to "
-"the malicious features of certain proprietary software.  For instance, some "
-"proprietary programs are &ldquo;spyware&rdquo;: the program sends out data "
-"about users' computing activities.  Microsoft Windows sends information "
-"about users' activities to Microsoft.  Windows Media Player and RealPlayer "
-"report what each user watches or listens to."
+"Furthermore, SaaSS automatically leads to consequences equivalent to the "
+"malicious features of certain proprietary software."
+msgstr ""
+
+#. type: Content of: <p>
+# | [-Furthermore, SaaS automatically leads to harmful consequences equivalent
+# | to the malicious features of certain proprietary software.-]For instance,
+# | some proprietary programs are &ldquo;spyware&rdquo;: the program sends out
+# | data about users' computing activities.  Microsoft Windows sends
+# | information about users' activities to Microsoft.  Windows Media Player
+# | [-and RealPlayer report-] {+reports+} what each user watches or listens
+# | to.  {+The Amazon Kindle reports which pages of which books the user looks
+# | at, and when.  Angry Birds reports the user's geolocation history.+}
+#, fuzzy
+#| msgid ""
+#| "Furthermore, SaaS automatically leads to harmful consequences equivalent "
+#| "to the malicious features of certain proprietary software.  For instance, "
+#| "some proprietary programs are &ldquo;spyware&rdquo;: the program sends "
+#| "out data about users' computing activities.  Microsoft Windows sends "
+#| "information about users' activities to Microsoft.  Windows Media Player "
+#| "and RealPlayer report what each user watches or listens to."
+msgid ""
+"For instance, some proprietary programs are &ldquo;spyware&rdquo;: the "
+"program sends out data about users' computing activities.  Microsoft Windows "
+"sends information about users' activities to Microsoft.  Windows Media "
+"Player reports what each user watches or listens to.  The Amazon Kindle "
+"reports which pages of which books the user looks at, and when.  Angry Birds "
+"reports the user's geolocation history."
 msgstr ""
 "De plus, le SaaS entraîne automatiquement des conséquences nocives "
 "équivalentes aux fonctionnalités malveillantes de certains logiciels "
@@ -179,11 +302,23 @@
 "et RealPlayer signalent ce que chaque utilisateur visionne ou écoute."
 
 #. type: Content of: <p>
-msgid ""
-"Unlike proprietary software, SaaS does not require covert code to obtain the "
-"user's data.  Instead, users must send their data to the server in order to "
-"use it.  This has the same effect as spyware: the server operator gets the "
-"data.  He gets it with no special effort, by the nature of SaaS."
+# | Unlike proprietary software, SaaS{+S+} does not require covert code to
+# | obtain the user's data.  Instead, users must send their data to the server
+# | in order to use it.  This has the same effect as spyware: the server
+# | operator gets the [-data.  He gets it with-] {+data&mdash;with+} no
+# | special effort, by the nature of SaaS{+S+}.
+#, fuzzy
+#| msgid ""
+#| "Unlike proprietary software, SaaS does not require covert code to obtain "
+#| "the user's data.  Instead, users must send their data to the server in "
+#| "order to use it.  This has the same effect as spyware: the server "
+#| "operator gets the data.  He gets it with no special effort, by the nature "
+#| "of SaaS."
+msgid ""
+"Unlike proprietary software, SaaSS does not require covert code to obtain "
+"the user's data.  Instead, users must send their data to the server in order "
+"to use it.  This has the same effect as spyware: the server operator gets "
+"the data&mdash;with no special effort, by the nature of SaaSS."
 msgstr ""
 "Contrairement aux logiciels privateurs, le SaaS n'a pas besoin de code caché 
"
 "pour obtenir les données de l'utilisateur. Comme ce dernier est obligé "
@@ -193,55 +328,91 @@
 
 #. type: Content of: <p>
 msgid ""
-"Some proprietary programs can mistreat users under remote command.  For "
-"instance, Windows has a back door with which Microsoft can forcibly change "
-"any software on the machine.  The Amazon Kindle e-book reader (whose name "
-"suggests it's intended to burn people's books) has an Orwellian back door "
-"that Amazon used in 2009 to <a href=\"http://www.nytimes.com/2009/07/18/";
-"technology/companies/18amazon.html\" >remotely delete</a> Kindle copies of "
-"Orwell's books <cite>1984</cite> and <cite>Animal Farm</cite> which the "
-"users had purchased from Amazon."
-msgstr ""
-"Certains programmes privateurs peuvent nuire aux utilisateurs sur commande à 
"
-"distance. Par exemple, Windows a une porte dérobée avec laquelle Microsoft "
-"peut modifier de force n'importe quel logiciel sur la machine. La liseuse "
-"Kindle d'Amazon (dont le nom suggère qu'elle est faite pour brûler les "
-"livres des gens)<a id=\"TransNote3-rev\" href=\"#TransNote3\"><sup>3</sup></"
-"a> a une porte dérobée orwellienne qu'Amazon a utilisée en 2009 pour <a 
href="
-"\"http://www.nytimes.com/2009/07/18/technology/companies/18amazon.html\"; "
-">effacer à distance</a> les copies pour Kindle des livres d'Orwell, "
-"<cite>1984</cite> et <cite>Animal Farm</cite>, que les utilisateurs avaient "
-"achetées&hellip; chez Amazon."
+"Some proprietary operating systems have a universal back door, permitting "
+"someone to remotely install software changes.  For instance, Windows has a "
+"universal back door with which Microsoft can forcibly change any software on "
+"the machine.  Nearly all portable phones have them, too.  Some proprietary "
+"applications also have universal back doors; for instance, the Steam client "
+"for GNU/Linux allows the developer to remotely install modified versions."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"SaaS inherently gives the server operator the power to change the software "
-"in use, or the users' data being operated on.  Once again, no special code "
-"is needed to do this."
-msgstr ""
-"Le SaaS donne intrinsèquement aux opérateurs du serveur le pouvoir de "
-"changer le logiciel utilisé, ou les données de l'utilisateur sur lesquelles 
"
-"le serveur opère. Une fois de plus, aucun code spécial n'est nécessaire."
+"With SaaSS, the server operator can change the software in use on the "
+"server.  He ought to be able to do this, since it's his computer; but the "
+"result is the same as using a proprietary application program with a "
+"universal back door: someone has the power to silently impose changes in how "
+"the user's computing gets done."
+msgstr ""
 
 #. type: Content of: <p>
+# | Thus, SaaS{+S+} is equivalent to [-total-] {+running proprietary software
+# | with+} spyware and a [-gaping wide-] {+universal+} back [-door, and-]
+# | {+door.  It+} gives the server operator unjust power over the [-user.  We
+# | can't accept that.-] {+user, and that power is something we must resist.+}
+#, fuzzy
+#| msgid ""
+#| "Thus, SaaS is equivalent to total spyware and a gaping wide back door, "
+#| "and gives the server operator unjust power over the user.  We can't "
+#| "accept that."
 msgid ""
-"Thus, SaaS is equivalent to total spyware and a gaping wide back door, and "
-"gives the server operator unjust power over the user.  We can't accept that."
+"Thus, SaaSS is equivalent to running proprietary software with spyware and a "
+"universal back door.  It gives the server operator unjust power over the "
+"user, and that power is something we must resist."
 msgstr ""
 "Ainsi, le SaaS est l'équivalent d'un logiciel espion intégral et d'une 
porte "
 "dérobée grande ouverte, et donne aux opérateurs du serveur un pouvoir "
 "injuste sur l'utilisateur. Nous ne pouvons accepter cela."
 
 #. type: Content of: <h3>
-msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
-msgstr "Démêler le problème du SaaS du problème du logiciel privateur"
+msgid "SaaSS and SaaS"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Originally we referred to this problematical practice as &ldquo; SaaS "
+"&rdquo;, which stands for &ldquo; Software as a Service &rdquo;.  It's a "
+"commonly used term for setting up software on a server rather than offering "
+"copies of it to users, and we thought it described precisely the cases where "
+"this problem occurs."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"SaaS and proprietary software lead to similar harmful results, but the "
-"causal mechanisms are different.  With proprietary software, the cause is "
-"that you have and use a copy which is difficult or illegal to change.  With "
-"SaaS, the cause is that you use a copy you don't have."
+"Subsequently we became aware that the term SaaS is sometimes used for "
+"communication services&mdash;activities for which this issue is not "
+"applicable.  In addition, the term &ldquo; Software as a Service &rdquo; "
+"doesn't explain <em>why</em> the practice is bad.  So we coined the term "
+"&ldquo; Service as a Software Substitute &rdquo;, which defines the bad "
+"practice more clearly and says what is bad about it."
+msgstr ""
+
+#. type: Content of: <h3>
+# | Untangling the SaaS{+S+} Issue from the Proprietary Software Issue
+#, fuzzy
+#| msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
+msgid "Untangling the SaaSS Issue from the Proprietary Software Issue"
+msgstr "Démêler le problème du SaaS du problème du logiciel privateur"
+
+#. type: Content of: <p>
+# | SaaS{+S+} and proprietary software lead to similar harmful results, but
+# | the [-causal-] mechanisms are different.  With proprietary software, the
+# | [-cause-] {+mechanism+} is that you have and use a copy which is difficult
+# | [-or-] {+and/or+} illegal to change.  With SaaS{+S+}, the [-cause-]
+# | {+mechanism+} is that you [-use a copy you-] don't [-have.-] {+have the
+# | copy that's doing your computing.+}
+#, fuzzy
+#| msgid ""
+#| "SaaS and proprietary software lead to similar harmful results, but the "
+#| "causal mechanisms are different.  With proprietary software, the cause is "
+#| "that you have and use a copy which is difficult or illegal to change.  "
+#| "With SaaS, the cause is that you use a copy you don't have."
+msgid ""
+"SaaSS and proprietary software lead to similar harmful results, but the "
+"mechanisms are different.  With proprietary software, the mechanism is that "
+"you have and use a copy which is difficult and/or illegal to change.  With "
+"SaaSS, the mechanism is that you don't have the copy that's doing your "
+"computing."
 msgstr ""
 "Le SaaS et le logiciel privateur conduisent à des résultats nocifs "
 "similaires, mais par des mécanismes différents : avec le logiciel 
privateur, "
@@ -250,15 +421,34 @@
 "possédez pas."
 
 #. type: Content of: <p>
+# | These two issues are often confused, and not only by accident.  Web
+# | developers use the vague term &ldquo;web application&rdquo; to lump the
+# | server software together with programs run on your machine in your
+# | browser.  Some web pages install [-nontrivial or-] {+nontrivial,+} even
+# | large JavaScript programs [-temporarily-] into your browser without
+# | informing you.  <a href=\"/philosophy/javascript-trap.html\">When these
+# | JavaScript programs are nonfree</a>, they are [-as bad-] {+the same sort
+# | of problem+} as any other nonfree software.  Here, however, we are
+# | concerned with the problem of the server software itself.
+#, fuzzy
+#| msgid ""
+#| "These two issues are often confused, and not only by accident.  Web "
+#| "developers use the vague term &ldquo;web application&rdquo; to lump the "
+#| "server software together with programs run on your machine in your "
+#| "browser.  Some web pages install nontrivial or even large JavaScript "
+#| "programs temporarily into your browser without informing you.  <a href=\"/"
+#| "philosophy/javascript-trap.html\">When these JavaScript programs are "
+#| "nonfree</a>, they are as bad as any other nonfree software.  Here, "
+#| "however, we are concerned with the problem of the server software itself."
 msgid ""
 "These two issues are often confused, and not only by accident.  Web "
 "developers use the vague term &ldquo;web application&rdquo; to lump the "
 "server software together with programs run on your machine in your browser.  "
-"Some web pages install nontrivial or even large JavaScript programs "
-"temporarily into your browser without informing you.  <a href=\"/philosophy/"
-"javascript-trap.html\">When these JavaScript programs are nonfree</a>, they "
-"are as bad as any other nonfree software.  Here, however, we are concerned "
-"with the problem of the server software itself."
+"Some web pages install nontrivial, even large JavaScript programs into your "
+"browser without informing you.  <a href=\"/philosophy/javascript-trap.html"
+"\">When these JavaScript programs are nonfree</a>, they are the same sort of "
+"problem as any other nonfree software.  Here, however, we are concerned with "
+"the problem of the server software itself."
 msgstr ""
 "On confond souvent ces deux problèmes, et pas seulement par accident. Les "
 "développeurs web utilisent le terme ambigu d'« application web » pour 
réunir "
@@ -271,14 +461,34 @@
 "nous occupons du problème posé par le logiciel serveur lui-même."
 
 #. type: Content of: <p>
-msgid ""
-"Many free software supporters assume that the problem of SaaS will be solved "
-"by developing free software for servers.  For the server operator's sake, "
-"the programs on the server had better be free; if they are proprietary, "
-"their owners have power over the server.  That's unfair to the operator, and "
-"doesn't help you at all.  But if the programs on the server are free, that "
-"doesn't protect you <em>as the server's user</em> from the effects of SaaS.  "
-"They give freedom to the operator, but not to you."
+# | Many free software supporters assume that the problem of SaaS{+S+} will be
+# | solved by developing free software for servers.  For the server operator's
+# | sake, the programs on the server had better be free; if they are
+# | proprietary, their owners have power over the server.  That's unfair to
+# | the operator, and doesn't help [-you-] {+the users+} at all.  But if the
+# | programs on the server are free, that doesn't protect [-you <em>as the-]
+# | {+<em>the+} server's user{+s+}</em> from the effects of [-SaaS.  They give
+# | freedom to-] {+SaaSS.  These programs liberate+} the {+server+} operator,
+# | but not [-to you.-] {+the server's users.+}
+#, fuzzy
+#| msgid ""
+#| "Many free software supporters assume that the problem of SaaS will be "
+#| "solved by developing free software for servers.  For the server "
+#| "operator's sake, the programs on the server had better be free; if they "
+#| "are proprietary, their owners have power over the server.  That's unfair "
+#| "to the operator, and doesn't help you at all.  But if the programs on the "
+#| "server are free, that doesn't protect you <em>as the server's user</em> "
+#| "from the effects of SaaS.  They give freedom to the operator, but not to "
+#| "you."
+msgid ""
+"Many free software supporters assume that the problem of SaaSS will be "
+"solved by developing free software for servers.  For the server operator's "
+"sake, the programs on the server had better be free; if they are "
+"proprietary, their owners have power over the server.  That's unfair to the "
+"operator, and doesn't help the users at all.  But if the programs on the "
+"server are free, that doesn't protect <em>the server's users</em> from the "
+"effects of SaaSS.  These programs liberate the server operator, but not the "
+"server's users."
 msgstr ""
 "De nombreux défenseurs du logiciel libre supposent que le problème du SaaS "
 "se résoudra en développant des logiciels serveurs libres. Dans l'intérêt 
de "
@@ -291,13 +501,41 @@
 
 #. type: Content of: <p>
 msgid ""
-"Releasing the server software source code does benefit the community: "
-"suitably skilled users can set up similar servers, perhaps changing the "
-"software.  But none of these servers would give you control over computing "
-"you do on it, unless it's <em>your</em> server.  The rest would all be "
-"SaaS.  SaaS always subjects you to the power of the server operator, and the "
-"only remedy is, <em>Don't use SaaS!</em> Don't use someone else's server to "
-"do your own computing on data provided by you."
+"Releasing the server software source code does benefit the community: it "
+"enables suitably skilled users to set up similar servers, perhaps changing "
+"the software.  <a href=\"/licenses/license-recommendations.html\"> We "
+"recommend using the GNU Affero GPL</a> as the license for programs often "
+"used on servers."
+msgstr ""
+
+#. type: Content of: <p>
+# | [-Releasing the server software source code does benefit the community:
+# | suitably skilled users can set up similar servers, perhaps changing the
+# | software.-]But none of these servers would give you control over computing
+# | you do on it, unless it's <em>your</em> server.  [-The rest would-]  {+It
+# | may be OK to trust your friend's server for some jobs, just as you might
+# | let your friend maintain the software on your own computer.  Outside of
+# | that,+} all {+these servers would+} be [-SaaS.  SaaS-] {+SaaSS for you. 
+# | SaaSS+} always subjects you to the power of the server operator, and the
+# | only remedy is, <em>Don't use SaaS{+S+}!</em> Don't use someone else's
+# | server to do your own computing on data provided by you.
+#, fuzzy
+#| msgid ""
+#| "Releasing the server software source code does benefit the community: "
+#| "suitably skilled users can set up similar servers, perhaps changing the "
+#| "software.  But none of these servers would give you control over "
+#| "computing you do on it, unless it's <em>your</em> server.  The rest would "
+#| "all be SaaS.  SaaS always subjects you to the power of the server "
+#| "operator, and the only remedy is, <em>Don't use SaaS!</em> Don't use "
+#| "someone else's server to do your own computing on data provided by you."
+msgid ""
+"But none of these servers would give you control over computing you do on "
+"it, unless it's <em>your</em> server.  It may be OK to trust your friend's "
+"server for some jobs, just as you might let your friend maintain the "
+"software on your own computer.  Outside of that, all these servers would be "
+"SaaSS for you.  SaaSS always subjects you to the power of the server "
+"operator, and the only remedy is, <em>Don't use SaaSS!</em> Don't use "
+"someone else's server to do your own computing on data provided by you."
 msgstr ""
 "Libérer le code source du logiciel côté serveur profite à la communauté 
: "
 "les utilisateurs ayant les compétences nécessaires peuvent mettre en place "
@@ -310,14 +548,48 @@
 "sur des données que vous fournissez."
 
 #. type: Content of: <h3>
-msgid "Distinguishing SaaS from Other Network Services"
+# | Distinguishing SaaS{+S+} from Other Network Services
+#, fuzzy
+#| msgid "Distinguishing SaaS from Other Network Services"
+msgid "Distinguishing SaaSS from Other Network Services"
 msgstr "Faire la distinction entre le SaaS et les autres services en ligne"
 
 #. type: Content of: <p>
 msgid ""
-"Does avoiding SaaS mean you refuse to use any network servers run by anyone "
-"other than you? Not at all.  Most servers do not raise this issue, because "
-"the job you do with them isn't your own computing except in a trivial sense."
+"Which online services are SaaSS? The clearest example is a translation "
+"service, which translates (say) English text into Spanish text.  Translating "
+"a text for you is computing that is purely yours.  You could do it by "
+"running a program on your own computer, if only you had the right program.  "
+"(To be ethical, that program should be free.)  The translation service "
+"substitutes for that program, so it is Service as a Software Substitute, or "
+"SaaSS.  Since it denies you control over your computing, it does you wrong."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Another clear example is using a service such as Flickr or Instagram to "
+"modify a photo.  Modifying photos is an activity that people have done in "
+"their own computers for decades; doing it in a server instead of your own "
+"computer is SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+# | [-Does avoiding SaaS-]{+Rejecting SaaSS does not+} mean [-you refuse-]
+# | {+refusing+} to use any network servers run by anyone other than [-you?
+# | Not at all.-] {+you.+}  Most servers [-do-] {+are+} not [-raise this
+# | issue,-] {+SaaSS+} because the [-job you-] {+jobs they+} do [-with them
+# | isn't your-] {+are not the user's+} own [-computing except in a trivial
+# | sense.-] {+computing.+}
+#, fuzzy
+#| msgid ""
+#| "Does avoiding SaaS mean you refuse to use any network servers run by "
+#| "anyone other than you? Not at all.  Most servers do not raise this issue, "
+#| "because the job you do with them isn't your own computing except in a "
+#| "trivial sense."
+msgid ""
+"Rejecting SaaSS does not mean refusing to use any network servers run by "
+"anyone other than you.  Most servers are not SaaSS because the jobs they do "
+"are not the user's own computing."
 msgstr ""
 "Éviter le SaaS signifie-t-il pour vous refuser d'utiliser tout serveur "
 "réseau géré par quelqu'un d'autre que vous ? Pas du tout. La plupart des "
@@ -325,17 +597,40 @@
 "avec eux n'est pas votre propre informatique sauf dans un sens trivial."
 
 #. type: Content of: <p>
-msgid ""
-"The original purpose of web servers wasn't to do computing for you, it was "
-"to publish information for you to access.  Even today this is what most web "
-"sites do, and it doesn't pose the SaaS problem, because accessing someone's "
-"published information isn't a matter of doing your own computing.  Neither "
-"is publishing your own materials via a blog site or a microblogging service "
-"such as Twitter or identi.ca.  The same goes for communication not meant to "
-"be private, such as chat groups.  Social networking can extend into SaaS; "
-"however, at root it is just a method of communication and publication, not "
-"SaaS.  If you use the service for minor editing of what you're going to "
-"communicate, that is not a significant issue."
+# | The original [-purpose-] {+idea+} of web servers wasn't to do computing
+# | for you, it was to publish information for you to access.  Even today this
+# | is what most web sites do, and it doesn't pose the SaaS{+S+} problem,
+# | because accessing someone's published information isn't [-a matter of-]
+# | doing your own computing.  Neither is publishing your own materials via a
+# | blog site or a microblogging service such as Twitter or [-identi.ca.-]
+# | {+StatusNet.  (These services may have other problems, of course.)+}  The
+# | same goes for {+other+} communication not meant to be private, such as
+# | chat groups.  [-Social networking can extend into SaaS; however, at root
+# | it is just a method of communication and publication, not SaaS.  If you
+# | use the service for minor editing of what you're going to communicate,
+# | that is not a significant issue.-]
+#, fuzzy
+#| msgid ""
+#| "The original purpose of web servers wasn't to do computing for you, it "
+#| "was to publish information for you to access.  Even today this is what "
+#| "most web sites do, and it doesn't pose the SaaS problem, because "
+#| "accessing someone's published information isn't a matter of doing your "
+#| "own computing.  Neither is publishing your own materials via a blog site "
+#| "or a microblogging service such as Twitter or identi.ca.  The same goes "
+#| "for communication not meant to be private, such as chat groups.  Social "
+#| "networking can extend into SaaS; however, at root it is just a method of "
+#| "communication and publication, not SaaS.  If you use the service for "
+#| "minor editing of what you're going to communicate, that is not a "
+#| "significant issue."
+msgid ""
+"The original idea of web servers wasn't to do computing for you, it was to "
+"publish information for you to access.  Even today this is what most web "
+"sites do, and it doesn't pose the SaaSS problem, because accessing someone's "
+"published information isn't doing your own computing.  Neither is publishing "
+"your own materials via a blog site or a microblogging service such as "
+"Twitter or StatusNet.  (These services may have other problems, of course.)  "
+"The same goes for other communication not meant to be private, such as chat "
+"groups."
 msgstr ""
 "L'objectif initial des serveurs web n'était pas d'exécuter des programmes "
 "pour vous, c'était de publier des données pour que vous y accédiez. Même "
@@ -353,12 +648,65 @@
 
 #. type: Content of: <p>
 msgid ""
+"In its essence, social networking is a form of communication and "
+"publication, not SaaSS.  However, a service whose main facility is social "
+"networking can have features or extensions which are SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+# | If a service is not SaaS{+S+}, that does not mean it is OK.  There are
+# | other [-bad things a service can do.-] {+ethical issues about services.+} 
+# | For instance, Facebook distributes video in Flash, which pressures users
+# | to run nonfree [-software,-] {+software; it requires running nonfree
+# | JavaScript code;+} and it gives users a misleading impression of
+# | [-privacy.-] {+privacy while luring them into baring their lives to
+# | Facebook.+}  Those are important [-issues too, but this article's concern
+# | is-] {+issues, different from+} the [-issue of SaaS.-] {+SaaSS issue.+}
+#, fuzzy
+#| msgid ""
+#| "If a service is not SaaS, that does not mean it is OK.  There are other "
+#| "bad things a service can do.  For instance, Facebook distributes video in "
+#| "Flash, which pressures users to run nonfree software, and it gives users "
+#| "a misleading impression of privacy.  Those are important issues too, but "
+#| "this article's concern is the issue of SaaS."
+msgid ""
+"If a service is not SaaSS, that does not mean it is OK.  There are other "
+"ethical issues about services.  For instance, Facebook distributes video in "
+"Flash, which pressures users to run nonfree software; it requires running "
+"nonfree JavaScript code; and it gives users a misleading impression of "
+"privacy while luring them into baring their lives to Facebook.  Those are "
+"important issues, different from the SaaSS issue."
+msgstr ""
+"Si un service n'est pas du SaaS, ça ne signifie pas que c'est OK. Il y a "
+"d'autres choses nocives que peut faire un service. Par exemple, Facebook "
+"distribue des vidéo en Flash, ce qui pousse les utilisateurs à exécuter 
des "
+"logiciels non libres ; de plus il donne aux utilisateurs l'impression "
+"trompeuse que leur vie privée est respectée. Ce sont aussi des problèmes "
+"importants, mais le sujet de cet article est le problème du SaaS."
+
+#. type: Content of: <p>
+# | Services such as search engines collect data from around the web and let
+# | you examine it.  Looking through their collection of data isn't your own
+# | computing in the usual sense&mdash;you didn't provide that
+# | collection&mdash;so using such a service to search the web is not [-SaaS. 
+# | (However,-] {+SaaSS.  However,+} using someone else's [-search engine-]
+# | {+server+} to implement a search facility for your own site <em>is</em>
+# | [-SaaS.)-] {+SaaSS.+}
+#, fuzzy
+#| msgid ""
+#| "Services such as search engines collect data from around the web and let "
+#| "you examine it.  Looking through their collection of data isn't your own "
+#| "computing in the usual sense&mdash;you didn't provide that "
+#| "collection&mdash;so using such a service to search the web is not SaaS.  "
+#| "(However, using someone else's search engine to implement a search "
+#| "facility for your own site <em>is</em> SaaS.)"
+msgid ""
 "Services such as search engines collect data from around the web and let you "
 "examine it.  Looking through their collection of data isn't your own "
 "computing in the usual sense&mdash;you didn't provide that collection&mdash;"
-"so using such a service to search the web is not SaaS.  (However, using "
-"someone else's search engine to implement a search facility for your own "
-"site <em>is</em> SaaS.)"
+"so using such a service to search the web is not SaaSS.  However, using "
+"someone else's server to implement a search facility for your own site "
+"<em>is</em> SaaSS."
 msgstr ""
 "Des services comme les moteurs de recherche collectent des données provenant 
"
 "de tout le web et vous laissent les examiner. Regarder dans leur collection "
@@ -369,12 +717,25 @@
 "fonction de recherche sur votre propre site <em>est</em> du SaaS)."
 
 #. type: Content of: <p>
-msgid ""
-"E-commerce is not SaaS, because the computing isn't solely yours; rather, it "
-"is done jointly for you and another party.  So there's no particular reason "
-"why you alone should expect to control that computing.  The real issue in e-"
-"commerce is whether you trust the other party with your money and personal "
-"information."
+# | [-E-commerce-]{+Purchasing online+} is not SaaS{+S+}, because the
+# | computing isn't [-solely yours;-] {+<em>your own</em>;+} rather, it is
+# | done jointly {+by and+} for you and [-another party.  So there's no
+# | particular reason why you alone should expect to control that computing.-]
+# | {+the store.+}  The real issue in [-e-commerce-] {+online shopping+} is
+# | whether you trust the other party with your money and {+other+} personal
+# | [-information.-] {+information (starting with your name).+}
+#, fuzzy
+#| msgid ""
+#| "E-commerce is not SaaS, because the computing isn't solely yours; rather, "
+#| "it is done jointly for you and another party.  So there's no particular "
+#| "reason why you alone should expect to control that computing.  The real "
+#| "issue in e-commerce is whether you trust the other party with your money "
+#| "and personal information."
+msgid ""
+"Purchasing online is not SaaSS, because the computing isn't <em>your own</"
+"em>; rather, it is done jointly by and for you and the store.  The real "
+"issue in online shopping is whether you trust the other party with your "
+"money and other personal information (starting with your name)."
 msgstr ""
 "L'e-commerce n'est pas du SaaS, car la tâche informatique n'est pas "
 "uniquement la vôtre ; elle est au contraire effectuée conjointement pour "
@@ -385,10 +746,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"Using a joint project's servers isn't SaaS because the computing you do in "
-"this way isn't yours personally.  For instance, if you edit pages on "
-"Wikipedia, you are not doing your own computing; rather, you are "
-"collaborating in Wikipedia's computing."
+"Repository sites such as as Savannah and SourceForge are not inherently "
+"SaaSS, because a repository's job is publication of data supplied to it."
+msgstr ""
+
+#. type: Content of: <p>
+# | Using a joint project's servers isn't SaaS{+S+} because the computing you
+# | do in this way isn't [-yours personally.-] {+your own.+}  For instance, if
+# | you edit pages on Wikipedia, you are not doing your own computing; rather,
+# | you are collaborating in Wikipedia's computing.  {+Wikipedia controls its
+# | own servers, but organizations as well as individuals encounter the
+# | problem of SaaSS if they do their computing in someone else's server.+}
+#, fuzzy
+#| msgid ""
+#| "Using a joint project's servers isn't SaaS because the computing you do "
+#| "in this way isn't yours personally.  For instance, if you edit pages on "
+#| "Wikipedia, you are not doing your own computing; rather, you are "
+#| "collaborating in Wikipedia's computing."
+msgid ""
+"Using a joint project's servers isn't SaaSS because the computing you do in "
+"this way isn't your own.  For instance, if you edit pages on Wikipedia, you "
+"are not doing your own computing; rather, you are collaborating in "
+"Wikipedia's computing.  Wikipedia controls its own servers, but "
+"organizations as well as individuals encounter the problem of SaaSS if they "
+"do their computing in someone else's server."
 msgstr ""
 "Utiliser les serveurs d'un projet commun n'est pas du SaaS car la tâche "
 "informatique que vous effectuez de cette manière ne vous appartient pas "
@@ -397,83 +778,30 @@
 "informatiques de Wikipédia."
 
 #. type: Content of: <p>
-msgid ""
-"Wikipedia controls its own servers, but groups can face the problem of SaaS "
-"if they do their group activities on someone else's server.  Fortunately, "
-"development hosting sites such as Savannah and SourceForge don't pose the "
-"SaaS problem, because what groups do there is mainly publication and public "
-"communication, rather than their own private computing."
-msgstr ""
-"Wikipédia contrôle ses propres serveurs, mais les groupes peuvent 
rencontrer "
-"le problème du SaaS s'ils font leurs activités de groupe sur le serveur de "
-"quelqu'un d'autre. Heureusement, les sites d'hébergement de projets de "
-"développement comme Savannah et SourceForge ne posent pas le problème du "
-"SaaS, puisque ce que font les groupes sur ces serveur est essentiellement de "
-"la publication et de la communication au public, plutôt que leurs propres "
-"tâches informatiques privées."
-
-#. type: Content of: <p>
-msgid ""
-"Multiplayer games are a group activity carried out on someone else's server, "
-"which makes them SaaS.  But where the data involved is just the state of "
-"play and the score, the worst wrong the operator might commit is "
-"favoritism.  You might well ignore that risk, since it seems unlikely and "
-"very little is at stake.  On the other hand, when the game becomes more than "
-"just a game, the issue changes."
-msgstr ""
-"Un jeu multi-joueurs est une activité de groupe effectuée sur le serveur de 
"
-"quelqu'un d'autre, ce qui en fait un SaaS. Mais quand les seules données "
-"concernées sont l'état du jeu et le score, la pire tort que vous puissiez "
-"subir de la part de l'opérateur est le favoritisme. Vous pouvez très bien "
-"ignorer ce risque, car il est peu probable et n'est que de peu de "
-"conséquence. Par contre, quand le jeu devient plus qu'un jeu, le problème "
-"n'est plus le même."
-
-#. type: Content of: <p>
-msgid ""
-"&ldquo;Backend as a Service&rdquo;, or BaaS, is a kind of SaaS, because it "
-"involves running your own web service on top of software that you can't "
-"control.  If you set up a service using BaaS, the BaaS platform may well "
-"collect information about your users as well as you."
-msgstr ""
-"« L'infrastructure en tant que service » (<cite>Backend as a 
Service</cite>, "
-"ou BaaS) est une sorte de SaaS parce que cela consiste à faire tourner votre 
"
-"propre service web sur un logiciel que vous ne pouvez pas contrôler. Si vous 
"
-"installez un service sur une plateforme BaaS, cette dernière peut très bien 
"
-"récolter des informations sur vos utilisateurs aussi bien que sur vous."
-
-#. type: Content of: <p>
-msgid ""
-"Which online services are SaaS? Google Docs is a clear example.  Its basic "
-"activity is editing, and Google encourages people to use it for their own "
-"editing; this is SaaS.  It offers the added feature of collaborative "
-"editing, but adding participants doesn't alter the fact that editing on the "
-"server is SaaS.  (In addition, Google Docs is unacceptable because it "
-"installs a large <a href=\"/philosophy/javascript-trap.html\"> nonfree "
-"JavaScript program</a> into the user's browser.)  If using a service for "
-"communication or collaboration requires doing substantial parts of your own "
-"computing with it too, that computing is SaaS even if the communication is "
-"not."
-msgstr ""
-"Quels services en ligne peut-on qualifier de SaaS ? Google Docs en est un "
-"exemple évident. Son activité de base est l'édition, et Google encourage 
les "
-"gens à utiliser ce service pour leurs propres éditions ; c'est ça le 
SaaS. "
-"Il offre la caractéristique supplémentaire d'être collaboratif, mais 
l'ajout "
-"de participants n'altère pas le fait qu'éditer sur le serveur est du SaaS "
-"(de plus, Google Docs est inacceptable car il installe un important <a href="
-"\"/philosophy/javascript-trap.html\">programme JavaScript non libre</a> dans "
-"le navigateur de l'utilisateur). Si utiliser un service pour communiquer ou "
-"collaborer requiert d'y faire également une part considérable de votre "
-"propre informatique, il s'agit de SaaS même si la communication, elle, n'en "
-"est pas."
-
-#. type: Content of: <p>
-msgid ""
-"Some sites offer multiple services, and if one is not SaaS, another may be "
-"SaaS.  For instance, the main service of Facebook is social networking, and "
-"that is not SaaS; however, it supports third-party applications, some of "
-"which may be SaaS.  Flickr's main service is distributing photos, which is "
-"not SaaS, but it also has features for editing photos, which is SaaS."
+# | Some sites offer multiple services, and if one is not SaaS{+S+}, another
+# | may be SaaS{+S+}.  For instance, the main service of Facebook is social
+# | networking, and that is not SaaS{+S+}; however, it supports third-party
+# | applications, some of which [-may be SaaS.-] {+are SaaSS.+}  Flickr's main
+# | service is distributing photos, which is not SaaS{+S+}, but it also has
+# | features for editing photos, which is [-SaaS.-] {+SaaSS.  Likewise, using
+# | Instagram to post a photo is not SaaSS, but using it to transform the
+# | photo is SaaSS.+}
+#, fuzzy
+#| msgid ""
+#| "Some sites offer multiple services, and if one is not SaaS, another may "
+#| "be SaaS.  For instance, the main service of Facebook is social "
+#| "networking, and that is not SaaS; however, it supports third-party "
+#| "applications, some of which may be SaaS.  Flickr's main service is "
+#| "distributing photos, which is not SaaS, but it also has features for "
+#| "editing photos, which is SaaS."
+msgid ""
+"Some sites offer multiple services, and if one is not SaaSS, another may be "
+"SaaSS.  For instance, the main service of Facebook is social networking, and "
+"that is not SaaSS; however, it supports third-party applications, some of "
+"which are SaaSS.  Flickr's main service is distributing photos, which is not "
+"SaaSS, but it also has features for editing photos, which is SaaSS.  "
+"Likewise, using Instagram to post a photo is not SaaSS, but using it to "
+"transform the photo is SaaSS."
 msgstr ""
 "Certains sites offrent plusieurs services, et si l'un d'eux n'est pas du "
 "SaaS, un autre peut en être. Par exemple, Facebook a pour principale "
@@ -484,39 +812,67 @@
 
 #. type: Content of: <p>
 msgid ""
-"Some sites whose main service is publication and communication extend it "
-"with &ldquo;contact management&rdquo;: keeping track of people you have "
-"relationships with.  Sending mail to those people for you is not SaaS, but "
-"keeping track of your dealings with them, if substantial, is SaaS."
-msgstr ""
-"Certains sites dont le principal service est la publication et la "
-"communication l'étendent avec « la gestion des contacts » : garder une 
trace "
-"des gens avec qui vous êtes en relation. Leur envoyer un courriel de votre "
-"part n'est pas du SaaS, mais garder une trace de vos relations avec eux, si "
-"elle est substantielle, est du SaaS."
+"Google Docs shows how complex the evaluation of a single service can "
+"become.  It invites people to edit a document by running a large <a href=\"/"
+"philosophy/javascript-trap.html\">nonfree JavaScript program</a>, clearly "
+"wrong.  However, it offers an API for uploading and downloading documents in "
+"standard formats.  A free software editor can do so through this API.  This "
+"usage scenario is not SaaSS, because it uses Google Docs as a mere "
+"repository.  Showing all your data to a company is bad, but that is a matter "
+"of privacy, not SaaSS; depending on a service for access to your data is "
+"bad, but that is a matter of risk, not SaaSS.  On the other hand, using the "
+"service for converting document formats <em>is</em> SaaSS, because it's "
+"something you could have done by running a suitable program (free, one "
+"hopes) in your own computer."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"If a service is not SaaS, that does not mean it is OK.  There are other bad "
-"things a service can do.  For instance, Facebook distributes video in Flash, "
-"which pressures users to run nonfree software, and it gives users a "
-"misleading impression of privacy.  Those are important issues too, but this "
-"article's concern is the issue of SaaS."
+"Using Google Docs through a free editor is rare, of course.  Most often, "
+"people use it through the nonfree JavaScript program, which is bad like any "
+"nonfree program.  This scenario might involve SaaSS, too; that depends on "
+"what part of the editing is done in the JavaScript program and what part in "
+"the server.  We don't know, but since SaaSS and proprietary software do "
+"similar wrong to the user, it is not crucial to know."
 msgstr ""
-"Si un service n'est pas du SaaS, ça ne signifie pas que c'est OK. Il y a "
-"d'autres choses nocives que peut faire un service. Par exemple, Facebook "
-"distribue des vidéo en Flash, ce qui pousse les utilisateurs à exécuter 
des "
-"logiciels non libres ; de plus il donne aux utilisateurs l'impression "
-"trompeuse que leur vie privée est respectée. Ce sont aussi des problèmes "
-"importants, mais le sujet de cet article est le problème du SaaS."
 
 #. type: Content of: <p>
 msgid ""
-"The IT industry discourages users from considering these distinctions.  "
-"That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is "
-"so nebulous that it could refer to almost any use of the Internet.  It "
-"includes SaaS and it includes nearly everything else.  The term only lends "
-"itself to uselessly broad statements."
+"Publishing via someone else's repository does not raise privacy issues, but "
+"publishing through Google Docs has a special problem: it is impossible even "
+"to <em>view the text</em> of a Google Docs document in a browser without "
+"running the nonfree JavaScript code.  Thus, you should not use Google Docs "
+"to publish anything&mdash;but the reason is not a matter of SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+# | The IT industry discourages users from [-considering-] {+making+} these
+# | distinctions.  That's what the buzzword &ldquo;cloud computing&rdquo; is
+# | for.  This term is so nebulous that it could refer to almost any use of
+# | the Internet.  It includes [-SaaS and it includes nearly everything
+# | else.-] {+SaaSS as well as many other network usage practices.  In any
+# | given context, an author who writes &ldquo;cloud&rdquo; (if a technical
+# | person) probably has a specific meaning in mind, but usually does not
+# | explain that in other articles the term has other specific meanings.+} 
+# | The term [-only lends itself-] {+leads people to generalize about
+# | practices they ought+} to [-uselessly broad statements.-] {+consider
+# | individually.+}
+#, fuzzy
+#| msgid ""
+#| "The IT industry discourages users from considering these distinctions.  "
+#| "That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term "
+#| "is so nebulous that it could refer to almost any use of the Internet.  It "
+#| "includes SaaS and it includes nearly everything else.  The term only "
+#| "lends itself to uselessly broad statements."
+msgid ""
+"The IT industry discourages users from making these distinctions.  That's "
+"what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is so "
+"nebulous that it could refer to almost any use of the Internet.  It includes "
+"SaaSS as well as many other network usage practices.  In any given context, "
+"an author who writes &ldquo;cloud&rdquo; (if a technical person) probably "
+"has a specific meaning in mind, but usually does not explain that in other "
+"articles the term has other specific meanings.  The term leads people to "
+"generalize about practices they ought to consider individually."
 msgstr ""
 "L'industrie informatique détourne l'attention des utilisateurs de ces "
 "distinctions. C'est pour ça que l'« informatique en nuage » <cite>[cloud 
"
@@ -526,13 +882,36 @@
 "déclarations générales et sans intérêt."
 
 #. type: Content of: <p>
-msgid ""
-"The real meaning of &ldquo;cloud computing&rdquo; is to suggest a devil-may-"
-"care approach towards your computing.  It says, &ldquo;Don't ask questions, "
-"just trust every business without hesitation.  Don't worry about who "
+# | [-The real meaning of-]{+If+} &ldquo;cloud computing&rdquo; {+has a
+# | meaning, it+} is [-to suggest-] {+not a way of doing computing, but rather
+# | a way of thinking about computing:+} a devil-may-care approach [-towards
+# | your computing.  It-] {+which+} says, &ldquo;Don't ask [-questions, just
+# | trust every business without hesitation.-] {+questions.+}  Don't worry
+# | about who controls your computing or who holds your data.  Don't check for
+# | a hook hidden inside our service before you swallow [-it.&rdquo;-] {+it. 
+# | Trust companies without hesitation.&rdquo;+} In other words,
+# | [-&ldquo;Think like-] {+&ldquo;Be+} a sucker.&rdquo; [-I prefer-] {+A
+# | cloud in the mind is an obstacle+} to {+clear thinking.  For the sake of
+# | clear thinking about computing, let's+} avoid the [-term.-] {+term
+# | &ldquo;cloud.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The real meaning of &ldquo;cloud computing&rdquo; is to suggest a devil-"
+#| "may-care approach towards your computing.  It says, &ldquo;Don't ask "
+#| "questions, just trust every business without hesitation.  Don't worry "
+#| "about who controls your computing or who holds your data.  Don't check "
+#| "for a hook hidden inside our service before you swallow it.&rdquo; In "
+#| "other words, &ldquo;Think like a sucker.&rdquo; I prefer to avoid the "
+#| "term."
+msgid ""
+"If &ldquo;cloud computing&rdquo; has a meaning, it is not a way of doing "
+"computing, but rather a way of thinking about computing: a devil-may-care "
+"approach which says, &ldquo;Don't ask questions.  Don't worry about who "
 "controls your computing or who holds your data.  Don't check for a hook "
-"hidden inside our service before you swallow it.&rdquo; In other words, "
-"&ldquo;Think like a sucker.&rdquo; I prefer to avoid the term."
+"hidden inside our service before you swallow it.  Trust companies without "
+"hesitation.&rdquo; In other words, &ldquo;Be a sucker.&rdquo; A cloud in the "
+"mind is an obstacle to clear thinking.  For the sake of clear thinking about "
+"computing, let's avoid the term &ldquo;cloud.&rdquo;"
 msgstr ""
 "La vraie signification d'« informatique en nuage » est de vous suggérer 
une "
 "approche je-m'en-foutiste de votre informatique. Elle dit : « Ne posez pas 
"
@@ -543,25 +922,52 @@
 "éviter ce terme."
 
 #. type: Content of: <h3>
-msgid "Dealing with the SaaS Problem"
+# | Dealing with the SaaS{+S+} Problem
+#, fuzzy
+#| msgid "Dealing with the SaaS Problem"
+msgid "Dealing with the SaaSS Problem"
 msgstr "Traiter le problème du SaaS"
 
 #. type: Content of: <p>
+# | Only a small fraction of all web sites do SaaS{+S+}; most don't raise the
+# | issue.  But what should we do about the ones that raise it?
+#, fuzzy
+#| msgid ""
+#| "Only a small fraction of all web sites do SaaS; most don't raise the "
+#| "issue.  But what should we do about the ones that raise it?"
 msgid ""
-"Only a small fraction of all web sites do SaaS; most don't raise the issue.  "
-"But what should we do about the ones that raise it?"
+"Only a small fraction of all web sites do SaaSS; most don't raise the "
+"issue.  But what should we do about the ones that raise it?"
 msgstr ""
 "Seule une petite partie de tous les sites web font du SaaS ; la plupart ne "
 "posent pas ce problème. Mais que sommes-nous censés faire à propos de ceux 
"
 "qui le posent ?"
 
 #. type: Content of: <p>
+# | For the simple case, where you are doing your own computing on data in
+# | your own hands, the solution is simple: use your own copy of a free
+# | software application.  Do your text editing with your copy of a free text
+# | editor such as GNU Emacs or a free word processor.  Do your photo editing
+# | with your copy of free software such as GIMP.  {+What if there is no free
+# | program available? A proprietary program or SaaSS would take away your
+# | freedom, so you shouldn't use those.  You can contribute your time or your
+# | money to development of a free replacement.+}
+#, fuzzy
+#| msgid ""
+#| "For the simple case, where you are doing your own computing on data in "
+#| "your own hands, the solution is simple: use your own copy of a free "
+#| "software application.  Do your text editing with your copy of a free text "
+#| "editor such as GNU Emacs or a free word processor.  Do your photo editing "
+#| "with your copy of free software such as GIMP."
 msgid ""
 "For the simple case, where you are doing your own computing on data in your "
 "own hands, the solution is simple: use your own copy of a free software "
 "application.  Do your text editing with your copy of a free text editor such "
 "as GNU Emacs or a free word processor.  Do your photo editing with your copy "
-"of free software such as GIMP."
+"of free software such as GIMP.  What if there is no free program available? "
+"A proprietary program or SaaSS would take away your freedom, so you "
+"shouldn't use those.  You can contribute your time or your money to "
+"development of a free replacement."
 msgstr ""
 "Pour le cas simple où vous travaillez sur des données que vous possédez "
 "personnellement, la solution est évidente : utilisez votre propre copie "
@@ -571,17 +977,44 @@
 "GIMP."
 
 #. type: Content of: <p>
-msgid ""
-"But what about collaborating with other individuals? It may be hard to do "
-"this at present without using a server.  If you use one, don't trust a "
-"server run by a company.  A mere contract as a customer is no protection "
-"unless you could detect a breach and could really sue, and the company "
-"probably writes its contracts to permit a broad range of abuses.  Police can "
-"subpoena your data from the company with less basis than required to "
-"subpoena them from you, supposing the company doesn't volunteer them like "
-"the US phone companies that illegally wiretapped their customers for Bush.  "
-"If you must use a server, use a server whose operators give you a basis for "
-"trust beyond a mere commercial relationship."
+# | [-But what-]{+What+} about collaborating with other [-individuals?-]
+# | {+individuals as a group?+} It may be hard to do this at present without
+# | using a {+server, and your group may not know how to run its own+} server.
+# |  If you use [-one,-] {+someone else's server, at least+} don't trust a
+# | server run by a company.  A mere contract as a customer is no protection
+# | unless you could detect a breach and could really sue, and the company
+# | probably writes its contracts to permit a broad range of abuses. 
+# | [-Police-]  {+The state+} can subpoena your data from the company
+# | {+along+} with [-less basis than required-] {+everyone else's, as Obama
+# | has done+} to [-subpoena them from you,-] {+phone companies,+} supposing
+# | the company doesn't volunteer them like the US phone companies that
+# | illegally wiretapped their customers for Bush.  If you must use a server,
+# | use a server whose operators give you a basis for trust beyond a mere
+# | commercial relationship.
+#, fuzzy
+#| msgid ""
+#| "But what about collaborating with other individuals? It may be hard to do "
+#| "this at present without using a server.  If you use one, don't trust a "
+#| "server run by a company.  A mere contract as a customer is no protection "
+#| "unless you could detect a breach and could really sue, and the company "
+#| "probably writes its contracts to permit a broad range of abuses.  Police "
+#| "can subpoena your data from the company with less basis than required to "
+#| "subpoena them from you, supposing the company doesn't volunteer them like "
+#| "the US phone companies that illegally wiretapped their customers for "
+#| "Bush.  If you must use a server, use a server whose operators give you a "
+#| "basis for trust beyond a mere commercial relationship."
+msgid ""
+"What about collaborating with other individuals as a group? It may be hard "
+"to do this at present without using a server, and your group may not know "
+"how to run its own server.  If you use someone else's server, at least don't "
+"trust a server run by a company.  A mere contract as a customer is no "
+"protection unless you could detect a breach and could really sue, and the "
+"company probably writes its contracts to permit a broad range of abuses.  "
+"The state can subpoena your data from the company along with everyone "
+"else's, as Obama has done to phone companies, supposing the company doesn't "
+"volunteer them like the US phone companies that illegally wiretapped their "
+"customers for Bush.  If you must use a server, use a server whose operators "
+"give you a basis for trust beyond a mere commercial relationship."
 msgstr ""
 "Mais qu'en est-il de la collaboration avec d'autres personnes ? Cela risque "
 "d'être difficile à l'heure actuelle sans utiliser un serveur. Si vous en "
@@ -625,13 +1058,28 @@
 "de leurs logiciels."
 
 #. type: Content of: <p>
+# | In the meantime, if a company invites you to use its server to do your own
+# | computing tasks, don't yield; don't use SaaS{+S+}.  Don't buy or install
+# | &ldquo;thin clients&rdquo;, which are simply computers so weak they make
+# | you do the real work on a server, unless you're going to use them with
+# | <em>your</em> server.  Use a real computer and keep your data there.  Do
+# | your [-work-] {+own computing+} with your own copy of a free program, for
+# | your freedom's sake.
+#, fuzzy
+#| msgid ""
+#| "In the meantime, if a company invites you to use its server to do your "
+#| "own computing tasks, don't yield; don't use SaaS.  Don't buy or install "
+#| "&ldquo;thin clients&rdquo;, which are simply computers so weak they make "
+#| "you do the real work on a server, unless you're going to use them with "
+#| "<em>your</em> server.  Use a real computer and keep your data there.  Do "
+#| "your work with your own copy of a free program, for your freedom's sake."
 msgid ""
 "In the meantime, if a company invites you to use its server to do your own "
-"computing tasks, don't yield; don't use SaaS.  Don't buy or install &ldquo;"
+"computing tasks, don't yield; don't use SaaSS.  Don't buy or install &ldquo;"
 "thin clients&rdquo;, which are simply computers so weak they make you do the "
 "real work on a server, unless you're going to use them with <em>your</em> "
-"server.  Use a real computer and keep your data there.  Do your work with "
-"your own copy of a free program, for your freedom's sake."
+"server.  Use a real computer and keep your data there.  Do your own "
+"computing with your own copy of a free program, for your freedom's sake."
 msgstr ""
 "En attendant, si une société vous invite à utiliser ses serveurs pour "
 "exécuter vos propres tâches informatiques, ne cédez pas ; n'utilisez pas 
le "
@@ -670,23 +1118,29 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "Veuillez envoyer les requêtes concernant la FSF et GNU à <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Il existe aussi <a 
href=\"/contact/"
-"\">d'autres moyens de contacter</a> la FSF."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou "
-"suggestions à <a href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>."
-
+"\">d'autres moyens de contacter</a> la FSF. Les liens orphelins et autres "
+"corrections ou suggestions peuvent être signalés à <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -703,7 +1157,10 @@
 "README.translations.html\">guide de traduction</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010 Richard Stallman"
+# | Copyright &copy; [-2010-] {+2010, 2013+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2010 Richard Stallman"
+msgid "Copyright &copy; 2010, 2013 Richard Stallman"
 msgstr "Copyright &copy; 2010 Richard Stallman"
 
 #. type: Content of: <div><p>
@@ -730,6 +1187,120 @@
 msgstr "Dernière mise à jour :"
 
 #~ msgid ""
+#~ "Some proprietary programs can mistreat users under remote command.  For "
+#~ "instance, Windows has a back door with which Microsoft can forcibly "
+#~ "change any software on the machine.  The Amazon Kindle e-book reader "
+#~ "(whose name suggests it's intended to burn people's books) has an "
+#~ "Orwellian back door that Amazon used in 2009 to <a href=\"http://www.";
+#~ "nytimes.com/2009/07/18/technology/companies/18amazon.html\" >remotely "
+#~ "delete</a> Kindle copies of Orwell's books <cite>1984</cite> and "
+#~ "<cite>Animal Farm</cite> which the users had purchased from Amazon."
+#~ msgstr ""
+#~ "Certains programmes privateurs peuvent nuire aux utilisateurs sur "
+#~ "commande à distance. Par exemple, Windows a une porte dérobée avec "
+#~ "laquelle Microsoft peut modifier de force n'importe quel logiciel sur la "
+#~ "machine. La liseuse Kindle d'Amazon (dont le nom suggère qu'elle est "
+#~ "faite pour brûler les livres des gens)<a id=\"TransNote3-rev\" href="
+#~ "\"#TransNote3\"><sup>3</sup></a> a une porte dérobée orwellienne "
+#~ "qu'Amazon a utilisée en 2009 pour <a href=\"http://www.nytimes.";
+#~ "com/2009/07/18/technology/companies/18amazon.html\" >effacer à distance</"
+#~ "a> les copies pour Kindle des livres d'Orwell, <cite>1984</cite> et "
+#~ "<cite>Animal Farm</cite>, que les utilisateurs avaient achetées&hellip; "
+#~ "chez Amazon."
+
+#~ msgid ""
+#~ "SaaS inherently gives the server operator the power to change the "
+#~ "software in use, or the users' data being operated on.  Once again, no "
+#~ "special code is needed to do this."
+#~ msgstr ""
+#~ "Le SaaS donne intrinsèquement aux opérateurs du serveur le pouvoir de "
+#~ "changer le logiciel utilisé, ou les données de l'utilisateur sur "
+#~ "lesquelles le serveur opère. Une fois de plus, aucun code spécial n'est "
+#~ "nécessaire."
+
+#~ msgid ""
+#~ "Wikipedia controls its own servers, but groups can face the problem of "
+#~ "SaaS if they do their group activities on someone else's server.  "
+#~ "Fortunately, development hosting sites such as Savannah and SourceForge "
+#~ "don't pose the SaaS problem, because what groups do there is mainly "
+#~ "publication and public communication, rather than their own private "
+#~ "computing."
+#~ msgstr ""
+#~ "Wikipédia contrôle ses propres serveurs, mais les groupes peuvent "
+#~ "rencontrer le problème du SaaS s'ils font leurs activités de groupe sur "
+#~ "le serveur de quelqu'un d'autre. Heureusement, les sites d'hébergement de 
"
+#~ "projets de développement comme Savannah et SourceForge ne posent pas le "
+#~ "problème du SaaS, puisque ce que font les groupes sur ces serveur est "
+#~ "essentiellement de la publication et de la communication au public, "
+#~ "plutôt que leurs propres tâches informatiques privées."
+
+#~ msgid ""
+#~ "Multiplayer games are a group activity carried out on someone else's "
+#~ "server, which makes them SaaS.  But where the data involved is just the "
+#~ "state of play and the score, the worst wrong the operator might commit is "
+#~ "favoritism.  You might well ignore that risk, since it seems unlikely and "
+#~ "very little is at stake.  On the other hand, when the game becomes more "
+#~ "than just a game, the issue changes."
+#~ msgstr ""
+#~ "Un jeu multi-joueurs est une activité de groupe effectuée sur le serveur 
"
+#~ "de quelqu'un d'autre, ce qui en fait un SaaS. Mais quand les seules "
+#~ "données concernées sont l'état du jeu et le score, la pire tort que 
vous "
+#~ "puissiez subir de la part de l'opérateur est le favoritisme. Vous pouvez "
+#~ "très bien ignorer ce risque, car il est peu probable et n'est que de peu "
+#~ "de conséquence. Par contre, quand le jeu devient plus qu'un jeu, le "
+#~ "problème n'est plus le même."
+
+#~ msgid ""
+#~ "&ldquo;Backend as a Service&rdquo;, or BaaS, is a kind of SaaS, because "
+#~ "it involves running your own web service on top of software that you "
+#~ "can't control.  If you set up a service using BaaS, the BaaS platform may "
+#~ "well collect information about your users as well as you."
+#~ msgstr ""
+#~ "« L'infrastructure en tant que service » (<cite>Backend as a Service</"
+#~ "cite>, ou BaaS) est une sorte de SaaS parce que cela consiste à faire "
+#~ "tourner votre propre service web sur un logiciel que vous ne pouvez pas "
+#~ "contrôler. Si vous installez un service sur une plateforme BaaS, cette "
+#~ "dernière peut très bien récolter des informations sur vos utilisateurs "
+#~ "aussi bien que sur vous."
+
+#~ msgid ""
+#~ "Which online services are SaaS? Google Docs is a clear example.  Its "
+#~ "basic activity is editing, and Google encourages people to use it for "
+#~ "their own editing; this is SaaS.  It offers the added feature of "
+#~ "collaborative editing, but adding participants doesn't alter the fact "
+#~ "that editing on the server is SaaS.  (In addition, Google Docs is "
+#~ "unacceptable because it installs a large <a href=\"/philosophy/javascript-"
+#~ "trap.html\"> nonfree JavaScript program</a> into the user's browser.)  If "
+#~ "using a service for communication or collaboration requires doing "
+#~ "substantial parts of your own computing with it too, that computing is "
+#~ "SaaS even if the communication is not."
+#~ msgstr ""
+#~ "Quels services en ligne peut-on qualifier de SaaS ? Google Docs en est un 
"
+#~ "exemple évident. Son activité de base est l'édition, et Google 
encourage "
+#~ "les gens à utiliser ce service pour leurs propres éditions ; c'est ça 
le "
+#~ "SaaS. Il offre la caractéristique supplémentaire d'être collaboratif, "
+#~ "mais l'ajout de participants n'altère pas le fait qu'éditer sur le "
+#~ "serveur est du SaaS (de plus, Google Docs est inacceptable car il "
+#~ "installe un important <a href=\"/philosophy/javascript-trap.html"
+#~ "\">programme JavaScript non libre</a> dans le navigateur de "
+#~ "l'utilisateur). Si utiliser un service pour communiquer ou collaborer "
+#~ "requiert d'y faire également une part considérable de votre propre "
+#~ "informatique, il s'agit de SaaS même si la communication, elle, n'en est "
+#~ "pas."
+
+#~ msgid ""
+#~ "Some sites whose main service is publication and communication extend it "
+#~ "with &ldquo;contact management&rdquo;: keeping track of people you have "
+#~ "relationships with.  Sending mail to those people for you is not SaaS, "
+#~ "but keeping track of your dealings with them, if substantial, is SaaS."
+#~ msgstr ""
+#~ "Certains sites dont le principal service est la publication et la "
+#~ "communication l'étendent avec « la gestion des contacts » : garder 
une "
+#~ "trace des gens avec qui vous êtes en relation. Leur envoyer un courriel "
+#~ "de votre part n'est pas du SaaS, mais garder une trace de vos relations "
+#~ "avec eux, si elle est substantielle, est du SaaS."
+
+#~ msgid ""
 #~ "(First published by <a href=\"http://bostonreview.net/BR35.2/stallman.php";
 #~ "\"> Boston Review</a>.)"
 #~ msgstr ""

Index: who-does-that-server-really-serve.hr.po
===================================================================
RCS file: /web/www/www/philosophy/po/who-does-that-server-really-serve.hr.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- who-does-that-server-really-serve.hr.po     6 Jun 2013 17:00:37 -0000       
1.5
+++ who-does-that-server-really-serve.hr.po     18 Jun 2013 05:29:59 -0000      
1.6
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: who-does-that-server-really-serve.html\n"
-"POT-Creation-Date: 2013-06-06 16:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-05-07 23:38+0100\n"
 "Last-Translator: Marin Rameša <address@hidden>\n"
 "Language-Team: www-hr <address@hidden>\n"
@@ -18,9 +18,14 @@
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
+# | Who Does That Server Really Serve? - GNU Project - Free Software
+# | Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Who Does That Server Really Serve? - GNU Project - Free Software "
+#| "Foundation (FSF)"
 msgid ""
-"Who Does That Server Really Serve? - GNU Project - Free Software Foundation "
-"(FSF)"
+"Who Does That Server Really Serve? - GNU Project - Free Software Foundation"
 msgstr ""
 "Koga taj poslužitelj stvarno poslužuje? - GNU projekt - Zaklada za slobodan 
"
 "softver (FSF)"
@@ -33,8 +38,8 @@
 msgid "by <strong>Richard Stallman</strong>"
 msgstr "<strong>Richard Stallman</strong>"
 
-#. type: Content of: <p>
-# | (First published by <a
+#. type: Content of: <blockquote><p>
+# | [-(First-]{+(The first version was+} published [-by-] {+in+} <a
 # | [-href=\"http://bostonreview.net/BR35.2/stallman.php\";>-]
 # | 
{+href=\"http://www.bostonreview.net/richard-stallman-free-software-DRM\";>+}
 # | Boston Review</a>.)
@@ -43,22 +48,42 @@
 #| "(First published by <a href=\"http://bostonreview.net/BR35.2/stallman.php";
 #| "\"> Boston Review</a>.)"
 msgid ""
-"(First published by <a href=\"http://www.bostonreview.net/richard-stallman-";
-"free-software-DRM\"> Boston Review</a>.)"
+"(The first version was published in <a href=\"http://www.bostonreview.net/";
+"richard-stallman-free-software-DRM\"> Boston Review</a>.)"
 msgstr ""
 "(Originalno objavljeno u <a href=\"http://bostonreview.net/BR35.2/stallman.";
 "php\"> Boston Review</a>.)"
 
 #. type: Content of: <p>
+# | <strong>On the Internet, proprietary software isn't the only way to lose
+# | your freedom.  [-Software-]  {+Service+} as a [-Service-] {+Software
+# | Substitute, or SaaSS,+} is another way to let someone else have power over
+# | your computing.</strong>
+#, fuzzy
+#| msgid ""
+#| "<strong>On the Internet, proprietary software isn't the only way to lose "
+#| "your freedom.  Software as a Service is another way to let someone else "
+#| "have power over your computing.</strong>"
 msgid ""
 "<strong>On the Internet, proprietary software isn't the only way to lose "
-"your freedom.  Software as a Service is another way to let someone else have "
-"power over your computing.</strong>"
+"your freedom.  Service as a Software Substitute, or SaaSS, is another way to "
+"let someone else have power over your computing.</strong>"
 msgstr ""
 "<strong>Na internetu, vlasnički softver nije jedini način da izgubite vašu 
"
 "slobodu. Softver kao usluga je još jedan način da dopustite nekom drugom da 
"
 "ima moć nad vašim računalnim aktivnostima.</strong>"
 
+#. type: Content of: outside any tag (error?)
+msgid ""
+"SaaSS means using a service implemented by someone else as a substitute for "
+"running your copy of a program.  The term is ours; articles and ads won't "
+"use it, and they won't tell you whether a service is SaaSS.  Instead they "
+"will probably use the vague and distracting term &ldquo;cloud&rdquo;, which "
+"lumps SaaSS together with various other practices, some abusive and some "
+"ok.  With the explanation and examples in this page, you can tell whether a "
+"service is SaaSS."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Background: How Proprietary Software Takes Away Your Freedom"
 msgstr "Pozadina: kako vlasnički softver oduzima vašu slobodu"
@@ -105,12 +130,25 @@
 "softvera</a>.)"
 
 #. type: Content of: <p>
+# | With free software, we, the users, take back control of our computing. 
+# | Proprietary software still exists, but we can exclude it from our lives
+# | and many of us have done so.  However, we now face a new threat to our
+# | control over our computing: [-Software-] {+Service+} as a [-Service.-]
+# | {+Software Substitute (SaaSS).+}  For our freedom's sake, we have to
+# | reject that too.
+#, fuzzy
+#| msgid ""
+#| "With free software, we, the users, take back control of our computing.  "
+#| "Proprietary software still exists, but we can exclude it from our lives "
+#| "and many of us have done so.  However, we now face a new threat to our "
+#| "control over our computing: Software as a Service.  For our freedom's "
+#| "sake, we have to reject that too."
 msgid ""
 "With free software, we, the users, take back control of our computing.  "
 "Proprietary software still exists, but we can exclude it from our lives and "
 "many of us have done so.  However, we now face a new threat to our control "
-"over our computing: Software as a Service.  For our freedom's sake, we have "
-"to reject that too."
+"over our computing: Service as a Software Substitute (SaaSS).  For our "
+"freedom's sake, we have to reject that too."
 msgstr ""
 "Sa slobodnim softverom, mi, korisnici, preuzimamo natrag kontrolu naših "
 "računalnih aktivnosti. Vlasnički softver još uvijek postoji, ali ga 
možemo "
@@ -119,17 +157,42 @@
 "usluga. Zbog naše slobode, moramo i to odbiti."
 
 #. type: Content of: <h3>
-msgid "How Software as a Service Takes Away Your Freedom"
+# | How [-Software-] {+Service+} as a [-Service-] {+Software Substitute+}
+# | Takes Away Your Freedom
+#, fuzzy
+#| msgid "How Software as a Service Takes Away Your Freedom"
+msgid "How Service as a Software Substitute Takes Away Your Freedom"
 msgstr "Kako softver kao usluga oduzima vašu slobodu"
 
 #. type: Content of: <p>
-msgid ""
-"Software as a Service (SaaS) means that someone sets up a network server "
-"that does certain computing tasks&mdash;running spreadsheets, word "
-"processing, translating text into another language, etc.&mdash;then invites "
-"users to do their computing on that server.  Users send their data to the "
-"server, which does their computing on the data thus provided, then sends the "
-"results back or acts on them directly."
+# | {+Service as a+} Software {+Substitute (SaaSS) means using a service+} as
+# | a [-Service (SaaS)-] {+substitute for running your copy of a program. 
+# | Concretely, it+} means that someone sets up a network server that does
+# | certain computing [-tasks&mdash;running spreadsheets, word processing,-]
+# | {+tasks&mdash;for instance, modifying a photo,+} translating text into
+# | another language, etc.&mdash;then invites users to do [-their-] computing
+# | [-on-] {+via+} that server.  [-Users-]  {+A user of the server would+}
+# | send [-their-] {+her+} data to the server, which does [-their computing-]
+# | {+<em>her own computing</em>+} on the data thus provided, then sends the
+# | results back {+to her+} or acts {+directly+} on [-them directly.-] {+her
+# | behalf.+}
+#, fuzzy
+#| msgid ""
+#| "Software as a Service (SaaS) means that someone sets up a network server "
+#| "that does certain computing tasks&mdash;running spreadsheets, word "
+#| "processing, translating text into another language, etc.&mdash;then "
+#| "invites users to do their computing on that server.  Users send their "
+#| "data to the server, which does their computing on the data thus provided, "
+#| "then sends the results back or acts on them directly."
+msgid ""
+"Service as a Software Substitute (SaaSS) means using a service as a "
+"substitute for running your copy of a program.  Concretely, it means that "
+"someone sets up a network server that does certain computing tasks&mdash;for "
+"instance, modifying a photo, translating text into another language, etc."
+"&mdash;then invites users to do computing via that server.  A user of the "
+"server would send her data to the server, which does <em>her own computing</"
+"em> on the data thus provided, then sends the results back to her or acts "
+"directly on her behalf."
 msgstr ""
 "Softver kao usluga (SaaS) znači da netko postavi mrežni poslužitelj koji "
 "vrši određene računalne aktivnosti&mdash;pokretanje tablica, jezično "
@@ -141,11 +204,31 @@
 
 #. type: Content of: <p>
 msgid ""
+"The computing is <em>her own</em> because, by assumption, she could, in "
+"principle, have done it by running a program on her own computer (whether or "
+"not that program is available to her at present).  When this assumption is "
+"not so, it isn't SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+# | These servers wrest control from the users even more inexorably than
+# | proprietary software.  With proprietary software, users typically get an
+# | executable file but not the source code.  That makes it hard [-for
+# | programmers-] to study the code that is running, so it's hard to determine
+# | what the program really does, and hard to change it.
+#, fuzzy
+#| msgid ""
+#| "These servers wrest control from the users even more inexorably than "
+#| "proprietary software.  With proprietary software, users typically get an "
+#| "executable file but not the source code.  That makes it hard for "
+#| "programmers to study the code that is running, so it's hard to determine "
+#| "what the program really does, and hard to change it."
+msgid ""
 "These servers wrest control from the users even more inexorably than "
 "proprietary software.  With proprietary software, users typically get an "
-"executable file but not the source code.  That makes it hard for programmers "
-"to study the code that is running, so it's hard to determine what the "
-"program really does, and hard to change it."
+"executable file but not the source code.  That makes it hard to study the "
+"code that is running, so it's hard to determine what the program really "
+"does, and hard to change it."
 msgstr ""
 "Ti poslužitelji istrgnu kontrolu od korisnika čak i više neumoljivo nego "
 "vlasnički softver. Kod vlasničkog softvera, korisnici obično dobiju 
izvršnu "
@@ -154,10 +237,20 @@
 "i teško ga je izmijeniti."
 
 #. type: Content of: <p>
-msgid ""
-"With SaaS, the users do not have even the executable file: it is on the "
-"server, where the users can't see or touch it.  Thus it is impossible for "
-"them to ascertain what it really does, and impossible to change it."
+# | With SaaS{+S+}, the users do not have even the executable [-file:-] {+file
+# | that does their computing:+} it is on [-the-] {+someone else's+} server,
+# | where the users can't see or touch it.  Thus it is impossible for them to
+# | ascertain what it really does, and impossible to change it.
+#, fuzzy
+#| msgid ""
+#| "With SaaS, the users do not have even the executable file: it is on the "
+#| "server, where the users can't see or touch it.  Thus it is impossible for "
+#| "them to ascertain what it really does, and impossible to change it."
+msgid ""
+"With SaaSS, the users do not have even the executable file that does their "
+"computing: it is on someone else's server, where the users can't see or "
+"touch it.  Thus it is impossible for them to ascertain what it really does, "
+"and impossible to change it."
 msgstr ""
 "Kod SaaS-a, korisnici čak nemaju niti izvršnu datoteku: ona je na "
 "poslužitelju, gdje je korisnici ne mogu vidjeti ili dotaknuti. Dakle je "
@@ -165,12 +258,34 @@
 
 #. type: Content of: <p>
 msgid ""
-"Furthermore, SaaS automatically leads to harmful consequences equivalent to "
-"the malicious features of certain proprietary software.  For instance, some "
-"proprietary programs are &ldquo;spyware&rdquo;: the program sends out data "
-"about users' computing activities.  Microsoft Windows sends information "
-"about users' activities to Microsoft.  Windows Media Player and RealPlayer "
-"report what each user watches or listens to."
+"Furthermore, SaaSS automatically leads to consequences equivalent to the "
+"malicious features of certain proprietary software."
+msgstr ""
+
+#. type: Content of: <p>
+# | [-Furthermore, SaaS automatically leads to harmful consequences equivalent
+# | to the malicious features of certain proprietary software.-]For instance,
+# | some proprietary programs are &ldquo;spyware&rdquo;: the program sends out
+# | data about users' computing activities.  Microsoft Windows sends
+# | information about users' activities to Microsoft.  Windows Media Player
+# | [-and RealPlayer report-] {+reports+} what each user watches or listens
+# | to.  {+The Amazon Kindle reports which pages of which books the user looks
+# | at, and when.  Angry Birds reports the user's geolocation history.+}
+#, fuzzy
+#| msgid ""
+#| "Furthermore, SaaS automatically leads to harmful consequences equivalent "
+#| "to the malicious features of certain proprietary software.  For instance, "
+#| "some proprietary programs are &ldquo;spyware&rdquo;: the program sends "
+#| "out data about users' computing activities.  Microsoft Windows sends "
+#| "information about users' activities to Microsoft.  Windows Media Player "
+#| "and RealPlayer report what each user watches or listens to."
+msgid ""
+"For instance, some proprietary programs are &ldquo;spyware&rdquo;: the "
+"program sends out data about users' computing activities.  Microsoft Windows "
+"sends information about users' activities to Microsoft.  Windows Media "
+"Player reports what each user watches or listens to.  The Amazon Kindle "
+"reports which pages of which books the user looks at, and when.  Angry Birds "
+"reports the user's geolocation history."
 msgstr ""
 "Dalje, SaaS automatski vodi do Å¡tetnih posljedica ekvivalentima malicioznim "
 "značajkama određenog vlasničkog softvera. Na primjer, neki vlasnički "
@@ -180,11 +295,23 @@
 "rade izvještaje o tome što svaki korisnik gleda ili sluša."
 
 #. type: Content of: <p>
-msgid ""
-"Unlike proprietary software, SaaS does not require covert code to obtain the "
-"user's data.  Instead, users must send their data to the server in order to "
-"use it.  This has the same effect as spyware: the server operator gets the "
-"data.  He gets it with no special effort, by the nature of SaaS."
+# | Unlike proprietary software, SaaS{+S+} does not require covert code to
+# | obtain the user's data.  Instead, users must send their data to the server
+# | in order to use it.  This has the same effect as spyware: the server
+# | operator gets the [-data.  He gets it with-] {+data&mdash;with+} no
+# | special effort, by the nature of SaaS{+S+}.
+#, fuzzy
+#| msgid ""
+#| "Unlike proprietary software, SaaS does not require covert code to obtain "
+#| "the user's data.  Instead, users must send their data to the server in "
+#| "order to use it.  This has the same effect as spyware: the server "
+#| "operator gets the data.  He gets it with no special effort, by the nature "
+#| "of SaaS."
+msgid ""
+"Unlike proprietary software, SaaSS does not require covert code to obtain "
+"the user's data.  Instead, users must send their data to the server in order "
+"to use it.  This has the same effect as spyware: the server operator gets "
+"the data&mdash;with no special effort, by the nature of SaaSS."
 msgstr ""
 "Za razliku od vlasničkog softvera, SaaS ne treba prikriveni kod da bi dobio "
 "podatke korisnika. Umjesto toga, korisnik mora poslati svoje podatke "
@@ -194,54 +321,91 @@
 
 #. type: Content of: <p>
 msgid ""
-"Some proprietary programs can mistreat users under remote command.  For "
-"instance, Windows has a back door with which Microsoft can forcibly change "
-"any software on the machine.  The Amazon Kindle e-book reader (whose name "
-"suggests it's intended to burn people's books) has an Orwellian back door "
-"that Amazon used in 2009 to <a href=\"http://www.nytimes.com/2009/07/18/";
-"technology/companies/18amazon.html\" >remotely delete</a> Kindle copies of "
-"Orwell's books <cite>1984</cite> and <cite>Animal Farm</cite> which the "
-"users had purchased from Amazon."
-msgstr ""
-"Neki vlasnički programi mogu maltretirati korisnike daljinskim upravljanjem. 
"
-"Na primjer, Windowsi imaju stražnja vrata s kojima Microsoft može na silu "
-"izmijeniti svaki softver na stroju. Čitač e-knjiga Amazon Kindle (čije ime 
"
-"naznačuje da je namijenjen spaljivanju<sup><a href=\"#TransNote1\">1</a></"
-"sup> knjiga korisnika) ima Orwellianska stražnja vrata koja je Amazon "
-"iskoristio 2009. da bi <a href=\"http://www.nytimes.com/2009/07/18/";
-"technology/companies/18amazon.html\" >na daljinu izbrisao</a> Kindle kopiju "
-"Orwellovih knjiga <cite>1984</cite> i <cite>Životinjska farma</cite> koje su 
"
-"korisnici kupili u Amazonu."
+"Some proprietary operating systems have a universal back door, permitting "
+"someone to remotely install software changes.  For instance, Windows has a "
+"universal back door with which Microsoft can forcibly change any software on "
+"the machine.  Nearly all portable phones have them, too.  Some proprietary "
+"applications also have universal back doors; for instance, the Steam client "
+"for GNU/Linux allows the developer to remotely install modified versions."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"SaaS inherently gives the server operator the power to change the software "
-"in use, or the users' data being operated on.  Once again, no special code "
-"is needed to do this."
-msgstr ""
-"SaaS inherentno daje operatoru poslužitelja moć da izmjeni softver koji se "
-"koristi, ili podatke korisnika nad kojima se vrše operacije. Još jednom, "
-"nikakav poseban kod nije potreban da bi se to napravilo."
+"With SaaSS, the server operator can change the software in use on the "
+"server.  He ought to be able to do this, since it's his computer; but the "
+"result is the same as using a proprietary application program with a "
+"universal back door: someone has the power to silently impose changes in how "
+"the user's computing gets done."
+msgstr ""
 
 #. type: Content of: <p>
-msgid ""
-"Thus, SaaS is equivalent to total spyware and a gaping wide back door, and "
-"gives the server operator unjust power over the user.  We can't accept that."
+# | Thus, SaaS{+S+} is equivalent to [-total-] {+running proprietary software
+# | with+} spyware and a [-gaping wide-] {+universal+} back [-door, and-]
+# | {+door.  It+} gives the server operator unjust power over the [-user.  We
+# | can't accept that.-] {+user, and that power is something we must resist.+}
+#, fuzzy
+#| msgid ""
+#| "Thus, SaaS is equivalent to total spyware and a gaping wide back door, "
+#| "and gives the server operator unjust power over the user.  We can't "
+#| "accept that."
+msgid ""
+"Thus, SaaSS is equivalent to running proprietary software with spyware and a "
+"universal back door.  It gives the server operator unjust power over the "
+"user, and that power is something we must resist."
 msgstr ""
 "Dakle, SaaS je ekvivalentan totalnom Å¡pijunskom programu i Å¡iroko otvorenim 
"
 "stražnjim vratima, i daje operatoru poslužitelja nepravednu moć nad "
 "korisnikom. Ne možemo to prihvatiti."
 
 #. type: Content of: <h3>
-msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
-msgstr "Razrješavanje SaaS problema iz problema vlasničkog softvera"
+msgid "SaaSS and SaaS"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"SaaS and proprietary software lead to similar harmful results, but the "
-"causal mechanisms are different.  With proprietary software, the cause is "
-"that you have and use a copy which is difficult or illegal to change.  With "
-"SaaS, the cause is that you use a copy you don't have."
+"Originally we referred to this problematical practice as &ldquo; SaaS "
+"&rdquo;, which stands for &ldquo; Software as a Service &rdquo;.  It's a "
+"commonly used term for setting up software on a server rather than offering "
+"copies of it to users, and we thought it described precisely the cases where "
+"this problem occurs."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Subsequently we became aware that the term SaaS is sometimes used for "
+"communication services&mdash;activities for which this issue is not "
+"applicable.  In addition, the term &ldquo; Software as a Service &rdquo; "
+"doesn't explain <em>why</em> the practice is bad.  So we coined the term "
+"&ldquo; Service as a Software Substitute &rdquo;, which defines the bad "
+"practice more clearly and says what is bad about it."
+msgstr ""
+
+#. type: Content of: <h3>
+# | Untangling the SaaS{+S+} Issue from the Proprietary Software Issue
+#, fuzzy
+#| msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
+msgid "Untangling the SaaSS Issue from the Proprietary Software Issue"
+msgstr "Razrješavanje SaaS problema iz problema vlasničkog softvera"
+
+#. type: Content of: <p>
+# | SaaS{+S+} and proprietary software lead to similar harmful results, but
+# | the [-causal-] mechanisms are different.  With proprietary software, the
+# | [-cause-] {+mechanism+} is that you have and use a copy which is difficult
+# | [-or-] {+and/or+} illegal to change.  With SaaS{+S+}, the [-cause-]
+# | {+mechanism+} is that you [-use a copy you-] don't [-have.-] {+have the
+# | copy that's doing your computing.+}
+#, fuzzy
+#| msgid ""
+#| "SaaS and proprietary software lead to similar harmful results, but the "
+#| "causal mechanisms are different.  With proprietary software, the cause is "
+#| "that you have and use a copy which is difficult or illegal to change.  "
+#| "With SaaS, the cause is that you use a copy you don't have."
+msgid ""
+"SaaSS and proprietary software lead to similar harmful results, but the "
+"mechanisms are different.  With proprietary software, the mechanism is that "
+"you have and use a copy which is difficult and/or illegal to change.  With "
+"SaaSS, the mechanism is that you don't have the copy that's doing your "
+"computing."
 msgstr ""
 "SaaS i vlasnički softver vode u slične štetne rezultate, ali uzročno-"
 "posljedični mehanizmi su drugačiji. Kod vlasničkog softvera, uzrok je taj 
da "
@@ -249,15 +413,34 @@
 "a, uzrok je taj da koristite kopiju koju nemate."
 
 #. type: Content of: <p>
+# | These two issues are often confused, and not only by accident.  Web
+# | developers use the vague term &ldquo;web application&rdquo; to lump the
+# | server software together with programs run on your machine in your
+# | browser.  Some web pages install [-nontrivial or-] {+nontrivial,+} even
+# | large JavaScript programs [-temporarily-] into your browser without
+# | informing you.  <a href=\"/philosophy/javascript-trap.html\">When these
+# | JavaScript programs are nonfree</a>, they are [-as bad-] {+the same sort
+# | of problem+} as any other nonfree software.  Here, however, we are
+# | concerned with the problem of the server software itself.
+#, fuzzy
+#| msgid ""
+#| "These two issues are often confused, and not only by accident.  Web "
+#| "developers use the vague term &ldquo;web application&rdquo; to lump the "
+#| "server software together with programs run on your machine in your "
+#| "browser.  Some web pages install nontrivial or even large JavaScript "
+#| "programs temporarily into your browser without informing you.  <a href=\"/"
+#| "philosophy/javascript-trap.html\">When these JavaScript programs are "
+#| "nonfree</a>, they are as bad as any other nonfree software.  Here, "
+#| "however, we are concerned with the problem of the server software itself."
 msgid ""
 "These two issues are often confused, and not only by accident.  Web "
 "developers use the vague term &ldquo;web application&rdquo; to lump the "
 "server software together with programs run on your machine in your browser.  "
-"Some web pages install nontrivial or even large JavaScript programs "
-"temporarily into your browser without informing you.  <a href=\"/philosophy/"
-"javascript-trap.html\">When these JavaScript programs are nonfree</a>, they "
-"are as bad as any other nonfree software.  Here, however, we are concerned "
-"with the problem of the server software itself."
+"Some web pages install nontrivial, even large JavaScript programs into your "
+"browser without informing you.  <a href=\"/philosophy/javascript-trap.html"
+"\">When these JavaScript programs are nonfree</a>, they are the same sort of "
+"problem as any other nonfree software.  Here, however, we are concerned with "
+"the problem of the server software itself."
 msgstr ""
 "Ta dva problema se često brkaju, i ne samo slučajnošću. Web developeri "
 "koriste magloviti termin &ldquo;web aplikacija&rdquo; da bi spojili softver "
@@ -270,14 +453,34 @@
 "poslužitelju."
 
 #. type: Content of: <p>
-msgid ""
-"Many free software supporters assume that the problem of SaaS will be solved "
-"by developing free software for servers.  For the server operator's sake, "
-"the programs on the server had better be free; if they are proprietary, "
-"their owners have power over the server.  That's unfair to the operator, and "
-"doesn't help you at all.  But if the programs on the server are free, that "
-"doesn't protect you <em>as the server's user</em> from the effects of SaaS.  "
-"They give freedom to the operator, but not to you."
+# | Many free software supporters assume that the problem of SaaS{+S+} will be
+# | solved by developing free software for servers.  For the server operator's
+# | sake, the programs on the server had better be free; if they are
+# | proprietary, their owners have power over the server.  That's unfair to
+# | the operator, and doesn't help [-you-] {+the users+} at all.  But if the
+# | programs on the server are free, that doesn't protect [-you <em>as the-]
+# | {+<em>the+} server's user{+s+}</em> from the effects of [-SaaS.  They give
+# | freedom to-] {+SaaSS.  These programs liberate+} the {+server+} operator,
+# | but not [-to you.-] {+the server's users.+}
+#, fuzzy
+#| msgid ""
+#| "Many free software supporters assume that the problem of SaaS will be "
+#| "solved by developing free software for servers.  For the server "
+#| "operator's sake, the programs on the server had better be free; if they "
+#| "are proprietary, their owners have power over the server.  That's unfair "
+#| "to the operator, and doesn't help you at all.  But if the programs on the "
+#| "server are free, that doesn't protect you <em>as the server's user</em> "
+#| "from the effects of SaaS.  They give freedom to the operator, but not to "
+#| "you."
+msgid ""
+"Many free software supporters assume that the problem of SaaSS will be "
+"solved by developing free software for servers.  For the server operator's "
+"sake, the programs on the server had better be free; if they are "
+"proprietary, their owners have power over the server.  That's unfair to the "
+"operator, and doesn't help the users at all.  But if the programs on the "
+"server are free, that doesn't protect <em>the server's users</em> from the "
+"effects of SaaSS.  These programs liberate the server operator, but not the "
+"server's users."
 msgstr ""
 "Mnogi pobornici slobodnog softvera pretpostavljaju da će problem SaaS-a biti 
"
 "riješen razvijanjem slobodnog softvera za poslužitelje. Radi operatora "
@@ -289,13 +492,41 @@
 
 #. type: Content of: <p>
 msgid ""
-"Releasing the server software source code does benefit the community: "
-"suitably skilled users can set up similar servers, perhaps changing the "
-"software.  But none of these servers would give you control over computing "
-"you do on it, unless it's <em>your</em> server.  The rest would all be "
-"SaaS.  SaaS always subjects you to the power of the server operator, and the "
-"only remedy is, <em>Don't use SaaS!</em> Don't use someone else's server to "
-"do your own computing on data provided by you."
+"Releasing the server software source code does benefit the community: it "
+"enables suitably skilled users to set up similar servers, perhaps changing "
+"the software.  <a href=\"/licenses/license-recommendations.html\"> We "
+"recommend using the GNU Affero GPL</a> as the license for programs often "
+"used on servers."
+msgstr ""
+
+#. type: Content of: <p>
+# | [-Releasing the server software source code does benefit the community:
+# | suitably skilled users can set up similar servers, perhaps changing the
+# | software.-]But none of these servers would give you control over computing
+# | you do on it, unless it's <em>your</em> server.  [-The rest would-]  {+It
+# | may be OK to trust your friend's server for some jobs, just as you might
+# | let your friend maintain the software on your own computer.  Outside of
+# | that,+} all {+these servers would+} be [-SaaS.  SaaS-] {+SaaSS for you. 
+# | SaaSS+} always subjects you to the power of the server operator, and the
+# | only remedy is, <em>Don't use SaaS{+S+}!</em> Don't use someone else's
+# | server to do your own computing on data provided by you.
+#, fuzzy
+#| msgid ""
+#| "Releasing the server software source code does benefit the community: "
+#| "suitably skilled users can set up similar servers, perhaps changing the "
+#| "software.  But none of these servers would give you control over "
+#| "computing you do on it, unless it's <em>your</em> server.  The rest would "
+#| "all be SaaS.  SaaS always subjects you to the power of the server "
+#| "operator, and the only remedy is, <em>Don't use SaaS!</em> Don't use "
+#| "someone else's server to do your own computing on data provided by you."
+msgid ""
+"But none of these servers would give you control over computing you do on "
+"it, unless it's <em>your</em> server.  It may be OK to trust your friend's "
+"server for some jobs, just as you might let your friend maintain the "
+"software on your own computer.  Outside of that, all these servers would be "
+"SaaSS for you.  SaaSS always subjects you to the power of the server "
+"operator, and the only remedy is, <em>Don't use SaaSS!</em> Don't use "
+"someone else's server to do your own computing on data provided by you."
 msgstr ""
 "Objavljivanje izvornog koda softvera poslužitelja ima korist za zajednicu: "
 "korisnici sa prikladnim vještinama mogu postaviti slične poslužitelje, 
možda "
@@ -307,14 +538,48 @@
 "aktivnosti nad podacima koje ste sami obezbjedili. "
 
 #. type: Content of: <h3>
-msgid "Distinguishing SaaS from Other Network Services"
+# | Distinguishing SaaS{+S+} from Other Network Services
+#, fuzzy
+#| msgid "Distinguishing SaaS from Other Network Services"
+msgid "Distinguishing SaaSS from Other Network Services"
 msgstr "Razlikovanje SaaS-a od drugih mrežnih servisa"
 
 #. type: Content of: <p>
 msgid ""
-"Does avoiding SaaS mean you refuse to use any network servers run by anyone "
-"other than you? Not at all.  Most servers do not raise this issue, because "
-"the job you do with them isn't your own computing except in a trivial sense."
+"Which online services are SaaSS? The clearest example is a translation "
+"service, which translates (say) English text into Spanish text.  Translating "
+"a text for you is computing that is purely yours.  You could do it by "
+"running a program on your own computer, if only you had the right program.  "
+"(To be ethical, that program should be free.)  The translation service "
+"substitutes for that program, so it is Service as a Software Substitute, or "
+"SaaSS.  Since it denies you control over your computing, it does you wrong."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Another clear example is using a service such as Flickr or Instagram to "
+"modify a photo.  Modifying photos is an activity that people have done in "
+"their own computers for decades; doing it in a server instead of your own "
+"computer is SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+# | [-Does avoiding SaaS-]{+Rejecting SaaSS does not+} mean [-you refuse-]
+# | {+refusing+} to use any network servers run by anyone other than [-you?
+# | Not at all.-] {+you.+}  Most servers [-do-] {+are+} not [-raise this
+# | issue,-] {+SaaSS+} because the [-job you-] {+jobs they+} do [-with them
+# | isn't your-] {+are not the user's+} own [-computing except in a trivial
+# | sense.-] {+computing.+}
+#, fuzzy
+#| msgid ""
+#| "Does avoiding SaaS mean you refuse to use any network servers run by "
+#| "anyone other than you? Not at all.  Most servers do not raise this issue, "
+#| "because the job you do with them isn't your own computing except in a "
+#| "trivial sense."
+msgid ""
+"Rejecting SaaSS does not mean refusing to use any network servers run by "
+"anyone other than you.  Most servers are not SaaSS because the jobs they do "
+"are not the user's own computing."
 msgstr ""
 "Da li izbjegavanje SaaS-a znači da odbijate koristiti bilo koje mrežne "
 "poslužitelje postavljene od strane bilo koga osim vas? Nimalo. Većina "
@@ -322,17 +587,40 @@
 "računalna aktivnost osim u trivijalnom smislu."
 
 #. type: Content of: <p>
-msgid ""
-"The original purpose of web servers wasn't to do computing for you, it was "
-"to publish information for you to access.  Even today this is what most web "
-"sites do, and it doesn't pose the SaaS problem, because accessing someone's "
-"published information isn't a matter of doing your own computing.  Neither "
-"is publishing your own materials via a blog site or a microblogging service "
-"such as Twitter or identi.ca.  The same goes for communication not meant to "
-"be private, such as chat groups.  Social networking can extend into SaaS; "
-"however, at root it is just a method of communication and publication, not "
-"SaaS.  If you use the service for minor editing of what you're going to "
-"communicate, that is not a significant issue."
+# | The original [-purpose-] {+idea+} of web servers wasn't to do computing
+# | for you, it was to publish information for you to access.  Even today this
+# | is what most web sites do, and it doesn't pose the SaaS{+S+} problem,
+# | because accessing someone's published information isn't [-a matter of-]
+# | doing your own computing.  Neither is publishing your own materials via a
+# | blog site or a microblogging service such as Twitter or [-identi.ca.-]
+# | {+StatusNet.  (These services may have other problems, of course.)+}  The
+# | same goes for {+other+} communication not meant to be private, such as
+# | chat groups.  [-Social networking can extend into SaaS; however, at root
+# | it is just a method of communication and publication, not SaaS.  If you
+# | use the service for minor editing of what you're going to communicate,
+# | that is not a significant issue.-]
+#, fuzzy
+#| msgid ""
+#| "The original purpose of web servers wasn't to do computing for you, it "
+#| "was to publish information for you to access.  Even today this is what "
+#| "most web sites do, and it doesn't pose the SaaS problem, because "
+#| "accessing someone's published information isn't a matter of doing your "
+#| "own computing.  Neither is publishing your own materials via a blog site "
+#| "or a microblogging service such as Twitter or identi.ca.  The same goes "
+#| "for communication not meant to be private, such as chat groups.  Social "
+#| "networking can extend into SaaS; however, at root it is just a method of "
+#| "communication and publication, not SaaS.  If you use the service for "
+#| "minor editing of what you're going to communicate, that is not a "
+#| "significant issue."
+msgid ""
+"The original idea of web servers wasn't to do computing for you, it was to "
+"publish information for you to access.  Even today this is what most web "
+"sites do, and it doesn't pose the SaaSS problem, because accessing someone's "
+"published information isn't doing your own computing.  Neither is publishing "
+"your own materials via a blog site or a microblogging service such as "
+"Twitter or StatusNet.  (These services may have other problems, of course.)  "
+"The same goes for other communication not meant to be private, such as chat "
+"groups."
 msgstr ""
 "Izvorna namjena mrežnih poslužitelja nije bila da vrše računalne 
aktivnosti "
 "za vas, bila je objavljivanje informacija kojima vi pristupate. Čak i danas "
@@ -348,12 +636,64 @@
 
 #. type: Content of: <p>
 msgid ""
+"In its essence, social networking is a form of communication and "
+"publication, not SaaSS.  However, a service whose main facility is social "
+"networking can have features or extensions which are SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+# | If a service is not SaaS{+S+}, that does not mean it is OK.  There are
+# | other [-bad things a service can do.-] {+ethical issues about services.+} 
+# | For instance, Facebook distributes video in Flash, which pressures users
+# | to run nonfree [-software,-] {+software; it requires running nonfree
+# | JavaScript code;+} and it gives users a misleading impression of
+# | [-privacy.-] {+privacy while luring them into baring their lives to
+# | Facebook.+}  Those are important [-issues too, but this article's concern
+# | is-] {+issues, different from+} the [-issue of SaaS.-] {+SaaSS issue.+}
+#, fuzzy
+#| msgid ""
+#| "If a service is not SaaS, that does not mean it is OK.  There are other "
+#| "bad things a service can do.  For instance, Facebook distributes video in "
+#| "Flash, which pressures users to run nonfree software, and it gives users "
+#| "a misleading impression of privacy.  Those are important issues too, but "
+#| "this article's concern is the issue of SaaS."
+msgid ""
+"If a service is not SaaSS, that does not mean it is OK.  There are other "
+"ethical issues about services.  For instance, Facebook distributes video in "
+"Flash, which pressures users to run nonfree software; it requires running "
+"nonfree JavaScript code; and it gives users a misleading impression of "
+"privacy while luring them into baring their lives to Facebook.  Those are "
+"important issues, different from the SaaSS issue."
+msgstr ""
+"Ako servis nije SaaS, to ne znači da je u redu. Postoje i druge loše stvari 
"
+"koje servis može napraviti. Na primjer, Facebook distribuira video u Flash "
+"formatu, što vrši pritisak na korisnike da pokreću neslobodni softver, i "
+"daje korisnicima varljiv utisak privatnosti. To su isto važni problemi, ali "
+"tema ovog članka je problem SaaS-a."
+
+#. type: Content of: <p>
+# | Services such as search engines collect data from around the web and let
+# | you examine it.  Looking through their collection of data isn't your own
+# | computing in the usual sense&mdash;you didn't provide that
+# | collection&mdash;so using such a service to search the web is not [-SaaS. 
+# | (However,-] {+SaaSS.  However,+} using someone else's [-search engine-]
+# | {+server+} to implement a search facility for your own site <em>is</em>
+# | [-SaaS.)-] {+SaaSS.+}
+#, fuzzy
+#| msgid ""
+#| "Services such as search engines collect data from around the web and let "
+#| "you examine it.  Looking through their collection of data isn't your own "
+#| "computing in the usual sense&mdash;you didn't provide that "
+#| "collection&mdash;so using such a service to search the web is not SaaS.  "
+#| "(However, using someone else's search engine to implement a search "
+#| "facility for your own site <em>is</em> SaaS.)"
+msgid ""
 "Services such as search engines collect data from around the web and let you "
 "examine it.  Looking through their collection of data isn't your own "
 "computing in the usual sense&mdash;you didn't provide that collection&mdash;"
-"so using such a service to search the web is not SaaS.  (However, using "
-"someone else's search engine to implement a search facility for your own "
-"site <em>is</em> SaaS.)"
+"so using such a service to search the web is not SaaSS.  However, using "
+"someone else's server to implement a search facility for your own site "
+"<em>is</em> SaaSS."
 msgstr ""
 "Servisi kao što su tražilice sakupljaju podatke iz mreže i daju vam ih na "
 "pregled. Pregled njihove kolekcije podataka nije vaša računalna aktivnost u 
"
@@ -363,12 +703,25 @@
 "vašoj vlastitoj stranici <em>jest</em> SaaS.)"
 
 #. type: Content of: <p>
-msgid ""
-"E-commerce is not SaaS, because the computing isn't solely yours; rather, it "
-"is done jointly for you and another party.  So there's no particular reason "
-"why you alone should expect to control that computing.  The real issue in e-"
-"commerce is whether you trust the other party with your money and personal "
-"information."
+# | [-E-commerce-]{+Purchasing online+} is not SaaS{+S+}, because the
+# | computing isn't [-solely yours;-] {+<em>your own</em>;+} rather, it is
+# | done jointly {+by and+} for you and [-another party.  So there's no
+# | particular reason why you alone should expect to control that computing.-]
+# | {+the store.+}  The real issue in [-e-commerce-] {+online shopping+} is
+# | whether you trust the other party with your money and {+other+} personal
+# | [-information.-] {+information (starting with your name).+}
+#, fuzzy
+#| msgid ""
+#| "E-commerce is not SaaS, because the computing isn't solely yours; rather, "
+#| "it is done jointly for you and another party.  So there's no particular "
+#| "reason why you alone should expect to control that computing.  The real "
+#| "issue in e-commerce is whether you trust the other party with your money "
+#| "and personal information."
+msgid ""
+"Purchasing online is not SaaSS, because the computing isn't <em>your own</"
+"em>; rather, it is done jointly by and for you and the store.  The real "
+"issue in online shopping is whether you trust the other party with your "
+"money and other personal information (starting with your name)."
 msgstr ""
 "E-prodavanje nije SaaS, jer računalna aktivnost nije u cjelini vaša; 
radije, "
 "vrši se zajednički za vas i drugu stranku. Prema tome, nema određenog "
@@ -378,10 +731,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"Using a joint project's servers isn't SaaS because the computing you do in "
-"this way isn't yours personally.  For instance, if you edit pages on "
-"Wikipedia, you are not doing your own computing; rather, you are "
-"collaborating in Wikipedia's computing."
+"Repository sites such as as Savannah and SourceForge are not inherently "
+"SaaSS, because a repository's job is publication of data supplied to it."
+msgstr ""
+
+#. type: Content of: <p>
+# | Using a joint project's servers isn't SaaS{+S+} because the computing you
+# | do in this way isn't [-yours personally.-] {+your own.+}  For instance, if
+# | you edit pages on Wikipedia, you are not doing your own computing; rather,
+# | you are collaborating in Wikipedia's computing.  {+Wikipedia controls its
+# | own servers, but organizations as well as individuals encounter the
+# | problem of SaaSS if they do their computing in someone else's server.+}
+#, fuzzy
+#| msgid ""
+#| "Using a joint project's servers isn't SaaS because the computing you do "
+#| "in this way isn't yours personally.  For instance, if you edit pages on "
+#| "Wikipedia, you are not doing your own computing; rather, you are "
+#| "collaborating in Wikipedia's computing."
+msgid ""
+"Using a joint project's servers isn't SaaSS because the computing you do in "
+"this way isn't your own.  For instance, if you edit pages on Wikipedia, you "
+"are not doing your own computing; rather, you are collaborating in "
+"Wikipedia's computing.  Wikipedia controls its own servers, but "
+"organizations as well as individuals encounter the problem of SaaSS if they "
+"do their computing in someone else's server."
 msgstr ""
 "Korištenje zajedničkog poslužitelja za projekte nije SaaS jer računalna "
 "aktivnost koju vršite na taj način nije vaša osobno. Na primjer, ako "
@@ -389,80 +762,30 @@
 "aktivnost; radije, vi sudjelujete u računalnoj aktivnosti Wikipedie."
 
 #. type: Content of: <p>
-msgid ""
-"Wikipedia controls its own servers, but groups can face the problem of SaaS "
-"if they do their group activities on someone else's server.  Fortunately, "
-"development hosting sites such as Savannah and SourceForge don't pose the "
-"SaaS problem, because what groups do there is mainly publication and public "
-"communication, rather than their own private computing."
-msgstr ""
-"Wikipedia kontrolira svoje poslužitelje, ali grupe se mogu susresti sa "
-"problemom SaaS-a ako rade svoje grupne aktivnosti na tuđim poslužiteljima. "
-"Srećom, stranice za udomaćivanje (<i>hosting</i>) razvoja kao što su "
-"Savannah i SourceForge ne postavljaju SaaS problem, jer ono Å¡to grupe rade "
-"na tim stranicama je većinom objavljivanje i javna komunikacija, radije nego 
"
-"privatna računalna aktivnost."
-
-#. type: Content of: <p>
-msgid ""
-"Multiplayer games are a group activity carried out on someone else's server, "
-"which makes them SaaS.  But where the data involved is just the state of "
-"play and the score, the worst wrong the operator might commit is "
-"favoritism.  You might well ignore that risk, since it seems unlikely and "
-"very little is at stake.  On the other hand, when the game becomes more than "
-"just a game, the issue changes."
-msgstr ""
-"Višekorisničke igre su grupna aktivnost koja se vrši na tuđim "
-"poslužiteljima, što ih karakterizira kao SaaS. Ali gdje su podaci u pitanju 
"
-"samo stanje igre i postignuće, najgora nepravda koju operator može 
napraviti "
-"je pristranost. Možete zanemariti taj rizik, pošto se čini nevjerojatno i "
-"malo toga je na ulogu. Sa druge strane, kada igra postane nešto više od "
-"igre, problem se mijenja."
-
-#. type: Content of: <p>
-msgid ""
-"&ldquo;Backend as a Service&rdquo;, or BaaS, is a kind of SaaS, because it "
-"involves running your own web service on top of software that you can't "
-"control.  If you set up a service using BaaS, the BaaS platform may well "
-"collect information about your users as well as you."
-msgstr ""
-"&ldquo;Stražnji kraj kao usluga&rdquo; (&ldquo;<i>Backend as a Service</"
-"i>&rdquo;), ili BaaS, je vrsta SaaS-a, jer uključuje pokretanje vašeg "
-"vlastitog mrežnog servisa nad softverom koji ne možete kontrolirati. Ako "
-"postavite servis koristeći BaaS, BaaS platforma može prikupljati 
informacije "
-"o vašim korisnicima, uključujući i vas."
-
-#. type: Content of: <p>
-msgid ""
-"Which online services are SaaS? Google Docs is a clear example.  Its basic "
-"activity is editing, and Google encourages people to use it for their own "
-"editing; this is SaaS.  It offers the added feature of collaborative "
-"editing, but adding participants doesn't alter the fact that editing on the "
-"server is SaaS.  (In addition, Google Docs is unacceptable because it "
-"installs a large <a href=\"/philosophy/javascript-trap.html\"> nonfree "
-"JavaScript program</a> into the user's browser.)  If using a service for "
-"communication or collaboration requires doing substantial parts of your own "
-"computing with it too, that computing is SaaS even if the communication is "
-"not."
-msgstr ""
-"Koji mrežni servisi su SaaS? Google Docs je jasan primjer. Njegova osnovna "
-"aktivnost je uređivanje, i Google ohrabruje ljude da koriste taj servis za "
-"svoje uređivanje; to je SaaS. Nudi i dodatnu značajku kolaborativnog "
-"uređivanja, ali dodavanje sudionika ne mijenja činjenicu da je uređivanje 
na "
-"poslužitelju SaaS. (Dodatno, Google Docs je neprihvatljiv jer instalira "
-"veliki <a href=\"/philosophy/javascript-trap.html\"> neslobodni JavaScript "
-"program</a> u preglednik korisnika.) Ako korištenje servisa za komunikaciju "
-"ili kolaboraciju s tim još i zahtijeva vršenje znatnog dijela vaše 
vlastite "
-"računalne aktivnosti, ta računalna aktivnost je SaaS čak iako komunikacija 
"
-"nije."
-
-#. type: Content of: <p>
-msgid ""
-"Some sites offer multiple services, and if one is not SaaS, another may be "
-"SaaS.  For instance, the main service of Facebook is social networking, and "
-"that is not SaaS; however, it supports third-party applications, some of "
-"which may be SaaS.  Flickr's main service is distributing photos, which is "
-"not SaaS, but it also has features for editing photos, which is SaaS."
+# | Some sites offer multiple services, and if one is not SaaS{+S+}, another
+# | may be SaaS{+S+}.  For instance, the main service of Facebook is social
+# | networking, and that is not SaaS{+S+}; however, it supports third-party
+# | applications, some of which [-may be SaaS.-] {+are SaaSS.+}  Flickr's main
+# | service is distributing photos, which is not SaaS{+S+}, but it also has
+# | features for editing photos, which is [-SaaS.-] {+SaaSS.  Likewise, using
+# | Instagram to post a photo is not SaaSS, but using it to transform the
+# | photo is SaaSS.+}
+#, fuzzy
+#| msgid ""
+#| "Some sites offer multiple services, and if one is not SaaS, another may "
+#| "be SaaS.  For instance, the main service of Facebook is social "
+#| "networking, and that is not SaaS; however, it supports third-party "
+#| "applications, some of which may be SaaS.  Flickr's main service is "
+#| "distributing photos, which is not SaaS, but it also has features for "
+#| "editing photos, which is SaaS."
+msgid ""
+"Some sites offer multiple services, and if one is not SaaSS, another may be "
+"SaaSS.  For instance, the main service of Facebook is social networking, and "
+"that is not SaaSS; however, it supports third-party applications, some of "
+"which are SaaSS.  Flickr's main service is distributing photos, which is not "
+"SaaSS, but it also has features for editing photos, which is SaaSS.  "
+"Likewise, using Instagram to post a photo is not SaaSS, but using it to "
+"transform the photo is SaaSS."
 msgstr ""
 "Neke stranice nude višestruke servise, i ako jedan od njih nije SaaS, drugi "
 "može biti SaaS. Na primjer, glavni servis Facebooka je društveno "
@@ -473,37 +796,67 @@
 
 #. type: Content of: <p>
 msgid ""
-"Some sites whose main service is publication and communication extend it "
-"with &ldquo;contact management&rdquo;: keeping track of people you have "
-"relationships with.  Sending mail to those people for you is not SaaS, but "
-"keeping track of your dealings with them, if substantial, is SaaS."
-msgstr ""
-"Neke stranice čiji su glavni servisi objavljivanje i komunikacija proširuju 
"
-"to sa &ldquo;upravljanjem kontaktima&rdquo;: praćenje s kojim ljudima ste u "
-"odnosu. Slanje poruka tim ljudima za vas nije SaaS, ali praćenje vaših "
-"poslova s tim ljudima, ako je to u znatnom opsegu, je SaaS."
+"Google Docs shows how complex the evaluation of a single service can "
+"become.  It invites people to edit a document by running a large <a href=\"/"
+"philosophy/javascript-trap.html\">nonfree JavaScript program</a>, clearly "
+"wrong.  However, it offers an API for uploading and downloading documents in "
+"standard formats.  A free software editor can do so through this API.  This "
+"usage scenario is not SaaSS, because it uses Google Docs as a mere "
+"repository.  Showing all your data to a company is bad, but that is a matter "
+"of privacy, not SaaSS; depending on a service for access to your data is "
+"bad, but that is a matter of risk, not SaaSS.  On the other hand, using the "
+"service for converting document formats <em>is</em> SaaSS, because it's "
+"something you could have done by running a suitable program (free, one "
+"hopes) in your own computer."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"If a service is not SaaS, that does not mean it is OK.  There are other bad "
-"things a service can do.  For instance, Facebook distributes video in Flash, "
-"which pressures users to run nonfree software, and it gives users a "
-"misleading impression of privacy.  Those are important issues too, but this "
-"article's concern is the issue of SaaS."
+"Using Google Docs through a free editor is rare, of course.  Most often, "
+"people use it through the nonfree JavaScript program, which is bad like any "
+"nonfree program.  This scenario might involve SaaSS, too; that depends on "
+"what part of the editing is done in the JavaScript program and what part in "
+"the server.  We don't know, but since SaaSS and proprietary software do "
+"similar wrong to the user, it is not crucial to know."
 msgstr ""
-"Ako servis nije SaaS, to ne znači da je u redu. Postoje i druge loše stvari 
"
-"koje servis može napraviti. Na primjer, Facebook distribuira video u Flash "
-"formatu, što vrši pritisak na korisnike da pokreću neslobodni softver, i "
-"daje korisnicima varljiv utisak privatnosti. To su isto važni problemi, ali "
-"tema ovog članka je problem SaaS-a."
 
 #. type: Content of: <p>
 msgid ""
-"The IT industry discourages users from considering these distinctions.  "
-"That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is "
-"so nebulous that it could refer to almost any use of the Internet.  It "
-"includes SaaS and it includes nearly everything else.  The term only lends "
-"itself to uselessly broad statements."
+"Publishing via someone else's repository does not raise privacy issues, but "
+"publishing through Google Docs has a special problem: it is impossible even "
+"to <em>view the text</em> of a Google Docs document in a browser without "
+"running the nonfree JavaScript code.  Thus, you should not use Google Docs "
+"to publish anything&mdash;but the reason is not a matter of SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+# | The IT industry discourages users from [-considering-] {+making+} these
+# | distinctions.  That's what the buzzword &ldquo;cloud computing&rdquo; is
+# | for.  This term is so nebulous that it could refer to almost any use of
+# | the Internet.  It includes [-SaaS and it includes nearly everything
+# | else.-] {+SaaSS as well as many other network usage practices.  In any
+# | given context, an author who writes &ldquo;cloud&rdquo; (if a technical
+# | person) probably has a specific meaning in mind, but usually does not
+# | explain that in other articles the term has other specific meanings.+} 
+# | The term [-only lends itself-] {+leads people to generalize about
+# | practices they ought+} to [-uselessly broad statements.-] {+consider
+# | individually.+}
+#, fuzzy
+#| msgid ""
+#| "The IT industry discourages users from considering these distinctions.  "
+#| "That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term "
+#| "is so nebulous that it could refer to almost any use of the Internet.  It "
+#| "includes SaaS and it includes nearly everything else.  The term only "
+#| "lends itself to uselessly broad statements."
+msgid ""
+"The IT industry discourages users from making these distinctions.  That's "
+"what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is so "
+"nebulous that it could refer to almost any use of the Internet.  It includes "
+"SaaSS as well as many other network usage practices.  In any given context, "
+"an author who writes &ldquo;cloud&rdquo; (if a technical person) probably "
+"has a specific meaning in mind, but usually does not explain that in other "
+"articles the term has other specific meanings.  The term leads people to "
+"generalize about practices they ought to consider individually."
 msgstr ""
 "IT industrija obeshrabruje korisnike od razmatranja ovih distinkcija. U tu "
 "svrhu se koristi <i>buzzword</i> &ldquo;oblak&rdquo; (&ldquo;<i>cloud "
@@ -512,13 +865,36 @@
 "skoro pa sve drugo. Termin se koristi samo za beskorisne općenite izjave."
 
 #. type: Content of: <p>
-msgid ""
-"The real meaning of &ldquo;cloud computing&rdquo; is to suggest a devil-may-"
-"care approach towards your computing.  It says, &ldquo;Don't ask questions, "
-"just trust every business without hesitation.  Don't worry about who "
+# | [-The real meaning of-]{+If+} &ldquo;cloud computing&rdquo; {+has a
+# | meaning, it+} is [-to suggest-] {+not a way of doing computing, but rather
+# | a way of thinking about computing:+} a devil-may-care approach [-towards
+# | your computing.  It-] {+which+} says, &ldquo;Don't ask [-questions, just
+# | trust every business without hesitation.-] {+questions.+}  Don't worry
+# | about who controls your computing or who holds your data.  Don't check for
+# | a hook hidden inside our service before you swallow [-it.&rdquo;-] {+it. 
+# | Trust companies without hesitation.&rdquo;+} In other words,
+# | [-&ldquo;Think like-] {+&ldquo;Be+} a sucker.&rdquo; [-I prefer-] {+A
+# | cloud in the mind is an obstacle+} to {+clear thinking.  For the sake of
+# | clear thinking about computing, let's+} avoid the [-term.-] {+term
+# | &ldquo;cloud.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "The real meaning of &ldquo;cloud computing&rdquo; is to suggest a devil-"
+#| "may-care approach towards your computing.  It says, &ldquo;Don't ask "
+#| "questions, just trust every business without hesitation.  Don't worry "
+#| "about who controls your computing or who holds your data.  Don't check "
+#| "for a hook hidden inside our service before you swallow it.&rdquo; In "
+#| "other words, &ldquo;Think like a sucker.&rdquo; I prefer to avoid the "
+#| "term."
+msgid ""
+"If &ldquo;cloud computing&rdquo; has a meaning, it is not a way of doing "
+"computing, but rather a way of thinking about computing: a devil-may-care "
+"approach which says, &ldquo;Don't ask questions.  Don't worry about who "
 "controls your computing or who holds your data.  Don't check for a hook "
-"hidden inside our service before you swallow it.&rdquo; In other words, "
-"&ldquo;Think like a sucker.&rdquo; I prefer to avoid the term."
+"hidden inside our service before you swallow it.  Trust companies without "
+"hesitation.&rdquo; In other words, &ldquo;Be a sucker.&rdquo; A cloud in the "
+"mind is an obstacle to clear thinking.  For the sake of clear thinking about "
+"computing, let's avoid the term &ldquo;cloud.&rdquo;"
 msgstr ""
 "Pravo značenje &ldquo;oblaka&rdquo; je predlaganje nikome-nije-stalo "
 "pristupa vašim računalnim aktivnostima. Termin predlaže: &ldquo;Ne "
@@ -529,24 +905,51 @@
 "&rdquo; Preferiram izbjegavanje tog termina."
 
 #. type: Content of: <h3>
-msgid "Dealing with the SaaS Problem"
+# | Dealing with the SaaS{+S+} Problem
+#, fuzzy
+#| msgid "Dealing with the SaaS Problem"
+msgid "Dealing with the SaaSS Problem"
 msgstr "Bavljenje SaaS problemom"
 
 #. type: Content of: <p>
+# | Only a small fraction of all web sites do SaaS{+S+}; most don't raise the
+# | issue.  But what should we do about the ones that raise it?
+#, fuzzy
+#| msgid ""
+#| "Only a small fraction of all web sites do SaaS; most don't raise the "
+#| "issue.  But what should we do about the ones that raise it?"
 msgid ""
-"Only a small fraction of all web sites do SaaS; most don't raise the issue.  "
-"But what should we do about the ones that raise it?"
+"Only a small fraction of all web sites do SaaSS; most don't raise the "
+"issue.  But what should we do about the ones that raise it?"
 msgstr ""
 "Samo mala frakcija mrežnih stranica rade SaaS; većina ne predstavlja "
 "problem. No, Å¡to da radimo s onima koji predstavljaju problem?"
 
 #. type: Content of: <p>
+# | For the simple case, where you are doing your own computing on data in
+# | your own hands, the solution is simple: use your own copy of a free
+# | software application.  Do your text editing with your copy of a free text
+# | editor such as GNU Emacs or a free word processor.  Do your photo editing
+# | with your copy of free software such as GIMP.  {+What if there is no free
+# | program available? A proprietary program or SaaSS would take away your
+# | freedom, so you shouldn't use those.  You can contribute your time or your
+# | money to development of a free replacement.+}
+#, fuzzy
+#| msgid ""
+#| "For the simple case, where you are doing your own computing on data in "
+#| "your own hands, the solution is simple: use your own copy of a free "
+#| "software application.  Do your text editing with your copy of a free text "
+#| "editor such as GNU Emacs or a free word processor.  Do your photo editing "
+#| "with your copy of free software such as GIMP."
 msgid ""
 "For the simple case, where you are doing your own computing on data in your "
 "own hands, the solution is simple: use your own copy of a free software "
 "application.  Do your text editing with your copy of a free text editor such "
 "as GNU Emacs or a free word processor.  Do your photo editing with your copy "
-"of free software such as GIMP."
+"of free software such as GIMP.  What if there is no free program available? "
+"A proprietary program or SaaSS would take away your freedom, so you "
+"shouldn't use those.  You can contribute your time or your money to "
+"development of a free replacement."
 msgstr ""
 "Za jednostavan slučaj, gdje vršite vaše vlastite računalne aktivnosti nad 
"
 "podacima koji su u vašim rukama, riješenje je jednostavno: koristite svoju "
@@ -556,17 +959,44 @@
 "kopijom slobodnog softvera kao Å¡to je GIMP."
 
 #. type: Content of: <p>
-msgid ""
-"But what about collaborating with other individuals? It may be hard to do "
-"this at present without using a server.  If you use one, don't trust a "
-"server run by a company.  A mere contract as a customer is no protection "
-"unless you could detect a breach and could really sue, and the company "
-"probably writes its contracts to permit a broad range of abuses.  Police can "
-"subpoena your data from the company with less basis than required to "
-"subpoena them from you, supposing the company doesn't volunteer them like "
-"the US phone companies that illegally wiretapped their customers for Bush.  "
-"If you must use a server, use a server whose operators give you a basis for "
-"trust beyond a mere commercial relationship."
+# | [-But what-]{+What+} about collaborating with other [-individuals?-]
+# | {+individuals as a group?+} It may be hard to do this at present without
+# | using a {+server, and your group may not know how to run its own+} server.
+# |  If you use [-one,-] {+someone else's server, at least+} don't trust a
+# | server run by a company.  A mere contract as a customer is no protection
+# | unless you could detect a breach and could really sue, and the company
+# | probably writes its contracts to permit a broad range of abuses. 
+# | [-Police-]  {+The state+} can subpoena your data from the company
+# | {+along+} with [-less basis than required-] {+everyone else's, as Obama
+# | has done+} to [-subpoena them from you,-] {+phone companies,+} supposing
+# | the company doesn't volunteer them like the US phone companies that
+# | illegally wiretapped their customers for Bush.  If you must use a server,
+# | use a server whose operators give you a basis for trust beyond a mere
+# | commercial relationship.
+#, fuzzy
+#| msgid ""
+#| "But what about collaborating with other individuals? It may be hard to do "
+#| "this at present without using a server.  If you use one, don't trust a "
+#| "server run by a company.  A mere contract as a customer is no protection "
+#| "unless you could detect a breach and could really sue, and the company "
+#| "probably writes its contracts to permit a broad range of abuses.  Police "
+#| "can subpoena your data from the company with less basis than required to "
+#| "subpoena them from you, supposing the company doesn't volunteer them like "
+#| "the US phone companies that illegally wiretapped their customers for "
+#| "Bush.  If you must use a server, use a server whose operators give you a "
+#| "basis for trust beyond a mere commercial relationship."
+msgid ""
+"What about collaborating with other individuals as a group? It may be hard "
+"to do this at present without using a server, and your group may not know "
+"how to run its own server.  If you use someone else's server, at least don't "
+"trust a server run by a company.  A mere contract as a customer is no "
+"protection unless you could detect a breach and could really sue, and the "
+"company probably writes its contracts to permit a broad range of abuses.  "
+"The state can subpoena your data from the company along with everyone "
+"else's, as Obama has done to phone companies, supposing the company doesn't "
+"volunteer them like the US phone companies that illegally wiretapped their "
+"customers for Bush.  If you must use a server, use a server whose operators "
+"give you a basis for trust beyond a mere commercial relationship."
 msgstr ""
 "Ali što je sa kolaboracijom sa drugim pojedincima? Trenutno, ovo je možda "
 "teško napraviti bez korištenja poslužitelja. Ako koristite poslužitelj, 
ne "
@@ -605,13 +1035,28 @@
 "slobodnog softvera da razmotre to pitanje u svojem dizajnu."
 
 #. type: Content of: <p>
+# | In the meantime, if a company invites you to use its server to do your own
+# | computing tasks, don't yield; don't use SaaS{+S+}.  Don't buy or install
+# | &ldquo;thin clients&rdquo;, which are simply computers so weak they make
+# | you do the real work on a server, unless you're going to use them with
+# | <em>your</em> server.  Use a real computer and keep your data there.  Do
+# | your [-work-] {+own computing+} with your own copy of a free program, for
+# | your freedom's sake.
+#, fuzzy
+#| msgid ""
+#| "In the meantime, if a company invites you to use its server to do your "
+#| "own computing tasks, don't yield; don't use SaaS.  Don't buy or install "
+#| "&ldquo;thin clients&rdquo;, which are simply computers so weak they make "
+#| "you do the real work on a server, unless you're going to use them with "
+#| "<em>your</em> server.  Use a real computer and keep your data there.  Do "
+#| "your work with your own copy of a free program, for your freedom's sake."
 msgid ""
 "In the meantime, if a company invites you to use its server to do your own "
-"computing tasks, don't yield; don't use SaaS.  Don't buy or install &ldquo;"
+"computing tasks, don't yield; don't use SaaSS.  Don't buy or install &ldquo;"
 "thin clients&rdquo;, which are simply computers so weak they make you do the "
 "real work on a server, unless you're going to use them with <em>your</em> "
-"server.  Use a real computer and keep your data there.  Do your work with "
-"your own copy of a free program, for your freedom's sake."
+"server.  Use a real computer and keep your data there.  Do your own "
+"computing with your own copy of a free program, for your freedom's sake."
 msgstr ""
 "U međuvremenu, ako vas kompanija pozove da koristite njihove poslužitelje 
da "
 "vršite vaše vlastite računalne zadatke, nemojte popustiti; ne koristite "
@@ -641,23 +1086,38 @@
 "engleskom znači &ldquo;zapaliti&rdquo;.</li></ol>"
 
 #. type: Content of: <div><p>
-msgid ""
-"Please send 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."
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&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>."
+msgid ""
+"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"
+"org&gt;</a>."
 msgstr ""
 "Molim vas šaljite općenite FSF &amp; GNU upite na <a 
href=\"mailto:address@hidden";
 "org\">&lt;address@hidden&gt;</a>. Postoje isto i <a href=\"/contact/\">drugi "
-"načini kontaktiranja</a> FSF-a."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Prekinute poveznice i drugi ispravci ili prijedlozi mogu biti poslani na <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. "
-
+"načini kontaktiranja</a> FSF-a. Prekinute poveznice i drugi ispravci ili "
+"prijedlozi mogu biti poslani na <a href=\"mailto:address@hidden";>&lt;"
+"address@hidden&gt;</a>. "
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -673,7 +1133,10 @@
 "prijevode</a>."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010 Richard Stallman"
+# | Copyright &copy; [-2010-] {+2010, 2013+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2010 Richard Stallman"
+msgid "Copyright &copy; 2010, 2013 Richard Stallman"
 msgstr "Copyright &copy; 2010 Richard Stallman"
 
 #. type: Content of: <div><p>
@@ -695,3 +1158,124 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Zadnji put promijenjeno:"
+
+#~ msgid ""
+#~ "Some proprietary programs can mistreat users under remote command.  For "
+#~ "instance, Windows has a back door with which Microsoft can forcibly "
+#~ "change any software on the machine.  The Amazon Kindle e-book reader "
+#~ "(whose name suggests it's intended to burn people's books) has an "
+#~ "Orwellian back door that Amazon used in 2009 to <a href=\"http://www.";
+#~ "nytimes.com/2009/07/18/technology/companies/18amazon.html\" >remotely "
+#~ "delete</a> Kindle copies of Orwell's books <cite>1984</cite> and "
+#~ "<cite>Animal Farm</cite> which the users had purchased from Amazon."
+#~ msgstr ""
+#~ "Neki vlasnički programi mogu maltretirati korisnike daljinskim "
+#~ "upravljanjem. Na primjer, Windowsi imaju stražnja vrata s kojima "
+#~ "Microsoft može na silu izmijeniti svaki softver na stroju. Čitač 
e-knjiga "
+#~ "Amazon Kindle (čije ime naznačuje da je namijenjen spaljivanju<sup><a "
+#~ "href=\"#TransNote1\">1</a></sup> knjiga korisnika) ima Orwellianska "
+#~ "stražnja vrata koja je Amazon iskoristio 2009. da bi <a 
href=\"http://www.";
+#~ "nytimes.com/2009/07/18/technology/companies/18amazon.html\" >na daljinu "
+#~ "izbrisao</a> Kindle kopiju Orwellovih knjiga <cite>1984</cite> i "
+#~ "<cite>Životinjska farma</cite> koje su korisnici kupili u Amazonu."
+
+#~ msgid ""
+#~ "SaaS inherently gives the server operator the power to change the "
+#~ "software in use, or the users' data being operated on.  Once again, no "
+#~ "special code is needed to do this."
+#~ msgstr ""
+#~ "SaaS inherentno daje operatoru poslužitelja moć da izmjeni softver koji "
+#~ "se koristi, ili podatke korisnika nad kojima se vrše operacije. Još "
+#~ "jednom, nikakav poseban kod nije potreban da bi se to napravilo."
+
+#~ msgid ""
+#~ "Wikipedia controls its own servers, but groups can face the problem of "
+#~ "SaaS if they do their group activities on someone else's server.  "
+#~ "Fortunately, development hosting sites such as Savannah and SourceForge "
+#~ "don't pose the SaaS problem, because what groups do there is mainly "
+#~ "publication and public communication, rather than their own private "
+#~ "computing."
+#~ msgstr ""
+#~ "Wikipedia kontrolira svoje poslužitelje, ali grupe se mogu susresti sa "
+#~ "problemom SaaS-a ako rade svoje grupne aktivnosti na tuđim "
+#~ "poslužiteljima. Srećom, stranice za udomaćivanje (<i>hosting</i>) 
razvoja "
+#~ "kao Å¡to su Savannah i SourceForge ne postavljaju SaaS problem, jer ono "
+#~ "što grupe rade na tim stranicama je većinom objavljivanje i javna "
+#~ "komunikacija, radije nego privatna računalna aktivnost."
+
+#~ msgid ""
+#~ "Multiplayer games are a group activity carried out on someone else's "
+#~ "server, which makes them SaaS.  But where the data involved is just the "
+#~ "state of play and the score, the worst wrong the operator might commit is "
+#~ "favoritism.  You might well ignore that risk, since it seems unlikely and "
+#~ "very little is at stake.  On the other hand, when the game becomes more "
+#~ "than just a game, the issue changes."
+#~ msgstr ""
+#~ "Višekorisničke igre su grupna aktivnost koja se vrši na tuđim "
+#~ "poslužiteljima, što ih karakterizira kao SaaS. Ali gdje su podaci u "
+#~ "pitanju samo stanje igre i postignuće, najgora nepravda koju operator "
+#~ "može napraviti je pristranost. Možete zanemariti taj rizik, pošto se 
čini "
+#~ "nevjerojatno i malo toga je na ulogu. Sa druge strane, kada igra postane "
+#~ "nešto više od igre, problem se mijenja."
+
+#~ msgid ""
+#~ "&ldquo;Backend as a Service&rdquo;, or BaaS, is a kind of SaaS, because "
+#~ "it involves running your own web service on top of software that you "
+#~ "can't control.  If you set up a service using BaaS, the BaaS platform may "
+#~ "well collect information about your users as well as you."
+#~ msgstr ""
+#~ "&ldquo;Stražnji kraj kao usluga&rdquo; (&ldquo;<i>Backend as a Service</"
+#~ "i>&rdquo;), ili BaaS, je vrsta SaaS-a, jer uključuje pokretanje vašeg "
+#~ "vlastitog mrežnog servisa nad softverom koji ne možete kontrolirati. Ako 
"
+#~ "postavite servis koristeći BaaS, BaaS platforma može prikupljati "
+#~ "informacije o vašim korisnicima, uključujući i vas."
+
+#~ msgid ""
+#~ "Which online services are SaaS? Google Docs is a clear example.  Its "
+#~ "basic activity is editing, and Google encourages people to use it for "
+#~ "their own editing; this is SaaS.  It offers the added feature of "
+#~ "collaborative editing, but adding participants doesn't alter the fact "
+#~ "that editing on the server is SaaS.  (In addition, Google Docs is "
+#~ "unacceptable because it installs a large <a href=\"/philosophy/javascript-"
+#~ "trap.html\"> nonfree JavaScript program</a> into the user's browser.)  If "
+#~ "using a service for communication or collaboration requires doing "
+#~ "substantial parts of your own computing with it too, that computing is "
+#~ "SaaS even if the communication is not."
+#~ msgstr ""
+#~ "Koji mrežni servisi su SaaS? Google Docs je jasan primjer. Njegova "
+#~ "osnovna aktivnost je uređivanje, i Google ohrabruje ljude da koriste taj "
+#~ "servis za svoje uređivanje; to je SaaS. Nudi i dodatnu značajku "
+#~ "kolaborativnog uređivanja, ali dodavanje sudionika ne mijenja činjenicu "
+#~ "da je uređivanje na poslužitelju SaaS. (Dodatno, Google Docs je "
+#~ "neprihvatljiv jer instalira veliki <a href=\"/philosophy/javascript-trap."
+#~ "html\"> neslobodni JavaScript program</a> u preglednik korisnika.) Ako "
+#~ "korištenje servisa za komunikaciju ili kolaboraciju s tim još i 
zahtijeva "
+#~ "vršenje znatnog dijela vaše vlastite računalne aktivnosti, ta 
računalna "
+#~ "aktivnost je SaaS čak iako komunikacija nije."
+
+#~ msgid ""
+#~ "Some sites whose main service is publication and communication extend it "
+#~ "with &ldquo;contact management&rdquo;: keeping track of people you have "
+#~ "relationships with.  Sending mail to those people for you is not SaaS, "
+#~ "but keeping track of your dealings with them, if substantial, is SaaS."
+#~ msgstr ""
+#~ "Neke stranice čiji su glavni servisi objavljivanje i komunikacija "
+#~ "proširuju to sa &ldquo;upravljanjem kontaktima&rdquo;: praćenje s kojim "
+#~ "ljudima ste u odnosu. Slanje poruka tim ljudima za vas nije SaaS, ali "
+#~ "praćenje vaših poslova s tim ljudima, ako je to u znatnom opsegu, je 
SaaS."
+
+#~ msgid ""
+#~ "Please send 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."
+#~ msgstr ""
+#~ "Molim vas šaljite općenite FSF &amp; GNU upite na <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>. Postoje isto i <a 
href=\"/contact/"
+#~ "\">drugi načini kontaktiranja</a> FSF-a."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Prekinute poveznice i drugi ispravci ili prijedlozi mogu biti poslani na "
+#~ "<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. "

Index: who-does-that-server-really-serve.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/who-does-that-server-really-serve.ja.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- who-does-that-server-really-serve.ja.po     11 Jun 2013 23:58:37 -0000      
1.6
+++ who-does-that-server-really-serve.ja.po     18 Jun 2013 05:29:59 -0000      
1.7
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: who-does-that-server-really-serve.html\n"
-"POT-Creation-Date: 2013-06-06 16:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2013-06-12 08:53+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -14,11 +14,15 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2013-06-18 05:25+0000\n"
 
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "Who Does That Server Really Serve? - GNU Project - Free Software "
+#| "Foundation (FSF)"
 msgid ""
-"Who Does That Server Really Serve? - GNU Project - Free Software Foundation "
-"(FSF)"
+"Who Does That Server Really Serve? - GNU Project - Free Software Foundation"
 msgstr ""
 "そのサーバはいったい誰にサーブするのか? - 
GNUプロジェクト - フリーソフトウェ"
 "アファウンデーション (FSF)"
@@ -31,25 +35,45 @@
 msgid "by <strong>Richard Stallman</strong>"
 msgstr "<strong>リチャード・ストールマン</strong>著"
 
-#. type: Content of: <p>
+#. type: Content of: <blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "(First published by <a href=\"http://www.bostonreview.net/richard-";
+#| "stallman-free-software-DRM\"> Boston Review</a>.)"
 msgid ""
-"(First published by <a href=\"http://www.bostonreview.net/richard-stallman-";
-"free-software-DRM\"> Boston Review</a>.)"
+"(The first version was published in <a href=\"http://www.bostonreview.net/";
+"richard-stallman-free-software-DRM\"> Boston Review</a>.)"
 msgstr ""
 "(<a href=\"http://www.bostonreview.net/richard-stallman-free-software-DRM\";>"
 "ボストン・レビュー</a>に最初に掲載されました。)"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<strong>On the Internet, proprietary software isn't the only way to lose "
+#| "your freedom.  Software as a Service is another way to let someone else "
+#| "have power over your computing.</strong>"
 msgid ""
 "<strong>On the Internet, proprietary software isn't the only way to lose "
-"your freedom.  Software as a Service is another way to let someone else have "
-"power over your computing.</strong>"
+"your freedom.  Service as a Software Substitute, or SaaSS, is another way to "
+"let someone else have power over your computing.</strong>"
 msgstr ""
 
"<strong>インターネットでは、プロプライエタリなソフトウェアã
 ã‘が自由を失う唯"
 
"一の方法ではありません。サービスとしてのソフトウェア(SaaS)は、ほかの誰かにあ"
 "なたのコンピューティングに対しての支é…
åŠ›ã‚’持たせる、もう一つの方法です。</"
 "strong>"
 
+#. type: Content of: outside any tag (error?)
+msgid ""
+"SaaSS means using a service implemented by someone else as a substitute for "
+"running your copy of a program.  The term is ours; articles and ads won't "
+"use it, and they won't tell you whether a service is SaaSS.  Instead they "
+"will probably use the vague and distracting term &ldquo;cloud&rdquo;, which "
+"lumps SaaSS together with various other practices, some abusive and some "
+"ok.  With the explanation and examples in this page, you can tell whether a "
+"service is SaaSS."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Background: How Proprietary Software Takes Away Your Freedom"
 msgstr ""
@@ -95,12 +119,19 @@
 "フトウェアの定義</a>をご覧ください。)"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "With free software, we, the users, take back control of our computing.  "
+#| "Proprietary software still exists, but we can exclude it from our lives "
+#| "and many of us have done so.  However, we now face a new threat to our "
+#| "control over our computing: Software as a Service.  For our freedom's "
+#| "sake, we have to reject that too."
 msgid ""
 "With free software, we, the users, take back control of our computing.  "
 "Proprietary software still exists, but we can exclude it from our lives and "
 "many of us have done so.  However, we now face a new threat to our control "
-"over our computing: Software as a Service.  For our freedom's sake, we have "
-"to reject that too."
+"over our computing: Service as a Software Substitute (SaaSS).  For our "
+"freedom's sake, we have to reject that too."
 msgstr ""
 
"自由ソフトウェアで、わたしたちユーザはわたしたちのコンピューティングのコント"
 
"ロールを取り戻します。プロプライエタリなソフトウェアは、なお存在しますが、わ"
@@ -111,17 +142,29 @@
 "ません。"
 
 #. type: Content of: <h3>
-msgid "How Software as a Service Takes Away Your Freedom"
+#, fuzzy
+#| msgid "How Software as a Service Takes Away Your Freedom"
+msgid "How Service as a Software Substitute Takes Away Your Freedom"
 msgstr 
"どのようにサービスとしてのソフトウェア(SaaS)はあなたの自由を奪うか"
 
 #. type: Content of: <p>
-msgid ""
-"Software as a Service (SaaS) means that someone sets up a network server "
-"that does certain computing tasks&mdash;running spreadsheets, word "
-"processing, translating text into another language, etc.&mdash;then invites "
-"users to do their computing on that server.  Users send their data to the "
-"server, which does their computing on the data thus provided, then sends the "
-"results back or acts on them directly."
+#, fuzzy
+#| msgid ""
+#| "Software as a Service (SaaS) means that someone sets up a network server "
+#| "that does certain computing tasks&mdash;running spreadsheets, word "
+#| "processing, translating text into another language, etc.&mdash;then "
+#| "invites users to do their computing on that server.  Users send their "
+#| "data to the server, which does their computing on the data thus provided, "
+#| "then sends the results back or acts on them directly."
+msgid ""
+"Service as a Software Substitute (SaaSS) means using a service as a "
+"substitute for running your copy of a program.  Concretely, it means that "
+"someone sets up a network server that does certain computing tasks&mdash;for "
+"instance, modifying a photo, translating text into another language, etc."
+"&mdash;then invites users to do computing via that server.  A user of the "
+"server would send her data to the server, which does <em>her own computing</"
+"em> on the data thus provided, then sends the results back to her or acts "
+"directly on her behalf."
 msgstr ""
 
"サービスとしてのソフトウェア(SaaS)は誰かがネットワークサーバを設置して、ある"
 
"コンピューティングのタスク(スプレッドシート、ワードプロセッサ、テキストの別の"
@@ -132,11 +175,26 @@
 
 #. type: Content of: <p>
 msgid ""
+"The computing is <em>her own</em> because, by assumption, she could, in "
+"principle, have done it by running a program on her own computer (whether or "
+"not that program is available to her at present).  When this assumption is "
+"not so, it isn't SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These servers wrest control from the users even more inexorably than "
+#| "proprietary software.  With proprietary software, users typically get an "
+#| "executable file but not the source code.  That makes it hard for "
+#| "programmers to study the code that is running, so it's hard to determine "
+#| "what the program really does, and hard to change it."
+msgid ""
 "These servers wrest control from the users even more inexorably than "
 "proprietary software.  With proprietary software, users typically get an "
-"executable file but not the source code.  That makes it hard for programmers "
-"to study the code that is running, so it's hard to determine what the "
-"program really does, and hard to change it."
+"executable file but not the source code.  That makes it hard to study the "
+"code that is running, so it's hard to determine what the program really "
+"does, and hard to change it."
 msgstr ""
 
"これらのサーバはプロプライエタリソフトウェアよりもより容赦なく、ユーザからコ"
 
"ントロールをもぎ取ります。プロプライエタリソフトウェアでは、å
…¸åž‹çš„には、ユー"
@@ -146,10 +204,16 @@
 "とです。"
 
 #. type: Content of: <p>
-msgid ""
-"With SaaS, the users do not have even the executable file: it is on the "
-"server, where the users can't see or touch it.  Thus it is impossible for "
-"them to ascertain what it really does, and impossible to change it."
+#, fuzzy
+#| msgid ""
+#| "With SaaS, the users do not have even the executable file: it is on the "
+#| "server, where the users can't see or touch it.  Thus it is impossible for "
+#| "them to ascertain what it really does, and impossible to change it."
+msgid ""
+"With SaaSS, the users do not have even the executable file that does their "
+"computing: it is on someone else's server, where the users can't see or "
+"touch it.  Thus it is impossible for them to ascertain what it really does, "
+"and impossible to change it."
 msgstr ""
 
"SaaSでは、ユーザは実行ファイルさえ有しません。それはサーバにあり、ユーザは見"
 
"ることも触ることもできません。ですから、ユーザにとってそれが実際に何をするの"
@@ -157,12 +221,26 @@
 
 #. type: Content of: <p>
 msgid ""
-"Furthermore, SaaS automatically leads to harmful consequences equivalent to "
-"the malicious features of certain proprietary software.  For instance, some "
-"proprietary programs are &ldquo;spyware&rdquo;: the program sends out data "
-"about users' computing activities.  Microsoft Windows sends information "
-"about users' activities to Microsoft.  Windows Media Player and RealPlayer "
-"report what each user watches or listens to."
+"Furthermore, SaaSS automatically leads to consequences equivalent to the "
+"malicious features of certain proprietary software."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Furthermore, SaaS automatically leads to harmful consequences equivalent "
+#| "to the malicious features of certain proprietary software.  For instance, "
+#| "some proprietary programs are &ldquo;spyware&rdquo;: the program sends "
+#| "out data about users' computing activities.  Microsoft Windows sends "
+#| "information about users' activities to Microsoft.  Windows Media Player "
+#| "and RealPlayer report what each user watches or listens to."
+msgid ""
+"For instance, some proprietary programs are &ldquo;spyware&rdquo;: the "
+"program sends out data about users' computing activities.  Microsoft Windows "
+"sends information about users' activities to Microsoft.  Windows Media "
+"Player reports what each user watches or listens to.  The Amazon Kindle "
+"reports which pages of which books the user looks at, and when.  Angry Birds "
+"reports the user's geolocation history."
 msgstr ""
 
"さらに、SaaSは、ある種のプロプライエタリ・ソフトウェアの悪意ある機能と同等の"
 
"有害な結果を自動的にもたらします。たとえば、あるプロプライエタリ・ソフトウェ"
@@ -172,11 +250,18 @@
 "れのユーザが視聴するものを報告します。"
 
 #. type: Content of: <p>
-msgid ""
-"Unlike proprietary software, SaaS does not require covert code to obtain the "
-"user's data.  Instead, users must send their data to the server in order to "
-"use it.  This has the same effect as spyware: the server operator gets the "
-"data.  He gets it with no special effort, by the nature of SaaS."
+#, fuzzy
+#| msgid ""
+#| "Unlike proprietary software, SaaS does not require covert code to obtain "
+#| "the user's data.  Instead, users must send their data to the server in "
+#| "order to use it.  This has the same effect as spyware: the server "
+#| "operator gets the data.  He gets it with no special effort, by the nature "
+#| "of SaaS."
+msgid ""
+"Unlike proprietary software, SaaSS does not require covert code to obtain "
+"the user's data.  Instead, users must send their data to the server in order "
+"to use it.  This has the same effect as spyware: the server operator gets "
+"the data&mdash;with no special effort, by the nature of SaaSS."
 msgstr ""
 
"プロプライエタリ・ソフトウェアと違って、SaaSはユーザのデータを獲得するéš
 ã•ã‚Œ"
 "たコードを必
要としません。代わりに、ユーザは使うためにデータをサーバに送らな"
@@ -186,53 +271,80 @@
 
 #. type: Content of: <p>
 msgid ""
-"Some proprietary programs can mistreat users under remote command.  For "
-"instance, Windows has a back door with which Microsoft can forcibly change "
-"any software on the machine.  The Amazon Kindle e-book reader (whose name "
-"suggests it's intended to burn people's books) has an Orwellian back door "
-"that Amazon used in 2009 to <a href=\"http://www.nytimes.com/2009/07/18/";
-"technology/companies/18amazon.html\" >remotely delete</a> Kindle copies of "
-"Orwell's books <cite>1984</cite> and <cite>Animal Farm</cite> which the "
-"users had purchased from Amazon."
-msgstr ""
-"あるプロプライエタリ・プログラムは遠
隔操作のコマンドでユーザを虐待することが"
-"できます。たとえば、ウィンドウズにはバックドアがあり、マイクロソフトはそのマ"
-"シンのいかなるソフトウェアも強制的に変更することができます。アマゾン・キンド"
-"ルe-bookリーダ(その名前は、それが人々
の書籍を焼くこと意図していることを暗示し"
-"ています)は、オーウェルのバックドアを有し、アマゾンは2009年に<a
 href="
-"\"http://www.nytimes.com/2009/07/18/technology/companies/18amazon.html\"; >遠"
-"隔操作で削除する</a>のにその機能を使い、キンドル上のユーザがアマゾンで購å
…¥ã—"
-"たオーウェルの書籍<cite>1984</cite>と<cite>Animal 
Farm</cite>を削除しました。"
+"Some proprietary operating systems have a universal back door, permitting "
+"someone to remotely install software changes.  For instance, Windows has a "
+"universal back door with which Microsoft can forcibly change any software on "
+"the machine.  Nearly all portable phones have them, too.  Some proprietary "
+"applications also have universal back doors; for instance, the Steam client "
+"for GNU/Linux allows the developer to remotely install modified versions."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"SaaS inherently gives the server operator the power to change the software "
-"in use, or the users' data being operated on.  Once again, no special code "
-"is needed to do this."
-msgstr ""
-"SaaSは本質的にサーバのオペレータに、使用するソフトウェアを変更する力、もしく"
-"は、操作されるユーザのデータを変更する力を与えます。ここでもまた、そうするの"
-"に特別なコードは必要ないのです。"
+"With SaaSS, the server operator can change the software in use on the "
+"server.  He ought to be able to do this, since it's his computer; but the "
+"result is the same as using a proprietary application program with a "
+"universal back door: someone has the power to silently impose changes in how "
+"the user's computing gets done."
+msgstr ""
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Thus, SaaS is equivalent to total spyware and a gaping wide back door, "
+#| "and gives the server operator unjust power over the user.  We can't "
+#| "accept that."
 msgid ""
-"Thus, SaaS is equivalent to total spyware and a gaping wide back door, and "
-"gives the server operator unjust power over the user.  We can't accept that."
+"Thus, SaaSS is equivalent to running proprietary software with spyware and a "
+"universal back door.  It gives the server operator unjust power over the "
+"user, and that power is something we must resist."
 msgstr ""
 "ですから、SaaSは完å…
¨ãªã‚¹ãƒ‘イウェアと同等であり、バックドアへ大口を開け、サー"
 "バのオペレータにユーザに対して不å…
¬æ­£ãªåŠ›ã‚’与えるのです。わたしたちはこれを受"
 "け入れることはできません。"
 
 #. type: Content of: <h3>
-msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
-msgstr 
"SaaSの問題をプロプライエタリ・ソフトウェアの問題から解決する"
+msgid "SaaSS and SaaS"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"SaaS and proprietary software lead to similar harmful results, but the "
-"causal mechanisms are different.  With proprietary software, the cause is "
-"that you have and use a copy which is difficult or illegal to change.  With "
-"SaaS, the cause is that you use a copy you don't have."
+"Originally we referred to this problematical practice as &ldquo; SaaS "
+"&rdquo;, which stands for &ldquo; Software as a Service &rdquo;.  It's a "
+"commonly used term for setting up software on a server rather than offering "
+"copies of it to users, and we thought it described precisely the cases where "
+"this problem occurs."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Subsequently we became aware that the term SaaS is sometimes used for "
+"communication services&mdash;activities for which this issue is not "
+"applicable.  In addition, the term &ldquo; Software as a Service &rdquo; "
+"doesn't explain <em>why</em> the practice is bad.  So we coined the term "
+"&ldquo; Service as a Software Substitute &rdquo;, which defines the bad "
+"practice more clearly and says what is bad about it."
+msgstr ""
+
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
+msgid "Untangling the SaaSS Issue from the Proprietary Software Issue"
+msgstr 
"SaaSの問題をプロプライエタリ・ソフトウェアの問題から解決する"
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "SaaS and proprietary software lead to similar harmful results, but the "
+#| "causal mechanisms are different.  With proprietary software, the cause is "
+#| "that you have and use a copy which is difficult or illegal to change.  "
+#| "With SaaS, the cause is that you use a copy you don't have."
+msgid ""
+"SaaSS and proprietary software lead to similar harmful results, but the "
+"mechanisms are different.  With proprietary software, the mechanism is that "
+"you have and use a copy which is difficult and/or illegal to change.  With "
+"SaaSS, the mechanism is that you don't have the copy that's doing your "
+"computing."
 msgstr ""
 
"SaaSとプロプライエタリ・ソフトウェアは似たような有害な結果をもたらしますが、"
 "表面的なメカニズム
は異なります。プロプライエタリ・ソフトウェアでは、その原å›
 "
@@ -240,15 +352,25 @@
 "SaaSでは、あなたが有していないコピーを使うのが原因
です。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These two issues are often confused, and not only by accident.  Web "
+#| "developers use the vague term &ldquo;web application&rdquo; to lump the "
+#| "server software together with programs run on your machine in your "
+#| "browser.  Some web pages install nontrivial or even large JavaScript "
+#| "programs temporarily into your browser without informing you.  <a href=\"/"
+#| "philosophy/javascript-trap.html\">When these JavaScript programs are "
+#| "nonfree</a>, they are as bad as any other nonfree software.  Here, "
+#| "however, we are concerned with the problem of the server software itself."
 msgid ""
 "These two issues are often confused, and not only by accident.  Web "
 "developers use the vague term &ldquo;web application&rdquo; to lump the "
 "server software together with programs run on your machine in your browser.  "
-"Some web pages install nontrivial or even large JavaScript programs "
-"temporarily into your browser without informing you.  <a href=\"/philosophy/"
-"javascript-trap.html\">When these JavaScript programs are nonfree</a>, they "
-"are as bad as any other nonfree software.  Here, however, we are concerned "
-"with the problem of the server software itself."
+"Some web pages install nontrivial, even large JavaScript programs into your "
+"browser without informing you.  <a href=\"/philosophy/javascript-trap.html"
+"\">When these JavaScript programs are nonfree</a>, they are the same sort of "
+"problem as any other nonfree software.  Here, however, we are concerned with "
+"the problem of the server software itself."
 msgstr ""
 "この二つの問題はよく混同されますが、それは偶然だ
けではありません。ウェブ開発"
 "者
は「ウェブ・アプリケーション」という曖昧な用語を使い、サーバソフトウェアと"
@@ -260,14 +382,25 @@
 "かし、サーバのソフトウェアの問題だけを扱います。"
 
 #. type: Content of: <p>
-msgid ""
-"Many free software supporters assume that the problem of SaaS will be solved "
-"by developing free software for servers.  For the server operator's sake, "
-"the programs on the server had better be free; if they are proprietary, "
-"their owners have power over the server.  That's unfair to the operator, and "
-"doesn't help you at all.  But if the programs on the server are free, that "
-"doesn't protect you <em>as the server's user</em> from the effects of SaaS.  "
-"They give freedom to the operator, but not to you."
+#, fuzzy
+#| msgid ""
+#| "Many free software supporters assume that the problem of SaaS will be "
+#| "solved by developing free software for servers.  For the server "
+#| "operator's sake, the programs on the server had better be free; if they "
+#| "are proprietary, their owners have power over the server.  That's unfair "
+#| "to the operator, and doesn't help you at all.  But if the programs on the "
+#| "server are free, that doesn't protect you <em>as the server's user</em> "
+#| "from the effects of SaaS.  They give freedom to the operator, but not to "
+#| "you."
+msgid ""
+"Many free software supporters assume that the problem of SaaSS will be "
+"solved by developing free software for servers.  For the server operator's "
+"sake, the programs on the server had better be free; if they are "
+"proprietary, their owners have power over the server.  That's unfair to the "
+"operator, and doesn't help the users at all.  But if the programs on the "
+"server are free, that doesn't protect <em>the server's users</em> from the "
+"effects of SaaSS.  These programs liberate the server operator, but not the "
+"server's users."
 msgstr ""
 "多くの自由ソフトウェア支持者
はSaaSの問題はサーバーのための自由ソフトウェアを"
 
"開発することで解決できると仮定しています。サーバのオペレータのためには、サー"
@@ -280,13 +413,31 @@
 
 #. type: Content of: <p>
 msgid ""
-"Releasing the server software source code does benefit the community: "
-"suitably skilled users can set up similar servers, perhaps changing the "
-"software.  But none of these servers would give you control over computing "
-"you do on it, unless it's <em>your</em> server.  The rest would all be "
-"SaaS.  SaaS always subjects you to the power of the server operator, and the "
-"only remedy is, <em>Don't use SaaS!</em> Don't use someone else's server to "
-"do your own computing on data provided by you."
+"Releasing the server software source code does benefit the community: it "
+"enables suitably skilled users to set up similar servers, perhaps changing "
+"the software.  <a href=\"/licenses/license-recommendations.html\"> We "
+"recommend using the GNU Affero GPL</a> as the license for programs often "
+"used on servers."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Releasing the server software source code does benefit the community: "
+#| "suitably skilled users can set up similar servers, perhaps changing the "
+#| "software.  But none of these servers would give you control over "
+#| "computing you do on it, unless it's <em>your</em> server.  The rest would "
+#| "all be SaaS.  SaaS always subjects you to the power of the server "
+#| "operator, and the only remedy is, <em>Don't use SaaS!</em> Don't use "
+#| "someone else's server to do your own computing on data provided by you."
+msgid ""
+"But none of these servers would give you control over computing you do on "
+"it, unless it's <em>your</em> server.  It may be OK to trust your friend's "
+"server for some jobs, just as you might let your friend maintain the "
+"software on your own computer.  Outside of that, all these servers would be "
+"SaaSS for you.  SaaSS always subjects you to the power of the server "
+"operator, and the only remedy is, <em>Don't use SaaSS!</em> Don't use "
+"someone else's server to do your own computing on data provided by you."
 msgstr ""
 
"サーバのソフトウェアのソースコードをリリースすることは、コミュニティの利益と"
 
"なります。適切な技術を持ったユーザは、おそらくソフトウェアを変更して、同様な"
@@ -298,14 +449,41 @@
 "いことです。"
 
 #. type: Content of: <h3>
-msgid "Distinguishing SaaS from Other Network Services"
+#, fuzzy
+#| msgid "Distinguishing SaaS from Other Network Services"
+msgid "Distinguishing SaaSS from Other Network Services"
 msgstr "SaaSをほかのネットワークサービスと区別する"
 
 #. type: Content of: <p>
 msgid ""
-"Does avoiding SaaS mean you refuse to use any network servers run by anyone "
-"other than you? Not at all.  Most servers do not raise this issue, because "
-"the job you do with them isn't your own computing except in a trivial sense."
+"Which online services are SaaSS? The clearest example is a translation "
+"service, which translates (say) English text into Spanish text.  Translating "
+"a text for you is computing that is purely yours.  You could do it by "
+"running a program on your own computer, if only you had the right program.  "
+"(To be ethical, that program should be free.)  The translation service "
+"substitutes for that program, so it is Service as a Software Substitute, or "
+"SaaSS.  Since it denies you control over your computing, it does you wrong."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Another clear example is using a service such as Flickr or Instagram to "
+"modify a photo.  Modifying photos is an activity that people have done in "
+"their own computers for decades; doing it in a server instead of your own "
+"computer is SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Does avoiding SaaS mean you refuse to use any network servers run by "
+#| "anyone other than you? Not at all.  Most servers do not raise this issue, "
+#| "because the job you do with them isn't your own computing except in a "
+#| "trivial sense."
+msgid ""
+"Rejecting SaaSS does not mean refusing to use any network servers run by "
+"anyone other than you.  Most servers are not SaaSS because the jobs they do "
+"are not the user's own computing."
 msgstr ""
 
"SaaSを避けるということは、自分以外の誰かによって動かされている、いかなるネッ"
 
"トワークサーバでも、その使用を拒絶する、ということでしょうか?
 まったく違いま"
@@ -314,17 +492,28 @@
 "す。"
 
 #. type: Content of: <p>
-msgid ""
-"The original purpose of web servers wasn't to do computing for you, it was "
-"to publish information for you to access.  Even today this is what most web "
-"sites do, and it doesn't pose the SaaS problem, because accessing someone's "
-"published information isn't a matter of doing your own computing.  Neither "
-"is publishing your own materials via a blog site or a microblogging service "
-"such as Twitter or identi.ca.  The same goes for communication not meant to "
-"be private, such as chat groups.  Social networking can extend into SaaS; "
-"however, at root it is just a method of communication and publication, not "
-"SaaS.  If you use the service for minor editing of what you're going to "
-"communicate, that is not a significant issue."
+#, fuzzy
+#| msgid ""
+#| "The original purpose of web servers wasn't to do computing for you, it "
+#| "was to publish information for you to access.  Even today this is what "
+#| "most web sites do, and it doesn't pose the SaaS problem, because "
+#| "accessing someone's published information isn't a matter of doing your "
+#| "own computing.  Neither is publishing your own materials via a blog site "
+#| "or a microblogging service such as Twitter or identi.ca.  The same goes "
+#| "for communication not meant to be private, such as chat groups.  Social "
+#| "networking can extend into SaaS; however, at root it is just a method of "
+#| "communication and publication, not SaaS.  If you use the service for "
+#| "minor editing of what you're going to communicate, that is not a "
+#| "significant issue."
+msgid ""
+"The original idea of web servers wasn't to do computing for you, it was to "
+"publish information for you to access.  Even today this is what most web "
+"sites do, and it doesn't pose the SaaSS problem, because accessing someone's "
+"published information isn't doing your own computing.  Neither is publishing "
+"your own materials via a blog site or a microblogging service such as "
+"Twitter or StatusNet.  (These services may have other problems, of course.)  "
+"The same goes for other communication not meant to be private, such as chat "
+"groups."
 msgstr ""
 
"ウェブサーバのオリジナルの目的はあなたのためにコンピューティングを行うという"
 "ものではありませんでした。それは情å 
±ã‚’提供し、あなたがアクセスできるようにす"
@@ -340,12 +529,49 @@
 
 #. type: Content of: <p>
 msgid ""
+"In its essence, social networking is a form of communication and "
+"publication, not SaaSS.  However, a service whose main facility is social "
+"networking can have features or extensions which are SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If a service is not SaaS, that does not mean it is OK.  There are other "
+#| "bad things a service can do.  For instance, Facebook distributes video in "
+#| "Flash, which pressures users to run nonfree software, and it gives users "
+#| "a misleading impression of privacy.  Those are important issues too, but "
+#| "this article's concern is the issue of SaaS."
+msgid ""
+"If a service is not SaaSS, that does not mean it is OK.  There are other "
+"ethical issues about services.  For instance, Facebook distributes video in "
+"Flash, which pressures users to run nonfree software; it requires running "
+"nonfree JavaScript code; and it gives users a misleading impression of "
+"privacy while luring them into baring their lives to Facebook.  Those are "
+"important issues, different from the SaaSS issue."
+msgstr ""
+"サービスがSaaSでないå 
´åˆã€OKという意味ではありません。ほかにもサービスが行い"
+"うる悪いことがあります。たとえば、FacebookはFlashで動画をé
…å¸ƒã—ますが、これは"
+"ユーザに不自由なソフトウェアを実行するよう圧力をかけ、誤ったプライバシの印象"
+"をユーザに与えます。これらは重要な問題ですが、この論説の論点はSaaSの問題で"
+"す。"
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Services such as search engines collect data from around the web and let "
+#| "you examine it.  Looking through their collection of data isn't your own "
+#| "computing in the usual sense&mdash;you didn't provide that "
+#| "collection&mdash;so using such a service to search the web is not SaaS.  "
+#| "(However, using someone else's search engine to implement a search "
+#| "facility for your own site <em>is</em> SaaS.)"
+msgid ""
 "Services such as search engines collect data from around the web and let you "
 "examine it.  Looking through their collection of data isn't your own "
 "computing in the usual sense&mdash;you didn't provide that collection&mdash;"
-"so using such a service to search the web is not SaaS.  (However, using "
-"someone else's search engine to implement a search facility for your own "
-"site <em>is</em> SaaS.)"
+"so using such a service to search the web is not SaaSS.  However, using "
+"someone else's server to implement a search facility for your own site "
+"<em>is</em> SaaSS."
 msgstr ""
 
"検索エンジンのようなサービスがウェブからデータを集め、あなたの調査に提示しま"
 
"す。かれらのデータの集積を見ることは、通常の意味では、あなたのコンピューティ"
@@ -355,12 +581,18 @@
 "です</em>。"
 
 #. type: Content of: <p>
-msgid ""
-"E-commerce is not SaaS, because the computing isn't solely yours; rather, it "
-"is done jointly for you and another party.  So there's no particular reason "
-"why you alone should expect to control that computing.  The real issue in e-"
-"commerce is whether you trust the other party with your money and personal "
-"information."
+#, fuzzy
+#| msgid ""
+#| "E-commerce is not SaaS, because the computing isn't solely yours; rather, "
+#| "it is done jointly for you and another party.  So there's no particular "
+#| "reason why you alone should expect to control that computing.  The real "
+#| "issue in e-commerce is whether you trust the other party with your money "
+#| "and personal information."
+msgid ""
+"Purchasing online is not SaaSS, because the computing isn't <em>your own</"
+"em>; rather, it is done jointly by and for you and the store.  The real "
+"issue in online shopping is whether you trust the other party with your "
+"money and other personal information (starting with your name)."
 msgstr ""
 
"E-コマースはSaaSではありません。なぜならそのコンピューティングはあなたã
 ã‘の"
 
"ものではないからです。むしろ、あなたと相手とで一緒になされるものです。ですか"
@@ -370,10 +602,24 @@
 
 #. type: Content of: <p>
 msgid ""
-"Using a joint project's servers isn't SaaS because the computing you do in "
-"this way isn't yours personally.  For instance, if you edit pages on "
-"Wikipedia, you are not doing your own computing; rather, you are "
-"collaborating in Wikipedia's computing."
+"Repository sites such as as Savannah and SourceForge are not inherently "
+"SaaSS, because a repository's job is publication of data supplied to it."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Using a joint project's servers isn't SaaS because the computing you do "
+#| "in this way isn't yours personally.  For instance, if you edit pages on "
+#| "Wikipedia, you are not doing your own computing; rather, you are "
+#| "collaborating in Wikipedia's computing."
+msgid ""
+"Using a joint project's servers isn't SaaSS because the computing you do in "
+"this way isn't your own.  For instance, if you edit pages on Wikipedia, you "
+"are not doing your own computing; rather, you are collaborating in "
+"Wikipedia's computing.  Wikipedia controls its own servers, but "
+"organizations as well as individuals encounter the problem of SaaSS if they "
+"do their computing in someone else's server."
 msgstr ""
 "å…
±åŒãƒ—ロジェクトのサーバを使うことは、SaaSではありません。なぜなら、この方法"
 
"であなたが行うコンピューティングは、あなたの個人的なものではないからです。た"
@@ -382,77 +628,22 @@
 "いるのです。"
 
 #. type: Content of: <p>
-msgid ""
-"Wikipedia controls its own servers, but groups can face the problem of SaaS "
-"if they do their group activities on someone else's server.  Fortunately, "
-"development hosting sites such as Savannah and SourceForge don't pose the "
-"SaaS problem, because what groups do there is mainly publication and public "
-"communication, rather than their own private computing."
-msgstr ""
-"Wikipediaはそれ自身のサーバをコントロールしますが、グループは、ほかの誰かの"
-"サーバでグループの活動を行えば、SaaSの問題に立ち向かうことができます。幸い、"
-"SavannahやSourceForgeのような開発のホスティングサイトはSaaSの問題はありませ"
-"ん。なぜなら、そこでグループが行うことは、自身のプライベートなコンピューティ"
-"ングではなく、主にå…
¬é–‹ã¨ãƒ‘ブリックなコミュニケーションだからです。"
-
-#. type: Content of: <p>
-msgid ""
-"Multiplayer games are a group activity carried out on someone else's server, "
-"which makes them SaaS.  But where the data involved is just the state of "
-"play and the score, the worst wrong the operator might commit is "
-"favoritism.  You might well ignore that risk, since it seems unlikely and "
-"very little is at stake.  On the other hand, when the game becomes more than "
-"just a game, the issue changes."
-msgstr ""
-"マルチプレイヤー・ゲーム
は、ほかの誰かのサーバで実行されるグループの活動で、"
-"SaaSとなります。しかし、ここで関係するデータはプレイの状æ
…‹ã¨ã‚¹ã‚³ã‚¢ã ã‘なの"
-"で、オペレータが行いうる最悪のå 
´åˆã¯ãˆã“ひいきです。あまりありえないと考えら"
-"れますし、問題になるのはほんの少しですから、このリスクも無視できるでしょう。"
-"一方、ゲームが単なるゲーム
以上になれば、この問題は変わります。"
-
-#. type: Content of: <p>
-msgid ""
-"&ldquo;Backend as a Service&rdquo;, or BaaS, is a kind of SaaS, because it "
-"involves running your own web service on top of software that you can't "
-"control.  If you set up a service using BaaS, the BaaS platform may well "
-"collect information about your users as well as you."
-msgstr ""
-"「サービスとしてのバックエンド」(BaaS)はSaaSの一種です。なぜなら、それはあな"
-"たが制御できないソフトウェアの上にあなた自身のウェブサービスを走らせることを"
-"伴うからです。BaaSを使ってサービスを設置したå 
´åˆã€BaaSのプラットフォームがあ"
-"なたと同じようにあなたのユーザについての情å 
±ã‚’よく集めるかもしれません。"
-
-#. type: Content of: <p>
-msgid ""
-"Which online services are SaaS? Google Docs is a clear example.  Its basic "
-"activity is editing, and Google encourages people to use it for their own "
-"editing; this is SaaS.  It offers the added feature of collaborative "
-"editing, but adding participants doesn't alter the fact that editing on the "
-"server is SaaS.  (In addition, Google Docs is unacceptable because it "
-"installs a large <a href=\"/philosophy/javascript-trap.html\"> nonfree "
-"JavaScript program</a> into the user's browser.)  If using a service for "
-"communication or collaboration requires doing substantial parts of your own "
-"computing with it too, that computing is SaaS even if the communication is "
-"not."
-msgstr ""
-"どのオンラインサービスがSaaSでしょうか? Google 
Docsは明白な例です。その基本機"
-"能は編集で、Googleは人々
がかれら自身の編集のためにそれを使うことを呼びかけて"
-"います。これがSaaSです。それは、協働編集の追加
された機能を提供しますが、参加"
-"者を加
えるということは、サーバで編集することがSaaSであるという事実を変えるも"
-"のではありません。(加えて、Google Docsは大きな<a 
href=\"/philosophy/"
-"javascript-trap.html\">不自由なJavaScriptプログラム
</a>をユーザのブラウザにイ"
-"ンストールするのため、容認できません。)コミュニケーションや協働のためにサービ"
-"スを使うのにあなた自身のコンピューティングの主要な部分をそれとともに行うå¿
…要"
-"があるå 
´åˆã€ãŸã¨ãˆãã®ã‚³ãƒŸãƒ¥ãƒ‹ã‚±ãƒ¼ã‚·ãƒ§ãƒ³ãŒãã†ã§ãªãã¨ã‚‚そのコンピューティン"
-"グはSaaSです。"
-
-#. type: Content of: <p>
-msgid ""
-"Some sites offer multiple services, and if one is not SaaS, another may be "
-"SaaS.  For instance, the main service of Facebook is social networking, and "
-"that is not SaaS; however, it supports third-party applications, some of "
-"which may be SaaS.  Flickr's main service is distributing photos, which is "
-"not SaaS, but it also has features for editing photos, which is SaaS."
+#, fuzzy
+#| msgid ""
+#| "Some sites offer multiple services, and if one is not SaaS, another may "
+#| "be SaaS.  For instance, the main service of Facebook is social "
+#| "networking, and that is not SaaS; however, it supports third-party "
+#| "applications, some of which may be SaaS.  Flickr's main service is "
+#| "distributing photos, which is not SaaS, but it also has features for "
+#| "editing photos, which is SaaS."
+msgid ""
+"Some sites offer multiple services, and if one is not SaaSS, another may be "
+"SaaSS.  For instance, the main service of Facebook is social networking, and "
+"that is not SaaSS; however, it supports third-party applications, some of "
+"which are SaaSS.  Flickr's main service is distributing photos, which is not "
+"SaaSS, but it also has features for editing photos, which is SaaSS.  "
+"Likewise, using Instagram to post a photo is not SaaSS, but using it to "
+"transform the photo is SaaSS."
 msgstr ""
 
"あるサイトでは複数のサービスが提供され、あるものはSaaSでなくても、別のものは"
 
"SaaSということがあるでしょう。たとえば、Facebookの主なサービスはソーシャル・"
@@ -463,37 +654,56 @@
 
 #. type: Content of: <p>
 msgid ""
-"Some sites whose main service is publication and communication extend it "
-"with &ldquo;contact management&rdquo;: keeping track of people you have "
-"relationships with.  Sending mail to those people for you is not SaaS, but "
-"keeping track of your dealings with them, if substantial, is SaaS."
-msgstr ""
-"主なサービスがパブリケーションとコミュニケーションのあるサイトでは、そのサー"
-"ビスを&ldquo;連絡å…
ˆç®¡ç†&rdquo;で拡張し、あなたが関係する人々
を追跡します。あ"
-"なたのためにその人々
にメールを送るのはSaaSではありませんが、あなたがかれらと"
-"関係していることを追跡するのは、もし、たくさんであれば、SaaSです。"
+"Google Docs shows how complex the evaluation of a single service can "
+"become.  It invites people to edit a document by running a large <a href=\"/"
+"philosophy/javascript-trap.html\">nonfree JavaScript program</a>, clearly "
+"wrong.  However, it offers an API for uploading and downloading documents in "
+"standard formats.  A free software editor can do so through this API.  This "
+"usage scenario is not SaaSS, because it uses Google Docs as a mere "
+"repository.  Showing all your data to a company is bad, but that is a matter "
+"of privacy, not SaaSS; depending on a service for access to your data is "
+"bad, but that is a matter of risk, not SaaSS.  On the other hand, using the "
+"service for converting document formats <em>is</em> SaaSS, because it's "
+"something you could have done by running a suitable program (free, one "
+"hopes) in your own computer."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"If a service is not SaaS, that does not mean it is OK.  There are other bad "
-"things a service can do.  For instance, Facebook distributes video in Flash, "
-"which pressures users to run nonfree software, and it gives users a "
-"misleading impression of privacy.  Those are important issues too, but this "
-"article's concern is the issue of SaaS."
+"Using Google Docs through a free editor is rare, of course.  Most often, "
+"people use it through the nonfree JavaScript program, which is bad like any "
+"nonfree program.  This scenario might involve SaaSS, too; that depends on "
+"what part of the editing is done in the JavaScript program and what part in "
+"the server.  We don't know, but since SaaSS and proprietary software do "
+"similar wrong to the user, it is not crucial to know."
 msgstr ""
-"サービスがSaaSでないå 
´åˆã€OKという意味ではありません。ほかにもサービスが行い"
-"うる悪いことがあります。たとえば、FacebookはFlashで動画をé
…å¸ƒã—ますが、これは"
-"ユーザに不自由なソフトウェアを実行するよう圧力をかけ、誤ったプライバシの印象"
-"をユーザに与えます。これらは重要な問題ですが、この論説の論点はSaaSの問題で"
-"す。"
 
 #. type: Content of: <p>
 msgid ""
-"The IT industry discourages users from considering these distinctions.  "
-"That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is "
-"so nebulous that it could refer to almost any use of the Internet.  It "
-"includes SaaS and it includes nearly everything else.  The term only lends "
-"itself to uselessly broad statements."
+"Publishing via someone else's repository does not raise privacy issues, but "
+"publishing through Google Docs has a special problem: it is impossible even "
+"to <em>view the text</em> of a Google Docs document in a browser without "
+"running the nonfree JavaScript code.  Thus, you should not use Google Docs "
+"to publish anything&mdash;but the reason is not a matter of SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The IT industry discourages users from considering these distinctions.  "
+#| "That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term "
+#| "is so nebulous that it could refer to almost any use of the Internet.  It "
+#| "includes SaaS and it includes nearly everything else.  The term only "
+#| "lends itself to uselessly broad statements."
+msgid ""
+"The IT industry discourages users from making these distinctions.  That's "
+"what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is so "
+"nebulous that it could refer to almost any use of the Internet.  It includes "
+"SaaSS as well as many other network usage practices.  In any given context, "
+"an author who writes &ldquo;cloud&rdquo; (if a technical person) probably "
+"has a specific meaning in mind, but usually does not explain that in other "
+"articles the term has other specific meanings.  The term leads people to "
+"generalize about practices they ought to consider individually."
 msgstr ""
 
"IT産業はユーザがこういった区別をすることをやめさせようとします。&ldquo;クラウ"
 
"ド・コンピューティング&rdquo;がそのためのバズワードです。この用語は、あまりに"
@@ -502,13 +712,24 @@
 "の用語は無用の広範な記述に手を差し伸べるだけです。"
 
 #. type: Content of: <p>
-msgid ""
-"The real meaning of &ldquo;cloud computing&rdquo; is to suggest a devil-may-"
-"care approach towards your computing.  It says, &ldquo;Don't ask questions, "
-"just trust every business without hesitation.  Don't worry about who "
+#, fuzzy
+#| msgid ""
+#| "The real meaning of &ldquo;cloud computing&rdquo; is to suggest a devil-"
+#| "may-care approach towards your computing.  It says, &ldquo;Don't ask "
+#| "questions, just trust every business without hesitation.  Don't worry "
+#| "about who controls your computing or who holds your data.  Don't check "
+#| "for a hook hidden inside our service before you swallow it.&rdquo; In "
+#| "other words, &ldquo;Think like a sucker.&rdquo; I prefer to avoid the "
+#| "term."
+msgid ""
+"If &ldquo;cloud computing&rdquo; has a meaning, it is not a way of doing "
+"computing, but rather a way of thinking about computing: a devil-may-care "
+"approach which says, &ldquo;Don't ask questions.  Don't worry about who "
 "controls your computing or who holds your data.  Don't check for a hook "
-"hidden inside our service before you swallow it.&rdquo; In other words, "
-"&ldquo;Think like a sucker.&rdquo; I prefer to avoid the term."
+"hidden inside our service before you swallow it.  Trust companies without "
+"hesitation.&rdquo; In other words, &ldquo;Be a sucker.&rdquo; A cloud in the "
+"mind is an obstacle to clear thinking.  For the sake of clear thinking about "
+"computing, let's avoid the term &ldquo;cloud.&rdquo;"
 msgstr ""
 
"&ldquo;クラウド・コンピューティング&rdquo;の本当の意味は、あなたのコンピュー"
 
"ティングにお気楽に無責任のアプローチを示唆するものです。それは、「疑念を持た"
@@ -520,25 +741,41 @@
 "けることを選びます。"
 
 #. type: Content of: <h3>
-msgid "Dealing with the SaaS Problem"
+#, fuzzy
+#| msgid "Dealing with the SaaS Problem"
+msgid "Dealing with the SaaSS Problem"
 msgstr "SaaSの問題を扱う"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Only a small fraction of all web sites do SaaS; most don't raise the "
+#| "issue.  But what should we do about the ones that raise it?"
 msgid ""
-"Only a small fraction of all web sites do SaaS; most don't raise the issue.  "
-"But what should we do about the ones that raise it?"
+"Only a small fraction of all web sites do SaaSS; most don't raise the "
+"issue.  But what should we do about the ones that raise it?"
 msgstr ""
 "全体のウェブサイトの本の一部だ
けがSaaSを行います。ほとんどはこの問題を引き起"
 
"こしません。しかし、この問題を引き起こすウェブサイトについてわたしたちはどう"
 "するべきでしょうか?"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For the simple case, where you are doing your own computing on data in "
+#| "your own hands, the solution is simple: use your own copy of a free "
+#| "software application.  Do your text editing with your copy of a free text "
+#| "editor such as GNU Emacs or a free word processor.  Do your photo editing "
+#| "with your copy of free software such as GIMP."
 msgid ""
 "For the simple case, where you are doing your own computing on data in your "
 "own hands, the solution is simple: use your own copy of a free software "
 "application.  Do your text editing with your copy of a free text editor such "
 "as GNU Emacs or a free word processor.  Do your photo editing with your copy "
-"of free software such as GIMP."
+"of free software such as GIMP.  What if there is no free program available? "
+"A proprietary program or SaaSS would take away your freedom, so you "
+"shouldn't use those.  You can contribute your time or your money to "
+"development of a free replacement."
 msgstr ""
 
"単純なケースで、あなた自身の手にあるデータであなた自身のコンピューティングを"
 "行うå 
´åˆã€è§£æ±ºç­–は単純で、あなた自身の自由ソフトウェア・アプリケーションのコ"
@@ -547,17 +784,30 @@
 
"集は、GIMPのような自由ソフトウェアのあなたのコピーで行いましょう。"
 
 #. type: Content of: <p>
-msgid ""
-"But what about collaborating with other individuals? It may be hard to do "
-"this at present without using a server.  If you use one, don't trust a "
-"server run by a company.  A mere contract as a customer is no protection "
-"unless you could detect a breach and could really sue, and the company "
-"probably writes its contracts to permit a broad range of abuses.  Police can "
-"subpoena your data from the company with less basis than required to "
-"subpoena them from you, supposing the company doesn't volunteer them like "
-"the US phone companies that illegally wiretapped their customers for Bush.  "
-"If you must use a server, use a server whose operators give you a basis for "
-"trust beyond a mere commercial relationship."
+#, fuzzy
+#| msgid ""
+#| "But what about collaborating with other individuals? It may be hard to do "
+#| "this at present without using a server.  If you use one, don't trust a "
+#| "server run by a company.  A mere contract as a customer is no protection "
+#| "unless you could detect a breach and could really sue, and the company "
+#| "probably writes its contracts to permit a broad range of abuses.  Police "
+#| "can subpoena your data from the company with less basis than required to "
+#| "subpoena them from you, supposing the company doesn't volunteer them like "
+#| "the US phone companies that illegally wiretapped their customers for "
+#| "Bush.  If you must use a server, use a server whose operators give you a "
+#| "basis for trust beyond a mere commercial relationship."
+msgid ""
+"What about collaborating with other individuals as a group? It may be hard "
+"to do this at present without using a server, and your group may not know "
+"how to run its own server.  If you use someone else's server, at least don't "
+"trust a server run by a company.  A mere contract as a customer is no "
+"protection unless you could detect a breach and could really sue, and the "
+"company probably writes its contracts to permit a broad range of abuses.  "
+"The state can subpoena your data from the company along with everyone "
+"else's, as Obama has done to phone companies, supposing the company doesn't "
+"volunteer them like the US phone companies that illegally wiretapped their "
+"customers for Bush.  If you must use a server, use a server whose operators "
+"give you a basis for trust beyond a mere commercial relationship."
 msgstr ""
 
"しかし、ほかの個人と協働することについてはどうでしょうか?
 現状、サーバを使わ"
 "ずにこれを行うのは難しいでしょう。あるサーバを使うå 
´åˆã€ä¼šç¤¾ã«ã‚ˆã£ã¦ç¨¼åƒã•ã‚Œ"
@@ -596,13 +846,21 @@
 "ほかの自由ソフトウェアプロジェクトも歓迎します。"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In the meantime, if a company invites you to use its server to do your "
+#| "own computing tasks, don't yield; don't use SaaS.  Don't buy or install "
+#| "&ldquo;thin clients&rdquo;, which are simply computers so weak they make "
+#| "you do the real work on a server, unless you're going to use them with "
+#| "<em>your</em> server.  Use a real computer and keep your data there.  Do "
+#| "your work with your own copy of a free program, for your freedom's sake."
 msgid ""
 "In the meantime, if a company invites you to use its server to do your own "
-"computing tasks, don't yield; don't use SaaS.  Don't buy or install &ldquo;"
+"computing tasks, don't yield; don't use SaaSS.  Don't buy or install &ldquo;"
 "thin clients&rdquo;, which are simply computers so weak they make you do the "
 "real work on a server, unless you're going to use them with <em>your</em> "
-"server.  Use a real computer and keep your data there.  Do your work with "
-"your own copy of a free program, for your freedom's sake."
+"server.  Use a real computer and keep your data there.  Do your own "
+"computing with your own copy of a free program, for your freedom's sake."
 msgstr ""
 
"それまでは、ある会社があなたにそのサーバを使ってあなた自身のコンピューティン"
 "グのタスクを実行するよう招くå 
´åˆã€æ˜Žã‘渡してはいけません。SaaSは使わないこと"
@@ -631,22 +889,28 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send 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."
+"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"
+"org&gt;</a>."
 msgstr ""
 "FSFおよびGNUに関する問い合わせは<a 
href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>までお願いします(英語)。FSFへの連絡は<a 
href=\"/contact/\">他の方"
-"法</a>もあります。"
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"リンク切れや他の修正、提案は<a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>までお送りください。"
+"法</a>もあります。リンク切れや他の修正、提案は<a 
href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>までお送りください。"
 
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
@@ -660,7 +924,9 @@
 "translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010 Richard Stallman"
+#, fuzzy
+#| msgid "Copyright &copy; 2010 Richard Stallman"
+msgid "Copyright &copy; 2010, 2013 Richard Stallman"
 msgstr "Copyright &copy; 2010 Richard Stallman"
 
 #. type: Content of: <div><p>
@@ -682,3 +948,107 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最終更新:"
+
+#~ msgid ""
+#~ "Some proprietary programs can mistreat users under remote command.  For "
+#~ "instance, Windows has a back door with which Microsoft can forcibly "
+#~ "change any software on the machine.  The Amazon Kindle e-book reader "
+#~ "(whose name suggests it's intended to burn people's books) has an "
+#~ "Orwellian back door that Amazon used in 2009 to <a href=\"http://www.";
+#~ "nytimes.com/2009/07/18/technology/companies/18amazon.html\" >remotely "
+#~ "delete</a> Kindle copies of Orwell's books <cite>1984</cite> and "
+#~ "<cite>Animal Farm</cite> which the users had purchased from Amazon."
+#~ msgstr ""
+#~ "あるプロプライエタリ・プログラムは遠
隔操作のコマンドでユーザを虐待すること"
+#~ 
"ができます。たとえば、ウィンドウズにはバックドアがあり、マイクロソフトはそ"
+#~ 
"のマシンのいかなるソフトウェアも強制的に変更することができます。アマゾン・"
+#~ "キンドルe-bookリーダ(その名前は、それが人々
の書籍を焼くこと意図しているこ"
+#~ 
"とを暗示しています)は、オーウェルのバックドアを有し、アマゾンは2009年に<a
 "
+#~ "href=\"http://www.nytimes.com/2009/07/18/technology/companies/18amazon.";
+#~ "html\" >遠
隔操作で削除する</a>のにその機能を使い、キンドル上のユーザがアマ"
+#~ "ゾンで購å…
¥ã—たオーウェルの書籍<cite>1984</cite>と<cite>Animal Farm</cite>"
+#~ "を削除しました。"
+
+#~ msgid ""
+#~ "SaaS inherently gives the server operator the power to change the "
+#~ "software in use, or the users' data being operated on.  Once again, no "
+#~ "special code is needed to do this."
+#~ msgstr ""
+#~ 
"SaaSは本質的にサーバのオペレータに、使用するソフトウェアを変更する力、もし"
+#~ 
"くは、操作されるユーザのデータを変更する力を与えます。ここでもまた、そうす"
+#~ "るのに特別なコードは必要ないのです。"
+
+#~ msgid ""
+#~ "Wikipedia controls its own servers, but groups can face the problem of "
+#~ "SaaS if they do their group activities on someone else's server.  "
+#~ "Fortunately, development hosting sites such as Savannah and SourceForge "
+#~ "don't pose the SaaS problem, because what groups do there is mainly "
+#~ "publication and public communication, rather than their own private "
+#~ "computing."
+#~ msgstr ""
+#~ 
"Wikipediaはそれ自身のサーバをコントロールしますが、グループは、ほかの誰か"
+#~ 
"のサーバでグループの活動を行えば、SaaSの問題に立ち向かうことができます。幸"
+#~ 
"い、SavannahやSourceForgeのような開発のホスティングサイトはSaaSの問題はあ"
+#~ 
"りません。なぜなら、そこでグループが行うことは、自身のプライベートなコン"
+#~ "ピューティングではなく、主にå…
¬é–‹ã¨ãƒ‘ブリックなコミュニケーションだからで"
+#~ "す。"
+
+#~ msgid ""
+#~ "Multiplayer games are a group activity carried out on someone else's "
+#~ "server, which makes them SaaS.  But where the data involved is just the "
+#~ "state of play and the score, the worst wrong the operator might commit is "
+#~ "favoritism.  You might well ignore that risk, since it seems unlikely and "
+#~ "very little is at stake.  On the other hand, when the game becomes more "
+#~ "than just a game, the issue changes."
+#~ msgstr ""
+#~ "マルチプレイヤー・ゲーム
は、ほかの誰かのサーバで実行されるグループの活動"
+#~ 
"で、SaaSとなります。しかし、ここで関係するデータはプレイの状æ
…‹ã¨ã‚¹ã‚³ã‚¢ã ã‘"
+#~ "なので、オペレータが行いうる最悪のå 
´åˆã¯ãˆã“ひいきです。あまりありえないと"
+#~ 
"考えられますし、問題になるのはほんの少しですから、このリスクも無視できるで"
+#~ "しょう。一方、ゲームが単なるゲーム
以上になれば、この問題は変わります。"
+
+#~ msgid ""
+#~ "&ldquo;Backend as a Service&rdquo;, or BaaS, is a kind of SaaS, because "
+#~ "it involves running your own web service on top of software that you "
+#~ "can't control.  If you set up a service using BaaS, the BaaS platform may "
+#~ "well collect information about your users as well as you."
+#~ msgstr ""
+#~ 
"「サービスとしてのバックエンド」(BaaS)はSaaSの一種です。なぜなら、それはあ"
+#~ 
"なたが制御できないソフトウェアの上にあなた自身のウェブサービスを走らせるこ"
+#~ "とを伴うからです。BaaSを使ってサービスを設置したå 
´åˆã€BaaSのプラットフォー"
+#~ "ムがあなたと同じようにあなたのユーザについての情å 
±ã‚’よく集めるかもしれませ"
+#~ "ん。"
+
+#~ msgid ""
+#~ "Which online services are SaaS? Google Docs is a clear example.  Its "
+#~ "basic activity is editing, and Google encourages people to use it for "
+#~ "their own editing; this is SaaS.  It offers the added feature of "
+#~ "collaborative editing, but adding participants doesn't alter the fact "
+#~ "that editing on the server is SaaS.  (In addition, Google Docs is "
+#~ "unacceptable because it installs a large <a href=\"/philosophy/javascript-"
+#~ "trap.html\"> nonfree JavaScript program</a> into the user's browser.)  If "
+#~ "using a service for communication or collaboration requires doing "
+#~ "substantial parts of your own computing with it too, that computing is "
+#~ "SaaS even if the communication is not."
+#~ msgstr ""
+#~ "どのオンラインサービスがSaaSでしょうか? Google 
Docsは明白な例です。その基"
+#~ "本機能は編集で、Googleは人々
がかれら自身の編集のためにそれを使うことを呼び"
+#~ 
"かけています。これがSaaSです。それは、協働編集の追加
された機能を提供します"
+#~ "が、参加者を加
えるということは、サーバで編集することがSaaSであるという事実"
+#~ "を変えるものではありません。(加えて、Google 
Docsは大きな<a href=\"/"
+#~ "philosophy/javascript-trap.html\">不自由なJavaScriptプログラム
</a>をユーザ"
+#~ 
"のブラウザにインストールするのため、容認できません。)コミュニケーションや"
+#~ 
"協働のためにサービスを使うのにあなた自身のコンピューティングの主要な部分を"
+#~ "それとともに行う必要があるå 
´åˆã€ãŸã¨ãˆãã®ã‚³ãƒŸãƒ¥ãƒ‹ã‚±ãƒ¼ã‚·ãƒ§ãƒ³ãŒãã†ã§ãªãã¨"
+#~ "もそのコンピューティングはSaaSです。"
+
+#~ msgid ""
+#~ "Some sites whose main service is publication and communication extend it "
+#~ "with &ldquo;contact management&rdquo;: keeping track of people you have "
+#~ "relationships with.  Sending mail to those people for you is not SaaS, "
+#~ "but keeping track of your dealings with them, if substantial, is SaaS."
+#~ msgstr ""
+#~ 
"主なサービスがパブリケーションとコミュニケーションのあるサイトでは、その"
+#~ "サービスを&ldquo;連絡å…
ˆç®¡ç†&rdquo;で拡張し、あなたが関係する人々を追跡しま"
+#~ "す。あなたのためにその人々
にメールを送るのはSaaSではありませんが、あなたが"
+#~ 
"かれらと関係していることを追跡するのは、もし、たくさんであれば、SaaSです。"

Index: who-does-that-server-really-serve.ko-diff.html
===================================================================
RCS file: 
/web/www/www/philosophy/po/who-does-that-server-really-serve.ko-diff.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- who-does-that-server-really-serve.ko-diff.html      6 Jun 2013 17:00:37 
-0000       1.6
+++ who-does-that-server-really-serve.ko-diff.html      18 Jun 2013 05:30:00 
-0000      1.7
@@ -11,8 +11,9 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-
-&lt;title&gt;Who Does That Server Really Serve? - GNU Project - Free Software 
Foundation (FSF)&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.75 
--&gt;</em></ins></span>
+&lt;title&gt;Who Does That Server Really Serve?
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
 
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/server/banner.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/philosophy/po/who-does-that-server-really-serve.translist"</em></ins></span>
 --&gt;
 &lt;!--#include <span 
class="removed"><del><strong>virtual="/philosophy/po/who-does-that-server-really-serve.translist"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/banner.html"</em></ins></span> --&gt;
@@ -21,13 +22,25 @@
 
 &lt;p&gt;by &lt;strong&gt;Richard Stallman&lt;/strong&gt;&lt;/p&gt;
 
-&lt;p&gt;(First published
-by &lt;a <span 
class="removed"><del><strong>href="http://bostonreview.net/BR35.2/stallman.php"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="http://www.bostonreview.net/richard-stallman-free-software-DRM"&gt;</em></ins></span>
-Boston Review&lt;/a&gt;.)&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;(First</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;(The first version 
was</em></ins></span> published <span 
class="removed"><del><strong>by</strong></del></span>
+<span class="inserted"><ins><em>in</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://bostonreview.net/BR35.2/stallman.php"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="http://www.bostonreview.net/richard-stallman-free-software-DRM"&gt;</em></ins></span>
+Boston <span 
class="removed"><del><strong>Review&lt;/a&gt;.)&lt;/p&gt;</strong></del></span> 
<span 
class="inserted"><ins><em>Review&lt;/a&gt;.)&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
 
 &lt;p&gt;&lt;strong&gt;On the Internet, proprietary software isn't the only 
way to
-lose your freedom.  Software as a Service is another way to let
-someone else have power over your computing.&lt;/strong&gt;&lt;/p&gt;
+lose your freedom.  <span 
class="removed"><del><strong>Software</strong></del></span>  <span 
class="inserted"><ins><em>Service</em></ins></span> as a <span 
class="removed"><del><strong>Service</strong></del></span> <span 
class="inserted"><ins><em>Software Substitute, or SaaSS,</em></ins></span> is
+another way to let someone else have power over your
+computing.&lt;/strong&gt;&lt;/p&gt;
+
+<span class="inserted"><ins><em>SaaSS means using a service implemented by 
someone else as a
+substitute for running your copy of a program.  The term is ours;
+articles and ads won't use it, and they won't tell you whether a
+service is SaaSS.  Instead they will probably use the vague and
+distracting term &ldquo;cloud&rdquo;, which lumps SaaSS together with
+various other practices, some abusive and some ok.  With the
+explanation and examples in this page, you can tell whether a service
+is SaaSS.</em></ins></span>
 
 &lt;h3&gt;Background: How Proprietary Software Takes Away Your 
Freedom&lt;/h3&gt;
 
@@ -53,221 +66,366 @@
 &lt;p&gt;With free software, we, the users, take back control of our
 computing.  Proprietary software still exists, but we can exclude it
 from our lives and many of us have done so.  However, we now face a
-new threat to our control over our computing: Software as a Service.
-For our freedom's sake, we have to reject that too.&lt;/p&gt;
-
-&lt;h3&gt;How Software as a Service Takes Away Your Freedom&lt;/h3&gt;
-
-&lt;p&gt;Software as a Service (SaaS) means that someone sets up a network
-server that does certain computing tasks&mdash;running spreadsheets,
-word processing, translating text into another language,
-etc.&mdash;then invites users to do their computing on that server.
-Users send their data to the server, which does their computing on the
-data thus provided, then sends the results back or acts on them
-directly.&lt;/p&gt;
+new threat to our control over our computing: <span 
class="removed"><del><strong>Software</strong></del></span> <span 
class="inserted"><ins><em>Service</em></ins></span> as a <span 
class="removed"><del><strong>Service.</strong></del></span> <span 
class="inserted"><ins><em>Software
+Substitute (SaaSS).</em></ins></span>  For our freedom's sake, we have to 
reject that
+too.&lt;/p&gt;
+
+&lt;h3&gt;How <span 
class="removed"><del><strong>Software</strong></del></span> <span 
class="inserted"><ins><em>Service</em></ins></span> as a <span 
class="removed"><del><strong>Service</strong></del></span> <span 
class="inserted"><ins><em>Software Substitute</em></ins></span> Takes Away Your 
Freedom&lt;/h3&gt;
+
+<span class="removed"><del><strong>&lt;p&gt;Software</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Service</em></ins></span> as a <span 
class="removed"><del><strong>Service (SaaS)</strong></del></span> <span 
class="inserted"><ins><em>Software Substitute (SaaSS) means using a service as a
+substitute for running your copy of a program.  Concretely, 
it</em></ins></span> means
+that someone sets up a network server that does certain computing <span 
class="removed"><del><strong>tasks&mdash;running spreadsheets,
+word processing,</strong></del></span>
+<span class="inserted"><ins><em>tasks&mdash;for instance, modifying a 
photo,</em></ins></span> translating text into
+another language, etc.&mdash;then invites users to do <span 
class="removed"><del><strong>their</strong></del></span> computing <span 
class="removed"><del><strong>on</strong></del></span> <span 
class="inserted"><ins><em>via</em></ins></span>
+that server.
+<span class="removed"><del><strong>Users</strong></del></span>  <span 
class="inserted"><ins><em>A user of the server would</em></ins></span> send 
<span class="removed"><del><strong>their</strong></del></span> <span 
class="inserted"><ins><em>her</em></ins></span> data to the server,
+which does <span class="removed"><del><strong>their 
computing</strong></del></span> <span class="inserted"><ins><em>&lt;em&gt;her 
own computing&lt;/em&gt;</em></ins></span> on the data thus provided, then
+sends the results back <span class="inserted"><ins><em>to 
her</em></ins></span> or acts <span 
class="inserted"><ins><em>directly</em></ins></span> on <span 
class="removed"><del><strong>them
+directly.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>her 
behalf.&lt;/p&gt;
+
+&lt;p&gt;The computing is &lt;em&gt;her own&lt;/em&gt; because, by assumption, 
she
+could, in principle, have done it by running a program on her own
+computer (whether or not that program is available to her at
+present).  When this assumption is not so, it isn't 
SaaSS.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;These servers wrest control from the users even more inexorably
 than proprietary software.  With proprietary software, users typically
 get an executable file but not the source code.  That makes it hard
-for programmers to study the code that is running, so it's hard to
-determine what the program really does, and hard to change it.&lt;/p&gt;
-
-&lt;p&gt;With SaaS, the users do not have even the executable file: it is on
-the server, where the users can't see or touch it.  Thus it is
-impossible for them to ascertain what it really does, and impossible
-to change it.&lt;/p&gt;
-
-&lt;p&gt;Furthermore, SaaS automatically leads to harmful consequences
-equivalent to the malicious features of certain proprietary software.
-For instance, some proprietary programs are &ldquo;spyware&rdquo;: the
-program sends out data about users' computing activities.  Microsoft
-Windows sends information about users' activities to Microsoft.
-Windows Media Player and RealPlayer report what each user watches or
-listens to.&lt;/p&gt;
+<span class="removed"><del><strong>for programmers</strong></del></span> to
+study the code that is running, so it's hard to determine what the
+program really does, and hard to change it.&lt;/p&gt;
+
+&lt;p&gt;With <span class="removed"><del><strong>SaaS,</strong></del></span> 
<span class="inserted"><ins><em>SaaSS,</em></ins></span> the users do not have 
even the executable <span 
class="removed"><del><strong>file:</strong></del></span> <span 
class="inserted"><ins><em>file that
+does their computing:</em></ins></span> it is on
+<span class="removed"><del><strong>the</strong></del></span> <span 
class="inserted"><ins><em>someone else's</em></ins></span> server, where the 
users
+can't see or touch it.  Thus it is impossible for them to ascertain
+what it really does, and impossible to change it.&lt;/p&gt;
+
+&lt;p&gt;Furthermore, <span 
class="removed"><del><strong>SaaS</strong></del></span> <span 
class="inserted"><ins><em>SaaSS</em></ins></span> automatically leads to <span 
class="removed"><del><strong>harmful</strong></del></span> consequences 
equivalent
+to the malicious features of certain proprietary <span 
class="removed"><del><strong>software.</strong></del></span> <span 
class="inserted"><ins><em>software.&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span> For instance, some proprietary programs are 
&ldquo;spyware&rdquo;:
+the program sends out data about users' computing activities.
+Microsoft Windows sends information about users' activities to
+Microsoft.  Windows Media Player <span class="removed"><del><strong>and 
RealPlayer report</strong></del></span> <span 
class="inserted"><ins><em>reports</em></ins></span> what each user watches or
+listens <span class="removed"><del><strong>to.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>to.  The Amazon Kindle reports which pages of 
which books the
+user looks at, and when.  Angry Birds reports the user's geolocation
+history.&lt;/p&gt;</em></ins></span>
 
-&lt;p&gt;Unlike proprietary software, SaaS does not require covert code to
+&lt;p&gt;Unlike proprietary software, <span 
class="removed"><del><strong>SaaS</strong></del></span> <span 
class="inserted"><ins><em>SaaSS</em></ins></span> does not require covert code 
to
 obtain the user's data.  Instead, users must send their data to the
 server in order to use it.  This has the same effect as spyware: the
-server operator gets the data.  He gets it with no special effort, by
-the nature of SaaS.&lt;/p&gt;
+server operator gets the <span class="removed"><del><strong>data.  He gets it 
with</strong></del></span> <span 
class="inserted"><ins><em>data&mdash;with</em></ins></span> no special effort, 
by
+the nature of <span 
class="removed"><del><strong>SaaS.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>SaaSS.&lt;/p&gt;</em></ins></span>
 
-&lt;p&gt;Some proprietary programs can mistreat users under remote command.
-For instance, Windows has a back door with which Microsoft can
-forcibly change any software on the machine.  The Amazon Kindle e-book
+&lt;p&gt;Some proprietary <span class="removed"><del><strong>programs can 
mistreat users under remote command.</strong></del></span> <span 
class="inserted"><ins><em>operating systems have a universal back door,
+permitting someone to remotely install software changes.</em></ins></span>  For
+instance, Windows has a <span 
class="inserted"><ins><em>universal</em></ins></span> back door with which 
Microsoft can
+forcibly change any software on the machine.  <span 
class="removed"><del><strong>The Amazon Kindle e-book
 reader (whose name suggests it's intended to burn people's books) has
-an Orwellian back door that Amazon used in 2009
+an Orwellian</strong></del></span>  <span class="inserted"><ins><em>Nearly all 
portable
+phones have them, too.  Some proprietary applications also have
+universal</em></ins></span> back <span class="removed"><del><strong>door that 
Amazon used in 2009
 to &lt;a 
href="http://www.nytimes.com/2009/07/18/technology/companies/18amazon.html";
 &gt;remotely delete&lt;/a&gt; Kindle copies of Orwell's books 
&lt;cite&gt;1984&lt;/cite&gt; and
-&lt;cite&gt;Animal Farm&lt;/cite&gt; which the users had purchased from 
Amazon.&lt;/p&gt;
+&lt;cite&gt;Animal Farm&lt;/cite&gt; which</strong></del></span> <span 
class="inserted"><ins><em>doors; for instance,</em></ins></span> the <span 
class="removed"><del><strong>users had purchased from Amazon.&lt;/p&gt;
 
-&lt;p&gt;SaaS inherently gives the server operator the power to change the
-software in use, or the users' data being operated on.  Once again, no
-special code is needed to do this.&lt;/p&gt;
+&lt;p&gt;SaaS inherently gives</strong></del></span> <span 
class="inserted"><ins><em>Steam client for GNU/Linux
+allows the developer to remotely install modified versions.&lt;/p&gt;
 
-&lt;p&gt;Thus, SaaS is equivalent to total spyware and a gaping wide back
-door, and gives the server operator unjust power over the user.  We
+&lt;p&gt;With SaaSS,</em></ins></span> the server operator <span 
class="removed"><del><strong>the power to</strong></del></span> <span 
class="inserted"><ins><em>can</em></ins></span> change the software in <span 
class="removed"><del><strong>use, or</strong></del></span> <span 
class="inserted"><ins><em>use on</em></ins></span>
+the <span class="removed"><del><strong>users' data being operated on.  Once 
again, no
+special code is needed</strong></del></span> <span 
class="inserted"><ins><em>server.  He ought to be able</em></ins></span> to do 
<span class="removed"><del><strong>this.&lt;/p&gt;
+
+&lt;p&gt;Thus, SaaS</strong></del></span> <span 
class="inserted"><ins><em>this, since it's his computer;
+but the result</em></ins></span> is <span 
class="removed"><del><strong>equivalent to total spyware 
and</strong></del></span> <span class="inserted"><ins><em>the same as using a 
proprietary application program
+with</em></ins></span> a <span class="removed"><del><strong>gaping 
wide</strong></del></span> <span 
class="inserted"><ins><em>universal</em></ins></span> back
+<span class="removed"><del><strong>door, and</strong></del></span> <span 
class="inserted"><ins><em>door: someone has the power to silently impose
+changes in how the user's computing gets done.&lt;/p&gt;
+
+&lt;p&gt;Thus, SaaSS is equivalent to running proprietary software with
+spyware and a universal back door.  It</em></ins></span> gives the server 
operator
+unjust power over the <span class="removed"><del><strong>user.  We
 can't accept that.&lt;/p&gt;
 
-&lt;h3&gt;Untangling the SaaS Issue from the Proprietary Software 
Issue&lt;/h3&gt;
+&lt;h3&gt;Untangling</strong></del></span> <span 
class="inserted"><ins><em>user, and that power is something we must
+resist.&lt;/p&gt;
+
+&lt;h3&gt;SaaSS and SaaS&lt;/h3&gt;
 
-&lt;p&gt;SaaS and proprietary software lead to similar harmful results, but
-the causal mechanisms are different.  With proprietary software, the
-cause is that you have and use a copy which is difficult or illegal to
-change.  With SaaS, the cause is that you use a copy you don't
-have.&lt;/p&gt;
+&lt;p&gt;Originally we referred to this problematical practice as &ldquo;
+SaaS &rdquo;, which stands for &ldquo; Software as a Service &rdquo;.
+It's a commonly used term for setting up software on a server rather
+than offering copies of it to users, and we thought it described
+precisely the cases where this problem occurs.&lt;/p&gt;
+
+&lt;p&gt;Subsequently we became aware that</em></ins></span> the <span 
class="inserted"><ins><em>term</em></ins></span> SaaS <span 
class="inserted"><ins><em>is sometimes used
+for communication services&mdash;activities for which this issue is
+not applicable.  In addition, the term &ldquo; Software as a Service
+&rdquo; doesn't explain &lt;em&gt;why&lt;/em&gt; the practice is bad.  So we
+coined the term &ldquo; Service as a Software Substitute &rdquo;,
+which defines the bad practice more clearly and says what is bad
+about it.&lt;/p&gt;
+
+&lt;h3&gt;Untangling the SaaSS</em></ins></span> Issue from the Proprietary 
Software Issue&lt;/h3&gt;
+
+<span class="removed"><del><strong>&lt;p&gt;SaaS</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;SaaSS</em></ins></span> and 
proprietary software lead to similar harmful results, but
+the <span class="removed"><del><strong>causal</strong></del></span> mechanisms 
are different.  With proprietary software, the
+<span class="removed"><del><strong>cause</strong></del></span>
+<span class="inserted"><ins><em>mechanism</em></ins></span> is that you have 
and use a copy which is difficult <span 
class="removed"><del><strong>or</strong></del></span> <span 
class="inserted"><ins><em>and/or</em></ins></span>
+illegal to change.  With <span 
class="removed"><del><strong>SaaS,</strong></del></span> <span 
class="inserted"><ins><em>SaaSS,</em></ins></span> the <span 
class="removed"><del><strong>cause</strong></del></span> <span 
class="inserted"><ins><em>mechanism</em></ins></span> is that you <span 
class="removed"><del><strong>use a copy you</strong></del></span> don't
+<span class="removed"><del><strong>have.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>have
+the copy that's doing your computing.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;These two issues are often confused, and not only by accident.  Web
 developers use the vague term &ldquo;web application&rdquo; to lump
 the server software together with programs run on your machine in your
-browser.  Some web pages install nontrivial or even large JavaScript
-programs temporarily into your browser without informing
+browser.  Some web pages install <span class="removed"><del><strong>nontrivial 
or</strong></del></span> <span 
class="inserted"><ins><em>nontrivial,</em></ins></span> even large JavaScript
+programs <span class="removed"><del><strong>temporarily</strong></del></span> 
into your browser without informing
 you.  &lt;a href="/philosophy/javascript-trap.html"&gt;When these JavaScript
-programs are nonfree&lt;/a&gt;, they are as bad as any other nonfree
-software.  Here, however, we are concerned with the problem of the
-server software itself.&lt;/p&gt;
+programs are nonfree&lt;/a&gt;, they are <span class="removed"><del><strong>as 
bad</strong></del></span> <span class="inserted"><ins><em>the same sort of 
problem</em></ins></span> as any
+other nonfree software.  Here, however, we are concerned with the
+problem of the server software itself.&lt;/p&gt;
 
-&lt;p&gt;Many free software supporters assume that the problem of SaaS will
+&lt;p&gt;Many free software supporters assume that the problem of <span 
class="removed"><del><strong>SaaS</strong></del></span> <span 
class="inserted"><ins><em>SaaSS</em></ins></span> will
 be solved by developing free software for servers.  For the server
 operator's sake, the programs on the server had better be free; if
 they are proprietary, their owners have power over the server.  That's
-unfair to the operator, and doesn't help you at all.  But if the
-programs on the server are free, that doesn't protect you &lt;em&gt;as the
-server's user&lt;/em&gt; from the effects of SaaS.  They give freedom to the
-operator, but not to you.&lt;/p&gt;
+unfair to the operator, and doesn't help <span 
class="removed"><del><strong>you</strong></del></span> <span 
class="inserted"><ins><em>the users</em></ins></span> at all.  But if the
+programs on the server are free, that doesn't protect <span 
class="removed"><del><strong>you &lt;em&gt;as the</strong></del></span> <span 
class="inserted"><ins><em>&lt;em&gt;the</em></ins></span> server's <span 
class="removed"><del><strong>user&lt;/em&gt;</strong></del></span>
+<span class="inserted"><ins><em>users&lt;/em&gt;</em></ins></span> from the 
effects of <span class="removed"><del><strong>SaaS.  They give freedom 
to</strong></del></span> <span class="inserted"><ins><em>SaaSS.  These programs 
liberate</em></ins></span> the
+<span class="inserted"><ins><em>server</em></ins></span> operator, but not 
<span class="removed"><del><strong>to you.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>the server's users.&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;Releasing the server software source code does benefit the
-community: suitably skilled users can set up similar servers, perhaps
-changing the software.  But none of these servers would give you
-control over computing you do on it, unless it's &lt;em&gt;your&lt;/em&gt; 
server.
-The rest would all be SaaS.  SaaS always subjects you to the power of
-the server operator, and the only remedy is, &lt;em&gt;Don't use 
SaaS!&lt;/em&gt;
-Don't use someone else's server to do your own computing on data
-provided by you.&lt;/p&gt;
+community: <span class="inserted"><ins><em>it enables</em></ins></span> 
suitably skilled users <span 
class="removed"><del><strong>can</strong></del></span> <span 
class="inserted"><ins><em>to</em></ins></span> set up similar
+servers, perhaps changing the
+software.  <span class="removed"><del><strong>But</strong></del></span>  <span 
class="inserted"><ins><em>&lt;a 
href="/licenses/license-recommendations.html"&gt; We
+recommend using the GNU Affero GPL&lt;/a&gt; as the license for programs
+often used on servers.&lt;/p&gt;
+
+&lt;p&gt;But</em></ins></span> none of these servers would give you control 
over computing you
+do on it, unless it's &lt;em&gt;your&lt;/em&gt; server.
+<span class="removed"><del><strong>The rest would</strong></del></span>  <span 
class="inserted"><ins><em>It may be OK to trust
+your friend's server for some jobs, just as you might let your friend
+maintain the software on your own computer.  Outside of 
that,</em></ins></span> all
+<span class="inserted"><ins><em>these servers would</em></ins></span> be <span 
class="removed"><del><strong>SaaS.  SaaS</strong></del></span> <span 
class="inserted"><ins><em>SaaSS for you.  SaaSS</em></ins></span> always 
subjects you to
+the power of the server operator, and the only remedy is, &lt;em&gt;Don't
+use <span class="removed"><del><strong>SaaS!&lt;/em&gt;</strong></del></span> 
<span class="inserted"><ins><em>SaaSS!&lt;/em&gt;</em></ins></span>  Don't use 
someone else's server to do your own
+computing on data provided by you.&lt;/p&gt;
 
-&lt;h3&gt;Distinguishing SaaS from Other Network Services&lt;/h3&gt;
+&lt;h3&gt;Distinguishing <span 
class="removed"><del><strong>SaaS</strong></del></span> <span 
class="inserted"><ins><em>SaaSS</em></ins></span> from Other Network 
Services&lt;/h3&gt;
 
-&lt;p&gt;Does avoiding SaaS mean you refuse to use any network servers run
+<span class="removed"><del><strong>&lt;p&gt;Does avoiding SaaS mean you refuse 
to use any network servers run
 by anyone other than you?  Not at all.  Most servers do not raise this
-issue, because the job you do with them isn't your own computing
-except in a trivial sense.&lt;/p&gt;
+issue, because the job</strong></del></span>
 
-&lt;p&gt;The original purpose of web servers wasn't to do computing for you,
-it was to publish information for you to access.  Even today this is
-what most web sites do, and it doesn't pose the SaaS problem, because
-accessing someone's published information isn't a matter of doing your
-own computing.  Neither is publishing your own materials via a blog
-site or a microblogging service such as Twitter or identi.ca.  The
-same goes for communication not meant to be private, such as chat
-groups.  Social networking can extend into SaaS; however, at root it
-is just a method of communication and publication, not SaaS.  If you
-use the service for minor editing of what you're going to communicate,
-that is not a significant issue.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;p&gt;Which online services are SaaSS?  The 
clearest example is a
+translation service, which translates (say) English text into Spanish
+text.  Translating a text for</em></ins></span> you <span 
class="removed"><del><strong>do with them isn't your own</strong></del></span> 
<span class="inserted"><ins><em>is</em></ins></span> computing
+<span class="removed"><del><strong>except in a trivial sense.&lt;/p&gt;
+
+&lt;p&gt;The original purpose of web servers wasn't to</strong></del></span> 
<span class="inserted"><ins><em>that is purely yours.
+You could</em></ins></span> do <span class="removed"><del><strong>computing 
for you,</strong></del></span> it <span class="removed"><del><strong>was to 
publish information</strong></del></span> <span class="inserted"><ins><em>by 
running a program on your own computer, if only you
+had the right program.  (To be ethical, that program should be free.)
+The translation service substitutes for that program, so it is Service
+as a Software Substitute, or SaaSS.  Since it denies you control
+over your computing, it does you wrong.&lt;/p&gt;
+
+&lt;p&gt;Another clear example is using a service such as Flickr or
+Instagram to modify a photo.  Modifying photos is an activity that
+people have done in their own computers for decades; doing it in a
+server instead of your own computer is SaaSS.&lt;/p&gt;
+
+&lt;p&gt;Rejecting SaaSS does not mean refusing to use any network servers
+run by anyone other than you.  Most servers are not SaaSS because the
+jobs they do are not the user's own computing.&lt;/p&gt;
+
+&lt;p&gt;The original idea of web servers wasn't to do computing for you, it
+was to publish information</em></ins></span> for you to access.  Even today 
this is what
+most web sites do, and it doesn't pose the <span 
class="removed"><del><strong>SaaS</strong></del></span> <span 
class="inserted"><ins><em>SaaSS</em></ins></span> problem, because
+accessing someone's published information isn't <span 
class="removed"><del><strong>a matter of</strong></del></span> doing your own
+computing.  Neither is publishing your own materials via a blog site
+or a microblogging service such as Twitter or <span 
class="removed"><del><strong>identi.ca.</strong></del></span> <span 
class="inserted"><ins><em>StatusNet.  (These
+services may have other problems, of course.)</em></ins></span>  The same goes 
for <span class="inserted"><ins><em>other</em></ins></span>
+communication not meant to be private, such as chat
+<span class="removed"><del><strong>groups.  Social</strong></del></span> <span 
class="inserted"><ins><em>groups.&lt;/p&gt;
+
+&lt;p&gt;In its essence, social</em></ins></span> networking <span 
class="removed"><del><strong>can extend into SaaS; however, at root 
it</strong></del></span> is <span 
class="removed"><del><strong>just</strong></del></span> a <span 
class="removed"><del><strong>method</strong></del></span> <span 
class="inserted"><ins><em>form</em></ins></span> of communication and
+publication, not <span class="removed"><del><strong>SaaS.  If you
+use the</strong></del></span> <span class="inserted"><ins><em>SaaSS.  However, 
a service whose main facility is
+social networking can have features or extensions which are SaaSS.&lt;/p&gt;
+
+&lt;p&gt;If a</em></ins></span> service <span class="removed"><del><strong>for 
minor editing of what you're going to communicate,
+that</strong></del></span> is not <span class="inserted"><ins><em>SaaSS, that 
does not mean it is OK.  There are
+other ethical issues about services.  For instance, Facebook
+distributes video in Flash, which pressures users to run nonfree
+software; it requires running nonfree JavaScript code; and it gives
+users</em></ins></span> a <span class="removed"><del><strong>significant 
issue.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>misleading impression of privacy while luring them 
into baring
+their lives to Facebook.  Those are important issues, different from
+the SaaSS issue.
+&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;Services such as search engines collect data from around the web
 and let you examine it.  Looking through their collection of data
 isn't your own computing in the usual sense&mdash;you didn't provide
 that collection&mdash;so using such a service to search the web is not
-SaaS.  (However, using someone else's search engine to implement a
-search facility for your own site &lt;em&gt;is&lt;/em&gt; SaaS.)&lt;/p&gt;
+<span class="removed"><del><strong>SaaS.  (However,</strong></del></span>
+<span class="inserted"><ins><em>SaaSS.  However,</em></ins></span> using 
someone else's <span class="removed"><del><strong>search 
engine</strong></del></span> <span 
class="inserted"><ins><em>server</em></ins></span> to implement a search
+facility for your own site &lt;em&gt;is&lt;/em&gt; <span 
class="removed"><del><strong>SaaS.)&lt;/p&gt;
 
-&lt;p&gt;E-commerce is not SaaS, because the computing isn't solely yours;
-rather, it is done jointly for you and another party.  So there's no
-particular reason why you alone should expect to control that
-computing.  The real issue in e-commerce is whether you trust the
-other party with your money and personal information.&lt;/p&gt;
-
-&lt;p&gt;Using a joint project's servers isn't SaaS because the computing
-you do in this way isn't yours personally.  For instance, if you edit
-pages on Wikipedia, you are not doing your own computing; rather, you
-are collaborating in Wikipedia's computing.&lt;/p&gt;
+&lt;p&gt;E-commerce</strong></del></span> <span 
class="inserted"><ins><em>SaaSS.&lt;/p&gt;
 
-&lt;p&gt;Wikipedia controls its own servers, but groups can face the problem
-of SaaS if they do their group activities on someone else's server.
+&lt;p&gt;Purchasing online</em></ins></span> is not <span 
class="removed"><del><strong>SaaS,</strong></del></span> <span 
class="inserted"><ins><em>SaaSS,</em></ins></span> because the computing
+isn't <span class="removed"><del><strong>solely yours;</strong></del></span> 
<span class="inserted"><ins><em>&lt;em&gt;your 
own&lt;/em&gt;;</em></ins></span> rather, it is done jointly <span 
class="inserted"><ins><em>by and</em></ins></span> for you and <span 
class="removed"><del><strong>another party.  So there's no
+particular reason why you alone should expect to control that
+computing.</strong></del></span>
+<span class="inserted"><ins><em>the store.</em></ins></span>  The real issue 
in <span class="removed"><del><strong>e-commerce</strong></del></span> <span 
class="inserted"><ins><em>online shopping</em></ins></span> is whether you 
trust the
+other party with your money and <span 
class="inserted"><ins><em>other</em></ins></span> personal <span 
class="removed"><del><strong>information.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>information (starting
+with your name).&lt;/p&gt;
+
+&lt;p&gt;Repository sites such as as Savannah and SourceForge are not
+inherently SaaSS, because a repository's job is publication of data
+supplied to it.&lt;/p&gt;</em></ins></span>
+
+&lt;p&gt;Using a joint project's servers isn't <span 
class="removed"><del><strong>SaaS</strong></del></span> <span 
class="inserted"><ins><em>SaaSS</em></ins></span> because the computing
+you do in this way isn't <span class="removed"><del><strong>yours 
personally.</strong></del></span> <span class="inserted"><ins><em>your 
own.</em></ins></span>  For instance, if you edit pages on
+Wikipedia, you are not doing your own computing; rather, you are
+collaborating in Wikipedia's <span 
class="removed"><del><strong>computing.&lt;/p&gt;
+
+&lt;p&gt;Wikipedia</strong></del></span> <span 
class="inserted"><ins><em>computing.  Wikipedia</em></ins></span> controls its 
own
+servers, but <span class="removed"><del><strong>groups can 
face</strong></del></span> <span class="inserted"><ins><em>organizations as 
well as individuals encounter</em></ins></span> the
+problem of <span class="removed"><del><strong>SaaS</strong></del></span> <span 
class="inserted"><ins><em>SaaSS</em></ins></span> if they do their <span 
class="removed"><del><strong>group activities on someone else's server.
 Fortunately, development hosting sites such as Savannah and
 SourceForge don't pose the SaaS problem, because what groups do there
 is mainly publication and public communication, rather than their own
 private computing.&lt;/p&gt;
 
-&lt;p&gt;Multiplayer games are a group activity carried out on someone
-else's server, which makes them SaaS.  But where the data involved is
+&lt;p&gt;Multiplayer games are a group activity carried out 
on</strong></del></span> <span class="inserted"><ins><em>computing 
in</em></ins></span> someone else's <span class="removed"><del><strong>server, 
which makes them SaaS.  But where the data involved is
 just the state of play and the score, the worst wrong the operator
 might commit is favoritism.  You might well ignore that risk, since it
 seems unlikely and very little is at stake.  On the other hand, when
 the game becomes more than just a game, the issue changes.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;&ldquo;Backend as a Service&rdquo;, 
or BaaS, is a kind of SaaS, because it
-involves running your own web service on top of software that you
-can't control.  If you set up a service using BaaS, the BaaS platform
-may well collect information about your users as well as 
you.&lt;/p&gt;</em></ins></span>
-
 &lt;p&gt;Which online services are SaaS?  Google Docs is a clear example.
 Its basic activity is editing, and Google encourages people to use it
 for their own editing; this is SaaS.  It offers the added feature of
 collaborative editing, but adding participants doesn't alter the fact
 that editing on the server is SaaS.  (In addition, Google Docs is
-unacceptable because it installs a
-large <span class="inserted"><ins><em>&lt;a 
href="/philosophy/javascript-trap.html"&gt;</em></ins></span> nonfree 
JavaScript <span class="removed"><del><strong>program</strong></del></span> 
<span class="inserted"><ins><em>program&lt;/a&gt;</em></ins></span>
-into the <span class="removed"><del><strong>users' 
browsers.)</strong></del></span> <span class="inserted"><ins><em>user's 
browser.)</em></ins></span>  If using a service for communication or
+unacceptable because it installs a large nonfree JavaScript program
+into the users' browsers.)  If using a service for communication or
 collaboration requires doing substantial parts of your own computing
 with it too, that computing is SaaS even if the communication is
-not.&lt;/p&gt;
+not.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>server.&lt;/p&gt;</em></ins></span>
 
-&lt;p&gt;Some sites offer multiple services, and if one is not SaaS, another
-may be SaaS.  For instance, the main service of Facebook is social
-networking, and that is not SaaS; however, it supports third-party
-applications, some of which may be SaaS.  Flickr's main service is
-distributing photos, which is not SaaS, but it also has features for
-editing photos, which is SaaS.&lt;/p&gt;
-
-&lt;p&gt;Some sites whose main service is publication and communication
-extend it with &ldquo;contact management&rdquo;: keeping track of
-people you have relationships with.  Sending mail to those people for
-you is not SaaS, but keeping track of your dealings with them, if
-substantial, is SaaS.&lt;/p&gt;
-
-&lt;p&gt;If a service is not SaaS, that does not mean it is OK.  There are
-other bad things a service can do.  For instance, Facebook distributes
-video in Flash, which pressures users to run nonfree software, and it
-gives users a misleading impression of privacy.  Those are important
-issues too, but this article's concern is the issue of SaaS.&lt;/p&gt;
-
-&lt;p&gt;The IT industry discourages users from considering these
-distinctions.  That's what the buzzword &ldquo;cloud computing&rdquo;
-is for.  This term is so nebulous that it could refer to almost any
-use of the Internet.  It includes SaaS and it includes nearly
-everything else.  The term only lends itself to uselessly broad
+&lt;p&gt;Some sites offer multiple services, and if one is not <span 
class="removed"><del><strong>SaaS,</strong></del></span> <span 
class="inserted"><ins><em>SaaSS,</em></ins></span>
+another may be <span class="removed"><del><strong>SaaS.</strong></del></span> 
<span class="inserted"><ins><em>SaaSS.</em></ins></span>  For instance, the 
main service of Facebook is
+social networking, and that is not <span 
class="removed"><del><strong>SaaS;</strong></del></span> <span 
class="inserted"><ins><em>SaaSS;</em></ins></span> however, it supports
+third-party applications, some of which <span class="removed"><del><strong>may 
be SaaS.</strong></del></span> <span class="inserted"><ins><em>are 
SaaSS.</em></ins></span>  Flickr's main
+service is distributing photos, which is not <span 
class="removed"><del><strong>SaaS,</strong></del></span> <span 
class="inserted"><ins><em>SaaSS,</em></ins></span> but it also has
+features for editing photos, which is <span 
class="removed"><del><strong>SaaS.&lt;/p&gt;
+
+&lt;p&gt;Some sites whose main service</strong></del></span> <span 
class="inserted"><ins><em>SaaSS.  Likewise, using
+Instagram to post a photo</em></ins></span> is <span 
class="removed"><del><strong>publication and communication
+extend</strong></del></span> <span class="inserted"><ins><em>not SaaSS, but 
using</em></ins></span> it <span class="removed"><del><strong>with 
&ldquo;contact management&rdquo;: keeping track</strong></del></span> <span 
class="inserted"><ins><em>to transform the
+photo is SaaSS.&lt;/p&gt;
+
+&lt;p&gt;Google Docs shows how complex the evaluation</em></ins></span> of 
<span class="inserted"><ins><em>a single service
+can become.  It invites</em></ins></span> people <span 
class="removed"><del><strong>you have relationships with.  Sending 
mail</strong></del></span> to <span class="removed"><del><strong>those 
people</strong></del></span> <span class="inserted"><ins><em>edit a document by 
running a
+large &lt;a href="/philosophy/javascript-trap.html"&gt;nonfree JavaScript
+program&lt;/a&gt;, clearly wrong.  However, it offers an API</em></ins></span> 
for
+<span class="removed"><del><strong>you</strong></del></span> <span 
class="inserted"><ins><em>uploading
+and downloading documents in standard formats.  A free software editor
+can do so through this API.  This usage scenario</em></ins></span> is not 
<span class="removed"><del><strong>SaaS, but keeping track 
of</strong></del></span> <span class="inserted"><ins><em>SaaSS, because
+it uses Google Docs as a mere repository.  Showing all</em></ins></span> your 
<span class="removed"><del><strong>dealings with them, if
+substantial,</strong></del></span> <span class="inserted"><ins><em>data to a
+company</em></ins></span> is <span class="removed"><del><strong>SaaS.&lt;/p&gt;
+
+&lt;p&gt;If</strong></del></span> <span class="inserted"><ins><em>bad, but 
that is a matter of privacy, not SaaSS; depending
+on</em></ins></span> a service <span class="inserted"><ins><em>for access to 
your data</em></ins></span> is <span class="removed"><del><strong>not 
SaaS,</strong></del></span> <span class="inserted"><ins><em>bad, 
but</em></ins></span> that <span class="removed"><del><strong>does not mean 
it</strong></del></span> is <span class="removed"><del><strong>OK.  There are
+other bad things</strong></del></span> a <span 
class="inserted"><ins><em>matter of
+risk, not SaaSS.  On the other hand, using the</em></ins></span> service <span 
class="removed"><del><strong>can do.  For instance, Facebook distributes
+video</strong></del></span> <span class="inserted"><ins><em>for converting
+document formats &lt;em&gt;is&lt;/em&gt; SaaSS, because it's something you 
could
+have done by running a suitable program (free, one hopes)</em></ins></span> in 
<span class="removed"><del><strong>Flash,</strong></del></span> <span 
class="inserted"><ins><em>your own
+computer.&lt;/p&gt;
+
+&lt;p&gt;Using Google Docs through a free editor is rare, of course.  Most
+often, people use it through the nonfree JavaScript program,</em></ins></span> 
which <span class="removed"><del><strong>pressures users to 
run</strong></del></span> <span class="inserted"><ins><em>is
+bad like any</em></ins></span> nonfree <span 
class="removed"><del><strong>software,</strong></del></span> <span 
class="inserted"><ins><em>program.  This scenario might involve SaaSS, too;
+that depends on what part of the editing is done in the JavaScript
+program and what part in the server.  We don't know, but since 
SaaSS</em></ins></span>
+and <span class="inserted"><ins><em>proprietary software do similar wrong to 
the user,</em></ins></span> it
+<span class="removed"><del><strong>gives users a misleading impression of 
privacy.  Those are important
+issues too,</strong></del></span> <span class="inserted"><ins><em>is not
+crucial to know.&lt;/p&gt;
+
+&lt;p&gt;Publishing via someone else's repository does not raise privacy
+issues,</em></ins></span> but <span class="removed"><del><strong>this 
article's concern</strong></del></span> <span 
class="inserted"><ins><em>publishing through Google Docs has a special problem: 
it</em></ins></span>
+is <span class="inserted"><ins><em>impossible even to 
&lt;em&gt;view</em></ins></span> the <span 
class="removed"><del><strong>issue</strong></del></span> <span 
class="inserted"><ins><em>text&lt;/em&gt; of a Google Docs document
+in a browser without running the nonfree JavaScript code.  Thus, you
+should not use Google Docs to publish anything&mdash;but the reason
+is not a matter</em></ins></span> of <span 
class="removed"><del><strong>SaaS.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>SaaSS.&lt;/p&gt;</em></ins></span>
+
+&lt;p&gt;The IT industry discourages users from <span 
class="removed"><del><strong>considering</strong></del></span> <span 
class="inserted"><ins><em>making</em></ins></span> these distinctions.
+That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This
+term is so nebulous that it could refer to almost any use of the
+Internet.  It includes <span class="removed"><del><strong>SaaS and it includes 
nearly
+everything else.</strong></del></span> <span class="inserted"><ins><em>SaaSS 
as well as many other network usage
+practices.  In any given context, an author who writes
+&ldquo;cloud&rdquo; (if a technical person) probably has a specific
+meaning in mind, but usually does not explain that in other articles
+the term has other specific meanings.</em></ins></span>  The term <span 
class="removed"><del><strong>only lends itself</strong></del></span> <span 
class="inserted"><ins><em>leads people to
+generalize about practices they ought</em></ins></span> to <span 
class="removed"><del><strong>uselessly broad
 statements.&lt;/p&gt;
 
-&lt;p&gt;The real meaning of &ldquo;cloud computing&rdquo; is to suggest a
-devil-may-care approach towards your computing.  It says, &ldquo;Don't
-ask questions, just trust every business without hesitation.  Don't
+&lt;p&gt;The real meaning of</strong></del></span> <span 
class="inserted"><ins><em>consider individually.&lt;/p&gt;
+
+&lt;p&gt;If</em></ins></span> &ldquo;cloud computing&rdquo; <span 
class="inserted"><ins><em>has a meaning, it</em></ins></span> is <span 
class="removed"><del><strong>to suggest</strong></del></span> <span 
class="inserted"><ins><em>not a way of
+doing computing, but rather a way of thinking about 
computing:</em></ins></span> a
+devil-may-care approach <span class="removed"><del><strong>towards your 
computing.  It</strong></del></span> <span 
class="inserted"><ins><em>which</em></ins></span> says, &ldquo;Don't ask <span 
class="removed"><del><strong>questions, just trust every business without 
hesitation.</strong></del></span> <span 
class="inserted"><ins><em>questions.</em></ins></span>  Don't
 worry about who controls your computing or who holds your data.  Don't
 check for a hook hidden inside our service before you swallow
-it.&rdquo; In other words, &ldquo;Think like a sucker.&rdquo; I prefer
-to avoid the term.&lt;/p&gt;
+<span class="removed"><del><strong>it.&rdquo;</strong></del></span> <span 
class="inserted"><ins><em>it.
+Trust companies without hesitation.&rdquo;</em></ins></span> In other words, 
<span class="removed"><del><strong>&ldquo;Think like</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;Be</em></ins></span> a
+sucker.&rdquo; <span class="removed"><del><strong>I 
prefer</strong></del></span> <span class="inserted"><ins><em>A cloud in the 
mind is an obstacle</em></ins></span> to <span class="inserted"><ins><em>clear 
thinking.
+For the sake of clear thinking about computing, let's</em></ins></span> avoid 
the <span class="removed"><del><strong>term.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>term
+&ldquo;cloud.&rdquo;&lt;/p&gt;</em></ins></span>
 
-&lt;h3&gt;Dealing with the SaaS Problem&lt;/h3&gt;
+&lt;h3&gt;Dealing with the <span 
class="removed"><del><strong>SaaS</strong></del></span> <span 
class="inserted"><ins><em>SaaSS</em></ins></span> Problem&lt;/h3&gt;
 
-&lt;p&gt;Only a small fraction of all web sites do SaaS; most don't raise
+&lt;p&gt;Only a small fraction of all web sites do <span 
class="removed"><del><strong>SaaS;</strong></del></span> <span 
class="inserted"><ins><em>SaaSS;</em></ins></span> most don't raise
 the issue.  But what should we do about the ones that raise it?&lt;/p&gt;
 
 &lt;p&gt;For the simple case, where you are doing your own computing on data
-in your own hands, the solution is simple: use your own copy of a free software
-application.  Do your text editing with your copy of a free text
-editor such as GNU Emacs or a free word processor.  Do your photo
-editing with your copy of free software such as GIMP.&lt;/p&gt;
-
-&lt;p&gt;But what about collaborating with other individuals?  It may be
-hard to do this at present without using a server.  If you use one,
-don't trust a server run by a company.  A mere contract as a customer
-is no protection unless you could detect a breach and could really
-sue, and the company probably writes its contracts to permit a broad
-range of abuses.  Police can subpoena your data from the company with
-less basis than required to subpoena them from you, supposing the
-company doesn't volunteer them like the US phone companies that
-illegally wiretapped their customers for Bush.  If you must use a
-server, use a server whose operators give you a basis for trust beyond
-a mere commercial relationship.&lt;/p&gt;
+in your own hands, the solution is simple: use your own copy of a free
+software application.  Do your text editing with your copy of a free
+text editor such as GNU Emacs or a free word processor.  Do your photo
+editing with your copy of free software such as <span 
class="removed"><del><strong>GIMP.&lt;/p&gt;
+
+&lt;p&gt;But what</strong></del></span> <span class="inserted"><ins><em>GIMP.  
What if there
+is no free program available?  A proprietary program or SaaSS would
+take away your freedom, so you shouldn't use those.  You can contribute
+your time or your money to development of a free replacement.&lt;/p&gt;
+
+&lt;p&gt;What</em></ins></span> about collaborating with other <span 
class="removed"><del><strong>individuals?</strong></del></span> <span 
class="inserted"><ins><em>individuals as a group?</em></ins></span>  It may
+be hard to do this at present without using a <span 
class="inserted"><ins><em>server, and your group
+may not know how to run its own</em></ins></span> server.  If you use <span 
class="removed"><del><strong>one,</strong></del></span> <span 
class="inserted"><ins><em>someone else's
+server, at least</em></ins></span> don't trust a server run by a company.  A 
mere
+contract as a customer is no protection unless you could detect a
+breach and could really sue, and the company probably writes its
+contracts to permit a broad range of abuses.  <span 
class="removed"><del><strong>Police</strong></del></span>  <span 
class="inserted"><ins><em>The state</em></ins></span> can subpoena
+your data from the company <span 
class="inserted"><ins><em>along</em></ins></span> with
+<span class="removed"><del><strong>less basis than 
required</strong></del></span> <span class="inserted"><ins><em>everyone else's, 
as Obama has
+done</em></ins></span> to <span class="removed"><del><strong>subpoena them 
from you,</strong></del></span> <span class="inserted"><ins><em>phone 
companies,</em></ins></span> supposing the company doesn't volunteer them
+like the US phone companies that illegally wiretapped their customers
+for Bush.  If you must use a server, use a server whose operators give
+you a basis for trust beyond a mere commercial relationship.&lt;/p&gt;
 
 &lt;p&gt;However, on a longer time scale, we can create alternatives to
 using servers.  For instance, we can create a peer-to-peer program
@@ -282,51 +440,88 @@
 free software projects to consider this issue in their design.&lt;/p&gt;
 
 &lt;p&gt;In the meantime, if a company invites you to use its server to do
-your own computing tasks, don't yield; don't use SaaS.  Don't buy or
+your own computing tasks, don't yield; don't use <span 
class="removed"><del><strong>SaaS.</strong></del></span> <span 
class="inserted"><ins><em>SaaSS.</em></ins></span>  Don't buy or
 install &ldquo;thin clients&rdquo;, which are simply computers so weak
-they make you do the real work on a server, unless you're
-going to use them with &lt;em&gt;your&lt;/em&gt; server.  Use a real
-computer and keep your data there.  Do your work with your own copy of
-a free program, for your freedom's sake.&lt;/p&gt;
+they make you do the real work on a server, unless you're going to use
+them with &lt;em&gt;your&lt;/em&gt; server.  Use a real computer and keep your
+data there.  Do your <span 
class="removed"><del><strong>work</strong></del></span> <span 
class="inserted"><ins><em>own computing</em></ins></span> with your own copy of 
a free
+program, for your freedom's sake.&lt;/p&gt;
+
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;h3&gt;See also:&lt;/h3&gt;
 &lt;p&gt;&lt;a href="/philosophy/bug-nobody-allowed-to-understand.html"&gt;The
-Bug Nobody is Allowed to Understand&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
+Bug Nobody is Allowed to Understand&lt;/a&gt;.&lt;/p&gt;
 
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above 
--&gt;</em></ins></span>
 &lt;!--#include virtual="/server/footer.html" --&gt;
-
 &lt;div id="footer"&gt;
-&lt;p&gt;
-Please send FSF &amp; GNU inquiries to
-&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.  There 
are
-also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt; the FSF.
-&lt;br /&gt;
-Please send broken links and other corrections or suggestions to
-&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+<span class="removed"><del><strong>&lt;p&gt;
+Please</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.
+<span class="removed"><del><strong>&lt;br /&gt;
+Please send broken</strong></del></span>  <span 
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections 
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
+to &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 &lt;/p&gt;
 
-&lt;p&gt;Please see
-the &lt;a href="/server/standards/README.translations.html"&gt;Translations
+&lt;p&gt;Please</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;
+Please</em></ins></span> see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
 README&lt;/a&gt; for information on coordinating and submitting translations
 of this article.&lt;/p&gt;
 
-&lt;p&gt;Copyright &copy; 2010 Richard Stallman
+<span class="inserted"><ins><em>&lt;!-- Regarding copyright, in general, 
standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. --&gt;</em></ins></span>
+
+&lt;p&gt;Copyright &copy; <span 
class="removed"><del><strong>2010</strong></del></span> <span 
class="inserted"><ins><em>2010, 2013</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman
 &lt;br /&gt;
-This page is licensed under a &lt;a rel="license"
+This</strong></del></span> <span class="inserted"><ins><em>Stallman&lt;/p&gt;
+
+&lt;p&gt;This</em></ins></span> page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.
-&lt;/p&gt;
+Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;!--#include 
virtual="/server/bottom-notes.html" --&gt;</em></ins></span>
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;</em></ins></span>
 
 &lt;p&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2013/06/06 17:00:37 $
+$Date: 2013/06/18 05:30:00 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-
 &lt;/div&gt;
 &lt;/body&gt;
 &lt;/html&gt;

Index: who-does-that-server-really-serve.ko.po
===================================================================
RCS file: /web/www/www/philosophy/po/who-does-that-server-really-serve.ko.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- who-does-that-server-really-serve.ko.po     6 Jun 2013 17:00:37 -0000       
1.10
+++ who-does-that-server-really-serve.ko.po     18 Jun 2013 05:30:00 -0000      
1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: who-does-that-server-really-serve.html\n"
-"POT-Creation-Date: 2013-06-06 16:55+0000\n"
+"POT-Creation-Date: 2013-06-18 05:25+0000\n"
 "PO-Revision-Date: 2012-05-04 14:26+0900\n"
 "Last-Translator: Chang-hun Song <address@hidden>\n"
 "Language-Team: Korean <address@hidden>\n"
@@ -18,9 +18,12 @@
 "Outdated-Since: 2012-10-31 20:26-0300\n"
 
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "Who Does That Server Really Serve? - GNU Project - Free Software "
+#| "Foundation (FSF)"
 msgid ""
-"Who Does That Server Really Serve? - GNU Project - Free Software Foundation "
-"(FSF)"
+"Who Does That Server Really Serve? - GNU Project - Free Software Foundation"
 msgstr ""
 "그 서버는 실제로 누구에게 봉사합니까? - GNU 프로젝트 - 
자유 소프트웨어 재단 "
 "(FSF)"
@@ -33,28 +36,44 @@
 msgid "by <strong>Richard Stallman</strong>"
 msgstr "글: <strong>리처드 스톨먼</strong>"
 
-#. type: Content of: <p>
+#. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid ""
 #| "(First published by <a href=\"http://bostonreview.net/BR35.2/stallman.php";
 #| "\"> Boston Review</a>.)"
 msgid ""
-"(First published by <a href=\"http://www.bostonreview.net/richard-stallman-";
-"free-software-DRM\"> Boston Review</a>.)"
+"(The first version was published in <a href=\"http://www.bostonreview.net/";
+"richard-stallman-free-software-DRM\"> Boston Review</a>.)"
 msgstr ""
 "(이 글은 <a href=\"http://bostonreview.net/BR35.2/stallman.php\";> Boston "
 "Review</a>에 처음 발표되었던 것입니다.)"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<strong>On the Internet, proprietary software isn't the only way to lose "
+#| "your freedom.  Software as a Service is another way to let someone else "
+#| "have power over your computing.</strong>"
 msgid ""
 "<strong>On the Internet, proprietary software isn't the only way to lose "
-"your freedom.  Software as a Service is another way to let someone else have "
-"power over your computing.</strong>"
+"your freedom.  Service as a Software Substitute, or SaaSS, is another way to "
+"let someone else have power over your computing.</strong>"
 msgstr ""
 "<strong>인터넷에서 여러분의 자유를 잃게 하는 것이 독점 
소프트웨어 뿐은 아닙니"
 "다. 서비스형 소프트웨어(SaaS, Software as a Service)도 
누군가에게 여러분의 컴"
 "퓨터 사용을 제어할 힘을 부여하는 또다른 방법이 
됩니다.</strong>"
 
+#. type: Content of: outside any tag (error?)
+msgid ""
+"SaaSS means using a service implemented by someone else as a substitute for "
+"running your copy of a program.  The term is ours; articles and ads won't "
+"use it, and they won't tell you whether a service is SaaSS.  Instead they "
+"will probably use the vague and distracting term &ldquo;cloud&rdquo;, which "
+"lumps SaaSS together with various other practices, some abusive and some "
+"ok.  With the explanation and examples in this page, you can tell whether a "
+"service is SaaSS."
+msgstr ""
+
 #. type: Content of: <h3>
 msgid "Background: How Proprietary Software Takes Away Your Freedom"
 msgstr "배경: 독점 소프트웨어는 어떻게 여러분의 자유를 
앗아가는가"
@@ -98,12 +117,19 @@
 "참고할 수 있습니다.)"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "With free software, we, the users, take back control of our computing.  "
+#| "Proprietary software still exists, but we can exclude it from our lives "
+#| "and many of us have done so.  However, we now face a new threat to our "
+#| "control over our computing: Software as a Service.  For our freedom's "
+#| "sake, we have to reject that too."
 msgid ""
 "With free software, we, the users, take back control of our computing.  "
 "Proprietary software still exists, but we can exclude it from our lives and "
 "many of us have done so.  However, we now face a new threat to our control "
-"over our computing: Software as a Service.  For our freedom's sake, we have "
-"to reject that too."
+"over our computing: Service as a Software Substitute (SaaSS).  For our "
+"freedom's sake, we have to reject that too."
 msgstr ""
 "자유 소프트웨어를 통해 우리 사용자들은 컴퓨터 사용의 
통제력을 되찾을 수 있습"
 "니다. 독점 소프트웨어는 여전히 존재하지만 우리는 
우리의 삶에서 그것을 몰아낼 "
@@ -112,17 +138,29 @@
 "다. 우리의 자유를 위해, 우리는 이또한 거부해야만 
합니다."
 
 #. type: Content of: <h3>
-msgid "How Software as a Service Takes Away Your Freedom"
+#, fuzzy
+#| msgid "How Software as a Service Takes Away Your Freedom"
+msgid "How Service as a Software Substitute Takes Away Your Freedom"
 msgstr "SaaS는 어떻게 여러분의 자유를 빼앗는가"
 
 #. type: Content of: <p>
-msgid ""
-"Software as a Service (SaaS) means that someone sets up a network server "
-"that does certain computing tasks&mdash;running spreadsheets, word "
-"processing, translating text into another language, etc.&mdash;then invites "
-"users to do their computing on that server.  Users send their data to the "
-"server, which does their computing on the data thus provided, then sends the "
-"results back or acts on them directly."
+#, fuzzy
+#| msgid ""
+#| "Software as a Service (SaaS) means that someone sets up a network server "
+#| "that does certain computing tasks&mdash;running spreadsheets, word "
+#| "processing, translating text into another language, etc.&mdash;then "
+#| "invites users to do their computing on that server.  Users send their "
+#| "data to the server, which does their computing on the data thus provided, "
+#| "then sends the results back or acts on them directly."
+msgid ""
+"Service as a Software Substitute (SaaSS) means using a service as a "
+"substitute for running your copy of a program.  Concretely, it means that "
+"someone sets up a network server that does certain computing tasks&mdash;for "
+"instance, modifying a photo, translating text into another language, etc."
+"&mdash;then invites users to do computing via that server.  A user of the "
+"server would send her data to the server, which does <em>her own computing</"
+"em> on the data thus provided, then sends the results back to her or acts "
+"directly on her behalf."
 msgstr ""
 "서비스형 소프트웨어 SaaS란, 문서 편집이나스프레드시트 
작업, 언어 번역 등과 같"
 "은 특정한 컴퓨터 작업을 할 수 있게 누군가 준비해 놓은 
네트워크 서버로 사용자"
@@ -132,11 +170,26 @@
 
 #. type: Content of: <p>
 msgid ""
+"The computing is <em>her own</em> because, by assumption, she could, in "
+"principle, have done it by running a program on her own computer (whether or "
+"not that program is available to her at present).  When this assumption is "
+"not so, it isn't SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These servers wrest control from the users even more inexorably than "
+#| "proprietary software.  With proprietary software, users typically get an "
+#| "executable file but not the source code.  That makes it hard for "
+#| "programmers to study the code that is running, so it's hard to determine "
+#| "what the program really does, and hard to change it."
+msgid ""
 "These servers wrest control from the users even more inexorably than "
 "proprietary software.  With proprietary software, users typically get an "
-"executable file but not the source code.  That makes it hard for programmers "
-"to study the code that is running, so it's hard to determine what the "
-"program really does, and hard to change it."
+"executable file but not the source code.  That makes it hard to study the "
+"code that is running, so it's hard to determine what the program really "
+"does, and hard to change it."
 msgstr ""
 "이러한 서버들은 심지어 독점 소프트웨어보다 더 
심각하게 사용자의 통제권을 빼앗"
 "습니다. 독점 소프트웨어에서는 사용자들이 전형적으로 
소스 코드 없이 실행 파일"
@@ -145,10 +198,16 @@
 "니다."
 
 #. type: Content of: <p>
-msgid ""
-"With SaaS, the users do not have even the executable file: it is on the "
-"server, where the users can't see or touch it.  Thus it is impossible for "
-"them to ascertain what it really does, and impossible to change it."
+#, fuzzy
+#| msgid ""
+#| "With SaaS, the users do not have even the executable file: it is on the "
+#| "server, where the users can't see or touch it.  Thus it is impossible for "
+#| "them to ascertain what it really does, and impossible to change it."
+msgid ""
+"With SaaSS, the users do not have even the executable file that does their "
+"computing: it is on someone else's server, where the users can't see or "
+"touch it.  Thus it is impossible for them to ascertain what it really does, "
+"and impossible to change it."
 msgstr ""
 "SaaS에서는 사용자가 심지어 실행 파일도 가질 수 
없습니다. 그것은 사용자가 보거"
 "나 만질 수 없는 서버에 존재합니다. 따라서 그들이 실ì 
œë¡œ 무엇을 하는지 확인하"
@@ -156,12 +215,26 @@
 
 #. type: Content of: <p>
 msgid ""
-"Furthermore, SaaS automatically leads to harmful consequences equivalent to "
-"the malicious features of certain proprietary software.  For instance, some "
-"proprietary programs are &ldquo;spyware&rdquo;: the program sends out data "
-"about users' computing activities.  Microsoft Windows sends information "
-"about users' activities to Microsoft.  Windows Media Player and RealPlayer "
-"report what each user watches or listens to."
+"Furthermore, SaaSS automatically leads to consequences equivalent to the "
+"malicious features of certain proprietary software."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Furthermore, SaaS automatically leads to harmful consequences equivalent "
+#| "to the malicious features of certain proprietary software.  For instance, "
+#| "some proprietary programs are &ldquo;spyware&rdquo;: the program sends "
+#| "out data about users' computing activities.  Microsoft Windows sends "
+#| "information about users' activities to Microsoft.  Windows Media Player "
+#| "and RealPlayer report what each user watches or listens to."
+msgid ""
+"For instance, some proprietary programs are &ldquo;spyware&rdquo;: the "
+"program sends out data about users' computing activities.  Microsoft Windows "
+"sends information about users' activities to Microsoft.  Windows Media "
+"Player reports what each user watches or listens to.  The Amazon Kindle "
+"reports which pages of which books the user looks at, and when.  Angry Birds "
+"reports the user's geolocation history."
 msgstr ""
 "더욱이 SaaS는 특정한 독점 소프트웨어의 해로운 기능과 
같은 나쁜 결과를 자동적"
 "으로  가져옵니다. 예를 들면, 어떤 독점 소프트웨어들은 
스파이웨어입니다. 이러"
@@ -171,11 +244,18 @@
 "합니다."
 
 #. type: Content of: <p>
-msgid ""
-"Unlike proprietary software, SaaS does not require covert code to obtain the "
-"user's data.  Instead, users must send their data to the server in order to "
-"use it.  This has the same effect as spyware: the server operator gets the "
-"data.  He gets it with no special effort, by the nature of SaaS."
+#, fuzzy
+#| msgid ""
+#| "Unlike proprietary software, SaaS does not require covert code to obtain "
+#| "the user's data.  Instead, users must send their data to the server in "
+#| "order to use it.  This has the same effect as spyware: the server "
+#| "operator gets the data.  He gets it with no special effort, by the nature "
+#| "of SaaS."
+msgid ""
+"Unlike proprietary software, SaaSS does not require covert code to obtain "
+"the user's data.  Instead, users must send their data to the server in order "
+"to use it.  This has the same effect as spyware: the server operator gets "
+"the data&mdash;with no special effort, by the nature of SaaSS."
 msgstr ""
 "독점 소프트웨어와 달리, SaaS는 사용자의 데이터를 얻기 
위해 코드를 숨길 필요"
 "가 없습니다. 그대신 사용자는 서비스를 이용하기 위해 
자신의 데이터를 서버로 직"
@@ -185,52 +265,80 @@
 
 #. type: Content of: <p>
 msgid ""
-"Some proprietary programs can mistreat users under remote command.  For "
-"instance, Windows has a back door with which Microsoft can forcibly change "
-"any software on the machine.  The Amazon Kindle e-book reader (whose name "
-"suggests it's intended to burn people's books) has an Orwellian back door "
-"that Amazon used in 2009 to <a href=\"http://www.nytimes.com/2009/07/18/";
-"technology/companies/18amazon.html\" >remotely delete</a> Kindle copies of "
-"Orwell's books <cite>1984</cite> and <cite>Animal Farm</cite> which the "
-"users had purchased from Amazon."
+"Some proprietary operating systems have a universal back door, permitting "
+"someone to remotely install software changes.  For instance, Windows has a "
+"universal back door with which Microsoft can forcibly change any software on "
+"the machine.  Nearly all portable phones have them, too.  Some proprietary "
+"applications also have universal back doors; for instance, the Steam client "
+"for GNU/Linux allows the developer to remotely install modified versions."
 msgstr ""
-"어떤 독점 프로그램들은 원격 명령으로 사용자를 혹사할 
수 있습니다. 예를 들면, "
-"윈도우즈에는 컴퓨터에 있는 어떤 소프트웨어도 
마이크로소프트가 강제로 변경할 "
-"수 있는 백도어가 있습니다. (사람들의 종이책을 불태우겠
다는 의미를 암시하는) "
-"아마존 킨들 전자책 리더는 사용자가 아마존으로부터 구입
했던 조지 오웰의 "
-"<cite>1984년</cite>과 <cite>동물농장</cite>의 킨들 복제물을 <a 
href=\"http://";
-"www.nytimes.com/2009/07/18/technology/companies/18amazon.html\" >원격으로 
삭"
-"제</a>하기 위해 2009년에 사용했던 오웰리언 백도어를 갖고 
있습니다."
 
 #. type: Content of: <p>
 msgid ""
-"SaaS inherently gives the server operator the power to change the software "
-"in use, or the users' data being operated on.  Once again, no special code "
-"is needed to do this."
+"With SaaSS, the server operator can change the software in use on the "
+"server.  He ought to be able to do this, since it's his computer; but the "
+"result is the same as using a proprietary application program with a "
+"universal back door: someone has the power to silently impose changes in how "
+"the user's computing gets done."
 msgstr ""
-"SaaS는 본래부터 서버 운영자에게 사용 중인 소프트웨어나 
처리 중인 사용자의 데"
-"이터를 수정할 권한을 부여합니다. 다시 한번 말하지만, 
이렇게 하는데 다른 특별"
-"한 코드가 필요한 것이 아닙니다."
 
 #. type: Content of: <p>
-msgid ""
-"Thus, SaaS is equivalent to total spyware and a gaping wide back door, and "
-"gives the server operator unjust power over the user.  We can't accept that."
+#, fuzzy
+#| msgid ""
+#| "Thus, SaaS is equivalent to total spyware and a gaping wide back door, "
+#| "and gives the server operator unjust power over the user.  We can't "
+#| "accept that."
+msgid ""
+"Thus, SaaSS is equivalent to running proprietary software with spyware and a "
+"universal back door.  It gives the server operator unjust power over the "
+"user, and that power is something we must resist."
 msgstr ""
 "따라서 SaaS는 완전한 스파이웨어와 넓은 틈을 가진 
백도어와 같아 서버 운영자에"
 "게 사용자에 대한 부당한 통제권을 주게 됩니다. 우리는 
이것을 받아들일 수 없습"
 "니다."
 
 #. type: Content of: <h3>
-msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
-msgstr "독점 소프트웨어 문제로부터 SaaS 문제를 해결하기"
+msgid "SaaSS and SaaS"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"SaaS and proprietary software lead to similar harmful results, but the "
-"causal mechanisms are different.  With proprietary software, the cause is "
-"that you have and use a copy which is difficult or illegal to change.  With "
-"SaaS, the cause is that you use a copy you don't have."
+"Originally we referred to this problematical practice as &ldquo; SaaS "
+"&rdquo;, which stands for &ldquo; Software as a Service &rdquo;.  It's a "
+"commonly used term for setting up software on a server rather than offering "
+"copies of it to users, and we thought it described precisely the cases where "
+"this problem occurs."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Subsequently we became aware that the term SaaS is sometimes used for "
+"communication services&mdash;activities for which this issue is not "
+"applicable.  In addition, the term &ldquo; Software as a Service &rdquo; "
+"doesn't explain <em>why</em> the practice is bad.  So we coined the term "
+"&ldquo; Service as a Software Substitute &rdquo;, which defines the bad "
+"practice more clearly and says what is bad about it."
+msgstr ""
+
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
+msgid "Untangling the SaaSS Issue from the Proprietary Software Issue"
+msgstr "독점 소프트웨어 문제로부터 SaaS 문제를 해결하기"
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "SaaS and proprietary software lead to similar harmful results, but the "
+#| "causal mechanisms are different.  With proprietary software, the cause is "
+#| "that you have and use a copy which is difficult or illegal to change.  "
+#| "With SaaS, the cause is that you use a copy you don't have."
+msgid ""
+"SaaSS and proprietary software lead to similar harmful results, but the "
+"mechanisms are different.  With proprietary software, the mechanism is that "
+"you have and use a copy which is difficult and/or illegal to change.  With "
+"SaaSS, the mechanism is that you don't have the copy that's doing your "
+"computing."
 msgstr ""
 "SaaS와 독점 소프트웨어는 비슷한 해로운 결과를 가ì 
¸ì˜¤ì§€ë§Œ, 일상적인 작동 원리"
 "는 다릅니다. 독점 소프트웨어에서의 원인은 소유하고 
사용하고 있는 복제물을 수"
@@ -238,15 +346,25 @@
 "수 없는 복제물을 사용한다는 것입니다."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "These two issues are often confused, and not only by accident.  Web "
+#| "developers use the vague term &ldquo;web application&rdquo; to lump the "
+#| "server software together with programs run on your machine in your "
+#| "browser.  Some web pages install nontrivial or even large JavaScript "
+#| "programs temporarily into your browser without informing you.  <a href=\"/"
+#| "philosophy/javascript-trap.html\">When these JavaScript programs are "
+#| "nonfree</a>, they are as bad as any other nonfree software.  Here, "
+#| "however, we are concerned with the problem of the server software itself."
 msgid ""
 "These two issues are often confused, and not only by accident.  Web "
 "developers use the vague term &ldquo;web application&rdquo; to lump the "
 "server software together with programs run on your machine in your browser.  "
-"Some web pages install nontrivial or even large JavaScript programs "
-"temporarily into your browser without informing you.  <a href=\"/philosophy/"
-"javascript-trap.html\">When these JavaScript programs are nonfree</a>, they "
-"are as bad as any other nonfree software.  Here, however, we are concerned "
-"with the problem of the server software itself."
+"Some web pages install nontrivial, even large JavaScript programs into your "
+"browser without informing you.  <a href=\"/philosophy/javascript-trap.html"
+"\">When these JavaScript programs are nonfree</a>, they are the same sort of "
+"problem as any other nonfree software.  Here, however, we are concerned with "
+"the problem of the server software itself."
 msgstr ""
 "이 두가지 문제는 종종 혼동되는데, 이것이 우연에 의한 
것만은 아닙니다. 웹 개발"
 "자들은 브라우저 상에서 자신의 시스템에서 실행되고 
있는 프로그램과 서버에서 실"
@@ -258,14 +376,25 @@
 "다. 그러나 이글에서는 서버 소프트웨어의 문제에 
대해서만 살펴보겠습니다."
 
 #. type: Content of: <p>
-msgid ""
-"Many free software supporters assume that the problem of SaaS will be solved "
-"by developing free software for servers.  For the server operator's sake, "
-"the programs on the server had better be free; if they are proprietary, "
-"their owners have power over the server.  That's unfair to the operator, and "
-"doesn't help you at all.  But if the programs on the server are free, that "
-"doesn't protect you <em>as the server's user</em> from the effects of SaaS.  "
-"They give freedom to the operator, but not to you."
+#, fuzzy
+#| msgid ""
+#| "Many free software supporters assume that the problem of SaaS will be "
+#| "solved by developing free software for servers.  For the server "
+#| "operator's sake, the programs on the server had better be free; if they "
+#| "are proprietary, their owners have power over the server.  That's unfair "
+#| "to the operator, and doesn't help you at all.  But if the programs on the "
+#| "server are free, that doesn't protect you <em>as the server's user</em> "
+#| "from the effects of SaaS.  They give freedom to the operator, but not to "
+#| "you."
+msgid ""
+"Many free software supporters assume that the problem of SaaSS will be "
+"solved by developing free software for servers.  For the server operator's "
+"sake, the programs on the server had better be free; if they are "
+"proprietary, their owners have power over the server.  That's unfair to the "
+"operator, and doesn't help the users at all.  But if the programs on the "
+"server are free, that doesn't protect <em>the server's users</em> from the "
+"effects of SaaSS.  These programs liberate the server operator, but not the "
+"server's users."
 msgstr ""
 "많은 자유 소프트웨어 지지자들은 SaaS의 문제가 서버를 
위한 자유 소프트웨어의 "
 "개발로 해결될 것이라고 가정합니다. 서버 운영자를 
위해서도 서버에서 실행되는 "
@@ -277,13 +406,31 @@
 
 #. type: Content of: <p>
 msgid ""
-"Releasing the server software source code does benefit the community: "
-"suitably skilled users can set up similar servers, perhaps changing the "
-"software.  But none of these servers would give you control over computing "
-"you do on it, unless it's <em>your</em> server.  The rest would all be "
-"SaaS.  SaaS always subjects you to the power of the server operator, and the "
-"only remedy is, <em>Don't use SaaS!</em> Don't use someone else's server to "
-"do your own computing on data provided by you."
+"Releasing the server software source code does benefit the community: it "
+"enables suitably skilled users to set up similar servers, perhaps changing "
+"the software.  <a href=\"/licenses/license-recommendations.html\"> We "
+"recommend using the GNU Affero GPL</a> as the license for programs often "
+"used on servers."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Releasing the server software source code does benefit the community: "
+#| "suitably skilled users can set up similar servers, perhaps changing the "
+#| "software.  But none of these servers would give you control over "
+#| "computing you do on it, unless it's <em>your</em> server.  The rest would "
+#| "all be SaaS.  SaaS always subjects you to the power of the server "
+#| "operator, and the only remedy is, <em>Don't use SaaS!</em> Don't use "
+#| "someone else's server to do your own computing on data provided by you."
+msgid ""
+"But none of these servers would give you control over computing you do on "
+"it, unless it's <em>your</em> server.  It may be OK to trust your friend's "
+"server for some jobs, just as you might let your friend maintain the "
+"software on your own computer.  Outside of that, all these servers would be "
+"SaaSS for you.  SaaSS always subjects you to the power of the server "
+"operator, and the only remedy is, <em>Don't use SaaSS!</em> Don't use "
+"someone else's server to do your own computing on data provided by you."
 msgstr ""
 "서버 소프트웨어의 소스 코드를 배포하는 것은 공동체에 
도움이 됩니다. 적절한 기"
 "술을 가진 사용자들이 비슷한 서버를 가동할 수 있고 
소프트웨어를 개작할 수도 있"
@@ -294,14 +441,41 @@
 "업을 위해 다른 누군가의 서버를 사용해서는 안됩니다."
 
 #. type: Content of: <h3>
-msgid "Distinguishing SaaS from Other Network Services"
+#, fuzzy
+#| msgid "Distinguishing SaaS from Other Network Services"
+msgid "Distinguishing SaaSS from Other Network Services"
 msgstr "SaaS와 다른 네트워크 서비스를 구별하기"
 
 #. type: Content of: <p>
 msgid ""
-"Does avoiding SaaS mean you refuse to use any network servers run by anyone "
-"other than you? Not at all.  Most servers do not raise this issue, because "
-"the job you do with them isn't your own computing except in a trivial sense."
+"Which online services are SaaSS? The clearest example is a translation "
+"service, which translates (say) English text into Spanish text.  Translating "
+"a text for you is computing that is purely yours.  You could do it by "
+"running a program on your own computer, if only you had the right program.  "
+"(To be ethical, that program should be free.)  The translation service "
+"substitutes for that program, so it is Service as a Software Substitute, or "
+"SaaSS.  Since it denies you control over your computing, it does you wrong."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Another clear example is using a service such as Flickr or Instagram to "
+"modify a photo.  Modifying photos is an activity that people have done in "
+"their own computers for decades; doing it in a server instead of your own "
+"computer is SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Does avoiding SaaS mean you refuse to use any network servers run by "
+#| "anyone other than you? Not at all.  Most servers do not raise this issue, "
+#| "because the job you do with them isn't your own computing except in a "
+#| "trivial sense."
+msgid ""
+"Rejecting SaaSS does not mean refusing to use any network servers run by "
+"anyone other than you.  Most servers are not SaaSS because the jobs they do "
+"are not the user's own computing."
 msgstr ""
 "SaaS를 사용하지 않는 것이 다른 사람이 운영하는 어떠한 
네트워크 서버의 사용도 "
 "거부하는 것을 의미할까요? 물론 아닙니다. 대부분의 
서버들은 이러한 문제를 일으"
@@ -309,17 +483,28 @@
 "이 여러분 자신의 컴퓨터 작업이 아니기 때문입니다."
 
 #. type: Content of: <p>
-msgid ""
-"The original purpose of web servers wasn't to do computing for you, it was "
-"to publish information for you to access.  Even today this is what most web "
-"sites do, and it doesn't pose the SaaS problem, because accessing someone's "
-"published information isn't a matter of doing your own computing.  Neither "
-"is publishing your own materials via a blog site or a microblogging service "
-"such as Twitter or identi.ca.  The same goes for communication not meant to "
-"be private, such as chat groups.  Social networking can extend into SaaS; "
-"however, at root it is just a method of communication and publication, not "
-"SaaS.  If you use the service for minor editing of what you're going to "
-"communicate, that is not a significant issue."
+#, fuzzy
+#| msgid ""
+#| "The original purpose of web servers wasn't to do computing for you, it "
+#| "was to publish information for you to access.  Even today this is what "
+#| "most web sites do, and it doesn't pose the SaaS problem, because "
+#| "accessing someone's published information isn't a matter of doing your "
+#| "own computing.  Neither is publishing your own materials via a blog site "
+#| "or a microblogging service such as Twitter or identi.ca.  The same goes "
+#| "for communication not meant to be private, such as chat groups.  Social "
+#| "networking can extend into SaaS; however, at root it is just a method of "
+#| "communication and publication, not SaaS.  If you use the service for "
+#| "minor editing of what you're going to communicate, that is not a "
+#| "significant issue."
+msgid ""
+"The original idea of web servers wasn't to do computing for you, it was to "
+"publish information for you to access.  Even today this is what most web "
+"sites do, and it doesn't pose the SaaSS problem, because accessing someone's "
+"published information isn't doing your own computing.  Neither is publishing "
+"your own materials via a blog site or a microblogging service such as "
+"Twitter or StatusNet.  (These services may have other problems, of course.)  "
+"The same goes for other communication not meant to be private, such as chat "
+"groups."
 msgstr ""
 "웹 서버의 고유한 목적은 여러분을 위해 컴퓨터 작업을 
수행하는 것이 아니었습니"
 "다. 그것은 여러분이 접근할 수 있는 정보를 게시하는 
것이었습니다. 심지어 오늘"
@@ -334,12 +519,49 @@
 
 #. type: Content of: <p>
 msgid ""
+"In its essence, social networking is a form of communication and "
+"publication, not SaaSS.  However, a service whose main facility is social "
+"networking can have features or extensions which are SaaSS."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If a service is not SaaS, that does not mean it is OK.  There are other "
+#| "bad things a service can do.  For instance, Facebook distributes video in "
+#| "Flash, which pressures users to run nonfree software, and it gives users "
+#| "a misleading impression of privacy.  Those are important issues too, but "
+#| "this article's concern is the issue of SaaS."
+msgid ""
+"If a service is not SaaSS, that does not mean it is OK.  There are other "
+"ethical issues about services.  For instance, Facebook distributes video in "
+"Flash, which pressures users to run nonfree software; it requires running "
+"nonfree JavaScript code; and it gives users a misleading impression of "
+"privacy while luring them into baring their lives to Facebook.  Those are "
+"important issues, different from the SaaSS issue."
+msgstr ""
+"어떤 서비스가 SaaS가 아니라 해서, 그것으로 괜찮은 것은 
아닙니다. 그러한 서비"
+"스가 할 수 있는 바쁜 것들이 또 있습니다. 예를 들면, 
페이스북은 사용자로 하여"
+"금 비자유 소프트웨어를 실행하도록 강요하는 플래쉬 
형태로 비디오를 배포합니"
+"다. 또한 페이스북은 시용자들에게 사생활에 대한 잘못된 
인상을 줍니다. 이것 또"
+"한 중요한 문제인데, 지금은 이 글의 주제인 SaaS에만 
집중하겠습니다."
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Services such as search engines collect data from around the web and let "
+#| "you examine it.  Looking through their collection of data isn't your own "
+#| "computing in the usual sense&mdash;you didn't provide that "
+#| "collection&mdash;so using such a service to search the web is not SaaS.  "
+#| "(However, using someone else's search engine to implement a search "
+#| "facility for your own site <em>is</em> SaaS.)"
+msgid ""
 "Services such as search engines collect data from around the web and let you "
 "examine it.  Looking through their collection of data isn't your own "
 "computing in the usual sense&mdash;you didn't provide that collection&mdash;"
-"so using such a service to search the web is not SaaS.  (However, using "
-"someone else's search engine to implement a search facility for your own "
-"site <em>is</em> SaaS.)"
+"so using such a service to search the web is not SaaSS.  However, using "
+"someone else's server to implement a search facility for your own site "
+"<em>is</em> SaaSS."
 msgstr ""
 "검색 엔진과 같은 서비스는 웹 곳곳에서 수집한 데이터를 
모아 여러분이 이용할 "
 "수 있게 해줍니다. 검색 엔진이 모아 놓은 데이터를 
둘러보는 것은 일반적인 의미"
@@ -349,12 +571,18 @@
 "SaaS입니다.)"
 
 #. type: Content of: <p>
-msgid ""
-"E-commerce is not SaaS, because the computing isn't solely yours; rather, it "
-"is done jointly for you and another party.  So there's no particular reason "
-"why you alone should expect to control that computing.  The real issue in e-"
-"commerce is whether you trust the other party with your money and personal "
-"information."
+#, fuzzy
+#| msgid ""
+#| "E-commerce is not SaaS, because the computing isn't solely yours; rather, "
+#| "it is done jointly for you and another party.  So there's no particular "
+#| "reason why you alone should expect to control that computing.  The real "
+#| "issue in e-commerce is whether you trust the other party with your money "
+#| "and personal information."
+msgid ""
+"Purchasing online is not SaaSS, because the computing isn't <em>your own</"
+"em>; rather, it is done jointly by and for you and the store.  The real "
+"issue in online shopping is whether you trust the other party with your "
+"money and other personal information (starting with your name)."
 msgstr ""
 "전자상거래는 SaaS가 아닙니다. 왜냐하면 컴퓨터 작업이 
모두 여러분의 것이 아니"
 "기 때문입니다. 더구나 그것은 여러분과 상대방을 위해 
연계 되어 수행됩니다. 따"
@@ -364,10 +592,24 @@
 
 #. type: Content of: <p>
 msgid ""
-"Using a joint project's servers isn't SaaS because the computing you do in "
-"this way isn't yours personally.  For instance, if you edit pages on "
-"Wikipedia, you are not doing your own computing; rather, you are "
-"collaborating in Wikipedia's computing."
+"Repository sites such as as Savannah and SourceForge are not inherently "
+"SaaSS, because a repository's job is publication of data supplied to it."
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Using a joint project's servers isn't SaaS because the computing you do "
+#| "in this way isn't yours personally.  For instance, if you edit pages on "
+#| "Wikipedia, you are not doing your own computing; rather, you are "
+#| "collaborating in Wikipedia's computing."
+msgid ""
+"Using a joint project's servers isn't SaaSS because the computing you do in "
+"this way isn't your own.  For instance, if you edit pages on Wikipedia, you "
+"are not doing your own computing; rather, you are collaborating in "
+"Wikipedia's computing.  Wikipedia controls its own servers, but "
+"organizations as well as individuals encounter the problem of SaaSS if they "
+"do their computing in someone else's server."
 msgstr ""
 "공동 프로젝트를 위해 서버를 사용하는 것도 SaaS가 
아닙니다. 왜냐하면 이러한 경"
 "우에 있어서의 컴퓨터 작업은 여러분 개인의 것이 아니기 
때문입니다. 예를 들면, "
@@ -376,84 +618,22 @@
 "다."
 
 #. type: Content of: <p>
-msgid ""
-"Wikipedia controls its own servers, but groups can face the problem of SaaS "
-"if they do their group activities on someone else's server.  Fortunately, "
-"development hosting sites such as Savannah and SourceForge don't pose the "
-"SaaS problem, because what groups do there is mainly publication and public "
-"communication, rather than their own private computing."
-msgstr ""
-"위키페디아가 그들의 서버를 통제합니다. 그러나 어떤 
그룹이 그룹 활동을  다른 "
-"누군가의 서버에서 수행한다면 이때는 SaaS 문제에 직면할 
수 있습니다. 다행스럽"
-"게도 Savannah나 SourceForge와 같은 개발 호스팅 사이트들은 
SaaS 문제를 보이지 "
-"않습니다. 왜냐하면 그룹들이 그곳에서 하는 일이 사적인 
작업이 아닌 주로 공개 "
-"통신과 출판이기 때문입니다."
-
-#. type: Content of: <p>
-msgid ""
-"Multiplayer games are a group activity carried out on someone else's server, "
-"which makes them SaaS.  But where the data involved is just the state of "
-"play and the score, the worst wrong the operator might commit is "
-"favoritism.  You might well ignore that risk, since it seems unlikely and "
-"very little is at stake.  On the other hand, when the game becomes more than "
-"just a game, the issue changes."
-msgstr ""
-"다중 사용자 게임은 SaaS로 만들 수 있는 다른 누군가의 
서버에서 이루어지는 그"
-"룹 활동입니다. 그러나 이때 관여되는 데이터는 단지 게임 
상태와 점수 등에 대한 "
-"것이고 운영자가 저지를 수 있는 최악의 것은 인기주의일 
것입니다. 그러나 이것"
-"은 가능성이 별로 없어 보이고, 연관성도 없어 보이기 
때문에 여러분이 그 위험을 "
-"충분히 무시할 수 있을 것같습니다. 그러나 게임이 단지 
게임 이상이 된다면 문제"
-"는 다를 것입니다."
-
-#. type: Content of: <p>
-msgid ""
-"&ldquo;Backend as a Service&rdquo;, or BaaS, is a kind of SaaS, because it "
-"involves running your own web service on top of software that you can't "
-"control.  If you set up a service using BaaS, the BaaS platform may well "
-"collect information about your users as well as you."
-msgstr ""
-
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "Which online services are SaaS? Google Docs is a clear example.  Its "
-#| "basic activity is editing, and Google encourages people to use it for "
-#| "their own editing; this is SaaS.  It offers the added feature of "
-#| "collaborative editing, but adding participants doesn't alter the fact "
-#| "that editing on the server is SaaS.  (In addition, Google Docs is "
-#| "unacceptable because it installs a large nonfree JavaScript program into "
-#| "the users' browsers.)  If using a service for communication or "
-#| "collaboration requires doing substantial parts of your own computing with "
-#| "it too, that computing is SaaS even if the communication is not."
-msgid ""
-"Which online services are SaaS? Google Docs is a clear example.  Its basic "
-"activity is editing, and Google encourages people to use it for their own "
-"editing; this is SaaS.  It offers the added feature of collaborative "
-"editing, but adding participants doesn't alter the fact that editing on the "
-"server is SaaS.  (In addition, Google Docs is unacceptable because it "
-"installs a large <a href=\"/philosophy/javascript-trap.html\"> nonfree "
-"JavaScript program</a> into the user's browser.)  If using a service for "
-"communication or collaboration requires doing substantial parts of your own "
-"computing with it too, that computing is SaaS even if the communication is "
-"not."
-msgstr ""
-"어떤 온라인 서비스가 SaaS일까요? 구글 Docs가 확실한 예입
니다. 이것의 기본적"
-"인 작업은 문서 편집입니다. 구글은 사람들에게 편집 작업
ì