Add Serbian and Montenegro languages. Patch provided by Peter Nugent

2006-11-02  Brian Cameron  <brian.cameron@sun.com>

        * gui/gdmlanguages.c, config/locale.alias:  Add
          Serbian and Montenegro languages.  Patch provided by
          Peter Nugent <Peter.Nugent@sun.com>

3 files changed, 56 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index 2aff7b07..e6381c3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-02  Brian Cameron  <brian.cameron@sun.com>
+
+	* gui/gdmlanguages.c, config/locale.alias:  Add 
+	  Serbian and Montenegro languages.  Patch provided by
+	  Peter Nugent <Peter.Nugent@sun.com>
+
 2006-11-06  Brian Cameron  <brian.cameron@sun.com>
 
         * daemon/verify-pam.c: Update to make casting more clear.
diff --git a/config/locale.alias b/config/locale.alias
index a406c329..8b53dfbb 100644
--- a/config/locale.alias
+++ b/config/locale.alias
@@ -1,4 +1,4 @@
-# NOTE! This is a broken way to do things.  Gdm currently reads languages ONLY
+# NOTE! This is a broken way to do things.  GDM currently reads languages ONLY
 # from this file.  This is Broken(tm).  This setup will be replaced in some
 # future version to be replaced by some automatic detection of available
 # locales.  This file is not really a locale.alias file and the first word
@@ -14,20 +14,20 @@
 #
 #		- George
 
-C(POSIX)   C,POSIX
-Afrikaans			af_ZA.UTF-8,af_ZA
-Albanian			sq_AL.UTF-8,sq_AL
+C(POSIX)		C,POSIX
+Afrikaans		af_ZA.UTF-8,af_ZA
+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
-Arabic(SaudiArabia)		ar_SA.UTF-8,ar_SA
+Arabic(SaudiArabia)	ar_SA.UTF-8,ar_SA
 Armenian		hy_AM.UTF-8,hy_AM
 Azerbaijani		az_AZ.UTF-8,az_AZ
 Azerbaijani(Iran)	az_IR.UTF-8,az_IR
 Basque			eu_ES.UTF-8,eu_ES
-Belarusian			be_BY.UTF-8,be_BY
+Belarusian		be_BY.UTF-8,be_BY
 Bengali			bn_BD.UTF-8,bn_BD
-Bengali(India)			bn_IN.UTF-8,bn_IN
+Bengali(India)		bn_IN.UTF-8,bn_IN
 Bosnian			bs_BA.UTF-8,bs_BA
 Breton			br_FR.UTF-8,br_FR
 Bulgarian		bg_BG.UTF-8,bg_BG
@@ -41,11 +41,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
-Dutch(Belgium)			nl_BE.UTF-8,nl_BE
+Dutch(Belgium)		nl_BE.UTF-8,nl_BE
 English(Australia)	en_AU.UTF-8,en_AU
 English(Canada)		en_CA.UTF-8,en_CA
 English(Ireland)	en_IE.UTF-8,en_IE
-English(Malta)	en_MT.UTF-8,en_MT
+English(Malta)		en_MT.UTF-8,en_MT
 English(NewZealand)	en_NZ.UTF-8,en_NZ
 English(SouthAfrica)	en_ZA.UTF-8,en_ZA
 English(UK)		en_GB.UTF-8,en_GB
@@ -56,7 +56,7 @@ Finnish			fi_FI.UTF-8,fi_FI
 French			fr_FR.UTF-8,fr_FR
 French(Belgium)		fr_BE.UTF-8,fr_BE
 French(Canada)		fr_CA.UTF-8,fr_CA
-French(Luxembourg)		fr_LU.UTF-8,fr_LU
+French(Luxembourg)	fr_LU.UTF-8,fr_LU
 French(Switzerland)	fr_CH.UTF-8,fr_CH
 Galician		gl_ES.UTF-8,gl_ES
 German			de_DE.UTF-8,de_DE
@@ -64,19 +64,19 @@ German(Austria)		de_AT.UTF-8,de_AT
 German(Switzerland)	de_CH.UTF-8,de_CH
 German(Luxembourg)	de_LU.UTF-8,de_LU
 Greek			el_GR.UTF-8,el_GR
-Greek(Cyprus)			el_CY.UTF-8,el_CY
-Gujarati			gu_IN.UTF-8,gu_IN
+Greek(Cyprus)		el_CY.UTF-8,el_CY
+Gujarati		gu_IN.UTF-8,gu_IN
 Hebrew			he_IL.UTF-8,he_IL
 Hindi			hi_IN.UTF-8,hi_IN
 Hungarian		hu_HU.UTF-8,hu_HU
 Icelandic		is_IS.UTF-8,is_IS
-Indonesian			id_ID.UTF-8,id_ID
-Interlingua			ia.UTF-8,ia
+Indonesian		id_ID.UTF-8,id_ID
+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
 Kannada			kn_IN.UTF-8,kn_IN
-Kinyarwanda             rw_RW.UTF-8,rw_RW
+Kinyarwanda		rw_RW.UTF-8,rw_RW
 Korean			ko_KR.UTF-8,ko_KR
 Latvian			lv_LV.UTF-8,lv_LV
 Limburgish		li_NL.UTF-8,li_NL
@@ -84,14 +84,14 @@ Limburgish(Belgium)	li_BE.UTF-8,li_BE
 Limburgish(Germany)	li_DE.UTF-8,li_DE
 Lithuanian		lt_LT.UTF-8,lt_LT
 Macedonian		mk_MK.UTF-8,mk_MK
-Malayalam			ml_IN.UTF-8,ml_IN
+Malayalam		ml_IN.UTF-8,ml_IN
 Malay			ms_MY.UTF-8,ms_MY
 Maltese			mt_MT.UTF-8,mt_MT
 Maori			mi_NZ.UTF-8,mi_NZ	
 Marathi			mr_IN.UTF-8,mr_IN
 Mongolian		mn_MN.UTF-8,mn_MN
 Nepali			ne_NP.UTF-8,ne_NP
-NorthernSotho	nso_ZA.UTF-8,nso_ZA
+NorthernSotho		nso_ZA.UTF-8,nso_ZA
 Norwegian(bokmal)	nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO
 Norwegian(nynorsk)	nn_NO.UTF-8,nn_NO
 Oriya			or_IN.UTF-8,or_IN
@@ -103,27 +103,29 @@ Portuguese		pt_PT.UTF-8,pt_PT
 Romanian		ro_RO.UTF-8,ro_RO
 Russian			ru_RU.UTF-8,ru_RU
 Serbian			sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU
-Serbian(Bosnia)			sh_BA.UTF-8,sh_BA
+Serbian(Montenegro)	sr_ME.UTF-8

+Serbian(Serbia)		sr_RS.UTF-8

+Serbian(Bosnia)		sh_BA.UTF-8,sh_BA
 Serbian(Latin)		sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn
 Serbian(Jekavian)	sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije
 Slovak			sk_SK.UTF-8,sk_SK
 Slovenian		sl_SI.UTF-8,sl_SI
 Spanish			es_ES.UTF-8,es_ES
-Spanish(Argentina)		es_AR.UTF-8,es_AR
-Spanish(Bolivia)		es_BO.UTF-8,es_BO
+Spanish(Argentina)	es_AR.UTF-8,es_AR
+Spanish(Bolivia)	es_BO.UTF-8,es_BO
 Spanish(Chile)		es_CL.UTF-8,es_CL
-Spanish(Colombia)		es_CO.UTF-8,es_CO
-Spanish(CostaRica)		es_CR.UTF-8,es_CR
-Spanish(Ecuador)		es_EC.UTF-8,es_EC
-Spanish(Guatemala)		es_GT.UTF-8,es_GT
+Spanish(Colombia)	es_CO.UTF-8,es_CO
+Spanish(CostaRica)	es_CR.UTF-8,es_CR
+Spanish(Ecuador)	es_EC.UTF-8,es_EC
+Spanish(Guatemala)	es_GT.UTF-8,es_GT
 Spanish(Mexico)		es_MX.UTF-8,es_MX
-Spanish(Nicaragua)		es_NI.UTF-8,es_NI
+Spanish(Nicaragua)	es_NI.UTF-8,es_NI
 Spanish(Panama)		es_PA.UTF-8,es_PA
 Spanish(Peru)		es_PE.UTF-8,es_PE
-Spanish(Paraguay)		es_PY.UTF-8,es_PY
-Spanish(ElSalvador)		es_SV.UTF-8,es_SV
-Spanish(Uruguay)		es_UY.UTF-8,es_UY
-Spanish(Venezuela)		es_VE.UTF-8,es_VE
+Spanish(Paraguay)	es_PY.UTF-8,es_PY
+Spanish(ElSalvador)	es_SV.UTF-8,es_SV
+Spanish(Uruguay)	es_UY.UTF-8,es_UY
+Spanish(Venezuela)	es_VE.UTF-8,es_VE
 Swedish(Finland)	sv_FI.UTF-8,sv_FI
 Swedish			sv_SE.UTF-8,sv_SE
 Tagalog			tl_PH.UTF-8,tl_PH
diff --git a/gui/gdmlanguages.c b/gui/gdmlanguages.c
index 026bf02a..08b130f8 100644
--- a/gui/gdmlanguages.c
+++ b/gui/gdmlanguages.c
@@ -168,25 +168,25 @@ static Language languages [] = {
 	/*Note translate the A-M to the A-M you used in the group label */
 	{ N_("A-M|Kannada"), "kn_IN", "ಕನ್ನಡ", 0 },
 	/*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|Kinyarwanda"), "rw_RW", "Kinyarwanda", 0 },
+	{ N_("A-M|Kinyarwanda"), "rw_RW", "Kinyarwanda", 0 },
+	/*Note translate the A-M to the A-M you used in the group label */
 	{ N_("A-M|Korean"), "ko_KR", "한국어", 0 },
 	/*Note translate the A-M to the A-M you used in the group label */
 	{ N_("A-M|Latvian"), "lv_LV", "Latviešu", 0 },
 	/*Note translate the A-M to the A-M you used in the group label */
 	{ N_("A-M|Lithuanian"), "lt_LT", "Lietuvių", 0 },
-        /*Note translate the A-M to the A-M you used in the group label */
-        { N_("A-M|Macedonian"), "mk_MK", NULL, 0 },
-        /*Note translate the A-M to the A-M you used in the group label */
-        { N_("A-M|Malay"), "ms_MY", "Bahasa Melayu", 0 },
-        /*Note translate the A-M to the A-M you used in the group label */
-        { N_("A-M|Malayalam"), "ml_IN", "മലയാളം", 0 },
-        /*Note translate the A-M to the A-M you used in the group label */
-        { N_("A-M|Maltese"), "mt_MT", NULL, 0 },
-        /*Note translate the A-M to the A-M you used in the group label */
-        { N_("A-M|Marathi"), "mr_IN", NULL, 0 },
-        /*Note translate the A-M to the A-M you used in the group label */
-        { N_("A-M|Mongolian"), "mn_MN", "Монгол", 0 },
+	/*Note translate the A-M to the A-M you used in the group label */
+	{ N_("A-M|Macedonian"), "mk_MK", NULL, 0 },
+	/*Note translate the A-M to the A-M you used in the group label */
+	{ N_("A-M|Malay"), "ms_MY", "Bahasa Melayu", 0 },
+	/*Note translate the A-M to the A-M you used in the group label */
+	{ N_("A-M|Malayalam"), "ml_IN", "മലയാളം", 0 },
+	/*Note translate the A-M to the A-M you used in the group label */
+	{ N_("A-M|Maltese"), "mt_MT", NULL, 0 },
+	/*Note translate the A-M to the A-M you used in the group label */
+	{ N_("A-M|Marathi"), "mr_IN", NULL, 0 },
+	/*Note translate the A-M to the A-M you used in the group label */
+	{ N_("A-M|Mongolian"), "mn_MN", "Монгол", 0 },
 	/*Note translate the N-Z to the N-Z you used in the group label */
 	{ N_("N-Z|Northern Sotho"), "nso_ZA", "Sesotho sa Leboa", 0 },
 	/*Note translate the N-Z to the N-Z you used in the group label */
@@ -212,7 +212,11 @@ static Language languages [] = {
 	/*Note translate the N-Z to the N-Z you used in the group label */
 	{ N_("N-Z|Serbian"), "sr_YU", "српски", 0 },
 	/*Note translate the N-Z to the N-Z you used in the group label */
-	{ N_("N-Z|Serbian"), "sr_CS", "српски", 0 },
+	{ N_("N-Z|Serbian (Serbia & Montenegro)"), "sr_CS", "српски", 0 },

+	/*Note translate the N-Z to the N-Z you used in the group label */

+	{ N_("N-Z|Serbian (Montenegro)"), "sr_ME", "српски", 0 },

+	/*Note translate the N-Z to the N-Z you used in the group label */

+	{ N_("N-Z|Serbian (Serbia)"), "sr_RS", "српски", 0 },	

 	/*Note translate the N-Z to the N-Z you used in the group label */
 	{ N_("N-Z|Serbian (Latin)"), "sr_CS@Latn", "srpski (latinica)", 0 },
 	/*Note translate the N-Z to the N-Z you used in the group label */