Merge pull request #30947 from TheoChevalier/new-gaia-locales

Bug 1183379 - Add Amharic (am), Upper Sorbian (hsb), Lower Sorbian (d…
mozilla-b2g · Jul 27, 2015 · 4729c98 · 4729c98
2 parents 302a448 + bbb889c
commit 4729c98
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/build/config/keyboard-layouts.json b/build/config/keyboard-layouts.json
@@ -4,6 +4,9 @@
         {"layoutId": "af", "app": ["apps", "keyboard"]},
         {"layoutId": "en", "app": ["apps", "keyboard"]}
     ],
+    "am": [
+        {"layoutId": "en", "app": ["apps", "keyboard"]}
+    ],
     "ar": [
         {"layoutId": "ar", "app": ["apps", "keyboard"]},
         {"layoutId": "en", "app": ["apps", "keyboard"]}
@@ -37,6 +40,9 @@
     "de": [
         {"layoutId": "de", "app": ["apps", "keyboard"]}
     ],
+    "dsb": [
+        {"layoutId": "en", "app": ["apps", "keyboard"]}
+    ],
     "ee": [
         {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
     ],
@@ -102,6 +108,9 @@
     "hr": [
         {"layoutId": "hr", "app": ["apps", "keyboard"]}
     ],
+    "hsb": [
+        {"layoutId": "en", "app": ["apps", "keyboard"]}
+    ],
     "ht": [
         {"layoutId": "en", "app": ["apps", "keyboard"]}
     ],
@@ -253,6 +262,10 @@
     "yo": [
         {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
     ],
+    "zam": [
+        {"layoutId": "es-Americas", "app": ["apps", "keyboard"]},
+        {"layoutId": "es", "app": ["apps", "keyboard"]}
+    ],
     "zh-CN": [
         {"layoutId": "zh-Hans-Pinyin", "app": ["apps", "keyboard"]},
         {"layoutId": "en", "app": ["apps", "keyboard"]}

diff --git a/locales/languages_all.json b/locales/languages_all.json
@@ -1,5 +1,6 @@
 {
   "af"        : "Afrikaans",
+  "am"        : "አማርኛ",
   "ar"        : "عربي",
   "as"        : "অসমীয়া",
   "ast"       : "Asturianu",
@@ -14,6 +15,7 @@
   "cy"        : "Cymraeg",
   "da"        : "Dansk",
   "de"        : "Deutsch",
+  "dsb"       : "Dolnoserbšćina",
   "ee"        : "Èʋe",
   "el"        : "Ελληνικά",
   "en-GB"     : "English (GB)",
@@ -34,6 +36,7 @@
   "he"        : "עברית",
   "hi-IN"     : "हिन्दी (भारत)",
   "hr"        : "Hrvatski",
+  "hsb"       : "Hornjoserbšćina",
   "ht"        : "Kreyòl ayisyen",
   "hu"        : "Magyar",
   "hy-AM"     : "Հայերեն",
@@ -86,6 +89,7 @@
   "wo"        : "Wolof",
   "xh"        : "isiXhosa",
   "yo"        : "èdè Yorùbá",
+  "zam"       : "Zapoteco de Miahuatlán",
   "zh-CN"     : "中文 (简体)",
   "zh-TW"     : "正體中文 (繁體)",
   "zu"        : "isiZulu"