From ba4510d77546069c9f2a07a0be7e66fb9b745e22 Mon Sep 17 00:00:00 2001
From: Jonathan Diehl <jonathan.diehl@gmail.com>
Date: Fri, 20 Jul 2012 09:54:24 +0200
Subject: [PATCH 1/8] added German localization and language switching

---
 src/command/Commands.js           |   1 +
 src/command/Menus.js              |   2 +
 src/debug/DebugCommandHandlers.js |  87 ++++++++++++++-
 src/strings.js                    | 161 +++++-----------------------
 src/strings/de-DE.js              | 168 +++++++++++++++++++++++++++++
 src/strings/en-US.js              | 169 ++++++++++++++++++++++++++++++
 6 files changed, 454 insertions(+), 134 deletions(-)
 create mode 100644 src/strings/de-DE.js
 create mode 100644 src/strings/en-US.js

diff --git a/src/command/Commands.js b/src/command/Commands.js
index 57c907ea2d2..64c4cd4af8c 100644
--- a/src/command/Commands.js
+++ b/src/command/Commands.js
@@ -85,6 +85,7 @@ define(function (require, exports, module) {
     exports.DEBUG_RUN_UNIT_TESTS        = "debug.runUnitTests";
     exports.DEBUG_SHOW_PERF_DATA        = "debug.showPerfData";
     exports.DEBUG_NEW_BRACKETS_WINDOW   = "debug.newBracketsWindow";
+    exports.DEBUG_SWITCH_LANGUAGE       = "debug.switchLanguage";
 
 	// Command that does nothing. Can be used for place holder menuItems
     
diff --git a/src/command/Menus.js b/src/command/Menus.js
index 6b5b3371937..fea536ec3ea 100644
--- a/src/command/Menus.js
+++ b/src/command/Menus.js
@@ -829,6 +829,8 @@ define(function (require, exports, module) {
                                                          {key: "Cmd-R", platform:  "mac"}]);
         menu.addMenuItem(Commands.DEBUG_NEW_BRACKETS_WINDOW);
         menu.addMenuDivider();
+        menu.addMenuItem(Commands.DEBUG_SWITCH_LANGUAGE);
+        menu.addMenuDivider();
         menu.addMenuItem(Commands.DEBUG_RUN_UNIT_TESTS);
         menu.addMenuItem(Commands.DEBUG_SHOW_PERF_DATA);
 
diff --git a/src/debug/DebugCommandHandlers.js b/src/debug/DebugCommandHandlers.js
index 15c84b88356..8b68bd514ce 100644
--- a/src/debug/DebugCommandHandlers.js
+++ b/src/debug/DebugCommandHandlers.js
@@ -33,7 +33,9 @@ define(function (require, exports, module) {
         Editor                  = require("editor/Editor").Editor,
         Strings                 = require("strings"),
         PerfUtils               = require("utils/PerfUtils"),
-        NativeApp               = require("utils/NativeApp");
+        NativeApp               = require("utils/NativeApp"),
+        NativeFileSystem        = require("file/NativeFileSystem").NativeFileSystem,
+        FileUtils               = require("file/FileUtils");
     
     function handleShowDeveloperTools(commandData) {
         brackets.app.showDeveloperTools();
@@ -130,6 +132,87 @@ define(function (require, exports, module) {
     function _handleNewBracketsWindow() {
         window.open(window.location.href);
     }
+
+    function _handleSwitchLanguage() {
+        var stringsPath = FileUtils.getNativeBracketsDirectoryPath() + "/strings";
+        NativeFileSystem.requestNativeFileSystem(stringsPath, function (dirEntry) {
+            dirEntry.createReader().readEntries(function (entries) {
+
+                var $activeLanguage;
+                var $submit;
+                function setLanguage(event) {
+                    if ($activeLanguage) {
+                        $activeLanguage.css("font-weight", "normal");
+                    }
+                    $activeLanguage = $(event.currentTarget);
+                    $activeLanguage.css("font-weight", "bold");
+                    $submit.attr("disabled", false);
+                }
+
+                var $modal = $("<div class='modal hide' />");
+
+                var $header = $("<div class='modal-header' />")
+                    .append("<a href='#' class='close'>&times;</a>")
+                    .append("<h1 class='dialog-title'>" + Strings.LANGUAGE_TITLE + "</h1>")
+                    .appendTo($modal);
+                
+                var $body = $("<div class='modal-body' style='max-height: 500px; overflow: auto;' />")
+                    .appendTo($modal);
+
+                var $p = $("<p class='dialog-message'>")
+                    .text(Strings.LANGUAGE_MESSAGE)
+                    .appendTo($body);
+
+                var $ul = $("<ul>")
+                    .appendTo($p);
+
+                // inspect all children of dirEntry
+                entries.forEach(function (entry) {
+                    if (entry.isFile && entry.name.match(/^[a-z]{2}-[A-Z]{2}\.js$/)) {
+                        var language = entry.name.substr(0, entry.name.length - 3);
+                        var $li = $("<li>")
+                            .text(entry.name)
+                            .data("language", language)
+                            .on("click", setLanguage)
+                            .appendTo($ul);
+                    }
+                });
+
+                var $footer = $("<div class='modal-footer' />")
+                    .appendTo($modal);
+
+                var $cancel = $("<button class='dialog-button btn left'>")
+                    .on("click", function () {
+                        $modal.modal('hide');
+                    })
+                    .text(Strings.LANGUAGE_CANCEL)
+                    .appendTo($footer);
+
+                $submit = $("<button class='dialog-button btn primary'>")
+                    .text(Strings.LANGUAGE_SUBMIT)
+                    .on("click", function () {
+                        if (!$activeLanguage) {
+                            return;
+                        }
+                        var language = $activeLanguage.data("language");
+                        window.localStorage.setItem("language", language);
+                        CommandManager.execute(Commands.DEBUG_REFRESH_WINDOW);
+                    })
+                    .attr("disabled", "disabled")
+                    .appendTo($footer);
+
+                $modal
+                    .appendTo(window.document.body)
+                    .modal({
+                        backdrop: "static",
+                        show: true
+                    })
+                    .on("hidden", function () {
+                        $(this).remove();
+                    });
+            });
+        });
+    }
     
     
     // Register all the command handlers
@@ -138,6 +221,8 @@ define(function (require, exports, module) {
     CommandManager.register(Strings.CMD_SHOW_PERF_DATA, Commands.DEBUG_SHOW_PERF_DATA,      _handleShowPerfData);
     CommandManager.register(Strings.CMD_NEW_BRACKETS_WINDOW,
                                                         Commands.DEBUG_NEW_BRACKETS_WINDOW, _handleNewBracketsWindow);
+    CommandManager.register(Strings.CMD_SWITCH_LANGUAGE,
+                                                        Commands.DEBUG_SWITCH_LANGUAGE, _handleSwitchLanguage);
     
     CommandManager.register(Strings.CMD_USE_TAB_CHARS,  Commands.TOGGLE_USE_TAB_CHARS,      _handleUseTabChars)
         .setChecked(Editor.getUseTabChar());
diff --git a/src/strings.js b/src/strings.js
index 90798dd339a..bbc79d8dcdf 100644
--- a/src/strings.js
+++ b/src/strings.js
@@ -22,141 +22,36 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define */
+/*global $, window, define */
 
 define(function (require, exports, module) {
-    
     'use strict';
-        
-    // General file io error strings
-    exports.GENERIC_ERROR                     = "(error {0})";
-    exports.NOT_FOUND_ERR                     = "The file could not be found.";
-    exports.NOT_READABLE_ERR                  = "The file could not be read.";
-    exports.NO_MODIFICATION_ALLOWED_ERR       = "The target directory cannot be modified.";
-    exports.NO_MODIFICATION_ALLOWED_ERR_FILE  = "The permissions do not allow you to make modifications.";
 
-    // Project error strings
-    exports.ERROR_LOADING_PROJECT             = "Error loading project";
-    exports.OPEN_DIALOG_ERROR                 = "An error occurred when showing the open file dialog. (error {0})";
-    exports.REQUEST_NATIVE_FILE_SYSTEM_ERROR  = "An error occurred when trying to load the directory <span class='dialog-filename'>{0}</span>. (error {1})";
-    exports.READ_DIRECTORY_ENTRIES_ERROR      = "An error occurred when reading the contents of the directory <span class='dialog-filename'>{0}</span>. (error {1})";
-
-    // File open/save error string
-    exports.ERROR_OPENING_FILE_TITLE          = "Error opening file";
-    exports.ERROR_OPENING_FILE                = "An error occurred when trying to open the file <span class='dialog-filename'>{0}</span>. {1}";
-    exports.ERROR_RELOADING_FILE_TITLE        = "Error reloading changes from disk";
-    exports.ERROR_RELOADING_FILE              = "An error occurred when trying to reload the file <span class='dialog-filename'>{0}</span>. {1}";
-    exports.ERROR_SAVING_FILE_TITLE           = "Error saving file";
-    exports.ERROR_SAVING_FILE                 = "An error occurred when trying to save the file <span class='dialog-filename'>{0}</span>. {1}";
-    exports.INVALID_FILENAME_TITLE            = "Invalid file name";
-    exports.INVALID_FILENAME_MESSAGE          = "Filenames cannot contain the following characters: /?*:;{}<>\\|";
-    exports.FILE_ALREADY_EXISTS               = "The file <span class='dialog-filename'>{0}</span> already exists.";
-    exports.ERROR_CREATING_FILE_TITLE         = "Error creating file";
-    exports.ERROR_CREATING_FILE               = "An error occurred when trying to create the file <span class='dialog-filename'>{0}</span>. {1}";
-
-    // Application error strings
-    exports.ERROR_BRACKETS_IN_BROWSER_TITLE   = "Oops! Brackets doesn't run in browsers yet.";
-    exports.ERROR_BRACKETS_IN_BROWSER         = "Brackets is built in HTML, but right now it runs as a desktop app so you can use it to edit local files. Please use the application shell in the <b>github.com/adobe/brackets-app</b> repo to run Brackets.";
-
-    // FileIndexManager error string
-    exports.ERROR_MAX_FILES_TITLE             = "Error Indexing Files";
-    exports.ERROR_MAX_FILES                   = "The maximum number of files have been indexed. Actions that look up files in the index may function incorrectly.";
-    
-    // CSSManager error strings
-    exports.ERROR_PARSE_TITLE                 = "Error parsing CSS file(s):";
-
-    // Live Development error strings
-    exports.ERROR_LAUNCHING_BROWSER_TITLE     = "Error launching browser";
-    exports.ERROR_CANT_FIND_CHROME            = "The Google Chrome browser could not be found. Please make sure it is installed.";
-    exports.ERROR_LAUNCHING_BROWSER           = "An error occurred when launching the browser. (error {0})";
-    
-    exports.LIVE_DEVELOPMENT_ERROR_TITLE      = "Live Development Error";
-    exports.LIVE_DEVELOPMENT_ERROR_MESSAGE    = "A live development connection to Chrome could not be established. "
-                                                + "For live development to work, Chrome needs to be started with remote debugging enabled."
-                                                + "<br><br>Would you like to relaunch Chrome and enable remote debugging?";
-    exports.LIVE_DEV_NEED_HTML_MESSAGE        = "Open an HTML file in order to launch live preview.";
-    
-    exports.LIVE_DEV_STATUS_TIP_NOT_CONNECTED = "Live File Preview";
-    exports.LIVE_DEV_STATUS_TIP_PROGRESS1     = "Live File Preview: Connecting...";
-    exports.LIVE_DEV_STATUS_TIP_PROGRESS2     = "Live File Preview: Initializing...";
-    exports.LIVE_DEV_STATUS_TIP_CONNECTED     = "Disconnect Live File Preview";
-    
-    exports.SAVE_CLOSE_TITLE                  = "Save Changes";
-    exports.SAVE_CLOSE_MESSAGE                = "Do you want to save the changes you made in the document <span class='dialog-filename'>{0}</span>?";
-    exports.SAVE_CLOSE_MULTI_MESSAGE          = "Do you want to save your changes to the following files?";
-    exports.EXT_MODIFIED_TITLE                = "External Changes";
-    exports.EXT_MODIFIED_MESSAGE              = "<span class='dialog-filename'>{0}</span> has been modified on disk, but also has unsaved changes in Brackets."
-                                                + "<br><br>"
-                                                + "Which version do you want to keep?";
-    exports.EXT_DELETED_MESSAGE               = "<span class='dialog-filename'>{0}</span> has been deleted on disk, but has unsaved changes in Brackets."
-                                                + "<br><br>"
-                                                + "Do you want to keep your changes?";
-    
-    exports.OPEN_FILE                         = "Open File";
-
-
-
-    /**
-     * Command Name Constants
-     */
-
-    // File menu commands
-    exports.FILE_MENU                           = "File";
-    exports.CMD_FILE_NEW                        = "New";
-    exports.CMD_FILE_OPEN                       = "Open\u2026";
-    exports.CMD_ADD_TO_WORKING_SET              = "Add To Working Set";
-    exports.CMD_OPEN_FOLDER                     = "Open Folder\u2026";
-    exports.CMD_FILE_CLOSE                      = "Close";
-    exports.CMD_FILE_CLOSE_ALL                  = "Close All";
-    exports.CMD_FILE_SAVE                       = "Save";
-    exports.CMD_LIVE_FILE_PREVIEW               = "Live File Preview";
-    exports.CMD_QUIT                            = "Quit";
-
-    // Edit menu commands
-    exports.EDIT_MENU                           = "Edit";
-    exports.CMD_SELECT_ALL                      = "Select All";
-    exports.CMD_FIND                            = "Find";
-    exports.CMD_FIND_IN_FILES                   = "Find in Files";
-    exports.CMD_FIND_NEXT                       = "Find Next";
-    exports.CMD_FIND_PREVIOUS                   = "Find Previous";
-    exports.CMD_REPLACE                         = "Replace";
-    exports.CMD_INDENT                          = "Indent";
-    exports.CMD_UNINDENT                        = "Unindent";
-    exports.CMD_DUPLICATE                       = "Duplicate";
-    exports.CMD_COMMENT                         = "Comment/Uncomment Lines";
-     
-    // View menu commands
-    exports.VIEW_MENU                           = "View";
-    exports.CMD_HIDE_SIDEBAR                    = "Hide Sidebar";
-    exports.CMD_SHOW_SIDEBAR                    = "Show Sidebar";
-    exports.CMD_INCREASE_FONT_SIZE              = "Increase Font Size";
-    exports.CMD_DECREASE_FONT_SIZE              = "Decrease Font Size";
-    exports.CMD_RESTORE_FONT_SIZE               = "Restore Font Size";
-
-    // Navigate menu Commands
-    exports.NAVIGATE_MENU                       = "Navigate";
-    exports.CMD_QUICK_OPEN                      = "Quick Open";
-    exports.CMD_GOTO_LINE                       = "Go to Line";
-    exports.CMD_GOTO_DEFINITION                 = "Go to Definition";
-    exports.CMD_TOGGLE_QUICK_EDIT               = "Quick Edit";
-    exports.CMD_QUICK_EDIT_PREV_MATCH           = "Previous Match";
-    exports.CMD_QUICK_EDIT_NEXT_MATCH           = "Next Match";
-    exports.CMD_NEXT_DOC                        = "Next Document";
-    exports.CMD_PREV_DOC                        = "Previous Document";
-    
-    // Debug menu commands
-    exports.DEBUG_MENU                          = "Debug";
-    exports.CMD_REFRESH_WINDOW                  = "Reload Brackets";
-    exports.CMD_SHOW_DEV_TOOLS                  = "Show Developer Tools";
-    exports.CMD_RUN_UNIT_TESTS                  = "Run Tests";
-    exports.CMD_JSLINT                          = "Enable JSLint";
-    exports.CMD_SHOW_PERF_DATA                  = "Show Performance Data";
-    exports.CMD_NEW_BRACKETS_WINDOW             = "New Brackets Window";
-    exports.CMD_USE_TAB_CHARS                   = "Use Tab Characters";
-
-    // Help menu commands
-    exports.CMD_ABOUT                           = "About";
-
-    // Special commands invoked by the native shell
-    exports.CMD_CLOSE_WINDOW                    = "Close Window";
+    // load the active language from the local storage
+    var _language = window.localStorage.language;
+    if (_language === undefined) {
+        // default language: english
+        _language = "en-US";
+    }
+
+    // load the active language strings file
+    function _load() {
+        var r = $.Deferred();
+        require(["strings/" + _language], function (strings) {
+            var i;
+            for (i in strings) {
+                if (strings.hasOwnProperty(i)) {
+                    exports[i] = strings[i];
+                }
+            }
+            r.resolve(exports);
+        });
+        return r.promise();
+    }
+
+    // load the default language immediately
+    _load();
+
+    // public methods
+    exports.set = set;
 });
diff --git a/src/strings/de-DE.js b/src/strings/de-DE.js
new file mode 100644
index 00000000000..8ab7b66aee5
--- /dev/null
+++ b/src/strings/de-DE.js
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
+ *  
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"), 
+ * to deal in the Software without restriction, including without limitation 
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ * and/or sell copies of the Software, and to permit persons to whom the 
+ * Software is furnished to do so, subject to the following conditions:
+ *  
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
+
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global define */
+
+define(function (require, exports, module) {
+    
+    'use strict';
+        
+    // General file io error strings
+    exports.GENERIC_ERROR                     = "(Fehler {0})";
+    exports.NOT_FOUND_ERR                     = "Datei konnte nicht gefunden werden.";
+    exports.NOT_READABLE_ERR                  = "Datei konnte nicht gelesen werden.";
+    exports.NO_MODIFICATION_ALLOWED_ERR       = "Das Zielverzeichnis kann nicht verändert werden.";
+    exports.NO_MODIFICATION_ALLOWED_ERR_FILE  = "Keine Rechte zur Veränderung.";
+
+    // Project error strings
+    exports.ERROR_LOADING_PROJECT             = "Fehler beim Laden des Projekts";
+    exports.OPEN_DIALOG_ERROR                 = "Fehler beim Erstellen des Öffnen Dialogs. (Fehler {0})";
+    exports.REQUEST_NATIVE_FILE_SYSTEM_ERROR  = "Fehler beim Lesen des Verzeichnisses <span class='dialog-filename'>{0}</span>. (Fehler {1})";
+    exports.READ_DIRECTORY_ENTRIES_ERROR      = "Fehler beim Lesen der Verzeichnisinhalte von <span class='dialog-filename'>{0}</span>. (Fehler {1})";
+
+    // File open/save error string
+    exports.ERROR_OPENING_FILE_TITLE          = "Fehler beim Öffnen der Datei";
+    exports.ERROR_OPENING_FILE                = "Beim Öffnen der Datei <span class='dialog-filename'>{0}</span> ist ein Fehler aufgetreten: {1}";
+    exports.ERROR_RELOADING_FILE_TITLE        = "Fehler beim Laden der Änderungen";
+    exports.ERROR_RELOADING_FILE              = "Beim Laden der Änderungen der Datei <span class='dialog-filename'>{0}</span> ist ein Fehler aufgetreten: {1}";
+    exports.ERROR_SAVING_FILE_TITLE           = "Fehler beim Speichern der Datei";
+    exports.ERROR_SAVING_FILE                 = "Beim Speichern der Datei <span class='dialog-filename'>{0}</span> ist ein Fehler aufgetreten: {1}";
+    exports.INVALID_FILENAME_TITLE            = "Ungültiger Dateiname";
+    exports.INVALID_FILENAME_MESSAGE          = "Dateinamen dürfen folgenden Zeichen nicht enthalten: /?*:;{}<>\\|";
+    exports.FILE_ALREADY_EXISTS               = "Die Datei <span class='dialog-filename'>{0}</span> existiert bereits.";
+    exports.ERROR_CREATING_FILE_TITLE         = "Fehler beim Erstellen der Datei";
+    exports.ERROR_CREATING_FILE               = "Beim Erstellen der Datei <span class='dialog-filename'>{0}</span> ist ein Fehler aufgetreten: {1}";
+
+    // Application error strings
+    exports.ERROR_BRACKETS_IN_BROWSER_TITLE   = "Ups! Brackets läuft derzeit leider nocht nicht im Browser.";
+    exports.ERROR_BRACKETS_IN_BROWSER         = "Brackets wurde in HTML programmiert aber derzeite läuft es nur als Desktop Anwendung um damit lokale Dateien zu bearbeiten. Bitte benutzen Sie die Anwendung von <b>github.com/adobe/brackets-app</b>.";
+
+    // FileIndexManager error string
+    exports.ERROR_MAX_FILES_TITLE             = "Fehler beim Indizieren der Dateien";
+    exports.ERROR_MAX_FILES                   = "Die maximal mögliche Anzahl inidizierbarer Datein wurde überschritten. Funktionen die auf dem Index beruhen werden möglicherweise nicht korrekt funktionieren.";
+    
+    // CSSManager error strings
+    exports.ERROR_PARSE_TITLE                 = "Fehler beim interpretieren der CSS Datei(en):";
+
+    // Live Development error strings
+    exports.ERROR_LAUNCHING_BROWSER_TITLE     = "Fehler beim Starten des Webbrowsers";
+    exports.ERROR_CANT_FIND_CHROME            = "Google Chrome konnte nicht gefunden werden. Bitte laden Sie den Browser unter <b>google.de/chrome</b>.";
+    exports.ERROR_LAUNCHING_BROWSER           = "Beim Starten des Webbrowsers ist ein Fehler aufgetreten: (Fehler {0})";
+    
+    exports.LIVE_DEVELOPMENT_ERROR_TITLE      = "Fehler bei der Live Entwicklung";
+    exports.LIVE_DEVELOPMENT_ERROR_MESSAGE    = "Beim Aufbauen einer Live Verbindung zu Chrome ist ein Fehler aufgetreten. "
+                                                + "Für die Live Entwicklung muss das Remote Debugger Protokoll von Chrome aktiviert sein."
+                                                + "<br><br>Soll Chrome neu gestartet werden um das Remote Debugger Protokoll zu aktivieren?";
+    exports.LIVE_DEV_NEED_HTML_MESSAGE        = "Öffnen Sie erst eine HTML Datei und aktivieren Sie dann die Live Verbindung.";
+    
+    exports.LIVE_DEV_STATUS_TIP_NOT_CONNECTED = "Live Entwicklung";
+    exports.LIVE_DEV_STATUS_TIP_PROGRESS1     = "Live Entwicklung: Verbinden...";
+    exports.LIVE_DEV_STATUS_TIP_PROGRESS2     = "Live Entwicklung: Initialisieren...";
+    exports.LIVE_DEV_STATUS_TIP_CONNECTED     = "Trennen der Live Verbindung";
+    
+    exports.SAVE_CLOSE_TITLE                  = "Ungespeicherte Änderungen";
+    exports.SAVE_CLOSE_MESSAGE                = "Wollen Sie die Änderungen in dem Dokument <span class='dialog-filename'>{0}</span> speichern?";
+    exports.SAVE_CLOSE_MULTI_MESSAGE          = "Wollen Sie die Änderungen in den folgenden Dateien speichern?";
+    exports.EXT_MODIFIED_TITLE                = "Externe Änderungen";
+    exports.EXT_MODIFIED_MESSAGE              = "<span class='dialog-filename'>{0}</span> wurde extern geändert und hat ungespeicherte Änderungen in Brackets."
+                                                + "<br><br>"
+                                                + "Welche Version wollen Sie erhalten?";
+    exports.EXT_DELETED_MESSAGE               = "<span class='dialog-filename'>{0}</span> wurde extern gelöscht und hat ungespeicherte Änderungen in Brackets."
+                                                + "<br><br>"
+                                                + "Wollen Sie die Änderungen erhalten?";
+    
+    exports.OPEN_FILE                         = "Datei Öffnen";
+
+    // Switch language
+    exports.LANGUAGE_TITLE                    = "Sprache Wechseln";
+    exports.LANGUAGE_MESSAGE                  = "Bitte wählen Sie die gewünschte Sprache aus der folgenden Liste aus:";
+    exports.LANGUAGE_SUBMIT                   = "Brackets neu starten";
+    exports.LANGUAGE_CANCEL                   = "Abbrechen";
+
+
+    /**
+     * Command Name Constants
+     */
+
+    // File menu commands
+    exports.FILE_MENU                           = "Datei";
+    exports.CMD_FILE_NEW                        = "Neu";
+    exports.CMD_FILE_OPEN                       = "Öffnen\u2026";
+    exports.CMD_ADD_TO_WORKING_SET              = "Zum Projekt hinzufügen";
+    exports.CMD_OPEN_FOLDER                     = "Ordner öffnen\u2026";
+    exports.CMD_FILE_CLOSE                      = "Schließen";
+    exports.CMD_FILE_CLOSE_ALL                  = "Alles schlieen";
+    exports.CMD_FILE_SAVE                       = "Speichern";
+    exports.CMD_LIVE_FILE_PREVIEW               = "Live Entwicklung";
+    exports.CMD_QUIT                            = "Beenden";
+
+    // Edit menu commands
+    exports.EDIT_MENU                           = "Bearbeiten";
+    exports.CMD_SELECT_ALL                      = "Alles auswählen";
+    exports.CMD_FIND                            = "Suchen";
+    exports.CMD_FIND_IN_FILES                   = "Im Projekt suchen";
+    exports.CMD_FIND_NEXT                       = "Weitersuchen (vorwärts)";
+    exports.CMD_FIND_PREVIOUS                   = "Weitersuchen (rückwärts)";
+    exports.CMD_REPLACE                         = "Ersetzen";
+    exports.CMD_INDENT                          = "Einrücken";
+    exports.CMD_UNINDENT                        = "Ausrücken";
+    exports.CMD_DUPLICATE                       = "Duplizieren";
+    exports.CMD_COMMENT                         = "Zeilen (aus-)kommentieren";
+     
+    // View menu commands
+    exports.VIEW_MENU                           = "Ansicht";
+    exports.CMD_HIDE_SIDEBAR                    = "Seitenleiste verbergen";
+    exports.CMD_SHOW_SIDEBAR                    = "Seitenleiste zeigen";
+    exports.CMD_INCREASE_FONT_SIZE              = "Schriftart vergrößern";
+    exports.CMD_DECREASE_FONT_SIZE              = "Schriftart verkleinern";
+    exports.CMD_RESTORE_FONT_SIZE               = "Schriftart zurücksetzen";
+
+    // Navigate menu Commands
+    exports.NAVIGATE_MENU                       = "Navigation";
+    exports.CMD_QUICK_OPEN                      = "Schnell Öffnen";
+    exports.CMD_GOTO_LINE                       = "Gehe zu Zeile";
+    exports.CMD_GOTO_DEFINITION                 = "Gehe zu Definition";
+    exports.CMD_TOGGLE_QUICK_EDIT               = "Schnell Bearbeiten";
+    exports.CMD_QUICK_EDIT_PREV_MATCH           = "Voriger Treffer";
+    exports.CMD_QUICK_EDIT_NEXT_MATCH           = "Nächster Treffer";
+    exports.CMD_NEXT_DOC                        = "Nächstes Dokument";
+    exports.CMD_PREV_DOC                        = "Voriges Dokument";
+    
+    // Debug menu commands
+    exports.DEBUG_MENU                          = "Debug";
+    exports.CMD_REFRESH_WINDOW                  = "Brackets neu laden";
+    exports.CMD_SHOW_DEV_TOOLS                  = "Entwicklungswerkzeuge zeigen";
+    exports.CMD_RUN_UNIT_TESTS                  = "Tests durchführen";
+    exports.CMD_JSLINT                          = "JSLint aktivieren";
+    exports.CMD_SHOW_PERF_DATA                  = "Performance Analyse";
+    exports.CMD_NEW_BRACKETS_WINDOW             = "Neues Brackets Fenster";
+    exports.CMD_USE_TAB_CHARS                   = "Mit Tabs einrücken";
+    exports.CMD_SWITCH_LANGUAGE                 = "Sprache wechseln";
+
+    // Help menu commands
+    exports.CMD_ABOUT                           = "Über";
+
+    // Special commands invoked by the native shell
+    exports.CMD_CLOSE_WINDOW                    = "Fenster schließen";
+});
diff --git a/src/strings/en-US.js b/src/strings/en-US.js
new file mode 100644
index 00000000000..f03144b491a
--- /dev/null
+++ b/src/strings/en-US.js
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
+ *  
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"), 
+ * to deal in the Software without restriction, including without limitation 
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ * and/or sell copies of the Software, and to permit persons to whom the 
+ * Software is furnished to do so, subject to the following conditions:
+ *  
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
+
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global define */
+
+define(function (require, exports, module) {
+    
+    'use strict';
+        
+    // General file io error strings
+    exports.GENERIC_ERROR                     = "(error {0})";
+    exports.NOT_FOUND_ERR                     = "The file could not be found.";
+    exports.NOT_READABLE_ERR                  = "The file could not be read.";
+    exports.NO_MODIFICATION_ALLOWED_ERR       = "The target directory cannot be modified.";
+    exports.NO_MODIFICATION_ALLOWED_ERR_FILE  = "The permissions do not allow you to make modifications.";
+
+    // Project error strings
+    exports.ERROR_LOADING_PROJECT             = "Error loading project";
+    exports.OPEN_DIALOG_ERROR                 = "An error occurred when showing the open file dialog. (error {0})";
+    exports.REQUEST_NATIVE_FILE_SYSTEM_ERROR  = "An error occurred when trying to load the directory <span class='dialog-filename'>{0}</span>. (error {1})";
+    exports.READ_DIRECTORY_ENTRIES_ERROR      = "An error occurred when reading the contents of the directory <span class='dialog-filename'>{0}</span>. (error {1})";
+
+    // File open/save error string
+    exports.ERROR_OPENING_FILE_TITLE          = "Error opening file";
+    exports.ERROR_OPENING_FILE                = "An error occurred when trying to open the file <span class='dialog-filename'>{0}</span>. {1}";
+    exports.ERROR_RELOADING_FILE_TITLE        = "Error reloading changes from disk";
+    exports.ERROR_RELOADING_FILE              = "An error occurred when trying to reload the file <span class='dialog-filename'>{0}</span>. {1}";
+    exports.ERROR_SAVING_FILE_TITLE           = "Error saving file";
+    exports.ERROR_SAVING_FILE                 = "An error occurred when trying to save the file <span class='dialog-filename'>{0}</span>. {1}";
+    exports.INVALID_FILENAME_TITLE            = "Invalid file name";
+    exports.INVALID_FILENAME_MESSAGE          = "Filenames cannot contain the following characters: /?*:;{}<>\\|";
+    exports.FILE_ALREADY_EXISTS               = "The file <span class='dialog-filename'>{0}</span> already exists.";
+    exports.ERROR_CREATING_FILE_TITLE         = "Error creating file";
+    exports.ERROR_CREATING_FILE               = "An error occurred when trying to create the file <span class='dialog-filename'>{0}</span>. {1}";
+
+    // Application error strings
+    exports.ERROR_BRACKETS_IN_BROWSER_TITLE   = "Oops! Brackets doesn't run in browsers yet.";
+    exports.ERROR_BRACKETS_IN_BROWSER         = "Brackets is built in HTML, but right now it runs as a desktop app so you can use it to edit local files. Please use the application shell in the <b>github.com/adobe/brackets-app</b> repo to run Brackets.";
+
+    // FileIndexManager error string
+    exports.ERROR_MAX_FILES_TITLE             = "Error Indexing Files";
+    exports.ERROR_MAX_FILES                   = "The maximum number of files have been indexed. Actions that look up files in the index may function incorrectly.";
+    
+    // CSSManager error strings
+    exports.ERROR_PARSE_TITLE                 = "Error parsing CSS file(s):";
+
+    // Live Development error strings
+    exports.ERROR_LAUNCHING_BROWSER_TITLE     = "Error launching browser";
+    exports.ERROR_CANT_FIND_CHROME            = "The Google Chrome browser could not be found. Please make sure it is installed.";
+    exports.ERROR_LAUNCHING_BROWSER           = "An error occurred when launching the browser. (error {0})";
+    
+    exports.LIVE_DEVELOPMENT_ERROR_TITLE      = "Live Development Error";
+    exports.LIVE_DEVELOPMENT_ERROR_MESSAGE    = "A live development connection to Chrome could not be established. "
+                                                + "For live development to work, Chrome needs to be started with remote debugging enabled."
+                                                + "<br><br>Would you like to relaunch Chrome and enable remote debugging?";
+    exports.LIVE_DEV_NEED_HTML_MESSAGE        = "Open an HTML file in order to launch live preview.";
+    
+    exports.LIVE_DEV_STATUS_TIP_NOT_CONNECTED = "Live File Preview";
+    exports.LIVE_DEV_STATUS_TIP_PROGRESS1     = "Live File Preview: Connecting...";
+    exports.LIVE_DEV_STATUS_TIP_PROGRESS2     = "Live File Preview: Initializing...";
+    exports.LIVE_DEV_STATUS_TIP_CONNECTED     = "Disconnect Live File Preview";
+    
+    exports.SAVE_CLOSE_TITLE                  = "Save Changes";
+    exports.SAVE_CLOSE_MESSAGE                = "Do you want to save the changes you made in the document <span class='dialog-filename'>{0}</span>?";
+    exports.SAVE_CLOSE_MULTI_MESSAGE          = "Do you want to save your changes to the following files?";
+    exports.EXT_MODIFIED_TITLE                = "External Changes";
+    exports.EXT_MODIFIED_MESSAGE              = "<span class='dialog-filename'>{0}</span> has been modified on disk, but also has unsaved changes in Brackets."
+                                                + "<br><br>"
+                                                + "Which version do you want to keep?";
+    exports.EXT_DELETED_MESSAGE               = "<span class='dialog-filename'>{0}</span> has been deleted on disk, but has unsaved changes in Brackets."
+                                                + "<br><br>"
+                                                + "Do you want to keep your changes?";
+    
+    exports.OPEN_FILE                         = "Open File";
+
+    // Switch language
+    exports.LANGUAGE_TITLE                    = "Switch Language";
+    exports.LANGUAGE_MESSAGE                  = "Please select the desired language from the list below:";
+    exports.LANGUAGE_SUBMIT                   = "Reload Brackets";
+    exports.LANGUAGE_CANCEL                   = "Cancel";
+
+
+
+    /**
+     * Command Name Constants
+     */
+
+    // File menu commands
+    exports.FILE_MENU                           = "File";
+    exports.CMD_FILE_NEW                        = "New";
+    exports.CMD_FILE_OPEN                       = "Open\u2026";
+    exports.CMD_ADD_TO_WORKING_SET              = "Add To Working Set";
+    exports.CMD_OPEN_FOLDER                     = "Open Folder\u2026";
+    exports.CMD_FILE_CLOSE                      = "Close";
+    exports.CMD_FILE_CLOSE_ALL                  = "Close All";
+    exports.CMD_FILE_SAVE                       = "Save";
+    exports.CMD_LIVE_FILE_PREVIEW               = "Live File Preview";
+    exports.CMD_QUIT                            = "Quit";
+
+    // Edit menu commands
+    exports.EDIT_MENU                           = "Edit";
+    exports.CMD_SELECT_ALL                      = "Select All";
+    exports.CMD_FIND                            = "Find";
+    exports.CMD_FIND_IN_FILES                   = "Find in Files";
+    exports.CMD_FIND_NEXT                       = "Find Next";
+    exports.CMD_FIND_PREVIOUS                   = "Find Previous";
+    exports.CMD_REPLACE                         = "Replace";
+    exports.CMD_INDENT                          = "Indent";
+    exports.CMD_UNINDENT                        = "Unindent";
+    exports.CMD_DUPLICATE                       = "Duplicate";
+    exports.CMD_COMMENT                         = "Comment/Uncomment Lines";
+     
+    // View menu commands
+    exports.VIEW_MENU                           = "View";
+    exports.CMD_HIDE_SIDEBAR                    = "Hide Sidebar";
+    exports.CMD_SHOW_SIDEBAR                    = "Show Sidebar";
+    exports.CMD_INCREASE_FONT_SIZE              = "Increase Font Size";
+    exports.CMD_DECREASE_FONT_SIZE              = "Decrease Font Size";
+    exports.CMD_RESTORE_FONT_SIZE               = "Restore Font Size";
+
+    // Navigate menu Commands
+    exports.NAVIGATE_MENU                       = "Navigate";
+    exports.CMD_QUICK_OPEN                      = "Quick Open";
+    exports.CMD_GOTO_LINE                       = "Go to Line";
+    exports.CMD_GOTO_DEFINITION                 = "Go to Definition";
+    exports.CMD_TOGGLE_QUICK_EDIT               = "Quick Edit";
+    exports.CMD_QUICK_EDIT_PREV_MATCH           = "Previous Match";
+    exports.CMD_QUICK_EDIT_NEXT_MATCH           = "Next Match";
+    exports.CMD_NEXT_DOC                        = "Next Document";
+    exports.CMD_PREV_DOC                        = "Previous Document";
+    
+    // Debug menu commands
+    exports.DEBUG_MENU                          = "Debug";
+    exports.CMD_REFRESH_WINDOW                  = "Reload Brackets";
+    exports.CMD_SHOW_DEV_TOOLS                  = "Show Developer Tools";
+    exports.CMD_RUN_UNIT_TESTS                  = "Run Tests";
+    exports.CMD_JSLINT                          = "Enable JSLint";
+    exports.CMD_SHOW_PERF_DATA                  = "Show Performance Data";
+    exports.CMD_NEW_BRACKETS_WINDOW             = "New Brackets Window";
+    exports.CMD_USE_TAB_CHARS                   = "Use Tab Characters";
+    exports.CMD_SWITCH_LANGUAGE                 = "Switch Language";
+
+    // Help menu commands
+    exports.CMD_ABOUT                           = "About";
+
+    // Special commands invoked by the native shell
+    exports.CMD_CLOSE_WINDOW                    = "Close Window";
+});

From 6d53fcc595af1c40058bac90556dfcb5efcdffb8 Mon Sep 17 00:00:00 2001
From: Jonathan Diehl <jonathan.diehl@gmail.com>
Date: Fri, 20 Jul 2012 10:05:20 +0200
Subject: [PATCH 2/8] bugfix

---
 src/strings.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/strings.js b/src/strings.js
index bbc79d8dcdf..1863ef0a4b0 100644
--- a/src/strings.js
+++ b/src/strings.js
@@ -52,6 +52,4 @@ define(function (require, exports, module) {
     // load the default language immediately
     _load();
 
-    // public methods
-    exports.set = set;
 });

From 286edc367399fb269c0d0b0e7cae15cf17e75947 Mon Sep 17 00:00:00 2001
From: Jonathan Diehl <jonathan.diehl@gmail.com>
Date: Fri, 20 Jul 2012 10:09:58 +0200
Subject: [PATCH 3/8] Simplified strings.js

---
 src/strings.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/strings.js b/src/strings.js
index 1863ef0a4b0..3f69b13953a 100644
--- a/src/strings.js
+++ b/src/strings.js
@@ -27,26 +27,25 @@
 define(function (require, exports, module) {
     'use strict';
 
-    // load the active language from the local storage
-    var _language = window.localStorage.language;
-    if (_language === undefined) {
-        // default language: english
-        _language = "en-US";
-    }
-
     // load the active language strings file
     function _load() {
-        var r = $.Deferred();
-        require(["strings/" + _language], function (strings) {
+
+        // load the active language from the local storage
+        var language = window.localStorage.language;
+        if (language === undefined || language === null) {
+            // default language: english
+            language = "en-US";
+        }
+
+        // require the language strings file
+        require(["strings/" + language], function (strings) {
             var i;
             for (i in strings) {
                 if (strings.hasOwnProperty(i)) {
                     exports[i] = strings[i];
                 }
             }
-            r.resolve(exports);
         });
-        return r.promise();
     }
 
     // load the default language immediately

From 5fa1b50340760621589073a378d4602dbeacef41 Mon Sep 17 00:00:00 2001
From: Jonathan Diehl <jonathan.diehl@gmail.com>
Date: Thu, 26 Jul 2012 08:12:45 +0200
Subject: [PATCH 4/8] Enabled the remaining agents

---
 src/LiveDevelopment/LiveDevelopment.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js
index cc09f07a61a..df5dc59d736 100644
--- a/src/LiveDevelopment/LiveDevelopment.js
+++ b/src/LiveDevelopment/LiveDevelopment.js
@@ -74,13 +74,11 @@ define(function LiveDevelopment(require, exports, module) {
         "remote": require("LiveDevelopment/Agents/RemoteAgent"),
         "network": require("LiveDevelopment/Agents/NetworkAgent"),
         "dom": require("LiveDevelopment/Agents/DOMAgent"),
-        "css": require("LiveDevelopment/Agents/CSSAgent")
-        /* FUTURE 
+        "css": require("LiveDevelopment/Agents/CSSAgent"),
         "script": require("LiveDevelopment/Agents/ScriptAgent"),
         "highlight": require("LiveDevelopment/Agents/HighlightAgent"),
         "goto": require("LiveDevelopment/Agents/GotoAgent"),
         "edit": require("LiveDevelopment/Agents/EditAgent")
-        */
     };
 
     var _htmlDocumentPath; // the path of the html file open for live development

From d8f6d5542b6195e6937243b96bc28e6b9b29abd8 Mon Sep 17 00:00:00 2001
From: Jonathan Diehl <jonathan.diehl@gmail.com>
Date: Thu, 26 Jul 2012 19:59:02 +0200
Subject: [PATCH 5/8] Revert "Enabled the remaining agents"

This reverts commit 5fa1b50340760621589073a378d4602dbeacef41.
---
 src/LiveDevelopment/LiveDevelopment.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js
index df5dc59d736..cc09f07a61a 100644
--- a/src/LiveDevelopment/LiveDevelopment.js
+++ b/src/LiveDevelopment/LiveDevelopment.js
@@ -74,11 +74,13 @@ define(function LiveDevelopment(require, exports, module) {
         "remote": require("LiveDevelopment/Agents/RemoteAgent"),
         "network": require("LiveDevelopment/Agents/NetworkAgent"),
         "dom": require("LiveDevelopment/Agents/DOMAgent"),
-        "css": require("LiveDevelopment/Agents/CSSAgent"),
+        "css": require("LiveDevelopment/Agents/CSSAgent")
+        /* FUTURE 
         "script": require("LiveDevelopment/Agents/ScriptAgent"),
         "highlight": require("LiveDevelopment/Agents/HighlightAgent"),
         "goto": require("LiveDevelopment/Agents/GotoAgent"),
         "edit": require("LiveDevelopment/Agents/EditAgent")
+        */
     };
 
     var _htmlDocumentPath; // the path of the html file open for live development

From 7c7fa35e62f179328a691393ff3486af5a6f53bf Mon Sep 17 00:00:00 2001
From: Jonathan Diehl <jonathan.diehl@gmail.com>
Date: Tue, 31 Jul 2012 15:12:51 +0200
Subject: [PATCH 6/8] switched language switching to i18n

---
 src/brackets.js                               |   4 +-
 src/debug/DebugCommandHandlers.js             |  20 ++-
 .../de-DE.js => nls/de-DE/strings.js}         |   0
 src/{strings/en-US.js => nls/strings.js}      |   8 +-
 src/strings.js                                |  24 +--
 src/thirdparty/i18n.js                        | 161 ++++++++++++++++++
 6 files changed, 185 insertions(+), 32 deletions(-)
 rename src/{strings/de-DE.js => nls/de-DE/strings.js} (100%)
 rename src/{strings/en-US.js => nls/strings.js} (98%)
 create mode 100755 src/thirdparty/i18n.js

diff --git a/src/brackets.js b/src/brackets.js
index 547c26dde66..eb78dd6ba32 100644
--- a/src/brackets.js
+++ b/src/brackets.js
@@ -28,7 +28,9 @@
 require.config({
     paths: {
         "text" : "thirdparty/text"
-    }
+    },
+    // store the locale in localStorage until CEF sets the correct navigator.language
+    locale: window.localStorage.getItem("locale")
 });
 
 /**
diff --git a/src/debug/DebugCommandHandlers.js b/src/debug/DebugCommandHandlers.js
index 1985e43afa6..deb135b03ea 100644
--- a/src/debug/DebugCommandHandlers.js
+++ b/src/debug/DebugCommandHandlers.js
@@ -134,7 +134,7 @@ define(function (require, exports, module) {
     }
 
     function _handleSwitchLanguage() {
-        var stringsPath = FileUtils.getNativeBracketsDirectoryPath() + "/strings";
+        var stringsPath = FileUtils.getNativeBracketsDirectoryPath() + "/nls";
         NativeFileSystem.requestNativeFileSystem(stringsPath, function (dirEntry) {
             dirEntry.createReader().readEntries(function (entries) {
 
@@ -164,16 +164,22 @@ define(function (require, exports, module) {
                     .appendTo($body);
 
                 var $ul = $("<ul>")
+                    .on("click", "li", setLanguage)
                     .appendTo($p);
 
+                // add english
+                var $li = $("<li>")
+                    .text("en-EN")
+                    .data("locale", "en-EN")
+                    .appendTo($ul);
+
                 // inspect all children of dirEntry
                 entries.forEach(function (entry) {
-                    if (entry.isFile && entry.name.match(/^[a-z]{2}-[A-Z]{2}\.js$/)) {
-                        var language = entry.name.substr(0, entry.name.length - 3);
+                    if (entry.isDirectory && entry.name.match(/^[a-z]{2}-[A-Z]{2}$/)) {
+                        var language = entry.name;
                         var $li = $("<li>")
                             .text(entry.name)
-                            .data("language", language)
-                            .on("click", setLanguage)
+                            .data("locale", language)
                             .appendTo($ul);
                     }
                 });
@@ -194,8 +200,8 @@ define(function (require, exports, module) {
                         if (!$activeLanguage) {
                             return;
                         }
-                        var language = $activeLanguage.data("language");
-                        window.localStorage.setItem("language", language);
+                        var locale = $activeLanguage.data("locale");
+                        window.localStorage.setItem("locale", locale);
                         CommandManager.execute(Commands.DEBUG_REFRESH_WINDOW);
                     })
                     .attr("disabled", "disabled")
diff --git a/src/strings/de-DE.js b/src/nls/de-DE/strings.js
similarity index 100%
rename from src/strings/de-DE.js
rename to src/nls/de-DE/strings.js
diff --git a/src/strings/en-US.js b/src/nls/strings.js
similarity index 98%
rename from src/strings/en-US.js
rename to src/nls/strings.js
index c1d70995c98..38bac372785 100644
--- a/src/strings/en-US.js
+++ b/src/nls/strings.js
@@ -24,10 +24,16 @@
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
 /*global define */
 
-define(function (require, exports, module) {
+define(function (require, ignored, module) {
     
     'use strict';
         
+    var exports = {};
+    module.exports = {
+        root: exports,
+        "de-DE": true
+    };
+        
     // Project error strings
     exports.ERROR_LOADING_PROJECT             = "Error loading project";
     exports.OPEN_DIALOG_ERROR                 = "An error occurred when showing the open file dialog. (error {0})";
diff --git a/src/strings.js b/src/strings.js
index 3f69b13953a..4db2bb7840c 100644
--- a/src/strings.js
+++ b/src/strings.js
@@ -27,28 +27,6 @@
 define(function (require, exports, module) {
     'use strict';
 
-    // load the active language strings file
-    function _load() {
-
-        // load the active language from the local storage
-        var language = window.localStorage.language;
-        if (language === undefined || language === null) {
-            // default language: english
-            language = "en-US";
-        }
-
-        // require the language strings file
-        require(["strings/" + language], function (strings) {
-            var i;
-            for (i in strings) {
-                if (strings.hasOwnProperty(i)) {
-                    exports[i] = strings[i];
-                }
-            }
-        });
-    }
-
-    // load the default language immediately
-    _load();
+    module.exports = require("thirdparty/i18n!nls/strings");
 
 });
diff --git a/src/thirdparty/i18n.js b/src/thirdparty/i18n.js
new file mode 100755
index 00000000000..0a815cd9d5b
--- /dev/null
+++ b/src/thirdparty/i18n.js
@@ -0,0 +1,161 @@
+/**
+ * @license RequireJS i18n 1.0.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/requirejs for details
+ */
+/*jslint regexp: false, nomen: false, plusplus: false, strict: false */
+/*global require: false, navigator: false, define: false */
+
+/**
+ * This plugin handles i18n! prefixed modules. It does the following:
+ *
+ * 1) A regular module can have a dependency on an i18n bundle, but the regular
+ * module does not want to specify what locale to load. So it just specifies
+ * the top-level bundle, like "i18n!nls/colors".
+ *
+ * This plugin will load the i18n bundle at nls/colors, see that it is a root/master
+ * bundle since it does not have a locale in its name. It will then try to find
+ * the best match locale available in that master bundle, then request all the
+ * locale pieces for that best match locale. For instance, if the locale is "en-us",
+ * then the plugin will ask for the "en-us", "en" and "root" bundles to be loaded
+ * (but only if they are specified on the master bundle).
+ *
+ * Once all the bundles for the locale pieces load, then it mixes in all those
+ * locale pieces into each other, then finally sets the context.defined value
+ * for the nls/colors bundle to be that mixed in locale.
+ *
+ * 2) A regular module specifies a specific locale to load. For instance,
+ * i18n!nls/fr-fr/colors. In this case, the plugin needs to load the master bundle
+ * first, at nls/colors, then figure out what the best match locale is for fr-fr,
+ * since maybe only fr or just root is defined for that locale. Once that best
+ * fit is found, all of its locale pieces need to have their bundles loaded.
+ *
+ * Once all the bundles for the locale pieces load, then it mixes in all those
+ * locale pieces into each other, then finally sets the context.defined value
+ * for the nls/fr-fr/colors bundle to be that mixed in locale.
+ */
+(function () {
+    //regexp for reconstructing the master bundle name from parts of the regexp match
+    //nlsRegExp.exec("foo/bar/baz/nls/en-ca/foo") gives:
+    //["foo/bar/baz/nls/en-ca/foo", "foo/bar/baz/nls/", "/", "/", "en-ca", "foo"]
+    //nlsRegExp.exec("foo/bar/baz/nls/foo") gives:
+    //["foo/bar/baz/nls/foo", "foo/bar/baz/nls/", "/", "/", "foo", ""]
+    //so, if match[5] is blank, it means this is the top bundle definition.
+    var nlsRegExp = /(^.*(^|\/)nls(\/|$))([^\/]*)\/?([^\/]*)/,
+        empty = {};
+
+    //Helper function to avoid repeating code. Lots of arguments in the
+    //desire to stay functional and support RequireJS contexts without having
+    //to know about the RequireJS contexts.
+    function addPart(locale, master, needed, toLoad, prefix, suffix) {
+        if (master[locale]) {
+            needed.push(locale);
+            if (master[locale] === true || master[locale] === 1) {
+                toLoad.push(prefix + locale + '/' + suffix);
+            }
+        }
+    }
+
+    function addIfExists(req, locale, toLoad, prefix, suffix) {
+        var fullName = prefix + locale + '/' + suffix;
+        if (require._fileExists(req.toUrl(fullName))) {
+            toLoad.push(fullName);
+        }
+    }
+
+    /**
+     * Simple function to mix in properties from source into target,
+     * but only if target does not already have a property of the same name.
+     * This is not robust in IE for transferring methods that match
+     * Object.prototype names, but the uses of mixin here seem unlikely to
+     * trigger a problem related to that.
+     */
+    function mixin(target, source, force) {
+        for (var prop in source) {
+            if (!(prop in empty) && (!(prop in target) || force)) {
+                target[prop] = source[prop];
+            }
+        }
+    }
+
+    define({
+        version: '1.0.0',
+        /**
+         * Called when a dependency needs to be loaded.
+         */
+        load: function (name, req, onLoad, config) {
+            config = config || {};
+
+            var masterName,
+                match = nlsRegExp.exec(name),
+                prefix = match[1],
+                locale = match[4],
+                suffix = match[5],
+                parts = locale.split("-"),
+                toLoad = [],
+                value = {},
+                i, part, current = "";
+
+            //If match[5] is blank, it means this is the top bundle definition,
+            //so it does not have to be handled. Locale-specific requests
+            //will have a match[4] value but no match[5]
+            if (match[5]) {
+                //locale-specific bundle
+                prefix = match[1];
+                masterName = prefix + suffix;
+            } else {
+                //Top-level bundle.
+                masterName = name;
+                suffix = match[4];
+                locale = config.locale || (config.locale =
+                        typeof navigator === "undefined" ? "root" :
+                        (navigator.language ||
+                         navigator.userLanguage || "root").toLowerCase());
+                parts = locale.split("-");
+            }
+
+            if (config.isBuild) {
+                //Check for existence of all locale possible files and
+                //require them if exist.
+                toLoad.push(masterName);
+                addIfExists(req, "root", toLoad, prefix, suffix);
+                for (i = 0; (part = parts[i]); i++) {
+                    current += (current ? "-" : "") + part;
+                    addIfExists(req, current, toLoad, prefix, suffix);
+                }
+
+                req(toLoad, function () {
+                    onLoad();
+                });
+            } else {
+                //First, fetch the master bundle, it knows what locales are available.
+                req([masterName], function (master) {
+                    //Figure out the best fit
+                    var needed = [];
+
+                    //Always allow for root, then do the rest of the locale parts.
+                    addPart("root", master, needed, toLoad, prefix, suffix);
+                    for (i = 0; (part = parts[i]); i++) {
+                        current += (current ? "-" : "") + part;
+                        addPart(current, master, needed, toLoad, prefix, suffix);
+                    }
+
+                    //Load all the parts missing.
+                    req(toLoad, function () {
+                        var i, partBundle;
+                        for (i = needed.length - 1; i > -1 && (part = needed[i]); i--) {
+                            partBundle = master[part];
+                            if (partBundle === true || partBundle === 1) {
+                                partBundle = req(prefix + part + '/' + suffix);
+                            }
+                            mixin(value, partBundle);
+                        }
+
+                        //All done, notify the loader.
+                        onLoad(value);
+                    });
+                });
+            }
+        }
+    });
+}());

From cbe31b56984923eccf9632a05d46884b30e17a72 Mon Sep 17 00:00:00 2001
From: Jonathan Diehl <jonathan.diehl@gmail.com>
Date: Sun, 23 Dec 2012 10:13:30 +0100
Subject: [PATCH 7/8] inform the user about missing libraries

---
 src/index.html | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/index.html b/src/index.html
index ce771cad40c..7205a813ecc 100644
--- a/src/index.html
+++ b/src/index.html
@@ -116,5 +116,34 @@
     <!-- All other scripts are loaded through require. -->
     <script src="thirdparty/require.js" data-main="brackets"></script>
 
+    <!-- Verify that all dependencies are loaded. -->
+    <script>
+        window.setTimeout(function () {
+            var deps = { "Mustache": window.Mustache, "jQuery": window.$, "CodeMirror": window.CodeMirror, "RequireJS": window.require };
+            var key, allOK = true;
+            for (key in deps) {
+                if (!deps[key]) {
+                    allOK = false;
+                    break;
+                }
+            }
+            if (allOK) {
+                return;
+            }
+            document.write("<h1>Missing libraries</h1>");
+            document.write("<p>The following required libraries were not found:</p>");
+            document.write("<ul>");
+            for (key in deps) {
+                if (!deps[key]) {
+                    document.write("<li>" + key + "</li>");
+                }
+            }
+            document.write("</ul>");
+            document.write("<p>If you have checked up Brackets from github, please update the submodules by running the following command:</p>");
+            document.write("<pre>git submodule update --init</pre>");
+            document.write("<p><a href=\"#\" onclick=\"window.location.reload()\">Reload Brackets</a></p>");
+        }, 1000);
+    </script>
+
 </body>
 </html>

From 2be783857f0d2e7b0e06c0547834f7e3f63e3bc1 Mon Sep 17 00:00:00 2001
From: Jonathan Diehl <jonathan.diehl@gmail.com>
Date: Wed, 2 Jan 2013 21:38:45 +0100
Subject: [PATCH 8/8] Updated wording as suggested by @gruehle

---
 src/index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/index.html b/src/index.html
index 7205a813ecc..4e6ef264975 100644
--- a/src/index.html
+++ b/src/index.html
@@ -131,7 +131,7 @@
                 return;
             }
             document.write("<h1>Missing libraries</h1>");
-            document.write("<p>The following required libraries were not found:</p>");
+            document.write("<p>Oops! One or more required libraries could not be found.</p>");
             document.write("<ul>");
             for (key in deps) {
                 if (!deps[key]) {
@@ -139,8 +139,9 @@
                 }
             }
             document.write("</ul>");
-            document.write("<p>If you have checked up Brackets from github, please update the submodules by running the following command:</p>");
+            document.write("<p>If you are running from a local copy of the Brackets source, please make sure submodules are updated by running:</p>");
             document.write("<pre>git submodule update --init</pre>");
+            document.write("<p>If you're still having problems, please contact us via one of the channels mentioned in the <a target=\"blank\" href=\"../README.md\">README</a></p>.");
             document.write("<p><a href=\"#\" onclick=\"window.location.reload()\">Reload Brackets</a></p>");
         }, 1000);
     </script>