CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   11/08/04 16:44:40

Modified files:
        copyleft       : copyleft.es.html 
        copyleft/po    : copyleft.es.po 
        gnu            : gnu-linux-faq.ru.html 
        philosophy     : free-sw.ru.html 
Added files:
        philosophy/po  : keep-control-of-your-computing.pot 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/copyleft/copyleft.es.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/copyleft/po/copyleft.es.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ru.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.ru.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/keep-control-of-your-computing.pot?cvsroot=www&rev=1.1

Patches:
Index: copyleft/copyleft.es.html
===================================================================
RCS file: /web/www/www/copyleft/copyleft.es.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- copyleft/copyleft.es.html   14 Jul 2011 08:34:05 -0000      1.18
+++ copyleft/copyleft.es.html   4 Aug 2011 16:44:14 -0000       1.19
@@ -182,9 +182,9 @@
 Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 2006, 2007, 2008, 2009 Free Software Foundation, Inc.,</p>
 
-<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
-Attribution-NoDerivs 3.0 United States License</a>.
+<p>Está página está bajo una <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.es";>licencia
+Creative Commons Atribución-SinDerivadas 3.0 Estados Unidos de América</a>.
 </p>
 
 
@@ -205,7 +205,7 @@
 <!-- timestamp start -->
 Última actualización:
 
-$Date: 2011/07/14 08:34:05 $
+$Date: 2011/08/04 16:44:14 $
 
 <!-- timestamp end -->
 </p>

Index: copyleft/po/copyleft.es.po
===================================================================
RCS file: /web/www/www/copyleft/po/copyleft.es.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- copyleft/po/copyleft.es.po  4 Aug 2011 08:35:41 -0000       1.13
+++ copyleft/po/copyleft.es.po  4 Aug 2011 16:44:20 -0000       1.14
@@ -372,9 +372,9 @@
 "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
 "NoDerivs 3.0 United States License</a>."
 msgstr ""
-"Está página está bajo una <a rel=\"license\" href=\"http://creative";
-"commons.org/licenses/by-nd/3.0/us/deed.es\">licencia Creative "
-"Commons Atribución-SinDerivadas 3.0 Estados Unidos de América</a>."
+"Está página está bajo una <a rel=\"license\" 
href=\"http://creativecommons.";
+"org/licenses/by-nd/3.0/us/deed.es\">licencia Creative Commons Atribución-"
+"SinDerivadas 3.0 Estados Unidos de América</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: gnu/gnu-linux-faq.ru.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ru.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/gnu-linux-faq.ru.html   14 Jul 2011 16:41:32 -0000      1.5
+++ gnu/gnu-linux-faq.ru.html   4 Aug 2011 16:44:25 -0000       1.6
@@ -158,9 +158,12 @@
 <li><a href="#othersys" id="TOCothersys">Если я установлю 
инструментарий GNU на
 Windows, значит ли это, что я использую систему 
GNU/Windows?</a></li>
 
-<li><a href="#justlinux" id="TOCjustlinux">Разве не бывает 
систем Linux без
+<li><a href="#justlinux" id="TOCjustlinux">Разве Linux нельзя 
использовать без
 GNU?</a></li>
 
+<li><a href="#linuxsyswithoutgnu" 
id="TOClinuxsyswithoutgnu">Существуют ли
+полные системы Linux без GNU?</a></li>
+
 <li><a href="#helplinus" id="TOChelplinus">Почему бы всё равно 
не называть
 систему &ldquo;Linux&rdquo;, укрепляя этим 
положение Линуса Торвальдса как
 &ldquo;парня с обложки&rdquo; нашего 
сообщества?</a></li>
@@ -1083,20 +1086,35 @@
 ситуация.
 </dd>
 
-<dt id="justlinux">Разве не бывает систем Linux без GNU? 
<span class="anchor-reference-id">(<a
-href="#justlinux">#justlinux</a>)</span></dt>
+<dt id="justlinux">Разве Linux нельзя использовать 
без GNU? <span
+class="anchor-reference-id">(<a href="#justlinux">#justlinux</a>)</span></dt>
+
+<dd>
+В некоторых случаях Linux применяется 
самостоятельно или с небольшими
+другими программами. Эти небольшие 
программные системы и на пушечный выстрел
+не приближаются к системе GNU/Linux. 
Пользователи, например, не
+устанавливают их на персональные 
компьютеры; эти системы обманули бы все их
+ожидания. Чтобы показать, насколько эти 
небольшие платформы отличаются от
+GNU/Linux, полезно говорить, что в этих 
приложениях работает только Linux.
+</dd>
+
+<dt id="linuxsyswithoutgnu">Существуют ли полные 
системы Linux без GNU? <span
+class="anchor-reference-id">(<a
+href="#linuxsyswithoutgnu">#linuxsyswithoutgnu</a>)</span></dt>
 
 <dd>
-Есть системы, которые содержат Linux, но не 
содержат
-GNU. Пример&nbsp;&mdash; Android.
+Есть полные системы, которые содержат Linux, 
но не содержат
+GNU. Пример&nbsp;&mdash; Android. Но называть их 
системами
+&ldquo;Linux&rdquo; было бы неправильно.
 <p>
-Android сильно отличается от системы GNU/Linux: в 
нём нет GNU, только
-Linux. В результате получается совершенно 
другая система. Если вы думаете о
-всей системе как о &ldquo;Linux&rdquo;, вам придётся 
говорить что-то вроде
+Android сильно отличается от системы GNU/Linux: от 
системы GNU в нём очень
+мало, только Linux.  В целом это другая 
система. Если вы называете всю
+систему &ldquo;Linux&rdquo;, вам придётся говорить 
что-то вроде
 &ldquo;Android содержит Linux, но это не Linux, потому 
что в нём нет обычных
 в Linux [так!] библиотек и утилит 
[подразумевая под этим систему
 GNU].&rdquo; Android содержит ровно столько же от 
Linux, сколько содержит
-GNU/Linux. Чего там нет&nbsp;&mdash; это GNU.</p>
+GNU/Linux. Чего там нет&nbsp;&mdash; это GNU. Вместо 
этого там много
+программ компании Google.</p>
 </dd>
 
 <dt id="helplinus">Почему бы всё равно не называть 
систему &ldquo;Linux&rdquo;, укрепляя этим
@@ -1427,7 +1445,7 @@
  <p><!-- timestamp start -->
 Обновлено:
 
-$Date: 2011/07/14 16:41:32 $
+$Date: 2011/08/04 16:44:25 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/free-sw.ru.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.ru.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/free-sw.ru.html  14 Jul 2011 16:42:35 -0000      1.6
+++ philosophy/free-sw.ru.html  4 Aug 2011 16:44:30 -0000       1.7
@@ -41,8 +41,9 @@
 
 <ul>
   <li>Свобода выполнять программу в любых 
целях (свобода 0).</li>
-  <li>Свобода изучать работу программы и 
модифицировать программу под свои нужды
-(свобода 1). Это предполагает доступ к 
исходному тексту.
+  <li>Свобода изучать работу программы и 
модифицировать программу, чтобы она
+выполняла ваши вычисления, как вы 
пожелаете (свобода 1). Это предполагает
+доступ к исходному тексту.
   </li>
   <li>Свобода передавать копии, чтобы помочь 
своему ближнему (свобода 2).
   </li>
@@ -331,6 +332,12 @@
 <ul>
 
 <li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.103&amp;r2=1.104";>Версия
+1.104</a>: отражено в краткой формулировке 
свободы&nbsp;1 (как уже отмечено
+в версии 1.80), что эта свобода включает в 
себя фактическое пользование
+измененной вами версией для своих 
вычислений.</li>
+
+<li><a
 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92";>Версия
 1.92</a>: Пояснение, что запутанный текст не 
считается исходным текстом.</li>
 
@@ -453,7 +460,7 @@
 
 <p>
 Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006,
-2007, 2009, 2010 Free Software Foundation, Inc.
+2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 </p>
 <p>Это произведение доступно по <a rel="license"
 
href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
@@ -470,7 +477,7 @@
 <!-- timestamp start -->
 Обновлено:
 
-$Date: 2011/07/14 16:42:35 $
+$Date: 2011/08/04 16:44:30 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/keep-control-of-your-computing.pot
===================================================================
RCS file: philosophy/po/keep-control-of-your-computing.pot
diff -N philosophy/po/keep-control-of-your-computing.pot
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/keep-control-of-your-computing.pot    4 Aug 2011 16:44:35 
-0000       1.1
@@ -0,0 +1,208 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-08-04 12:25-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <l...@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING"
+
+#. type: Content of: <title>
+msgid ""
+"Keep control of your computing, so it doesn't control you! - GNU Project - "
+"Free Software Foundation"
+msgstr ""
+
+#. type: Content of: <h2>
+msgid "Keep control of your computing, so it doesn't control you!"
+msgstr ""
+
+#. type: Content of: <p>
+msgid "by Richard Stallman"
+msgstr ""
+
+#. type: Content of: <p>
+msgid "First published in Der Spiegel Online"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"The World Wide Web, developed by Tim Berners-Lee in 1990 as a system for "
+"publishing and viewing information, is slowly being transformed into a "
+"system of remote computing. It will store your data, and data about you, "
+"often limiting your access to it but allowing FBI access at any time. It "
+"will do your computing for you, but you cannot control what it does. It "
+"provides various tempting attractions, but you must resist them."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"In the 1980s, most people did not use computers; those who did, mostly used "
+"personal computers or timesharing services. Both allowed you to install "
+"software of your choice. Both allowed you full control over your data, "
+"though it is not clear what access the timesharing services gave to the "
+"FBI. In any case, the timesharing services mostly faded away by the 90s."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"This does not mean that these users had control of their computing.  With "
+"software, either the users control the program (free software) or the "
+"program controls the users (proprietary or nonfree software).  Those users "
+"were running proprietary software because that's all there was at the "
+"time. The users could not change it, or even tell what it really did."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"The abusiveness of proprietary software has intensified since then; "
+"nowadays, it is likely to spy on you, intentionally restrict you, and/or "
+"have back doors. (Windows is known to do all three; likewise the iPhone and "
+"the Kindle.) But even absent such abuse, it wasn't right for users to be "
+"controlled by their software."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"That's why I launched the free software movement in 1983. We decided to "
+"develop an operating system and applications that would be entirely free "
+"(libre, freie), so that the users would have control over them.  I gave this "
+"system the name GNU. (You have probably heard people call it \"Linux\", but "
+"that's an error.) People who switch to this system, and insist on using only "
+"free software, are in a position to control their computing. We have "
+"liberated only a small part of cyberspace, as yet, but that is a foothold "
+"for freedom."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Developments in the Web threaten to negate this achievement. The first "
+"problem was the use of invisible references to sites whose mission was "
+"surveillance (perhaps for advertising). Users who visited sites A, B, X and "
+"Z did not realize that those pages contained invisible references to "
+"iamwatchingyou.com, so each visit informed that site too, and it recorded "
+"permanently that this user had visited certain pages."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Javascript created a further problem. Initially used for harmless things "
+"such as unusual-looking menus, its capabilities have been extended to the "
+"point where it can do nontrivial computing. Services such as Google Docs "
+"install large Javascript programs into the user's browser. Even though they "
+"run in your computer, you have no control over what they do there."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Then there is the issue of storing your data in companies' servers.  The "
+"largest such companies have little respect for users' privacy.  For "
+"instance, if you hand your data to Facebook, companies pay Facebook (not "
+"you) for the use of it. They pay Facebook (not you) to run ads using your "
+"face."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"The timesharing companies of the 1980s had usually treated their users' data "
+"with respect, even though they could occasionally abuse them, because their "
+"users were paying clients and could go elsewhere.  Facebook's users do not "
+"pay, so they are not its clients. They are its merchandise, to be sold to "
+"other businesses. If the company is in the US, or is a subsidiary of a US "
+"company, the FBI can collect this data at whim without even a court order "
+"under an un-American US law, named in purest blackwhiting the \"Patriot "
+"Act\"."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Services also offer to operate on the users data. In effect, this means that "
+"users do their computing on the servers, and the servers take complete "
+"control of that computing."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"There is a systematic marketing campaign to drive users to entrusting their "
+"computing and their data to companies they have absolutely no reason to "
+"trust. Its buzzword is \"cloud computing\", a term used for so many "
+"different computing structures that its only real meaning is, \"Do it "
+"without thinking about what you're doing\"."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"There is even a product, Google ChromeOS, designed so that it can only store "
+"data remotely, and the user must do her computing remotely.  Ironically, it "
+"is free software, a version of GNU/Linux. Users will have access to the "
+"source code, and could change it so as to support local computing and local "
+"data storage &mdash; if the machine has enough memory to store it, and if it "
+"permits users to install their own versions of the software. If Android "
+"phones are any guide, most ChromeOS devices will be designed to prevent "
+"users from doing that."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"This does not mean Internet users can't have privacy. This does not mean "
+"that Internet users can't have control of their computing. It does mean that "
+"you'll have to swim against the current to have them."
+msgstr ""
+
+#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
+#. type: Content of: <div>
+msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"Please send general FSF &amp; GNU inquiries to <a "
+"href=\"mailto:g...@gnu.org\";>&lt;g...@gnu.org&gt;</a>.  There are also <a "
+"href=\"/contact/\">other ways to contact</a> the FSF."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"Please send broken links and other corrections or suggestions to <a "
+"href=\"mailto:webmast...@gnu.org\";>&lt;webmast...@gnu.org&gt;</a>."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"Please see the <a "
+"href=\"/server/standards/README.translations.html\">Translations README</a> "
+"for information on coordinating and submitting translations of this article."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Copyright &copy; 2011 Richard Stallman"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"This page is licensed under a <a rel=\"license\" "
+"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
+"Attribution-NoDerivs 3.0 United States License</a>."
+msgstr ""
+
+#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
+#. type: Content of: <div><div>
+msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
+msgstr ""
+
+#.  timestamp start 
+#. type: Content of: <div><p>
+msgid "Updated:"
+msgstr ""
+
+#. type: Content of: <div><h4>
+msgid "Translations of this page"
+msgstr ""

Reply via email to