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

www/licenses license-recommendations.ru.html po...

From: GNUN
Subject: www/licenses license-recommendations.ru.html po...
Date: Fri, 20 Nov 2020 12:30:05 -0500 (EST) 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     20/11/20 12:30:05

Modified files:
        licenses       : license-recommendations.ru.html 
        licenses/po    : license-recommendations.es.po 
                         license-recommendations.fr.po 
                         license-recommendations.it-diff.html 
                         license-recommendations.it.po 
                         license-recommendations.ja.po 
                         license-recommendations.pot 
                         license-recommendations.pt-br.po 
                         license-recommendations.ru-en.html 
                         license-recommendations.ru.po 
                         license-recommendations.tr.po 
                         license-recommendations.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-recommendations.ru.html?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.es.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.fr.po?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.it-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.it.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ja.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.pot?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.pt-br.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ru-en.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ru.po?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.tr.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.zh-cn.po?cvsroot=www&r1=1.19&r2=1.20

Patches:
Index: license-recommendations.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-recommendations.ru.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- license-recommendations.ru.html     8 Oct 2020 09:59:30 -0000       1.45
+++ license-recommendations.ru.html     20 Nov 2020 17:30:04 -0000      1.46
@@ -1,7 +1,8 @@
 <!--#set var="ENGLISH_PAGE" value="/licenses/license-recommendations.en.html" 
-->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.94 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Как выбрать лицензию для своей работы - 
Проект GNU - Фонд свободного
@@ -88,9 +89,12 @@
 последнюю версию <a 
href="/licenses/gpl.html">Стандартной общественной
 лицензии GNU (GPL)</a>. Ее сильное авторское 
лево подходит ко всем видам
 программ и предусматривает 
многочисленные меры охраны свободы
-пользователей.Пожалуйста, давайте 
разрешение пользоваться и будущими
-версиями лицензии&nbsp;&mdash; записывайте в 
лицензионном уведомлении, что
-ваша программа распространяется по GPL 
версии 3 или более поздней.</p>
+пользователей.Чтобы допустить обновления 
лицензии в будущем, <a
+href="/licenses/identify-licenses-clearly.html">указывайте, 
пожалуйста,
+&ldquo;версию 3 или любую более позднюю 
версию&rdquo;</a>, чтобы ваша
+программа была <a href="/licenses/license-compatibility.html"> 
совместима по
+лицензии</a> с программами, которые могут 
быть выпущены в будущем под
+последующими версиями GPL.</p>
 
 <p>Другие советы о том, <a 
href="/licenses/gpl-howto.html">как выпускать
 программу под GNU GPL</a>.</p>
@@ -108,16 +112,16 @@
 
 <p>Для этих программ мы рекомендуем <a
 href="http://www.apache.org/licenses/LICENSE-2.0";>версию 2.0 
Лицензии
-Apache</a>. Это безвольная лицензия программ 
(без авторского лева), в
-которой есть условия, предотвращающие 
преследования со стороны вторичных
-разработчиков и распространителей за 
нарушение патентов. Это не делает
-программы стойкими к патентным угрозам 
(этого нельзя добиться с помощью
-лицензии на программу), но это лишает 
держателей патентов возможности
-&ldquo;ловить на блесну&rdquo;, когда они 
выпускают программы на свободных
-условиях, а затем требуют, чтобы 
получатели соглашались на несвободные
-условия из патентной лицензии.</p>
+Apache</a>. Это слабая безвольная 
неограничительная лицензия программ (без
+авторского лева), в которой есть условия, 
предотвращающие преследования со
+стороны вторичных разработчиков и 
распространителей за нарушение
+патентов. Это не делает программы стойкими 
к патентным угрозам (этого нельзя
+добиться с помощью лицензии на программу), 
но это лишает держателей патентов
+возможности &ldquo;ловить на блесну&rdquo;, 
когда они выпускают программы на
+свободных условиях, а затем требуют, чтобы 
получатели соглашались на
+несвободные условия из патентной 
лицензии.</p>
 
-<p>Apache&nbsp;2.0&nbsp;&mdash; лучшая из 
безвольно-неограничительных лицензий;
+<p>Apache&nbsp;2.0&nbsp;&mdash; лучшая из слабых 
(неограничительных) лицензий;
 так что если вы собираетесь 
воспользоваться 
безвольно-неограничительной
 лицензией по любой причине, мы 
рекомедндуем ее.</p>
 
@@ -308,7 +312,7 @@
      
      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, 2017, 2018, 2019 Free
+<p>Copyright &copy; 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free
 Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
@@ -325,7 +329,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/10/08 09:59:30 $
+$Date: 2020/11/20 17:30:04 $
 
 <!-- timestamp end -->
 </p>

Index: po/license-recommendations.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.es.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- po/license-recommendations.es.po    20 Nov 2020 16:30:39 -0000      1.20
+++ po/license-recommendations.es.po    20 Nov 2020 17:30:05 -0000      1.21
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2020-11-20 17:25+0000\n"
 "PO-Revision-Date: 2019-12-29 11:42+0100\n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-general@gnu.org>\n"
@@ -253,7 +253,7 @@
 #. type: Content of: <p>
 # | For those programs, we recommend the <a
 # | href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License
-# | 2.0</a>.  This is a [-pushover-] {+weak, lax, \"pushover\"+}
+# | 2.0</a>.  This is a [-pushover-] {+weak, lax, &ldquo;pushover&rdquo;+}
 # | (non-copyleft)  software license that has terms to prevent contributors
 # | and distributors from suing for patent infringement.  This doesn't make
 # | the software immune to threats from patents [-(a-] {+(no+} software
@@ -273,8 +273,8 @@
 #| "require recipients to agree to nonfree terms in a patent license."
 msgid ""
 "For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, "
-"\"pushover\" (non-copyleft)  software license that has terms to prevent "
+"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, &ldquo;"
+"pushover&rdquo; (non-copyleft)  software license that has terms to prevent "
 "contributors and distributors from suing for patent infringement.  This "
 "doesn't make the software immune to threats from patents (no software "
 "license can achieve that), but it does prevent patent holders from setting "
@@ -610,7 +610,6 @@
 "proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
-#
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -623,9 +622,15 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "El equipo de traductores al español se esfuerza por ofrecer traducciones "

Index: po/license-recommendations.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.fr.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- po/license-recommendations.fr.po    20 Nov 2020 16:30:39 -0000      1.42
+++ po/license-recommendations.fr.po    20 Nov 2020 17:30:05 -0000      1.43
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2020-11-20 17:25+0000\n"
 "PO-Revision-Date: 2019-12-28 14:18+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -254,7 +254,7 @@
 #. type: Content of: <p>
 # | For those programs, we recommend the <a
 # | href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License
-# | 2.0</a>.  This is a [-pushover-] {+weak, lax, \"pushover\"+}
+# | 2.0</a>.  This is a [-pushover-] {+weak, lax, &ldquo;pushover&rdquo;+}
 # | (non-copyleft)  software license that has terms to prevent contributors
 # | and distributors from suing for patent infringement.  This doesn't make
 # | the software immune to threats from patents [-(a-] {+(no+} software
@@ -274,8 +274,8 @@
 #| "require recipients to agree to nonfree terms in a patent license."
 msgid ""
 "For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, "
-"\"pushover\" (non-copyleft)  software license that has terms to prevent "
+"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, &ldquo;"
+"pushover&rdquo; (non-copyleft)  software license that has terms to prevent "
 "contributors and distributors from suing for patent infringement.  This "
 "doesn't make the software immune to threats from patents (no software "
 "license can achieve that), but it does prevent patent holders from setting "
@@ -631,17 +631,14 @@
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"Nous faisons le maximum pour proposer des traductions fidèles et de bonne "
-"qualité, mais nous ne sommes pas parfaits. Merci d'adresser vos commentaires 
"
-"sur cette page, ainsi que vos suggestions d'ordre général sur les "
-"traductions, à <a href=\"mailto:web-translators@gnu.org\";> &lt;web-"
-"translators@gnu.org&gt;</a>.</p>\n"
-"<p>Pour tout renseignement sur la coordination et la soumission des "
-"traductions de nos pages web, reportez-vous au <a href=\"/server/standards/"
-"README.translations.html\">guide de traduction</a>."
+"Merci d'adresser vos commentaires sur cette page et sur les traductions en "
+"général à <a 
href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu."
+"org&gt;</a>. Si vous souhaitez y contribuer, vous trouverez dans le <a href="
+"\"/server/standards/README.translations.html\">guide de traduction</a> les "
+"infos nécessaires."
 
 #. type: Content of: <div><p>
 # | Copyright &copy; 2011, 2013, 2014, 2015, 2017, 2018, [-2019-] {+2019,

Index: po/license-recommendations.it-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.it-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/license-recommendations.it-diff.html     20 Nov 2020 16:30:39 -0000      
1.5
+++ po/license-recommendations.it-diff.html     20 Nov 2020 17:30:05 -0000      
1.6
@@ -11,7 +11,8 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.90</em></ins></span> --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.94 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;How to choose a license for your own work
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/licenses/po/license-recommendations.translist" --&gt;
@@ -119,7 +120,7 @@
 
 &lt;p&gt;For those programs, we recommend
 the &lt;a href="http://www.apache.org/licenses/LICENSE-2.0"&gt;Apache
-License 2.0&lt;/a&gt;.  This is a <span 
class="removed"><del><strong>pushover</strong></del></span> <span 
class="inserted"><ins><em>weak, lax, "pushover"</em></ins></span> (non-copyleft)
+License 2.0&lt;/a&gt;.  This is a <span 
class="removed"><del><strong>pushover</strong></del></span> <span 
class="inserted"><ins><em>weak, lax, &ldquo;pushover&rdquo;</em></ins></span> 
(non-copyleft)
 software license
 that has terms to prevent contributors and distributors from suing for
 patent infringement.  This doesn't make the software immune to threats
@@ -286,7 +287,7 @@
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -317,7 +318,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2020/11/20 16:30:39 $
+$Date: 2020/11/20 17:30:05 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/license-recommendations.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.it.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- po/license-recommendations.it.po    20 Nov 2020 16:30:40 -0000      1.20
+++ po/license-recommendations.it.po    20 Nov 2020 17:30:05 -0000      1.21
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2020-11-20 17:25+0000\n"
 "PO-Revision-Date: 2018-01-20 19:54+0100\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian <www-it-traduzioni@gnu.org>\n"
@@ -254,7 +254,7 @@
 #. type: Content of: <p>
 # | For those programs, we recommend the <a
 # | href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License
-# | 2.0</a>.  This is a [-pushover-] {+weak, lax, \"pushover\"+}
+# | 2.0</a>.  This is a [-pushover-] {+weak, lax, &ldquo;pushover&rdquo;+}
 # | (non-copyleft)  software license that has terms to prevent contributors
 # | and distributors from suing for patent infringement.  This doesn't make
 # | the software immune to threats from patents [-(a-] {+(no+} software
@@ -274,8 +274,8 @@
 #| "require recipients to agree to nonfree terms in a patent license."
 msgid ""
 "For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, "
-"\"pushover\" (non-copyleft)  software license that has terms to prevent "
+"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, &ldquo;"
+"pushover&rdquo; (non-copyleft)  software license that has terms to prevent "
 "contributors and distributors from suing for patent infringement.  This "
 "doesn't make the software immune to threats from patents (no software "
 "license can achieve that), but it does prevent patent holders from setting "
@@ -626,9 +626,15 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Le traduzioni italiane sono effettuate ponendo la massima attenzione ai "

Index: po/license-recommendations.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ja.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- po/license-recommendations.ja.po    20 Nov 2020 16:30:40 -0000      1.38
+++ po/license-recommendations.ja.po    20 Nov 2020 17:30:05 -0000      1.39
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2020-11-20 17:25+0000\n"
 "PO-Revision-Date: 2019-12-31 10:29+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -240,8 +240,8 @@
 #| "require recipients to agree to nonfree terms in a patent license."
 msgid ""
 "For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, "
-"\"pushover\" (non-copyleft)  software license that has terms to prevent "
+"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, &ldquo;"
+"pushover&rdquo; (non-copyleft)  software license that has terms to prevent "
 "contributors and distributors from suing for patent infringement.  This "
 "doesn't make the software immune to threats from patents (no software "
 "license can achieve that), but it does prevent patent holders from setting "
@@ -565,13 +565,13 @@
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 
"正確で良い品質の翻訳を提供するよう努力していますが、不完å
…¨ãªå ´åˆã‚‚あるかと思"
 "います。翻訳に関するコメントと提案は、<a 
href=\"mailto:web-translators@gnu.";
 
"org\">&lt;web-translators@gnu.org&gt;</a>におねがいします。</p><p>わたしたち"
-"のウェブページの翻訳の調整と提出については、<a 
href=\"/server/standards/"
+"のウェブページの翻訳の調整と貢献については、<a 
href=\"/server/standards/"
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>

Index: po/license-recommendations.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.pot,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- po/license-recommendations.pot      20 Nov 2020 16:30:40 -0000      1.28
+++ po/license-recommendations.pot      20 Nov 2020 17:30:05 -0000      1.29
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2020-11-20 17:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,13 +163,13 @@
 msgid ""
 "For those programs, we recommend the <a "
 "href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License 2.0</a>.  "
-"This is a weak, lax, \"pushover\" (non-copyleft)  software license that has "
-"terms to prevent contributors and distributors from suing for patent "
-"infringement.  This doesn't make the software immune to threats from patents "
-"(no software license can achieve that), but it does prevent patent holders "
-"from setting up a &ldquo;bait and switch&rdquo; where they release the "
-"software under free terms then require recipients to agree to nonfree terms "
-"in a patent license."
+"This is a weak, lax, &ldquo;pushover&rdquo; (non-copyleft)  software license "
+"that has terms to prevent contributors and distributors from suing for "
+"patent infringement.  This doesn't make the software immune to threats from "
+"patents (no software license can achieve that), but it does prevent patent "
+"holders from setting up a &ldquo;bait and switch&rdquo; where they release "
+"the software under free terms then require recipients to agree to nonfree "
+"terms in a patent license."
 msgstr ""
 
 #. type: Content of: <p>
@@ -384,7 +384,8 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: po/license-recommendations.pt-br.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.pt-br.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- po/license-recommendations.pt-br.po 20 Nov 2020 16:30:40 -0000      1.23
+++ po/license-recommendations.pt-br.po 20 Nov 2020 17:30:05 -0000      1.24
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2020-11-20 17:25+0000\n"
 "PO-Revision-Date: 2019-12-31 07:21-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -249,8 +249,8 @@
 #| "require recipients to agree to nonfree terms in a patent license."
 msgid ""
 "For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, "
-"\"pushover\" (non-copyleft)  software license that has terms to prevent "
+"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, &ldquo;"
+"pushover&rdquo; (non-copyleft)  software license that has terms to prevent "
 "contributors and distributors from suing for patent infringement.  This "
 "doesn't make the software immune to threats from patents (no software "
 "license can achieve that), but it does prevent patent holders from setting "
@@ -583,7 +583,7 @@
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -591,8 +591,8 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
 #, fuzzy

Index: po/license-recommendations.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ru-en.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- po/license-recommendations.ru-en.html       28 Dec 2019 15:30:27 -0000      
1.38
+++ po/license-recommendations.ru-en.html       20 Nov 2020 17:30:05 -0000      
1.39
@@ -1,5 +1,6 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.94 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>How to choose a license for your own work
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/licenses/po/license-recommendations.translist" -->
@@ -83,9 +84,12 @@
 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.</p>
+freedom.  To allow for future license
+upgrades, <a href="/licenses/identify-licenses-clearly.html"> please
+specify &ldquo;version 3 or any later version&rdquo;</a> so that your
+program will be <a href="/licenses/license-compatibility.html">
+license-compatible</a> with code that may be released, in the future,
+under subsequent GPL versions.</p>
 
 <p>Here is more advice about <a href="/licenses/gpl-howto.html">how
 to release a program under the GNU GPL</a>.</p>
@@ -103,16 +107,17 @@
 
 <p>For those programs, we recommend
 the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache
-License 2.0</a>.  This is a pushover (non-copyleft) software license
+License 2.0</a>.  This is a weak, lax, &ldquo;pushover&rdquo; (non-copyleft)
+software license
 that has terms to prevent contributors and distributors from suing for
 patent infringement.  This doesn't make the software immune to threats
-from patents (a software license can't do that), but it does prevent
+from patents (no software license can achieve that), but it does prevent
 patent holders from setting up a &ldquo;bait and switch&rdquo; where
 they release the software under free terms then require recipients to
 agree to nonfree terms in a patent license.</p>
 
-<p>Among the lax pushover licenses, Apache 2.0 is best; so if you
-are going to use a lax pushover license, whatever the reason,
+<p>Among the weak (pushover) licenses, Apache 2.0 is best; so if you
+are going to use a weak license, whatever the reason,
 we recommend using that one.</p>
 
 <h4 id="libraries">Libraries</h4>
@@ -267,7 +272,7 @@
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -288,7 +293,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, 2017, 2018, 2019 Free Software 
Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 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
@@ -298,7 +303,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/12/28 15:30:27 $
+$Date: 2020/11/20 17:30:05 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/license-recommendations.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ru.po,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- po/license-recommendations.ru.po    20 Nov 2020 17:23:32 -0000      1.61
+++ po/license-recommendations.ru.po    20 Nov 2020 17:30:05 -0000      1.62
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2020-11-20 17:25+0000\n"
 "PO-Revision-Date: 2020-11-20 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-11-20 16:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -179,26 +178,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-]  {+To allow for+} future license [-versions as
-# | well&mdash;in other words, make the license notice say-] {+upgrades, <a
-# | href=\"/licenses/identify-licenses-clearly.html\"> please specify
-# | &ldquo;version 3 or any later version&rdquo;</a> so+} that your program
-# | [-is covered by-] {+will be <a
-# | href=\"/licenses/license-compatibility.html\"> license-compatible</a> with
-# | code that may be released, in the future, under subsequent+} GPL [-version
-# | 3 or later.-] {+versions.+}
-#| 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.  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 "
@@ -214,12 +193,12 @@
 "последнюю версию <a 
href=\"/licenses/gpl.html\">Стандартной общественной "
 "лицензии GNU (GPL)</a>. Ее сильное авторское 
лево подходит ко всем видам "
 "программ и предусматривает 
многочисленные меры охраны свободы 
пользователей."
-"Чтобы допустить обновления лицензии в 
будущем, "
-"<a href=\"/licenses/identify-licenses-clearly.html\">"
-"указывайте, пожалуйста, &ldquo;версию 3 или 
любую более позднюю версию&rdquo;</a>, "
-"чтобы ваша программа была <a 
href=\"/licenses/license-compatibility.html\"> "
-"совместима по лицензии</a> с программами, 
которые могут быть выпущены в будущем "
-"под последующими версиями GPL."
+"Чтобы допустить обновления лицензии в 
будущем, <a href=\"/licenses/identify-"
+"licenses-clearly.html\">указывайте, пожалуйста, 
&ldquo;версию 3 или любую "
+"более позднюю версию&rdquo;</a>, чтобы ваша 
программа была <a href=\"/"
+"licenses/license-compatibility.html\"> совместима по 
лицензии</a> с "
+"программами, которые могут быть выпущены 
в будущем под последующими версиями "
+"GPL."
 
 #. type: Content of: <p>
 msgid ""
@@ -256,29 +235,10 @@
 "всегда сопровождать программу копией 
лицензии."
 
 #. type: Content of: <p>
-# | For those programs, we recommend the <a
-# | href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License
-# | 2.0</a>.  This is a [-pushover-] {+weak, lax, \"pushover\"+}
-# | (non-copyleft)  software license that has terms to prevent contributors
-# | and distributors from suing for patent infringement.  This doesn't make
-# | the software immune to threats from patents [-(a-] {+(no+} software
-# | license [-can't do-] {+can achieve+} that), but it does prevent patent
-# | holders from setting up a &ldquo;bait and switch&rdquo; where they release
-# | the software under free terms then require recipients to agree to nonfree
-# | terms in a patent license.
-#| msgid ""
-#| "For those programs, we recommend the <a href=\"http://www.apache.org/";
-#| "licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a pushover (non-"
-#| "copyleft) software license that has terms to prevent contributors and "
-#| "distributors from suing for patent infringement.  This doesn't make the "
-#| "software immune to threats from patents (a software license can't do "
-#| "that), but it does prevent patent holders from setting up a &ldquo;bait "
-#| "and switch&rdquo; where they release the software under free terms then "
-#| "require recipients to agree to nonfree terms in a patent license."
 msgid ""
 "For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, "
-"&ldquo;pushover&rdquo; (non-copyleft)  software license that has terms to 
prevent "
+"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, &ldquo;"
+"pushover&rdquo; (non-copyleft)  software license that has terms to prevent "
 "contributors and distributors from suing for patent infringement.  This "
 "doesn't make the software immune to threats from patents (no software "
 "license can achieve that), but it does prevent patent holders from setting "
@@ -287,23 +247,17 @@
 "license."
 msgstr ""
 "Для этих программ мы рекомендуем <a 
href=\"http://www.apache.org/licenses/";
-"LICENSE-2.0\">версию 2.0 Лицензии Apache</a>. Это 
слабая безвольная неограничительная 
лицензия "
-"программ (без авторского лева), в которой 
есть условия, предотвращающие "
-"преследования со стороны вторичных 
разработчиков и распространителей за "
-"нарушение патентов. Это не делает 
программы стойкими к патентным угрозам "
-"(этого нельзя добиться с помощью лицензии 
на программу), но это лишает "
-"держателей патентов возможности 
&ldquo;ловить на блесну&rdquo;, когда они "
-"выпускают программы на свободных условиях
, а затем требуют, чтобы получатели "
-"соглашались на несвободные условия из 
патентной лицензии."
-
-#. type: Content of: <p>
-# | Among the [-lax pushover-] {+weak (pushover)+} licenses, Apache 2.0 is
-# | best; so if you are going to use a [-lax pushover-] {+weak+} license,
-# | whatever the reason, we recommend using that one.
-#| msgid ""
-#| "Among the lax pushover licenses, Apache 2.0 is best; so if you are going "
-#| "to use a lax pushover license, whatever the reason, we recommend using "
-#| "that one."
+"LICENSE-2.0\">версию 2.0 Лицензии Apache</a>. Это 
слабая безвольная "
+"неограничительная лицензия программ (без 
авторского лева), в которой есть "
+"условия, предотвращающие преследования 
со стороны вторичных разработчиков и "
+"распространителей за нарушение патентов. 
Это не делает программы стойкими к "
+"патентным угрозам (этого нельзя добиться 
с помощью лицензии на программу), "
+"но это лишает держателей патентов 
возможности &ldquo;ловить на "
+"блесну&rdquo;, когда они выпускают программы 
на свободных условиях, а затем "
+"требуют, чтобы получатели соглашались на 
несвободные условия из патентной "
+"лицензии."
+
+#. type: Content of: <p>
 msgid ""
 "Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
 "to use a weak license, whatever the reason, we recommend using that one."
@@ -635,11 +589,6 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2011, 2013, 2014, 2015, 2017, 2018, [-2019-] {+2019,
-# | 2020+} Free Software Foundation, Inc.
-#| msgid ""
-#| "Copyright &copy; 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-#| "Foundation, Inc."
 msgid ""
 "Copyright &copy; 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
 "Software Foundation, Inc."

Index: po/license-recommendations.tr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.tr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/license-recommendations.tr.po    20 Nov 2020 16:30:40 -0000      1.4
+++ po/license-recommendations.tr.po    20 Nov 2020 17:30:05 -0000      1.5
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2020-11-20 17:25+0000\n"
 "PO-Revision-Date: 2020-08-22 08:35+0200\n"
 "Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
 "Language-Team: Turkish <www-tr-comm@gnu.org>\n"
@@ -244,8 +244,8 @@
 #| "require recipients to agree to nonfree terms in a patent license."
 msgid ""
 "For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, "
-"\"pushover\" (non-copyleft)  software license that has terms to prevent "
+"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, &ldquo;"
+"pushover&rdquo; (non-copyleft)  software license that has terms to prevent "
 "contributors and distributors from suing for patent infringement.  This "
 "doesn't make the software immune to threats from patents (no software "
 "license can achieve that), but it does prevent patent holders from setting "
@@ -573,9 +573,14 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Çevirilerimizde bulmuş olabileceğiniz hataları, aklınızdaki soru ve "

Index: po/license-recommendations.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.zh-cn.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- po/license-recommendations.zh-cn.po 20 Nov 2020 16:30:40 -0000      1.19
+++ po/license-recommendations.zh-cn.po 20 Nov 2020 17:30:05 -0000      1.20
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2020-11-20 16:25+0000\n"
+"POT-Creation-Date: 2020-11-20 17:25+0000\n"
 "PO-Revision-Date: 2020-01-01 19:29+0800\n"
 "Last-Translator: Hagb (郭俊余) <hagb_green@qq.com>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -222,8 +222,8 @@
 #| "require recipients to agree to nonfree terms in a patent license."
 msgid ""
 "For those programs, we recommend the <a href=\"http://www.apache.org/";
-"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, "
-"\"pushover\" (non-copyleft)  software license that has terms to prevent "
+"licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, &ldquo;"
+"pushover&rdquo; (non-copyleft)  software license that has terms to prevent "
 "contributors and distributors from suing for patent infringement.  This "
 "doesn't make the software immune to threats from patents (no software "
 "license can achieve that), but it does prevent patent holders from setting "
@@ -502,9 +502,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接，å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
 #.         We work hard and do our best to provide accurate, good quality
@@ -517,16 +515,18 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"我们尽最大努力来提供精准和高质量的翻译，但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方"
-"面有评论或一般性的建议，请发送至 <a 
href=\"mailto:web-translators@gnu.org";
-"\">&lt;web-translators@gnu.org&gt;</a>。</p><p>å…
³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信"
-"息参见 <a href=\"/server/standards/README.translators.html\">《译者
指南》</"
-"a>。"
+"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
+"解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
 #, fuzzy
@@ -564,3 +564,17 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最后更新："
+
+#
+#
+#
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "我们尽最大努力来提供精准和高质量的翻译，但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这"
+#~ "方面有评论或一般性的建议，请发送至 <a 
href=\"mailto:web-translators@gnu.";
+#~ "org\">&lt;web-translators@gnu.org&gt;</a>。</p><p>å…
³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘çš„"
+#~ "更多信息参见 <a 
href=\"/server/standards/README.translators.html\">《译者"
+#~ "指南》</a>。"
reply via email to
[Prev in Thread] Current Thread [Next in Thread]