Merge pull request #7599 from adobe/fix-7333

fix as suggested in #7333
adobe · Apr 23, 2014 · 7e0d04d · 7e0d04d
2 parents 180e4cc + 061fc80
commit 7e0d04d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/nls/en-uk/strings.js → src/nls/en-gb/strings.js b/src/nls/en-uk/strings.js → src/nls/en-gb/strings.js
diff --git a/src/nls/root/strings-app.js b/src/nls/root/strings-app.js
@@ -32,8 +32,8 @@ define({
     "LOCALE_CS"                                 : "Česky",
     "LOCALE_DE"                                 : "Deutsch",
     "LOCALE_EL"                                 : "Ελληνικά",
-    "LOCALE_EN"                                 : "English",
-    "LOCALE_EN_UK"                              : "English (UK)",
+    "LOCALE_EN"                                 : "English (US)",
+    "LOCALE_EN_GB"                              : "English (UK)",
     "LOCALE_ES"                                 : "Español",
     "LOCALE_FI"                                 : "suomi",
     "LOCALE_FR"                                 : "Français",

diff --git a/src/nls/strings.js b/src/nls/strings.js
@@ -40,7 +40,7 @@ define(function (require, exports, module) {
         "cs": true,
         "de": true,
         "el": true,
-        "en-uk": true,
+        "en-gb": true,
         "es": true,
         "fa-ir": true,
         "fi": true,