Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7

1 files changed, 5 insertions, 5 deletions

diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index f6ae79d..06ae503 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -444,8 +444,8 @@ WebInspector.loaded = function()
     this._registerShortcuts();
 
     // set order of some sections explicitly
-    WebInspector.shortcutsHelp.section("Console");
-    WebInspector.shortcutsHelp.section("Elements Panel");
+    WebInspector.shortcutsHelp.section(WebInspector.UIString("Console"));
+    WebInspector.shortcutsHelp.section(WebInspector.UIString("Elements Panel"));
 
     this.drawer = new WebInspector.Drawer();
     this.console = new WebInspector.ConsoleView(this.drawer);
@@ -1514,7 +1514,7 @@ WebInspector.setRecordingProfile = function(isProfiling)
         if (!this._temporaryRecordingProfile) {
             this._temporaryRecordingProfile = {
                 typeId: WebInspector.CPUProfileType.TypeId,
-                title: WebInspector.UIString('Recording...'),
+                title: WebInspector.UIString("Recording…"),
                 uid: -1,
                 isTemporary: true
             };
@@ -1861,10 +1861,10 @@ WebInspector.UIString = function(string)
     if (window.localizedStrings && string in window.localizedStrings)
         string = window.localizedStrings[string];
     else {
-        if (!(string in this.missingLocalizedStrings)) {
+        if (!(string in WebInspector.missingLocalizedStrings)) {
             if (!WebInspector.InspectorBackendStub)
                 console.error("Localized string \"" + string + "\" not found.");
-            this.missingLocalizedStrings[string] = true;
+            WebInspector.missingLocalizedStrings[string] = true;
         }
 
         if (Preferences.showMissingLocalizedStrings)