www-commits
[Top][All Lists]
Advanced

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

www philosophy/who-does-that-server-really-serv...


From: GNUN
Subject: www philosophy/who-does-that-server-really-serv...
Date: Wed, 20 Jan 2016 23:30:00 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/01/20 23:30:00

Modified files:
        philosophy     : who-does-that-server-really-serve.pl.html 
        philosophy/po  : misinterpreting-copyright.pl.po 
                         who-does-that-server-really-serve.pl-diff.html 
        proprietary/po : proprietary-back-doors.de.po 
                         proprietary-back-doors.fr.po 
                         proprietary-back-doors.it.po 
                         proprietary-back-doors.ja.po 
                         proprietary-back-doors.pot 
                         proprietary-back-doors.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/who-does-that-server-really-serve.pl.html?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/misinterpreting-copyright.pl.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.pl-diff.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-back-doors.de.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-back-doors.fr.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-back-doors.it.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-back-doors.ja.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-back-doors.pot?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-back-doors.ru.po?cvsroot=www&r1=1.41&r2=1.42

Patches:
Index: philosophy/who-does-that-server-really-serve.pl.html
===================================================================
RCS file: /web/www/www/philosophy/who-does-that-server-really-serve.pl.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- philosophy/who-does-that-server-really-serve.pl.html        14 Feb 2015 
21:04:04 -0000      1.35
+++ philosophy/who-does-that-server-really-serve.pl.html        20 Jan 2016 
23:29:55 -0000      1.36
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" 
value="/philosophy/who-does-that-server-really-serve.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/who-does-that-server-really-serve.pl.po">
+ http://www.gnu.org/philosophy/po/who-does-that-server-really-serve.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" 
value="/philosophy/who-does-that-server-really-serve.html"
+ --><!--#set var="DIFF_FILE" 
value="/philosophy/po/who-does-that-server-really-serve.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-11-21" --><!--#set 
var="ENGLISH_PAGE" 
value="/philosophy/who-does-that-server-really-serve.en.html" -->
 
 <!--#include virtual="/server/header.pl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
 
 <!--#include 
virtual="/philosophy/po/who-does-that-server-really-serve.translist" -->
 <!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
 <h2>Komu tak na&nbsp;prawdę służy ten serwer?</h2>
 
 <p><strong>Richard Stallman</strong></p>
@@ -481,7 +487,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2015/02/14 21:04:04 $
+$Date: 2016/01/20 23:29:55 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/misinterpreting-copyright.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/misinterpreting-copyright.pl.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/misinterpreting-copyright.pl.po       20 Jan 2016 23:13:03 
-0000      1.1
+++ philosophy/po/misinterpreting-copyright.pl.po       20 Jan 2016 23:29:57 
-0000      1.2
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Outdated-Since: 2016-01-01 05:56+0000\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
@@ -321,10 +322,6 @@
 msgid "Balancing against what?"
 msgstr "Równoważenie czego?"
 
-# | When the government buys something for the public, it acts on behalf of
-# | the public; its responsibility is to obtain the best possible [-deal --
-# | best-] {+deal&mdash;best+} for the public, not for the other party in the
-# | agreement.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -336,7 +333,6 @@
 "odpowiedzialnością jest zawarcie jak najlepszej umowy &mdash; najlepszej 
dla "
 "ogółu, nie dla drugiej strony porozumienia."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -348,7 +344,6 @@
 "budowę autostrad, rząd stara się wydać jak najmniej pieniędzy 
podatników. "
 "Agencje rządowe rozpisują przetargi, aby&nbsp;obniżyć cenę 
do&nbsp;minimum."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -374,7 +369,6 @@
 "płacących podatki kierowców najlepszą umowę, jaka jest możliwa w&nbsp;"
 "kontekście wolnego społeczeństwa i&nbsp;wolnego rynku."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -391,14 +385,11 @@
 "Rządy nigdy nie mogą stawiać interesów wydawców na&nbsp;równi z&nbsp;"
 "wolnością ogółu."
 
-# | Not [-\"balance\"-] {+&ldquo;balance&rdquo;+} but [-\"trade-off\-]
-# | {+&ldquo;trade-off&rdquo;+}
 #. type: Content of: <h3>
 #, fuzzy
 msgid "Not &ldquo;balance&rdquo; but &ldquo;trade-off&rdquo;"
 msgstr "Nie &bdquo;równowaga&rdquo; a&nbsp;&bdquo;kompromis&rdquo;"
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -431,13 +422,6 @@
 "równowaga&rdquo; w&nbsp;odniesieniu do&nbsp;obu grup interesów czytelników 
"
 "byłoby mylące.<a href=\"#footnote1\">[1]</a> Potrzebujemy innego pojęcia."
 
-# | In general, when one party has two goals that partly conflict, and cannot
-# | completely achieve both of them, we call this a [-\"trade-off.\"-]
-# | {+&ldquo;trade-off.&rdquo;+} Therefore, rather than speaking of
-# | [-\"striking-] {+&ldquo;striking+} the right [-balance\"-]
-# | {+balance&rdquo;+} between parties, we should speak of [-\"finding-]
-# | {+&ldquo;finding+} the right trade-off between spending our freedom and
-# | keeping [-it.\"-] {+it.&rdquo;+}
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -455,18 +439,11 @@
 "znalezieniu właściwego kompromisu pomiędzy poświęceniem naszej wolności 
"
 "a&nbsp;jej zachowaniem&rdquo;."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <h3>
 #, fuzzy
 msgid "The second error: maximizing one output"
 msgstr "Drugi błąd: maksymalizacja zdolności wytwórczej"
 
-# | The second mistake in copyright policy consists of adopting the goal of
-# | [-maximizing -- not-] {+maximizing&mdash;not+} just [-increasing -- the-]
-# | {+increasing&mdash;the+} number of published works.  The erroneous concept
-# | of [-\"striking-] {+&ldquo;striking+} a [-balance\"-] {+balance&rdquo;+}
-# | elevated the publishers to parity with the readers; this second error
-# | places them far above the readers.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -482,13 +459,6 @@
 "równowagi&rdquo; wyniosła wydawców na&nbsp;równy poziom 
z&nbsp;czytelnikami; "
 "ten drugi błąd umiejscawia ich o&nbsp;wiele wyżej niż czytelników."
 
-# | When we purchase something, we do not generally buy the whole quantity in
-# | stock or the most expensive model.  Instead we conserve funds for other
-# | purchases, by buying only what we need of any particular good, and
-# | choosing a model of sufficient rather than highest quality.  The principle
-# | of diminishing returns suggests that spending all our money on one
-# | particular good is likely to be {+an+} inefficient allocation of
-# | resources; we generally choose to keep some money for another use.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -509,15 +479,6 @@
 "efektywnej alokacji środków; staramy się raczej zachować trochę 
pieniędzy "
 "na&nbsp;inne cele."
 
-# | Diminishing returns applies to copyright just as to any other purchase.
-# | The first freedoms we should trade away are those we miss the least,
-# | [-while giving-] {+and whose sacrifice gives+} the largest encouragement
-# | to publication.  As we trade additional freedoms that cut closer to home,
-# | we find that each trade is a bigger sacrifice than the last, while
-# | bringing a smaller increment in literary activity.  Well before the
-# | increment becomes zero, we may well say it is not worth its incremental
-# | price; we would then settle on a bargain whose overall result is to
-# | increase the amount of publication, but not to the utmost possible extent.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -542,10 +503,6 @@
 "układ, którego rezultatem jest zwiększenie ilości publikacji, 
ale&nbsp;nie "
 "do&nbsp;najwyższego możliwego stopnia."
 
-# | Accepting the goal of maximizing publication rejects all these wiser, more
-# | advantageous bargains in [-advance -- it-] {+advance&mdash;it+} dictates
-# | that the public must cede nearly all of its freedom to use published
-# | works, for just a little more publication.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -559,23 +516,11 @@
 "że&nbsp;ogół musi scedować prawie całą swoją wolność 
do&nbsp;korzystania "
 "z&nbsp;utworów, w&nbsp;zamian za&nbsp;tylko trochę większą liczbę 
publikacji."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <h3>
 #, fuzzy
 msgid "The rhetoric of maximization"
 msgstr "Retoryka maksymalizacji"
 
-# | In practice, the goal of maximizing publication regardless of the cost to
-# | freedom is supported by widespread rhetoric which asserts that public
-# | copying is illegitimate, unfair, and intrinsically wrong.  For instance,
-# | the publishers call people who copy [-\"pirates,\"-]
-# | {+&ldquo;pirates,&rdquo;+} a smear term designed to equate sharing
-# | information with your neighbor with attacking a ship.  (This smear term
-# | was formerly used by authors to describe publishers who found lawful ways
-# | to publish unauthorized editions; its modern use by the publishers is
-# | almost the reverse.)  This rhetoric directly rejects the
-# | [-C-]{+c+}onstitutional basis for copyright, but presents itself as
-# | representing the unquestioned tradition of the American legal system.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -604,15 +549,6 @@
 "przedstawia siebie samą jako reprezentującą niekwestionowaną tradycję "
 "amerykańskiego systemu prawnego."
 
-# | The [-\"pirate\"-] {+&ldquo;pirate&rdquo;+} rhetoric is typically accepted
-# | because it [-blankets-] {+so pervades+} the media [-so-] that few people
-# | realize [-that-] {+how radical+} it [-is radical.-] {+is.+}  It is
-# | effective because if copying by the public is fundamentally illegitimate,
-# | we can never object to the publishers' demand that we surrender our
-# | freedom to do so.  In other words, when the public is challenged to show
-# | why publishers should not receive some additional power, the most
-# | important reason of [-all -- \"We-] {+all&mdash;&ldquo;We+} want to
-# | [-copy\" -- is-] {+copy&rdquo;&mdash;is+} disqualified in advance.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -634,10 +570,6 @@
 "powód ze wszystkich &mdash; &bdquo;chcemy kopiować&rdquo; &mdash; zostaje "
 "z&nbsp;góry zdyskwalifikowany."
 
-# | This leaves no way to argue against increasing copyright power except
-# | using side issues.  Hence{+,+} opposition to stronger copyright powers
-# | today almost exclusively cites side issues, and never dares cite the
-# | freedom to distribute copies as a legitimate public value.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -653,13 +585,6 @@
 "drugorzędne, i&nbsp;nigdy nie ośmielają się podnieść kwestii wolności "
 "do&nbsp;dystrybucji kopii jako prawnie usankcjonowanej wartości społecznej."
 
-# | As a practical matter, the goal of maximization enables publishers to
-# | argue that [-\"A-] {+&ldquo;A+} certain practice is reducing our [-sales
-# | -- or-] {+sales&mdash;or+} we think it [-might -- so-] {+might&mdash;so+}
-# | we presume it diminishes publication by some unknown amount, and therefore
-# | it should be [-prohibited.\"-] {+prohibited.&rdquo;+} We are led to the
-# | outrageous conclusion that the public good is measured by publishers'
-# | sales: What's good for General Media is good for the [-U.S.A.-] {+USA.+}
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -679,21 +604,10 @@
 "iż dobro ogółu jest mierzone przez rozmiary sprzedaży wydawców: to, co 
dobre "
 "dla General Media, jest dobre dla USA."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <h3>
 msgid "The third error: maximizing publishers' power"
 msgstr "Trzeci błąd: maksymalizacja władzy wydawców"
 
-# | Once the publishers have obtained assent to the policy goal of maximizing
-# | publication output at any cost, their next step is to infer that this
-# | requires giving them the maximum possible [-powers -- making-]
-# | {+powers&mdash;making+} copyright cover every imaginable use of a work, or
-# | applying some other legal tool such as [-\"shrink wrap\"-] {+&ldquo;shrink
-# | wrap&rdquo;+} licenses to equivalent effect.  This goal, which entails the
-# | abolition of [-\"fair use\"-] {+&ldquo;fair use&rdquo;+} and the
-# | [-\"right-] {+&ldquo;right+} of first [-sale,\"-] {+sale,&rdquo;+} is
-# | being pressed at every available level of government, from states of the
-# | [-U.S.-] {+US+} to international bodies.
 #. type: Content of: <p>
 msgid ""
 "Once the publishers have obtained assent to the policy goal of maximizing "
@@ -711,17 +625,12 @@
 "przyznania im maksymalnych możliwych uprawnień&nbsp;&mdash; sprawienie, "
 "aby&nbsp;prawo autorskie pokrywało każde możliwe wykorzystanie utworu, "
 "lub&nbsp;zastosowanie innych prawnych narzędzi, jak np. &bdquo;licencje "
-"zafoliowane&rdquo;, shrink-wrap<a href=\"#footnoteX\" name=\"bodyfootnoteX"
-"\">[*]</a>, dla osiągnięcia tego samego efektu. Ten cel pociąga 
za&nbsp;sobą "
+"zafoliowane&rdquo;, shrink-wrap<a href=\"#footnoteX\" name=\"bodyfootnoteX\">"
+"[*]</a>, dla osiągnięcia tego samego efektu. Ten cel pociąga za&nbsp;sobą 
"
 "zniesienie &bdquo;dozwolonego użytku&rdquo; i&nbsp;&bdquo;prawa pierwszej "
 "sprzedaży&rdquo; jest forsowany na&nbsp;każdym możliwym szczeblu rzą
dowym, "
 "od&nbsp;poszczególnych stanów USA aż do&nbsp;organów międzynarodowych."
 
-# | This step is erroneous because strict copyright rules obstruct the
-# | creation of useful new works.  For instance, Shakespeare borrowed the
-# | plots of some of his plays from [-other plays-] {+works others had+}
-# | published a few decades before, so if today's copyright law had been in
-# | effect, his plays would have been illegal.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -736,7 +645,6 @@
 "lat wcześniej, tak więc&nbsp;jeśli wówczas obowiązywałoby dzisiejsze 
prawo "
 "autorskie, jego sztuki byłyby nielegalne."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -748,13 +656,11 @@
 "niezależnie od&nbsp;kosztów dla ogółu, maksymalizacja uprawnień 
wydawców nie "
 "jest odpowiednią drogą. Jako środek wspierania postępu, przeczy on sam 
sobie."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <h3>
 #, fuzzy
 msgid "The results of the three errors"
 msgstr "Rezultaty trzech błędów"
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -771,7 +677,6 @@
 "autorskiego była służba ogółowi, kiedy tak naprawdę dają wydawcom "
 "czegokolwiek ci sobie zażyczą."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -782,7 +687,6 @@
 "akt prawny z&nbsp;1995 roku przedłużający o&nbsp;20 lat okres, 
na&nbsp;jaki "
 "przysługują prawa autorskie:"
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <blockquote><p>
 #, fuzzy
 msgid ""
@@ -819,12 +723,6 @@
 "avoid.html#Protect\">chronić</a>,&rdquo; który zawiera drugi z&nbsp;trzech "
 "błędów."
 
-# | The bill also extended the copyrights of works yet to be written.  For
-# | works made for hire, copyright would last 95 years instead of the present
-# | 75 years.  Theoretically this would increase the incentive to write new
-# | works; but any publisher that claims to need this extra incentive should
-# | {+be required+} substantiate the claim with projected balance sheets for
-# | {+75 years in+} the [-year 2075.-] {+future.+}
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -842,13 +740,6 @@
 "wydawca, który twierdzi, iż potrzebuje tej dodatkowej zachęty, powinien "
 "poprzeć żądanie przewidywanymi zestawieniami bilansowymi na&nbsp;rok 2075."
 
-# | Needless to say, Congress did not question the publishers' arguments: a
-# | law extending copyright was enacted in 1998.  It was {+officially+} called
-# | the Sonny Bono Copyright Term Extension Act, named after one of its
-# | sponsors who died earlier that year.  [-His-]  {+We usually call it the
-# | Mickey Mouse Copyright Act, since we presume its real motive was to
-# | prevent the copyright on the appearance of Mickey Mouse from expiring.
-# | Bono's+} widow, who served the rest of his term, made this statement:
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -867,12 +758,6 @@
 "po&nbsp;jednym z&nbsp;jej orędowników, który zmarł wcześniej tego samego 
"
 "roku. Wdowa po&nbsp;nim złożyła następujące oświadczenie:"
 
-# | Actually, Sonny wanted {+the term of+} copyright {+protection+} to last
-# | forever. I am informed by staff that such a change would violate the
-# | Constitution. I invite all of you to work with me to strengthen our
-# | copyright laws in all {+of the+} ways available to us. As you know, there
-# | is also Jack Valenti's proposal {+for term+} to last forever less one day.
-# | Perhaps the [-c-]{+C+}ommittee may look at that next Congress.
 #. type: Content of: <blockquote><p>
 #, fuzzy
 msgid ""
@@ -890,11 +775,6 @@
 "propozycja Jacka Valentiego, aby&nbsp;trwały wiecznie minus jeden dzień. 
Być "
 "może komisja zajmie się tym za&nbsp;następnego Kongresu."
 
-# | The Supreme Court [-has agreed to hear-] {+later heard+} a case that
-# | [-seeks-] {+sought+} to overturn the law on the grounds that the
-# | retroactive extension fails to serve the Constitution's goal of promoting
-# | progress.  {+The court responded by abdicating its responsibility to judge
-# | the question; on copyright, the Constitution requires only lip service.+}
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -908,10 +788,6 @@
 "podstawie tego, iż rozszerzenie z&nbsp;mocą wsteczną nie służy "
 "Konstytucyjnej zasadzie wspierania postępu."
 
-# | Another law, passed in 199[-6-]{+7+}, made it a felony to make
-# | sufficiently many copies of any published work, even if you give them away
-# | to friends just to be nice.  Previously this was not a crime in the
-# | [-U.S.-] {+US+} at all.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -953,15 +829,6 @@
 "utwór zawiera jakiś rodzaj szyfrowania lub&nbsp;menedżera licencji, 
aby&nbsp;"
 "je egzekwować."
 
-# | One of the arguments offered for this bill was that it would implement a
-# | recent treaty to increase copyright powers.  The treaty was promulgated by
-# | the World [-Intellectual Property-] {+<a
-# | href=\"not-ipr.html\">Intellectual Property</a>+} Organization, an
-# | organization dominated by [-copyright-holding-] {+copyright-+} and
-# | patent-holding interests, with the aid of pressure from the Clinton
-# | administration; since the treaty only increases copyright power, whether
-# | it serves the public interest in any country is doubtful.  In any case,
-# | the bill went far beyond what the treaty required.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -984,15 +851,6 @@
 "wątpliwe. W&nbsp;każdym razie, ustawa poszła znacznie dalej niż wymagał 
tego "
 "traktat."
 
-# | Libraries were a key source of opposition to this bill, especially to the
-# | aspects that block the forms of copying that are considered [-\"fair
-# | use.\"-] {+fair use.+} How did the publishers respond? Former
-# | representative Pat Schroeder, now a lobbyist for the Association of
-# | American Publishers, said that the publishers [-\"could-] {+&ldquo;could+}
-# | not live with what [the libraries [-are]-] {+were]+} asking [-for.\"-]
-# | {+for.&rdquo;+} Since the libraries were asking only to preserve part of
-# | the status quo, one might respond by wondering how the publishers had
-# | survived until the present day.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1015,21 +873,6 @@
 "status quo, należałoby odpowiedzieć, iż zastanawiające jest, jakim cudem 
"
 "wydawcy w&nbsp;ogóle przetrwali do&nbsp;dnia dzisiejszego."
 
-# | Congressman Barney Frank, in a meeting with me and others who opposed this
-# | bill, showed how far the [-U.S.-] {+US+} Constitution's view of copyright
-# | has been disregarded.  He said that new powers, backed by criminal
-# | penalties, were needed urgently because the [-\"movie-] {+&ldquo;movie+}
-# | industry is [-worried,\"-] {+worried,&rdquo;+} as well as the [-\"music
-# | industry\"-] {+&ldquo;music industry&rdquo;+} and other
-# | [-\"industries.\"-] {+&ldquo;industries.&rdquo;+} I asked him, [-\"But-]
-# | {+&ldquo;But+} is this in the public [-interest?\"-] {+interest?&rdquo;+}
-# | His response was telling: [-\"Why-] {+&ldquo;Why+} are you talking about
-# | the public interest? These creative people don't have to give up their
-# | rights for the public [-interest!\"-] {+interest!&rdquo;+} The
-# | [-\"industry\"-] {+&ldquo;industry&rdquo;+} has been identified with the
-# | [-\"creative people\"-] {+&ldquo;creative people&rdquo;+} it hires,
-# | copyright has been treated as its entitlement, and the Constitution has
-# | been turned upside down.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1059,7 +902,6 @@
 "przez niego &bdquo;uprawnienia&rdquo;, a&nbsp;konstytucja &mdash; postawiona "
 "do&nbsp;góry nogami."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1075,7 +917,6 @@
 "prawo do&nbsp;dozwolonego użytku. Faktycznie dozwolony użytek jest "
 "zabroniony."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1097,14 +938,6 @@
 "systemie kodowania proponowanym jako środek ograniczenia dostępu do&nbsp;"
 "muzyki."
 
-# | We are also beginning to see e-books that take away many of readers'
-# | traditional [-freedoms -- for-] {+freedoms&mdash;for+} instance, the
-# | freedom to lend a book to your friend, to sell it to a used book store, to
-# | borrow it from a library, to buy it without giving your name to a
-# | corporate data bank, even the freedom to read it twice.  Encrypted e-books
-# | generally restrict all these [-activities -- you-]
-# | {+activities&mdash;you+} can read them only with special secret software
-# | designed to restrict you.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1126,7 +959,6 @@
 "za&nbsp;pomocą specjalnego tajnego oprogramowania, opracowanego, by cię "
 "ograniczyć."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1138,12 +970,6 @@
 "elektronicznych, i&nbsp;mam nadzieję, że&nbsp;wy też je odrzucicie. Jeśli 
e-"
 "book nie daje takich samych praw jak książka tradycyjna, nie akceptuj go!"
 
-# | Anyone independently releasing software that can read restricted e-books
-# | risks prosecution.  A Russian programmer, Dmitry Sklyarov, was arrested in
-# | 2001 while visiting the [-U.S.-] {+US+} to speak at a conference, because
-# | he had written such a program in Russia, where it was lawful to do so.
-# | Now Russia is preparing a law to prohibit it too, and the European Union
-# | recently adopted one.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1162,17 +988,6 @@
 "dozwolone. Teraz Rosja przygotowuje prawo, które też ma tego zabraniać, "
 "a&nbsp;Unia Europejska ostatnio takie prawo przyjęła."
 
-# | Mass-market e-books have been a commercial failure so far, but not because
-# | readers chose to defend their freedom; they were unattractive for other
-# | reasons, such as that computer display screens are not easy surfaces to
-# | read from.  We can't rely on this happy accident to protect us in the long
-# | term; the next attempt to promote e-books will use [-\"electronic paper\"
-# | -- book-like-] {+&ldquo;electronic paper&rdquo;&mdash;book-like+} objects
-# | into which an encrypted, restricted e-book can be downloaded.  If this
-# | paper-like surface proves more appealing than today's display screens, we
-# | will have to defend our freedom in order to keep it.  Meanwhile, e-books
-# | are making inroads in niches: NYU and other dental schools require
-# | students to buy their textbooks in the form of restricted e-books.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1221,17 +1036,17 @@
 "Ale&nbsp;firmy medialne wciąż nie są zadowolone. W&nbsp;2001 finansowany "
 "przez Disneya senator Hollings przedstawił projekt ustawy nazwanego &bdquo;"
 "Security Systems Standards and Certification Act&rdquo; (SSSCA, &bdquo;"
-"Ustawa o&nbsp;Standardach i&nbsp;Certyfikacji Systemów "
-"Bezpieczeństwa&rdquo;)<a href=\"#footnote2\">[2]</a>, który wymagałby, "
-"aby&nbsp;wszystkie komputery (oraz inne urządzenia umożliwiające cyfrowy "
-"zapis lub&nbsp;odczyt) miały zatwierdzone przez rząd systemy ograniczające 
"
-"kopiowanie. To jest ich ostateczny cel, ale&nbsp;pierwszym punktem ich planu "
-"jest zakazanie wszelkich urządzeń, które mogą odbierać programy nadawane 
"
-"w&nbsp;systemie HDTV (cyfrowej telewizji wysokiej rozdzielczości), o&nbsp;"
-"ile takie urządzenia nie zostaną zaprojektowane w&nbsp;taki sposób, 
aby&nbsp;"
-"ogół nie mógł nimi &bdquo;manipulować&rdquo; (innymi słowy modyfikować 
dla "
-"własnych celów). Ponieważ&nbsp;wolne oprogramowanie jest oprogramowaniem, "
-"które użytkownik może swobodnie modyfikować, stajemy tu po&nbsp;raz 
pierwszy "
+"Ustawa o&nbsp;Standardach i&nbsp;Certyfikacji Systemów 
Bezpieczeństwa&rdquo;)"
+"<a href=\"#footnote2\">[2]</a>, który wymagałby, aby&nbsp;wszystkie "
+"komputery (oraz inne urządzenia umożliwiające cyfrowy zapis 
lub&nbsp;odczyt) "
+"miały zatwierdzone przez rząd systemy ograniczające kopiowanie. To jest 
ich "
+"ostateczny cel, ale&nbsp;pierwszym punktem ich planu jest zakazanie "
+"wszelkich urządzeń, które mogą odbierać programy nadawane 
w&nbsp;systemie "
+"HDTV (cyfrowej telewizji wysokiej rozdzielczości), o&nbsp;ile takie "
+"urządzenia nie zostaną zaprojektowane w&nbsp;taki sposób, aby&nbsp;ogół 
nie "
+"mógł nimi &bdquo;manipulować&rdquo; (innymi słowy modyfikować dla 
własnych "
+"celów). Ponieważ&nbsp;wolne oprogramowanie jest oprogramowaniem, które "
+"użytkownik może swobodnie modyfikować, stajemy tu po&nbsp;raz pierwszy "
 "w&nbsp;obliczu prawa, które wyraźnie zakazuje zastosowania wolnego "
 "oprogramowania dla wykonania określonego zadania. Zakazy uwzględniające 
inne "
 "rodzaje zadań z&nbsp;pewnością zostaną zaproponowane 
w&nbsp;przyszłości. "
@@ -1246,13 +1061,11 @@
 "Zablokowanie tych ustaw i&nbsp;przepisów wymaga działań politycznych<a 
href="
 "\"#footnote3\">[3]</a>"
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <h3>
 #, fuzzy
 msgid "Finding the right bargain"
 msgstr "Znalezienie właściwej umowy"
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1271,7 +1084,6 @@
 "okrojenie zakresu prawa autorskiego, tak jak to tylko możliwe, zachowując "
 "jednocześnie porównywalny poziom publikacji."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1282,7 +1094,6 @@
 "przetargów, jak to jest czynione przy projektach budowlanych, to jak ją "
 "możemy znaleźć?"
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1303,7 +1114,6 @@
 "szacunków i&nbsp;roztaczania wizji zagłady, jeśli ich uprawnienia 
zostałyby "
 "w&nbsp;jakimkolwiek stopniu zmniejszone."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1318,7 +1128,6 @@
 "zredukowanie innych wymiarów prawa autorskiego przy równoczesnym zachowaniu 
"
 "pożądanego poziomu publikacji."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1335,7 +1144,6 @@
 "prawa autorskiego, regulującym tworzenie pochodnych utworów, mógłby "
 "obowiązywać dłuższy okres."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1355,7 +1163,6 @@
 "opóźnienie publikacji tylko po&nbsp;to, aby&nbsp;przesunąć w&nbsp;czasie "
 "okres działania praw autorskich."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1380,7 +1187,6 @@
 "chętniej kupi aktualne wydanie objęte prawem autorskim niż skopiuje "
 "dziesięcioletni egzemplarz stanowiący <i>public domain</i>, dobro 
publiczne."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1398,14 +1204,6 @@
 "zaoponował, twierdząc, iż wszystko ponad okresem 5-letnim jest nie 
do&nbsp;"
 "przyjęcia."
 
-# | But we don't have to apply the same time span to all kinds of works.
-# | Maintaining the utmost uniformity of copyright policy is not crucial to
-# | the public interest, and copyright law already has many exceptions for
-# | specific uses and media.  It would be foolish to pay for every highway
-# | project at the rates necessary for the most difficult projects in the most
-# | expensive regions of the country; it is equally foolish to [-\"pay\"-]
-# | {+&ldquo;pay&rdquo;+} for all kinds of art with the greatest price in
-# | freedom that we find necessary for any one kind.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1428,7 +1226,6 @@
 "najwyższą cenę, którą uważamy za&nbsp;konieczną w&nbsp;przypadku 
jednego "
 "z&nbsp;rodzajów."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1449,20 +1246,6 @@
 "Na&nbsp;moim polu, programowania komputerowego, trzy lata powinny "
 "wystarczyć, ponieważ&nbsp;cykl życia produktu jest jeszcze krótszy."
 
-# | Another dimension of copyright policy is the extent of fair use: some ways
-# | of reproducing all or part of a published work that are legally permitted
-# | even though it is copyrighted.  The natural first step in reducing this
-# | dimension of copyright power is to permit occasional private
-# | small-quantity noncommercial copying and distribution among individuals.
-# | This would eliminate the intrusion of the copyright police into people's
-# | private lives, but would probably have little effect on the sales of
-# | published works.  (It may be necessary to take other legal steps to ensure
-# | that shrink-wrap licenses cannot be used to substitute for copyright in
-# | restricting such copying.)  The experience of Napster shows that we should
-# | also permit noncommercial verbatim redistribution to the general [-public
-# | -- when-] {+public&mdash;when+} so many of the public want to copy and
-# | share, and find it so useful, only draconian measures will stop them, and
-# | the public deserves to get what it wants.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1499,15 +1282,6 @@
 "że&nbsp;jest to użyteczne, tylko drakońskie środki będą w&nbsp;stanie 
ich "
 "powstrzymać, a&nbsp;ogół zasługuje, aby&nbsp;dostać to, czego chce."
 
-# | For novels, and in general for works that are used for entertainment,
-# | noncommercial verbatim redistribution may be sufficient freedom for the
-# | readers.  Computer programs, being used for functional purposes (to get
-# | jobs done), call for additional freedoms beyond that, including the
-# | freedom to publish an improved version.  See [-\"Free-] {+&ldquo;Free+}
-# | Software [-Definition,\"-] {+Definition,&rdquo;+} in this book, for an
-# | explanation of the freedoms that software users should have.  But it may
-# | be an acceptable compromise for these freedoms to be universally available
-# | only after a delay of two or three years from the program's publication.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1532,12 +1306,6 @@
 "być przyznanie powszechnej dostępności, ale&nbsp;po upływie dwóch 
lub&nbsp;"
 "trzech lat od&nbsp;wydania programu."
 
-# | Changes like these could bring copyright into line with the public's wish
-# | to use digital technology to copy.  Publishers will no doubt find these
-# | proposals [-\"unbalanced\";-] {+&ldquo;unbalanced&rdquo;;+} they may
-# | threaten to take their marbles and go home, but they won't really do it,
-# | because the game will remain profitable and it will be the only game in
-# | town.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1555,12 +1323,6 @@
 "ta zabawa wciąż pozostanie bardzo dochodowym zajęciem i&nbsp;będzie to "
 "jedyne takie zajęcie w&nbsp;okolicy."
 
-# | As we consider reductions in copyright power, we must make sure media
-# | companies do not simply replace it with end-user license agreements.  It
-# | would be necessary to prohibit the use of contracts to apply restrictions
-# | on copying that go beyond those of copyright.  Such limitations on what
-# | mass-market nonnegotiated contracts can require are a standard part of the
-# | [-U.S.-] {+US+} legal system.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1578,23 +1340,11 @@
 "tego, co może narzucać masowy rynek za&nbsp;pomocą umów nie podlegają
cych "
 "negocjacji, są standardową częścią amerykańskiego systemu prawa."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <h3>
 #, fuzzy
 msgid "A personal note"
 msgstr "Uwaga osobista"
 
-# | I am a software designer, not a legal scholar.  I've become concerned with
-# | copyright issues because there's no avoiding them in the world of computer
-# | [-networks <a name=\"bodyfootnote3\" href=\"#footnote3\">[3]</a>.-]
-# | {+networks, such as the Internet.+}  As a user of computers and networks
-# | for [-thirty-] {+30+} years, I value the freedoms that we have lost, and
-# | the ones we may lose next.  As an author, I can reject the romantic
-# | mystique of the author as semidivine [-creator,-] {+<a
-# | href=\"words-to-avoid.html#Creator\">creator</a>,+} often cited by
-# | publishers to justify increased copyright powers for [-authors,-]
-# | {+authors&mdash;powers+} which {+these+} authors will then sign away to
-# | publishers.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1617,12 +1367,6 @@
 "często przytaczaną przez wydawców celem usprawiedliwienia poszerzonych 
praw "
 "autorskich, które później autorzy przepisują na&nbsp;rzecz wydawców."
 
-# | Most of this article consists of facts and reasoning that you can check,
-# | and proposals on which you can form your own opinions.  But I ask you to
-# | accept one thing on my word alone: that authors like me don't deserve
-# | special power over you.  If you wish to reward me further for the software
-# | or books I have written, I would gratefully accept a [-check -- but-]
-# | {+check&mdash;but+} please don't surrender your freedom in my name.
 #. type: Content of: <p>
 #, fuzzy
 msgid ""
@@ -1641,7 +1385,6 @@
 "książki, które napisałem, z&nbsp;wdzięcznością przyjmę czek &mdash; 
ale&nbsp;"
 "proszę nie rezygnuj ze swoich wolności w&nbsp;moim imieniu."
 
-# || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <h4>
 msgid "Footnotes"
 msgstr "Przypisy"
@@ -1693,9 +1436,9 @@
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
 "Essays of Richard M. Stallman</cite></a>."
 msgstr ""
-"Ten esej został opublikowany w&nbsp;książce <a href=\"http://shop.fsf.org/";
-"product/free-software-free-society/\"><cite>Free Software, Free Society: The "
-"Selected Essays of Richard M. Stallman</cite></a>."
+"Ten esej jest opublikowany w&nbsp;<a href=\"http://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -1715,7 +1458,13 @@
 "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 " "
+msgstr ""
+"Wszelkie pytania dotyczące GNU i&nbsp;FSF prosimy kierować na&nbsp;adres <a 
"
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. Inne metody 
kontaktu "
+"z&nbsp;FSF można znaleźć na&nbsp;stronie <a href=\"/contact/contact.html"
+"\">kontakt</a> <br /> Informacje o niedziałających odnośnikach oraz&nbsp;"
+"inne poprawki (lub propozycje) prosimy wysyłać na&nbsp;adres <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:
@@ -1733,7 +1482,15 @@
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and submitting "
 "translations of this article."
-msgstr " "
+msgstr ""
+"Staramy się, aby&nbsp;tłumaczenia były wierne i&nbsp;wysokiej jakości, "
+"ale&nbsp;nie jesteśmy zwolnieni z&nbsp;niedoskonałości. Komentarze 
odnośnie "
+"tłumaczenia polskiego oraz&nbsp;zgłoszenia dotyczące chęci współpracy 
w&nbsp;"
+"tłumaczeniu prosimy kierować na&nbsp;adres <a href=\"mailto:address@hidden";
+"org\">address@hidden</a>. <br /> Więcej informacji na&nbsp;temat "
+"koordynacji oraz&nbsp;zgłaszania propozycji tłumaczeń artykułów 
znajdziecie "
+"na&nbsp;<a href=\"/server/standards/README.translations.html\">stronie "
+"tłumaczeń</a>."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -1746,14 +1503,17 @@
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
 "NoDerivatives 4.0 International License</a>."
-msgstr " "
+msgstr ""
+"Ta strona jest dostępna na&nbsp;<a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/4.0/deed.pl\">licencji Creative Commons "
+"Uznanie autorstwa&nbsp;&ndash; Bez&nbsp;utworów zależnych 4.0 "
+"Międzynarodowe</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr "Tłumaczenie: Andrzej Siewierski 2005, Jan Owoc 2016."
 
-# type: Content of: <div><p>
 #.  timestamp start 
 #. type: Content of: <div><p>
 msgid "Updated:"

Index: philosophy/po/who-does-that-server-really-serve.pl-diff.html
===================================================================
RCS file: 
/web/www/www/philosophy/po/who-does-that-server-really-serve.pl-diff.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/po/who-does-that-server-really-serve.pl-diff.html        1 Jul 
2014 15:30:21 -0000       1.18
+++ philosophy/po/who-does-that-server-really-serve.pl-diff.html        20 Jan 
2016 23:29:57 -0000      1.19
@@ -11,9 +11,9 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.77 
--&gt;</em></ins></span>
+&lt;!-- Parent-Version: 1.77 --&gt;
 &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>
+- GNU Project - Free Software Foundation&lt;/title&gt;
 
 &lt;!--#include 
virtual="/philosophy/po/who-does-that-server-really-serve.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
@@ -22,26 +22,22 @@
 
 &lt;p&gt;by &lt;strong&gt;Richard Stallman&lt;/strong&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 
href="http://www.bostonreview.net/richard-stallman-free-software-DRM"&gt;
-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;blockquote&gt;&lt;p&gt;(The first version was published
+in &lt;a 
href="http://www.bostonreview.net/richard-stallman-free-software-DRM"&gt;
+Boston Review&lt;/a&gt;.)&lt;/p&gt;&lt;/blockquote&gt;
 
 &lt;p&gt;&lt;strong&gt;On the Internet, proprietary software isn't the only 
way to
-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;
+lose your freedom.  Service as a Software Substitute, or SaaSS, is
+another way to <span class="removed"><del><strong>let</strong></del></span> 
<span class="inserted"><ins><em>give</em></ins></span> someone else <span 
class="removed"><del><strong>have</strong></del></span> 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
+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>
+is SaaSS.
 
 &lt;h3&gt;Background: How Proprietary Software Takes Away Your 
Freedom&lt;/h3&gt;
 
@@ -66,99 +62,85 @@
 
 &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: <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;
+from our lives and many of us have done so.  However, we <span 
class="inserted"><ins><em>are</em></ins></span> now <span 
class="removed"><del><strong>face a
+new threat</strong></del></span>
+<span class="inserted"><ins><em>offered another tempting way</em></ins></span> 
to <span class="removed"><del><strong>our</strong></del></span> <span 
class="inserted"><ins><em>cede</em></ins></span> control over our computing:
+Service as a Software Substitute (SaaSS).  For our freedom's sake, we
+have to reject that too.&lt;/p&gt;
+
+&lt;h3&gt;How Service as a Software Substitute Takes Away Your 
Freedom&lt;/h3&gt;
+
+&lt;p&gt;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 &lt;em&gt;her own computing&lt;/em&gt; on the data thus provided, 
then
+sends the results back to her or acts directly on 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>
+present).  <span class="removed"><del><strong>When</strong></del></span>  
<span class="inserted"><ins><em>In cases where</em></ins></span> this 
assumption is not so, it isn't SaaSS.&lt;/p&gt;
 
 &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
-<span class="removed"><del><strong>for programmers</strong></del></span> to
+get an 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.&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
+&lt;p&gt;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.&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;Furthermore, SaaSS automatically leads to consequences equivalent
+to the malicious features of certain proprietary software.&lt;/p&gt;
 
-&lt;p&gt;</em></ins></span> For instance, some proprietary programs are 
&ldquo;spyware&rdquo;:
-the program <span class="inserted"><ins><em>&lt;a 
href="/philosophy/proprietary-surveillance.html"&gt;</em></ins></span>
-sends out data about users' computing <span 
class="removed"><del><strong>activities.</strong></del></span> <span 
class="inserted"><ins><em>activities&lt;/a&gt;.</em></ins></span>
+&lt;p&gt; For instance, some proprietary programs are &ldquo;spyware&rdquo;:
+the program &lt;a href="/philosophy/proprietary-surveillance.html"&gt;
+sends out data about users' computing activities&lt;/a&gt;.
 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
+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.&lt;/p&gt;</em></ins></span>
+history.&lt;/p&gt;
 
-&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
+&lt;p&gt;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 <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.  Amy Webb, who intended never to post any 
photos of
+server operator gets the data&mdash;with no special effort, by the
+nature of SaaSS.  Amy Webb, who intended never to post any photos of
 her daughter, made the mistake of using SaaSS (Instagram) to edit
 photos of her.  Eventually
 &lt;a 
href="http://www.slate.com/articles/technology/data_mine_1/2013/09/privacy_facebook_kids_don_t_post_photos_of_your_kids_on_social_media.html"&gt;
 they
 leaked from there&lt;/a&gt;.
-&lt;/p&gt;</em></ins></span>
+&lt;/p&gt;
 
-&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</strong></del></span>  <span class="inserted"><ins><em>Nearly all 
portable
+<span class="inserted"><ins><em>&lt;p&gt;Theoretically, homomorphic encryption 
might some day advance to the
+point where future SaaSS services might be constructed to be unable to
+understand some of the data that users send them.  Such
+services &lt;em&gt;could&lt;/em&gt; be set up not to snoop on users; this does 
not
+mean they &lt;em&gt;will&lt;/em&gt; do no snooping.&lt;/p&gt;</em></ins></span>
+
+&lt;p&gt;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</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</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</strong></del></span> <span 
class="inserted"><ins><em>Steam client for GNU/Linux
+universal back doors; for instance, the Steam client for GNU/Linux
 allows the developer to remotely install modified versions.&lt;/p&gt;
 
-&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</em></ins></span> to <span 
class="removed"><del><strong>do this.&lt;/p&gt;
-
-&lt;p&gt;Thus, SaaS is equivalent</strong></del></span> <span 
class="inserted"><ins><em>be able</em></ins></span> to <span 
class="removed"><del><strong>total</strong></del></span> <span 
class="inserted"><ins><em>do this, since it's his computer;
+&lt;p&gt;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.&lt;/p&gt;
 
-&lt;p&gt;Thus, SaaSS is equivalent to running proprietary software 
with</em></ins></span>
-spyware and 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.  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</strong></del></span> <span 
class="inserted"><ins><em>user, and that power is something we must
+&lt;p&gt;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.&lt;/p&gt;
 
 &lt;h3&gt;SaaSS and SaaS&lt;/h3&gt;
@@ -169,76 +151,79 @@
 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
+&lt;p&gt;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 &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;
+&lt;h3&gt;Untangling the SaaSS 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;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.&lt;/p&gt;
 
 &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 <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
+browser.  Some web pages install nontrivial, even large JavaScript
+programs 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 <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
+programs are nonfree&lt;/a&gt;, they cause the same sort of injustice as any
 other nonfree software.  Here, however, we are concerned with the
-problem of the server software itself.&lt;/p&gt;
+issue of using the service itself.&lt;/p&gt;
 
-&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
+&lt;p&gt;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 <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>
+they are proprietary, their <span 
class="removed"><del><strong>owners</strong></del></span> <span 
class="inserted"><ins><em>developers/owners</em></ins></span> have power over 
the
+server.  That's unfair to the server operator, and doesn't help the
+<span class="inserted"><ins><em>server's</em></ins></span> users at all.  But 
if the programs on the server are free,
+that doesn't protect &lt;em&gt;the server's users&lt;/em&gt; from the effects 
of
+SaaSS.  These programs liberate the server operator, but not the
+server's users.&lt;/p&gt;
 
 &lt;p&gt;Releasing the server software source code does benefit the
-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
+community: it enables suitably skilled users to 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
+software.  &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;p&gt;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; <span 
class="removed"><del><strong>server.</strong></del></span> <span 
class="inserted"><ins><em>server (one whose software load
+you control, regardless of whether the machine is your 
property).</em></ins></span>  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, &lt;em&gt;Don't use SaaSS!&lt;/em&gt;  Don't use someone else's 
server
+to do your own computing on data provided by you.&lt;/p&gt;
+
+&lt;p&gt;This issue demonstrates the depth of the difference between
+&ldquo;open&rdquo; and &ldquo;free&rdquo;.  Source code that is open
+source &lt;a href="/philosophy/free-open-overlap.html"&gt;is, nearly always,
+free&lt;/a&gt;.  However, the idea of
+an &lt;a href="http://opendefinition.org/software-service"&gt;&ldquo;open
+software&rdquo; service&lt;/a&gt;, meaning one whose server software is open
+source and/or free, fails to address the issue of SaaSS.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;Services are fundamentally different 
from programs, and the ethical
+&lt;p&gt;Services are fundamentally different from programs, and the ethical
 issues that services raise are fundamentally different from the issues
 that programs raise.  To avoid confusion,
 we &lt;a href="/philosophy/network-services-arent-free-or-nonfree.html"&gt;
 avoid describing a service as &ldquo;free&rdquo; or
-&ldquo;proprietary.&rdquo;&lt;/a&gt;&lt;/p&gt;</em></ins></span>
-
-&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;
+&ldquo;proprietary.&rdquo;&lt;/a&gt;&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Does avoiding SaaS 
mean</strong></del></span>
+&lt;h3&gt;Distinguishing SaaSS from Other Network Services&lt;/h3&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;Which online services are SaaSS?  The 
clearest example is a
+&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>refuse to use any network servers 
run</strong></del></span> <span class="inserted"><ins><em>is computing that is 
purely yours.
-You could do it</em></ins></span> by <span class="removed"><del><strong>anyone 
other than you?  Not at all.</strong></del></span> <span 
class="inserted"><ins><em>running a program on your own computer, if only you
+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
@@ -247,198 +232,156 @@
 &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;
+server <span class="removed"><del><strong>instead of</strong></del></span> 
<span class="inserted"><ins><em>you don't control, rather 
than</em></ins></span> your own <span 
class="removed"><del><strong>computer</strong></del></span> <span 
class="inserted"><ins><em>computer,</em></ins></span> 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.</em></ins></span>  Most servers <span 
class="removed"><del><strong>do</strong></del></span> <span 
class="inserted"><ins><em>are</em></ins></span> not <span 
class="removed"><del><strong>raise this
-issue,</strong></del></span> <span 
class="inserted"><ins><em>SaaSS</em></ins></span> because the <span 
class="removed"><del><strong>job you</strong></del></span>
-<span class="inserted"><ins><em>jobs they</em></ins></span> do <span 
class="removed"><del><strong>with them isn't your</strong></del></span> <span 
class="inserted"><ins><em>are not the user's</em></ins></span> own <span 
class="removed"><del><strong>computing
-except in a trivial sense.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>computing.&lt;/p&gt;</em></ins></span>
+run by anyone other than you.  Most servers are not SaaSS because the
+jobs they do are <span class="removed"><del><strong>not</strong></del></span> 
<span class="inserted"><ins><em>some sort of communication, rather 
than</em></ins></span> the user's
+own computing.&lt;/p&gt;
 
-&lt;p&gt;The original <span 
class="removed"><del><strong>purpose</strong></del></span> <span 
class="inserted"><ins><em>idea</em></ins></span> of web servers wasn't to do 
computing for you, it
+&lt;p&gt;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 <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
+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 <span class="removed"><del><strong>publishing your own 
materials via</strong></del></span> <span class="inserted"><ins><em>use 
of</em></ins></span> a blog site <span class="inserted"><ins><em>to publish 
your own works,</em></ins></span>
+or <span class="inserted"><ins><em>using</em></ins></span> a microblogging 
service such as Twitter or StatusNet.  (These
+services may <span class="inserted"><ins><em>or may not</em></ins></span> have 
other problems, <span class="removed"><del><strong>of 
course.)</strong></del></span> <span class="inserted"><ins><em>depending on 
details.)</em></ins></span>
+The same goes for other communication not meant to be private, such as
+chat groups.&lt;/p&gt;
+
+&lt;p&gt;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.&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
+&lt;p&gt;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</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
+users a 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;
 
 &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
-<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</strong></del></span> <span 
class="inserted"><ins><em>SaaSS.&lt;/p&gt;
-
-&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;
+SaaSS.  However, using someone else's server to implement a search
+facility for your own site &lt;em&gt;is&lt;/em&gt; SaaSS.&lt;/p&gt;
 
-&lt;p&gt;Repository sites such as as Savannah and SourceForge are not
+&lt;p&gt;Purchasing online is not SaaSS, because the computing
+isn't &lt;em&gt;your <span 
class="removed"><del><strong>own&lt;/em&gt;;</strong></del></span> <span 
class="inserted"><ins><em>own&lt;/em&gt; activity;</em></ins></span> 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).&lt;/p&gt;
+
+&lt;p&gt;Repository sites such as <span 
class="removed"><del><strong>as</strong></del></span> 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>
+supplied to it.&lt;/p&gt;
 
-&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
+&lt;p&gt;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 <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</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;
-
-&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;
-
-&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 &lt;a href="/philosophy/javascript-trap.html"&gt; nonfree JavaScript 
program&lt;/a&gt;
-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.&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 <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
+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.&lt;/p&gt;
+
+&lt;p&gt;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.&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
+&lt;p&gt;Google Docs shows how complex the evaluation of a single service
+can become.  It invites people to 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
+program&lt;/a&gt;, 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</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
+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 &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
+have done by running a suitable program (free, one hopes) in 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;
+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</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
+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.&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;</em></ins></span> of <span 
class="removed"><del><strong>SaaS.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>a Google Docs document
+issues, but publishing through Google Docs has a special problem: it
+is impossible even to &lt;em&gt;view the 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 of SaaSS.&lt;/p&gt;</em></ins></span>
+is not a matter of SaaSS.&lt;/p&gt;
 
-&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.
+&lt;p&gt;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 <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
+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.</em></ins></span>  The term <span 
class="removed"><del><strong>only lends itself</strong></del></span> <span 
class="inserted"><ins><em>leads people</em></ins></span> to <span 
class="removed"><del><strong>uselessly broad
-statements.&lt;/p&gt;
-
-&lt;p&gt;The real meaning of</strong></del></span>
-<span class="inserted"><ins><em>generalize about practices they ought to 
consider individually.&lt;/p&gt;
+the term has other specific meanings.  The term leads people to
+generalize about practices they ought to 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
+&lt;p&gt;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
-<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>
+check for a hook 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;&lt;/p&gt;
+
+<span class="inserted"><ins><em>&lt;h3&gt;Renting a Server Distinguished from 
SaaSS&lt;/h3&gt;
+
+&lt;p&gt;If you rent a server (real or virtual), whose software load you
+have control over, that's not SaaSS.  In SaaSS, someone else decides
+what software runs on the server and therefore controls the computing
+it does for you.  In the case where you install the software on the
+server, you control what computing it does for you.  Thus, the rented
+server is virtually your computer.  For this issue, it counts as
+yours.&lt;/p&gt;
+
+&lt;p&gt;The &lt;em&gt;data&lt;/em&gt; on the rented remote server is less 
secure than
+if you had the server at home, but that is a separate issue from
+SaaSS.&lt;/p&gt;</em></ins></span>
 
-&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;h3&gt;Dealing with the SaaSS Problem&lt;/h3&gt;
 
-&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
+&lt;p&gt;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?&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 <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
+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.&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
+&lt;p&gt;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.  <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
+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.&lt;/p&gt;
@@ -456,35 +399,27 @@
 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 <span 
class="removed"><del><strong>SaaS.</strong></del></span> <span 
class="inserted"><ins><em>SaaSS.</em></ins></span>  Don't buy or
+your own 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 &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
+data there.  Do your own computing with your own copy of a free
 program, for your freedom's sake.&lt;/p&gt;
 
 &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;
-<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for id="content", starts 
in the include above --&gt;</em></ins></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;
-<span class="removed"><del><strong>&lt;p&gt;
-Please</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="unprintable"&gt;
+&lt;div class="unprintable"&gt;
 
-&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
+&lt;p&gt;Please send general 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</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
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:
@@ -499,15 +434,15 @@
         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
+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;
-<span class="inserted"><ins><em>&lt;/div&gt;
+&lt;/div&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
+     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  Please do NOT change or 
remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -520,24 +455,20 @@
      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>
+     Information document, www.gnu.org/prep/maintain. --&gt;
 
-&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</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 <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;</em></ins></span>
+&lt;p&gt;Copyright &copy; 2010, 2013, <span 
class="removed"><del><strong>2015</strong></del></span> <span 
class="inserted"><ins><em>2015, 2016</em></ins></span> Richard 
Stallman&lt;/p&gt;
 
-&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
+<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Updated:</strong></del></span>
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-<span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2014/07/01 15:30:21 $
+$Date: 2016/01/20 23:29:57 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: proprietary/po/proprietary-back-doors.de.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-back-doors.de.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- proprietary/po/proprietary-back-doors.de.po 18 Jan 2016 02:58:13 -0000      
1.31
+++ proprietary/po/proprietary-back-doors.de.po 20 Jan 2016 23:29:58 -0000      
1.32
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: proprietary-back-doors.html\n"
 "Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2016-01-18 02:55+0000\n"
+"POT-Creation-Date: 2016-01-20 23:25+0000\n"
 "PO-Revision-Date: 2016-01-13 22:00+0100\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: www-de <address@hidden>\n"
@@ -124,30 +124,6 @@
 msgid "It is used by 14,000 Android applications."
 msgstr "Sie wird von 14.000 Android-Anwendungen verwendet."
 
-# (Verbraucherzentrale mahnt Microsoft wegen Windows-10-„Zwangsdownload“ 
ab ) http://heise.de/-3045781 ;)
-#. type: Content of: <ul><li><p>
-msgid ""
-"Microsoft is <a href=\"http://www.computerworld.com/article/3012278/";
-"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
-"strategy.html\">attacking computers that run Windows 7 and 8</a>, switching "
-"on a flag that says whether to &ldquo;upgrade&rdquo; to Windows 10 when "
-"users have turned it off."
-msgstr ""
-"Microsoft <a href=\"//www.computerworld.com/article/3012278/microsoft-"
-"windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html\" "
-"title=\"Gregg Keizer, Microsoft sets stage for massive Windows 10 upgrade "
-"strategy, Computerworld 2015.\">attackiert Rechner, die Windows 7 und 8 "
-"ausführen</a> und aktiviert die 
<ins>Zwangsfunktions-</ins>„Verbesserung“ "
-"auf Windows 10, selbst wenn Benutzer diese deaktiviert haben."
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"This, by the way, reaffirms the presence of a universal back door in Windows "
-"7 and 8."
-msgstr ""
-"Dies <ins>scheint</ins> übrigens nochmals den Einsatz einer universellen "
-"Hintertür in Windows 7 und 8 zu bekräftigen."
-
 # (Doppelte Hintertür in Kabelmodems von Arris) (http://heise.de/-3016128
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -187,11 +163,21 @@
 
 # 
http://images.techhive.com/images/article/2015/10/winupdate-100622022-primary.idge.jpg
 #. type: Content of: <ul><li><p>
-msgid ""
-"Users report <a href=\"http://www.networkworld.com/article/2993490/windows/";
-"windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk."
-"rss_all\"> Microsoft is forcing them to replace Windows 7 and 8 with all-"
-"spying Windows 10</a>."
+# | Users [-report-] {+reported that+} <a
+# | 
href=\"http://www.networkworld.com/article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk.rss_all\";>
+# | Microsoft [-is-] {+was+} forcing them to replace Windows 7 and 8 with
+# | all-spying Windows 10</a>.
+#, fuzzy
+#| msgid ""
+#| "Users report <a href=\"http://www.networkworld.com/article/2993490/";
+#| "windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-"
+#| "users.html#tk.rss_all\"> Microsoft is forcing them to replace Windows 7 "
+#| "and 8 with all-spying Windows 10</a>."
+msgid ""
+"Users reported that <a href=\"http://www.networkworld.com/article/2993490/";
+"windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users."
+"html#tk.rss_all\"> Microsoft was forcing them to replace Windows 7 and 8 "
+"with all-spying Windows 10</a>."
 msgstr ""
 "Benutzer berichten, dass <a href=\"http://www.networkworld.com/";
 "article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-"
@@ -200,6 +186,42 @@
 "\">Microsoft sie zwingen würde, Windows 7 und 8 mit der alles "
 "ausspionierenden <ins>„Abhöranlage“</ins> Windows 10 zu ersetzen</a>."
 
+# (Verbraucherzentrale mahnt Microsoft wegen Windows-10-„Zwangsdownload“ 
ab ) http://heise.de/-3045781 ;)
+#. type: Content of: <ul><li><p>
+# | Microsoft [-is-] {+was in fact+} <a
+# | 
href=\"http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html\";>{+
+# | +}attacking computers that run Windows 7 and 8</a>, switching on a flag
+# | that [-says-] {+said+} whether to &ldquo;upgrade&rdquo; to Windows 10 when
+# | users [-have-] {+had+} turned it off.
+#, fuzzy
+#| msgid ""
+#| "Microsoft is <a href=\"http://www.computerworld.com/article/3012278/";
+#| "microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+#| "strategy.html\">attacking computers that run Windows 7 and 8</a>, "
+#| "switching on a flag that says whether to &ldquo;upgrade&rdquo; to Windows "
+#| "10 when users have turned it off."
+msgid ""
+"Microsoft was in fact <a href=\"http://www.computerworld.com/article/3012278/";
+"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+"strategy.html\"> attacking computers that run Windows 7 and 8</a>, switching "
+"on a flag that said whether to &ldquo;upgrade&rdquo; to Windows 10 when "
+"users had turned it off."
+msgstr ""
+"Microsoft <a href=\"//www.computerworld.com/article/3012278/microsoft-"
+"windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html\" "
+"title=\"Gregg Keizer, Microsoft sets stage for massive Windows 10 upgrade "
+"strategy, Computerworld 2015.\">attackiert Rechner, die Windows 7 und 8 "
+"ausführen</a> und aktiviert die 
<ins>Zwangsfunktions-</ins>„Verbesserung“ "
+"auf Windows 10, selbst wenn Benutzer diese deaktiviert haben."
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Later on, Microsoft published instructions on <a href=\"http://arstechnica.";
+"com/information-technology/2016/01/microsoft-finally-has-a-proper-way-to-opt-"
+"out-of-windows-78-to-windows-10-upgrades/\"> how to permanently reject the "
+"downgrade to Windows 10</a>."
+msgstr ""
+
 #. type: Content of: <ul><li><p>
 msgid "This seems to involve use of a back door in Windows 7 and 8."
 msgstr ""
@@ -695,6 +717,13 @@
 msgid "Updated:"
 msgstr "Aktualisierung:"
 
+#~ msgid ""
+#~ "This, by the way, reaffirms the presence of a universal back door in "
+#~ "Windows 7 and 8."
+#~ msgstr ""
+#~ "Dies <ins>scheint</ins> übrigens nochmals den Einsatz einer universellen "
+#~ "Hintertür in Windows 7 und 8 zu bekräftigen."
+
 #~ msgid "Copyright &copy; 2014-2015 Free Software Foundation, Inc."
 #~ msgstr ""
 #~ "Copyright &copy; 201<ins>3</ins>-2015 Free Software Foundation, Inc."

Index: proprietary/po/proprietary-back-doors.fr.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-back-doors.fr.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- proprietary/po/proprietary-back-doors.fr.po 18 Jan 2016 09:06:39 -0000      
1.27
+++ proprietary/po/proprietary-back-doors.fr.po 20 Jan 2016 23:29:58 -0000      
1.28
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: proprietary-back-doors.html\n"
-"POT-Creation-Date: 2016-01-18 02:55+0000\n"
+"POT-Creation-Date: 2016-01-20 23:25+0000\n"
 "PO-Revision-Date: 2016-01-18 10:05+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-01-20 23:25+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -121,28 +122,6 @@
 
 #. type: Content of: <ul><li><p>
 msgid ""
-"Microsoft is <a href=\"http://www.computerworld.com/article/3012278/";
-"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
-"strategy.html\">attacking computers that run Windows 7 and 8</a>, switching "
-"on a flag that says whether to &ldquo;upgrade&rdquo; to Windows 10 when "
-"users have turned it off."
-msgstr ""
-"Microsoft <a href=\"http://www.computerworld.com/article/3012278/microsoft-";
-"windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html\"> "
-"attaque les ordinateurs sous Windows 7 et 8</a> en modifiant un drapeau "
-"indiquant si la « mise à niveau » vers Windows 10 doit être faite, 
lorsque "
-"l'utilisateur a coché « non »."
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"This, by the way, reaffirms the presence of a universal back door in Windows "
-"7 and 8."
-msgstr ""
-"Au demeurant, cela confirme la présence d'une porte dérobée dans Windows 7 
"
-"et 8."
-
-#. type: Content of: <ul><li><p>
-msgid ""
 "ARRIS cable modem has a <a href=\"https://w00tsec.blogspot.de/2015/11/arris-";
 "cable-modem-has-backdoor-in.html?m=1\"> backdoor in the backdoor</a>."
 msgstr ""
@@ -173,11 +152,21 @@
 "attaquants pour obtenir les privilèges du superutilisateur 
<cite>root</cite>."
 
 #. type: Content of: <ul><li><p>
-msgid ""
-"Users report <a href=\"http://www.networkworld.com/article/2993490/windows/";
-"windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk."
-"rss_all\"> Microsoft is forcing them to replace Windows 7 and 8 with all-"
-"spying Windows 10</a>."
+# | Users [-report-] {+reported that+} <a
+# | 
href=\"http://www.networkworld.com/article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk.rss_all\";>
+# | Microsoft [-is-] {+was+} forcing them to replace Windows 7 and 8 with
+# | all-spying Windows 10</a>.
+#, fuzzy
+#| msgid ""
+#| "Users report <a href=\"http://www.networkworld.com/article/2993490/";
+#| "windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-"
+#| "users.html#tk.rss_all\"> Microsoft is forcing them to replace Windows 7 "
+#| "and 8 with all-spying Windows 10</a>."
+msgid ""
+"Users reported that <a href=\"http://www.networkworld.com/article/2993490/";
+"windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users."
+"html#tk.rss_all\"> Microsoft was forcing them to replace Windows 7 and 8 "
+"with all-spying Windows 10</a>."
 msgstr ""
 "Des utilisateurs rapportent que <a href=\"http://www.networkworld.com/";
 "article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-"
@@ -185,6 +174,40 @@
 "Windows 7 et 8 par Windows 10, l'espion tous azimuths</a>."
 
 #. type: Content of: <ul><li><p>
+# | Microsoft [-is-] {+was in fact+} <a
+# | 
href=\"http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html\";>{+
+# | +}attacking computers that run Windows 7 and 8</a>, switching on a flag
+# | that [-says-] {+said+} whether to &ldquo;upgrade&rdquo; to Windows 10 when
+# | users [-have-] {+had+} turned it off.
+#, fuzzy
+#| msgid ""
+#| "Microsoft is <a href=\"http://www.computerworld.com/article/3012278/";
+#| "microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+#| "strategy.html\">attacking computers that run Windows 7 and 8</a>, "
+#| "switching on a flag that says whether to &ldquo;upgrade&rdquo; to Windows "
+#| "10 when users have turned it off."
+msgid ""
+"Microsoft was in fact <a href=\"http://www.computerworld.com/article/3012278/";
+"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+"strategy.html\"> attacking computers that run Windows 7 and 8</a>, switching "
+"on a flag that said whether to &ldquo;upgrade&rdquo; to Windows 10 when "
+"users had turned it off."
+msgstr ""
+"Microsoft <a href=\"http://www.computerworld.com/article/3012278/microsoft-";
+"windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html\"> "
+"attaque les ordinateurs sous Windows 7 et 8</a> en modifiant un drapeau "
+"indiquant si la « mise à niveau » vers Windows 10 doit être faite, 
lorsque "
+"l'utilisateur a coché « non »."
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Later on, Microsoft published instructions on <a href=\"http://arstechnica.";
+"com/information-technology/2016/01/microsoft-finally-has-a-proper-way-to-opt-"
+"out-of-windows-78-to-windows-10-upgrades/\"> how to permanently reject the "
+"downgrade to Windows 10</a>."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
 msgid "This seems to involve use of a back door in Windows 7 and 8."
 msgstr ""
 "Il semble que cela se fasse par le moyen d'une porte dérobée dans Windows 7 
"
@@ -590,3 +613,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "This, by the way, reaffirms the presence of a universal back door in "
+#~ "Windows 7 and 8."
+#~ msgstr ""
+#~ "Au demeurant, cela confirme la présence d'une porte dérobée dans 
Windows "
+#~ "7 et 8."

Index: proprietary/po/proprietary-back-doors.it.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-back-doors.it.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- proprietary/po/proprietary-back-doors.it.po 18 Jan 2016 02:58:14 -0000      
1.37
+++ proprietary/po/proprietary-back-doors.it.po 20 Jan 2016 23:29:59 -0000      
1.38
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: proprietary-back-doors.html\n"
-"POT-Creation-Date: 2016-01-18 02:55+0000\n"
+"POT-Creation-Date: 2016-01-20 23:25+0000\n"
 "PO-Revision-Date: 2016-01-16 22:59+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian <address@hidden>\n"
@@ -119,28 +119,6 @@
 
 #. type: Content of: <ul><li><p>
 msgid ""
-"Microsoft is <a href=\"http://www.computerworld.com/article/3012278/";
-"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
-"strategy.html\">attacking computers that run Windows 7 and 8</a>, switching "
-"on a flag that says whether to &ldquo;upgrade&rdquo; to Windows 10 when "
-"users have turned it off."
-msgstr ""
-"Microsoft sta <a href=\"http://www.computerworld.com/article/3012278/";
-"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
-"strategy.html\">attaccando i computer con Windows 7 e 8</a>, attivando un "
-"interruttore che dice se &ldquo;aggiornare&rdquo; a Windows 10 anche quando "
-"gli utenti lo hanno disattivato."
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"This, by the way, reaffirms the presence of a universal back door in Windows "
-"7 and 8."
-msgstr ""
-"Questa, tra l'altro, è un'ulteriore conferma della presenza di una backdoor "
-"in Windows 7 e 8."
-
-#. type: Content of: <ul><li><p>
-msgid ""
 "ARRIS cable modem has a <a href=\"https://w00tsec.blogspot.de/2015/11/arris-";
 "cable-modem-has-backdoor-in.html?m=1\"> backdoor in the backdoor</a>."
 msgstr ""
@@ -168,11 +146,21 @@
 "backdoor locale</a> intenzionale."
 
 #. type: Content of: <ul><li><p>
-msgid ""
-"Users report <a href=\"http://www.networkworld.com/article/2993490/windows/";
-"windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk."
-"rss_all\"> Microsoft is forcing them to replace Windows 7 and 8 with all-"
-"spying Windows 10</a>."
+# | Users [-report-] {+reported that+} <a
+# | 
href=\"http://www.networkworld.com/article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk.rss_all\";>
+# | Microsoft [-is-] {+was+} forcing them to replace Windows 7 and 8 with
+# | all-spying Windows 10</a>.
+#, fuzzy
+#| msgid ""
+#| "Users report <a href=\"http://www.networkworld.com/article/2993490/";
+#| "windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-"
+#| "users.html#tk.rss_all\"> Microsoft is forcing them to replace Windows 7 "
+#| "and 8 with all-spying Windows 10</a>."
+msgid ""
+"Users reported that <a href=\"http://www.networkworld.com/article/2993490/";
+"windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users."
+"html#tk.rss_all\"> Microsoft was forcing them to replace Windows 7 and 8 "
+"with all-spying Windows 10</a>."
 msgstr ""
 "Alcuni utenti segnalano che <a href=\"http://www.networkworld.com/";
 "article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-"
@@ -180,6 +168,40 @@
 "sostituire Windows 7 e 8</a> con Windows 10, che spia tutto."
 
 #. type: Content of: <ul><li><p>
+# | Microsoft [-is-] {+was in fact+} <a
+# | 
href=\"http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html\";>{+
+# | +}attacking computers that run Windows 7 and 8</a>, switching on a flag
+# | that [-says-] {+said+} whether to &ldquo;upgrade&rdquo; to Windows 10 when
+# | users [-have-] {+had+} turned it off.
+#, fuzzy
+#| msgid ""
+#| "Microsoft is <a href=\"http://www.computerworld.com/article/3012278/";
+#| "microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+#| "strategy.html\">attacking computers that run Windows 7 and 8</a>, "
+#| "switching on a flag that says whether to &ldquo;upgrade&rdquo; to Windows "
+#| "10 when users have turned it off."
+msgid ""
+"Microsoft was in fact <a href=\"http://www.computerworld.com/article/3012278/";
+"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+"strategy.html\"> attacking computers that run Windows 7 and 8</a>, switching "
+"on a flag that said whether to &ldquo;upgrade&rdquo; to Windows 10 when "
+"users had turned it off."
+msgstr ""
+"Microsoft sta <a href=\"http://www.computerworld.com/article/3012278/";
+"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+"strategy.html\">attaccando i computer con Windows 7 e 8</a>, attivando un "
+"interruttore che dice se &ldquo;aggiornare&rdquo; a Windows 10 anche quando "
+"gli utenti lo hanno disattivato."
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Later on, Microsoft published instructions on <a href=\"http://arstechnica.";
+"com/information-technology/2016/01/microsoft-finally-has-a-proper-way-to-opt-"
+"out-of-windows-78-to-windows-10-upgrades/\"> how to permanently reject the "
+"downgrade to Windows 10</a>."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
 msgid "This seems to involve use of a back door in Windows 7 and 8."
 msgstr "Sembra che questo sfrutti una backdoor in Windows 7 e 8."
 
@@ -591,6 +613,13 @@
 msgstr "Ultimo aggiornamento:"
 
 #~ msgid ""
+#~ "This, by the way, reaffirms the presence of a universal back door in "
+#~ "Windows 7 and 8."
+#~ msgstr ""
+#~ "Questa, tra l'altro, è un'ulteriore conferma della presenza di una "
+#~ "backdoor in Windows 7 e 8."
+
+#~ 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>."

Index: proprietary/po/proprietary-back-doors.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-back-doors.ja.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- proprietary/po/proprietary-back-doors.ja.po 18 Jan 2016 02:58:14 -0000      
1.32
+++ proprietary/po/proprietary-back-doors.ja.po 20 Jan 2016 23:29:59 -0000      
1.33
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: proprietary-back-doors.html\n"
-"POT-Creation-Date: 2016-01-18 02:55+0000\n"
+"POT-Creation-Date: 2016-01-20 23:25+0000\n"
 "PO-Revision-Date: 2015-12-29 15:24+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -103,28 +103,6 @@
 
 #. type: Content of: <ul><li><p>
 msgid ""
-"Microsoft is <a href=\"http://www.computerworld.com/article/3012278/";
-"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
-"strategy.html\">attacking computers that run Windows 7 and 8</a>, switching "
-"on a flag that says whether to &ldquo;upgrade&rdquo; to Windows 10 when "
-"users have turned it off."
-msgstr ""
-"マイクロソフトは<a 
href=\"http://www.computerworld.com/article/3012278/";
-"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
-"strategy.html\">ウィンドウズ 
7と8を動かしているコンピュータを攻撃しています</"
-"a>、(ユーザがそれをオフにしてあるå 
´åˆã«)ウィンドウズ10に「アップグレード」す"
-"るかどうかのフラグをオンに変更してです。"
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"This, by the way, reaffirms the presence of a universal back door in Windows "
-"7 and 8."
-msgstr ""
-"ところで、これは、これはウィンドウズ7と8の万能バックドアの存在を再確認しま"
-"す。"
-
-#. type: Content of: <ul><li><p>
-msgid ""
 "ARRIS cable modem has a <a href=\"https://w00tsec.blogspot.de/2015/11/arris-";
 "cable-modem-has-backdoor-in.html?m=1\"> backdoor in the backdoor</a>."
 msgstr ""
@@ -152,11 +130,17 @@
 "が4年間あり</a>、攻撃者
がroot権限を取得するのに悪用されうる状況でした。"
 
 #. type: Content of: <ul><li><p>
-msgid ""
-"Users report <a href=\"http://www.networkworld.com/article/2993490/windows/";
-"windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk."
-"rss_all\"> Microsoft is forcing them to replace Windows 7 and 8 with all-"
-"spying Windows 10</a>."
+#, fuzzy
+#| msgid ""
+#| "Users report <a href=\"http://www.networkworld.com/article/2993490/";
+#| "windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-"
+#| "users.html#tk.rss_all\"> Microsoft is forcing them to replace Windows 7 "
+#| "and 8 with all-spying Windows 10</a>."
+msgid ""
+"Users reported that <a href=\"http://www.networkworld.com/article/2993490/";
+"windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users."
+"html#tk.rss_all\"> Microsoft was forcing them to replace Windows 7 and 8 "
+"with all-spying Windows 10</a>."
 msgstr ""
 "ユーザは、<a href=\"http://www.networkworld.com/article/2993490/windows/";
 "windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk."
@@ -164,6 +148,35 @@
 "ウズ10に置き換えることを強制する</a>、とå 
±å‘Šã—ています。"
 
 #. type: Content of: <ul><li><p>
+#, fuzzy
+#| msgid ""
+#| "Microsoft is <a href=\"http://www.computerworld.com/article/3012278/";
+#| "microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+#| "strategy.html\">attacking computers that run Windows 7 and 8</a>, "
+#| "switching on a flag that says whether to &ldquo;upgrade&rdquo; to Windows "
+#| "10 when users have turned it off."
+msgid ""
+"Microsoft was in fact <a href=\"http://www.computerworld.com/article/3012278/";
+"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+"strategy.html\"> attacking computers that run Windows 7 and 8</a>, switching "
+"on a flag that said whether to &ldquo;upgrade&rdquo; to Windows 10 when "
+"users had turned it off."
+msgstr ""
+"マイクロソフトは<a 
href=\"http://www.computerworld.com/article/3012278/";
+"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+"strategy.html\">ウィンドウズ 
7と8を動かしているコンピュータを攻撃しています</"
+"a>、(ユーザがそれをオフにしてあるå 
´åˆã«)ウィンドウズ10に「アップグレード」す"
+"るかどうかのフラグをオンに変更してです。"
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Later on, Microsoft published instructions on <a href=\"http://arstechnica.";
+"com/information-technology/2016/01/microsoft-finally-has-a-proper-way-to-opt-"
+"out-of-windows-78-to-windows-10-upgrades/\"> how to permanently reject the "
+"downgrade to Windows 10</a>."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
 msgid "This seems to involve use of a back door in Windows 7 and 8."
 msgstr 
"これはウィンドウズ7と8のバックドアの使用に関係しているようです。"
 
@@ -558,3 +571,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最終更新:"
+
+#~ msgid ""
+#~ "This, by the way, reaffirms the presence of a universal back door in "
+#~ "Windows 7 and 8."
+#~ msgstr ""
+#~ 
"ところで、これは、これはウィンドウズ7と8の万能バックドアの存在を再確認しま"
+#~ "す。"

Index: proprietary/po/proprietary-back-doors.pot
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-back-doors.pot,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- proprietary/po/proprietary-back-doors.pot   18 Jan 2016 02:58:14 -0000      
1.16
+++ proprietary/po/proprietary-back-doors.pot   20 Jan 2016 23:29:59 -0000      
1.17
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: proprietary-back-doors.html\n"
-"POT-Creation-Date: 2016-01-18 02:55+0000\n"
+"POT-Creation-Date: 2016-01-20 23: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"
@@ -89,21 +89,6 @@
 
 #. type: Content of: <ul><li><p>
 msgid ""
-"Microsoft is <a "
-"href=\"http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html\";>attacking
 "
-"computers that run Windows 7 and 8</a>, switching on a flag that says "
-"whether to &ldquo;upgrade&rdquo; to Windows 10 when users have turned it "
-"off."
-msgstr ""
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"This, by the way, reaffirms the presence of a universal back door in Windows "
-"7 and 8."
-msgstr ""
-
-#. type: Content of: <ul><li><p>
-msgid ""
 "ARRIS cable modem has a <a "
 
"href=\"https://w00tsec.blogspot.de/2015/11/arris-cable-modem-has-backdoor-in.html?m=1\";>
 "
 "backdoor in the backdoor</a>."
@@ -125,10 +110,26 @@
 
 #. type: Content of: <ul><li><p>
 msgid ""
-"Users report <a "
+"Users reported that <a "
 
"href=\"http://www.networkworld.com/article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk.rss_all\";>
 "
-"Microsoft is forcing them to replace Windows 7 and 8 with all-spying Windows "
-"10</a>."
+"Microsoft was forcing them to replace Windows 7 and 8 with all-spying "
+"Windows 10</a>."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Microsoft was in fact <a "
+"href=\"http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html\";>
 "
+"attacking computers that run Windows 7 and 8</a>, switching on a flag that "
+"said whether to &ldquo;upgrade&rdquo; to Windows 10 when users had turned it "
+"off."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Later on, Microsoft published instructions on <a "
+"href=\"http://arstechnica.com/information-technology/2016/01/microsoft-finally-has-a-proper-way-to-opt-out-of-windows-78-to-windows-10-upgrades/\";>
 "
+"how to permanently reject the downgrade to Windows 10</a>."
 msgstr ""
 
 #. type: Content of: <ul><li><p>

Index: proprietary/po/proprietary-back-doors.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-back-doors.ru.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- proprietary/po/proprietary-back-doors.ru.po 18 Jan 2016 06:01:28 -0000      
1.41
+++ proprietary/po/proprietary-back-doors.ru.po 20 Jan 2016 23:29:59 -0000      
1.42
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: proprietary-back-doors.html\n"
-"POT-Creation-Date: 2016-01-18 02:55+0000\n"
+"POT-Creation-Date: 2016-01-20 23:25+0000\n"
 "PO-Revision-Date: 2016-01-18 17:34+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-01-20 23:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Proprietary Back Doors - GNU Project - Free Software Foundation"
@@ -119,28 +120,6 @@
 
 #. type: Content of: <ul><li><p>
 msgid ""
-"Microsoft is <a href=\"http://www.computerworld.com/article/3012278/";
-"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
-"strategy.html\">attacking computers that run Windows 7 and 8</a>, switching "
-"on a flag that says whether to &ldquo;upgrade&rdquo; to Windows 10 when "
-"users have turned it off."
-msgstr ""
-"Microsoft <a href=\"http://www.computerworld.com/article/3012278/microsoft-";
-"windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html"
-"\">атакует компьютеры, работающие под 
Windows&nbsp;7 и 8</a>, включая "
-"настройку, которая разрешает 
&ldquo;обновиться&rdquo; до Windows&nbsp;10, "
-"когда пользователи выключили это."
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"This, by the way, reaffirms the presence of a universal back door in Windows "
-"7 and 8."
-msgstr ""
-"Это, между прочим, подтверждает наличие 
универсального черного хода в "
-"Windows&nbsp;7 и 8."
-
-#. type: Content of: <ul><li><p>
-msgid ""
 "ARRIS cable modem has a <a href=\"https://w00tsec.blogspot.de/2015/11/arris-";
 "cable-modem-has-backdoor-in.html?m=1\"> backdoor in the backdoor</a>."
 msgstr ""
@@ -168,11 +147,21 @@
 "преднамеренно  сохранялся черный ход</a>."
 
 #. type: Content of: <ul><li><p>
-msgid ""
-"Users report <a href=\"http://www.networkworld.com/article/2993490/windows/";
-"windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk."
-"rss_all\"> Microsoft is forcing them to replace Windows 7 and 8 with all-"
-"spying Windows 10</a>."
+# | Users [-report-] {+reported that+} <a
+# | 
href=\"http://www.networkworld.com/article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk.rss_all\";>
+# | Microsoft [-is-] {+was+} forcing them to replace Windows 7 and 8 with
+# | all-spying Windows 10</a>.
+#, fuzzy
+#| msgid ""
+#| "Users report <a href=\"http://www.networkworld.com/article/2993490/";
+#| "windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-"
+#| "users.html#tk.rss_all\"> Microsoft is forcing them to replace Windows 7 "
+#| "and 8 with all-spying Windows 10</a>."
+msgid ""
+"Users reported that <a href=\"http://www.networkworld.com/article/2993490/";
+"windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users."
+"html#tk.rss_all\"> Microsoft was forcing them to replace Windows 7 and 8 "
+"with all-spying Windows 10</a>."
 msgstr ""
 "По сообщениям пользователей, <a 
href=\"http://www.networkworld.com/";
 "article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-"
@@ -180,6 +169,40 @@
 "Windows&nbsp;7 и&nbsp;8 на шпионящую за всем Windows 
10</a>."
 
 #. type: Content of: <ul><li><p>
+# | Microsoft [-is-] {+was in fact+} <a
+# | 
href=\"http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html\";>{+
+# | +}attacking computers that run Windows 7 and 8</a>, switching on a flag
+# | that [-says-] {+said+} whether to &ldquo;upgrade&rdquo; to Windows 10 when
+# | users [-have-] {+had+} turned it off.
+#, fuzzy
+#| msgid ""
+#| "Microsoft is <a href=\"http://www.computerworld.com/article/3012278/";
+#| "microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+#| "strategy.html\">attacking computers that run Windows 7 and 8</a>, "
+#| "switching on a flag that says whether to &ldquo;upgrade&rdquo; to Windows "
+#| "10 when users have turned it off."
+msgid ""
+"Microsoft was in fact <a href=\"http://www.computerworld.com/article/3012278/";
+"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
+"strategy.html\"> attacking computers that run Windows 7 and 8</a>, switching "
+"on a flag that said whether to &ldquo;upgrade&rdquo; to Windows 10 when "
+"users had turned it off."
+msgstr ""
+"Microsoft <a href=\"http://www.computerworld.com/article/3012278/microsoft-";
+"windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html"
+"\">атакует компьютеры, работающие под 
Windows&nbsp;7 и 8</a>, включая "
+"настройку, которая разрешает 
&ldquo;обновиться&rdquo; до Windows&nbsp;10, "
+"когда пользователи выключили это."
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Later on, Microsoft published instructions on <a href=\"http://arstechnica.";
+"com/information-technology/2016/01/microsoft-finally-has-a-proper-way-to-opt-"
+"out-of-windows-78-to-windows-10-upgrades/\"> how to permanently reject the "
+"downgrade to Windows 10</a>."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
 msgid "This seems to involve use of a back door in Windows 7 and 8."
 msgstr "Кажется, здесь используется черный х
од в Windows&nbsp;7 и&nbsp;8."
 
@@ -583,6 +606,13 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+#~ msgid ""
+#~ "This, by the way, reaffirms the presence of a universal back door in "
+#~ "Windows 7 and 8."
+#~ msgstr ""
+#~ "Это, между прочим, подтверждает наличие 
универсального черного хода в "
+#~ "Windows&nbsp;7 и 8."
+
 # type: Content of: <div><p>
 #~ msgid "Copyright &copy; 2013 Free Software Foundation, Inc."
 #~ msgstr "Copyright &copy; 2013 Free Software Foundation, Inc."



reply via email to

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