e: add icon support for languages.
authorChidambar Zinnoury <illogict@online.fr>
Sun, 2 Oct 2011 13:14:44 +0000 (13:14 +0000)
committerChidambar Zinnoury <illogict@online.fr>
Sun, 2 Oct 2011 13:14:44 +0000 (13:14 +0000)
SVN revision: 63746

src/modules/conf_intl/e_int_config_intl.c

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