Bug 1308500 - Migrate localization strings away from netmonitor.dtd;r=jsnajdr draft
authorFred Lin <gasolin@mozilla.com>
Fri, 14 Oct 2016 12:03:05 +0800
changeset 425953 5a04b070e8c2f4f8f2bde92d491c91d4166a8180
parent 425936 9ed78dd58adc11a692ec148b27873430656c409d
child 534020 e6b0ff743951916ff7548c254e4cf76fe78b826c
push id32541
push userbmo:gasolin@mozilla.com
push dateMon, 17 Oct 2016 10:13:09 +0000
reviewersjsnajdr
bugs1308500
milestone52.0a1
Bug 1308500 - Migrate localization strings away from netmonitor.dtd;r=jsnajdr MozReview-Commit-ID: 3DqbbDq7AXh
devtools/client/locales/en-US/netmonitor.dtd
devtools/client/locales/en-US/netmonitor.properties
devtools/client/netmonitor/netmonitor.xul
deleted file mode 100644
--- a/devtools/client/locales/en-US/netmonitor.dtd
+++ /dev/null
@@ -1,400 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- LOCALIZATION NOTE : FILE This file contains the Network Monitor strings -->
-<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
-
-<!-- LOCALIZATION NOTE : FILE 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 (netmonitorUI.perfNotice1/2/3): These are the labels displayed
-  -  in the network table when empty to start performance analysis. -->
-<!ENTITY netmonitorUI.perfNotice1         "• Click on the">
-<!ENTITY netmonitorUI.perfNotice2         "button to start performance analysis.">
-<!ENTITY netmonitorUI.perfNotice3         "Analyze">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.reload1/2/3): These are the labels displayed
-  -  in the network table when empty to start logging network requests. -->
-<!ENTITY netmonitorUI.reloadNotice1       "• Perform a request or">
-<!ENTITY netmonitorUI.reloadNotice2       "Reload">
-<!ENTITY netmonitorUI.reloadNotice3       "the page to see detailed information about network activity.">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status2): This is the label displayed
-  -  in the network table toolbar, above the "status" column. -->
-<!ENTITY netmonitorUI.toolbar.status3     "Status">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
-  -  in the network table toolbar, above the "method" column. -->
-<!ENTITY netmonitorUI.toolbar.method      "Method">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.file): This is the label displayed
-  -  in the network table toolbar, above the "file" column. -->
-<!ENTITY netmonitorUI.toolbar.file        "File">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.domain): This is the label displayed
-  -  in the network table toolbar, above the "domain" column. -->
-<!ENTITY netmonitorUI.toolbar.domain      "Domain">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.cause): This is the label displayed
-  -  in the network table toolbar, above the "cause" column. -->
-<!ENTITY netmonitorUI.toolbar.cause        "Cause">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.type): This is the label displayed
-  -  in the network table toolbar, above the "type" column. -->
-<!ENTITY netmonitorUI.toolbar.type        "Type">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.transferred): This is the label displayed
-  -  in the network table toolbar, above the "transferred" column, which is the
-  -  compressed / encoded size. -->
-<!ENTITY netmonitorUI.toolbar.transferred "Transferred">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.size): This is the label displayed
-  -  in the network table toolbar, above the "size" column, which is the
-  -  uncompressed / decoded size. -->
-<!ENTITY netmonitorUI.toolbar.size        "Size">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.waterfall): This is the label displayed
-  -  in the network table toolbar, above the "waterfall" column. -->
-<!ENTITY netmonitorUI.toolbar.waterfall   "Timeline">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.tab.headers): This is the label displayed
-  -  in the network details pane identifying the headers tab. -->
-<!ENTITY netmonitorUI.tab.headers         "Headers">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.tab.cookies): This is the label displayed
-  -  in the network details pane identifying the cookies tab. -->
-<!ENTITY netmonitorUI.tab.cookies         "Cookies">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.tab.params): This is the label displayed
-  -  in the network details pane identifying the params tab. -->
-<!ENTITY netmonitorUI.tab.params          "Params">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.tab.response): This is the label displayed
-  -  in the network details pane identifying the response tab. -->
-<!ENTITY netmonitorUI.tab.response        "Response">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.tab.timings): This is the label displayed
-  -  in the network details pane identifying the timings tab. -->
-<!ENTITY netmonitorUI.tab.timings         "Timings">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.tab.preview): This is the label displayed
-  -  in the network details pane identifying the preview tab. -->
-<!ENTITY netmonitorUI.tab.preview         "Preview">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.tab.security): This is the label displayed
-  -  in the network details pane identifying the security tab. -->
-<!ENTITY netmonitorUI.tab.security        "Security">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterAll): This is the label displayed
-  -  in the network details footer for the "All" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterAll    "All">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterHTML): This is the label displayed
-  -  in the network details footer for the "HTML" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterHTML   "HTML">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterCSS): This is the label displayed
-  -  in the network details footer for the "CSS" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterCSS    "CSS">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterJS): This is the label displayed
-  -  in the network details footer for the "JS" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterJS     "JS">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterXHR): This is the label displayed
-  -  in the network details footer for the "XHR" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterXHR    "XHR">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterFonts): This is the label displayed
-  -  in the network details footer for the "Fonts" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterFonts  "Fonts">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterImages): This is the label displayed
-  -  in the network details footer for the "Images" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterImages "Images">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterMedia): This is the label displayed
-  -  in the network details footer for the "Media" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterMedia  "Media">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterFlash): This is the label displayed
-  -  in the network details footer for the "Flash" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterFlash  "Flash">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterWS): This is the label displayed
-  -  in the network details footer for the "WS" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterWS  "WS">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterOther): This is the label displayed
-  -  in the network details footer for the "Other" filtering button. -->
-<!ENTITY netmonitorUI.footer.filterOther  "Other">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterFreetext): This is the label displayed
-  -  in the network details footer for the url filtering textbox. -->
-<!ENTITY netmonitorUI.footer.filterFreetext.label  "Filter URLs">
-<!ENTITY netmonitorUI.footer.filterFreetext.key  "F">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.clear): This is the label displayed
-  -  in the network details footer for the "Clear" button. -->
-<!ENTITY netmonitorUI.footer.clear  "Clear">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.footer.clear): This is the label displayed
-  -  in the network details footer for the performance analysis button. -->
-<!ENTITY netmonitorUI.footer.perf   "Toggle performance analysis…">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.panesButton.tooltip): This is the tooltip for
-  -  the button that toggles the panes visible or hidden in the netmonitor UI. -->
-<!ENTITY netmonitorUI.panesButton.tooltip "Toggle network info">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.url): This is the label displayed
-  -  in the network details headers tab identifying the URL. -->
-<!ENTITY netmonitorUI.summary.url         "Request URL:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.method): This is the label displayed
-  -  in the network details headers tab identifying the method. -->
-<!ENTITY netmonitorUI.summary.method      "Request method:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.address): This is the label displayed
-  -  in the network details headers tab identifying the remote address. -->
-<!ENTITY netmonitorUI.summary.address     "Remote address:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.status): This is the label displayed
-  -  in the network details headers tab identifying the status code. -->
-<!ENTITY netmonitorUI.summary.status      "Status code:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.version): This is the label displayed
-  -  in the network details headers tab identifying the http version. -->
-<!ENTITY netmonitorUI.summary.version     "Version:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.size): This is the label displayed
-  -  in the network details headers tab identifying the headers size. -->
-<!ENTITY netmonitorUI.summary.size        "Headers size:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.response.name): This is the label displayed
-  -  in the network details response tab identifying an image's file name. -->
-<!ENTITY netmonitorUI.response.name       "Name:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.response.dimensions): This is the label displayed
-  -  in the network details response tab identifying an image's dimensions. -->
-<!ENTITY netmonitorUI.response.dimensions "Dimensions:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.response.mime): This is the label displayed
-  -  in the network details response tab identifying an image's mime. -->
-<!ENTITY netmonitorUI.response.mime       "MIME Type:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.timings.blocked): This is the label displayed
-  -  in the network details timings tab identifying the amount of time spent
-  -  in a "blocked" state. -->
-<!ENTITY netmonitorUI.timings.blocked     "Blocked:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.timings.dns): This is the label displayed
-  -  in the network details timings tab identifying the amount of time spent
-  -  in a "dns" state. -->
-<!ENTITY netmonitorUI.timings.dns         "DNS resolution:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.timings.connect): This is the label displayed
-  -  in the network details timings tab identifying the amount of time spent
-  -  in a "connect" state. -->
-<!ENTITY netmonitorUI.timings.connect     "Connecting:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.timings.send): This is the label displayed
-  -  in the network details timings tab identifying the amount of time spent
-  -  in a "send" state. -->
-<!ENTITY netmonitorUI.timings.send        "Sending:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.timings.wait): This is the label displayed
-  -  in the network details timings tab identifying the amount of time spent
-  -  in a "wait" state. -->
-<!ENTITY netmonitorUI.timings.wait        "Waiting:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.timings.receive): This is the label displayed
-  -  in the network details timings tab identifying the amount of time spent
-  -  in a "receive" state. -->
-<!ENTITY netmonitorUI.timings.receive     "Receiving:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.security.warning.cipher): A tooltip
-  -  for warning icon that indicates a connection uses insecure cipher suite. -->
-<!ENTITY netmonitorUI.security.warning.cipher     "The cipher used for encryption is deprecated and insecure.">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.security.error): This is the label displayed
-  -  in the security tab if a security error prevented the connection. -->
-<!ENTITY netmonitorUI.security.error      "An error occured:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.security.protocolVersion): This is the label displayed
-  -  in the security tab describing TLS/SSL protocol version. -->
-<!ENTITY netmonitorUI.security.protocolVersion "Protocol version:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.security.cipherSuite): This is the label displayed
-  -  in the security tab describing the cipher suite used to secure this connection. -->
-<!ENTITY netmonitorUI.security.cipherSuite "Cipher suite:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.security.hsts): This is the label displayed
-  -  in the security tab describing the usage of HTTP Strict Transport Security. -->
-<!ENTITY netmonitorUI.security.hsts "HTTP Strict Transport Security:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.security.hpkp): This is the label displayed
-  -  in the security tab describing the usage of Public Key Pinning. -->
-<!ENTITY netmonitorUI.security.hpkp "Public Key Pinning:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.security.connection): This is the label displayed
-  -  in the security tab describing the section containing information related to
-  -  the secure connection. -->
-<!ENTITY netmonitorUI.security.connection "Connection:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.security.certificate): This is the label displayed
-  -  in the security tab describing the server certificate section. -->
-<!ENTITY netmonitorUI.security.certificate "Certificate:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
-  -  on the context menu that copies the selected request's url -->
-<!ENTITY netmonitorUI.context.copyUrl     "Copy URL">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
-  -  for the Copy URL menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.copyUrl.accesskey "U">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrlParams): This is the label displayed
-  -  on the context menu that copies the selected request's url parameters -->
-<!ENTITY netmonitorUI.context.copyUrlParams     "Copy URL Parameters">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrlParams.accesskey): This is the access key
-  -  for the Copy URL Parameters menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.copyUrlParams.accesskey "P">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyPostData): This is the label displayed
-  -  on the context menu that copies the selected request's post data -->
-<!ENTITY netmonitorUI.context.copyPostData     "Copy POST Data">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyPostData.accesskey): This is the access key
-  -  for the Copy POST Data menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.copyPostData.accesskey "D">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCurl): This is the label displayed
-  -  on the context menu that copies the selected request as a cURL command.
-  -  The capitalization is part of the official name and should be used throughout all languages.
-  -  http://en.wikipedia.org/wiki/CURL -->
-<!ENTITY netmonitorUI.context.copyAsCurl    "Copy as cURL">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCUrl.accesskey): This is the access key
-  -  for the Copy as cURL menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.copyAsCurl.accesskey "C">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRequestHeaders): This is the label displayed
-  -  on the context menu that copies the selected item's request headers -->
-<!ENTITY netmonitorUI.context.copyRequestHeaders     "Copy Request Headers">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRequestHeaders.accesskey): This is the access key
-  -  for the Copy Request Headers menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.copyRequestHeaders.accesskey  "Q">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponseHeaders): This is the label displayed
-  -  on the context menu that copies the selected item's response headers -->
-<!ENTITY netmonitorUI.context.copyResponseHeaders     "Copy Response Headers">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponseHeaders.accesskey): This is the access key
-  -  for the Copy Response Headers menu item displayed in the context menu for a response -->
-<!ENTITY netmonitorUI.context.copyResponseHeaders.accesskey  "S">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyResponse): This is the label displayed
-  -  on the context menu that copies the selected response as a string -->
-<!ENTITY netmonitorUI.context.copyResponse "Copy Response">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyRespose.accesskey): This is the access key
-  -  for the Copy Response menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.copyResponse.accesskey  "R">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri): This is the label displayed
-  -  on the context menu that copies the selected image as data uri -->
-<!ENTITY netmonitorUI.context.copyImageAsDataUri "Copy Image as Data URI">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri.accesskey): This is the access key
-  -  for the Copy Image As Data URI menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.copyImageAsDataUri.accesskey  "I">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAllAsHar): This is the label displayed
-  -  on the context menu that copies all as HAR format -->
-<!ENTITY netmonitorUI.context.copyAllAsHar "Copy All As HAR">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAllAsHar.accesskey): This is the access key
-  -  for the Copy All As HAR menu item displayed in the context menu for a network panel -->
-<!ENTITY netmonitorUI.context.copyAllAsHar.accesskey "O">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.saveAllAsHar): This is the label displayed
-  -  on the context menu that saves all as HAR format -->
-<!ENTITY netmonitorUI.context.saveAllAsHar "Save All As HAR">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.saveAllAsHar.accesskey): This is the access key
-  -  for the Save All As HAR menu item displayed in the context menu for a network panel -->
-<!ENTITY netmonitorUI.context.saveAllAsHar.accesskey "H">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.editAndResend): This is the label displayed
-  -  on the button in the headers tab that opens a form to edit and resend the currently
-     displayed request -->
-<!ENTITY netmonitorUI.summary.editAndResend "Edit and Resend">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.editAndResend.accesskey): This is the access key
-  -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.summary.editAndResend.accesskey "E">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.rawHeaders): This is the label displayed
-  -  on the button in the headers tab that toggle view for raw request/response headers
-     from the currently displayed request -->
-<!ENTITY netmonitorUI.summary.rawHeaders "Raw headers">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.rawHeaders.requestHeaders): This is the label displayed
-  -  in the network details headers tab identifying the raw request headers textarea -->
-<!ENTITY netmonitorUI.summary.rawHeaders.requestHeaders "Request headers:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.summary.rawHeaders.responseHeaders): This is the label displayed
-  -  in the network details headers tab identifying the raw response headers textarea -->
-<!ENTITY netmonitorUI.summary.rawHeaders.responseHeaders "Response headers:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.newTab):  This is the label
-  -  for the Open in New Tab menu item displayed in the context menu of the
-  -  network container  -->
-<!ENTITY netmonitorUI.context.newTab      "Open in New Tab">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.newTab.accesskey): This is the access key
-  -  for the Open in New Tab menu item displayed in the context menu of the
-  -  network container -->
-<!ENTITY netmonitorUI.context.newTab.accesskey "T">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools): This is the label displayed
-  -  on the context menu that shows the performance analysis tools -->
-<!ENTITY netmonitorUI.context.perfTools   "Start Performance Analysis…">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
-  -  for the performance analysis menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.perfTools.accesskey "A">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.custom.newRequest): This is the label displayed
-  -  as the title of the new custom request form -->
-<!ENTITY netmonitorUI.custom.newRequest   "New Request">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.custom.query): This is the label displayed
-  -  above the query string entry in the custom request form -->
-<!ENTITY netmonitorUI.custom.query        "Query String:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.custom.headers): This is the label displayed
-  -  above the request headers entry in the custom request form -->
-<!ENTITY netmonitorUI.custom.headers      "Request Headers:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.custom.postData): This is the label displayed
-  -  above the request body entry in the custom request form -->
-<!ENTITY netmonitorUI.custom.postData     "Request Body:">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.custom.send): This is the label displayed
-  -  on the button which sends the custom request -->
-<!ENTITY netmonitorUI.custom.send         "Send">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.custom.cancel): This is the label displayed
-  -  on the button which cancels and closes the custom request form -->
-<!ENTITY netmonitorUI.custom.cancel       "Cancel">
-
-<!-- LOCALIZATION NOTE (netmonitorUI.backButton): This is the label displayed
-  -  on the button which exists the performance statistics view -->
-<!ENTITY netmonitorUI.backButton          "Back">
--- a/devtools/client/locales/en-US/netmonitor.properties
+++ b/devtools/client/locales/en-US/netmonitor.properties
@@ -348,8 +348,401 @@ certmgr.fingerprints.label=Fingerprints
 
 # LOCALIZATION NOTE (certmgr.certdetail.sha256fingerprint):
 # A label used for Fingerprints sub-section in security tab
 certmgr.certdetail.sha256fingerprint=SHA-256 Fingerprint:
 
 # LOCALIZATION NOTE (certmgr.certdetail.sha1fingerprint):
 # A label used for Fingerprints sub-section in security tab
 certmgr.certdetail.sha1fingerprint=SHA1 Fingerprint:
+
+# LOCALIZATION NOTE (netmonitor.perfNotice1/2/3): These are the labels displayed
+# in the network table when empty to start performance analysis.
+netmonitor.perfNotice1=• Click on the
+netmonitor.perfNotice2=button to start performance analysis.
+netmonitor.perfNotice3=Analyze
+
+# LOCALIZATION NOTE (netmonitor.reload1/2/3): These are the labels displayed
+# in the network table when empty to start logging network requests.
+netmonitor.reloadNotice1=• Perform a request or
+netmonitor.reloadNotice2=Reload
+netmonitor.reloadNotice3=the page to see detailed information about network activity.
+
+# LOCALIZATION NOTE (netmonitor.toolbar.status2): This is the label displayed
+# in the network table toolbar, above the "status" column.
+netmonitor.toolbar.status3=Status
+
+# LOCALIZATION NOTE (netmonitor.toolbar.method): This is the label displayed
+# in the network table toolbar, above the "method" column.
+netmonitor.toolbar.method=Method
+
+# LOCALIZATION NOTE (netmonitor.toolbar.file): This is the label displayed
+# in the network table toolbar, above the "file" column.
+netmonitor.toolbar.file=File
+
+# LOCALIZATION NOTE (netmonitor.toolbar.domain): This is the label displayed
+# in the network table toolbar, above the "domain" column.
+netmonitor.toolbar.domain=Domain
+
+# LOCALIZATION NOTE (netmonitor.toolbar.cause): This is the label displayed
+# in the network table toolbar, above the "cause" column.
+netmonitor.toolbar.cause=Cause
+
+# LOCALIZATION NOTE (netmonitor.toolbar.type): This is the label displayed
+# in the network table toolbar, above the "type" column.
+netmonitor.toolbar.type=Type
+
+# LOCALIZATION NOTE (netmonitor.toolbar.transferred): This is the label displayed
+# in the network table toolbar, above the "transferred" column, which is the
+# compressed / encoded size.
+netmonitor.toolbar.transferred=Transferred
+
+# LOCALIZATION NOTE (netmonitor.toolbar.size): This is the label displayed
+# in the network table toolbar, above the "size" column, which is the
+# uncompressed / decoded size.
+netmonitor.toolbar.size=Size
+
+# LOCALIZATION NOTE (netmonitor.toolbar.waterfall): This is the label displayed
+# in the network table toolbar, above the "waterfall" column.
+netmonitor.toolbar.waterfall=Timeline
+
+# LOCALIZATION NOTE (netmonitor.tab.headers): This is the label displayed
+# in the network details pane identifying the headers tab.
+netmonitor.tab.headers=Headers
+
+# LOCALIZATION NOTE (netmonitor.tab.cookies): This is the label displayed
+# in the network details pane identifying the cookies tab.
+netmonitor.tab.cookies=Cookies
+
+# LOCALIZATION NOTE (netmonitor.tab.params): This is the label displayed
+# in the network details pane identifying the params tab.
+netmonitor.tab.params=Params
+
+# LOCALIZATION NOTE (netmonitor.tab.response): This is the label displayed
+# in the network details pane identifying the response tab.
+netmonitor.tab.response=Response
+
+# LOCALIZATION NOTE (netmonitor.tab.timings): This is the label displayed
+# in the network details pane identifying the timings tab.
+netmonitor.tab.timings=Timings
+
+# LOCALIZATION NOTE (netmonitor.tab.preview): This is the label displayed
+# in the network details pane identifying the preview tab.
+netmonitor.tab.preview=Preview
+
+# LOCALIZATION NOTE (netmonitor.tab.security): This is the label displayed
+# in the network details pane identifying the security tab.
+netmonitor.tab.security=Security
+
+# LOCALIZATION NOTE (netmonitor.footer.filterAll): This is the label displayed
+# in the network details footer for the "All" filtering button.
+netmonitor.footer.filterAll=All
+
+# LOCALIZATION NOTE (netmonitor.footer.filterHTML): This is the label displayed
+# in the network details footer for the "HTML" filtering button.
+netmonitor.footer.filterHTML=HTML
+
+# LOCALIZATION NOTE (netmonitor.footer.filterCSS): This is the label displayed
+# in the network details footer for the "CSS" filtering button.
+netmonitor.footer.filterCSS=CSS
+
+# LOCALIZATION NOTE (netmonitor.footer.filterJS): This is the label displayed
+# in the network details footer for the "JS" filtering button.
+netmonitor.footer.filterJS=JS
+
+# LOCALIZATION NOTE (netmonitor.footer.filterXHR): This is the label displayed
+# in the network details footer for the "XHR" filtering button.
+netmonitor.footer.filterXHR=XHR
+
+# LOCALIZATION NOTE (netmonitor.footer.filterFonts): This is the label displayed
+# in the network details footer for the "Fonts" filtering button.
+netmonitor.footer.filterFonts=Fonts
+
+# LOCALIZATION NOTE (netmonitor.footer.filterImages): This is the label displayed
+# in the network details footer for the "Images" filtering button.
+netmonitor.footer.filterImages=Images
+
+# LOCALIZATION NOTE (netmonitor.footer.filterMedia): This is the label displayed
+# in the network details footer for the "Media" filtering button.
+netmonitor.footer.filterMedia=Media
+
+# LOCALIZATION NOTE (netmonitor.footer.filterFlash): This is the label displayed
+# in the network details footer for the "Flash" filtering button.
+netmonitor.footer.filterFlash=Flash
+
+# LOCALIZATION NOTE (netmonitor.footer.filterWS): This is the label displayed
+# in the network details footer for the "WS" filtering button.
+netmonitor.footer.filterWS=WS
+
+# LOCALIZATION NOTE (netmonitor.footer.filterOther): This is the label displayed
+# in the network details footer for the "Other" filtering button.
+netmonitor.footer.filterOther=Other
+
+# LOCALIZATION NOTE (netmonitor.footer.filterFreetext): This is the label displayed
+# in the network details footer for the url filtering textbox.
+netmonitor.footer.filterFreetext.label=Filter URLs
+netmonitor.footer.filterFreetext.key=F
+
+# LOCALIZATION NOTE (netmonitor.footer.clear): This is the label displayed
+# in the network details footer for the "Clear" button.
+netmonitor.footer.clear=Clear
+
+# LOCALIZATION NOTE (netmonitor.footer.clear): This is the label displayed
+# in the network details footer for the performance analysis button.
+netmonitor.footer.perf=Toggle performance analysis…
+
+# LOCALIZATION NOTE (netmonitor.panesButton.tooltip): This is the tooltip for
+# the button that toggles the panes visible or hidden in the netmonitor UI.
+netmonitor.panesButton.tooltip=Toggle network info
+
+# LOCALIZATION NOTE (netmonitor.summary.url): This is the label displayed
+# in the network details headers tab identifying the URL.
+netmonitor.summary.url=Request URL:
+
+# LOCALIZATION NOTE (netmonitor.summary.method): This is the label displayed
+# in the network details headers tab identifying the method.
+netmonitor.summary.method=Request method:
+
+# LOCALIZATION NOTE (netmonitor.summary.address): This is the label displayed
+# in the network details headers tab identifying the remote address.
+netmonitor.summary.address=Remote address:
+
+# LOCALIZATION NOTE (netmonitor.summary.status): This is the label displayed
+# in the network details headers tab identifying the status code.
+netmonitor.summary.status=Status code:
+
+# LOCALIZATION NOTE (netmonitor.summary.version): This is the label displayed
+# in the network details headers tab identifying the http version.
+netmonitor.summary.version=Version:
+
+# LOCALIZATION NOTE (netmonitor.summary.editAndResend): This is the label displayed
+# on the button in the headers tab that opens a form to edit and resend the currently
+# displayed request
+netmonitor.summary.editAndResend=Edit and Resend
+
+# LOCALIZATION NOTE (netmonitor.summary.rawHeaders): This is the label displayed
+# on the button in the headers tab that toggle view for raw request/response headers
+# from the currently displayed request
+netmonitor.summary.rawHeaders=Raw headers
+
+# LOCALIZATION NOTE (netmonitor.summary.rawHeaders.requestHeaders): This is the label displayed
+# in the network details headers tab identifying the raw request headers textarea
+netmonitor.summary.rawHeaders.requestHeaders=Request headers:
+
+# LOCALIZATION NOTE (netmonitor.summary.rawHeaders.responseHeaders): This is the label displayed
+# in the network details headers tab identifying the raw response headers textarea
+netmonitor.summary.rawHeaders.responseHeaders=Response headers:
+
+# LOCALIZATION NOTE (netmonitor.summary.size): This is the label displayed
+# in the network details headers tab identifying the headers size.
+netmonitor.summary.size=Headers size:
+
+# LOCALIZATION NOTE (netmonitor.response.name): This is the label displayed
+# in the network details response tab identifying an image's file name.
+netmonitor.response.name=Name:
+
+# LOCALIZATION NOTE (netmonitor.response.dimensions): This is the label displayed
+# in the network details response tab identifying an image's dimensions.
+netmonitor.response.dimensions=Dimensions:
+
+# LOCALIZATION NOTE (netmonitor.response.mime): This is the label displayed
+# in the network details response tab identifying an image's mime.
+netmonitor.response.mime=MIME Type:
+
+# LOCALIZATION NOTE (netmonitor.timings.blocked): This is the label displayed
+# in the network details timings tab identifying the amount of time spent
+# in a "blocked" state.
+netmonitor.timings.blocked=Blocked:
+
+# LOCALIZATION NOTE (netmonitor.timings.dns): This is the label displayed
+# in the network details timings tab identifying the amount of time spent
+# in a "dns" state.
+netmonitor.timings.dns=DNS resolution:
+
+# LOCALIZATION NOTE (netmonitor.timings.connect): This is the label displayed
+# in the network details timings tab identifying the amount of time spent
+# in a "connect" state.
+netmonitor.timings.connect=Connecting:
+
+# LOCALIZATION NOTE (netmonitor.timings.send): This is the label displayed
+# in the network details timings tab identifying the amount of time spent
+# in a "send" state.
+netmonitor.timings.send=Sending:
+
+# LOCALIZATION NOTE (netmonitor.timings.wait): This is the label displayed
+# in the network details timings tab identifying the amount of time spent
+# in a "wait" state.
+netmonitor.timings.wait=Waiting:
+
+# LOCALIZATION NOTE (netmonitor.timings.receive): This is the label displayed
+# in the network details timings tab identifying the amount of time spent
+# in a "receive" state.
+netmonitor.timings.receive=Receiving:
+
+# LOCALIZATION NOTE (netmonitor.security.warning.cipher): A tooltip
+# for warning icon that indicates a connection uses insecure cipher suite.
+netmonitor.security.warning.cipher=The cipher used for encryption is deprecated and insecure.
+
+# LOCALIZATION NOTE (netmonitor.security.error): This is the label displayed
+# in the security tab if a security error prevented the connection.
+netmonitor.security.error=An error occured:
+
+# LOCALIZATION NOTE (netmonitor.security.protocolVersion): This is the label displayed
+# in the security tab describing TLS/SSL protocol version.
+netmonitor.security.protocolVersion=Protocol version:
+
+# LOCALIZATION NOTE (netmonitor.security.cipherSuite): This is the label displayed
+# in the security tab describing the cipher suite used to secure this connection.
+netmonitor.security.cipherSuite=Cipher suite:
+
+# LOCALIZATION NOTE (netmonitor.security.hsts): This is the label displayed
+# in the security tab describing the usage of HTTP Strict Transport Security.
+netmonitor.security.hsts=HTTP Strict Transport Security:
+
+# LOCALIZATION NOTE (netmonitor.security.hpkp): This is the label displayed
+# in the security tab describing the usage of Public Key Pinning.
+netmonitor.security.hpkp=Public Key Pinning:
+
+# LOCALIZATION NOTE (netmonitor.security.connection): This is the label displayed
+# in the security tab describing the section containing information related to
+# the secure connection.
+netmonitor.security.connection=Connection:
+
+# LOCALIZATION NOTE (netmonitor.security.certificate): This is the label displayed
+# in the security tab describing the server certificate section.
+netmonitor.security.certificate=Certificate:
+
+# LOCALIZATION NOTE (netmonitor.context.copyUrl): This is the label displayed
+# on the context menu that copies the selected request's url
+netmonitor.context.copyUrl=Copy URL
+
+# LOCALIZATION NOTE (netmonitor.context.copyUrl.accesskey): This is the access key
+# for the Copy URL menu item displayed in the context menu for a request
+netmonitor.context.copyUrl.accesskey=U
+
+# LOCALIZATION NOTE (netmonitor.context.copyUrlParams): This is the label displayed
+# on the context menu that copies the selected request's url parameters
+netmonitor.context.copyUrlParams=Copy URL Parameters
+
+# LOCALIZATION NOTE (netmonitor.context.copyUrlParams.accesskey): This is the access key
+# for the Copy URL Parameters menu item displayed in the context menu for a request
+netmonitor.context.copyUrlParams.accesskey=P
+
+# LOCALIZATION NOTE (netmonitor.context.copyPostData): This is the label displayed
+# on the context menu that copies the selected request's post data
+netmonitor.context.copyPostData=Copy POST Data
+
+# LOCALIZATION NOTE (netmonitor.context.copyPostData.accesskey): This is the access key
+# for the Copy POST Data menu item displayed in the context menu for a request
+netmonitor.context.copyPostData.accesskey=D
+
+# LOCALIZATION NOTE (netmonitor.context.copyAsCurl): This is the label displayed
+# on the context menu that copies the selected request as a cURL command.
+# The capitalization is part of the official name and should be used throughout all languages.
+# http://en.wikipedia.org/wiki/CURL
+netmonitor.context.copyAsCurl=Copy as cURL
+
+# LOCALIZATION NOTE (netmonitor.context.copyAsCUrl.accesskey): This is the access key
+# for the Copy as cURL menu item displayed in the context menu for a request
+netmonitor.context.copyAsCurl.accesskey=C
+
+# LOCALIZATION NOTE (netmonitor.context.copyRequestHeaders): This is the label displayed
+# on the context menu that copies the selected item's request headers
+netmonitor.context.copyRequestHeaders=Copy Request Headers
+
+# LOCALIZATION NOTE (netmonitor.context.copyRequestHeaders.accesskey): This is the access key
+# for the Copy Request Headers menu item displayed in the context menu for a request
+netmonitor.context.copyRequestHeaders.accesskey=Q
+
+# LOCALIZATION NOTE (netmonitor.context.copyResponseHeaders): This is the label displayed
+# on the context menu that copies the selected item's response headers
+netmonitor.context.copyResponseHeaders=Copy Response Headers
+
+# LOCALIZATION NOTE (netmonitor.context.copyResponseHeaders.accesskey): This is the access key
+# for the Copy Response Headers menu item displayed in the context menu for a response
+netmonitor.context.copyResponseHeaders.accesskey=S
+
+# LOCALIZATION NOTE (netmonitor.context.copyResponse): This is the label displayed
+# on the context menu that copies the selected response as a string
+netmonitor.context.copyResponse=Copy Response
+
+# LOCALIZATION NOTE (netmonitor.context.copyRespose.accesskey): This is the access key
+# for the Copy Response menu item displayed in the context menu for a request
+netmonitor.context.copyResponse.accesskey=R
+
+# LOCALIZATION NOTE (netmonitor.context.copyImageAsDataUri): This is the label displayed
+# on the context menu that copies the selected image as data uri
+netmonitor.context.copyImageAsDataUri=Copy Image as Data URI
+
+# LOCALIZATION NOTE (netmonitor.context.copyImageAsDataUri.accesskey): This is the access key
+# for the Copy Image As Data URI menu item displayed in the context menu for a request
+netmonitor.context.copyImageAsDataUri.accesskey=I
+
+# LOCALIZATION NOTE (netmonitor.context.copyAllAsHar): This is the label displayed
+# on the context menu that copies all as HAR format
+netmonitor.context.copyAllAsHar=Copy All As HAR
+
+# LOCALIZATION NOTE (netmonitor.context.copyAllAsHar.accesskey): This is the access key
+# for the Copy All As HAR menu item displayed in the context menu for a network panel
+netmonitor.context.copyAllAsHar.accesskey=O
+
+# LOCALIZATION NOTE (netmonitor.context.saveAllAsHar): This is the label displayed
+# on the context menu that saves all as HAR format
+netmonitor.context.saveAllAsHar=Save All As HAR
+
+# LOCALIZATION NOTE (netmonitor.context.saveAllAsHar.accesskey): This is the access key
+# for the Save All As HAR menu item displayed in the context menu for a network panel
+netmonitor.context.saveAllAsHar.accesskey=H
+
+# LOCALIZATION NOTE (netmonitor.context.editAndResend): This is the label displayed
+# on the context menu that opens a form to edit and resend the currently
+# displayed request
+netmonitor.context.editAndResend=Edit and Resend
+
+# LOCALIZATION NOTE (netmonitor.context.editAndResend.accesskey): This is the access key
+# for the "Edit and Resend" menu item displayed in the context menu for a request
+netmonitor.context.editAndResend.accesskey=E
+
+# LOCALIZATION NOTE (netmonitor.context.newTab):  This is the label
+# for the Open in New Tab menu item displayed in the context menu of the
+# network container
+netmonitor.context.newTab=Open in New Tab
+
+# LOCALIZATION NOTE (netmonitor.context.newTab.accesskey): This is the access key
+# for the Open in New Tab menu item displayed in the context menu of the
+# network container
+netmonitor.context.newTab.accesskey=T
+
+# LOCALIZATION NOTE (netmonitor.context.perfTools): This is the label displayed
+# on the context menu that shows the performance analysis tools
+netmonitor.context.perfTools=Start Performance Analysis…
+
+# LOCALIZATION NOTE (netmonitor.context.perfTools.accesskey): This is the access key
+# for the performance analysis menu item displayed in the context menu for a request
+netmonitor.context.perfTools.accesskey=A
+
+# LOCALIZATION NOTE (netmonitor.custom.newRequest): This is the label displayed
+# as the title of the new custom request form
+netmonitor.custom.newRequest=New Request
+
+# LOCALIZATION NOTE (netmonitor.custom.query): This is the label displayed
+# above the query string entry in the custom request form
+netmonitor.custom.query=Query String:
+
+# LOCALIZATION NOTE (netmonitor.custom.headers): This is the label displayed
+# above the request headers entry in the custom request form
+netmonitor.custom.headers=Request Headers:
+
+# LOCALIZATION NOTE (netmonitor.custom.postData): This is the label displayed
+# above the request body entry in the custom request form
+netmonitor.custom.postData=Request Body:
+
+# LOCALIZATION NOTE (netmonitor.custom.send): This is the label displayed
+# on the button which sends the custom request
+netmonitor.custom.send=Send
+
+# LOCALIZATION NOTE (netmonitor.custom.cancel): This is the label displayed
+# on the button which cancels and closes the custom request form
+netmonitor.custom.cancel=Cancel
+
+# LOCALIZATION NOTE (netmonitor.backButton): This is the label displayed
+# on the button which exists the performance statistics view
+netmonitor.backButton=Back
--- a/devtools/client/netmonitor/netmonitor.xul
+++ b/devtools/client/netmonitor/netmonitor.xul
@@ -1,177 +1,158 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/netmonitor.css" type="text/css"?>
-<!DOCTYPE window [
-  <!ENTITY % netmonitorDTD SYSTEM "chrome://devtools/locale/netmonitor.dtd">
-  %netmonitorDTD;
-]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml">
+        xmlns:html="http://www.w3.org/1999/xhtml"
+        data-localization-bundle="devtools/locale/netmonitor.properties">
 
   <script type="application/javascript;version=1.8"
           src="chrome://devtools/content/shared/theme-switching.js"/>
   <script type="text/javascript" src="netmonitor-controller.js"/>
   <script type="text/javascript" src="netmonitor-view.js"/>
 
   <popupset id="networkPopupSet">
     <menupopup id="network-request-popup">
       <menuitem id="request-menu-context-copy-url"
-                label="&netmonitorUI.context.copyUrl;"
-                accesskey="&netmonitorUI.context.copyUrl.accesskey;"/>
+                data-localization="label=netmonitor.context.copyUrl;accesskey=netmonitor.context.copyUrl.accesskey"/>
       <menuitem id="request-menu-context-copy-url-params"
-                label="&netmonitorUI.context.copyUrlParams;"
-                accesskey="&netmonitorUI.context.copyUrlParams.accesskey;"
+                data-localization="label=netmonitor.context.copyUrlParams;accesskey=netmonitor.context.copyUrlParams.accesskey"
                 oncommand="NetMonitorView.RequestsMenu.copyUrlParams();"/>
       <menuitem id="request-menu-context-copy-post-data"
-                label="&netmonitorUI.context.copyPostData;"
-                accesskey="&netmonitorUI.context.copyPostData.accesskey;"
+                data-localization="label=netmonitor.context.copyPostData;accesskey=netmonitor.context.copyPostData.accesskey"
                 oncommand="NetMonitorView.RequestsMenu.copyPostData();"/>
       <menuitem id="request-menu-context-copy-as-curl"
-                label="&netmonitorUI.context.copyAsCurl;"
-                accesskey="&netmonitorUI.context.copyAsCurl.accesskey;"
+                data-localization="label=netmonitor.context.copyAsCurl;accesskey=netmonitor.context.copyAsCurl.accesskey"
                 oncommand="NetMonitorView.RequestsMenu.copyAsCurl();"/>
       <menuseparator class="request-menu-context-separator"/>
       <menuitem id="request-menu-context-copy-request-headers"
-                label="&netmonitorUI.context.copyRequestHeaders;"
-                accesskey="&netmonitorUI.context.copyRequestHeaders.accesskey;"
+                data-localization="label=netmonitor.context.copyRequestHeaders;accesskey=netmonitor.context.copyRequestHeaders.accesskey"
                 oncommand="NetMonitorView.RequestsMenu.copyRequestHeaders();"/>
       <menuitem id="response-menu-context-copy-response-headers"
-                label="&netmonitorUI.context.copyResponseHeaders;"
-                accesskey="&netmonitorUI.context.copyResponseHeaders.accesskey;"
+                data-localization="label=netmonitor.context.copyResponseHeaders;accesskey=netmonitor.context.copyResponseHeaders.accesskey"
                 oncommand="NetMonitorView.RequestsMenu.copyResponseHeaders();"/>
       <menuitem id="request-menu-context-copy-response"
-                label="&netmonitorUI.context.copyResponse;"
-                accesskey="&netmonitorUI.context.copyResponse.accesskey;"/>
+                data-localization="label=netmonitor.context.copyResponse;accesskey=netmonitor.context.copyResponse.accesskey"/>
       <menuitem id="request-menu-context-copy-image-as-data-uri"
-                label="&netmonitorUI.context.copyImageAsDataUri;"
-                accesskey="&netmonitorUI.context.copyImageAsDataUri.accesskey;"/>
+                data-localization="label=netmonitor.context.copyImageAsDataUri;accesskey=netmonitor.context.copyImageAsDataUri.accesskey"/>
       <menuseparator class="request-menu-context-separator"/>
       <menuitem id="request-menu-context-copy-all-as-har"
-                label="&netmonitorUI.context.copyAllAsHar;"
-                accesskey="&netmonitorUI.context.copyAllAsHar.accesskey;"
+                data-localization="label=netmonitor.context.copyAllAsHar;accesskey=netmonitor.context.copyAllAsHar.accesskey"
                 oncommand="NetMonitorView.RequestsMenu.copyAllAsHar();"/>
       <menuitem id="request-menu-context-save-all-as-har"
-                label="&netmonitorUI.context.saveAllAsHar;"
-                accesskey="&netmonitorUI.context.saveAllAsHar.accesskey;"
+                data-localization="label=netmonitor.context.saveAllAsHar;accesskey=netmonitor.context.saveAllAsHar.accesskey"
                 oncommand="NetMonitorView.RequestsMenu.saveAllAsHar();"/>
       <menuseparator class="request-menu-context-separator"/>
       <menuitem id="request-menu-context-resend"
-                label="&netmonitorUI.summary.editAndResend;"
-                accesskey="&netmonitorUI.summary.editAndResend.accesskey;"/>
+                data-localization="label=netmonitor.context.editAndResend;accesskey=netmonitor.context.editAndResend.accesskey"/>
       <menuseparator class="request-menu-context-separator"/>
       <menuitem id="request-menu-context-newtab"
-                label="&netmonitorUI.context.newTab;"
-                accesskey="&netmonitorUI.context.newTab.accesskey;"/>
+                data-localization="label=netmonitor.context.newTab;accesskey=netmonitor.context.newTab.accesskey"/>
       <menuitem id="request-menu-context-perf"
-                label="&netmonitorUI.context.perfTools;"
-                accesskey="&netmonitorUI.context.perfTools.accesskey;"/>
+                data-localization="label=netmonitor.context.perfTools;accesskey=netmonitor.context.perfTools.accesskey"/>
     </menupopup>
   </popupset>
 
   <commandset>
     <command id="freeTextFilterCommand"
              oncommand="NetMonitorView.RequestsMenu.freetextFilterBox.focus()"/>
   </commandset>
 
   <keyset>
     <key id="freeTextFilterKey"
-         key="&netmonitorUI.footer.filterFreetext.key;"
+         data-localization="key=netmonitor.footer.filterFreetext.key"
          modifiers="accel"
          command="freeTextFilterCommand"/>
   </keyset>
 
-  <deck id="body"
-        class="theme-sidebar"
-        data-localization-bundle="devtools/locale/netmonitor.properties"
-        flex="1">
+  <deck id="body" class="theme-sidebar" flex="1">
 
     <vbox id="network-inspector-view" flex="1">
       <hbox id="netmonitor-toolbar" class="devtools-toolbar">
         <toolbarbutton id="requests-menu-clear-button"
                        class="devtools-toolbarbutton devtools-clear-icon"
-                       tooltiptext="&netmonitorUI.footer.clear;"/>
+                       data-localization="tooltiptext=netmonitor.footer.clear"/>
         <hbox id="requests-menu-filter-buttons">
           <button id="requests-menu-filter-all-button"
                   class="requests-menu-filter-button"
                   checked="true"
                   data-key="all"
-                  label="&netmonitorUI.footer.filterAll;">
+                  data-localization="label=netmonitor.footer.filterAll">
           </button>
           <button id="requests-menu-filter-html-button"
                   class="requests-menu-filter-button"
                   data-key="html"
-                  label="&netmonitorUI.footer.filterHTML;">
+                  data-localization="label=netmonitor.footer.filterHTML">
           </button>
           <button id="requests-menu-filter-css-button"
                   class="requests-menu-filter-button"
                   data-key="css"
-                  label="&netmonitorUI.footer.filterCSS;">
+                  data-localization="label=netmonitor.footer.filterCSS">
           </button>
           <button id="requests-menu-filter-js-button"
                   class="requests-menu-filter-button"
                   data-key="js"
-                  label="&netmonitorUI.footer.filterJS;">
+                  data-localization="label=netmonitor.footer.filterJS">
           </button>
           <button id="requests-menu-filter-xhr-button"
                   class="requests-menu-filter-button"
                   data-key="xhr"
-                  label="&netmonitorUI.footer.filterXHR;">
+                  data-localization="label=netmonitor.footer.filterXHR">
           </button>
           <button id="requests-menu-filter-fonts-button"
                   class="requests-menu-filter-button"
                   data-key="fonts"
-                  label="&netmonitorUI.footer.filterFonts;">
+                  data-localization="label=netmonitor.footer.filterFonts">
           </button>
           <button id="requests-menu-filter-images-button"
                   class="requests-menu-filter-button"
                   data-key="images"
-                  label="&netmonitorUI.footer.filterImages;">
+                  data-localization="label=netmonitor.footer.filterImages">
           </button>
           <button id="requests-menu-filter-media-button"
                   class="requests-menu-filter-button"
                   data-key="media"
-                  label="&netmonitorUI.footer.filterMedia;">
+                  data-localization="label=netmonitor.footer.filterMedia">
           </button>
           <button id="requests-menu-filter-flash-button"
                   class="requests-menu-filter-button"
                   data-key="flash"
-                  label="&netmonitorUI.footer.filterFlash;">
+                  data-localization="label=netmonitor.footer.filterFlash">
           </button>
           <button id="requests-menu-filter-ws-button"
                   class="requests-menu-filter-button"
                   data-key="ws"
-                  label="&netmonitorUI.footer.filterWS;">
+                  data-localization="label=netmonitor.footer.filterWS">
           </button>
           <button id="requests-menu-filter-other-button"
                   class="requests-menu-filter-button"
                   data-key="other"
-                  label="&netmonitorUI.footer.filterOther;">
+                  data-localization="label=netmonitor.footer.filterOther">
           </button>
         </hbox>
         <spacer id="requests-menu-spacer"
                 flex="1"/>
         <toolbarbutton id="requests-menu-network-summary-button"
                        class="devtools-toolbarbutton icon-and-text"
-                       tooltiptext="&netmonitorUI.footer.perf;"/>
+                       data-localization="tooltiptext=netmonitor.footer.perf"/>
         <textbox id="requests-menu-filter-freetext-text"
                  class="devtools-filterinput"
                  type="search"
                  required="true"
-                 placeholder="&netmonitorUI.footer.filterFreetext.label;"/>
+                 data-localization="placeholder=netmonitor.footer.filterFreetext.label"/>
         <toolbarbutton id="details-pane-toggle"
                        class="devtools-toolbarbutton"
-                       tooltiptext="&netmonitorUI.panesButton.tooltip;"
+                       data-localization="tooltiptext=netmonitor.panesButton.tooltip"
                        disabled="true"
                        tabindex="0"/>
       </hbox>
       <hbox id="network-table-and-sidebar"
             class="devtools-responsive-container"
             flex="1">
         <vbox id="network-table" flex="1" class="devtools-main-content">
           <toolbar id="requests-menu-toolbar"
@@ -179,135 +160,135 @@
                    align="center">
             <hbox id="toolbar-labels" flex="1">
               <hbox id="requests-menu-status-header-box"
                     class="requests-menu-header requests-menu-status"
                     align="center">
                 <button id="requests-menu-status-button"
                         class="requests-menu-header-button requests-menu-status"
                         data-key="status"
-                        label="&netmonitorUI.toolbar.status3;"
+                        data-localization="label=netmonitor.toolbar.status3"
                         flex="1">
                 </button>
               </hbox>
               <hbox id="requests-menu-method-header-box"
                     class="requests-menu-header requests-menu-method"
                     align="center">
                 <button id="requests-menu-method-button"
                         class="requests-menu-header-button requests-menu-method"
                         data-key="method"
-                        label="&netmonitorUI.toolbar.method;"
+                        data-localization="label=netmonitor.toolbar.method"
                         crop="end"
                         flex="1">
                 </button>
               </hbox>
               <hbox id="requests-menu-icon-and-file-header-box"
                     class="requests-menu-header requests-menu-icon-and-file"
                     align="center">
                 <button id="requests-menu-file-button"
                         class="requests-menu-header-button requests-menu-file"
                         data-key="file"
-                        label="&netmonitorUI.toolbar.file;"
+                        data-localization="label=netmonitor.toolbar.file"
                         crop="end"
                         flex="1">
                 </button>
               </hbox>
               <hbox id="requests-menu-domain-header-box"
                     class="requests-menu-header requests-menu-security-and-domain"
                     align="center">
                 <button id="requests-menu-domain-button"
                         class="requests-menu-header-button requests-menu-security-and-domain"
                         data-key="domain"
-                        label="&netmonitorUI.toolbar.domain;"
+                        data-localization="label=netmonitor.toolbar.domain"
                         crop="end"
                         flex="1">
                 </button>
               </hbox>
               <hbox id="requests-menu-cause-header-box"
                     class="requests-menu-header requests-menu-cause"
                     align="center">
                 <button id="requests-menu-cause-button"
                         class="requests-menu-header-button requests-menu-cause"
                         data-key="cause"
-                        label="&netmonitorUI.toolbar.cause;"
+                        data-localization="label=netmonitor.toolbar.cause"
                         crop="end"
                         flex="1">
                 </button>
               </hbox>
               <hbox id="requests-menu-type-header-box"
                     class="requests-menu-header requests-menu-type"
                     align="center">
                 <button id="requests-menu-type-button"
                         class="requests-menu-header-button requests-menu-type"
                         data-key="type"
-                        label="&netmonitorUI.toolbar.type;"
+                        data-localization="label=netmonitor.toolbar.type"
                         crop="end"
                         flex="1">
                 </button>
               </hbox>
               <hbox id="requests-menu-transferred-header-box"
                     class="requests-menu-header requests-menu-transferred"
                     align="center">
                 <button id="requests-menu-transferred-button"
                         class="requests-menu-header-button requests-menu-transferred"
                         data-key="transferred"
-                        label="&netmonitorUI.toolbar.transferred;"
+                        data-localization="label=netmonitor.toolbar.transferred"
                         crop="end"
                         flex="1">
                 </button>
               </hbox>
               <hbox id="requests-menu-size-header-box"
                     class="requests-menu-header requests-menu-size"
                     align="center">
                 <button id="requests-menu-size-button"
                         class="requests-menu-header-button requests-menu-size"
                         data-key="size"
-                        label="&netmonitorUI.toolbar.size;"
+                        data-localization="label=netmonitor.toolbar.size"
                         crop="end"
                         flex="1">
                 </button>
               </hbox>
               <hbox id="requests-menu-waterfall-header-box"
                     class="requests-menu-header requests-menu-waterfall"
                     align="center"
                     flex="1">
                 <button id="requests-menu-waterfall-button"
                         class="requests-menu-header-button requests-menu-waterfall"
                         data-key="waterfall"
                         pack="start"
-                        label="&netmonitorUI.toolbar.waterfall;"
+                        data-localization="label=netmonitor.toolbar.waterfall"
                         flex="1">
                   <image id="requests-menu-waterfall-image"/>
                   <box id="requests-menu-waterfall-label-wrapper">
                     <label id="requests-menu-waterfall-label"
                            class="plain requests-menu-waterfall"
-                           value="&netmonitorUI.toolbar.waterfall;"/>
+                           data-localization="label=netmonitor.toolbar.waterfall"/>
                   </box>
                 </button>
               </hbox>
             </hbox>
           </toolbar>
 
           <vbox id="requests-menu-empty-notice"
                 class="side-menu-widget-empty-text">
             <hbox id="notice-reload-message" align="center">
-              <label value="&netmonitorUI.reloadNotice1;"/>
+              <label data-localization="content=netmonitor.reloadNotice1"/>
               <button id="requests-menu-reload-notice-button"
                       class="devtools-toolbarbutton"
                       standalone="true"
-                      label="&netmonitorUI.reloadNotice2;"/>
-              <label value="&netmonitorUI.reloadNotice3;"/>
+                      data-localization="label=netmonitor.reloadNotice2"/>
+              <label data-localization="content=netmonitor.reloadNotice3"/>
             </hbox>
             <hbox id="notice-perf-message" align="center">
-              <label value="&netmonitorUI.perfNotice1;"/>
+              <label data-localization="content=netmonitor.perfNotice1"/>
               <button id="requests-menu-perf-notice-button"
+                      class="devtools-toolbarbutton"
                       standalone="true"
-                      tooltiptext="&netmonitorUI.perfNotice3;"
-                      class="devtools-toolbarbutton"/>
-              <label value="&netmonitorUI.perfNotice2;"/>
+                      data-localization="tooltiptext=netmonitor.perfNotice3"/>
+              <label data-localization="content=netmonitor.perfNotice2"/>
             </hbox>
           </vbox>
 
           <vbox id="requests-menu-contents" flex="1" context="network-request-popup">
             <hbox id="requests-menu-item-template" hidden="true">
               <hbox class="requests-menu-subitem requests-menu-status"
                     align="center">
                 <box class="requests-menu-status-icon"/>
@@ -359,174 +340,174 @@
         <splitter id="network-inspector-view-splitter"
                   class="devtools-side-splitter"/>
 
         <deck id="details-pane"
               hidden="true">
           <vbox id="custom-pane"
                 class="tabpanel-content">
             <hbox align="baseline">
-              <label value="&netmonitorUI.custom.newRequest;"
+              <label data-localization="content=netmonitor.custom.newRequest"
                      class="plain tabpanel-summary-label
                             custom-header"/>
               <hbox flex="1" pack="end"
                     class="devtools-toolbarbutton-group">
                 <button id="custom-request-send-button"
                         class="devtools-toolbarbutton"
-                        label="&netmonitorUI.custom.send;"/>
+                        data-localization="label=netmonitor.custom.send"/>
                 <button id="custom-request-close-button"
                         class="devtools-toolbarbutton"
-                        label="&netmonitorUI.custom.cancel;"/>
+                        data-localization="label=netmonitor.custom.cancel"/>
               </hbox>
             </hbox>
             <hbox id="custom-method-and-url"
                   class="tabpanel-summary-container"
                   align="center">
               <textbox id="custom-method-value"
                        data-key="method"/>
               <textbox id="custom-url-value"
                        flex="1"
                        data-key="url"/>
             </hbox>
             <vbox id="custom-query"
                   class="tabpanel-summary-container custom-section">
               <label class="plain tabpanel-summary-label"
-                     value="&netmonitorUI.custom.query;"/>
+                     data-localization="content=netmonitor.custom.query"/>
               <textbox id="custom-query-value"
                        class="tabpanel-summary-input"
                        multiline="true"
                        rows="4"
                        wrap="off"
                        data-key="query"/>
             </vbox>
             <vbox id="custom-headers"
                   class="tabpanel-summary-container custom-section">
               <label class="plain tabpanel-summary-label"
-                     value="&netmonitorUI.custom.headers;"/>
+                     data-localization="content=netmonitor.custom.headers"/>
               <textbox id="custom-headers-value"
                        class="tabpanel-summary-input"
                        multiline="true"
                        rows="8"
                        wrap="off"
                        data-key="headers"/>
             </vbox>
             <vbox id="custom-postdata"
                   class="tabpanel-summary-container custom-section">
               <label class="plain tabpanel-summary-label"
-                     value="&netmonitorUI.custom.postData;"/>
+                     data-localization="content=netmonitor.custom.postData"/>
               <textbox id="custom-postdata-value"
                        class="tabpanel-summary-input"
                        multiline="true"
                        rows="6"
                        wrap="off"
                        data-key="body"/>
             </vbox>
           </vbox>
           <tabbox id="event-details-pane"
                   class="devtools-sidebar-tabs"
                   handleCtrlTab="false">
             <tabs>
               <tab id="headers-tab"
                    crop="end"
-                   label="&netmonitorUI.tab.headers;"/>
+                   data-localization="label=netmonitor.tab.headers"/>
               <tab id="cookies-tab"
                    crop="end"
-                   label="&netmonitorUI.tab.cookies;"/>
+                   data-localization="label=netmonitor.tab.cookies"/>
               <tab id="params-tab"
                    crop="end"
-                   label="&netmonitorUI.tab.params;"/>
+                   data-localization="label=netmonitor.tab.params"/>
               <tab id="response-tab"
                    crop="end"
-                   label="&netmonitorUI.tab.response;"/>
+                   data-localization="label=netmonitor.tab.response"/>
               <tab id="timings-tab"
                    crop="end"
-                   label="&netmonitorUI.tab.timings;"/>
+                   data-localization="label=netmonitor.tab.timings"/>
               <tab id="security-tab"
                    crop="end"
-                   label="&netmonitorUI.tab.security;"/>
+                   data-localization="label=netmonitor.tab.security"/>
               <tab id="preview-tab"
                    crop="end"
-                   label="&netmonitorUI.tab.preview;"/>
+                   data-localization="label=netmonitor.tab.preview"/>
             </tabs>
             <tabpanels flex="1">
               <tabpanel id="headers-tabpanel"
                         class="tabpanel-content">
                 <vbox flex="1">
                   <hbox id="headers-summary-url"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.summary.url;"/>
+                           data-localization="content=netmonitor.summary.url"/>
                     <textbox id="headers-summary-url-value"
                              class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
                              flex="1"
                              readonly="true"/>
                   </hbox>
                   <hbox id="headers-summary-method"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.summary.method;"/>
+                           data-localization="content=netmonitor.summary.method"/>
                     <label id="headers-summary-method-value"
                            class="plain tabpanel-summary-value devtools-monospace"
                            crop="end"
                            flex="1"/>
                   </hbox>
                   <hbox id="headers-summary-address"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.summary.address;"/>
+                           data-localization="content=netmonitor.summary.address"/>
                     <textbox id="headers-summary-address-value"
                              class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
                              flex="1"
                              readonly="true"/>
                   </hbox>
                   <hbox id="headers-summary-status"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.summary.status;"/>
+                           data-localization="content=netmonitor.summary.status"/>
                     <box id="headers-summary-status-circle"
                          class="requests-menu-status-icon"/>
                     <label id="headers-summary-status-value"
                            class="plain tabpanel-summary-value devtools-monospace"
                            crop="end"
                            flex="1"/>
                     <button id="headers-summary-resend"
                             class="devtools-toolbarbutton"
-                            label="&netmonitorUI.summary.editAndResend;"/>
+                            data-localization="label=netmonitor.summary.editAndResend"/>
                     <button id="toggle-raw-headers"
                             class="devtools-toolbarbutton"
-                            label="&netmonitorUI.summary.rawHeaders;"/>
+                            data-localization="label=netmonitor.summary.rawHeaders"/>
                   </hbox>
                   <hbox id="headers-summary-version"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.summary.version;"/>
+                           data-localization="content=netmonitor.summary.version"/>
                     <label id="headers-summary-version-value"
                            class="plain tabpanel-summary-value devtools-monospace"
                            crop="end"
                            flex="1"/>
                   </hbox>
                   <hbox id="raw-headers"
                         class="tabpanel-summary-container"
                         align="center"
                         hidden="true">
                     <vbox id="raw-request-headers-textarea-box" flex="1" hidden="false">
                       <label class="plain tabpanel-summary-label"
-                        value="&netmonitorUI.summary.rawHeaders.requestHeaders;"/>
+                        data-localization="content=netmonitor.summary.rawHeaders.requestHeaders"/>
                       <textbox id="raw-request-headers-textarea"
                         class="raw-response-textarea"
                         flex="1" multiline="true" readonly="true"/>
                     </vbox>
                     <vbox id="raw-response-headers-textarea-box" flex="1" hidden="false">
                       <label class="plain tabpanel-summary-label"
-                        value="&netmonitorUI.summary.rawHeaders.responseHeaders;"/>
+                        data-localization="content=netmonitor.summary.rawHeaders.responseHeaders"/>
                       <textbox id="raw-response-headers-textarea"
                         class="raw-response-textarea"
                         flex="1" multiline="true" readonly="true"/>
                     </vbox>
                   </hbox>
                   <vbox id="all-headers" flex="1"/>
                 </vbox>
               </tabpanel>
@@ -556,173 +537,173 @@
                   </vbox>
                   <vbox id="response-content-textarea-box" flex="1" hidden="true">
                     <vbox id="response-content-textarea" flex="1"/>
                   </vbox>
                   <vbox id="response-content-image-box" flex="1" hidden="true">
                     <image id="response-content-image"/>
                     <hbox>
                       <label class="plain tabpanel-summary-label"
-                             value="&netmonitorUI.response.name;"/>
+                             data-localization="content=netmonitor.response.name"/>
                       <label id="response-content-image-name-value"
                              class="plain tabpanel-summary-value devtools-monospace"
                              crop="end"
                              flex="1"/>
                     </hbox>
                     <hbox>
                       <label class="plain tabpanel-summary-label"
-                             value="&netmonitorUI.response.dimensions;"/>
+                             data-localization="content=netmonitor.response.dimensions"/>
                       <label id="response-content-image-dimensions-value"
                              class="plain tabpanel-summary-value devtools-monospace"
                              crop="end"
                              flex="1"/>
                     </hbox>
                     <hbox>
                       <label class="plain tabpanel-summary-label"
-                             value="&netmonitorUI.response.mime;"/>
+                             data-localization="content=netmonitor.response.mime"/>
                       <label id="response-content-image-mime-value"
                              class="plain tabpanel-summary-value devtools-monospace"
                              crop="end"
                              flex="1"/>
                     </hbox>
                   </vbox>
                 </vbox>
               </tabpanel>
               <tabpanel id="timings-tabpanel"
                         class="tabpanel-content">
                 <vbox flex="1">
                   <hbox id="timings-summary-blocked"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.timings.blocked;"/>
+                           data-localization="content=netmonitor.timings.blocked"/>
                     <hbox class="requests-menu-timings-box blocked"/>
                     <label class="plain requests-menu-timings-total"/>
                   </hbox>
                   <hbox id="timings-summary-dns"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.timings.dns;"/>
+                           data-localization="content=netmonitor.timings.dns"/>
                     <hbox class="requests-menu-timings-box dns"/>
                     <label class="plain requests-menu-timings-total"/>
                   </hbox>
                   <hbox id="timings-summary-connect"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.timings.connect;"/>
+                           data-localization="content=netmonitor.timings.connect"/>
                     <hbox class="requests-menu-timings-box connect"/>
                     <label class="plain requests-menu-timings-total"/>
                   </hbox>
                   <hbox id="timings-summary-send"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.timings.send;"/>
+                           data-localization="content=netmonitor.timings.send"/>
                     <hbox class="requests-menu-timings-box send"/>
                     <label class="plain requests-menu-timings-total"/>
                   </hbox>
                   <hbox id="timings-summary-wait"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.timings.wait;"/>
+                           data-localization="content=netmonitor.timings.wait"/>
                     <hbox class="requests-menu-timings-box wait"/>
                     <label class="plain requests-menu-timings-total"/>
                   </hbox>
                   <hbox id="timings-summary-receive"
                         class="tabpanel-summary-container"
                         align="center">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.timings.receive;"/>
+                           data-localization="content=netmonitor.timings.receive"/>
                     <hbox class="requests-menu-timings-box receive"/>
                     <label class="plain requests-menu-timings-total"/>
                   </hbox>
                 </vbox>
               </tabpanel>
               <tabpanel id="security-tabpanel"
                         class="tabpanel-content">
                   <vbox id="security-error"
                         class="tabpanel-summary-container"
                         flex="1">
                     <label class="plain tabpanel-summary-label"
-                           value="&netmonitorUI.security.error;"/>
+                           data-localization="content=netmonitor.security.error"/>
                     <hbox class="security-info-section"
                           flex="1">
                       <textbox id="security-error-message"
                                class="plain"
                                flex="1"
                                multiline="true"
                                readonly="true"/>
                     </hbox>
                   </vbox>
                   <vbox id="security-information"
                         flex="1">
                     <vbox id="security-info-connection"
                           class="tabpanel-summary-container">
                       <label class="plain tabpanel-summary-label"
-                             value="&netmonitorUI.security.connection;"/>
+                             data-localization="content=netmonitor.security.connection"/>
                       <vbox class="security-info-section">
                         <hbox id="security-protocol-version"
                               class="tabpanel-summary-container"
                               align="baseline">
                           <label class="plain tabpanel-summary-label"
-                                 value="&netmonitorUI.security.protocolVersion;"/>
+                                 data-localization="content=netmonitor.security.protocolVersion"/>
                           <textbox id="security-protocol-version-value"
                                    class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
                                    flex="1"
                                    readonly="true"/>
                         </hbox>
                         <hbox id="security-ciphersuite"
                               class="tabpanel-summary-container"
                               align="baseline">
                           <label class="plain tabpanel-summary-label"
-                                 value="&netmonitorUI.security.cipherSuite;"/>
+                                 data-localization="content=netmonitor.security.cipherSuite"/>
                           <textbox id="security-ciphersuite-value"
                                    class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
                                    flex="1"
                                    readonly="true"/>
                           <image class="security-warning-icon"
                                  id="security-warning-cipher"
-                                 tooltiptext="&netmonitorUI.security.warning.cipher;" />
+                                 data-localization="tooltiptext=netmonitor.security.warning.cipher" />
                         </hbox>
                       </vbox>
                     </vbox>
                     <vbox id="security-info-domain"
                           class="tabpanel-summary-container">
                       <label class="plain tabpanel-summary-label"
                              id="security-info-host-header"/>
                       <vbox class="security-info-section">
                         <hbox id="security-http-strict-transport-security"
                               class="tabpanel-summary-container"
                               align="baseline">
                           <label class="plain tabpanel-summary-label"
-                                 value="&netmonitorUI.security.hsts;"/>
+                                 data-localization="content=netmonitor.security.hsts"/>
                           <textbox id="security-http-strict-transport-security-value"
                                    class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
                                    flex="1"
                                    readonly="true"/>
                         </hbox>
                         <hbox id="security-public-key-pinning"
                               class="tabpanel-summary-container"
                               align="baseline">
                           <label class="plain tabpanel-summary-label"
-                                 value="&netmonitorUI.security.hpkp;"/>
+                                 data-localization="content=netmonitor.security.hpkp"/>
                           <textbox id="security-public-key-pinning-value"
                                    class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
                                    flex="1"
                                    readonly="true"/>
                         </hbox>
                       </vbox>
                     </vbox>
                     <vbox id="security-info-certificate"
                           class="tabpanel-summary-container">
                         <label class="plain tabpanel-summary-label"
-                               value="&netmonitorUI.security.certificate;"/>
+                               data-localization="content=netmonitor.security.certificate"/>
                       <vbox class="security-info-section">
                         <vbox class="tabpanel-summary-container">
                           <label class="plain tabpanel-summary-label"
                                  data-localization="content=certmgr.subjectinfo.label" flex="1"/>
                         </vbox>
                         <vbox class="security-info-section">
                           <hbox class="tabpanel-summary-container"
                                 align="baseline">
@@ -853,17 +834,17 @@
 
     </vbox>
 
     <box id="network-statistics-view">
       <toolbar id="network-statistics-toolbar"
                class="devtools-toolbar">
         <button id="network-statistics-back-button"
                 class="devtools-toolbarbutton"
-                label="&netmonitorUI.backButton;"/>
+                data-localization="label=netmonitor.backButton"/>
       </toolbar>
       <box id="network-statistics-charts"
            class="devtools-responsive-container"
            flex="1">
         <vbox id="primed-cache-chart" pack="center" flex="1"/>
         <splitter id="network-statistics-view-splitter"
                   class="devtools-side-splitter"/>
         <vbox id="empty-cache-chart" pack="center" flex="1"/>