merge 2 flag repos and update lang+flag lists in wizard and lang

chooser.

SVN revision: 70562

diff --git a/data/flags/Makefile.am b/data/flags/Makefile.am
index 7667f1c..a9b5d11 100644 (file)
--- a/data/flags/Makefile.am
+++ b/data/flags/Makefile.am
@@ -6,6 +6,7 @@ af_flag.png \
 al_flag.png \
 am_flag.png \
 ara_flag.png \
+ar_flag.png \
 at_flag.png \
 az_flag.png \
 ba_flag.png \
@@ -18,6 +19,7 @@ bt_flag.png \
 bw_flag.png \
 by_flag.png \
 ca_flag.png \
+cat_flag.png \
 cd_flag.png \
 ch_flag.png \
 cn_flag.png \
@@ -50,8 +52,10 @@ ke_flag.png \
 kg_flag.png \
 kh_flag.png \
 kr_flag.png \
+ku_flag.png \
 kz_flag.png \
 la_flag.png \
+lang-system.png \
 latam_flag.png \
 lk_flag.png \
 lt_flag.png \
@@ -65,6 +69,7 @@ mm_flag.png \
 mn_flag.png \
 mt_flag.png \
 mv_flag.png \
+my_flag.png \
 ng_flag.png \
 nl_flag.png \
 no_flag.png \

diff --git a/data/flags/ad_flag.png b/data/flags/ad_flag.png
index 619810e..77ca135 100644 (file)
Binary files a/data/flags/ad_flag.png and b/data/flags/ad_flag.png differ

diff --git a/data/flags/af_flag.png b/data/flags/af_flag.png
index 4145511..7c37b4f 100644 (file)
Binary files a/data/flags/af_flag.png and b/data/flags/af_flag.png differ

diff --git a/data/flags/al_flag.png b/data/flags/al_flag.png
index 9b41953..e397a46 100644 (file)
Binary files a/data/flags/al_flag.png and b/data/flags/al_flag.png differ

diff --git a/data/flags/am_flag.png b/data/flags/am_flag.png
index 546b496..74b5be0 100644 (file)
Binary files a/data/flags/am_flag.png and b/data/flags/am_flag.png differ

diff --git a/data/flags/ar_flag.png b/data/flags/ar_flag.png
new file mode 100644 (file)
index 0000000..e32170c
Binary files /dev/null and b/data/flags/ar_flag.png differ

diff --git a/data/flags/ara_flag.png b/data/flags/ara_flag.png
index 8618027..bfc1035 100644 (file)
Binary files a/data/flags/ara_flag.png and b/data/flags/ara_flag.png differ

diff --git a/data/flags/at_flag.png b/data/flags/at_flag.png
index 0b129b0..f9e6ee9 100644 (file)
Binary files a/data/flags/at_flag.png and b/data/flags/at_flag.png differ

diff --git a/data/flags/az_flag.png b/data/flags/az_flag.png
index ea04f37..33f2a17 100644 (file)
Binary files a/data/flags/az_flag.png and b/data/flags/az_flag.png differ

diff --git a/data/flags/ba_flag.png b/data/flags/ba_flag.png
index f0dba20..5dcbc43 100644 (file)
Binary files a/data/flags/ba_flag.png and b/data/flags/ba_flag.png differ

diff --git a/data/flags/bd_flag.png b/data/flags/bd_flag.png
index 0f4c2a6..155aad8 100644 (file)
Binary files a/data/flags/bd_flag.png and b/data/flags/bd_flag.png differ

diff --git a/data/flags/be_flag.png b/data/flags/be_flag.png
index 074ee03..04e3a3d 100644 (file)
Binary files a/data/flags/be_flag.png and b/data/flags/be_flag.png differ

diff --git a/data/flags/bg_flag.png b/data/flags/bg_flag.png
index 2740adb..fc20fb2 100644 (file)
Binary files a/data/flags/bg_flag.png and b/data/flags/bg_flag.png differ

diff --git a/data/flags/br_flag.png b/data/flags/br_flag.png
index 6601a52..04132b3 100644 (file)
Binary files a/data/flags/br_flag.png and b/data/flags/br_flag.png differ

diff --git a/data/flags/brai_flag.png b/data/flags/brai_flag.png
index b1aa6de..fc21519 100644 (file)
Binary files a/data/flags/brai_flag.png and b/data/flags/brai_flag.png differ

diff --git a/data/flags/bt_flag.png b/data/flags/bt_flag.png
index bddcbf8..d26c4ad 100644 (file)
Binary files a/data/flags/bt_flag.png and b/data/flags/bt_flag.png differ

diff --git a/data/flags/bw_flag.png b/data/flags/bw_flag.png
index 47f768a..7dc870d 100644 (file)
Binary files a/data/flags/bw_flag.png and b/data/flags/bw_flag.png differ

diff --git a/data/flags/by_flag.png b/data/flags/by_flag.png
index be39496..34da2d4 100644 (file)
Binary files a/data/flags/by_flag.png and b/data/flags/by_flag.png differ

diff --git a/data/flags/ca_flag.png b/data/flags/ca_flag.png
index 64dfd58..35a3786 100644 (file)
Binary files a/data/flags/ca_flag.png and b/data/flags/ca_flag.png differ

diff --git a/data/flags/cat_flag.png b/data/flags/cat_flag.png
new file mode 100644 (file)
index 0000000..f8c529e
Binary files /dev/null and b/data/flags/cat_flag.png differ

diff --git a/data/flags/cd_flag.png b/data/flags/cd_flag.png
index 5062f64..2510cae 100644 (file)
Binary files a/data/flags/cd_flag.png and b/data/flags/cd_flag.png differ

diff --git a/data/flags/ch_flag.png b/data/flags/ch_flag.png
index 32d9f60..d76088b 100644 (file)
Binary files a/data/flags/ch_flag.png and b/data/flags/ch_flag.png differ

diff --git a/data/flags/cn_flag.png b/data/flags/cn_flag.png
index 9df4530..e7f0794 100644 (file)
Binary files a/data/flags/cn_flag.png and b/data/flags/cn_flag.png differ

diff --git a/data/flags/cz_flag.png b/data/flags/cz_flag.png
index b5d2562..a7894ae 100644 (file)
Binary files a/data/flags/cz_flag.png and b/data/flags/cz_flag.png differ

diff --git a/data/flags/de_flag.png b/data/flags/de_flag.png
index 190aa9b..9d0283a 100644 (file)
Binary files a/data/flags/de_flag.png and b/data/flags/de_flag.png differ

diff --git a/data/flags/dk_flag.png b/data/flags/dk_flag.png
index 5116838..88f6290 100644 (file)
Binary files a/data/flags/dk_flag.png and b/data/flags/dk_flag.png differ

diff --git a/data/flags/ee_flag.png b/data/flags/ee_flag.png
index 9535888..0f77c7d 100644 (file)
Binary files a/data/flags/ee_flag.png and b/data/flags/ee_flag.png differ

diff --git a/data/flags/epo_flag.png b/data/flags/epo_flag.png
index a6b68af..09ad3e7 100644 (file)
Binary files a/data/flags/epo_flag.png and b/data/flags/epo_flag.png differ

diff --git a/data/flags/es_flag.png b/data/flags/es_flag.png
index 8f51848..700f9b6 100644 (file)
Binary files a/data/flags/es_flag.png and b/data/flags/es_flag.png differ

diff --git a/data/flags/et_flag.png b/data/flags/et_flag.png
index 86281f3..98f46c5 100644 (file)
Binary files a/data/flags/et_flag.png and b/data/flags/et_flag.png differ

diff --git a/data/flags/fi_flag.png b/data/flags/fi_flag.png
index b3322bc..f32d4ad 100644 (file)
Binary files a/data/flags/fi_flag.png and b/data/flags/fi_flag.png differ

diff --git a/data/flags/fo_flag.png b/data/flags/fo_flag.png
index 73c1230..a50176a 100644 (file)
Binary files a/data/flags/fo_flag.png and b/data/flags/fo_flag.png differ

diff --git a/data/flags/fr_flag.png b/data/flags/fr_flag.png
index c9e3fa1..2eaf24b 100644 (file)
Binary files a/data/flags/fr_flag.png and b/data/flags/fr_flag.png differ

diff --git a/data/flags/gb_flag.png b/data/flags/gb_flag.png
index edb79de..73e4214 100644 (file)
Binary files a/data/flags/gb_flag.png and b/data/flags/gb_flag.png differ

diff --git a/data/flags/ge_flag.png b/data/flags/ge_flag.png
index bb308c6..f09cfcc 100644 (file)
Binary files a/data/flags/ge_flag.png and b/data/flags/ge_flag.png differ

diff --git a/data/flags/gh_flag.png b/data/flags/gh_flag.png
index 5357f2e..f2edeb7 100644 (file)
Binary files a/data/flags/gh_flag.png and b/data/flags/gh_flag.png differ

diff --git a/data/flags/gn_flag.png b/data/flags/gn_flag.png
index 996acac..ea57bf8 100644 (file)
Binary files a/data/flags/gn_flag.png and b/data/flags/gn_flag.png differ

diff --git a/data/flags/gr_flag.png b/data/flags/gr_flag.png
index 6c4f85e..f79d5bc 100644 (file)
Binary files a/data/flags/gr_flag.png and b/data/flags/gr_flag.png differ

diff --git a/data/flags/hr_flag.png b/data/flags/hr_flag.png
index 4f770ae..9fe5d23 100644 (file)
Binary files a/data/flags/hr_flag.png and b/data/flags/hr_flag.png differ

diff --git a/data/flags/hu_flag.png b/data/flags/hu_flag.png
index 1ec76d8..62f9c58 100644 (file)
Binary files a/data/flags/hu_flag.png and b/data/flags/hu_flag.png differ

diff --git a/data/flags/ie_flag.png b/data/flags/ie_flag.png
index 81b68f3..9663fe8 100644 (file)
Binary files a/data/flags/ie_flag.png and b/data/flags/ie_flag.png differ

diff --git a/data/flags/il_flag.png b/data/flags/il_flag.png
index a150478..b3d4331 100644 (file)
Binary files a/data/flags/il_flag.png and b/data/flags/il_flag.png differ

diff --git a/data/flags/in_flag.png b/data/flags/in_flag.png
index 0cdc4bc..b3171d5 100644 (file)
Binary files a/data/flags/in_flag.png and b/data/flags/in_flag.png differ

diff --git a/data/flags/iq_flag.png b/data/flags/iq_flag.png
index 3c79811..1e0f7e5 100644 (file)
Binary files a/data/flags/iq_flag.png and b/data/flags/iq_flag.png differ

diff --git a/data/flags/ir_flag.png b/data/flags/ir_flag.png
index 6449394..19984e2 100644 (file)
Binary files a/data/flags/ir_flag.png and b/data/flags/ir_flag.png differ

diff --git a/data/flags/is_flag.png b/data/flags/is_flag.png
index dff82f5..6789f7d 100644 (file)
Binary files a/data/flags/is_flag.png and b/data/flags/is_flag.png differ

diff --git a/data/flags/it_flag.png b/data/flags/it_flag.png
index 6496ade..0c4c082 100644 (file)
Binary files a/data/flags/it_flag.png and b/data/flags/it_flag.png differ

diff --git a/data/flags/jp_flag.png b/data/flags/jp_flag.png
index acdb409..b9e0deb 100644 (file)
Binary files a/data/flags/jp_flag.png and b/data/flags/jp_flag.png differ

diff --git a/data/flags/ke_flag.png b/data/flags/ke_flag.png
index 7c923bb..1b7e63e 100644 (file)
Binary files a/data/flags/ke_flag.png and b/data/flags/ke_flag.png differ

diff --git a/data/flags/kg_flag.png b/data/flags/kg_flag.png
index 084ba53..4266da5 100644 (file)
Binary files a/data/flags/kg_flag.png and b/data/flags/kg_flag.png differ

diff --git a/data/flags/kh_flag.png b/data/flags/kh_flag.png
index 87f420a..e0b9b27 100644 (file)
Binary files a/data/flags/kh_flag.png and b/data/flags/kh_flag.png differ

diff --git a/data/flags/kr_flag.png b/data/flags/kr_flag.png
index e541ba4..eb9e119 100644 (file)
Binary files a/data/flags/kr_flag.png and b/data/flags/kr_flag.png differ

diff --git a/data/flags/ku_flag.png b/data/flags/ku_flag.png
new file mode 100644 (file)
index 0000000..ac11d97
Binary files /dev/null and b/data/flags/ku_flag.png differ

diff --git a/data/flags/kz_flag.png b/data/flags/kz_flag.png
index e81412e..8dc79d2 100644 (file)
Binary files a/data/flags/kz_flag.png and b/data/flags/kz_flag.png differ

diff --git a/data/flags/la_flag.png b/data/flags/la_flag.png
index d4742c7..0a9a001 100644 (file)
Binary files a/data/flags/la_flag.png and b/data/flags/la_flag.png differ

diff --git a/data/flags/lang-system.png b/data/flags/lang-system.png
new file mode 100644 (file)
index 0000000..bbed4b2
Binary files /dev/null and b/data/flags/lang-system.png differ

diff --git a/data/flags/latam_flag.png b/data/flags/latam_flag.png
index dd3bb34..1025ca2 100644 (file)
Binary files a/data/flags/latam_flag.png and b/data/flags/latam_flag.png differ

diff --git a/data/flags/lk_flag.png b/data/flags/lk_flag.png
index f861823..a5a409e 100644 (file)
Binary files a/data/flags/lk_flag.png and b/data/flags/lk_flag.png differ

diff --git a/data/flags/lt_flag.png b/data/flags/lt_flag.png
index 8703074..18c7cc2 100644 (file)
Binary files a/data/flags/lt_flag.png and b/data/flags/lt_flag.png differ

diff --git a/data/flags/lv_flag.png b/data/flags/lv_flag.png
index 7f0c4ba..5948704 100644 (file)
Binary files a/data/flags/lv_flag.png and b/data/flags/lv_flag.png differ

diff --git a/data/flags/ma_flag.png b/data/flags/ma_flag.png
index 1e78d44..d33e320 100644 (file)
Binary files a/data/flags/ma_flag.png and b/data/flags/ma_flag.png differ

diff --git a/data/flags/mao_flag.png b/data/flags/mao_flag.png
index b70c5db..ce509c4 100644 (file)
Binary files a/data/flags/mao_flag.png and b/data/flags/mao_flag.png differ

diff --git a/data/flags/me_flag.png b/data/flags/me_flag.png
index 7f71386..11d6849 100644 (file)
Binary files a/data/flags/me_flag.png and b/data/flags/me_flag.png differ

diff --git a/data/flags/mk_flag.png b/data/flags/mk_flag.png
index a971041..8eb80cf 100644 (file)
Binary files a/data/flags/mk_flag.png and b/data/flags/mk_flag.png differ

diff --git a/data/flags/ml_flag.png b/data/flags/ml_flag.png
index e2c0c49..03116e4 100644 (file)
Binary files a/data/flags/ml_flag.png and b/data/flags/ml_flag.png differ

diff --git a/data/flags/mm_flag.png b/data/flags/mm_flag.png
index 570e011..5689e4a 100644 (file)
Binary files a/data/flags/mm_flag.png and b/data/flags/mm_flag.png differ

diff --git a/data/flags/mn_flag.png b/data/flags/mn_flag.png
index 930c658..1d1fcd5 100644 (file)
Binary files a/data/flags/mn_flag.png and b/data/flags/mn_flag.png differ

diff --git a/data/flags/mt_flag.png b/data/flags/mt_flag.png
index ea4022a..dd4784f 100644 (file)
Binary files a/data/flags/mt_flag.png and b/data/flags/mt_flag.png differ

diff --git a/data/flags/mv_flag.png b/data/flags/mv_flag.png
index 14ca66e..d30a62d 100644 (file)
Binary files a/data/flags/mv_flag.png and b/data/flags/mv_flag.png differ

diff --git a/data/flags/my_flag.png b/data/flags/my_flag.png
new file mode 100644 (file)
index 0000000..0357018
Binary files /dev/null and b/data/flags/my_flag.png differ

diff --git a/data/flags/ng_flag.png b/data/flags/ng_flag.png
index 727b5c9..b7ea102 100644 (file)
Binary files a/data/flags/ng_flag.png and b/data/flags/ng_flag.png differ

diff --git a/data/flags/nl_flag.png b/data/flags/nl_flag.png
index cf8352a..e657471 100644 (file)
Binary files a/data/flags/nl_flag.png and b/data/flags/nl_flag.png differ

diff --git a/data/flags/no_flag.png b/data/flags/no_flag.png
index b508a6d..6cf5749 100644 (file)
Binary files a/data/flags/no_flag.png and b/data/flags/no_flag.png differ

diff --git a/data/flags/np_flag.png b/data/flags/np_flag.png
index ac1a80c..738805e 100644 (file)
Binary files a/data/flags/np_flag.png and b/data/flags/np_flag.png differ

diff --git a/data/flags/ph_flag.png b/data/flags/ph_flag.png
index 7ba2755..c096a35 100644 (file)
Binary files a/data/flags/ph_flag.png and b/data/flags/ph_flag.png differ

diff --git a/data/flags/pk_flag.png b/data/flags/pk_flag.png
index ea217d6..714fd34 100644 (file)
Binary files a/data/flags/pk_flag.png and b/data/flags/pk_flag.png differ

diff --git a/data/flags/pl_flag.png b/data/flags/pl_flag.png
index 6139276..d561958 100644 (file)
Binary files a/data/flags/pl_flag.png and b/data/flags/pl_flag.png differ

diff --git a/data/flags/pt_flag.png b/data/flags/pt_flag.png
index 140cbe3..27acf0a 100644 (file)
Binary files a/data/flags/pt_flag.png and b/data/flags/pt_flag.png differ

diff --git a/data/flags/ro_flag.png b/data/flags/ro_flag.png
index aa37ddc..01e303e 100644 (file)
Binary files a/data/flags/ro_flag.png and b/data/flags/ro_flag.png differ

diff --git a/data/flags/rs_flag.png b/data/flags/rs_flag.png
index f197ec3..3911d4c 100644 (file)
Binary files a/data/flags/rs_flag.png and b/data/flags/rs_flag.png differ

diff --git a/data/flags/ru_flag.png b/data/flags/ru_flag.png
index 072c142..79cf4be 100644 (file)
Binary files a/data/flags/ru_flag.png and b/data/flags/ru_flag.png differ

diff --git a/data/flags/se_flag.png b/data/flags/se_flag.png
index c37f371..8161fcc 100644 (file)
Binary files a/data/flags/se_flag.png and b/data/flags/se_flag.png differ

diff --git a/data/flags/si_flag.png b/data/flags/si_flag.png
index 803cd1c..49c9d81 100644 (file)
Binary files a/data/flags/si_flag.png and b/data/flags/si_flag.png differ

diff --git a/data/flags/sk_flag.png b/data/flags/sk_flag.png
index c923986..1cb47fa 100644 (file)
Binary files a/data/flags/sk_flag.png and b/data/flags/sk_flag.png differ

diff --git a/data/flags/sn_flag.png b/data/flags/sn_flag.png
index b43c6e3..9aa120c 100644 (file)
Binary files a/data/flags/sn_flag.png and b/data/flags/sn_flag.png differ

diff --git a/data/flags/sy_flag.png b/data/flags/sy_flag.png
index 819572b..88574e1 100644 (file)
Binary files a/data/flags/sy_flag.png and b/data/flags/sy_flag.png differ

diff --git a/data/flags/th_flag.png b/data/flags/th_flag.png
index 9968b79..52332d4 100644 (file)
Binary files a/data/flags/th_flag.png and b/data/flags/th_flag.png differ

diff --git a/data/flags/tj_flag.png b/data/flags/tj_flag.png
index 250c635..775a2b3 100644 (file)
Binary files a/data/flags/tj_flag.png and b/data/flags/tj_flag.png differ

diff --git a/data/flags/tm_flag.png b/data/flags/tm_flag.png
index 45e1167..ec56fe2 100644 (file)
Binary files a/data/flags/tm_flag.png and b/data/flags/tm_flag.png differ

diff --git a/data/flags/tr_flag.png b/data/flags/tr_flag.png
index fe83568..6b20fbf 100644 (file)
Binary files a/data/flags/tr_flag.png and b/data/flags/tr_flag.png differ

diff --git a/data/flags/tw_flag.png b/data/flags/tw_flag.png
index b1fbd83..d146632 100644 (file)
Binary files a/data/flags/tw_flag.png and b/data/flags/tw_flag.png differ

diff --git a/data/flags/tz_flag.png b/data/flags/tz_flag.png
index 2f5f020..5d00a40 100644 (file)
Binary files a/data/flags/tz_flag.png and b/data/flags/tz_flag.png differ

diff --git a/data/flags/ua_flag.png b/data/flags/ua_flag.png
index 45af3c7..97734c7 100644 (file)
Binary files a/data/flags/ua_flag.png and b/data/flags/ua_flag.png differ

diff --git a/data/flags/unknown_flag.png b/data/flags/unknown_flag.png
index 2e4dee2..0a613b8 100644 (file)
Binary files a/data/flags/unknown_flag.png and b/data/flags/unknown_flag.png differ

diff --git a/data/flags/us_flag.png b/data/flags/us_flag.png
index 26e3c38..6302368 100644 (file)
Binary files a/data/flags/us_flag.png and b/data/flags/us_flag.png differ

diff --git a/data/flags/uz_flag.png b/data/flags/uz_flag.png
index b82e9a2..29c1ec6 100644 (file)
Binary files a/data/flags/uz_flag.png and b/data/flags/uz_flag.png differ

diff --git a/data/flags/vn_flag.png b/data/flags/vn_flag.png
index 366ab25..d976d19 100644 (file)
Binary files a/data/flags/vn_flag.png and b/data/flags/vn_flag.png differ

diff --git a/data/flags/za_flag.png b/data/flags/za_flag.png
index 4413460..cc014b6 100644 (file)
Binary files a/data/flags/za_flag.png and b/data/flags/za_flag.png differ

diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index 9be4c44..7a340b0 100644 (file)
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -5,33 +5,6 @@ enlightenment.png \
 test.png \
 test.jpg \
 test.edj \
-test.svg \
-lang-system.png \
-lang-bg_BG.png \
-lang-ca_ES.png \
-lang-cs_CZ.png \
-lang-da_DK.png \
-lang-de_DE.png \
-lang-el_GR.png \
-lang-en_US.png \
-lang-es_AR.png \
-lang-es_ES.png \
-lang-fi_FI.png \
-lang-fr_FR.png \
-lang-hu_HU.png \
-lang-it_IT.png \
-lang-ja_JP.png \
-lang-ko_KR.png \
-lang-nb_NO.png \
-lang-nl_NL.png \
-lang-pl_PL.png \
-lang-pt_BR.png \
-lang-ru_RU.png \
-lang-sk_SK.png \
-lang-sl_SI.png \
-lang-sv_SE.png \
-lang-zh_CN.png \
-lang-zh_HK.png \
-lang-zh_TW.png
+test.svg
 
 EXTRA_DIST = $(files_DATA)

diff --git a/data/images/lang-bg_BG.png b/data/images/lang-bg_BG.png
deleted file mode 100644 (file)
index 2c51e68..0000000
Binary files a/data/images/lang-bg_BG.png and /dev/null differ

diff --git a/data/images/lang-ca_ES.png b/data/images/lang-ca_ES.png
deleted file mode 100644 (file)
index 2adad8b..0000000
Binary files a/data/images/lang-ca_ES.png and /dev/null differ

diff --git a/data/images/lang-cs_CZ.png b/data/images/lang-cs_CZ.png
deleted file mode 100644 (file)
index 07a8740..0000000
Binary files a/data/images/lang-cs_CZ.png and /dev/null differ

diff --git a/data/images/lang-da_DK.png b/data/images/lang-da_DK.png
deleted file mode 100644 (file)
index 1b89287..0000000
Binary files a/data/images/lang-da_DK.png and /dev/null differ

diff --git a/data/images/lang-de_DE.png b/data/images/lang-de_DE.png
deleted file mode 100644 (file)
index af866a2..0000000
Binary files a/data/images/lang-de_DE.png and /dev/null differ

diff --git a/data/images/lang-el_GR.png b/data/images/lang-el_GR.png
deleted file mode 100644 (file)
index adc877c..0000000
Binary files a/data/images/lang-el_GR.png and /dev/null differ

diff --git a/data/images/lang-en_US.png b/data/images/lang-en_US.png
deleted file mode 100644 (file)
index 690bfe6..0000000
Binary files a/data/images/lang-en_US.png and /dev/null differ

diff --git a/data/images/lang-es_AR.png b/data/images/lang-es_AR.png
deleted file mode 100644 (file)
index f0850ec..0000000
Binary files a/data/images/lang-es_AR.png and /dev/null differ

diff --git a/data/images/lang-es_ES.png b/data/images/lang-es_ES.png
deleted file mode 100644 (file)
index f405190..0000000
Binary files a/data/images/lang-es_ES.png and /dev/null differ

diff --git a/data/images/lang-fi_FI.png b/data/images/lang-fi_FI.png
deleted file mode 100644 (file)
index 54b940b..0000000
Binary files a/data/images/lang-fi_FI.png and /dev/null differ

diff --git a/data/images/lang-fr_FR.png b/data/images/lang-fr_FR.png
deleted file mode 100644 (file)
index 582c2bf..0000000
Binary files a/data/images/lang-fr_FR.png and /dev/null differ

diff --git a/data/images/lang-hu_HU.png b/data/images/lang-hu_HU.png
deleted file mode 100644 (file)
index fd0c0ff..0000000
Binary files a/data/images/lang-hu_HU.png and /dev/null differ

diff --git a/data/images/lang-it_IT.png b/data/images/lang-it_IT.png
deleted file mode 100644 (file)
index ba34c6d..0000000
Binary files a/data/images/lang-it_IT.png and /dev/null differ

diff --git a/data/images/lang-ja_JP.png b/data/images/lang-ja_JP.png
deleted file mode 100644 (file)
index a2d5154..0000000
Binary files a/data/images/lang-ja_JP.png and /dev/null differ

diff --git a/data/images/lang-ko_KR.png b/data/images/lang-ko_KR.png
deleted file mode 100644 (file)
index 7a22e8d..0000000
Binary files a/data/images/lang-ko_KR.png and /dev/null differ

diff --git a/data/images/lang-nb_NO.png b/data/images/lang-nb_NO.png
deleted file mode 100644 (file)
index ebed2a7..0000000
Binary files a/data/images/lang-nb_NO.png and /dev/null differ

diff --git a/data/images/lang-nl_NL.png b/data/images/lang-nl_NL.png
deleted file mode 100644 (file)
index 206eb6e..0000000
Binary files a/data/images/lang-nl_NL.png and /dev/null differ

diff --git a/data/images/lang-pl_PL.png b/data/images/lang-pl_PL.png
deleted file mode 100644 (file)
index 26d767b..0000000
Binary files a/data/images/lang-pl_PL.png and /dev/null differ

diff --git a/data/images/lang-pt_BR.png b/data/images/lang-pt_BR.png
deleted file mode 100644 (file)
index 1e1c97e..0000000
Binary files a/data/images/lang-pt_BR.png and /dev/null differ

diff --git a/data/images/lang-ru_RU.png b/data/images/lang-ru_RU.png
deleted file mode 100644 (file)
index 38938d3..0000000
Binary files a/data/images/lang-ru_RU.png and /dev/null differ

diff --git a/data/images/lang-sk_SK.png b/data/images/lang-sk_SK.png
deleted file mode 100644 (file)
index 33a4474..0000000
Binary files a/data/images/lang-sk_SK.png and /dev/null differ

diff --git a/data/images/lang-sl_SI.png b/data/images/lang-sl_SI.png
deleted file mode 100644 (file)
index ae72b65..0000000
Binary files a/data/images/lang-sl_SI.png and /dev/null differ

diff --git a/data/images/lang-sv_SE.png b/data/images/lang-sv_SE.png
deleted file mode 100644 (file)
index 3b71a38..0000000
Binary files a/data/images/lang-sv_SE.png and /dev/null differ

diff --git a/data/images/lang-system.png b/data/images/lang-system.png
deleted file mode 100644 (file)
index b922f85..0000000
Binary files a/data/images/lang-system.png and /dev/null differ

diff --git a/data/images/lang-zh_CN.png b/data/images/lang-zh_CN.png
deleted file mode 100644 (file)
index 6b984a1..0000000
Binary files a/data/images/lang-zh_CN.png and /dev/null differ

diff --git a/data/images/lang-zh_HK.png b/data/images/lang-zh_HK.png
deleted file mode 100644 (file)
index 7249692..0000000
Binary files a/data/images/lang-zh_HK.png and /dev/null differ

diff --git a/data/images/lang-zh_TW.png b/data/images/lang-zh_TW.png
deleted file mode 100644 (file)
index f1fc2d5..0000000
Binary files a/data/images/lang-zh_TW.png and /dev/null differ

diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c
index 705f0fc..7dade89 100644 (file)
--- a/src/modules/conf_intl/e_int_config_intl.c
+++ b/src/modules/conf_intl/e_int_config_intl.c
@@ -99,431 +99,431 @@ struct _E_Config_Dialog_Data
 };
 
 const E_Intl_Pair basic_language_predefined_pairs[ ] = {
-       {"ar_AE.UTF-8", NULL,             "العربية"},
-       {"bg_BG.UTF-8", "lang-bg_BG.png", "Български"},
-       {"ca_ES.UTF-8", "lang-ca_ES.png", "Català"},
-       {"cs_CZ.UTF-8", "lang-cs_CZ.png", "Čeština"},
-       {"da_DK.UTF-8", "lang-da_DK.png", "Dansk"},
-       {"de_DE.UTF-8", "lang-de_DE.png", "Deutsch"},
-       {"en_US.UTF-8", "lang-en_US.png", "English"},
-       {"en_GB.UTF-8", NULL,             "British English"},
-       {"el_GR.UTF-8", "lang-el_GR.png", "Ελληνικά"},
-       {"eo.UTF-8",    NULL,             "Esperanto"},
-       {"es_AR.UTF-8", "lang-es_AR.png", "Español"},
-       {"et_ET.UTF-8", NULL,             "Eesti keel"},
-       {"fi_FI.UTF-8", "lang-fi_FI.png", "Suomi"},
-       {"fo_FO.UTF-8", NULL,             "Føroyskt"},
-       {"fr_CH.UTF-8", NULL,             "Français (Suisse)"},
-       {"fr_FR.UTF-8", "lang-fr_FR.png", "Français"},
-       {"he_HE.UTF-8", NULL,             "עברית"},
-       {"hr_HR.UTF-8", NULL,             "Hrvatski"},
-       {"hu_HU.UTF-8", "lang-hu_HU.png", "Magyar"},
-       {"it_IT.UTF-8", "lang-it_IT.png", "Italiano"},
-       {"ja_JP.UTF-8", "lang-ja_JP.png", "日本語"},
-       {"km_KM.UTF-8", NULL,             "ភាសាខ្មែរ"},
-       {"ko_KR.UTF-8", "lang-ko_KR.png", "한국어"},
-       {"ku.UTF-8",    NULL,             "یدروك"},
-       {"lt_LT.UTF-8", NULL,             "Lietuvių kalba"},
-       {"ms_MY.UTF-8", NULL,             "Bahasa Melayu"},
-       {"nb_NO.UTF-8", "lang-nb_NO.png", "Norsk Bokmål"},
-       {"nl_NL.UTF-8", "lang-nl_NL.png", "Nederlands"},
-       {"pl_PL.UTF-8", "lang-pl_PL.png", "Polski"},
-       {"pt_BR.UTF-8", "lang-pt_BR.png", "Português"},
-       {"ru_RU.UTF-8", "lang-ru_RU.png", "Русский"},
-       {"sk_SK.UTF-8", "lang-sk_SK.png", "Slovenčina"},
-       {"sl_SI.UTF-8", "lang-sl_SI.png", "Slovenščina"},
-       {"sv_SE.UTF-8", "lang-sv_SE.png", "Svenska"},
-       {"tr_TR.UTF-8", NULL,             "Türkçe"},
-       {"uk_UK.UTF-8", NULL,             "Українська мова"},
-       {"zh_CN.UTF-8", "lang-zh_CN.png", "中文 (繁体)"},
-       {"zh_TW.UTF-8", "lang-zh_TW.png", "中文 (繁體)"},
-       { NULL, NULL, NULL }
+   {"ar_AE.UTF-8", "ara_flag.png",   "العربية"},
+   {"bg_BG.UTF-8", "bg_flag.png",    "Български"},
+   {"ca_ES.UTF-8", "cat_flag.png",   "Català"},
+   {"cs_CZ.UTF-8", "cz_flag.png",    "Čeština"},
+   {"da_DK.UTF-8", "dk_flag.png",    "Dansk"},
+   {"de_DE.UTF-8", "de_flag.png",    "Deutsch"},
+   {"en_US.UTF-8", "us_flag.png",    "English"},
+   {"en_GB.UTF-8", "bg_flag.png",    "British English"},
+   {"el_GR.UTF-8", "gr_flag.png",    "Ελληνικά"},
+   {"eo.UTF-8",    "epo_flag.png",   "Esperanto"},
+   {"es_AR.UTF-8", "ar_flag.png",    "Español"},
+   {"et_ET.UTF-8", "ee_flag.png",    "Eesti keel"},
+   {"fi_FI.UTF-8", "fi_flag.png",    "Suomi"},
+   {"fo_FO.UTF-8", "fo_flag.png",    "Føroyskt"},
+   {"fr_CH.UTF-8", "ch_flag.png",    "Français (Suisse)"},
+   {"fr_FR.UTF-8", "fr_flag.png",    "Français"},
+   {"he_HE.UTF-8", "il_flag.png",    "עברית"},
+   {"hr_HR.UTF-8", "hr_flag.png",    "Hrvatski"},
+   {"hu_HU.UTF-8", "hu_flag.png",    "Magyar"},
+   {"it_IT.UTF-8", "it_flag.png",    "Italiano"},
+   {"ja_JP.UTF-8", "jp_flag.png",    "日本語"},
+   {"km_KM.UTF-8", "kh_flag.png",    "ភាសាខ្មែរ"},
+   {"ko_KR.UTF-8", "kr_flag.png",    "한국어"},
+   {"ku.UTF-8",    "ku_flag.png",    "یدروك"},
+   {"lt_LT.UTF-8", "lt_flag.png",    "Lietuvių kalba"},
+   {"ms_MY.UTF-8", "my_flag.png",    "Bahasa Melayu"},
+   {"nb_NO.UTF-8", "no_flag.png",    "Norsk Bokmål"},
+   {"nl_NL.UTF-8", "nl_flag.png",    "Nederlands"},
+   {"pl_PL.UTF-8", "pl_flag.png",    "Polski"},
+   {"pt_BR.UTF-8", "br_flag.png",    "Português"},
+   {"ru_RU.UTF-8", "ru_flag.png",    "Русский"},
+   {"sk_SK.UTF-8", "sk_flag.png",    "Slovenčina"},
+   {"sl_SI.UTF-8", "si_flag.png",    "Slovenščina"},
+   {"sv_SE.UTF-8", "se_flag.png",    "Svenska"},
+   {"tr_TR.UTF-8", "tr_flag.png",    "Türkçe"},
+   {"uk_UK.UTF-8", "ua_flag.png",    "Українська мова"},
+   {"zh_CN.UTF-8", "cn_flag.png",    "中文 (繁体)"},
+   {"zh_TW.UTF-8", "tw_flag.png",    "中文 (繁體)"},
+   { NULL, NULL, NULL }
 };
 
 const E_Intl_Pair language_predefined_pairs[ ] = {
-       {"aa", NULL, "Qafár af"},
-       {"af", NULL, "Afrikaans"},
-       {"ak", NULL, "Akan"},
-       {"am", NULL, "አማርኛ"},
-       {"an", NULL, "Aragonés"},
-       {"ar", NULL, "ةيبرعلا"},
-       {"as", NULL, "অসমীয়া"},
-       {"az", NULL, "Azərbaycan dili"},
-       {"be", NULL, "Беларуская мова"},
-       {"bg", NULL, "Български"},
-       {"bn", NULL, "বাংলা"},
-       {"br", NULL, "Brezhoneg"},
-       {"bs", NULL, "Bosanski"},
-       {"byn", NULL, "ብሊና"},
-       {"ca", NULL, "Català"},
-       {"cch", NULL, "Atsam"},
-       {"cs", NULL, "Čeština"},
-       {"cy", NULL, "Cymraeg"},
-       {"da", NULL, "Dansk"},
-       {"de", NULL, "Deutsch"},
-       {"dv", NULL, "ދިވެހި"},
-       {"dz", NULL, "Dzongkha"},
-       {"ee", NULL, "Eʋegbe"},
-       {"el", NULL, "Ελληνικά"},
-       {"en", NULL, "English"},
-       {"eo", NULL, "Esperanto"},
-       {"es", NULL, "Español"},
-       {"et", NULL, "Eesti keel"},
-       {"eu", NULL, "Euskara"},
-       {"fa", NULL, "یسراف"},
-       {"fi", NULL, "Suomi"},
-       {"fo", NULL, "Føroyskt"},
-       {"fr", NULL, "Français"},
-       {"fur", NULL, "Furlan"},
-       {"ga", NULL, "Gaeilge"},
-       {"gaa", NULL, "Gã"},
-       {"gez", NULL, "ግዕዝ"},
-       {"gl", NULL, "Galego"},
-       {"gu", NULL, "Gujarati"},
-       {"gv", NULL, "Yn Ghaelg"},
-       {"ha", NULL, "Hausa"},
-       {"haw", NULL, "ʻŌlelo Hawaiʻi"},
-       {"he", NULL, "עברית"},
-       {"hi", NULL, "Hindi"},
-       {"hr", NULL, "Hrvatski"},
-       {"hu", NULL, "Magyar"},
-       {"hy", NULL, "Հայերեն"},
-       {"ia", NULL, "Interlingua"},
-       {"id", NULL, "Indonesian"},
-       {"ig", NULL, "Igbo"},
-       {"is", NULL, "Íslenska"},
-       {"it", NULL, "Italiano"},
-       {"iu", NULL, "ᐃᓄᒃᑎᑐᑦ"},
-       {"iw", NULL, "עברית"},
-       {"ja", NULL, "日本語"},
-       {"ka", NULL, "ქართული"},
-       {"kaj", NULL, "Jju"},
-       {"kam", NULL, "Kikamba"},
-       {"kcg", NULL, "Tyap"},
-       {"kfo", NULL, "Koro"},
-       {"kk", NULL, "Qazaq"},
-       {"kl", NULL, "Kalaallisut"},
-       {"km", NULL, "ភាសាខ្មែរ"},
-       {"kn", NULL, "ಕನ್ನಡ"},
-       {"ko", NULL, "한국어"},
-       {"kok", NULL, "Konkani"},
-       {"ku", NULL, "یدروك"},
-       {"kw", NULL, "Kernowek"},
-       {"ky", NULL, "Кыргыз тили"},
-       {"ln", NULL, "Lingála"},
-       {"lo", NULL, "ພາສາລາວ"},
-       {"lt", NULL, "Lietuvių kalba"},
-       {"lv", NULL, "Latviešu"},
-       {"mi", NULL, "Te Reo Māori"},
-       {"mk", NULL, "Македонски"},
-       {"ml", NULL, "മലയാളം"},
-       {"mn", NULL, "Монгол"},
-       {"mr", NULL, "मराठी"},
-       {"ms", NULL, "Bahasa Melayu"},
-       {"mt", NULL, "Malti"},
-       {"nb", NULL, "Norsk Bokmål"},
-       {"ne", NULL, "नेपाली"},
-       {"nl", NULL, "Nederlands"},
-       {"nn", NULL, "Norsk Nynorsk"},
-       {"no", NULL, "Norsk"},
-       {"nr", NULL, "isiNdebele"},
-       {"nso", NULL, "Sesotho sa Leboa"},
-       {"ny", NULL, "Chicheŵa"},
-       {"oc", NULL, "Occitan"},
-       {"om", NULL, "Oromo"},
-       {"or", NULL, "ଓଡ଼ିଆ"},
-       {"pa", NULL, "ਪੰਜਾਬੀ"},
-       {"pl", NULL, "Polski"},
-       {"ps", NULL, "وتښپ"},
-       {"pt", NULL, "Português"},
-       {"ro", NULL, "Română"},
-       {"ru", NULL, "Русский"},
-       {"rw", NULL, "Kinyarwanda"},
-       {"sa", NULL, "संस्कृतम्"},
-       {"se", NULL, "Davvisápmi"},
-       {"sh", NULL, "Srpskohrvatski/Српскохрватски"},
-       {"sid", NULL, "Sidámo 'Afó"},
-       {"sk", NULL, "Slovenčina"},
-       {"sl", NULL, "Slovenščina"},
-       {"so", NULL, "af Soomaali"},
-       {"sq", NULL, "Shqip"},
-       {"sr", NULL, "Српски"},
-       {"ss", NULL, "Swati"},
-       {"st", NULL, "Southern Sotho"},
-       {"sv", NULL, "Svenska"},
-       {"sw", NULL, "Swahili"},
-       {"syr", NULL, "Syriac"},
-       {"ta", NULL, "தமிழ்"},
-       {"te", NULL, "తెలుగు"},
-       {"tg", NULL, "Тоҷикӣ"},
-       {"th", NULL, "ภาษาไทย"},
-       {"ti", NULL, "ትግርኛ"},
-       {"tig", NULL, "ቲግሬ"},
-       {"tl", NULL, "Tagalog"},
-       {"tn", NULL, "Setswana"},
-       {"tr", NULL, "Türkçe"},
-       {"ts", NULL, "Tsonga"},
-       {"tt", NULL, "Татарча"},
-       {"uk", NULL, "Українська мова"},
-       {"ur", NULL, "ودراُ"},
-       {"uz", NULL, "O‘zbek"},
-       {"ve", NULL, "Venda"},
-       {"vi", NULL, "Tiếng Việt"},
-       {"wa", NULL, "Walon"},
-       {"wal", NULL, "Walamo"},
-       {"xh", NULL, "Xhosa"},
-       {"yi", NULL, "שידיִי"},
-       {"yo", NULL, "èdèe Yorùbá"},
-       {"zh", NULL, "汉语/漢語"},
-       {"zu", NULL, "Zulu"},
-       { NULL, NULL, NULL}
+   {"aa", NULL, "Qafár af"},
+   {"af", NULL, "Afrikaans"},
+   {"ak", NULL, "Akan"},
+   {"am", NULL, "አማርኛ"},
+   {"an", NULL, "Aragonés"},
+   {"ar", NULL, "ةيبرعلا"},
+   {"as", NULL, "অসমীয়া"},
+   {"az", NULL, "Azərbaycan dili"},
+   {"be", NULL, "Беларуская мова"},
+   {"bg", NULL, "Български"},
+   {"bn", NULL, "বাংলা"},
+   {"br", NULL, "Brezhoneg"},
+   {"bs", NULL, "Bosanski"},
+   {"byn", NULL, "ብሊና"},
+   {"ca", NULL, "Català"},
+   {"cch", NULL, "Atsam"},
+   {"cs", NULL, "Čeština"},
+   {"cy", NULL, "Cymraeg"},
+   {"da", NULL, "Dansk"},
+   {"de", NULL, "Deutsch"},
+   {"dv", NULL, "ދިވެހި"},
+   {"dz", NULL, "Dzongkha"},
+   {"ee", NULL, "Eʋegbe"},
+   {"el", NULL, "Ελληνικά"},
+   {"en", NULL, "English"},
+   {"eo", NULL, "Esperanto"},
+   {"es", NULL, "Español"},
+   {"et", NULL, "Eesti keel"},
+   {"eu", NULL, "Euskara"},
+   {"fa", NULL, "یسراف"},
+   {"fi", NULL, "Suomi"},
+   {"fo", NULL, "Føroyskt"},
+   {"fr", NULL, "Français"},
+   {"fur", NULL, "Furlan"},
+   {"ga", NULL, "Gaeilge"},
+   {"gaa", NULL, "Gã"},
+   {"gez", NULL, "ግዕዝ"},
+   {"gl", NULL, "Galego"},
+   {"gu", NULL, "Gujarati"},
+   {"gv", NULL, "Yn Ghaelg"},
+   {"ha", NULL, "Hausa"},
+   {"haw", NULL, "ʻŌlelo Hawaiʻi"},
+   {"he", NULL, "עברית"},
+   {"hi", NULL, "Hindi"},
+   {"hr", NULL, "Hrvatski"},
+   {"hu", NULL, "Magyar"},
+   {"hy", NULL, "Հայերեն"},
+   {"ia", NULL, "Interlingua"},
+   {"id", NULL, "Indonesian"},
+   {"ig", NULL, "Igbo"},
+   {"is", NULL, "Íslenska"},
+   {"it", NULL, "Italiano"},
+   {"iu", NULL, "ᐃᓄᒃᑎᑐᑦ"},
+   {"iw", NULL, "עברית"},
+   {"ja", NULL, "日本語"},
+   {"ka", NULL, "ქართული"},
+   {"kaj", NULL, "Jju"},
+   {"kam", NULL, "Kikamba"},
+   {"kcg", NULL, "Tyap"},
+   {"kfo", NULL, "Koro"},
+   {"kk", NULL, "Qazaq"},
+   {"kl", NULL, "Kalaallisut"},
+   {"km", NULL, "ភាសាខ្មែរ"},
+   {"kn", NULL, "ಕನ್ನಡ"},
+   {"ko", NULL, "한국어"},
+   {"kok", NULL, "Konkani"},
+   {"ku", NULL, "یدروك"},
+   {"kw", NULL, "Kernowek"},
+   {"ky", NULL, "Кыргыз тили"},
+   {"ln", NULL, "Lingála"},
+   {"lo", NULL, "ພາສາລາວ"},
+   {"lt", NULL, "Lietuvių kalba"},
+   {"lv", NULL, "Latviešu"},
+   {"mi", NULL, "Te Reo Māori"},
+   {"mk", NULL, "Македонски"},
+   {"ml", NULL, "മലയാളം"},
+   {"mn", NULL, "Монгол"},
+   {"mr", NULL, "मराठी"},
+   {"ms", NULL, "Bahasa Melayu"},
+   {"mt", NULL, "Malti"},
+   {"nb", NULL, "Norsk Bokmål"},
+   {"ne", NULL, "नेपाली"},
+   {"nl", NULL, "Nederlands"},
+   {"nn", NULL, "Norsk Nynorsk"},
+   {"no", NULL, "Norsk"},
+   {"nr", NULL, "isiNdebele"},
+   {"nso", NULL, "Sesotho sa Leboa"},
+   {"ny", NULL, "Chicheŵa"},
+   {"oc", NULL, "Occitan"},
+   {"om", NULL, "Oromo"},
+   {"or", NULL, "ଓଡ଼ିଆ"},
+   {"pa", NULL, "ਪੰਜਾਬੀ"},
+   {"pl", NULL, "Polski"},
+   {"ps", NULL, "وتښپ"},
+   {"pt", NULL, "Português"},
+   {"ro", NULL, "Română"},
+   {"ru", NULL, "Русский"},
+   {"rw", NULL, "Kinyarwanda"},
+   {"sa", NULL, "संस्कृतम्"},
+   {"se", NULL, "Davvisápmi"},
+   {"sh", NULL, "Srpskohrvatski/Српскохрватски"},
+   {"sid", NULL, "Sidámo 'Afó"},
+   {"sk", NULL, "Slovenčina"},
+   {"sl", NULL, "Slovenščina"},
+   {"so", NULL, "af Soomaali"},
+   {"sq", NULL, "Shqip"},
+   {"sr", NULL, "Српски"},
+   {"ss", NULL, "Swati"},
+   {"st", NULL, "Southern Sotho"},
+   {"sv", NULL, "Svenska"},
+   {"sw", NULL, "Swahili"},
+   {"syr", NULL, "Syriac"},
+   {"ta", NULL, "தமிழ்"},
+   {"te", NULL, "తెలుగు"},
+   {"tg", NULL, "Тоҷикӣ"},
+   {"th", NULL, "ภาษาไทย"},
+   {"ti", NULL, "ትግርኛ"},
+   {"tig", NULL, "ቲግሬ"},
+   {"tl", NULL, "Tagalog"},
+   {"tn", NULL, "Setswana"},
+   {"tr", NULL, "Türkçe"},
+   {"ts", NULL, "Tsonga"},
+   {"tt", NULL, "Татарча"},
+   {"uk", NULL, "Українська мова"},
+   {"ur", NULL, "ودراُ"},
+   {"uz", NULL, "O‘zbek"},
+   {"ve", NULL, "Venda"},
+   {"vi", NULL, "Tiếng Việt"},
+   {"wa", NULL, "Walon"},
+   {"wal", NULL, "Walamo"},
+   {"xh", NULL, "Xhosa"},
+   {"yi", NULL, "שידיִי"},
+   {"yo", NULL, "èdèe Yorùbá"},
+   {"zh", NULL, "汉语/漢語"},
+   {"zu", NULL, "Zulu"},
+   { NULL, NULL, NULL}
 };
 
 const E_Intl_Pair region_predefined_pairs[ ] = {
-       { "AF", NULL, "Afghanistan"},
-       { "AX", NULL, "Åland"},
-       { "AL", NULL, "Shqipëria"},
-       { "DZ", NULL, "Algeria"},
-       { "AS", NULL, "Amerika Sāmoa"},
-       { "AD", NULL, "Andorra"},
-       { "AO", NULL, "Angola"},
-       { "AI", NULL, "Anguilla"},
-       { "AQ", NULL, "Antarctica"},
-       { "AG", NULL, "Antigua and Barbuda"},
-       { "AR", NULL, "Argentina"},
-       { "AM", NULL, "Հայաստան"},
-       { "AW", NULL, "Aruba"},
-       { "AU", NULL, "Australia"},
-       { "AT", NULL, "Österreich"},
-       { "AZ", NULL, "Azərbaycan"},
-       { "BS", NULL, "Bahamas"},
-       { "BH", NULL, "Bahrain"},
-       { "BD", NULL, "বাংলাদেশ"},
-       { "BB", NULL, "Barbados"},
-       { "BY", NULL, "Беларусь"},
-       { "BE", NULL, "Belgium"},
-       { "BZ", NULL, "Belize"},
-       { "BJ", NULL, "Bénin"},
-       { "BM", NULL, "Bermuda"},
-       { "BT", NULL, "Bhutan"},
-       { "BO", NULL, "Bolivia"},
-       { "BA", NULL, "Bosnia and Herzegovina"},
-       { "BW", NULL, "Botswana"},
-       { "BV", NULL, "Bouvetøya"},
-       { "BR", NULL, "Brazil"},
-       { "IO", NULL, "British Indian Ocean Territory"},
-       { "BN", NULL, "Brunei Darussalam"},
-       { "BG", NULL, "България"},
-       { "BF", NULL, "Burkina Faso"},
-       { "BI", NULL, "Burundi"},
-       { "KH", NULL, "Cambodia"},
-       { "CM", NULL, "Cameroon"},
-       { "CA", NULL, "Canada"},
-       { "CV", NULL, "Cape Verde"},
-       { "KY", NULL, "Cayman Islands"},
-       { "CF", NULL, "Central African Republic"},
-       { "TD", NULL, "Chad"},
-       { "CL", NULL, "Chile"},
-       { "CN", NULL, "中國"},
-       { "CX", NULL, "Christmas Island"},
-       { "CC", NULL, "Cocos (keeling) Islands"},
-       { "CO", NULL, "Colombia"},
-       { "KM", NULL, "Comoros"},
-       { "CG", NULL, "Congo"},
-       { "CD", NULL, "Congo"},
-       { "CK", NULL, "Cook Islands"},
-       { "CR", NULL, "Costa Rica"},
-       { "CI", NULL, "Cote d'Ivoire"},
-       { "HR", NULL, "Hrvatska"},
-       { "CU", NULL, "Cuba"},
-       { "CY", NULL, "Cyprus"},
-       { "CZ", NULL, "Česká republika"},
-       { "DK", NULL, "Danmark"},
-       { "DJ", NULL, "Djibouti"},
-       { "DM", NULL, "Dominica"},
-       { "DO", NULL, "República Dominicana"},
-       { "EC", NULL, "Ecuador"},
-       { "EG", NULL, "Egypt"},
-       { "SV", NULL, "El Salvador"},
-       { "GQ", NULL, "Equatorial Guinea"},
-       { "ER", NULL, "Eritrea"},
-       { "EE", NULL, "Eesti"},
-       { "ET", NULL, "Ethiopia"},
-       { "FK", NULL, "Falkland Islands (malvinas)"},
-       { "FO", NULL, "Faroe Islands"},
-       { "FJ", NULL, "Fiji"},
-       { "FI", NULL, "Finland"},
-       { "FR", NULL, "France"},
-       { "GF", NULL, "French Guiana"},
-       { "PF", NULL, "French Polynesia"},
-       { "TF", NULL, "French Southern Territories"},
-       { "GA", NULL, "Gabon"},
-       { "GM", NULL, "Gambia"},
-       { "GE", NULL, "Georgia"},
-       { "DE", NULL, "Deutschland"},
-       { "GH", NULL, "Ghana"},
-       { "GI", NULL, "Gibraltar"},
-       { "GR", NULL, "Greece"},
-       { "GL", NULL, "Greenland"},
-       { "GD", NULL, "Grenada"},
-       { "GP", NULL, "Guadeloupe"},
-       { "GU", NULL, "Guam"},
-       { "GT", NULL, "Guatemala"},
-       { "GG", NULL, "Guernsey"},
-       { "GN", NULL, "Guinea"},
-       { "GW", NULL, "Guinea-Bissau"},
-       { "GY", NULL, "Guyana"},
-       { "HT", NULL, "Haiti"},
-       { "HM", NULL, "Heard Island and Mcdonald Islands"},
-       { "VA", NULL, "Holy See (Vatican City State)"},
-       { "HN", NULL, "Honduras"},
-       { "HK", NULL, "Hong Kong"},
-       { "HU", NULL, "Magyarország"},
-       { "IS", NULL, "Iceland"},
-       { "IN", NULL, "India"},
-       { "ID", NULL, "Indonesia"},
-       { "IR", NULL, "Iran"},
-       { "IQ", NULL, "Iraq"},
-       { "IE", NULL, "Éire"},
-       { "IM", NULL, "Isle Of Man"},
-       { "IL", NULL, "Israel"},
-       { "IT", NULL, "Italia"},
-       { "JM", NULL, "Jamaica"},
-       { "JP", NULL, "日本"},
-       { "JE", NULL, "Jersey"},
-       { "JO", NULL, "Jordan"},
-       { "KZ", NULL, "Kazakhstan"},
-       { "KE", NULL, "Kenya"},
-       { "KI", NULL, "Kiribati"},
-       { "KP", NULL, "Korea"},
-       { "KR", NULL, "Korea"},
-       { "KW", NULL, "Kuwait"},
-       { "KG", NULL, "Kyrgyzstan"},
-       { "LA", NULL, "Lao People's Democratic Republic"},
-       { "LV", NULL, "Latvija"},
-       { "LB", NULL, "Lebanon"},
-       { "LS", NULL, "Lesotho"},
-       { "LR", NULL, "Liberia"},
-       { "LY", NULL, "Libyan Arab Jamahiriya"},
-       { "LI", NULL, "Liechtenstein"},
-       { "LT", NULL, "Lietuva"},
-       { "LU", NULL, "Lëtzebuerg"},
-       { "MO", NULL, "Macao"},
-       { "MK", NULL, "Македонија"},
-       { "MG", NULL, "Madagascar"},
-       { "MW", NULL, "Malawi"},
-       { "MY", NULL, "Malaysia"},
-       { "MV", NULL, "Maldives"},
-       { "ML", NULL, "Mali"},
-       { "MT", NULL, "Malta"},
-       { "MH", NULL, "Marshall Islands"},
-       { "MQ", NULL, "Martinique"},
-       { "MR", NULL, "Mauritania"},
-       { "MU", NULL, "Mauritius"},
-       { "YT", NULL, "Mayotte"},
-       { "MX", NULL, "Mexico"},
-       { "FM", NULL, "Micronesia"},
-       { "MD", NULL, "Moldova"},
-       { "MC", NULL, "Monaco"},
-       { "MN", NULL, "Mongolia"},
-       { "MS", NULL, "Montserrat"},
-       { "MA", NULL, "Morocco"},
-       { "MZ", NULL, "Mozambique"},
-       { "MM", NULL, "Myanmar"},
-       { "NA", NULL, "Namibia"},
-       { "NR", NULL, "Nauru"},
-       { "NP", NULL, "Nepal"},
-       { "NL", NULL, "Nederland"},
-       { "AN", NULL, "Netherlands Antilles"},
-       { "NC", NULL, "New Caledonia"},
-       { "NZ", NULL, "New Zealand"},
-       { "NI", NULL, "Nicaragua"},
-       { "NE", NULL, "Niger"},
-       { "NG", NULL, "Nigeria"},
-       { "NU", NULL, "Niue"},
-       { "NF", NULL, "Norfolk Island"},
-       { "MP", NULL, "Northern Mariana Islands"},
-       { "NO", NULL, "Norge"},
-       { "OM", NULL, "Oman"},
-       { "PK", NULL, "Pakistan"},
-       { "PW", NULL, "Palau"},
-       { "PS", NULL, "Palestinian Territory"},
-       { "PA", NULL, "Panama"},
-       { "PG", NULL, "Papua New Guinea"},
-       { "PY", NULL, "Paraguay"},
-       { "PE", NULL, "Peru"},
-       { "PH", NULL, "Philippines"},
-       { "PN", NULL, "Pitcairn"},
-       { "PL", NULL, "Poland"},
-       { "PT", NULL, "Portugal"},
-       { "PR", NULL, "Puerto Rico"},
-       { "QA", NULL, "Qatar"},
-       { "RE", NULL, "Reunion"},
-       { "RO", NULL, "Romania"},
-       { "RU", NULL, "Russian Federation"},
-       { "RW", NULL, "Rwanda"},
-       { "SH", NULL, "Saint Helena"},
-       { "KN", NULL, "Saint Kitts and Nevis"},
-       { "LC", NULL, "Saint Lucia"},
-       { "PM", NULL, "Saint Pierre and Miquelon"},
-       { "VC", NULL, "Saint Vincent and the Grenadines"},
-       { "WS", NULL, "Samoa"},
-       { "SM", NULL, "San Marino"},
-       { "ST", NULL, "Sao Tome and Principe"},
-       { "SA", NULL, "Saudi Arabia"},
-       { "SN", NULL, "Senegal"},
-       { "CS", NULL, "Serbia and Montenegro"},
-       { "SC", NULL, "Seychelles"},
-       { "SL", NULL, "Sierra Leone"},
-       { "SG", NULL, "Singapore"},
-       { "SK", NULL, "Slovakia"},
-       { "SI", NULL, "Slovenia"},
-       { "SB", NULL, "Solomon Islands"},
-       { "SO", NULL, "Somalia"},
-       { "ZA", NULL, "South Africa"},
-       { "GS", NULL, "South Georgia and the South Sandwich Islands"},
-       { "ES", NULL, "Spain"},
-       { "LK", NULL, "Sri Lanka"},
-       { "SD", NULL, "Sudan"},
-       { "SR", NULL, "Suriname"},
-       { "SJ", NULL, "Svalbard and Jan Mayen"},
-       { "SZ", NULL, "Swaziland"},
-       { "SE", NULL, "Sweden"},
-       { "CH", NULL, "Switzerland"},
-       { "SY", NULL, "Syrian Arab Republic"},
-       { "TW", NULL, "Taiwan"},
-       { "TJ", NULL, "Tajikistan"},
-       { "TZ", NULL, "Tanzania"},
-       { "TH", NULL, "Thailand"},
-       { "TL", NULL, "Timor-Leste"},
-       { "TG", NULL, "Togo"},
-       { "TK", NULL, "Tokelau"},
-       { "TO", NULL, "Tonga"},
-       { "TT", NULL, "Trinidad and Tobago"},
-       { "TN", NULL, "Tunisia"},
-       { "TR", NULL, "Turkey"},
-       { "TM", NULL, "Turkmenistan"},
-       { "TC", NULL, "Turks and Caicos Islands"},
-       { "TV", NULL, "Tuvalu"},
-       { "UG", NULL, "Uganda"},
-       { "UA", NULL, "Ukraine"},
-       { "AE", NULL, "United Arab Emirates"},
-       { "GB", NULL, "United Kingdom"},
-       { "US", NULL, "United States"},
-       { "UM", NULL, "United States Minor Outlying Islands"},
-       { "UY", NULL, "Uruguay"},
-       { "UZ", NULL, "Uzbekistan"},
-       { "VU", NULL, "Vanuatu"},
-       { "VE", NULL, "Venezuela"},
-       { "VN", NULL, "Viet Nam"},
-       { "VG", NULL, "Virgin Islands"},
-       { "VI", NULL, "Virgin Islands"},
-       { "WF", NULL, "Wallis and Futuna"},
-       { "EH", NULL, "Western Sahara"},
-       { "YE", NULL, "Yemen"},
-       { "ZM", NULL, "Zambia"},
-       { "ZW", NULL, "Zimbabwe"},
-       { NULL, NULL, NULL}
+   { "AF", NULL, "Afghanistan"},
+   { "AX", NULL, "Åland"},
+   { "AL", NULL, "Shqipëria"},
+   { "DZ", NULL, "Algeria"},
+   { "AS", NULL, "Amerika Sāmoa"},
+   { "AD", NULL, "Andorra"},
+   { "AO", NULL, "Angola"},
+   { "AI", NULL, "Anguilla"},
+   { "AQ", NULL, "Antarctica"},
+   { "AG", NULL, "Antigua and Barbuda"},
+   { "AR", NULL, "Argentina"},
+   { "AM", NULL, "Հայաստան"},
+   { "AW", NULL, "Aruba"},
+   { "AU", NULL, "Australia"},
+   { "AT", NULL, "Österreich"},
+   { "AZ", NULL, "Azərbaycan"},
+   { "BS", NULL, "Bahamas"},
+   { "BH", NULL, "Bahrain"},
+   { "BD", NULL, "বাংলাদেশ"},
+   { "BB", NULL, "Barbados"},
+   { "BY", NULL, "Беларусь"},
+   { "BE", NULL, "Belgium"},
+   { "BZ", NULL, "Belize"},
+   { "BJ", NULL, "Bénin"},
+   { "BM", NULL, "Bermuda"},
+   { "BT", NULL, "Bhutan"},
+   { "BO", NULL, "Bolivia"},
+   { "BA", NULL, "Bosnia and Herzegovina"},
+   { "BW", NULL, "Botswana"},
+   { "BV", NULL, "Bouvetøya"},
+   { "BR", NULL, "Brazil"},
+   { "IO", NULL, "British Indian Ocean Territory"},
+   { "BN", NULL, "Brunei Darussalam"},
+   { "BG", NULL, "България"},
+   { "BF", NULL, "Burkina Faso"},
+   { "BI", NULL, "Burundi"},
+   { "KH", NULL, "Cambodia"},
+   { "CM", NULL, "Cameroon"},
+   { "CA", NULL, "Canada"},
+   { "CV", NULL, "Cape Verde"},
+   { "KY", NULL, "Cayman Islands"},
+   { "CF", NULL, "Central African Republic"},
+   { "TD", NULL, "Chad"},
+   { "CL", NULL, "Chile"},
+   { "CN", NULL, "中國"},
+   { "CX", NULL, "Christmas Island"},
+   { "CC", NULL, "Cocos (keeling) Islands"},
+   { "CO", NULL, "Colombia"},
+   { "KM", NULL, "Comoros"},
+   { "CG", NULL, "Congo"},
+   { "CD", NULL, "Congo"},
+   { "CK", NULL, "Cook Islands"},
+   { "CR", NULL, "Costa Rica"},
+   { "CI", NULL, "Cote d'Ivoire"},
+   { "HR", NULL, "Hrvatska"},
+   { "CU", NULL, "Cuba"},
+   { "CY", NULL, "Cyprus"},
+   { "CZ", NULL, "Česká republika"},
+   { "DK", NULL, "Danmark"},
+   { "DJ", NULL, "Djibouti"},
+   { "DM", NULL, "Dominica"},
+   { "DO", NULL, "República Dominicana"},
+   { "EC", NULL, "Ecuador"},
+   { "EG", NULL, "Egypt"},
+   { "SV", NULL, "El Salvador"},
+   { "GQ", NULL, "Equatorial Guinea"},
+   { "ER", NULL, "Eritrea"},
+   { "EE", NULL, "Eesti"},
+   { "ET", NULL, "Ethiopia"},
+   { "FK", NULL, "Falkland Islands (malvinas)"},
+   { "FO", NULL, "Faroe Islands"},
+   { "FJ", NULL, "Fiji"},
+   { "FI", NULL, "Finland"},
+   { "FR", NULL, "France"},
+   { "GF", NULL, "French Guiana"},
+   { "PF", NULL, "French Polynesia"},
+   { "TF", NULL, "French Southern Territories"},
+   { "GA", NULL, "Gabon"},
+   { "GM", NULL, "Gambia"},
+   { "GE", NULL, "Georgia"},
+   { "DE", NULL, "Deutschland"},
+   { "GH", NULL, "Ghana"},
+   { "GI", NULL, "Gibraltar"},
+   { "GR", NULL, "Greece"},
+   { "GL", NULL, "Greenland"},
+   { "GD", NULL, "Grenada"},
+   { "GP", NULL, "Guadeloupe"},
+   { "GU", NULL, "Guam"},
+   { "GT", NULL, "Guatemala"},
+   { "GG", NULL, "Guernsey"},
+   { "GN", NULL, "Guinea"},
+   { "GW", NULL, "Guinea-Bissau"},
+   { "GY", NULL, "Guyana"},
+   { "HT", NULL, "Haiti"},
+   { "HM", NULL, "Heard Island and Mcdonald Islands"},
+   { "VA", NULL, "Holy See (Vatican City State)"},
+   { "HN", NULL, "Honduras"},
+   { "HK", NULL, "Hong Kong"},
+   { "HU", NULL, "Magyarország"},
+   { "IS", NULL, "Iceland"},
+   { "IN", NULL, "India"},
+   { "ID", NULL, "Indonesia"},
+   { "IR", NULL, "Iran"},
+   { "IQ", NULL, "Iraq"},
+   { "IE", NULL, "Éire"},
+   { "IM", NULL, "Isle Of Man"},
+   { "IL", NULL, "Israel"},
+   { "IT", NULL, "Italia"},
+   { "JM", NULL, "Jamaica"},
+   { "JP", NULL, "日本"},
+   { "JE", NULL, "Jersey"},
+   { "JO", NULL, "Jordan"},
+   { "KZ", NULL, "Kazakhstan"},
+   { "KE", NULL, "Kenya"},
+   { "KI", NULL, "Kiribati"},
+   { "KP", NULL, "Korea"},
+   { "KR", NULL, "Korea"},
+   { "KW", NULL, "Kuwait"},
+   { "KG", NULL, "Kyrgyzstan"},
+   { "LA", NULL, "Lao People's Democratic Republic"},
+   { "LV", NULL, "Latvija"},
+   { "LB", NULL, "Lebanon"},
+   { "LS", NULL, "Lesotho"},
+   { "LR", NULL, "Liberia"},
+   { "LY", NULL, "Libyan Arab Jamahiriya"},
+   { "LI", NULL, "Liechtenstein"},
+   { "LT", NULL, "Lietuva"},
+   { "LU", NULL, "Lëtzebuerg"},
+   { "MO", NULL, "Macao"},
+   { "MK", NULL, "Македонија"},
+   { "MG", NULL, "Madagascar"},
+   { "MW", NULL, "Malawi"},
+   { "MY", NULL, "Malaysia"},
+   { "MV", NULL, "Maldives"},
+   { "ML", NULL, "Mali"},
+   { "MT", NULL, "Malta"},
+   { "MH", NULL, "Marshall Islands"},
+   { "MQ", NULL, "Martinique"},
+   { "MR", NULL, "Mauritania"},
+   { "MU", NULL, "Mauritius"},
+   { "YT", NULL, "Mayotte"},
+   { "MX", NULL, "Mexico"},
+   { "FM", NULL, "Micronesia"},
+   { "MD", NULL, "Moldova"},
+   { "MC", NULL, "Monaco"},
+   { "MN", NULL, "Mongolia"},
+   { "MS", NULL, "Montserrat"},
+   { "MA", NULL, "Morocco"},
+   { "MZ", NULL, "Mozambique"},
+   { "MM", NULL, "Myanmar"},
+   { "NA", NULL, "Namibia"},
+   { "NR", NULL, "Nauru"},
+   { "NP", NULL, "Nepal"},
+   { "NL", NULL, "Nederland"},
+   { "AN", NULL, "Netherlands Antilles"},
+   { "NC", NULL, "New Caledonia"},
+   { "NZ", NULL, "New Zealand"},
+   { "NI", NULL, "Nicaragua"},
+   { "NE", NULL, "Niger"},
+   { "NG", NULL, "Nigeria"},
+   { "NU", NULL, "Niue"},
+   { "NF", NULL, "Norfolk Island"},
+   { "MP", NULL, "Northern Mariana Islands"},
+   { "NO", NULL, "Norge"},
+   { "OM", NULL, "Oman"},
+   { "PK", NULL, "Pakistan"},
+   { "PW", NULL, "Palau"},
+   { "PS", NULL, "Palestinian Territory"},
+   { "PA", NULL, "Panama"},
+   { "PG", NULL, "Papua New Guinea"},
+   { "PY", NULL, "Paraguay"},
+   { "PE", NULL, "Peru"},
+   { "PH", NULL, "Philippines"},
+   { "PN", NULL, "Pitcairn"},
+   { "PL", NULL, "Poland"},
+   { "PT", NULL, "Portugal"},
+   { "PR", NULL, "Puerto Rico"},
+   { "QA", NULL, "Qatar"},
+   { "RE", NULL, "Reunion"},
+   { "RO", NULL, "Romania"},
+   { "RU", NULL, "Russian Federation"},
+   { "RW", NULL, "Rwanda"},
+   { "SH", NULL, "Saint Helena"},
+   { "KN", NULL, "Saint Kitts and Nevis"},
+   { "LC", NULL, "Saint Lucia"},
+   { "PM", NULL, "Saint Pierre and Miquelon"},
+   { "VC", NULL, "Saint Vincent and the Grenadines"},
+   { "WS", NULL, "Samoa"},
+   { "SM", NULL, "San Marino"},
+   { "ST", NULL, "Sao Tome and Principe"},
+   { "SA", NULL, "Saudi Arabia"},
+   { "SN", NULL, "Senegal"},
+   { "CS", NULL, "Serbia and Montenegro"},
+   { "SC", NULL, "Seychelles"},
+   { "SL", NULL, "Sierra Leone"},
+   { "SG", NULL, "Singapore"},
+   { "SK", NULL, "Slovakia"},
+   { "SI", NULL, "Slovenia"},
+   { "SB", NULL, "Solomon Islands"},
+   { "SO", NULL, "Somalia"},
+   { "ZA", NULL, "South Africa"},
+   { "GS", NULL, "South Georgia and the South Sandwich Islands"},
+   { "ES", NULL, "Spain"},
+   { "LK", NULL, "Sri Lanka"},
+   { "SD", NULL, "Sudan"},
+   { "SR", NULL, "Suriname"},
+   { "SJ", NULL, "Svalbard and Jan Mayen"},
+   { "SZ", NULL, "Swaziland"},
+   { "SE", NULL, "Sweden"},
+   { "CH", NULL, "Switzerland"},
+   { "SY", NULL, "Syrian Arab Republic"},
+   { "TW", NULL, "Taiwan"},
+   { "TJ", NULL, "Tajikistan"},
+   { "TZ", NULL, "Tanzania"},
+   { "TH", NULL, "Thailand"},
+   { "TL", NULL, "Timor-Leste"},
+   { "TG", NULL, "Togo"},
+   { "TK", NULL, "Tokelau"},
+   { "TO", NULL, "Tonga"},
+   { "TT", NULL, "Trinidad and Tobago"},
+   { "TN", NULL, "Tunisia"},
+   { "TR", NULL, "Turkey"},
+   { "TM", NULL, "Turkmenistan"},
+   { "TC", NULL, "Turks and Caicos Islands"},
+   { "TV", NULL, "Tuvalu"},
+   { "UG", NULL, "Uganda"},
+   { "UA", NULL, "Ukraine"},
+   { "AE", NULL, "United Arab Emirates"},
+   { "GB", NULL, "United Kingdom"},
+   { "US", NULL, "United States"},
+   { "UM", NULL, "United States Minor Outlying Islands"},
+   { "UY", NULL, "Uruguay"},
+   { "UZ", NULL, "Uzbekistan"},
+   { "VU", NULL, "Vanuatu"},
+   { "VE", NULL, "Venezuela"},
+   { "VN", NULL, "Viet Nam"},
+   { "VG", NULL, "Virgin Islands"},
+   { "VI", NULL, "Virgin Islands"},
+   { "WF", NULL, "Wallis and Futuna"},
+   { "EH", NULL, "Western Sahara"},
+   { "YE", NULL, "Yemen"},
+   { "ZM", NULL, "Zambia"},
+   { "ZW", NULL, "Zimbabwe"},
+   { NULL, NULL, NULL}
 };
 
 /* This comes from
@@ -537,40 +537,40 @@ const E_Intl_Pair region_predefined_pairs[ ] = {
  * all situations just to be safe.
  */
 const E_Intl_Pair charset_predefined_pairs[ ] = {
-       /* These are in locale -a but not in charsets */
-       {"cp1255", NULL, "CP1255"},
-       {"euc", NULL, "EUC"},
-       {"georgianps", NULL, "GEORGIAN-PS"},
-       {"iso885914", NULL, "ISO-8859-14"},
-       {"koi8t", NULL, "KOI8-T"},
-       {"tcvn", NULL, "TCVN"},
-       {"ujis", NULL, "UJIS"},
-
-       /* These are from charsets man page */
-       {"big5", NULL, "BIG5"},
-       {"big5hkscs", NULL, "BIG5-HKSCS"},
-       {"cp1251", NULL, "CP1251"},
-       {"eucjp", NULL, "EUC-JP"},
-       {"euckr", NULL, "EUC-KR"},
-       {"euctw", NULL, "EUC-TW"},
-       {"gb18030", NULL, "GB18030"},
-       {"gb2312", NULL, "GB2312"},
-       {"gbk", NULL, "GBK"},
-       {"iso88591", NULL, "ISO-8859-1"},
-       {"iso885913", NULL, "ISO-8859-13"},
-       {"iso885915", NULL, "ISO-8859-15"},
-       {"iso88592", NULL, "ISO-8859-2"},
-       {"iso88593", NULL, "ISO-8859-3"},
-       {"iso88595", NULL, "ISO-8859-5"},
-       {"iso88596", NULL, "ISO-8859-6"},
-       {"iso88597", NULL, "ISO-8859-7"},
-       {"iso88598", NULL, "ISO-8859-8"},
-       {"iso88599", NULL, "ISO-8859-9"},
-       {"koi8r", NULL, "KOI8-R"},
-       {"koi8u", NULL, "KOI8-U"},
-       {"tis620", NULL, "TIS-620"},
-       {"utf8", NULL, "UTF-8"},
-       { NULL, NULL, NULL }
+   /* These are in locale -a but not in charsets */
+   {"cp1255", NULL, "CP1255"},
+   {"euc", NULL, "EUC"},
+   {"georgianps", NULL, "GEORGIAN-PS"},
+   {"iso885914", NULL, "ISO-8859-14"},
+   {"koi8t", NULL, "KOI8-T"},
+   {"tcvn", NULL, "TCVN"},
+   {"ujis", NULL, "UJIS"},
+   
+   /* These are from charsets man page */
+   {"big5", NULL, "BIG5"},
+   {"big5hkscs", NULL, "BIG5-HKSCS"},
+   {"cp1251", NULL, "CP1251"},
+   {"eucjp", NULL, "EUC-JP"},
+   {"euckr", NULL, "EUC-KR"},
+   {"euctw", NULL, "EUC-TW"},
+   {"gb18030", NULL, "GB18030"},
+   {"gb2312", NULL, "GB2312"},
+   {"gbk", NULL, "GBK"},
+   {"iso88591", NULL, "ISO-8859-1"},
+   {"iso885913", NULL, "ISO-8859-13"},
+   {"iso885915", NULL, "ISO-8859-15"},
+   {"iso88592", NULL, "ISO-8859-2"},
+   {"iso88593", NULL, "ISO-8859-3"},
+   {"iso88595", NULL, "ISO-8859-5"},
+   {"iso88596", NULL, "ISO-8859-6"},
+   {"iso88597", NULL, "ISO-8859-7"},
+   {"iso88598", NULL, "ISO-8859-8"},
+   {"iso88599", NULL, "ISO-8859-9"},
+   {"koi8r", NULL, "KOI8-R"},
+   {"koi8u", NULL, "KOI8-U"},
+   {"tis620", NULL, "TIS-620"},
+   {"utf8", NULL, "UTF-8"},
+   { NULL, NULL, NULL }
 };
 
 E_Config_Dialog *
@@ -975,7 +975,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    else
      cur_sig_loc = NULL;
 
-   e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", "lang-system.png");
+   e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", "lang-system.png");
    ic = e_util_icon_add(buf, evas);
    e_widget_ilist_append(cfdata->gui.blang_list, ic, _("System Default"), NULL, NULL, "");
    if ((!cur_sig_loc) || (!cfdata->cur_language))
@@ -993,7 +993,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
        trans = _(pair->locale_translation);
        if (pair->locale_icon)
          {
-            e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", pair->locale_icon);
+            e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", pair->locale_icon);
             ic = e_util_icon_add(buf, evas);
          }
         else
@@ -1426,7 +1426,7 @@ _lang_list_load(void *data)
    edje_freeze();
    e_widget_ilist_freeze(cfdata->gui.lang_list);
 
-   e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", "lang-system.png");
+   e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", "lang-system.png");
    ic = e_util_icon_add(buf, cfdata->evas);
    e_widget_ilist_append(cfdata->gui.lang_list, ic, _("System Default"), NULL, NULL, "");
    for (l = cfdata->lang_list; l; l = l->next)

diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c
index 6bdafb2..da7763d 100644 (file)
--- a/src/modules/wizard/page_010.c
+++ b/src/modules/wizard/page_010.c
@@ -15,31 +15,44 @@ struct _E_Intl_Pair
 
 const E_Intl_Pair basic_language_predefined_pairs[ ] =
 {
-   {"bg_BG.UTF-8", "lang-bg_BG.png", "Български"},
-   {"ca_ES.UTF-8", "lang-ca_ES.png", "Català"},
-   {"zh_CN.UTF-8", "lang-zh_CN.png", "Chinese (Simplified)"},
-   {"zh_TW.UTF-8", "lang-zh_TW.png", "Chinese (Traditional)"},
-   {"cs_CZ.UTF-8", "lang-cs_CZ.png", "Čeština"},
-   {"da_DK.UTF-8", "lang-da_DK.png", "Dansk"},
-   {"nl_NL.UTF-8", "lang-nl_NL.png", "Nederlands"},
-   {"en_US.UTF-8", "lang-en_US.png", "English"},
-   {"en_GB.UTF-8", NULL,             "British English"},
-   {"fi_FI.UTF-8", "lang-fi_FI.png", "Suomi"},
-   {"fr_FR.UTF-8", "lang-fr_FR.png", "Français"},
-   {"de_DE.UTF-8", "lang-de_DE.png", "Deutsch"},
-   {"hu_HU.UTF-8", "lang-hu_HU.png", "Magyar"},
-   {"it_IT.UTF-8", "lang-it_IT.png", "Italiano"},
-   {"ja_JP.UTF-8", "lang-ja_JP.png", "日本語"},
-   {"ko_KR.UTF-8", "lang-ko_KR.png", "한국어"},
-   {"nb_NO.UTF-8", "lang-nb_NO.png", "Norsk Bokmål"},
-   {"pl_PL.UTF-8", "lang-pl_PL.png", "Polski"},
-   {"pt_BR.UTF-8", "lang-pt_BR.png", "Português"},
-   {"ru_RU.UTF-8", "lang-ru_RU.png", "Русский"},
-   {"sk_SK.UTF-8", "lang-sk_SK.png", "Slovenčina"},
-   {"sl_SI.UTF-8", "lang-sl_SI.png", "Slovenščina"},
-   {"es_AR.UTF-8", "lang-es_AR.png", "Español"},
-   {"sv_SE.UTF-8", "lang-sv_SE.png", "Svenska"},
-   {"el_GR.UTF-8", "lang-el_GR.png", "Ελληνικά"},
+   {"ar_AE.UTF-8", "ara_flag.png",   "العربية"},
+   {"bg_BG.UTF-8", "bg_flag.png",    "Български"},
+   {"ca_ES.UTF-8", "cat_flag.png",   "Català"},
+   {"cs_CZ.UTF-8", "cz_flag.png",    "Čeština"},
+   {"da_DK.UTF-8", "dk_flag.png",    "Dansk"},
+   {"de_DE.UTF-8", "de_flag.png",    "Deutsch"},
+   {"en_US.UTF-8", "us_flag.png",    "English"},
+   {"en_GB.UTF-8", "bg_flag.png",    "British English"},
+   {"el_GR.UTF-8", "gr_flag.png",    "Ελληνικά"},
+   {"eo.UTF-8",    "epo_flag.png",   "Esperanto"},
+   {"es_AR.UTF-8", "ar_flag.png",    "Español"},
+   {"et_ET.UTF-8", "ee_flag.png",    "Eesti keel"},
+   {"fi_FI.UTF-8", "fi_flag.png",    "Suomi"},
+   {"fo_FO.UTF-8", "fo_flag.png",    "Føroyskt"},
+   {"fr_CH.UTF-8", "ch_flag.png",    "Français (Suisse)"},
+   {"fr_FR.UTF-8", "fr_flag.png",    "Français"},
+   {"he_HE.UTF-8", "il_flag.png",    "עברית"},
+   {"hr_HR.UTF-8", "hr_flag.png",    "Hrvatski"},
+   {"hu_HU.UTF-8", "hu_flag.png",    "Magyar"},
+   {"it_IT.UTF-8", "it_flag.png",    "Italiano"},
+   {"ja_JP.UTF-8", "jp_flag.png",    "日本語"},
+   {"km_KM.UTF-8", "kh_flag.png",    "ភាសាខ្មែរ"},
+   {"ko_KR.UTF-8", "kr_flag.png",    "한국어"},
+   {"ku.UTF-8",    "ku_flag.png",    "یدروك"},
+   {"lt_LT.UTF-8", "lt_flag.png",    "Lietuvių kalba"},
+   {"ms_MY.UTF-8", "my_flag.png",    "Bahasa Melayu"},
+   {"nb_NO.UTF-8", "no_flag.png",    "Norsk Bokmål"},
+   {"nl_NL.UTF-8", "nl_flag.png",    "Nederlands"},
+   {"pl_PL.UTF-8", "pl_flag.png",    "Polski"},
+   {"pt_BR.UTF-8", "br_flag.png",    "Português"},
+   {"ru_RU.UTF-8", "ru_flag.png",    "Русский"},
+   {"sk_SK.UTF-8", "sk_flag.png",    "Slovenčina"},
+   {"sl_SI.UTF-8", "si_flag.png",    "Slovenščina"},
+   {"sv_SE.UTF-8", "se_flag.png",    "Svenska"},
+   {"tr_TR.UTF-8", "tr_flag.png",    "Türkçe"},
+   {"uk_UK.UTF-8", "ua_flag.png",    "Українська мова"},
+   {"zh_CN.UTF-8", "cn_flag.png",    "中文 (繁体)"},
+   {"zh_TW.UTF-8", "tw_flag.png",    "中文 (繁體)"},
    { NULL, NULL, NULL }
 };
 
@@ -150,7 +163,7 @@ wizard_page_show(E_Wizard_Page *pg)
 
    e_widget_ilist_freeze(ob);
 
-   e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", "lang-system.png");
+   e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", "lang-system.png");
    ic = e_util_icon_add(buf, pg->evas);
    e_widget_ilist_append(ob, ic, _("System Default"),
                          NULL, NULL, NULL);
@@ -161,7 +174,7 @@ wizard_page_show(E_Wizard_Page *pg)
        pair = l->data;
        if (pair->locale_icon)
          {
-            e_prefix_data_snprintf(buf, sizeof(buf), "data/images/%s", pair->locale_icon);
+            e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", pair->locale_icon);
             ic = e_util_icon_add(buf, pg->evas);
          }
         else