Package: languagechooser
Severity: normal
Tags: patch d-i
The attached patch changes the way languages are presented in chooselanguage:
-removes all country references, except when they concern different variant
of the same language ("same" meaning there same ISO code....The two Norwegian
languages are then considered two different languages as they have different
ISO codes)
-thus, only one entry per language
-commented languages for which the d-i translation status is by far too low
for being usable
-get a more natural sorting of languages by adding the language code before
the translated phrase
This change was as conservative as possible (many entries just commented).
The current drawback is that a default country is always forced, for
languages which had previously more than one entry (French, Italian,
German,...).
The country choice is supposed to be covered by an upcoming countrychooser
package.
-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux mykerinos 2.6.0 #1 Thu Dec 18 10:33:22 CET 2003 i686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (ignored: LC_ALL set to fr_FR.UTF-8)
diff -Nru --exclude=CVS languagechooser/debian/changelog
languagechooser.new/debian/changelog
--- languagechooser/debian/changelog 2004-01-07 07:16:05.000000000 +0100
+++ languagechooser.new/debian/changelog 2004-01-06 16:35:43.000000000 +0100
@@ -1,3 +1,10 @@
+languagechooser (1.09) UNRELEASED; urgency=low
+
+ * Removed reference to countries except for pt_BR/pt
+ * Country choosing to me moved in countrychooser
+
+ -- Christian Perrier <[EMAIL PROTECTED]> Tue, 6 Jan 2004 16:34:55 +0100
+
languagechooser (1.08) unstable; urgency=low
* Petter Reinholdtsen
diff -Nru --exclude=CVS languagechooser/languagelist languagechooser.new/languagelist
--- languagechooser/languagelist 2004-01-07 07:16:05.000000000 +0100
+++ languagechooser.new/languagelist 2004-01-06 18:21:58.000000000 +0100
@@ -3,40 +3,27 @@
#
#Language [(Region/Country)];locale;langcode;countrycode;langlist
# (languages marked #X need updated translations)
-Arabic;ar_SY;ar;SY
-Bosnian;bs_BA;bs;BA;bs_BA:bs:en_GB:en
-Bulgarian;bg_BG;bg;BG;
+Arabic;ar_EG;ar;EG;
+#X Bosnian;bs_BA;bs;BA;bs_BA:bs:en_GB:en
Catalan;ca_ES;ca;ES;
Chinese (Simplified);zh_CN;zh;CN;
-Chinese (Traditional);zh_TW;zh;TW;
+#X Chinese (Traditional);zh_TW;zh;TW;
#X Croatian;hr_HR;hr;HR;
Czech;cs_CZ;cs;CZ;
Danish;da_DK;da;DK;
-Dutch (Belgium);[EMAIL PROTECTED];nl;BE;nl_BE:nl:en_GB:en
-Dutch (The Netherlands);[EMAIL PROTECTED];nl;NL;nl_NL:nl:en_GB:en
-English (Australia);en_AU;en;AU;
-English (India);en_IN;en;IN;
-English (USA);en_US;en;US;
-English (United Kingdom);en_GB;en;GB;
-English (Ireland);en_IE;en;IE;
-Esperanto;eo_EO;eo;;
+Dutch;[EMAIL PROTECTED];nl;NL;nl_NL:nl:en_GB:en
+English;en_US;en;US;
+#X Esperanto;eo_EO;eo;;
Finnish;[EMAIL PROTECTED];fi;FI;fi:se
-French (Belgium);[EMAIL PROTECTED];fr;BE;fr_BE:fr:[EMAIL PROTECTED];NL_BE:nl:en_GB:en
-French (Canada);fr_CA;fr;CA;
-French (France);[EMAIL PROTECTED];fr;FR;fr_FR:fr:en_GB:en
-French (Luxembourg);[EMAIL PROTECTED];fr;LU;
-French (Switzerland);fr_CH;fr;CH;
-Galician;gl_ES;gl;ES;gl:es
-German (Belgium);[EMAIL PROTECTED];de;BE;de_BE:de:en_GB:en
-German (Germany);[EMAIL PROTECTED];de;DE;de_DE:de:en_GB:en
-German (Switzerland);de_CH;de;CH;de_CH:de;en_GB:en
+French;[EMAIL PROTECTED];fr;FR;fr_FR:fr:en_GB:en
+#X Galician;gl_ES;gl;ES;gl:es
+German;[EMAIL PROTECTED];de;DE;de_DE:de:en_GB:en
Greek;el_GR;el;GR;
#X Hebrew;he_IL;he;IL;
Hungarian;hu_HU;hu;HU;
-Irish;ga_IE;ga;IE;ga:en_IE
+#X Irish;ga_IE;ga;IE;ga:en_IE
#X Icelandic;is_IS;is;IS;
-Italian (Italy);[EMAIL PROTECTED];it;IT;
-Italian (Switzerland);it_CH;it;CH;
+Italian;[EMAIL PROTECTED];it;IT;
# Not sure which locale to select, the EUC-JP or the UTF-8 one. Picked one at random.
# [pere 2003-09-06]
Japanese;ja_JP.EUC-JP;ja;JP;
@@ -44,20 +31,18 @@
# 'KR' so we use it as the country.
# Not sure which locale to select, the EUC-KR or the UTF-8 one. Picked one at random.
# [pere 2003-09-06]
-Korean;ko_KR.EUC-KR;ko;KR;
+#X Korean;ko_KR.EUC-KR;ko;KR;
Latvian;lv_LV;lv;LV;lv:ru:en
Lithuanian;lt_LT;lt;LT;lt:en
-Northern Saami (Norway);se_NO;se_NO:se:nb_NO:nb:no_NO:no:nn_NO:nn:en_GB:en
+#X Northern Saami;se_NO;se_NO:se:nb_NO:nb:no_NO:no:nn_NO:nn:en_GB:en
Norwegian Bokmaal;no_NO;nb;NO;nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en_GB:en
Norwegian Nynorsk;nn_NO;nn;NO;nn_NO:nn:no_NO:no:nb_NO:nb:da:sv:en_GB:en
Polish;pl_PL;pl;PL;
Portuguese (Brazil);pt_BR;pt;BR;pt_BR:pt:pt_PT
-Portuguese (Portugal);pt_PT;pt;PT;pt_PT:pt:pt_BR
+Portuguese;pt_PT;pt;PT;pt_PT:pt:pt_BR
Russian;ru_RU.KOI8-R;ru;RU;
Slovak;sk_SK;sk;SK;
Slovenian;sl_SI;sl;SI;sl_SI:sl:en_GB
-Spanish (Spain);[EMAIL PROTECTED];es;ES;
-Spanish (Mexico);es_MX;es;MX;es_MX:es
-Swedish (Finland);sv_FI;sv;FI;
-Swedish (Sweden);sv_SE;sv;SE;
+Spanish;[EMAIL PROTECTED];es;ES;
+Swedish;sv_SE;sv;SE;
Turkish;tr_TR;tr;TR;
diff -Nru --exclude=CVS languagechooser/languagelist.l10n
languagechooser.new/languagelist.l10n
--- languagechooser/languagelist.l10n 2004-01-07 07:16:05.000000000 +0100
+++ languagechooser.new/languagelist.l10n 2004-01-06 18:21:06.000000000 +0100
@@ -1,57 +1,42 @@
#
# List of translations for the language prompt
# The phrase to translate is
-# Choose this to proceed in <language> [<region/country>]
+# Choose this to proceed in <language>
#
-Arabic: (ØØØØ ÙÙÙ ÙØØØØ ØØÙØØ ØÙØØØÙØ (ØÙØØÙÙ
ØÙØØØÙ
-Bosnian: Izaberite ovu opciju kako bi ste nastavili na bosanskom
-Bulgarian: ÐÐÐÐÑÐÑÐ ÑÐÐÐ ÐÐÑÐÑ, ÐÐ ÐÐ ÐÑÐÐÑÐÐÐÑÐ ÐÐ
ÐÑÐÐÐÑÑÐÐ
-Catalan: Trieu aquesta opcià per a continuar en catalÃ
-Chinese (Simplified): éææéåäççääæççåè
-Chinese (Traditional): éææéåäççéäæççåè
-Croatian: Odaberite ovo i pritisnite Enter kako bi nastavili na hrvatskom
-Czech: Zvolte tuto moÅnost pro pokraÄovÃnà v ÄeÅtinÄ
-Danish: VÃlg dette for at fortsÃtte pà dansk
-Dutch (Belgium): Kies dit om in het Nederlands verder te gaan (BelgiÃ)
-Dutch (The Netherlands): Kies dit om in het Nederlands verder te gaan (Nederland)
-English (Australia): Choose this to proceed in English (Australia)
-English (India): Choose this to proceed in English (India)
-English (USA): Choose this to proceed in English (USA)
-English (United Kingdom): Choose this to proceed in English (United Kingdom)
-English (Ireland): Choose this to proceed in English (Ireland)
-Esperanto: Elektu Äi tion por daÅrigi en Esperanto
-Finnish: Valitse tÃmà jatkaaksesi suomeksi
-French (Belgium): Choisissez ceci pour continuer en franÃais (Belgique)
-French (Canada): Choisissez ceci pour continuer en franÃais (Canada)
-French (France): Choisissez ceci pour continuer en franÃais (France)
-French (Luxembourg): Choisissez ceci pour continuer en franÃais (Luxembourg)
-French (Switzerland): Choisissez ceci pour continuer en franÃais (Suisse)
-Galician: Escolla isto para seguir en galego
-German (Germany): Dies auswÃhlen um auf Deutsch fortzufahren (Deutschland)
-German (Belgium): Dies auswÃhlen um auf Deutsch fortzufahren (Belgien)
-German (Switzerland): Dies auswÃhlen um auf Deutsch fortzufahren (Schweiz)
-Greek: ÎÏÎÎÎÎÏÎ ÎÎÏ ÎÎÎ ÎÎ ÏÏÎÎÏÎÏÎÏÎ ÏÏÎ
ÎÎÎÎÎÎÎÎ
-Hebrew: Choose this to proceed in Hebrew
-Hungarian: Ha magyarul kÃvÃn telepÃteni, vÃlassza ezt
-Irish: TÃg seo a lean as Gaeilge
-Icelandic: Choose this to proceed in Icelandic
-Italian (Italy): Selezionare questa riga per l'italiano (Italia)
-Italian (Switzerland): Selezionare questa riga per l'italiano (Svizzera)
-Japanese: ææèãèåãèããããããéãããããã
-Korean: íêìë ìííììëë. êìíëë ìíë ëëìì
-Latvian: IzvÄlaties Åo lai turpinÄtu Latviski
-Lithuanian: IÅsirinkite ÅiÄ eilutÄ, kad tÄsti lietuviÅkai
-Northern Saami (Norway): VÃllje dÃn jos Ãiggot joatkit sÃmegillii (Norga)
-Norwegian Bokmaal: Velg denne for à fortsette med norsk bokmÃl
-Norwegian Nynorsk: Velg denne for à fortsette med norsk nynorsk
-Polish: Wybierz tÄ pozycjÄ aby kontynuowaÄ w jÄzyku polskim
-Portuguese (Brazil): Selecione esta para prosseguir em PortuguÃs (Brasil)
-Portuguese (Portugal): Vocà selecionou o idioma PortuguÃs (Portugal)
-Russian: ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÑÑ ÐÐ-ÑÑÑÑÐÐ,
ÐÑÐÐÑÐÑÐ ÑÑÑ ÑÑÑÐÐÑ
-Slovak: ZvoÄte si tÃto moÅnosÅ, ak chcete pouÅÃvaÅ slovenÄinu
-Slovenian: Izberite to moÅnost za nadaljevanje v slovenÅÄini (Slovenija)
-Spanish (Spain): Elija esta opciÃn para continuar en espaÃol (EspaÃa)
-Spanish (Mexico): Elija esta opciÃn para continuar en espaÃol (Mexico)
-Swedish (Finland): VÃlj det hÃr fÃr att fortsÃtta pà svenska (Finland)
-Swedish (Sweden): VÃlj det hÃr fÃr att fortsÃtta pà svenska (Sverige)
-Turkish: TÃrkÃe olarak devam etmek iÃin seÃiniz
+Arabic: ar (ØØØØ ÙÙÙ ÙØØØØ ØØÙØØ ØÙØØØÙØ (ØÙØØÙÙ
ØÙØØØÙ
+Bosnian: ba Izaberite ovu opciju kako bi ste nastavili na bosanskom
+Catalan: ca Trieu aquesta opcià per a continuar en catalÃ
+Chinese (Simplified): zh_CN éææéåäççääæççåè
+Chinese (Traditional): zh_TW éææéåäççéäæççåè
+Croatian: hr Odaberite ovo i pritisnite Enter kako bi nastavili na hrvatskom
+Czech: cs Zvolte tuto moÅnost pro pokraÄovÃnà v ÄeÅtinÄ
+Danish: da VÃlg dette for at fortsÃtte pà dansk
+Dutch: nl Kies dit om in het Nederlands verder te gaan
+English: C Choose this to proceed in international English
+Esperanto: eo Elektu Äi tion por daÅrigi en Esperanto
+Finnish: fi Valitse tÃmà jatkaaksesi suomeksi
+French: fr Choisissez ceci pour continuer en franÃais
+Galician: gl Escolla isto para seguir en galego
+German: de Dies auswÃhlen um auf Deutsch fortzufahren
+Greek: el ÎÏÎÎÎÎÏÎ ÎÎÏ ÎÎÎ ÎÎ ÏÏÎÎÏÎÏÎÏÎ ÏÏÎ
ÎÎÎÎÎÎÎÎ
+Hebrew: he Choose this to proceed in Hebrew
+Hungarian: hu Ha magyarul kÃvÃn telepÃteni, vÃlassza ezt
+Irish: ga TÃg seo a lean as Gaeilge
+Icelandic: is Choose this to proceed in Icelandic
+Italian: it Selezionare questa riga per l'italiano
+Japanese: ja ææèãèåãèããããããéãããããã
+Korean: ko íêìë ìííììëë. êìíëë ìíë
ëëìì
+Latvian: lv IzvÄlaties Åo lai turpinÄtu Latviski
+Lithuanian: lt IÅsirinkite ÅiÄ eilutÄ, kad tÄsti lietuviÅkai
+Northern Saami: se VÃllje dÃn jos Ãiggot joatkit sÃmegillii
+Norwegian Bokmaal: no Velg denne for à fortsette med norsk bokmÃl
+Norwegian Nynorsk: nn Velg denne for à fortsette med norsk nynorsk
+Polish: pl Wybierz tÄ pozycjÄ aby kontynuowaÄ w jÄzyku polskim
+Portuguese (Brazil): pt_BR Selecione esta opÃÃo para prosseguir com o idioma
PortuguÃs do Brasil
+Portuguese: pt Vocà selecionou o idioma PortuguÃs
+Russian: ru ÐÑÐÐÑ ÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÑÑ ÐÐ-ÑÑÑÑÐÐ,
ÐÑÐÐÑÐÑÐ ÑÑÑ ÑÑÑÐÐÑ
+Slovak: sk ZvoÄte si tÃto moÅnosÅ, ak chcete pouÅÃvaÅ slovenÄinu
+Slovenian: sl Izberite to moÅnost za nadaljevanje v slovenÅÄini
+Spanish: es Elija esta opciÃn para continuar en espaÃol
+Swedish: sv VÃlj det hÃr fÃr att fortsÃtta pà svenska
+Turkish: tr TÃrkÃe olarak devam etmek iÃin seÃiniz
