diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
index 454ee2b84..6ff2d5ab9 100644
--- a/app/src/processing/app/Preferences.java
+++ b/app/src/processing/app/Preferences.java
@@ -97,37 +97,35 @@ public class Preferences {
       new Language(_("Aragonese"), "Aragonés", "an"),
       new Language(_("Bulgarian"), "български", "bg"),
       new Language(_("Catalan"), "Català", "ca"),
-      new Language(_("Croatian"), "Hrvatski", "hr_hr"),
-      new Language(_("Czech"), "český", "cs_cz"),
-      new Language(_("Chinese Simplified"), "简体中文", "zh_cn"),
-      new Language(_("Chinese Traditional"), "繁體中文", "zh_tw"),
-      new Language(_("Danish"), "Dansk", "da"),
+      new Language(_("Croatian"), "Hrvatski", "hr_HR"),
+      new Language(_("Czech"), "český", "cs_CZ"),
+      new Language(_("Chinese Simplified"), "简体中文", "zh_CN"),
+      new Language(_("Chinese Traditional"), "繁體中文", "zh_TW"),
+      new Language(_("Danish"), "Dansk", "da_DK"),
       new Language(_("Dutch"), "Nederlands", "nl"),
       new Language(_("English"), "English", "en"),
       new Language(_("Estonian"), "Eesti", "et"),
       new Language(_("Filipino"), "Pilipino", "tl"),
       new Language(_("French"), "Français", "fr"),
-      new Language(_("Canadian French"), "Canadienne-français", "fr_ca"),
+      new Language(_("Canadian French"), "Canadienne-français", "fr_CA"),
       new Language(_("Galician"), "Galego", "gl"),
-      new Language(_("Georgian"), "საქართველოს", "ka_ge"),
-      new Language(_("German"), "Deutsch", "de"),
-      new Language(_("Greek"), "ελληνικά", "el"),
-      new Language(_("Hebrew"), "עברית", "he"),
+      new Language(_("Georgian"), "საქართველოს", "ka_GE"),
+      new Language(_("German"), "Deutsch", "de_DE"),
+      new Language(_("Greek"), "ελληνικά", "el_GR"),
       new Language(_("Hindi"), "हिंदी", "hi"),
       new Language(_("Hungarian"), "Magyar", "hu"),
       new Language(_("Indonesian"), "Bahasa Indonesia", "id"),
-      new Language(_("Italian"), "Italiano", "it"),
-      new Language(_("Japanese"), "日本語", "ja"),
-      new Language(_("Korean"), "한국어", "ko"),
-      new Language(_("Latvian"), "Latviešu", "lv"),
-      new Language(_("Lithuaninan"), "Lietuvių Kalba", "lt"),
+      new Language(_("Italian"), "Italiano", "it_IT"),
+      new Language(_("Japanese"), "日本語", "ja_JP"),
+      new Language(_("Korean"), "한국어", "ko_KR"),
+      new Language(_("Latvian"), "Latviešu", "lv_LV"),
+      new Language(_("Lithuaninan"), "Lietuvių Kalba", "lt_LT"),
       new Language(_("Marathi"), "मराठी", "mr"),
-      new Language(_("Norwegian"), "Norsk", "no_nb"),
-      new Language(_("Norwegian Bokmål"), "Norsk bokmål", "nb_no"),
+      new Language(_("Norwegian Bokmål"), "Norsk bokmål", "nb_NO"),
       new Language(_("Persian"), "فارسی", "fa"),
       new Language(_("Polish"), "Język Polski", "pl"),
-      new Language(_("Portuguese (Brazil)"), "Português (Brazil)", "pt_br"),
-      new Language(_("Portuguese (Portugal)"), "Português (Portugal)", "pt_pt"),
+      new Language(_("Portuguese (Brazil)"), "Português (Brazil)", "pt_BR"),
+      new Language(_("Portuguese (Portugal)"), "Português (Portugal)", "pt_PT"),
       new Language(_("Romanian"), "Română", "ro"),
       new Language(_("Russian"), "Русский", "ru"),
       new Language(_("Spanish"), "Español", "es"),
@@ -135,6 +133,28 @@ public class Preferences {
       new Language(_("Turkish"), "Türk", "tr"),
       new Language(_("Ukrainian"), "Український", "uk"), };
 
+  Language missingLanguages[] = {
+      new Language(_("Armenian"), "Հայերեն", "hy"),
+      new Language(_("Asturian"), "Asturianu", "ast"),
+      new Language(_("Belarusian"), "Беларуская мова", "be"),
+      new Language(_("Bosnian"), "Bosanski", "bs"),
+      new Language(_("Burmese (Myanmar)"), "ဗမာစကား", "my_MM"),
+      new Language(_("Chinese (China)"), "", "zh_CN"),
+      new Language(_("Chinese (Hong Kong)"), "", "zh_HK"),
+      new Language(_("Chinese (Taiwan)"), "", "zh_TW"),
+      new Language(_("Chinese (Taiwan) (Big5)"), "", "zh_TW.Big5"),
+      new Language(_("Dutch (Netherlands)"), "Nederlands", "nl_NL"),
+      new Language(_("English (United Kingdom)"), "English (United Kingdom)", "en_GB"),
+      new Language(_("Estonian (Estonia)"), "Eesti keel", "et_EE"),
+      new Language(_("Finnish"), "Suomi", "fi"),
+      new Language(_("Hebrew"), "עברית", "he"),
+      new Language(_("Nepali"), "नेपाली", "ne"),
+      new Language(_("Norwegian"), "Norsk", "no_NB"),
+      new Language(_("Portugese"), "Português", "pt"),
+      new Language(_("Slovenian"), "Slovenščina", "sl_SL"),
+      new Language(_("Swedish"), "Svenska", "sv"),
+      new Language(_("Vietnamese"), "Tiếng Việt", "vi"), };
+
   /**
    * Standardized width for buttons. Mac OS X 10.3 wants 70 as its default,
    * Windows XP needs 66, and my Ubuntu machine needs 80+, so 80 seems proper.
diff --git a/app/src/processing/app/i18n/Resources_cs_cz.po b/app/src/processing/app/i18n/Resources_cs_CZ.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_cs_cz.po
rename to app/src/processing/app/i18n/Resources_cs_CZ.po
diff --git a/app/src/processing/app/i18n/Resources_cs_cz.properties b/app/src/processing/app/i18n/Resources_cs_CZ.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_cs_cz.properties
rename to app/src/processing/app/i18n/Resources_cs_CZ.properties
diff --git a/app/src/processing/app/i18n/Resources_da.po b/app/src/processing/app/i18n/Resources_da_DK.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_da.po
rename to app/src/processing/app/i18n/Resources_da_DK.po
diff --git a/app/src/processing/app/i18n/Resources_da.properties b/app/src/processing/app/i18n/Resources_da_DK.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_da.properties
rename to app/src/processing/app/i18n/Resources_da_DK.properties
diff --git a/app/src/processing/app/i18n/Resources_de.po b/app/src/processing/app/i18n/Resources_de_DE.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_de.po
rename to app/src/processing/app/i18n/Resources_de_DE.po
diff --git a/app/src/processing/app/i18n/Resources_de.properties b/app/src/processing/app/i18n/Resources_de_DE.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_de.properties
rename to app/src/processing/app/i18n/Resources_de_DE.properties
diff --git a/app/src/processing/app/i18n/Resources_el.po b/app/src/processing/app/i18n/Resources_el_GR.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_el.po
rename to app/src/processing/app/i18n/Resources_el_GR.po
diff --git a/app/src/processing/app/i18n/Resources_el.properties b/app/src/processing/app/i18n/Resources_el_GR.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_el.properties
rename to app/src/processing/app/i18n/Resources_el_GR.properties
diff --git a/app/src/processing/app/i18n/Resources_fr_ca.po b/app/src/processing/app/i18n/Resources_fr_CA.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_fr_ca.po
rename to app/src/processing/app/i18n/Resources_fr_CA.po
diff --git a/app/src/processing/app/i18n/Resources_fr_ca.properties b/app/src/processing/app/i18n/Resources_fr_CA.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_fr_ca.properties
rename to app/src/processing/app/i18n/Resources_fr_CA.properties
diff --git a/app/src/processing/app/i18n/Resources_hr_hr.po b/app/src/processing/app/i18n/Resources_hr_HR.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_hr_hr.po
rename to app/src/processing/app/i18n/Resources_hr_HR.po
diff --git a/app/src/processing/app/i18n/Resources_hr_hr.properties b/app/src/processing/app/i18n/Resources_hr_HR.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_hr_hr.properties
rename to app/src/processing/app/i18n/Resources_hr_HR.properties
diff --git a/app/src/processing/app/i18n/Resources_it.po b/app/src/processing/app/i18n/Resources_it_IT.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_it.po
rename to app/src/processing/app/i18n/Resources_it_IT.po
diff --git a/app/src/processing/app/i18n/Resources_it.properties b/app/src/processing/app/i18n/Resources_it_IT.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_it.properties
rename to app/src/processing/app/i18n/Resources_it_IT.properties
diff --git a/app/src/processing/app/i18n/Resources_ja.po b/app/src/processing/app/i18n/Resources_ja_JP.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_ja.po
rename to app/src/processing/app/i18n/Resources_ja_JP.po
diff --git a/app/src/processing/app/i18n/Resources_ja.properties b/app/src/processing/app/i18n/Resources_ja_JP.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_ja.properties
rename to app/src/processing/app/i18n/Resources_ja_JP.properties
diff --git a/app/src/processing/app/i18n/Resources_ka_ge.po b/app/src/processing/app/i18n/Resources_ka_GE.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_ka_ge.po
rename to app/src/processing/app/i18n/Resources_ka_GE.po
diff --git a/app/src/processing/app/i18n/Resources_ka_ge.properties b/app/src/processing/app/i18n/Resources_ka_GE.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_ka_ge.properties
rename to app/src/processing/app/i18n/Resources_ka_GE.properties
diff --git a/app/src/processing/app/i18n/Resources_ko.po b/app/src/processing/app/i18n/Resources_ko_KR.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_ko.po
rename to app/src/processing/app/i18n/Resources_ko_KR.po
diff --git a/app/src/processing/app/i18n/Resources_ko.properties b/app/src/processing/app/i18n/Resources_ko_KR.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_ko.properties
rename to app/src/processing/app/i18n/Resources_ko_KR.properties
diff --git a/app/src/processing/app/i18n/Resources_lt.po b/app/src/processing/app/i18n/Resources_lt_LT.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_lt.po
rename to app/src/processing/app/i18n/Resources_lt_LT.po
diff --git a/app/src/processing/app/i18n/Resources_lt.properties b/app/src/processing/app/i18n/Resources_lt_LT.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_lt.properties
rename to app/src/processing/app/i18n/Resources_lt_LT.properties
diff --git a/app/src/processing/app/i18n/Resources_lv.po b/app/src/processing/app/i18n/Resources_lv_LV.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_lv.po
rename to app/src/processing/app/i18n/Resources_lv_LV.po
diff --git a/app/src/processing/app/i18n/Resources_lv.properties b/app/src/processing/app/i18n/Resources_lv_LV.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_lv.properties
rename to app/src/processing/app/i18n/Resources_lv_LV.properties
diff --git a/app/src/processing/app/i18n/Resources_nb_no.po b/app/src/processing/app/i18n/Resources_nb_NO.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_nb_no.po
rename to app/src/processing/app/i18n/Resources_nb_NO.po
diff --git a/app/src/processing/app/i18n/Resources_nb_no.properties b/app/src/processing/app/i18n/Resources_nb_NO.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_nb_no.properties
rename to app/src/processing/app/i18n/Resources_nb_NO.properties
diff --git a/app/src/processing/app/i18n/Resources_pt_br.po b/app/src/processing/app/i18n/Resources_pt_BR.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_pt_br.po
rename to app/src/processing/app/i18n/Resources_pt_BR.po
diff --git a/app/src/processing/app/i18n/Resources_pt_br.properties b/app/src/processing/app/i18n/Resources_pt_BR.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_pt_br.properties
rename to app/src/processing/app/i18n/Resources_pt_BR.properties
diff --git a/app/src/processing/app/i18n/Resources_pt_pt.po b/app/src/processing/app/i18n/Resources_pt_PT.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_pt_pt.po
rename to app/src/processing/app/i18n/Resources_pt_PT.po
diff --git a/app/src/processing/app/i18n/Resources_pt_pt.properties b/app/src/processing/app/i18n/Resources_pt_PT.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_pt_pt.properties
rename to app/src/processing/app/i18n/Resources_pt_PT.properties
diff --git a/app/src/processing/app/i18n/Resources_zh_cn.po b/app/src/processing/app/i18n/Resources_zh_CN.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_zh_cn.po
rename to app/src/processing/app/i18n/Resources_zh_CN.po
diff --git a/app/src/processing/app/i18n/Resources_zh_cn.properties b/app/src/processing/app/i18n/Resources_zh_CN.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_zh_cn.properties
rename to app/src/processing/app/i18n/Resources_zh_CN.properties
diff --git a/app/src/processing/app/i18n/Resources_zh_tw.po b/app/src/processing/app/i18n/Resources_zh_TW.po
similarity index 100%
rename from app/src/processing/app/i18n/Resources_zh_tw.po
rename to app/src/processing/app/i18n/Resources_zh_TW.po
diff --git a/app/src/processing/app/i18n/Resources_zh_tw.properties b/app/src/processing/app/i18n/Resources_zh_TW.properties
similarity index 100%
rename from app/src/processing/app/i18n/Resources_zh_tw.properties
rename to app/src/processing/app/i18n/Resources_zh_TW.properties