www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www distros/distros.ru.html distros/free-system...

From: GNUN
Subject: www distros/distros.ru.html distros/free-system...
Date: Tue, 17 Oct 2017 12:29:36 -0400 (EDT) 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     17/10/17 12:29:35

Modified files:
        distros        : distros.ru.html 
                         free-system-distribution-guidelines.ru.html 
        distros/po     : distros.ru-en.html distros.ru.po 
                         free-system-distribution-guidelines.ru-en.html 
                         free-system-distribution-guidelines.ru.po 
        licenses       : gpl-faq.ru.html license-list.ru.html 
                         license-recommendations.ru.html 
        licenses/po    : gpl-faq.ru-en.html gpl-faq.ru.po 
                         license-list.cs.po license-list.de-diff.html 
                         license-list.de.po license-list.es.po 
                         license-list.fr.po license-list.it.po 
                         license-list.ja-diff.html license-list.ja.po 
                         license-list.pl.po license-list.pot 
                         license-list.ru-en.html license-list.ru.po 
                         license-recommendations.ru-en.html 
                         license-recommendations.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/distros.ru.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-system-distribution-guidelines.ru.html?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.ru-en.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.ru.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-system-distribution-guidelines.ru-en.html?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-system-distribution-guidelines.ru.po?cvsroot=www&r1=1.74&r2=1.75
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.ru.html?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.112&r2=1.113
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-recommendations.ru.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru-en.html?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru.po?cvsroot=www&r1=1.139&r2=1.140
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.cs.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de.po?cvsroot=www&r1=1.266&r2=1.267
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es.po?cvsroot=www&r1=1.235&r2=1.236
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.346&r2=1.347
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.287&r2=1.288
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.160&r2=1.161
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pl.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.175&r2=1.176
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.101&r2=1.102
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.279&r2=1.280
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ru-en.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ru.po?cvsroot=www&r1=1.41&r2=1.42

Patches:
Index: distros/distros.ru.html
===================================================================
RCS file: /web/www/www/distros/distros.ru.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- distros/distros.ru.html     15 Sep 2015 11:58:09 -0000      1.37
+++ distros/distros.ru.html     17 Oct 2017 16:29:33 -0000      1.38
@@ -15,14 +15,13 @@
 <h2>Дистрибутивы GNU/Linux</h2>
 
 <p>
-Свободные дистрибутивы системы GNU/Linux 
включают
-и предлагают только свободное программное 
обеспечение.
-Они отказываются от несвободных 
приложений, несвободных
-платформ программирования, несвободных 
драйверов, несвободных
-программ для устройств (&ldquo;клякс&rdquo;) и 
всех прочих несвободных
-программ и документации. Если они 
обнаруживают, что включили что-то из этого
-по ошибке,
-они удаляют это.
+Свободные дистрибутивы <a 
href="/gnu/linux-and-gnu.html">системы
+GNU/Linux</a> включают
+и предлагают только свободные программы. 
Они отказываются от несвободных
+приложений, несвободных платформ 
программирования, несвободных драйверов,
+несвободных программ для устройств 
(&ldquo;клякс&rdquo;) и всех прочих
+несвободных программ и документации. Если 
они обнаруживают, что включили
+что-то из этого по ошибке, они удаляют это.
 </p>
 
 <h3 id="freeDistros">Свободные дистрибутивы GNU/Linux</h3>
@@ -167,7 +166,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -181,12 +180,12 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc.</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">
@@ -201,7 +200,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/09/15 11:58:09 $
+$Date: 2017/10/17 16:29:33 $
 
 <!-- timestamp end -->
 </p>

Index: distros/free-system-distribution-guidelines.ru.html
===================================================================
RCS file: /web/www/www/distros/free-system-distribution-guidelines.ru.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- distros/free-system-distribution-guidelines.ru.html 23 Feb 2016 09:59:26 
-0000      1.52
+++ distros/free-system-distribution-guidelines.ru.html 17 Oct 2017 16:29:33 
-0000      1.53
@@ -18,10 +18,10 @@
 <h3 id="introduction">Введение</h3>
 
 <p>Эти рекомендации предназначены для того, 
чтобы объяснить, что требуется от
-дистрибутива устанавливаемой системы 
(такого, как дистрибутив GNU/Linux),
-чтобы он мог считаться <a 
href="/philosophy/free-sw.html">свободным</a>, и
-помочь разработчикам дистрибутивов 
привести свои дистрибутивы в соответствие
-этим требованиям.</p>
+дистрибутива устанавливаемой системы 
(такого, как дистрибутив <a
+href="/gnu/linux-and-gnu.html">GNU/Linux</a>), чтобы он мог 
считаться <a
+href="/philosophy/free-sw.html">свободным</a>, и помочь 
разработчикам
+дистрибутивов привести свои дистрибутивы 
в соответствие этим требованиям.</p>
 
 <p>Эти рекомендации не полны. Мы упомянули 
аспекты, о которых нам сейчас
 известно, но мы уверены, что есть и другие. 
Мы будем добавлять их по мере
@@ -82,6 +82,10 @@
 измениться. Программы в системе не должны 
предлагать установку несвободных
 дополнений, документации и так далее.</p>
 
+<p>Например, дистрибутив свободной системы 
не может содержать браузеры, которые
+реализуют EME&nbsp;&mdash; функции браузера, 
спроектированные для загрузки
+модулей цифрового управления 
ограничениями.</p>
+
 <p>Свободный дистрибутив должен быть 
самостоятелен. Это значит, что вы должны
 быть в состоянии разрабатывать и собирать 
систему средствами, которые вам
 предоставляет система. Как следствие, 
свободный дистрибутив системы не может
@@ -359,7 +363,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -379,7 +383,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/02/23 09:59:26 $
+$Date: 2017/10/17 16:29:33 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/distros.ru-en.html
===================================================================
RCS file: /web/www/www/distros/po/distros.ru-en.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- distros/po/distros.ru-en.html       13 Apr 2015 12:29:13 -0000      1.27
+++ distros/po/distros.ru-en.html       17 Oct 2017 16:29:33 -0000      1.28
@@ -10,7 +10,8 @@
 <h2>GNU/Linux Distros</h2>
 
 <p>
-Free GNU/Linux system distributions (or &ldquo;distros&rdquo;) only
+Free distributions (or &ldquo;distros&rdquo;) of
+the <a href="/gnu/linux-and-gnu.html">GNU/Linux system</a> only
 include and only propose free software.  They reject non-free
 applications, non-free programming platforms, non-free drivers,
 non-free firmware &ldquo;blobs&rdquo;, and any other non-free software
@@ -145,7 +146,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -160,17 +161,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2017 Free Software Foundation, Inc.</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/04/13 12:29:13 $
+$Date: 2017/10/17 16:29:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: distros/po/distros.ru.po
===================================================================
RCS file: /web/www/www/distros/po/distros.ru.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- distros/po/distros.ru.po    17 Oct 2017 16:15:17 -0000      1.37
+++ distros/po/distros.ru.po    17 Oct 2017 16:29:33 -0000      1.38
@@ -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: 2017-10-16 18:55+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU/Linux Distros - GNU Project - Free Software Foundation"
@@ -35,20 +34,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-# | Free [-GNU/Linux system-] distributions (or &ldquo;distros&rdquo;) {+of
-# | the <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux system</a>+} only
-# | include and only propose free software.  They reject non-free
-# | applications, non-free programming platforms, non-free drivers, non-free
-# | firmware &ldquo;blobs&rdquo;, and any other non-free software and
-# | documentation.  If they discover that by mistake some had been included,
-# | they remove it.
-#| msgid ""
-#| "Free GNU/Linux system distributions (or &ldquo;distros&rdquo;) only "
-#| "include and only propose free software.  They reject non-free "
-#| "applications, non-free programming platforms, non-free drivers, non-free "
-#| "firmware &ldquo;blobs&rdquo;, and any other non-free software and "
-#| "documentation.  If they discover that by mistake some had been included, "
-#| "they remove it."
 msgid ""
 "Free distributions (or &ldquo;distros&rdquo;) of the <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux system</a> only include and only propose free "
@@ -57,14 +42,13 @@
 "other non-free software and documentation.  If they discover that by mistake "
 "some had been included, they remove it."
 msgstr ""
-"Свободные дистрибутивы <a 
href=\"/gnu/linux-and-gnu.html\">системы GNU/Linux</a> включают 
\n"
-"и предлагают только свободные программы. "
-"Они отказываются от несвободных 
приложений, несвободных "
-"платформ программирования, несвободных 
драйверов, несвободных "
-"программ для устройств (&ldquo;клякс&rdquo;) и 
всех прочих несвободных "
-"программ и документации. Если они 
обнаруживают, что включили что-то из этого "
-"по ошибке, "
-"они удаляют это."
+"Свободные дистрибутивы <a 
href=\"/gnu/linux-and-gnu.html\">системы GNU/"
+"Linux</a> включают \n"
+"и предлагают только свободные программы. 
Они отказываются от несвободных "
+"приложений, несвободных платформ 
программирования, несвободных драйверов, "
+"несвободных программ для устройств 
(&ldquo;клякс&rdquo;) и всех прочих "
+"несвободных программ и документации. Если 
они обнаруживают, что включили что-"
+"то из этого по ошибке, они удаляют это."
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
@@ -328,17 +312,10 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2014, 2015, 201[-6-]{+7+} Free Software Foundation, Inc.
-#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2014, 2015, 2017 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. 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-"

Index: distros/po/free-system-distribution-guidelines.ru-en.html
===================================================================
RCS file: 
/web/www/www/distros/po/free-system-distribution-guidelines.ru-en.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- distros/po/free-system-distribution-guidelines.ru-en.html   26 Jun 2015 
05:58:04 -0000      1.35
+++ distros/po/free-system-distribution-guidelines.ru-en.html   17 Oct 2017 
16:29:33 -0000      1.36
@@ -12,7 +12,7 @@
 <h3 id="introduction">Introduction</h3>
 
 <p>The purpose of these guidelines is to explain what it means for an
-installable system distribution (such as a GNU/Linux distribution) to
+installable system distribution (such as a <a 
href="/gnu/linux-and-gnu.html">GNU/Linux</a> distribution) to
 qualify as <a href="/philosophy/free-sw.html">free</a> (libre), and
 help distribution developers make their distributions qualify.</p>
 
@@ -76,6 +76,10 @@
 should not suggest installing nonfree plugins, documentation, and so
 on.</p>
 
+<p>For instance, a free system distribution must not contain browsers
+that implement EME, the browser functionality designed to load DRM
+modules.</p>
+
 <p>A free system distribution should be self-hosting.  This means that
 you must be able to develop and build the system with tools that the
 system provides you.  As a result, a free system distribution cannot
@@ -340,7 +344,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2017 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -350,7 +354,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/06/26 05:58:04 $
+$Date: 2017/10/17 16:29:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: distros/po/free-system-distribution-guidelines.ru.po
===================================================================
RCS file: /web/www/www/distros/po/free-system-distribution-guidelines.ru.po,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- distros/po/free-system-distribution-guidelines.ru.po        17 Oct 2017 
16:15:17 -0000      1.74
+++ distros/po/free-system-distribution-guidelines.ru.po        17 Oct 2017 
16:29:33 -0000      1.75
@@ -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: 2017-10-16 18:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -38,16 +37,6 @@
 msgstr "Введение"
 
 #. type: Content of: <p>
-# | The purpose of these guidelines is to explain what it means for an
-# | installable system distribution (such as a [-GNU/Linux-] {+<a
-# | href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>+} distribution) to qualify
-# | as <a href=\"/philosophy/free-sw.html\">free</a> (libre), and help
-# | distribution developers make their distributions qualify.
-#| msgid ""
-#| "The purpose of these guidelines is to explain what it means for an "
-#| "installable system distribution (such as a GNU/Linux distribution) to "
-#| "qualify as <a href=\"/philosophy/free-sw.html\">free</a> (libre), and "
-#| "help distribution developers make their distributions qualify."
 msgid ""
 "The purpose of these guidelines is to explain what it means for an "
 "installable system distribution (such as a <a href=\"/gnu/linux-and-gnu.html"
@@ -56,10 +45,10 @@
 "distributions qualify."
 msgstr ""
 "Эти рекомендации предназначены для того, 
чтобы объяснить, что требуется от "
-"дистрибутива устанавливаемой системы 
(такого, как дистрибутив <a 
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>), "
-"чтобы он мог считаться <a 
href=\"/philosophy/free-sw.html\">свободным</a>, и "
-"помочь разработчикам дистрибутивов 
привести свои дистрибутивы в соответствие "
-"этим требованиям."
+"дистрибутива устанавливаемой системы 
(такого, как дистрибутив <a href=\"/gnu/"
+"linux-and-gnu.html\">GNU/Linux</a>), чтобы он мог 
считаться <a href=\"/"
+"philosophy/free-sw.html\">свободным</a>, и помочь 
разработчикам "
+"дистрибутивов привести свои дистрибутивы 
в соответствие этим требованиям."
 
 #. type: Content of: <p>
 msgid ""
@@ -725,8 +714,6 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2014, 2015, 201[-6-]{+7+} Free Software Foundation, Inc.
-#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2014, 2015, 2017 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 

Index: licenses/gpl-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.ru.html,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- licenses/gpl-faq.ru.html    23 Aug 2017 05:31:11 -0000      1.77
+++ licenses/gpl-faq.ru.html    17 Oct 2017 16:29:33 -0000      1.78
@@ -3261,7 +3261,13 @@
 Нет, потому что два этих действия 
противоречат друг другу. GNU GPL
 разработана специально для 
предотвращения дополнительных 
ограничений. GPLv3
 в разделе&nbsp;7 допускает очень 
ограниченный их набор, но любые другие
-ограничения пользователь может 
удалять.</p></dd>
+ограничения пользователь может удалять.</p>
+
+<p>Вообще, лицензия, которая ограничивает 
то, кто или для чего может применять
+программу, <a
+href="/philosophy/programs-must-not-limit-freedom-to-run.html">не 
является
+лицензией свободных программ</a>.</p>
+</dd>
 
 
 <dt id="ConveyVsDistribute">Представляет ли собой 
&ldquo;передача&rdquo; в GPLv3 то же, что в GPLv2
@@ -3863,7 +3869,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2017/08/23 05:31:11 $
+$Date: 2017/10/17 16:29:33 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- licenses/license-list.ru.html       12 Sep 2017 10:05:39 -0000      1.112
+++ licenses/license-list.ru.html       17 Oct 2017 16:29:33 -0000      1.113
@@ -947,19 +947,25 @@
 Apache&nbsp;2.0, поскольку она защищает 
пользователей от патентного
 предательства.</p></dd>
 
-<dt><a id="Wx"></a>Лицензия WxWidgets <span 
class="anchor-reference-id">(<a
+<dt id="Wx">Лицензия библиотеки WxWidgets <span 
class="anchor-reference-id">(<a
 href="#Wx">#Wx</a>)</span></dt>
 <dd>
 <p>Лицензия WxWidgets&nbsp;&mdash; совместимая с GPL 
лицензия свободных
 программ. Она состоит из <a 
href="/licenses/old-licenses/lgpl-2.0.html">
-LGPL&nbsp;2.0</a> или любой более поздней версии с 
дополнительным
-разрешением, допускающим распространение 
программ, применяющих библиотеку, в
-двоичном виде, на условиях по выбору 
распространителя (в том числе
-несвободных). Как и LGPL, это лицензия со 
слабым авторским левом, так что мы
-рекомендуем ее <a href="/licenses/why-not-lgpl.html"> 
только в особых
+Меньшей стандартной общественной 
лицензии GNU&nbsp;2.0</a> или любой более
+поздней версии с дополнительным 
разрешением, допускающим распространение
+программ, применяющих библиотеку, в 
двоичном виде, на условиях по выбору
+распространителя (в том числе несвободных
). Это слабое авторское лево, так
+что мы рекомендуем ее <a href="/licenses/why-not-lgpl.html"> 
только в особых
 обстоятельствах</a>.</p>
 </dd>
 
+<dt id="Wxwind">Лицензия библиотеки WxWindows <span 
class="anchor-reference-id">(<a
+href="#Wx">#Wxwind</a>)</span></dt>
+<dd>
+<p>Более старое название <a href="#Wx">лицензии 
библиотеки WxWidgets</a>.</p>
+</dd>
+
 <dt><a id="X11License" href="http://directory.fsf.org/wiki/License:X11";>
 Лицензия X11</a> <span class="anchor-reference-id"> (<a
 href="#X11License">#X11License</a>)</span></dt>
@@ -1219,6 +1225,22 @@
 преследований, направленных конкретно 
против тех, кто дорабатывал программу
 под лицензией Eclipse.</p></dd>
 
+<dt><a id="EPL2" href="http://directory.fsf.org/wiki/License:EPLv2.0";>
+Общественная лицензия Eclipse (Eclipse Public License), 
версия&nbsp;2.0</a>
+<span class="anchor-reference-id">(<a href="#EPL2">#EPL2</a>)</span></dt>
+<dd>
+<p>С точки зрения совместимости с GPL 
Общественная лицензия Eclipse 2.0 по
+существу эквивалентна версии 1.0. 
Единственное изменение состоит в том, что
+она явно предлагает возможность 
назначения GNU GPL версии 2 или более
+поздней в качестве &ldquo;вторичной 
лицензии&rdquo; для определенной части
+программы.</p>
+
+<p>Если первоначальный разработчик 
выпускает конкретную часть программы и
+назначает GNU GPL версии 2 или более поздней в 
качестве вторичной лицензии,
+это дает явную совместимость с этими 
версиями GPL для этой части
+программы. (Для пользователей это примерно 
эквивалентно выпуску этой части
+программы под двойной лицензией: EPL или GPL.) 
Однако EPL2 без этого
+назначения остается несовместимой с 
GPL.</p></dd>
 
 <dt><a id="EUPL" href="http://directory.fsf.org/wiki/License:EUPLv1.1";>
 Общественная лицензия Европейского союза 
(European Union Public License,
@@ -2706,7 +2728,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2017/09/12 10:05:39 $
+$Date: 2017/10/17 16:29:33 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/license-recommendations.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-recommendations.ru.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- licenses/license-recommendations.ru.html    20 Apr 2017 14:28:07 -0000      
1.36
+++ licenses/license-recommendations.ru.html    17 Oct 2017 16:29:34 -0000      
1.37
@@ -87,9 +87,16 @@
 <p>Для большинства программ мы рекомендуем 
вам применять для своего проекта
 последнюю версию <a 
href="/licenses/gpl.html">Стандартной общественной
 лицензии GNU (GPL)</a>. Ее сильное авторское 
лево подходит ко всем видам
-программ и предусматривает 
многочисленные меры охраны свободы 
пользователей.</p>
+программ и предусматривает 
многочисленные меры охраны свободы
+пользователей.Пожалуйста, давайте 
разрешение пользоваться и будущими
+версиями лицензии&nbsp;&mdash; записывайте в 
лицензионном уведомлении, что
+ваша программа распространяется по GPL 
версии 3 или более поздней.</p>
 
-<p>Теперь об исключениях</p>
+<p>Другие советы о том, <a 
href="/licenses/gpl-howto.html">как выпускать
+программу под GNU GPL</a>.</p>
+
+<p>Теперь об исключениях, когда лучше 
применять какие-то другие лицензии вместо
+GNU GPL.</p>
 
 <h4 id="small">Небольшие программы</h4>
 
@@ -290,7 +297,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2011, 2012, 2013, 2014, 2015 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2013, 2014, 2015, 2017 Free Software
+Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -306,7 +314,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2017/04/20 14:28:07 $
+$Date: 2017/10/17 16:29:34 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/gpl-faq.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru-en.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- licenses/po/gpl-faq.ru-en.html      23 Aug 2017 05:31:12 -0000      1.59
+++ licenses/po/gpl-faq.ru-en.html      17 Oct 2017 16:29:34 -0000      1.60
@@ -3340,7 +3340,13 @@
 No, because those two goals contradict each other.  The GNU GPL is
 designed specifically to prevent the addition of further restrictions.
 GPLv3 allows a very limited set of them, in section 7, but any other
-added restriction can be removed by the user.</p></dd>
+added restriction can be removed by the user.</p>
+
+<p>More generally, a license that limits who can use a program, or for
+what,
+is <a href="/philosophy/programs-must-not-limit-freedom-to-run.html">not
+a free software license</a>.</p>
+</dd>
 
 
 <dt id="ConveyVsDistribute">Is &ldquo;convey&rdquo; in GPLv3 the same
@@ -3898,7 +3904,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/08/23 05:31:12 $
+$Date: 2017/10/17 16:29:34 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/gpl-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru.po,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- licenses/po/gpl-faq.ru.po   17 Oct 2017 16:15:17 -0000      1.139
+++ licenses/po/gpl-faq.ru.po   17 Oct 2017 16:29:34 -0000      1.140
@@ -19,7 +19,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2017-10-16 18:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -6904,10 +6903,9 @@
 "<a href=\"/philosophy/programs-must-not-limit-freedom-to-run.html\">not a "
 "free software license</a>."
 msgstr ""
-"Вообще, лицензия, которая ограничивает то, 
кто или для чего может "
-"применять программу, "
-"<a href=\"/philosophy/programs-must-not-limit-freedom-to-run.html\">не 
является "
-"лицензией свободных программ</a>."
+"Вообще, лицензия, которая ограничивает то, 
кто или для чего может применять "
+"программу, <a 
href=\"/philosophy/programs-must-not-limit-freedom-to-run.html"
+"\">не является лицензией свободных 
программ</a>."
 
 #. type: Content of: <dl><dt>
 msgid ""

Index: licenses/po/license-list.cs.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.cs.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- licenses/po/license-list.cs.po      16 Oct 2017 20:00:53 -0000      1.11
+++ licenses/po/license-list.cs.po      17 Oct 2017 16:29:34 -0000      1.12
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2017-10-16 19:56+0000\n"
+"POT-Creation-Date: 2017-10-17 16:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <address@hidden>\n"
@@ -1484,8 +1484,8 @@
 #| "<a id=\"YaST\"> YaST License</a> <span class=\"anchor-reference-id\">(<a "
 #| "href=\"#YaST\">#YaST</a>)</span>"
 msgid ""
-"<a id=\"Wx\"></a>WxWidgets Library License <span class=\"anchor-reference-id"
-"\">(<a href=\"#Wx\">#Wx</a>)</span>"
+"WxWidgets Library License <span class=\"anchor-reference-id\">(<a href=\"#Wx"
+"\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"YaST\">Licence YaST</a> <span class=\"anchor-reference-id\">(<a href="
 "\"#YaST\">#YaST</a>)</span>"
@@ -1507,8 +1507,8 @@
 #| "<a id=\"YaST\"> YaST License</a> <span class=\"anchor-reference-id\">(<a "
 #| "href=\"#YaST\">#YaST</a>)</span>"
 msgid ""
-"<a id=\"Wxwind\"></a>WxWindows Library License <span class=\"anchor-"
-"reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
+"WxWindows Library License <span class=\"anchor-reference-id\">(<a href="
+"\"#Wxwind\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"YaST\">Licence YaST</a> <span class=\"anchor-reference-id\">(<a href="
 "\"#YaST\">#YaST</a>)</span>"
@@ -2059,7 +2059,7 @@
 msgid ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
 "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"
-"(<a href=\"#EPL\">#EPL</a>)</span>"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
 msgstr ""
 "<a id=\"QPL\" href=\"http://directory.fsf.org/wiki/License:QPLv1.0\";> Q "
 "Public License (QPL), verze&nbsp;1.0</a> <span class=\"anchor-reference-id\">"

Index: licenses/po/license-list.de-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- licenses/po/license-list.de-diff.html       16 Oct 2017 20:00:53 -0000      
1.4
+++ licenses/po/license-list.de-diff.html       17 Oct 2017 16:29:34 -0000      
1.5
@@ -974,7 +974,10 @@
 license for one, we recommend the Apache 2.0 license since it protects
 users from patent treachery.&lt;/p&gt;&lt;/dd&gt;
 
-&lt;dt&gt;&lt;a id="Wx"&gt;&lt;/a&gt;WxWidgets <span 
class="inserted"><ins><em>Library</em></ins></span> License &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#Wx"&gt;#Wx&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+<span class="removed"><del><strong>&lt;dt&gt;&lt;a 
id="Wx"&gt;&lt;/a&gt;WxWidgets</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;dt id="Wx"&gt;WxWidgets 
Library</em></ins></span> License
+&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#Wx"&gt;#Wx&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;The WxWidgets license is a GPL-compatible free software license. It
 consists of the &lt;a <span 
class="removed"><del><strong>href="/licenses/old-licenses/lgpl-2.0.html"&gt;LGPL</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/old-licenses/lgpl-2.0.html"&gt;GNU
@@ -986,12 +989,13 @@
 circumstances&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt&gt;&lt;a <span 
class="inserted"><ins><em>id="Wxwind"&gt;&lt;/a&gt;WxWindows Library License 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#Wxwind"&gt;#Wx&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+<span class="inserted"><ins><em>&lt;dt id="Wxwind"&gt;WxWindows Library License
+&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#Wxwind"&gt;#Wx&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;An older name for the &lt;a href="#Wx"&gt;WxWidgets Library 
license&lt;/a&gt;.&lt;/p&gt;
-&lt;/dd&gt;
+&lt;/dd&gt;</em></ins></span>
 
-&lt;dt&gt;&lt;a</em></ins></span> id="X11License" 
href="http://directory.fsf.org/wiki/License:X11"&gt;
+&lt;dt&gt;&lt;a id="X11License" 
href="http://directory.fsf.org/wiki/License:X11"&gt;
     X11 License&lt;/a&gt;
     &lt;span class="anchor-reference-id"&gt;
        (&lt;a 
href="#X11License"&gt;#X11License&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -1259,7 +1263,7 @@
 
 &lt;dt&gt;&lt;a <span class="inserted"><ins><em>id="EPL2" 
href="http://directory.fsf.org/wiki/License:EPLv2.0"&gt;
     Eclipse Public License Version 2.0&lt;/a&gt;
-    &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#EPL"&gt;#EPL&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#EPL2"&gt;#EPL2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;In terms of GPL compatibility, the Eclipse Public License version
 2.0 is essentially equivalent to version 1.0. The only change is that
@@ -2731,7 +2735,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2017/10/16 20:00:53 $
+$Date: 2017/10/17 16:29:34 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: licenses/po/license-list.de.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de.po,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -b -r1.266 -r1.267
--- licenses/po/license-list.de.po      16 Oct 2017 20:00:53 -0000      1.266
+++ licenses/po/license-list.de.po      17 Oct 2017 16:29:34 -0000      1.267
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: license-list.html\n"
 "Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2017-10-16 19:56+0000\n"
+"POT-Creation-Date: 2017-10-17 16:25+0000\n"
 "PO-Revision-Date: 2017-04-12 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -1810,15 +1810,15 @@
 "Nutzer vor Patentverrat schützt."
 
 #. type: Content of: <dl><dt>
-# | <a id=\"Wx\"></a>WxWidgets {+Library+} License <span
+# | [-<a id=\"Wx\"></a>WxWidgets-]{+WxWidgets Library+} License <span
 # | class=\"anchor-reference-id\">(<a href=\"#Wx\">#Wx</a>)</span>
 #, fuzzy
 #| msgid ""
 #| "<a id=\"Wx\"></a>WxWidgets License <span class=\"anchor-reference-id\">"
 #| "(<a href=\"#Wx\">#Wx</a>)</span>"
 msgid ""
-"<a id=\"Wx\"></a>WxWidgets Library License <span class=\"anchor-reference-id"
-"\">(<a href=\"#Wx\">#Wx</a>)</span>"
+"WxWidgets Library License <span class=\"anchor-reference-id\">(<a href=\"#Wx"
+"\">#Wx</a>)</span>"
 msgstr ""
 "<span id=\"Wx\" xml:lang=\"en\" lang=\"en\">WxWidgets License</span> <span "
 "class=\"anchor-reference-id\">(<a href=\"#Wx\">#Wx</a>)</span>"
@@ -1861,16 +1861,16 @@
 "Umständen empfohlen</a>."
 
 #. type: Content of: <dl><dt>
-# | <a [-id=\"Wx\"></a>WxWidgets-] {+id=\"Wxwind\"></a>WxWindows Library+}
-# | License <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#Wx\">#Wx</a>)</span>-] {+href=\"#Wxwind\">#Wx</a>)</span>+}
+# | [-<a id=\"Wx\"></a>WxWidgets-]{+WxWindows Library+} License <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#Wx\">#Wx</a>)</span>-]
+# | {+href=\"#Wxwind\">#Wx</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a id=\"Wx\"></a>WxWidgets License <span class=\"anchor-reference-id\">"
 #| "(<a href=\"#Wx\">#Wx</a>)</span>"
 msgid ""
-"<a id=\"Wxwind\"></a>WxWindows Library License <span class=\"anchor-"
-"reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
+"WxWindows Library License <span class=\"anchor-reference-id\">(<a href="
+"\"#Wxwind\">#Wx</a>)</span>"
 msgstr ""
 "<span id=\"Wx\" xml:lang=\"en\" lang=\"en\">WxWidgets License</span> <span "
 "class=\"anchor-reference-id\">(<a href=\"#Wx\">#Wx</a>)</span>"
@@ -2463,7 +2463,8 @@
 # | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>-]
 # | {+id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";>+}
 # | Eclipse Public License Version [-1-]{+2+}.0</a> <span
-# | class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#EPL2\">#EPL2</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
@@ -2472,7 +2473,7 @@
 msgid ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
 "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"
-"(<a href=\"#EPL\">#EPL</a>)</span>"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
 msgstr ""
 "<a id=\"EPL\" href=\"//directory.fsf.org/wiki/License:EPLv1.0\" xml:lang=\"en"
 "\" lang=\"en\"> Eclipse Public License Version 1.0</a> <span class=\"anchor-"

Index: licenses/po/license-list.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es.po,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -b -r1.235 -r1.236
--- licenses/po/license-list.es.po      17 Oct 2017 11:29:18 -0000      1.235
+++ licenses/po/license-list.es.po      17 Oct 2017 16:29:34 -0000      1.236
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: license-list.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-16 19:56+0000\n"
+"POT-Creation-Date: 2017-10-17 16:25+0000\n"
 "PO-Revision-Date: 2017-10-17 12:05+0200\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: 2017-10-17 16:25+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
@@ -1890,9 +1891,15 @@
 "patentes."
 
 #. type: Content of: <dl><dt>
+# | [-<a id=\"Wx\"></a>WxWidgets-]{+WxWidgets+} Library License <span
+# | class=\"anchor-reference-id\">(<a href=\"#Wx\">#Wx</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Wx\"></a>WxWidgets Library License <span class=\"anchor-reference-"
+#| "id\">(<a href=\"#Wx\">#Wx</a>)</span>"
 msgid ""
-"<a id=\"Wx\"></a>WxWidgets Library License <span class=\"anchor-reference-id"
-"\">(<a href=\"#Wx\">#Wx</a>)</span>"
+"WxWidgets Library License <span class=\"anchor-reference-id\">(<a href=\"#Wx"
+"\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"Wx\"></a>Licencia de bibliotecas <cite>WxWidgets</cite><span class="
 "\"anchor-reference-id\">(<a href=\"#Wx\">#Wx</a>)</span>"
@@ -1918,9 +1925,15 @@
 "especiales</a>. "
 
 #. type: Content of: <dl><dt>
+# | [-<a id=\"Wxwind\"></a>WxWindows-]{+WxWindows+} Library License <span
+# | class=\"anchor-reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Wxwind\"></a>WxWindows Library License <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
 msgid ""
-"<a id=\"Wxwind\"></a>WxWindows Library License <span class=\"anchor-"
-"reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
+"WxWindows Library License <span class=\"anchor-reference-id\">(<a href="
+"\"#Wxwind\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"Wxwind\"></a>Licencia de bibliotecas WxWindows <span class=\"anchor-"
 "reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
@@ -2511,10 +2524,19 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";>
+# | Eclipse Public License Version 2.0</a> <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#EPL2\">#EPL2</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
+#| "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
 msgid ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
 "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"
-"(<a href=\"#EPL\">#EPL</a>)</span>"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
 msgstr ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:";
 "EPLv2.0\">Licencia Pública Eclipse, versión 2.0</a> <span class=\"anchor-"

Index: licenses/po/license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -b -r1.346 -r1.347
--- licenses/po/license-list.fr.po      17 Oct 2017 09:40:22 -0000      1.346
+++ licenses/po/license-list.fr.po      17 Oct 2017 16:29:34 -0000      1.347
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2017-10-16 19:56+0000\n"
+"POT-Creation-Date: 2017-10-17 16:25+0000\n"
 "PO-Revision-Date: 2017-10-17 11:36+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: 2017-10-17 16:25+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.6\n"
 
@@ -1778,9 +1779,15 @@
 "protège l'utilisateur contre les entourloupes relatives aux brevets."
 
 #. type: Content of: <dl><dt>
+# | [-<a id=\"Wx\"></a>WxWidgets-]{+WxWidgets+} Library License <span
+# | class=\"anchor-reference-id\">(<a href=\"#Wx\">#Wx</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Wx\"></a>WxWidgets Library License <span class=\"anchor-reference-"
+#| "id\">(<a href=\"#Wx\">#Wx</a>)</span>"
 msgid ""
-"<a id=\"Wx\"></a>WxWidgets Library License <span class=\"anchor-reference-id"
-"\">(<a href=\"#Wx\">#Wx</a>)</span>"
+"WxWidgets Library License <span class=\"anchor-reference-id\">(<a href=\"#Wx"
+"\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"Wx\"></a>WxWidgets Library License <span class=\"anchor-reference-id"
 "\">(<a href=\"#Wx\">#Wx</a>)</span>"
@@ -1805,9 +1812,15 @@
 "\">que dans des circonstances particulières</a>."
 
 #. type: Content of: <dl><dt>
+# | [-<a id=\"Wxwind\"></a>WxWindows-]{+WxWindows+} Library License <span
+# | class=\"anchor-reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"Wxwind\"></a>WxWindows Library License <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
 msgid ""
-"<a id=\"Wxwind\"></a>WxWindows Library License <span class=\"anchor-"
-"reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
+"WxWindows Library License <span class=\"anchor-reference-id\">(<a href="
+"\"#Wxwind\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"Wxwind\"></a>WxWindows Library License <span class=\"anchor-"
 "reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
@@ -2356,10 +2369,19 @@
 "contributeurs du programme soumis à l'EPL."
 
 #. type: Content of: <dl><dt>
+# | <a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";>
+# | Eclipse Public License Version 2.0</a> <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#EPL2\">#EPL2</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
+#| "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id"
+#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
 msgid ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
 "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"
-"(<a href=\"#EPL\">#EPL</a>)</span>"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
 msgstr ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
 "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"

Index: licenses/po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -b -r1.287 -r1.288
--- licenses/po/license-list.it.po      16 Oct 2017 20:00:53 -0000      1.287
+++ licenses/po/license-list.it.po      17 Oct 2017 16:29:34 -0000      1.288
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2017-10-16 19:56+0000\n"
+"POT-Creation-Date: 2017-10-17 16:25+0000\n"
 "PO-Revision-Date: 2017-09-30 22:32+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -1881,15 +1881,15 @@
 "protegge gli utenti da tranelli brevettuali."
 
 #. type: Content of: <dl><dt>
-# | <a id=\"Wx\"></a>WxWidgets {+Library+} License <span
+# | [-<a id=\"Wx\"></a>WxWidgets-]{+WxWidgets Library+} License <span
 # | class=\"anchor-reference-id\">(<a href=\"#Wx\">#Wx</a>)</span>
 #, fuzzy
 #| msgid ""
 #| "<a id=\"Wx\"></a>WxWidgets License <span class=\"anchor-reference-id\">"
 #| "(<a href=\"#Wx\">#Wx</a>)</span>"
 msgid ""
-"<a id=\"Wx\"></a>WxWidgets Library License <span class=\"anchor-reference-id"
-"\">(<a href=\"#Wx\">#Wx</a>)</span>"
+"WxWidgets Library License <span class=\"anchor-reference-id\">(<a href=\"#Wx"
+"\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"Wx\"></a>La licenza di WxWidgets <span class=\"anchor-reference-id\">"
 "(<a href=\"#Wx\">#Wx</a>)</span>"
@@ -1931,16 +1931,16 @@
 "lgpl.html\">in casi particolari</a>."
 
 #. type: Content of: <dl><dt>
-# | <a [-id=\"Wx\"></a>WxWidgets-] {+id=\"Wxwind\"></a>WxWindows Library+}
-# | License <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#Wx\">#Wx</a>)</span>-] {+href=\"#Wxwind\">#Wx</a>)</span>+}
+# | [-<a id=\"Wx\"></a>WxWidgets-]{+WxWindows Library+} License <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#Wx\">#Wx</a>)</span>-]
+# | {+href=\"#Wxwind\">#Wx</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a id=\"Wx\"></a>WxWidgets License <span class=\"anchor-reference-id\">"
 #| "(<a href=\"#Wx\">#Wx</a>)</span>"
 msgid ""
-"<a id=\"Wxwind\"></a>WxWindows Library License <span class=\"anchor-"
-"reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
+"WxWindows Library License <span class=\"anchor-reference-id\">(<a href="
+"\"#Wxwind\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"Wx\"></a>La licenza di WxWidgets <span class=\"anchor-reference-id\">"
 "(<a href=\"#Wx\">#Wx</a>)</span>"
@@ -2533,7 +2533,8 @@
 # | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>-]
 # | {+id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";>+}
 # | Eclipse Public License Version [-1-]{+2+}.0</a> <span
-# | class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#EPL2\">#EPL2</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
@@ -2542,7 +2543,7 @@
 msgid ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
 "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"
-"(<a href=\"#EPL\">#EPL</a>)</span>"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
 msgstr ""
 "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
 "Licenza pubblica Eclipse, versione 1.0</a> <span class=\"anchor-reference-id"

Index: licenses/po/license-list.ja-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- licenses/po/license-list.ja-diff.html       16 Oct 2017 20:00:53 -0000      
1.8
+++ licenses/po/license-list.ja-diff.html       17 Oct 2017 16:29:34 -0000      
1.9
@@ -975,7 +975,10 @@
 license for one, we recommend the Apache 2.0 license since it protects
 users from patent treachery.&lt;/p&gt;&lt;/dd&gt;
 
-&lt;dt&gt;&lt;a id="Wx"&gt;&lt;/a&gt;WxWidgets <span 
class="inserted"><ins><em>Library</em></ins></span> License &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#Wx"&gt;#Wx&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+<span class="removed"><del><strong>&lt;dt&gt;&lt;a 
id="Wx"&gt;&lt;/a&gt;WxWidgets</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;dt id="Wx"&gt;WxWidgets 
Library</em></ins></span> License
+&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#Wx"&gt;#Wx&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;The WxWidgets license is a GPL-compatible free software license. It
 consists of the &lt;a <span 
class="removed"><del><strong>href="/licenses/old-licenses/lgpl-2.0.html"&gt;LGPL</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/old-licenses/lgpl-2.0.html"&gt;GNU
@@ -987,12 +990,13 @@
 circumstances&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt&gt;&lt;a <span 
class="inserted"><ins><em>id="Wxwind"&gt;&lt;/a&gt;WxWindows Library License 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#Wxwind"&gt;#Wx&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+<span class="inserted"><ins><em>&lt;dt id="Wxwind"&gt;WxWindows Library License
+&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#Wxwind"&gt;#Wx&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;An older name for the &lt;a href="#Wx"&gt;WxWidgets Library 
license&lt;/a&gt;.&lt;/p&gt;
-&lt;/dd&gt;
+&lt;/dd&gt;</em></ins></span>
 
-&lt;dt&gt;&lt;a</em></ins></span> id="X11License" 
href="http://directory.fsf.org/wiki/License:X11"&gt;
+&lt;dt&gt;&lt;a id="X11License" 
href="http://directory.fsf.org/wiki/License:X11"&gt;
     X11 License&lt;/a&gt;
     &lt;span class="anchor-reference-id"&gt;
        (&lt;a 
href="#X11License"&gt;#X11License&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -1260,7 +1264,7 @@
 
 &lt;dt&gt;&lt;a <span class="inserted"><ins><em>id="EPL2" 
href="http://directory.fsf.org/wiki/License:EPLv2.0"&gt;
     Eclipse Public License Version 2.0&lt;/a&gt;
-    &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#EPL"&gt;#EPL&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+    &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#EPL2"&gt;#EPL2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
 &lt;p&gt;In terms of GPL compatibility, the Eclipse Public License version
 2.0 is essentially equivalent to version 1.0. The only change is that
@@ -2732,7 +2736,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2017/10/16 20:00:53 $
+$Date: 2017/10/17 16:29:34 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: licenses/po/license-list.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja.po,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- licenses/po/license-list.ja.po      16 Oct 2017 20:00:53 -0000      1.160
+++ licenses/po/license-list.ja.po      17 Oct 2017 16:29:34 -0000      1.161
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2017-10-16 19:56+0000\n"
+"POT-Creation-Date: 2017-10-17 16:25+0000\n"
 "PO-Revision-Date: 2016-10-31 10:00+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -1738,8 +1738,8 @@
 #| "<a id=\"Wx\"></a>WxWidgets License <span class=\"anchor-reference-id\">"
 #| "(<a href=\"#Wx\">#Wx</a>)</span>"
 msgid ""
-"<a id=\"Wx\"></a>WxWidgets Library License <span class=\"anchor-reference-id"
-"\">(<a href=\"#Wx\">#Wx</a>)</span>"
+"WxWidgets Library License <span class=\"anchor-reference-id\">(<a href=\"#Wx"
+"\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"Wx\"></a>WxWidgetsライセンス<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#Wx\">#Wx</a>)</span>"
@@ -1776,8 +1776,8 @@
 #| "<a id=\"Wx\"></a>WxWidgets License <span class=\"anchor-reference-id\">"
 #| "(<a href=\"#Wx\">#Wx</a>)</span>"
 msgid ""
-"<a id=\"Wxwind\"></a>WxWindows Library License <span class=\"anchor-"
-"reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
+"WxWindows Library License <span class=\"anchor-reference-id\">(<a href="
+"\"#Wxwind\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"Wx\"></a>WxWidgetsライセンス<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#Wx\">#Wx</a>)</span>"
@@ -2333,7 +2333,7 @@
 msgid ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
 "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"
-"(<a href=\"#EPL\">#EPL</a>)</span>"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
 msgstr ""
 "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> Eclipse"
 "パブリックライセンス バージョン1.0</a> <span 
class=\"anchor-reference-id\">"

Index: licenses/po/license-list.pl.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pl.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- licenses/po/license-list.pl.po      16 Oct 2017 20:00:53 -0000      1.10
+++ licenses/po/license-list.pl.po      17 Oct 2017 16:29:34 -0000      1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2017-10-16 19:56+0000\n"
+"POT-Creation-Date: 2017-10-17 16:25+0000\n"
 "PO-Revision-Date: 2017-04-24 16:01-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <address@hidden>\n"
@@ -1669,16 +1669,16 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
-# | <a [-id=\"YaST\"> YaST License</a>-] {+id=\"Wx\"></a>WxWidgets Library
-# | License+} <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#YaST\">#YaST</a>)</span>-] {+href=\"#Wx\">#Wx</a>)</span>+}
+# | [-<a id=\"YaST\"> YaST License</a>-]{+WxWidgets Library License+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#YaST\">#YaST</a>)</span>-]
+# | {+href=\"#Wx\">#Wx</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a id=\"YaST\"> YaST License</a> <span class=\"anchor-reference-id\">(<a "
 #| "href=\"#YaST\">#YaST</a>)</span>"
 msgid ""
-"<a id=\"Wx\"></a>WxWidgets Library License <span class=\"anchor-reference-id"
-"\">(<a href=\"#Wx\">#Wx</a>)</span>"
+"WxWidgets Library License <span class=\"anchor-reference-id\">(<a href=\"#Wx"
+"\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"YaST\"> Licencja YaST</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#YaST\">#YaST</a>)</span>"
@@ -1695,16 +1695,16 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
-# | <a [-id=\"YaST\"> YaST License</a>-] {+id=\"Wxwind\"></a>WxWindows Library
-# | License+} <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#YaST\">#YaST</a>)</span>-] {+href=\"#Wxwind\">#Wx</a>)</span>+}
+# | [-<a id=\"YaST\"> YaST License</a>-]{+WxWindows Library License+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#YaST\">#YaST</a>)</span>-]
+# | {+href=\"#Wxwind\">#Wx</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a id=\"YaST\"> YaST License</a> <span class=\"anchor-reference-id\">(<a "
 #| "href=\"#YaST\">#YaST</a>)</span>"
 msgid ""
-"<a id=\"Wxwind\"></a>WxWindows Library License <span class=\"anchor-"
-"reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
+"WxWindows Library License <span class=\"anchor-reference-id\">(<a href="
+"\"#Wxwind\">#Wx</a>)</span>"
 msgstr ""
 "<a id=\"YaST\"> Licencja YaST</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#YaST\">#YaST</a>)</span>"
@@ -2377,7 +2377,8 @@
 # | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>-]
 # | {+id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";>+}
 # | Eclipse Public License Version [-1-]{+2+}.0</a> <span
-# | class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>
+# | class=\"anchor-reference-id\">(<a [-href=\"#EPL\">#EPL</a>)</span>-]
+# | {+href=\"#EPL2\">#EPL2</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
@@ -2386,7 +2387,7 @@
 msgid ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
 "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"
-"(<a href=\"#EPL\">#EPL</a>)</span>"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
 msgstr ""
 "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
 "Eclipse Public License Version&nbsp;1.0</a> <span class=\"anchor-reference-id"

Index: licenses/po/license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- licenses/po/license-list.pot        16 Oct 2017 20:00:53 -0000      1.175
+++ licenses/po/license-list.pot        17 Oct 2017 16:29:34 -0000      1.176
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2017-10-16 19:56+0000\n"
+"POT-Creation-Date: 2017-10-17 16:25+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"
@@ -1216,8 +1216,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Wx\"></a>WxWidgets Library License <span "
-"class=\"anchor-reference-id\">(<a href=\"#Wx\">#Wx</a>)</span>"
+"WxWidgets Library License <span class=\"anchor-reference-id\">(<a "
+"href=\"#Wx\">#Wx</a>)</span>"
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -1233,8 +1233,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Wxwind\"></a>WxWindows Library License <span "
-"class=\"anchor-reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
+"WxWindows Library License <span class=\"anchor-reference-id\">(<a "
+"href=\"#Wxwind\">#Wx</a>)</span>"
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -1619,7 +1619,7 @@
 msgid ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
 "Eclipse Public License Version 2.0</a> <span "
-"class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>"
+"class=\"anchor-reference-id\">(<a href=\"#EPL2\">#EPL2</a>)</span>"
 msgstr ""
 
 #. type: Content of: <dl><dd><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.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- licenses/po/license-list.ru-en.html 26 Aug 2017 08:59:52 -0000      1.101
+++ licenses/po/license-list.ru-en.html 17 Oct 2017 16:29:34 -0000      1.102
@@ -962,18 +962,25 @@
 license for one, we recommend the Apache 2.0 license since it protects
 users from patent treachery.</p></dd>
 
-<dt><a id="Wx"></a>WxWidgets License <span class="anchor-reference-id">(<a 
href="#Wx">#Wx</a>)</span></dt>
+<dt id="Wx">WxWidgets Library License
+<span class="anchor-reference-id">(<a href="#Wx">#Wx</a>)</span></dt>
 <dd>
 <p>The WxWidgets license is a GPL-compatible free software license. It
-consists of the  <a href="/licenses/old-licenses/lgpl-2.0.html">LGPL 2.0</a> 
-or any later version, plus an additional permission allowing binary
-distributions that use the library to be licensed under terms of the
-distributor's choice (including proprietary). Like the LGPL it is a
-weak copyleft license, so we recommend it <a
-href="/licenses/why-not-lgpl.html"> only in special
+consists of the <a href="/licenses/old-licenses/lgpl-2.0.html">GNU
+Lesser GPL 2.0</a> or any later version, plus an additional permission
+allowing binary distributions that use the library to be licensed
+under terms of the distributor's choice (including proprietary).  It
+is a weak copyleft, even weaker than the LGPL, so we recommend
+it <a href="/licenses/why-not-lgpl.html"> only in special
 circumstances</a>.</p>
 </dd>
 
+<dt id="Wxwind">WxWindows Library License
+<span class="anchor-reference-id">(<a href="#Wxwind">#Wx</a>)</span></dt>
+<dd>
+<p>An older name for the <a href="#Wx">WxWidgets Library license</a>.</p>
+</dd>
+
 <dt><a id="X11License" href="http://directory.fsf.org/wiki/License:X11";>
     X11 License</a>
     <span class="anchor-reference-id">
@@ -1240,6 +1247,22 @@
 infringement suits specifically against Contributors to the EPL'd
 program.</p></dd>
 
+<dt><a id="EPL2" href="http://directory.fsf.org/wiki/License:EPLv2.0";>
+    Eclipse Public License Version 2.0</a>
+    <span class="anchor-reference-id">(<a href="#EPL2">#EPL2</a>)</span></dt>
+<dd>
+<p>In terms of GPL compatibility, the Eclipse Public License version
+2.0 is essentially equivalent to version 1.0. The only change is that
+it explicitly offers the option of designating the GNU GPL version 2
+or later as a &ldquo;secondary license&rdquo; for a certain piece of
+code.</p>
+
+<p>If an initial contributor releases a specific piece of code and
+designates GNU GPL version 2 or later as a secondary license, that
+provides explicit compatibility with those GPL versions for that
+code. (Doing so is roughly equivalent, for users, to releasing that
+piece of code under a dual license, EPL | GPL.) However, the EPL2
+without this designation remains incompatible with the GPL.</p></dd>
 
 <dt><a id="EUPL" href="http://directory.fsf.org/wiki/License:EUPLv1.1";>
     European Union Public License (EUPL) version 1.1</a>
@@ -2698,7 +2721,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/08/26 08:59:52 $
+$Date: 2017/10/17 16:29:34 $
 <!-- 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.279
retrieving revision 1.280
diff -u -b -r1.279 -r1.280
--- licenses/po/license-list.ru.po      17 Oct 2017 16:15:17 -0000      1.279
+++ licenses/po/license-list.ru.po      17 Oct 2017 16:29:34 -0000      1.280
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2017-10-16 19:56+0000\n"
+"POT-Creation-Date: 2017-10-17 16:25+0000\n"
 "PO-Revision-Date: 2017-10-17 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: 2017-10-16 19:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -1774,36 +1773,14 @@
 "предательства."
 
 #. type: Content of: <dl><dt>
-# | <a id=\"Wx\"></a>WxWidgets {+Library+} License <span
-# | class=\"anchor-reference-id\">(<a href=\"#Wx\">#Wx</a>)</span>
-#| msgid ""
-#| "<a id=\"Wx\"></a>WxWidgets License <span class=\"anchor-reference-id\">"
-#| "(<a href=\"#Wx\">#Wx</a>)</span>"
-msgid ""
-"WxWidgets Library License <span class=\"anchor-reference-id"
-"\">(<a href=\"#Wx\">#Wx</a>)</span>"
-msgstr ""
-"Лицензия библиотеки WxWidgets <span 
class=\"anchor-reference-id\">(<a "
-"href=\"#Wx\">#Wx</a>)</span>"
-
-#. type: Content of: <dl><dd><p>
-# | The WxWidgets license is a GPL-compatible free software license. It
-# | consists of the <a [-href=\"/licenses/old-licenses/lgpl-2.0.html\">LGPL-]
-# | {+href=\"/licenses/old-licenses/lgpl-2.0.html\">GNU Lesser GPL+} 2.0</a>
-# | or any later version, plus an additional permission allowing binary
-# | distributions that use the library to be licensed under terms of the
-# | distributor's choice (including proprietary). [-Like the LGPL it-]  {+It+}
-# | is a weak [-copyleft license,-] {+copyleft, even weaker than the LGPL,+}
-# | so we recommend it <a href=\"/licenses/why-not-lgpl.html\"> only in
-# | special circumstances</a>.
-#| msgid ""
-#| "The WxWidgets license is a GPL-compatible free software license. It "
-#| "consists of the <a href=\"/licenses/old-licenses/lgpl-2.0.html\">LGPL "
-#| "2.0</a> or any later version, plus an additional permission allowing "
-#| "binary distributions that use the library to be licensed under terms of "
-#| "the distributor's choice (including proprietary). Like the LGPL it is a "
-#| "weak copyleft license, so we recommend it <a href=\"/licenses/why-not-"
-#| "lgpl.html\"> only in special circumstances</a>."
+msgid ""
+"WxWidgets Library License <span class=\"anchor-reference-id\">(<a href=\"#Wx"
+"\">#Wx</a>)</span>"
+msgstr ""
+"Лицензия библиотеки WxWidgets <span 
class=\"anchor-reference-id\">(<a href="
+"\"#Wx\">#Wx</a>)</span>"
+
+#. type: Content of: <dl><dd><p>
 msgid ""
 "The WxWidgets license is a GPL-compatible free software license. It consists "
 "of the <a href=\"/licenses/old-licenses/lgpl-2.0.html\">GNU Lesser GPL 2.0</"
@@ -1815,30 +1792,25 @@
 msgstr ""
 "Лицензия WxWidgets&nbsp;&mdash; совместимая с GPL 
лицензия свободных "
 "программ. Она состоит из <a 
href=\"/licenses/old-licenses/lgpl-2.0.html\"> "
-"Меньшей стандартной общественной 
лицензии GNU&nbsp;2.0</a> или любой более поздней 
версии с дополнительным "
-"разрешением, допускающим распространение 
программ, применяющих библиотеку, в "
-"двоичном виде, на условиях по выбору 
распространителя (в том числе "
-"несвободных). Это слабое авторское лево, 
так что мы "
-"рекомендуем ее <a href=\"/licenses/why-not-lgpl.html\"> 
только в особых "
-"обстоятельствах</a>."
-
-#. type: Content of: <dl><dt>
-# | <a [-id=\"Wx\"></a>WxWidgets-] {+id=\"Wxwind\"></a>WxWindows Library+}
-# | License <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#Wx\">#Wx</a>)</span>-] {+href=\"#Wxwind\">#Wx</a>)</span>+}
-#| msgid ""
-#| "<a id=\"Wx\"></a>WxWidgets License <span class=\"anchor-reference-id\">"
-#| "(<a href=\"#Wx\">#Wx</a>)</span>"
+"Меньшей стандартной общественной 
лицензии GNU&nbsp;2.0</a> или любой более "
+"поздней версии с дополнительным 
разрешением, допускающим распространение "
+"программ, применяющих библиотеку, в 
двоичном виде, на условиях по выбору "
+"распространителя (в том числе несвободных
). Это слабое авторское лево, так "
+"что мы рекомендуем ее <a 
href=\"/licenses/why-not-lgpl.html\"> только в "
+"особых обстоятельствах</a>."
+
+#. type: Content of: <dl><dt>
 msgid ""
-"WxWindows Library License <span class=\"anchor-"
-"reference-id\">(<a href=\"#Wxwind\">#Wx</a>)</span>"
+"WxWindows Library License <span class=\"anchor-reference-id\">(<a href="
+"\"#Wxwind\">#Wx</a>)</span>"
 msgstr ""
-"Лицензия библиотеки WxWindows <span 
class=\"anchor-reference-id\">(<a "
-"href=\"#Wx\">#Wxwind</a>)</span>"
+"Лицензия библиотеки WxWindows <span 
class=\"anchor-reference-id\">(<a href="
+"\"#Wx\">#Wxwind</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid "An older name for the <a href=\"#Wx\">WxWidgets Library license</a>."
-msgstr "Более старое название <a 
href=\"#Wx\">лицензии библиотеки WxWidgets</a>."
+msgstr ""
+"Более старое название <a href=\"#Wx\">лицензии 
библиотеки WxWidgets</a>."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -2379,14 +2351,6 @@
 "под лицензией Eclipse."
 
 #. type: Content of: <dl><dt>
-# | <a [-id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";>-]
-# | {+id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";>+}
-# | Eclipse Public License Version [-1-]{+2+}.0</a> <span
-# | class=\"anchor-reference-id\">(<a href=\"#EPL\">#EPL</a>)</span>
-#| msgid ""
-#| "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
-#| "Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
-#| "\">(<a href=\"#EPL\">#EPL</a>)</span>"
 msgid ""
 "<a id=\"EPL2\" href=\"http://directory.fsf.org/wiki/License:EPLv2.0\";> "
 "Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"
@@ -2403,10 +2367,11 @@
 "offers the option of designating the GNU GPL version 2 or later as a &ldquo;"
 "secondary license&rdquo; for a certain piece of code."
 msgstr ""
-"С точки зрения совместимости с GPL 
Общественная лицензия Eclipse 2.0 по существу "
-"эквивалентна версии 1.0. Единственное 
изменение состоит в том, что она явно "
-"предлагает возможность назначения GNU GPL 
версии 2 или более поздней в качестве "
-"&ldquo;вторичной лицензии&rdquo; для 
определенной части программы."
+"С точки зрения совместимости с GPL 
Общественная лицензия Eclipse 2.0 по "
+"существу эквивалентна версии 1.0. 
Единственное изменение состоит в том, что "
+"она явно предлагает возможность 
назначения GNU GPL версии 2 или более "
+"поздней в качестве &ldquo;вторичной 
лицензии&rdquo; для определенной части "
+"программы."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2421,8 +2386,8 @@
 "назначает GNU GPL версии 2 или более поздней в 
качестве вторичной лицензии, "
 "это дает явную совместимость с этими 
версиями GPL для этой части программы. "
 "(Для пользователей это примерно 
эквивалентно выпуску этой части программы "
-"под двойной лицензией: EPL или GPL.) Однако EPL2 
без этого назначения остается "
-"несовместимой с GPL."
+"под двойной лицензией: EPL или GPL.) Однако EPL2 
без этого назначения "
+"остается несовместимой с GPL."
 
 #. type: Content of: <dl><dt>
 msgid ""

Index: licenses/po/license-recommendations.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ru-en.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- licenses/po/license-recommendations.ru-en.html      21 Dec 2015 08:30:56 
-0000      1.30
+++ licenses/po/license-recommendations.ru-en.html      17 Oct 2017 16:29:34 
-0000      1.31
@@ -83,9 +83,15 @@
 version of the <a href="/licenses/gpl.html">GNU General Public License
 (GPL)</a> for your project.  Its strong copyleft is appropriate for
 all kinds of software, and includes numerous protections for users'
-freedom.</p>
+freedom.  Please give permission to use future license versions as
+well&mdash;in other words, make the license notice say that your
+program is covered by GPL version 3 or later.</p>
 
-<p>Now for the exceptions.</p>
+<p>Here is more advice about <a href="/licenses/gpl-howto.html">how
+to release a program under the GNU GPL</a>.</p>
+
+<p>Now for the exceptions, where it is better to use some other
+licenses instead of the GNU GPL.</p>
 
 <h4 id="small">Small programs</h4>
 
@@ -272,7 +278,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2011, 2013, 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2013, 2014, 2015, 2017 Free Software Foundation, 
Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -282,7 +288,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/12/21 08:30:56 $
+$Date: 2017/10/17 16:29:34 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-recommendations.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ru.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- licenses/po/license-recommendations.ru.po   17 Oct 2017 16:15:17 -0000      
1.41
+++ licenses/po/license-recommendations.ru.po   17 Oct 2017 16:29:34 -0000      
1.42
@@ -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: 2017-10-16 19:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -178,18 +177,6 @@
 "это, как правило, наилучшая стратегия 
лицензирования."
 
 #. type: Content of: <p>
-# | For most programs, we recommend that you use the most recent version of
-# | the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a>
-# | for your project.  Its strong copyleft is appropriate for all kinds of
-# | software, and includes numerous protections for users' freedom.  {+Please
-# | give permission to use future license versions as well&mdash;in other
-# | words, make the license notice say that your program is covered by GPL
-# | version 3 or later.+}
-#| msgid ""
-#| "For most programs, we recommend that you use the most recent version of "
-#| "the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> "
-#| "for your project.  Its strong copyleft is appropriate for all kinds of "
-#| "software, and includes numerous protections for users' freedom."
 msgid ""
 "For most programs, we recommend that you use the most recent version of the "
 "<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
@@ -202,9 +189,9 @@
 "последнюю версию <a 
href=\"/licenses/gpl.html\">Стандартной общественной "
 "лицензии GNU (GPL)</a>. Ее сильное авторское 
лево подходит ко всем видам "
 "программ и предусматривает 
многочисленные меры охраны свободы 
пользователей."
-"Пожалуйста, давайте разрешение 
пользоваться и будущими версиями 
лицензии&nbsp;&mdash; "
-"записывайте в лицензионном уведомлении, 
что ваша программа распространяется "
-"по GPL версии 3 или более поздней."
+"Пожалуйста, давайте разрешение 
пользоваться и будущими версиями "
+"лицензии&nbsp;&mdash; записывайте в 
лицензионном уведомлении, что ваша "
+"программа распространяется по GPL версии 3 
или более поздней."
 
 #. type: Content of: <p>
 msgid ""
@@ -219,8 +206,8 @@
 "Now for the exceptions, where it is better to use some other licenses "
 "instead of the GNU GPL."
 msgstr ""
-"Теперь об исключениях, когда лучше 
применять какие-то другие лицензии "
-"вместо GNU GPL."
+"Теперь об исключениях, когда лучше 
применять какие-то другие лицензии вместо "
+"GNU GPL."
 
 #. type: Content of: <h4>
 msgid "Small programs"
@@ -569,14 +556,11 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2011, 2013, 2014, [-2015-] {+2015, 2017+} Free Software
-# | Foundation, Inc.
-#| msgid ""
-#| "Copyright &copy; 2011, 2013, 2014, 2015 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 2011, 2013, 2014, 2015, 2017 Free Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2011, 2012, 2013, 2014, 2015, 2017 Free Software Foundation, 
Inc."
+"Copyright &copy; 2011, 2012, 2013, 2014, 2015, 2017 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
reply via email to
[Prev in Thread] Current Thread [Next in Thread]