www/philosophy fs-translations.ca.html po/fs-tr...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/09/18 08:28:36

Modified files:
        philosophy     : fs-translations.ca.html 
        philosophy/po  : fs-translations.ca-en.html 
                         fs-translations.ca.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.ca.html?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ca-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ca.po?cvsroot=www&r1=1.115&r2=1.116

Patches:
Index: fs-translations.ca.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.ca.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- fs-translations.ca.html     11 Jul 2016 08:08:18 -0000      1.51
+++ fs-translations.ca.html     18 Sep 2016 08:28:36 -0000      1.52
@@ -1,9 +1,4 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/fs-translations.ca.po">
- https://www.gnu.org/philosophy/po/fs-translations.ca.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/philosophy/fs-translations.html"
- --><!--#set var="DIFF_FILE" 
value="/philosophy/po/fs-translations.ca-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2016-05-05" -->
+<!--#set var="ENGLISH_PAGE" value="/philosophy/fs-translations.en.html" -->
 
 <!--#include virtual="/server/header.ca.html" -->
 <!-- Parent-Version: 1.79 -->
@@ -13,8 +8,20 @@
 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.ca.html" -->
-<!--#include virtual="/server/outdated.ca.html" -->
 <h2>Traduccions del terme "programari lliure"</h2>
 
 <p>A continuació teniu una llista de traduccions recomanades del terme
@@ -22,8 +29,9 @@
 href="/philosophy/open-source-misses-the-point.html">lliure de
 llibertat</a>) a diverses llengües.</p>
 
-<p>També proporcionem traduccions de &ldquo;programari gratuït&rdquo; en una
-columna apart per mostrar la diferència en els diversos idiomes.</p>
+<p>També proporcionem traduccions de &ldquo;programari gratuït&rdquo;,
+&ldquo;programari privatiu&rdquo;, i &ldquo;programari comercial&rdquo; per
+mostrar com remarcar la diferència en les diverses llengües.</p>
 
 <p>Si veieu que cal fer alguna correcció o addició a la llista, feu-nos-ho
 saber enviant un correu electrònic a <a
@@ -34,406 +42,964 @@
 traduccions son transcripcions (amb vocal afegides si són
 rellevants). Envieu-nos també si us plau qualsevol correcció o addició.</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>Codi de l'idioma</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">Albanès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="de">Alemany</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>
+<tr><th>Proprietary Software</th>
+<td lang="de" xml:lang="de">
+Proprietäre Software</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="de" xml:lang="de">
+Kommerzielle Software</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ar">Àrab</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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">Armeni</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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">Basc</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="bn">Bengalí</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="be">Bielorús</h3>
+
+<!-- GNUN-SORT-END-KEY -->
 <table border="1">
-<tr><th>Codi de l'idioma</th><th>Nom de l'idioma</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>Àrab</td>
-<td lang="ar" xml:lang="ar">برمجيات حرة (barmajiyat ḥorrah)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>be</td><td>Bielorús</td>
+<tr><th>Codi de l'idioma</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>Búlgar</td>
+свабоднае праграмнае забесьпячэньне 
(svabodnae pragramnae zabes'pjachen'ne)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="bg">Búlgar</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</th>
+<td>bg</td></tr>
+<tr><th>Free Software</th>
 <td lang="bg" xml:lang="bg">
-свободен софтуер (svoboden softuer)</td>
+свободен софтуер (svoboden softuer)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="bg" xml:lang="bg">
-безплатен софтуер (bezplaten softuer)</td>
-</tr>
-<tr>
-<td>bn</td><td>Bengalí</td>
-<td lang="bn" xml:lang="bn">
-স্বাধীন সফটওয়্যার (swadhin software)
-</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ca</td><td>Català </td>
+безплатен софтуер (bezplaten softuer)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="es">Castellà </h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>
+<tr><th>Proprietary Software</th>
+<td lang="es" xml:lang="es">
+software privativo</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="es" xml:lang="es">
+software comercial</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ca">Català </h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Txec</td>
-<td lang="cs" xml:lang="cs">
-svobodný software</td>
-<td lang="cs" xml:lang="cs">
-bezplatný software</td>
-</tr>
-<tr>
-<td>cy</td><td>Gal·lès</td>
-<td lang="cy" xml:lang="cy">
-meddalwedd rydd</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>da</td><td>Danès</td>
+programari gratuït</td></tr>
+<tr><th>Proprietary Software</th>
+<td lang="ca" xml:lang="ca">
+programari privatiu</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="ca" xml:lang="ca">
+programari comercial</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ko">Coreà </h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="hr">Croat</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="da">Danès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Alemany</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>Grec</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="sk">Eslovac</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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">Eslovè</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="eo">Esperanto</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Basc</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>Castellà </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>Estonià </td>
+libera programaro / programo</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="et">Estonià </h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Persa</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>Finès</td>
+tasuta tarkvara</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="fi">Finès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Francès</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">Francès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Irlandès</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>Hebreu</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>
+<tr><th>Proprietary Software</th>
+<td lang="fr" xml:lang="fr">
+logiciel privateur</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="fr" xml:lang="fr">
+logiciel commercial</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="cy">Gal·lès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="ka">Georgià </h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="el">Grec</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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">Hebreu</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Codi de l'idioma</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>Croat</td>
-<td lang="hr" xml:lang="hr">
-slobodan softver</td>
-<td>besplatan softver</td>
-</tr>
-<tr>
-<td>hu</td><td>Hongarès</td>
+मुफ़्त सॉफ्टवेयर (muft software)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="hu">Hongarès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Armeni</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>Indonesi</td>
+ingyenes szoftver / ingyen szoftver</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>Codi de l'idioma</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">Indonesi</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Islandès</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>Codi de l'idioma</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">Irlandès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="is">Islandès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</th>
+<td>is</td></tr>
+<tr><th>Free Software</th>
 <td lang="is" xml:lang="is">
-frjáls hugbúnaður</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>it</td><td>Italià </td>
+frjáls hugbúnaður</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="it">Italià </h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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 libero</td>
+software gratuito</td></tr>
+<tr><th>Proprietary Software</th>
 <td lang="it" xml:lang="it">
-software gratuito</td>
-</tr>
-<tr>
-<td>ja</td><td>Japonès</td>
+software proprietario</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="it" xml:lang="it">
+software commerciale</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ja">Japonès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Georgià </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>Coreà </td>
-<td lang="ko" xml:lang="ko">
-ìžìœ  소프트웨어 (ja-yu software)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>lt</td><td>Lituà </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>Letó</td>
+無料ソフトウェア (muryō sofutouea)</td></tr>
+<tr><th>Proprietary Software</th>
+<td lang="ja" xml:lang="ja">
+プロプライエタリなソフトウェア (puropuraietari na 
sofutouea)</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="ja" xml:lang="ja">
+商用ソフトウェア (shōyō sofutouea)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="lv">Letó</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Macedònic</td>
+bezmaksas programmatūra</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="lt">Lituà </h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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">Macedònic</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Malaialam</td>
+бесплатен софтвер (besplaten softver)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ms">Malai</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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">Malaialam</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Malai</td>
-<td lang="ms" xml:lang="ms">
-perisian bebas</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>nl</td><td>Neerlandès</td>
+സൗജന്യസോഫ്റ്റ്‌വെയര്‍ 
(soujanyasophṯṯveyar)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="nl">Neerlandès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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">
-vrije software</td>
+gratis software</td></tr>
+<tr><th>Proprietary Software</th>
 <td lang="nl" xml:lang="nl">
-gratis software</td>
-</tr>
-<tr>
-<td>no</td><td>Noruec</td>
+private software</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="nl" xml:lang="nl">
+commerci&euml;le software</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="no">Noruec</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Polonès</td>
+fri programvare</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="fa">Persa</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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">Polonès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>
+<tr><th>Proprietary Software</th>
 <td lang="pl" xml:lang="pl">
-wolne oprogramowanie</td>
+oprogramowanie własnościowe</td></tr>
+<tr><th>Commercial Software</th>
 <td lang="pl" xml:lang="pl">
-darmowe oprogramowanie</td>
-</tr>
-<tr>
-<td>pt</td><td>Portuguès</td>
+oprogramowanie komercyjne</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="pt">Portuguès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Romanès</td>
+software livre</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ro">Romanès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</th>
+<td>ro</td></tr>
+<tr><th>Free Software</th>
+<td lang="ro" xml:lang="ro">
+programe libere</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="ro" xml:lang="ro">
+programe gratuite</td></tr>
+<tr><th>Proprietary Software</th>
 <td lang="ro" xml:lang="ro">
-programe libere</td>
+programe proprietărești</td></tr>
+<tr><th>Commercial Software</th>
 <td lang="ro" xml:lang="ro">
-programe gratuite</td>
-</tr>
-<tr>
-<td>ru</td><td>Rus</td>
+programe comerciale</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ru">Rus</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</th>
+<td>ru</td></tr>
+<tr><th>Free Software</th>
+<td lang="ru" xml:lang="ru">
+свободные программы (svobodnie programmi)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="ru" xml:lang="ru">
-свободные программы (svobodnie programmi)</td>
+бесплатные программы (besplatnie programmi)</td></tr>
+<tr><th>Proprietary Software</th>
 <td lang="ru" xml:lang="ru">
-бесплатные программы (besplatnie programmi)</td>
-</tr>
-<tr>
-<td>sc</td><td>Sard</td>
+несвободные программы (nesvobodnie programmi)</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="ru" xml:lang="ru">
+коммерческие программы (kommercheskie programmi)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sc">Sard</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Singalès</td>
-<td lang="si" xml:lang="si">
-නිදහස් මෘදුකාංග (nidahas mṛdukāṅga)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>sk</td><td>Eslovac</td>
-<td lang="sk" xml:lang="sk">
-slobodný softvér</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>sl</td><td>Eslovè</td>
-<td lang="sl" xml:lang="sl">
-prosto programje</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>sq</td><td>Albanès</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>Serbi</td>
+software liberu</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="sr">Serbi</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</th>
+<td>sr</td></tr>
+<tr><th>Free Software</th>
 <td lang="sr" xml:lang="sr">
-слободни софтвер / slobodni softver</td>
+слободни софтвер / slobodni softver</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="sr" xml:lang="sr">
-бесплатни софтвер / besplatni softver</td>
-</tr>
-<tr>
-<td>sv</td><td>Suec</td>
+бесплатни софтвер / besplatni softver</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="si">Singalès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="sw">Suahili</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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">Suec</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Suahili</td>
-<td lang="sw" xml:lang="sw">
-Software huru / Programu huru za Kompyuta</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>ta</td><td>TÃ mil</td>
+gratis programvara / gratis mjukvara</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="tl">Tagà log / filipí</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="th">Tailandès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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="ta">TÃ mil</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Tailandès</td>
-<td lang="th" xml:lang="th">
-ซอฟต์แวร์เสรี (sofotwerseri)</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>tl</td><td>Tagà log / filipí</td>
-<td lang="tl" xml:lang="tl">
-malayang software</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>tr</td><td>Turc</td>
+இலவச மென்பொருள் (illavasa menporul) </td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="tr">Turc</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</th>
+<td>tr</td></tr>
+<tr><th>Free Software</th>
 <td lang="tr" xml:lang="tr">
-özgür yazılım</td>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td>uk</td><td>Ukraïnès</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="cs">Txec</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</th>
+<td>cs</td></tr>
+<tr><th>Free Software</th>
+<td lang="cs" xml:lang="cs">
+svobodný software</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="cs" xml:lang="cs">
+bezplatný software</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="uk">Ukraïnès</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Urdú</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>Vietnamita</td>
+вільне програмне забезпечення (vil'ne prohramne 
zabezpechennja)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="ur">Urdú</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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">Vietnamita</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Xinès (Simplificat)</td>
+phần mềm tự do</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="zh-cn">Xinès (Simplificat)</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</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>Xinès (Tradicional)</td>
+免费软件 (mian-fei ruan-jian)</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="zh-tw">Xinès (Tradicional)</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Codi de l'idioma</th>
+<td>zh-tw</td></tr>
+<tr><th>Free Software</th>
 <td lang="zh-tw" xml:lang="zh-tw">
-自由軟體 (zih-yo)</td>
+自由軟體 (zih-yo ruan-ti)</td></tr>
+<tr><th>Gratis Software</th>
 <td lang="zh-tw" xml:lang="zh-tw">
-免費軟體 (mien-fei)</td>
-</tr>
-<tr>
-<td>zu</td><td>Zulu</td>
+免費軟體 (mien-fei ruan-ti)</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>Codi de l'idioma</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 class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -506,7 +1072,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2016/07/11 08:08:18 $
+$Date: 2016/09/18 08:28:36 $
 
 <!-- timestamp end -->
 </p>

Index: po/fs-translations.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ca-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- po/fs-translations.ca-en.html       23 Apr 2016 18:30:14 -0000      1.19
+++ po/fs-translations.ca-en.html       18 Sep 2016 08:28:36 -0000      1.20
@@ -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,851 @@
 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><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>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>
+<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></tr>
+<tr><th>Gratis Software</th>
 <td lang="ca" xml:lang="ca">
-programari lliure</td>
+programari gratuït</td></tr>
+<tr><th>Proprietary Software</th>
 <td lang="ca" xml:lang="ca">
-programari gratuït</td>
-</tr>
-<tr>
-<td>cs</td><td>Czech</td>
+programari privatiu</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="ca" xml:lang="ca">
+programari comercial</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>
+<tr><th>Proprietary Software</th>
+<td lang="nl" xml:lang="nl">
+private software</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="nl" xml:lang="nl">
+commerci&euml;le 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>
+<tr><th>Proprietary Software</th>
+<td lang="fr" xml:lang="fr">
+logiciel privateur</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="fr" xml:lang="fr">
+logiciel commercial</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>
+<tr><th>Proprietary Software</th>
+<td lang="de" xml:lang="de">
+Proprietäre Software</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="de" xml:lang="de">
+Kommerzielle 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></tr>
+<tr><th>Gratis Software</th>
 <td lang="it" xml:lang="it">
-software libero</td>
+software gratuito</td></tr>
+<tr><th>Proprietary Software</th>
 <td lang="it" xml:lang="it">
-software gratuito</td>
-</tr>
-<tr>
-<td>ja</td><td>Japanese</td>
+software proprietario</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="it" xml:lang="it">
+software commerciale</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>
+<tr><th>Proprietary Software</th>
+<td lang="ja" xml:lang="ja">
+プロプライエタリなソフトウェア 
+(puropuraietari na sofutouea)</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="ja" xml:lang="ja">
+商用ソフトウェア (shōyō 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>
+<tr><th>Proprietary Software</th>
+<td lang="pl" xml:lang="pl">
+oprogramowanie własnościowe</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="pl" xml:lang="pl">
+oprogramowanie komercyjne</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></tr>
+<tr><th>Gratis Software</th>
 <td lang="ro" xml:lang="ro">
-programe libere</td>
+programe gratuite</td></tr>
+<tr><th>Proprietary Software</th>
 <td lang="ro" xml:lang="ro">
-programe gratuite</td>
-</tr>
-<tr>
-<td>ru</td><td>Russian</td>
+programe proprietărești</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="ro" xml:lang="ro">
+programe comerciale</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>
+<tr><th>Proprietary Software</th>
+<td lang="ru" xml:lang="ru">
+несвободные программы (nesvobodnie programmi)</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="ru" xml:lang="ru">
+коммерческие программы (kommercheskie 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>
+<tr><th>Proprietary Software</th>
+<td lang="es" xml:lang="es">
+software privativo</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="es" xml:lang="es">
+software comercial</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>&nbsp;</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)</td>
-<td lang="zh-tw" xml:lang="zh-tw">
-免費軟體 (mien-fei)</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 +935,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/04/23 18:30:14 $
+$Date: 2016/09/18 08:28:36 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/fs-translations.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ca.po,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- po/fs-translations.ca.po    18 Sep 2016 08:06:19 -0000      1.115
+++ po/fs-translations.ca.po    18 Sep 2016 08:28:36 -0000      1.116
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2016-09-18 10:05+0200\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -41,16 +42,14 @@
 "html\">lliure de llibertat</a>) a diverses llengües."
 
 #. type: Content of: <p>
-#| msgid ""
-#| "We also provide translations of &ldquo;gratis software&rdquo; in a "
-#| "separate column to show how to make the contrast in various languages."
 msgid ""
 "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."
 msgstr ""
 "També proporcionem traduccions de &ldquo;programari gratuït&rdquo;, &ldquo;"
-"programari privatiu&rdquo;, i &ldquo;programari comercial&rdquo; per mostrar 
com remarcar la diferència en les diverses llengües."
+"programari privatiu&rdquo;, i &ldquo;programari comercial&rdquo; per mostrar "
+"com remarcar la diferència en les diverses llengües."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -224,23 +223,19 @@
 
 # type: Attribute 'title' of: <link>
 #. type: Content of: <table><tr><th>
-#| msgid "Freie Software"
 msgid "Proprietary Software"
 msgstr "Proprietary Software"
 
 #. type: Content of: <table><tr><td>
-#| msgid "programari gratuït"
 msgid "programari privatiu"
 msgstr "programari privatiu"
 
 # type: Attribute 'title' of: <link>
 #. type: Content of: <table><tr><th>
-#| msgid "Freie Software"
 msgid "Commercial Software"
 msgstr "Commercial Software"
 
 #. type: Content of: <table><tr><td>
-#| msgid "programari gratuït"
 msgid "programari comercial"
 msgstr "programari comercial"
 
@@ -269,12 +264,10 @@
 msgstr "zh-tw"
 
 #. type: Content of: <table><tr><td>
-#| msgid "自由軟體 (zih-yo)"
 msgid "自由軟體 (zih-yo ruan-ti)"
 msgstr "自由軟體 (zih-yo ruan-ti)"
 
 #. type: Content of: <table><tr><td>
-#| msgid "免費軟體 (mien-fei)"
 msgid "免費軟體 (mien-fei ruan-ti)"
 msgstr "免費軟體 (mien-fei ruan-ti)"
 
@@ -346,13 +339,11 @@
 
 # type: Attribute 'title' of: <link>
 #. type: Content of: <table><tr><td>
-#| msgid "vrije software"
 msgid "private software"
 msgstr "private software"
 
 # type: Attribute 'title' of: <link>
 #. type: Content of: <table><tr><td>
-#| msgid "vrije software"
 msgid "commerci&euml;le software"
 msgstr "commerci&euml;le software"
 
@@ -418,12 +409,10 @@
 msgstr "logiciel gratuit"
 
 #. type: Content of: <table><tr><td>
-#| msgid "logiciel gratuit"
 msgid "logiciel privateur"
 msgstr "logiciel privateur"
 
 #. type: Content of: <table><tr><td>
-#| msgid "logiciel gratuit"
 msgid "logiciel commercial"
 msgstr "logiciel commercial"
 
@@ -462,13 +451,11 @@
 
 # type: Attribute 'title' of: <link>
 #. type: Content of: <table><tr><td>
-#| msgid "Free Software"
 msgid "Proprietäre Software"
 msgstr "Proprietäre Software"
 
 # type: Attribute 'title' of: <link>
 #. type: Content of: <table><tr><td>
-#| msgid "Free Software"
 msgid "Kommerzielle Software"
 msgstr "Kommerzielle Software"
 
@@ -625,12 +612,10 @@
 msgstr "software gratuito"
 
 #. type: Content of: <table><tr><td>
-#| msgid "software libero"
 msgid "software proprietario"
 msgstr "software proprietario"
 
 #. type: Content of: <table><tr><td>
-#| msgid "software falas"
 msgid "software commerciale"
 msgstr "software commerciale"
 
@@ -655,7 +640,6 @@
 msgstr "プロプライエタリなソフトウェア (puropuraietari na 
sofutouea)"
 
 #. type: Content of: <table><tr><td>
-#| msgid "自由ソフトウェア (jiyū sofutouea)"
 msgid "商用ソフトウェア (shōyō sofutouea)"
 msgstr "商用ソフトウェア (shōyō sofutouea)"
 
@@ -804,7 +788,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
-#| msgid "wolne oprogramowanie"
 msgid "oprogramowanie komercyjne"
 msgstr "oprogramowanie komercyjne"
 
@@ -837,12 +820,10 @@
 msgstr "programe gratuite"
 
 #. type: Content of: <table><tr><td>
-#| msgid "programe libere"
 msgid "programe proprietărești"
 msgstr "programe proprietărești"
 
 #. type: Content of: <table><tr><td>
-#| msgid "programe libere"
 msgid "programe comerciale"
 msgstr "programe comerciale"
 
@@ -866,13 +847,11 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
-#| msgid "свободные программы (svobodnie programmi)"
 msgid "несвободные программы (nesvobodnie programmi)"
 msgstr "несвободные программы (nesvobodnie programmi)"
 
 # type: Content of: <ul><li>
 #. type: Content of: <table><tr><td>
-#| msgid "свободные программы (svobodnie programmi)"
 msgid "коммерческие программы (kommercheskie programmi)"
 msgstr "коммерческие программы (kommercheskie programmi)"
 
@@ -954,12 +933,10 @@
 msgstr "software libre"
 
 #. type: Content of: <table><tr><td>
-#| msgid "software gratuito"
 msgid "software privativo"
 msgstr "software privativo"
 
 #. type: Content of: <table><tr><td>
-#| msgid "software falas"
 msgid "software comercial"
 msgstr "software comercial"
 
@@ -1047,7 +1024,6 @@
 msgstr "özgür yazılım"
 
 #. type: Content of: <table><tr><td>
-#| msgid "özgür yazılım"
 msgid "bedava yazılım"
 msgstr "bedava yazılım"