Bug#226575: New languagechooser proposal: Remove reference to countries in languagechooser
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 <bubulle@debian.org> 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);nl_BE@euro;nl;BE;nl_BE:nl:en_GB:en
-Dutch (The Netherlands);nl_NL@euro;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;nl_NL@euro;nl;NL;nl_NL:nl:en_GB:en
+English;en_US;en;US;
+#X Esperanto;eo_EO;eo;;
Finnish;fi_FI@euro;fi;FI;fi:se
-French (Belgium);fr_BE@euro;fr;BE;fr_BE:fr:NL_BE@euro;NL_BE:nl:en_GB:en
-French (Canada);fr_CA;fr;CA;
-French (France);fr_FR@euro;fr;FR;fr_FR:fr:en_GB:en
-French (Luxembourg);fr_LU@euro;fr;LU;
-French (Switzerland);fr_CH;fr;CH;
-Galician;gl_ES;gl;ES;gl:es
-German (Belgium);de_BE@euro;de;BE;de_BE:de:en_GB:en
-German (Germany);de_DE@euro;de;DE;de_DE:de:en_GB:en
-German (Switzerland);de_CH;de;CH;de_CH:de;en_GB:en
+French;fr_FR@euro;fr;FR;fr_FR:fr:en_GB:en
+#X Galician;gl_ES;gl;ES;gl:es
+German;de_DE@euro;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);it_IT@euro;it;IT;
-Italian (Switzerland);it_CH;it;CH;
+Italian;it_IT@euro;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);es_ES@euro;es;ES;
-Spanish (Mexico);es_MX;es;MX;es_MX:es
-Swedish (Finland);sv_FI;sv;FI;
-Swedish (Sweden);sv_SE;sv;SE;
+Spanish;es_ES@euro;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
Reply to: