Merge branch 'master' of https://github.com/arduino/Arduino

Author: facchinm

app/src/cc/arduino/view/preferences/Preferences.java

@@ -104,14 +104,16 @@ public Preferences(Window parent, Base base) {
       new Language(tr("Albanian"), "shqip", "sq"),
       new Language(tr("Arabic"), "العربية", "ar"),
       new Language(tr("Aragonese"), "Aragonés", "an"),
+      new Language(tr("Basque"), "Euskara", "eu"),
       new Language(tr("Belarusian"), "Беларуская мова", "be"),
       new Language(tr("Bulgarian"), "български", "bg"),
+      new Language(tr("Canadian French"), "Canadienne-français", "fr_CA"),
       new Language(tr("Catalan"), "Català", "ca"),
-      new Language(tr("Chinese Simplified"), "简体中文", "zh_CN"),
-      new Language(tr("Chinese Traditional"), "繁體中文", "zh_TW"),
+      new Language(tr("Chinese (China)"), "简体中文", "zh_CN"),
+      new Language(tr("Chinese (Taiwan) (Big5)"), "", "zh_TW.Big5"),
+      new Language(tr("Chinese (Taiwan)"), "", "zh_TW"),
       new Language(tr("Croatian"), "Hrvatski", "hr_HR"),
       new Language(tr("Czech (Czech Republic)"), "český (Czech Republic)", "cs_CZ"),
-      new Language(tr("Danish (Denmark)"), "Dansk (Denmark)", "da_DK"),
       new Language(tr("Dutch"), "Nederlands", "nl"),
       new Language(tr("English"), "English", "en"),
       new Language(tr("English (United Kingdom)"), "English (United Kingdom)", "en_GB"),
@@ -120,27 +122,26 @@ public Preferences(Window parent, Base base) {
       new Language(tr("Filipino"), "Pilipino", "fil"),
       new Language(tr("Finnish"), "Suomi", "fi"),
       new Language(tr("French"), "Français", "fr"),
-      new Language(tr("Canadian French"), "Canadienne-français", "fr_CA"),
       new Language(tr("Galician"), "Galego", "gl"),
+      new Language(tr("Galician (Spain)"), "Galego (Spain)", "gl_ES"),
       new Language(tr("Georgian"), "საქართველოს", "ka_GE"),
       new Language(tr("German"), "Deutsch", "de_DE"),
-      new Language(tr("Greek"), "ελληνικά", "el_GR"),
       new Language(tr("Hebrew"), "עברית", "he"),
       new Language(tr("Hindi"), "हिंदी", "hi"),
-      new Language(tr("Hungarian"), "Magyar", "hu"),
       new Language(tr("Indonesian"), "Bahasa Indonesia", "id"),
       new Language(tr("Italian"), "Italiano", "it_IT"),
       new Language(tr("Japanese"), "日本語", "ja_JP"),
       new Language(tr("Korean"), "한국어", "ko_KR"),
       new Language(tr("Latvian"), "Latviešu", "lv_LV"),
-      new Language(tr("Lithuaninan"), "Lietuvių Kalba", "lt_LT"),
       new Language(tr("Norwegian Bokmål"), "Norsk bokmål", "nb_NO"),
       new Language(tr("Persian"), "فارسی", "fa"),
       new Language(tr("Polish"), "Język Polski", "pl"),
+      new Language(tr("Portugese"), "Português", "pt"),
       new Language(tr("Portuguese (Brazil)"), "Português (Brazil)", "pt_BR"),
       new Language(tr("Portuguese (Portugal)"), "Português (Portugal)", "pt_PT"),
       new Language(tr("Romanian"), "Română", "ro"),
       new Language(tr("Russian"), "Русский", "ru"),
+      new Language(tr("Slovak"), "Slovenčina", "sk"),
       new Language(tr("Slovenian"), "Slovenščina", "sl_SI"),
       new Language(tr("Spanish"), "Español", "es"),
       new Language(tr("Swedish"), "Svenska", "sv"),
@@ -154,31 +155,18 @@ public Preferences(Window parent, Base base) {
       new Language(tr("Afrikaans"), "Afrikaans", "af"),
       new Language(tr("Armenian"), "Հայերեն", "hy"),
       new Language(tr("Asturian"), "Asturianu", "ast"),
-      new Language(tr("Basque"), "Euskara", "eu"),
-      new Language(tr("Bengali (India)"), "বাংলা (India)", "bn_IN"),
       new Language(tr("Bosnian"), "Bosanski", "bs"),
       new Language(tr("Burmese (Myanmar)"), "ဗမာစကား", "my_MM"),
-      new Language(tr("Chinese (China)"), "", "zh_CN"),
-      new Language(tr("Chinese (Hong Kong)"), "", "zh_HK"),
-      new Language(tr("Chinese (Taiwan)"), "", "zh_TW"),
-      new Language(tr("Chinese (Taiwan) (Big5)"), "", "zh_TW.Big5"),
-      new Language(tr("Czech"), "český", "cs"),
-      new Language(tr("Danish"), "Dansk", "da"),
+      new Language(tr("Danish (Denmark)"), "Dansk (Denmark)", "da_DK"),
       new Language(tr("Dutch (Netherlands)"), "Nederlands", "nl_NL"),
-      new Language(tr("Galician (Spain)"), "Galego (Spain)", "gl_ES"),
-      new Language(tr("Nepali"), "नेपाली", "ne"),
-      new Language(tr("N'Ko"), "ߒߞߏ", "nqo"),
+      new Language(tr("Greek"), "ελληνικά", "el_GR"),
+      new Language(tr("Hungarian"), "Magyar", "hu"),
+      new Language(tr("Lithuaninan"), "Lietuvių Kalba", "lt_LT"),
       new Language(tr("Marathi"), "मराठी", "mr"),
-      new Language(tr("Malay (Malaysia)"), "بهاس ملايو (Malaysia)", "ms_MY"),
-      new Language(tr("Norwegian"), "Norsk", "no"),
-      new Language(tr("Norwegian Nynorsk"), "Norsk Nynorsk", "nn"),
-      new Language(tr("Portugese"), "Português", "pt"),
+      new Language(tr("Nepali"), "नेपाली", "ne"),
       new Language(tr("Persian (Iran)"), "فارسی (Iran)", "fa_IR"),
-      new Language(tr("Slovak"), "Slovenčina", "sk"),
-      new Language(tr("Swahili"), "كِسوَهِل", "sw"),
       new Language(tr("Talossan"), "Talossan", "tzl"),
-      new Language(tr("Urdu (Pakistan)"), "اردو (Pakistan)", "ur_PK"),
-      new Language(tr("Western Frisian"), "Western Frisian", "fy"),
+      new Language(tr("Western Frisian"), "Western Frisian", "fy")
     };
 
     this.warningItems = new WarningItem[]{