[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy/po android-and-users-freedom.de....
|
From: |
GNUN |
|
Subject: |
www/philosophy/po android-and-users-freedom.de.... |
|
Date: |
Sun, 3 Jun 2018 08:29:24 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 18/06/03 08:29:23
Modified files:
philosophy/po : android-and-users-freedom.de.po
android-and-users-freedom.es.po
android-and-users-freedom.fr.po
android-and-users-freedom.it.po
android-and-users-freedom.ml-diff.html
android-and-users-freedom.ml.po
android-and-users-freedom.pl-diff.html
android-and-users-freedom.pl.po
android-and-users-freedom.pot
android-and-users-freedom.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.de.po?cvsroot=www&r1=1.88&r2=1.89
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.es.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.fr.po?cvsroot=www&r1=1.91&r2=1.92
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.it.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.ml-diff.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.ml.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.pl-diff.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.pl.po?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.pot?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.ru.po?cvsroot=www&r1=1.82&r2=1.83
Patches:
Index: android-and-users-freedom.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.de.po,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- android-and-users-freedom.de.po 3 Dec 2016 23:45:12 -0000 1.88
+++ android-and-users-freedom.de.po 3 Jun 2018 12:29:23 -0000 1.89
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: android-and-users-freedom.html\n"
"Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2016-11-18 06:58+0000\n"
+"POT-Creation-Date: 2018-06-03 12:26+0000\n"
"PO-Revision-Date: 2016-07-04 22:00+0200\n"
"Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
"Language-Team: www-de <address@hidden>\n"
@@ -16,6 +16,7 @@
"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"
@@ -39,19 +40,18 @@
# URL: http://www.guardian.co.uk/technology/2011/sep/19/android-free-software-
# stallman, (2012-09-15)
#. 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>+}
+#, fuzzy
+#| 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 <a href=\"http://www.guardian.co.uk/technology/2011/";
-"sep/19/android-free-software-stallman\"> The Guardian</a>"
+"First published in <em><a href=\"http://www.guardian.co.uk/technology/2011/";
+"sep/19/android-free-software-stallman\"> The Guardian</a></em>"
msgstr " "
-#. type: Content of: <h3>
-msgid ""
-"Support the <a href=\"http://FreeYourAndroid.org/\";> Free Your Android</a> "
-"campaign."
-msgstr ""
-"Unterstützen Sie die Kampagne <cite><a href=\"//FreeYourAndroid.org/"
-"\">Befreien Sie Ihr Android</a></cite>"
-
# (m/f) For a computer user -> For computer users
#. type: Content of: <p>
msgid ""
@@ -85,13 +85,28 @@
"em> zu sein."
#. 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>.+}
+#, fuzzy
+#| 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 "
"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>."
+"\"/licenses/copyleft.html\">copyleft</a>."
msgstr ""
"Android ist in erster Linie ein Betriebssystem für Smartphones und andere "
"Geräte, welches Linux (also Torvaldsâ Systemkern), einige Bibliotheken,
eine "
@@ -121,7 +136,44 @@
"damit das Gerät lauffähig ist. Einige der in Android enthaltenden "
"Anwendungen sind im Allgemeinen ebenfalls unfrei."
+#. type: Content of: <div><p>
+# | [-Support-]{+<em>Support+} the <a href=\"http://FreeYourAndroid.org/\";>[-
+# | -]Free Your Android</a> [-campaign.-] {+campaign.</em>+}
+#, fuzzy
+#| 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 ""
+"Unterstützen Sie die Kampagne <cite><a href=\"//FreeYourAndroid.org/"
+"\">Befreien Sie Ihr Android</a></cite>"
+
#. 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 “Linux” refers to the entire GNU/Linux
+# | combination get tied in knots by these facts, and make paradoxical
+# | statements such as “Android contains Linux, but it isn't
+# | Linux.”(<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.
+#, fuzzy
+#| 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 “"
+#| "Linux” refers to the entire GNU/Linux combination get tied in knots "
+#| "by these facts, and make paradoxical statements such as “Android "
+#| "contains Linux, but it isn't Linux.”(<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, "
@@ -129,7 +181,7 @@
"Linux, the kernel. People who erroneously think “Linux” refers "
"to the entire GNU/Linux combination get tied in knots by these facts, and "
"make paradoxical statements such as “Android contains Linux, but it "
-"isn't Linux.”(<a href=\"#linuxnote\">*</a>) Absent this confusion, the "
+"isn't Linux.”(<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."
msgstr ""
@@ -568,15 +620,30 @@
"sind, kann nicht gesagt werden, dass sie die Freiheit der Nutzer "
"respektieren."
-#. type: Content of: <ul><li>
-msgid ""
-"<a id=\"linuxnote\"></a>The extreme example of this confusion appears in the "
-"site linuxonandroid.org, which offers help to “install Linux [sic] on "
-"your Android devices.” 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."
+#. 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
+# | “install Linux [sic] on your Android devices.” 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.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"linuxnote\"></a>The extreme example of this confusion appears in "
+#| "the site linuxonandroid.org, which offers help to “install Linux "
+#| "[sic] on your Android devices.” 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 “install Linux [sic] on your Android devices."
+"” 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."
msgstr ""
"<span id=\"fnote\"><a href=\"#linuxnote-ref\" id=\"linuxnote\">(*)</a> Ein "
"extremes Beispiel für dieses Durcheinander scheint die Internetpräsenz von "
@@ -651,7 +718,11 @@
"standards/README.translations\">LIESMICH für Ãbersetzungen</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+# | Copyright © 2011, 2012, 2014, 2015, [-2016-] {+2016, 2018+} Richard
+# | Stallman
+#, fuzzy
+#| msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+msgid "Copyright © 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman"
msgstr "Copyright © 2011-2016 Richard Stallman."
#. type: Content of: <div><p>
Index: android-and-users-freedom.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.es.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- android-and-users-freedom.es.po 1 Jul 2016 09:29:52 -0000 1.10
+++ android-and-users-freedom.es.po 3 Jun 2018 12:29:23 -0000 1.11
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: android-and-users-freedom.html\n"
-"POT-Creation-Date: 2016-06-29 11:55+0000\n"
+"POT-Creation-Date: 2018-06-03 12:26+0000\n"
"PO-Revision-Date: 2016-07-01 10:34+0100\n"
"Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
"Language-Team: Spanish <address@hidden>\n"
@@ -16,6 +16,7 @@
"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"
"X-Generator: Poedit 1.6.10\n"
#. type: Content of: <title>
@@ -33,22 +34,21 @@
msgstr "por Richard Stallman"
#. 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>+}
+#, fuzzy
+#| 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 <a href=\"http://www.guardian.co.uk/technology/2011/";
-"sep/19/android-free-software-stallman\"> The Guardian</a>"
+"First published in <em><a href=\"http://www.guardian.co.uk/technology/2011/";
+"sep/19/android-free-software-stallman\"> The Guardian</a></em>"
msgstr ""
"Publicado originalmente en <a href=\"http://www.guardian.co.uk/";
"technology/2011/sep/19/android-free-software-stallman\"><cite>The Guardian</"
"cite></a>"
-#. type: Content of: <h3>
-msgid ""
-"Support the <a href=\"http://FreeYourAndroid.org/\";> Free Your Android</a> "
-"campaign."
-msgstr ""
-"Apoye la campaña <a href=\"http://FreeYourAndroid.org/\";>Libera tu Android
</"
-"a>"
-
#. type: Content of: <p>
msgid ""
"To what extent does Android respect the freedom of its users? For a computer "
@@ -81,13 +81,28 @@
"\">abierto</a>», sino si permite a los usuarios ser libres."
#. 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>.+}
+#, fuzzy
+#| 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 "
"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>."
+"\"/licenses/copyleft.html\">copyleft</a>."
msgstr ""
"Android es un sistema operativo principalmente para teléfonos móviles y "
"otros dispositivos. Está formado por Linux (el núcleo de Torvalds), algunas
"
@@ -118,7 +133,44 @@
"es suficiente para hacer funcionar el dispositivo. Algunas de las "
"aplicaciones que generalmente vienen con Android tampoco son libres."
+#. type: Content of: <div><p>
+# | [-Support-]{+<em>Support+} the <a href=\"http://FreeYourAndroid.org/\";>[-
+# | -]Free Your Android</a> [-campaign.-] {+campaign.</em>+}
+#, fuzzy
+#| 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 ""
+"Apoye la campaña <a href=\"http://FreeYourAndroid.org/\";>Libera tu Android
</"
+"a>"
+
#. 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 “Linux” refers to the entire GNU/Linux
+# | combination get tied in knots by these facts, and make paradoxical
+# | statements such as “Android contains Linux, but it isn't
+# | Linux.”(<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.
+#, fuzzy
+#| 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 “"
+#| "Linux” refers to the entire GNU/Linux combination get tied in knots "
+#| "by these facts, and make paradoxical statements such as “Android "
+#| "contains Linux, but it isn't Linux.”(<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, "
@@ -126,7 +178,7 @@
"Linux, the kernel. People who erroneously think “Linux” refers "
"to the entire GNU/Linux combination get tied in knots by these facts, and "
"make paradoxical statements such as “Android contains Linux, but it "
-"isn't Linux.”(<a href=\"#linuxnote\">*</a>) Absent this confusion, the "
+"isn't Linux.”(<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."
msgstr ""
@@ -546,15 +598,30 @@
"son mucho menos malos que los teléfonos de Apple o Windows, no puede decirse
"
"que respeten la libertad."
-#. type: Content of: <ul><li>
-msgid ""
-"<a id=\"linuxnote\"></a>The extreme example of this confusion appears in the "
-"site linuxonandroid.org, which offers help to “install Linux [sic] on "
-"your Android devices.” 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."
+#. 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
+# | “install Linux [sic] on your Android devices.” 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.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"linuxnote\"></a>The extreme example of this confusion appears in "
+#| "the site linuxonandroid.org, which offers help to “install Linux "
+#| "[sic] on your Android devices.” 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 “install Linux [sic] on your Android devices."
+"” 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."
msgstr ""
"<a id=\"linuxnote\"></a>Un ejemplo extremo de esta confusión lo constituye "
"el sitio linuxonandroid.org, que ofrece ayuda para «instalar Linux [sic] en "
@@ -612,7 +679,11 @@
"de este sitio web."
#. type: Content of: <div><p>
-msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+# | Copyright © 2011, 2012, 2014, 2015, [-2016-] {+2016, 2018+} Richard
+# | Stallman
+#, fuzzy
+#| msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+msgid "Copyright © 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman"
msgstr "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
#. type: Content of: <div><p>
Index: android-and-users-freedom.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.fr.po,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- android-and-users-freedom.fr.po 29 Jun 2016 18:57:55 -0000 1.91
+++ android-and-users-freedom.fr.po 3 Jun 2018 12:29:23 -0000 1.92
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: android-and-users-freedom.html\n"
-"POT-Creation-Date: 2016-06-29 11:55+0000\n"
+"POT-Creation-Date: 2018-06-03 12:26+0000\n"
"PO-Revision-Date: 2016-06-29 19:16+0200\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: 2018-06-03 12:26+0000\n"
"Plural-Forms: \n"
"X-Generator: Gtranslator 2.91.5\n"
@@ -33,21 +34,20 @@
msgstr "par Richard Stallman"
#. 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>+}
+#, fuzzy
+#| 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 <a href=\"http://www.guardian.co.uk/technology/2011/";
-"sep/19/android-free-software-stallman\"> The Guardian</a>"
+"First published in <em><a href=\"http://www.guardian.co.uk/technology/2011/";
+"sep/19/android-free-software-stallman\"> The Guardian</a></em>"
msgstr ""
"Publié initialement dans <a
href=\"http://www.guardian.co.uk/technology/2011/";
"sep/19/android-free-software-stallman\"> The Guardian</a>"
-#. type: Content of: <h3>
-msgid ""
-"Support the <a href=\"http://FreeYourAndroid.org/\";> Free Your Android</a> "
-"campaign."
-msgstr ""
-"Soutenez la campagne « <a href=\"http://FreeYourAndroid.org/\";>Libérez
votre "
-"Android</a> »"
-
#. type: Content of: <p>
msgid ""
"To what extent does Android respect the freedom of its users? For a computer "
@@ -81,13 +81,28 @@
"l'utilise d'être libre."
#. 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>.+}
+#, fuzzy
+#| 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 "
"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>."
+"\"/licenses/copyleft.html\">copyleft</a>."
msgstr ""
"Android est un système d'exploitation orienté principalement vers les "
"téléphones mobiles et autres appareils. Il est constitué du noyau Linux
(le "
@@ -119,7 +134,44 @@
"Quelques applications qui viennent généralement avec Android sont
également "
"non libres."
+#. type: Content of: <div><p>
+# | [-Support-]{+<em>Support+} the <a href=\"http://FreeYourAndroid.org/\";>[-
+# | -]Free Your Android</a> [-campaign.-] {+campaign.</em>+}
+#, fuzzy
+#| 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 ""
+"Soutenez la campagne « <a href=\"http://FreeYourAndroid.org/\";>Libérez
votre "
+"Android</a> »"
+
#. 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 “Linux” refers to the entire GNU/Linux
+# | combination get tied in knots by these facts, and make paradoxical
+# | statements such as “Android contains Linux, but it isn't
+# | Linux.”(<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.
+#, fuzzy
+#| 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 “"
+#| "Linux” refers to the entire GNU/Linux combination get tied in knots "
+#| "by these facts, and make paradoxical statements such as “Android "
+#| "contains Linux, but it isn't Linux.”(<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, "
@@ -127,7 +179,7 @@
"Linux, the kernel. People who erroneously think “Linux” refers "
"to the entire GNU/Linux combination get tied in knots by these facts, and "
"make paradoxical statements such as “Android contains Linux, but it "
-"isn't Linux.”(<a href=\"#linuxnote\">*</a>) Absent this confusion, the "
+"isn't Linux.”(<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."
msgstr ""
@@ -556,15 +608,30 @@
"considérablement moins mauvais que ceux d'Apple ou de Windows, on ne peut "
"pas dire qu'ils respectent votre liberté."
-#. type: Content of: <ul><li>
-msgid ""
-"<a id=\"linuxnote\"></a>The extreme example of this confusion appears in the "
-"site linuxonandroid.org, which offers help to “install Linux [sic] on "
-"your Android devices.” 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."
+#. 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
+# | “install Linux [sic] on your Android devices.” 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.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"linuxnote\"></a>The extreme example of this confusion appears in "
+#| "the site linuxonandroid.org, which offers help to “install Linux "
+#| "[sic] on your Android devices.” 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 “install Linux [sic] on your Android devices."
+"” 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."
msgstr ""
"<a id=\"linuxnote\"></a>L'exemple ultime de cette confusion se trouve sur le "
"site linuxonandroid.org, qui propose de l'aide pour « installer Linux [sic]
"
@@ -624,7 +691,11 @@
"README.translations.html\">guide de traduction</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+# | Copyright © 2011, 2012, 2014, 2015, [-2016-] {+2016, 2018+} Richard
+# | Stallman
+#, fuzzy
+#| msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+msgid "Copyright © 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman"
msgstr "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
#. type: Content of: <div><p>
Index: android-and-users-freedom.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.it.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- android-and-users-freedom.it.po 21 Apr 2018 17:31:09 -0000 1.11
+++ android-and-users-freedom.it.po 3 Jun 2018 12:29:23 -0000 1.12
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: android-and-users-freedom.html\n"
-"POT-Creation-Date: 2016-11-18 06:58+0000\n"
+"POT-Creation-Date: 2018-06-03 12:26+0000\n"
"PO-Revision-Date: 2016-07-30 17:58+0100\n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: Italian <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: 2018-06-03 12:26+0000\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
@@ -32,21 +33,20 @@
msgstr "di Richard Stallman"
#. 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>+}
+#, fuzzy
+#| 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 <a href=\"http://www.guardian.co.uk/technology/2011/";
-"sep/19/android-free-software-stallman\"> The Guardian</a>"
+"First published in <em><a href=\"http://www.guardian.co.uk/technology/2011/";
+"sep/19/android-free-software-stallman\"> The Guardian</a></em>"
msgstr ""
"Originariamente pubblicato sul sito <a href=\"http://www.guardian.co.uk/";
"technology/2011/sep/19/android-free-software-stallman\"> The Guardian</a>"
-#. type: Content of: <h3>
-msgid ""
-"Support the <a href=\"http://FreeYourAndroid.org/\";> Free Your Android</a> "
-"campaign."
-msgstr ""
-"Sostenete la campagna <a href=\"http://FreeYourAndroid.org/\";> Liberate il "
-"vostro Android</a>."
-
#. type: Content of: <p>
msgid ""
"To what extent does Android respect the freedom of its users? For a computer "
@@ -80,13 +80,28 @@
"utenti. "
#. 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>.+}
+#, fuzzy
+#| 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 "
"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>."
+"\"/licenses/copyleft.html\">copyleft</a>."
msgstr ""
"Android è un sistema operativo per telefoni cellulari ed altri dispositivi "
"formato da Linux (il kernel di Torvalds), alcune librerie, una piattaforma "
@@ -116,7 +131,44 @@
"corretto funzionamento del dispositivo. Alcune applicazioni preinstallate in "
"Android sono altrettanto proprietarie."
+#. type: Content of: <div><p>
+# | [-Support-]{+<em>Support+} the <a href=\"http://FreeYourAndroid.org/\";>[-
+# | -]Free Your Android</a> [-campaign.-] {+campaign.</em>+}
+#, fuzzy
+#| 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 ""
+"Sostenete la campagna <a href=\"http://FreeYourAndroid.org/\";> Liberate il "
+"vostro Android</a>."
+
#. 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 “Linux” refers to the entire GNU/Linux
+# | combination get tied in knots by these facts, and make paradoxical
+# | statements such as “Android contains Linux, but it isn't
+# | Linux.”(<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.
+#, fuzzy
+#| 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 “"
+#| "Linux” refers to the entire GNU/Linux combination get tied in knots "
+#| "by these facts, and make paradoxical statements such as “Android "
+#| "contains Linux, but it isn't Linux.”(<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, "
@@ -124,7 +176,7 @@
"Linux, the kernel. People who erroneously think “Linux” refers "
"to the entire GNU/Linux combination get tied in knots by these facts, and "
"make paradoxical statements such as “Android contains Linux, but it "
-"isn't Linux.”(<a href=\"#linuxnote\">*</a>) Absent this confusion, the "
+"isn't Linux.”(<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."
msgstr ""
@@ -562,15 +614,30 @@
"nocivi rispetto ai telefoni della Apple o quelli Windows, certamente non "
"possiamo affermare che rispettino la vostra libertà . "
-#. type: Content of: <ul><li>
-msgid ""
-"<a id=\"linuxnote\"></a>The extreme example of this confusion appears in the "
-"site linuxonandroid.org, which offers help to “install Linux [sic] on "
-"your Android devices.” 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."
+#. 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
+# | “install Linux [sic] on your Android devices.” 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.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"linuxnote\"></a>The extreme example of this confusion appears in "
+#| "the site linuxonandroid.org, which offers help to “install Linux "
+#| "[sic] on your Android devices.” 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 “install Linux [sic] on your Android devices."
+"” 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."
msgstr ""
"<a id=\"linuxnote\"></a>Una esemplificazione paradossale di questo tipo di "
"confusione di termini appare sul sito linuxonandroid.org, dove si offre "
@@ -628,7 +695,11 @@
"traduzioni</a>."
#. type: Content of: <div><p>
-msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+# | Copyright © 2011, 2012, 2014, 2015, [-2016-] {+2016, 2018+} Richard
+# | Stallman
+#, fuzzy
+#| msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+msgid "Copyright © 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman"
msgstr "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
#. type: Content of: <div><p>
Index: android-and-users-freedom.ml-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.ml-diff.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- android-and-users-freedom.ml-diff.html 10 Apr 2017 20:31:08 -0000
1.7
+++ android-and-users-freedom.ml-diff.html 3 Jun 2018 12:29:23 -0000
1.8
@@ -17,14 +17,19 @@
<!--#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 <span
class="removed"><del><strong><a</strong></del></span> <span
class="inserted"><ins><em><em><a</em></ins></span>
href="http://www.guardian.co.uk/technology/2011/sep/19/android-free-software-stallman">
-The Guardian</a></p>
+The <span class="removed"><del><strong>Guardian</a></p>
<h3 class="center">Support the <a
href="http://FreeYourAndroid.org/">
Free Your Android</a> campaign.</h3>
-<p>To what extent does Android respect the freedom of its users? For a
+<p>To</strong></del></span> <span
class="inserted"><ins><em>Guardian</a></em></p>
+
+<hr class="thin" />
+
+<p class="comment">
+To</em></ins></span> 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>
@@ -44,7 +49,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 <span
class="removed"><del><strong>href="/copyleft/copyleft.html">copyleft</a>.</p></strong></del></span>
<span
class="inserted"><ins><em>href="/licenses/copyleft.html">copyleft</a>.</p></em></ins></span>
<p>The version of Linux included in Android is not entirely free
software, since it contains nonfree “binary blobs” (just
@@ -55,6 +60,11 @@
code is insufficient to run the device. Some of the applications that
generally come with Android are nonfree, too.</p>
+<span class="inserted"><ins><em><div class="announcement comment">
+<p><em>Support the <a
href="http://FreeYourAndroid.org/">Free Your
+Android</a> campaign.</em></p>
+</div></em></ins></span>
+
<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
@@ -62,7 +72,7 @@
kernel. People who erroneously think “Linux” refers to the
entire GNU/Linux combination get tied in knots by these facts, and make
paradoxical statements such as “Android contains Linux, but it
-isn't <span class="removed"><del><strong>Linux.” If we avoid starting
from the</strong></del></span> <span
class="inserted"><ins><em>Linux.”(<a href="#linuxnote">*</a>)
Absent this</em></ins></span> confusion,
+isn't <span class="removed"><del><strong>Linux.” If we avoid starting
from the</strong></del></span> <span
class="inserted"><ins><em>Linux.”(<a href="#linuxnote">1</a>)
Absent this</em></ins></span> confusion,
the situation is simple: Android contains Linux, but not GNU; thus,
Android and GNU/Linux are mostly <span
class="removed"><del><strong>different.</p></strong></del></span> <span
class="inserted"><ins><em>different, because all they have in
common is Linux.</p></em></ins></span>
@@ -256,9 +266,10 @@
less bad than Apple or Windows <span
class="removed"><del><strong>smartphones,</strong></del></span> <span
class="inserted"><ins><em>phones,</em></ins></span> they cannot be said to
respect your freedom.</p>
-<span class="inserted"><ins><em><hr />
-<ul>
-<li><a id="linuxnote"></a>The extreme example of this
confusion appears in
+<span class="inserted"><ins><em><hr class="thin" />
+
+<ol>
+<li id="linuxnote">The extreme example of this confusion appears in
the site linuxonandroid.org, which offers help to “install Linux
[sic] on your Android devices.” This is entirely false: what
they are installing is a version of the GNU system,
<em>excluding</em>
@@ -266,8 +277,7 @@
supports only <a href="/distros/distros.html">nonfree GNU/Linux
distros</a>, we do not recommend it.
</li>
-</ul></em></ins></span>
-
+</ol></em></ins></span>
<!-- If needed, change the copyright block at the bottom. In general,
all pages on the GNU web server should have the section about
@@ -304,7 +314,7 @@
information on coordinating and submitting translations of this
article.</p>
</div>
-<p>Copyright © 2011, 2012, <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015, 2016</em></ins></span> Richard
Stallman</p>
+<p>Copyright © 2011, 2012, <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015, 2016, 2018</em></ins></span> Richard
Stallman</p>
<p>This page is licensed under a <a rel="license"
<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
@@ -315,7 +325,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/04/10 20:31:08 $
+$Date: 2018/06/03 12:29:23 $
<!-- timestamp end -->
</p>
</div>
Index: android-and-users-freedom.ml.po
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.ml.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- android-and-users-freedom.ml.po 10 Apr 2017 20:08:45 -0000 1.18
+++ android-and-users-freedom.ml.po 3 Jun 2018 12:29:23 -0000 1.19
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: android-and-users-freedom.html\n"
-"POT-Creation-Date: 2016-11-18 06:58+0000\n"
+"POT-Creation-Date: 2018-06-03 12:26+0000\n"
"PO-Revision-Date: 2014-05-06 17:59+0530\n"
"Last-Translator: Navaneeth <address@hidden>\n"
"Language-Team: Malayalam <address@hidden>\n"
@@ -34,21 +34,20 @@
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>+}
+#, fuzzy
+#| 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 <a href=\"http://www.guardian.co.uk/technology/2011/";
-"sep/19/android-free-software-stallman\"> The Guardian</a>"
+"First published in <em><a href=\"http://www.guardian.co.uk/technology/2011/";
+"sep/19/android-free-software-stallman\"> The Guardian</a></em>"
msgstr ""
"à´à´¦àµà´¯à´
à´ªàµà´°à´¸à´¿à´¦àµà´§àµà´à´°à´¿à´¯àµà´àµà´à´ªàµà´ªàµà´àµà´à´¤àµ
<a href=\"http://www.guardian.co.uk/technology/2011/";
"sep/19/android-free-software-stallman\"> à´¦
à´à´¾à´¡à´¿à´¯à´¨à´¿à´²àµâ</a>"
-#. type: Content of: <h3>
-msgid ""
-"Support the <a href=\"http://FreeYourAndroid.org/\";> Free Your Android</a> "
-"campaign."
-msgstr ""
-"<a href=\"http://FreeYourAndroid.org/\";> നിà´àµà´à´³àµà´àµ
à´à´¨àµâà´¡àµà´°àµà´¯à´¿à´¡à´¿à´¨àµ
à´¸àµà´µà´¤à´¨àµà´¤àµà´°à´®à´¾à´àµà´àµ</a> "
-"സമരà´à´àµà´à´¤àµà´¤àµ പിനàµà´¤àµà´£à´¯àµà´àµà´àµ"
-
#. type: Content of: <p>
msgid ""
"To what extent does Android respect the freedom of its users? For a computer "
@@ -86,7 +85,9 @@
# | 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>.
+# | software license without <a
+# | [-href=\"/copyleft/copyleft.html\">copyleft</a>.-]
+# | {+href=\"/licenses/copyleft.html\">copyleft</a>.+}
#, fuzzy
#| msgid ""
#| "Android is an operating system primarily for mobile phones, which "
@@ -101,7 +102,7 @@
"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>."
+"\"/licenses/copyleft.html\">copyleft</a>."
msgstr ""
"à´ªàµà´°à´§à´¾à´¨à´®à´¾à´¯àµà´ à´®àµà´¬àµà´²àµâ
à´«àµà´£àµà´à´³àµâà´àµà´à´¾à´¯àµà´³àµà´³
à´à´ªàµà´ªà´±àµà´±àµà´±à´¿à´àµ സിസàµà´±àµà´±à´®à´¾à´£àµ
à´à´¨àµâà´¡àµà´°àµà´¯à´¿à´¡àµ. à´à´¤à´¿à´²àµâ ലിനà´àµà´¸àµ
(à´àµà´°àµà´¡àµ "
"വാളàµâà´¡àµà´¸à´¿à´¨àµà´±àµ à´àµà´£à´²àµâ), à´à´¿à´²
à´²àµà´¬àµà´°à´±à´¿à´à´³àµâ, à´à´¾à´µà´¯àµà´àµ à´à´°àµ
à´ªàµà´²à´¾à´±àµà´±àµà´«àµà´, à´à´¿à´²
à´à´ªàµà´²à´¿à´àµà´àµà´·à´¨àµà´à´³àµâ à´à´¨àµà´¨à´¿à´µ "
@@ -128,6 +129,20 @@
"2
à´¸àµà´µà´¤à´¨àµà´¤àµà´°à´¸àµà´«àµà´±àµà´±àµâà´µàµà´¯à´±à´¾à´£àµà´àµà´à´¿à´²àµà´
– à´à´ªà´à´°à´£à´¤àµà´¤à´¿à´²àµâ
à´ªàµà´°à´µà´°àµâà´¤àµà´¤à´¿à´àµà´à´¾à´¨à´¾à´µàµà´¨àµà´¨
തരതàµà´¤à´¿à´²àµà´³àµà´³à´¤à´²àµà´². "
"à´à´¨àµâà´¡àµà´°àµà´¯à´¿à´¡à´¿à´²àµ à´à´¿à´²
à´à´ªàµà´²à´¿à´àµà´àµà´·à´¨àµà´à´³àµâ
à´¸àµà´µà´¤à´¨àµà´¤àµà´°à´µàµà´®à´²àµà´²."
+#. type: Content of: <div><p>
+# | [-Support-]{+<em>Support+} the <a href=\"http://FreeYourAndroid.org/\";>[-
+# | -]Free Your Android</a> [-campaign.-] {+campaign.</em>+}
+#, fuzzy
+#| 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 ""
+"<a href=\"http://FreeYourAndroid.org/\";> നിà´àµà´à´³àµà´àµ
à´à´¨àµâà´¡àµà´°àµà´¯à´¿à´¡à´¿à´¨àµ
à´¸àµà´µà´¤à´¨àµà´¤àµà´°à´®à´¾à´àµà´àµ</a> "
+"സമരà´à´àµà´à´¤àµà´¤àµ പിനàµà´¤àµà´£à´¯àµà´àµà´àµ"
+
#. type: Content of: <p>
# | Android is very different from the <a
# | href=\"/gnu/the-gnu-project.html\">GNU/Linux operating system</a> because
@@ -137,7 +152,7 @@
# | combination get tied in knots by these facts, and make paradoxical
# | statements such as “Android contains Linux, but it isn't
# | [-Linux.” If we avoid starting from the-] {+Linux.”(<a
-# | href=\"#linuxnote\">*</a>) Absent this+} confusion, the situation is
+# | 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.-] {+different, because all they have in common is
# | Linux.+}
@@ -159,7 +174,7 @@
"Linux, the kernel. People who erroneously think “Linux” refers "
"to the entire GNU/Linux combination get tied in knots by these facts, and "
"make paradoxical statements such as “Android contains Linux, but it "
-"isn't Linux.”(<a href=\"#linuxnote\">*</a>) Absent this confusion, the "
+"isn't Linux.”(<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."
msgstr ""
@@ -649,15 +664,14 @@
"വിനàµâà´¡àµà´¸àµ à´¸àµà´®à´¾à´°àµâà´àµà´àµ
à´«àµà´£à´¿à´¨àµà´àµà´à´¾à´³àµà´ à´àµà´±à´µàµ à´¦àµà´·à´®àµ
à´à´¨àµâà´¡àµà´°àµà´¯à´¿à´¡àµ à´«àµà´£àµâ
à´àµà´¯àµà´¯àµà´¨àµà´¨àµà´³àµà´³àµ à´à´àµà´à´¿à´²àµà´ à´
à´¤àµ
നിà´àµà´à´³àµà´àµ "
"à´¸àµà´µà´¾à´¤à´¨àµà´¤àµà´°àµà´¯à´
à´¸à´à´°à´àµà´·à´¿à´àµà´àµà´¨àµà´¨à´¿à´²àµà´²."
-#. type: Content of: <ul><li>
+#. type: Content of: <ol><li>
msgid ""
-"<a id=\"linuxnote\"></a>The extreme example of this confusion appears in the "
-"site linuxonandroid.org, which offers help to “install Linux [sic] on "
-"your Android devices.” 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."
+"The extreme example of this confusion appears in the site linuxonandroid."
+"org, which offers help to “install Linux [sic] on your Android devices."
+"” 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."
msgstr ""
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -704,10 +718,11 @@
"server/standards/README.translations.html\">Translations README</a>
à´à´¾à´£àµà´."
#. type: Content of: <div><p>
-# | Copyright © 2011, 2012, [-2014-] {+2014, 2015, 2016+} Richard Stallman
+# | Copyright © 2011, 2012, [-2014-] {+2014, 2015, 2016, 2018+} Richard
+# | Stallman
#, fuzzy
#| msgid "Copyright © 2011, 2012, 2014 Richard Stallman"
-msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+msgid "Copyright © 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman"
msgstr "Copyright © 2011, 2012, 2014 Richard Stallman |
റിà´àµà´à´¾à´°àµâഡൠസàµà´±àµà´±à´¾à´³àµâമാനàµâ"
#. type: Content of: <div><p>
Index: android-and-users-freedom.pl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.pl-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- android-and-users-freedom.pl-diff.html 18 Nov 2016 07:32:52 -0000
1.2
+++ android-and-users-freedom.pl-diff.html 3 Jun 2018 12:29:23 -0000
1.3
@@ -17,14 +17,19 @@
<!--#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 <span
class="removed"><del><strong><a</strong></del></span> <span
class="inserted"><ins><em><em><a</em></ins></span>
href="http://www.guardian.co.uk/technology/2011/sep/19/android-free-software-stallman">
-The Guardian</a></p>
+The <span class="removed"><del><strong>Guardian</a></p>
<h3 class="center">Support the <a
href="http://FreeYourAndroid.org/">
Free Your Android</a> campaign.</h3>
-<p>To what extent does Android respect the freedom of its users? For a
+<p>To</strong></del></span> <span
class="inserted"><ins><em>Guardian</a></em></p>
+
+<hr class="thin" />
+
+<p class="comment">
+To</em></ins></span> 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>
@@ -44,7 +49,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 <span
class="removed"><del><strong>href="/copyleft/copyleft.html">copyleft</a>.</p></strong></del></span>
<span
class="inserted"><ins><em>href="/licenses/copyleft.html">copyleft</a>.</p></em></ins></span>
<p>The version of Linux included in Android is not entirely free
software, since it contains nonfree “binary blobs” (just
@@ -55,6 +60,11 @@
code is insufficient to run the device. Some of the applications that
generally come with Android are nonfree, too.</p>
+<span class="inserted"><ins><em><div class="announcement comment">
+<p><em>Support the <a
href="http://FreeYourAndroid.org/">Free Your
+Android</a> campaign.</em></p>
+</div></em></ins></span>
+
<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
@@ -62,7 +72,7 @@
kernel. People who erroneously think “Linux” refers to the
entire GNU/Linux combination get tied in knots by these facts, and make
paradoxical statements such as “Android contains Linux, but it
-isn't Linux.”(<a href="#linuxnote">*</a>) Absent this
confusion,
+isn't Linux.”(<a <span
class="removed"><del><strong>href="#linuxnote">*</a>)</strong></del></span>
<span
class="inserted"><ins><em>href="#linuxnote">1</a>)</em></ins></span>
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>
@@ -253,9 +263,12 @@
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 <span class="inserted"><ins><em>class="thin"</em></ins></span> />
+<span class="removed"><del><strong><ul>
+<li><a id="linuxnote"></a>The</strong></del></span>
+
+<span class="inserted"><ins><em><ol>
+<li id="linuxnote">The</em></ins></span> extreme example of this
confusion appears in
the site linuxonandroid.org, which offers help to “install Linux
[sic] on your Android devices.” This is entirely false: what
they are installing is a version of the GNU system,
<em>excluding</em>
@@ -263,8 +276,8 @@
supports only <a href="/distros/distros.html">nonfree GNU/Linux
distros</a>, we do not recommend it.
</li>
-</ul>
-
+<span class="removed"><del><strong></ul></strong></del></span>
+<span class="inserted"><ins><em></ol></em></ins></span>
<!-- If needed, change the copyright block at the bottom. In general,
all pages on the GNU web server should have the section about
@@ -301,7 +314,7 @@
information on coordinating and submitting translations of this
article.</p>
</div>
-<p>Copyright © 2011, 2012, 2014, <span
class="removed"><del><strong>2015</strong></del></span> <span
class="inserted"><ins><em>2015, 2016</em></ins></span> Richard
Stallman</p>
+<p>Copyright © 2011, 2012, 2014, <span
class="removed"><del><strong>2015</strong></del></span> <span
class="inserted"><ins><em>2015, 2016, 2018</em></ins></span> Richard
Stallman</p>
<p>This page is licensed under a <a rel="license"
<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
@@ -312,7 +325,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/11/18 07:32:52 $
+$Date: 2018/06/03 12:29:23 $
<!-- timestamp end -->
</p>
</div>
Index: android-and-users-freedom.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.pl.po,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- android-and-users-freedom.pl.po 18 Nov 2016 07:32:52 -0000 1.56
+++ android-and-users-freedom.pl.po 3 Jun 2018 12:29:23 -0000 1.57
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: android-and-users-freedom.html\n"
-"POT-Creation-Date: 2016-11-18 06:58+0000\n"
+"POT-Creation-Date: 2018-06-03 12:26+0000\n"
"PO-Revision-Date: 2015-05-17 10:18-0600\n"
"Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -37,21 +37,20 @@
msgstr "Richard Stallman"
#. 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>+}
+#, fuzzy
+#| 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 <a href=\"http://www.guardian.co.uk/technology/2011/";
-"sep/19/android-free-software-stallman\"> The Guardian</a>"
+"First published in <em><a href=\"http://www.guardian.co.uk/technology/2011/";
+"sep/19/android-free-software-stallman\"> The Guardian</a></em>"
msgstr ""
"Pierwotnie opublikowano w <a href=\"http://www.guardian.co.uk/";
"technology/2011/sep/19/android-free-software-stallman\">The Guardian</a>"
-#. type: Content of: <h3>
-msgid ""
-"Support the <a href=\"http://FreeYourAndroid.org/\";> Free Your Android</a> "
-"campaign."
-msgstr ""
-"Wesprzyj kampaniÄ <a href=\"http://FreeYourAndroid.org/\";>Free Your
Android</"
-"a>."
-
#. type: Content of: <p>
msgid ""
"To what extent does Android respect the freedom of its users? For a computer "
@@ -85,13 +84,28 @@
"bycie wolnymi."
#. 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>.+}
+#, fuzzy
+#| 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 "
"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>."
+"\"/licenses/copyleft.html\">copyleft</a>."
msgstr ""
"Android to system operacyjny gÅównie dla telefonów komórkowych
i innych "
"urzÄ
dzeÅ, na który skÅada siÄ Linux (jÄ
dro systemu, napisane przez
"
@@ -123,7 +137,44 @@
"urzÄ
dzenie. Niektóre aplikacje zwykle dostarczane z Androidem
również "
"sÄ
niewolne."
+#. type: Content of: <div><p>
+# | [-Support-]{+<em>Support+} the <a href=\"http://FreeYourAndroid.org/\";>[-
+# | -]Free Your Android</a> [-campaign.-] {+campaign.</em>+}
+#, fuzzy
+#| 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 ""
+"Wesprzyj kampaniÄ <a href=\"http://FreeYourAndroid.org/\";>Free Your
Android</"
+"a>."
+
#. 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 “Linux” refers to the entire GNU/Linux
+# | combination get tied in knots by these facts, and make paradoxical
+# | statements such as “Android contains Linux, but it isn't
+# | Linux.”(<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.
+#, fuzzy
+#| 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 “"
+#| "Linux” refers to the entire GNU/Linux combination get tied in knots "
+#| "by these facts, and make paradoxical statements such as “Android "
+#| "contains Linux, but it isn't Linux.”(<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, "
@@ -131,7 +182,7 @@
"Linux, the kernel. People who erroneously think “Linux” refers "
"to the entire GNU/Linux combination get tied in knots by these facts, and "
"make paradoxical statements such as “Android contains Linux, but it "
-"isn't Linux.”(<a href=\"#linuxnote\">*</a>) Absent this confusion, the "
+"isn't Linux.”(<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."
msgstr ""
@@ -541,15 +592,30 @@
"niż telefony Apple lub Windows, nie można o nich powiedzieÄ,
że "
"szanujÄ
WaszÄ
wolnoÅÄ."
-#. type: Content of: <ul><li>
-msgid ""
-"<a id=\"linuxnote\"></a>The extreme example of this confusion appears in the "
-"site linuxonandroid.org, which offers help to “install Linux [sic] on "
-"your Android devices.” 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."
+#. 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
+# | “install Linux [sic] on your Android devices.” 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.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"linuxnote\"></a>The extreme example of this confusion appears in "
+#| "the site linuxonandroid.org, which offers help to “install Linux "
+#| "[sic] on your Android devices.” 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 “install Linux [sic] on your Android devices."
+"” 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."
msgstr ""
"<a id=\"linuxnote\"></a>Ekstremalnym przykÅadem tego zamieszania jest strona
"
"linuxonandroid.com, która pomaga „zainstalowaÄ Linuksa [sic] na "
@@ -606,10 +672,11 @@
"tÅumaczeÅ</a>."
#. type: Content of: <div><p>
-# | Copyright © 2011, 2012, 2014, [-2015-] {+2015, 2016+} Richard Stallman
+# | Copyright © 2011, 2012, 2014, [-2015-] {+2015, 2016, 2018+} Richard
+# | Stallman
#, fuzzy
#| msgid "Copyright © 2011, 2012, 2014, 2015 Richard Stallman"
-msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+msgid "Copyright © 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman"
msgstr "Copyright © 2011, 2012, 2014, 2015 Richard Stallman"
#. type: Content of: <div><p>
Index: android-and-users-freedom.pot
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.pot,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- android-and-users-freedom.pot 18 Nov 2016 07:32:53 -0000 1.40
+++ android-and-users-freedom.pot 3 Jun 2018 12:29:23 -0000 1.41
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: android-and-users-freedom.html\n"
-"POT-Creation-Date: 2016-11-18 06:58+0000\n"
+"POT-Creation-Date: 2018-06-03 12:26+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"
@@ -30,15 +30,9 @@
#. type: Content of: <p>
msgid ""
-"First published in <a "
+"First published in <em><a "
"href=\"http://www.guardian.co.uk/technology/2011/sep/19/android-free-software-stallman\";>
"
-"The Guardian</a>"
-msgstr ""
-
-#. type: Content of: <h3>
-msgid ""
-"Support the <a href=\"http://FreeYourAndroid.org/\";> Free Your Android</a> "
-"campaign."
+"The Guardian</a></em>"
msgstr ""
#. type: Content of: <p>
@@ -68,7 +62,7 @@
"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>."
msgstr ""
#. type: Content of: <p>
@@ -83,6 +77,12 @@
"are nonfree, too."
msgstr ""
+#. type: Content of: <div><p>
+msgid ""
+"<em>Support the <a href=\"http://FreeYourAndroid.org/\";>Free Your "
+"Android</a> campaign.</em>"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"Android is very different from the <a "
@@ -92,7 +92,7 @@
"think “Linux” refers to the entire GNU/Linux combination get "
"tied in knots by these facts, and make paradoxical statements such as "
"“Android contains Linux, but it isn't Linux.”(<a "
-"href=\"#linuxnote\">*</a>) Absent this confusion, the situation is simple: "
+"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."
msgstr ""
@@ -336,13 +336,13 @@
"phones, they cannot be said to respect your freedom."
msgstr ""
-#. type: Content of: <ul><li>
+#. type: Content of: <ol><li>
msgid ""
-"<a id=\"linuxnote\"></a>The extreme example of this confusion appears in the "
-"site linuxonandroid.org, which offers help to “install Linux [sic] on "
-"your Android devices.” 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 "
+"The extreme example of this confusion appears in the site "
+"linuxonandroid.org, which offers help to “install Linux [sic] on your "
+"Android devices.” 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."
msgstr ""
@@ -383,7 +383,7 @@
msgstr ""
#. type: Content of: <div><p>
-msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+msgid "Copyright © 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman"
msgstr ""
#. type: Content of: <div><p>
Index: android-and-users-freedom.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.ru.po,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- android-and-users-freedom.ru.po 29 Jun 2016 15:00:44 -0000 1.82
+++ android-and-users-freedom.ru.po 3 Jun 2018 12:29:23 -0000 1.83
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: android-and-users-freedom.html\n"
-"POT-Creation-Date: 2016-06-29 11:55+0000\n"
+"POT-Creation-Date: 2018-06-03 12:26+0000\n"
"PO-Revision-Date: 2016-06-29 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -16,6 +16,7 @@
"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"
@@ -33,21 +34,20 @@
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>+}
+#, fuzzy
+#| 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 <a href=\"http://www.guardian.co.uk/technology/2011/";
-"sep/19/android-free-software-stallman\"> The Guardian</a>"
+"First published in <em><a href=\"http://www.guardian.co.uk/technology/2011/";
+"sep/19/android-free-software-stallman\"> The Guardian</a></em>"
msgstr ""
"ÐпеÑвÑе опÑбликовано в <a
href=\"http://www.guardian.co.uk/technology/2011/";
"sep/19/android-free-software-stallman\">ÐаÑдиан</a>"
-#. type: Content of: <h3>
-msgid ""
-"Support the <a href=\"http://FreeYourAndroid.org/\";> Free Your Android</a> "
-"campaign."
-msgstr ""
-"ÐоддеÑжиÑе ÐºÐ°Ð¼Ð¿Ð°Ð½Ð¸Ñ <a
href=\"http://FreeYourAndroid.org/\";> ÐÑвободи Ñвой "
-"Android</a>."
-
#. type: Content of: <p>
msgid ""
"To what extent does Android respect the freedom of its users? For a computer "
@@ -81,13 +81,28 @@
"ÑвободнÑми."
#. 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>.+}
+#, fuzzy
+#| 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 "
"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>."
+"\"/licenses/copyleft.html\">copyleft</a>."
msgstr ""
"Android — опеÑаÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑиÑÑема, главнÑм
обÑазом Ð´Ð»Ñ Ð¼Ð¾Ð±Ð¸Ð»ÑнÑÑ
"
"ÑелеÑонов и дÑÑгиÑ
ÑÑÑÑойÑÑв, коÑоÑаÑ
ÑоÑÑÐ¾Ð¸Ñ Ð¸Ð· Linux (ÑдÑа ТоÑвалÑдÑа), "
@@ -119,7 +134,44 @@
"ÐекоÑоÑÑе из пÑиложений, коÑоÑÑе обÑÑно
поÑÑавлÑÑÑÑÑ Ñ ÑиÑÑемой Android, "
"Ñакже неÑвободнÑ."
+#. type: Content of: <div><p>
+# | [-Support-]{+<em>Support+} the <a href=\"http://FreeYourAndroid.org/\";>[-
+# | -]Free Your Android</a> [-campaign.-] {+campaign.</em>+}
+#, fuzzy
+#| 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 ""
+"ÐоддеÑжиÑе ÐºÐ°Ð¼Ð¿Ð°Ð½Ð¸Ñ <a
href=\"http://FreeYourAndroid.org/\";> ÐÑвободи Ñвой "
+"Android</a>."
+
#. 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 “Linux” refers to the entire GNU/Linux
+# | combination get tied in knots by these facts, and make paradoxical
+# | statements such as “Android contains Linux, but it isn't
+# | Linux.”(<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.
+#, fuzzy
+#| 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 “"
+#| "Linux” refers to the entire GNU/Linux combination get tied in knots "
+#| "by these facts, and make paradoxical statements such as “Android "
+#| "contains Linux, but it isn't Linux.”(<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, "
@@ -127,7 +179,7 @@
"Linux, the kernel. People who erroneously think “Linux” refers "
"to the entire GNU/Linux combination get tied in knots by these facts, and "
"make paradoxical statements such as “Android contains Linux, but it "
-"isn't Linux.”(<a href=\"#linuxnote\">*</a>) Absent this confusion, the "
+"isn't Linux.”(<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."
msgstr ""
@@ -546,15 +598,30 @@
"знаÑиÑелÑно лÑÑÑе, Ñем ÑмаÑÑÑÐ¾Ð½Ñ Ð½Ð° базе
ÑиÑÑем Apple и Windows, Ð¼Ñ Ð½Ðµ можем "
"ÑказаÑÑ, ÑÑо они ÑважаÑÑ Ð²Ð°ÑÑ ÑвободÑ."
-#. type: Content of: <ul><li>
-msgid ""
-"<a id=\"linuxnote\"></a>The extreme example of this confusion appears in the "
-"site linuxonandroid.org, which offers help to “install Linux [sic] on "
-"your Android devices.” 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."
+#. 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
+# | “install Linux [sic] on your Android devices.” 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.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"linuxnote\"></a>The extreme example of this confusion appears in "
+#| "the site linuxonandroid.org, which offers help to “install Linux "
+#| "[sic] on your Android devices.” 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 “install Linux [sic] on your Android devices."
+"” 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."
msgstr ""
"<a id=\"linuxnote\"></a>ÐÑайний пÑÐ¸Ð¼ÐµÑ ÑÑой пÑÑаниÑÑ
Ð¼Ñ Ð²Ð¸Ð´Ð¸Ð¼ на ÑайÑе "
"linuxonandroid.org, где пÑедлагаÑÑ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð²
“ÑÑÑановке Linux [!] на "
@@ -610,7 +677,11 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+# | Copyright © 2011, 2012, 2014, 2015, [-2016-] {+2016, 2018+} Richard
+# | Stallman
+#, fuzzy
+#| msgid "Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman"
+msgid "Copyright © 2011, 2012, 2014, 2015, 2016, 2018 Richard Stallman"
msgstr ""
"Copyright © 2011, 2012, 2014, 2015, 2016 Richard Stallman<br /"
">Copyright © 2014, 2015, 2016 Free Software Foundation, Inc. "
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy/po android-and-users-freedom.de....,
GNUN <=