--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -637,16 +637,19 @@ just addresses the organization to follo
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Αντιγραφή εξωτερικού HTML">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "ξ">
 
 <!ENTITY inspectorHTMLDelete.label          "Διαγραφή Node">
 <!ENTITY inspectorHTMLDelete.accesskey      "Δ">
 
 
-<!-- LOCALIZATION NOTE (markupButton.arialabel): The markup button is the button
-located in front of the breadcrumbs display in the inspector toolbar. The button
-doesn't display any label, but exposes a label to screen-readers with "aria-label".
--->
-<!ENTITY markupButton.arialabel          "Markup">
-<!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
+<!-- LOCALIZATION NOTE (htmlPanel.label): This is a label for a button that
+activates the Web Developer->Inspect UI's HTML Tree Panel. -->
+<!ENTITY htmlPanel.label              "HTML">
+
+<!-- LOCALIZATION NOTE (htmlPanel.tooltiptext): The text that appears when a user
+hovers over the HTML panel's toolbar button. -->
+<!ENTITY htmlPanel.tooltiptext        "HTML panel">
+
+<!-- LOCALIZATION NOTE (htmlPanel.accesskey): The key bound to the HTML panel's
 toolbar button -->
-<!ENTITY markupButton.accesskey          "M">
+<!ENTITY htmlPanel.accesskey          "H">

--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -427,25 +427,19 @@ syncPromoNotification.passwords.description=Μπορείτε να έχετε πρόσβαση στους κωδικούς σας από όλες τις συσκευές σας με το %S.\u0020
 telemetryLinkLabel = Μάθετε περισσότερα
 
 telemetryYesButtonAccessKey = α
 telemetryNoButtonLabel = Όχι
 telemetryNoButtonAccessKey = χ
 telemetryYesButtonLabel2 = Ναι, θέλω να βοηθήσω
 
 
-activatePluginsMessage.message=Θέλετε να ενεργοποιήσετε τις πρόσθετες λειτουργίες για αυτή τη σελίδα;
-activatePluginsMessage.label=Ενεργοποίηση πρόσθετων λειτουργιών
-activatePluginsMessage.accesskey=ν
-activatePluginsMessage.always=Πάντα ενεργοποίηση για αυτή την σελίδα
-activatePluginsMessage.always.accesskey=ν
-activatePluginsMessage.never=Ποτέ ενεργοποίηση για αυτή την σελίδα
-activatePluginsMessage.never.accesskey=Π
 
-telemetryOptInPrompt = Θέλετε να βοηθήσετε να βελτιωθεί ο %1$S με το να υποβάλλονται ανώνυμα η χρήση μνήμης και η συμπεριφορά και οι επιδόσεις της εφαρμογής στο %2$S;
+telemetryPrompt = Θέλετε να βοηθήσετε να βελτιωθεί ο %1$S με το να υποβάλλονται ανώνυμα η χρήση μνήμης και η συμπεριφορά και οι επιδόσεις της εφαρμογής στο %2$S;
+
 
 # Telemetry opt-out prompt for Aurora and Nightly
 # LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt = Ο %1$S αποστέλλει πληροφορίες για τις επιδόσεις, το υλικό, τη χρήση και τις προσαρμογές στο %2$S, για να βελτιωθεί ο %3$S.
 
 # Webapps notification popup
 webapps.install = Εγκατάσταση

--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -15,27 +15,16 @@
 <!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
   -  launches the debugger UI. Do not translate this one! -->
 <!ENTITY debuggerMenu.commandkey     "S">
 
 <!-- LOCALIZATION NOTE (debuggerUI.closeButton): This is the label for the
   -  button that closes the debugger UI. -->
 <!ENTITY debuggerUI.closeButton      "Close">
 
-<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton): This is the label for the
-  -  button that steps over a function call. -->
-<!ENTITY debuggerUI.stepOverButton   "Step Over">
-
-<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the label for the
-  -  button that steps into a function call. -->
-<!ENTITY debuggerUI.stepInButton     "Step In">
-
-<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the label for the
-  -  button that steps out of a function call. -->
-<!ENTITY debuggerUI.stepOutButton    "Step Out">
 
 <!-- LOCALIZATION NOTE (debuggerUI.stackTitle): This is the label for the
   -  widget that displays the call stack frames in the debugger. -->
 <!ENTITY debuggerUI.stackTitle       "Call stack">
 
 <!-- LOCALIZATION NOTE (debuggerUI.scriptTitle): This is the label for the
   -  widget that displays the source code for the script that is currently
   -  being inspected in the debugger. -->

--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -1,40 +1,16 @@
-# LOCALIZATION NOTE These strings are used inside the Debugger
-# which is available from the Web Developer sub-menu -> 'Debugger'.
+# LOCALIZATION NOTE These strings are used inside the Script Debugger
+# which is available from the Web Developer sub-menu -> 'Script Debugger'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-# LOCALIZATION NOTE (remoteDebuggerWindowTitle): The title displayed for the
-# remote debugger window.
-remoteDebuggerWindowTitle=Remote Debugger
-
-# LOCALIZATION NOTE (remoteDebuggerPromptTitle): The title displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerPromptTitle=Remote Connection
-
-# LOCALIZATION NOTE (remoteDebuggerPromptMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerPromptMessage=Enter hostname and port number (host:port)
-
-# LOCALIZATION NOTE (remoteDebuggerPromptCheck): The message displayed on the
-# debugger prompt asking if the prompt should be shown again next time.
-remoteDebuggerPromptCheck=Don't ask me again
-
-# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerReconnectMessage=Server not found. Try again? (host:port)
-
-# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerConnectionFailedMessage=Could not find a server at the specified hostname and port number.
-
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
 pauseLabel=Pause
 
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
 resumeLabel=Resume
 
@@ -49,27 +25,27 @@ runningState=Running
 # LOCALIZATION NOTE (localScope): The label that is displayed in the variables
 # pane as a header on the local scope container.
 localScope=Local
 
 # LOCALIZATION NOTE (globalScope): The label that is displayed in the variables
 # pane as a header on the globel scope container.
 globalScope=Global
 
-# LOCALIZATION NOTE (withScope): The label that is displayed in the variables
+# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
 # pane as a header on the container for identifiers in a with block.
 withScope=With block
 
 # LOCALIZATION NOTE (closureScope): The label that is displayed in the variables
 # pane as a header on container for identifiers in a closure scope.
 closureScope=Closure
 
-# LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
-# frames list when there are no frames to display.
-emptyStackText=No stacks to display.
+# LOCALIZATION NOTE (emptyText): The text that is displayed in the stack frames
+# list when there are no frames to display.
+emptyText=Empty
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the laoding process has started but there is no file to display
 # yet.
 loadingText=Loading\u2026
 
 # LOCALIZATION NOTE (loadingError):
 # This is the error message that is displayed on failed attempts to load an

--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -4,30 +4,25 @@
 confirmNavigationAway.message=Αν φύγετε από αυτή τη σελίδα θα κλείσει ο Inspector και οι τροποποιήσεις που κάνατε θα χαθούν.
 confirmNavigationAway.buttonLeave=Έξοδος από τη σελίδα
 confirmNavigationAway.buttonLeaveAccesskey=ξ
 confirmNavigationAway.buttonStay=Παραμονή στη σελίδα
 confirmNavigationAway.buttonStayAccesskey=μ
 
 breadcrumbs.siblings=Siblings
 
-# LOCALIZATION NOTE (inspectButtonWithShortcutKey.tooltip):
-# This button appears in the Inspector Toolbar. inspectButton is stateful,
-# if it's pressed users can select an element with the mouse.
-# %S is the keyboard shortcut.
-inspectButtonWithShortcutKey.tooltip=Επιλογή στοιχείου με το ποντίκι (%S)
 
-# LOCALIZATION NOTE (inspectButton.tooltip):
-# Same as inspectButtonWithShortcutKey.tooltip but used when an add-on
-# overrides the shortcut key.
-inspectButton.tooltip=Επιλογή στοιχείου με το ποντίκι
+# LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
+# method when registering the HTML panel.
 
-
-
-markupButton.tooltip=Markup Panel
-markupButton.tooltipWithAccesskey=Markup Panel (%S)
+# LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
+# associated with the Highlighter's CSS Rule View in the Style Sidebar.
+ruleView.label=Rules
+ruleView.accesskey=R
+ruleView.tooltiptext=View and Edit CSS
 
-# LOCALIZATION NOTE (nodeMenu.tooltiptext)
-# This menu appears in the Infobar (on top of the highlighted node) once
-# the node is selected.
-nodeMenu.tooltiptext=Node operations
+# LOCALIZATION NOTE (inspectButton.tooltiptext):
+# This button appears in the Inspector Toolbar. inspectButton is stateful,
+# if it's pressed users can select an element with the mouse. Pressing the
+# "Return" key # changes that state. %S is the keyboard shortcut (VK_RETURN in
+# chrome://global/locale/keys.properties).
+inspectButton.tooltiptext=Select element with mouse (%S)
 
-

--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -35,13 +35,9 @@ gotoLineCmd.promptMessage=Μετάβαση σε αριθμό γραμμής:
 # the editor gutters. This feature is used in the JavaScript Debugger.
 annotation.breakpoint.title=Breakpoint: %S
 
 # LOCALIZATION NOTE  (annotation.currentLine): This is the text shown in
 # a tooltip displayed in any of the editor gutters when the user hovers the
 # current line.
 annotation.currentLine=Current line
 
-# LOCALIZATION NOTE  (annotation.debugLocation.title): This is the text shown in
-# a tooltip displayed in any of the editor gutters when the user hovers the
-# current debugger location. The debugger can pause the JavaScript execution at
-# user-defined lines.
-annotation.debugLocation.title=Current step: %S
+

--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -111,18 +111,10 @@ rule.contextmenu.copyproperty.accesskey=
 # LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue): The rule view's
 # context menu copy property entry allows a CSS property value to be copied.
 rule.contextmenu.copypropertyvalue=Copy property value
 
 # LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue.accesskey): The rule
 # view's context menu copy property value access key.
 rule.contextmenu.copypropertyvalue.accesskey=U
 
-# LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
-# associated with the Highlighter's CSS Rule View in the Style Sidebar.
-ruleView.label=Rules
-ruleView.accesskey=R
-ruleView.tooltiptext=View and Edit CSS
 
-# LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
-# first opened and there's no node selected in the rule view.
-rule.empty=No element selected.