Hi, in languagechooser, the country codes (ISO-3166) are used in lower case. They should be uppercase, as it makes them easier to differentiate from language codes, and process. Attached is a patch to do this. Any objections if I submit it to CVS? Regards, Alastair -- Alastair McKinstry <mckinstry@computer.org> GPG Key fingerprint = 9E64 E714 8E08 81F9 F3DC 1020 FA8E 3790 9051 38F4 He that would make his own liberty secure must guard even his enemy from oppression; for if he violates this duty he establishes a precedent that will reach to himself. - --Thomas Paine
diff -urN languagechooser/CVS/Entries languagechooser.new/CVS/Entries
--- languagechooser/CVS/Entries 2003-02-06 18:45:17.000000000 +0000
+++ languagechooser.new/CVS/Entries 2003-01-19 22:25:08.000000000 +0000
@@ -3,4 +3,4 @@
/README.trans/1.2/Tue Dec 17 00:33:17 2002//
/languagechooser/1.8/Sat Dec 21 23:07:21 2002//
/prebaseconfig/1.1/Sun Dec 15 23:30:47 2002//
-D
+D/debian////
diff -urN languagechooser/CVS/Entries.Log languagechooser.new/CVS/Entries.Log
--- languagechooser/CVS/Entries.Log 2003-02-06 18:45:17.000000000 +0000
+++ languagechooser.new/CVS/Entries.Log 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-A D/debian////
diff -urN languagechooser/debian/CVS/Entries languagechooser.new/debian/CVS/Entries
--- languagechooser/debian/CVS/Entries 2003-02-06 18:45:18.000000000 +0000
+++ languagechooser.new/debian/CVS/Entries 2003-01-19 22:25:08.000000000 +0000
@@ -6,4 +6,4 @@
/postinst/1.1/Sun Dec 15 23:30:47 2002//
/rules/1.3/Wed Jan 15 15:30:46 2003//
/templates/1.11/Fri Dec 20 09:28:48 2002//
-D
+D/po////
diff -urN languagechooser/debian/CVS/Entries.Log languagechooser.new/debian/CVS/Entries.Log
--- languagechooser/debian/CVS/Entries.Log 2003-02-06 18:45:18.000000000 +0000
+++ languagechooser.new/debian/CVS/Entries.Log 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-A D/po////
diff -urN languagechooser/debian/files languagechooser.new/debian/files
--- languagechooser/debian/files 1970-01-01 01:00:00.000000000 +0100
+++ languagechooser.new/debian/files 2003-01-24 14:05:11.000000000 +0000
@@ -0,0 +1 @@
+languagechooser_0.013_all.udeb debian-installer standard
diff -urN languagechooser/debian/languagechooser/DEBIAN/control languagechooser.new/debian/languagechooser/DEBIAN/control
--- languagechooser/debian/languagechooser/DEBIAN/control 1970-01-01 01:00:00.000000000 +0100
+++ languagechooser.new/debian/languagechooser/DEBIAN/control 2003-01-24 14:05:11.000000000 +0000
@@ -0,0 +1,11 @@
+Package: languagechooser
+Version: 0.013
+Section: debian-installer
+Priority: standard
+Architecture: all
+Provides: language-selected
+Installed-Size: 56
+Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
+Description: Choose language
+ This package provides a language chooser for the Debian installer.
+installer-menu-item: 10
diff -urN languagechooser/debian/languagechooser/DEBIAN/postinst languagechooser.new/debian/languagechooser/DEBIAN/postinst
--- languagechooser/debian/languagechooser/DEBIAN/postinst 1970-01-01 01:00:00.000000000 +0100
+++ languagechooser.new/debian/languagechooser/DEBIAN/postinst 2003-01-24 14:05:11.000000000 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+PATH=$PATH:.
+
+languagechooser
+
+exit 0
diff -urN languagechooser/debian/languagechooser/DEBIAN/postrm languagechooser.new/debian/languagechooser/DEBIAN/postrm
--- languagechooser/debian/languagechooser/DEBIAN/postrm 1970-01-01 01:00:00.000000000 +0100
+++ languagechooser.new/debian/languagechooser/DEBIAN/postrm 2003-01-24 14:05:11.000000000 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+# Automatically added by dh_installdebconf
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_purge
+fi
+# End automatically added section
diff -urN languagechooser/debian/languagechooser/DEBIAN/templates languagechooser.new/debian/languagechooser/DEBIAN/templates
--- languagechooser/debian/languagechooser/DEBIAN/templates 1970-01-01 01:00:00.000000000 +0100
+++ languagechooser.new/debian/languagechooser/DEBIAN/templates 2003-01-24 14:05:10.000000000 +0000
@@ -0,0 +1,122 @@
+Template: debian-installer/locale
+Type: select
+Choices: nb_NO, nn_NO, se_NO, lv_LV
+Default: nb_NO
+Description: Select locale
+ Please select which locale you would like to use.
+Description-fr.UTF-8: Choix de la localisation
+ Veuillez sélectionner la localisation que vous souhaitez utiliser.
+Description-nb.UTF-8: Velg locale
+ Vennligst velg hvilket locale du ønsker å bruke.
+Description-nl.UTF-8: Selecteer taalgebied
+ Selecteer welk taalgebied u wilt gebruiken.
+Description-pt_BR.UTF-8: Selecione o locale
+ Por favor selecione o locale que você gostaria de usar.
+
+Template: languagechooser/language-first
+Type: select
+Choices: [da] Danish, [de] German, [en] English, [es] Spanish, [fr] French, [nb] Norwegian Bokmal, [nl] Dutch, [pt_BR] Brazilian Portuguese, [ru] Russian, [sv] Swedish
+Choices-fr.UTF-8: [da] danois, [de] allemand, [en] anglais, [es] espagnol, [fr] français, [nb] Norvégien bokmâl, [nl] néerlandais, [pt_BR] portugais tel qu'on le parle au Brésil, [ru] russe, [sv] suédois
+Choices-nl.UTF-8: [da] Deens, [de] Duits, [en] Engels, [es] Spaans, [fr] Frans, [nb] Bokmal noors, [nl] Nederlands, [pt_BR] Braziliaans Portugees, [ru] Russisch, [sv] Zweeds
+Choices-pt_BR.UTF-8: [da] Dinamarquês, [de] Alemão, [en] Inglês, [es] Espanhol, [fr] Francês, [nb] Norueguês Bokmal, [nl] Holandês, [pt_BR] Português Brasileiro, [ru] Russo, [sv] Sueco
+Default: [en] English
+Default-fr.UTF-8: [fr] French
+Default-nb.UTF-8: [nb] Norwegian Bokmal
+Default-nl.UTF-8: [nl] Dutch
+Default-pt_BR.UTF-8: [pt_BR] Brazilian Portuguese
+Description: Select language
+ Default installation language is English, but you can select another to
+ perform installation. Questions will be displayed in this language if
+ they have been translated, or English otherwise.
+ .
+ Languages are sorted accordingly to their international language code.
+ .
+ Please select which language you would like to use.
+Description-fr.UTF-8: Choisissez une langue
+ La langue d'installation par défaut est l'anglais, mais vous pouvez en
+ choisir une autre pour l'installation. Les questions seront affichées
+ dans cette langue, si les messages ont été traduits, en anglais dans le
+ cas contraire.
+ .
+ Les langues sont classées selon l'ordre de leurs sigles internationaux.
+ .
+ Choisissez la langue que vous souhaitez utiliser.
+Description-pt_BR.UTF-8: Selecione o idioma
+ O idioma de instalação padrão é o Português do Brasil, mas você pode
+ selecionar outro idioma para executar a instalação. As perguntas serão
+ exibidas caso tenham sido traduzidas ou o Inglês será utilizado.
+ .
+ Os idiomas estão ordenados de acordo com seu código de idioma
+ internacional.
+ .
+ Por favor selecione o idioma que você gostaria de usar.
+
+Template: languagechooser/language-addtolist
+Type: select
+Choices: ${list}, Reset, Remove last entry, Finish
+Choices-fr.UTF-8: ${list}, Réinitialiser, Enlever la dernière entrée, Terminer
+Choices-nl.UTF-8: ${list}, Resetten, Laatste verwijderen, Voltooien
+Choices-pt_BR.UTF-8: ${list}, Reiniciar, Remover última entrada, Finalizar
+Default: Finish
+Description: Select alternate languages
+ You can select several languages, in which case translated questions
+ will be searched for in turn, and the first one available is displayed.
+ For instance, Norwegian people may select
+ no:nb:nn:dk:sv
+ to see translated questions in Norwegian, Norwegian Bokmal, Norwegian
+ Nynorsk, Danish or Swedish. When no translation is available, original
+ English question is displayed.
+ .
+ Your current language selection is:
+ ${LANGUAGE}
+ .
+ You can add another language, remove the last entry, reset this list, or
+ finish.
+
+Template: languagechooser/country-name
+Type: select
+Choices: Other, [at] Austria, [au] Australia, [be] Belgium, [bg] Bulgaria, [br] Brazil, [by] Belarus, [ca] Canada, [ch] Switzerland, [cl] Chile, [cn] China, [cr] Costa Rica, [cz] Czech Republic, [de] Germany, [dk] Denmark, [ee] Estonia, [es] Spain, [fi] Finland, [fr] France, [gb] Great Britain, [gr] Greece, [hk] Hong Kong, [hr] Croatia, [hu] Hungary, [id] Indonesia, [ie] Ireland, [il] Israel, [in] India, [is] Iceland, [it] Italy, [jp] Japan, [kr] Korea, [lt] Lithuania, [lu] Luxembourg, [lv] Latvia, [mx] Mexico, [nl] Netherlands, [no] Norway, [nz] New Zealand, [pe] Peru, [pl] Poland, [pt] Portugal, [ru] Russia, [se] Sweden, [sg] Singapore, [si] Slovenia, [sk] Slovakia, [th] Thailand, [tr] Turkey, [tw] Taiwan, [ua] Ukraine, [us] United States, [za] South Africa
+Choices-fr.UTF-8: Autre, [at] Autriche, [au] Australie, [be] Belgique, [bg] Bulgarie, [br] Brésil, [by] Biélorussie, [ca] Canada, [ch] Suisse, [cl] Chili, [cn] Chine, [cr] Costa Rica, [cz] République Tchèque, [de] Allemagne, [dk] Danemark, [ee] Estonie, [es] Espagne, [fi] Finlande, [fr] France, [bg] Grande-Bretagne, [gr] Grèce, [hk] Hong-Kong, [hr] Croatie, [hu] Hongrie, [id] Indonésie, [ie] Irlande, [il] Israël, [in] Inde, [is] Islande, [it] Italie, [jp] Japon, [kr] Corée, [lt] Lituanie, [lu] Luxembourg, [lv] Lettonie, [mx] Mexique, [nl] Pays-Bas, [no] Norvège, [nz] Nouvelle-Zélande, [pe] Pérou, [pl] Pologne, [pt] Portugal, [ru] Russie, [se] Suède, [sg] Singapour, [si] Slovénie, [sk] Slovaquie, [th] Thaïlande, [tr] Turquie, [tw] Taïwan, [ua] Ukraine, [us] États-Unis d'Amérique, [za] Afrique du sud
+Choices-pt_BR.UTF-8: Outro, [at] Áustria, [au] Austrália, [be] Bélgica, [bg] Bulgária, [br] Brasil, [by] Belarus, [ca] Canadá, [ch] Suíça, [cl] Chile, [cn] China, [cr] Costa Rica, [cz] República Tcheca, [de] Alemanha, [dk] Dinamarca, [ee] Estônia, [es] Espanha, [fi] Finlândia, [fr] França, [gb] Grã-Bretanha, [gr] Grécia, [hk] Hong Kong, [hr] Croácia, [hu] Hungria, [id] Indonésia, [ie] Irlanda, [il] Israel, [in] Índia, [is] Islândia, [it] Itália, [jp] Japão, [kr] Coréia, [lt] Lituânia, [lu] Luxemburgo, [lv] Latvia, [mx] México, [nl] Holanda, [no] Noruega, [nz] Nova Zelândia, [pe] Peru, [pl] Polônia, [pt] Portugal, [ru] Rússia, [se] Suécia, [sg] Singapura, [si] Eslovênia, [sk] Slováquia, [th] Tailândia, [tr] Turquia, [tw] Taiwan, [ua] Ucrânia, [us] Estados Unidos, [za] África do Sul
+Description: Select country
+ Please select in which country you are located. This affects the locale
+ and time zone setting.
+ .
+ Countries are sorted accordingly to their international country code.
+Description-fr.UTF-8: Sélectionnez un pays
+ Sélectionnez le pays dans lequel vous vous situez. Cela déterminera la
+ localisation et le fuseau horaire.
+ .
+ Les pays sont classés selon l'ordre de leurs sigles internationaux.
+Description-pt_BR.UTF-8: Selecione o país
+ Por favor selecione em qual país você reside. Esta seleção afeta as
+ configurações de locale e fuso horário.
+ .
+ Países são ordenados de acordo com seu código de país interncional.
+
+Template: languagechooser/no-backup
+Type: note
+Description: No Way
+ Previous state can not be retrieved. You have to select either "Reset"
+ or "Remove last entry" to cancel the last selection.
+
+Template: debian-installer/language
+Type: string
+Description: Internal use
+
+Template: debian-installer/country
+Type: string
+Description: Internal use
+
+Template: languagechooser/dummy-language-list-other
+Type: select
+Choices: [pt_BR] Brazilian Portuguese, [zh_CN] Chinese (Mainland China), [zh_HK] Chinese (Hong-Kong), [zh_TW] Chinese (Taiwan)
+Choices-fr.UTF-8: [pt_BR] portugais tel qu'on le parle au Brésil, [zh_CN] chinois (Chine), [zh_HK] chinois (Hong-Kong), [zh_TW] chinois (Taïwan)
+Choices-pt_BR.UTF-8: [pt_BR] Português Brasileiro, [zh_CN] Chinês (Continente China), [zh_HK] Chinês (Hong-Kong), [zh_TW] Chinês (Taiwan)
+Description: Internal use
+
+Template: languagechooser/dummy-language-list-iso-639
+Type: select
+Choices: [aa] Afar, [ab] Abkhazian, [ae] Avestan, [af] Afrikaans, [am] Amharic, [ar] Arabic, [as] Assamese, [ay] Aymara, [az] Azerbaijani, [ba] Bashkir, [be] Belarusian, [bg] Bulgarian, [bh] Bihari, [bi] Bislama, [bn] Bengali, [bo] Tibetan, [br] Breton, [bs] Bosnian, [ca] Catalan, [ce] Chechen, [ch] Chamorro, [co] Corsican, [cs] Czech, [cu] Church Slavic, [cv] Chuvash, [cy] Welsh, [da] Danish, [de] German, [dz] Dzongkha, [el] Greek (Modern: 1453-), [en] English, [eo] Esperanto, [es] Spanish, [et] Estonian, [eu] Basque, [fa] Persian, [fi] Finnish, [fj] Fijian, [fo] Faroese, [fr] French, [fy] Frisian, [ga] Irish, [gd] Gaelic, [gl] Gallegan, [gn] Guarani, [gu] Gujarati, [gv] Manx, [ha] Hausa, [he] Hebrew, [hi] Hindi, [ho] Hiri Motu, [hr] Croatian, [hu] Hungarian, [hy] Armenian, [hz] Herero, [ia] Interlingua, [id] Indonesian, [ie] Interlingue, [ii] Sichuan Yi, [ik] Inupiaq, [io] Ido, [is] Icelandic, [it] Italian, [iu] Inuktitut, [ja] Japanese, [jv] Javanese, [ka] Georgian, [ki] Kikuyu, [kj] Kuanyama, [kk] Kazakh, [kl] Kalaallisut, [km] Khmer, [kn] Kannada, [ko] Korean, [ks] Kashmiri, [ku] Kurdish, [kv] Komi, [kw] Cornish, [ky] Kirghiz, [la] Latin, [lb] Luxembourgish, [li] Limburgish, [ln] Lingala, [lo] Lao, [lt] Lithuanian, [lv] Latvian, [mg] Malagasy, [mh] Marshallese, [mi] Maori, [mk] Macedonian, [ml] Malayalam, [mn] Mongolian, [mo] Moldavian, [mr] Marathi, [ms] Malay, [mt] Maltese, [my] Burmese, [na] Nauru, [nb] Norwegian Bokmal, [nd] North Ndebele, [ne] Nepali, [ng] Ndonga, [nl] Dutch, [nn] Norwegian Nynorsk, [no] Norwegian, [nr] South Ndebele, [nv] Navaho, [ny] Nyanja, [oc] Occitan (post 1500), [om] Oromo, [or] Oriya, [os] Ossetian, [pa] Panjabi, [pi] Pali, [pl] Polish, [ps] Pushto, [pt] Portuguese, [qu] Quechua, [rm] Raeto-Romance, [rn] Rundi, [ro] Romanian, [ru] Russian, [rw] Kinyarwanda, [sa] Sanskrit, [sc] Sardinian, [sd] Sindhi, [se] Northern Sami, [sg] Sango, [si] Sinhalese, [sk] Slovak, [sl] Slovenian, [sm] Samoan, [sn] Shona, [so] Somali, [sq] Albanian, [sr] Serbian, [ss] Swati, [st] Sotho (Southern), [su] Sundanese, [sv] Swedish, [sw] Swahili, [ta] Tamil, [te] Telugu, [tg] Tajik, [th] Thai, [ti] Tigrinya, [tk] Turkmen, [tl] Tagalog, [tn] Tswana, [to] Tonga (Tonga Islands), [tr] Turkish, [ts] Tsonga, [tt] Tatar, [tw] Twi, [ty] Tahitian, [ug] Uighur, [uk] Ukrainian, [ur] Urdu, [uz] Uzbek, [vi] Vietnamese, [vo] Volapuk, [wa] Walloon, [wo] Wolof, [xh] Xhosa, [yi] Yiddish, [yo] Yoruba, [za] Zhuang, [zh] Chinese, [zu] Zulu
+Choices-fr.UTF-8: [aa] afar, [ab] abkhaze, [ae] avestique, [af] afrikaans, [am] amharique, [ar] arabe, [as] assamais, [ay] aymara, [az] azéri, [ba] bachkir, [be] biélorusse, [bg] bulgare, [bh] bihari, [bi] bichlamar, [bn] bengali, [bo] tibétain, [br] breton, [bs] bosniaque, [ca] catalan, [ce] tchétchène, [ch] chamorro, [co] corse, [cs] tchèque, [cu] slavon, [cv] tchouvache, [cy] gallois, [da] danois, [de] allemand, [dz] dzongkha, [el] grec moderne (après 1453), [en] anglais, [eo] espéranto, [es] espagnol, [et] estonien, [eu] basque, [fa] persan, [fi] finnois, [fj] fidjien, [fo] féroïen, [fr] français, [fy] frison, [ga] irlandais, [gd] gaélique, [gl] galicien, [gn] guarani, [gu] goudjrati, [gv] mannois, [ha] haoussa, [he] hébreu, [hi] hindi, [ho] hiri motu, [hr] croate, [hu] hongrois, [hy] arménien, [hz] herero, [ia] interlingua, [id] indonésien, [ie] interlingue, [ii] Sichuan Yi, [ik] inupiaq, [io] ido, [is] islandais, [it] italien, [iu] inuktitut, [ja] japonais, [jv] javanais, [ka] géorgien, [ki] kikuyu, [kj] kuanyama, [kk] kazakh, [kl] groenlandais, [km] khmer, [kn] kannada, [ko] coréen, [ks] kashmiri, [ku] kurde, [kv] komi, [kw] cornique, [ky] kirghize, [la] latin, [lb] luxembourgeois, [li] limbourgeois, [ln] lingala, [lo] lao, [lt] lituanien, [lv] letton, [mg] malgache, [mh] marshall, [mi] maori, [mk] macédonien, [ml] malayalam, [mn] mongol, [mo] moldave, [mr] marathe, [ms] malais, [mt] maltais, [my] birman, [na] nauruan, [nb] Norvégien bokmâl, [nd] ndébélé du Nord, [ne] népalais, [ng] ndonga, [nl] néerlandais, [nn] norvégien nynorsk, [no] norvégien, [nr] ndébélé du Sud, [nv] navaho, [ny] nyanja, [oc] occitan (après 1500), [om] galla, [or] oriya, [os] ossète, [pa] pendjabi, [pi] pali, [pl] polonais, [ps] pachto, [pt] portugais, [qu] quechua, [rm] rhéto-roman, [rn] rundi, [ro] roumain, [ru] russe, [rw] rwandais, [sa] sanskrit, [sc] sarde, [sd] sindhi, [se] sami du Nord, [sg] sango, [si] singhalais, [sk] slovaque, [sl] slovène, [sm] samoan, [sn] shona, [so] somali, [sq] albanais, [sr] serbe, [ss] swati, [st] sotho du Sud, [su] soudanais, [sv] suédois, [sw] swahili, [ta] tamoul, [te] télougou, [tg] tadjik, [th] thaï, [ti] tigrigna, [tk] turkmène, [tl] tagalog, [tn] tswana, [to] tongan (îles Tonga), [tr] turc, [ts] tsonga, [tt] tatar, [tw] twi, [ty] tahitien, [ug] ouïgour, [uk] ukrainien, [ur] ourdou, [uz] ouzbek, [vi] vietnamien, [vo] volapük, [wa] wallon, [wo] wolof, [xh] xhosa, [yi] yiddish, [yo] yoruba, [za] zhuang, [zh] chinois, [zu] zoulou
+Description: Internal use
diff -urN languagechooser/debian/languagechooser/usr/bin/languagechooser languagechooser.new/debian/languagechooser/usr/bin/languagechooser
--- languagechooser/debian/languagechooser/usr/bin/languagechooser 1970-01-01 01:00:00.000000000 +0100
+++ languagechooser.new/debian/languagechooser/usr/bin/languagechooser 2003-01-24 14:05:10.000000000 +0000
@@ -0,0 +1,131 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+logfile=/var/log/messages
+
+localecode="debian-installer/locale"
+languagecode="debian-installer/language"
+countrycode="debian-installer/country"
+
+log() {
+ echo "languagechooser: info: $*" >> $logfile
+}
+
+db_capb backup
+
+db_metaget "languagechooser/language-first" choices
+db_subst "languagechooser/language-addtolist" list "$RET"
+
+STATE=1
+
+while [ "$STATE" -gt 0 ]; do
+ # States 1 and 2 depend on $languagecode current value
+ db_get "$languagecode"
+ language="$RET"
+ case "${language}=$STATE" in
+ =[12])
+ STATE=1 ;;
+ *=[12])
+ STATE=2 ;;
+ esac
+
+ case "$STATE" in
+ 1)
+ db_fset "languagechooser/language-first" seen false
+ db_fset "$languagecode" seen false
+ db_input critical "languagechooser/language-first" || [ $? -eq 30 ]
+ if db_go; then
+ db_get "languagechooser/language-first"
+ language=`echo $RET | sed -e 's/ .*//' -e 's/[][]//g'`
+ db_set "$languagecode" "$language"
+ db_fset "$languagecode" seen true
+ else
+ STATE=$(($STATE - 1))
+ fi
+ ;;
+
+ 2)
+ db_reset "languagechooser/language-addtolist"
+ db_subst "languagechooser/language-addtolist" LANGUAGE "$language"
+ db_input critical "languagechooser/language-addtolist" || [ $? -eq 30 ]
+ if db_go; then
+ db_get "languagechooser/language-addtolist"
+ case $RET in
+ Finish)
+ STATE=$(($STATE + 1))
+ ;;
+ Reset)
+ db_reset "$languagecode"
+ ;;
+ "Remove last entry")
+ language=`echo ":$language" | sed -e 's/:[^:]*$//' -e 's/^://'`
+ if [ -n "$language" ]; then
+ db_set "$languagecode" "$language"
+ else
+ db_reset "$languagecode"
+ fi
+ ;;
+ *)
+ language="${language}:"`echo $RET | sed -e 's/ .*//' -e 's/[][]//g'`
+ db_set "$languagecode" "$language"
+ ;;
+ esac
+ else
+ STATE=99
+ fi
+ ;;
+
+ 3)
+ db_fset "languagechooser/country-name" seen false
+ db_fset "$countrycode" seen false
+ db_input critical "languagechooser/country-name" || [ $? -eq 30 ]
+ if db_go; then
+ db_get "languagechooser/country-name"
+ if [ "$RET" != "Other" ]; then
+ country=`echo $RET | sed -e 's/ .*//' -e 's/[][]//g'`
+ db_set "$countrycode" "$country"
+ else
+ country=unknown
+ fi
+ STATE=$(($STATE + 1))
+ else
+ STATE=$(($STATE - 1))
+ fi
+ ;;
+
+ 4)
+ db_fset "$localecode" seen false
+ db_input critical "$localecode" || [ $? -eq 30 ]
+ if db_go; then
+ db_get "$localecode"
+ locale="$RET"
+ STATE=$(($STATE + 1))
+ else
+ STATE=$(($STATE - 1))
+ fi
+ ;;
+
+ 99)
+ db_fset "languagechooser/no-backup" seen false
+ db_input critical "languagechooser/no-backup"
+ db_go
+ STATE=1
+ ;;
+
+ *)
+ STATE=-1
+ ;;
+ esac
+done
+
+# debconf/language is an alias for debian-installer/language
+db_register "$languagecode" "debconf/language"
+db_get "$languagecode"
+db_set "debconf/language" "$RET"
+
+[ $STATE = -1 ] || exit 0
+
+log "debian-installer/locale = '$locale'"
+log "debian-installer/language = '$language'"
+log "debian-installer/country = '$country'"
diff -urN languagechooser/debian/languagechooser/usr/lib/prebaseconfig.d/65languagechooser languagechooser.new/debian/languagechooser/usr/lib/prebaseconfig.d/65languagechooser
--- languagechooser/debian/languagechooser/usr/lib/prebaseconfig.d/65languagechooser 1970-01-01 01:00:00.000000000 +0100
+++ languagechooser.new/debian/languagechooser/usr/lib/prebaseconfig.d/65languagechooser 2003-01-24 14:05:10.000000000 +0000
@@ -0,0 +1,22 @@
+#! /bin/sh -e
+#
+# Pass the language/locale information needed by base-config into
+# /target/root/dbootstrap_settings.
+
+. /usr/share/debconf/confmodule
+
+db_get debian-installer/locale
+LOCALE=$RET
+
+if [ ! -d /target/root ] ; then
+ if mkdir /target/root ; then
+ :
+ else
+ echo "error: unable to create /target/root"
+ fi
+fi
+
+(
+ echo "# Inserted by languagechooser."
+ echo "LANG_INST=\"$LOCALE\""
+) >> /target/root/dbootstrap_settings
diff -urN languagechooser/debian/languagechooser.postrm.debhelper languagechooser.new/debian/languagechooser.postrm.debhelper
--- languagechooser/debian/languagechooser.postrm.debhelper 1970-01-01 01:00:00.000000000 +0100
+++ languagechooser.new/debian/languagechooser.postrm.debhelper 2003-01-24 14:05:10.000000000 +0000
@@ -0,0 +1,6 @@
+# Automatically added by dh_installdebconf
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_purge
+fi
+# End automatically added section
diff -urN languagechooser/debian/languagechooser.substvars languagechooser.new/debian/languagechooser.substvars
--- languagechooser/debian/languagechooser.substvars 1970-01-01 01:00:00.000000000 +0100
+++ languagechooser.new/debian/languagechooser.substvars 2003-01-24 14:05:10.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=debconf (>= 0.5)
diff -urN languagechooser/debian/po/fr.po languagechooser.new/debian/po/fr.po
--- languagechooser/debian/po/fr.po 2002-12-22 12:36:00.000000000 +0000
+++ languagechooser.new/debian/po/fr.po 2003-02-06 16:05:59.000000000 +0000
@@ -13,7 +13,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: languagechooser\n"
+"Project-Id-Version: languagechooser CVS\n"
"POT-Creation-Date: 2002-12-20 10:38+0100\n"
"PO-Revision-Date: 2002-12-21 11:25+0100\n"
"Last-Translator: Pierre Machard <pmachard@tuxfamily.org>\n"
@@ -119,263 +119,263 @@
#. Choices
#: ../templates:42
-msgid "[at] Austria"
-msgstr "[at] Autriche"
+msgid "[AT] Austria"
+msgstr "[AT] Autriche"
#. Choices
#: ../templates:42
-msgid "[au] Australia"
-msgstr "[au] Australie"
+msgid "[AU] Australia"
+msgstr "[AU] Australie"
#. Choices
#: ../templates:42
-msgid "[be] Belgium"
-msgstr "[be] Belgique"
+msgid "[BE] Belgium"
+msgstr "[BE] Belgique"
#. Choices
#: ../templates:42
-msgid "[bg] Bulgaria"
-msgstr "[bg] Bulgarie"
+msgid "[BG] Bulgaria"
+msgstr "[BG] Bulgarie"
#. Choices
#: ../templates:42
-msgid "[br] Brazil"
-msgstr "[br] Br�l"
+msgid "[BR] Brazil"
+msgstr "[BR] Br�l"
#. Choices
#: ../templates:42
-msgid "[by] Belarus"
-msgstr "[by] Bi�russie"
+msgid "[BY] Belarus"
+msgstr "[BY] Bi�russie"
#. Choices
#: ../templates:42
-msgid "[ca] Canada"
-msgstr "[ca] Canada"
+msgid "[CA] Canada"
+msgstr "[CA] Canada"
#. Choices
#: ../templates:42
-msgid "[ch] Switzerland"
-msgstr "[ch] Suisse"
+msgid "[CH] Switzerland"
+msgstr "[CH] Suisse"
#. Choices
#: ../templates:42
-msgid "[cl] Chile"
-msgstr "[cl] Chili"
+msgid "[CL] Chile"
+msgstr "[CL] Chili"
#. Choices
#: ../templates:42
-msgid "[cn] China"
-msgstr "[cn] Chine"
+msgid "[CN] China"
+msgstr "[CN] Chine"
#. Choices
#: ../templates:42
-msgid "[cr] Costa Rica"
-msgstr "[cr] Costa Rica"
+msgid "[CR] Costa Rica"
+msgstr "[CR] Costa Rica"
#. Choices
#: ../templates:42
-msgid "[cz] Czech Republic"
-msgstr "[cz] R�blique Tch�e"
+msgid "[CZ] Czech Republic"
+msgstr "[CZ] R�blique Tch�e"
#. Choices
#: ../templates:42
-msgid "[de] Germany"
-msgstr "[de] Allemagne"
+msgid "[DE] Germany"
+msgstr "[DE] Allemagne"
#. Choices
#: ../templates:42
-msgid "[dk] Denmark"
-msgstr "[dk] Danemark"
+msgid "[DK] Denmark"
+msgstr "[DK] Danemark"
#. Choices
#: ../templates:42
-msgid "[ee] Estonia"
-msgstr "[ee] Estonie"
+msgid "[EE] Estonia"
+msgstr "[EE] Estonie"
#. Choices
#: ../templates:42
-msgid "[es] Spain"
-msgstr "[es] Espagne"
+msgid "[ES] Spain"
+msgstr "[ES] Espagne"
#. Choices
#: ../templates:42
-msgid "[fi] Finland"
-msgstr "[fi] Finlande"
+msgid "[FI] Finland"
+msgstr "[FI] Finlande"
#. Choices
#: ../templates:42
-msgid "[fr] France"
-msgstr "[fr] France"
+msgid "[FR] France"
+msgstr "[FR] France"
#. Choices
#: ../templates:42
-msgid "[gb] Great Britain"
-msgstr "[bg] Grande-Bretagne"
+msgid "[GB] Great Britain"
+msgstr "[GB] Grande-Bretagne"
#. Choices
#: ../templates:42
-msgid "[gr] Greece"
-msgstr "[gr] Gr�"
+msgid "[GR] Greece"
+msgstr "[GR] Gr�"
#. Choices
#: ../templates:42
-msgid "[hk] Hong Kong"
-msgstr "[hk] Hong-Kong"
+msgid "[HK] Hong Kong"
+msgstr "[HK] Hong-Kong"
#. Choices
#: ../templates:42
-msgid "[hr] Croatia"
-msgstr "[hr] Croatie"
+msgid "[HR] Croatia"
+msgstr "[HR] Croatie"
#. Choices
#: ../templates:42
-msgid "[hu] Hungary"
-msgstr "[hu] Hongrie"
+msgid "[HU] Hungary"
+msgstr "[HU] Hongrie"
#. Choices
#: ../templates:42
-msgid "[id] Indonesia"
-msgstr "[id] Indon�e"
+msgid "[ID] Indonesia"
+msgstr "[ID] Indon�e"
#. Choices
#: ../templates:42
-msgid "[ie] Ireland"
-msgstr "[ie] Irlande"
+msgid "[IE] Ireland"
+msgstr "[IE] Irlande"
#. Choices
#: ../templates:42
-msgid "[il] Israel"
-msgstr "[il] Isra�
+msgid "[IL] Israel"
+msgstr "[IL] Isra�
#. Choices
#: ../templates:42
-msgid "[in] India"
-msgstr "[in] Inde"
+msgid "[IN] India"
+msgstr "[IN] Inde"
#. Choices
#: ../templates:42
-msgid "[is] Iceland"
-msgstr "[is] Islande"
+msgid "[IS] Iceland"
+msgstr "[IS] Islande"
#. Choices
#: ../templates:42
-msgid "[it] Italy"
-msgstr "[it] Italie"
+msgid "[IT] Italy"
+msgstr "[IT] Italie"
#. Choices
#: ../templates:42
-msgid "[jp] Japan"
-msgstr "[jp] Japon"
+msgid "[JP] Japan"
+msgstr "[JP] Japon"
#. Choices
#: ../templates:42
-msgid "[kr] Korea"
-msgstr "[kr] Cor�
+msgid "[KR] Korea"
+msgstr "[KR] Cor�
#. Choices
#: ../templates:42
-msgid "[lt] Lithuania"
-msgstr "[lt] Lituanie"
+msgid "[LT] Lithuania"
+msgstr "[LT] Lituanie"
#. Choices
#: ../templates:42
-msgid "[lu] Luxembourg"
-msgstr "[lu] Luxembourg"
+msgid "[LU] Luxembourg"
+msgstr "[LU] Luxembourg"
#. Choices
#: ../templates:42
-msgid "[lv] Latvia"
-msgstr "[lv] Lettonie"
+msgid "[LV] Latvia"
+msgstr "[LV] Lettonie"
#. Choices
#: ../templates:42
-msgid "[mx] Mexico"
-msgstr "[mx] Mexique"
+msgid "[MX] Mexico"
+msgstr "[MX] Mexique"
#. Choices
#: ../templates:42
-msgid "[nl] Netherlands"
-msgstr "[nl] Pays-Bas"
+msgid "[NL] Netherlands"
+msgstr "[NL] Pays-Bas"
#. Choices
#: ../templates:42
-msgid "[no] Norway"
-msgstr "[no] Norv�"
+msgid "[NO] Norway"
+msgstr "[NO] Norv�"
#. Choices
#: ../templates:42
-msgid "[nz] New Zealand"
-msgstr "[nz] Nouvelle-Z�nde"
+msgid "[NZ] New Zealand"
+msgstr "[NZ] Nouvelle-Z�nde"
#. Choices
#: ../templates:42
-msgid "[pe] Peru"
-msgstr "[pe] P�u"
+msgid "[PE] Peru"
+msgstr "[PE] P�u"
#. Choices
#: ../templates:42
-msgid "[pl] Poland"
-msgstr "[pl] Pologne"
+msgid "[PL] Poland"
+msgstr "[PL] Pologne"
#. Choices
#: ../templates:42
-msgid "[pt] Portugal"
-msgstr "[pt] Portugal"
+msgid "[PT] Portugal"
+msgstr "[PT] Portugal"
#. Choices
#: ../templates:42
-msgid "[ru] Russia"
-msgstr "[ru] Russie"
+msgid "[RU] Russia"
+msgstr "[RU] Russie"
#. Choices
#: ../templates:42
-msgid "[se] Sweden"
-msgstr "[se] Su�"
+msgid "[SE] Sweden"
+msgstr "[SE] Su�"
#. Choices
#: ../templates:42
-msgid "[sg] Singapore"
-msgstr "[sg] Singapour"
+msgid "[SG] Singapore"
+msgstr "[SG] Singapour"
#. Choices
#: ../templates:42
-msgid "[si] Slovenia"
-msgstr "[si] Slov�e"
+msgid "[SI] Slovenia"
+msgstr "[SI] Slov�e"
#. Choices
#: ../templates:42
-msgid "[sk] Slovakia"
-msgstr "[sk] Slovaquie"
+msgid "[SK] Slovakia"
+msgstr "[SK] Slovaquie"
#. Choices
#: ../templates:42
-msgid "[th] Thailand"
-msgstr "[th] Tha�nde"
+msgid "[TH] Thailand"
+msgstr "[TH] Tha�nde"
#. Choices
#: ../templates:42
-msgid "[tr] Turkey"
-msgstr "[tr] Turquie"
+msgid "[TR] Turkey"
+msgstr "[TR] Turquie"
#. Choices
#: ../templates:42
-msgid "[tw] Taiwan"
-msgstr "[tw] Ta�n"
+msgid "[TW] Taiwan"
+msgstr "[TW] Ta�n"
#. Choices
#: ../templates:42
-msgid "[ua] Ukraine"
-msgstr "[ua] Ukraine"
+msgid "[UA] Ukraine"
+msgstr "[UA] Ukraine"
#. Choices
#: ../templates:42
-msgid "[us] United States"
-msgstr "[us] �ats-Unis d'Am�que"
+msgid "[US] United States"
+msgstr "[US] �ats-Unis d'Am�que"
#. Choices
#: ../templates:42
-msgid "[za] South Africa"
-msgstr "[za] Afrique du sud"
+msgid "[ZA] South Africa"
+msgstr "[ZA] Afrique du sud"
#. Description
#: ../templates:43
diff -urN languagechooser/debian/po/nb.po languagechooser.new/debian/po/nb.po
--- languagechooser/debian/po/nb.po 2002-12-20 09:28:48.000000000 +0000
+++ languagechooser.new/debian/po/nb.po 2003-02-06 16:08:45.000000000 +0000
@@ -11,10 +11,11 @@
#
# Developers do not need to manually edit POT or PO files.
#
-#, fuzzy
+# $Id: $
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: languagechooser CVS\n"
"POT-Creation-Date: 2002-12-20 10:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -105,262 +106,262 @@
#. Choices
#: ../templates:42
-msgid "[at] Austria"
+msgid "[AT] Austria"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[au] Australia"
+msgid "[AU] Australia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[be] Belgium"
+msgid "[BE] Belgium"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[bg] Bulgaria"
+msgid "[BG] Bulgaria"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[br] Brazil"
+msgid "[BR] Brazil"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[by] Belarus"
+msgid "[BY] Belarus"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ca] Canada"
+msgid "[CA] Canada"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ch] Switzerland"
+msgid "[CH] Switzerland"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[cl] Chile"
+msgid "[CL] Chile"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[cn] China"
+msgid "[CN] China"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[cr] Costa Rica"
+msgid "[CR] Costa Rica"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[cz] Czech Republic"
+msgid "[CZ] Czech Republic"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[de] Germany"
+msgid "[DE] Germany"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[dk] Denmark"
+msgid "[DK] Denmark"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ee] Estonia"
+msgid "[EE] Estonia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[es] Spain"
+msgid "[ES] Spain"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[fi] Finland"
+msgid "[FI] Finland"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[fr] France"
+msgid "[FR] France"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[gb] Great Britain"
+msgid "[GB] Great Britain"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[gr] Greece"
+msgid "[GR] Greece"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[hk] Hong Kong"
+msgid "[HK] Hong Kong"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[hr] Croatia"
+msgid "[HR] Croatia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[hu] Hungary"
+msgid "[HU] Hungary"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[id] Indonesia"
+msgid "[ID] Indonesia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ie] Ireland"
+msgid "[IE] Ireland"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[il] Israel"
+msgid "[IL] Israel"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[in] India"
+msgid "[IN] India"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[is] Iceland"
+msgid "[IS] Iceland"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[it] Italy"
+msgid "[IT] Italy"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[jp] Japan"
+msgid "[JP] Japan"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[kr] Korea"
+msgid "[KR] Korea"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[lt] Lithuania"
+msgid "[LT] Lithuania"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[lu] Luxembourg"
+msgid "[LU] Luxembourg"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[lv] Latvia"
+msgid "[LV] Latvia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[mx] Mexico"
+msgid "[MX] Mexico"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[nl] Netherlands"
+msgid "[NL] Netherlands"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[no] Norway"
+msgid "[NO] Norway"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[nz] New Zealand"
+msgid "[NZ] New Zealand"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[pe] Peru"
+msgid "[PE] Peru"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[pl] Poland"
+msgid "[PL] Poland"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[pt] Portugal"
+msgid "[PT] Portugal"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ru] Russia"
+msgid "[RU] Russia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[se] Sweden"
+msgid "[SE] Sweden"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[sg] Singapore"
+msgid "[SG] Singapore"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[si] Slovenia"
+msgid "[SI] Slovenia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[sk] Slovakia"
+msgid "[SK] Slovakia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[th] Thailand"
+msgid "[TH] Thailand"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[tr] Turkey"
+msgid "[TR] Turkey"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[tw] Taiwan"
+msgid "[TW] Taiwan"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ua] Ukraine"
+msgid "[UA] Ukraine"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[us] United States"
+msgid "[US] United States"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[za] South Africa"
+msgid "[ZA] South Africa"
msgstr ""
#. Description
diff -urN languagechooser/debian/po/nl.po languagechooser.new/debian/po/nl.po
--- languagechooser/debian/po/nl.po 2002-12-20 09:28:48.000000000 +0000
+++ languagechooser.new/debian/po/nl.po 2003-02-06 18:39:30.000000000 +0000
@@ -117,286 +117,264 @@
#. Choices
#: ../templates:42
-msgid "[at] Austria"
-msgstr "[at] Oostenrijk"
+msgid "[AT] Austria"
+msgstr "[AT] Oostenrijk"
#. Choices
#: ../templates:42
-msgid "[au] Australia"
-msgstr "[au] Australi�+msgid "[AU] Australia"
+msgstr "[AU] Australi�
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[be] Belgium"
-msgstr "[bn] Bengaals"
+msgid "[BE Belgium"
+msgstr "[BE] Belgi�
#. Choices
#: ../templates:42
-msgid "[bg] Bulgaria"
-msgstr "[bg] Bulgarije"
+msgid "[BG] Bulgaria"
+msgstr "[BG] Bulgarije"
#. Choices
#: ../templates:42
-msgid "[br] Brazil"
-msgstr "[br] Brazili�+msgid "[BR] Brazil"
+msgstr "[BR] Brazili�
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[by] Belarus"
-msgstr "[bg] Bulgarije"
+msgid "[BY] Belarus"
+msgstr "[BY] Wit-Rusland"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[ca] Canada"
-msgstr "[ca] Catalaans"
+msgid "[CA] Canada"
+msgstr "[CA] Canada"
#. Choices
#: ../templates:42
#, fuzzy
-msgid "[ch] Switzerland"
-msgstr "[nl] Nederland"
+msgid "[CH] Switzerland"
+msgstr "[CH] Nederland"
#. Choices
#: ../templates:42
-msgid "[cl] Chile"
-msgstr "[cl] Chili"
+msgid "[CL] Chile"
+msgstr "[CL] Chili"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[cn] China"
-msgstr "[cl] Chili"
+msgid "[CN] China"
+msgstr "[CN] China"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[cr] Costa Rica"
-msgstr "[hr] Kroati�+msgid "[CR] Costa Rica"
+msgstr ""
#. Choices
#: ../templates:42
-msgid "[cz] Czech Republic"
-msgstr "[cz] Tsjechi�+msgid "[CZ] Czech Republic"
+msgstr "[CZ] Tsjechi�
#. Choices
#: ../templates:42
-msgid "[de] Germany"
-msgstr "[de] Duitsland"
+msgid "[DE] Germany"
+msgstr "[DE] Duitsland"
#. Choices
#: ../templates:42
-msgid "[dk] Denmark"
-msgstr "[dk] Denemarken"
+msgid "[DK] Denmark"
+msgstr "[DK] Denemarken"
#. Choices
#: ../templates:42
-msgid "[ee] Estonia"
-msgstr "[ee] Estland"
+msgid "[EE] Estonia"
+msgstr "[EE] Estland"
#. Choices
#: ../templates:42
-msgid "[es] Spain"
-msgstr "[es] Spanje"
+msgid "[ES] Spain"
+msgstr "[ES] Spanje"
#. Choices
#: ../templates:42
-msgid "[fi] Finland"
-msgstr "[fi] Finland"
+msgid "[FI] Finland"
+msgstr "[FI] Finland"
#. Choices
#: ../templates:42
-msgid "[fr] France"
-msgstr "[fr] Frankrijk"
+msgid "[FR] France"
+msgstr "[FR] Frankrijk"
#. Choices
#: ../templates:42
-msgid "[gb] Great Britain"
+msgid "[GB] Great Britain"
msgstr ""
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[gr] Greece"
-msgstr "[gd] Gaelic"
+msgid "[GR] Greece"
+msgstr "[GR] Griekenland"
#. Choices
#: ../templates:42
-msgid "[hk] Hong Kong"
-msgstr "[hk] Hong Kong"
+msgid "[HK] Hong Kong"
+msgstr "[HK] Hong Kong"
#. Choices
#: ../templates:42
-msgid "[hr] Croatia"
-msgstr "[hr] Kroati�+msgid "[HR] Croatia"
+msgstr "[HR] Kroati�
#. Choices
#: ../templates:42
-msgid "[hu] Hungary"
-msgstr "[hu] Hongarije"
+msgid "[HU] Hungary"
+msgstr "[HU] Hongarije"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[id] Indonesia"
-msgstr "[id] Indonesisch"
+msgid "[ID] Indonesia"
+msgstr "[ID] Indonesi�
#. Choices
#: ../templates:42
-msgid "[ie] Ireland"
-msgstr "[ie] Ierland"
+msgid "[IE] Ireland"
+msgstr "[IE] Ierland"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[il] Israel"
-msgstr "[ie] Ierland"
+msgid "[IL] Israel"
+msgstr "[IL] Israel"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[in] India"
-msgstr "[id] Indonesisch"
+msgid "[IN] India"
+msgstr "[IN] India"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[is] Iceland"
-msgstr "[is] IJslands"
+msgid "[IS] Iceland"
+msgstr "[IS] IJsland"
#. Choices
#: ../templates:42
-msgid "[it] Italy"
-msgstr "[it] Itali�+msgid "[IT] Italy"
+msgstr "[IT] Itali�
#. Choices
#: ../templates:42
-msgid "[jp] Japan"
-msgstr "[jp] Japan"
+msgid "[JP] Japan"
+msgstr "[JP] Japan"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[kr] Korea"
-msgstr "[ko] Koreaans"
+msgid "[KR] Korea"
+msgstr "[KR] Zuid-Korea"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[lt] Lithuania"
-msgstr "[lt] Litouws"
+msgid "[LT] Lithuania"
+msgstr "[LT] Litouwen"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[lu] Luxembourg"
-msgstr "[lb] Luxemburgs"
+msgid "[LU] Luxembourg"
+msgstr "[LU] Luxemburg"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[lv] Latvia"
-msgstr "[lv] Lets"
+msgid "[LV] Latvia"
+msgstr "[LV] Letland"
#. Choices
#: ../templates:42
-msgid "[mx] Mexico"
+msgid "[MX] Mexico"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[nl] Netherlands"
-msgstr "[nl] Nederland"
+msgid "[NL] Netherlands"
+msgstr "[NL] Nederland"
#. Choices
#: ../templates:42
-msgid "[no] Norway"
-msgstr "[no] Noorwegen"
+msgid "[NO] Norway"
+msgstr "[NO] Noorwegen"
#. Choices
#: ../templates:42
-msgid "[nz] New Zealand"
-msgstr "[nz] Nieuw Zeeland"
+msgid "[NZ] New Zealand"
+msgstr "[NZ] Nieuw Zeeland"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[pe] Peru"
-msgstr "[he] Hebreeuws"
+msgid "[PE] Peru"
+msgstr "[PE] Peru"
#. Choices
#: ../templates:42
-msgid "[pl] Poland"
-msgstr "[pl] Polen"
+msgid "[PL] Poland"
+msgstr "[PL] Polen"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[pt] Portugal"
-msgstr "[pt] Portugees"
+msgid "[PT] Portugal"
+msgstr "[PT] Portugal"
#. Choices
#: ../templates:42
-msgid "[ru] Russia"
-msgstr "[ru] Rusland"
+msgid "[RU] Russia"
+msgstr "[RU] Rusland"
#. Choices
#: ../templates:42
-msgid "[se] Sweden"
-msgstr "[se] Zweden"
+msgid "[SE] Sweden"
+msgstr "[SE] Zweden"
#. Choices
#: ../templates:42
-msgid "[sg] Singapore"
+msgid "[SG] Singapore"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[si] Slovenia"
-msgstr "[si] Sloveni�+msgid "[SI] Slovenia"
+msgstr "[SI] Sloveni�
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[sk] Slovakia"
-msgstr "[sk] Slowaaks"
+msgid "[SK] Slovakia"
+msgstr "[SK] Slovakije"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[th] Thailand"
-msgstr "[th] Tha�
+msgid "[TH] Thailand"
+msgstr "[TH] Thailand"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[tr] Turkey"
-msgstr "[tk] Turkmeens"
+msgid "[TR] Turkey"
+msgstr "[TR] Turkije"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[tw] Taiwan"
-msgstr "[th] Tha�
+msgid "[TW] Taiwan"
+msgstr "[TW] Taiwan"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[ua] Ukraine"
-msgstr "[la] Latijn"
+msgid "[UA] Ukraine"
+msgstr "[UA] Oekra�"
#. Choices
#: ../templates:42
-msgid "[us] United States"
-msgstr "[us] Verenigde Staten"
+msgid "[US] United States"
+msgstr "[US] Verenigde Staten"
#. Choices
#: ../templates:42
-#, fuzzy
-msgid "[za] South Africa"
-msgstr "[at] Oostenrijk"
+msgid "[ZA] South Africa"
+msgstr "[ZA] Zuid-Afrika"
#. Description
#: ../templates:43
diff -urN languagechooser/debian/po/pt_BR.po languagechooser.new/debian/po/pt_BR.po
--- languagechooser/debian/po/pt_BR.po 2002-12-22 19:55:34.000000000 +0000
+++ languagechooser.new/debian/po/pt_BR.po 2003-02-06 16:22:31.000000000 +0000
@@ -13,7 +13,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: languagechoose-0.012\n"
+"Project-Id-Version: languagechooser 0.012\n"
"POT-Creation-Date: 2002-12-20 10:38+0100\n"
"PO-Revision-Date: 2002-12-22 17:55-0300\n"
"Last-Translator: Andr�u�Lopes <andrelop@ig.com.br>\n"
@@ -118,263 +118,263 @@
#. Choices
#: ../templates:42
-msgid "[at] Austria"
-msgstr "[at] �stria"
+msgid "[AT] Austria"
+msgstr "[AT] �stria"
#. Choices
#: ../templates:42
-msgid "[au] Australia"
-msgstr "[au] Austr�a"
+msgid "[AU] Australia"
+msgstr "[AU] Austr�a"
#. Choices
#: ../templates:42
-msgid "[be] Belgium"
-msgstr "[be] B�ica"
+msgid "[BE] Belgium"
+msgstr "[BE] B�ica"
#. Choices
#: ../templates:42
-msgid "[bg] Bulgaria"
-msgstr "[bg] Bulg�a"
+msgid "[BG] Bulgaria"
+msgstr "[BG] Bulg�a"
#. Choices
#: ../templates:42
-msgid "[br] Brazil"
-msgstr "[br] Brasil"
+msgid "[BR] Brazil"
+msgstr "[BR] Brasil"
#. Choices
#: ../templates:42
-msgid "[by] Belarus"
-msgstr "[by] Belarus"
+msgid "[BY] Belarus"
+msgstr "[BY] Belarus"
#. Choices
#: ../templates:42
-msgid "[ca] Canada"
-msgstr "[ca] Canad�+msgid "[CA] Canada"
+msgstr "[CA] Canad�
#. Choices
#: ../templates:42
-msgid "[ch] Switzerland"
-msgstr "[ch] Su�"
+msgid "[CH] Switzerland"
+msgstr "[CH] Su�"
#. Choices
#: ../templates:42
-msgid "[cl] Chile"
-msgstr "[cl] Chile"
+msgid "[CL] Chile"
+msgstr "[CL] Chile"
#. Choices
#: ../templates:42
-msgid "[cn] China"
-msgstr "[cn] China"
+msgid "[CN] China"
+msgstr "[CN] China"
#. Choices
#: ../templates:42
-msgid "[cr] Costa Rica"
-msgstr "[cr] Costa Rica"
+msgid "[CR] Costa Rica"
+msgstr "[CR] Costa Rica"
#. Choices
#: ../templates:42
-msgid "[cz] Czech Republic"
-msgstr "[cz] Rep�a Tcheca"
+msgid "[CZ] Czech Republic"
+msgstr "[CZ] Rep�a Tcheca"
#. Choices
#: ../templates:42
-msgid "[de] Germany"
-msgstr "[de] Alemanha"
+msgid "[DE] Germany"
+msgstr "[DE] Alemanha"
#. Choices
#: ../templates:42
-msgid "[dk] Denmark"
-msgstr "[dk] Dinamarca"
+msgid "[DK] Denmark"
+msgstr "[DK] Dinamarca"
#. Choices
#: ../templates:42
-msgid "[ee] Estonia"
-msgstr "[ee] Est�"
+msgid "[EE] Estonia"
+msgstr "[EE] Est�"
#. Choices
#: ../templates:42
-msgid "[es] Spain"
-msgstr "[es] Espanha"
+msgid "[ES] Spain"
+msgstr "[ES] Espanha"
#. Choices
#: ../templates:42
-msgid "[fi] Finland"
-msgstr "[fi] Finl�ia"
+msgid "[FI] Finland"
+msgstr "[FI] Finl�ia"
#. Choices
#: ../templates:42
-msgid "[fr] France"
-msgstr "[fr] Fran�
+msgid "[FR] France"
+msgstr "[FR] Fran�
#. Choices
#: ../templates:42
-msgid "[gb] Great Britain"
-msgstr "[gb] Gr�retanha"
+msgid "[GB] Great Britain"
+msgstr "[GB] Gr�retanha"
#. Choices
#: ../templates:42
-msgid "[gr] Greece"
-msgstr "[gr] Gr�a"
+msgid "[GR] Greece"
+msgstr "[GR] Gr�a"
#. Choices
#: ../templates:42
-msgid "[hk] Hong Kong"
-msgstr "[hk] Hong Kong"
+msgid "[HK] Hong Kong"
+msgstr "[HK] Hong Kong"
#. Choices
#: ../templates:42
-msgid "[hr] Croatia"
-msgstr "[hr] Cro�a"
+msgid "[HR] Croatia"
+msgstr "[HR] Cro�a"
#. Choices
#: ../templates:42
-msgid "[hu] Hungary"
-msgstr "[hu] Hungria"
+msgid "[HU] Hungary"
+msgstr "[HU] Hungria"
#. Choices
#: ../templates:42
-msgid "[id] Indonesia"
-msgstr "[id] Indon�a"
+msgid "[ID] Indonesia"
+msgstr "[ID] Indon�a"
#. Choices
#: ../templates:42
-msgid "[ie] Ireland"
-msgstr "[ie] Irlanda"
+msgid "[IE] Ireland"
+msgstr "[IE] Irlanda"
#. Choices
#: ../templates:42
-msgid "[il] Israel"
-msgstr "[il] Israel"
+msgid "[IL] Israel"
+msgstr "[IL] Israel"
#. Choices
#: ../templates:42
-msgid "[in] India"
-msgstr "[in] �dia"
+msgid "[IN] India"
+msgstr "[IN] �dia"
#. Choices
#: ../templates:42
-msgid "[is] Iceland"
-msgstr "[is] Isl�ia"
+msgid "[IS] Iceland"
+msgstr "[IS] Isl�ia"
#. Choices
#: ../templates:42
-msgid "[it] Italy"
-msgstr "[it] It�a"
+msgid "[IT] Italy"
+msgstr "[IT] It�a"
#. Choices
#: ../templates:42
-msgid "[jp] Japan"
-msgstr "[jp] Jap�
+msgid "[JP] Japan"
+msgstr "[JP] Jap�
#. Choices
#: ../templates:42
-msgid "[kr] Korea"
-msgstr "[kr] Cor�"
+msgid "[KR] Korea"
+msgstr "[KR] Cor�"
#. Choices
#: ../templates:42
-msgid "[lt] Lithuania"
-msgstr "[lt] Litu�a"
+msgid "[LT] Lithuania"
+msgstr "[LT] Litu�a"
#. Choices
#: ../templates:42
-msgid "[lu] Luxembourg"
-msgstr "[lu] Luxemburgo"
+msgid "[LU] Luxembourg"
+msgstr "[LU] Luxemburgo"
#. Choices
#: ../templates:42
-msgid "[lv] Latvia"
-msgstr "[lv] Latvia"
+msgid "[LV] Latvia"
+msgstr "[LV] Latvia"
#. Choices
#: ../templates:42
-msgid "[mx] Mexico"
-msgstr "[mx] M�co"
+msgid "[MX] Mexico"
+msgstr "[MX] M�co"
#. Choices
#: ../templates:42
-msgid "[nl] Netherlands"
-msgstr "[nl] Holanda"
+msgid "[NL] Netherlands"
+msgstr "[NL] Holanda"
#. Choices
#: ../templates:42
-msgid "[no] Norway"
-msgstr "[no] Noruega"
+msgid "[NO] Norway"
+msgstr "[NO] Noruega"
#. Choices
#: ../templates:42
-msgid "[nz] New Zealand"
-msgstr "[nz] Nova Zel�ia"
+msgid "[NZ] New Zealand"
+msgstr "[NZ] Nova Zel�ia"
#. Choices
#: ../templates:42
-msgid "[pe] Peru"
-msgstr "[pe] Peru"
+msgid "[PE] Peru"
+msgstr "[PE] Peru"
#. Choices
#: ../templates:42
-msgid "[pl] Poland"
-msgstr "[pl] Pol�"
+msgid "[PL] Poland"
+msgstr "[PL] Pol�"
#. Choices
#: ../templates:42
-msgid "[pt] Portugal"
-msgstr "[pt] Portugal"
+msgid "[PT] Portugal"
+msgstr "[PT] Portugal"
#. Choices
#: ../templates:42
-msgid "[ru] Russia"
-msgstr "[ru] R�"
+msgid "[RU] Russia"
+msgstr "[RU] R�"
#. Choices
#: ../templates:42
-msgid "[se] Sweden"
-msgstr "[se] Su�a"
+msgid "[SE] Sweden"
+msgstr "[SE] Su�a"
#. Choices
#: ../templates:42
-msgid "[sg] Singapore"
-msgstr "[sg] Singapura"
+msgid "[SG] Singapore"
+msgstr "[SG] Singapura"
#. Choices
#: ../templates:42
-msgid "[si] Slovenia"
-msgstr "[si] Eslov�a"
+msgid "[SI] Slovenia"
+msgstr "[SI] Eslov�a"
#. Choices
#: ../templates:42
-msgid "[sk] Slovakia"
-msgstr "[sk] Slov�ia"
+msgid "[SK] Slovakia"
+msgstr "[SK] Slov�ia"
#. Choices
#: ../templates:42
-msgid "[th] Thailand"
-msgstr "[th] Tail�ia"
+msgid "[TH] Thailand"
+msgstr "[TH] Tail�ia"
#. Choices
#: ../templates:42
-msgid "[tr] Turkey"
-msgstr "[tr] Turquia"
+msgid "[TR] Turkey"
+msgstr "[TR] Turquia"
#. Choices
#: ../templates:42
-msgid "[tw] Taiwan"
-msgstr "[tw] Taiwan"
+msgid "[TW] Taiwan"
+msgstr "[TW] Taiwan"
#. Choices
#: ../templates:42
-msgid "[ua] Ukraine"
-msgstr "[ua] Ucr�a"
+msgid "[UA] Ukraine"
+msgstr "[UA] Ucr�a"
#. Choices
#: ../templates:42
-msgid "[us] United States"
-msgstr "[us] Estados Unidos"
+msgid "[US] United States"
+msgstr "[US] Estados Unidos"
#. Choices
#: ../templates:42
-msgid "[za] South Africa"
-msgstr "[za] �rica do Sul"
+msgid "[ZA] South Africa"
+msgstr "[ZA] �rica do Sul"
#. Description
#: ../templates:43
diff -urN languagechooser/debian/po/templates.pot languagechooser.new/debian/po/templates.pot
--- languagechooser/debian/po/templates.pot 2002-12-20 09:28:48.000000000 +0000
+++ languagechooser.new/debian/po/templates.pot 2003-02-06 16:00:49.000000000 +0000
@@ -23,6 +23,7 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+
#. Description
#: ../templates:5
msgid "Select locale"
@@ -104,262 +105,262 @@
#. Choices
#: ../templates:42
-msgid "[at] Austria"
+msgid "[AT] Austria"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[au] Australia"
+msgid "[AU] Australia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[be] Belgium"
+msgid "[BE] Belgium"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[bg] Bulgaria"
+msgid "[BG] Bulgaria"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[br] Brazil"
+msgid "[BR] Brazil"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[by] Belarus"
+msgid "[BY] Belarus"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ca] Canada"
+msgid "[CA] Canada"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ch] Switzerland"
+msgid "[CH] Switzerland"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[cl] Chile"
+msgid "[CL] Chile"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[cn] China"
+msgid "[CN] China"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[cr] Costa Rica"
+msgid "[CR] Costa Rica"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[cz] Czech Republic"
+msgid "[CZ] Czech Republic"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[de] Germany"
+msgid "[DE] Germany"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[dk] Denmark"
+msgid "[DK] Denmark"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ee] Estonia"
+msgid "[EE] Estonia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[es] Spain"
+msgid "[ES] Spain"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[fi] Finland"
+msgid "[FI] Finland"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[fr] France"
+msgid "[FR] France"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[gb] Great Britain"
+msgid "[GB] Great Britain"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[gr] Greece"
+msgid "[GR] Greece"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[hk] Hong Kong"
+msgid "[HK] Hong Kong"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[hr] Croatia"
+msgid "[HR] Croatia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[hu] Hungary"
+msgid "[HU] Hungary"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[id] Indonesia"
+msgid "[ID] Indonesia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ie] Ireland"
+msgid "[IE] Ireland"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[il] Israel"
+msgid "[IL] Israel"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[in] India"
+msgid "[IN] India"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[is] Iceland"
+msgid "[IS] Iceland"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[it] Italy"
+msgid "[IT] Italy"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[jp] Japan"
+msgid "[JP] Japan"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[kr] Korea"
+msgid "[KR] Korea"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[lt] Lithuania"
+msgid "[LT] Lithuania"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[lu] Luxembourg"
+msgid "[LU] Luxembourg"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[lv] Latvia"
+msgid "[LV] Latvia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[mx] Mexico"
+msgid "[MX] Mexico"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[nl] Netherlands"
+msgid "[NL] Netherlands"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[no] Norway"
+msgid "[NO] Norway"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[nz] New Zealand"
+msgid "[NZ] New Zealand"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[pe] Peru"
+msgid "[PE] Peru"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[pl] Poland"
+msgid "[PL] Poland"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[pt] Portugal"
+msgid "[PT] Portugal"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ru] Russia"
+msgid "[RU] Russia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[se] Sweden"
+msgid "[SE] Sweden"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[sg] Singapore"
+msgid "[SG] Singapore"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[si] Slovenia"
+msgid "[SI] Slovenia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[sk] Slovakia"
+msgid "[SK] Slovakia"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[th] Thailand"
+msgid "[TH] Thailand"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[tr] Turkey"
+msgid "[TR] Turkey"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[tw] Taiwan"
+msgid "[TW] Taiwan"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[ua] Ukraine"
+msgid "[UA] Ukraine"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[us] United States"
+msgid "[US] United States"
msgstr ""
#. Choices
#: ../templates:42
-msgid "[za] South Africa"
+msgid "[ZA] South Africa"
msgstr ""
#. Description
diff -urN languagechooser/debian/templates languagechooser.new/debian/templates
--- languagechooser/debian/templates 2002-12-20 09:28:48.000000000 +0000
+++ languagechooser.new/debian/templates 2003-02-06 16:17:44.000000000 +0000
@@ -39,7 +39,7 @@
Template: languagechooser/country-name
Type: select
-__Choices: Other, [at] Austria, [au] Australia, [be] Belgium, [bg] Bulgaria, [br] Brazil, [by] Belarus, [ca] Canada, [ch] Switzerland, [cl] Chile, [cn] China, [cr] Costa Rica, [cz] Czech Republic, [de] Germany, [dk] Denmark, [ee] Estonia, [es] Spain, [fi] Finland, [fr] France, [gb] Great Britain, [gr] Greece, [hk] Hong Kong, [hr] Croatia, [hu] Hungary, [id] Indonesia, [ie] Ireland, [il] Israel, [in] India, [is] Iceland, [it] Italy, [jp] Japan, [kr] Korea, [lt] Lithuania, [lu] Luxembourg, [lv] Latvia, [mx] Mexico, [nl] Netherlands, [no] Norway, [nz] New Zealand, [pe] Peru, [pl] Poland, [pt] Portugal, [ru] Russia, [se] Sweden, [sg] Singapore, [si] Slovenia, [sk] Slovakia, [th] Thailand, [tr] Turkey, [tw] Taiwan, [ua] Ukraine, [us] United States, [za] South Africa
+__Choices: Other, [AT] Austria, [AU] Australia, [BE] Belgium, [BG] Bulgaria, [BR] Brazil, [BY] Belarus, [CA] Canada, [CH] Switzerland, [CL] Chile, [CN] China, [CR] Costa Rica, [CZ] Czech Republic, [DE] Germany, [DK] Denmark, [EE] Estonia, [ES] Spain, [FI] Finland, [FR] France, [GB] Great Britain, [GR] Greece, [HK] Hong Kong, [HR] Croatia, [HU] Hungary, [ID] Indonesia, [IE] Ireland, [IL] Israel, [IN] India, [IS] Iceland, [IT] Italy, [JP] Japan, [KR] Korea, [LT] Lithuania, [LU] Luxembourg, [LV] Latvia, [MX] Mexico, [NL] Netherlands, [no] Norway, [NZ] New Zealand, [PE] Peru, [PL] Poland, [PT] Portugal, [RU] Russia, [SE] Sweden, [SG] Singapore, [SI] Slovenia, [SK] Slovakia, [TH] Thailand, [TR] Turkey, [TW] Taiwan, [UA] Ukraine, [US] United States, [ZA] South Africa
_Description: Select country
Please select in which country you are located. This affects the locale
and time zone setting.
Attachment:
signature.asc
Description: This is a digitally signed message part