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

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/06/24 07:31:45

Modified files:
        licenses       : license-list.ru.html 
        licenses/po    : license-list.ru-en.html license-list.ru.po 
        proprietary    : malware-microsoft.ru.html 
        proprietary/po : malware-microsoft.ru-en.html 
                         malware-microsoft.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.97&r2=1.98
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.90&r2=1.91
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.241&r2=1.242
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/malware-microsoft.ru.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.ru-en.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.ru.po?cvsroot=www&r1=1.60&r2=1.61

Patches:
Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- licenses/license-list.ru.html       12 Apr 2016 08:59:12 -0000      1.97
+++ licenses/license-list.ru.html       24 Jun 2016 07:31:44 -0000      1.98
@@ -1421,12 +1421,12 @@
 Лицензия OpenSSL</a> <span class="anchor-reference-id"> (<a
 href="#OpenSSL">#OpenSSL</a>)</span></dt>
 <dd>
-<p>Лицензия OpenSSL является конъюнкцией двух 
лицензий, одна из
-которых&nbsp;&mdash; лицензия SSLeay. Вы должны 
следовать обеим. Сочетание
-приводит к лицензии свободных программ с 
авторским левом, которая
-несовместима с GNU GPL. В ней также есть пункт 
о рекламе, как в <a
-href="#OriginalBSD"> первоначальной лицензии BSD</a> и 
в <a
-href="#apache1">лицензии Apache&nbsp;1</a>.</p>
+<p>Лицензия OpenSSL является конъюнкцией двух 
лицензий, одна из них называется
+&ldquo;лицензией OpenSSL&rdquo;, другая&nbsp;&mdash; 
лицензией SSLeay. Вы
+должны следовать обеим. Сочетание 
приводит к лицензии свободных программ с
+авторским левом, которая несовместима с GNU 
GPL. В ней также есть пункт о
+рекламе, как в <a href="#OriginalBSD"> первоначальной 
лицензии BSD</a> и в
+<a href="#apache1">лицензии Apache&nbsp;1</a>.</p>
 
 <p>Мы рекомендуем применять GNUTLS вместо OpenSSL 
в программах, которые вы
 пишете. Однако нет причин не пользоваться 
OpenSSL и приложениями, которые
@@ -2660,7 +2660,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/04/12 08:59:12 $
+$Date: 2016/06/24 07:31:44 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- licenses/po/license-list.ru-en.html 12 Apr 2016 08:59:12 -0000      1.90
+++ licenses/po/license-list.ru-en.html 24 Jun 2016 07:31:44 -0000      1.91
@@ -1442,12 +1442,12 @@
     <span class="anchor-reference-id">
        (<a href="#OpenSSL">#OpenSSL</a>)</span></dt>
 <dd>
-<p>The license of OpenSSL is a conjunction of two licenses, one of them
-being the license of SSLeay.  You must follow both.  The combination
-results in a copyleft free software license that is incompatible with
-the GNU GPL.  It also has an advertising clause like the <a
-href="#OriginalBSD">original BSD license</a> and the <a
-href="#apache1">Apache&nbsp;1 license</a>.</p>
+<p>The license of OpenSSL is a conjunction of two licenses, one called
+&ldquo;OpenSSL License&rdquo; and the other being the license of SSLeay. You 
must
+follow both.  The combination results in a copyleft free software
+license that is incompatible with the GNU GPL.  It also has an
+advertising clause like the <a href="#OriginalBSD">original BSD
+license</a> and the <a href="#apache1">Apache&nbsp;1 license</a>.</p>
 
 <p>We recommend using GNUTLS instead of OpenSSL in software you write.
 However, there is no reason not to use OpenSSL and applications that
@@ -2649,7 +2649,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/04/12 08:59:12 $
+$Date: 2016/06/24 07:31: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.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- licenses/po/license-list.ru.po      24 Jun 2016 06:27:16 -0000      1.241
+++ licenses/po/license-list.ru.po      24 Jun 2016 07:31:44 -0000      1.242
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2016-06-23 19:25+0000\n"
+"POT-Creation-Date: 2016-06-24 06:25+0000\n"
 "PO-Revision-Date: 2016-04-12 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-23 19:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -2808,33 +2807,20 @@
 "\">#OpenSSL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-# | The license of OpenSSL is a conjunction of two licenses, one [-of them-]
-# | {+called \"OpenSSL License\" and the other+} being the license of SSLeay.
-# | You must follow both.  The combination results in a copyleft free software
-# | license that is incompatible with the GNU GPL.  It also has an advertising
-# | clause like the <a href=\"#OriginalBSD\">original BSD license</a> and the
-# | <a href=\"#apache1\">Apache&nbsp;1 license</a>.
-#| msgid ""
-#| "The license of OpenSSL is a conjunction of two licenses, one of them "
-#| "being the license of SSLeay.  You must follow both.  The combination "
-#| "results in a copyleft free software license that is incompatible with the "
-#| "GNU GPL.  It also has an advertising clause like the <a href="
-#| "\"#OriginalBSD\">original BSD license</a> and the <a href="
-#| "\"#apache1\">Apache&nbsp;1 license</a>."
 msgid ""
-"The license of OpenSSL is a conjunction of two licenses, one called "
-"&ldquo;OpenSSL License&rdquo; and the other being the license of SSLeay. You 
must "
+"The license of OpenSSL is a conjunction of two licenses, one called &ldquo;"
+"OpenSSL License&rdquo; and the other being the license of SSLeay. You must "
 "follow both.  The combination results in a copyleft free software license "
 "that is incompatible with the GNU GPL.  It also has an advertising clause "
 "like the <a href=\"#OriginalBSD\">original BSD license</a> and the <a href="
 "\"#apache1\">Apache&nbsp;1 license</a>."
 msgstr ""
 "Лицензия OpenSSL является конъюнкцией двух 
лицензий, одна из них называется "
-"&ldquo;лицензией OpenSSL&rdquo;, другая&nbsp;&mdash; 
лицензией SSLeay. Вы должны следовать обеим. 
Сочетание приводит к "
-"лицензии свободных программ с авторским 
левом, которая несовместима с GNU "
-"GPL. В ней также есть пункт о рекламе, как в <a 
href=\"#OriginalBSD\"> "
-"первоначальной лицензии BSD</a> и в <a 
href=\"#apache1\">лицензии "
-"Apache&nbsp;1</a>."
+"&ldquo;лицензией OpenSSL&rdquo;, другая&nbsp;&mdash; 
лицензией SSLeay. Вы "
+"должны следовать обеим. Сочетание 
приводит к лицензии свободных программ с "
+"авторским левом, которая несовместима с GNU 
GPL. В ней также есть пункт о "
+"рекламе, как в <a href=\"#OriginalBSD\"> 
первоначальной лицензии BSD</a> и в "
+"<a href=\"#apache1\">лицензии Apache&nbsp;1</a>."
 
 #. type: Content of: <dl><dd><p>
 msgid ""

Index: proprietary/malware-microsoft.ru.html
===================================================================
RCS file: /web/www/www/proprietary/malware-microsoft.ru.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- proprietary/malware-microsoft.ru.html       10 Jun 2016 19:59:28 -0000      
1.18
+++ proprietary/malware-microsoft.ru.html       24 Jun 2016 07:31:44 -0000      
1.19
@@ -137,6 +137,10 @@
 поддержки старой версии на ваших будущих 
платформах.
   </p></li>
 
+  <li><p>&ldquo;Обновления&rdquo; Windows 10 <a
+href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/";>удаляют
+программы</a> без разрешения.</p></li>
+
   <li><p>
   Microsoft <a
 
href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1";>
@@ -361,7 +365,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/06/10 19:59:28 $
+$Date: 2016/06/24 07:31:44 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/po/malware-microsoft.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.ru-en.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- proprietary/po/malware-microsoft.ru-en.html 10 Jun 2016 19:59:29 -0000      
1.17
+++ proprietary/po/malware-microsoft.ru-en.html 24 Jun 2016 07:31:44 -0000      
1.18
@@ -120,6 +120,10 @@
   the old version on your future platforms.
   </p></li>
 
+  <li><p>Windows 10 &ldquo;upgrades&rdquo; <a
+      
href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/";>
+      delete applications</a> without asking permission.</p></li>
+
   <li><p>
   Microsoft is <a 
href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1";>
   repeatedly nagging many users to install Windows 10</a>.
@@ -309,7 +313,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/06/10 19:59:29 $
+$Date: 2016/06/24 07:31:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/malware-microsoft.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.ru.po,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- proprietary/po/malware-microsoft.ru.po      24 Jun 2016 06:27:16 -0000      
1.60
+++ proprietary/po/malware-microsoft.ru.po      24 Jun 2016 07:31:45 -0000      
1.61
@@ -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-24 01:26+0000\n"
 
 #. type: Content of: <title>
 msgid ""