www/licenses gpl-howto.zh-cn.html gpl-violation...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     22/01/04 10:30:36

Modified files:
        licenses       : gpl-howto.zh-cn.html gpl-violation.zh-cn.html 
                         quick-guide-gplv3.fr.html 
                         quick-guide-gplv3.ru.html 
        licenses/po    : gpl-howto.zh-cn-en.html 
                         gpl-violation.zh-cn-en.html 
                         gpl-violation.zh-cn.po 
                         quick-guide-gplv3.fr-en.html 
                         quick-guide-gplv3.ru-en.html 
                         quick-guide-gplv3.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-howto.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-violation.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/quick-guide-gplv3.fr.html?cvsroot=www&r1=1.74&r2=1.75
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/quick-guide-gplv3.ru.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-howto.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-violation.zh-cn-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-violation.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/quick-guide-gplv3.fr-en.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/quick-guide-gplv3.ru-en.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/quick-guide-gplv3.ru.po?cvsroot=www&r1=1.28&r2=1.29

Patches:
Index: gpl-howto.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/gpl-howto.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gpl-howto.zh-cn.html        16 Jun 2019 13:00:26 -0000      1.1
+++ gpl-howto.zh-cn.html        4 Jan 2022 15:30:34 -0000       1.2
@@ -1,14 +1,17 @@
 <!--#set var="ENGLISH_PAGE" value="/licenses/gpl-howto.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.97 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>å¦‚ä½•åœ¨ä½ çš„è½¯ä»¶ä¸­ä½¿ç”¨ GNU 许可证 - GNU 工程 - 
自由软件基金会</title>
 
 <!--#include virtual="/licenses/po/gpl-howto.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<div class="article reduced-width">
 <h2>å¦‚ä½•åœ¨ä½ çš„è½¯ä»¶ä¸­ä½¿ç”¨ GNU 许可证</h2>
+<div class="thin"></div>
 
 <p>æœ¬æ–‡ç®€ä»‹å¦‚ä½•è®©ä½ çš„ç¨‹åºä½¿ç”¨ <a href="/licenses/gpl.html">GNU 
通用公共许可证</a>、<a
 href="/licenses/lgpl.html">GNU 宽通用公共许可证</a>或者 <a
@@ -45,7 +48,7 @@
 
 <p>ä»¥ä¸‹æ˜¯ä¸€ä¸ªç‰ˆæƒå…é™¤å£°æ˜Žçš„å¼æ ·ï¼›ä½ 
只需适当修改名字、题目和程序说明就好了：</p>
 
-<blockquote>
+<blockquote class="emph-box">
 <p>Yoyodyne 公司，现在声明放弃所有与由 James Hacker 
编写的程序
 &ldquo;Woodpecker&rdquo;ï¼ˆè¯¥ç¨‹åºåˆ†è§£æ ‘å½¢ç»“æž„ï¼‰æœ‰å…
³çš„版权利益。</p>
 
@@ -90,40 +93,28 @@
 
<p>每个文件的复制许可声明（又称为许可证声明）应当紧跟在版权声明之后。对由单个文件构成的程序，该声明（对
 GPL）应该类似以下内容，使用 GPL 版本 3
 或以后版本：</p>
 
-<pre>
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see 
&lt;https://www.gnu.org/licenses/&gt;.
-</pre>
+<blockquote class="emph-box"><p>
+    æœ¬ç¨‹åºæ˜¯è‡ªç”±è½¯ä»¶ï¼šä½ å¯ä»¥å†åˆ†å‘ä¹‹å’Œ/或依ç…
§ç”±è‡ªç”±è½¯ä»¶åŸºé‡‘会发布的 GNU é€šç”¨å…¬å…±è®¸å¯è¯ä¿®æ”¹ä¹‹ï¼Œæ— 
论是版本 3
+è®¸å¯è¯ï¼Œè¿˜æ˜¯ï¼ˆæŒ‰ä½ çš„å†³å®šï¼‰ä»»ä½•ä»¥åŽç‰ˆéƒ½å¯ä»¥ã€‚</p>
+<p>
+    å‘å¸ƒè¯¥ç¨‹åºæ˜¯å¸Œæœ›å®ƒèƒ½æœ‰ç”¨ï¼Œä½†æ˜¯å¹¶æ— ä¿éšœ; 
甚至连可销售和符合某个特定的目的都不保证。请参看 GNU 
通用公共许可证，了解详情。</p>
+<p>
+    ä½ åº”è¯¥éšç¨‹åºèŽ·å¾—ä¸€ä»½ GNU 通用公å…
±è®¸å¯è¯çš„复本。如果没有，请看 
&lt;https://www.gnu.org/licenses/&gt;。
+</p></blockquote>
 
 <p>对由多个文件构成的程序，最好将其中的 &ldquo;this 
program&rdquo; 替换为程序的名字，并以 &ldquo;This file
 is part of NAME&rdquo; 为开头。例如，</p>
 
-<pre>
-    This file is part of Foobar.
-
-    Foobar is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Foobar is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Foobar.  If not, see &lt;https://www.gnu.org/licenses/&gt;.
-</pre>
+<blockquote class="emph-box"><p>
+    本文件是 Foobar 的一部分。</p>
+<p>
+    Foobar æ˜¯è‡ªç”±è½¯ä»¶ï¼šä½ å¯ä»¥å†åˆ†å‘ä¹‹å’Œ/或依ç…
§ç”±è‡ªç”±è½¯ä»¶åŸºé‡‘会发布的 GNU é€šç”¨å…¬å…±è®¸å¯è¯ä¿®æ”¹ä¹‹ï¼Œæ— 
论是版本 3
+è®¸å¯è¯ï¼Œè¿˜æ˜¯ï¼ˆæŒ‰ä½ çš„å†³å®šï¼‰ä»»ä½•ä»¥åŽç‰ˆéƒ½å¯ä»¥ã€‚</p>
+<p>
+    发布 Foobar æ˜¯å¸Œæœ›å®ƒèƒ½æœ‰ç”¨ï¼Œä½†æ˜¯å¹¶æ— ä¿éšœ; 
甚至连可销售和符合某个特定的目的都不保证。请参看 GNU 
通用公共许可证，了解详情。</p>
+<p>
+    ä½ åº”è¯¥éšç¨‹åºèŽ·å¾—ä¸€ä»½ GNU 通用公å…
±è®¸å¯è¯çš„复本。如果没有，请看 
&lt;https://www.gnu.org/licenses/&gt;。
+</p></blockquote>
 
 <p>如果要使用一个不同版本的 GPLï¼Œä½ 
需要改写一些第一段的末尾部分。例如，如果使用的是版本 
2 æˆ–è€…å…¶ä»¥åŽç‰ˆæœ¬ï¼Œä½ éœ€è¦æŠŠ &ldquo;3&rdquo;
 替换为 &ldquo;2&rdquo;。</p>
@@ -162,7 +153,9 @@
 æ³¨å†Œç‰ˆæƒæ˜¯ä¸€ä¸ªå¥½ä¸»æ„ï¼Œå› ä¸ºè¿™æ 
·çš„è¯ï¼Œå¦‚æžœæœ‰äººåœ¨ç¾Žå›½è¿åäº†è®¸å¯è¯ï¼Œä½ 
就处在非常有利的地位。大多数国家并没有此类版权注册的机构。</p>
 
 <p>我们想要在自由软件目录下列出所有的自由软件，包
括所有使用 GPL ï¼ˆæ— è®ºç‰ˆæœ¬ï¼‰çš„è‡ªç”±è½¯ä»¶ã€‚å› æ­¤ï¼Œå½“ä½ 
的程序达到一定的可用度时，请提交一个说明条目。请参看
-<a href="http://directory.fsf.org/";>自由软件目录的网页</a> 
æ¥äº†è§£æ›´å¤šä¿¡æ¯ä»¥åŠåœ¨çº¿æäº¤çš„æ ¼å¼ã€‚</p>
+<a
+href="https://directory.fsf.org/wiki/Free_Software_Directory:Participate";>自由软件目录
+Wiki</a> æ¥äº†è§£æ›´å¤šä¿¡æ¯ä»¥åŠåœ¨çº¿æäº¤çš„æ ¼å¼ã€‚</p>
 
 <p>ä½ çš„ç¨‹åºä¹Ÿå¯ä»¥å˜æˆ GNU 软件包，作为 GNU 
å·¥ç¨‹çš„ä¸€éƒ¨åˆ†ã€‚å¦‚æžœä½ æœ‰å…´è¶£åŠ å…¥ GNU 工程，请参看 <a
 href="/help/evaluation.html">GNU 软件评价页面</a> 
æ¥äº†è§£æ›´å¤šä¿¡æ¯å¹¶å®Œæˆä¸€ä¸ªé—®å·ã€‚æˆ‘ä»¬ä¼šè”ç³»ä½ å¹¶å’Œä½ 
讨论此事。</p>
@@ -171,6 +164,7 @@
 è½¯ä»¶åŒ…ï¼Œä½ ä¹Ÿå¯ä»¥ä½¿ç”¨æˆ‘ä»¬çš„è®¸å¯è¯ï¼›å®žé™…ä¸Šï¼Œæˆ‘ä»¬å¾ˆæœŸå¾…
ä½ ä½¿ç”¨æˆ‘ä»¬çš„è®¸å¯è¯ï¼Œæ— 
è®ºå“ªä¸ªç‰ˆæœ¬éƒ½è¡Œã€‚å®ƒä»¬æ˜¯ä¸ºæ‰€æœ‰äººå‡†å¤‡çš„ã€‚å¦‚æžœä½ æƒ³å¯¹ä½ 
使用的许可证做推广，请放心使用
 <a href="/graphics/license-logos.html" title="GNU License
 Logos">æˆ‘ä»¬çš„è®¸å¯è¯æ ‡è¯†</a>。</p>
+</div>
 
 <div class="translators-notes">
 
@@ -180,7 +174,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>请将有关自由软件基金会(FSF) &amp; 
GNU的一般性问题发送到<a
@@ -199,13 +193,13 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 我们尽最大努力来提供精准和高质量的翻译，但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方面有评论或一般性的建议，请发送至
 <a
 
href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p><p>å
…³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信息参见
-<a href="/server/standards/README.translators.html">《译者
指南》</a>。</p>
+<a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -224,8 +218,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2001, 2007, 2008, 2009, 2013, 2014, 2017, 2018 Free
-Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001, 2007-2009, 2011, 2017, 2018, 2022 Free Software
+Foundation, Inc.</p>
 
 <p>本页面使用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -236,12 +230,12 @@
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2019。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2019，2022。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2019/06/16 13:00:26 $
+$Date: 2022/01/04 15:30:34 $
 
 <!-- timestamp end -->
 </p>

Index: gpl-violation.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/gpl-violation.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gpl-violation.zh-cn.html    15 Dec 2018 14:46:15 -0000      1.7
+++ gpl-violation.zh-cn.html    4 Jan 2022 15:30:34 -0000       1.8
@@ -1,16 +1,26 @@
 <!--#set var="ENGLISH_PAGE" value="/licenses/gpl-violation.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.97 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>违反GNU许可证的情况 - GNU工程 - 自由软件基金会</title>
+<style type="text/css" media="screen"><!--
+.note#fsf-licensing {
+   float: none;
+   width: 47em; max-width: 93%;
+   margin: 2em auto 3em;
+}
+-->
+</style>
 
 <!--#include virtual="/licenses/po/gpl-violation.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<div class="article reduced-width">
 <h2>违反GNU许可证的情况</h2>
+<div class="thin"></div>
 
-<!--#include virtual="/licenses/fsf-licensing.zh-cn.html" -->
 <p>
 å¦‚æžœä½ è®¤ä¸ºä½ çœ‹åˆ°è¿åGNU<a href="/licenses/gpl.html">GPL</a>、<a
 href="/licenses/lgpl.html">LGPL</a>、<a
@@ -23,6 +33,7 @@
   
<li>如果发布的只是二进制，是否有书面约定说会提供源代ç 
ï¼Ÿ</li>
   <li>å¯èŽ·å–çš„æºä»£ç æ˜¯å¦å®Œå…¨ï¼Œæˆ–æ˜¯å®ƒæ˜¯å¦è¿˜è¦ä¸Žå…
¶ä»–非自由的模块连接？</li>
 </ul>
+
 <p>
 如果看起来真是违反的情
况，您接下来要做的就是仔细地记录细节：</p>
 
@@ -69,6 +80,9 @@
 软件自由管理委员会的同仁为许多自由软件的GPL违反情
况进行执法，为他们自己的版权也为他们与这些程序所有者
的联合版权。这些程序包括Linux、Git、Samba、QEMU以及å…
¶ä»–ã€‚å¦‚æžœä½ 碰到有关程序的GPLè¿åæƒ…å†µï¼Œæˆ‘ä»¬å»ºè®®ä½ è®¿é—®<a
 
href="https://sfconservancy.org/copyleft-compliance/";>管委会的copyleft合规页面</a>来获得最新的程序æ¸
…单以及如何举报违规情况。</p>
 
+<!--#include virtual="/licenses/fsf-licensing.zh-cn.html" -->
+</div>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -77,7 +91,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会（FSF）&amp;GNU的一般性问题发送到<a
@@ -96,11 +110,13 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
-若您想翻译本文，请参看<a 
href="/server/standards/README.translations.html">翻译须知</a>。</p>
+我们尽最大努力来提供精准和高质量的翻译，但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方面有评论或一般性的建议，请发送至
 <a
+href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p><p>å
…³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信息参见
+<a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -119,7 +135,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999, 2001, 2007, 2008, 2013, 2014, 2017, 2018 Free
+<p>Copyright &copy; 1999, 2001, 2006, 2007, 2009, 2014, 2017, 2018, 2022 Free
 Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
@@ -134,12 +150,12 @@
 href="mailto:chliu@gnu.org";>&lt;chliu@gnu.org&gt;</a><br></br>
 <b>å®¡æ ¡</b>: 马雪萍<br></br>
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2018。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2018，2022。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/12/15 14:46:15 $
+$Date: 2022/01/04 15:30:34 $
 
 <!-- timestamp end -->
 </p>

Index: quick-guide-gplv3.fr.html
===================================================================
RCS file: /web/www/www/licenses/quick-guide-gplv3.fr.html,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- quick-guide-gplv3.fr.html   2 Jan 2022 22:01:13 -0000       1.74
+++ quick-guide-gplv3.fr.html   4 Jan 2022 15:30:34 -0000       1.75
@@ -198,7 +198,7 @@
 compatible avec la GPLv3. La GPLv2 est compatible avec la GPLv3 si le
 programme vous permet de choisir « toute version ultérieure » de la 
GPL, ce
 qui est le cas de la plupart des logiciels publiés sous cette licence. Ce
-diagramme n'est pas complet (se reporter à <a class="reference external"
+diagramme n'est pas complet (se reporter à <a
 href="/licenses/license-list.html">notre page de licences</a> pour une liste
 plus complète des licences compatibles avec la GPLv2 et la GPLv3) mais il
 illustre clairement le fait que la GPLv3 est compatible avec à peu près tout
@@ -319,15 +319,16 @@
 avocats. Nous espérons que vous utiliserez la GPLv3 lors de votre prochaine
 publication.</p>
 <p>Si vous souhaitez en apprendre plus sur le passage de votre projet à la
-GPLv3, le <i>FSF Compliance Lab</i> serait enchanté de vous aider. Sur <a
-class="reference external" href="https://www.fsf.org/licensing/";>notre site
-web</a>, vous pouvez trouver <a href="/licenses/gpl-howto.html">des
-informations de base pour utiliser la licence</a>, et une <a
-href="/licenses/gpl-faq.html">FAQ répondant aux questions usuelles</a> que
-se posent les gens à son propos. Si votre cas est plus compliqué, prenez <a
-href="mailto:licensing&#64;fsf.org";>contact avec nous</a> et nous ferons
-tout notre possible pour vous aider dans cette transition. Ensemble, nous
-pouvons contribuer à protéger la liberté de tous les utilisateurs.</p>
+GPLv3, le <i>FSF Compliance Lab</i> serait enchanté de vous aider. Aussi
+bien sur <a href="/licenses/licenses.html">gnu.org</a> que <a
+href="https://www.fsf.org/licensing/";>fsf.org</a>, vous pouvez trouver <a
+href="/licenses/gpl-howto.html">des informations de base pour utiliser la
+licence</a>, et une <a href="/licenses/gpl-faq.html">FAQ répondant aux
+questions usuelles</a> que se posent les gens à son propos. Si votre cas est
+plus compliqué, prenez <a href="mailto:licensing@fsf.org";>contact avec
+nous</a> et nous ferons tout notre possible pour vous aider dans cette
+transition. Ensemble, nous pouvons contribuer à protéger la liberté de tous
+les utilisateurs.</p>
 </div>
 
 <div class="translators-notes">
@@ -412,7 +413,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2022/01/02 22:01:13 $
+$Date: 2022/01/04 15:30:34 $
 
 <!-- timestamp end -->
 </p>

Index: quick-guide-gplv3.ru.html
===================================================================
RCS file: /web/www/www/licenses/quick-guide-gplv3.ru.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- quick-guide-gplv3.ru.html   3 Jan 2022 07:43:24 -0000       1.33
+++ quick-guide-gplv3.ru.html   4 Jan 2022 15:30:35 -0000       1.34
@@ -190,10 +190,9 @@
 позволяет вам выбрать &ldquo;любую более 
позднюю версию&rdquo; GPL, что
 верно для большинства программ, 
выпускаемых под этой лицензией. Эта
 диаграмма не подробна (более полный список 
лицензий, совместимых с GPLv2 и
-GPLv3 см. на <a class="reference external"
-href="/licenses/license-list.html">нашей странице 
лицензий</a>); она просто
-показывает, что GPLv3 совместима почти со 
всем, с чем совместима GPLv2, и
-еще кое с чем.</p>
+GPLv3 см. на <a href="/licenses/license-list.html">нашей 
странице
+лицензий</a>); она просто показывает, что GPLv3 
совместима почти со всем, с
+чем совместима GPLv2, и еще кое с чем.</p>
 <p>Заодно была написана GNU GPL Афферо 
версии&nbsp;3. Первоначальная GPL Афферо
 была составлена так, чтобы гарантировать, 
что все пользователи приложения
 для Интернета смогут получить его исх
одный текст. Версия&nbsp;3 GNU GPL
@@ -304,13 +303,14 @@
 надеемся, что вы воспользуетесь GPLv3 в своем 
следующем выпуске.</p>
 <p>Если вы хотите узнать больше о переводе 
своего проекта на GPLv3, Лаборатория
 лицензирования ФСПО с радостью вам 
поможет. На <a
-href="https://www.fsf.org/licensing/";>нашем сайте</a> вы 
найдете <a
+href="/licenses/licenses.html">gnu.org</a> и <a
+href="https://www.fsf.org/licensing/";>fsf.org</a> вы найдете <a
 href="/licenses/gpl-howto.html">основные указания по 
применению лицензии</a>
-и <a class="reference external" href="/licenses/gpl-faq.html">Ответы 
на
-общие вопросы</a> о ней, которыми 
интересуются люди. В более сложной
-ситуации <a href="mailto:licensing@fsf.org";>обращайтесь, 
пожалуйста, к
-нам</a>, и мы сделаем все возможное, чтобы 
помочь вам в переходе. Вместе мы
-поможем защитить свободу всех 
пользователей.</p>
+и <a href="/licenses/gpl-faq.html">Ответы на общие 
вопросы</a> о ней,
+которыми интересуются люди. В более 
сложной ситуации <a
+href="mailto:licensing@fsf.org";>обращайтесь, пожалуйста, 
к нам</a>, и мы
+сделаем все возможное, чтобы помочь вам в 
переходе. Вместе мы поможем
+защитить свободу всех пользователей.</p>
 </div>
 
 <div class="translators-notes">
@@ -390,7 +390,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2022/01/03 07:43:24 $
+$Date: 2022/01/04 15:30:35 $
 
 <!-- timestamp end -->
 </p>

Index: po/gpl-howto.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-howto.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/gpl-howto.zh-cn-en.html  16 Jun 2019 13:00:26 -0000      1.1
+++ po/gpl-howto.zh-cn-en.html  4 Jan 2022 15:30:35 -0000       1.2
@@ -1,10 +1,13 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
-<title>How to use GNU licenses for your own software
+<!-- Parent-Version: 1.97 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<title>How to Use GNU Licenses for Your Own Software
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/licenses/po/gpl-howto.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>How to use GNU licenses for your own software</h2>
+<div class="article reduced-width">
+<h2>How to Use GNU Licenses for Your Own Software</h2>
+<div class="thin"></div>
 
 <p>This is a brief explanation of how to place a program under the <a
 href="/licenses/gpl.html">GNU General Public License</a>, <a
@@ -58,7 +61,7 @@
 <p>Here is a sample copyright disclaimer; just alter the names, title,
 and program description as appropriate:</p>
 
-<blockquote>
+<blockquote class="emph-box">
 <p>Yoyodyne, Inc., hereby disclaims all copyright interest
 in the program &ldquo;Woodpecker&rdquo; (which deconstructs trees)
 written by James Hacker.</p>
@@ -131,42 +134,42 @@
 program, the statement (for the GPL) should look like this, to use
 GPL version 3 or later:</p>
 
-<pre>
+<blockquote class="emph-box"><p>
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
+    (at your option) any later version.</p>
+<p>
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
+    GNU General Public License for more details.</p>
+<p>
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see 
&lt;https://www.gnu.org/licenses/&gt;.
-</pre>
+</p></blockquote>
 
 <p>For programs that are more than one file, it is better to replace
 &ldquo;this program&rdquo; with the name of the program, and begin the
 statement with a line saying &ldquo;This file is part of NAME&rdquo;.
 For instance,</p>
 
-<pre>
-    This file is part of Foobar.
-
+<blockquote class="emph-box"><p>
+    This file is part of Foobar.</p>
+<p>
     Foobar is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
+    (at your option) any later version.</p>
+<p>
     Foobar is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
+    GNU General Public License for more details.</p>
+<p>
     You should have received a copy of the GNU General Public License
     along with Foobar.  If not, see &lt;https://www.gnu.org/licenses/&gt;.
-</pre>
+</p></blockquote>
 
 <p>To use a different set of GPL versions, you would modify the end of
 the first long paragraph.  For instance, to license under version 2 or
@@ -232,9 +235,9 @@
 <p>We would like to list all free software programs in the Free
 Software Directory, including all programs licensed under the GPL (any
 version).  So please submit an entry for your program, when it has
-reached the point of being useful.  Please see
-the <a href="http://directory.fsf.org/";>Directory web page</a> for
-information and an online submission form.</p>
+reached the point of being useful.  Please see the <a
+href="https://directory.fsf.org/wiki/Free_Software_Directory:Participate";>
+Directory wiki</a> for information and an online submission form.</p>
 
 <p>It is also possible to make your program a GNU package, a part of the
 GNU Project.  If you might be interested in joining up with the
@@ -248,10 +251,11 @@
 everyone.  If you'd like to advertise your use of a particular license,
 feel free to use <a href="/graphics/license-logos.html"
 title="GNU License Logos">one of our logos</a>.</p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -269,13 +273,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         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>
 
@@ -296,8 +300,8 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2001, 2007, 2008, 2009, 2013, 2014, 2017, 2018
-Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001, 2007-2009, 2011, 2017, 2018, 2022 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
@@ -307,7 +311,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/06/16 13:00:26 $
+$Date: 2022/01/04 15:30:35 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/gpl-violation.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-violation.zh-cn-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/gpl-violation.zh-cn-en.html      15 Dec 2018 14:46:19 -0000      1.4
+++ po/gpl-violation.zh-cn-en.html      4 Jan 2022 15:30:35 -0000       1.5
@@ -1,11 +1,20 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.97 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>Violations of the GNU Licenses
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen"><!--
+.note#fsf-licensing {
+   float: none;
+   width: 47em; max-width: 93%;
+   margin: 2em auto 3em;
+}
+--></style>
 <!--#include virtual="/licenses/po/gpl-violation.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<div class="article reduced-width">
 <h2>Violations of the GNU Licenses</h2>
-<!--#include virtual="/licenses/fsf-licensing.html" -->
+<div class="thin"></div>
 
 <p>
 If you think you see a violation of the GNU
@@ -26,6 +35,7 @@
   <li>Is the available source code complete, or is it designed for
        linking in other non-free modules?</li>
 </ul>
+
 <p>
 If there seems to be a real violation, the next thing you need to do
 is record the details carefully:</p>
@@ -102,9 +112,12 @@
 Conservancy's copyleft compliance page</a> for the up-to-date list
 of programs it handles, and how to report violations.</p>
 
+<!--#include virtual="/licenses/fsf-licensing.html" -->
+</div>
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -122,13 +135,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         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>
 
@@ -149,7 +162,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1999, 2001, 2007, 2008, 2013, 2014, 2017, 2018
+<p>Copyright &copy; 1999, 2001, 2006, 2007, 2009, 2014, 2017, 2018, 2022
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -160,7 +173,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:19 $
+$Date: 2022/01/04 15:30:35 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/gpl-violation.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-violation.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/gpl-violation.zh-cn.po   4 Jan 2022 09:43:17 -0000       1.8
+++ po/gpl-violation.zh-cn.po   4 Jan 2022 15:30:35 -0000       1.9
@@ -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: 2022-01-02 17:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Violations of the GNU Licenses - GNU Project - Free Software Foundation"

Index: po/quick-guide-gplv3.fr-en.html
===================================================================
RCS file: /web/www/www/licenses/po/quick-guide-gplv3.fr-en.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- po/quick-guide-gplv3.fr-en.html     2 Jan 2022 22:01:14 -0000       1.38
+++ po/quick-guide-gplv3.fr-en.html     4 Jan 2022 15:30:35 -0000       1.39
@@ -63,7 +63,8 @@
 Copyright Act and the European Union Copyright Directive make it a crime
 to write or share software that can break DRM (Digital Restrictions
 Management; see <a
-href="#neutralizing-laws-that-prohibit-free-software-but-not-forbidding-drm">below</a>).
  These laws should not interfere with the rights the GPL grants you.</li>
+href="#neutralizing-laws-that-prohibit-free-software-but-not-forbidding-drm">
+below</a>).  These laws should not interfere with the rights the GPL grants 
you.</li>
 <li>Discriminatory patent deals: Microsoft has recently started
 telling people that they will not sue free software users for patent
 infringement&mdash;as long as you get the software from a vendor
@@ -171,7 +172,8 @@
 license is compatible with GPLv3.  GPLv2 is compatible with GPLv3 if the
 program allows you to choose &ldquo;any later version&rdquo; of the GPL, which 
is the
 case for most software released under this license.  This diagram is not
-comprehensive (see <a class="reference external" 
href="/licenses/license-list.html">our licenses page</a> for a more complete 
list of licenses
+comprehensive (see <a href="/licenses/license-list.html">our licenses page</a>
+for a more complete list of licenses
 compatible with GPLv2 and GPLv3), but plainly illustrates that GPLv3
 is compatible with just about everything GPLv2 is, and then some.</p>
 <p>The GNU Affero GPL version 3 has also been brought into the fold.  The
@@ -276,9 +278,11 @@
 distributors, even lawyers&mdash;will benefit.  We hope you'll use
 GPLv3 for your next release.</p>
 <p>If you'd like to learn more about upgrading your project to GPLv3, the FSF
-Compliance Lab would be happy to assist you.  On <a 
href="https://www.fsf.org/licensing/";>our website</a>, you can
+Compliance Lab would be happy to assist you.  Both on <a
+href="/licenses/licenses.html">gnu.org</a> and <a
+href="https://www.fsf.org/licensing/";>fsf.org</a>, you can
 find <a href="/licenses/gpl-howto.html">basic instructions for using the
-license</a>, and an <a href="/licenses/gpl-faq.html">FAQ addressing
+license</a>, and a <a href="/licenses/gpl-faq.html">FAQ addressing
 common concerns</a> that people have about it.  If your situation is more
 complicated than that, please <a
 href="mailto:licensing@fsf.org";>contact us</a> and we'll do what we can to
@@ -343,7 +347,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2022/01/02 22:01:14 $
+$Date: 2022/01/04 15:30:35 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/quick-guide-gplv3.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/quick-guide-gplv3.ru-en.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/quick-guide-gplv3.ru-en.html     3 Jan 2022 07:43:26 -0000       1.25
+++ po/quick-guide-gplv3.ru-en.html     4 Jan 2022 15:30:36 -0000       1.26
@@ -63,7 +63,8 @@
 Copyright Act and the European Union Copyright Directive make it a crime
 to write or share software that can break DRM (Digital Restrictions
 Management; see <a
-href="#neutralizing-laws-that-prohibit-free-software-but-not-forbidding-drm">below</a>).
  These laws should not interfere with the rights the GPL grants you.</li>
+href="#neutralizing-laws-that-prohibit-free-software-but-not-forbidding-drm">
+below</a>).  These laws should not interfere with the rights the GPL grants 
you.</li>
 <li>Discriminatory patent deals: Microsoft has recently started
 telling people that they will not sue free software users for patent
 infringement&mdash;as long as you get the software from a vendor
@@ -171,7 +172,8 @@
 license is compatible with GPLv3.  GPLv2 is compatible with GPLv3 if the
 program allows you to choose &ldquo;any later version&rdquo; of the GPL, which 
is the
 case for most software released under this license.  This diagram is not
-comprehensive (see <a class="reference external" 
href="/licenses/license-list.html">our licenses page</a> for a more complete 
list of licenses
+comprehensive (see <a href="/licenses/license-list.html">our licenses page</a>
+for a more complete list of licenses
 compatible with GPLv2 and GPLv3), but plainly illustrates that GPLv3
 is compatible with just about everything GPLv2 is, and then some.</p>
 <p>The GNU Affero GPL version 3 has also been brought into the fold.  The
@@ -276,9 +278,11 @@
 distributors, even lawyers&mdash;will benefit.  We hope you'll use
 GPLv3 for your next release.</p>
 <p>If you'd like to learn more about upgrading your project to GPLv3, the FSF
-Compliance Lab would be happy to assist you.  On <a 
href="https://www.fsf.org/licensing/";>our website</a>, you can
+Compliance Lab would be happy to assist you.  Both on <a
+href="/licenses/licenses.html">gnu.org</a> and <a
+href="https://www.fsf.org/licensing/";>fsf.org</a>, you can
 find <a href="/licenses/gpl-howto.html">basic instructions for using the
-license</a>, and an <a href="/licenses/gpl-faq.html">FAQ addressing
+license</a>, and a <a href="/licenses/gpl-faq.html">FAQ addressing
 common concerns</a> that people have about it.  If your situation is more
 complicated than that, please <a
 href="mailto:licensing@fsf.org";>contact us</a> and we'll do what we can to
@@ -343,7 +347,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2022/01/03 07:43:26 $
+$Date: 2022/01/04 15:30:36 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/quick-guide-gplv3.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/quick-guide-gplv3.ru.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- po/quick-guide-gplv3.ru.po  4 Jan 2022 13:04:16 -0000       1.28
+++ po/quick-guide-gplv3.ru.po  4 Jan 2022 15:30:36 -0000       1.29
@@ -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: 2022-01-04 10:57+0000\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -152,20 +151,6 @@
 "устройство не дает вам делать это, мы 
называем это тивоизацией."
 
 #. type: Content of: <div><ul><li>
-# | Laws prohibiting free software: Legislation like the Digital Millennium
-# | Copyright Act and the European Union Copyright Directive make it a crime
-# | to write or share software that can break DRM (Digital Restrictions
-# | Management; see <a
-# | 
href=\"#neutralizing-laws-that-prohibit-free-software-but-not-forbidding-drm\">{+
-# | +}below</a>).  These laws should not interfere with the rights the GPL
-# | grants you.
-#| msgid ""
-#| "Laws prohibiting free software: Legislation like the Digital Millennium "
-#| "Copyright Act and the European Union Copyright Directive make it a crime "
-#| "to write or share software that can break DRM (Digital Restrictions "
-#| "Management; see <a href=\"#neutralizing-laws-that-prohibit-free-software-"
-#| "but-not-forbidding-drm\">below</a>).  These laws should not interfere "
-#| "with the rights the GPL grants you."
 msgid ""
 "Laws prohibiting free software: Legislation like the Digital Millennium "
 "Copyright Act and the European Union Copyright Directive make it a crime to "
@@ -432,29 +417,6 @@
 "свободных программ. Подробности см. на 
странице ФСПО со списком лицензий."
 
 #. type: Content of: <div><p>
-# | Arrows pointing from one license to another indicate that the first
-# | license is compatible with the second.  This is true even if you follow
-# | multiple arrows to get from one license to the other; so, for example, the
-# | ISC license is compatible with GPLv3.  GPLv2 is compatible with GPLv3 if
-# | the program allows you to choose &ldquo;any later version&rdquo; of the
-# | GPL, which is the case for most software released under this license. 
-# | This diagram is not comprehensive (see <a [-class=\"reference external\"-]
-# | href=\"/licenses/license-list.html\">our licenses page</a> for a more
-# | complete list of licenses compatible with GPLv2 and GPLv3), but plainly
-# | illustrates that GPLv3 is compatible with just about everything GPLv2 is,
-# | and then some.
-#| msgid ""
-#| "Arrows pointing from one license to another indicate that the first "
-#| "license is compatible with the second.  This is true even if you follow "
-#| "multiple arrows to get from one license to the other; so, for example, "
-#| "the ISC license is compatible with GPLv3.  GPLv2 is compatible with GPLv3 "
-#| "if the program allows you to choose &ldquo;any later version&rdquo; of "
-#| "the GPL, which is the case for most software released under this "
-#| "license.  This diagram is not comprehensive (see <a class=\"reference "
-#| "external\" href=\"/licenses/license-list.html\">our licenses page</a> for "
-#| "a more complete list of licenses compatible with GPLv2 and GPLv3), but "
-#| "plainly illustrates that GPLv3 is compatible with just about everything "
-#| "GPLv2 is, and then some."
 msgid ""
 "Arrows pointing from one license to another indicate that the first license "
 "is compatible with the second.  This is true even if you follow multiple "
@@ -474,9 +436,9 @@
 "позволяет вам выбрать &ldquo;любую более 
позднюю версию&rdquo; GPL, что "
 "верно для большинства программ, 
выпускаемых под этой лицензией. Эта "
 "диаграмма не подробна (более полный 
список лицензий, совместимых с GPLv2 и "
-"GPLv3 см. на <a href=\"/licenses/license-list."
-"html\">нашей странице лицензий</a>); она просто 
показывает, что GPLv3 "
-"совместима почти со всем, с чем совместима 
GPLv2, и еще кое с чем."
+"GPLv3 см. на <a href=\"/licenses/license-list.html\">нашей 
странице "
+"лицензий</a>); она просто показывает, что GPLv3 
совместима почти со всем, с "
+"чем совместима GPLv2, и еще кое с чем."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -738,27 +700,6 @@
 "надеемся, что вы воспользуетесь GPLv3 в 
своем следующем выпуске."
 
 #. type: Content of: <div><p>
-# | If you'd like to learn more about upgrading your project to GPLv3, the FSF
-# | Compliance Lab would be happy to assist you.  [-On-]  {+Both on+} <a
-# | [-href=\"https://www.fsf.org/licensing/\";>our website</a>,-]
-# | {+href=\"/licenses/licenses.html\">gnu.org</a> and <a
-# | href=\"https://www.fsf.org/licensing/\";>fsf.org</a>,+} you can find <a
-# | href=\"/licenses/gpl-howto.html\">basic instructions for using the
-# | license</a>, and a[-n-] <a href=\"/licenses/gpl-faq.html\">FAQ addressing
-# | common concerns</a> that people have about it.  If your situation is more
-# | complicated than that, please <a href=\"mailto:licensing@fsf.org\";>contact
-# | us</a> and we'll do what we can to help you with your transition. 
-# | Together, we can help protect freedom for all users.
-#| msgid ""
-#| "If you'd like to learn more about upgrading your project to GPLv3, the "
-#| "FSF Compliance Lab would be happy to assist you.  On <a href=\"https://";
-#| "www.fsf.org/licensing/\">our website</a>, you can find <a href=\"/"
-#| "licenses/gpl-howto.html\">basic instructions for using the license</a>, "
-#| "and an <a href=\"/licenses/gpl-faq.html\">FAQ addressing common concerns</"
-#| "a> that people have about it.  If your situation is more complicated than "
-#| "that, please <a href=\"mailto:licensing@fsf.org\";>contact us</a> and "
-#| "we'll do what we can to help you with your transition.  Together, we can "
-#| "help protect freedom for all users."
 msgid ""
 "If you'd like to learn more about upgrading your project to GPLv3, the FSF "
 "Compliance Lab would be happy to assist you.  Both on <a href=\"/licenses/"
@@ -771,15 +712,14 @@
 "your transition.  Together, we can help protect freedom for all users."
 msgstr ""
 "Если вы хотите узнать больше о переводе 
своего проекта на GPLv3, Лаборатория "
-"лицензирования ФСПО с радостью вам 
поможет. На <a href=\""
-"/licenses/licenses.html\">gnu.org</a> и <a 
href=\"https://www.fsf.org/licensing/\";>"
-"fsf.org</a> вы найдете <a href=\"/licenses/gpl-howto.html"
-"\">основные указания по применению 
лицензии</a> и <a "
-"href=\"/licenses/gpl-faq.html\">Ответы на общие 
вопросы</a> о "
-"ней, которыми интересуются люди. В более 
сложной ситуации <a href=\"mailto:";
-"licensing@fsf.org\">обращайтесь, пожалуйста, к 
нам</a>, и мы сделаем все "
-"возможное, чтобы помочь вам в переходе. 
Вместе мы поможем защитить свободу "
-"всех пользователей."
+"лицензирования ФСПО с радостью вам 
поможет. На <a href=\"/licenses/licenses."
+"html\">gnu.org</a> и <a href=\"https://www.fsf.org/licensing/\";>fsf.org</a> "
+"вы найдете <a href=\"/licenses/gpl-howto.html\">основные 
указания по "
+"применению лицензии</a> и <a 
href=\"/licenses/gpl-faq.html\">Ответы на общие "
+"вопросы</a> о ней, которыми интересуются 
люди. В более сложной ситуации <a "
+"href=\"mailto:licensing@fsf.org\";>обращайтесь, 
пожалуйста, к нам</a>, и мы "
+"сделаем все возможное, чтобы помочь вам в 
переходе. Вместе мы поможем "
+"защитить свободу всех пользователей."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.