www-commits
[Top][All Lists]
Advanced

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

www licenses/license-list.ru.html licenses/po/l...


From: GNUN
Subject: www licenses/license-list.ru.html licenses/po/l...
Date: Wed, 29 Jun 2016 15:00:45 +0000 (UTC)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/06/29 15:00:44

Modified files:
        licenses       : license-list.ru.html 
        licenses/po    : license-list.de.po license-list.es.po 
                         license-list.fr.po license-list.it.po 
                         license-list.ja.po license-list.pot 
                         license-list.ru-en.html license-list.ru.po 
        philosophy     : android-and-users-freedom.ru.html 
        philosophy/po  : android-and-users-freedom.ru-en.html 
                         android-and-users-freedom.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.98&r2=1.99
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de.po?cvsroot=www&r1=1.237&r2=1.238
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es.po?cvsroot=www&r1=1.205&r2=1.206
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.317&r2=1.318
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.265&r2=1.266
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.142&r2=1.143
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.164&r2=1.165
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.91&r2=1.92
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.245&r2=1.246
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/android-and-users-freedom.ru.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.ru-en.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.ru.po?cvsroot=www&r1=1.81&r2=1.82

Patches:
Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- licenses/license-list.ru.html       24 Jun 2016 07:31:44 -0000      1.98
+++ licenses/license-list.ru.html       29 Jun 2016 15:00:43 -0000      1.99
@@ -1368,7 +1368,8 @@
 дополнительным пунктом, в котором 
компании Netscape разрешается использовать
 ваши исходные тексты <em>даже в несвободных 
версиях программы</em>. Конечно,
 они не дают <em>вам</em> разрешения 
использовать <em>их</em> исходные тексты
-аналогичным образом. Мы настоятельно 
рекомендуем вам не применять NPL.</p></dd>
+аналогичным образом. <a href="/philosophy/netscape-npl">Мы 
настоятельно
+рекомендуем вам не применять NPL</a>. </p></dd>
 
 
 <dt><a id="Nokia" href="http://directory.fsf.org/wiki/License:NokOSv1.0a";>
@@ -1541,8 +1542,7 @@
 перераспространении из GPL.</p></dd>
 
 
-<dt><a id="Yahoo"
-href="http://www.zimbra.com/license/yahoo_public_license_1.1.html";>
+<dt><a id="Yahoo" href="http://directory.fsf.org/wiki/License:YPLv1.1";>
 Общественная лицензия Yahoo! (Yahoo! Public License) 
1.1</a> <span
 class="anchor-reference-id">(<a href="#Yahoo">#Yahoo</a>)</span></dt>
 <dd>
@@ -2158,12 +2158,12 @@
 <dt><a id="FDL" href="/licenses/fdl.html"> Лицензия свободной 
документации GNU
 (GNU Free Documentation License)</a> <span class="anchor-reference-id">(<a
 href="#FDL">#FDL</a>)</span></dt>
-<dd>
-<p>Это лицензия, предназначенная для 
применения в свободной документации с
-авторским левом. Мы планируем принимать ее 
для всех руководств GNU. Она
-также подходит для других видов полезных 
работ (таких, как учебники и
-словари, например). Ее применимость не 
ограничивается текстовыми
-произведениями (&ldquo;книгами&rdquo;).</p></dd>
+<dd><p>Это лицензия, предназначенная для 
применения в <a
+href="/philosophy/free-doc.html">свободной 
документации</a> с авторским
+левом. Мы планируем <a 
href="/licenses/using-gfdl">принимать ее для всех
+руководств GNU</a>. Она также подходит для 
других видов полезных работ
+(таких, как учебники и словари, например). 
Ее применимость не ограничивается
+текстовыми произведениями 
(&ldquo;книгами&rdquo;).</p></dd>
 
 
 <dt><a id="FreeBSDDL"
@@ -2510,8 +2510,9 @@
 других ситуациях.</p></dd>
 
 
-<dt><a id="SILOFL" href="http://scripts.sil.org/OFL_web";> Лицензия 
открытых
-шрифтов SIL&nbsp;1.1 (SIL Open Font License 1.1)</a> <span
+<dt><a id="SILOFL"
+href="http://directory.fsf.org/wiki/SIL_Open_Font_License_1.1";> 
Лицензия
+открытых шрифтов SIL&nbsp;1.1 (SIL Open Font License 1.1)</a> 
<span
 class="anchor-reference-id"> (<a href="#SILOFL">#SILOFL</a>)</span></dt>
 <dd>
 <p>Лицензия открытых шрифтов (включая ее 
первоначальный выпуск,
@@ -2660,7 +2661,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/06/24 07:31:44 $
+$Date: 2016/06/29 15:00:43 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.de.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de.po,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -b -r1.237 -r1.238
--- licenses/po/license-list.de.po      28 Jun 2016 17:32:10 -0000      1.237
+++ licenses/po/license-list.de.po      29 Jun 2016 15:00:43 -0000      1.238
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: license-list.html\n"
 "Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2016-06-28 17:27+0000\n"
+"POT-Creation-Date: 2016-06-29 14:57+0000\n"
 "PO-Revision-Date: 2016-04-12 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: www-de <address@hidden>\n"
@@ -4412,11 +4412,11 @@
 
 #. type: Content of: <dl><dd><p>
 # | This is a license intended for use on copylefted [-free documentation.-]
-# | {+<a href=\"/philosophy/free-doc\">free documentation</a>.+}  We plan to
-# | [-adopt it-] {+<a href=\" /licenses/using-gfdl\">adopt it</a>+} for all
-# | GNU manuals.  It is also suitable for other kinds of useful works (such as
-# | textbooks and dictionaries, for instance).  Its applicability is not
-# | limited to textual works (&ldquo;books&rdquo;).
+# | {+<a href=\"/philosophy/free-doc.html\">free documentation</a>.+}  We plan
+# | to [-adopt it-] {+<a href=\"/licenses/using-gfdl.html\">adopt it</a>+} for
+# | all GNU manuals.  It is also suitable for other kinds of useful works
+# | (such as textbooks and dictionaries, for instance).  Its applicability is
+# | not limited to textual works (&ldquo;books&rdquo;).
 #, fuzzy
 #| msgid ""
 #| "This is a license intended for use on copylefted free documentation.  We "
@@ -4426,10 +4426,10 @@
 #| "books&rdquo;)."
 msgid ""
 "This is a license intended for use on copylefted <a href=\"/philosophy/free-"
-"doc\">free documentation</a>.  We plan to <a href=\" /licenses/using-gfdl"
-"\">adopt it</a> for all GNU manuals.  It is also suitable for other kinds of "
-"useful works (such as textbooks and dictionaries, for instance).  Its "
-"applicability is not limited to textual works (&ldquo;books&rdquo;)."
+"doc.html\">free documentation</a>.  We plan to <a href=\"/licenses/using-"
+"gfdl.html\">adopt it</a> for all GNU manuals.  It is also suitable for other "
+"kinds of useful works (such as textbooks and dictionaries, for instance).  "
+"Its applicability is not limited to textual works (&ldquo;books&rdquo;)."
 msgstr ""
 "Dies ist eine Lizenz zur Verwendung auf freie Dokumentation mit Copyleft; "
 "sie soll für alle GNU-Handbücher übernommen werden und eignet sich auch 
für "

Index: licenses/po/license-list.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es.po,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -b -r1.205 -r1.206
--- licenses/po/license-list.es.po      29 Jun 2016 10:30:21 -0000      1.205
+++ licenses/po/license-list.es.po      29 Jun 2016 15:00:43 -0000      1.206
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: license-list.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-28 17:27+0000\n"
+"POT-Creation-Date: 2016-06-29 14:57+0000\n"
 "PO-Revision-Date: 2016-06-29 12:03+0100\n"
 "Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -20,6 +20,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-06-29 14:57+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.6.10\n"
 
@@ -4649,12 +4650,28 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a license intended for use on copylefted <a
+# | [-href=\"/philosophy/free-doc\">free-]
+# | {+href=\"/philosophy/free-doc.html\">free+} documentation</a>.  We plan to
+# | <a [-href=\" /licenses/using-gfdl\">adopt-]
+# | {+href=\"/licenses/using-gfdl.html\">adopt+} it</a> for all GNU manuals. 
+# | It is also suitable for other kinds of useful works (such as textbooks and
+# | dictionaries, for instance).  Its applicability is not limited to textual
+# | works (&ldquo;books&rdquo;).
+#, fuzzy
+#| msgid ""
+#| "This is a license intended for use on copylefted <a href=\"/philosophy/"
+#| "free-doc\">free documentation</a>.  We plan to <a href=\" /licenses/using-"
+#| "gfdl\">adopt it</a> for all GNU manuals.  It is also suitable for other "
+#| "kinds of useful works (such as textbooks and dictionaries, for "
+#| "instance).  Its applicability is not limited to textual works (&ldquo;"
+#| "books&rdquo;)."
 msgid ""
 "This is a license intended for use on copylefted <a href=\"/philosophy/free-"
-"doc\">free documentation</a>.  We plan to <a href=\" /licenses/using-gfdl"
-"\">adopt it</a> for all GNU manuals.  It is also suitable for other kinds of "
-"useful works (such as textbooks and dictionaries, for instance).  Its "
-"applicability is not limited to textual works (&ldquo;books&rdquo;)."
+"doc.html\">free documentation</a>.  We plan to <a href=\"/licenses/using-"
+"gfdl.html\">adopt it</a> for all GNU manuals.  It is also suitable for other "
+"kinds of useful works (such as textbooks and dictionaries, for instance).  "
+"Its applicability is not limited to textual works (&ldquo;books&rdquo;)."
 msgstr ""
 "Esta es una licencia hecha para <a href=\"/philosophy/free-doc"
 "\">documentación libre con copyleft</a>. Planeamos <a href=\" /licenses/"

Index: licenses/po/license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -b -r1.317 -r1.318
--- licenses/po/license-list.fr.po      28 Jun 2016 22:28:54 -0000      1.317
+++ licenses/po/license-list.fr.po      29 Jun 2016 15:00:43 -0000      1.318
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-06-28 17:27+0000\n"
+"POT-Creation-Date: 2016-06-29 14:57+0000\n"
 "PO-Revision-Date: 2016-06-28 23:55+0200\n"
 "Last-Translator: Thérèse godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -19,6 +19,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-06-29 14:57+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.6\n"
 
@@ -4366,12 +4367,28 @@
 "a> <span class=\"anchor-reference-id\">(<a href=\"#FDL\">#FDL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a license intended for use on copylefted <a
+# | [-href=\"/philosophy/free-doc\">free-]
+# | {+href=\"/philosophy/free-doc.html\">free+} documentation</a>.  We plan to
+# | <a [-href=\" /licenses/using-gfdl\">adopt-]
+# | {+href=\"/licenses/using-gfdl.html\">adopt+} it</a> for all GNU manuals. 
+# | It is also suitable for other kinds of useful works (such as textbooks and
+# | dictionaries, for instance).  Its applicability is not limited to textual
+# | works (&ldquo;books&rdquo;).
+#, fuzzy
+#| msgid ""
+#| "This is a license intended for use on copylefted <a href=\"/philosophy/"
+#| "free-doc\">free documentation</a>.  We plan to <a href=\" /licenses/using-"
+#| "gfdl\">adopt it</a> for all GNU manuals.  It is also suitable for other "
+#| "kinds of useful works (such as textbooks and dictionaries, for "
+#| "instance).  Its applicability is not limited to textual works (&ldquo;"
+#| "books&rdquo;)."
 msgid ""
 "This is a license intended for use on copylefted <a href=\"/philosophy/free-"
-"doc\">free documentation</a>.  We plan to <a href=\" /licenses/using-gfdl"
-"\">adopt it</a> for all GNU manuals.  It is also suitable for other kinds of "
-"useful works (such as textbooks and dictionaries, for instance).  Its "
-"applicability is not limited to textual works (&ldquo;books&rdquo;)."
+"doc.html\">free documentation</a>.  We plan to <a href=\"/licenses/using-"
+"gfdl.html\">adopt it</a> for all GNU manuals.  It is also suitable for other "
+"kinds of useful works (such as textbooks and dictionaries, for instance).  "
+"Its applicability is not limited to textual works (&ldquo;books&rdquo;)."
 msgstr ""
 "La licence GNU de documentation libre (GNU FDL) est destinée à la <a 
href=\"/"
 "philosophy/free-doc\">documentation libre</a> sous copyleft. Nous prévoyons "

Index: licenses/po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -b -r1.265 -r1.266
--- licenses/po/license-list.it.po      28 Jun 2016 17:32:10 -0000      1.265
+++ licenses/po/license-list.it.po      29 Jun 2016 15:00:44 -0000      1.266
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-06-28 17:27+0000\n"
+"POT-Creation-Date: 2016-06-29 14:57+0000\n"
 "PO-Revision-Date: 2016-04-30 23:50+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -4660,11 +4660,11 @@
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
 # | This is a license intended for use on copylefted [-free documentation.-]
-# | {+<a href=\"/philosophy/free-doc\">free documentation</a>.+}  We plan to
-# | [-adopt it-] {+<a href=\" /licenses/using-gfdl\">adopt it</a>+} for all
-# | GNU manuals.  It is also suitable for other kinds of useful works (such as
-# | textbooks and dictionaries, for instance).  Its applicability is not
-# | limited to textual works (&ldquo;books&rdquo;).
+# | {+<a href=\"/philosophy/free-doc.html\">free documentation</a>.+}  We plan
+# | to [-adopt it-] {+<a href=\"/licenses/using-gfdl.html\">adopt it</a>+} for
+# | all GNU manuals.  It is also suitable for other kinds of useful works
+# | (such as textbooks and dictionaries, for instance).  Its applicability is
+# | not limited to textual works (&ldquo;books&rdquo;).
 #, fuzzy
 #| msgid ""
 #| "This is a license intended for use on copylefted free documentation.  We "
@@ -4674,10 +4674,10 @@
 #| "books&rdquo;)."
 msgid ""
 "This is a license intended for use on copylefted <a href=\"/philosophy/free-"
-"doc\">free documentation</a>.  We plan to <a href=\" /licenses/using-gfdl"
-"\">adopt it</a> for all GNU manuals.  It is also suitable for other kinds of "
-"useful works (such as textbooks and dictionaries, for instance).  Its "
-"applicability is not limited to textual works (&ldquo;books&rdquo;)."
+"doc.html\">free documentation</a>.  We plan to <a href=\"/licenses/using-"
+"gfdl.html\">adopt it</a> for all GNU manuals.  It is also suitable for other "
+"kinds of useful works (such as textbooks and dictionaries, for instance).  "
+"Its applicability is not limited to textual works (&ldquo;books&rdquo;)."
 msgstr ""
 "Questa licenza è stata progettata per documentazione libera con copyleft. "
 "Pensiamo di adottarla per tutti i manuali GNU. Si presta anche ad altri tipi "

Index: licenses/po/license-list.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja.po,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- licenses/po/license-list.ja.po      28 Jun 2016 17:32:10 -0000      1.142
+++ licenses/po/license-list.ja.po      29 Jun 2016 15:00:44 -0000      1.143
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-06-28 17:27+0000\n"
+"POT-Creation-Date: 2016-06-29 14:57+0000\n"
 "PO-Revision-Date: 2016-06-28 12:45+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -4233,10 +4233,10 @@
 #| "books&rdquo;)."
 msgid ""
 "This is a license intended for use on copylefted <a href=\"/philosophy/free-"
-"doc\">free documentation</a>.  We plan to <a href=\" /licenses/using-gfdl"
-"\">adopt it</a> for all GNU manuals.  It is also suitable for other kinds of "
-"useful works (such as textbooks and dictionaries, for instance).  Its "
-"applicability is not limited to textual works (&ldquo;books&rdquo;)."
+"doc.html\">free documentation</a>.  We plan to <a href=\"/licenses/using-"
+"gfdl.html\">adopt it</a> for all GNU manuals.  It is also suitable for other "
+"kinds of useful works (such as textbooks and dictionaries, for instance).  "
+"Its applicability is not limited to textual works (&ldquo;books&rdquo;)."
 msgstr ""
 
"これは、コピーレフトの自由な文書に使うことを目的としたライセンスです。わたし"
 
"たちはこれを、すべてのGNUマニュアルに適用する予定です。また、このライセンスは"

Index: licenses/po/license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- licenses/po/license-list.pot        28 Jun 2016 17:32:10 -0000      1.164
+++ licenses/po/license-list.pot        29 Jun 2016 15:00:44 -0000      1.165
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-06-28 17:27+0000\n"
+"POT-Creation-Date: 2016-06-29 14:57+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"
@@ -3000,9 +3000,9 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is a license intended for use on copylefted <a "
-"href=\"/philosophy/free-doc\">free documentation</a>.  We plan to <a href=\" "
-"/licenses/using-gfdl\">adopt it</a> for all GNU manuals.  It is also "
-"suitable for other kinds of useful works (such as textbooks and "
+"href=\"/philosophy/free-doc.html\">free documentation</a>.  We plan to <a "
+"href=\"/licenses/using-gfdl.html\">adopt it</a> for all GNU manuals.  It is "
+"also suitable for other kinds of useful works (such as textbooks and "
 "dictionaries, for instance).  Its applicability is not limited to textual "
 "works (&ldquo;books&rdquo;)."
 msgstr ""

Index: licenses/po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- licenses/po/license-list.ru-en.html 24 Jun 2016 07:31:44 -0000      1.91
+++ licenses/po/license-list.ru-en.html 29 Jun 2016 15:00:44 -0000      1.92
@@ -1386,8 +1386,9 @@
 License version 1.1 with an added clause that permits Netscape to use
 your added code <em>even in their proprietary versions of the
 program</em>.  Of course, they do not give <em>you</em> permission to
-use <em>their</em> code in the analogous way.  We urge you not to use
-the NPL.</p></dd>
+use <em>their</em> code in the analogous
+way.  <a href="/philosophy/netscape-npl">We urge you not to use
+the NPL.</a> </p></dd>
 
 
 <dt><a id="Nokia" href="http://directory.fsf.org/wiki/License:NokOSv1.0a";>
@@ -1567,7 +1568,7 @@
 
 
 <dt><a id="Yahoo"
-       href="http://www.zimbra.com/license/yahoo_public_license_1.1.html";>
+       href="http://directory.fsf.org/wiki/License:YPLv1.1";>
     Yahoo! Public License 1.1</a>
     <span class="anchor-reference-id">(<a href="#Yahoo">#Yahoo</a>)</span></dt>
 <dd>
@@ -2174,12 +2175,12 @@
 <dt><a id="FDL" href="/licenses/fdl.html">
     GNU Free Documentation License</a>
     <span class="anchor-reference-id">(<a href="#FDL">#FDL</a>)</span></dt>
-<dd>
-<p>This is a license intended for use on copylefted free documentation.
-We plan to adopt it for all GNU manuals.  It is also suitable for other
-kinds of useful works (such as textbooks and dictionaries, for
-instance).  Its applicability is not limited to textual works
-(&ldquo;books&rdquo;).</p></dd>
+<dd><p>This is a license intended for use on
+copylefted <a href="/philosophy/free-doc.html">free documentation</a>.  We
+plan to <a href="/licenses/using-gfdl.html">adopt it</a> for all GNU
+manuals.  It is also suitable for other kinds of useful works (such as
+textbooks and dictionaries, for instance).  Its applicability is not
+limited to textual works (&ldquo;books&rdquo;).</p></dd>
 
 
 <dt><a id="FreeBSDDL"
@@ -2521,7 +2522,7 @@
 and could be overly burdensome in other contexts.</p></dd>
 
 
-<dt><a id="SILOFL" href="http://scripts.sil.org/OFL_web";>
+<dt><a id="SILOFL" 
href="http://directory.fsf.org/wiki/SIL_Open_Font_License_1.1";>
     SIL Open Font License 1.1</a>
     <span class="anchor-reference-id">
        (<a href="#SILOFL">#SILOFL</a>)</span></dt>
@@ -2649,7 +2650,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/06/24 07:31:44 $
+$Date: 2016/06/29 15:00:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -b -r1.245 -r1.246
--- licenses/po/license-list.ru.po      29 Jun 2016 14:49:52 -0000      1.245
+++ licenses/po/license-list.ru.po      29 Jun 2016 15:00:44 -0000      1.246
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-06-28 17:27+0000\n"
+"POT-Creation-Date: 2016-06-29 14:57+0000\n"
 "PO-Revision-Date: 2016-06-29 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2016-06-28 16:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -2680,20 +2679,6 @@
 "\">#NPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-# | This is a free software license, not a strong copyleft, and incompatible
-# | with the GNU GPL.  It consists of the Mozilla Public License version 1.1
-# | with an added clause that permits Netscape to use your added code <em>even
-# | in their proprietary versions of the program</em>.  Of course, they do not
-# | give <em>you</em> permission to use <em>their</em> code in the analogous
-# | way.  [-We-]  {+<a href=\"/philosophy/netscape-npl\">We+} urge you not to
-# | use the [-NPL.-] {+NPL.</a>+}
-#| msgid ""
-#| "This is a free software license, not a strong copyleft, and incompatible "
-#| "with the GNU GPL.  It consists of the Mozilla Public License version 1.1 "
-#| "with an added clause that permits Netscape to use your added code "
-#| "<em>even in their proprietary versions of the program</em>.  Of course, "
-#| "they do not give <em>you</em> permission to use <em>their</em> code in "
-#| "the analogous way.  We urge you not to use the NPL."
 msgid ""
 "This is a free software license, not a strong copyleft, and incompatible "
 "with the GNU GPL.  It consists of the Mozilla Public License version 1.1 "
@@ -2708,7 +2693,8 @@
 "дополнительным пунктом, в котором 
компании Netscape разрешается использовать "
 "ваши исходные тексты <em>даже в несвободных 
версиях программы</em>. Конечно, "
 "они не дают <em>вам</em> разрешения 
использовать <em>их</em> исходные тексты "
-"аналогичным образом. <a 
href=\"/philosophy/netscape-npl\">Мы настоятельно 
рекомендуем вам не применять NPL</a>."
+"аналогичным образом. <a 
href=\"/philosophy/netscape-npl\">Мы настоятельно "
+"рекомендуем вам не применять NPL</a>."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -3082,24 +3068,14 @@
 "перераспространении из GPL."
 
 #. type: Content of: <dl><dt>
-# | <a [-id=\"SPL\" href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";>
-# | Sun-] {+id=\"Yahoo\"
-# | href=\"http://directory.fsf.org/wiki/License:YPLv1.1\";> Yahoo!+} Public
-# | [-License</a>-] {+License 1.1</a>+} <span
-# | class=\"anchor-reference-id\">(<a [-href=\"#SPL\">#SPL</a>)</span>-]
-# | {+href=\"#Yahoo\">#Yahoo</a>)</span>+}
-#| msgid ""
-#| "<a id=\"SPL\" href=\"http://directory.fsf.org/wiki/License:SPLv1.0\";> Sun "
-#| "Public License</a> <span class=\"anchor-reference-id\">(<a href=\"#SPL"
-#| "\">#SPL</a>)</span>"
 msgid ""
 "<a id=\"Yahoo\" href=\"http://directory.fsf.org/wiki/License:YPLv1.1\";> "
 "Yahoo! Public License 1.1</a> <span class=\"anchor-reference-id\">(<a href="
 "\"#Yahoo\">#Yahoo</a>)</span>"
 msgstr ""
 "<a id=\"Yahoo\" href=\"http://directory.fsf.org/wiki/License:YPLv1.1\";> "
-"Общественная лицензия Yahoo! (Yahoo! Public License) 
1.1</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#Yahoo\">#Yahoo</a>)</span>"
+"Общественная лицензия Yahoo! (Yahoo! Public License) 
1.1</a> <span class="
+"\"anchor-reference-id\">(<a href=\"#Yahoo\">#Yahoo</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -4395,29 +4371,16 @@
 "(<a href=\"#FDL\">#FDL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-# | This is a license intended for use on copylefted [-free documentation.-]
-# | {+<a href=\"/philosophy/free-doc\">free documentation</a>.+}  We plan to
-# | [-adopt it-] {+<a href=\" /licenses/using-gfdl\">adopt it</a>+} for all
-# | GNU manuals.  It is also suitable for other kinds of useful works (such as
-# | textbooks and dictionaries, for instance).  Its applicability is not
-# | limited to textual works (&ldquo;books&rdquo;).
-#| msgid ""
-#| "This is a license intended for use on copylefted free documentation.  We "
-#| "plan to adopt it for all GNU manuals.  It is also suitable for other "
-#| "kinds of useful works (such as textbooks and dictionaries, for "
-#| "instance).  Its applicability is not limited to textual works (&ldquo;"
-#| "books&rdquo;)."
 msgid ""
 "This is a license intended for use on copylefted <a href=\"/philosophy/free-"
-"doc.html\">free documentation</a>.  We plan to <a 
href=\"/licenses/using-gfdl.html"
-"\">adopt it</a> for all GNU manuals.  It is also suitable for other kinds of "
-"useful works (such as textbooks and dictionaries, for instance).  Its "
-"applicability is not limited to textual works (&ldquo;books&rdquo;)."
+"doc.html\">free documentation</a>.  We plan to <a href=\"/licenses/using-"
+"gfdl.html\">adopt it</a> for all GNU manuals.  It is also suitable for other "
+"kinds of useful works (such as textbooks and dictionaries, for instance).  "
+"Its applicability is not limited to textual works (&ldquo;books&rdquo;)."
 msgstr ""
 "Это лицензия, предназначенная для 
применения в <a href=\"/philosophy/free-"
-"doc.html\">свободной документации</a> с "
-"авторским левом. Мы планируем <a 
href=\"/licenses/using-gfdl"
-"\">принимать ее для всех руководств GNU</a>. 
Она "
+"doc.html\">свободной документации</a> с 
авторским левом. Мы планируем <a "
+"href=\"/licenses/using-gfdl\">принимать ее для всех 
руководств GNU</a>. Она "
 "также подходит для других видов полезных 
работ (таких, как учебники и "
 "словари, например). Ее применимость не 
ограничивается текстовыми "
 "произведениями (&ldquo;книгами&rdquo;)."
@@ -5071,22 +5034,15 @@
 "других ситуациях."
 
 #. type: Content of: <dl><dt>
-# | <a id=\"SILOFL\" [-href=\"http://scripts.sil.org/OFL_web\";>-]
-# | {+href=\"http://directory.fsf.org/wiki/SIL_Open_Font_License_1.1\";>+} SIL
-# | Open Font License 1.1</a> <span class=\"anchor-reference-id\"> (<a
-# | href=\"#SILOFL\">#SILOFL</a>)</span>
-#| msgid ""
-#| "<a id=\"SILOFL\" href=\"http://scripts.sil.org/OFL_web\";> SIL Open Font "
-#| "License 1.1</a> <span class=\"anchor-reference-id\"> (<a href=\"#SILOFL"
-#| "\">#SILOFL</a>)</span>"
 msgid ""
 "<a id=\"SILOFL\" href=\"http://directory.fsf.org/wiki/";
 "SIL_Open_Font_License_1.1\"> SIL Open Font License 1.1</a> <span class="
 "\"anchor-reference-id\"> (<a href=\"#SILOFL\">#SILOFL</a>)</span>"
 msgstr ""
-"<a id=\"SILOFL\" 
href=\"http://directory.fsf.org/wiki/SIL_Open_Font_License_1.1\";> 
Лицензия открытых "
-"шрифтов SIL&nbsp;1.1 (SIL Open Font License 1.1)</a> <span 
class=\"anchor-"
-"reference-id\"> (<a href=\"#SILOFL\">#SILOFL</a>)</span>"
+"<a id=\"SILOFL\" href=\"http://directory.fsf.org/wiki/";
+"SIL_Open_Font_License_1.1\"> Лицензия открытых шрифтов 
SIL&nbsp;1.1 (SIL "
+"Open Font License 1.1)</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#SILOFL\">#SILOFL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""

Index: philosophy/android-and-users-freedom.ru.html
===================================================================
RCS file: /web/www/www/philosophy/android-and-users-freedom.ru.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- philosophy/android-and-users-freedom.ru.html        1 May 2015 18:13:42 
-0000       1.46
+++ philosophy/android-and-users-freedom.ru.html        29 Jun 2016 15:00:44 
-0000      1.47
@@ -124,6 +124,14 @@
 системы Android, но лучше от этого она не 
становится.
 </p>
 
+<p>Компания Google переместила многие общие 
базовые функции в несвободную <a
+href="https://blog.grobox.de/2016/the-proprietarization-of-android-google-play-services-and-apps/";>библиотеку
+Google Play Services</a>. Если собственные программы 
приложения свободны, но
+зависят от Google Play Services, в целом это 
приложение фактически
+несвободно; оно не может работать в 
свободной версии системы Android, такой
+как Replicant.
+</p>
+
 <p>Если вы цените свободу, несвободные 
приложения, которые предлагает Google
 Play, вам не нужны. Чтобы устанавливать 
свободные приложения Android, вам не
 нужен Google Play, потому что вы можете получить 
их с <a
@@ -311,13 +319,14 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2014, 2015 Richard Stallman<br />Copyright
-&copy; 2014, 2015 Free Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2011, 2012, 2014, 2015, 2016 Richard Stallman<br
+/>Copyright &copy; 2014, 2015, 2016 Free Software Foundation,
+Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -332,7 +341,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/01 18:13:42 $
+$Date: 2016/06/29 15:00:44 $
 
 <!-- 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.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- philosophy/po/android-and-users-freedom.ru-en.html  1 May 2015 18:13:43 
-0000       1.41
+++ philosophy/po/android-and-users-freedom.ru-en.html  29 Jun 2016 15:00:44 
-0000      1.42
@@ -115,6 +115,13 @@
 it any less bad.
 </p>
 
+<p>Google has moved many basic general facilities into the
+nonfree <a 
href="https://blog.grobox.de/2016/the-proprietarization-of-android-google-play-services-and-apps/";>Google
+Play Services library</a>.  If an app's own code is free software but
+it depends on Google Play Services, that app as a whole is effectively
+nonfree; it can't run on a free version of Android, such as Replicant.
+</p>
+
 <p>If you value freedom, you don't want the nonfree apps that Google
 Play offers.  To install free Android apps, you don't need Google
 Play, because you can get them
@@ -282,17 +289,17 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2014, 2015 Richard Stallman</p>
+<p>Copyright &copy; 2011, 2012, 2014, 2015, 2016 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/05/01 18:13:43 $
+$Date: 2016/06/29 15:00:44 $
 <!-- 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.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- philosophy/po/android-and-users-freedom.ru.po       29 Jun 2016 14:49:52 
-0000      1.81
+++ philosophy/po/android-and-users-freedom.ru.po       29 Jun 2016 15:00:44 
-0000      1.82
@@ -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: 2016-06-29 11:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Android and Users' Freedom - GNU Project - Free Software Foundation"
@@ -280,12 +279,12 @@
 "is effectively nonfree; it can't run on a free version of Android, such as "
 "Replicant."
 msgstr ""
-"Компания Google переместила многие общие 
базовые функции в несвободную <a href="
-"\"https://blog.grobox.de/2016/the-proprietarization-of-android-google-play-";
-"services-and-apps/\">библиотеку Google Play Services</a>. Если 
собственные "
-"программы приложения свободны, но зависят 
от Google Play Services, в целом "
-"это приложение фактически несвободно; оно 
не может работать в свободной версии "
-"системы Android, такой как Replicant."
+"Компания Google переместила многие общие 
базовые функции в несвободную <a "
+"href=\"https://blog.grobox.de/2016/the-proprietarization-of-android-google-";
+"play-services-and-apps/\">библиотеку Google Play Services</a>. 
Если "
+"собственные программы приложения 
свободны, но зависят от Google Play "
+"Services, в целом это приложение фактически 
несвободно; оно не может "
+"работать в свободной версии системы Android, 
такой как Replicant."
 
 #. type: Content of: <p>
 msgid ""
@@ -611,19 +610,13 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 2011, 2012, 2014, [-2015-] {+2015, 2016+} Richard Stallman
-#| msgid "Copyright &copy; 2011, 2012, 2014, 2015 Richard Stallman"
 msgid "Copyright &copy; 2011, 2012, 2014, 2015, 2016 Richard Stallman"
 msgstr ""
-"Copyright &copy; 2011, 2012, 2014, 2015, 2016 Richard Stallman<br />Copyright 
"
-"&copy; 2014, 2015, 2016 Free Software Foundation, Inc. (translation)"
+"Copyright &copy; 2011, 2012, 2014, 2015, 2016 Richard Stallman<br /"
+">Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc. "
+"(translation)"
 
 #. type: Content of: <div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"



reply via email to

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