From 061fc804c3a9f731f323c545bf76f7f8de4dcb22 Mon Sep 17 00:00:00 2001 From: Martin Zagora Date: Tue, 22 Apr 2014 13:30:46 +1000 Subject: [PATCH] fix as suggested in #7333 --- src/nls/{en-uk => en-gb}/strings.js | 0 src/nls/root/strings-app.js | 4 ++-- src/nls/strings.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/nls/{en-uk => en-gb}/strings.js (100%) diff --git a/src/nls/en-uk/strings.js b/src/nls/en-gb/strings.js similarity index 100% rename from src/nls/en-uk/strings.js rename to src/nls/en-gb/strings.js diff --git a/src/nls/root/strings-app.js b/src/nls/root/strings-app.js index d4fcf7bf2bd..a8fa59892dd 100644 --- 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 index 9cf6af44a07..aacb0a87d0c 100644 --- 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,