www-commits
[Top][All Lists]
Advanced

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

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


From: GNUN
Subject: www philosophy/android-and-users-freedom.ru.htm...
Date: Sun, 3 Jun 2018 12:30:00 -0400 (EDT)

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

Modified files:
        philosophy     : android-and-users-freedom.ru.html 
        philosophy/po  : android-and-users-freedom.ru-en.html 
                         android-and-users-freedom.ru.po 
        software       : recent-releases-include.ru.html 
        software/po    : recent-releases-include.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.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.ru-en.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.ru.po?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/software/recent-releases-include.ru.html?cvsroot=www&r1=1.1465&r2=1.1466
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/recent-releases-include.ru.po?cvsroot=www&r1=1.2057&r2=1.2058

Patches:
Index: philosophy/android-and-users-freedom.ru.html
===================================================================
RCS file: /web/www/www/philosophy/android-and-users-freedom.ru.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- philosophy/android-and-users-freedom.ru.html        18 Nov 2016 07:32:42 
-0000      1.48
+++ philosophy/android-and-users-freedom.ru.html        3 Jun 2018 16:29:59 
-0000       1.49
@@ -10,13 +10,13 @@
 <!--#include virtual="/philosophy/po/android-and-users-freedom.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
 <h2>Android и свобода пользователей</h2>
-<p>Ричард Столмен<br />Впервые опубликовано в 
<a
-href="http://www.guardian.co.uk/technology/2011/sep/19/android-free-software-stallman";>Гардиан</a></p>
+<p>Ричард Столмен<br />Впервые опубликовано в 
<em><a
+href="http://www.guardian.co.uk/technology/2011/sep/19/android-free-software-stallman";>Гардиан</a></em></p>
 
-<h3 class="center">Поддержите кампанию <a 
href="http://FreeYourAndroid.org/";> Освободи свой
-Android</a>.</h3>
+<hr class="thin" />
 
-<p>В какой мере Android уважает свободу своих 
пользователей? Для пользователя
+<p class="comment">
+В какой мере Android уважает свободу своих 
пользователей? Для пользователя
 компьютера, который ценит свободу, это 
самый важный из вопросов о любой
 программной системе.</p>
 
@@ -37,7 +37,7 @@
 программы системы Android версий&nbsp;1 и 2 были 
по большей части
 разработаны компанией Google; Google выпустила 
их под лицензией
 Apache&nbsp;2.0, которая является 
неограничительной лицензией свободных
-программ без <a href="/copyleft/copyleft.html">авторского 
лева</a>.</p>
+программ без <a href="/licenses/copyleft.html">авторского 
лева</a>.</p>
 
 <p>Версия Linux в составе системы Android не 
является полностью свободной,
 поскольку она содержит несвободные 
&ldquo;двоичные кляксы&rdquo; (точно так
@@ -50,6 +50,11 @@
 устройства. Некоторые из приложений, 
которые обычно поставляются с системой
 Android, также несвободны.</p>
 
+<div class="announcement comment">
+<p><em>Поддержите кампанию <a 
href="http://FreeYourAndroid.org/";> Освободи свой
+Android</a>.</em></p>
+</div>
+
 <p>Android сильно отличается от <a
 href="/gnu/the-gnu-project.html">операционной системы 
GNU/Linux</a>, потому
 что он содержит очень немногое из GNU. В 
самом деле, едва ли не единственный
@@ -57,7 +62,7 @@
 ядро. Тех, кто ошибочно считает, что 
&ldquo;Linux&rdquo; относится к
 комбинации GNU/Linux в целом, эти факты 
безнадежно запутывают, и они делают
 такие парадоксальные утверждения, как 
&ldquo;Android содержит Linux, но это
-не Linux(<a href="#linuxnote">*</a>)&rdquo;. Если мы не 
начинаем с путаницы,
+не Linux(<a href="#linuxnote">1</a>)&rdquo;. Если мы не 
начинаем с путаницы,
 ситуация проста: Android содержит Linux, но не GNU; 
таким образом, Android и
 GNU/Linux в основном различны, потому что их 
объединяет только Linux.</p>
 
@@ -260,17 +265,18 @@
 значительно лучше, чем смартфоны на базе 
систем Apple и Windows, мы не можем
 сказать, что они уважают вашу свободу.</p>
 
-<hr />
-<ul>
-<li><a id="linuxnote"></a>Крайний пример этой 
путаницы мы видим на сайте
-linuxonandroid.org, где предлагают помощь в 
&ldquo;установке Linux [!] на
-ваших устройствах на базе Android&rdquo;. Это 
полностью неверно:
-устанавливают они версию системы GNU, 
<em>исключая</em> Linux, которая уже
-присутствует как часть системы Android. 
Поскольку тот сайт поддерживает
-только <a href="/distros/distros.html">несвободные 
дистрибутивы
-GNU/Linux</a>, мы его не рекомендуем.
+<hr class="thin" />
+
+<ol>
+<li id="linuxnote">Крайний пример этой путаницы мы 
видим на сайте linuxonandroid.org, где
+предлагают помощь в &ldquo;установке Linux [!] на 
ваших устройствах на базе
+Android&rdquo;. Это полностью неверно: 
устанавливают они версию системы GNU,
+<em>исключая</em> Linux, которая уже 
присутствует как часть системы
+Android. Поскольку тот сайт поддерживает 
только <a
+href="/distros/distros.html">несвободные дистрибутивы 
GNU/Linux</a>, мы его
+не рекомендуем.
 </li>
-</ul>
+</ol>
 
 <!-- If needed, change the copyright block at the bottom. In general,
      all pages on the GNU web server should have the section about
@@ -319,8 +325,8 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2014, 2015, 2016 Richard Stallman<br
-/>Copyright &copy; 2014, 2015, 2016 Free Software Foundation,
+<p>Copyright &copy; 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman<br
+/>Copyright &copy; 2014, 2015, 2016, 2018 Free Software Foundation,
 Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
@@ -341,7 +347,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/11/18 07:32:42 $
+$Date: 2018/06/03 16:29:59 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/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.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- philosophy/po/android-and-users-freedom.ru-en.html  18 Nov 2016 07:32:53 
-0000      1.43
+++ philosophy/po/android-and-users-freedom.ru-en.html  3 Jun 2018 16:29:59 
-0000       1.44
@@ -5,14 +5,14 @@
 <!--#include virtual="/philosophy/po/android-and-users-freedom.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Android and Users' Freedom</h2>
-<p>by Richard Stallman<br />First published in <a
+<p>by Richard Stallman<br />First published in <em><a
 
href="http://www.guardian.co.uk/technology/2011/sep/19/android-free-software-stallman";>
-The Guardian</a></p>
+The Guardian</a></em></p>
 
-<h3 class="center">Support the <a href="http://FreeYourAndroid.org/";>
-Free Your Android</a> campaign.</h3>
+<hr class="thin" />
 
-<p>To what extent does Android respect the freedom of its users? For a
+<p class="comment">
+To what extent does Android respect the freedom of its users? For a
 computer user that values freedom, that is the most important question
 to ask about any software system.</p>
 
@@ -32,7 +32,7 @@
 and some applications. Linux aside, the software of Android versions
 1 and 2 was mostly developed by Google; Google released it under the
 Apache 2.0 license, which is a lax free software license without
-<a href="/copyleft/copyleft.html">copyleft</a>.</p>
+<a href="/licenses/copyleft.html">copyleft</a>.</p>
 
 <p>The version of Linux included in Android is not entirely free
 software, since it contains nonfree &ldquo;binary blobs&rdquo; (just
@@ -43,6 +43,11 @@
 code is insufficient to run the device. Some of the applications that
 generally come with Android are nonfree, too.</p>
 
+<div class="announcement comment">
+<p><em>Support the <a href="http://FreeYourAndroid.org/";>Free Your
+Android</a> campaign.</em></p>
+</div>
+
 <p>Android is very different from the <a
 href="/gnu/the-gnu-project.html">GNU/Linux operating
 system</a> because it contains very little of GNU. Indeed, just about
@@ -50,7 +55,7 @@
 kernel. People who erroneously think &ldquo;Linux&rdquo; refers to the
 entire GNU/Linux combination get tied in knots by these facts, and make
 paradoxical statements such as &ldquo;Android contains Linux, but it
-isn't Linux.&rdquo;(<a href="#linuxnote">*</a>) Absent this confusion,
+isn't Linux.&rdquo;(<a href="#linuxnote">1</a>) Absent this confusion,
 the situation is simple: Android contains Linux, but not GNU; thus,
 Android and GNU/Linux are mostly different, because all they have in
 common is Linux.</p>
@@ -241,9 +246,10 @@
 less bad than Apple or Windows phones, they cannot be said to
 respect your freedom.</p>
 
-<hr />
-<ul>
-<li><a id="linuxnote"></a>The extreme example of this confusion appears in
+<hr class="thin" />
+
+<ol>
+<li id="linuxnote">The extreme example of this confusion appears in
 the site linuxonandroid.org, which offers help to &ldquo;install Linux
 [sic] on your Android devices.&rdquo; This is entirely false: what
 they are installing is a version of the GNU system, <em>excluding</em>
@@ -251,8 +257,7 @@
 supports only <a href="/distros/distros.html">nonfree GNU/Linux
 distros</a>, we do not recommend it.
 </li>
-</ul>
-
+</ol>
 
 <!-- If needed, change the copyright block at the bottom. In general,
      all pages on the GNU web server should have the section about
@@ -289,7 +294,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2014, 2015, 2016 Richard Stallman</p>
+<p>Copyright &copy; 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -299,7 +304,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/11/18 07:32:53 $
+$Date: 2018/06/03 16:29:59 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/android-and-users-freedom.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.ru.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- philosophy/po/android-and-users-freedom.ru.po       3 Jun 2018 15:57:48 
-0000       1.84
+++ philosophy/po/android-and-users-freedom.ru.po       3 Jun 2018 16:29:59 
-0000       1.85
@@ -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: 2018-06-03 12:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Android and Users' Freedom - GNU Project - Free Software Foundation"
@@ -34,18 +33,12 @@
 msgstr "Ричард Столмен"
 
 #. type: Content of: <p>
-# | First published in [-<a-] {+<em><a+}
-# | 
href=\"http://www.guardian.co.uk/technology/2011/sep/19/android-free-software-stallman\";>
-# | The [-Guardian</a>-] {+Guardian</a></em>+}
-#| msgid ""
-#| "First published in <a href=\"http://www.guardian.co.uk/technology/2011/";
-#| "sep/19/android-free-software-stallman\"> The Guardian</a>"
 msgid ""
 "First published in <em><a href=\"http://www.guardian.co.uk/technology/2011/";
 "sep/19/android-free-software-stallman\"> The Guardian</a></em>"
 msgstr ""
-"Впервые опубликовано в <em><a 
href=\"http://www.guardian.co.uk/technology/2011/";
-"sep/19/android-free-software-stallman\">Гардиан</a></em>"
+"Впервые опубликовано в <em><a 
href=\"http://www.guardian.co.uk/";
+"technology/2011/sep/19/android-free-software-stallman\">Гардиан</a></em>"
 
 #. type: Content of: <p>
 msgid ""
@@ -80,20 +73,6 @@
 "свободными."
 
 #. type: Content of: <p>
-# | Android is an operating system primarily for mobile phones and other
-# | devices, which consists of Linux (Torvalds' kernel), some libraries, a
-# | Java platform and some applications. Linux aside, the software of Android
-# | versions 1 and 2 was mostly developed by Google; Google released it under
-# | the Apache 2.0 license, which is a lax free software license without <a
-# | [-href=\"/copyleft/copyleft.html\">copyleft</a>.-]
-# | {+href=\"/licenses/copyleft.html\">copyleft</a>.+}
-#| msgid ""
-#| "Android is an operating system primarily for mobile phones and other "
-#| "devices, which consists of Linux (Torvalds' kernel), some libraries, a "
-#| "Java platform and some applications. Linux aside, the software of Android "
-#| "versions 1 and 2 was mostly developed by Google; Google released it under "
-#| "the Apache 2.0 license, which is a lax free software license without <a "
-#| "href=\"/copyleft/copyleft.html\">copyleft</a>."
 msgid ""
 "Android is an operating system primarily for mobile phones and other "
 "devices, which consists of Linux (Torvalds' kernel), some libraries, a Java "
@@ -133,41 +112,14 @@
 "также несвободны."
 
 #. type: Content of: <div><p>
-# | [-Support-]{+<em>Support+} the <a href=\"http://FreeYourAndroid.org/\";>[-
-# | -]Free Your Android</a> [-campaign.-] {+campaign.</em>+}
-#| msgid ""
-#| "Support the <a href=\"http://FreeYourAndroid.org/\";> Free Your Android</"
-#| "a> campaign."
 msgid ""
 "<em>Support the <a href=\"http://FreeYourAndroid.org/\";>Free Your Android</"
 "a> campaign.</em>"
 msgstr ""
-"<em>Поддержите кампанию <a 
href=\"http://FreeYourAndroid.org/\";> Освободи свой "
-"Android</a>.</em>"
+"<em>Поддержите кампанию <a 
href=\"http://FreeYourAndroid.org/\";> Освободи "
+"свой Android</a>.</em>"
 
 #. type: Content of: <p>
-# | Android is very different from the <a
-# | href=\"/gnu/the-gnu-project.html\">GNU/Linux operating system</a> because
-# | it contains very little of GNU. Indeed, just about the only component in
-# | common between Android and GNU/Linux is Linux, the kernel. People who
-# | erroneously think &ldquo;Linux&rdquo; refers to the entire GNU/Linux
-# | combination get tied in knots by these facts, and make paradoxical
-# | statements such as &ldquo;Android contains Linux, but it isn't
-# | Linux.&rdquo;(<a href=\"#linuxnote\">[-*-]{+1+}</a>) Absent this
-# | confusion, the situation is simple: Android contains Linux, but not GNU;
-# | thus, Android and GNU/Linux are mostly different, because all they have in
-# | common is Linux.
-#| msgid ""
-#| "Android is very different from the <a href=\"/gnu/the-gnu-project.html"
-#| "\">GNU/Linux operating system</a> because it contains very little of GNU. "
-#| "Indeed, just about the only component in common between Android and GNU/"
-#| "Linux is Linux, the kernel. People who erroneously think &ldquo;"
-#| "Linux&rdquo; refers to the entire GNU/Linux combination get tied in knots "
-#| "by these facts, and make paradoxical statements such as &ldquo;Android "
-#| "contains Linux, but it isn't Linux.&rdquo;(<a href=\"#linuxnote\">*</a>) "
-#| "Absent this confusion, the situation is simple: Android contains Linux, "
-#| "but not GNU; thus, Android and GNU/Linux are mostly different, because "
-#| "all they have in common is Linux."
 msgid ""
 "Android is very different from the <a href=\"/gnu/the-gnu-project.html\">GNU/"
 "Linux operating system</a> because it contains very little of GNU. Indeed, "
@@ -595,21 +547,6 @@
 "сказать, что они уважают вашу свободу."
 
 #. type: Content of: <ol><li>
-# | [-<a id=\"linuxnote\"></a>The-]{+The+} extreme example of this confusion
-# | appears in the site linuxonandroid.org, which offers help to
-# | &ldquo;install Linux [sic] on your Android devices.&rdquo; This is
-# | entirely false: what they are installing is a version of the GNU system,
-# | <em>excluding</em> Linux, which is already present as part of Android. 
-# | Since that site supports only <a href=\"/distros/distros.html\">nonfree
-# | GNU/Linux distros</a>, we do not recommend it.
-#| msgid ""
-#| "<a id=\"linuxnote\"></a>The extreme example of this confusion appears in "
-#| "the site linuxonandroid.org, which offers help to &ldquo;install Linux "
-#| "[sic] on your Android devices.&rdquo; This is entirely false: what they "
-#| "are installing is a version of the GNU system, <em>excluding</em> Linux, "
-#| "which is already present as part of Android.  Since that site supports "
-#| "only <a href=\"/distros/distros.html\">nonfree GNU/Linux distros</a>, we "
-#| "do not recommend it."
 msgid ""
 "The extreme example of this confusion appears in the site linuxonandroid."
 "org, which offers help to &ldquo;install Linux [sic] on your Android devices."
@@ -618,13 +555,12 @@
 "Android.  Since that site supports only <a href=\"/distros/distros.html"
 "\">nonfree GNU/Linux distros</a>, we do not recommend it."
 msgstr ""
-"Крайний пример этой путаницы мы видим на 
сайте "
-"linuxonandroid.org, где предлагают помощь в 
&ldquo;установке Linux [!] на "
-"ваших устройствах на базе Android&rdquo;. Это 
полностью неверно: "
-"устанавливают они версию системы GNU, 
<em>исключая</em> Linux, которая уже "
-"присутствует как часть системы Android. 
Поскольку тот сайт поддерживает "
-"только <a href=\"/distros/distros.html\">несвободные 
дистрибутивы GNU/Linux</"
-"a>, мы его не рекомендуем."
+"Крайний пример этой путаницы мы видим на 
сайте linuxonandroid.org, где "
+"предлагают помощь в &ldquo;установке Linux [!] на 
ваших устройствах на базе "
+"Android&rdquo;. Это полностью неверно: 
устанавливают они версию системы GNU, "
+"<em>исключая</em> Linux, которая уже 
присутствует как часть системы Android. "
+"Поскольку тот сайт поддерживает только <a 
href=\"/distros/distros.html"
+"\">несвободные дистрибутивы GNU/Linux</a>, мы его 
не рекомендуем."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -672,9 +608,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 2011, 2012, 2014, 2015, [-2016-] {+2016, 2018+} Richard
-# | Stallman
-#| msgid "Copyright &copy; 2011, 2012, 2014, 2015, 2016 Richard Stallman"
 msgid "Copyright &copy; 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman<br /"

Index: software/recent-releases-include.ru.html
===================================================================
RCS file: /web/www/www/software/recent-releases-include.ru.html,v
retrieving revision 1.1465
retrieving revision 1.1466
diff -u -b -r1.1465 -r1.1466
--- software/recent-releases-include.ru.html    2 Jun 2018 13:01:56 -0000       
1.1465
+++ software/recent-releases-include.ru.html    3 Jun 2018 16:29:59 -0000       
1.1466
@@ -1,9 +1,9 @@
 <ul>
-<li><strong>June 02, 2018</strong>
+<li><strong>02 июня 2018</strong>
 <ul>
 <li><a
-href="http://lists.gnu.org/archive/html/info-gnu/2018-06/msg00000.html";>[ANNOUNCE]
-nano-2.9.8 is released</a>, <i>Benno Schulenberg</i>, <tt>08:27</tt></li>
+href="http://lists.gnu.org/archive/html/info-gnu/2018-06/msg00000.html";>[ОБЪЯВЛ]
+Выпущен nano-2.9.8</a>, <i>Бенно Шуленберг</i>, 
<tt>08:27</tt></li>
 </ul></li>
 </ul>
 <ul>

Index: software/po/recent-releases-include.ru.po
===================================================================
RCS file: /web/www/www/software/po/recent-releases-include.ru.po,v
retrieving revision 1.2057
retrieving revision 1.2058
diff -u -b -r1.2057 -r1.2058
--- software/po/recent-releases-include.ru.po   3 Jun 2018 15:57:50 -0000       
1.2057
+++ software/po/recent-releases-include.ru.po   3 Jun 2018 16:29:59 -0000       
1.2058
@@ -14,25 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-06-02 13:00+0000\n"
 
 #. type: Content of: <ul><li>
-# | <strong>June 02, 201[-7-]{+8+}</strong>
-#| msgid "<strong>June 02, 2017</strong>"
 msgid "<strong>June 02, 2018</strong>"
 msgstr "<strong>02 июня 2018</strong>"
 
 #. type: Content of: <ul><li><ul><li>
-# | <a
-# | 
[-href=\"http://lists.gnu.org/archive/html/info-gnu/2018-03/msg00001.html\";>[ANNOUNCE]
-# | nano-2.9.4-]
-# | 
{+href=\"http://lists.gnu.org/archive/html/info-gnu/2018-06/msg00000.html\";>[ANNOUNCE]
-# | nano-2.9.8+} is released</a>, <i>Benno Schulenberg</i>,
-# | <tt>08:2[-8-]{+7+}</tt>
-#| msgid ""
-#| "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2018-03/msg00001.html";
-#| "\">[ANNOUNCE] nano-2.9.4 is released</a>, <i>Benno Schulenberg</i>, "
-#| "<tt>08:28</tt>"
 msgid ""
 "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2018-06/msg00000.html\";>"
 "[ANNOUNCE] nano-2.9.8 is released</a>, <i>Benno Schulenberg</i>, <tt>08:27</"



reply via email to

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