summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2002-07-16 18:28:14 +0000
committerGeorge Lebl <jirka@src.gnome.org>2002-07-16 18:28:14 +0000
commit08d3b5c1d4594541f5cdec9154950a0a5935be3a (patch)
tree925ada3d3d2fd861668c8ba3719c676be1e06f7d
parent30e15b41b3b347c350c502f8eb269b362aaa567d (diff)
downloadgdm-08d3b5c1d4594541f5cdec9154950a0a5935be3a.tar.gz
Added a few more languages And fixed the naming for english and brazilian
Tue Jul 16 11:37:22 2002 George Lebl <jirka@5z.com> * config/locale.alias, gui/gdmlanguages.c: Added a few more languages And fixed the naming for english and brazilian portuguese which fixes #88273
-rw-r--r--ChangeLog6
-rw-r--r--config/locale.alias7
-rw-r--r--gui/gdmlanguages.c27
3 files changed, 36 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 976a0a1e..579adf9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 16 11:37:22 2002 George Lebl <jirka@5z.com>
+
+ * config/locale.alias, gui/gdmlanguages.c: Added a few more languages
+ And fixed the naming for english and brazilian portuguese which
+ fixes #88273
+
Tue Jul 16 10:49:44 2002 George Lebl <jirka@5z.com>
* Release 2.4.0.2
diff --git a/config/locale.alias b/config/locale.alias
index b60cf125..7f7342c2 100644
--- a/config/locale.alias
+++ b/config/locale.alias
@@ -13,6 +13,8 @@
# - George
Azerbaijani az_AZ
+Arabic(Egypt) ar_EG
+Arabic(Lebanon) ar_LB
Basque eu_ES
Bulgarian bg_BG
Catalan ca_ES
@@ -24,7 +26,9 @@ Danish da_DK
Dutch nl_NL
Estonian et_EE
English(American) en_US
+English(Australian) en_AU
English(British) en_GB
+English(Ireland) en_IE
Finnish fi_FI
French fr_FR
Galician gl_ES
@@ -33,6 +37,7 @@ Greek el_GR
Hebrew he_IL
Hungarian hu_HU
Icelandic is_IS
+Irish ga_IE
Italian it_IT
Japanese ja_JP
Korean ko_KR
@@ -50,7 +55,9 @@ Russian ru_RU
Slovak sk_SK
Slovenian sl_SI
Spanish es_ES
+Spanish(Mexico) es_MX
Swedish sv_SE
+Tamil ta_IN
Turkish tr_TR
Ukrainian uk_UA
Vietnamese vi_VN
diff --git a/gui/gdmlanguages.c b/gui/gdmlanguages.c
index 5055babf..e1d0a1d5 100644
--- a/gui/gdmlanguages.c
+++ b/gui/gdmlanguages.c
@@ -37,14 +37,23 @@ struct _Language {
char *collate_key;
};
+/* FIXME: We need to have a nicer selection of language and country,
+ * I suppose that we should have a menu of languages and then for each have
+ * a submenu of countries (and perhaps other variations such as utf8 vs not
+ * etc...) if there is more then one. */
+
/* Note: these should NOT include the encodings, this is just a translation
* matrix for language_country names. This is NOT a list of available
* languages, just their names and where they are placed in the menu.
* 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 */
+ /*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|Arabic (Egypt)"), "ar_EG", NULL, 0 },
+ /*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|Basque"), "eu_ES", "Euskara", 0 },
/*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|Bulgarian"), "bg_BG", NULL, 0 },
@@ -67,9 +76,13 @@ static Language languages [] = {
/*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|American English"), "en_US", "American English", 0 },
+ { 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 },
/*Note translate the A-M to the A-M you used in the group label */
- { N_("A-M|British English"), "en_GB", "British English", 0 },
+ { N_("A-M|English (British)"), "en_GB", "British English", 0 },
+ /*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|Finnish"), "fi_FI", "Suomi", 0 },
/*Note translate the A-M to the A-M you used in the group label */
@@ -88,6 +101,8 @@ static Language languages [] = {
/*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|Icelandic"), "is_IS", NULL, 0 },
/*Note translate the A-M to the A-M you used in the group label */
+ { N_("A-M|Irish"), "ga_IE", NULL, 0 },
+ /*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|Italian"), "it_IT", "Italiano", 0 },
/*Note translate the A-M to the A-M you used in the group label */
{ N_("A-M|Japanese"), "ja_JP", "日本語", 0 },
@@ -110,7 +125,7 @@ static Language languages [] = {
/*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Portuguese"), "pt_PT", "Português", 0 },
/*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Brazilian Portuguese"), "pt_BR", "Português do Brasil", 0 },
+ { 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|Romanian"), "ro_RO", "Română", 0 },
/*Note translate the N-Z to the N-Z you used in the group label */
@@ -122,8 +137,12 @@ static Language languages [] = {
/*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Spanish"), "es_ES", "Español", 0 },
/*Note translate the N-Z to the N-Z you used in the group label */
+ { N_("N-Z|Spanish (Mexico)"), "es_MX", NULL, 0 },
+ /*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Swedish"), "sv_SE", "Svenska", 0 },
/*Note translate the N-Z to the N-Z you used in the group label */
+ { N_("N-Z|Tamil"), "ta_IN", NULL, 0 },
+ /*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Turkish"), "tr_TR", "Türkçe", 0 },
/*Note translate the N-Z to the N-Z you used in the group label */
{ N_("N-Z|Ukrainian"), "uk_UA", NULL, 0 },