summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Golder <rossg@src.gnome.org>2003-03-15 10:31:02 +0000
committerRoss Golder <rossg@src.gnome.org>2003-03-15 10:31:02 +0000
commitf138b70323181314dceea561ea67d95020d45394 (patch)
tree45a25c6046c1db963d6a20e3b878dd1b6785224d
parent0b1a7ea19a79a69663a54277c55ecb1380162d07 (diff)
downloadgdm-f138b70323181314dceea561ea67d95020d45394.tar.gz
Sorted into proper alphabetic order (fixed #106293)
* config/locale.alias, gui/gdmlanguages.c: Sorted into proper alphabetic order (fixed #106293)
-rw-r--r--ChangeLog5
-rw-r--r--config/locale.alias18
-rw-r--r--gui/gdmlanguages.c12
3 files changed, 20 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index dea4abb0..105413ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-15 Ross Golder <ross@golder.org>
+
+ * config/locale.alias, gui/gdmlanguages.c: Sorted into proper
+ alphabetic order. (fixes #106293)
+
2003-03-13 Christian Rose <menthos@menthos.com>
* configure.in: Added "ml" to ALL_LINGUAS.
diff --git a/config/locale.alias b/config/locale.alias
index 49822cfe..98870eea 100644
--- a/config/locale.alias
+++ b/config/locale.alias
@@ -14,16 +14,16 @@
#
# - George
-Azerbaijani az_AZ.UTF-8,az_AZ
Albanian sq_AL.UTF-8,sq_AL
+Amharic am_ET.UTF-8,am_ET
Arabic(Egypt) ar_EG.UTF-8,ar_EG
Arabic(Lebanon) ar_LB.UTF-8,ar_LB
-Amharic am_ET.UTF-8,am_ET
+Azerbaijani az_AZ.UTF-8,az_AZ
Basque eu_ES.UTF-8,eu_ES
-Bosnian bs_BA.UTF-8,bs_BA
Belarusian be_BY.UTF-8,be_BY
Bengali bn_BD.UTF-8,bn_BD
Bengali(India) bn_IN.UTF-8,bn_IN
+Bosnian bs_BA.UTF-8,bs_BA
Bulgarian bg_BG.UTF-8,bg_BG
Catalan ca_ES.UTF-8,ca_ES
Chinese(simplified) zh_CN.UTF-8,zh_CN
@@ -32,11 +32,11 @@ Croatian hr_HR.UTF-8,hr_HR
Czech cs_CZ.UTF-8,cs_CZ
Danish da_DK.UTF-8,da_DK
Dutch nl_NL.UTF-8,nl_NL
-Estonian et_EE.UTF-8,et_EE
English(American) en_US.UTF-8,en_US
English(Australian) en_AU.UTF-8,en_AU
English(British) en_GB.UTF-8,en_GB
English(Ireland) en_IE.UTF-8,en_IE
+Estonian et_EE.UTF-8,et_EE
Finnish fi_FI.UTF-8,fi_FI
French fr_FR.UTF-8,fr_FR
Galician gl_ES.UTF-8,gl_ES
@@ -52,23 +52,23 @@ Interlingua ia.UTF-8,ia
Irish ga_IE.UTF-8,ga_IE
Italian it_IT.UTF-8,it_IT
Japanese ja_JP.UTF-8,ja_JP
-Korean ko_KR.UTF-8,ko_KR
Kannada kn_IN.UTF-8,kn_IN
+Korean ko_KR.UTF-8,ko_KR
Latvian lv_LV.UTF-8,lv_LV
Lithuanian lt_LT.UTF-8,lt_LT
Macedonian mk_MK.UTF-8,mk_MK
-Malay ms_MY.UTF-8,ms_MY
Malayalam ml_IN.UTF-8,ml_IN
+Malay ms_MY.UTF-8,ms_MY
Marathi mr_IN.UTF-8,mr_IN
Mongolian mn_MN.UTF-8,mn_MN
Norwegian(bokmal) no_NO.UTF-8,no_NO
Norwegian(nynorsk) nn_NO.UTF-8,nn_NO
Oriya or_IN.UTF-8,or_IN
+Panjabi pa_IN.UTF-8,pa_IN
Persian fa_IR.UTF-8,fa_IR
Polish pl_PL.UTF-8,pl_PL
-Portuguese pt_PT.UTF-8,pt_PT
Portuguese(Brazilian) pt_BR.UTF-8,pt_BR
-Panjabi pa_IN.UTF-8,pa_IN
+Portuguese pt_PT.UTF-8,pt_PT
Romanian ro_RO.UTF-8,ro_RO
Russian ru_RU.UTF-8,ru_RU
Serbian sr_YU.UTF-8,sr_YU
@@ -76,8 +76,8 @@ Slovak sk_SK.UTF-8,sk_SK
Slovenian sl_SI.UTF-8,sl_SI
Spanish es_ES.UTF-8,es_ES
Spanish(Mexico) es_MX.UTF-8,es_MX
-Swedish sv_SE.UTF-8,sv_SE
Swedish(Finland) sv_FI.UTF-8,sv_FI
+Swedish sv_SE.UTF-8,sv_SE
Tamil ta_IN.UTF-8,ta_IN
Telugu te_IN.UTF-8,te_IN
Thai th_TH.UTF-8,th_TH
diff --git a/gui/gdmlanguages.c b/gui/gdmlanguages.c
index 8d228a82..782472bc 100644
--- a/gui/gdmlanguages.c
+++ b/gui/gdmlanguages.c
@@ -50,8 +50,6 @@ struct _Language {
* The available languages come from the supplied locale.alias */
static Language languages [] = {
/*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Azerbaijani"), "az_AZ", NULL, 0 },
- /*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|Albanian"), "sq_AL", "Shqip", 0 },
/*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|Amharic"), "am_ET", NULL, 0 },
@@ -60,6 +58,8 @@ static Language languages [] = {
/*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|Arabic (Lebanon)"), "ar_LB", NULL, 0 },
/*Note translate the A-M to the A-M you used in the group label */
+ { N_("A-M|Azerbaijani"), "az_AZ", NULL, 0 },
+ /*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|Basque"), "eu_ES", "Euskara", 0 },
/*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|Belarusian"), "be_BY", NULL, 0 },
@@ -88,8 +88,6 @@ static Language languages [] = {
/*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|English"), "en", "English", 0 },
/*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|Estonian"), "et_EE", "Eesti", 0 },
- /*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|English (American)"), "en_US", "American English", 0 },
/*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|English (Australian)"), "en_AU", "Australian English", 0 },
@@ -98,6 +96,8 @@ static Language languages [] = {
/*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|English (Ireland)"), "en_IE", "Irish English", 0 },
/*Note translate the A-M to the A-M you used in the group label */
+ { N_("A-M|Estonian"), "et_EE", "Eesti", 0 },
+ /*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|Finnish"), "fi_FI", "Suomi", 0 },
/*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|French"), "fr_FR", "Français", 0 },
@@ -148,6 +148,8 @@ static Language languages [] = {
/*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Norwegian (nynorsk)"), "nn_NO", "Norsk (nynorsk)", 0 },
/*Note translate the N-Z to the N-Z you used in the group label */
+ { N_("N-Z|Panjabi"), "pa_IN", NULL, 0 },
+ /*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Persian"), "fa_IR", "فارسی", 0 },
/*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Polish"), "pl_PL", "Polski", 0 },
@@ -156,8 +158,6 @@ static Language languages [] = {
/*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Portuguese (Brazilian)"), "pt_BR", "Português do Brasil", 0 },
/*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Panjabi"), "pa_IN", NULL, 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Romanian"), "ro_RO", "Română", 0 },
/*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Russian"), "ru_RU", "русский", 0 },