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

www licenses/gpl-faq.ru.html licenses/old-licen...

From: GNUN
Subject: www licenses/gpl-faq.ru.html licenses/old-licen...
Date: Sat, 11 Mar 2017 04:02:39 -0500 (EST) 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     17/03/11 04:02:39

Modified files:
        licenses       : gpl-faq.ru.html 
        licenses/old-licenses/po: gpl-2.0-faq.ru.po 
        licenses/po    : gpl-faq.ru-en.html gpl-faq.ru.po 
        proprietary    : proprietary-surveillance.ru.html 
        proprietary/po : malware-apple.ru.po 
                         proprietary-surveillance.ru-en.html 
                         proprietary-surveillance.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.ru.html?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ru.po?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru-en.html?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru.po?cvsroot=www&r1=1.128&r2=1.129
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-surveillance.ru.html?cvsroot=www&r1=1.63&r2=1.64
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-apple.ru.po?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-surveillance.ru-en.html?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-surveillance.ru.po?cvsroot=www&r1=1.186&r2=1.187

Patches:
Index: licenses/gpl-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.ru.html,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- licenses/gpl-faq.ru.html    28 Feb 2017 06:30:56 -0000      1.73
+++ licenses/gpl-faq.ru.html    11 Mar 2017 09:02:38 -0000      1.74
@@ -577,6 +577,9 @@
 требуется ли от меня использование GPL в 
качестве лицензии для моего
 модуля?</a></li>
   
+    <li><a href="#GPLPlugins">Когда программа и ее 
внешние модули считаются единой
+комбинированной программой?</a></li>
+  
     <li><a href="#GPLAndPlugins">Если я пишу внешний 
модуль для применения с
 программой, выпущенной под GPL, какие 
требования это налагает на лицензии,
 под которыми я могу распространять свой 
модуль?</a></li>
@@ -1716,45 +1719,58 @@
 <p>В пересмотренной лицензии BSD пункта о 
рекламе нет, что устраняет проблему.</p></dd>
 
 
+<dt id="GPLPlugins">Когда программа и ее внешние 
модули считаются единой комбинированной
+программой? <span class="anchor-reference-id">(<a href="#GPLPlugins"
+>#GPLPlugins</a>)</span></dt>
+<dd><p>
+    Это зависит от того, как главная 
программа вызывает свои внешние
+модули. Если главная программа использует 
для этого fork и exec и они
+завязывают тесное общение через сложные 
структуры данных, общие или
+передаваемые туда и обратно, то они 
становятся единой комбинированной
+программой. Когда главная программа 
использует для вызова внешних модулей
+просто fork и exec, не завязывая тесного 
общения с ними, внешние модули
+остаются отдельными программами.</p>
+       
+<p> Если главная программа динамически 
компонуется с модулями и они вызывают
+функции друг из друга и разделяют общие 
структуры данных, мы убеждены, что
+они формируют единую комбинированную 
программу, которая должна
+рассматриваться как расширение и главной 
программы, и модулей. Если главная
+программа динамически компонуется с 
модулями, но взаимодействие между ними
+ограничено вызовом &ldquo;главной&rdquo; 
процедуры модуля с какими-то
+параметрами и ожиданием результата, то это 
предельный случай.</p>
+
+<p>Применение общей памяти для обмена 
сложными структурами данных вполне
+эквивалентно динамическому 
связыванию.</p></dd>
+
+
 <dt id="GPLAndPlugins">Если я пишу внешний модуль для 
применения с программой, выпущенной под GPL,
 какие требования это налагает на лицензии, 
под которыми я могу
 распространять свой модуль? <span 
class="anchor-reference-id">(<a
 href="#GPLAndPlugins" >#GPLAndPlugins</a>)</span></dt>
 <dd><p>
-Это зависит от того, как программа 
задействует свои внешние модули. Если
-программа пользуется для этого вызовами 
<em>fork</em> или <em>exec</em>, то
-модули&nbsp;&mdash; это отдельные программы, так 
что лицензия главной
-программы не предъявляет к ним никаких 
требований.</p>
-
-<p>Если программа динамически компонуется 
с модулями и они вызывают функции
-друг из друга и разделяют общие структуры 
данных, мы убеждены, что они
-формируют единую программу, которая 
должна рассматриваться как расширение и
-главной программы, и модулей. Это значит, 
что вы должны выпускать модуль под
-GPL или совместимой с ней лицензией 
свободных программ и распространять его
-с исходным текстом так, чтобы это было 
совместимо с GPL.</p>
-
-<p>Как предельный может рассматриваться 
случай, когда программа динамически
-компонуется с модулями, но сообщение между 
ними ограничивается вызовом
-&ldquo;главной&rdquo; функции модуля с 
некоторыми аргументами и ожиданием,
-когда произойдет возврат из функции.</p></dd>
+См. также отдельный вопрос <a href="#GPLPlugins">для 
определения того,
+считаются ли модули и главная программа 
единой комбинированной программой
+или раздельными произведениями</a>.</p>
+
+<p> Если главная программа и модули 
составляют комбинированную программу, то 
это
+значит, что вы должны выпускать модуль под 
GPL или совместимой с ней
+лицензией свободных программ и 
распространять его с исходным текстом так,
+чтобы это было совместимо с GPL. Если 
главная программа отдельна от внешних
+модулей, то это не налагает требований на 
внешние модули. </p></dd>
 
 
 <dt id="GPLPluginsInNF">Могу я применять GPL, когда 
пишу внешний модуль к несвободной 
программе?
 <span class="anchor-reference-id">(<a href="#GPLPluginsInNF"
 >#GPLPluginsInNF</a>)</span></dt>
 <dd><p>
-Если программа пользуется вызовами 
<em>fork</em> и <em>exec</em> для того,
-чтобы задействовать модуль, то модули 
являются отдельными программами, так
-что лицензия главной программы не 
предъявляет к ним никаких требований. Так
-что вы можете применять GPL для модуля и 
никаких особых требований нет.</p>
-
-<p>Если программа динамически компонуется 
с модулями и они вызывают функции
-друг из друга и разделяют общие структуры 
данных, мы убеждены, что они
-формируют единую программу, которая 
должна рассматриваться как расширение и
-главной программы, и модулей. Это значит, 
что объединение модуля под GPL с
-несвободной программой нарушало бы GPL. 
Однако вы можете решить эту
-юридическую проблему, добавив исключение 
к лицензии своего модуля, в котором
-дается разрешение компоновать его с 
несвободной главной программой.</p>
+ См. также отдельный вопрос <a href="#GPLPlugins">для 
определения того,
+считаются ли модули и главная программа 
единой комбинированной программой
+или раздельными программами</a>.</p>
+<p> Если они формируют единую 
комбинированную программу, это значит, что
+объединение модуля под GPL с несвободной 
программой нарушало бы GPL. Однако
+вы можете решить эту юридическую проблему, 
добавив исключение к лицензии
+своего модуля, в котором дается разрешение 
компоновать его с несвободной
+главной программой.</p>
 
 <p>См. также ответ на вопрос <a href="#FSWithNFLibs">о 
написании свободных
 программ с использованием несвободных 
библиотек</a>.</p></dd>
@@ -1763,28 +1779,19 @@
 <dt id="NFUseGPLPlugins">Могу я выпустить несвободную 
программу, составленную так, чтобы 
подгружать
 внешний модуль под GPL? <span class="anchor-reference-id">(<a
 href="#NFUseGPLPlugins" >#NFUseGPLPlugins</a>)</span></dt>
+
 <dd><p>
-Это зависит от того, как программа 
задействует свои внешние
-модули. Например, если программа 
использует <em>только</em> простые вызовы
-<em>fork</em> и <em>exec</em> для загрузки и связи с 
модулями, то эти модули
-являются отдельными программами, так что 
лицензия модуля не предъявляет
-требований к главной программе.</p>
-
-<p>Если программа динамически компонуется 
с модулями и они вызывают функции
-друг из друга и разделяют общие структуры 
данных, мы убеждены, что они
-формируют единую программу, которая 
должна рассматриваться как расширение и
-главной программы, и модулей. Чтобы 
пользоваться модулями под GPL, главная
-программа должна выпускаться под GPL или 
совместимой с ней лицензией
-свободных программ и условия GPL должны 
соблюдаться, когда главная программа
-распространяется для использования с 
этими модулями.</p>
-
-<p>Как предельный может рассматриваться 
случай, когда программа динамически
-компонуется с модулями, но сообщение между 
ними ограничивается вызовом
-&ldquo;главной&rdquo; функции модуля с 
некоторыми аргументами и ожиданием,
-когда произойдет возврат из функции.</p>
+ См. также отдельный вопрос <a href="#GPLPlugins">для 
определения того,
+считаются ли модули и главная программа 
единой комбинированной программой
+или раздельными программами</a>.</p>
+<p>
+Если они формируют единую комбинированную 
программу, то главная программа
+должна выпускаться под GPL или совместимой 
с ней лицензией свободных
+программ, и при распространении главной 
программы для пользования с этими
+модулями должны соблюдаться условия GPL.</p>
 
-<p>Применение общей памяти для обмена 
сложными структурами данных вполне
-эквивалентно динамическому связыванию.</p>
+<p>Однако если это раздельные произведения, 
то лицензия на модули не налагает
+требований на главную программу.</p>
 
 <p>См. также ответ на вопрос <a href="#FSWithNFLibs">о 
написании свободных
 программ с использованием несвободных 
библиотек</a>.</p></dd>
@@ -3855,7 +3862,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2017/02/28 06:30:56 $
+$Date: 2017/03/11 09:02:38 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/old-licenses/po/gpl-2.0-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ru.po,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- licenses/old-licenses/po/gpl-2.0-faq.ru.po  11 Mar 2017 07:55:56 -0000      
1.45
+++ licenses/old-licenses/po/gpl-2.0-faq.ru.po  11 Mar 2017 09:02:38 -0000      
1.46
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-2.0-faq.html\n"
-"POT-Creation-Date: 2017-03-10 21:26+0000\n"
+"POT-Creation-Date: 2017-03-11 07:56+0000\n"
 "PO-Revision-Date: 2017-01-03 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -183,10 +183,18 @@
 "измененных версий выставлялся на 
всеобщее обозрение?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLAndNonfreeOnSameMachine\"
+# | name=\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program
+# | and an unrelated non[---]free program on the same computer?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLAndNonfreeOnSameMachine\" name="
+#| "\"TOCGPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and "
+#| "an unrelated non-free program on the same computer?</a>"
 msgid ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
-"\"> Can I have a GPL-covered program and an unrelated non-free program on "
-"the same computer?</a>"
+"\"> Can I have a GPL-covered program and an unrelated nonfree program on the "
+"same computer?</a>"
 msgstr ""
 "<a href=\"#GPLAndNonfreeOnSameMachine\" name=\"TOCGPLAndNonfreeOnSameMachine"
 "\">Может у меня быть программа под GPL и не 
связанная с ней несвободная "
@@ -432,10 +440,18 @@
 "продукт?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would
+# | like to release a program I wrote under the GNU GPL, but I would like to
+# | use the same code in non[---]free programs.</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a>"
 msgid ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">I would "
 "like to release a program I wrote under the GNU GPL, but I would like to use "
-"the same code in non-free programs.</a>"
+"the same code in nonfree programs.</a>"
 msgstr ""
 "<a href=\"#ReleaseUnderGPLAndNF\" name=\"TOCReleaseUnderGPLAndNF\">Мне "
 "хотелось бы выпустить написанную мной 
программу под GNU GPL, но я хочу "
@@ -485,9 +501,15 @@
 "шаблонов системы поддержки сайта?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program
+# | under the GPL which I developed using non[---]free tools?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a>"
 msgid ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Can I release a program "
-"under the GPL which I developed using non-free tools?</a>"
+"under the GPL which I developed using nonfree tools?</a>"
 msgstr ""
 "<a href=\"#NonFreeTools\" name=\"TOCNonFreeTools\">Могу я 
выпустить "
 "программу, которую я разработал с помощью 
несвободных средств, под GPL?</a>"
@@ -679,10 +701,18 @@
 "программ"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I
+# | use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I "
+#| "use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a>"
 msgid ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Can I use "
-"GPL-covered editors such as GNU Emacs to develop non-free programs? Can I "
-"use GPL-covered tools such as GCC to compile them?</a>"
+"GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I use "
+"GPL-covered tools such as GCC to compile them?</a>"
 msgstr ""
 "<a href=\"#CanIUseGPLToolsForNF\" name=\"TOCCanIUseGPLToolsForNF\">Можно 
мне "
 "пользоваться редакторами под GPL, такими, 
как GNU Emacs, для разработки "
@@ -833,20 +863,13 @@
 "модуль к программе под GPL, требуется ли от 
меня использование GPL в "
 "качестве лицензии для моего модуля?</a>"
 
-# | <a [-href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the
-# | GPL when writing-] {+href=\"#GPLPlugins\" name=\"TOCGPLPlugins\"> When
-# | are+} a [-plug-in for-] {+program and its plug-ins considered+} a
-# | [-non-free-] {+single combined+} program?</a>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the "
-#| "GPL when writing a plug-in for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPlugins\" name=\"TOCGPLPlugins\"> When are a program and its "
 "plug-ins considered a single combined program?</a>"
 msgstr ""
-"<a href=\"#GPLPlugins\" name=\"TOCGPLPlugins\"> Когда программа 
и ее "
-"внешние модули считаются единой 
комбинированной программой?</a>"
+"<a href=\"#GPLPlugins\" name=\"TOCGPLPlugins\"> Когда программа 
и ее внешние "
+"модули считаются единой комбинированной 
программой?</a>"
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -859,17 +882,29 @@
 "лицензиям модуля?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL
+# | when writing a plug-in for a non[---]free program?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a>"
 msgid ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Can I apply the GPL "
-"when writing a plug-in for a non-free program?</a>"
+"when writing a plug-in for a nonfree program?</a>"
 msgstr ""
 "<a href=\"#GPLPluginsInNF\" name=\"TOCGPLPluginsInNF\">Могу я 
применять GPL, "
 "когда пишу внешний модуль к несвободной 
программе?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a
+# | non[---]free program that's designed to load a GPL-covered plug-in?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+#| "non-free program that's designed to load a GPL-covered plug-in?</a>"
 msgid ""
-"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a non-"
-"free program that's designed to load a GPL-covered plug-in?</a>"
+"<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Can I release a "
+"nonfree program that's designed to load a GPL-covered plug-in?</a>"
 msgstr ""
 "<a href=\"#NFUseGPLPlugins\" name=\"TOCNFUseGPLPlugins\">Могу я 
выпустить "
 "несвободную программу, составленную так, 
чтобы подгружать внешний модуль под "
@@ -900,9 +935,15 @@
 "GPL, и несвободной частью?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free
+# | software that uses non[---]free libraries?</a>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
+#| "software that uses non-free libraries?</a>"
 msgid ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\"> Can I write free "
-"software that uses non-free libraries?</a>"
+"software that uses nonfree libraries?</a>"
 msgstr ""
 "<a href=\"#FSWithNFLibs\" name=\"TOCFSWithNFLibs\">Могу ли я 
написать "
 "свободную программу, которая пользуется 
несвободными библиотеками?</a>"
@@ -1306,10 +1347,18 @@
 "определенными способами; но вы вполне 
можете решать, выпускать ее или нет."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCGPLAndNonfreeOnSameMachine\"
+# | name=\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and
+# | an unrelated non[---]free program on the same computer?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
+#| "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
+#| "unrelated non-free program on the same computer?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLAndNonfreeOnSameMachine\" name="
 "\"GPLAndNonfreeOnSameMachine\"> Can I have a GPL-covered program and an "
-"unrelated non-free program on the same computer?</a></b>"
+"unrelated nonfree program on the same computer?</a></b>"
 msgstr ""
 "<a href=\"#TOCGPLAndNonfreeOnSameMachine\" name=\"GPLAndNonfreeOnSameMachine"
 "\">Может у меня быть программа под GPL и не 
связанная с ней несвободная "
@@ -1533,8 +1582,18 @@
 "платил мне или извещал меня?</a>"
 
 #. type: Content of: <dl><dd>
+# | No.  In fact, a requirement like that would make the program non[---]free.
+# |  If people have to pay when they get a copy of a program, or if they have
+# | to notify anyone in particular, then the program is not free.  See the <a
+# | href=\"/philosophy/free-sw.html\"> definition of free software</a>.
+#, fuzzy
+#| msgid ""
+#| "No.  In fact, a requirement like that would make the program non-free.  "
+#| "If people have to pay when they get a copy of a program, or if they have "
+#| "to notify anyone in particular, then the program is not free.  See the <a "
+#| "href=\"/philosophy/free-sw.html\"> definition of free software</a>."
 msgid ""
-"No.  In fact, a requirement like that would make the program non-free.  If "
+"No.  In fact, a requirement like that would make the program nonfree.  If "
 "people have to pay when they get a copy of a program, or if they have to "
 "notify anyone in particular, then the program is not free.  See the <a href="
 "\"/philosophy/free-sw.html\"> definition of free software</a>."
@@ -1877,18 +1936,36 @@
 "по GNU GPL. Другая лицензия совместима с GPL, 
если она тоже разрешает это."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free
+# | software that uses non[---]free libraries?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
+#| "software that uses non-free libraries?</a></b>"
 msgid ""
 "<b><a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Can I write free "
-"software that uses non-free libraries?</a></b>"
+"software that uses nonfree libraries?</a></b>"
 msgstr ""
 "<a href=\"#TOCFSWithNFLibs\" name=\"FSWithNFLibs\">Могу ли я 
написать "
 "свободную программу, которая пользуется 
несвободными библиотеками?</a>"
 
 #. type: Content of: <dl><dd>
+# | If you do this, your program won't be fully usable in a free environment.
+# | If your program depends on a non[---]free library to do a certain job, it
+# | cannot do that job in the Free World. If it depends on a non[---]free
+# | library to run at all, it cannot be part of a free operating system such
+# | as GNU; it is entirely off limits to the Free World.
+#, fuzzy
+#| msgid ""
+#| "If you do this, your program won't be fully usable in a free environment. "
+#| "If your program depends on a non-free library to do a certain job, it "
+#| "cannot do that job in the Free World. If it depends on a non-free library "
+#| "to run at all, it cannot be part of a free operating system such as GNU; "
+#| "it is entirely off limits to the Free World."
 msgid ""
 "If you do this, your program won't be fully usable in a free environment. If "
-"your program depends on a non-free library to do a certain job, it cannot do "
-"that job in the Free World. If it depends on a non-free library to run at "
+"your program depends on a nonfree library to do a certain job, it cannot do "
+"that job in the Free World. If it depends on a nonfree library to run at "
 "all, it cannot be part of a free operating system such as GNU; it is "
 "entirely off limits to the Free World."
 msgstr ""
@@ -1909,14 +1986,32 @@
 "библиотеки?"
 
 #. type: Content of: <dl><dd><p>
+# | If the program is already written using the non[---]free library, perhaps
+# | it is too late to change the decision. You may as well release the program
+# | as it stands, rather than not release it. But please mention in the README
+# | that the need for the non[---]free library is a drawback, and suggest the
+# | task of changing the program so that it does the same job without the
+# | non[---]free library.  Please suggest that anyone who thinks of doing
+# | substantial further work on the program first free it from dependence on
+# | the non[---]free library.
+#, fuzzy
+#| msgid ""
+#| "If the program is already written using the non-free library, perhaps it "
+#| "is too late to change the decision. You may as well release the program "
+#| "as it stands, rather than not release it. But please mention in the "
+#| "README that the need for the non-free library is a drawback, and suggest "
+#| "the task of changing the program so that it does the same job without the "
+#| "non-free library.  Please suggest that anyone who thinks of doing "
+#| "substantial further work on the program first free it from dependence on "
+#| "the non-free library."
 msgid ""
-"If the program is already written using the non-free library, perhaps it is "
+"If the program is already written using the nonfree library, perhaps it is "
 "too late to change the decision. You may as well release the program as it "
 "stands, rather than not release it. But please mention in the README that "
-"the need for the non-free library is a drawback, and suggest the task of "
-"changing the program so that it does the same job without the non-free "
+"the need for the nonfree library is a drawback, and suggest the task of "
+"changing the program so that it does the same job without the nonfree "
 "library.  Please suggest that anyone who thinks of doing substantial further "
-"work on the program first free it from dependence on the non-free library."
+"work on the program first free it from dependence on the nonfree library."
 msgstr ""
 "Если программа уже написана с 
использованием несвободной библиотеки, "
 "возможно, менять решение уже поздно. Если 
вы выпустите программу в том виде, "
@@ -1928,8 +2023,18 @@
 "работу над программой, прежде всего 
освободить ее от этой зависимости."
 
 #. type: Content of: <dl><dd><p>
+# | Note that there may also be legal issues with combining certain
+# | non[---]free libraries with GPL-covered Free Software.  Please see <a
+# | href=\"#GPLIncompatibleLibs\">the question on GPL software with
+# | GPL-incompatible libraries</a> for more information.
+#, fuzzy
+#| msgid ""
+#| "Note that there may also be legal issues with combining certain non-free "
+#| "libraries with GPL-covered Free Software.  Please see <a href="
+#| "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-"
+#| "incompatible libraries</a> for more information."
 msgid ""
-"Note that there may also be legal issues with combining certain non-free "
+"Note that there may also be legal issues with combining certain nonfree "
 "libraries with GPL-covered Free Software.  Please see <a href="
 "\"#GPLIncompatibleLibs\">the question on GPL software with GPL-incompatible "
 "libraries</a> for more information."
@@ -2119,10 +2224,18 @@
 "для своих текстов&nbsp;&mdash; они сами решают, 
сделать ли это."
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"If the libraries you intend to link with are non-free, please also see <a "
-"href=\"#FSWithNFLibs\">the section on writing Free Software which uses non-"
-"free libraries</a>."
+# | If the libraries you intend to link with are non[---]free, please also see
+# | <a href=\"#FSWithNFLibs\">the section on writing Free Software which uses
+# | non[---]free libraries</a>.
+#, fuzzy
+#| msgid ""
+#| "If the libraries you intend to link with are non-free, please also see <a "
+#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+#| "non-free libraries</a>."
+msgid ""
+"If the libraries you intend to link with are nonfree, please also see <a "
+"href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
+"nonfree libraries</a>."
 msgstr ""
 "Если библиотеки, с которыми вы 
собираетесь компоновать программу, "
 "несвободны, прочтите, пожалуйста, <a 
href=\"#FSWithNFLibs\">ответ на вопрос "
@@ -2289,18 +2402,36 @@
 "является лицензией, которая 
распространяется на вашу копию."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I
+# | would like to release a program I wrote under the GNU GPL, but I would
+# | like to use the same code in non[---]free programs.</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
+#| "would like to release a program I wrote under the GNU GPL, but I would "
+#| "like to use the same code in non-free programs.</a></b>"
 msgid ""
 "<b><a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">I "
 "would like to release a program I wrote under the GNU GPL, but I would like "
-"to use the same code in non-free programs.</a></b>"
+"to use the same code in nonfree programs.</a></b>"
 msgstr ""
 "<a href=\"#TOCReleaseUnderGPLAndNF\" name=\"ReleaseUnderGPLAndNF\">Мне "
 "хотелось бы выпустить написанную мной 
программу под GNU GPL, но я хочу "
 "использовать те же исходные тексты в 
несвободных программах.</a>"
 
 #. type: Content of: <dl><dd>
+# | To release a non[---]free program is always ethically tainted, but legally
+# | there is no obstacle to your doing this.  If you are the copyright holder
+# | for the code, you can release it under various different non-exclusive
+# | licenses at various times.
+#, fuzzy
+#| msgid ""
+#| "To release a non-free program is always ethically tainted, but legally "
+#| "there is no obstacle to your doing this.  If you are the copyright holder "
+#| "for the code, you can release it under various different non-exclusive "
+#| "licenses at various times."
 msgid ""
-"To release a non-free program is always ethically tainted, but legally there "
+"To release a nonfree program is always ethically tainted, but legally there "
 "is no obstacle to your doing this.  If you are the copyright holder for the "
 "code, you can release it under various different non-exclusive licenses at "
 "various times."
@@ -2361,10 +2492,18 @@
 "условиях GPL и это право не может быть 
отозвано."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can
+# | I use GPL-covered editors such as GNU Emacs to develop non[---]free
+# | programs? Can I use GPL-covered tools such as GCC to compile them?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can "
+#| "I use GPL-covered editors such as GNU Emacs to develop non-free programs? "
+#| "Can I use GPL-covered tools such as GCC to compile them?</a></b>"
 msgid ""
 "<b><a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Can I "
-"use GPL-covered editors such as GNU Emacs to develop non-free programs? Can "
-"I use GPL-covered tools such as GCC to compile them?</a></b>"
+"use GPL-covered editors such as GNU Emacs to develop nonfree programs? Can I "
+"use GPL-covered tools such as GCC to compile them?</a></b>"
 msgstr ""
 "<a href=\"#TOCCanIUseGPLToolsForNF\" name=\"CanIUseGPLToolsForNF\">Можно 
мне "
 "пользоваться редакторами под GPL, такими, 
как GNU Emacs, для разработки "
@@ -2400,12 +2539,24 @@
 "авторско-правовой статус входных данных."
 
 #. type: Content of: <dl><dd><p>
+# | As it happens, Bison can also be used to develop non[---]free programs. 
+# | This is because we decided to explicitly permit the use of the Bison
+# | standard parser program in Bison output files without restriction.  We
+# | made the decision because there were other tools comparable to Bison which
+# | already permitted use for non[---]free programs.
+#, fuzzy
+#| msgid ""
+#| "As it happens, Bison can also be used to develop non-free programs.  This "
+#| "is because we decided to explicitly permit the use of the Bison standard "
+#| "parser program in Bison output files without restriction.  We made the "
+#| "decision because there were other tools comparable to Bison which already "
+#| "permitted use for non-free programs."
 msgid ""
-"As it happens, Bison can also be used to develop non-free programs.  This is "
+"As it happens, Bison can also be used to develop nonfree programs.  This is "
 "because we decided to explicitly permit the use of the Bison standard parser "
 "program in Bison output files without restriction.  We made the decision "
 "because there were other tools comparable to Bison which already permitted "
-"use for non-free programs."
+"use for nonfree programs."
 msgstr ""
 "Вместе с тем, Bison тоже можно применять для 
разработки несвободных "
 "программ&nbsp;&mdash; благодаря тому, что мы 
решили явно разрешить "
@@ -2812,20 +2963,13 @@
 msgstr ""
 "В пересмотренной лицензии BSD пункта о 
рекламе нет, что устраняет проблему."
 
-# | <b><a [-href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply
-# | the GPL when writing-] {+href=\"#TOCGPLPlugins\" name=\"GPLPlugins\"> When
-# | are+} a [-plug-in for-] {+program and its plug-ins considered+} a
-# | [-non-free program?</a></b>-] {+single combined program? </a></b>+}
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
-#| "GPL when writing a plug-in for a non-free program?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLPlugins\" name=\"GPLPlugins\"> When are a program and "
 "its plug-ins considered a single combined program? </a></b>"
 msgstr ""
-"<a href=\"#TOCGPLPlugins\" name=\"GPLPlugins\"> Когда программа 
и ее "
-"внешние модули считаются единой 
комбинированной программой?</a>"
+"<a href=\"#TOCGPLPlugins\" name=\"GPLPlugins\"> Когда программа 
и ее внешние "
+"модули считаются единой комбинированной 
программой?</a>"
 
 #. type: Content of: <dl><dd>
 msgid ""
@@ -2845,24 +2989,7 @@
 "завязывая тесного общения с ними, внешние 
модули остаются отдельными "
 "программами."
 
-# | If the {+main+} program dynamically links plug-ins, and they make function
-# | calls to each other and share data structures, we believe they form a
-# | single {+combined+} program, which must be treated as an extension of both
-# | the main program and the plug-ins.  [-This means-] {+If+} the [-plug-ins
-# | must be released under-] {+main program dynamically links plug-ins, but+}
-# | the [-GPL or a GPL-compatible free software license, and that-]
-# | {+communication between them is limited to invoking+} the [-terms-]
-# | {+&lsquo;main&rsquo; function+} of the [-GPL must be followed when those
-# | plug-ins are distributed.-] {+plug-in with some options and waiting for it
-# | to return, that is a borderline case.+}
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "If the program dynamically links plug-ins, and they make function calls "
-#| "to each other and share data structures, we believe they form a single "
-#| "program, which must be treated as an extension of both the main program "
-#| "and the plug-ins.  This means the plug-ins must be released under the GPL "
-#| "or a GPL-compatible free software license, and that the terms of the GPL "
-#| "must be followed when those plug-ins are distributed."
 msgid ""
 "If the main program dynamically links plug-ins, and they make function calls "
 "to each other and share data structures, we believe they form a single "
@@ -2872,13 +2999,13 @@
 "main&rsquo; function of the plug-in with some options and waiting for it to "
 "return, that is a borderline case."
 msgstr ""
-"Если главная программа динамически 
компонуется с модулями и они вызывают 
функции "
-"друг из друга и разделяют общие структуры 
данных, мы убеждены, что они "
-"формируют единую комбинированную 
программу, которая должна рассматриваться 
как расширение и "
-"главной программы, и модулей. Если главная 
программа динамически компонуется "
-"с модулями, но взаимодействие между ними 
ограничено вызовом &ldquo;главной&rdquo; "
-"процедуры модуля с какими-то параметрами 
и ожиданием результата, то это "
-"предельный случай."
+"Если главная программа динамически 
компонуется с модулями и они вызывают "
+"функции друг из друга и разделяют общие 
структуры данных, мы убеждены, что "
+"они формируют единую комбинированную 
программу, которая должна "
+"рассматриваться как расширение и главной 
программы, и модулей. Если главная "
+"программа динамически компонуется с 
модулями, но взаимодействие между ними "
+"ограничено вызовом &ldquo;главной&rdquo; 
процедуры модуля с какими-то "
+"параметрами и ожиданием результата, то 
это предельный случай."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2908,25 +3035,7 @@
 "считаются ли модули и главная программа 
единой комбинированной программой "
 "или раздельными произведениями</a>."
 
-# | If the [-program dynamically links plug-ins, and they make function calls
-# | to each other and share data structures, we believe they form a single
-# | program, which must be treated as an extension of both the-] main program
-# | and the [-plug-ins.  In order to use the GPL-covered plug-ins, the main-]
-# | {+plugins are a single combined+} program {+then this means you+} must
-# | [-be released-] {+license the plug-in+} under the GPL or a GPL-compatible
-# | free software license[-,-] and [-that the terms of the GPL must be
-# | followed when the-] {+distribute it with source code in a GPL-compliant
-# | way. A+} main program {+that+} is [-distributed-] {+separate from its
-# | plug-ins makes no requirements+} for [-use with these-] {+the+} plug-ins.
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "If the program dynamically links plug-ins, and they make function calls "
-#| "to each other and share data structures, we believe they form a single "
-#| "program, which must be treated as an extension of both the main program "
-#| "and the plug-ins.  In order to use the GPL-covered plug-ins, the main "
-#| "program must be released under the GPL or a GPL-compatible free software "
-#| "license, and that the terms of the GPL must be followed when the main "
-#| "program is distributed for use with these plug-ins."
 msgid ""
 "If the main program and the plugins are a single combined program then this "
 "means you must license the plug-in under the GPL or a GPL-compatible free "
@@ -2935,15 +3044,21 @@
 "the plug-ins."
 msgstr ""
 "Если главная программа и модули 
составляют комбинированную программу, то 
это "
-"значит, что вы должны выпускать модуль под 
"
-"GPL или совместимой с ней лицензией 
свободных программ и распространять его "
-"с исходным текстом так, чтобы это было 
совместимо с GPL. Если главная программа "
-"отдельна от внешних модулей, то это не 
налагает требований на внешние модули."
+"значит, что вы должны выпускать модуль под 
GPL или совместимой с ней "
+"лицензией свободных программ и 
распространять его с исходным текстом так, "
+"чтобы это было совместимо с GPL. Если 
главная программа отдельна от внешних "
+"модулей, то это не налагает требований на 
внешние модули."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the
+# | GPL when writing a plug-in for a non[---]free program?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
+#| "GPL when writing a plug-in for a non-free program?</a></b>"
 msgid ""
 "<b><a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Can I apply the "
-"GPL when writing a plug-in for a non-free program?</a></b>"
+"GPL when writing a plug-in for a nonfree program?</a></b>"
 msgstr ""
 "<a href=\"#TOCGPLPluginsInNF\" name=\"GPLPluginsInNF\">Могу я 
применять GPL, "
 "когда пишу внешний модуль к несвободной 
программе?</a>"
@@ -2958,97 +3073,81 @@
 "считаются ли модули и главная программа 
единой комбинированной программой "
 "или раздельными программами</a>."
 
-# | If [-the program dynamically links plug-ins, and they make function calls
-# | to each other and share data structures, we believe-] they form a single
-# | [-program, which must be treated as an extension of both the main-]
-# | {+combined+} program [-and the plug-ins.  This-] {+this+} means that
-# | combination of the GPL-covered plug-in with the non-free main program
-# | would violate the GPL. However, you can resolve that legal problem by
-# | adding an exception to your plug-in's license, giving permission to link
-# | it with the non-free main program.
 #. type: Content of: <dl><dd><p>
+# | If they form a single combined program this means that combination of the
+# | GPL-covered plug-in with the non[---]free main program would violate the
+# | GPL. However, you can resolve that legal problem by adding an exception to
+# | your plug-in's license, giving permission to link it with the non[---]free
+# | main program.
+#, fuzzy
 #| msgid ""
-#| "If the program dynamically links plug-ins, and they make function calls "
-#| "to each other and share data structures, we believe they form a single "
-#| "program, which must be treated as an extension of both the main program "
-#| "and the plug-ins.  This means that combination of the GPL-covered plug-in "
-#| "with the non-free main program would violate the GPL.  However, you can "
-#| "resolve that legal problem by adding an exception to your plug-in's "
-#| "license, giving permission to link it with the non-free main program."
+#| "If they form a single combined program this means that combination of the "
+#| "GPL-covered plug-in with the non-free main program would violate the GPL. "
+#| "However, you can resolve that legal problem by adding an exception to "
+#| "your plug-in's license, giving permission to link it with the non-free "
+#| "main program."
 msgid ""
 "If they form a single combined program this means that combination of the "
-"GPL-covered plug-in with the non-free main program would violate the GPL. "
+"GPL-covered plug-in with the nonfree main program would violate the GPL. "
 "However, you can resolve that legal problem by adding an exception to your "
-"plug-in's license, giving permission to link it with the non-free main "
+"plug-in's license, giving permission to link it with the nonfree main "
 "program."
 msgstr ""
-"Если они формируют единую 
комбинированную программу, это значит, что 
объединение модуля под GPL с "
-"несвободной программой нарушало бы GPL. 
Однако вы можете решить эту "
-"юридическую проблему, добавив исключение 
к лицензии своего модуля, в котором "
-"дается разрешение компоновать его с 
несвободной главной программой."
+"Если они формируют единую 
комбинированную программу, это значит, что "
+"объединение модуля под GPL с несвободной 
программой нарушало бы GPL. Однако "
+"вы можете решить эту юридическую 
проблему, добавив исключение к лицензии "
+"своего модуля, в котором дается 
разрешение компоновать его с несвободной "
+"главной программой."
 
 #. type: Content of: <dl><dd><p>
+# | See also the question <a href=\"#FSWithNFLibs\">I am writing free software
+# | that uses a non[---]free library.</a>
+#, fuzzy
+#| msgid ""
+#| "See also the question <a href=\"#FSWithNFLibs\">I am writing free "
+#| "software that uses a non-free library.</a>"
 msgid ""
 "See also the question <a href=\"#FSWithNFLibs\">I am writing free software "
-"that uses a non-free library.</a>"
+"that uses a nonfree library.</a>"
 msgstr ""
 "См. также ответ на вопрос <a href=\"#FSWithNFLibs\">о 
написании свободных "
 "программ с использованием несвободных 
библиотек</a>."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release
+# | a non[---]free program that's designed to load a GPL-covered
+# | plug-in?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release "
+#| "a non-free program that's designed to load a GPL-covered plug-in?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Can I release a "
-"non-free program that's designed to load a GPL-covered plug-in?</a></b>"
+"nonfree program that's designed to load a GPL-covered plug-in?</a></b>"
 msgstr ""
 "<a href=\"#TOCNFUseGPLPlugins\" name=\"NFUseGPLPlugins\">Могу я 
выпустить "
 "несвободную программу, составленную так, 
чтобы подгружать внешний модуль под "
 "GPL?</a>"
 
-# | If [-the program dynamically links plug-ins, and they make function calls
-# | to each other and share data structures, we believe-] they form a single
-# | [-program, which must be treated as an extension of both the main-]
-# | {+combined+} program [-and the plug-ins.  In order to use the GPL-covered
-# | plug-ins,-] {+then+} the main program must be released under the GPL or a
-# | GPL-compatible free software license, and [-that-] the terms of the GPL
-# | must be followed when the main program is distributed for use with these
-# | plug-ins.
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "If the program dynamically links plug-ins, and they make function calls "
-#| "to each other and share data structures, we believe they form a single "
-#| "program, which must be treated as an extension of both the main program "
-#| "and the plug-ins.  In order to use the GPL-covered plug-ins, the main "
-#| "program must be released under the GPL or a GPL-compatible free software "
-#| "license, and that the terms of the GPL must be followed when the main "
-#| "program is distributed for use with these plug-ins."
 msgid ""
 "If they form a single combined program then the main program must be "
 "released under the GPL or a GPL-compatible free software license, and the "
 "terms of the GPL must be followed when the main program is distributed for "
 "use with these plug-ins."
 msgstr ""
-"Если они "
-"формируют единую комбинированную 
программу, то главная программа должна "
-"выпускаться под GPL или совместимой с ней 
лицензией свободных программ, "
-"и при распространении главной программы 
для пользования с этими "
+"Если они формируют единую 
комбинированную программу, то главная 
программа "
+"должна выпускаться под GPL или совместимой 
с ней лицензией свободных "
+"программ, и при распространении главной 
программы для пользования с этими "
 "модулями должны соблюдаться условия GPL."
 
-# | [-It depends on how the program invokes its plug-ins.  If the program uses
-# | fork and exec to invoke plug-ins, then the plug-ins-]{+However, if they+}
-# | are separate [-programs, so-] {+works then+} the license of the plug-in
-# | makes no requirements about the main program.
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "It depends on how the program invokes its plug-ins.  If the program uses "
-#| "fork and exec to invoke plug-ins, then the plug-ins are separate "
-#| "programs, so the license of the plug-in makes no requirements about the "
-#| "main program."
 msgid ""
 "However, if they are separate works then the license of the plug-in makes no "
 "requirements about the main program."
 msgstr ""
-"Однако если это раздельные произведения, 
то лицензия на модули не "
-"налагает требований на главную программу."
+"Однако если это раздельные произведения, 
то лицензия на модули не налагает "
+"требований на главную программу."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -3512,12 +3611,24 @@
 "систему. Можно мне это делать?</a>"
 
 #. type: Content of: <dl><dd>
+# | You cannot incorporate GPL-covered software in a proprietary system.  The
+# | goal of the GPL is to grant everyone the freedom to copy, redistribute,
+# | understand, and modify a program.  If you could incorporate GPL-covered
+# | software into a non[---]free system, it would have the effect of making
+# | the GPL-covered software non[---]free too.
+#, fuzzy
+#| msgid ""
+#| "You cannot incorporate GPL-covered software in a proprietary system.  The "
+#| "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
+#| "understand, and modify a program.  If you could incorporate GPL-covered "
+#| "software into a non-free system, it would have the effect of making the "
+#| "GPL-covered software non-free too."
 msgid ""
 "You cannot incorporate GPL-covered software in a proprietary system.  The "
 "goal of the GPL is to grant everyone the freedom to copy, redistribute, "
 "understand, and modify a program.  If you could incorporate GPL-covered "
-"software into a non-free system, it would have the effect of making the GPL-"
-"covered software non-free too."
+"software into a nonfree system, it would have the effect of making the GPL-"
+"covered software nonfree too."
 msgstr ""
 "Вы не можете включать программы, 
распространяемые по GPL, в несвободную "
 "систему. Цель GPL&nbsp;&mdash; предоставить 
каждому свободу копировать, "
@@ -3541,10 +3652,22 @@
 "вторых, чтобы поощрить людей возвращать 
улучшения, которые они делают."
 
 #. type: Content of: <dl><dd><p>
+# | However, in many cases you can distribute the GPL-covered software
+# | alongside your proprietary system.  To do this validly, you must make sure
+# | that the free and non[---]free programs communicate at arms length, that
+# | they are not combined in a way that would make them effectively a single
+# | program.
+#, fuzzy
+#| msgid ""
+#| "However, in many cases you can distribute the GPL-covered software "
+#| "alongside your proprietary system.  To do this validly, you must make "
+#| "sure that the free and non-free programs communicate at arms length, that "
+#| "they are not combined in a way that would make them effectively a single "
+#| "program."
 msgid ""
 "However, in many cases you can distribute the GPL-covered software alongside "
 "your proprietary system.  To do this validly, you must make sure that the "
-"free and non-free programs communicate at arms length, that they are not "
+"free and nonfree programs communicate at arms length, that they are not "
 "combined in a way that would make them effectively a single program."
 msgstr ""
 "Однако во многих случаях вы можете 
распространять программы под GPL вместе "
@@ -4652,9 +4775,15 @@
 "удалите замечание об этом исключении из 
своей версии."
 
 #. type: Content of: <dl><dt>
+# | <b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a
+# | program under the GPL which I developed using non[---]free tools?</a></b>
+#, fuzzy
+#| msgid ""
+#| "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
+#| "program under the GPL which I developed using non-free tools?</a></b>"
 msgid ""
 "<b><a href=\"#TOCNonFreeTools\" name=\"NonFreeTools\">Can I release a "
-"program under the GPL which I developed using non-free tools?</a></b>"
+"program under the GPL which I developed using nonfree tools?</a></b>"
 msgstr ""
 "<a name=\"NonFreeTools\">Могу я выпустить программу, 
которую я разработал с "
 "помощью несвободных средств, под GPL?</a>"
@@ -4670,8 +4799,22 @@
 "вопросов, связанных с лицензированием 
этого исходного текста."
 
 #. type: Content of: <dl><dd><p>
+# | However, if you link non[---]free libraries with the source code, that
+# | would be an issue you need to deal with.  It does not preclude releasing
+# | the source code under the GPL, but if the libraries don't fit under the
+# | &ldquo;system library&rdquo; exception, you should affix an explicit
+# | notice giving permission to link your program with them.  The FSF can give
+# | you advice on doing this.
+#, fuzzy
+#| msgid ""
+#| "However, if you link non-free libraries with the source code, that would "
+#| "be an issue you need to deal with.  It does not preclude releasing the "
+#| "source code under the GPL, but if the libraries don't fit under the "
+#| "&ldquo;system library&rdquo; exception, you should affix an explicit "
+#| "notice giving permission to link your program with them.  The FSF can "
+#| "give you advice on doing this."
 msgid ""
-"However, if you link non-free libraries with the source code, that would be "
+"However, if you link nonfree libraries with the source code, that would be "
 "an issue you need to deal with.  It does not preclude releasing the source "
 "code under the GPL, but if the libraries don't fit under the &ldquo;system "
 "library&rdquo; exception, you should affix an explicit notice giving "
@@ -4970,14 +5113,30 @@
 "GPL или другой лицензией свободных 
программ?</a>"
 
 #. type: Content of: <dl><dd>
+# | In general, the answer is no&mdash;this is not a legal requirement.  In
+# | specific, the answer depends on which libraries you want to use and what
+# | their licenses are.  Most system libraries either use the <a
+# | href=\"/copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus
+# | an exception permitting linking the library with anything.  These
+# | libraries can be used in non[---]free programs; but in the case of the
+# | Lesser GPL, it does have some requirements you must follow.
+#, fuzzy
+#| msgid ""
+#| "In general, the answer is no&mdash;this is not a legal requirement.  In "
+#| "specific, the answer depends on which libraries you want to use and what "
+#| "their licenses are.  Most system libraries either use the <a href=\"/"
+#| "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
+#| "exception permitting linking the library with anything.  These libraries "
+#| "can be used in non-free programs; but in the case of the Lesser GPL, it "
+#| "does have some requirements you must follow."
 msgid ""
 "In general, the answer is no&mdash;this is not a legal requirement.  In "
 "specific, the answer depends on which libraries you want to use and what "
 "their licenses are.  Most system libraries either use the <a href=\"/"
 "copyleft/lesser.html\">GNU Lesser GPL</a>, or use the GNU GPL plus an "
 "exception permitting linking the library with anything.  These libraries can "
-"be used in non-free programs; but in the case of the Lesser GPL, it does "
-"have some requirements you must follow."
+"be used in nonfree programs; but in the case of the Lesser GPL, it does have "
+"some requirements you must follow."
 msgstr ""
 "Вообще говоря, нет&nbsp;&mdash; это не является 
юридическим требованием. В "
 "конкретном случае это зависит от того, 
какими библиотеками вы хотите "

Index: licenses/po/gpl-faq.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru-en.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- licenses/po/gpl-faq.ru-en.html      17 Feb 2017 06:30:24 -0000      1.56
+++ licenses/po/gpl-faq.ru-en.html      11 Mar 2017 09:02:39 -0000      1.57
@@ -101,7 +101,7 @@
     public?</a></li>
   
     <li><a href="#GPLAndNonfreeOnSameMachine">Can I have a GPL-covered
-    program and an unrelated non-free program on the same computer?</a></li>
+    program and an unrelated nonfree program on the same computer?</a></li>
   
     <li><a href="#CanIDemandACopy">If I know someone has a copy of a
     GPL-covered program, can I demand they give me a copy?</a></li>
@@ -304,7 +304,7 @@
 
     <li><a href="#ReleaseUnderGPLAndNF">I would like to release a
     program I wrote under the GNU GPL, but I would like to use the same
-    code in non-free programs.</a></li>
+    code in nonfree programs.</a></li>
   
     <li><a href="#CanDeveloperThirdParty">Can the developer of a program
     who distributed it under the GPL later license it to another party
@@ -339,7 +339,7 @@
     system templates?</a></li>
 
     <li><a href="#NonFreeTools">Can I release a program under the GPL
-    which I developed using non-free tools?</a></li>
+    which I developed using nonfree tools?</a></li>
 
     <li><a href="#GiveUpKeys">I use public key cryptography to sign my
     code to assure its authenticity. Is it true that GPLv3 forces me to
@@ -488,11 +488,11 @@
 
   <ul>
     <li><a href="#GPLAndNonfreeOnSameMachine">Can I have a GPL-covered
-    program and an unrelated non-free program on the same
+    program and an unrelated nonfree program on the same
     computer?</a></li>
 
     <li><a href="#CanIUseGPLToolsForNF">Can I use GPL-covered editors
-    such as GNU Emacs to develop non-free programs?  Can I use
+    such as GNU Emacs to develop nonfree programs?  Can I use
     GPL-covered tools such as GCC to compile them?</a></li>
   
     <li><a href="#GPLOutput">Is there some way that I can GPL the output
@@ -587,14 +587,17 @@
     program, do I have to use the GPL as the license for my
     module?</a></li>
   
+    <li><a href="#GPLPlugins">When are a program and its plug-ins
+    considered a single combined program?</a></li>
+  
     <li><a href="#GPLAndPlugins">If I write a plug-in to use with
     a GPL-covered program, what requirements does that impose
     on the licenses I can use for distributing my plug-in?</a></li>
   
     <li><a href="#GPLPluginsInNF">Can I apply the GPL when writing a
-    plug-in for a non-free program?</a></li>
+    plug-in for a nonfree program?</a></li>
 
-    <li><a href="#NFUseGPLPlugins">Can I release a non-free program
+    <li><a href="#NFUseGPLPlugins">Can I release a nonfree program
     that's designed to load a GPL-covered plug-in?</a></li>
   
     <li><a href="#GPLInProprietarySystem">I'd like to incorporate
@@ -609,7 +612,7 @@
     and the proprietary part?</a></li>
   
     <li><a href="#FSWithNFLibs">Can I write free software that uses
-    non-free libraries?</a></li>
+    nonfree libraries?</a></li>
 
     <li><a href="#SystemLibraryException">Can I link a GPL program with
     a proprietary system library?</a></li>
@@ -830,7 +833,7 @@
 
 
 <dt id="GPLAndNonfreeOnSameMachine">Can I have a GPL-covered
-    program and an unrelated non-free program on the same computer?
+    program and an unrelated nonfree program on the same computer?
  <span class="anchor-reference-id">(<a href="#GPLAndNonfreeOnSameMachine"
  >#GPLAndNonfreeOnSameMachine</a>)</span></dt>
 <dd><p>Yes.</p></dd>
@@ -949,7 +952,7 @@
  <span class="anchor-reference-id">(<a href="#DoesTheGPLAllowRequireFee"
  >#DoesTheGPLAllowRequireFee</a>)</span></dt>
 <dd><p>
-No.  In fact, a requirement like that would make the program non-free.
+No.  In fact, a requirement like that would make the program nonfree.
 If people have to pay when they get a copy of a program, or if they
 have to notify anyone in particular, then the program is not free.
 See the <a href="/philosophy/free-sw.html">
@@ -1199,29 +1202,29 @@
 
 
 <dt id="FSWithNFLibs">Can I write
-    free software that uses non-free libraries?
+    free software that uses nonfree libraries?
  <span class="anchor-reference-id">(<a href="#FSWithNFLibs"
  >#FSWithNFLibs</a>)</span></dt>
 <dd><p>
 If you do this, your program won't be fully usable in a free
-environment. If your program depends on a non-free library to do a
+environment. If your program depends on a nonfree library to do a
 certain job, it cannot do that job in the Free World. If it depends on a
-non-free library to run at all, it cannot be part of a free operating
+nonfree library to run at all, it cannot be part of a free operating
 system such as GNU; it is entirely off limits to the Free World.</p>
 
 <p>So please consider: can you find a way to get the job done without using
 this library? Can you write a free replacement for that library?</p>
 
-<p>If the program is already written using the non-free library, perhaps it
+<p>If the program is already written using the nonfree library, perhaps it
 is too late to change the decision. You may as well release the program
 as it stands, rather than not release it. But please mention in the
-README that the need for the non-free library is a drawback, and suggest
+README that the need for the nonfree library is a drawback, and suggest
 the task of changing the program so that it does the same job without
-the non-free library.  Please suggest that anyone who thinks of doing
+the nonfree library.  Please suggest that anyone who thinks of doing
 substantial further work on the program first free it from dependence
-on the non-free library.</p>
+on the nonfree library.</p>
 
-<p>Note that there may also be legal issues with combining certain non-free
+<p>Note that there may also be legal issues with combining certain nonfree
 libraries with GPL-covered free software.  Please see <a
 href="#GPLIncompatibleLibs">the question on GPL software with
 GPL-incompatible libraries</a> for more information.</p></dd>
@@ -1267,9 +1270,9 @@
 <p>When other people modify the program, they do not have to make the same
 exception for their code&mdash;it is their choice whether to do so.</p>
 
-<p>If the libraries you intend to link with are non-free, please also see
+<p>If the libraries you intend to link with are nonfree, please also see
 <a href="#FSWithNFLibs">the section on writing Free Software which uses
-non-free libraries</a>.</p>
+nonfree libraries</a>.</p>
 
 <p>If you're using GPLv3, you can accomplish this goal by granting an
 additional permission under section 7.  The following license notice will
@@ -1435,11 +1438,11 @@
 
 <dt id="ReleaseUnderGPLAndNF">I would like to release a program I wrote
     under the GNU GPL, but I would
-    like to use the same code in non-free programs.
+    like to use the same code in nonfree programs.
  <span class="anchor-reference-id">(<a href="#ReleaseUnderGPLAndNF"
  >#ReleaseUnderGPLAndNF</a>)</span></dt>
 <dd><p>
-To release a non-free program is always ethically tainted, but
+To release a nonfree program is always ethically tainted, but
 legally there is no obstacle to your doing this.  If you are the copyright
 holder for the code, you can release it under various different
 non-exclusive licenses at various times.</p></dd>
@@ -1471,7 +1474,7 @@
 
 
 <dt id="CanIUseGPLToolsForNF">Can I use GPL-covered editors such as
-    GNU Emacs to develop non-free programs?  Can I use GPL-covered tools
+    GNU Emacs to develop nonfree programs?  Can I use GPL-covered tools
     such as GCC to compile them?
  <span class="anchor-reference-id">(<a href="#CanIUseGPLToolsForNF"
  >#CanIUseGPLToolsForNF</a>)</span></dt>
@@ -1487,11 +1490,11 @@
 part of the output which is derived from the program's input inherits
 the copyright status of the input.</p>
 
-<p>As it happens, Bison can also be used to develop non-free programs.
+<p>As it happens, Bison can also be used to develop nonfree programs.
 This is because we decided to explicitly permit the use of the Bison
 standard parser program in Bison output files without restriction.  We
 made the decision because there were other tools comparable to Bison
-which already permitted use for non-free programs.</p></dd>
+which already permitted use for nonfree programs.</p></dd>
 
 
 <dt id="GPLFairUse">Do I have &ldquo;fair use&rdquo;
@@ -1751,82 +1754,87 @@
 eliminates the problem.</p></dd>
 
 
+<dt id="GPLPlugins">When are a program and its plug-ins considered a single 
combined program?
+ <span class="anchor-reference-id">(<a href="#GPLPlugins"
+ >#GPLPlugins</a>)</span></dt>
+<dd><p>
+    It depends on how the main program invokes its plug-ins. If the
+main program uses fork and exec to invoke plug-ins, and they establish
+intimate communication by sharing complex data structures, or shipping
+complex data structures back and forth, that can make them one single
+combined program. A main program that uses simple fork and exec to
+invoke plug-ins and does not establish intimate communication between
+them results in the plug-ins being a separate program.</p>
+       
+<p> If the main program dynamically links plug-ins, and they make
+function calls to each other and share data structures, we believe
+they form a single combined program, which must be treated as an
+extension of both the main program and the plug-ins. If the main
+program dynamically links plug-ins, but the communication between them
+is limited to invoking the &lsquo;main&rsquo; function of the plug-in
+with some options and waiting for it to return, that is a borderline
+case.</p>
+
+<p>Using shared memory to communicate with complex data structures is
+pretty much equivalent to dynamic linking.</p></dd>
+
+
 <dt id="GPLAndPlugins">If I write a plug-in to use with a GPL-covered
   program, what requirements does that impose on the licenses I can
   use for distributing my plug-in?
  <span class="anchor-reference-id">(<a href="#GPLAndPlugins"
  >#GPLAndPlugins</a>)</span></dt>
 <dd><p>
-It depends on how the program invokes its plug-ins.  If the program
-uses fork and exec to invoke plug-ins, then the plug-ins are separate
-programs, so the license for the main program makes no requirements
-for them.</p>
-
-<p>If the program dynamically links plug-ins, and they make function
-calls to each other and share data structures, we believe they form a
-single program, which must be treated as an extension of both the main
-program and the plug-ins.  This means you must license the plug-in
-under the GPL or a GPL-compatible free software license and distribute
-it with source code in a GPL-compliant way.</p>
-
-<p>If the program dynamically links plug-ins, but the communication
-between them is limited to invoking the &lsquo;main&rsquo; function of
-the plug-in with some options and waiting for it to return, that is a
-borderline case.</p></dd>
+Please see this question <a href="#GPLPlugins">for determining when
+plug-ins and a main program are considered a single combined program
+and when they are considered separate works</a>.</p>
+
+<p> If the main program and the plugins are a single combined program then 
this means
+you must license the plug-in under the GPL or a GPL-compatible free
+software license and distribute it with source code in a GPL-compliant
+way. A main program that is separate from its plug-ins makes no
+requirements for the plug-ins. </p></dd>
 
 
 <dt id="GPLPluginsInNF">Can I apply the
-    GPL when writing a plug-in for a non-free program?
+    GPL when writing a plug-in for a nonfree program?
  <span class="anchor-reference-id">(<a href="#GPLPluginsInNF"
  >#GPLPluginsInNF</a>)</span></dt>
 <dd><p>
-If the program uses fork and exec to invoke plug-ins, then the
-plug-ins are separate programs, so the license for the main program
-makes no requirements for them.  So you can use the GPL for a plug-in,
-and there are no special requirements.</p>
-
-<p>If the program dynamically links plug-ins, and they make function
-calls to each other and share data structures, we believe they form a
-single program, which must be treated as an extension of both the main
-program and the plug-ins.  This means that combination of the
-GPL-covered plug-in with the non-free main program would violate the
-GPL.  However, you can resolve that legal problem by adding an
-exception to your plug-in's license, giving permission to link it with
-the non-free main program.</p>
+ Please see this question <a href="#GPLPlugins">for determining when
+plug-ins and a main program are considered a single combined program
+and when they are considered separate programs</a>.</p>
+<p> If they form a
+single combined program this means that combination of the GPL-covered
+plug-in with the nonfree main program would violate the GPL. However,
+you can resolve that legal problem by adding an exception to your
+plug-in's license, giving permission to link it with the nonfree main
+program.</p>
 
 <p>See also the question <a href="#FSWithNFLibs">I am
-writing free software that uses a non-free library.</a></p></dd>
+writing free software that uses a nonfree library.</a></p></dd>
 
 
-<dt id="NFUseGPLPlugins">Can I release a non-free program
+<dt id="NFUseGPLPlugins">Can I release a nonfree program
     that's designed to load a GPL-covered plug-in?
  <span class="anchor-reference-id">(<a href="#NFUseGPLPlugins"
  >#NFUseGPLPlugins</a>)</span></dt>
-<dd><p>
-It depends on how the program invokes its plug-ins.  For instance, if
-the program uses <em>only</em> simple fork and exec to invoke and
-communicate with plug-ins, then the plug-ins are separate programs, so
-the license of the plug-in makes no requirements about the main
-program.</p>
 
-<p>If the program dynamically links plug-ins, and they make function
-calls to each other and share data structures, we believe they form a
-single program, which must be treated as an extension of both the main
-program and the plug-ins.  In order to use the GPL-covered plug-ins,
-the main program must be released under the GPL or a GPL-compatible
-free software license, and that the terms of the GPL must be followed
-when the main program is distributed for use with these plug-ins.</p>
-
-<p>If the program dynamically links plug-ins, but the communication
-between them is limited to invoking the &lsquo;main&rsquo; function of
-the plug-in with some options and waiting for it to return, that is a
-borderline case.</p>
+<dd><p>
+ Please see this question <a href="#GPLPlugins">for determining when
+plug-ins and a main program are considered a single combined program
+and when they are considered separate programs</a>.</p>
+<p>
+If they form a single combined program then the
+main program must be released under the GPL or a GPL-compatible free
+software license, and the terms of the GPL must be followed when
+the main program is distributed for use with these plug-ins.</p>
 
-<p>Using shared memory to communicate with complex data structures
-is pretty much equivalent to dynamic linking.</p>
+<p>However, if they are separate works then the license of the plug-in
+makes no requirements about the main program.</p>
 
 <p>See also the question <a href="#FSWithNFLibs">I am
-writing free software that uses a non-free library.</a></p></dd>
+writing free software that uses a nonfree library.</a></p></dd>
 
 
 <dt id="LinkingWithGPL">You have a GPL'ed program that I'd like
@@ -1950,7 +1958,7 @@
 An &ldquo;aggregate&rdquo; consists of a number of separate programs,
 distributed together on the same CD-ROM or other media.  The GPL permits
 you to create and distribute an aggregate, even when the licenses of the
-other software are non-free or GPL-incompatible.  The only condition is
+other software are nonfree or GPL-incompatible.  The only condition is
 that you cannot release the aggregate under a license that prohibits users
 from exercising rights that each program's individual license would
 grant them.</p>
@@ -2102,8 +2110,8 @@
 You cannot incorporate GPL-covered software in a proprietary system.
 The goal of the GPL is to grant everyone the freedom to copy,
 redistribute, understand, and modify a program.  If you could
-incorporate GPL-covered software into a non-free system, it would have
-the effect of making the GPL-covered software non-free too.</p>
+incorporate GPL-covered software into a nonfree system, it would have
+the effect of making the GPL-covered software nonfree too.</p>
 
 <p>A system incorporating a GPL-covered program is an extended version of
 that program.  The GPL says that any extended version of the program
@@ -2114,7 +2122,7 @@
 
 <p>However, in many cases you can distribute the GPL-covered software
 alongside your proprietary system.  To do this validly, you must make
-sure that the free and non-free programs communicate at arms length,
+sure that the free and nonfree programs communicate at arms length,
 that they are not combined in a way that would make them
 effectively a single program.</p>
 
@@ -2666,7 +2674,7 @@
 
 
 <dt id="NonFreeTools">Can I release
-    a program under the GPL which I developed using non-free tools?
+    a program under the GPL which I developed using nonfree tools?
  <span class="anchor-reference-id">(<a href="#NonFreeTools"
  >#NonFreeTools</a>)</span></dt>
 <dd><p>
@@ -2674,7 +2682,7 @@
 study it, or record it, usually makes no difference for issues
 concerning the licensing of that source code.</p>
 
-<p>However, if you link non-free libraries with the source code, that
+<p>However, if you link nonfree libraries with the source code, that
 would be an issue you need to deal with.  It does not preclude
 releasing the source code under the GPL, but if the libraries don't
 fit under the &ldquo;system library&rdquo; exception, you should affix
@@ -2829,7 +2837,7 @@
 their licenses are.  Most system libraries either use the <a
 href="/licenses/lgpl.html">GNU Lesser GPL</a>, or use the GNU GPL plus an
 exception permitting linking the library with anything.  These libraries
-can be used in non-free programs; but in the case of the Lesser GPL, it
+can be used in nonfree programs; but in the case of the Lesser GPL, it
 does have some requirements you must follow.</p>
 
 <p>Some libraries are released under the GNU GPL alone; you must use a
@@ -3888,7 +3896,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/02/17 06:30:24 $
+$Date: 2017/03/11 09:02:39 $
 <!-- 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.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- licenses/po/gpl-faq.ru.po   11 Mar 2017 08:15:25 -0000      1.128
+++ licenses/po/gpl-faq.ru.po   11 Mar 2017 09:02:39 -0000      1.129
@@ -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-03-10 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -2602,13 +2601,6 @@
 "для своих текстов&nbsp;&mdash; они сами решают, 
сделать ли это."
 
 #. type: Content of: <dl><dd><p>
-# | If the libraries you intend to link with are nonfree, please also see <a
-# | href=\"#FSWithNFLibs\">the section on writing Free Software which uses
-# | non[---]free libraries</a>.
-#| msgid ""
-#| "If the libraries you intend to link with are nonfree, please also see <a "
-#| "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "
-#| "non-free libraries</a>."
 msgid ""
 "If the libraries you intend to link with are nonfree, please also see <a "
 "href=\"#FSWithNFLibs\">the section on writing Free Software which uses "

Index: proprietary/proprietary-surveillance.ru.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-surveillance.ru.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- proprietary/proprietary-surveillance.ru.html        10 Mar 2017 06:30:53 
-0000      1.63
+++ proprietary/proprietary-surveillance.ru.html        11 Mar 2017 09:02:39 
-0000      1.64
@@ -503,6 +503,13 @@
 так, чтобы не позволять себя 
обнаруживать.</p>
   </li>
 
+  <li><p>Apple предлагает ввести <a
+href="https://www.theguardian.com/technology/2017/feb/15/apple-removing-iphone-home-button-fingerprint-scanning-screen";>
+сенсорный экран, сканирующий отпечатки 
пальцев</a>. Это значит, что им
+невозможно было бы пользоваться, не сдавая 
отпечатков своих пальцев. У
+пользователей не было бы никакой 
возможности узнать, не шпионит ли телефон
+за ними.</p></li>
+
   <li><p>Телефоны Samsung продают <a
 
href="http://arstechnica.com/gadgets/2015/07/samsung-sued-for-loading-devices-with-unremovable-crapware-in-china/";>
 с приложениями, которые не могут быть 
удалены пользователями</a> и которые
@@ -1289,7 +1296,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2017/03/10 06:30:53 $
+$Date: 2017/03/11 09:02:39 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/po/malware-apple.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-apple.ru.po,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- proprietary/po/malware-apple.ru.po  11 Mar 2017 08:02:29 -0000      1.89
+++ proprietary/po/malware-apple.ru.po  11 Mar 2017 09:02:39 -0000      1.90
@@ -447,18 +447,33 @@
 msgstr "Слежка"
 
 #. type: Content of: <ul><li><p>
+# | Apple proposes <a
+# | 
[-href=\"https://www.theguardian.com/technology/2017/feb/15/apple-removing-iphone-home-button-fingerprint-scanning-screen\";>
+# | a-]
+# | 
{+href=\"https://www.theguardian.com/technology/2017/feb/15/apple-removing-iphone-home-button-fingerprint-scanning-\\
+# | screen\">a+} fingerprint-scanning touch screen</a> &mdash; which would
+# | mean no way to use it without having your fingerprints taken. Users would
+# | have no way to tell whether the phone is snooping on them.
+#, fuzzy
+#| msgid ""
+#| "Apple proposes <a href=\"https://www.theguardian.com/technology/2017/";
+#| "feb/15/apple-removing-iphone-home-button-fingerprint-scanning-screen\"> a "
+#| "fingerprint-scanning touch screen</a> &mdash; which would mean no way to "
+#| "use it without having your fingerprints taken. Users would have no way to "
+#| "tell whether the phone is snooping on them."
 msgid ""
 "Apple proposes <a href=\"https://www.theguardian.com/technology/2017/feb/15/";
-"apple-removing-iphone-home-button-fingerprint-scanning-screen\"> a "
+"apple-removing-iphone-home-button-fingerprint-scanning-\\ screen\">a "
 "fingerprint-scanning touch screen</a> &mdash; which would mean no way to use "
 "it without having your fingerprints taken. Users would have no way to tell "
 "whether the phone is snooping on them."
 msgstr ""
-"Apple предлагает ввести <a 
href=\"https://www.theguardian.com/technology/2017/feb/15/";
-"apple-removing-iphone-home-button-fingerprint-scanning-screen\"> "
-"сенсорный экран, сканирующий отпечатки 
пальцев</a>. Это значит, что им невозможно "
-"было бы пользоваться, не сдавая 
отпечатков своих пальцев. У пользователей 
не было бы "
-"никакой возможности узнать, не шпионит ли 
телефон за ними."
+"Apple предлагает ввести <a 
href=\"https://www.theguardian.com/";
+"technology/2017/feb/15/apple-removing-iphone-home-button-fingerprint-"
+"scanning-screen\"> сенсорный экран, сканирующий 
отпечатки пальцев</a>. Это "
+"значит, что им невозможно было бы 
пользоваться, не сдавая отпечатков своих "
+"пальцев. У пользователей не было бы 
никакой возможности узнать, не шпионит "
+"ли телефон за ними."
 
 #. type: Content of: <ul><li><p>
 msgid ""

Index: proprietary/po/proprietary-surveillance.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-surveillance.ru-en.html,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- proprietary/po/proprietary-surveillance.ru-en.html  10 Mar 2017 06:30:54 
-0000      1.60
+++ proprietary/po/proprietary-surveillance.ru-en.html  11 Mar 2017 09:02:39 
-0000      1.61
@@ -478,6 +478,12 @@
       disguise itself from investigation.</p>
   </li>
 
+  <li><p>Apple proposes
+      <a 
href="https://www.theguardian.com/technology/2017/feb/15/apple-removing-iphone-home-button-fingerprint-scanning-screen";>a
 fingerprint-scanning touch screen</a>
+      &mdash; which would mean no way to use it without having your 
fingerprints
+      taken. Users would have no way to tell whether the phone is snooping on
+      them.</p></li>
+
   <li><p>Samsung phones come with
       <a 
href="http://arstechnica.com/gadgets/2015/07/samsung-sued-for-loading-devices-with-unremovable-crapware-in-china/";>apps
 that users can't delete</a>,
       and they send so much data that their transmission is a
@@ -1201,7 +1207,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/03/10 06:30:54 $
+$Date: 2017/03/11 09:02:39 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-surveillance.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-surveillance.ru.po,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- proprietary/po/proprietary-surveillance.ru.po       11 Mar 2017 08:02:29 
-0000      1.186
+++ proprietary/po/proprietary-surveillance.ru.po       11 Mar 2017 09:02:39 
-0000      1.187
@@ -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-03-10 19:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Proprietary Surveillance - GNU Project - Free Software Foundation"
@@ -960,11 +959,12 @@
 "it without having your fingerprints taken. Users would have no way to tell "
 "whether the phone is snooping on them."
 msgstr ""
-"Apple предлагает ввести <a 
href=\"https://www.theguardian.com/technology/2017/feb/15/";
-"apple-removing-iphone-home-button-fingerprint-scanning-screen\"> "
-"сенсорный экран, сканирующий отпечатки 
пальцев</a>. Это значит, что им невозможно "
-"было бы пользоваться, не сдавая 
отпечатков своих пальцев. У пользователей 
не было бы "
-"никакой возможности узнать, не шпионит ли 
телефон за ними."
+"Apple предлагает ввести <a 
href=\"https://www.theguardian.com/";
+"technology/2017/feb/15/apple-removing-iphone-home-button-fingerprint-"
+"scanning-screen\"> сенсорный экран, сканирующий 
отпечатки пальцев</a>. Это "
+"значит, что им невозможно было бы 
пользоваться, не сдавая отпечатков своих "
+"пальцев. У пользователей не было бы 
никакой возможности узнать, не шпионит "
+"ли телефон за ними."
 
 #. type: Content of: <ul><li><p>
 msgid ""
reply via email to
[Prev in Thread] Current Thread [Next in Thread]