www/philosophy categories.zh-cn.html fs-transla...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/22 00:01:32

Modified files:
        philosophy     : categories.zh-cn.html 
                         fs-translations.zh-cn.html pragmatic.zh-cn.html 
                         using-gfdl.zh-cn.html 
        philosophy/po  : categories.zh-cn-en.html categories.zh-cn.po 
                         fs-translations.zh-cn-en.html 
                         fs-translations.zh-cn.po 
                         pragmatic.zh-cn-en.html pragmatic.zh-cn.po 
                         using-gfdl.zh-cn-en.html using-gfdl.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.zh-cn.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/pragmatic.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/using-gfdl.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-cn.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.zh-cn-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.zh-cn.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/pragmatic.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/pragmatic.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/using-gfdl.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/using-gfdl.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6

Patches:
Index: categories.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/categories.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- categories.zh-cn.html       28 Jul 2019 08:58:34 -0000      1.7
+++ categories.zh-cn.html       22 Jul 2021 04:01:32 -0000      1.8
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>自由与非自由软件的分类 - GNU 工程 - 
自由软件基金会</title>
@@ -15,6 +18,10 @@
 
 <!--#include virtual="/philosophy/po/categories.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="reduced-width">
 <h2>自由与非自由软件的分类</h2>
 
 <p>另见<a
@@ -100,7 +107,7 @@
 许可证，那么某些副本或者修改版本可能完å…
¨ä¸æ˜¯è‡ªç”±çš„。软件公司可以编译该程序，不论是否对å…
¶è¿›è¡Œä¿®æ”¹ï¼Œéƒ½å¯ä»¥å°†å¯æ‰§è¡Œæ–‡ä»¶ä½œä¸º<a
 href="#ProprietarySoftware">专有软件</a>产品发布。</p>
 
-       <p><a href="http://www.x.org";>X Window 系统</a>阐释了这一点。X 
联盟将 X11 以某种非 copyleft
+       <p><a href="https://www.x.org";>X Window 
系统</a>阐释了这一点。X 联盟将 X11 以某种非 copyleft
 发布条款发布，使其成为非 copyleft
 çš„è‡ªç”±è½¯ä»¶ï¼Œå¹¶ä¸”åŽç»­å¼€å‘è€…å‡ 
乎沿用了相同的方式。一份带有此类发布条款的副本是自由软件。然而，也有专有版本的存在，并且确实有（或è€
…
至少确实曾经有）流行的用于工作站或个人计算机（PC）的图形显示卡ä»
…支持专有版本。如果您使用的是这类硬件，那么
 X11 对您来说不是自由软件。<a href="/philosophy/x.html">X11 
的开发者甚至曾经在一段时期将 X11
@@ -142,7 +149,7 @@
 
 <h3 id="GNUsoftware">GNU 软件（GNU Software）</h3>
 
-       <p>&ldquo;<a href="/software/software.html">GNU 
软件</a>&rdquo;是指在 <a
+       <p><a href="/software/software.html">GNU 软件</a>是指在 <a
 href="/gnu/gnu-history.html">GNU 
计划</a>支持下发布的软件。如果一个程序是 GNU 
软件，我们也可称之为 GNU
 程序或 GNU 软件包。GNU 软件包
的自述文件（README）或手册应当声明它是一个 GNU 软件包
；同时，<a
 href="/directory">自由软件目录</a>æ ‡è¯†äº†æ‰€æœ‰ GNU 软件包。</p>
@@ -150,8 +157,8 @@
        <p>大部分 GNU 软件是<a href="/licenses/copyleft.html"> copyleft 
</a>的，但不是全部；然而，所有 GNU
 软件都必须是<a href="/philosophy/free-sw.html">自由软件</a>。</p>
 
-       <p>有些 GNU 软件是由<a 
href="http://www.fsf.org";>自由软件基金会（FSF）</a><a
-href="http://www.fsf.org/about/staff/";>员工</a>所编写的，但是大部分
 GNU 软件来自众多<a
+       <p>有些 GNU 软件是由<a 
href="https://www.fsf.org";>自由软件基金会（FSF）</a><a
+href="https://www.fsf.org/about/staff/";>员工</a>所编写的，但是大部分
 GNU 软件来自众多<a
 href="/people/people.html">志愿者</a>（某些志愿者由商业公司或者
大学支付薪酬，但他们确实是我们的志愿者
）。某些贡献的软件由
 FSF 拥有版权，有些由编写它们的贡献者拥有版权。</p>
 
@@ -216,13 +223,8 @@
        <p>对于 GNU 计划，上述优å…
ˆçº§åº”该是另一种顺序：重要的是 GNU Ada
 
是一款自由软件；它同时也是一款商业软件只是细节。然而，由于å
…¶ä½œä¸ºä¸€æ¬¾å•†ä¸šè½¯ä»¶è€Œå¸¦æ¥çš„额外发展是大有裨益的。</p>
        <p>è¯·æ‚¨å¸®åŠ©æˆ‘ä»¬å®£ä¼ 
这种认识：自由的商业软件是可能的。您可以努力通过在您想要表达&ldquo;专有&rdquo;的时候避å
…ä½¿ç”¨&ldquo;商业&rdquo;æ¥è¾¾åˆ°è¿™æ ·çš„æ•ˆæžœã€‚</p>
+</div>
 
-<!-- If needed, change the copyright block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -235,7 +237,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>请将有关自由软件基金会与 GNU 
的查询与问题（以英语）发送到<a
@@ -254,18 +256,17 @@
 
         &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.translations.html">《译者指南》</a>。</p>
+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>
 
-<p>Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015,
-2016, 2017, 2018, 2019 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021
+Free Software Foundation, Inc.</p>
 
 <p>本页面使用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -278,12 +279,12 @@
 <b>翻译</b>:<a rel="team"
 href="https://savannah.nongnu.org/projects/blug/";>BLUG</a>，2016<br></br>
 <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，2021。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2019/07/28 08:58:34 $
+$Date: 2021/07/22 04:01:32 $
 
 <!-- timestamp end -->
 </p>

Index: fs-translations.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.zh-cn.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- fs-translations.zh-cn.html  6 May 2021 11:30:04 -0000       1.15
+++ fs-translations.zh-cn.html  22 Jul 2021 04:01:32 -0000      1.16
@@ -2,6 +2,9 @@
 
 <!--#include virtual="/server/html5-header.zh-cn.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>&ldquo;自由软件&rdquo;一词的翻译 - GNU工程 - 
自由软件基金会</title>
@@ -21,6 +24,9 @@
 </style>
 
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <div class="reduced-width">
 <h2>&ldquo;自由软件&rdquo;一词的翻译</h2>
 <div class="thin"></div>
@@ -38,91 +44,102 @@
 <!-- The languages are sorted by their name in English.  -->
 <!-- GNUN-SORT-START -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="sq">阿尔巴尼亚语</h3>
+<h3 id="eo">世界语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>sq</td></tr>
+<td>eo</td></tr>
 <tr><th>自由软件</th>
-<td lang="sq" xml:lang="sq">
-software i lirë</td></tr>
+<td lang="eo" xml:lang="eo">
+libera programaro / programo</td></tr>
 <tr><th>免费软件</th>
-<td lang="sq" xml:lang="sq">
-software falas</td></tr>
+<td lang="eo" xml:lang="eo">
+senpaga programaro / programo</td></tr>
+<tr><th>专有软件</th>
+<td lang="eo" xml:lang="eo">
+mallibera programaro / programo</td></tr>
+<tr><th>商业软件</th>
+<td lang="eo" xml:lang="eo">
+komerca programaro / programo</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ar">阿拉伯语</h3>
+<h3 id="da">丹麦语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ar</td></tr>
+<td>da</td></tr>
 <tr><th>自由软件</th>
-<td lang="ar" xml:lang="ar">برمجيات حرة (barmajiyat 
ḥorrah)</td></tr>
+<td lang="da" xml:lang="da">
+fri software / frit programmel</td></tr>
+<tr><th>免费软件</th>
+<td lang="da" xml:lang="da">
+gratis software</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ga">爱尔兰语</h3>
+<h3 id="uk">乌克兰语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ga</td></tr>
+<td>uk</td></tr>
 <tr><th>自由软件</th>
-<td lang="ga" xml:lang="ga">
-Saorbhogearraí</td></tr>
-<tr><th>免费软件</th>
-<td lang="ga" xml:lang="ga">
-Bogearraí saora in aisce</td></tr>
+<td lang="uk" xml:lang="uk">
+вільне програмне забезпечення (vil'ne prohramne 
zabezpechennja)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="et">爱沙尼亚语</h3>
+<h3 id="ur">乌尔都语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>et</td></tr>
+<td>ur</td></tr>
 <tr><th>自由软件</th>
-<td lang="et" xml:lang="et">
-vaba tarkvara</td></tr>
+<td lang="ur" xml:lang="ur">آزاد سافٹ ویئر (azad 
software)</td></tr>
 <tr><th>免费软件</th>
-<td lang="et" xml:lang="et">
-tasuta tarkvara</td></tr>
+<td lang="ur" xml:lang="ur">مفت سافٹ ویئر (muft software)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="eu">巴斯克语</h3>
+<h3 id="hy">亚美尼亚语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>eu</td></tr>
+<td>hy</td></tr>
 <tr><th>自由软件</th>
-<td lang="eu" xml:lang="eu">
-software librea</td></tr>
-<tr><th>免费软件</th>
-<td lang="eu" xml:lang="eu">
-doako softwarea</td></tr>
+<td lang="hy" xml:lang="hy">
+ազատ ծրագիր/ծրագրեր (azat tsragir/tsragrer)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="be">白俄罗斯语</h3>
+<h3 id="ru">俄语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>be</td></tr>
+<td>ru</td></tr>
 <tr><th>自由软件</th>
-<td lang="be" xml:lang="be">
-свабоднае праграмнае забесьпячэньне 
(svabodnae pragramnae zabes'pjachen'ne)</td></tr>
+<td lang="ru" xml:lang="ru">
+свободные программы (svobodnie programmi)</td></tr>
+<tr><th>免费软件</th>
+<td lang="ru" xml:lang="ru">
+бесплатные программы (besplatnie programmi)</td></tr>
+<tr><th>专有软件</th>
+<td lang="ru" xml:lang="ru">
+несвободные программы (nesvobodnie programmi)</td></tr>
+<tr><th>商业软件</th>
+<td lang="ru" xml:lang="ru">
+коммерческие программы (kommercheskie programmi)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
@@ -143,6 +160,21 @@
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="hr">克罗地亚语</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>è¯­è¨€ä»£ç </th>
+<td>hr</td></tr>
+<tr><th>自由软件</th>
+<td lang="hr" xml:lang="hr">
+slobodan softver</td></tr>
+<tr><th>免费软件</th>
+<td>besplatan softver</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
 <h3 id="is">冰岛语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
@@ -156,312 +188,288 @@
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="pl">波兰语</h3>
+<h3 id="ca">åŠ æ³°éš†è¯­</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>pl</td></tr>
+<td>ca</td></tr>
 <tr><th>自由软件</th>
-<td lang="pl" xml:lang="pl">
-wolne oprogramowanie</td></tr>
+<td lang="ca" xml:lang="ca">
+programari lliure</td></tr>
 <tr><th>免费软件</th>
-<td lang="pl" xml:lang="pl">
-darmowe oprogramowanie</td></tr>
+<td lang="ca" xml:lang="ca">
+programari gratuït</td></tr>
 <tr><th>专有软件</th>
-<td lang="pl" xml:lang="pl">
-oprogramowanie własnościowe</td></tr>
+<td lang="ca" xml:lang="ca">
+programari privatiu</td></tr>
 <tr><th>商业软件</th>
-<td lang="pl" xml:lang="pl">
-oprogramowanie komercyjne</td></tr>
+<td lang="ca" xml:lang="ca">
+programari comercial</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="fa">波斯语</h3>
+<h3 id="gl">åŠ é‡Œè¥¿äºšè¯­</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>fa</td></tr>
+<td>gl</td></tr>
 <tr><th>自由软件</th>
-<td lang="fa" xml:lang="fa">نرم‌افزار آزاد (narmafzar 
azad)</td></tr>
+<td lang="gl" xml:lang="gl">
+software libre</td></tr>
 <tr><th>免费软件</th>
-<td lang="fa" xml:lang="fa">نرم‌افزار رایگان (narmafzar 
raygan)</td></tr>
+<td lang="gl" xml:lang="gl">
+software gratuíto</td></tr>
+<tr><th>专有软件</th>
+<td lang="gl" xml:lang="gl">
+software privativo</td></tr>
+<tr><th>商业软件</th>
+<td lang="gl" xml:lang="gl">
+software comercial</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="da">丹麦语</h3>
+<h3 id="hu">匈牙利语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>da</td></tr>
+<td>hu</td></tr>
 <tr><th>自由软件</th>
-<td lang="da" xml:lang="da">
-fri software / frit programmel</td></tr>
+<td lang="hu" xml:lang="hu">
+szabad szoftver</td></tr>
 <tr><th>免费软件</th>
-<td lang="da" xml:lang="da">
-gratis software</td></tr>
+<td lang="hu" xml:lang="hu">
+ingyenes szoftver / ingyen szoftver</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="de">德语</h3>
+<h3 id="af">南非语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>de</td></tr>
+<td>af</td></tr>
 <tr><th>自由软件</th>
-<td lang="de" xml:lang="de">
-Freie Software</td></tr>
+<td lang="af" xml:lang="af">vrye sagteware</td></tr>
 <tr><th>免费软件</th>
-<td lang="de" xml:lang="de">
-Gratis-Software / Kostenlose Software</td></tr>
-<tr><th>专有软件</th>
-<td lang="de" xml:lang="de">
-Proprietäre Software</td></tr>
-<tr><th>商业软件</th>
-<td lang="de" xml:lang="de">
-Kommerzielle Software</td></tr>
+<td lang="af" xml:lang="af">gratis sagteware</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ru">俄语</h3>
+<h3 id="hi">印地语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ru</td></tr>
+<td>hi</td></tr>
 <tr><th>自由软件</th>
-<td lang="ru" xml:lang="ru">
-свободные программы (svobodnie programmi)</td></tr>
+<td lang="hi" xml:lang="hi">
+मुक्त सॉफ्टवेयर (mukt software)</td></tr>
 <tr><th>免费软件</th>
-<td lang="ru" xml:lang="ru">
-бесплатные программы (besplatnie programmi)</td></tr>
-<tr><th>专有软件</th>
-<td lang="ru" xml:lang="ru">
-несвободные программы (nesvobodnie programmi)</td></tr>
-<tr><th>商业软件</th>
-<td lang="ru" xml:lang="ru">
-коммерческие программы (kommercheskie programmi)</td></tr>
+<td lang="hi" xml:lang="hi">
+मुफ़्त सॉफ्टवेयर (muft software)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="fr">法语</h3>
+<h3 id="id">印度尼西亚语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>fr</td></tr>
+<td>id</td></tr>
 <tr><th>自由软件</th>
-<td lang="fr" xml:lang="fr">
-logiciel libre</td></tr>
+<td lang="id" xml:lang="id">
+perangkat lunak bebas</td></tr>
 <tr><th>免费软件</th>
-<td lang="fr" xml:lang="fr">
-logiciel gratuit</td></tr>
-<tr><th>专有软件</th>
-<td lang="fr" xml:lang="fr">
-logiciel privateur</td></tr>
-<tr><th>商业软件</th>
-<td lang="fr" xml:lang="fr">
-logiciel commercial</td></tr>
+<td lang="id" xml:lang="id">
+perangkat lunak gratis</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="zh-tw">繁体中文</h3>
+<h3 id="tr">土耳其语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>zh-tw</td></tr>
+<td>tr</td></tr>
 <tr><th>自由软件</th>
-<td lang="zh-tw" xml:lang="zh-tw">
-自由軟體 (zih-yo ruan-ti)</td></tr>
+<td lang="tr" xml:lang="tr">
+özgür yazılım</td></tr>
 <tr><th>免费软件</th>
-<td lang="zh-tw" xml:lang="zh-tw">
-免費軟體 (mien-fei ruan-ti)</td></tr>
+<td lang="tr" xml:lang="tr">
+bedava yazılım</td></tr>
+<tr><th>专有软件</th>
+<td lang="tr" xml:lang="tr">
+özel mülk yazılım</td></tr>
+<tr><th>商业软件</th>
+<td lang="tr" xml:lang="tr">
+ticari yazılım</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="fi">芬兰语</h3>
+<h3 id="tl">å¡”åŠ æ´›è¯­/菲律宾语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>fi</td></tr>
+<td>tl</td></tr>
 <tr><th>自由软件</th>
-<td lang="fi" xml:lang="fi">
-vapaa ohjelmisto</td></tr>
-<tr><th>免费软件</th>
-<td lang="fi" xml:lang="fi">ilmainen ohjelmisto</td></tr>
+<td lang="tl" xml:lang="tl">
+malayang software</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ka">æ ¼é²å‰äºšè¯­</h3>
+<h3 id="sr">塞尔维亚语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ka</td></tr>
+<td>sr</td></tr>
 <tr><th>自由软件</th>
-<td lang="ka" xml:lang="ka">
-თავისუფალი პროგრამები (tavisupali 
programebi)</td></tr>
+<td lang="sr" xml:lang="sr">
+слободни софтвер / slobodni softver</td></tr>
 <tr><th>免费软件</th>
-<td lang="ka" xml:lang="ka">
-უფასო პროგრამები (upaso programebi)</td></tr>
+<td lang="sr" xml:lang="sr">
+бесплатни софтвер / besplatni softver</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ko">韩语</h3>
+<h3 id="cy">威尔士语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ko</td></tr>
+<td>cy</td></tr>
 <tr><th>自由软件</th>
-<td lang="ko" xml:lang="ko">
-ìžìœ  소프트웨어 (ja-yu software)</td></tr>
+<td lang="cy" xml:lang="cy">
+meddalwedd rydd</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="nl">荷兰语</h3>
+<h3 id="bn">å­ŸåŠ æ‹‰è¯­</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>nl</td></tr>
+<td>bn</td></tr>
 <tr><th>自由软件</th>
-<td lang="nl" xml:lang="nl">
-vrije software</td></tr>
+<td lang="bn" xml:lang="bn">
+স্বাধীন সফটওয়্যার (swadhin software)
+</td></tr>
 <tr><th>免费软件</th>
-<td lang="nl" xml:lang="nl">
-gratis software</td></tr>
+<td lang="bn" xml:lang="bn">
+বিনামূল্যের সফটওয়্যার (binamuller 
software)
+</td></tr>
 <tr><th>专有软件</th>
-<td lang="nl" xml:lang="nl">
-private software</td></tr>
+<td lang="bn" xml:lang="bn">
+মালিকানা সফটওয়্যার (malikana software)
+</td></tr>
 <tr><th>商业软件</th>
-<td lang="nl" xml:lang="nl">
-commerci&euml;le software</td></tr>
+<td lang="bn" xml:lang="bn">
+বাণিজ্যিক সফটওয়্যার (banijjik software)
+</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="gl">åŠ é‡Œè¥¿äºšè¯­</h3>
+<h3 id="eu">巴斯克语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>gl</td></tr>
+<td>eu</td></tr>
 <tr><th>自由软件</th>
-<td lang="gl" xml:lang="gl">
-software libre</td></tr>
+<td lang="eu" xml:lang="eu">
+software librea</td></tr>
 <tr><th>免费软件</th>
-<td lang="gl" xml:lang="gl">
-software gratuíto</td></tr>
-<tr><th>专有软件</th>
-<td lang="gl" xml:lang="gl">
-software privativo</td></tr>
-<tr><th>商业软件</th>
-<td lang="gl" xml:lang="gl">
-software comercial</td></tr>
+<td lang="eu" xml:lang="eu">
+doako softwarea</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ca">åŠ æ³°éš†è¯­</h3>
+<h3 id="he">希伯来语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ca</td></tr>
+<td>he</td></tr>
 <tr><th>自由软件</th>
-<td lang="ca" xml:lang="ca">
-programari lliure</td></tr>
+<td lang="he" xml:lang="he">×ª×•×›× ×” חופשית (tochna chofshit)</td></tr>
 <tr><th>免费软件</th>
-<td lang="ca" xml:lang="ca">
-programari gratuït</td></tr>
-<tr><th>专有软件</th>
-<td lang="ca" xml:lang="ca">
-programari privatiu</td></tr>
-<tr><th>商业软件</th>
-<td lang="ca" xml:lang="ca">
-programari comercial</td></tr>
-</table>
-
-<!-- GNUN-SORT-NEXT-ITEM -->
-<!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="io">简化世界语</h3>
-
-<!-- GNUN-SORT-END-KEY -->
-<table border="1">
-<tr><th>è¯­è¨€ä»£ç </th>
-<td>io</td></tr>
-<tr><th>自由软件</th>
-<td lang="io" xml:lang="io">
-libera programaro</td></tr>
+<td lang="he" xml:lang="he">×ª×•×›× ×” ×—×™× ×ž×™×ª (tochna chinamit)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="zh-cn">简体中文</h3>
+<h3 id="el">希腊语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>zh-cn</td></tr>
+<td>el</td></tr>
 <tr><th>自由软件</th>
-<td lang="zh-cn" xml:lang="zh-cn">
-自由软件 (普通话发音：zi(4)-you(2) Ruan(3)-jian(4))</td></tr>
+<td lang="el" xml:lang="el">
+ελεύθερο λογισμικό (elefthero logismiko)</td></tr>
 <tr><th>免费软件</th>
-<td lang="zh-cn" xml:lang="zh-cn">
-免费软件 (普通话发音：mian(3)-fei(4) ruan(3)-jian(4))</td></tr>
+<td lang="el" xml:lang="el">
+δωρεάν λογισμικό (dorean logismiko)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="cs">捷克语</h3>
+<h3 id="de">德语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>cs</td></tr>
+<td>de</td></tr>
 <tr><th>自由软件</th>
-<td lang="cs" xml:lang="cs">
-svobodný software</td></tr>
+<td lang="de" xml:lang="de">
+Freie Software</td></tr>
 <tr><th>免费软件</th>
-<td lang="cs" xml:lang="cs">
-bezplatný software</td></tr>
+<td lang="de" xml:lang="de">
+Gratis-Software / Kostenlose Software</td></tr>
 <tr><th>专有软件</th>
-<td lang="cs" xml:lang="cs">
-proprietární software</td></tr>
+<td lang="de" xml:lang="de">
+Proprietäre Software</td></tr>
 <tr><th>商业软件</th>
-<td lang="cs" xml:lang="cs">
-komerční software</td></tr>
+<td lang="de" xml:lang="de">
+Kommerzielle Software</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="hr">克罗地亚语</h3>
+<h3 id="it">意大利语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>hr</td></tr>
+<td>it</td></tr>
 <tr><th>自由软件</th>
-<td lang="hr" xml:lang="hr">
-slobodan softver</td></tr>
+<td lang="it" xml:lang="it">
+software libero</td></tr>
 <tr><th>免费软件</th>
-<td>besplatan softver</td></tr>
+<td lang="it" xml:lang="it">
+software gratuito</td></tr>
+<tr><th>专有软件</th>
+<td lang="it" xml:lang="it">
+software proprietario</td></tr>
+<tr><th>商业软件</th>
+<td lang="it" xml:lang="it">
+software commerciale</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
@@ -495,498 +503,497 @@
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="lt">立陶宛语</h3>
+<h3 id="no">挪威语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>lt</td></tr>
+<td>no, nb, nn</td></tr>
 <tr><th>自由软件</th>
-<td lang="lt" xml:lang="lt">
-laisva programinė įranga</td></tr>
+<td lang="no" xml:lang="no">
+fri programvare</td></tr>
 <tr><th>免费软件</th>
-<td lang="lt" xml:lang="lt">
-nemokama programinė įranga</td></tr>
+<td lang="no" xml:lang="no">
+gratis programvare</td></tr>
+<tr><th>专有软件</th>
+<td lang="no" xml:lang="no">
+godseid programvare / proprietær programvare</td></tr>
+<tr><th>商业软件</th>
+<td lang="no" xml:lang="no">
+kommersiell programvare</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ro">罗马尼亚语</h3>
+<h3 id="cs">捷克语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ro</td></tr>
+<td>cs</td></tr>
 <tr><th>自由软件</th>
-<td lang="ro" xml:lang="ro">
-programe libere</td></tr>
+<td lang="cs" xml:lang="cs">
+svobodný software</td></tr>
 <tr><th>免费软件</th>
-<td lang="ro" xml:lang="ro">
-programe gratuite</td></tr>
+<td lang="cs" xml:lang="cs">
+bezplatný software</td></tr>
 <tr><th>专有软件</th>
-<td lang="ro" xml:lang="ro">
-programe proprietărești</td></tr>
+<td lang="cs" xml:lang="cs">
+proprietární software</td></tr>
 <tr><th>商业软件</th>
-<td lang="ro" xml:lang="ro">
-programe comerciale</td></tr>
+<td lang="cs" xml:lang="cs">
+komerční software</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ml">马拉亚拉姆语</h3>
+<h3 id="sc">撒丁语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ml</td></tr>
+<td>sc</td></tr>
 <tr><th>自由软件</th>
-<td lang="ml" xml:lang="ml">
-സ്വതന്ത്രസോഫ്റ്റ്‌വെയര്‍ 
(svatantrasophṯṯveyar)</td></tr>
-<tr><th>免费软件</th>
-<td lang="ml" xml:lang="ml">
-സൗജന്യസോഫ്റ്റ്‌വെയര്‍ 
(soujanyasophṯṯveyar)</td></tr>
+<td lang="sc" xml:lang="sc">
+software liberu</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ms">马来语</h3>
+<h3 id="sk">斯洛伐克语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ms</td></tr>
+<td>sk</td></tr>
 <tr><th>自由软件</th>
-<td lang="ms" xml:lang="ms">
-perisian bebas</td></tr>
-<tr><th>免费软件</th>
-<td lang="ms" xml:lang="ms">
-perisian percuma</td></tr>
-<tr><th>专有软件</th>
-<td lang="ms" xml:lang="ms">
-perisian hakmilik</td></tr>
-<tr><th>商业软件</th>
-<td lang="ms" xml:lang="ms">
-perisian dagangan</td></tr>
+<td lang="sk" xml:lang="sk">
+slobodný softvér</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="mk">马其顿语</h3>
+<h3 id="sl">斯洛文尼亚语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>mk</td></tr>
+<td>sl</td></tr>
 <tr><th>自由软件</th>
-<td lang="mk" xml:lang="mk">
-слободен софтвер (sloboden softver)</td></tr>
-<tr><th>免费软件</th>
-<td lang="mk" xml:lang="mk">
-бесплатен софтвер (besplaten softver)</td></tr>
+<td lang="sl" xml:lang="sl">
+prosto programje</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="bn">å­ŸåŠ æ‹‰è¯­</h3>
+<h3 id="sw">斯瓦西里语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>bn</td></tr>
+<td>sw</td></tr>
 <tr><th>自由软件</th>
-<td lang="bn" xml:lang="bn">
-স্বাধীন সফটওয়্যার (swadhin software)
-</td></tr>
-<tr><th>免费软件</th>
-<td lang="bn" xml:lang="bn">
-বিনামূল্যের সফটওয়্যার (binamuller 
software)
-</td></tr>
-<tr><th>专有软件</th>
-<td lang="bn" xml:lang="bn">
-মালিকানা সফটওয়্যার (malikana software)
-</td></tr>
-<tr><th>商业软件</th>
-<td lang="bn" xml:lang="bn">
-বাণিজ্যিক সফটওয়্যার (banijjik software)
-</td></tr>
+<td lang="sw" xml:lang="sw">
+Software huru / Programu huru za Kompyuta</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="my">缅甸语</h3>
+<h3 id="ja">日语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>my</td></tr>
+<td>ja</td></tr>
 <tr><th>自由软件</th>
-<td lang="my" xml:lang="my">
-လွတ်လပ်ဆော့ဖ်ဝဲ (lu' la' software)</td></tr>
+<td lang="ja" xml:lang="ja">
+自由ソフトウェア (jiyū sofutouea)</td></tr>
 <tr><th>免费软件</th>
-<td lang="my" xml:lang="my">
-အခမဲ့ဆော့ဖ်ဝဲ (a̱kha. me. software)</td></tr>
+<td lang="ja" xml:lang="ja">
+無料ソフトウェア (muryō sofutouea)</td></tr>
+<tr><th>专有软件</th>
+<td lang="ja" xml:lang="ja">
+プロプライエタリなソフトウェア (puropuraietari na 
sofutouea)</td></tr>
+<tr><th>商业软件</th>
+<td lang="ja" xml:lang="ja">
+商用ソフトウェア (shōyō sofutouea)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="af">南非语</h3>
+<h3 id="ka">æ ¼é²å‰äºšè¯­</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>af</td></tr>
+<td>ka</td></tr>
 <tr><th>自由软件</th>
-<td lang="af" xml:lang="af">vrye sagteware</td></tr>
+<td lang="ka" xml:lang="ka">
+თავისუფალი პროგრამები (tavisupali 
programebi)</td></tr>
 <tr><th>免费软件</th>
-<td lang="af" xml:lang="af">gratis sagteware</td></tr>
+<td lang="ka" xml:lang="ka">
+უფასო პროგრამები (upaso programebi)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="no">挪威语</h3>
+<h3 id="fr">法语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>no, nb, nn</td></tr>
+<td>fr</td></tr>
 <tr><th>自由软件</th>
-<td lang="no" xml:lang="no">
-fri programvare</td></tr>
+<td lang="fr" xml:lang="fr">
+logiciel libre</td></tr>
 <tr><th>免费软件</th>
-<td lang="no" xml:lang="no">
-gratis programvare</td></tr>
+<td lang="fr" xml:lang="fr">
+logiciel gratuit</td></tr>
 <tr><th>专有软件</th>
-<td lang="no" xml:lang="no">
-godseid programvare / proprietær programvare</td></tr>
+<td lang="fr" xml:lang="fr">
+logiciel privateur</td></tr>
 <tr><th>商业软件</th>
-<td lang="no" xml:lang="no">
-kommersiell programvare</td></tr>
+<td lang="fr" xml:lang="fr">
+logiciel commercial</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="pt">葡萄牙语</h3>
+<h3 id="pl">波兰语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>pt</td></tr>
+<td>pl</td></tr>
 <tr><th>自由软件</th>
-<td lang="pt" xml:lang="pt">
-software livre</td></tr>
+<td lang="pl" xml:lang="pl">
+wolne oprogramowanie</td></tr>
 <tr><th>免费软件</th>
-<td lang="pt" xml:lang="pt">
-software gratuito</td></tr>
+<td lang="pl" xml:lang="pl">
+darmowe oprogramowanie</td></tr>
 <tr><th>专有软件</th>
-<td lang="pt" xml:lang="pt">
-software privativo</td></tr>
+<td lang="pl" xml:lang="pl">
+oprogramowanie własnościowe</td></tr>
 <tr><th>商业软件</th>
-<td lang="pt" xml:lang="pt">
-software comercial</td></tr>
+<td lang="pl" xml:lang="pl">
+oprogramowanie komercyjne</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ja">日语</h3>
+<h3 id="fa">波斯语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ja</td></tr>
+<td>fa</td></tr>
 <tr><th>自由软件</th>
-<td lang="ja" xml:lang="ja">
-自由ソフトウェア (jiyū sofutouea)</td></tr>
+<td lang="fa" xml:lang="fa">نرم‌افزار آزاد (narmafzar 
azad)</td></tr>
 <tr><th>免费软件</th>
-<td lang="ja" xml:lang="ja">
-無料ソフトウェア (muryō sofutouea)</td></tr>
-<tr><th>专有软件</th>
-<td lang="ja" xml:lang="ja">
-プロプライエタリなソフトウェア (puropuraietari na 
sofutouea)</td></tr>
-<tr><th>商业软件</th>
-<td lang="ja" xml:lang="ja">
-商用ソフトウェア (shōyō sofutouea)</td></tr>
+<td lang="fa" xml:lang="fa">نرم‌افزار رایگان (narmafzar 
raygan)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="sv">瑞典语</h3>
+<h3 id="te">泰卢固语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>sv</td></tr>
+<td>te</td></tr>
 <tr><th>自由软件</th>
-<td lang="sv" xml:lang="sv">
-fri programvara / fri mjukvara</td></tr>
+<td lang="te" xml:lang="te">
+స్వేచ్ఛ సాఫ్ట్‌వేర్ (swechcha软件)
+</td></tr>
 <tr><th>免费软件</th>
-<td lang="sv" xml:lang="sv">
-gratis programvara / gratis mjukvara</td></tr>
+<td lang="te" xml:lang="te">
+ఉచిత సాఫ్ట్‌వేర్ (uchitha软件)
+</td></tr>
+<tr><th>专有软件</th>
+<td lang="te" xml:lang="te">
+యాజమాన్య సాఫ్ట్‌వేర్ (yaajamaanya软件)
+</td></tr>
+<tr><th>商业软件</th>
+<td lang="te" xml:lang="te">
+వాణిజ్య సాఫ్ట్‌వేర్ (vaanijya软件)
+</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="sc">撒丁语</h3>
+<h3 id="ta">泰米尔语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>sc</td></tr>
+<td>ta</td></tr>
 <tr><th>自由软件</th>
-<td lang="sc" xml:lang="sc">
-software liberu</td></tr>
+<td lang="ta" xml:lang="ta">
+கட்டற்ற மென்பொருள் (kaṭṭaṟṟa 
meṉpoñaḷ)</td></tr>
+<tr><th>免费软件</th>
+<td lang="ta" xml:lang="ta">
+இலவச மென்பொருள் (illavasa menporul) </td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="sr">塞尔维亚语</h3>
+<h3 id="th">泰语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>sr</td></tr>
+<td>th</td></tr>
 <tr><th>自由软件</th>
-<td lang="sr" xml:lang="sr">
-слободни софтвер / slobodni softver</td></tr>
-<tr><th>免费软件</th>
-<td lang="sr" xml:lang="sr">
-бесплатни софтвер / besplatni softver</td></tr>
+<td lang="th" xml:lang="th">
+ซอฟต์แวร์เสรี (sofotwerseri)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="eo">世界语</h3>
+<h3 id="ga">爱尔兰语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>eo</td></tr>
+<td>ga</td></tr>
 <tr><th>自由软件</th>
-<td lang="eo" xml:lang="eo">
-libera programaro / programo</td></tr>
+<td lang="ga" xml:lang="ga">
+Saorbhogearraí</td></tr>
 <tr><th>免费软件</th>
-<td lang="eo" xml:lang="eo">
-senpaga programaro / programo</td></tr>
-<tr><th>专有软件</th>
-<td lang="eo" xml:lang="eo">
-mallibera programaro / programo</td></tr>
-<tr><th>商业软件</th>
-<td lang="eo" xml:lang="eo">
-komerca programaro / programo</td></tr>
+<td lang="ga" xml:lang="ga">
+Bogearraí saora in aisce</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="sk">斯洛伐克语</h3>
+<h3 id="et">爱沙尼亚语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>sk</td></tr>
+<td>et</td></tr>
 <tr><th>自由软件</th>
-<td lang="sk" xml:lang="sk">
-slobodný softvér</td></tr>
+<td lang="et" xml:lang="et">
+vaba tarkvara</td></tr>
+<tr><th>免费软件</th>
+<td lang="et" xml:lang="et">
+tasuta tarkvara</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="sl">斯洛文尼亚语</h3>
+<h3 id="sv">瑞典语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>sl</td></tr>
+<td>sv</td></tr>
 <tr><th>自由软件</th>
-<td lang="sl" xml:lang="sl">
-prosto programje</td></tr>
+<td lang="sv" xml:lang="sv">
+fri programvara / fri mjukvara</td></tr>
+<tr><th>免费软件</th>
+<td lang="sv" xml:lang="sv">
+gratis programvara / gratis mjukvara</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="sw">斯瓦西里语</h3>
+<h3 id="be">白俄罗斯语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>sw</td></tr>
+<td>be</td></tr>
 <tr><th>自由软件</th>
-<td lang="sw" xml:lang="sw">
-Software huru / Programu huru za Kompyuta</td></tr>
+<td lang="be" xml:lang="be">
+свабоднае праграмнае забесьпячэньне 
(svabodnae pragramnae zabes'pjachen'ne)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="gd">è‹æ ¼å…°ç›–å°”è¯­</h3>
+<h3 id="zu">祖鲁语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>gd</td></tr>
+<td>zu</td></tr>
 <tr><th>自由软件</th>
-<td lang="gd" xml:lang="gd">
-bathar-bog saor</td></tr>
-<tr><th>免费软件</th>
-<td lang="gd" xml:lang="gd">
-bathar-bog an-asgaidh</td></tr>
+<td lang="zu" xml:lang="zu">
+Isoftware Ekhululekile</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="tl">å¡”åŠ æ´›è¯­/菲律宾语</h3>
+<h3 id="lt">立陶宛语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>tl</td></tr>
+<td>lt</td></tr>
 <tr><th>自由软件</th>
-<td lang="tl" xml:lang="tl">
-malayang software</td></tr>
+<td lang="lt" xml:lang="lt">
+laisva programinė įranga</td></tr>
+<tr><th>免费软件</th>
+<td lang="lt" xml:lang="lt">
+nemokama programinė įranga</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="te">泰卢固语</h3>
+<h3 id="zh-cn">简体中文</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>te</td></tr>
+<td>zh-cn</td></tr>
 <tr><th>自由软件</th>
-<td lang="te" xml:lang="te">
-స్వేచ్ఛ సాఫ్ట్‌వేర్ (swechcha软件)
-</td></tr>
+<td lang="zh-cn" xml:lang="zh-cn">
+自由软件 (普通话发音：zi(4)-you(2) Ruan(3)-jian(4))</td></tr>
 <tr><th>免费软件</th>
-<td lang="te" xml:lang="te">
-ఉచిత సాఫ్ట్‌వేర్ (uchitha软件)
-</td></tr>
-<tr><th>专有软件</th>
-<td lang="te" xml:lang="te">
-యాజమాన్య సాఫ్ట్‌వేర్ (yaajamaanya软件)
-</td></tr>
-<tr><th>商业软件</th>
-<td lang="te" xml:lang="te">
-వాణిజ్య సాఫ్ట్‌వేర్ (vaanijya软件)
-</td></tr>
+<td lang="zh-cn" xml:lang="zh-cn">
+免费软件 (普通话发音：mian(3)-fei(4) ruan(3)-jian(4))</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ta">泰米尔语</h3>
+<h3 id="io">简化世界语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ta</td></tr>
+<td>io</td></tr>
 <tr><th>自由软件</th>
-<td lang="ta" xml:lang="ta">
-கட்டற்ற மென்பொருள் (kaṭṭaṟṟa 
meṉpoñaḷ)</td></tr>
-<tr><th>免费软件</th>
-<td lang="ta" xml:lang="ta">
-இலவச மென்பொருள் (illavasa menporul) </td></tr>
+<td lang="io" xml:lang="io">
+libera programaro</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="th">泰语</h3>
+<h3 id="zh-tw">繁体中文</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>th</td></tr>
+<td>zh-tw</td></tr>
 <tr><th>自由软件</th>
-<td lang="th" xml:lang="th">
-ซอฟต์แวร์เสรี (sofotwerseri)</td></tr>
+<td lang="zh-tw" xml:lang="zh-tw">
+自由軟體 (zih-yo ruan-ti)</td></tr>
+<tr><th>免费软件</th>
+<td lang="zh-tw" xml:lang="zh-tw">
+免費軟體 (mien-fei ruan-ti)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="tr">土耳其语</h3>
+<h3 id="my">缅甸语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>tr</td></tr>
+<td>my</td></tr>
 <tr><th>自由软件</th>
-<td lang="tr" xml:lang="tr">
-özgür yazılım</td></tr>
+<td lang="my" xml:lang="my">
+လွတ်လပ်ဆော့ဖ်ဝဲ (lu' la' software)</td></tr>
 <tr><th>免费软件</th>
-<td lang="tr" xml:lang="tr">
-bedava yazılım</td></tr>
-<tr><th>专有软件</th>
-<td lang="tr" xml:lang="tr">
-özel mülk yazılım</td></tr>
-<tr><th>商业软件</th>
-<td lang="tr" xml:lang="tr">
-ticari yazılım</td></tr>
+<td lang="my" xml:lang="my">
+အခမဲ့ဆော့ဖ်ဝဲ (a̱kha. me. software)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="cy">威尔士语</h3>
+<h3 id="ro">罗马尼亚语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>cy</td></tr>
+<td>ro</td></tr>
 <tr><th>自由软件</th>
-<td lang="cy" xml:lang="cy">
-meddalwedd rydd</td></tr>
+<td lang="ro" xml:lang="ro">
+programe libere</td></tr>
+<tr><th>免费软件</th>
+<td lang="ro" xml:lang="ro">
+programe gratuite</td></tr>
+<tr><th>专有软件</th>
+<td lang="ro" xml:lang="ro">
+programe proprietărești</td></tr>
+<tr><th>商业软件</th>
+<td lang="ro" xml:lang="ro">
+programe comerciale</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="ur">乌尔都语</h3>
+<h3 id="fi">芬兰语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>ur</td></tr>
+<td>fi</td></tr>
 <tr><th>自由软件</th>
-<td lang="ur" xml:lang="ur">آزاد سافٹ ویئر (azad 
software)</td></tr>
+<td lang="fi" xml:lang="fi">
+vapaa ohjelmisto</td></tr>
 <tr><th>免费软件</th>
-<td lang="ur" xml:lang="ur">مفت سافٹ ویئر (muft software)</td></tr>
+<td lang="fi" xml:lang="fi">ilmainen ohjelmisto</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="uk">乌克兰语</h3>
+<h3 id="gd">è‹æ ¼å…°ç›–å°”è¯­</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>uk</td></tr>
+<td>gd</td></tr>
 <tr><th>自由软件</th>
-<td lang="uk" xml:lang="uk">
-вільне програмне забезпечення (vil'ne prohramne 
zabezpechennja)</td></tr>
+<td lang="gd" xml:lang="gd">
+bathar-bog saor</td></tr>
+<tr><th>免费软件</th>
+<td lang="gd" xml:lang="gd">
+bathar-bog an-asgaidh</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="he">希伯来语</h3>
+<h3 id="nl">荷兰语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>he</td></tr>
+<td>nl</td></tr>
 <tr><th>自由软件</th>
-<td lang="he" xml:lang="he">×ª×•×›× ×” חופשית (tochna chofshit)</td></tr>
+<td lang="nl" xml:lang="nl">
+vrije software</td></tr>
 <tr><th>免费软件</th>
-<td lang="he" xml:lang="he">×ª×•×›× ×” ×—×™× ×ž×™×ª (tochna chinamit)</td></tr>
+<td lang="nl" xml:lang="nl">
+gratis software</td></tr>
+<tr><th>专有软件</th>
+<td lang="nl" xml:lang="nl">
+private software</td></tr>
+<tr><th>商业软件</th>
+<td lang="nl" xml:lang="nl">
+commerci&euml;le software</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="el">希腊语</h3>
+<h3 id="pt">葡萄牙语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>el</td></tr>
+<td>pt</td></tr>
 <tr><th>自由软件</th>
-<td lang="el" xml:lang="el">
-ελεύθερο λογισμικό (elefthero logismiko)</td></tr>
+<td lang="pt" xml:lang="pt">
+software livre</td></tr>
 <tr><th>免费软件</th>
-<td lang="el" xml:lang="el">
-δωρεάν λογισμικό (dorean logismiko)</td></tr>
+<td lang="pt" xml:lang="pt">
+software gratuito</td></tr>
+<tr><th>专有软件</th>
+<td lang="pt" xml:lang="pt">
+software privativo</td></tr>
+<tr><th>商业软件</th>
+<td lang="pt" xml:lang="pt">
+software comercial</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
@@ -1013,124 +1020,123 @@
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="si">锡兰语</h3>
+<h3 id="vi">越南语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>si</td></tr>
+<td>vi</td></tr>
 <tr><th>自由软件</th>
-<td lang="si" xml:lang="si">
-නිදහස් මෘදුකාංග (nidahas mṛdukāṅga)</td></tr>
+<td lang="vi" xml:lang="vi">
+phần mềm tự do</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="hu">匈牙利语</h3>
+<h3 id="si">锡兰语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>hu</td></tr>
+<td>si</td></tr>
 <tr><th>自由软件</th>
-<td lang="hu" xml:lang="hu">
-szabad szoftver</td></tr>
-<tr><th>免费软件</th>
-<td lang="hu" xml:lang="hu">
-ingyenes szoftver / ingyen szoftver</td></tr>
+<td lang="si" xml:lang="si">
+නිදහස් මෘදුකාංග (nidahas mṛdukāṅga)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="hy">亚美尼亚语</h3>
+<h3 id="sq">阿尔巴尼亚语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>hy</td></tr>
+<td>sq</td></tr>
 <tr><th>自由软件</th>
-<td lang="hy" xml:lang="hy">
-ազատ ծրագիր/ծրագրեր (azat tsragir/tsragrer)</td></tr>
+<td lang="sq" xml:lang="sq">
+software i lirë</td></tr>
+<tr><th>免费软件</th>
+<td lang="sq" xml:lang="sq">
+software falas</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="it">意大利语</h3>
+<h3 id="ar">阿拉伯语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>it</td></tr>
+<td>ar</td></tr>
 <tr><th>自由软件</th>
-<td lang="it" xml:lang="it">
-software libero</td></tr>
-<tr><th>免费软件</th>
-<td lang="it" xml:lang="it">
-software gratuito</td></tr>
-<tr><th>专有软件</th>
-<td lang="it" xml:lang="it">
-software proprietario</td></tr>
-<tr><th>商业软件</th>
-<td lang="it" xml:lang="it">
-software commerciale</td></tr>
+<td lang="ar" xml:lang="ar">برمجيات حرة (barmajiyat 
ḥorrah)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="hi">印地语</h3>
+<h3 id="ko">韩语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>hi</td></tr>
+<td>ko</td></tr>
 <tr><th>自由软件</th>
-<td lang="hi" xml:lang="hi">
-मुक्त सॉफ्टवेयर (mukt software)</td></tr>
-<tr><th>免费软件</th>
-<td lang="hi" xml:lang="hi">
-मुफ़्त सॉफ्टवेयर (muft software)</td></tr>
+<td lang="ko" xml:lang="ko">
+ìžìœ  소프트웨어 (ja-yu software)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="id">印度尼西亚语</h3>
+<h3 id="mk">马其顿语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>id</td></tr>
+<td>mk</td></tr>
 <tr><th>自由软件</th>
-<td lang="id" xml:lang="id">
-perangkat lunak bebas</td></tr>
+<td lang="mk" xml:lang="mk">
+слободен софтвер (sloboden softver)</td></tr>
 <tr><th>免费软件</th>
-<td lang="id" xml:lang="id">
-perangkat lunak gratis</td></tr>
+<td lang="mk" xml:lang="mk">
+бесплатен софтвер (besplaten softver)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="vi">越南语</h3>
+<h3 id="ml">马拉亚拉姆语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>vi</td></tr>
+<td>ml</td></tr>
 <tr><th>自由软件</th>
-<td lang="vi" xml:lang="vi">
-phần mềm tự do</td></tr>
+<td lang="ml" xml:lang="ml">
+സ്വതന്ത്രസോഫ്റ്റ്‌വെയര്‍ 
(svatantrasophṯṯveyar)</td></tr>
+<tr><th>免费软件</th>
+<td lang="ml" xml:lang="ml">
+സൗജന്യസോഫ്റ്റ്‌വെയര്‍ 
(soujanyasophṯṯveyar)</td></tr>
 </table>
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="zu">祖鲁语</h3>
+<h3 id="ms">马来语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
 <tr><th>è¯­è¨€ä»£ç </th>
-<td>zu</td></tr>
+<td>ms</td></tr>
 <tr><th>自由软件</th>
-<td lang="zu" xml:lang="zu">
-Isoftware Ekhululekile</td></tr>
+<td lang="ms" xml:lang="ms">
+perisian bebas</td></tr>
+<tr><th>免费软件</th>
+<td lang="ms" xml:lang="ms">
+perisian percuma</td></tr>
+<tr><th>专有软件</th>
+<td lang="ms" xml:lang="ms">
+perisian hakmilik</td></tr>
+<tr><th>商业软件</th>
+<td lang="ms" xml:lang="ms">
+perisian dagangan</td></tr>
 </table>
 
 <!-- GNUN-SORT-STOP -->
@@ -1188,9 +1194,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 1999-2021 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -1206,7 +1210,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2021/05/06 11:30:04 $
+$Date: 2021/07/22 04:01:32 $
 
 <!-- timestamp end -->
 </p>

Index: pragmatic.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/pragmatic.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- pragmatic.zh-cn.html        28 Oct 2020 06:59:36 -0000      1.2
+++ pragmatic.zh-cn.html        22 Jul 2021 04:01:32 -0000      1.3
@@ -1,18 +1,25 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/pragmatic.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Copyleft：实用的理想主义 - GNU工程 - 
自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/pragmatic.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="reduced-width">
 <h2>Copyleft：实用的理想主义</h2>
 
-<p>
-<a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a> 
著</p>
+<address class="byline"><a 
href="https://www.stallman.org/";>理查德·斯托曼</a> 著</address>
 
+<div class="article">
 <p>
 一个人所做的每个决定都源自这个人的价值观和目æ 
‡ã€‚äººä»¬æœ‰å¾ˆå¤šä¸åŒçš„ä»·å€¼è§‚å’Œç›®æ ‡ï¼›åèª‰ã€åˆ©ç›Šã€çˆ±æƒ…
ã€ç”Ÿå­˜ã€å¿«ä¹å’Œè‡ªç”±ï¼Œè¿™äº›åªæ˜¯å¸¸äººä¼šæœ‰çš„éƒ¨åˆ†ç›®æ ‡ã€‚å½“ç›®æ 
‡æ˜¯åŽŸåˆ™æ€§é—®é¢˜çš„时候，我们称之为理想主义。</p>
 
@@ -20,8 +27,9 @@
 一个理想主义的目æ 
‡æ¿€åŠ±ç€æˆ‘从事自由软件的工作：弘扬自由和合作。我要<a
 
href="/philosophy/why-copyleft.html">鼓励自由软件的转播</a>，让它替代禁止合作的专属软件，从而使我们的社会变得更好。</p>
 <p>
-这就是为什么GNU通用公共许可证按照&mdash;<a
-href="/copyleft">copyleft</a>é‚£æ ·å†™çš„åŸºæœ¬åŽŸå› 
。所有为遵循GPLçš„ç¨‹åºè€Œæ·»åŠ çš„ä»£ç éƒ½å¿…
é¡»æ˜¯è‡ªç”±è½¯ä»¶ï¼Œå³ä½¿è¿™äº›ä»£ç æ˜¯å•ç‹¬çš„æ–‡ä»¶ã€‚æˆ‘æŠŠæˆ‘çš„ä»£ç 
ç»™è‡ªç”±è½¯ä»¶ä½¿ç”¨ï¼Œè€Œä¸ç»™ä¸“属软件使用。我认为专属软件开发è€
…
使用版权来禁止我们分享，那么我们就使用版权来给予互相合作的程序员自己的优势：他们可以使用我们的代ç
 ã€‚</p>
+这就是为什么 GNU 通用公共许可证按照&mdash;&mdash;<a
+href="/licenses/copyleft.html">copyleft</a> é‚£æ ·å†™çš„åŸºæœ¬åŽŸå› 
。所有为遵循 GPL
+çš„ç¨‹åºè€Œæ·»åŠ çš„ä»£ç éƒ½å¿…é¡»æ˜¯è‡ªç”±è½¯ä»¶ï¼Œå³ä½¿è¿™äº›ä»£ç 
æ˜¯å•ç‹¬çš„文件。我把我的代ç 
ç»™è‡ªç”±è½¯ä»¶ä½¿ç”¨ï¼Œè€Œä¸ç»™ä¸“属软件使用。我认为专属软件开发è€
…
使用版权来禁止我们分享，那么我们就使用版权来给予互相合作的程序员自己的优势：他们可以使用我们的代ç
 ã€‚</p>
 <p>
 并非所有使用GNU GPL的人都有这个目æ 
‡ã€‚多年以前，我的一个朋友被要求按ç…
§éžcopyleft的条款发布遵循copyleft条款的程序，他大概这æ 
·å›žå¤ï¼š</p>
 <blockquote><p>
@@ -71,10 +79,14 @@
 <p>
 如果嘲笑者
挖苦自由、讽刺社区&hellip;如果&ldquo;顽固的现实主义者
&rdquo;说利益是唯一的理想&hellip;只需忽略他们，并一如既往地使用copyleft。</p>
 
-<hr />
-<blockquote id="fsfs"><p>本文发表于<a
-href="http://shop.fsf.org/product/free-software-free-society/";><cite>自由软件，自由社会：Richard
-M. Stallman选集</cite></a>一书。</p></blockquote>
+<hr class="thin" />
+<div id="fsfs" role="complementary">
+<p>本文发表于<a
+href="https://shop.fsf.org/product/free-software-free-society/";><cite>自由软件，自由社会：Richard
+M. Stallman选集</cite></a>一书。</p>
+</div>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -84,7 +96,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
@@ -103,12 +115,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
@@ -127,7 +140,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 2003, 2020 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1998, 2021 Free Software Foundation, Inc.</p>
 
 <p>本页面使用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -138,16 +151,17 @@
 
 <!--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>，2017，2020。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017，2020，2021。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2020/10/28 06:59:36 $
+$Date: 2021/07/22 04:01:32 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: using-gfdl.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/using-gfdl.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- using-gfdl.zh-cn.html       21 Apr 2018 10:35:13 -0000      1.4
+++ using-gfdl.zh-cn.html       22 Jul 2021 04:01:32 -0000      1.5
@@ -1,19 +1,27 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/using-gfdl.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>使用GNU FDL - GNU工程 - 自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/using-gfdl.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="reduced-width">
 <h2>使用GNU FDL</h2>
 
-<p><a href="http://www.stallman.org";>Richard Stallman</a> 著</p>
+<address class="byline"><a 
href="https://www.stallman.org/";>理查德·斯托曼</a> 著</address>
 
+<div class="article">
 <p>å¦‚æžœä½ 
知道有人正在撰写自由软件的使用手册，并且计划商业出版，那么ä½
 有机会花小力气为自由软件运动办大事：向那位作者
建议使用<a
-href="/copyleft/fdl.html">GNU自由文档许可证</a>出版该手册。</p>
+href="/licenses/fdl.html">GNU自由文档许可证</a>出版该手册。</p>
 
 <p>ç›´åˆ°æœ€è¿‘ï¼Œå‡ 
乎所有商业书籍的出版都是非自由的。但是随着自由商用软件的增多，现在自由商用文档也开始渐露头角。一些主要的针对<a
 href=
 
"/gnu/linux-and-gnu.html">GNU/Linux系统</a>和自由软件的文档的出版商开始愿意使用GNU
@@ -33,8 +41,11 @@
 <p>当一个商业手册是自由的，并与GNU系统有å…
³ï¼ŒGNUå·¥ç¨‹å°†å‘å…¬ä¼—æŽ¨èå®ƒã€‚å› æ­¤ï¼Œå¦‚æžœä½œè€…
或出版商创建了描述或出售该手册的网页，我们可以在<a
 
href="/doc/other-free-books.html">www.gnu.org/doc/other-free-books.html</a>æ·»åŠ
 一个链接指向该网页，但前提是该网页须符合我们的常规æ 
‡å‡†ï¼ˆä¾‹å¦‚，它不应该链接到å…
¶ä»–非自由软件或文档，也不要令人讨厌地劝说大家购买该手册）。请将该页面的信息发给<a
 href="mailto:webmasters@gnu.org";> &lt;webmasters@gnu.org&gt;</a>。</p>
+</div>
+<hr class="column-limit" />
 
 <p>请同时参看<a 
href="/philosophy/free-doc.html">自由软件和自由文档</a>。</p>
+</div>
 
 <div class="translators-notes">
 
@@ -44,7 +55,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
@@ -63,16 +74,18 @@
 
         &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
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -86,11 +99,11 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999 Richard M. Stallman</p>
+<p>Copyright &copy; 1999, 2021 Richard M. Stallman</p>
 
-<p>本页面使用<a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
-Attribution-NoDerivs 3.0 United States License</a>授权。</p>
+<p>本页面使用 <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a> 授权。</p>
 
 <!--#include virtual="/server/bottom-notes.zh-cn.html" -->
 <div class="translators-credits">
@@ -103,11 +116,12 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/04/21 10:35:13 $
+$Date: 2021/07/22 04:01:32 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/categories.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/categories.zh-cn-en.html 23 Feb 2019 10:31:34 -0000      1.2
+++ po/categories.zh-cn-en.html 22 Jul 2021 04:01:32 -0000      1.3
@@ -1,5 +1,8 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Categories of Free and Nonfree Software
 - GNU Project - Free Software Foundation</title>
 <style type="text/css" media="screen">
@@ -10,7 +13,11 @@
 </style>
 <!--#include virtual="/philosophy/po/categories.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Categories of free and nonfree software</h2>
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Categories of Free and Nonfree Software</h2>
 
 <p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
        Words which You Might Want to Avoid</a>.</p>
@@ -180,7 +187,7 @@
        a <a href="#ProprietarySoftware">proprietary</a> software
        product.</p>
 
-       <p>The <a href="http://www.x.org";>X Window System</a>
+       <p>The <a href="https://www.x.org/wiki/";>X Window System</a>
        illustrates this.  The X Consortium released X11 with
        distribution terms that made it noncopylefted free
        software, and subsequent developers have mostly followed the
@@ -252,8 +259,8 @@
 <h3 id="GNUsoftware">GNU software</h3>
 
        <p><a href="/software/software.html">GNU software</a> is
-       software that is released under the auspices of the <a href=
-       "/gnu/gnu-history.html">GNU Project</a>. If a program is GNU
+       software that is released under the auspices of the <a
+       href="/gnu/gnu-history.html">GNU Project</a>. If a program is GNU
        software, we also say that it is a GNU program or a GNU
        package.  The README or manual of a GNU package should say it
        is one; also, the <a href="/directory">Free Software
@@ -264,9 +271,9 @@
        all GNU software must be <a href="/philosophy/free-sw.html">free
        software</a>.</p>
 
-       <p>Some GNU software was written by <a href=
-       "http://www.fsf.org/about/staff/";>staff</a> of
-       the <a href="http://www.fsf.org/";>Free Software
+       <p>Some GNU software was written by <a
+       href="https://www.fsf.org/about/staff/";>staff</a> of
+       the <a href="https://www.fsf.org/";>Free Software
        Foundation</a>, but most GNU software comes from many
        <a href="/people/people.html">volunteers</a>.  (Some of these
        volunteers are paid by companies or universities, but they are
@@ -402,16 +409,11 @@
        software is possible. You can do this by making an effort not
        to say &ldquo;commercial&rdquo; when you mean
        &ldquo;proprietary.&rdquo;</p>
+</div>
 
-<!-- If needed, change the copyright block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
 </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 <a
@@ -429,16 +431,16 @@
         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 of this article.</p>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 
2015, 2016, 2017, 2018, 2019 Free
+<p>Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 
Free
 Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -449,7 +451,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/02/23 10:31:34 $
+$Date: 2021/07/22 04:01:32 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/categories.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-cn.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/categories.zh-cn.po      22 Jul 2021 03:29:05 -0000      1.15
+++ po/categories.zh-cn.po      22 Jul 2021 04:01:32 -0000      1.16
@@ -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: 2021-07-21 20:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: po/fs-translations.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.zh-cn-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/fs-translations.zh-cn-en.html    6 May 2021 11:30:04 -0000       1.10
+++ po/fs-translations.zh-cn-en.html    22 Jul 2021 04:01:32 -0000      1.11
@@ -1,5 +1,8 @@
 <!--#include virtual="/server/html5-header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Translations of the term &ldquo;free software&rdquo;
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/fs-translations.translist" -->
@@ -11,6 +14,9 @@
 --><!--#endif -->
 </style>
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="reduced-width">
 <h2>Translations of the term &ldquo;free software&rdquo;</h2>
 <div class="thin"></div>
@@ -1066,9 +1072,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1999-2021 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
@@ -1078,7 +1082,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/05/06 11:30:04 $
+$Date: 2021/07/22 04:01:32 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/fs-translations.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.zh-cn.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- po/fs-translations.zh-cn.po 22 Jul 2021 03:28:06 -0000      1.29
+++ po/fs-translations.zh-cn.po 22 Jul 2021 04:01:32 -0000      1.30
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-21 20:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: po/pragmatic.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/pragmatic.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/pragmatic.zh-cn-en.html  28 Oct 2020 06:59:37 -0000      1.2
+++ po/pragmatic.zh-cn-en.html  22 Jul 2021 04:01:32 -0000      1.3
@@ -1,16 +1,22 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Copyleft: Pragmatic Idealism
 - GNU Project - Free Software Foundation</title>
-
 <!--#include virtual="/philosophy/po/pragmatic.translist" -->
 <!--#include virtual="/server/banner.html" -->
-   
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Copyleft: Pragmatic Idealism</h2>
 
-<p>
-by <a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a></p>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
+<div class="article">
 <p>
 Every decision a person makes stems from the person's values and
 goals.  People can have many different goals and values; fame, profit,
@@ -26,7 +32,7 @@
 and thus make our society better.</p>
 <p>
 That's the basic reason why the GNU General Public License is written
-the way it is&mdash;as a <a href="/copyleft"> copyleft</a>.
+the way it is&mdash;as a <a href="/licenses/copyleft.html"> copyleft</a>.
 All code added to a GPL-covered program
 must be free software, even if it is put in a separate file.  I make
 my code available for use in free software, and not for use in
@@ -152,15 +158,19 @@
 &ldquo;hard-nosed realists&rdquo; say that profit is the only
 ideal&hellip;just ignore them, and use copyleft all the same.</p>
 
-<hr />
-<blockquote id="fsfs"><p>This essay is published
-in <a href="http://shop.fsf.org/product/free-software-free-society/";><cite>Free
+<hr class="thin" />
+<div id="fsfs" role="complementary">
+<p>This essay is published in
+<a href="https://shop.fsf.org/product/free-software-free-society/";><cite>Free
 Software, Free Society: The Selected Essays of Richard
-M. Stallman</cite></a>.</p></blockquote>
+M. Stallman</cite></a>.</p>
+</div>
+</div>
+</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
@@ -178,13 +188,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>
 
@@ -205,7 +215,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1998, 2003, 2020 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1998, 2021 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
@@ -215,10 +225,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/10/28 06:59:37 $
+$Date: 2021/07/22 04:01:32 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/pragmatic.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/pragmatic.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/pragmatic.zh-cn.po       22 Jul 2021 03:27:30 -0000      1.8
+++ po/pragmatic.zh-cn.po       22 Jul 2021 04:01:32 -0000      1.9
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-21 18:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Copyleft: Pragmatic Idealism - GNU Project - Free Software Foundation"

Index: po/using-gfdl.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/using-gfdl.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/using-gfdl.zh-cn-en.html 21 Apr 2018 10:35:13 -0000      1.1
+++ po/using-gfdl.zh-cn-en.html 22 Jul 2021 04:01:32 -0000      1.2
@@ -1,18 +1,27 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Using GNU FDL
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/using-gfdl.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Using GNU FDL</h2>
 
-<p>by <a href="http://www.stallman.org";>Richard Stallman</a></p>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
+<div class="article">
 <p>If you know someone who is writing a manual about free software,
 and looking towards commercial publication, you have a chance to help
 the Free Software Movement a great deal with a small amount of work:
 by suggesting the idea of publishing the manual under
-the <a href="/copyleft/fdl.html">GNU Free Documentation
+the <a href="/licenses/fdl.html">GNU Free Documentation
 License</a>.</p>
 
 <p>Until recently, commercial book publication almost always implied a
@@ -57,13 +66,16 @@
 should not be obnoxious about trying to persuade people to buy).
 Please inform <a href="mailto:webmasters@gnu.org";>
 &lt;webmasters@gnu.org&gt;</a> about such pages.</p>
+</div>
+<hr class="column-limit" />
 
 <p>See also <a href="/philosophy/free-doc.html">Free Software and Free
 Manuals</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
@@ -81,19 +93,19 @@
         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>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -108,20 +120,20 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1999 Richard M. Stallman</p>
+<p>Copyright &copy; 1999, 2021 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/04/21 10:35:13 $
+$Date: 2021/07/22 04:01:32 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/using-gfdl.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/using-gfdl.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/using-gfdl.zh-cn.po      22 Jul 2021 03:28:42 -0000      1.5
+++ po/using-gfdl.zh-cn.po      22 Jul 2021 04:01:32 -0000      1.6
@@ -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: 2021-07-21 18:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Using GNU FDL - GNU Project - Free Software Foundation"