Merge pull request 'master' (#14) from YanTheKaller/ubl-settings-keyboard:master into master

Reviewed-on: #14

layouts.csv

@@ -1,68 +1,98 @@
-af;Afrikaans
-ar;Arabic
-as;Assamese
+al;Albanian
+et;Amharic
+am;Armenian
+ara;Arabic
+eg;Arabic (Egypt)
+iq;Arabic (Iraq)
+ma;Arabic (Morocco)
+sy;Arabic (Syria)
 az;Azerbaijani
-be;Belarusian
+ml;Bambara
+bd;Bangla
+by;Belarusian
+be;Belgian
+dz;Berber (Algeria, Latin)
+ba;Bosnian
+brai;Braille
 bg;Bulgarian
-bn;Bengali
-bs;Bosnian
-ca;Catalan
-cs;Czech
-da;Danish
-de;German
-el;Greek
-en;English
-es;Spanish
-et;Estonian
+mm;Burmese
+cn;Chinese
+hr;Croatian
+cz;Czech
+dk;Danish
+af;Dari
+mv;Dhivehi
+nl;Dutch
+bt;Dzongkha
+au;English (Australia)
+cm;English (Cameroon)
+gh;English (Ghana)
+nz;English (New Zealand)
+ng;English (Nigeria)
+za;English (South Africa)
+gb;English (UK)
+us;English (US)
+epo;Esperanto
+ee;Estonian
+fo;Faroese
+ph;Filipino
 fi;Finnish
 fr;French
-gu;Gujarati
-he;Hebrew
-hi;Hindi
-hr;Croatian
+ca;French (Canada)
+cd;French (Democratic Republic of the Congo)
+tg;French (Togo)
+ge;Georgian
+de;German
+at;German (Austria)
+ch;German (Switzerland)
+gr;Greek
+il;Hebrew
 hu;Hungarian
-hy;Armenian
-id;Indonesian
 is;Icelandic
+in;Indian
+id;Indonesian (Latin)
+ie;Irish
 it;Italian
-ja;Japanese
-ka;Georgian
-kk;Kazakh
-kn;Kannada
-ko;Korean
-ks;Kashmiri
-ku;Kurdish
-ky;Kirghiz
-lt;Lithuanian
+jp;Japanese
+kz;Kazakh
+kh;Khmer (Cambodia)
+kr;Korean
+kg;Kyrgyz
+la;Lao
 lv;Latvian
+lt;Lithuanian
 mk;Macedonian
-ml;Malayalam
-mr;Marathi
-ms;Malay
+my;Malay (Jawi, Arabic Keyboard)
 mt;Maltese
-nb;Bokmal
-nl;Dutch
-nn;Nynorsk
-or;Oriya
-pa;Punjabi
+md;Moldavian
+mn;Mongolian
+me;Montenegrin
+np;Nepali
+gn;N'Ko (AZERTY)
+no;Norwegian
+ir;Persian
 pl;Polish
 pt;Portuguese
+br;Portuguese (Brazil)
 ro;Romanian
 ru;Russian
-sa;Sanskrit
+rs;Serbian
+lk;Sinhala (phonetic)
 sk;Slovak
-sl;Slovenian
-sq;Albanian
-sr;Serbian
-sv;Swedish
-ta;Tamil
-te;Telugu
+si;Slovenian
+es;Spanish
+latam;Spanish (Latin American)
+ke;Swahili (Kenya)
+tz;Swahili (Tanzania)
+se;Swedish
+tw;Taiwanese
+tj;Tajik
 th;Thai
+bw;Tswana
+tm;Turkmen
 tr;Turkish
-uk;Ukrainian
-us;American
-vi;Vietnamese
-zh;Simplified Chinese
-zh;Traditional Chinese
-zh;Chinese
-zh;Traditional Chinese
+ua;Ukrainian
+pk;Urdu (Pakistan)
+uz;Uzbek
+vn;Vietnamese
+sn;Wolof

source/ubl-settings-keyboard.c

@@ -440,7 +440,8 @@ void yon_main_window_complete(main_window *widgets){
         yon_char_remove_last_symbol(rtn[i],'\n');
         config_str layout = yon_char_parse(rtn[i],&laysize,";");
         gtk_list_store_append(main_config.layouts_list,&iter);
-        gtk_list_store_set(main_config.layouts_list,&iter,0,layout[0],1,_(layout[1]),-1);
+        char *lout = layout[1];
+        gtk_list_store_set(main_config.layouts_list,&iter,0,layout[0],1,lout,-1);
     }
     main_config.options_list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_BOOLEAN);
     rtn = yon_config_load(get_options_command,&size);