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

Re: About english/template/debian/countries*.wml



[...]
> Oh. Please commit it.

Applied.

So there is now only one file for translating country names: and the
winner is... english/template/debian/countries.wml
The english/template/debian/countries_perl.wml has been removed, and one
has to update Makefile.common before building webpages.

Some people did forget in the past to update these 2 files, so I
manually checked all the translations, and merge them.  The attached
patch show the changes applied to countries_perl.wml before it has been
renamed into countries.wml.
Translators please have a look at this patch and double check that I did
not revert recent changes.

Denis
Index: countries_perl.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/countries_perl.wml,v
retrieving revision 1.3
diff -u -r1.3 countries_perl.wml
--- countries_perl.wml	2001/07/23 23:25:11	1.3
+++ countries_perl.wml	2001/07/27 23:18:56
@@ -1,10 +1,13 @@
 # Format of this file
 # ('COUNTRY' => {'lang' => 'name for country in lang', ...
 
+#use def::debian::countries
+
 <:
 my %countries =
   ('AR' => {'EN' => 'Argentina',
 	    'AR' => 'ÃÑÌäÊíä',
+	    'CA' => 'Argentina',
 	    'DA' => 'Argentina',
 	    'DE' => 'Argentinien',
 	    'EL' => 'ÁñãåíôéíÞ',
@@ -29,6 +32,7 @@
            },
    'AU' => {'EN' => 'Australia',
 	    'AR' => 'ÃÓÊÑÇáíå',
+	    'CA' => 'Austràlia',
 	    'DA' => 'Australien',
 	    'DE' => 'Australien',
 	    'EL' => 'Áõóôñáëßá',
@@ -53,6 +57,7 @@
            },
    'AT' => {'EN' => 'Austria',
 	    'AR' => 'äãÓÉ',
+	    'CA' => 'Àustria',
 	    'DA' => '&Oslash;strig',
 	    'DE' => 'Österreich',
 	    'EL' => 'Áõóôñßá',
@@ -77,6 +82,7 @@
            },
    'BE' => {'EN' => 'Belgium',
 	    'AR' => 'ÈáÌíßíå',
+	    'CA' => 'Bèlgica',
 	    'DA' => 'Belgien',
 	    'DE' => 'Belgien',
 	    'EL' => 'ÂÝëãéï',
@@ -101,6 +107,7 @@
            },
    'BG' => {'EN' => 'Bulgaria',
 	    'AR' => 'ÈáÛÇÑíå',
+	    'CA' => 'Bulgària',
 	    'DA' => 'Bulgarien',
 	    'DE' => 'Bulgarien',
 	    'EL' => 'Âïõëãáñßá',
@@ -125,6 +132,7 @@
            },
    'BR' => {'EN' => 'Brazil',
 	    'AR' => 'ÈÑÇÒíá',
+	    'CA' => 'Brasil',
 	    'DA' => 'Brasilien',
 	    'DE' => 'Brasilien',
 	    'EL' => 'Âñáæéëßá',
@@ -147,13 +155,39 @@
 	    'TR' => 'Brezilya',
 	    'ZH' => '¤Ú¦è',
            },
+   'BY' => {'EN' => 'Belarus',
+	    'AR' => 'Belarus',
+	    'CA' => 'Bielorússia',
+	    'DA' => 'Hviderusland',
+	    'DE' => 'Weißrußland',
+	    'EL' => 'Belarus',
+	    'EO' => 'Bielorusia',
+	    'ES' => 'Bielorrusia',
+	    'FI' => 'Belarus',
+	    'FR' => 'Belarus',
+	    'HR' => 'Belarus',
+	    'HU' => 'Belarus',
+	    'IT' => 'Bielorussia',
+	    'JA' => 'Belarus',
+	    'KO' => 'Belarus',
+	    'NL' => 'Belarus',
+	    'NO' => 'Hviterussland',
+	    'PL' => 'Belarus',
+	    'PT' => 'Bielorrúsia',
+	    'RO' => 'Bielorusia',
+	    'RU' => 'âÅÌÁÒÕÓØ',
+	    'SV' => 'Vitryssland',
+	    'TR' => 'Belarus',
+	    'ZH' => 'Belarus',
+           },
    'CA' => {'EN' => 'Canada',
 	    'AR' => 'ßÇäÏÇ',
+	    'CA' => 'Canada',
 	    'DA' => 'Canada',
 	    'DE' => 'Kanada',
 	    'EL' => 'ÊáíáäÜò',
 	    'EO' => 'Kanado',
-	    'ES' => 'Canada',
+	    'ES' => 'Canadá',
 	    'FI' => 'Kanada',
 	    'FR' => 'Canada',
 	    'HR' => 'Kanada',
@@ -173,7 +207,8 @@
            },
    'CH' => {'EN' => 'Switzerland',
 	    'AR' => 'Switzerland',
-	    'DA' => 'Switzerland',
+	    'CA' => 'Suïssa',
+	    'DA' => 'Svejts',
 	    'DE' => 'Schweiz',
 	    'EL' => 'Åëâåôßá',
 	    'EO' => 'Switzerland',
@@ -181,14 +216,14 @@
 	    'FI' => 'Sveitsi',
 	    'FR' => 'Suisse',
 	    'HR' => '©vicarska',
-	    'HU' => 'Switzerland',
+	    'HU' => 'Svájc',
 	    'IT' => 'Svizzera',
 	    'JA' => '¥¹¥¤¥¹',
 	    'KO' => 'Switzerland',
 	    'NL' => 'Zwitserland',
 	    'NO' => 'Sveits',
 	    'PL' => 'Szwajcaria',
-	    'PT' => 'Switzerland',
+	    'PT' => 'Suíça',
 	    'RO' => 'Elveþia',
 	    'RU' => 'û×ÅÊÃÁÒÉÑ',
 	    'SV' => 'Schweiz',
@@ -197,6 +232,7 @@
            },
    'CL' => {'EN' => 'Chile',
  	    'AR' => 'Ôíáí',
+ 	    'CA' => 'Xile',
  	    'DA' => 'Chile',
  	    'DE' => 'Chile',
  	    'EL' => '×éëÞ',
@@ -221,7 +257,8 @@
            },
    'CN' => {'EN' => 'China',
 	    'AR' => 'China',
-	    'DA' => 'China',
+	    'CA' => 'Xina',
+	    'DA' => 'Kina',
 	    'DE' => 'China',
 	    'EL' => 'Êßíá',
 	    'EO' => 'China',
@@ -229,7 +266,7 @@
 	    'FI' => 'Kiina',
 	    'FR' => 'Chine',
 	    'HR' => 'Kina',
-	    'HU' => 'China',
+	    'HU' => 'Kína',
 	    'IT' => 'Cina',
 	    'JA' => 'Ãæ¹ñ',
 	    'KO' => 'China',
@@ -241,10 +278,11 @@
 	    'RU' => 'ëÉÔÁÊ',
 	    'SV' => 'Kina',
 	    'TR' => 'Çin',
-	    'ZH' => 'China',
+	    'ZH' => '¤¤°ê¤j³°',
            },
    'CO' => {'EN' => 'Colombia',
 	    'AR' => 'Colombia',
+	    'CA' => 'Colòmbia',
 	    'DA' => 'Colombia',
 	    'DE' => 'Kolumbien',
 	    'EL' => 'Êïëïìâßá',
@@ -253,22 +291,23 @@
 	    'FI' => 'Kolumbia',
 	    'FR' => 'Colombie',
 	    'HR' => 'Kolumbija',
-	    'HU' => 'Colombia',
+	    'HU' => 'Kolumbia',
 	    'IT' => 'Colombia',
 	    'JA' => '¥³¥í¥ó¥Ó¥¢',
 	    'KO' => 'Colombia',
 	    'NL' => 'Colombia',
 	    'NO' => 'Colombia',
 	    'PL' => 'Kolumbia',
-	    'PT' => 'Colombia',
+	    'PT' => 'Colômbia',
 	    'RO' => 'Columbia',
 	    'RU' => 'ëÏÌÕÍÂÉÑ',
 	    'SV' => 'Colombia',
 	    'TR' => 'Kolombiya',
-	    'ZH' => 'Colombia',
+	    'ZH' => '­ô­Û¤ñ¨È',
            },
    'CR' => {'EN' => 'Costa Rica',
 	    'AR' => 'Costa Rica',
+	    'CA' => 'Costa Rica',
 	    'DA' => 'Costa Rica',
 	    'DE' => 'Costa Rica',
 	    'EL' => 'Êüóôá Ñßêá',
@@ -285,38 +324,40 @@
 	    'NO' => 'Costa Rica',
 	    'PL' => 'Kostaryka',
 	    'PT' => 'Costa Rica',
-	    'RO' => 'Costa Rica',
+	    'RO' => 'Costa&nbsp;Rica',
 	    'RU' => 'ëÏÓÔÁ-òÉËÁ',
 	    'SV' => 'Costa Rica',
 	    'TR' => 'Kostarika',
-	    'ZH' => 'Costa Rica',
+	    'ZH' => '­ô´µ¹F¥§¥[',
            },
    'CZ' => {'EN' => 'Czech Republic',
 	    'AR' => 'Czech Republic',
-	    'DA' => 'Czech Republic',
-	    'DE' => 'Czech Republic',
+	    'CA' => 'República Txeca',
+	    'DA' => 'Tjekkiet',
+	    'DE' => 'Tschechische Republik',
 	    'EL' => 'Ôóå÷éêÞ Äçìïêñáôßá',
 	    'EO' => 'Czech Republic',
 	    'ES' => 'República Checa',
 	    'FI' => 'Tsekki',
 	    'FR' => 'République Tchèque',
 	    'HR' => 'Èe¹ka',
-	    'HU' => 'Czech Republic',
+	    'HU' => 'Csehország',
 	    'IT' => 'Repubblica Ceca',
 	    'JA' => '¥Á¥§¥³',
 	    'KO' => 'Czech Republic',
 	    'NL' => 'Czech Republic',
 	    'NO' => 'Tsjekkia',
 	    'PL' => 'Czechy',
-	    'PT' => 'Czech Republic',
-	    'RO' => 'Republica Cehã',
+	    'PT' => 'República Tcheca',
+	    'RO' => 'Republica&nbsp;Cehã',
 	    'RU' => 'þÅÈÉÑ',
 	    'SV' => 'Tjeckien',
 	    'TR' => 'Çek Cum.',
-	    'ZH' => 'Czech Republic',
+	    'ZH' => '±¶§J¦@©M°ê',
            },
    'DE' => {'EN' => 'Germany',
 	    'AR' => 'ÃáãÇäíÇ',
+	    'CA' => 'Alemanya',
 	    'DA' => 'Tyskland',
 	    'DE' => 'Deutschland',
 	    'EL' => 'Ãåñìáíßá',
@@ -341,6 +382,7 @@
            },
    'DK' => {'EN' => 'Denmark',
 	    'AR' => 'ÏäãÇÑß',
+	    'CA' => 'Dinamarca',
 	    'DA' => 'Danmark',
 	    'DE' => 'Dänemark',
 	    'EL' => 'Äáíßá',
@@ -365,6 +407,7 @@
            },
    'DO' => {'EN' => 'Dominican Republic',
 	    'AR' => 'Dominican Republic',
+	    'CA' => 'Dominican Republic',
 	    'DA' => 'Dominican Republic',
 	    'DE' => 'Dominicanischen Republik',
 	    'EL' => 'Dominican Republic',
@@ -389,7 +432,8 @@
            },
    'EE' => {'EN' => 'Estonia',
 	    'AR' => 'Estonia',
-	    'DA' => 'Estonia',
+	    'CA' => 'Estònia',
+	    'DA' => 'Estland',
 	    'DE' => 'Estland',
 	    'EL' => 'Åóèïíßá',
 	    'EO' => 'Estonia',
@@ -397,22 +441,23 @@
 	    'FI' => 'Viro',
 	    'FR' => 'Estonie',
 	    'HR' => 'Estonija',
-	    'HU' => 'Estonia',
+	    'HU' => 'Észtország',
 	    'IT' => 'Estonia',
 	    'JA' => '¥¨¥¹¥È¥Ë¥¢',
 	    'KO' => 'Estonia',
 	    'NL' => 'Estonia',
 	    'NO' => 'Estland',
 	    'PL' => 'Estonia',
-	    'PT' => 'Estonia',
+	    'PT' => 'Estônia',
 	    'RO' => 'Estonia',
 	    'RU' => 'üÓÔÏÎÉÑ',
 	    'SV' => 'Estland',
 	    'TR' => 'Estonya',
-	    'ZH' => 'Estonia',
+	    'ZH' => '·R¨F¥§¨È',
            },
    'ES' => {'EN' => 'Spain',
 	    'AR' => 'ÇÓÈÇäíÇ',
+	    'CA' => 'Espanya',
 	    'DA' => 'Spanien',
 	    'DE' => 'Spanien',
 	    'EL' => 'Éóðáíßá',
@@ -437,6 +482,7 @@
            },
    'FI' => {'EN' => 'Finland',
 	    'AR' => 'ÝäáäÏÇ',
+	    'CA' => 'Finlàndia',
 	    'DA' => 'Finland',
 	    'DE' => 'Finland',
 	    'EL' => 'Öéíëáíäßá',
@@ -461,6 +507,7 @@
            },
    'FO' => {'EN' => 'Faroe Islands',
 	    'AR' => 'Faroe Islands',
+	    'CA' => 'Faroe Islands',
 	    'DA' => 'Faroe Islands',
 	    'DE' => 'Färöer-Inseln',
 	    'EL' => 'Faroe Islands',
@@ -485,6 +532,7 @@
            },
    'FR' => {'EN' => 'France',
 	    'AR' => 'ÝÑäÓÇ',
+	    'CA' => 'França',
 	    'DA' => 'Frankrig',
 	    'DE' => 'Frankreich',
 	    'EL' => 'Ãáëëßá',
@@ -501,7 +549,7 @@
 	    'NO' => 'Frankrike',
 	    'PL' => 'Francja',
 	    'PT' => 'França',
-	    'RO' => 'Franþa',
+	    'RO' => 'Fran&#163;a',
 	    'RU' => 'æÒÁÎÃÉÑ',
 	    'SV' => 'Frankrike',
 	    'TR' => 'Fransa',
@@ -509,6 +557,7 @@
            },
    'GB' => {'EN' => 'United Kingdom',
 	    'AR' => 'ÈÑíØÇäíå',
+	    'CA' => 'England',
 	    'DA' => 'England',
 	    'DE' => 'England',
 	    'EL' => 'Ì. Âñåôáíßá',
@@ -533,6 +582,7 @@
            },
    'GL' => {'EN' => 'Greenland',
 	    'AR' => 'Greenland',
+	    'CA' => 'Greenland',
 	    'DA' => 'Greenland',
 	    'DE' => 'Grönland',
 	    'EL' => 'Greenland',
@@ -555,8 +605,34 @@
 	    'TR' => 'Greenland',
 	    'ZH' => 'Greenland',
            },
+   'GR' => {'EN' => 'Greece',
+	    'AR' => 'íäÇä',
+	    'CA' => 'Grècia',
+	    'DA' => 'Grækenland',
+	    'DE' => 'Griechenland',
+	    'EL' => 'ÅëëÜäá',
+	    'EO' => 'Grekio',
+	    'ES' => 'Grecia',
+	    'FI' => 'Kreikka',
+	    'FR' => 'Grèce',
+	    'HR' => 'Grèka',
+	    'HU' => 'Görögország',
+	    'IT' => 'Grecia',
+	    'JA' => '¥®¥ê¥·¥ã',
+	    'KO' => '±×¸®½º',
+	    'NL' => 'Griekenland',
+	    'NO' => 'Hellas',
+	    'PL' => 'Grecja',
+	    'PT' => 'Grécia',
+	    'RO' => 'Grecia',
+	    'RU' => 'çÒÅÃÉÑ',
+	    'SV' => 'Grekland',
+	    'TR' => 'Yunanistan',
+	    'ZH' => '§Æþ',
+           },
    'HK' => {'EN' => 'Hong Kong',
 	    'AR' => 'åäß-ßä?',
+	    'CA' => 'Hong Kong',
 	    'DA' => 'Hong Kong',
 	    'DE' => 'Hong Kong',
 	    'EL' => '×ïíê Êïíê',
@@ -573,14 +649,40 @@
 	    'NO' => 'Hong Kong',
 	    'PL' => 'Hongkong',
 	    'PT' => 'Hong Kong',
-	    'RO' => 'Hong Kong',
+	    'RO' => 'Hong&nbsp;Kong',
 	    'RU' => 'çÏÎËÏÎÇ',
 	    'SV' => 'Hongkong',
 	    'TR' => 'Hong Kong',
 	    'ZH' => '­»´ä',
            },
+   'HR' => {'EN' => 'Croatia',
+	    'AR' => 'Croatia',
+	    'CA' => 'Croatia',
+	    'DA' => 'Kroatien',
+	    'DE' => 'Kroatien',
+	    'EL' => 'Kroatía',
+	    'EO' => 'Croatia',
+	    'ES' => 'Croacia',
+	    'FI' => 'Kroatia',
+	    'FR' => 'Croatie',
+	    'HR' => 'Hrvatska',
+	    'HU' => 'Horvatorszag',
+	    'IT' => 'Croazia',
+	    'JA' => 'Croatia',
+	    'KO' => 'Croatia',
+	    'NL' => 'Kroatië',
+	    'NO' => 'Kroatia',
+	    'PL' => 'Chorwacja',
+	    'PT' => 'Croácia',
+	    'RO' => 'Croatia',
+	    'RU' => 'èÏÒ×ÁÔÉÑ',
+	    'SV' => 'Kroatien',
+	    'TR' => 'Hýrvatistan',
+	    'ZH' => 'Croatia',
+           },
    'HU' => {'EN' => 'Hungary',
 	    'AR' => 'ãÌÑø',
+	    'CA' => 'Hongria',
 	    'DA' => 'Ungarn',
 	    'DE' => 'Ungarn',
 	    'EL' => 'Ïõããáñßá',
@@ -605,32 +707,34 @@
            },
    'ID' => {'EN' => 'Indonesia',
 	    'AR' => 'Indonesia',
-	    'DA' => 'Indonesia',
-	    'DE' => 'Indonesia',
+	    'CA' => 'Indonèsia',
+	    'DA' => 'Indonesien',
+	    'DE' => 'Indonesien',
 	    'EL' => 'Éíäïíçóßá',
 	    'EO' => 'Indonesia',
 	    'ES' => 'Indonesia',
 	    'FI' => 'Indonesia',
 	    'FR' => 'Indonésie',
 	    'HR' => 'Indonezija',
-	    'HU' => 'Indonesia',
+	    'HU' => 'Indonézia',
 	    'IT' => 'Indonesia',
 	    'JA' => '¥¤¥ó¥É¥Í¥·¥¢',
 	    'KO' => 'Indonesia',
 	    'NL' => 'Indonesië',
 	    'NO' => 'Indonesia',
 	    'PL' => 'Indonezja',
-	    'PT' => 'Indonesia',
+	    'PT' => 'Indonésia',
 	    'RO' => 'Indonezia',
 	    'RU' => 'éÎÄÏÎÅÚÉÑ',
 	    'SV' => 'Indonesien',
 	    'TR' => 'Endonezya',
-	    'ZH' => 'Indonesia',
+	    'ZH' => '¦L¥§',
            },
    'IE' => {'EN' => 'Ireland',
 	    'AR' => 'ÇÑáäÏÇ',
+	    'CA' => 'Irlanda',
 	    'DA' => 'Irland',
-	    'DE' => 'Ireland',
+	    'DE' => 'Irland',
 	    'EL' => 'Éñëáíäßá',
 	    'EO' => 'Ireland',
 	    'ES' => 'Irlandia',
@@ -644,7 +748,7 @@
 	    'NL' => 'Ierland',
 	    'NO' => 'Irland',
 	    'PL' => 'Irlandia',
-	    'PT' => 'Ireland',
+	    'PT' => 'Irlanda',
 	    'RO' => 'Irlanda',
 	    'RU' => 'éÒÌÁÎÄÉÑ',
 	    'SV' => 'Irland',
@@ -653,6 +757,7 @@
            },
    'IL' => {'EN' => 'Israel',
 	    'AR' => 'ÝáÓØíä',
+	    'CA' => 'Israel',
 	    'DA' => 'Israel',
 	    'DE' => 'Israel',
 	    'EL' => 'ÉóñáÞë',
@@ -677,7 +782,8 @@
            },
    'IN' => {'EN' => 'India',
 	    'AR' => 'åäÏ',
-	    'DA' => 'India',
+	    'CA' => 'Índia',
+	    'DA' => 'Indien',
 	    'DE' => 'Indien',
 	    'EL' => 'Éíäßá',
 	    'EO' => 'Hindio',
@@ -692,7 +798,7 @@
 	    'NL' => 'Indië',
 	    'NO' => 'India',
 	    'PL' => 'Indie',
-	    'PT' => 'India',
+	    'PT' => 'Índia',
 	    'RO' => 'India',
 	    'RU' => 'éÎÄÉÑ',
 	    'SV' => 'Indien',
@@ -701,6 +807,7 @@
            },
    'IS' => {'EN' => 'Iceland',
 	    'AR' => 'ÇÓáäÏÇ',
+	    'CA' => 'Islàndia',
 	    'DA' => 'Island',
 	    'DE' => 'Island',
 	    'EL' => 'Éóëáíäßá',
@@ -725,6 +832,7 @@
            },
    'IT' => {'EN' => 'Italy',
 	    'AR' => 'ÇØÇáíå',
+	    'CA' => 'Itàlia',
 	    'DA' => 'Italien',
 	    'DE' => 'Italien',
 	    'EL' => 'Éôáëßá',
@@ -749,6 +857,7 @@
            },
    'JP' => {'EN' => 'Japan',
 	    'AR' => 'íÈÇä',
+	    'CA' => 'Japó',
 	    'DA' => 'Japan',
 	    'DE' => 'Japan',
 	    'EL' => 'Éáðùíßá',
@@ -773,6 +882,7 @@
            },
    'KR' => {'EN' => 'Korea',
 	    'AR' => 'ßÑíå',
+	    'CA' => 'Corea',
 	    'DA' => 'Korea',
 	    'DE' => 'Korea',
 	    'EL' => 'ÊïñÝá',
@@ -797,6 +907,7 @@
            },
    'LT' => {'EN' => 'Lithuania',
 	    'AR' => 'Lithuania',
+	    'CA' => 'Lithuania',
 	    'DA' => 'Lithuania',
 	    'DE' => 'Litauen',
 	    'EL' => 'Lithuania',
@@ -821,7 +932,8 @@
            },
    'LV' => {'EN' => 'Latvia',
 	    'AR' => 'Latvia',
-	    'DA' => 'Latvia',
+	    'CA' => 'Letònia',
+	    'DA' => 'Letland',
 	    'DE' => 'Lettland',
 	    'EL' => 'Ëåôôïíßá',
 	    'EO' => 'Latvia',
@@ -829,22 +941,23 @@
 	    'FI' => 'Latvia',
 	    'FR' => 'Lettonie',
 	    'HR' => 'Latvija',
-	    'HU' => 'Latvia',
-	    'IT' => 'Latvia',
+	    'HU' => 'Lettország',
+	    'IT' => 'Lettonia',
 	    'JA' => '¥é¥È¥ô¥£¥¢',
 	    'KO' => 'Latvia',
 	    'NL' => 'Letland',
 	    'NO' => 'Latvia',
 	    'PL' => 'Litwa',
-	    'PT' => 'Latvia',
+	    'PT' => 'Letônia',
 	    'RO' => 'Letonia',
 	    'RU' => 'ìÁÔ×ÉÑ',
 	    'SV' => 'Lettland',
 	    'TR' => 'Latvia',
-	    'ZH' => 'Latvia',
+	    'ZH' => '©Ô²æºû¨È',
            },
    'MX' => {'EN' => 'Mexico',
 	    'AR' => 'ãßÓíß',
+	    'CA' => 'Mèxic',
 	    'DA' => 'Mexico',
 	    'DE' => 'Mexiko',
 	    'EL' => 'Ìåîéêü',
@@ -869,6 +982,7 @@
            },
    'NL' => {'EN' => 'Netherlands',
 	    'AR' => 'åáäÏÇ',
+	    'CA' => 'Països Baixos',
 	    'DA' => 'Holland',
 	    'DE' => 'Niederlande',
 	    'EL' => 'Ïëëáíäßá',
@@ -893,6 +1007,7 @@
            },
    'NO' => {'EN' => 'Norway',
 	    'AR' => 'äÑæíÌ',
+	    'CA' => 'Noruega',
 	    'DA' => 'Norge',
 	    'DE' => 'Norwegen',
 	    'EL' => 'Íïñâçãßá',
@@ -908,7 +1023,7 @@
 	    'NL' => 'Noorwegen',
 	    'NO' => 'Norge',
 	    'PL' => 'Norwegia',
-	    'PT' => 'Norway',
+	    'PT' => 'Noruega',
 	    'RO' => 'Norvegia',
 	    'RU' => 'îÏÒ×ÅÇÉÑ',
 	    'SV' => 'Norge',
@@ -917,6 +1032,7 @@
            },
    'NZ' => {'EN' => 'New Zealand',
 	    'AR' => 'ÒáäÏÇ ÇáÌÏíÏÉ',
+	    'CA' => 'Nova Zelanda',
 	    'DA' => 'New Zealand',
 	    'DE' => 'Neuseeland',
 	    'EL' => 'Íåá Æçëáíäßá',
@@ -933,7 +1049,7 @@
 	    'NO' => 'New Zealand',
 	    'PL' => 'Nowa Zelandia',
 	    'PT' => 'Nova Zelândia',
-	    'RO' => 'Noua Zeelandã',
+	    'RO' => 'Noua&nbsp;Zeelandã',
 	    'RU' => 'îÏ×ÁÑ úÅÌÁÎÄÉÑ',
 	    'SV' => 'Nya Zeeland',
 	    'TR' => 'Yeni Zellanda',
@@ -941,6 +1057,7 @@
            },
    'PL' => {'EN' => 'Poland',
 	    'AR' => 'ÈáæäíÇ',
+	    'CA' => 'Polònia',
 	    'DA' => 'Polen',
 	    'DE' => 'Polen',
 	    'EL' => 'Ðïëùíßá',
@@ -965,6 +1082,7 @@
            },
    'PT' => {'EN' => 'Portugal',
 	    'AR' => 'ÈÑÊÛÇá',
+	    'CA' => 'Portugal',
 	    'DA' => 'Portugal',
 	    'DE' => 'Portugal',
 	    'EL' => 'Ðïñôïãáëßá',
@@ -989,8 +1107,9 @@
            },
    'RO' => {'EN' => 'Romania',
 	    'AR' => 'Romania',
-	    'DA' => 'Romania',
-	    'DE' => 'Romänien',
+	    'CA' => 'Romania',
+	    'DA' => 'Romænien',
+	    'DE' => 'Rumänien',
 	    'EL' => 'Ñïõìáíßá',
 	    'EO' => 'Romania',
 	    'ES' => 'Rumania',
@@ -1004,15 +1123,16 @@
 	    'NL' => 'Roemenië',
 	    'NO' => 'Romania',
 	    'PL' => 'Rumunia',
-	    'PT' => 'Romania',
-	    'RO' => 'România',
+	    'PT' => 'Romênia',
+	    'RO' => 'Rom&acirc;nia',
 	    'RU' => 'òÕÍÙÎÉÑ',
 	    'SV' => 'Rumänien',
 	    'TR' => 'Romanya',
-	    'ZH' => 'Romania',
+	    'ZH' => 'ù°¨¥§¨È',
            },
    'RU' => {'EN' => 'Russia',
 	    'AR' => 'ÑæÓíÇ',
+	    'CA' => 'Rússia',
 	    'DA' => 'Rusland',
 	    'DE' => 'Rußland',
 	    'EL' => 'Ñùóßá',
@@ -1037,57 +1157,60 @@
            },
    'SA' => {'EN' => 'Saudi Arabia',
 	    'AR' => 'Saudi Arabia',
-	    'DA' => 'Saudi Arabia',
-	    'DE' => 'Saudi Arabia',
+	    'CA' => 'Aràbia Saudita',
+	    'DA' => 'Saudi-Arabien',
+	    'DE' => 'Saudi Arabien',
 	    'EL' => 'ÓáïõäéêÞ Áñáâßá',
 	    'EO' => 'Saudi Arabia',
 	    'ES' => 'Arabia Saudí',
 	    'FI' => 'Saudi-Arabia',
 	    'FR' => 'Arabie Saoudite',
 	    'HR' => 'Saudijska Arabija',
-	    'HU' => 'Saudi Arabia',
+	    'HU' => 'Szaud Arábia',
 	    'IT' => 'Arabia Saudita',
 	    'JA' => '¥µ¥¦¥¸¥¢¥é¥Ó¥¢',
 	    'KO' => 'Saudi Arabia',
 	    'NL' => 'Saoedi Arabië',
 	    'NO' => 'Saudiarabia',
 	    'PL' => 'Arabia Saudyjska',
-	    'PT' => 'Saudi Arabia',
-	    'RO' => 'Arabia Sauditã',
+	    'PT' => 'Arábia Saudita',
+	    'RO' => 'Arabia&nbsp;Sauditã',
 	    'RU' => 'óÁÕÄÏ×ÓËÁÑ áÒÁ×ÉÑ',
 	    'SV' => 'Saudiarabien',
 	    'TR' => 'Suudi Arabistan',
-	    'ZH' => 'Saudi Arabia',
+	    'ZH' => '¨F¦aªü©Ô§B',
            },
    'SE' => {'EN' => 'Sweden',
+            'AR' => 'ÓæíÏ',
+            'CA' => 'Suècia',
+            'DA' => 'Sverige',
+            'DE' => 'Schweden',
             'EL' => 'Óïõçäßá',
-            'RO' => 'Suedia',
-            'IT' => 'Svezia',
             'EO' => 'Svedio',
-            'TR' => 'Ýsveç',
-            'FI' => 'Ruotsi',
-            'PT' => 'Suécia',
             'ES' => 'Suecia',
+            'FI' => 'Ruotsi',
             'FR' => 'Suède',
-            'NL' => 'Zweden',
             'HR' => '©vedska',
-            'DE' => 'Schweden',
-            'DA' => 'Sverige',
-            'NO' => 'Sverige',
+            'HU' => 'Svédország',
+            'IT' => 'Svezia',
             'JA' => '¥¹¥¦¥§¡¼¥Ç¥ó',
-            'ZH' => '·ç¨å',
-            'SV' => 'Sverige',
             'KO' => '½º¿þµ§',
+            'NL' => 'Zweden',
+            'NO' => 'Sverige',
             'PL' => 'Szwecja',
-            'HU' => 'Svédország',
-            'AR' => 'ÓæíÏ',
+            'PT' => 'Suécia',
+            'RO' => 'Suedia',
             'RU' => 'û×ÅÃÉÑ',
+            'SV' => 'Sverige',
+            'TR' => 'Ýsveç',
+            'ZH' => '·ç¨å',
            },
-   'SG' => {'AR' => 'Óä??æÑ',
+   'SG' => {'EN' => 'Singapore',
+	    'AR' => 'Óä??æÑ',
+	    'CA' => 'Singapur',
 	    'DA' => 'Singapore',
-	    'DE' => 'Singapore',
+	    'DE' => 'Singapur',
 	    'EL' => 'Óéíãêáðïýñç',
-	    'EN' => 'Singapore',
 	    'EO' => 'Singapore',
 	    'ES' => 'Singapur',
 	    'FI' => 'Singapore',
@@ -1100,7 +1223,7 @@
 	    'NL' => 'Singapore',
 	    'NO' => 'Singapore',
 	    'PL' => 'Singapur',
-	    'PT' => 'Singapore',
+	    'PT' => 'Singapura',
 	    'RO' => 'Singapore',
 	    'RU' => 'óÉÎÇÁÐÕÒ',
 	    'SV' => 'Singapore',
@@ -1109,48 +1232,48 @@
            },
    'SI' => {'EN' => 'Slovenia',
 	    'AR' => 'Slovenia',
-	    'DA' => 'Slovenia',
-	    'DE' => 'Slovenia',
+	    'CA' => 'Eslovènia',
+	    'DA' => 'Slovenien',
+	    'DE' => 'Slowenien',
 	    'EL' => 'Óëïâåíßá',
 	    'EO' => 'Slovenia',
 	    'ES' => 'Eslovenia',
 	    'FI' => 'Slovenia',
 	    'FR' => 'Slovénie',
 	    'HR' => 'Slovenija',
-	    'HU' => 'Slovenia',
+	    'HU' => 'Szlovénia',
 	    'IT' => 'Slovenia',
 	    'JA' => '¥¹¥í¥Ù¥Ë¥¢',
 	    'KO' => 'Slovenia',
 	    'NL' => 'Slovenië',
 	    'NO' => 'Slovenia',
 	    'PL' => 'S³owenia',
-	    'PT' => 'Slovenia',
+	    'PT' => 'Eslovênia',
 	    'RO' => 'Slovenia',
 	    'RU' => 'óÌÏ×ÅÎÉÑ',
 	    'SV' => 'Slovenien',
 	    'TR' => 'Slovenya',
-	    'ZH' => 'Slovenia',
+	    'ZH' => '´µ¬¥ªk¥§¨È',
            },
    'SK' => {'EN' => 'Slovakia',
 	    'AR' => 'Slovakia',
-	    'DA' => 'Slovakia',
-	    'DE' => 'Slovakia',
+	    'CA' => 'Eslovàquia',
+	    'DA' => 'Slovakiet',
+	    'DE' => 'Slovakei',
 	    'EL' => 'Óëïâáêßá',
 	    'EO' => 'Slovakia',
 	    'ES' => 'República Eslovaca',
-	    'ES' => 'Slovakia',
 	    'FI' => 'Slovakia',
 	    'FR' => 'République Slovaque',
 	    'HR' => 'Slovaèka',
-	    'HU' => 'Slovakia',
+	    'HU' => 'Szlovákia',
 	    'IT' => 'Slovacca',
 	    'JA' => '¥¹¥í¥Ð¥­¥¢',
 	    'KO' => 'Slovakia',
 	    'NL' => 'Slovakije',
 	    'NO' => 'Slovakia',
 	    'PL' => 'S³owacja',
-	    'PT' => 'Slovak Republic',
-	    'PT' => 'Slovakia',
+	    'PT' => 'Eslováquia',
 	    'RO' => 'Slovacia',
 	    'RU' => 'óÌÏ×ÁËÉÑ',
 	    'SV' => 'Slovakien',
@@ -1159,6 +1282,7 @@
            },
    'TH' => {'EN' => 'Thailand',
 	    'AR' => 'Thailand',
+	    'CA' => 'Tailàndia',
 	    'DA' => 'Thailand',
 	    'DE' => 'Thailand',
 	    'EL' => 'ÔáúëÜíäç',
@@ -1167,22 +1291,23 @@
 	    'FI' => 'Thaimaa',
 	    'FR' => 'Thaïlande',
 	    'HR' => 'Tajland',
-	    'HU' => 'Thailand',
+	    'HU' => 'Thaiföld',
 	    'IT' => 'Tailandia',
 	    'JA' => '¥¿¥¤',
 	    'KO' => 'Thailand',
 	    'NL' => 'Thailand',
 	    'NO' => 'Thailand',
 	    'PL' => 'Tajlandia',
-	    'PT' => 'Thailand',
+	    'PT' => 'Tailândia',
 	    'RO' => 'Tailanda',
 	    'RU' => 'ôÁÊÌÁÎÄ',
 	    'SV' => 'Thailand',
 	    'TR' => 'Tayland',
-	    'ZH' => 'Thailand',
+	    'ZH' => '®õ°ê',
            },
    'TR' => {'EN' => 'Turkey',
 	    'AR' => 'ÊÑßíå',
+	    'CA' => 'Turquia',
 	    'DA' => 'Tyrkiet',
 	    'DE' => 'Türkei',
 	    'EL' => 'Ôïõñêßá',
@@ -1207,6 +1332,7 @@
            },
    'TW' => {'EN' => 'Taiwan',
 	    'AR' => 'ÊíæÇä',
+	    'CA' => 'Taiwan',
 	    'DA' => 'Taiwan',
 	    'DE' => 'Taiwan',
 	    'EL' => 'ÔáéâÜí',
@@ -1232,7 +1358,8 @@
 # TODO: what's the point of having both UK and GB when they're the same?
    'UK' => {'EN' => 'United Kingdom',
 	    'AR' => 'ÈÑíØÇäíå',
-	    'DA' => 'England',
+	    'CA' => 'Regne Unit',
+	    'DA' => 'Storbritannien',
 	    'DE' => 'England',
 	    'EL' => 'Ì. Âñåôáíßá',
 	    'EO' => 'Britio',
@@ -1245,10 +1372,10 @@
 	    'JA' => '¥¤¥®¥ê¥¹',
 	    'KO' => '¿µ±¹',
 	    'NL' => 'Verenigd Koninkrijk',
-	    'NO' => 'Storbritania',
+	    'NO' => 'Storbritannia',
 	    'PL' => 'Wielka Brytania',
 	    'PT' => 'Reino Unido',
-	    'RO' => 'Marea Britanie',
+	    'RO' => 'Marea&nbsp;Britanie',
 	    'RU' => '÷ÅÌÉËÏÂÒÉÔÁÎÉÑ',
 	    'SV' => 'Storbritannien',
 	    'TR' => 'Ýngiltere',
@@ -1256,8 +1383,9 @@
            },
    'US' => {'EN' => 'United States',
 	    'AR' => 'ÇáæáÇíÇÊ ÇáãÊøÍÏå',
+	    'CA' => 'Estats Units',
 	    'DA' => 'USA',
-	    'DE' => 'US Amerika',
+	    'DE' => 'Vereinigte Staaten',
 	    'EL' => 'Çí. Ðïëéôåßåò',
 	    'EO' => 'Usono',
 	    'ES' => 'Estados Unidos',
@@ -1269,10 +1397,10 @@
 	    'JA' => '¥¢¥á¥ê¥«¹ç½°¹ñ',
 	    'KO' => '¹Ì±¹',
 	    'NL' => 'Verenigde Staten',
-	    'NO' => 'Forente Stater',
+	    'NO' => 'Forente stater',
 	    'PL' => 'Stany Zjednoczone',
 	    'PT' => 'Estados Unidos',
-	    'RO' => 'Statele Unite',
+	    'RO' => 'Statele&nbsp;Unite',
 	    'RU' => 'óûá',
 	    'SV' => 'Förenta staterna',
 	    'TR' => 'A.B.D.',
@@ -1280,6 +1408,7 @@
            },
    'VE' => {'EN' => 'Venezuela',
 	    'AR' => 'Venezuela',
+	    'CA' => 'Venezuela',
 	    'DA' => 'Venezuela',
 	    'DE' => 'Venezuela',
 	    'EL' => 'ÂåíåæïõÝëá',
@@ -1300,10 +1429,11 @@
 	    'RU' => '÷ÅÎÅÓÕÜÌÁ',
 	    'SV' => 'Venezuela',
 	    'TR' => 'Venezuela',
-	    'ZH' => 'Venezuela',
+	    'ZH' => '©e¤º·ç©Ô',
            },
    'YU' => {'EN' => 'Yugoslavia',
 	    'AR' => 'Yugoslavia',
+	    'CA' => 'Yugoslavia',
 	    'DA' => 'Yugoslavia',
 	    'DE' => 'Jugoslawien',
 	    'EL' => 'Yugoslavia',
@@ -1328,6 +1458,7 @@
            },
    'ZA' => {'EN' => 'South Africa',
 	    'AR' => 'ÇÝÑíÞíÇ ÇáÌäæÈíÉ',
+	    'CA' => 'Sud-àfrica',
 	    'DA' => 'Sydafrika',
 	    'DE' => 'Südafrika',
 	    'EL' => 'Íüôéá ÁöñéêÞ',
@@ -1343,12 +1474,28 @@
 	    'NL' => 'Zuid Afrika',
 	    'NO' => 'Sørafrika',
 	    'PL' => 'RPA',
-	    'PT' => 'África do sul',
-	    'RO' => 'Africa de Sud',
+	    'PT' => 'África do Sul',
+	    'RO' => 'Africa&nbsp;de&nbsp;Sud',
 	    'RU' => 'àÖÎÁÑ áÆÒÉËÁ',
 	    'SV' => 'Sydafrika',
 	    'TR' => 'Güney Afrika',
 	    'ZH' => '«n«D',
            },
   );
+
+#     These lines generate the countries.def file, only when this file
+#     is processed through
+#         sed -e /^#/d countries.wml | eperl -B '<:' -E ':>' - >/dev/null
+#     WML will skip this block
+if ('$(DUMMY_VAR_DO_NOT_REMOVE)' ne '') {
+    open(GEN, "> countries.def");
+    print GEN "#   File generated automatically.  Do not edit!\n";
+    foreach my $c (sort keys %countries) {
+        print GEN "<"."define-tag ".$c."c endtag=delete>\n";
+        foreach my $t (sort keys %{$countries{$c}}) {
+            print GEN "    [".$t.":".$countries{$c}{$t}.":]\n";
+        }
+        print GEN "<"."/define-tag>\n";
+    }
+}
 :>

Reply to: