www/philosophy android-and-users-freedom.ru.htm...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/12/18 16:57:36

Modified files:
        philosophy     : android-and-users-freedom.ru.html 
        philosophy/po  : android-and-users-freedom.ru-en.html 
                         android-and-users-freedom.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/android-and-users-freedom.ru.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.ru-en.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.ru.po?cvsroot=www&r1=1.73&r2=1.74

Patches:
Index: android-and-users-freedom.ru.html
===================================================================
RCS file: /web/www/www/philosophy/android-and-users-freedom.ru.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- android-and-users-freedom.ru.html   18 Aug 2014 06:31:35 -0000      1.43
+++ android-and-users-freedom.ru.html   18 Dec 2014 16:57:35 -0000      1.44
@@ -71,7 +71,7 @@
 ошибочны; Google не имеет права изменять 
лицензию программ Linux, они и не
 пытались. Если бы авторы Linux позволили 
пользоваться ядром на условиях <a
 href="/licenses/gpl.html">GPL версии&nbsp;3</a>, то эти 
программы можно было
-бы сочетать с программами под лицензией 
Apache, причем комбинация могла бы
+бы сочетать с программами под лицензией 
Apache и комбинация могла бы
 выпускаться под GPL версии&nbsp;3. Но Linux на 
таких условиях не выпускали.</p>
 
 <p>Компания Google удовлетворила требованиям 
Стандартной общественной лицензии
@@ -223,7 +223,7 @@
 
 <p>Android&nbsp;&mdash; не самодостаточная система; 
разработку для Android
 нужно вести на какой-то другой системе. 
Инструменты в &ldquo;наборе для
-разработки программ&ldquo; (SDK) компании Google, 
кажется, свободны, но
+разработки программ&ldquo; (SDK) компании Google, 
оказывается, свободны, но
 файлы с определениями некоторых 
протоколов программирования приложений
 несвободны, и может быть другие части тоже. 
При установке SDK требуется
 подписать лицензию несвободных программ, 
а вам следует отказываться ее
@@ -321,7 +321,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/08/18 06:31:35 $
+$Date: 2014/12/18 16:57:35 $
 
 <!-- timestamp end -->
 </p>

Index: po/android-and-users-freedom.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.ru-en.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- po/android-and-users-freedom.ru-en.html     18 Aug 2014 06:31:38 -0000      
1.39
+++ po/android-and-users-freedom.ru-en.html     18 Dec 2014 16:57:35 -0000      
1.40
@@ -63,7 +63,7 @@
 erroneous; Google has no power to change the license on the code of
 Linux, and did not try. If the authors of Linux allowed its use under <a
 href="/licenses/gpl.html">GPL version 3</a>,
-then that code could be combined with Apache-licensed code, with the
+then that code could be combined with Apache-licensed code, and the
 combination could be released under GPL version 3. But Linux has not
 been released that way.</p>
 
@@ -121,7 +121,7 @@
 </p>
 
 <p>Android products also come with nonfree libraries.  These are
-officially not part of Android, but that since various Android
+officially not part of Android, but since various Android
 functionalities depend on them, they are part of any real Android
 installation.</p>
 
@@ -205,11 +205,12 @@
 
 <p>Android is not a self-hosting system; development for Android needs
 to be done on some other system.  The tools in Google's
-&ldquo;software development kit&rdquo; (SDK) are appear to be free,
+&ldquo;software development kit&rdquo; (SDK) appear to be free,
 but it is hard work to check this.  The definition files for certain
 Google APIs are nonfree.  Installing the SDK requires signing a
 proprietary software license, which you should refuse to sign.
-<a 
href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantSDK";>Replicant's
 SDK</a> is a free replacement.</p>
+<a href="http://redmine.replicant.us/projects/replicant/wiki/ReplicantSDK";>
+Replicant's SDK</a> is a free replacement.</p>
 
 <p>Recent press coverage of Android focuses on the patent wars. During
 20 years of campaigning for the abolition of software patents, we have
@@ -277,7 +278,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/08/18 06:31:38 $
+$Date: 2014/12/18 16:57:35 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/android-and-users-freedom.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.ru.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- po/android-and-users-freedom.ru.po  18 Dec 2014 16:40:22 -0000      1.73
+++ po/android-and-users-freedom.ru.po  18 Dec 2014 16:57:36 -0000      1.74
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2014-12-18 16:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Android and Users' Freedom - GNU Project - Free Software Foundation"
@@ -143,29 +142,6 @@
 "Android и GNU/Linux в основном различны."
 
 #. type: Content of: <p>
-# | Within Android, Linux the kernel remains a separate program, with its
-# | source code under <a href=\"/licenses/gpl-2.0.html\">GNU GPL version
-# | 2</a>. To combine Linux with code under the Apache 2.0 license would be
-# | copyright infringement, since GPL version 2 and Apache 2.0 are <a
-# | href=\"/licenses/license-list.html#apache2\">incompatible</a>.  Rumors
-# | that Google has somehow converted Linux to the Apache license are
-# | erroneous; Google has no power to change the license on the code of Linux,
-# | and did not try. If the authors of Linux allowed its use under <a
-# | href=\"/licenses/gpl.html\">GPL version 3</a>, then that code could be
-# | combined with Apache-licensed code, [-with-] {+and+} the combination could
-# | be released under GPL version 3. But Linux has not been released that way.
-#| msgid ""
-#| "Within Android, Linux the kernel remains a separate program, with its "
-#| "source code under <a href=\"/licenses/gpl-2.0.html\">GNU GPL version 2</"
-#| "a>. To combine Linux with code under the Apache 2.0 license would be "
-#| "copyright infringement, since GPL version 2 and Apache 2.0 are <a href=\"/"
-#| "licenses/license-list.html#apache2\">incompatible</a>.  Rumors that "
-#| "Google has somehow converted Linux to the Apache license are erroneous; "
-#| "Google has no power to change the license on the code of Linux, and did "
-#| "not try. If the authors of Linux allowed its use under <a href=\"/"
-#| "licenses/gpl.html\">GPL version 3</a>, then that code could be combined "
-#| "with Apache-licensed code, with the combination could be released under "
-#| "GPL version 3. But Linux has not been released that way."
 msgid ""
 "Within Android, Linux the kernel remains a separate program, with its source "
 "code under <a href=\"/licenses/gpl-2.0.html\">GNU GPL version 2</a>. To "
@@ -189,8 +165,8 @@
 "изменять лицензию программ Linux, они и не 
пытались. Если бы авторы Linux "
 "позволили пользоваться ядром на условиях 
<a href=\"/licenses/gpl.html\">GPL "
 "версии&nbsp;3</a>, то эти программы можно было 
бы сочетать с программами под "
-"лицензией Apache и комбинация могла бы 
выпускаться под GPL "
-"версии&nbsp;3. Но Linux на таких условиях не 
выпускали."
+"лицензией Apache и комбинация могла бы 
выпускаться под GPL версии&nbsp;3. Но "
+"Linux на таких условиях не выпускали."
 
 #. type: Content of: <p>
 msgid ""
@@ -305,13 +281,6 @@
 "droid.org\">f-droid.org</a>."
 
 #. type: Content of: <p>
-# | Android products also come with nonfree libraries.  These are officially
-# | not part of Android, but [-that-] since various Android functionalities
-# | depend on them, they are part of any real Android installation.
-#| msgid ""
-#| "Android products also come with nonfree libraries.  These are officially "
-#| "not part of Android, but that since various Android functionalities "
-#| "depend on them, they are part of any real Android installation."
 msgid ""
 "Android products also come with nonfree libraries.  These are officially not "
 "part of Android, but since various Android functionalities depend on them, "
@@ -494,23 +463,6 @@
 "таком телефоне."
 
 #. type: Content of: <p>
-# | Android is not a self-hosting system; development for Android needs to be
-# | done on some other system.  The tools in Google's &ldquo;software
-# | development kit&rdquo; (SDK) [-are-] appear to be free, but it is hard
-# | work to check this.  The definition files for certain Google APIs are
-# | nonfree.  Installing the SDK requires signing a proprietary software
-# | license, which you should refuse to sign.  <a
-# | 
href=\"http://redmine.replicant.us/projects/replicant/wiki/ReplicantSDK\";>{+
-# | +}Replicant's SDK</a> is a free replacement.
-#| msgid ""
-#| "Android is not a self-hosting system; development for Android needs to be "
-#| "done on some other system.  The tools in Google's &ldquo;software "
-#| "development kit&rdquo; (SDK) are appear to be free, but it is hard work "
-#| "to check this.  The definition files for certain Google APIs are "
-#| "nonfree.  Installing the SDK requires signing a proprietary software "
-#| "license, which you should refuse to sign.  <a href=\"http://redmine.";
-#| "replicant.us/projects/replicant/wiki/ReplicantSDK\">Replicant's SDK</a> "
-#| "is a free replacement."
 msgid ""
 "Android is not a self-hosting system; development for Android needs to be "
 "done on some other system.  The tools in Google's &ldquo;software "