www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www licenses/license-list.ja.html licenses/po/l...


From: GNUN
Subject: www licenses/license-list.ja.html licenses/po/l...
Date: Tue, 12 Jul 2016 06:30:50 +0000 (UTC)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/07/12 06:30:49

Modified files:
        licenses       : license-list.ja.html 
        licenses/po    : license-list.ja-en.html license-list.ja.po 
        philosophy     : essays-and-articles.ja.html 
                         fs-translations.ja.html 
        philosophy/po  : essays-and-articles.ja-en.html 
                         essays-and-articles.ja.po 
                         fs-translations.ja-en.html 
                         fs-translations.ja.po 
        proprietary    : malware-microsoft.ja.html 
                         proprietary-insecurity.ja.html 
                         proprietary-interference.ja.html 
                         proprietary-sabotage.ja.html 
                         proprietary.ja.html 
        proprietary/po : malware-microsoft.ja-en.html 
                         malware-microsoft.ja.po 
                         proprietary-insecurity.ja-en.html 
                         proprietary-interference.ja-en.html 
                         proprietary-interference.ja.po 
                         proprietary-sabotage.ja-en.html 
                         proprietary-sabotage.ja.po 
                         proprietary.ja-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ja.html?cvsroot=www&r1=1.81&r2=1.82
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja-en.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.147&r2=1.148
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.ja.html?cvsroot=www&r1=1.66&r2=1.67
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.ja.html?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ja-en.html?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ja.po?cvsroot=www&r1=1.145&r2=1.146
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ja-en.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ja.po?cvsroot=www&r1=1.98&r2=1.99
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/malware-microsoft.ja.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-insecurity.ja.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-interference.ja.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-sabotage.ja.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary.ja.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.ja-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.ja.po?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-insecurity.ja-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-interference.ja-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-interference.ja.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-sabotage.ja-en.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-sabotage.ja.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.ja-en.html?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: licenses/license-list.ja.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ja.html,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- licenses/license-list.ja.html       1 Jul 2016 05:33:11 -0000       1.81
+++ licenses/license-list.ja.html       12 Jul 2016 06:30:48 -0000      1.82
@@ -469,13 +469,15 @@
 <dt><a id="ISC" 
href="http://directory.fsf.org/wiki/License:ISC";>ISCライセンス</a>
 <span class="anchor-reference-id">(<a href="#ISC">#ISC</a>)</span></dt>
 <dd>
-<p>このライセンスは時にOpenBSDライセンスとしても知られています。これはゆるい寛容な自由ソフトウェアライセンスで、GNU
 GPLと両立します。</p>
+<p>これは、ゆるい寛容な自由ソフトウェアライセンスで、GNU
 GPLと両立します。</p> 
 
-<p>このライセンスは、不幸な言葉遣いの選択をしています:
 このライセンスは受け取った人に&quot;Permission to use, copy,
-modify, and/or distribute this software&hellip;&quot;
-(このソフトウェアを使用、コピー、改変、そして/または、é
…
å¸ƒã™ã‚‹è¨±å¯&hellip;)を提供しています。これはPineのライセンスの言い方とã
 
いたい同じものですが、ワシントン大学は、その後、このソフトウェアの改変バージョンのé
…å¸ƒã‚’人々に禁止すると主張しています。</p>
+<p>このライセンスは時にOpenBSDライセンスとしても知られますが、二つのライセンスにはひとつ地位さな差異があります。OpenBSDライセンスは曖昧な用語
+&quot;and/or&quot; 
を除去するように更新されました。ISCライセンスは受け取った人に対して&quot;Permission
 to
+use, copy, modify, and/or distribute this
+software&hellip;&quot;と許可を与えますが、OpenBSDライセンスは受け取った人に対して&quot;Permission
 to
+use, copy, modify, and distribute&hellip;&quot;の許可を与えます。 </p>
 
-<p>ISCは、わたしたちに対して、ワシントン大学の解釈をå…
±æœ‰ã—ていない、と述べました。そして、わたしたちはかれらを信用するすべての理由があります。ですから、このライセンスでリリースされたソフトウェアを避ける理由はなにもありません。しかし、この言い方が将来的になにも問題を引き起こすことができないよう確実にするために、わたしたちは開発è€
…
にかれらの作品とは異なるライセンスを使うことを推奨します。<a
+<p>ISCライセンスがリリースされた時点で、&quot;and/or&quot;の構成は懸念でした。なぜならPineのライセンスで同様な言葉遣いが使われており、ワシントン大学が後に人ã€
…がソフトウェアの改変したバージョンをé…
å¸ƒã™ã‚‹ã“とを禁止すると主張したからです。しかし、ISCは、わたしたちに対して、ワシントン大学の解釈をå
…
±æœ‰ã—ていない、と述べました。そして、わたしたちはかれらを信用するすべての理由があります。ですから、このライセンスでリリースされたソフトウェアを避ける理由はなにもありません。しかし、この言い方が将来的になにも問題を引き起こすことができないよう確実にするために、わたしたちは開発è€
…
にかれらの作品とは異なるライセンスを使うことを推奨します。<a
 href="#Expat">Expatライセンス</a>と<a
 
href="#FreeBSD">FreeBSDライセンス</a>は同様な寛容なライセンスで簡潔です。</p></dd>
 
@@ -1897,7 +1899,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/07/01 05:33:11 $
+$Date: 2016/07/12 06:30:48 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja-en.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- licenses/po/license-list.ja-en.html 1 Jul 2016 05:33:11 -0000       1.34
+++ licenses/po/license-list.ja-en.html 12 Jul 2016 06:30:48 -0000      1.35
@@ -633,23 +633,30 @@
     ISC License</a>
     <span class="anchor-reference-id">(<a href="#ISC">#ISC</a>)</span></dt>
 <dd>
-<p>This license is sometimes also known as the OpenBSD License.  It is a
-lax, permissive free software license, and compatible with the GNU GPL.</p>
+<p>This is a lax, permissive free software license, and compatible
+with the GNU GPL.</p> 
 
-<p>This license does have an unfortunate wording choice: it provides
-recipients with &quot;Permission to use, copy, modify, and/or distribute
-this software&hellip;&quot; This is roughly the same language from the
-license of Pine that the University of Washington later claimed
-prohibited people from distributing modified versions of the
-software.</p>
-
-<p>ISC has told us they do not share the University of Washington's
-interpretation, and we have every reason to believe them.  Thus, there's
-no reason to avoid software released under this license.  However, to
-help make sure this language cannot cause any trouble in the future, we
-encourage developers to choose a different license for their own works.
-The <a href="#Expat">Expat License</a> and <a href="#FreeBSD">FreeBSD
-License</a> are similarly permissive and brief.</p></dd>
+<p>This license is sometimes also known as the OpenBSD License,
+although there is one minor difference between the two licenses. The
+OpenBSD license was updated to remove the ambiguous term:
+&quot;and/or&quot;. The ISC license provides recipients with
+&quot;Permission to use, copy, modify, and/or distribute this
+software&hellip;&quot;, whereas the OpenBSD license provides
+recipients with &quot;Permission to use, copy, modify, and
+distribute&hellip;&quot;. </p>
+
+<p>At the time the ISC license was released, the use of
+&quot;and/or&quot; construct was a concern because it is similar
+language used in the license of Pine that the University of Washington
+later claimed prohibited people from distributing modified versions of
+the software. However, ISC has told us they do not share the
+University of Washington's interpretation, and we have every reason to
+believe them.  Thus, there's no reason to avoid software released
+under this license.  However, to help make sure this language cannot
+cause any trouble in the future, we encourage developers to choose a
+different license for their own works.  The <a href="#Expat">Expat
+License</a> and <a href="#FreeBSD">FreeBSD License</a> are similarly
+permissive and brief.</p></dd>
 
 
 <dt><a id="MPL-2.0"
@@ -2650,7 +2657,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/07/01 05:33:11 $
+$Date: 2016/07/12 06:30:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja.po,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- licenses/po/license-list.ja.po      12 Jul 2016 05:58:18 -0000      1.147
+++ licenses/po/license-list.ja.po      12 Jul 2016 06:30:48 -0000      1.148
@@ -1109,13 +1109,13 @@
 "recipients with &quot;Permission to use, copy, modify, and distribute&hellip;"
 "&quot;."
 msgstr ""
-"このライセンスは時にOpenBSDライセンスとしても知られますが、二つのライセンスには"
-"ひとつ地位さな差異があります。OpenBSDライセンスは曖昧な用語
 &quot;and/or&quot; を"
-"除去するように更新されました。ISCライセンスは受け取った人に対して&quot;Permission
 to use, copy, modify, and/or "
-"distribute this software&hellip;&quot;と許可を与えますが、"
-"OpenBSDライセンスは受け取った人に対して"
-"&quot;Permission to use, copy, modify, and distribute&hellip;"
-"&quot;の許可を与えます。"
+"このライセンスは時にOpenBSDライセンスとしても知られますが、二つのライセンスに"
+"はひとつ地位さな差異があります。OpenBSDライセンスは曖昧な用語
 &quot;and/"
+"or&quot; 
を除去するように更新されました。ISCライセンスは受け取った人に対して"
+"&quot;Permission to use, copy, modify, and/or distribute this "
+"software&hellip;&quot;と許可を与えますが、OpenBSDライセンスは受け取った人に対"
+"して&quot;Permission to use, copy, modify, and 
distribute&hellip;&quot;の許可"
+"を与えます。"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1131,16 +1131,16 @@
 "\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD License</a> are "
 "similarly permissive and brief."
 msgstr ""
-"ISCライセンスがリリースされた時点で、&quot;and/or&quot;の構成は懸念でした。"
-"なぜならPineのライセンスで同様な言葉遣いが使われており、ワシントン大学が後に"
-"人々がソフトウェアの改変したバージョンをé…
å¸ƒã™ã‚‹ã“とを禁止すると主張したからです。"
-"しかし、ISCは、わたしたちに対して、ワシントン大学の解釈をå
…±æœ‰ã—ていない、と述べまし"
-"た。そして、わたしたちはかれらを信用するすべての理由があります。ですから、こ"
-"のライセンスでリリースされたソフトウェアを避ける理由はなにもありません。しか"
-"し、この言い方が将来的になにも問題を引き起こすことができないよう確実にするた"
-"めに、わたしたちは開発者
にかれらの作品とは異なるライセンスを使うことを推奨し"
-"ます。<a href=\"#Expat\">Expatライセンス</a>と<a 
href=\"#FreeBSD\">FreeBSDラ"
-"イセンス</a>は同様な寛容なライセンスで簡潔です。"
+"ISCライセンスがリリースされた時点で、&quot;and/or&quot;の構成は懸念でした。な"
+"ぜならPineのライセンスで同様な言葉遣いが使われており、ワシントン大学が後に"
+"人々がソフトウェアの改変したバージョンをé…
å¸ƒã™ã‚‹ã“とを禁止すると主張したから"
+"です。しかし、ISCは、わたしたちに対して、ワシントン大学の解釈をå
…±æœ‰ã—ていな"
+"い、と述べました。そして、わたしたちはかれらを信用するすべての理由がありま"
+"す。ですから、このライセンスでリリースされたソフトウェアを避ける理由はなにも"
+"ありません。しかし、この言い方が将来的になにも問題を引き起こすことができない"
+"よう確実にするために、わたしたちは開発者
にかれらの作品とは異なるライセンスを"
+"使うことを推奨します。<a 
href=\"#Expat\">Expatライセンス</a>と<a href="
+"\"#FreeBSD\">FreeBSDライセンス</a>は同様な寛容なライセンスで簡潔です。"
 
 #. type: Content of: <dl><dt>
 msgid ""

Index: philosophy/essays-and-articles.ja.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.ja.html,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- philosophy/essays-and-articles.ja.html      29 Jun 2016 05:29:15 -0000      
1.66
+++ philosophy/essays-and-articles.ja.html      12 Jul 2016 06:30:49 -0000      
1.67
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/essays-and-articles.en.html" -->
 
 <!--#include virtual="/server/header.ja.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.79 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
@@ -385,6 +385,8 @@
 
   <li><a
 
href="/philosophy/is-ever-good-use-nonfree-program.html">不自由なプログラãƒ
 
を使うのは、良いことでしょうか?</a>、リチャード・ストールマン著。</li>
+
+ <li><a 
href="/philosophy/contradictory-support.html">矛盾した「サポート」を知ろう</a></li>
 </ul>
 
 
@@ -525,7 +527,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/06/29 05:29:15 $
+$Date: 2016/07/12 06:30:49 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/fs-translations.ja.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.ja.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- philosophy/fs-translations.ja.html  29 Jun 2016 05:29:15 -0000      1.59
+++ philosophy/fs-translations.ja.html  12 Jul 2016 06:30:49 -0000      1.60
@@ -7,419 +7,930 @@
 <title>&ldquo;free software&rdquo;という用語の各言語訳 - 
GNUプロジェクト - 
フリーソフトウェアファウンデーション</title>
 
 <!--#include virtual="/philosophy/po/fs-translations.translist" -->
+<style type="text/css" media="print,screen">
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
+<!--
+#content th { text-align: right; }
+-->
+<!--#else -->
+<!--
+#content th { text-align: left; }
+-->
+<!--#endif -->
+
+</style>
+
 <!--#include virtual="/server/banner.ja.html" -->
 <h2>&ldquo;free software&rdquo;という用語の各言語訳</h2>
 
 <p>以下に、英語の&ldquo;free software&rdquo;という用語(<a
 
href="/philosophy/open-source-misses-the-point.html">&ldquo;free&rdquo;は自由という意味</a>)の各言語に対する推奨される曖昧性のない翻訳の一覧を示します。</p>
 
-<p>わたしたちは「無料ソフトウェア」の翻訳も別のカラム
で、いろいろな言語での対照を示します。</p>
+<p>わたしたちは「無料ソフトウェア」、「プロプライエタリ・ソフトウェア」、「商用ソフトウェア」の翻訳も提供し、いろいろな言語での対ç
…§ã‚’示します。</p>
 
 <p>この一覧に、修正や追加がある場合は、<a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>までお送りくだ
さい。メッセージはUTF-8でお願いします。</p>
 
 
<p>いくつかのエントリの後の括弧書きのローマ字は、音訳です(å¿
…
要に応じて母音が足されています)。これについても、修正、追åŠ
 ãŒã‚れば教えてください。</p>
 
+<!-- The languages are sorted by their name in English.  -->
+<!-- GNUN-SORT-START -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="is">アイスランド語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
 <table border="1">
-<tr><th>言語コード</th><th>言語名</th>
-<th>Free Software</th><th>Gratis Software</th></tr>
-<tr>
-<td>af</td><td>アフリカーンス語</td>
-<td lang="af" xml:lang="af">
-vrye sagteware</td>
-<td lang="af" xml:lang="af">
-gratis sagteware</td>
-</tr>
-<tr>
-<td>ar</td><td>アラビア語</td>
-<td lang="ar" xml:lang="ar">برمجيات حرة (barmajiyat ḥorrah)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>be</td><td>ベラルーシ語</td>
-<td lang="be" xml:lang="be">
-свабоднае праграмнае забесьпячэньне 
(svabodnae pragramnae zabes'pjachen'ne)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>bg</td><td>ブルガリア語</td>
-<td lang="bg" xml:lang="bg">
-свободен софтуер (svoboden softuer)</td>
-<td lang="bg" xml:lang="bg">
-безплатен софтуер (bezplaten softuer)</td>
-</tr>
-<tr>
-<td>bn</td><td>ベンガル語</td>
-<td lang="bn" xml:lang="bn">
-স্বাধীন সফটওয়্যার (swadhin software)
-</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ca</td><td>カタルーニャ語</td>
+<tr><th>言語コード</th>
+<td>is</td></tr>
+<tr><th>Free Software</th>
+<td lang="is" xml:lang="is">
+frjáls hugbúnaður</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ga">アイルランド語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ga</td></tr>
+<tr><th>Free Software</th>
+<td lang="ga" xml:lang="ga">
+Saorbhogearraí</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="ga" xml:lang="ga">
+Bogearraí saora in aisce</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="af">アフリカーンス語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>af</td></tr>
+<tr><th>Free Software</th>
+<td lang="af" xml:lang="af">vrye sagteware</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="af" xml:lang="af">gratis sagteware</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ar">アラビア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ar</td></tr>
+<tr><th>Free Software</th>
+<td lang="ar" xml:lang="ar">برمجيات حرة (barmajiyat 
ḥorrah)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sq">アルバニア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>sq</td></tr>
+<tr><th>Free Software</th>
+<td lang="sq" xml:lang="sq">
+software i lirë</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="sq" xml:lang="sq">
+software falas</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="hy">アルメニア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>hy</td></tr>
+<tr><th>Free Software</th>
+<td lang="hy" xml:lang="hy">
+ազատ ծրագիր/ծրագրեր (azat tsragir/tsragrer)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="it">イタリア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>it</td></tr>
+<tr><th>Free Software</th>
+<td lang="it" xml:lang="it">
+software libero</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="it" xml:lang="it">
+software gratuito</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>Free Software</th>
+<td lang="io" xml:lang="io">
+libera programaro</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ia">インターリングア</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ia</td></tr>
+<tr><th>Free Software</th>
+<td lang="ia" xml:lang="ia">
+libere programmage / libere programmario</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="id">インドネシア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>id</td></tr>
+<tr><th>Free Software</th>
+<td lang="id" xml:lang="id">
+perangkat lunak bebas</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="id" xml:lang="id">
+perangkat lunak gratis</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="cy">ウェールズ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>cy</td></tr>
+<tr><th>Free Software</th>
+<td lang="cy" xml:lang="cy">
+meddalwedd rydd</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="uk">ウクライナ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>uk</td></tr>
+<tr><th>Free Software</th>
+<td lang="uk" xml:lang="uk">
+вільне програмне забезпечення (vil'ne prohramne 
zabezpechennja)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ur">ウルドゥー語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ur</td></tr>
+<tr><th>Free Software</th>
+<td lang="ur" xml:lang="ur">آزاد سافٹ ویئر (azad 
software)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="ur" xml:lang="ur">مفت سافٹ ویئر (muft software)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="eo">エスぺラント語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>eo</td></tr>
+<tr><th>Free Software</th>
+<td lang="eo" xml:lang="eo">
+libera programaro / programo</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="et">エストニア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>et</td></tr>
+<tr><th>Free Software</th>
+<td lang="et" xml:lang="et">
+vaba tarkvara</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="et" xml:lang="et">
+tasuta tarkvara</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="nl">オランダ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>nl</td></tr>
+<tr><th>Free Software</th>
+<td lang="nl" xml:lang="nl">
+vrije software</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="nl" xml:lang="nl">
+gratis software</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ca">カタルーニャ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ca</td></tr>
+<tr><th>Free Software</th>
 <td lang="ca" xml:lang="ca">
-programari lliure</td>
+programari lliure</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ca" xml:lang="ca">
-programari gratuït</td>
-</tr>
-<tr>
-<td>cs</td><td>チェコ語</td>
+programari gratuït</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="el">ギリシャ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>el</td></tr>
+<tr><th>Free Software</th>
+<td lang="el" xml:lang="el">
+ελεύθερο λογισμικό (elefthero logismiko)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="el" xml:lang="el">
+δωρεάν λογισμικό (dorean logismiko)</td></tr>
+</table>
+
+<!-- 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>Free Software</th>
+<td lang="hr" xml:lang="hr">
+slobodan softver</td></tr>
+<tr><th>Gratis Software</th>
+<td>besplatan softver</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ka">グルジア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ka</td></tr>
+<tr><th>Free Software</th>
+<td lang="ka" xml:lang="ka">
+თავისუფალი პროგრამები (tavisupali 
programebi)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="ka" xml:lang="ka">
+უფასო პროგრამები (upaso programebi)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sc">サルデーニャ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>sc</td></tr>
+<tr><th>Free Software</th>
+<td lang="sc" xml:lang="sc">
+software liberu</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="si">シンハラ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>si</td></tr>
+<tr><th>Free Software</th>
+<td lang="si" xml:lang="si">
+නිදහස් මෘදුකාංග (nidahas mṛdukāṅga)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sv">スウェーデン語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>sv</td></tr>
+<tr><th>Free Software</th>
+<td lang="sv" xml:lang="sv">
+fri programvara / fri mjukvara</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="sv" xml:lang="sv">
+gratis programvara / gratis mjukvara</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="es">スペイン語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>es</td></tr>
+<tr><th>Free Software</th>
+<td lang="es" xml:lang="es">
+software libre</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="es" xml:lang="es">
+software gratuito</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sk">スロバキア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>sk</td></tr>
+<tr><th>Free Software</th>
+<td lang="sk" xml:lang="sk">
+slobodný softvér</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sl">スロベニア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>sl</td></tr>
+<tr><th>Free Software</th>
+<td lang="sl" xml:lang="sl">
+prosto programje</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sw">スワヒリ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>sw</td></tr>
+<tr><th>Free Software</th>
+<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="zu">ズールー語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>zu</td></tr>
+<tr><th>Free Software</th>
+<td lang="zu" xml:lang="zu">
+Isoftware Ekhululekile</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sr">セルビア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>sr</td></tr>
+<tr><th>Free Software</th>
+<td lang="sr" xml:lang="sr">
+слободни софтвер / slobodni softver</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="sr" xml:lang="sr">
+бесплатни софтвер / besplatni softver</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="th">タイ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>th</td></tr>
+<tr><th>Free Software</th>
+<td lang="th" xml:lang="th">
+ซอฟต์แวร์เสรี (sofotwerseri)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="tl">タガログ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>tl</td></tr>
+<tr><th>Free Software</th>
+<td lang="tl" xml:lang="tl">
+malayang software</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ta">タミル語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ta</td></tr>
+<tr><th>Free Software</th>
+<td lang="ta" xml:lang="ta">
+கட்டற்ற மென்பொருள் (kaṭṭaṟṟa 
meṉpoñaḷ)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="ta" xml:lang="ta">
+இலவச மென்பொருள் (illavasa menporul) </td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="cs">チェコ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>cs</td></tr>
+<tr><th>Free Software</th>
 <td lang="cs" xml:lang="cs">
-svobodný software</td>
+svobodný software</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="cs" xml:lang="cs">
-bezplatný software</td>
-</tr>
-<tr>
-<td>cy</td><td>ウェールズ語</td>
-<td lang="cy" xml:lang="cy">
-meddalwedd rydd</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>da</td><td>デンマーク語</td>
+bezplatný software</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="da">デンマーク語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>da</td></tr>
+<tr><th>Free Software</th>
 <td lang="da" xml:lang="da">
-fri software / frit programmel</td>
+fri software / frit programmel</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="da" xml:lang="da">
-gratis software</td>
-</tr>
-<tr>
-<td>de</td><td>ドイツ語</td>
+gratis software</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="tr">トルコ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>tr</td></tr>
+<tr><th>Free Software</th>
+<td lang="tr" xml:lang="tr">
+özgür yazılım</td></tr>
+<tr><th>Gratis Software</th>
+<td>bedava yazılım</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="de">ドイツ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>de</td></tr>
+<tr><th>Free Software</th>
 <td lang="de" xml:lang="de">
-Freie Software</td>
+Freie Software</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="de" xml:lang="de">
-Gratis-Software / Kostenlose Software</td>
-</tr>
-<tr>
-<td>el</td><td>ギリシャ語</td>
-<td lang="el" xml:lang="el">
-ελεύθερο λογισμικό (elefthero logismiko)</td>
-<td lang="el" xml:lang="el">
-δωρεάν λογισμικό (dorean logismiko)</td>
-</tr>
-<tr>
-<td>eo</td><td>エスぺラント語</td>
-<td lang="eo" xml:lang="eo">
-libera programaro / programo</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>eu</td><td>バスク語</td>
+Gratis-Software / Kostenlose Software</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="no">ノルウェー語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>no</td></tr>
+<tr><th>Free Software</th>
+<td lang="no" xml:lang="no">
+fri programvare</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="hu">ハンガリー語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>hu</td></tr>
+<tr><th>Free Software</th>
+<td lang="hu" xml:lang="hu">
+szabad szoftver</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="hu" xml:lang="hu">
+ingyenes szoftver / ingyen szoftver</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="eu">バスク語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>eu</td></tr>
+<tr><th>Free Software</th>
 <td lang="eu" xml:lang="eu">
-software librea</td>
+software librea</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="eu" xml:lang="eu">
-doako softwarea</td>
-</tr>
-<tr>
-<td>es</td><td>スペイン語</td>
-<td lang="es" xml:lang="es">
-software libre</td>
-<td lang="es" xml:lang="es">
-software gratuito</td>
-</tr>
-<tr>
-<td>et</td><td>エストニア語</td>
-<td lang="et" xml:lang="et">
-vaba tarkvara</td>
-<td lang="et" xml:lang="et">
-tasuta tarkvara</td>
-</tr>
-<tr>
-<td>fa</td><td>ペルシャ語</td>
-<td lang="fa" xml:lang="fa">نرم‌افزار آزاد (narmafzar azad)</td>
-<td lang="fa" xml:lang="fa">نرم‌افزار رایگان (narmafzar 
raygan)</td>
-</tr>
-<tr>
-<td>fi</td><td>フィンランド語</td>
+doako softwarea</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="hi">ヒンディ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>hi</td></tr>
+<tr><th>Free Software</th>
+<td lang="hi" xml:lang="hi">
+मुक्त सॉफ्टवेयर (mukt software)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="hi" xml:lang="hi">
+मुफ़्त सॉफ्टवेयर (muft software)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="fi">フィンランド語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>fi</td></tr>
+<tr><th>Free Software</th>
 <td lang="fi" xml:lang="fi">
-vapaa ohjelmisto</td>
-<td lang="fi" xml:lang="fi">ilmainen ohjelmisto</td>
-</tr>
-<tr>
-<td>fr</td><td>フランス語</td>
+vapaa ohjelmisto</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="fi" xml:lang="fi">ilmainen ohjelmisto</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="fr">フランス語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>fr</td></tr>
+<tr><th>Free Software</th>
 <td lang="fr" xml:lang="fr">
-logiciel libre</td>
+logiciel libre</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="fr" xml:lang="fr">
-logiciel gratuit</td>
-</tr>
-<tr>
-<td>ga</td><td>アイルランド語</td>
-<td lang="ga" xml:lang="ga">
-Saorbhogearraí</td>
-<td lang="ga" xml:lang="ga">
-Bogearraí saora in aisce</td>
-</tr>
-<tr>
-<td>he</td><td>ヘブライ語</td>
-<td lang="he" xml:lang="he">תוכנה חופשית (tochna chofshit)</td>
-<td lang="he" xml:lang="he">תוכנה חינמית (tochna chinamit)</td>
-</tr>
-<tr>
-<td>hi</td><td>ヒンディ語</td>
-<td lang="hi" xml:lang="hi">
-मुक्त सॉफ्टवेयर (mukt software)</td>
-<td lang="hi" xml:lang="hi">
-मुफ़्त सॉफ्टवेयर (muft software)</td>
-</tr>
-<tr>
-<td>hr</td><td>クロアチア語</td>
-<td lang="hr" xml:lang="hr">
-slobodan softver</td>
-<td>besplatan softver</td>
-</tr>
-<tr>
-<td>hu</td><td>ハンガリー語</td>
-<td lang="hu" xml:lang="hu">
-szabad szoftver</td>
-<td lang="hu" xml:lang="hu">
-ingyenes szoftver / ingyen szoftver</td>
-</tr>
-<tr>
-<td>hy</td><td>アルメニア語</td>
-<td lang="hy" xml:lang="hy">
-ազատ ծրագիր/ծրագրեր (azat tsragir/tsragrer)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ia</td><td>インターリングア</td>
-<td lang="ia" xml:lang="ia">
-libere programmage / libere programmario</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>id</td><td>インドネシア語</td>
-<td lang="id" xml:lang="id">
-perangkat lunak bebas</td>
-<td lang="id" xml:lang="id">
-perangkat lunak gratis</td>
-</tr>
-<tr>
-<td>io</td><td>イド語</td>
-<td lang="io" xml:lang="io">
-libera programaro</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>is</td><td>アイスランド語</td>
-<td lang="is" xml:lang="is">
-frjáls hugbúnaður</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>it</td><td>イタリア語</td>
-<td lang="it" xml:lang="it">
-software libero</td>
-<td lang="it" xml:lang="it">
-software gratuito</td>
-</tr>
-<tr>
-<td>ja</td><td>日本語</td>
-<td lang="ja" xml:lang="ja">
-自由ソフトウェア (jiyū sofutouea)</td>
-<td lang="ja" xml:lang="ja">
-無料ソフトウェア (muryō sofutouea)</td>
-</tr>
-<tr>
-<td>ka</td><td>グルジア語</td>
-<td lang="ka" xml:lang="ka">
-თავისუფალი პროგრამები (tavisupali 
programebi)</td>
-<td lang="ka" xml:lang="ka">
-უფასო პროგრამები (upaso programebi)</td>
-</tr>
-<tr>
-<td>ko</td><td>韓国語</td>
-<td lang="ko" xml:lang="ko">
-자유 소프트웨어 (ja-yu software)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>lt</td><td>リトアニア語</td>
-<td lang="lt" xml:lang="lt">
-laisva programinė įranga</td>
-<td lang="lt" xml:lang="lt">
-nemokama programinė įranga</td>
-</tr>
-<tr>
-<td>lv</td><td>ラトビア語</td>
-<td lang="lv" xml:lang="lv">
-brīva programmatūra</td>
-<td lang="lv" xml:lang="lv">
-bezmaksas programmatūra</td>
-</tr>
-<tr>
-<td>mk</td><td>マケドニア語</td>
+logiciel gratuit</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="bg">ブルガリア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>bg</td></tr>
+<tr><th>Free Software</th>
+<td lang="bg" xml:lang="bg">
+свободен софтуер (svoboden softuer)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="bg" xml:lang="bg">
+безплатен софтуер (bezplaten softuer)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="he">ヘブライ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>he</td></tr>
+<tr><th>Free Software</th>
+<td lang="he" xml:lang="he">תוכנה חופשית (tochna chofshit)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="he" xml:lang="he">תוכנה חינמית (tochna chinamit)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="vi">ベトナム語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>vi</td></tr>
+<tr><th>Free Software</th>
+<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="be">ベラルーシ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>be</td></tr>
+<tr><th>Free Software</th>
+<td lang="be" xml:lang="be">
+свабоднае праграмнае забесьпячэньне 
(svabodnae pragramnae zabes'pjachen'ne)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="bn">ベンガル語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>bn</td></tr>
+<tr><th>Free Software</th>
+<td lang="bn" xml:lang="bn">
+স্বাধীন সফটওয়্যার (swadhin software)
+</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="fa">ペルシャ語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>fa</td></tr>
+<tr><th>Free Software</th>
+<td lang="fa" xml:lang="fa">نرم‌افزار آزاد (narmafzar 
azad)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="fa" xml:lang="fa">نرم‌افزار رایگان (narmafzar 
raygan)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="pl">ポーランド語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>pl</td></tr>
+<tr><th>Free Software</th>
+<td lang="pl" xml:lang="pl">
+wolne oprogramowanie</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="pl" xml:lang="pl">
+darmowe oprogramowanie</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="pt">ポルトガル語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>pt</td></tr>
+<tr><th>Free Software</th>
+<td lang="pt" xml:lang="pt">
+software livre</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="mk">マケドニア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>mk</td></tr>
+<tr><th>Free Software</th>
 <td lang="mk" xml:lang="mk">
-слободен софтвер (sloboden softver)</td>
+слободен софтвер (sloboden softver)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="mk" xml:lang="mk">
-бесплатен софтвер (besplaten softver)</td>
-</tr>
-<tr>
-<td>ml</td><td>マラヤーラム語</td>
+бесплатен софтвер (besplaten softver)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ml">マラヤーラム語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ml</td></tr>
+<tr><th>Free Software</th>
 <td lang="ml" xml:lang="ml">
-സ്വതന്ത്രസോഫ്റ്റ്‌വെയര്‍ 
(svatantrasophṯṯveyar)</td>
+സ്വതന്ത്രസോഫ്റ്റ്‌വെയര്‍ 
(svatantrasophṯṯveyar)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ml" xml:lang="ml">
-സൗജന്യസോഫ്റ്റ്‌വെയര്‍ 
(soujanyasophṯṯveyar)</td>
-</tr>
-<tr>
-<td>ms</td><td>マレー語</td>
+സൗജന്യസോഫ്റ്റ്‌വെയര്‍ 
(soujanyasophṯṯveyar)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ms">マレー語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ms</td></tr>
+<tr><th>Free Software</th>
 <td lang="ms" xml:lang="ms">
-perisian bebas</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>nl</td><td>オランダ語</td>
-<td lang="nl" xml:lang="nl">
-vrije software</td>
-<td lang="nl" xml:lang="nl">
-gratis software</td>
-</tr>
-<tr>
-<td>no</td><td>ノルウェー語</td>
-<td lang="no" xml:lang="no">
-fri programvare</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>pl</td><td>ポーランド語</td>
-<td lang="pl" xml:lang="pl">
-wolne oprogramowanie</td>
-<td lang="pl" xml:lang="pl">
-darmowe oprogramowanie</td>
-</tr>
-<tr>
-<td>pt</td><td>ポルトガル語</td>
-<td lang="pt" xml:lang="pt">
-software livre</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ro</td><td>ルーマニア語</td>
+perisian bebas</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="lv">ラトビア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>lv</td></tr>
+<tr><th>Free Software</th>
+<td lang="lv" xml:lang="lv">
+brīva programmatūra</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="lv" xml:lang="lv">
+bezmaksas programmatūra</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="lt">リトアニア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>lt</td></tr>
+<tr><th>Free Software</th>
+<td lang="lt" xml:lang="lt">
+laisva programinė įranga</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="lt" xml:lang="lt">
+nemokama programinė įranga</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ro">ルーマニア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ro</td></tr>
+<tr><th>Free Software</th>
 <td lang="ro" xml:lang="ro">
-programe libere</td>
+programe libere</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ro" xml:lang="ro">
-programe gratuite</td>
-</tr>
-<tr>
-<td>ru</td><td>ロシア語</td>
+programe gratuite</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ru">ロシア語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ru</td></tr>
+<tr><th>Free Software</th>
 <td lang="ru" xml:lang="ru">
-свободные программы (svobodnie programmi)</td>
+свободные программы (svobodnie programmi)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ru" xml:lang="ru">
-бесплатные программы (besplatnie programmi)</td>
-</tr>
-<tr>
-<td>sc</td><td>サルデーニャ語</td>
-<td lang="sc" xml:lang="sc">
-software liberu</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>si</td><td>シンハラ語</td>
-<td lang="si" xml:lang="si">
-නිදහස් මෘදුකාංග (nidahas mṛdukāṅga)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>sk</td><td>スロバキア語</td>
-<td lang="sk" xml:lang="sk">
-slobodný softvér</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>sl</td><td>スロベニア語</td>
-<td lang="sl" xml:lang="sl">
-prosto programje</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>sq</td><td>アルバニア語</td>
-<td lang="sq" xml:lang="sq">
-software i lirë</td>
-<td lang="sq" xml:lang="sq">
-software falas</td>
-</tr>
-<tr>
-<td>sr</td><td>セルビア語</td>
-<td lang="sr" xml:lang="sr">
-слободни софтвер / slobodni softver</td>
-<td lang="sr" xml:lang="sr">
-бесплатни софтвер / besplatni softver</td>
-</tr>
-<tr>
-<td>sv</td><td>スウェーデン語</td>
-<td lang="sv" xml:lang="sv">
-fri programvara / fri mjukvara</td>
-<td lang="sv" xml:lang="sv">
-gratis programvara / gratis mjukvara</td>
-</tr>
-<tr>
-<td>sw</td><td>スワヒリ語</td>
-<td lang="sw" xml:lang="sw">
-Software huru / Programu huru za Kompyuta</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ta</td><td>タミル語</td>
-<td lang="ta" xml:lang="ta">
-கட்டற்ற மென்பொருள் (kaṭṭaṟṟa 
meṉpoñaḷ)</td>
-<td lang="ta" xml:lang="ta">
-இலவச மென்பொருள் (illavasa menporul) </td>
-</tr>
-<tr>
-<td>th</td><td>タイ語</td>
-<td lang="th" xml:lang="th">
-ซอฟต์แวร์เสรี (sofotwerseri)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>tl</td><td>タガログ語</td>
-<td lang="tl" xml:lang="tl">
-malayang software</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>tr</td><td>トルコ語</td>
-<td lang="tr" xml:lang="tr">
-özgür yazılım</td>
-<td>bedava yazılım</td>
-</tr>
-<tr>
-<td>uk</td><td>ウクライナ語</td>
-<td lang="uk" xml:lang="uk">
-вільне програмне забезпечення (vil'ne prohramne 
zabezpechennja)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ur</td><td>ウルドゥー語</td>
-<td lang="ur" xml:lang="ur">آزاد سافٹ ویئر (azad software)</td>
-<td lang="ur" xml:lang="ur">مفت سافٹ ویئر (muft software)</td>
-</tr>
-<tr>
-<td>vi</td><td>ベトナム語</td>
-<td lang="vi" xml:lang="vi">
-phần mềm tự do</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>zh-cn</td><td>中国語(簡体字)</td>
+бесплатные программы (besplatnie programmi)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ko">韓国語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ko</td></tr>
+<tr><th>Free Software</th>
+<td lang="ko" xml:lang="ko">
+자유 소프트웨어 (ja-yu software)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="zh-cn">中国語(簡体字)</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>zh-cn</td></tr>
+<tr><th>Free Software</th>
 <td lang="zh-cn" xml:lang="zh-cn">
-自由软件 (zi-you ruan-jian)</td>
+自由软件 (zi-you ruan-jian)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="zh-cn" xml:lang="zh-cn">
-免费软件 (mian-fei ruan-jian)</td>
-</tr>
-<tr>
-<td>zh-tw</td><td>中国語(繁体字)</td>
+免费软件 (mian-fei ruan-jian)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="zh-tw">中国語(繁体字)</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>zh-tw</td></tr>
+<tr><th>Free Software</th>
 <td lang="zh-tw" xml:lang="zh-tw">
-自由軟體 (zih-yo ruan-ti)</td>
+自由軟體 (zih-yo ruan-ti)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="zh-tw" xml:lang="zh-tw">
-免費軟體 (mien-fei ruan-ti)</td>
-</tr>
-<tr>
-<td>zu</td><td>ズールー語</td>
-<td lang="zu" xml:lang="zu">
-Isoftware Ekhululekile</td>
-<td>&nbsp;</td>
-</tr>
+免費軟體 (mien-fei ruan-ti)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ja">日本語</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>言語コード</th>
+<td>ja</td></tr>
+<tr><th>Free Software</th>
+<td lang="ja" xml:lang="ja">
+自由ソフトウェア (jiyū sofutouea)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="ja" xml:lang="ja">
+無料ソフトウェア (muryō sofutouea)</td></tr>
 </table>
 
+<!-- GNUN-SORT-STOP -->
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -488,7 +999,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/06/29 05:29:15 $
+$Date: 2016/07/12 06:30:49 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/essays-and-articles.ja-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ja-en.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- philosophy/po/essays-and-articles.ja-en.html        29 Jun 2016 05:29:15 
-0000      1.56
+++ philosophy/po/essays-and-articles.ja-en.html        12 Jul 2016 06:30:49 
-0000      1.57
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.79 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <title>Essays and Articles
@@ -480,6 +480,9 @@
   <li><a href="/philosophy/is-ever-good-use-nonfree-program.html">
   Is It Ever a Good Thing to Use a Nonfree Program?</a> By
   Richard Stallman.</li>
+
+ <li><a href="/philosophy/contradictory-support.html">
+  Beware of Contradictory &ldquo;Support&rdquo;</a></li>
 </ul>
 
 
@@ -630,7 +633,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/06/29 05:29:15 $
+$Date: 2016/07/12 06:30:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/essays-and-articles.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ja.po,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- philosophy/po/essays-and-articles.ja.po     12 Jul 2016 05:58:18 -0000      
1.145
+++ philosophy/po/essays-and-articles.ja.po     12 Jul 2016 06:30:49 -0000      
1.146
@@ -1216,8 +1216,8 @@
 "<a href=\"/philosophy/contradictory-support.html\"> Beware of Contradictory "
 "&ldquo;Support&rdquo;</a>"
 msgstr ""
-"<a href=\"/philosophy/contradictory-support.html\">矛盾した"
-"「サポート」を知ろう</a>"
+"<a 
href=\"/philosophy/contradictory-support.html\">矛盾した「サポート」を知ろ"
+"う</a>"
 
 #. type: Content of: <h4>
 msgid "Misc"

Index: philosophy/po/fs-translations.ja-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ja-en.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- philosophy/po/fs-translations.ja-en.html    29 Jun 2016 05:29:15 -0000      
1.49
+++ philosophy/po/fs-translations.ja-en.html    12 Jul 2016 06:30:49 -0000      
1.50
@@ -3,6 +3,14 @@
 <title>Translations of the term &ldquo;free software&rdquo;
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/fs-translations.translist" -->
+
+<style type="text/css" media="print,screen">
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" --><!--
+#content th { text-align: right; }
+--><!--#else --><!--
+#content th { text-align: left; }
+--><!--#endif -->
+</style>
 <!--#include virtual="/server/banner.html" -->
 <h2>Translations of the term &ldquo;free software&rdquo;</h2>
 
@@ -11,9 +19,9 @@
 href="/philosophy/open-source-misses-the-point.html">free as in
 freedom</a>) into various languages.</p>
 
-<p>We also provide translations of &ldquo;gratis software&rdquo; in
-a separate column to show how to make the contrast in various
-languages.</p>
+<p>We also provide translations of &ldquo;gratis software&rdquo;,
+&ldquo;proprietary software&rdquo;, and &ldquo;commercial software&rdquo;
+to show how to make the contrast in various languages.</p>
 
 <p>If you know a correction or addition to the list, please email it to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
@@ -23,413 +31,790 @@
 are transliterations (with vowels added where relevant).  Please send
 any corrections or additions to those, too.</p>
 
+<!-- The languages are sorted by their name in English.  -->
+<!-- GNUN-SORT-START -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="af">Afrikaans</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>af</td></tr>
+<tr><th>Free Software</th>
+<td lang="af" xml:lang="af">vrye sagteware</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="af" xml:lang="af">gratis sagteware</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sq">Albanian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>sq</td></tr>
+<tr><th>Free Software</th>
+<td lang="sq" xml:lang="sq">
+software i lirë</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="sq" xml:lang="sq">
+software falas</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ar">Arabic</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ar</td></tr>
+<tr><th>Free Software</th>
+<td lang="ar" xml:lang="ar">برمجيات حرة (barmajiyat 
ḥorrah)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="hy">Armenian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>hy</td></tr>
+<tr><th>Free Software</th>
+<td lang="hy" xml:lang="hy">
+ազատ ծրագիր/ծրագրեր (azat tsragir/tsragrer)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="eu">Basque</h3>
+<!-- GNUN-SORT-END-KEY -->
 <table border="1">
-<tr><th>Language Code</th><th>Language Name</th>
-<th>Free Software</th><th>Gratis Software</th></tr>
-<tr>
-<td>af</td><td>Afrikaans</td>
-<td lang="af" xml:lang="af">
-vrye sagteware</td>
-<td lang="af" xml:lang="af">
-gratis sagteware</td>
-</tr>
-<tr>
-<td>ar</td><td>Arabic</td>
-<td lang="ar" xml:lang="ar">برمجيات حرة (barmajiyat ḥorrah)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>be</td><td>Belarusian</td>
+<tr><th>Language Code</th>
+<td>eu</td></tr>
+<tr><th>Free Software</th>
+<td lang="eu" xml:lang="eu">
+software librea</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="eu" xml:lang="eu">
+doako softwarea</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="be">Belarusian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>be</td></tr>
+<tr><th>Free Software</th>
 <td lang="be" xml:lang="be">
 свабоднае праграмнае забесьпячэньне
-(svabodnae pragramnae zabes'pjachen'ne)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>bg</td><td>Bulgarian</td>
-<td lang="bg" xml:lang="bg">
-свободен софтуер (svoboden softuer)</td>
-<td lang="bg" xml:lang="bg">
-безплатен софтуер (bezplaten softuer)</td>
-</tr>
-<tr>
-<td>bn</td><td>Bengali</td>
+(svabodnae pragramnae zabes'pjachen'ne)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="bn">Bengali</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>bn</td></tr>
+<tr><th>Free Software</th>
 <td lang="bn" xml:lang="bn">
 স্বাধীন সফটওয়্যার
 (swadhin software)
-</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ca</td><td>Catalan</td>
+</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="bg">Bulgarian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>bg</td></tr>
+<tr><th>Free Software</th>
+<td lang="bg" xml:lang="bg">
+свободен софтуер (svoboden softuer)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="bg" xml:lang="bg">
+безплатен софтуер (bezplaten softuer)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ca">Catalan</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ca</td></tr>
+<tr><th>Free Software</th>
 <td lang="ca" xml:lang="ca">
-programari lliure</td>
+programari lliure</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ca" xml:lang="ca">
-programari gratuït</td>
-</tr>
-<tr>
-<td>cs</td><td>Czech</td>
+programari gratuït</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="zh-cn">Chinese (Simplified)</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>zh-cn</td></tr>
+<tr><th>Free Software</th>
+<td lang="zh-cn" xml:lang="zh-cn">
+自由软件 (zi-you ruan-jian)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="zh-cn" xml:lang="zh-cn">
+免费软件 (mian-fei ruan-jian)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="zh-tw">Chinese (Traditional)</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>zh-tw</td></tr>
+<tr><th>Free Software</th>
+<td lang="zh-tw" xml:lang="zh-tw">
+自由軟體 (zih-yo ruan-ti)</td></tr>
+<tr><th>Gratis Software</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="hr">Croatian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>hr</td></tr>
+<tr><th>Free Software</th>
+<td lang="hr" xml:lang="hr">
+slobodan softver</td></tr>
+<tr><th>Gratis Software</th>
+<td>besplatan softver</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="cs">Czech</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>cs</td></tr>
+<tr><th>Free Software</th>
 <td lang="cs" xml:lang="cs">
-svobodný software</td>
+svobodný software</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="cs" xml:lang="cs">
-bezplatný software</td>
-</tr>
-<tr>
-<td>cy</td><td>Welsh</td>
-<td lang="cy" xml:lang="cy">
-meddalwedd rydd</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>da</td><td>Danish</td>
+bezplatný software</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="da">Danish</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>da</td></tr>
+<tr><th>Free Software</th>
 <td lang="da" xml:lang="da">
-fri software / frit programmel</td>
+fri software / frit programmel</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="da" xml:lang="da">
-gratis software</td>
-</tr>
-<tr>
-<td>de</td><td>German</td>
-<td lang="de" xml:lang="de">
-Freie Software</td>
-<td lang="de" xml:lang="de">
-Gratis-Software / Kostenlose Software</td>
-</tr>
-<tr>
-<td>el</td><td>Greek</td>
-<td lang="el" xml:lang="el">
-ελεύθερο λογισμικό (elefthero logismiko)</td>
-<td lang="el" xml:lang="el">
-δωρεάν λογισμικό (dorean logismiko)</td>
-</tr>
-<tr>
-<td>eo</td><td>Esperanto</td>
+gratis software</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="nl">Dutch</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>nl</td></tr>
+<tr><th>Free Software</th>
+<td lang="nl" xml:lang="nl">
+vrije software</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="nl" xml:lang="nl">
+gratis software</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="eo">Esperanto</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>eo</td></tr>
+<tr><th>Free Software</th>
 <td lang="eo" xml:lang="eo">
-libera programaro / programo</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>eu</td><td>Basque</td>
-<td lang="eu" xml:lang="eu">
-software librea</td>
-<td lang="eu" xml:lang="eu">
-doako softwarea</td>
-</tr>
-<tr>
-<td>es</td><td>Spanish</td>
-<td lang="es" xml:lang="es">
-software libre</td>
-<td lang="es" xml:lang="es">
-software gratuito</td>
-</tr>
-<tr>
-<td>et</td><td>Estonian</td>
+libera programaro / programo</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="et">Estonian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>et</td></tr>
+<tr><th>Free Software</th>
 <td lang="et" xml:lang="et">
-vaba tarkvara</td>
+vaba tarkvara</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="et" xml:lang="et">
-tasuta tarkvara</td>
-</tr>
-<tr>
-<td>fa</td><td>Persian (Farsi)</td>
-<td lang="fa" xml:lang="fa">نرم‌افزار آزاد (narmafzar azad)</td>
-<td lang="fa" xml:lang="fa">نرم‌افزار رایگان (narmafzar 
raygan)</td>
-</tr>
-<tr>
-<td>fi</td><td>Finnish</td>
+tasuta tarkvara</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="fi">Finnish</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>fi</td></tr>
+<tr><th>Free Software</th>
 <td lang="fi" xml:lang="fi">
-vapaa ohjelmisto</td>
-<td lang="fi" xml:lang="fi">ilmainen ohjelmisto</td>
-</tr>
-<tr>
-<td>fr</td><td>French</td>
+vapaa ohjelmisto</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="fi" xml:lang="fi">ilmainen ohjelmisto</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="fr">French</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>fr</td></tr>
+<tr><th>Free Software</th>
 <td lang="fr" xml:lang="fr">
-logiciel libre</td>
+logiciel libre</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="fr" xml:lang="fr">
-logiciel gratuit</td>
-</tr>
-<tr>
-<td>ga</td><td>Irish</td>
-<td lang="ga" xml:lang="ga">
-Saorbhogearraí</td>
-<td lang="ga" xml:lang="ga">
-Bogearraí saora in aisce</td>
-</tr>
-<tr>
-<td>he</td><td>Hebrew</td>
-<td lang="he" xml:lang="he">תוכנה חופשית (tochna chofshit)</td>
-<td lang="he" xml:lang="he">תוכנה חינמית (tochna chinamit)</td>
-</tr>
-<tr>
-<td>hi</td><td>Hindi</td>
+logiciel gratuit</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ka">Georgian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ka</td></tr>
+<tr><th>Free Software</th>
+<td lang="ka" xml:lang="ka">
+თავისუფალი პროგრამები (tavisupali 
programebi)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="ka" xml:lang="ka">
+უფასო პროგრამები (upaso programebi)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="de">German</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>de</td></tr>
+<tr><th>Free Software</th>
+<td lang="de" xml:lang="de">
+Freie Software</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="de" xml:lang="de">
+Gratis-Software / Kostenlose Software</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="el">Greek</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>el</td></tr>
+<tr><th>Free Software</th>
+<td lang="el" xml:lang="el">
+ελεύθερο λογισμικό (elefthero logismiko)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="el" xml:lang="el">
+δωρεάν λογισμικό (dorean logismiko)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="he">Hebrew</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>he</td></tr>
+<tr><th>Free Software</th>
+<td lang="he" xml:lang="he">תוכנה חופשית (tochna chofshit)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="he" xml:lang="he">תוכנה חינמית (tochna chinamit)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="hi">Hindi</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>hi</td></tr>
+<tr><th>Free Software</th>
 <td lang="hi" xml:lang="hi">
-मुक्त सॉफ्टवेयर (mukt software)</td>
+मुक्त सॉफ्टवेयर (mukt software)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="hi" xml:lang="hi">
-मुफ़्त सॉफ्टवेयर (muft software)</td>
-</tr>
-<tr>
-<td>hr</td><td>Croatian</td>
-<td lang="hr" xml:lang="hr">
-slobodan softver</td>
-<td>besplatan softver</td>
-</tr>
-<tr>
-<td>hu</td><td>Hungarian</td>
+मुफ़्त सॉफ्टवेयर (muft software)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="hu">Hungarian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>hu</td></tr>
+<tr><th>Free Software</th>
 <td lang="hu" xml:lang="hu">
-szabad szoftver</td>
+szabad szoftver</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="hu" xml:lang="hu">
-ingyenes szoftver / ingyen szoftver</td>
-</tr>
-<tr>
-<td>hy</td><td>Armenian</td>
-<td lang="hy" xml:lang="hy">
-ազատ ծրագիր/ծրագրեր (azat tsragir/tsragrer)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ia</td><td>Interlingua</td>
-<td lang="ia" xml:lang="ia">
-libere programmage / libere programmario</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>id</td><td>Indonesian</td>
+ingyenes szoftver / ingyen szoftver</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="is">Icelandic</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>is</td></tr>
+<tr><th>Free Software</th>
+<td lang="is" xml:lang="is">
+frjáls hugbúnaður</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="io">Ido</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>io</td></tr>
+<tr><th>Free Software</th>
+<td lang="io" xml:lang="io">
+libera programaro</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="id">Indonesian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>id</td></tr>
+<tr><th>Free Software</th>
 <td lang="id" xml:lang="id">
-perangkat lunak bebas</td>
+perangkat lunak bebas</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="id" xml:lang="id">
-perangkat lunak gratis</td>
-</tr>
-<tr>
-<td>io</td><td>Ido</td>
-<td lang="io" xml:lang="io">
-libera programaro</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>is</td><td>Icelandic</td>
-<td lang="is" xml:lang="is">
-frjáls hugbúnaður</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>it</td><td>Italian</td>
+perangkat lunak gratis</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ia">Interlingua</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ia</td></tr>
+<tr><th>Free Software</th>
+<td lang="ia" xml:lang="ia">
+libere programmage / libere programmario</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ga">Irish</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ga</td></tr>
+<tr><th>Free Software</th>
+<td lang="ga" xml:lang="ga">
+Saorbhogearraí</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="ga" xml:lang="ga">
+Bogearraí saora in aisce</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="it">Italian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>it</td></tr>
+<tr><th>Free Software</th>
 <td lang="it" xml:lang="it">
-software libero</td>
+software libero</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="it" xml:lang="it">
-software gratuito</td>
-</tr>
-<tr>
-<td>ja</td><td>Japanese</td>
+software gratuito</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ja">Japanese</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ja</td></tr>
+<tr><th>Free Software</th>
 <td lang="ja" xml:lang="ja">
-自由ソフトウェア (jiyū sofutouea)</td>
+自由ソフトウェア (jiyū sofutouea)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ja" xml:lang="ja">
-無料ソフトウェア (muryō sofutouea)</td>
-</tr>
-<tr>
-<td>ka</td><td>Georgian</td>
-<td lang="ka" xml:lang="ka">
-თავისუფალი პროგრამები (tavisupali 
programebi)</td>
-<td lang="ka" xml:lang="ka">
-უფასო პროგრამები (upaso programebi)</td>
-</tr>
-<tr>
-<td>ko</td><td>Korean</td>
+無料ソフトウェア (muryō sofutouea)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ko">Korean</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ko</td></tr>
+<tr><th>Free Software</th>
 <td lang="ko" xml:lang="ko">
-자유 소프트웨어 (ja-yu software)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>lt</td><td>Lithuanian</td>
-<td lang="lt" xml:lang="lt">
-laisva programinė įranga</td>
-<td lang="lt" xml:lang="lt">
-nemokama programinė įranga</td>
-</tr>
-<tr>
-<td>lv</td><td>Latvian</td>
+자유 소프트웨어 (ja-yu software)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="lv">Latvian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>lv</td></tr>
+<tr><th>Free Software</th>
 <td lang="lv" xml:lang="lv">
-brīva programmatūra</td>
+brīva programmatūra</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="lv" xml:lang="lv">
-bezmaksas programmatūra</td>
-</tr>
-<tr>
-<td>mk</td><td>Macedonian</td>
+bezmaksas programmatūra</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="lt">Lithuanian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>lt</td></tr>
+<tr><th>Free Software</th>
+<td lang="lt" xml:lang="lt">
+laisva programinė įranga</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="lt" xml:lang="lt">
+nemokama programinė įranga</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="mk">Macedonian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>mk</td></tr>
+<tr><th>Free Software</th>
 <td lang="mk" xml:lang="mk">
-слободен софтвер (sloboden softver)</td>
+слободен софтвер (sloboden softver)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="mk" xml:lang="mk">
-бесплатен софтвер (besplaten softver)</td>
-</tr>
-<tr>
-<td>ml</td><td>Malayalam</td>
+бесплатен софтвер (besplaten softver)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ms">Malay</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ms</td></tr>
+<tr><th>Free Software</th>
+<td lang="ms" xml:lang="ms">
+perisian bebas</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ml">Malayalam</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ml</td></tr>
+<tr><th>Free Software</th>
 <td lang="ml" xml:lang="ml">
 സ്വതന്ത്രസോഫ്റ്റ്‌വെയര്‍
-(svatantrasophṯṯveyar)</td>
+(svatantrasophṯṯveyar)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ml" xml:lang="ml">
 സൗജന്യസോഫ്റ്റ്‌വെയര്‍
-(soujanyasophṯṯveyar)</td>
-</tr>
-<tr>
-<td>ms</td><td>Malay</td>
-<td lang="ms" xml:lang="ms">
-perisian bebas</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>nl</td><td>Dutch</td>
-<td lang="nl" xml:lang="nl">
-vrije software</td>
-<td lang="nl" xml:lang="nl">
-gratis software</td>
-</tr>
-<tr>
-<td>no</td><td>Norwegian</td>
+(soujanyasophṯṯveyar)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="no">Norwegian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>no</td></tr>
+<tr><th>Free Software</th>
 <td lang="no" xml:lang="no">
-fri programvare</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>pl</td><td>Polish</td>
+fri programvare</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="fa">Persian (Farsi)</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>fa</td></tr>
+<tr><th>Free Software</th>
+<td lang="fa" xml:lang="fa">نرم‌افزار آزاد (narmafzar 
azad)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="fa" xml:lang="fa">نرم‌افزار رایگان (narmafzar 
raygan)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="pl">Polish</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>pl</td></tr>
+<tr><th>Free Software</th>
 <td lang="pl" xml:lang="pl">
-wolne oprogramowanie</td>
+wolne oprogramowanie</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="pl" xml:lang="pl">
-darmowe oprogramowanie</td>
-</tr>
-<tr>
-<td>pt</td><td>Portuguese</td>
+darmowe oprogramowanie</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="pt">Portuguese</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>pt</td></tr>
+<tr><th>Free Software</th>
 <td lang="pt" xml:lang="pt">
-software livre</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ro</td><td>Romanian</td>
+software livre</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ro">Romanian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ro</td></tr>
+<tr><th>Free Software</th>
 <td lang="ro" xml:lang="ro">
-programe libere</td>
+programe libere</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ro" xml:lang="ro">
-programe gratuite</td>
-</tr>
-<tr>
-<td>ru</td><td>Russian</td>
+programe gratuite</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ru">Russian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ru</td></tr>
+<tr><th>Free Software</th>
 <td lang="ru" xml:lang="ru">
-свободные программы (svobodnie programmi)</td>
+свободные программы (svobodnie programmi)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ru" xml:lang="ru">
-бесплатные программы (besplatnie programmi)</td>
-</tr>
-<tr>
-<td>sc</td><td>Sardinian</td>
+бесплатные программы (besplatnie programmi)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sc">Sardinian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>sc</td></tr>
+<tr><th>Free Software</th>
 <td lang="sc" xml:lang="sc">
-software liberu</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>si</td><td>Sinhala</td>
+software liberu</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sr">Serbian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>sr</td></tr>
+<tr><th>Free Software</th>
+<td lang="sr" xml:lang="sr">
+слободни софтвер / slobodni softver</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="sr" xml:lang="sr">
+бесплатни софтвер  / besplatni softver</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="si">Sinhala</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>si</td></tr>
+<tr><th>Free Software</th>
 <td lang="si" xml:lang="si">
 නිදහස් මෘදුකාංග
-(nidahas mṛdukāṅga)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>sk</td><td>Slovak</td>
+(nidahas mṛdukāṅga)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sk">Slovak</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>sk</td></tr>
+<tr><th>Free Software</th>
 <td lang="sk" xml:lang="sk">
-slobodný softvér</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>sl</td><td>Slovenian</td>
+slobodný softvér</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sl">Slovenian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>sl</td></tr>
+<tr><th>Free Software</th>
 <td lang="sl" xml:lang="sl">
-prosto programje</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>sq</td><td>Albanian</td>
-<td lang="sq" xml:lang="sq">
-software i lirë</td>
-<td lang="sq" xml:lang="sq">
-software falas</td>
-</tr>
-<tr>
-<td>sr</td><td>Serbian</td>
-<td lang="sr" xml:lang="sr">
-слободни софтвер / slobodni softver</td>
-<td lang="sr" xml:lang="sr">
-бесплатни софтвер  / besplatni softver</td>
-</tr>
-<tr>
-<td>sv</td><td>Swedish</td>
+prosto programje</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="es">Spanish</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>es</td></tr>
+<tr><th>Free Software</th>
+<td lang="es" xml:lang="es">
+software libre</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="es" xml:lang="es">
+software gratuito</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sw">Swahili</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>sw</td></tr>
+<tr><th>Free Software</th>
+<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="sv">Swedish</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>sv</td></tr>
+<tr><th>Free Software</th>
 <td lang="sv" xml:lang="sv">
-fri programvara / fri mjukvara</td>
+fri programvara / fri mjukvara</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="sv" xml:lang="sv">
-gratis programvara / gratis mjukvara</td>
-</tr>
-<tr>
-<td>sw</td><td>Swahili</td>
-<td lang="sw" xml:lang="sw">
-Software huru / Programu huru za Kompyuta</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ta</td><td>Tamil</td>
+gratis programvara / gratis mjukvara</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="tl">Tagalog / Filipino</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>tl</td></tr>
+<tr><th>Free Software</th>
+<td lang="tl" xml:lang="tl">
+malayang software</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ta">Tamil</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ta</td></tr>
+<tr><th>Free Software</th>
 <td lang="ta" xml:lang="ta">
 கட்டற்ற மென்பொருள்
-(kaṭṭaṟṟa meṉpoñaḷ)</td>
+(kaṭṭaṟṟa meṉpoñaḷ)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ta" xml:lang="ta">
 இலவச மென்பொருள்
-(illavasa menporul) </td>
-</tr>
-<tr>
-<td>th</td><td>Thai</td>
+(illavasa menporul) </td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="th">Thai</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>th</td></tr>
+<tr><th>Free Software</th>
 <td lang="th" xml:lang="th">
 ซอฟต์แวร์เสรี
-(sofotwerseri)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>tl</td><td>Tagalog / Filipino</td>
-<td lang="tl" xml:lang="tl">
-malayang software</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>tr</td><td>Turkish</td>
+(sofotwerseri)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="tr">Turkish</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>tr</td></tr>
+<tr><th>Free Software</th>
 <td lang="tr" xml:lang="tr">
-özgür yazılım</td>
-<td>bedava yazılım</td>
-</tr>
-<tr>
-<td>uk</td><td>Ukrainian</td>
+özgür yazılım</td></tr>
+<tr><th>Gratis Software</th>
+<td>bedava yazılım</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="uk">Ukrainian</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>uk</td></tr>
+<tr><th>Free Software</th>
 <td lang="uk" xml:lang="uk">
-вільне програмне забезпечення (vil'ne prohramne 
zabezpechennja)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ur</td><td>Urdu</td>
-<td lang="ur" xml:lang="ur">آزاد سافٹ ویئر (azad software)</td>
-<td lang="ur" xml:lang="ur">مفت سافٹ ویئر (muft software)</td>
-</tr>
-<tr>
-<td>vi</td><td>Vietnamese</td>
+вільне програмне забезпечення (vil'ne prohramne 
zabezpechennja)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ur">Urdu</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>ur</td></tr>
+<tr><th>Free Software</th>
+<td lang="ur" xml:lang="ur">آزاد سافٹ ویئر (azad 
software)</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="ur" xml:lang="ur">مفت سافٹ ویئر (muft software)</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="vi">Vietnamese</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>vi</td></tr>
+<tr><th>Free Software</th>
 <td lang="vi" xml:lang="vi">
-phần mềm tự do</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>zh-cn</td><td>Chinese (Simplified)</td>
-<td lang="zh-cn" xml:lang="zh-cn">
-自由软件 (zi-you ruan-jian)</td>
-<td lang="zh-cn" xml:lang="zh-cn">
-免费软件 (mian-fei ruan-jian)</td>
-</tr>
-<tr>
-<td>zh-tw</td><td>Chinese (Traditional)</td>
-<td lang="zh-tw" xml:lang="zh-tw">
-自由軟體 (zih-yo ruan-ti)</td>
-<td lang="zh-tw" xml:lang="zh-tw">
-免費軟體 (mien-fei ruan-ti)</td>
-</tr>
-<tr>
-<td>zu</td><td>Zulu</td>
+phần mềm tự do</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="cy">Welsh</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>cy</td></tr>
+<tr><th>Free Software</th>
+<td lang="cy" xml:lang="cy">
+meddalwedd rydd</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="zu">Zulu</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>zu</td></tr>
+<tr><th>Free Software</th>
 <td lang="zu" xml:lang="zu">
-Isoftware Ekhululekile</td>
-<td>&nbsp;</td>
-</tr>
+Isoftware Ekhululekile</td></tr>
 </table>
+<!-- GNUN-SORT-STOP -->
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -489,7 +874,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/06/29 05:29:15 $
+$Date: 2016/07/12 06:30:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/fs-translations.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ja.po,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- philosophy/po/fs-translations.ja.po 12 Jul 2016 05:58:18 -0000      1.98
+++ philosophy/po/fs-translations.ja.po 12 Jul 2016 06:30:49 -0000      1.99
@@ -43,8 +43,8 @@
 "proprietary software&rdquo;, and &ldquo;commercial software&rdquo; to show "
 "how to make the contrast in various languages."
 msgstr ""
-"わたしたちは「無料ソフトウェア」、「プロプライエタリ・ソフトウェア」、「商用ソフトウェア」の翻訳も提供し、いろいろな言語での対ç
…§"
-"を示します。"
+"わたしたちは「無料ソフトウェア」、「プロプライエタリ・ソフトウェア」、「商用"
+"ソフトウェア」の翻訳も提供し、いろいろな言語での対ç…
§ã‚’示します。"
 
 #. type: Content of: <p>
 msgid ""

Index: proprietary/malware-microsoft.ja.html
===================================================================
RCS file: /web/www/www/proprietary/malware-microsoft.ja.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- proprietary/malware-microsoft.ja.html       7 Jul 2016 01:29:32 -0000       
1.13
+++ proprietary/malware-microsoft.ja.html       12 Jul 2016 06:30:49 -0000      
1.14
@@ -97,7 +97,7 @@
   <p>自由ソフトウェアの開発者も、自分のプログラム
の古いバージョンを保守することを止めることがあります。しかし、自由ソフトウェアのユーザはそのコントロールを有していますから、ユーザにとってこれは不å
…
¬æ­£ã§ã¯ã‚りません。もしそのソフトウェアがあなたにとって重要であるならば、あなたやほかのユーザは、あなたの将来のプラットフォーãƒ
 
で古いバージョンをサポートするように誰かを雇うことができるでしょう。
   </p></li>
 
-  
<li><p>あなたが好むにしろ嫌うにしろ、マイクロソフトは<a
+  <li><p>マイクロソフトは<a
 
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146";>強制的に押し込んで</a>
 <a
 
href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html";>ウィンドウズをバージョン10に更新するのです</a>。ウィンドウズ7や8のアップグレードしないと設定できたフラグを無視してです。これは<a
@@ -130,6 +130,9 @@
 
 <ul>
 
+<li><p>マイクロソフトは<a
+href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1";>あきれるほど、繰り返し、ウィンドウズ10をインストールするように多くのユーザにうるさくせがむことを</a>開始しました。</p></li>
+
   <li><p>マイクロソフトは <a
 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml";>ユーザをã
 ã¾ã—て</a>
 <a
@@ -272,7 +275,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/07/07 01:29:32 $
+$Date: 2016/07/12 06:30:49 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-insecurity.ja.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-insecurity.ja.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- proprietary/proprietary-insecurity.ja.html  7 Jul 2016 01:29:32 -0000       
1.14
+++ proprietary/proprietary-insecurity.ja.html  12 Jul 2016 06:30:49 -0000      
1.15
@@ -18,6 +18,12 @@
 
 <ul>
 <li>
+<p>アンチウィルスのプログラム
があまりにも間違いが多いので<a
+href="https://theconversation.com/as-more-vulnerabilities-are-discovered-is-it-time-to-uninstall-antivirus-software-61374";>セキュリティを悪くさせてしまいます</a>。</p>
+<p>GNU/Linuxはアンチウィルスのソフトウェアを必
要としません。</p>
+</li>
+
+<li>
 
<p>70を越えるブランドのネットワークに接続される監視カメラに<a
 
href="http://www.kerneronsec.com/2016/02/remote-code-execution-in-cctv-dvrs-of.html";>セキュリティのバグがあり、誰でも見ることができるようになってしまいます</a>。</p>
 </li>
@@ -276,7 +282,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/07/07 01:29:32 $
+$Date: 2016/07/12 06:30:49 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-interference.ja.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-interference.ja.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- proprietary/proprietary-interference.ja.html        29 Jun 2016 06:30:49 
-0000      1.6
+++ proprietary/proprietary-interference.ja.html        12 Jul 2016 06:30:49 
-0000      1.7
@@ -16,6 +16,11 @@
 
 <ul>
 
+<li>
+<p>マイクロソフトは<a
+href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1";>あきれるほど、繰り返し、ウィンドウズ10をインストールするように多くのユーザにうるさくせがむことを</a>開始しました。</p>
+</li>
+
 <li><p>マイクロソフトは <a
 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml";>ユーザをã
 ã¾ã—て</a>
 <a
@@ -122,7 +127,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/06/29 06:30:49 $
+$Date: 2016/07/12 06:30:49 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-sabotage.ja.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-sabotage.ja.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- proprietary/proprietary-sabotage.ja.html    7 Jul 2016 01:29:32 -0000       
1.15
+++ proprietary/proprietary-sabotage.ja.html    12 Jul 2016 06:30:49 -0000      
1.16
@@ -46,7 +46,7 @@
   </li>
 
   <li>
-    <p>あなたが好むにしろ嫌うにしろ、マイクロソフトは<a
+    <p>マイクロソフトは<a
 
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146";>強制的に押し込んで</a>
 <a
 
href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html";>ウィンドウズをバージョン10に更新するのです</a>。ウィンドウズ7や8のアップグレードしないと設定できたフラグを無視してです。これは<a
@@ -232,7 +232,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/07/07 01:29:32 $
+$Date: 2016/07/12 06:30:49 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary.ja.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary.ja.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- proprietary/proprietary.ja.html     3 Feb 2016 09:14:24 -0000       1.6
+++ proprietary/proprietary.ja.html     12 Jul 2016 06:30:49 -0000      1.7
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/proprietary/proprietary.en.html" -->
 
 <!--#include virtual="/server/header.ja.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.79 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>プロプライエタリなソフトウェア - GNUプロジェクト - 
フリーソフトウェアファウンデーション</title>
@@ -117,7 +117,7 @@
 
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2013, 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2013, 2014, 2015, 2016 Free Software Foundation, Inc.</p>
 
 <p>このページは<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ja";>Creative
@@ -132,7 +132,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/02/03 09:14:24 $
+$Date: 2016/07/12 06:30:49 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/po/malware-microsoft.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.ja-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- proprietary/po/malware-microsoft.ja-en.html 7 Jul 2016 01:29:33 -0000       
1.9
+++ proprietary/po/malware-microsoft.ja-en.html 12 Jul 2016 06:30:49 -0000      
1.10
@@ -120,7 +120,7 @@
   the old version on your future platforms.
   </p></li>
 
-  <li><p>Whether you like it or not, Microsoft
+  <li><p>Microsoft
     is <a 
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146";>
     forcibly
     pushing</a> <a 
href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html";>Windows
@@ -163,6 +163,10 @@
 
 <ul>
 
+<li><p>Microsoft has
+started <a 
href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder";>nagging
+users obnoxiously and repeatedly to install Windows 10</a>.</p></li>
+
   <li><p>Microsoft
       <a 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml";>is
         tricking
@@ -322,7 +326,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/07/07 01:29:33 $
+$Date: 2016/07/12 06:30:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/malware-microsoft.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.ja.po,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- proprietary/po/malware-microsoft.ja.po      12 Jul 2016 05:58:17 -0000      
1.50
+++ proprietary/po/malware-microsoft.ja.po      12 Jul 2016 06:30:49 -0000      
1.51
@@ -276,14 +276,13 @@
 "upgrade.  This reaffirms the presence of a <a href=\"/proprietary/"
 "proprietary-back-doors.html\">universal back door in Windows</a> 7 and 8."
 msgstr ""
-"マイクロソフトは<a href=\"http://gizmodo.com/";
-"woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146\">強制的に"
-"押し込んで</a> <a href=\"http://www.computerworld.com/article/3012278/";
-"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
-"strategy.html\">ウィンドウズをバージョン10に更新するのです</a>。ウィンドウズ7"
-"や8のアップグレードしないと設定できたフラグを無視してです。これは<a
 href=\"/"
-"proprietary/proprietary-back-doors.html\">万能バックドアの存在を再確認しま"
-"す。ウィンドウズ</a>7と8の。"
+"マイクロソフトは<a href=\"http://gizmodo.com/woman-wins-10-000-from-";
+"microsoft-after-unwanted-window-1782666146\">強制的に押し込んで</a> 
<a href="
+"\"http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-";
+"sets-stage-for-massive-windows-10-upgrade-strategy.html\">ウィンドウズをバー"
+"ジョン10に更新するのです</a>。ウィンドウズ7や8のアップグレードしないと設定で"
+"きたフラグを無視してです。これは<a 
href=\"/proprietary/proprietary-back-"
+"doors.html\">万能バックドアの存在を再確認します。ウィンドウズ</a>7と8の。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -372,8 +371,8 @@
 "\">nagging users obnoxiously and repeatedly to install Windows 10</a>."
 msgstr ""
 "マイクロソフトは<a 
href=\"http://www.theguardian.com/technology/2015/sep/11/";
-"microsoft-downloading-windows-1\">あきれるほど、繰り返し、ウィンドウズ10をインストールする"
-"ように多くのユーザにうるさくせがむことを</a>開始しました。"
+"microsoft-downloading-windows-1\">あきれるほど、繰り返し、ウィンドウズ10をイ"
+"ンストールするように多くのユーザにうるさくせがむことを</a>開始しました。"
 
 #. type: Content of: <ul><li><p>
 msgid ""

Index: proprietary/po/proprietary-insecurity.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-insecurity.ja-en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- proprietary/po/proprietary-insecurity.ja-en.html    7 Jul 2016 01:29:33 
-0000       1.11
+++ proprietary/po/proprietary-insecurity.ja-en.html    12 Jul 2016 06:30:49 
-0000      1.12
@@ -21,6 +21,13 @@
 
 <ul>
 <li>
+<p>Antivirus programs have so many errors
+  that <a 
href="https://theconversation.com/as-more-vulnerabilities-are-discovered-is-it-time-to-uninstall-antivirus-software-61374";>they
+  may make security worse</a>.</p>
+<p>GNU/Linux does not need antivirus software.</p>
+</li>
+
+<li>
 <p>Over 70 brands of network-connected surveillance
 cameras <a 
href="http://www.kerneronsec.com/2016/02/remote-code-execution-in-cctv-dvrs-of.html";>have
 security bugs that allow anyone to watch through them</a>.</p>
@@ -329,7 +336,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/07/07 01:29:33 $
+$Date: 2016/07/12 06:30:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-interference.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-interference.ja-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- proprietary/po/proprietary-interference.ja-en.html  29 Jun 2016 06:30:50 
-0000      1.6
+++ proprietary/po/proprietary-interference.ja-en.html  12 Jul 2016 06:30:49 
-0000      1.7
@@ -14,6 +14,13 @@
 
 <ul>
 
+<li>
+<p>Microsoft has
+started <a
+href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder";>
+nagging users obnoxiously and repeatedly to install Windows 10</a>.</p>
+</li>
+
 <li><p>Microsoft
     <a 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml";>is
       tricking users</a> <a
@@ -128,7 +135,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/06/29 06:30:50 $
+$Date: 2016/07/12 06:30:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-interference.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-interference.ja.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- proprietary/po/proprietary-interference.ja.po       12 Jul 2016 05:58:17 
-0000      1.27
+++ proprietary/po/proprietary-interference.ja.po       12 Jul 2016 06:30:49 
-0000      1.28
@@ -42,8 +42,8 @@
 "\"> nagging users obnoxiously and repeatedly to install Windows 10</a>."
 msgstr ""
 "マイクロソフトは<a 
href=\"http://www.theguardian.com/technology/2015/sep/11/";
-"microsoft-downloading-windows-1\">あきれるほど、繰り返し、ウィンドウズ10をインストールする"
-"ように多くのユーザにうるさくせがむことを</a>開始しました。"
+"microsoft-downloading-windows-1\">あきれるほど、繰り返し、ウィンドウズ10をイ"
+"ンストールするように多くのユーザにうるさくせがむことを</a>開始しました。"
 
 #. type: Content of: <ul><li><p>
 msgid ""

Index: proprietary/po/proprietary-sabotage.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-sabotage.ja-en.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- proprietary/po/proprietary-sabotage.ja-en.html      7 Jul 2016 01:29:33 
-0000       1.12
+++ proprietary/po/proprietary-sabotage.ja-en.html      12 Jul 2016 06:30:49 
-0000      1.13
@@ -58,7 +58,7 @@
   </li>
 
   <li>
-    <p>Whether you like it or not, Microsoft
+    <p>Microsoft
     is <a 
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146";>
     forcibly
     pushing</a> <a 
href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html";>Windows
@@ -276,7 +276,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/07/07 01:29:33 $
+$Date: 2016/07/12 06:30:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-sabotage.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-sabotage.ja.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- proprietary/po/proprietary-sabotage.ja.po   12 Jul 2016 05:58:17 -0000      
1.55
+++ proprietary/po/proprietary-sabotage.ja.po   12 Jul 2016 06:30:49 -0000      
1.56
@@ -130,14 +130,13 @@
 "upgrade.  This reaffirms the presence of a <a href=\"/proprietary/"
 "proprietary-back-doors.html\">universal back door in Windows</a> 7 and 8."
 msgstr ""
-"マイクロソフトは<a href=\"http://gizmodo.com/";
-"woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146\">強制的に"
-"押し込んで</a> <a href=\"http://www.computerworld.com/article/3012278/";
-"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
-"strategy.html\">ウィンドウズをバージョン10に更新するのです</a>。ウィンドウズ7"
-"や8のアップグレードしないと設定できたフラグを無視してです。これは<a
 href=\"/"
-"proprietary/proprietary-back-doors.html\">万能バックドアの存在を再確認しま"
-"す。ウィンドウズ</a>7と8の。"
+"マイクロソフトは<a href=\"http://gizmodo.com/woman-wins-10-000-from-";
+"microsoft-after-unwanted-window-1782666146\">強制的に押し込んで</a> 
<a href="
+"\"http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-";
+"sets-stage-for-massive-windows-10-upgrade-strategy.html\">ウィンドウズをバー"
+"ジョン10に更新するのです</a>。ウィンドウズ7や8のアップグレードしないと設定で"
+"きたフラグを無視してです。これは<a 
href=\"/proprietary/proprietary-back-"
+"doors.html\">万能バックドアの存在を再確認します。ウィンドウズ</a>7と8の。"
 
 #. type: Content of: <ul><li><p>
 msgid ""

Index: proprietary/po/proprietary.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.ja-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- proprietary/po/proprietary.ja-en.html       22 Sep 2015 02:27:37 -0000      
1.4
+++ proprietary/po/proprietary.ja-en.html       12 Jul 2016 06:30:49 -0000      
1.5
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.79 -->
 <title>Proprietary Software
 - GNU Project - Free Software Foundation</title>
  <!--#include virtual="/proprietary/po/proprietary.translist" -->
@@ -125,7 +125,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2013, 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2013, 2014, 2015, 2016 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
@@ -135,7 +135,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/22 02:27:37 $
+$Date: 2016/07/12 06:30:49 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]