[en-GB] update from Pootle (firefox)
☠☠ backed out by 706ea507fc78 ☠ ☠
authoren-GB team [Pootle] <https://wiki.mozilla.org/L10n:Teams:en-GB>
Mon, 09 Mar 2015 19:18:26 +0000
changeset 482 bdac3e7398874dab9502748b64c641f6d83a0ae6
parent 481 1fd558d8dfe7f64745d0d6228d7413a0c70d4089
child 483 81d17e6becb0331f8dbad8166b918c6cc05c743b
push id86
push userfrancesco.lodolo@mozillaitalia.org
push dateWed, 12 Aug 2015 09:11:41 +0000
[en-GB] update from Pootle (firefox)
browser/branding/official/brand.dtd
browser/branding/official/brand.properties
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutRobots.dtd
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/aboutTabCrashed.dtd
browser/chrome/browser/accounts.properties
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/customizableui/customizableWidgets.properties
browser/chrome/browser/devtools/animationinspector.dtd
browser/chrome/browser/devtools/animationinspector.properties
browser/chrome/browser/devtools/app-manager.dtd
browser/chrome/browser/devtools/app-manager.properties
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/device.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.dtd
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/projecteditor.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/shared.properties
browser/chrome/browser/devtools/storage.properties
browser/chrome/browser/devtools/timeline.dtd
browser/chrome/browser/devtools/timeline.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webaudioeditor.dtd
browser/chrome/browser/devtools/webaudioeditor.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/devtools/webide.dtd
browser/chrome/browser/devtools/webide.properties
browser/chrome/browser/downloads/downloads.dtd
browser/chrome/browser/downloads/downloads.properties
browser/chrome/browser/loop/loop.properties
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/colors.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/cookies.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/search.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/safeMode.dtd
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/search.properties
browser/chrome/browser/searchbar.dtd
browser/chrome/browser/shellservice.properties
browser/chrome/browser/syncCustomize.dtd
browser/chrome/browser/translation.properties
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
browser/pdfviewer/viewer.properties
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/calendar/calendar-extract.properties
calendar/chrome/calendar/calendar-invitations-dialog.dtd
calendar/chrome/calendar/calendar-occurrence-prompt.dtd
calendar/chrome/calendar/calendar-occurrence-prompt.properties
calendar/chrome/calendar/calendar-subscriptions-dialog.dtd
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/calendar.properties
calendar/chrome/calendar/categories.properties
calendar/chrome/calendar/global.dtd
calendar/chrome/calendar/menuOverlay.dtd
calendar/chrome/calendar/preferences/alarms.dtd
calendar/chrome/calendar/preferences/categories.dtd
calendar/chrome/calendar/preferences/general.dtd
calendar/chrome/calendar/preferences/views.dtd
calendar/chrome/calendar/providers/gdata/amo.properties
calendar/chrome/calendar/providers/gdata/gdata.dtd
calendar/chrome/calendar/providers/gdata/gdata.properties
calendar/chrome/calendar/timezones.properties
calendar/chrome/lightning/lightning-toolbar.dtd
calendar/chrome/lightning/lightning.dtd
calendar/chrome/lightning/lightning.properties
chat/irc.properties
chat/xmpp.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/appstrings.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
dom/chrome/plugins.properties
dom/chrome/security/security.properties
editor/ui/chrome/composer/editingOverlay.dtd
editor/ui/chrome/composer/editor.dtd
editor/ui/chrome/composer/editor.properties
editor/ui/chrome/composer/editorOverlay.dtd
editor/ui/chrome/composer/editorPrefsOverlay.dtd
editor/ui/chrome/composer/editorSmileyOverlay.dtd
editor/ui/chrome/composer/pref-composer.dtd
editor/ui/chrome/dialogs/EdConvertToTable.dtd
editor/ui/chrome/dialogs/EdDialogOverlay.dtd
editor/ui/chrome/dialogs/EdLinkChecker.dtd
editor/ui/chrome/dialogs/EdNamedAnchorProperties.dtd
editor/ui/chrome/dialogs/EditConflict.dtd
editor/ui/chrome/dialogs/EditorColorProperties.dtd
editor/ui/chrome/dialogs/EditorFieldSetProperties.dtd
editor/ui/chrome/dialogs/EditorHLineProperties.dtd
editor/ui/chrome/dialogs/EditorImageProperties.dtd
editor/ui/chrome/dialogs/EditorInputProperties.dtd
editor/ui/chrome/dialogs/EditorInsertChars.dtd
editor/ui/chrome/dialogs/EditorInsertMath.dtd
editor/ui/chrome/dialogs/EditorInsertSource.dtd
editor/ui/chrome/dialogs/EditorInsertTable.dtd
editor/ui/chrome/dialogs/EditorListProperties.dtd
editor/ui/chrome/dialogs/EditorPageProperties.dtd
editor/ui/chrome/dialogs/EditorPersonalDictionary.dtd
editor/ui/chrome/dialogs/EditorPublish.dtd
editor/ui/chrome/dialogs/EditorPublishProgress.dtd
editor/ui/chrome/dialogs/EditorReplace.dtd
editor/ui/chrome/dialogs/EditorSaveAsCharset.dtd
editor/ui/chrome/dialogs/EditorSnapToGrid.dtd
editor/ui/chrome/dialogs/EditorSpellCheck.dtd
editor/ui/chrome/dialogs/EditorTableProperties.dtd
mail/chrome/communicator/utilityOverlay.dtd
mail/chrome/messenger-mapi/mapi.properties
mail/chrome/messenger-newsblog/am-newsblog.dtd
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger-smime/certFetchingStatus.dtd
mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
mail/chrome/messenger-smime/msgCompSecurityInfo.dtd
mail/chrome/messenger-smime/msgReadSMIMEOverlay.dtd
mail/chrome/messenger-smime/msgReadSMIMEOverlay.properties
mail/chrome/messenger-smime/msgReadSecurityInfo.dtd
mail/chrome/messenger-smime/msgSecurityInfo.properties
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/SearchDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/aboutRights.dtd
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/accountCreation.properties
mail/chrome/messenger/activity.dtd
mail/chrome/messenger/activity.properties
mail/chrome/messenger/addressbook/abAddressBookNameDialog.dtd
mail/chrome/messenger/addressbook/abCardOverlay.dtd
mail/chrome/messenger/addressbook/abMailListDialog.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/abNewCardDialog.dtd
mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/addressbook/pref-directory-add.dtd
mail/chrome/messenger/addressbook/pref-directory.dtd
mail/chrome/messenger/am-addressing.dtd
mail/chrome/messenger/am-advanced.dtd
mail/chrome/messenger/am-archiveoptions.dtd
mail/chrome/messenger/am-copies.dtd
mail/chrome/messenger/am-main.dtd
mail/chrome/messenger/am-offline.dtd
mail/chrome/messenger/am-server-advanced.dtd
mail/chrome/messenger/am-server-top.dtd
mail/chrome/messenger/baseMenuOverlay.dtd
mail/chrome/messenger/chat.dtd
mail/chrome/messenger/chat.properties
mail/chrome/messenger/cloudfile/Box/auth.dtd
mail/chrome/messenger/cloudfile/Box/settings.dtd
mail/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd
mail/chrome/messenger/downloadheaders.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/glodaComplete.properties
mail/chrome/messenger/glodaFacetView.dtd
mail/chrome/messenger/imAccounts.properties
mail/chrome/messenger/imapMsgs.properties
mail/chrome/messenger/importDialog.dtd
mail/chrome/messenger/junkLog.dtd
mail/chrome/messenger/localMsgs.properties
mail/chrome/messenger/mailEditorOverlay.dtd
mail/chrome/messenger/mailOverlay.dtd
mail/chrome/messenger/mailViewList.dtd
mail/chrome/messenger/mailViewSetup.dtd
mail/chrome/messenger/markByDate.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/addressingWidgetOverlay.dtd
mail/chrome/messenger/messengercompose/askSendFormat.dtd
mail/chrome/messenger/messengercompose/askSendFormat.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/mailComposeEditorOverlay.dtd
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/messengercompose/sendProgress.dtd
mail/chrome/messenger/messengercompose/sendProgress.properties
mail/chrome/messenger/mime.properties
mail/chrome/messenger/mimeheader.properties
mail/chrome/messenger/msgAccountCentral.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/msgPrintEngine.dtd
mail/chrome/messenger/msgSynchronize.dtd
mail/chrome/messenger/msgViewPickerOverlay.dtd
mail/chrome/messenger/multimessageview.properties
mail/chrome/messenger/newFolderDialog.dtd
mail/chrome/messenger/newTagDialog.dtd
mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
mail/chrome/messenger/newmailaccount/accountProvisioner.properties
mail/chrome/messenger/news.properties
mail/chrome/messenger/offline.properties
mail/chrome/messenger/offlineStartup.properties
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/preferences/applications.dtd
mail/chrome/messenger/preferences/chat.dtd
mail/chrome/messenger/preferences/colors.dtd
mail/chrome/messenger/preferences/compose.dtd
mail/chrome/messenger/preferences/connection.dtd
mail/chrome/messenger/preferences/cookies.dtd
mail/chrome/messenger/preferences/display.dtd
mail/chrome/messenger/preferences/fonts.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/preferences/notifications.dtd
mail/chrome/messenger/preferences/offline.dtd
mail/chrome/messenger/preferences/permissions.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/preferences.properties
mail/chrome/messenger/preferences/privacy.dtd
mail/chrome/messenger/preferences/security.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/quickFilterBar.dtd
mail/chrome/messenger/renameFolderDialog.dtd
mail/chrome/messenger/sanitize.dtd
mail/chrome/messenger/searchIntegrationDefault.dtd
mail/chrome/messenger/searchTermOverlay.dtd
mail/chrome/messenger/shutdownWindow.properties
mail/chrome/messenger/subscribe.dtd
mail/chrome/messenger/subscribe.properties
mail/chrome/messenger/systemIntegrationDialog.dtd
mail/chrome/messenger/tabmail.dtd
mail/chrome/messenger/textImportMsgs.properties
mail/chrome/messenger/viewZoomOverlay.dtd
mail/chrome/messenger/virtualFolderListDialog.dtd
mail/chrome/overrides/netError.dtd
mail/defines.inc
mail/updater/updater.ini
mobile/android/base/android_strings.dtd
mobile/android/base/search_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/about.dtd
mobile/android/chrome/aboutFeedback.dtd
mobile/android/chrome/aboutHome.dtd
mobile/android/chrome/aboutPasswords.dtd
mobile/android/chrome/aboutPasswords.properties
mobile/android/chrome/browser.properties
mobile/android/chrome/handling.properties
mobile/android/chrome/webapp.properties
mobile/android/chrome/webcompatReporter.properties
mobile/android/defines.inc
mobile/overrides/appstrings.properties
mobile/overrides/netError.dtd
netwerk/necko.properties
other-licenses/branding/thunderbird/brand.dtd
other-licenses/branding/thunderbird/brand.properties
security/manager/chrome/pipnss/nsserrors.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pipnss/security.properties
security/manager/chrome/pippki/certManager.dtd
security/manager/chrome/pippki/deviceManager.dtd
security/manager/chrome/pippki/pippki.dtd
security/manager/chrome/pippki/pippki.properties
services/sync/sync.properties
toolkit/chrome/global/aboutReader.properties
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/aboutTelemetry.properties
toolkit/chrome/global/autocomplete.properties
toolkit/chrome/global/browser.properties
toolkit/chrome/global/charsetMenu.properties
toolkit/chrome/global/devtools/debugger.properties
toolkit/chrome/global/fallbackMenubar.properties
toolkit/chrome/global/resetProfile.dtd
toolkit/chrome/global/resetProfile.properties
toolkit/chrome/global/textcontext.dtd
toolkit/chrome/mozapps/downloads/downloads.properties
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/handling/handling.properties
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/passwordmgr/passwordManager.dtd
webapprt/webapprt/overrides/appstrings.properties
--- a/browser/branding/official/brand.dtd
+++ b/browser/branding/official/brand.dtd
@@ -1,8 +1,7 @@
 <!-- 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/. -->
-
 <!ENTITY  brandShortName        "Firefox">
 <!ENTITY  brandFullName         "Mozilla Firefox">
 <!ENTITY  vendorShortName       "Mozilla">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logo's are trademarks of the Mozilla Foundation.">
--- a/browser/branding/official/brand.properties
+++ b/browser/branding/official/brand.properties
@@ -1,12 +1,13 @@
 # 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/.
 
+brandShorterName=Firefox
 brandShortName=Firefox
 brandFullName=Mozilla Firefox
 vendorShortName=Mozilla
 
 homePageSingleStartMain=Firefox Start, a fast home page with built-in search
 homePageImport=Import your home page from %S
 
 homePageMigrationPageTitle=Home Page Selection
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,107 +1,103 @@
 <!-- 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/.  -->
 <!ENTITY aboutDialog.title          "About &brandFullName;">
-
 <!-- LOCALIZATION NOTE (update.checkForUpdatesButton.*, update.updateButton.*, update.applyButtonBillboard.*):
 # Only one button is present at a time.
 # The button when displayed is located directly under the Firefox version in
 # the about dialog (see bug 596813 for screenshots).
 -->
+
 <!ENTITY update.checkForUpdatesButton.label       "Check for updates">
 <!ENTITY update.checkForUpdatesButton.accesskey   "C">
 <!ENTITY update.updateButton.label2                "Restart &brandShortName; to Update">
-<!ENTITY update.updateButton.accesskey            "R">
+
 <!ENTITY update.applyButtonBillboard.label        "Apply Update…">
 <!ENTITY update.applyButtonBillboard.accesskey    "A">
+<!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 
 
-<!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 <!ENTITY warningDesc.version        "&brandShortName; is experimental and may be unstable.">
 <!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
-<!ENTITY warningDesc.telemetryDesc  "It automatically sends information about performance, hardware, usage and customisations back to &vendorShortName; to help make &brandShortName; better.">
+<!ENTITY warningDesc.telemetryDesc  "It automatically sends information about performance, hardware, usage and customization's back to &vendorShortName; to help make &brandShortName; better.">
+<!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 
-<!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 <!ENTITY community.exp.start        "">
 <!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.exp.mozillaLink  "&vendorShortName;">
 <!ENTITY community.exp.middle       " is a ">
 <!-- LOCALIZATION NOTE (community.exp.creditslink): This is a link title that links to about:credits. -->
-<!ENTITY community.exp.creditsLink  "global community">
+<!ENTITY community.exp.creditsLink  "Global Community">
 <!ENTITY community.exp.end          " working together to keep the Web open, public and accessible to all.">
 
 <!ENTITY community.start2           "&brandShortName; is designed by ">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
-<!ENTITY community.mozillaLink      "&vendorShortName;">
 <!ENTITY community.middle2          ", a ">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
-<!ENTITY community.creditsLink      "global community">
-<!ENTITY community.end3             " working together to keep the Web open, public and accessible to all.">
+<!ENTITY community.creditsLink      "Global Community">
 
-<!ENTITY helpus.start               "Want to help? ">
+
 <!-- LOCALIZATION NOTE (helpus.donateLink): This is a link title that links to https://sendto.mozilla.org/page/contribute/Give-Now?source=mozillaorg_default_footer&ref=firefox_about&utm_campaign=firefox_about&utm_source=firefox&utm_medium=referral&utm_content=20140929_FireFoxAbout. -->
-<!ENTITY helpus.donateLink          "Make a donation">
-<!ENTITY helpus.middle              " or ">
+
 <!-- LOCALIZATION NOTE (helpus.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
-<!ENTITY helpus.getInvolvedLink     "get involved!">
 <!ENTITY helpus.end                 "">
+<!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 
-<!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "Licensing Information">
+<!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 
-<!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 <!ENTITY bottomLinks.rights         "End-User Rights">
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 
-<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 <!ENTITY bottomLinks.privacy        "Privacy Policy">
+<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 
-<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingForUpdates  "Checking for updates…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
 <!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
 <!ENTITY update.otherInstanceHandlingUpdates "&brandShortName; is being updated by another instance">
-
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
      the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
      one line, try to make the localized text short (see bug 596813 for screenshots). -->
+
 <!ENTITY update.failed.start        "Update failed. ">
 <!ENTITY update.failed.linkText     "Download the latest version">
 <!ENTITY update.failed.end          "">
-
 <!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
      all go into one line and have an anchor in between with text that is the same as the link to a site
      to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
      try to make the localized text short (see bug 596813 for screenshots). -->
+
 <!ENTITY update.manual.start        "Updates available at ">
 <!ENTITY update.manual.end          "">
-
 <!-- LOCALIZATION NOTE (update.unsupported.start,update.unsupported.linkText,update.unsupported.end):
      update.unsupported.start, update.unsupported.linkText, and
      update.unsupported.end all go into one line with linkText being wrapped in
      an anchor that links to a site to provide additional information regarding
      why the system is no longer supported. As this is all in one line, try to
      make the localized text short (see bug 843497 for screenshots). -->
+
 <!ENTITY update.unsupported.start    "You can not perform further updates on this system. ">
 <!ENTITY update.unsupported.linkText "Learn more">
 <!ENTITY update.unsupported.end      "">
-
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
+
 <!ENTITY update.downloading.start   "Downloading update — ">
 <!ENTITY update.downloading.end     "">
 
 <!ENTITY update.applying            "Applying update…">
-
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
+
 <!ENTITY channel.description.start  "You are currently on the ">
-<!ENTITY channel.description.end    " update channel. ">
+<!ENTITY channel.description.end    "Update Channels">
--- a/browser/chrome/browser/aboutRobots.dtd
+++ b/browser/chrome/browser/aboutRobots.dtd
@@ -1,19 +1,16 @@
 <!-- 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/. -->
 <!-- These strings are used in the about:robots page, which ties in with the
      robots theme used in the Firefox 3 Beta 2/3 first run pages.
      They're just meant to be fun and whimsical, with references to some geeky
      but well-known robots in movies and books. Be creative with translations! -->
 <!-- Nonsense line from the movie "The Day The Earth Stood Still". No translation needed. -->
-
-
-<!ENTITY robots.pagetitle  "Gort! Klaatu barada nikto!">
 <!-- Movie: Logan's Run... Box (cybog): "Welcome Humans! I am ready for you." -->
 <!ENTITY robots.errorTitleText "Welcome Humans!">
 <!-- Movie: The Day The Earth Stood Still. Spoken by Klaatu. -->
 <!ENTITY robots.errorShortDescText "We have come to visit you in peace and with goodwill!">
 <!-- Various books by Isaac Asimov. http://en.wikipedia.org/wiki/Three_Laws_of_Robotics -->
 <!ENTITY robots.errorLongDesc1 "Robots may not injure a human being or, through inaction, allow a human being to come to harm.">
 <!-- Movie: Blade Runner. Batty: "I've seen things you people wouldn't believe..." -->
 <!ENTITY robots.errorLongDesc2 "Robots have seen things you people wouldn't believe.">
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -8,42 +8,31 @@
 
 <!ENTITY restorepage.errorTitle     "Well, this is embarrassing.">
 <!ENTITY restorepage.problemDesc    "&brandShortName; is having trouble recovering your windows and tabs. This is usually caused by a recently opened web page.">
 <!ENTITY restorepage.tryThis        "You can try:">
 <!ENTITY restorepage.restoreSome    "Removing one or more tabs that you think may be causing the problem">
 <!ENTITY restorepage.startNew       "Starting an entirely new browsing session">
 
 <!ENTITY restorepage.tryagainButton "Restore">
-<!ENTITY restorepage.restore.access "R">
+
 <!ENTITY restorepage.closeButton    "Close">
-<!ENTITY restorepage.close.access   "C">
 
-<!ENTITY restorepage.restoreHeader  "Restore">
+
 <!ENTITY restorepage.listHeader     "Windows and Tabs">
 <!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
 <!ENTITY restorepage.windowLabel    "Window &#037;S">
-
-
 <!-- LOCALIZATION NOTE: The following 'welcomeback2' strings are for about:welcomeback,
      not for about:sessionstore -->
-<!ENTITY welcomeback2.restoreButton  "Let's go!">
-<!ENTITY welcomeback2.restoreButton.access "L">
 
-<!ENTITY welcomeback2.tabtitle      "Success!">
 
-<!ENTITY welcomeback2.pageTitle     "Success!">
-<!ENTITY welcomeback2.pageInfo1     "&brandShortName; is ready to go.">
 
-<!ENTITY welcomeback2.label.restoreAll  "Restore all Windows and Tabs">
-<!ENTITY welcomeback2.label.restoreSome "Restore only the ones you want">
+
 
 
 <!-- LOCALIZATION NOTE (welcomeback2.beforelink.pageInfo2,
 welcomeback2.afterlink.pageInfo2): these two string are used respectively
 before and after the the "learn more" link (welcomeback2.link.pageInfo2).
 Localizers can use one of them, or both, to better adapt this sentence to
 their language.
 -->
-<!ENTITY welcomeback2.beforelink.pageInfo2  "Your add-ons and customisations have been removed and your browser settings have been restored to their defaults. If this didn't fix your issue, ">
 <!ENTITY welcomeback2.afterlink.pageInfo2   "">
 
-<!ENTITY welcomeback2.link.pageInfo2        "learn more about what you can do.">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/aboutTabCrashed.dtd
@@ -0,0 +1,9 @@
+<!-- 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/. -->
+
+
+
+
+
+
--- a/browser/chrome/browser/accounts.properties
+++ b/browser/chrome/browser/accounts.properties
@@ -1,46 +1,30 @@
 # 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 (needUserShort)
 # %S = Firefox Accounts brand name from syncBrand.dtd
-needUserShort = %S required for sync
-needUserLong = We've rebuilt Sync to make it easier for everyone. Please upgrade to a Firefox Account to continue synchronising.
 
 upgradeToFxA.label = Upgrade
 upgradeToFxA.accessKey = U
 
 # LOCALIZATION NOTE (signInAfterUpgradeOnOtherDevice.description)
 # %S = Email address of user's Firefox Account
-signInAfterUpgradeOnOtherDevice.description = Sync was upgraded on another device by %S. Resume synchronising?
 signInAfterUpgradeOnOtherDevice.label = Sign In
 signInAfterUpgradeOnOtherDevice.accessKey = S
 
 # LOCALIZATION NOTE (needVerifiedUserShort, needVerifiedUserLong)
 # %S = Email address of user's Firefox Account
-needVerifiedUserShort = %S not verified
-needVerifiedUserLong = Please click the verification link in the email sent to %S
 
-resendVerificationEmail.label = Resend
-resendVerificationEmail.accessKey = R
 
-forgetMigration.label = Forget
-forgetMigration.accessKey = F
 
-unlinkMigration.label = Unlink Sync
-unlinkMigration.accessKey = l
 
-unlinkVerificationTitle = Unlink old version of Sync?
-unlinkVerificationDescription = If you no longer want to be reminded about upgrading Sync, you can unlink your old Sync account to remove it.
 unlinkVerificationConfirm = Unlink
 
 # These strings are used in a dialog we display after the user requests we resend
 # a verification email.
 verificationSentTitle = Verification Sent
 # LOCALIZATION NOTE (verificationSentHeading) - %S = Email address of user's Firefox Account
 verificationSentHeading = A verification link has been sent to %S
 verificationSentDescription = Please check your email and click the link to begin synchronising.
 
-verificationNotSentTitle = Unable to Send Verification
-verificationNotSentHeading = We are unable to send a verification mail at this time
-verificationNotSentDescription = Please try again later.
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -1,52 +1,46 @@
 <!-- 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/. -->
-
-<!ENTITY minimizeWindow.key       "m">
 <!ENTITY minimizeWindow.label     "Minimise">
 <!ENTITY bringAllToFront.label    "Bring All to Front">
 <!ENTITY zoomWindow.label         "Zoom">
 <!ENTITY windowMenu.label         "Window">
 
 <!ENTITY helpMenu.label           "Help"> 
 <!ENTITY helpMenu.accesskey       "H"> 
 <!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
                        for the help button in the menubar but Gnome does not.   -->
-<!ENTITY helpMenuWin.label        "Help"> 
-<!ENTITY helpMenuWin.accesskey    "H">
-<!ENTITY aboutProduct.label       "About &brandShortName;">
-<!ENTITY aboutProduct.accesskey   "A">
-<!ENTITY productHelp.label        "&brandShortName; Help">
-<!ENTITY productHelp.accesskey    "H">
-<!ENTITY helpMac.commandkey       "?">
+
+
+
+
+
+
 
 <!ENTITY helpKeyboardShortcuts.label     "Keyboard Shortcuts">
 <!ENTITY helpKeyboardShortcuts.accesskey "K">
 
 <!ENTITY helpSafeMode.label       "Restart with Add-ons Disabled…">
 <!ENTITY helpSafeMode.accesskey   "R">
 
-<!ENTITY healthReport.label       "&brandShortName; Health Report">
-<!ENTITY healthReport.accesskey   "e">
+
 
 <!ENTITY helpTroubleshootingInfo.label      "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey  "T">
 
 <!ENTITY helpFeedbackPage.label      "Submit Feedback…">
 <!ENTITY helpFeedbackPage.accesskey  "S">
 
-<!ENTITY helpShowTour.label             "&brandShortName; Tour">
-<!ENTITY helpShowTour.accesskey         "o">
+
 
 <!ENTITY preferencesCmdMac.label        "Preferences…">
-<!ENTITY preferencesCmdMac.commandkey   ",">
+
 
 <!ENTITY servicesMenuMac.label          "Services">
 
-<!ENTITY hideThisAppCmdMac.label        "Hide &brandShortName;">
-<!ENTITY hideThisAppCmdMac.commandkey   "H">
+
 
 <!ENTITY hideOtherAppsCmdMac.label      "Hide Others">
-<!ENTITY hideOtherAppsCmdMac.commandkey "H">
+
 
 <!ENTITY showAllAppsCmdMac.label        "Show All">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -1,46 +1,46 @@
 <!-- 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 browser main menu items -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys --> 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
 
-<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+
 <!ENTITY mainWindow.title "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifier "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 <!-- LOCALIZATION NOTE (mainWindow.titlePrivateBrowsingSuffix): This will be appended to the window's title
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Private Browsing)">
 
 <!ENTITY appmenu.tooltip                     "Open menu">
 <!ENTITY navbarOverflow.label                "More tools…">
+<!-- Tab context menu -->
 
-<!-- Tab context menu -->
 <!ENTITY  reloadTab.label                    "Reload Tab">
 <!ENTITY  reloadTab.accesskey                "R">
 <!ENTITY  reloadAllTabs.label                "Reload All Tabs">
 <!ENTITY  reloadAllTabs.accesskey            "A">
 <!-- LOCALIZATION NOTE (closeTabsToTheEnd.label): This should indicate the
 direction in which tabs are closed, i.e. locales that use RTL mode should say
 left instead of right. -->
 <!ENTITY  closeTabsToTheEnd.label            "Close Tabs to the Right">
 <!ENTITY  closeTabsToTheEnd.accesskey        "i">
 <!ENTITY  closeOtherTabs.label               "Close Other Tabs">
 <!ENTITY  closeOtherTabs.accesskey           "o">
-
 <!-- LOCALIZATION NOTE (pinTab.label, unpinTab.label): "Pin" is being
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
 left edge of the tabstrip. Really we just want the string to express the idea
 that this is a lightweight and reversible action that keeps your tab where you
 can reach it easily. -->
+
 <!ENTITY  pinTab.label                       "Pin Tab">
 <!ENTITY  pinTab.accesskey                   "P">
 <!ENTITY  unpinTab.label                     "Unpin Tab">
 <!ENTITY  unpinTab.accesskey                 "b">
 <!ENTITY  moveToGroup.label                  "Move to Group">
 <!ENTITY  moveToGroup.accesskey              "M">
 <!ENTITY  moveToNewGroup.label               "New Group">
 <!ENTITY  moveToNewWindow.label              "Move to New Window">
@@ -51,66 +51,65 @@ can reach it easily. -->
 <!ENTITY  undoCloseTab.accesskey             "U">
 <!ENTITY  closeTab.label                     "Close Tab">
 <!ENTITY  closeTab.accesskey                 "C">
 
 <!ENTITY  listAllTabs.label      "List all tabs">
 
 <!ENTITY tabCmd.label "New Tab">
 <!ENTITY tabCmd.accesskey "T">
-<!ENTITY tabCmd.commandkey "t">
+
 <!-- LOCALIZATION NOTE (openLocationCmd.label): "Open Location" is only
 displayed on OS X, and only on windows that aren't main browser windows, or
 when there are no windows but Firefox is still running. -->
 <!ENTITY openLocationCmd.label "Open Location…">
 <!ENTITY openFileCmd.label "Open File…">
 <!ENTITY openFileCmd.accesskey "O">
-<!ENTITY openFileCmd.commandkey "o">
+
 <!ENTITY printSetupCmd.label "Page Setup…">
 <!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printPreviewCmd.label "Print Preview">
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.accesskey "P">
-<!ENTITY printCmd.commandkey "p">
+
 
 <!ENTITY goOfflineCmd.label "Work Offline">
 <!ENTITY goOfflineCmd.accesskey "k">
 
 <!ENTITY menubarCmd.label "Menu Bar">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "Navigation Toolbar">
 <!ENTITY personalbarCmd.label "Bookmarks Toolbar">
 <!ENTITY personalbarCmd.accesskey "B">
 <!ENTITY bookmarksToolbarItem.label "Bookmarks Toolbar Items">
 
-<!ENTITY toolbarContextMenu.reloadAllTabs.label "Reload All Tabs">
-<!ENTITY toolbarContextMenu.reloadAllTabs.accesskey "A">
-<!ENTITY toolbarContextMenu.bookmarkAllTabs.label "Bookmark All Tabs…">
-<!ENTITY toolbarContextMenu.bookmarkAllTabs.accesskey "T">
-<!ENTITY toolbarContextMenu.undoCloseTab.label "Undo Close Tab">
-<!ENTITY toolbarContextMenu.undoCloseTab.accesskey "U">
+
+
+
+
+
 
 <!ENTITY pageSourceCmd.label "Page Source">
 <!ENTITY pageSourceCmd.accesskey "o">
-<!ENTITY pageSourceCmd.commandkey "u">
+
 <!ENTITY pageInfoCmd.label "Page Info">
 <!ENTITY pageInfoCmd.accesskey "I">
-<!ENTITY pageInfoCmd.commandkey "i">
-<!ENTITY mirrorTabCmd.label "Mirror Tab">
-<!ENTITY mirrorTabCmd.accesskey "M">
+
+
+
 <!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
 These should match what Safari and other Apple applications use on OS X Lion. -->
 <!ENTITY enterFullScreenCmd.label "Enter Full Screen">
 <!ENTITY enterFullScreenCmd.accesskey "F">
 <!ENTITY exitFullScreenCmd.label "Exit Full Screen">
 <!ENTITY exitFullScreenCmd.accesskey "F">
 <!ENTITY fullScreenCmd.label "Full Screen">
 <!ENTITY fullScreenCmd.accesskey "F">
-<!ENTITY fullScreenCmd.macCommandKey "f">
+
 <!ENTITY showAllTabsCmd.label "Show All Tabs">
 <!ENTITY showAllTabsCmd.accesskey "A">
 
 <!ENTITY fxaSignIn.label "Sign in to &syncBrand.shortName.label;">
 <!ENTITY fxaSignInError.label "Reconnect to &syncBrand.shortName.label;">
 <!ENTITY syncStartPanel2.heading "&syncBrand.shortName.label; enabled">
 <!ENTITY syncStartPanel2.subTitle "&brandShortName; will begin synchronising momentarily.">
 <!ENTITY syncErrorPanel.heading "Cannot connect to &syncBrand.shortName.label;">
@@ -135,34 +134,32 @@ These should match what Safari and other
 
 <!ENTITY closeWindow.label "Close Window">
 <!ENTITY closeWindow.accesskey "d">
 
 <!ENTITY bookmarksMenu.label "Bookmarks">
 <!ENTITY bookmarksMenu.accesskey "B">
 <!ENTITY bookmarkThisPageCmd.label "Bookmark This Page">
 <!ENTITY editThisBookmarkCmd.label "Edit This Bookmark">
-<!ENTITY bookmarkThisPageCmd.commandkey "d">
-<!ENTITY markPageCmd.commandkey "l">
+
+
 <!-- LOCALIZATION NOTE (findShareServices.label):
   -  Use the unicode ellipsis char, \u2026,
   -  or use "..." if \u2026 doesn't suit traditions in your locale. -->
-<!ENTITY findShareServices.label "Find more Share services…">
 <!ENTITY sharePageCmd.label "Share This Page">
-<!ENTITY sharePageCmd.commandkey "S">
+
 <!ENTITY sharePageCmd.accesskey "S">
 <!-- LOCALIZATION NOTE (shareLink.accesskey): must be different than the following share access keys -->
-<!ENTITY shareLink.label "Share This Link">
-<!ENTITY shareLink.accesskey "h">
-<!ENTITY shareImage.label "Share This Image">
-<!ENTITY shareImage.accesskey "r">
-<!ENTITY shareSelect.label "Share Selection">
-<!ENTITY shareSelect.accesskey "r">
-<!ENTITY shareVideo.label "Share This Video">
-<!ENTITY shareVideo.accesskey "r">
+
+
+
+
+
+
+
 <!ENTITY feedsMenu.label "Subscribe">
 <!ENTITY subscribeToPageMenupopup.label "Subscribe to This Page">
 <!ENTITY subscribeToPageMenuitem.label "Subscribe to This Page…">
 <!ENTITY addCurPagesCmd.label "Bookmark All Tabs…">
 <!ENTITY showAllBookmarks2.label "Show All Bookmarks">
 <!ENTITY unsortedBookmarksCmd.label "Unsorted Bookmarks">
 <!ENTITY bookmarksToolbarChevron.tooltip "Show more bookmarks">
 
@@ -170,176 +167,170 @@ These should match what Safari and other
 <!ENTITY backButton.tooltip           "Go backwards one page">
 <!ENTITY forwardCmd.label             "Forwards">
 <!ENTITY forwardButton.tooltip        "Go forwards one page">
 <!ENTITY backForwardButtonMenu.tooltip "Right-click or pull down to show history">
 <!ENTITY backForwardButtonMenuMac.tooltip "Pull down to show history">
 <!ENTITY reloadCmd.label              "Reload">
 <!ENTITY reloadButton.tooltip         "Reload current page">
 <!ENTITY stopCmd.label                "Stop">
-<!ENTITY stopCmd.macCommandKey        ".">
+
 <!ENTITY stopButton.tooltip           "Stop loading this page">
 <!ENTITY goEndCap.tooltip             "Go to the address in the Location Bar">
 <!ENTITY printButton.label            "Print">
 <!ENTITY printButton.tooltip          "Print this page">
 
 <!ENTITY locationItem.title           "Location">
 <!ENTITY searchItem.title             "Search">
+<!-- Toolbar items --> 
 
-<!-- Toolbar items --> 
 <!ENTITY homeButton.label             "Home">
 
 <!ENTITY tabGroupsButton.label        "Tab Groups">
 
 <!ENTITY bookmarksButton.label          "Bookmarks">
-<!ENTITY bookmarksCmd.commandkey "b">
+
 
-<!ENTITY bookmarksMenuButton.label          "Bookmarks">
-<!ENTITY bookmarksMenuButton.unsorted.label "Unsorted Bookmarks">
+
 <!ENTITY viewBookmarksSidebar2.label        "View Bookmarks Sidebar">
 <!ENTITY viewBookmarksToolbar.label         "View Bookmarks Toolbar">
-
 <!-- LOCALIZATION NOTE (bookmarksSidebarGtkCmd.commandkey): This command
   -  key should not contain the letters A-F, since these are reserved
   -  shortcut keys on Linux. -->
-<!ENTITY bookmarksGtkCmd.commandkey "o">
-<!ENTITY bookmarksWinCmd.commandkey "i">
+
 
 <!ENTITY historyButton.label            "History">
-<!ENTITY historySidebarCmd.commandKey   "h">
+
 
 <!ENTITY toolsMenu.label              "Tools">
 <!ENTITY toolsMenu.accesskey          "T"> 
 
 <!ENTITY keywordfield.label           "Add a Keyword for this Search…">
 <!ENTITY keywordfield.accesskey       "K">
 
 <!ENTITY downloads.label              "Downloads">
 <!ENTITY downloads.accesskey          "D">
-<!ENTITY downloads.commandkey         "j">
-<!ENTITY downloadsUnix.commandkey     "y">
+
+
 <!ENTITY addons.label                 "Add-ons">
 <!ENTITY addons.accesskey             "A">
-<!ENTITY addons.commandkey            "A">
-<!ENTITY webapps.label                "Apps">
-<!ENTITY webapps.accesskey            "p">
+
+
+
 
 <!ENTITY webDeveloperMenu.label       "Web Developer">
 <!ENTITY webDeveloperMenu.accesskey   "W">
 
 <!ENTITY devToolsCmd.keycode          "VK_F12">
 <!ENTITY devToolsCmd.keytext          "F12">
 
 <!ENTITY devtoolsConnect.label        "Connect…">
 <!ENTITY devtoolsConnect.accesskey    "e">
 
 <!ENTITY errorConsoleCmd.label        "Error Console">
 <!ENTITY errorConsoleCmd.accesskey    "C">
 
 <!ENTITY remoteWebConsoleCmd.label    "Remote Web Console">
 
 <!ENTITY browserConsoleCmd.label      "Browser Console">
-<!ENTITY browserConsoleCmd.commandkey "j">
+
 <!ENTITY browserConsoleCmd.accesskey  "B">
 
 <!ENTITY inspectContextMenu.label     "Inspect Element">
-<!ENTITY inspectContextMenu.accesskey "Q">
+
 
 <!ENTITY responsiveDesignTool.label   "Responsive Design View">
 <!ENTITY responsiveDesignTool.accesskey "R">
-<!ENTITY responsiveDesignTool.commandkey "M">
+
 
 <!ENTITY eyedropper.label   "Eyedropper">
 <!ENTITY eyedropper.accesskey "y">
-
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
+
 <!ENTITY scratchpad.label             "Scratchpad">
 <!ENTITY scratchpad.accesskey         "S">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
-
 <!-- LOCALIZATION NOTE (browserToolboxMenu.label): This is the label for the
   -  application menu item that opens the browser toolbox UI in the Tools menu. -->
+
 <!ENTITY browserToolboxMenu.label     "Browser Toolbox">
 <!ENTITY browserToolboxMenu.accesskey "e">
-
 <!-- LOCALIZATION NOTE (browserContentToolboxMenu.label): This is the label for the
   -  application menu item that opens the browser content toolbox UI in the Tools menu.
   -  This toolbox allows to debug the chrome of the content process in multiprocess builds.  -->
-<!ENTITY browserContentToolboxMenu.label     "Browser Content Toolbox">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Close Developer Toolbar">
 <!ENTITY devToolbarMenu.label              "Developer Toolbar">
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devAppMgrMenu.label               "App Manager">
 <!ENTITY devAppMgrMenu.accesskey           "A">
 <!ENTITY webide.label                      "WebIDE">
 <!ENTITY webide.accesskey                  "W">
 <!ENTITY webide.keycode                    "VK_F8">
 <!ENTITY webide.keytext                    "F8">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolboxMenuItem.label          "Toggle Tools">
 <!ENTITY devToolboxMenuItem.accesskey      "T">
-<!ENTITY devToolboxMenuItem.keytext        "I">
+
 
 <!ENTITY devToolbarToolsButton.tooltip     "Toggle developer tools">
 <!ENTITY devToolbarOtherToolsButton.label  "More Tools">
 
 <!ENTITY getMoreDevtoolsCmd.label        "Get More Tools">
 <!ENTITY getMoreDevtoolsCmd.accesskey    "M">
 
 <!ENTITY fileMenu.label         "File"> 
 <!ENTITY fileMenu.accesskey       "F">
 <!ENTITY newNavigatorCmd.label        "New Window">
-<!ENTITY newNavigatorCmd.key        "N">
+
 <!ENTITY newNavigatorCmd.accesskey      "N">
 <!ENTITY newPrivateWindow.label     "New Private Window">
 <!ENTITY newPrivateWindow.accesskey "W">
 
 <!ENTITY editMenu.label         "Edit"> 
 <!ENTITY editMenu.accesskey       "E"> 
 <!ENTITY undoCmd.label            "Undo">  
-<!ENTITY undoCmd.key            "Z">  
+
 <!ENTITY undoCmd.accesskey          "U"> 
 <!ENTITY redoCmd.label            "Redo">  
-<!ENTITY redoCmd.key            "Y">  
+
 <!ENTITY redoCmd.accesskey          "R"> 
 <!ENTITY cutCmd.label           "Cut">  
-<!ENTITY cutCmd.key             "X">  
+
 <!ENTITY cutCmd.accesskey         "t"> 
 <!ENTITY copyCmd.label            "Copy">  
-<!ENTITY copyCmd.key            "C">  
+
 <!ENTITY copyCmd.accesskey          "C"> 
 <!ENTITY pasteCmd.label           "Paste">  
-<!ENTITY pasteCmd.key           "V">  
+
 <!ENTITY pasteCmd.accesskey         "P"> 
 <!ENTITY deleteCmd.label          "Delete">  
-<!ENTITY deleteCmd.key            "D">  
+
 <!ENTITY deleteCmd.accesskey        "D"> 
 <!ENTITY selectAllCmd.label         "Select All">  
-<!ENTITY selectAllCmd.key         "A">  
+
 <!ENTITY selectAllCmd.accesskey       "A"> 
 <!ENTITY preferencesCmd2.label       "Options">
 <!ENTITY preferencesCmd2.accesskey     "O">
 <!ENTITY preferencesCmdUnix.label       "Preferences">
 <!ENTITY preferencesCmdUnix.accesskey     "n"> 
 
 <!ENTITY clearRecentHistory.label               "Clear Recent History…">
 
-<!ENTITY privateBrowsingCmd.commandkey          "P">
 
 <!ENTITY viewMenu.label         "View"> 
 <!ENTITY viewMenu.accesskey       "V"> 
 <!ENTITY viewTabGroups.label            "Tab Groups">
 <!ENTITY viewTabGroups.accesskey        "G">
 <!ENTITY viewToolbarsMenu.label       "Toolbars"> 
 <!ENTITY viewToolbarsMenu.accesskey     "T"> 
 <!ENTITY viewSidebarMenu.label "Sidebar">
@@ -350,26 +341,26 @@ These should match what Safari and other
 <!ENTITY historyMenu.label "History">
 <!ENTITY historyMenu.accesskey "s">
 <!ENTITY historyUndoMenu.label "Recently Closed Tabs">
 <!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
 <!ENTITY historyUndoWindowMenu.label "Recently Closed Windows">
 <!ENTITY historyRestoreLastSession.label "Restore Previous Session">
 
 <!ENTITY showAllHistoryCmd2.label "Show All History">
-<!ENTITY showAllHistoryCmd.commandkey "H">
+
 
 <!ENTITY appMenuCustomize.label "Customise">
 <!ENTITY appMenuCustomize.tooltip "Customise the Menu and Toolbars">
 <!ENTITY appMenuCustomizeExit.label "Exit Customise">
 <!ENTITY appMenuCustomizeExit.tooltip "Finish Customising">
-<!ENTITY appMenuHistory.label "History">
-<!ENTITY appMenuHistory.showAll.label "Show All History">
-<!ENTITY appMenuHistory.clearRecent.label "Clear Recent History…">
-<!ENTITY appMenuHistory.restoreSession.label "Restore Previous Session">
+
+
+
+
 <!ENTITY appMenuHistory.viewSidebar.label "View History Sidebar">
 <!ENTITY appMenuHelp.tooltip "Open Help Menu">
 
 <!ENTITY customizeMenu.addToToolbar.label "Add to Toolbar">
 <!ENTITY customizeMenu.addToToolbar.accesskey "A">
 <!ENTITY customizeMenu.addToPanel.label "Add to Menu">
 <!ENTITY customizeMenu.addToPanel.accesskey "M">
 <!ENTITY customizeMenu.moveToToolbar.label "Move to Toolbar">
@@ -383,21 +374,19 @@ These should match what Safari and other
 <!ENTITY customizeMenu.moveToPanel.accesskey "o">
 <!ENTITY customizeMenu.removeFromToolbar.label "Remove from Toolbar">
 <!ENTITY customizeMenu.removeFromToolbar.accesskey "R">
 <!ENTITY customizeMenu.removeFromMenu.label "Remove from Menu">
 <!ENTITY customizeMenu.removeFromMenu.accesskey "R">
 <!ENTITY customizeMenu.addMoreItems.label "Add More Items…">
 <!ENTITY customizeMenu.addMoreItems.accesskey "A">
 
-<!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder2          "Search or enter address">
-<!ENTITY urlbar.accesskey             "d">
+
 <!ENTITY urlbar.switchToTab.label     "Switch to tab:">
-
 <!-- 
   Comment duplicated from browser-sets.inc:
 
   Search Command Key Logic works like this:
 
   Unix: Ctrl+J (0.8, 0.9 support)
         Ctrl+K (cross platform binding)
   Mac:  Cmd+K (cross platform binding)
@@ -408,56 +397,52 @@ These should match what Safari and other
   We support Ctrl+K on all platforms now and advertise it in the menu since it is
   our standard - it is a "safe" choice since it is near no harmful keys like "W" as
   "E" is. People mourning the loss of Ctrl+K for emacs compat can switch their GTK
   system setting to use emacs emulation, and we should respect it. Focus-Search-Box
   is a fundamental keybinding and we are maintaining a XP binding so that it is easy
   for people to switch to Linux.
 
  -->
-<!ENTITY searchFocus.commandkey       "k">
-<!ENTITY searchFocus.commandkey2      "e">
-<!ENTITY searchFocusUnix.commandkey   "j">
+
 
 <!-- LOCALIZATION NOTE (searchFor.label, searchWith.label):
      These two strings are used to build the header above the list of one-click
      search providers:  "Search for <used typed keywords> with:" -->
-<!ENTITY searchFor.label              "Search for ">
-<!ENTITY searchWith.label             " with:">
+
 <!-- LOCALIZATION NOTE (searchWithHeader.label):
-          The wording of this string should be as close as possible to
+     The wording of this string should be as close as possible to
      searchFor.label and searchWith.label. This string will be used instead of
      them when the user has not typed any keyword. -->
-<!ENTITY searchWithHeader.label       "Search with:">
-<!ENTITY changeSearchSettings.button  "Change Search Settings">
+<!-- LOCALIZATION NOTE (changeSearchSettings.button):
+     This string won't wrap, so if the translated string is longer,
+     consider translating it as if it said only "Search Settings". -->
 
-<!ENTITY tabView.commandkey           "e">
 
 <!ENTITY openLinkCmdInTab.label       "Open Link in New Tab">
 <!ENTITY openLinkCmdInTab.accesskey   "T">
 <!ENTITY openLinkCmd.label            "Open Link in New Window">
 <!ENTITY openLinkCmd.accesskey        "W">
 <!ENTITY openLinkInPrivateWindowCmd.label "Open Link in New Private Window">
 <!ENTITY openLinkInPrivateWindowCmd.accesskey "P">
 <!ENTITY openLinkCmdInCurrent.label     "Open Link">
 <!ENTITY openLinkCmdInCurrent.accesskey "O">
 <!ENTITY openFrameCmdInTab.label      "Open Frame in New Tab">
 <!ENTITY openFrameCmdInTab.accesskey  "T">
 <!ENTITY openFrameCmd.label           "Open Frame in New Window">
 <!ENTITY openFrameCmd.accesskey       "W">
 <!ENTITY showOnlyThisFrameCmd.label     "Show Only This Frame">
 <!ENTITY showOnlyThisFrameCmd.accesskey "S">
-<!ENTITY reloadCmd.commandkey         "r">
+
 <!ENTITY reloadFrameCmd.label         "Reload Frame">
 <!ENTITY reloadFrameCmd.accesskey     "R">
 <!ENTITY viewPartialSourceForSelectionCmd.label "View Selection Source">
 <!ENTITY viewPartialSourceForMathMLCmd.label    "View MathML Source">
 <!-- LOCALIZATION NOTE (viewPartialSourceCmd.accesskey): This accesskey is used for both 
          viewPartialSourceForSelectionCmd.label and viewPartialSourceForMathMLCmd.label -->
-<!ENTITY viewPartialSourceCmd.accesskey "e">
 <!ENTITY viewPageSourceCmd.label      "View Page Source">
 <!ENTITY viewPageSourceCmd.accesskey  "V">
 <!ENTITY viewFrameSourceCmd.label     "View Frame Source">
 <!ENTITY viewFrameSourceCmd.accesskey "V">
 <!ENTITY viewPageInfoCmd.label        "View Page Info">
 <!ENTITY viewPageInfoCmd.accesskey    "I">
 <!ENTITY viewFrameInfoCmd.label       "View Frame Info">
 <!ENTITY viewFrameInfoCmd.accesskey   "I">
@@ -470,46 +455,45 @@ These should match what Safari and other
 <!ENTITY viewImageDescCmd.label       "View Description">
 <!ENTITY viewImageDescCmd.accesskey   "D">
 <!ENTITY viewVideoCmd.label           "View Video">
 <!ENTITY viewVideoCmd.accesskey       "i">
 <!ENTITY viewBGImageCmd.label         "View Background Image">
 <!ENTITY viewBGImageCmd.accesskey     "w">
 <!ENTITY setDesktopBackgroundCmd.label      "Set As Desktop Background…">
 <!ENTITY setDesktopBackgroundCmd.accesskey  "S">
-<!ENTITY bookmarkPageCmd2.label       "Bookmark This Page">
+
 <!ENTITY bookmarkThisLinkCmd.label      "Bookmark This Link">
 <!ENTITY bookmarkThisLinkCmd.accesskey  "L">
 <!ENTITY bookmarkThisFrameCmd.label      "Bookmark This Frame">
 <!ENTITY bookmarkThisFrameCmd.accesskey  "m">
 <!ENTITY emailPageCmd.label           "Email Link…">
 <!ENTITY emailPageCmd.accesskey       "E">
 <!ENTITY savePageCmd.label            "Save Page As…">
 <!ENTITY savePageCmd.accesskey        "A">
 <!-- alternate for content area context menu -->
-<!ENTITY savePageCmd.accesskey2       "P">
-<!ENTITY savePageCmd.commandkey       "s">
+
 <!ENTITY saveFrameCmd.label           "Save Frame As…">
 <!ENTITY saveFrameCmd.accesskey       "F">
 <!ENTITY printFrameCmd.label          "Print Frame…">
 <!ENTITY printFrameCmd.accesskey      "P">
 <!ENTITY saveLinkCmd.label            "Save Link As…">
 <!ENTITY saveLinkCmd.accesskey        "k">
 <!ENTITY saveImageCmd.label           "Save Image As…">
 <!ENTITY saveImageCmd.accesskey       "v">
 <!ENTITY saveVideoCmd.label           "Save Video As…">
 <!ENTITY saveVideoCmd.accesskey       "v">
 <!ENTITY saveAudioCmd.label           "Save Audio As…">
 <!ENTITY saveAudioCmd.accesskey       "v">
 <!ENTITY emailImageCmd.label          "Email Image…">
 <!ENTITY emailImageCmd.accesskey      "a">
 <!ENTITY emailVideoCmd.label          "Email Video…">
 <!ENTITY emailVideoCmd.accesskey      "a">
-<!ENTITY castVideoCmd.label           "Send Video To Device">
-<!ENTITY castVideoCmd.accesskey       "e">
+
+
 <!ENTITY emailAudioCmd.label          "Email Audio…">
 <!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY playPluginCmd.label          "Activate this plugin">
 <!ENTITY playPluginCmd.accesskey      "c">
 <!ENTITY hidePluginCmd.label          "Hide this plugin">
 <!ENTITY hidePluginCmd.accesskey      "H">
 <!ENTITY copyLinkCmd.label            "Copy Link Location">
 <!ENTITY copyLinkCmd.accesskey        "a">
@@ -520,21 +504,21 @@ These should match what Safari and other
 <!ENTITY copyVideoURLCmd.label        "Copy Video Location">
 <!ENTITY copyVideoURLCmd.accesskey    "o">
 <!ENTITY copyAudioURLCmd.label        "Copy Audio Location">
 <!ENTITY copyAudioURLCmd.accesskey    "o">
 <!ENTITY copyEmailCmd.label           "Copy Email Address">
 <!ENTITY copyEmailCmd.accesskey       "E">
 <!ENTITY thisFrameMenu.label              "This Frame">
 <!ENTITY thisFrameMenu.accesskey          "h">
-
 <!-- Media (video/audio) controls -->
 <!-- LOCALIZATION NOTE: The access keys for "Play" and
 "Pause" are the same because the two context-menu
 items are mutually exclusive. -->
+
 <!ENTITY mediaPlay.label             "Play">
 <!ENTITY mediaPlay.accesskey         "P">
 <!ENTITY mediaPause.label            "Pause">
 <!ENTITY mediaPause.accesskey        "P">
 <!-- LOCALIZATION NOTE: The access keys for "Mute" and
 "Unmute" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaMute.label             "Mute">
@@ -556,112 +540,109 @@ fast. -->
 <!ENTITY mediaPlaybackRate200x.accesskey "L">
 <!-- LOCALIZATION NOTE: The access keys for "Show Controls" and
 "Hide Controls" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaShowControls.label     "Show Controls">
 <!ENTITY mediaShowControls.accesskey "C">
 <!ENTITY mediaHideControls.label     "Hide Controls">
 <!ENTITY mediaHideControls.accesskey "C">
-<!ENTITY videoFullScreen.label       "Full Screen">
-<!ENTITY videoFullScreen.accesskey   "F">
+
+
 <!ENTITY videoSaveImage.label        "Save Snapshot As…">
 <!ENTITY videoSaveImage.accesskey    "S">
 <!-- LOCALIZATION NOTE: The access keys for "Show Statistics" and
 "Hide Statistics" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY videoShowStats.label        "Show Statistics">
 <!ENTITY videoShowStats.accesskey    "t">
 <!ENTITY videoHideStats.label        "Hide Statistics">
 <!ENTITY videoHideStats.accesskey    "t">
-
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
 If shift key is needed with your locale popular keyboard for them,
 you can use these alternative items. Otherwise, their values should be empty.  -->
 
+
 <!ENTITY fullZoomEnlargeCmd.label       "Zoom In">
 <!ENTITY fullZoomEnlargeCmd.accesskey   "I">
-<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
+
 <!-- + is above this key on many keyboards -->
-<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.label        "Zoom Out">
 <!ENTITY fullZoomReduceCmd.accesskey    "O">
-<!ENTITY fullZoomReduceCmd.commandkey   "-">
+
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 
 <!ENTITY fullZoomResetCmd.label         "Reset">
 <!ENTITY fullZoomResetCmd.accesskey     "R">
-<!ENTITY fullZoomResetCmd.commandkey    "0">
+
 <!ENTITY fullZoomResetCmd.commandkey2   "">
 
 <!ENTITY fullZoomToggleCmd.label        "Zoom Text Only">
 <!ENTITY fullZoomToggleCmd.accesskey    "T">
 <!ENTITY fullZoom.label                 "Zoom">
 <!ENTITY fullZoom.accesskey             "Z">
 
 <!ENTITY sidebarCloseButton.tooltip     "Close sidebar">
 
-<!ENTITY quitApplicationCmdWin.label       "Exit"> 
-<!ENTITY quitApplicationCmdWin.accesskey   "x">
-<!ENTITY quitApplicationCmdWin.tooltip     "Exit &brandShortName;">
-<!ENTITY goBackCmd.commandKey "[">
-<!ENTITY goForwardCmd.commandKey "]">
+<!ENTITY quitApplicationCmdWin2.label       "Exit">
+<!ENTITY quitApplicationCmdWin2.accesskey   "x">
+
+
+
 <!ENTITY quitApplicationCmd.label       "Quit"> 
 <!ENTITY quitApplicationCmd.accesskey   "Q">
-<!ENTITY quitApplicationCmdMac.label    "Quit &brandShortName;">
+
 <!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX builds. -->
-<!ENTITY quitApplicationCmdUnix.key     "Q">
 
 <!ENTITY closeCmd.label                 "Close">  
-<!ENTITY closeCmd.key                   "W">  
+
 <!ENTITY closeCmd.accesskey             "C">
 
 <!ENTITY pageStyleMenu.label "Page Style">
 <!ENTITY pageStyleMenu.accesskey "y">
 <!ENTITY pageStyleNoStyle.label "No Style">
 <!ENTITY pageStyleNoStyle.accesskey "N">
 <!ENTITY pageStylePersistentOnly.label "Basic Page Style">
 <!ENTITY pageStylePersistentOnly.accesskey "B">
 
 <!ENTITY pageReportIcon.tooltip            "Change popup blocking settings for this web site">
 
-<!ENTITY allowPopups.accesskey "p">
 <!-- On Windows we use the term "Options" to describe settings, but
      on Linux and Mac OS X we use "Preferences" - carry that distinction
      over into this string, which is used in the "popup blocked" info bar . -->
 <!ENTITY editPopupSettingsUnix.label "Edit Popup Blocker Preferences…">
 <!ENTITY editPopupSettings.label "Edit Popup Blocker Options…">
 <!ENTITY editPopupSettings.accesskey "E">
-<!ENTITY dontShowMessage.accesskey "D">
+
 
 <!ENTITY bidiSwitchPageDirectionItem.label        "Switch Page Direction">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey    "D">
 <!ENTITY bidiSwitchTextDirectionItem.label        "Switch Text Direction">
 <!ENTITY bidiSwitchTextDirectionItem.accesskey    "w">
-<!ENTITY bidiSwitchTextDirectionItem.commandkey   "X">
+
 
 <!ENTITY findOnCmd.label     "Find in This Page…">
 <!ENTITY findOnCmd.accesskey "F">
-<!ENTITY findOnCmd.commandkey "f">
+
 <!ENTITY findAgainCmd.label  "Find Again">
 <!ENTITY findAgainCmd.accesskey "g">
-<!ENTITY findAgainCmd.commandkey "g">
+
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
-<!ENTITY findSelectionCmd.commandkey "e">
+
 
 <!ENTITY spellAddDictionaries.label "Add Dictionaries…">
 <!ENTITY spellAddDictionaries.accesskey "A">
 
 <!ENTITY editBookmark.done.label                     "Done">
 <!ENTITY editBookmark.cancel.label                   "Cancel">
-<!ENTITY editBookmark.removeBookmark.accessKey       "R">
+
 
 <!ENTITY identity.unverifiedsite2 "This web site does not supply identity information.">
 <!ENTITY identity.connectedTo "You are connected to">
 <!-- Localization note (identity.runBy) : This string appears between a
 domain name (above) and an organization name (below). E.g.
 
 example.com
 which is run by
@@ -671,38 +652,38 @@ The layout of the identity dialog preven
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity.runBy "which is run by">
 
 <!ENTITY identity.moreInfoLinkText "More Information…">
 
 <!ENTITY identity.permissions "Permissions">
-
 <!-- LOCALIZATION NOTE (identity.help.tooltip) : This string should be the
      localized title of this SUMO article
      https://support.mozilla.org/kb/how-do-i-tell-if-my-connection-is-secure -->
+
 <!ENTITY identity.help.tooltip "How do I tell if my connection to a web site is secure?">
-
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
-<!ENTITY tabsToolbar.label "Browser tabs">
 
+<!ENTITY tabsToolbar.label "Browser tabs">
 <!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
+
 <!ENTITY syncTabsMenu2.label     "Tabs From Other Devices">
 
 <!ENTITY syncBrand.shortName.label    "Sync">
 
 <!ENTITY syncSetup.label              "Set Up &syncBrand.shortName.label;…">
-<!ENTITY syncSetup.accesskey          "Y">
+
 <!ENTITY syncSyncNowItem.label        "Synchronise Now">
 <!ENTITY syncSyncNowItem.accesskey    "S">
 <!ENTITY syncReAuthItem.label         "Reconnect to &syncBrand.shortName.label;…">
 <!ENTITY syncReAuthItem.accesskey     "R">
-<!ENTITY syncToolbarButton.label      "Sync">
+
 
 <!ENTITY socialToolbar.title        "Social Toolbar Button">
 
 <!ENTITY social.ok.label       "OK">
 <!ENTITY social.ok.accesskey   "O">
 
 <!ENTITY social.toggleSidebar.label "Show sidebar">
 <!ENTITY social.toggleSidebar.accesskey "s">
@@ -714,121 +695,134 @@ just addresses the organization to follo
 
 <!ENTITY social.activated.description "Services from <label/> have been enabled. You can change your settings for services in the <label class='text-link'>Add-on Manager</label>.">
 <!ENTITY social.activated.undo.label "Oops, undo this!">
 <!ENTITY social.activated.undo.accesskey "u">
 <!ENTITY social.learnMore.label "Learn more…">
 <!ENTITY social.learnMore.accesskey "L">
 <!ENTITY social.closeNotificationItem.label "Not Now">
 
-<!ENTITY social.directory.label "Activations Directory">
-<!ENTITY social.directory.text "You can activate Share services from the directory.">
-<!ENTITY social.directory.button "Take me there!">
-<!ENTITY social.directory.introText "Click on a service to add it to &brandShortName;.">
-<!ENTITY social.directory.viewmore.text "View More">
+
+
+
+
 
 <!ENTITY customizeMode.tabTitle "Customise &brandShortName;">
 <!ENTITY customizeMode.menuAndToolbars.header2 "Additional Tools and Features">
 <!ENTITY customizeMode.menuAndToolbars.empty "Want more tools?">
 <!ENTITY customizeMode.menuAndToolbars.emptyLink "Choose from thousands of add-ons">
 <!ENTITY customizeMode.restoreDefaults "Restore Defaults">
 <!ENTITY customizeMode.toolbars "Show / Hide Toolbars">
 <!ENTITY customizeMode.titlebar "Title Bar">
 <!ENTITY customizeMode.lwthemes "Themes">
 <!ENTITY customizeMode.lwthemes.myThemes "My Themes">
 <!ENTITY customizeMode.lwthemes.recommended "Recommended">
 <!ENTITY customizeMode.lwthemes.menuManage "Manage">
-<!ENTITY customizeMode.lwthemes.menuManage.accessKey "M">
+
 <!ENTITY customizeMode.lwthemes.menuGetMore "Get More Themes">
-<!ENTITY customizeMode.lwthemes.menuGetMore.accessKey "G">
-<!ENTITY customizeMode.deveditionTheme.label2 "Use Developer Edition Theme">
+
 
-<!ENTITY social.chatBar.commandkey "c">
+
 <!ENTITY social.chatBar.label "Focus chats">
 <!ENTITY social.chatBar.accesskey "c">
 
 <!ENTITY social.markpageMenu.accesskey "P">
 <!ENTITY social.markpageMenu.label "Save Page To…">
 <!ENTITY social.marklinkMenu.accesskey "L">
 <!ENTITY social.marklinkMenu.label "Save Link To…">
 
 <!ENTITY getUserMedia.selectCamera.label "Camera to share:">
 <!ENTITY getUserMedia.selectCamera.accesskey "C">
 <!ENTITY getUserMedia.selectMicrophone.label "Microphone to share:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
 <!ENTITY getUserMedia.allWindowsShared.message "All visible windows on your screen will be shared.">
+<!-- Bad Content Blocker Doorhanger Notification -->
 
-<!-- Bad Content Blocker Doorhanger Notification -->
 <!ENTITY badContentBlocked.moreinfo "Most web sites will work properly even if content is blocked.">
 
 <!ENTITY mixedContentBlocked2.message "Insecure content">
 <!ENTITY mixedContentBlocked2.moreinfo "Some unencrypted elements on this web site have been blocked.">
 <!ENTITY mixedContentBlocked2.learnMore "Learn More">
 <!ENTITY mixedContentBlocked2.options "Options">
 <!ENTITY mixedContentBlocked2.unblock.label "Disable protection for now">
 <!ENTITY mixedContentBlocked2.unblock.accesskey "D">
-<!ENTITY mixedContentBlocked2.block.label "Enable protection">
-<!ENTITY mixedContentBlocked2.block.accesskey "E">
+
+
 <!ENTITY mixedContentBlocked2.disabled.message "Protection is disabled">
 
 <!ENTITY trackingContentBlocked.message "Tracking">
 <!ENTITY trackingContentBlocked.moreinfo "Parts of the page that track your online activity have been blocked.">
-<!ENTITY trackingContentBlocked.learnMore "Learn More">
-<!ENTITY trackingContentBlocked.options "Options">
-<!ENTITY trackingContentBlocked.unblock2.label "Disable protection for this site">
-<!ENTITY trackingContentBlocked.unblock2.accesskey "D">
-<!ENTITY trackingContentBlocked.block.label "Enable protection">
-<!ENTITY trackingContentBlocked.block.accesskey "E">
+
+
+
+
+
+
 <!ENTITY trackingContentBlocked.disabled.message "Tracking protection is disabled">
 
 <!ENTITY pointerLock.notification.message "Press ESC at any time to show it again.">
 
 <!ENTITY pluginNotification.showAll.label "Show All">
 <!ENTITY pluginNotification.showAll.accesskey "S">
+<!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
 
-<!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
 <!ENTITY pluginActivateNow.label "Allow Now">
 <!ENTITY pluginActivateAlways.label "Allow and Remember">
 <!ENTITY pluginBlockNow.label "Block Plugin">
-
 <!-- LOCALIZATION NOTE: (pluginNotification.width): This is used to determine the
      width of the plugin popup notification that can appear if a plugin has been
      blocked on a page. Should be wide enough to fit the pluginActivateNow.label
      and pluginActivateAlways.label strings above on a single line. This must be
      a CSS length value. -->
+
 <!ENTITY pluginNotification.width "28em">
 
-<!ENTITY tabCrashed.header "Tab crashed">
-<!ENTITY tabCrashed.message "Well, this is embarrassing. We tried to display this Web page, but it's not responding.">
-<!ENTITY tabCrashed.checkSendReport "Tell &vendorShortName; about this crash so they can fix it.">
-<!ENTITY tabCrashed.tryAgain "Try Again">
-
-<!ENTITY uiTour.infoPanel.close "Close">
 
 <!ENTITY appMenuSidebars.label         "Sidebars">
 
 <!ENTITY switchToMetroCmd2.label       "Relaunch in &brandShortName; for Windows 8 Touch">
-
 <!-- LOCALIZATION NOTE: (panicButton.view.mainTimeframeDesc, panicButton.view.5min, panicButton.view.2hr, panicButton.view.day):
      The .mainTimeframeDesc string combined with any of the 3 others is meant to form a complete sentence, e.g. "Forget the last: Five minutes".
      Please ensure that this remains the case in the translation. -->
+
 <!ENTITY panicButton.view.mainTimeframeDesc       "Forget the last:">
 <!ENTITY panicButton.view.5min                    "Five minutes">
 <!ENTITY panicButton.view.2hr                     "Two hours">
 <!ENTITY panicButton.view.day                     "24 hours">
-
 <!-- LOCALIZATION NOTE: (panicButton.view.mainLabel, panicButton.view.deleteCookies, panicButton.view.deleteHistory, panicButton.view.deleteTabsAndWindows, panicButton.view.openNewWindow):
      The .mainActionDesc string combined with any of the 4 others is meant to form a complete sentence, e.g. "Proceeding will: Delete Recent Cookies".
      Note also that the deleteCookies, deleteHistory and deleteTabsAndWindows strings include <html:strong> tags for emphasis on the words "Cookies", "History", "Tabs" and "Windows".
      The translation should do the same. -->
+
 <!ENTITY panicButton.view.mainActionDesc          "Proceeding will:">
 <!ENTITY panicButton.view.deleteCookies           "Delete Recent <html:strong>Cookies</html:strong>">
 <!ENTITY panicButton.view.deleteHistory           "Delete Recent <html:strong>History</html:strong>">
 <!ENTITY panicButton.view.deleteTabsAndWindows    "Close all <html:strong>Tabs</html:strong> and <html:strong>Windows</html:strong>">
 <!ENTITY panicButton.view.openNewWindow           "Open a new clean Window">
 
 <!ENTITY panicButton.view.undoWarning             "This action cannot be undone.">
 <!ENTITY panicButton.view.forgetButton            "Forget!">
 
 <!ENTITY panicButton.thankyou.msg1                "Your recent history is cleared.">
 <!ENTITY panicButton.thankyou.msg2                "Safe browsing!">
 <!ENTITY panicButton.thankyou.buttonlabel         "Thanks!">
 
+
+
+
+
+
+
+
+
+
+
+
+<!ENTITY emeNotificationsDontAskAgain.label       "Don't ask me again">
+<!ENTITY emeNotificationsDontAskAgain.accesskey   "D">
+
+
+
+<!-- Pre-landed string for bug 1124153 -->
+<!-- Pre-landed string for bug 1133662 -->
+<!-- Pre-landed string for bug 1123525 -->
+<!-- Pre-landed strings for bug 1123519 -->
+
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -8,131 +8,110 @@ openFile=Open File
 droponhometitle=Set Home Page
 droponhomemsg=Do you want this document to be your new home page?
 
 # context menu strings
 
 # LOCALIZATION NOTE (contextMenuSearch): %1$S is the search engine,
 # %2$S is the selection string.
 contextMenuSearch=Search %1$S for "%2$S"
-contextMenuSearch.accesskey=S
 
 # bookmark dialog strings
 
 bookmarkAllTabsDefault=[Folder Name]
 
 xpinstallPromptWarning=%S prevented this site (%S) from asking you to install software on your computer.
 xpinstallPromptAllowButton=Allow
 # Accessibility Note:
 # Be sure you do not choose an accesskey that is used elsewhere in the active context (e.g. main menu bar, submenu of the warning popup button)
 # See http://www.mozilla.org/access/keyboard/accesskey for details
-xpinstallPromptAllowButton.accesskey=A
 xpinstallDisabledMessageLocked=Software installation has been disabled by your system administrator.
 xpinstallDisabledMessage=Software installation is currently disabled. Click Enable and try again.
 xpinstallDisabledButton=Enable
-xpinstallDisabledButton.accesskey=n
 
 # LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled, addonDownloadRestart):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Also see https://bugzilla.mozilla.org/show_bug.cgi?id=570012 for mockups
 addonDownloading=Add-on downloading;Add-ons downloading
 addonDownloadCancelled=Add-on download cancelled.;Add-on downloads cancelled.
 addonDownloadRestart=Restart Download;Restart Downloads
-addonDownloadRestart.accessKey=R
 addonDownloadCancelTooltip=Cancel
 
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 first add-on's name, #2 number of add-ons, #3 application name
 addonsInstalled=#1 has been installed successfully.;#2 add-ons have been installed successfully.
 addonsInstalledNeedsRestart=#1 will be installed after you restart #3.;#2 add-ons will be installed after you restart #3.
 addonInstallRestartButton=Restart Now
-addonInstallRestartButton.accesskey=R
 
 # LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
 # #1 is the add-on name, #2 is the host name, #3 is the application name
 # #4 is the application version
 addonError-1=The add-on could not be downloaded because of a connection failure on #2.
 addonError-2=The add-on from #2 could not be installed because it does not match the add-on #3 expected.
 addonError-3=The add-on downloaded from #2 could not be installed because it appears to be corrupt.
 addonError-4=#1 could not be installed because #3 cannot modify the needed file.
 
 # LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonErrorIncompatible, addonErrorBlocklisted):
 # #1 is the add-on name, #3 is the application name, #4 is the application version
 addonLocalError-1=This add-on could not be installed because of a filesystem error.
 addonLocalError-2=This add-on could not be installed because it does not match the add-on #3 expected.
 addonLocalError-3=This add-on could not be installed because it appears to be corrupt.
-addonLocalError-4=#1 could not be installed because #3 cannot modify the needed file.
 addonErrorIncompatible=#1 could not be installed because it is not compatible with #3 #4.
 addonErrorBlocklisted=#1 could not be installed because it has a high risk of causing stability or security problems.
 
 # LOCALIZATION NOTE (lwthemeInstallRequest.message): %S will be replaced with
 # the host name of the site.
 lwthemeInstallRequest.message=This site (%S) attempted to install a theme.
-lwthemeInstallRequest.allowButton=Allow
-lwthemeInstallRequest.allowButton.accesskey=a
 
 lwthemePostInstallNotification.message=A new theme has been installed.
 lwthemePostInstallNotification.undoButton=Undo
-lwthemePostInstallNotification.undoButton.accesskey=U
 lwthemePostInstallNotification.manageButton=Manage Themes…
-lwthemePostInstallNotification.manageButton.accesskey=M
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message=%S will be installed after you restart.
-lwthemeNeedsRestart.button=Restart Now
-lwthemeNeedsRestart.accesskey=R
 
 # LOCALIZATION NOTE (popupWarning.message): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName and #2 is the number of pop-ups blocked.
 popupWarning.message=#1 prevented this site from opening a pop-up window.;#1 prevented this site from opening #2 pop-up windows.
 popupWarningButton=Options
-popupWarningButton.accesskey=O
 popupWarningButtonUnix=Preferences
-popupWarningButtonUnix.accesskey=P
 popupAllow=Allow popups for %S
 popupBlock=Block popups for %S
 popupWarningDontShowFromMessage=Don't show this message when popups are blocked
 popupWarningDontShowFromLocationbar=Don't show info bar when popups are blocked
 popupShowPopupPrefix=Show '%S'
 
 # Bad Content Blocker Doorhanger Notification
 # %S is brandShortName
 badContentBlocked.blocked.message=%S is blocking content on this page.
 badContentBlocked.notblocked.message=%S is not blocking any content on this page.
 
 crashedpluginsMessage.title=The %S plugin has crashed.
-crashedpluginsMessage.reloadButton.label=Reload page
-crashedpluginsMessage.reloadButton.accesskey=R
-crashedpluginsMessage.submitButton.label=Submit a crash report
-crashedpluginsMessage.submitButton.accesskey=S
 crashedpluginsMessage.learnMore=Learn More…
 
 # Keyword fixup messages
 # LOCALIZATION NOTE (keywordURIFixup.message): Used when the user tries to visit
 # a local host page, by the time the DNS request recognizes it, we have already
 # loaded a search page for the given word.  An infobar then asks to the user
 # whether he rather wanted to visit the host.  %S is the recognized host.
 keywordURIFixup.message=Did you mean to go to %S?
 keywordURIFixup.goTo=Yes, take me to %S
-keywordURIFixup.goTo.accesskey=Y
 keywordURIFixup.dismiss=No thanks
-keywordURIFixup.dismiss.accesskey=N
 
 ## Plugin doorhanger strings
 # LOCALIZATION NOTE (pluginActivateNew.message): Used for newly-installed
 # plugins which are not known to be unsafe. %1$S is the plugin name and %2$S
 # is the site domain.
 pluginActivateNew.message=Allow %2$S to run "%1$S"?
 pluginActivateMultiple.message=Allow %S to run plugins?
-pluginActivate.learnMore=Learn More…
 # LOCALIZATION NOTE (pluginActivateOutdated.message, pluginActivateOutdated.label):
 # These strings are used when an unsafe plugin has an update available.
 # %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
 pluginActivateOutdated.message=%3$S has prevented the outdated plugin "%1$S" from running on %2$S.
 pluginActivateOutdated.label=Outdated plugin
 pluginActivate.updateLabel=Update now…
 # LOCALIZATION NOTE (pluginActivateVulnerable.message, pluginActivateVulnerable.label):
 # These strings are used when an unsafe plugin has no update available.
@@ -144,46 +123,33 @@ pluginActivate.riskLabel=What's the risk
 pluginActivateBlocked.message=%2$S has blocked "%1$S" for your protection.
 pluginActivateBlocked.label=Blocked for your protection
 pluginActivateDisabled.message="%S" is disabled.
 pluginActivateDisabled.label=Disabled
 pluginActivateDisabled.manage=Manage plugins…
 pluginEnabled.message="%S" is enabled on %S.
 pluginEnabledOutdated.message=Outdated plugin "%S" is enabled on %S.
 pluginEnabledVulnerable.message=Insecure plugin "%S" is enabled on %S.
-pluginInfo.unknownPlugin=Unknown
 
 # LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.dtd
 # LOCALIZATION NOTE (pluginActivateNow.label): This button will enable the
 # plugin in the current session for an short time (about an hour), auto-renewed
 # if the site keeps using the plugin.
-pluginActivateNow.label=Allow Now
-pluginActivateNow.accesskey=N
 # LOCALIZATION NOTE (pluginActivateAlways.label): This button will enable the
 # plugin for a long while (90 days), auto-renewed if the site keeps using the
 # plugin.
-pluginActivateAlways.label=Allow and Remember
-pluginActivateAlways.accesskey=R
-pluginBlockNow.label=Block Plugin
-pluginBlockNow.accesskey=B
-pluginContinue.label=Continue Allowing
-pluginContinue.accesskey=C
 
 # in-page UI
 PluginClickToActivate=Activate %S.
 PluginVulnerableUpdatable=This plugin is vulnerable and should be updated.
 PluginVulnerableNoUpdate=This plugin has security vulnerabilities.
 
 # infobar UI
-pluginContinueBlocking.label=Continue Blocking
-pluginContinueBlocking.accesskey=B
 # LOCALIZATION NOTE (pluginActivateTrigger): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
-pluginActivateTrigger.label=Allow…
-pluginActivateTrigger.accesskey=A
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=Clear All History
 sanitizeButtonOK=Clear Now
 # LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
@@ -197,18 +163,16 @@ sanitizeButtonClearing=Clearing
 sanitizeEverythingWarning2=All history will be cleared.
 # LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has modified the default set of history items to clear.
 sanitizeSelectedWarning=All selected items will be cleared.
 
 # LOCALIZATION NOTE (downloadAndInstallButton.label): %S is replaced by the
 # version of the update: "Update to 28.0".
-update.downloadAndInstallButton.label=Update to %S
-update.downloadAndInstallButton.accesskey=U
 
 # RSS Pretty Print
 feedShowFeedNew=Subscribe to '%S'…
 
 menuOpenAllInTabs.label=Open All in Tabs
 
 # History menu
 menuRestoreAllTabs.label=Restore All Tabs
@@ -231,18 +195,16 @@ menuUndoCloseWindowSingleTabLabel=#1
 tabHistory.current=Stay on this page
 tabHistory.goBack=Go back to this page
 tabHistory.goForward=Go forward to this page
 
 # URL Bar
 pasteAndGo.label=Paste & Go
 
 # Block autorefresh
-refreshBlocked.goButton=Allow
-refreshBlocked.goButton.accesskey=A
 refreshBlocked.refreshLabel=%S prevented this page from automatically reloading.
 refreshBlocked.redirectLabel=%S prevented this page from automatically redirecting to another page.
 
 # General bookmarks button
 # LOCALIZATION NOTE (bookmarksMenuButton.tooltip):
 # %S is the keyboard shortcut for "Show All Bookmarks"
 bookmarksMenuButton.tooltip=Show your bookmarks (%S)
 # Star button
@@ -270,116 +232,87 @@ newWindowButton.tooltip=Open a new windo
 
 # New Tab button tooltip
 # LOCALIZATION NOTE (newTabButton.tooltip):
 # %S is the keyboard shortcut for "New Tab"
 newTabButton.tooltip=Open a new tab (%S)
 
 # Offline web applications
 offlineApps.available=This web site (%S) is asking to store data on your computer for offline use.
-offlineApps.allow=Allow
-offlineApps.allowAccessKey=A
 offlineApps.never=Never for This Site
-offlineApps.neverAccessKey=e
 offlineApps.notNow=Not Now
-offlineApps.notNowAccessKey=N
 
 offlineApps.usage=This web site (%S) is now storing more than %SMB of data on your computer for offline use.
 offlineApps.manageUsage=Show settings
-offlineApps.manageUsageAccessKey=S
-
-# LOCALIZATION NOTE (indexedDB.usage): %1$S is the website host name
-# %2$S a number of megabytes.
-indexedDB.usage=This web site (%1$S) is attempting to store more than %2$S MB of data on your computer for offline use.
 
 identity.identified.verifier=Verified by: %S
 identity.identified.verified_by_you=You have added a security exception for this site.
 identity.identified.state_and_country=%S, %S
 
 identity.encrypted2=The connection to this web site is secure.
-identity.broken_loaded=The connection to this web site is not fully secure because it contains unencrypted elements (such as images) or the encryption is not strong enough.
 identity.mixed_active_loaded2=This web site contains interactive content that isn't encrypted (such as scripts). Other people can view your information or modify the web site's behavior.
 identity.unencrypted=Your connection to this web site is not encrypted.
 
 identity.unknown.tooltip=This web site does not supply identity information.
 
 # LOCALIZATION NOTE (identity.chrome): %S is replaced with the brandShortName.
 identity.chrome=This is a secure %S page.
 
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle=Page Bookmarked
 editBookmarkPanel.pageBookmarkedDescription=%S will always remember this page for you.
 editBookmarkPanel.bookmarkedRemovedTitle=Bookmark Removed
-editBookmarkPanel.editBookmarkTitle=Edit This Bookmark
 
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Replacement for #1 is the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
 editBookmark.removeBookmarks.label=Remove Bookmark;Remove #1 Bookmarks
 
 # Post Update Notifications
-pu.notifyButton.label=Details…
-pu.notifyButton.accesskey=D
 # LOCALIZATION NOTE %S will be replaced by the short name of the application.
 puNotifyText=%S has been updated
 puAlertTitle=%S Updated
 puAlertText=Click here for details
 
 # Geolocation UI
 
 # LOCALIZATION NOTE (geolocation.shareLocation geolocation.alwaysShareLocation geolocation.neverShareLocation):
 #If you're having trouble with the word Share, please use Allow and Block in your language.
 geolocation.shareLocation=Share Location
-geolocation.shareLocation.accesskey=a
 geolocation.alwaysShareLocation=Always Share Location
-geolocation.alwaysShareLocation.accesskey=A
 geolocation.neverShareLocation=Never Share Location
-geolocation.neverShareLocation.accesskey=N
 geolocation.shareWithSite=Would you like to share your location with %S?
 geolocation.shareWithFile=Would you like to share your location with the file %S?
 
 webNotifications.showForSession=Show for this session
-webNotifications.showForSession.accesskey=s
 webNotifications.alwaysShow=Always Show Notifications
-webNotifications.alwaysShow.accesskey=A
 webNotifications.neverShow=Always Block Notifications
-webNotifications.neverShow.accesskey=N
 webNotifications.showFromSite=Would you like to show notifications from %S?
 
 # Pointer lock UI
 
 pointerLock.allow2=Hide pointer
-pointerLock.allow2.accesskey=H
 pointerLock.alwaysAllow=Always allow hiding
-pointerLock.alwaysAllow.accesskey=A
 pointerLock.neverAllow=Never allow hiding
-pointerLock.neverAllow.accesskey=N
 pointerLock.title2=Would you like to allow the pointer to be hidden on %S?
 pointerLock.autoLock.title2=%S will hide the pointer.
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
 # The two button strings will never be shown at the same time, so
 # it's okay for them to have the same access key
-safebrowsing.getMeOutOfHereButton.label=Get me out of here!
-safebrowsing.getMeOutOfHereButton.accessKey=G
 safebrowsing.reportedWebForgery=Reported Web Forgery!
-safebrowsing.notAForgeryButton.label=This isn't a web forgery…
-safebrowsing.notAForgeryButton.accessKey=F
 safebrowsing.reportedAttackSite=Reported Attack Site!
-safebrowsing.notAnAttackButton.label=This isn't an attack site…
-safebrowsing.notAnAttackButton.accessKey=A
 
 # Ctrl-Tab
 # LOCALIZATION NOTE (ctrlTab.listAllTabs.label): #1 represents the number
 # of tabs in the current browser window. It will always be 2 at least.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-ctrlTab.listAllTabs.label=;List All #1 Tabs
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Search %S
 
 # TabView
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
 tabview.title=%S - Group Your Tabs
@@ -413,153 +346,118 @@ browser.menu.showCharacterEncoding=false
 # LOCALIZATION NOTE (syncPromoNotification.bookmarks.label): This appears in
 # the add bookmark star panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.bookmarks.description=You can access your bookmarks on all your devices with %S.\u0020
 # LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
 # the remember password panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.passwords.description=You can access your passwords on all your devices with %S.\u0020
-syncPromoNotification.learnMoreLinkText=Learn More
 # LOCALIZATION NOTE (syncPromoNotification.addons.label): This appears in
 # the add-on install complete panel when Sync isn't set.
 # %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.addons.description=You can access your add-ons on all your devices with %S.\u0020
 # LOCALIZATION NOTE (syncPromoNotification.addons-sync-disabled.label):
 # This appears in the add-on install complete panel when Sync is set
 # but addons sync is not. %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.addons-sync-disabled.description=You can use your %S account to synchronise add-ons across multiple devices.\u0020
 
 # Mozilla data reporting notification (Telemetry, Firefox Health Report, etc)
 dataReportingNotification.message       = %1$S automatically sends some data to %2$S so that we can improve your experience.
-dataReportingNotification.button.label  = Choose What I Share
-dataReportingNotification.button.accessKey  = C
+
+# Process hang reporter
 
 # Webapps notification popup
 webapps.install = Install
-webapps.install.accesskey = I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall = Do you want to install "%1$S" from this site (%2$S)?
 webapps.install.success = Application Installed
 webapps.install.inprogress = Installation in progress
 webapps.uninstall = Uninstall
-webapps.uninstall.accesskey = U
 webapps.doNotUninstall = Don't Uninstall
-webapps.doNotUninstall.accesskey = D
 #LOCALIZATION NOTE (webapps.requestUninstall) %1$S is the web app name
 webapps.requestUninstall = Do you want to uninstall "%1$S"?
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S is now fullscreen.
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision=Remember decision for %S
 
 # LOCALIZATION NOTE (fullscreenButton.tooltip): %S is the keyboard shortcut for full screen
 fullscreenButton.tooltip=Display the window in full screen (%S)
 
 service.toolbarbutton.label=Services
-service.toolbarbutton.tooltiptext=Services
 
 # LOCALIZATION NOTE (social.install.description): %1$S is the hostname of the social provider, %2$S is brandShortName (e.g. Firefox)
 service.install.description=Would you like to enable services from %1$S to display in your %2$S toolbar and sidebar?
-service.install.ok.label=Enable Services
-service.install.ok.accesskey=E
 
 # LOCALIZATION NOTE (social.markpageMenu.label): %S is the name of the social provider
 social.markpageMenu.label=Save Page to %S
 # LOCALIZATION NOTE (social.marklinkMenu.label): %S is the name of the social provider
 social.marklinkMenu.label=Save Link to %S
 
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message=%1$S is unable to connect with %2$S right now.
-social.error.tryAgain.label=Try Again
-social.error.tryAgain.accesskey=T
-social.error.closeSidebar.label=Close This Sidebar
-social.error.closeSidebar.accesskey=C
 
 # LOCALIZATION NOTE: %1$S is the label for the toolbar button, %2$S is the associated badge numbering that the social provider may provide.
 social.aria.toolbarButtonBadgeText=%1$S (%2$S)
 
 # Identity notifications popups
 identity.termsOfService = Terms of Service
 identity.privacyPolicy = Privacy Policy
 # LOCALIZATION NOTE (identity.chooseIdentity.description): %S is the website origin (e.g. https://www.mozilla.org) shown in popup notifications.
 identity.chooseIdentity.description = Sign in to %S
 identity.chooseIdentity.label = Use an existing email
-identity.newIdentity.label = Use a different email
-identity.newIdentity.accessKey = e
 identity.newIdentity.email.placeholder = Email
 # LOCALIZATION NOTE (identity.newIdentity.description): %S is the website origin (e.g. https://www.mozilla.org) shown in popup notifications.
 identity.newIdentity.description = Enter your email address to sign in to %S
 identity.next.label = Next
 identity.next.accessKey = N
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
 # LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
 identity.loggedIn.description = Signed in as: %S
-identity.loggedIn.signOut.label = Sign Out
-identity.loggedIn.signOut.accessKey = O
 
 # LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message,
 #                    getUserMedia.shareScreen.message, getUserMedia.shareCameraAndMicrophone.message,
 #                    getUserMedia.shareScreenAndMicrophone.message):
 #  %S is the website origin (e.g. www.mozilla.org)
 getUserMedia.shareCamera.message = Would you like to share your camera with %S?
 getUserMedia.shareMicrophone.message = Would you like to share your microphone with %S?
 getUserMedia.shareScreen.message = Would you like to share your screen with %S?
 getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
 getUserMedia.shareScreenAndMicrophone.message = Would you like to share your microphone and screen with %S?
-getUserMedia.selectWindow.label=Window to share:
-getUserMedia.selectWindow.accesskey=W
-getUserMedia.selectScreen.label=Screen to share:
-getUserMedia.selectScreen.accesskey=S
-getUserMedia.selectApplication.label=Application to share:
-getUserMedia.selectApplication.accesskey=A
 getUserMedia.noVideo.label = No Video
 getUserMedia.noApplication.label = No Application
 getUserMedia.noScreen.label = No Screen
 getUserMedia.noWindow.label = No Window
 getUserMedia.noAudio.label = No Audio
 getUserMedia.shareEntireScreen.label = Entire screen
 # LOCALIZATION NOTE (getUserMedia.shareApplicationWindowCount.label):
 # Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Replacement for #1 is the name of the application.
 # Replacement for #2 is the number of windows currently displayed by the application.
 getUserMedia.shareApplicationWindowCount.label=#1 (#2 window);#1 (#2 windows)
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
-getUserMedia.shareSelectedDevices.label = Share Selected Device;Share Selected Devices
-getUserMedia.shareSelectedDevices.accesskey = S
 getUserMedia.shareScreen.label = Share Screen
 getUserMedia.shareApplication.label = Share Selected Application
 getUserMedia.shareWindow.label = Share Selected Window
 getUserMedia.shareSelectedItems.label = Share Selected Items
-getUserMedia.always.label = Always Share
-getUserMedia.always.accesskey = A
-getUserMedia.denyRequest.label = Don't Share
-getUserMedia.denyRequest.accesskey = D
-getUserMedia.never.label = Never Share
-getUserMedia.never.accesskey = N
 getUserMedia.sharingCamera.message2 = You are currently sharing your camera with this page.
 getUserMedia.sharingMicrophone.message2 = You are currently sharing your microphone with this page.
 getUserMedia.sharingCameraAndMicrophone.message2 = You are currently sharing your camera and microphone with this page.
 getUserMedia.sharingApplication.message = You are currently sharing an application with this page.
 getUserMedia.sharingScreen.message = You are currently sharing your screen with this page.
 getUserMedia.sharingWindow.message = You are currently sharing a window with this page.
-getUserMedia.continueSharing.label = Continue Sharing
-getUserMedia.continueSharing.accesskey = C
-getUserMedia.stopSharing.label = Stop Sharing
-getUserMedia.stopSharing.accesskey = S
 
-getUserMedia.sharingMenu.label = Tabs sharing devices
-getUserMedia.sharingMenu.accesskey = d
 # LOCALIZATION NOTE (getUserMedia.sharingMenuCamera
 #                    getUserMedia.sharingMenuMicrophone,
 #                    getUserMedia.sharingMenuApplication,
 #                    getUserMedia.sharingMenuScreen,
 #                    getUserMedia.sharingMenuWindow,
 #                    getUserMedia.sharingMenuCameraMicrophone,
 #                    getUserMedia.sharingMenuCameraMicrophoneApplication,
 #                    getUserMedia.sharingMenuCameraMicrophoneScreen,
@@ -575,44 +473,57 @@ getUserMedia.sharingMenuCamera = %S (cam
 getUserMedia.sharingMenuMicrophone = %S (microphone)
 getUserMedia.sharingMenuApplication = %S (application)
 getUserMedia.sharingMenuScreen = %S (screen)
 getUserMedia.sharingMenuWindow = %S (window)
 getUserMedia.sharingMenuCameraMicrophone = %S (camera and microphone)
 getUserMedia.sharingMenuCameraMicrophoneApplication = %S (camera, microphone and application)
 getUserMedia.sharingMenuCameraMicrophoneScreen = %S (camera, microphone and screen)
 getUserMedia.sharingMenuCameraMicrophoneWindow = %S (camera, microphone and window)
-getUserMedia.sharingMenuCameraApplication = %S (camera and application)
-getUserMedia.sharingMenuCameraScreen = %S (camera and screen)
-getUserMedia.sharingMenuCameraWindow = %S (camera and window)
-getUserMedia.sharingMenuMicrophoneApplication = %S (microphone and application)
-getUserMedia.sharingMenuMicrophoneScreen = %S (microphone and screen)
-getUserMedia.sharingMenuMicrophoneWindow = %S (microphone and window)
 getUserMedia.sharingMenuMicrophoneApplication = %S (microphone and application)
 getUserMedia.sharingMenuMicrophoneScreen = %S (microphone and screen)
 getUserMedia.sharingMenuMicrophoneWindow = %S (microphone and window)
 # LOCALIZATION NOTE(getUserMedia.sharingMenuUnknownHost): this is used for the website
 # origin for the sharing menu if no readable origin could be deduced from the URL.
 getUserMedia.sharingMenuUnknownHost = Unknown origin
 
+# LOCALIZATION NOTE(emeNotifications.drmContentPlaying.message2): %S is brandShortName.
+
+# LOCALIZATION NOTE(emeNotifications.drmContentDisabled.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S will be the 'learn more' link
+# LOCALIZATION NOTE(emeNotifications.drmContentDisabled.learnMoreLabel): NB: inserted via innerHTML, so please don't use <, > or & in this string.
+
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMNotSupported.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %1$S is brandShortName, %2$S will be the 'learn more' link
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMNotSupported.learnMoreLabel): NB: inserted via innerHTML, so please don't use <, > or & in this string.
+
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMInsufficientVersion.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S is brandShortName
+
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMInstalling.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S is brandShortName
+
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMNotSupported.64bit.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %1$S is brandShortName, %2$S will be the 'learn more' link
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMNotSupported.unsupportedOS.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %1$S is brandShortName, %2$S is the name of the user's OS (Windows, Linux, Mac OS X), %3$S will be the 'learn more' link
+
+
+
 # LOCALIZATION NOTE - %S is brandShortName
 slowStartup.message = %S seems slow… to… start.
-slowStartup.helpButton.label = Learn How to Speed It Up
-slowStartup.helpButton.accesskey = L
-slowStartup.disableNotificationButton.label = Don't Tell Me Again
-slowStartup.disableNotificationButton.accesskey = A
 
+# LOCALIZATION NOTE  - %S is brandShortName
 
 # LOCALIZATION NOTE(customizeTips.tip0): %1$S will be replaced with the text defined
 # in customizeTips.tip0.hint, %2$S will be replaced with brandShortName, %3$S will
 # be replaced with a hyperlink containing the text defined in customizeTips.tip0.learnMore.
 customizeTips.tip0 = %1$S: You can customise %2$S to work the way you do. Simply drag any of the above to the menu or toolbar. %3$S about customising %2$S.
 customizeTips.tip0.hint = Hint
 customizeTips.tip0.learnMore = Learn more
 
 # LOCALIZATION NOTE(appmenu.*.description, appmenu.*.label): these are used for
 # the appmenu labels and buttons that appear when an update is staged for
 # installation or a background update has failed and a manual download is required.
 # %S is brandShortName
-appmenu.restartNeeded.description = Restart %S to apply updates
-appmenu.updateFailed.description = Background update failed, please download update
 appmenu.restartBrowserButton.label = Restart %S
-appmenu.downloadUpdateButton.label = Download Update
+
+# Pre-landed string for bug 1124153
+# LOCALIZATION NOTE(readingList.sidebar.showMore.tooltip): %S is the number of items that will be added by clicking this button
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# Pre-landed strings for bug 1131457 / bug 1131461
+# Pre-landed strings for bug 1133610 & bug 1133611
+# LOCALIZATION NOTE(readingList.promo.noSync.label): %S a link, using the text from readingList.promo.noSync.link
--- a/browser/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -90,29 +90,21 @@ characterencoding-button.tooltiptext2 = 
 email-link-button.label = Email Link
 email-link-button.tooltiptext3 = Email a link to this page
 
 # LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.linux2 = Quit %1$S (%2$S)
 # LOCALIZATION NOTE(quit-button.tooltiptext.mac): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
-quit-button.tooltiptext.mac = Quit %1$S (%2$S)
 
 # LOCALIZATION NOTE(loop-call-button3.label): This is a brand name, request
 # approval before you change it.
-loop-call-button3.label = Hello
-loop-call-button3.tooltiptext = Start a conversation
 
-social-share-button.label = Share This Page
-social-share-button.tooltiptext = Share This Page
 
 panic-button.label = Forget
 panic-button.tooltiptext = Forget about some browsing history
 
 web-apps-button.label = Apps
-web-apps-button.tooltiptext = Discover Apps
 
 # LOCALIZATION NOTE(devtools-webide-button.label, devtools-webide-button.tooltiptext):
 # widget is only visible after WebIDE has been started once (Tools > Web Developers > WebIDE)
 # %S is the keyboard shortcut
-devtools-webide-button2.label = WebIDE
-devtools-webide-button2.tooltiptext = Open WebIDE (%S)
--- a/browser/chrome/browser/devtools/animationinspector.dtd
+++ b/browser/chrome/browser/devtools/animationinspector.dtd
@@ -1,24 +1,19 @@
 <!-- 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/. -->
-
+     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 Animations panel strings.
-  - The Animations panel is part of the Inspector sidebar -->
-
+     The Animations panel is part of the Inspector sidebar -->
 <!-- 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. -->
-
+     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 (title): This is the label shown in the sidebar tab -->
-<!ENTITY title                  "Animations">
-
 <!-- LOCALIZATION NOTE (invalidElement): This is the label shown in the panel
-  - when an invalid node is currently selected in the inspector. -->
-<!ENTITY invalidElement         "No animations were found for the current element.">
-
+     when an invalid node is currently selected in the inspector. -->
 <!-- LOCALIZATION NOTE (selectElement): This is the label shown in the panel
-  - when an invalid node is currently selected in the inspector, to invite the
-  - user to select a new node by clicking on the element-picker icon. -->
-<!ENTITY selectElement         "Pick another element from the page.">
\ No newline at end of file
+     when an invalid node is currently selected in the inspector, to invite the
+     user to select a new node by clicking on the element-picker icon. -->
+<!-- LOCALIZATION NOTE (allAnimations): This is the label shown at the bottom of
+     the panel, in a toolbar, to let the user know the toolbar applies to all
+     animations, not just the ones applying to the current element. -->
--- a/browser/chrome/browser/devtools/animationinspector.properties
+++ b/browser/chrome/browser/devtools/animationinspector.properties
@@ -8,36 +8,34 @@
 # 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 (player.animationNameLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation name.
-player.animationNameLabel=Animation:
 
 # LOCALIZATION NOTE (player.transitionNameLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed in the header, when the element is animated by mean of a css
 # transition
-player.transitionNameLabel=Transition
 
 # LOCALIZATION NOTE (player.animationDurationLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation duration.
-player.animationDurationLabel=Duration:
+
+# LOCALIZATION NOTE (player.animationDelayLabel):
+# This string is displayed in each animation player widget. It is the label
+# displayed before the animation delay.
 
 # LOCALIZATION NOTE (player.animationIterationCountLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the number of times the animation is set to repeat.
-player.animationIterationCountLabel=Repeats:
 
 # LOCALIZATION NOTE (player.infiniteIterationCount):
 # In case the animation repeats infinitely, this string is displayed next to the
 # player.animationIterationCountLabel string, instead of a number.
-player.infiniteIterationCount=&#8734;
 
 # LOCALIZATION NOTE (player.timeLabel):
 # This string is displayed in each animation player widget, to indicate either
 # how long (in seconds) the animation lasts, or what is the animation's current
 # time (in seconds too);
-player.timeLabel=%Ss
--- a/browser/chrome/browser/devtools/app-manager.dtd
+++ b/browser/chrome/browser/devtools/app-manager.dtd
@@ -31,19 +31,19 @@
 <!ENTITY device.denyTooltip "This permission is denied for apps of this type">
 <!ENTITY device.installedApps "Installed Apps">
 <!ENTITY device.installedAppsTooltip "View a list of apps installed on the device. Some apps, such as certified apps, may be excluded from this view.">
 <!ENTITY device.permissions "Permissions">
 <!ENTITY device.permissionsTooltip "View a table of the permissions accessible to the different types of apps">
 <!ENTITY device.permissionsHelpLink "https://developer.mozilla.org/docs/Web/Apps/App_permissions">
 <!ENTITY device.browserTabs "Browser Tabs">
 <!ENTITY device.browserTabsTooltip "View a list of tabs in the browser of the connected device">
-<!ENTITY device.debugBrowserTab "Debug">
+
 <!ENTITY device.debugBrowserTabTooltip "Open the Developer Tools connected to this browser tab on the device">
-<!ENTITY device.help "Help">
+
 
 <!ENTITY connection.connectTooltip "Connect to the device">
 <!ENTITY connection.disconnect "Disconnect">
 <!ENTITY connection.disconnectTooltip "Disconnect from the current device or simulator">
 <!ENTITY connection.notConnected2 "Not Connected.">
 <!ENTITY connection.connectTo "Connect to:">
 <!ENTITY connection.noDeviceFound "No device found. Plug a device">
 <!ENTITY connection.changeHostAndPort "Change">
@@ -61,43 +61,42 @@
 <!ENTITY connection.noSimulatorInstalled "No simulator installed.">
 <!ENTITY connection.installOneSimulator "Install Simulator">
 <!ENTITY connection.installOneSimulatorTooltip "Install a version of the Simulator by downloading the relevant add-on">
 <!ENTITY connection.installAnotherSimulator "Add">
 <!ENTITY connection.installAnotherSimulatorTooltip "Install an additional version of the Simulator by downloading the relevant add-on">
 <!ENTITY connection.startRegisteredSimulator "Start:">
 
 <!ENTITY projects.localApps "Local Apps">
-<!ENTITY projects.addApp "Add">
+
 <!ENTITY projects.addPackaged "Add Packaged App">
 <!ENTITY projects.addPackagedTooltip "Add a new packaged app (a directory) from your computer">
 <!ENTITY projects.addHosted "Add Hosted App">
 <!ENTITY projects.addHostedTooltip "Add a new hosted app (link to a manifest.webapp file) from a remote web site">
-<!ENTITY projects.title "Local Apps">
+
 <!ENTITY projects.appDetails "App Details">
 <!ENTITY projects.removeAppFromList "Remove this app from the list of apps you are working on. This will not remove it from a device or a simulator.">
 <!ENTITY projects.updateApp "Update">
 <!ENTITY projects.updateAppTooltip "Execute validation checks and update the app to the connected device">
-<!ENTITY projects.debugApp "Debug">
+
 <!ENTITY projects.debugAppTooltip "Open Developer Tools connected to this app">
-<!ENTITY projects.saveManifest "Save">
+
 <!ENTITY projects.saveManifestTooltip "Save the contents of the Manifest Editor below">
 <!ENTITY projects.hostedManifestPlaceHolder2 "http://example.com/app/manifest.webapp">
 <!ENTITY projects.noProjects "No projects. Add a new packaged app below (local directory) or a hosted app (link to a manifest file).">
 <!ENTITY projects.manifestEditor "Manifest Editor">
 <!ENTITY projects.manifestEditorTooltip "Edit your app's manifest in the panel below. The Update button will save your changes and update the app.">
 <!ENTITY projects.manifestViewer "Manifest Viewer">
 <!ENTITY projects.manifestViewerTooltip "Examine your app's manifest in the panel below">
 <!ENTITY projects.valid "Valid">
 <!ENTITY projects.error "Error">
 <!ENTITY projects.warning "Warning">
 <!ENTITY projects.hosted "Hosted">
 <!ENTITY projects.packaged "Packaged">
 
-<!ENTITY help.title "App Manager">
 <!ENTITY help.close "Close">
 <!ENTITY help.intro "This tool will help you build and install web apps on compatible devices (i.e. Firefox OS). The <strong>Apps</strong> tab will assist you in the validation and installation process of your app. The <strong>Device</strong> tab will give you information about the connected device. Use the bottom toolbar to connect to a device or start the simulator.">
 <!ENTITY help.usefullLinks "Useful links:">
 <!ENTITY help.appMgrDoc "Documentation: Using the App Manager">
 <!ENTITY help.configuringDevice "How to setup your Firefox OS device">
 <!ENTITY help.troubleShooting "Troubleshooting">
 <!ENTITY help.simulatorAddon "Install Simulator Add-on">
 <!ENTITY help.adbHelperAddon "Install Adb Helper Add-on">
--- a/browser/chrome/browser/devtools/app-manager.properties
+++ b/browser/chrome/browser/devtools/app-manager.properties
@@ -1,15 +1,12 @@
 # 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/.
 
-index.deprecationNotice=The App Manager will be removed in a future release.  Your projects have been migrated to WebIDE.
-index.launchWebIDE=Launch WebIDE
-index.readMoreAboutWebIDE=Read More
 # LOCALIZATION NOTE (device.deviceSize): %1$S is the device's width, %2$S is
 # the device's height, %3$S is the device's pixel density.
 # Example: 800x480 (86 DPI).
 device.deviceSize=Device size: %1$Sx%2$S (%3$S DPI)
 # LOCALIZATION NOTE (connection.connectedToDevice, connection.connectTo):
 # %1$S is the host name, %2$S is the port number.
 connection.connectedToDevice=Connected to %1$S
 connection.connectTo=Connect to %1$S:%2$S
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -310,8 +310,10 @@ watchExpressionsSeparatorLabel=\u0020→
 functionSearchSeparatorLabel=←
 
 # LOCALIZATION NOTE (resumptionOrderPanelTitle): This is the text that appears
 # as a description in the notification panel popup, when multiple debuggers are
 # open in separate tabs and the user tries to resume them in the wrong order.
 # The substitution parameter is the URL of the last paused window that must be
 # resumed first.
 resumptionOrderPanelTitle=There are one or more paused debuggers. Please resume the most-recently paused debugger first at: %S
+
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/device.properties
@@ -0,0 +1,14 @@
+# 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 These strings are used inside Device Emulation developer
+# tools. 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:
+# These strings are category names in a list of devices that a user can choose
+# to simulate (e.g. "ZTE Open C", "VIA Vixen", "720p HD Television", etc).
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -17,17 +17,16 @@
 helpDesc=Get help on the available commands
 
 # LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
 # explain the contents of the command help table.
 helpAvailable=Available Commands
 
 # LOCALIZATION NOTE (notAvailableInE10S) Used in the output of any command that
 # is not compatible with multiprocess mode (E10S).
-notAvailableInE10S=The command '%1$S' is not available in multiprocess mode (E10S)
 
 # LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
 # function of the console command.
 consoleDesc=Commands to control the console
 
 # LOCALIZATION NOTE (consoleManual) A longer description describing the
 # set of commands that control the console.
 consoleManual=Filter, clear and close the web console
@@ -215,17 +214,16 @@ highlightKeepDesc=Keep existing highligh
 # option parameter to the 'highlight' command, displayed when the user asks for
 # help on what it does.
 highlightKeepManual=By default, existing highlighters are hidden when running the command, unless this option is set
 
 # LOCALIZATION NOTE (highlightOutputConfirm) A confirmation message for the
 # 'highlight' command, displayed to the user once the command has been entered,
 # informing the user how many nodes have been highlighted successfully and how
 # to turn highlighting off
-highlightOutputConfirm=%1$S nodes highlighted
 
 # LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
 # 'highlight' command, displayed to the user once the command has been entered,
 # informing the user how many nodes have been highlighted successfully and that
 # some nodes could not be highlighted due to the maximum number of nodes being
 # reached, and how to turn highlighting off
 highlightOutputMaxReached=%1$S nodes matched, but only %2$S nodes highlighted. Use '--showall' to show all
 
--- a/browser/chrome/browser/devtools/inspector.dtd
+++ b/browser/chrome/browser/devtools/inspector.dtd
@@ -1,96 +1,80 @@
 <!-- LOCALIZATION NOTE (inspectorHTMLEdit.label): This is the label shown
      in the inspector contextual-menu for the item that lets users edit the
      (outer) HTML of the current node -->
 <!ENTITY inspectorHTMLEdit.label       "Edit As HTML">
 <!ENTITY inspectorHTMLEdit.accesskey   "E">
-
 <!-- LOCALIZATION NOTE (inspectorHTMLCopyInner.label): This is the label shown
      in the inspector contextual-menu for the item that lets users copy the
      inner HTML of the current node -->
+
 <!ENTITY inspectorHTMLCopyInner.label       "Copy Inner HTML">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "I">
-
 <!-- LOCALIZATION NOTE (inspectorHTMLCopyOuter.label): This is the label shown
      in the inspector contextual-menu for the item that lets users copy the
      outer HTML of the current node -->
+
 <!ENTITY inspectorHTMLCopyOuter.label       "Copy Outer HTML">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
-
 <!-- LOCALIZATION NOTE (inspectorCopyUniqueSelector.label): This is the label
      shown in the inspector contextual-menu for the item that lets users copy
      the CSS Selector of the current node -->
+
 <!ENTITY inspectorCopyUniqueSelector.label       "Copy Unique Selector">
 <!ENTITY inspectorCopyUniqueSelector.accesskey   "U">
-
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteOuter.label): This is the label shown
      in the inspector contextual-menu for the item that lets users paste outer
      HTML in the current node -->
+
 <!ENTITY inspectorHTMLPasteOuter.label      "Paste Outer HTML">
 <!ENTITY inspectorHTMLPasteOuter.accesskey  "P">
-
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteInner.label): This is the label shown
      in the inspector contextual-menu for the item that lets users paste inner
      HTML in the current node -->
-<!ENTITY inspectorHTMLPasteInner.label      "Paste Inner HTML">
-<!ENTITY inspectorHTMLPasteInner.accesskey  "n">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteExtraSubmenu.label): This is the label
      shown in the inspector contextual-menu for the sub-menu of the other Paste
      items, which allow to paste HTML:
      - before the current node
      - after the current node
      - as the first child of the current node
      - as the last child of the current node -->
-<!ENTITY inspectorHTMLPasteExtraSubmenu.label      "Paste…">
-<!ENTITY inspectorHTMLPasteExtraSubmenu.accesskey  "t">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteBefore.label): This is the label shown
      in the inspector contextual-menu for the item that lets users paste
      the HTML before the current node -->
-<!ENTITY inspectorHTMLPasteBefore.label      "Before">
-<!ENTITY inspectorHTMLPasteBefore.accesskey  "B">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteAfter.label): This is the label shown
      in the inspector contextual-menu for the item that lets users paste
      the HTML after the current node -->
-<!ENTITY inspectorHTMLPasteAfter.label       "After">
-<!ENTITY inspectorHTMLPasteAfter.accesskey   "A">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteFirstChild.label): This is the label
      shown in the inspector contextual-menu for the item that lets users paste
      the HTML as the first child the current node -->
-<!ENTITY inspectorHTMLPasteFirstChild.label      "As First Child">
-<!ENTITY inspectorHTMLPasteFirstChild.accesskey  "F">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteLastChild.label): This is the label
      shown in the inspector contextual-menu for the item that lets users paste
      the HTML as the last child the current node -->
-<!ENTITY inspectorHTMLPasteLastChild.label       "As Last Child">
-<!ENTITY inspectorHTMLPasteLastChild.accesskey   "L">
-
 
 <!-- LOCALIZATION NOTE (inspectorHTMLDelete.label): This is the label shown in
      the inspector contextual-menu for the item that lets users delete the
      current node -->
+
+
 <!ENTITY inspectorHTMLDelete.label          "Delete Node">
 <!ENTITY inspectorHTMLDelete.accesskey      "D">
 
 <!ENTITY inspector.selectButton.tooltip     "Select element with mouse">
-
-<!-- LOCALIZATION NOTE (inspectorSearchHTML.label): This is the label shown as
+<!-- LOCALIZATION NOTE (inspectorSearchHTML.label2): This is the label shown as
      the placeholder in inspector search box -->
-<!ENTITY inspectorSearchHTML.label          "Search HTML">
 <!ENTITY inspectorSearchHTML.key            "F">
-
 <!-- LOCALIZATION NOTE (inspectorCopyImageDataUri.label): This is the label
      shown in the inspector contextual-menu for the item that lets users copy
      the URL embedding the image data encoded in Base 64 (what we name
      here Image Data URL). For more information:
      https://developer.mozilla.org/en-US/docs/Web/HTTP/data_URIs -->
+
 <!ENTITY inspectorCopyImageDataUri.label       "Copy Image Data-URL">
-
 <!-- LOCALIZATION NOTE (inspectorShowDOMProperties.label): This is the label
      shown in the inspector contextual-menu for the item that lets users see
      the DOM properties of the current node. When triggered, this item
      opens the split Console and displays the properties in its side panel. -->
-<!ENTITY inspectorShowDOMProperties.label       "Show DOM Properties">
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -28,19 +28,17 @@ debuggerPausedWarning.message=Debugger i
 
 # 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 (inspector.*)
 # Used for the menuitem in the tool menu
-inspector.label=Inspector
 inspector.commandkey=C
-inspector.accesskey=I
 
 # LOCALIZATION NOTE (inspector.panelLabel.*)
 # Labels applied to the panel and views within the panel in the toolbox
 inspector.panelLabel=Inspector Panel
 inspector.panelLabel.markupView=Markup View
 
 # LOCALIZATION NOTE (markupView.more.*)
 # When there are too many nodes to load at once, we will offer to
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -1,316 +1,306 @@
 <!-- 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): 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.">
-
 <!-- 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.status2     "✓">
-
 <!-- 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.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. -->
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.size): This is the label displayed
-  -  in the network table toolbar, above the "size" column. -->
+  -  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 (debuggerUI.tab.headers): This is the label displayed
   -  in the network details pane identifying the headers tab. -->
+
 <!ENTITY netmonitorUI.tab.headers         "Headers">
-
 <!-- LOCALIZATION NOTE (debuggerUI.tab.cookies): This is the label displayed
   -  in the network details pane identifying the cookies tab. -->
+
 <!ENTITY netmonitorUI.tab.cookies         "Cookies">
-
 <!-- LOCALIZATION NOTE (debuggerUI.tab.params): This is the label displayed
   -  in the network details pane identifying the params tab. -->
+
 <!ENTITY netmonitorUI.tab.params          "Params">
-
 <!-- LOCALIZATION NOTE (debuggerUI.tab.response): This is the label displayed
   -  in the network details pane identifying the response tab. -->
+
 <!ENTITY netmonitorUI.tab.response        "Response">
-
 <!-- LOCALIZATION NOTE (debuggerUI.tab.timings): This is the label displayed
   -  in the network details pane identifying the timings tab. -->
+
 <!ENTITY netmonitorUI.tab.timings         "Timings">
-
 <!-- LOCALIZATION NOTE (debuggerUI.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 (debuggerUI.footer.filterAll): This is the label displayed
   -  in the network details footer for the "All" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterAll    "All">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterHTML): This is the label displayed
   -  in the network details footer for the "HTML" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterHTML   "HTML">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterCSS): This is the label displayed
   -  in the network details footer for the "CSS" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterCSS    "CSS">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterJS): This is the label displayed
   -  in the network details footer for the "JS" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterJS     "JS">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterXHR): This is the label displayed
   -  in the network details footer for the "XHR" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterXHR    "XHR">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterFonts): This is the label displayed
   -  in the network details footer for the "Fonts" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterFonts  "Fonts">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterImages): This is the label displayed
   -  in the network details footer for the "Images" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterImages "Images">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterMedia): This is the label displayed
   -  in the network details footer for the "Media" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterMedia  "Media">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterFlash): This is the label displayed
   -  in the network details footer for the "Flash" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterFlash  "Flash">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterOther): This is the label displayed
   -  in the network details footer for the "Other" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterOther  "Other">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.clear): This is the label displayed
   -  in the network details footer for the "Clear" button. -->
+
 <!ENTITY netmonitorUI.footer.clear  "Clear">
-
 <!-- LOCALIZATION NOTE (debuggerUI.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 (debuggerUI.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 (debuggerUI.summary.url): This is the label displayed
   -  in the network details headers tab identifying the URL. -->
+
 <!ENTITY netmonitorUI.summary.url         "Request URL:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.summary.method): This is the label displayed
   -  in the network details headers tab identifying the method. -->
+
 <!ENTITY netmonitorUI.summary.method      "Request method:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.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 (debuggerUI.summary.version): This is the label displayed
   -  in the network details headers tab identifying the http version. -->
+
 <!ENTITY netmonitorUI.summary.version     "Version:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.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 (debuggerUI.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 (debuggerUI.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 (debuggerUI.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 (debuggerUI.response.encoding): This is the label displayed
   -  in the network details response tab identifying an image's encoding. -->
+
 <!ENTITY netmonitorUI.response.encoding   "Encoding:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.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 (debuggerUI.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 (debuggerUI.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 (debuggerUI.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 (debuggerUI.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 (debuggerUI.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.protocol): A tooltip
+  -  for warning icon that indicates a connection uses insecure protocol. -->
+<!-- LOCALIZATION NOTE (netmonitorUI.security.warning.cipher): A tooltip
+  -  for warning icon that indicates a connection uses insecure cipher suite. -->
 <!-- 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.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 "S">
-
 <!-- 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.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.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 "C">
-
 <!-- 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 (debuggerUI.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 (debuggerUI.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 "R">
-
 <!-- LOCALIZATION NOTE (debuggerUI.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 (debuggerUI.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 (debuggerUI.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 "O">
-
 <!-- LOCALIZATION NOTE (debuggerUI.custom.newRequest): This is the label displayed
   -  as the title of the new custom request form -->
+
 <!ENTITY netmonitorUI.custom.newRequest   "New Request">
-
 <!-- LOCALIZATION NOTE (debuggerUI.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 (debuggerUI.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 (debuggerUI.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 (debuggerUI.custom.send): This is the label displayed
   -  on the button which sends the custom request -->
+
 <!ENTITY netmonitorUI.custom.send         "Send">
-
 <!-- LOCALIZATION NOTE (debuggerUI.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 (debuggerUI.backButton): This is the label displayed
   -  on the button which exists the performance statistics view -->
+
 <!ENTITY netmonitorUI.backButton          "Back">
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -8,46 +8,44 @@
 # 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 (netmonitor.label):
 # This string is displayed in the title of the tab when the Network Monitor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
-netmonitor.label=Network
 
 # LOCALIZATION NOTE (netmonitor.panelLabel):
 # This is used as the label for the toolbox panel.
 netmonitor.panelLabel=Network Panel
 
 # LOCALIZATION NOTE (netmonitor.commandkey, netmonitor.accesskey)
 # Used for the menuitem in the tool menu
 netmonitor.commandkey=Q
-netmonitor.accesskey=N
 
 # LOCALIZATION NOTE (netmonitor.tooltip):
 # This string is displayed in the tooltip of the tab when the Network Monitor is
 # displayed inside the developer tools window.
 netmonitor.tooltip=Network Monitor
 
 # LOCALIZATION NOTE (netmonitor.security.state.secure)
 # This string is used as an tooltip for request that was performed over secure
 # channel i.e. the connection was encrypted.
-netmonitor.security.state.secure=The connection used to fetch this resource was secure.
 
 # LOCALIZATION NOTE (netmonitor.security.state.insecure)
 # This string is used as an tooltip for request that was performed over insecure
 # channel i.e. the connection was not encrypted.
-netmonitor.security.state.insecure=The connection used to fetch this resource was not encrypted.
 
 # LOCALIZATION NOTE (netmonitor.security.state.broken)
 # This string is used as an tooltip for request that failed due to security
 # issues.
-netmonitor.security.state.broken=A security error prevented the resource from being loaded.
+
+# LOCALIZATION NOTE (netmonitor.security.state.weak)
+# This string is used as an tooltip for request that had minor security issues
 
 # LOCALIZATION NOTE (netmonitor.security.enabled):
 # This string is used to indicate that a specific security feature is used by
 # a connection in the security details tab.
 # For example: "HTTP Strict Transport Security: Enabled"
 netmonitor.security.enabled=Enabled
 
 # LOCALIZATION NOTE (netmonitor.security.disabled):
@@ -55,24 +53,22 @@ netmonitor.security.enabled=Enabled
 # a connection in the security details tab.
 # For example: "HTTP Strict Transport Security: Disabled"
 netmonitor.security.disabled=Disabled
 
 # LOCALIZATION NOTE (netmonitor.security.hostHeader):
 # This string is used as a header for section containing security information
 # related to the remote host. %S is replaced with the domain name of the remote
 # host. For example: Host example.com
-netmonitor.security.hostHeader=Host %S:
 
 # LOCALIZATION NOTE (netmonitor.security.notAvailable):
 # This string is used to indicate that a certain piece of information is not
 # available to be displayd. For example a certificate that has no organization
 # defined:
 #   Organization: <Not Available>
-netmonitor.security.notAvailable=<Not Available>
 
 # LOCALIZATION NOTE (collapseDetailsPane): This is the tooltip for the button
 # that collapses the network details pane in the UI.
 collapseDetailsPane=Hide request details
 
 # LOCALIZATION NOTE (expandDetailsPane): This is the tooltip for the button
 # that expands the network details pane in the UI.
 expandDetailsPane=Show request details
@@ -164,16 +160,20 @@ networkMenu.empty=No requests
 # information about all requests. Parameters: #1 is the number of requests,
 # #2 is the size, #3 is the number of seconds.
 networkMenu.summary=One request, #2 kB, #3 s;#1 requests, #2 kB, #3 s
 
 # LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
 # in the network menu specifying the size of a request (in kilobytes).
 networkMenu.sizeKB=%S kB
 
+# LOCALIZATION NOTE (networkMenu.sizeUnavailable): This is the label displayed
+# in the network menu specifying the transferred size of a request is
+# unavailable.
+
 # LOCALIZATION NOTE (networkMenu.totalMS): This is the label displayed
 # in the network menu specifying the time for a request to finish (in milliseconds).
 networkMenu.totalMS=→ %S ms
 
 # LOCALIZATION NOTE (networkMenu.millisecond): This is the label displayed
 # in the network menu specifying timing interval divisions (in milliseconds).
 networkMenu.millisecond=%S ms
 
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -1,63 +1,87 @@
 <!-- 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 Profiler 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 (profilerUI.emptyNotice1/2): This is the label shown
   -  in the call list view when empty. -->
+
+
+
 <!ENTITY profilerUI.emptyNotice1    "Click on the">
 <!ENTITY profilerUI.emptyNotice2    "button to start recording JavaScript function calls.">
-
 <!-- LOCALIZATION NOTE (profilerUI.stopNotice1/2): This is the label shown
   -  in the call list view while recording a profile. -->
+
 <!ENTITY profilerUI.stopNotice1    "Click on the">
 <!ENTITY profilerUI.stopNotice2    "button again to stop profiling.">
-
 <!-- LOCALIZATION NOTE (profilerUI.loadingNotice): This is the label shown
   -  in the call list view while loading a profile. -->
+
 <!ENTITY profilerUI.loadingNotice "Loading…">
-
 <!-- LOCALIZATION NOTE (profilerUI.recordButton): This string is displayed
   -  on a button that starts a new profile. -->
+
 <!ENTITY profilerUI.recordButton.tooltip "Record JavaScript function calls.">
-
 <!-- LOCALIZATION NOTE (profilerUI.importButton): This string is displayed
   -  on a button that opens a dialog to import a saved profile data file. -->
+
 <!ENTITY profilerUI.importButton "Import…">
-
 <!-- LOCALIZATION NOTE (profilerUI.exportButton): This string is displayed
   -  on a button that opens a dialog to export a saved profile data file. -->
+
 <!ENTITY profilerUI.exportButton "Save">
-
 <!-- LOCALIZATION NOTE (profilerUI.clearButton): This string is displayed
   -  on a button that remvoes all the recordings. -->
+
 <!ENTITY profilerUI.clearButton "Clear">
+<!-- LOCALIZATION NOTE (profilerUI.toolbar.*): These strings are displayed
+  -  in the toolbar on buttons that select which view is currently shown. -->
 
-<!-- LOCALIZATION NOTE (profilerUI.invertTree): This is the label shown next to
-  -  a checkbox that inverts and un-inverts the profiler's call tree. -->
-<!ENTITY profilerUI.invertTree "Invert Call Tree">
+<!ENTITY profilerUI.toolbar.waterfall "Timeline">
+<!ENTITY profilerUI.toolbar.js-calltree "JavaScript">
 
-<!-- LOCALIZATION NOTE (profilerUI.invertTree.tooltiptext): This is the tooltip
-  -  for the tree-inverting checkbox's label.  -->
-<!ENTITY profilerUI.invertTree.tooltiptext "Inverting the call tree displays the profiled call paths starting from the youngest frames and expanding out to the older frames.">
+
 
 <!-- LOCALIZATION NOTE (profilerUI.table.*): These strings are displayed
   -  in the call tree headers for a recording. -->
-<!ENTITY profilerUI.table.totalDuration   "Total Time (ms)">
-<!ENTITY profilerUI.table.selfDuration    "Self Time (ms)">
-<!ENTITY profilerUI.table.totalPercentage "Total Cost">
-<!ENTITY profilerUI.table.selfPercentage  "Self Cost">
-<!ENTITY profilerUI.table.samples         "Samples">
+
+
+
+
+
+
 <!ENTITY profilerUI.table.function        "Function">
-
 <!-- LOCALIZATION NOTE (profilerUI.newtab.tooltiptext): The tooltiptext shown
   -  on the "+" (new tab) button for a profile when a selection is available. -->
+
 <!ENTITY profilerUI.newtab.tooltiptext "Add new tab from selection">
+<!-- LOCALIZATION NOTE (profilerUI.options.tooltiptext): This is the tooltip
+  -  for the options button. -->
+<!-- LOCALIZATION NOTE (profilerUI.invertTree): This is the label shown next to
+  -  a checkbox that inverts and un-inverts the profiler's call tree. -->
+
+<!-- LOCALIZATION NOTE (profilerUI.invertFlameGraph): This is the label shown next to
+  -  a checkbox that inverts and un-inverts the profiler's flame graph. -->
+
+<!-- LOCALIZATION NOTE (profilerUI.showPlatformData): This is the
+  -  label for the checkbox that toggles whether or not Gecko platform data
+  -  is displayed in the profiler. -->
+
+<!-- LOCALIZATION NOTE (profilerUI.flattenTreeRecursion): This is the
+  -  label for the checkbox that toggles the flattening of tree recursion in inspected
+  -  functions in the profiler. -->
+
+<!-- LOCALIZATION NOTE (profilerUI.enableMemory): This string
+  -  is displayed next to a checkbox determining whether or not memory
+  -  measurements are enabled. -->
+
+<!-- LOCALIZATION NOTE (profilerUI.enableFramerate): This string
+  -  is displayed next to a checkbox determining whether or not framerate
+  -  is recorded. -->
+
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -63,35 +63,43 @@ profile.tab=%1$S ms → %2$S ms
 # as the unit used to measure frames per second. This label should be kept
 # AS SHORT AS POSSIBLE so it doesn't obstruct important parts of the graph.
 graphs.fps=fps
 
 # LOCALIZATION NOTE (graphs.ms):
 # This string is displayed in the flamegraph of the Profiler,
 # as the unit used to measure time (in milliseconds). This label should be kept
 # AS SHORT AS POSSIBLE so it doesn't obstruct important parts of the graph.
-graphs.ms=ms
 
 # LOCALIZATION NOTE (category.*):
 # These strings are displayed in the categories graph of the Profiler,
 # as the legend for each block in every bar. These labels should be kept
 # AS SHORT AS POSSIBLE so they don't obstruct important parts of the graph.
 category.other=Gecko
 category.css=Styles
 category.js=JIT
 category.gc=GC
 category.network=Network
 category.graphics=Graphics
 category.storage=Storage
 category.events=Input & Events
 
+# LOCALIZATION NOTE (graphs.ms):
+# This string is displayed in the call tree after units of time in milliseconds.
+
+# LOCALIZATION NOTE (graphs.ms):
+# This string is displayed in the call tree after units representing percentages.
+
 # LOCALIZATION NOTE (table.root):
 # This string is displayed in the call tree for the root node.
 table.root=(root)
 
+# LOCALIZATION NOTE (table.idle):
+# This string is displayed in the call tree for the idle blocks.
+
 # LOCALIZATION NOTE (table.url.tooltiptext):
 # This string is displayed in the call tree as the tooltip text for the url
 # labels which, when clicked, jump to the debugger.
 table.url.tooltiptext=View source in Debugger
 
 # LOCALIZATION NOTE (table.zoom.tooltiptext):
 # This string is displayed in the call tree as the tooltip text for the 'zoom'
 # buttons (small magnifying glass icons) which spawn a new tab.
@@ -103,8 +111,9 @@ recordingsList.saveDialogTitle=Save profile…
 
 # LOCALIZATION NOTE (recordingsList.saveDialogJSONFilter):
 # This string is displayed as a filter for saving a recording to disk.
 recordingsList.saveDialogJSONFilter=JSON Files
 
 # LOCALIZATION NOTE (recordingsList.saveDialogAllFilter):
 # This string is displayed as a filter for saving a recording to disk.
 recordingsList.saveDialogAllFilter=All Files
+
--- a/browser/chrome/browser/devtools/projecteditor.properties
+++ b/browser/chrome/browser/devtools/projecteditor.properties
@@ -8,23 +8,22 @@
 # 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 (projecteditor.confirmUnsavedTitle):
 # This string is displayed as as the title of the confirm prompt that checks
-# to make sure if the project editor can be closed without saving changes
+# to make sure if the project can be closed/switched without saving changes
 projecteditor.confirmUnsavedTitle=Unsaved Changes
 
-# LOCALIZATION NOTE (projecteditor.confirmUnsavedLabel):
+# LOCALIZATION NOTE (projecteditor.confirmUnsavedLabel2):
 # This string is displayed as the message of the confirm prompt that checks
-# to make sure if the project editor can be closed without saving changes
-projecteditor.confirmUnsavedLabel=You have unsaved changes that will be lost if you exit. Are you sure you want to continue?
+# to make sure if the project can be closed/switched without saving changes
 
 # LOCALIZATION NOTE (projecteditor.deleteLabel):
 # This string is displayed as a context menu item for allowing the selected
 # file / folder to be deleted.
 projecteditor.deleteLabel=Delete
 
 # LOCALIZATION NOTE (projecteditor.deletePromptTitle):
 # This string is displayed as as the title of the confirm prompt that checks
@@ -44,17 +43,16 @@ projecteditor.deleteFilePromptMessage=Ar
 # LOCALIZATION NOTE (projecteditor.newLabel):
 # This string is displayed as a menu item for adding a new file to
 # the directory.
 projecteditor.newLabel=New…
 
 # LOCALIZATION NOTE (projecteditor.renameLabel):
 # This string is displayed as a menu item for renaming a file in
 # the directory.
-projecteditor.renameLabel=Rename
 
 # LOCALIZATION NOTE (projecteditor.saveLabel):
 # This string is displayed as a menu item for saving the current file.
 projecteditor.saveLabel=Save
 
 # LOCALIZATION NOTE (projecteditor.saveAsLabel):
 # This string is displayed as a menu item for saving the current file
 # with a new name.
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -27,19 +27,19 @@ scratchpadContext.invalid=Scratchpad can
 # LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
 # open a file from Scratchpad.
 openFile.title=Open File
 
 # LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
 # open fails.
 openFile.failed=Failed to read the file.
 
-# LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
-# open fails.
-importFromFile.convert.failed=Failed to convert file to Unicode from %1$S.
+# LOCALIZATION NOTE  (importFromFile.convert.failed): This is the message
+# displayed when file conversion from some charset to Unicode fails.
+# %1 is the name of the charset from which the conversion failed.
 
 # LOCALIZATION NOTE (clearRecentMenuItems.label): This is the label for the
 # menuitem in the 'Open Recent'-menu which clears all recent files.
 clearRecentMenuItems.label=Clear Items
 
 # LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
 # a file in Scratchpad.
 saveFileAs=Save File As
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/shared.properties
@@ -0,0 +1,6 @@
+# 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 (dimensions): This is used to display the dimensions
+# of a node or image, like 100×200.
--- a/browser/chrome/browser/devtools/storage.properties
+++ b/browser/chrome/browser/devtools/storage.properties
@@ -10,21 +10,19 @@
 # on web development on the web.
 
 # LOCALIZATION NOTE  (storage.commandkey): This the key to use in
 # conjunction with shift to open the storage editor
 storage.commandkey=VK_F9
 
 # LOCALIZATION NOTE (storage.accesskey): The access key used to open the storage
 # editor.
-storage.accesskey=a
 
 # LOCALIZATION NOTE (storage.label):
 # This string is displayed as the label of the tab in the developer tools window
-storage.label=Storage
 
 # LOCALIZATION NOTE (storage.menuLabel):
 # This string is displayed in the Tools menu as a shortcut to open the devtools
 # with the Storage Inspector tab selected.
 storage.menuLabel=Storage Inspector
 
 # LOCALIZATION NOTE (storage.panelLabel):
 # This string is used as the aria-label for the iframe of the Storage Inspector
--- a/browser/chrome/browser/devtools/timeline.dtd
+++ b/browser/chrome/browser/devtools/timeline.dtd
@@ -1,43 +1,29 @@
 <!-- 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 Timeline 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 (timelineUI.recordButton): This string is displayed
   -  on a button that starts a new recording. -->
-<!ENTITY timelineUI.recordButton.tooltip "Record timeline operations">
-
-<!-- LOCALIZATION NOTE (timelineUI.recordButton): This string is displayed
+<!-- LOCALIZATION NOTE (timelineUI.recordLabel): This string is displayed
   -  as a label to signal that a recording is in progress. -->
+
 <!ENTITY timelineUI.recordLabel "Recording…">
-
-<!-- LOCALIZATION NOTE (timelineUI.timelineUI.memoryCheckbox.label): This string
+<!-- LOCALIZATION NOTE (timelineUI.memoryCheckbox.label): This string
   -  is displayed next to a checkbox determining whether or not memory
   -  measurements are enabled. -->
-<!ENTITY timelineUI.memoryCheckbox.label "Memory">
-
-<!-- LOCALIZATION NOTE (timelineUI.timelineUI.memoryCheckbox.tooltip): This string
+<!-- LOCALIZATION NOTE (timelineUI.memoryCheckbox.tooltip): This string
   -  is displayed next to the memory checkbox -->
-<!ENTITY timelineUI.memoryCheckbox.tooltip "Enable memory measurements">
-
 <!-- LOCALIZATION NOTE (timelineUI.filterButton.tooltip): This string
   -  is displayed next to the filter button-->
-<!ENTITY timelineUI.filterButton.tooltip "Select what data to display">
-
 <!-- LOCALIZATION NOTE (timelineUI.emptyNotice1/2): This is the label shown
   -  in the timeline view when empty. -->
-<!ENTITY timelineUI.emptyNotice1    "Click on the">
-<!ENTITY timelineUI.emptyNotice2    "button to start recording timeline events.">
 
 <!-- LOCALIZATION NOTE (timelineUI.stopNotice1/2): This is the label shown
   -  in the timeline view while recording. -->
-<!ENTITY timelineUI.stopNotice1    "Click on the">
-<!ENTITY timelineUI.stopNotice2    "button again to stop recording.">
+
--- a/browser/chrome/browser/devtools/timeline.properties
+++ b/browser/chrome/browser/devtools/timeline.properties
@@ -12,40 +12,32 @@
 
 # LOCALIZATION NOTE (timeline.label):
 # This string is displayed in the title of the tab when the timeline is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 timeline.label=Timeline
 
 # LOCALIZATION NOTE (timeline.panelLabel):
 # This is used as the label for the toolbox panel.
-timeline.panelLabel=Timeline Panel
 
 # LOCALIZATION NOTE (timeline.tooltip):
 # This string is displayed in the tooltip of the tab when the timeline is
 # displayed inside the developer tools window.
-timeline.tooltip=Performance Timeline
 
 # LOCALIZATION NOTE (timeline.tick):
 # This string is displayed in the timeline overview, for delimiting ticks
 # by time, in milliseconds.
 timeline.tick=%S ms
 
 # LOCALIZATION NOTE (timeline.records):
 # This string is displayed in the timeline waterfall, as a title for the menu.
-timeline.records=RECORDS
 
 # LOCALIZATION NOTE (timeline.label.*):
 # These strings are displayed in the timeline waterfall, identifying markers.
 # We want to use the same wording as Google Chrome
-timeline.label.styles2=Recalculate Style
-timeline.label.reflow2=Layout
-timeline.label.paint=Paint
-timeline.label.javascript2=Function Call
-timeline.label.domevent=DOM Event
 timeline.label.consoleTime=Console
 
 # LOCALIZATION NOTE (graphs.memory):
 # This string is displayed in the memory graph of the Performance tool,
 # as the unit used to memory consumption. This label should be kept
 # AS SHORT AS POSSIBLE so it doesn't obstruct important parts of the graph.
 graphs.memory=MB
 
@@ -53,20 +45,9 @@ graphs.memory=MB
 # Some timeline markers come with details, like a size, a name, a js function.
 # %1$S is replaced with one of the above label (timeline.label.*) and %2$S
 # with the details. For examples: Paint (200x100), or console.time (FOO)
 timeline.markerDetailFormat=%1$S (%2$S)
 
 # LOCALIZATION NOTE (time.markerDetail.*):
 # Strings used in the waterfall sidebar.
 timeline.markerDetail.start=Start:
-timeline.markerDetail.end=End:
-timeline.markerDetail.duration=Duration:
-timeline.markerDetail.consoleTimerName=Timer Name:
-timeline.markerDetail.DOMEventType=Event Type:
-timeline.markerDetail.DOMEventPhase=Phase:
-timeline.markerDetail.DOMEventTargetPhase=Target
-timeline.markerDetail.DOMEventCapturingPhase=Capture
-timeline.markerDetail.DOMEventBubblingPhase=Bubbling
 timeline.markerDetail.stack=Stack:
-timeline.markerDetail.startStack=Stack at start:
-timeline.markerDetail.endStack=Stack at end:
-timeline.markerDetail.unknownFrame=<unknown location>
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -1,15 +1,15 @@
 <!-- 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 Toolbox strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate key -->
 
+
 <!ENTITY closeCmd.key  "W">
 
 <!ENTITY toolboxCloseButton.tooltip    "Close Developer Tools">
 <!ENTITY toolboxOptionsButton.key      "O">
 <!ENTITY toolboxNextTool.key           "]">
 <!ENTITY toolboxPreviousTool.key       "[">
 
 <!ENTITY toolboxZoomIn.key             "+">
@@ -18,174 +18,173 @@
 <!ENTITY toolboxZoomOut.key            "-">
 <!ENTITY toolboxZoomReset.key          "0">
 
 <!ENTITY toolboxReload.key             "r">
 <!-- LOCALIZATION NOTE (toolboxFramesButton): This is the label for
   -  the iframes menu list that appears only when the document has some.
   -  It allows you to switch the context of the whole toolbox. -->
 <!ENTITY toolboxFramesTooltip          "Select an iframe as the currently targeted document">
-
 <!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
   -  the heading of the advanced settings group in the options panel. -->
+
 <!ENTITY options.context.advancedSettings "Advanced settings">
-
 <!-- LOCALIZATION NOTE (options.context.inspector): This is the label for
   -  the heading of the Inspector group in the options panel. -->
+
 <!ENTITY options.context.inspector "Inspector">
-
 <!-- LOCALIZATION NOTE (options.showUserAgentStyles.label): This is the label
   -  for the checkbox option to show user agent styles in the Inspector
   -  panel. -->
+
 <!ENTITY options.showUserAgentStyles.label "Show Browser Styles">
 <!ENTITY options.showUserAgentStyles.tooltip "Turning this on will show default styles that are loaded by the browser.">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.label): This is the label for a
   -  dropdown list that controls the default color unit used in the inspector.
   -  This label is visible in the options panel. -->
+
 <!ENTITY options.defaultColorUnit.label "Default colour unit">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.accesskey): This is the access
   -  key for a dropdown list that controls the default color unit used in the
   -  inspector. This is visible in the options panel. -->
+
 <!ENTITY options.defaultColorUnit.accesskey "u">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.hex): This is used in the
   -  'Default color unit' dropdown list and is visible in the options panel. -->
+
 <!ENTITY options.defaultColorUnit.hex "Hex">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.hsl): This is used in the
   -  'Default color unit' dropdown list and is visible in the options panel. -->
+
 <!ENTITY options.defaultColorUnit.hsl "HSL(A)">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.rgb): This is used in the
   -  'Default color unit' dropdown list and is visible in the options panel. -->
+
 <!ENTITY options.defaultColorUnit.rgb "RGB(A)">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.name): This is used in
   -  the 'Default color unit' dropdown list and is visible in the options panel.
   -  -->
+
 <!ENTITY options.defaultColorUnit.name "Colour Names">
-
 <!-- LOCALIZATION NOTE (options.context.triggersPageRefresh): This is the
   -  triggers page refresh footnote under the advanced settings group in the
   -  options panel and is used for settings that trigger page reload. -->
+
 <!ENTITY options.context.triggersPageRefresh  "* Current session only, reloads the page">
-
 <!-- LOCALIZATION NOTE (options.enableChrome.label4): This is the label for the
   -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
   -  boolean preference in about:config, in the options panel. -->
+
 <!ENTITY options.enableChrome.label4    "Enable chrome and addon debugging">
 <!ENTITY options.enableChrome.tooltip2  "Turning this option on will allow you to use various developer tools in browser context and debug addons from the Add-On Manager">
-
 <!-- LOCALIZATION NOTE (options.enableRemote.label3): This is the label for the
   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
   -  boolean preference in about:config, in the options panel. -->
+
 <!ENTITY options.enableRemote.label3    "Enable remote debugging">
 <!ENTITY options.enableRemote.tooltip   "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS">
-
 <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
   -  options.disableJavaScript.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles JavaScript on or off. -->
+
 <!ENTITY options.disableJavaScript.label     "Disable JavaScript *">
 <!ENTITY options.disableJavaScript.tooltip   "Turning this option on will disable JavaScript for the current tab. If the tab or the toolbox is closed then this setting will be forgotten.">
-
 <!-- LOCALIZATION NOTE (options.disableCache.label2,
   -  options.disableCache.tooltip2): This is the options panel label and
   -  tooltip for the checkbox that toggles the cache on or off. -->
+
 <!ENTITY options.disableCache.label2     "Disable Cache (when toolbox is open)">
 <!ENTITY options.disableCache.tooltip2   "Turning this option on will disable the cache for all tabs that have the toolbox open.">
-
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
+
 <!ENTITY options.selectDefaultTools.label     "Default Firefox Developer Tools">
-
 <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
   -  added by add-ons. This heading is hidden when there is no developer tool
   -  installed by add-ons. -->
+
 <!ENTITY options.selectAdditionalTools.label  "Developer Tools installed by add-ons">
-
 <!-- LOCALIZATION NOTE (options.selectEnabledToolboxButtons.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tool buttons. -->
+
 <!ENTITY options.selectEnabledToolboxButtons.label     "Available Toolbox Buttons">
-
 <!-- LOCALIZATION NOTE (options.toolNotSupported.label): This is the label for
   -  the explanation of the * marker on a tool which is currently not supported
   -  for the target of the toolbox. -->
+
 <!ENTITY options.toolNotSupported.label  "* Not supported for current toolbox target">
-
 <!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label2): This is the label for
   -  the heading of the radiobox corresponding to the theme of the developer
   -  tools. -->
+
 <!ENTITY options.selectDevToolsTheme.label2   "Themes">
-
 <!-- LOCALIZATION NOTE (options.usedeveditiontheme.*) Options under the
   -  toolbox for enabling and disabling the Developer Edition browser theme. -->
-<!ENTITY options.usedeveditiontheme.label   "Use Developer Edition browser theme">
-<!ENTITY options.usedeveditiontheme.tooltip "Toggles the Developer Edition browser theme.">
 
 <!-- LOCALIZATION NOTE (options.webconsole.label): This is the label for the
   -  heading of the group of Web Console preferences in the options panel. -->
+
 <!ENTITY options.webconsole.label            "Web Console">
-
 <!-- LOCALIZATION NOTE (options.timestampMessages.label): This is the
    - label for the checkbox that toggles timestamps in the Web Console -->
+
 <!ENTITY options.timestampMessages.label      "Enable timestamps">
 <!ENTITY options.timestampMessages.tooltip    "If you enable this option commands and output in the Web Console will display a timestamp">
-
 <!-- LOCALIZATION NOTE (options.styleeditor.label): This is the label for the
   -  heading of the group of Style Editor preferences in the options
   -  panel. -->
+
 <!ENTITY options.styleeditor.label            "Style Editor">
-
 <!-- LOCALIZATION NOTE (options.stylesheetSourceMaps.label): This is the
    - label for the checkbox that toggles showing original sources in the Style Editor -->
+
 <!ENTITY options.stylesheetSourceMaps.label      "Show original sources">
 <!ENTITY options.stylesheetSourceMaps.tooltip    "Show original sources (e.g. Sass files) in the Style Editor and Inspector">
-
 <!-- LOCALIZATION NOTE (options.stylesheetAutocompletion.label): This is the
    - label for the checkbox that toggles autocompletion of css in the Style Editor -->
+
 <!ENTITY options.stylesheetAutocompletion.label      "Autocomplete CSS">
 <!ENTITY options.stylesheetAutocompletion.tooltip    "Autocomplete CSS properties, values and selectors in Style Editor as you type">
-
 <!-- LOCALIZATION NOTE (options.profiler.label): This is the label for the
   -  heading of the group of JavaScript Profiler preferences in the options
   -  panel. -->
+
 <!ENTITY options.profiler.label            "JavaScript Profiler">
-
-<!-- LOCALICATION NOTE (options.commonprefs): This is the label for the heading
+<!-- LOCALIZATION NOTE (options.commonprefs): This is the label for the heading
       of all preferences that affect both the Web Console and the Network
       Monitor -->
+
 <!ENTITY options.commonPrefs.label           "Common Preferences">
-
 <!-- LOCALIZATION NOTE (options.enablePersistentLogs.label): This is the
   -  label for the checkbox that toggles persistent logs in the Web Console and
   -  network monitor,  i.e. devtools.webconsole.persistlog a boolean preference in
   -  about:config, in the options panel. -->
+
 <!ENTITY options.enablePersistentLogs.label    "Enable persistent logs">
 <!ENTITY options.enablePersistentLogs.tooltip  "If you enable this option the Web Console and Network Monitor will not clear the output each time you navigate to a new page">
-
 <!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
   -  label for the checkbox that toggles the display of the platform data in the,
   -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
   -  in about:config, in the options panel. -->
+
 <!ENTITY options.showPlatformData.label    "Show Gecko platform data">
 <!ENTITY options.showPlatformData.tooltip  "If you enable this option the JavaScript Profiler reports will include 
 Gecko platform symbols">
-
 <!-- LOCALIZATION NOTE (options.sourceeditor.*): Options under the editor
   -  section. -->
 
+
 <!ENTITY options.sourceeditor.label                     "Editor Preferences">
 <!ENTITY options.sourceeditor.detectindentation.label   "Detect indentation">
 <!ENTITY options.sourceeditor.detectindentation.tooltip "Guess indentation based on source content">
 <!ENTITY options.sourceeditor.autoclosebrackets.label   "Autoclose brackets">
 <!ENTITY options.sourceeditor.autoclosebrackets.tooltip "Automatically insert closing brackets">
 <!ENTITY options.sourceeditor.expandtab.label           "Indent using spaces">
 <!ENTITY options.sourceeditor.expandtab.tooltip         "Use spaces intead of the tab character">
 <!ENTITY options.sourceeditor.tabsize.label             "Tab size">
 <!ENTITY options.sourceeditor.tabsize.accesskey         "T">
 <!ENTITY options.sourceeditor.keybinding.label          "Keybindings">
 <!ENTITY options.sourceeditor.keybinding.accesskey      "K">
 <!ENTITY options.sourceeditor.keybinding.default.label  "Default">
+
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -66,20 +66,27 @@ scratchpad.keycode=VK_F4
 # Used for toggling the browser console from the detached toolbox window
 # Needs to match browserConsoleCmd.commandkey from browser.dtd
 browserConsoleCmd.commandkey=j
 
 # LOCALIZATION NOTE (pickButton.tooltip)
 # This is the tooltip of the pick button in the toolbox toolbar
 pickButton.tooltip=Pick an element from the page
 
+# LOCALIZATION NOTE (sidebar.showAllTabs.label)
+# This is the label shown in the show all tabs button in the tabbed side
+# bar, when there's no enough space to show all tabs at once
+
+# LOCALIZATION NOTE (sidebar.showAllTabs.tooltip)
+# This is the tooltip shown when hover over the '…' button in the tabbed side
+# bar, when there's no enough space to show all tabs at once
+
 # LOCALIZATION NOTE (options.darkTheme.label)
 # Used as a label for dark theme
 options.darkTheme.label=Dark theme
 
 # LOCALIZATION NOTE (options.lightTheme.label)
 # Used as a label for light theme
 options.lightTheme.label=Light theme
 
 # LOCALIZATION NOTE (toolbox.noContentProcess.message)
 # Used as a message in the alert displayed when trying to open a browser
 # content toolbox and there is no content process running
-toolbox.noContentProcess.message=No content process running.
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -68,16 +68,17 @@
 
 <!ENTITY btnPageLogging.label   "Logging">
 <!ENTITY btnPageLogging.tooltip "Log messages sent to the window.console object">
 <!ENTITY btnPageLogging.accesskey3 "L">
 <!ENTITY btnConsoleErrors       "Errors">
 <!ENTITY btnConsoleInfo         "Info">
 <!ENTITY btnConsoleWarnings     "Warnings">
 <!ENTITY btnConsoleLog          "Log">
+<!ENTITY btnConsoleXhr          "XHR">
 <!ENTITY btnConsoleReflows      "Reflows">
 
 <!ENTITY filterOutput.placeholder "Filter output">
 <!ENTITY btnClear.label        "Clear">
 <!ENTITY btnClear.tooltip      "Clear the Web Console output">
 <!ENTITY btnClear.accesskey    "r">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
--- a/browser/chrome/browser/devtools/webaudioeditor.dtd
+++ b/browser/chrome/browser/devtools/webaudioeditor.dtd
@@ -17,24 +17,31 @@
 <!-- LOCALIZATION NOTE (webAudioEditorUI.reloadNotice2): This is the label shown
   -  along with the button that triggers a page refresh. -->
 
 <!ENTITY webAudioEditorUI.reloadNotice2   "the page to view and edit the audio context.">
 <!-- LOCALIZATION NOTE (webAudioEditorUI.emptyNotice): This is the label shown
   -  while the page is refreshing and the tool waits for a audio context. -->
 
 <!ENTITY webAudioEditorUI.emptyNotice     "Waiting for an audio context to be created…">
-<!-- LOCALIZATION NOTE (webAudioEditorUI.tab.properties): This is the label shown
+<!-- LOCALIZATION NOTE (webAudioEditorUI.tab.properties2): This is the label shown
   -  for the properties tab view. -->
 
-<!ENTITY webAudioEditorUI.tab.properties  "Parameters">
+<!ENTITY webAudioEditorUI.tab.properties2 "Properties">
+<!-- LOCALIZATION NOTE (webAudioEditorUI.tab.automation): This is the label shown
+  -  for the automation tab view. -->
 <!-- LOCALIZATION NOTE (webAudioEditorUI.inspectorTitle): This is the title for the
   -  AudioNode inspector view. -->
 
 <!ENTITY webAudioEditorUI.inspectorTitle  "AudioNode Inspector">
 <!-- LOCALIZATION NOTE (webAudioEditorUI.inspectorEmpty): This is the title for the
   -  AudioNode inspector view empty message. -->
 
 <!ENTITY webAudioEditorUI.inspectorEmpty  "No AudioNode selected.">
 <!-- LOCALIZATION NOTE (webAudioEditorUI.propertiesEmpty): This is the title for the
   -  AudioNode inspector view properties tab empty message. -->
 
 <!ENTITY webAudioEditorUI.propertiesEmpty "Node does not have any properties.">
+<!-- LOCALIZATION NOTE (webAudioEditorUI.automationEmpty): This is the title for the
+  -  AudioNode inspector view automation tab empty message. -->
+<!-- LOCALIZATION NOTE (webAudioEditorUI.automationNoEvents): This is the title for the
+  -  AudioNode inspector view automation tab message when there are no automation
+  -  events. -->
--- a/browser/chrome/browser/devtools/webaudioeditor.properties
+++ b/browser/chrome/browser/devtools/webaudioeditor.properties
@@ -28,8 +28,11 @@ ToolboxWebAudioEditor1.tooltip=Web Audio
 # LOCALIZATION NOTE (collapseInspector): This is the tooltip for the button
 # that collapses the inspector in the web audio tool UI.
 collapseInspector=Collapse inspector
 
 # LOCALIZATION NOTE (expandInspector): This is the tooltip for the button
 # that expands the inspector in the web audio tool UI.
 expandInspector=Expand inspector
 
+# LOCALIZATION NOTE (webAudioEditorTooltipBypass): This is the tooltip for the
+# button that bypasses an AudioNode
+
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -4,35 +4,33 @@
 
 # LOCALIZATION NOTE
 # 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.
 
-typeError=Error:
-typeWarning=Warning:
-typeNetwork=Network:
-typeException=Exception:
-typeCssParser=CSS Parser:
-typeStrict=Strict Warning:
-msgCategory=Category:
+typeError=Error:\u0020
+typeWarning=Warning:\u0020
+typeNetwork=Network:\u0020
+typeException=Exception: \u0020
+typeCssParser=CSS Parser:\u0020
+typeStrict=Strict Warning:\u0020
+msgCategory=Category:\u0020
 errLine=Line: %S
 btnHide=Hide
 btnPrefs=Preferences
 categoryPage=Page:
 categoryConsole=Console:
 btnMutation=DOM Mutation
 tipMutation=Toggle DOM Mutation event logging
 btnGlobal=Global Messages
 tipGlobal=Toggle Global Message logging
 localConsole=Local Console
-clearConsoleCmd.label=Clear Console
-clearConsoleCmd.accesskey=e
 close.button=Close
 close.accesskey=C
 update.button=Update
 update.accesskey=U
 cmd.commandkey=k
 webConsoleCmd.accesskey=W
 
 # LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
@@ -65,16 +63,21 @@ NetworkPanel.responseBodyUnableToDisplay
 
 ConsoleAPIDisabled=The Web Console logging API (console.log, console.info, console.warn, console.error) has been disabled by a script on this page.
 
 # LOCALIZATION NOTE (webConsoleWindowTitleAndURL): the Web Console floating
 # panel title. For RTL languages you need to set the LRM in the string to give
 # the URL the correct direction. Parameters: %S is the web page URL.
 webConsoleWindowTitleAndURL=Web Console - %S
 
+# LOCALIZATION NOTE (webConsoleXhrIndicator): the indicator displayed before
+# a URL in the Web Console that was requested using an XMLHttpRequest.
+# Should probably be the same as &btnConsoleXhr; in webConsole.dtd
+webConsoleXhrIndicator=XHR
+
 # LOCALIZATION NOTE (webConsoleMixedContentWarning): the message displayed
 # after a URL in the Web Console that has been flagged for Mixed Content (i.e.
 # http content in an https page).
 webConsoleMixedContentWarning=Mixed Content
 
 # LOCALIZATION NOTE (webConsoleMoreInfoLabel): the more info tag displayed
 # after security related web console messages.
 webConsoleMoreInfoLabel=Learn More
@@ -252,8 +255,13 @@ messageToggleDetails=Show/hide message d
 emptySlotLabel=#1 empty slot;#1 empty slots
 
 # LOCALIZATION NOTE (table.index, table.iterationIndex, table.key, table.value):
 # the column header displayed in the console table widget.
 table.index=(index)
 table.iterationIndex=(iteration index)
 table.key=Key
 table.value=Values
+
+# LOCALIZATION NOTE (severity.error, severity.warn, severity.info, severity.log):
+# tooltip for icons next to console output
+severity.info=Info
+severity.log=Log
--- a/browser/chrome/browser/devtools/webide.dtd
+++ b/browser/chrome/browser/devtools/webide.dtd
@@ -10,117 +10,119 @@
 <!ENTITY projectMenu_newApp_accesskey "N">
 <!ENTITY projectMenu_importPackagedApp_label "Open Packaged App…">
 <!ENTITY projectMenu_importPackagedApp_accesskey "P">
 <!ENTITY projectMenu_importHostedApp_label "Open Hosted App…">
 <!ENTITY projectMenu_importHostedApp_accesskey "H">
 <!ENTITY projectMenu_selectApp_label "Open App…">
 <!ENTITY projectMenu_selectApp_accesskey "O">
 <!ENTITY projectMenu_play_label "Install and Run">
-<!ENTITY projectMenu_play_accesskey "I">
+
 <!ENTITY projectMenu_stop_label "Stop App">
 <!ENTITY projectMenu_stop_accesskey "S">
 <!ENTITY projectMenu_debug_label "Debug App">
 <!ENTITY projectMenu_debug_accesskey "D">
 <!ENTITY projectMenu_remove_label "Remove Project">
 <!ENTITY projectMenu_remove_accesskey "R">
 <!ENTITY projectMenu_showPrefs_label "Preferences">
 <!ENTITY projectMenu_showPrefs_accesskey "e">
-<!ENTITY projectMenu_manageComponents_label "Manage Extra Components">
-<!ENTITY projectMenu_manageComponents_accesskey "M">
+
+
 
 <!ENTITY runtimeMenu_label "Runtime">
 <!ENTITY runtimeMenu_accesskey "R">
 <!ENTITY runtimeMenu_disconnect_label "Disconnect">
 <!ENTITY runtimeMenu_disconnect_accesskey "D">
 <!ENTITY runtimeMenu_showPermissionTable_label "Permissions Table">
 <!ENTITY runtimeMenu_showPermissionTable_accesskey "P">
 <!ENTITY runtimeMenu_takeScreenshot_label "Screenshot">
 <!ENTITY runtimeMenu_takeScreenshot_accesskey "S">
 <!ENTITY runtimeMenu_showDetails_label "Runtime Info">
 <!ENTITY runtimeMenu_showDetails_accesskey "E">
 <!ENTITY runtimeMenu_showMonitor_label "Monitor">
 <!ENTITY runtimeMenu_showMonitor_accesskey "M">
-<!ENTITY runtimeMenu_showDevicePrefs_label "Device Preferences">
-<!ENTITY runtimeMenu_showDevicePrefs_accesskey "D">
+
+
+
+
 
 <!ENTITY viewMenu_label "View">
 <!ENTITY viewMenu_accesskey "V">
 <!ENTITY viewMenu_toggleEditor_label "Toggle Editor">
 <!ENTITY viewMenu_toggleEditor_accesskey "E">
 <!ENTITY viewMenu_zoomin_label "Zoom In">
-<!ENTITY viewMenu_zoomin_accesskey "I">
+
 <!ENTITY viewMenu_zoomout_label "Zoom Out">
-<!ENTITY viewMenu_zoomout_accesskey "O">
-<!ENTITY viewMenu_resetzoom_label "Reset Zoom">
-<!ENTITY viewMenu_resetzoom_accesskey "R">
+
+
+
 
 <!ENTITY projectButton_label "Open App">
 <!ENTITY runtimeButton_label "Select Runtime">
-
 <!-- We try to repicate Firefox' bindings: -->
 <!-- quit app -->
+
 <!ENTITY key_quit "W">
 <!-- open menu -->
 <!ENTITY key_showProjectPanel "O">
 <!-- reload app -->
 <!ENTITY key_play "R">
 <!-- show toolbox -->
 <!ENTITY key_toggleToolbox "VK_F12">
 <!-- toggle sidebar -->
 <!ENTITY key_toggleEditor "B">
 <!-- zoom -->
-<!ENTITY key_zoomin "+">
-<!ENTITY key_zoomin2 "=">
-<!ENTITY key_zoomout "-">
-<!ENTITY key_resetzoom "0">
+
+
+
 
 <!ENTITY projectPanel_myProjects "My Projects">
 <!ENTITY projectPanel_runtimeApps "Runtime Apps">
 <!ENTITY projectPanel_tabs "Tabs">
 <!ENTITY runtimePanel_usb "USB Devices">
 <!ENTITY runtimePanel_wifi "Wi-Fi Devices">
 <!ENTITY runtimePanel_simulator "Simulators">
 <!ENTITY runtimePanel_other "Other">
 <!ENTITY runtimePanel_installsimulator "Install Simulator">
 <!ENTITY runtimePanel_noadbhelper "Install ADB Helper">
 <!ENTITY runtimePanel_nousbdevice "Can't see your device?">
+<!-- Lense -->
 
-<!-- Lense -->
 <!ENTITY details_valid_header "valid">
 <!ENTITY details_warning_header "warnings">
 <!ENTITY details_error_header "errors">
 <!ENTITY details_description "Description">
 <!ENTITY details_location "Location">
 <!ENTITY details_manifestURL "App ID">
 <!ENTITY details_removeProject_button "Remove Project">
 
 <!-- New App -->
+
 <!ENTITY newAppWindowTitle "New App">
 <!ENTITY newAppHeader "Select template">
 <!ENTITY newAppLoadingTemplate "Loading templates…">
 <!ENTITY newAppProjectName "Project Name:">
+<!-- Decks -->
 
 
-<!-- Decks -->
 
 <!ENTITY deck_close "Close">
+<!-- Addons -->
 
-<!-- Addons -->
 <!ENTITY addons_title "Extra Components">
 <!ENTITY addons_aboutaddons "Open Add-ons Manager">
+<!-- Prefs -->
 
-<!-- Prefs -->
 <!ENTITY prefs_title "Preferences">
 <!ENTITY prefs_editor_title "Editor">
 <!ENTITY prefs_general_title "General">
 <!ENTITY prefs_restore "Restore Defaults">
-<!ENTITY prefs_manage_components "Manage Extra Components">
-<!ENTITY prefs_options_autoconnectruntime "Reconnect to previous runtime">
-<!ENTITY prefs_options_autoconnectruntime_tooltip "Reconnect to previous runtime when WebIDE starts">
+
+
+
 <!ENTITY prefs_options_rememberlastproject "Remember last project">
 <!ENTITY prefs_options_rememberlastproject_tooltip "Restore previous project when WebIDE starts">
 <!ENTITY prefs_options_templatesurl "Templates URL">
 <!ENTITY prefs_options_templatesurl_tooltip "Index of available templates">
 <!ENTITY prefs_options_showeditor "Show editor">
 <!ENTITY prefs_options_showeditor_tooltip "Show internal editor">
 <!ENTITY prefs_options_tabsize "Tab size">
 <!ENTITY prefs_options_expandtab "Soft tabs">
@@ -128,36 +130,53 @@
 <!ENTITY prefs_options_detectindentation "Autoindent">
 <!ENTITY prefs_options_detectindentation_tooltip "Guess indentation based on source content">
 <!ENTITY prefs_options_autocomplete "Autocomplete">
 <!ENTITY prefs_options_autocomplete_tooltip "Enable code autocompletion">
 <!ENTITY prefs_options_autoclosebrackets "Autoclose brackets">
 <!ENTITY prefs_options_autoclosebrackets_tooltip "Automatically insert closing brackets">
 <!ENTITY prefs_options_keybindings "Keybindings">
 <!ENTITY prefs_options_keybindings_default "Default">
+<!-- Permissions Table -->
 
-<!-- Permissions Table -->
 <!ENTITY permissionstable_title "Permissions Table">
 <!ENTITY permissionstable_name_header "Name">
+<!-- Runtime Details -->
 
-<!-- Runtime Details -->
 <!ENTITY runtimedetails_title "Runtime Info">
 <!ENTITY runtimedetails_adbIsRoot "ADB is root: ">
 <!ENTITY runtimedetails_summonADBRoot "root device">
 <!ENTITY runtimedetails_ADBRootWarning "(requires unlocked bootloader)">
-<!ENTITY runtimedetails_restrictedPrivileges "DevTools restricted privileges: ">
+
 <!ENTITY runtimedetails_requestPrivileges "request higher privileges">
 <!ENTITY runtimedetails_privilegesWarning "(Will reboot device. Requires root access.)">
+<!-- Device Preferences and Settings -->
+
+
+<!ENTITY device_typeobject "Object">
 
 <!-- Device Preferences -->
-<!ENTITY devicepreferences_title "Device Preferences">
-<!ENTITY devicepreferences_search "Search preferences">
-<!ENTITY devicepreferences_newname "New preference name">
-<!ENTITY devicepreferences_newtext "Preference value">
-<!ENTITY devicepreferences_addnew "Add new preference">
-<!ENTITY devicepreferences_typeboolean "Boolean">
-<!ENTITY devicepreferences_typenumber "Integer">
-<!ENTITY devicepreferences_typestring "String">
-<!ENTITY devicepreferences_typenone "Select a type">
+
+
+
+
+<!-- Device Settings -->
+
+
+
 
 <!-- Monitor -->
+
 <!ENTITY monitor_title "Monitor">
 <!ENTITY monitor_help "Help">
+<!-- WiFi Authentication -->
+<!-- LOCALIZATION NOTE (wifi_auth_header): The header displayed on the dialog
+     that instructs the user to transfer an authentication token to the
+     server. -->
+<!-- LOCALIZATION NOTE (wifi_auth_scan_request): Instructions requesting the
+     user to transfer authentication info by scanning a QR code. -->
+<!-- LOCALIZATION NOTE (wifi_auth_no_scanner): Link text to assist users with
+     devices that can't scan a QR code. -->
+<!-- LOCALIZATION NOTE (wifi_auth_yes_scanner): Link text to assist users with
+     devices that can scan a QR code. -->
+<!-- LOCALIZATION NOTE (wifi_auth_token_request): Instructions requesting the
+     user to transfer authentication info by transferring a token. -->
+<!-- Logs panel -->
--- a/browser/chrome/browser/devtools/webide.properties
+++ b/browser/chrome/browser/devtools/webide.properties
@@ -14,18 +14,17 @@ local_runtime=Local Runtime
 remote_runtime=Remote Runtime
 remote_runtime_promptTitle=Remote Runtime
 remote_runtime_promptMessage=hostname:port
 
 importPackagedApp_title=Select Directory
 importHostedApp_title=Open Hosted App
 importHostedApp_header=Enter Manifest URL
 
-notification_showTroubleShooting_label=Troubleshooting
-notification_showTroubleShooting_accesskey=T
+notification_showTroubleShooting_label=troubleshooting
 
 # LOCALIZATION NOTE (project_tab_loading): This is shown as a temporary tab
 # title for browser tab projects when the tab is still loading.
 project_tab_loading=Loading…
 
 # These messages appear in a notification box when an error occur.
 
 error_cantInstallNotFullyConnected=Can't install project. Not fully connected.
@@ -37,43 +36,39 @@ error_operationTimeout=Operation timed o
 error_operationFail=Operation failed: %1$S
 
 # Variable: app name
 error_cantConnectToApp=Can't connect to app: %1$S
 
 # Variable: error message (in english)
 error_cantFetchAddonsJSON=Can't fetch the add-on list: %S
 
-error_appProjectsLoadFailed=Unable to load project list. This can occur if you've used this profile with a newer version of Firefox.
 
 addons_stable=stable
 addons_unstable=unstable
 # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of
 # a given simulator version in the "Manage Simulators" pane.  %1$S: Firefox OS
 # version in the simulator, ex. 1.3.  %2$S: Simulator stability label, ex.
 # "stable" or "unstable".
 addons_simulator_label=Firefox OS %1$S Simulator (%2$S)
 addons_install_button=install
 addons_uninstall_button=uninstall
 addons_adb_label=ADB Helper Add-on
-addons_adapters_label=Tools Adapters Add-on
 addons_adb_warning=USB devices won't be detected without this add-on
 addons_status_unknown=?
 addons_status_installed=Installed
 addons_status_uninstalled=Not Installed
 addons_status_preparing=preparing
 addons_status_downloading=downloading
 addons_status_installing=installing
 
 runtimedetails_checkno=no
 runtimedetails_checkyes=yes
-runtimedetails_checkunknown=unknown (requires ADB Helper 0.4.0 or later)
 runtimedetails_notUSBDevice=Not a USB device
 
 # Validation status
 status_tooltip=Validation status: %1$S
 status_valid=VALID
 status_warning=WARNINGS
 status_error=ERRORS
 status_unknown=UNKNOWN
 
-# Preferences
-devicepreferences_reset_default=Reset to default
+# Device preferences and settings
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -66,40 +66,34 @@
 <!ENTITY cmd.clearList.accesskey          "a">
 <!ENTITY cmd.clearDownloads.label         "Clear Downloads">
 <!ENTITY cmd.clearDownloads.accesskey     "D">
 <!-- LOCALIZATION NOTE (cmd.unblock.label):
      This command may be shown in the context menu, as a menu button item, or as
      a text link when malware or potentially unwanted downloads are blocked.
      Note: This string doesn't exist in the UI yet.  See bug 1053890.
      -->
-<!ENTITY cmd.unblock.label                "Unblock">
-<!ENTITY cmd.unblock.accesskey            "U">
 
 <!-- LOCALIZATION NOTE (cmd.removeFile.label):
      This command may be shown in the context menu or as a menu button label
      when malware or potentially unwanted downloads are blocked.
      Note: This string doesn't exist in the UI yet.  See bug 1053890.
      -->
-<!ENTITY cmd.removeFile.label             "Remove File">
-<!ENTITY cmd.removeFile.accesskey         "m">
 
 <!-- LOCALIZATION NOTE (blocked.label):
      Shown as a tag before the file name for some types of blocked downloads.
      Note: This string doesn't exist in the UI yet.  See bug 1053890.
      -->
-<!ENTITY blocked.label                    "BLOCKED">
-
 <!-- LOCALIZATION NOTE (learnMore.label):
      Shown as a text link for some types of blocked downloads, for example
      malware, when there is an associated explanation page on the Mozilla site.
      Note: This string doesn't exist in the UI yet.  See bug 1053890.
      -->
+
 <!ENTITY learnMore.label                  "Learn More">
-
 <!-- LOCALIZATION NOTE (downloadsHistory.label, downloadsHistory.accesskey):
      This string is shown at the bottom of the Downloads Panel when all the
      downloads fit in the available space, or when there are no downloads in
      the panel at all.
      -->
 
 <!ENTITY downloadsHistory.label           "Show All Downloads">
 <!ENTITY downloadsHistory.accesskey       "S">
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -40,35 +40,25 @@ stateDirty=Blocked: May contain a virus 
 
 # LOCALIZATION NOTE (blockedMalware, blockedPotentiallyUnwanted,
 #                    blockedUncommon):
 # These strings are shown in the panel for some types of blocked downloads, and
 # are immediately followed by the "Learn More" link, thus they must end with a
 # period.  You may need to adjust "downloadDetails.width" in "downloads.dtd" if
 # this turns out to be longer than the other existing status strings.
 # Note: These strings don't exist in the UI yet.  See bug 1053890.
-blockedMalware=This file contains a virus or malware.
-blockedPotentiallyUnwanted=This file may harm your computer.
-blockedUncommon=This file may not be safe to open.
 
 # LOCALIZATION NOTE (unblockHeader, unblockTypeMalware,
 #                    unblockTypePotentiallyUnwanted, unblockTypeUncommon,
 #                    unblockTip, unblockButtonContinue, unblockButtonCancel):
 # These strings are displayed in the dialog shown when the user asks a blocked
 # download to be unblocked.  The severity of the threat is expressed in
 # descending order by the unblockType strings, it is higher for files detected
 # as malware and lower for uncommon downloads.
 # Note: These strings don't exist in the UI yet.  See bug 1053890.
-unblockHeader=Are you sure you want to unblock this file?
-unblockTypeMalware=This file contains a virus or other malware that will harm your computer.
-unblockTypePotentiallyUnwanted=This file, disguised as a helpful download, will make unexpected changes to your programs and settings.
-unblockTypeUncommon=This file has been downloaded from an unfamiliar and potentially dangerous web site and may not be safe to open.
-unblockTip=You can search for an alternate download source or try to download the file again later.
-unblockButtonContinue=Unblock anyway
-unblockButtonCancel=Keep me safe
 
 # LOCALIZATION NOTE (sizeWithUnits):
 # %1$S is replaced with the size number, and %2$S with the measurement unit.
 sizeWithUnits=%1$S %2$S
 sizeUnknown=Unknown size
 
 # LOCALIZATION NOTE (shortTimeLeftSeconds, shortTimeLeftMinutes,
 #                    shortTimeLeftHours, shortTimeLeftDays):
--- a/browser/chrome/browser/loop/loop.properties
+++ b/browser/chrome/browser/loop/loop.properties
@@ -1,80 +1,49 @@
 # 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/.
 
 # Panel Strings
 
 ## LOCALIZATION NOTE(clientShortname2): This should not be localized and
 ## should remain "Firefox Hello" for all locales.
-clientShortname2=Firefox Hello
+
 
 ## LOCALIZATION_NOTE(first_time_experience.title): clientShortname will be
 ## replaced by the brand name
-first_time_experience_title={{clientShortname}} — Join the conversation
-first_time_experience_button_label=Get Started
 
-share_link_header_text=Share this link to invite someone to talk:
-invite_header_text=Invite someone to join you.
-
-## LOCALIZATION NOTE(invitee_name_label): Displayed when obtaining a url.
-## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#precall-firstrun
-## Click the label icon at the end of the url field.
-invitee_name_label=Who are you inviting?
-## LOCALIZATION NOTE(invitee_expire_days_label): Allows the user to adjust
-## the expiry time. Click the label icon at the end of the url field to see where
-## this is:
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#precall-firstrun
-## Semicolon-separated list of plural forms. See:
-## http://developer.mozilla.org/en/docs/Localization_and_Plurals
-## In this item, don't translate the part between {{..}}
-invitee_expire_days_label=Invitation will expire in {{expiry_time}} day;Invitation will expire in {{expiry_time}} days
-## LOCALIZATION NOTE(invitee_expire_hours_label): Allows the user to adjust
-## the expiry time. Click the label icon are the end of the url field to see where
-## this is:
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#precall-firstrun
-## Semicolon-separated list of plural forms. See:
-## http://developer.mozilla.org/en/docs/Localization_and_Plurals
-## In this item, don't translate the part between {{..}}
-invitee_expire_hours_label=Invitation will expire in {{expiry_time}} hour;Invitation will expire in {{expiry_time}} hours
 
 # Status text
 display_name_guest=Guest
 display_name_dnd_status=Do Not Disturb
 display_name_available_status=Available
 
 # Error bars
 ## LOCALIZATION NOTE(unable_retrieve_url,session_expired_error_description,could_not_authenticate,password_changed_question,try_again_later,could_not_connect,check_internet_connection,login_expired,service_not_available,problem_accessing_account):
 ## These may be displayed at the top of the panel here:
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error
-unable_retrieve_url=Sorry, we were unable to retrieve a call url.
 session_expired_error_description=Session expired. All URLs you have previously created and shared will no longer work.
 could_not_authenticate=Could Not Authenticate
 password_changed_question=Did you change your password?
 try_again_later=Please try again later
 could_not_connect=Could Not Connect To The Server
 check_internet_connection=Please check your internet connection
 login_expired=Your Login Has Expired
 service_not_available=Service Unavailable At This Time
 problem_accessing_account=There Was A Problem Accessing Your Account
 
 ## LOCALIZATION NOTE(retry_button): Displayed when there is an error to retry
 ## the appropriate action.
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error for location
 retry_button=Retry
 
-share_email_subject4={{clientShortname}} — Join the conversation
 ## LOCALIZATION NOTE (share_email_body4): In this item, don't translate the
-## part between {{..}} and leave the \r\n\r\n part alone
-share_email_body4=Hello!\r\n\r\nJoin me for a video conversation using {{clientShortname}}:\r\n\r\nYou don't have to download or install anything. Just copy and paste this URL into your browser:\r\n\r\n{{callUrl}}\r\n\r\nIf you want, you can also learn more about {{clientShortname}} at {{learnMoreUrl}}\r\n\r\nTalk to you soon!
-share_button=Email
-share_button2=Email Link
-copy_url_button=Copy
-copy_url_button2=Copy Link
+## part between {{..}} and leave the \n\n part alone
+
 copied_url_button=Copied!
 
 panel_footer_signin_or_signup_link=Sign In or Sign Up
 
 settings_menu_item_account=Account
 settings_menu_item_settings=Settings
 settings_menu_item_signout=Sign Out
 settings_menu_item_signin=Sign In
@@ -92,20 +61,17 @@ contacts_search_placesholder=Search…
 ## for where this appears on the UI
 new_contact_button=New Contact
 ## LOCALIZATION NOTE (new_contact_name_placeholder, new_contact_email_placeholder):
 ## These are the placeholders for the fields for entering a new contact
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 ## and click the 'New Contact' button to see the fields.
 new_contact_name_placeholder=Name
 new_contact_email_placeholder=Email
-new_contact_fxos_phone_placeholder=Firefox OS Phone
-new_contact_phone_placeholder2=Phone
 
-contacts_blocked_contacts=Blocked Contacts
 
 ## LOCALIZATION NOTE (add_contact_button):
 ## This is the button to actually add the new contact
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 ## and click the 'New Contact' button to see the fields.
 add_contact_button=Add Contact
 ### LOCALIZATION NOTE (valid_email_text_description): This is displayed when
 ### the user enters an invalid email address, preventing the addition of the
@@ -115,26 +81,29 @@ valid_email_text_description=Please ente
 ## LOCALIZATION NOTE (add_or_import_contact_title): This is the subtitle of the panel
 ## at https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 add_or_import_contact_title=Add or Import Contact
 ## LOCALIZATION NOTE (import_contacts_button, importing_contacts_progress_button):
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 ## for where these appear on the UI
 import_contacts_button=Import
 importing_contacts_progress_button=Importing…
+## LOCALIZATION NOTE(import_contacts_success_message): Success notification message
+## when user's contacts have been successfully imported.
+## Semicolon-separated list of plural forms. See:
+## http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## In this item, don't translate the part between {{..}}
 ## LOCALIZATION NOTE(sync_contacts_button): This button is displayed in place of
 ## importing_contacts_button once contacts have been imported once.
 sync_contacts_button=Synchronise Contacts
 
 ## LOCALIZATION NOTE(import_failed_description simple): Displayed when an import of
 ## contacts fails. This is displayed in the error field here:
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error
 import_failed_description_simple=Sorry, contact import failed
-import_failed_description_some=Some contacts could not be imported
-import_failed_support_button=Help
 
 ## LOCALIZATION NOTE(remove_contact_menu_button): Displayed in the contact list in
 ## a pop-up menu next to the contact's name.
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 remove_contact_menu_button=Remove Contact
 ## LOCALIZATION NOTE(confirm_delete_contact_alert): This is an alert that is displayed
 ## to confirm deletion of a contact.
 confirm_delete_contact_alert=Are you sure you want to delete this contact?
@@ -176,23 +145,27 @@ edit_contact_done_button=Done
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 audio_call_menu_button=Audio Conversation
 
 ## LOCALIZATION NOTE(video_call_menu_button): Displayed in the contact list in a
 ## pop-up menu next to the contact's name.
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 video_call_menu_button=Video Conversation
 
+## LOCALIZATION NOTE(gravatars_promo_message): The {{learn_more}} part will be
+## replaced with a link with the text content of gravatars_promo_message_learnmore.
+gravatars_promo_message_learnmore=Learn more
+gravatars_promo_button_nothanks=No Thanks
+
 # Conversation Window Strings
 
 initiate_call_button_label2=Ready to start your conversation?
 incoming_call_title2=Conversation Request
 incoming_call_accept_button=Accept
 incoming_call_accept_audio_only_tooltip=Accept with voice
-incoming_call_accept_audio_video_tooltip=Accept with video
 incoming_call_cancel_button=Cancel
 incoming_call_cancel_and_block_button=Cancel and Block
 incoming_call_block_button=Block
 hangup_button_title=Hang up
 hangup_button_caption2=Exit
 mute_local_audio_button_title=Mute your audio
 unmute_local_audio_button_title=Unmute your audio
 mute_local_video_button_title=Mute your video
@@ -223,18 +196,16 @@ call_progress_ringing_description=Ringing…
 
 peer_ended_conversation2=The person you were calling has ended the conversation.
 conversation_has_ended=Your conversation has ended.
 restart_call=Rejoin
 
 ## LOCALIZATION NOTE (contact_unavailable_title): The title displayed
 ## when a contact is unavailable. Don't translate the part between {{..}}
 ## because this will be replaced by the contact's name.
-contact_unavailable_title={{contactName}} is unavailable.
-generic_contact_unavailable_title=This person is unavailable.
 
 generic_failure_title=Something went wrong.
 generic_failure_with_reason2=You can try again or email a link to be reached at later.
 generic_failure_no_reason2=Would you like to try again?
 
 ## LOCALIZATION NOTE (contact_offline_title): Title for
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#link-prompt
 ## displayed when the contact is offline.
@@ -254,72 +225,52 @@ cancel_button=Cancel
 cannot_start_call_session_not_ready=Can't start call, session is not ready.
 network_disconnected=The network connection terminated abruptly.
 connection_error_see_console_notification=Call failed; see console for details.
 
 ## LOCALIZATION NOTE (legal_text_and_links3): In this item, don't translate the
 ## parts between {{..}} because these will be replaced with links with the labels
 ## from legal_text_tos and legal_text_privacy. clientShortname will be replaced
 ## by the brand name.
-legal_text_and_links3=By using {{clientShortname}} you agree to the {{terms_of_use}} \
-  and {{privacy_notice}}.
+legal_text_and_links3=By using {{clientShortname}} you agree to the {{terms_of_use}} and {{privacy_notice}}.
 legal_text_tos = Terms of Use
 legal_text_privacy = Privacy Notice
 
 ## LOCALIZATION NOTE (powered_by_beforeLogo, powered_by_afterLogo):
 ## These 2 strings are displayed before and after a 'Telefonica'
 ## logo.
-powered_by_beforeLogo=Powered by
 powered_by_afterLogo=
 
 feedback_call_experience_heading2=How was your conversation?
-feedback_what_makes_you_sad=What makes you sad?
 feedback_thank_you_heading=Thank you for your feedback!
 feedback_category_audio_quality=Audio quality
 feedback_category_video_quality=Video quality
 feedback_category_was_disconnected=Was disconnected
-feedback_category_confusing=Confusing
-feedback_category_other2=Other
 feedback_custom_category_text_placeholder=What went wrong?
 feedback_submit_button=Submit
 feedback_back_button=Back
 ## LOCALIZATION NOTE (feedback_window_will_close_in2):
 ## Semicolon-separated list of plural forms. See:
 ## http://developer.mozilla.org/en/docs/Localization_and_Plurals
 ## In this item, don't translate the part between {{..}}
 feedback_window_will_close_in2=This window will close in {{countdown}} second;This window will close in {{countdown}} seconds
 ## LOCALIZATION_NOTE (feedback_rejoin_button): Displayed on the feedback form after
 ## a signed-in to signed-in user call.
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#feedback
 feedback_rejoin_button=Rejoin
 ## LOCALIZATION NOTE (feedback_report_user_button): Used to report a user in the case of
 ## an abusive user.
 feedback_report_user_button=Report User
 
-help_label=Help
-tour_label=Tour
 
 ## LOCALIZATION NOTE(rooms_default_room_name_template): {{conversationLabel}}
 ## will be replaced by a number. For example "Conversation 1" or "Conversation 12".
-rooms_default_room_name_template=Conversation {{conversationLabel}}
 rooms_leave_button_label=Leave
-rooms_list_copy_url_tooltip=Copy Link
 ## LOCALIZATION NOTE (rooms_list_current_conversations):
 ## Semicolon-separated list of plural forms. See:
 ## http://developer.mozilla.org/en/docs/Localization_and_Plurals
 ## We prefer to have no number in the string, but if you need it for your
 ## language please use {{num}}.
-rooms_list_current_conversations=Current conversation;Current conversations
-rooms_list_delete_tooltip=Delete conversation
 rooms_list_deleteConfirmation_label=Are you sure?
-rooms_list_no_current_conversations=No current conversations
-rooms_name_this_room_label=Name this conversation
-rooms_name_this_room_tooltip2=Click to edit the conversation name
-rooms_name_change_failed_label=Conversation cannot be renamed
-rooms_new_room_button_label=Start a conversation
-rooms_only_occupant_label=You're the first one here.
-rooms_panel_title=Choose a conversation or start a new one
-rooms_room_full_label=There are already two people in this conversation.
-rooms_room_full_call_to_action_nonFx_label=Download {{brandShortname}} to start your own
-rooms_room_full_call_to_action_label=Learn more about {{clientShortname}} »
-rooms_room_joined_label=Someone has joined the conversation!
-rooms_room_join_label=Join the conversation
-rooms_signout_alert=Open conversations will be closed
+
+# Infobar strings
+
+infobar_button_gotit_label=Got it!
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -47,16 +47,18 @@
 <!ENTITY cmd.delete.accesskey           "D">
 <!ENTITY cmd.deleteDomainData.label     "Forget About This Site">
 <!ENTITY cmd.deleteDomainData.accesskey "F">
 
 <!ENTITY cmd.open.label                  "Open">
 <!ENTITY cmd.open.accesskey              "O">
 <!ENTITY cmd.open_window.label           "Open in a New Window">
 <!ENTITY cmd.open_window.accesskey       "N">
+
+
 <!ENTITY cmd.open_tab.label              "Open in a New Tab">
 <!ENTITY cmd.open_tab.accesskey          "w">
 <!ENTITY cmd.open_all_in_tabs.label      "Open All in Tabs">
 <!ENTITY cmd.open_all_in_tabs.accesskey  "O">
 
 <!ENTITY cmd.properties.label      "Properties">
 <!ENTITY cmd.properties.accesskey  "i">
 
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -23,34 +23,16 @@ bookmarksLivemarkFailed=Live Bookmark fe
 menuOpenLivemarkOrigin.label=Open "%S"
 
 sortByName=Sort '%S' by Name
 sortByNameGeneric=Sort by Name
 # LOCALIZATION NOTE (view.sortBy.1.name.label): sortBy properties are versioned.
 # When any of these changes, all of the properties must be bumped, and the
 # change must be annotated here.  Both label and accesskey must be updated.
 # - version 1: changed view.sortBy.1.date.
-view.sortBy.1.name.label=Sort by Name
-view.sortBy.1.name.accesskey=N
-view.sortBy.1.url.label=Sort by Location
-view.sortBy.1.url.accesskey=L
-view.sortBy.1.date.label=Sort by Most Recent Visit
-view.sortBy.1.date.accesskey=V
-view.sortBy.1.visitCount.label=Sort by Visit Count
-view.sortBy.1.visitCount.accesskey=C
-view.sortBy.1.keyword.label=Sort by Keyword
-view.sortBy.1.keyword.accesskey=K
-view.sortBy.1.description.label=Sort by Description
-view.sortBy.1.description.accesskey=D
-view.sortBy.1.dateAdded.label=Sort by Added
-view.sortBy.1.dateAdded.accesskey=e
-view.sortBy.1.lastModified.label=Sort by Last Modified
-view.sortBy.1.lastModified.accesskey=M
-view.sortBy.1.tags.label=Sort by Tags
-view.sortBy.1.tags.accesskey=T
 
 searchBookmarks=Search Bookmarks
 searchHistory=Search History
 searchDownloads=Search Downloads
 
 tabs.openWarningTitle=Confirm open
 tabs.openWarningMultipleBranded=You are about to open %S tabs.  This might slow down %S while the pages are loading.  Are you sure you want to continue?
 tabs.openButtonMultiple=Open tabs
@@ -86,10 +68,8 @@ switchtabResultLabel=Tab
 keywordResultLabel=Keyword
 searchengineResultLabel=Search
 
 
 # LOCALIZATION NOTE (lockPrompt.text)
 # %S will be replaced with the application name.
 lockPrompt.title=Browser Startup Error
 lockPrompt.text=The bookmarks and history system will not be functional because one of %S's files is in use by another application. Some security software can cause this problem.
-lockPromptInfoButton.label=Learn More
-lockPromptInfoButton.accessKey=L
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -23,29 +23,26 @@
 <!ENTITY useSmoothScrolling.accesskey    "m">
 <!ENTITY allowHWAccel.label              "Use hardware acceleration when available">
 <!ENTITY allowHWAccel.accesskey          "v">
 <!ENTITY checkSpelling.label             "Check my spelling as I type">
 <!ENTITY checkSpelling.accesskey         "k">
 
 <!ENTITY dataChoicesTab.label            "Data Choices">
 
-<!ENTITY healthReportSection.label       "&brandShortName; Health Report">
 <!ENTITY healthReportDesc.label          "Helps you understand your browser performance and shares data with &vendorShortName; about your browser health">
 <!ENTITY enableHealthReport.label        "Enable &brandShortName; Health Report">
 <!ENTITY enableHealthReport.accesskey    "R">
 <!ENTITY healthReportLearnMore.label     "Learn More">
 
-<!ENTITY telemetrySection.label          "Telemetry">
 <!ENTITY telemetryDesc.label             "Shares performance, usage, hardware and customisation data about your browser with &vendorShortName; to help us make &brandShortName; better">
-<!ENTITY enableTelemetry.label           "Enable Telemetry">
-<!ENTITY enableTelemetry.accesskey       "T">
+
+
 <!ENTITY telemetryLearnMore.label        "Learn More">
 
-<!ENTITY crashReporterSection.label      "Crash Reporter">
 <!ENTITY crashReporterDesc.label         "&brandShortName; submits crash reports to help &vendorShortName; make your browser more stable and secure">
 <!ENTITY enableCrashReporter.label       "Enable Crash Reporter">
 <!ENTITY enableCrashReporter.accesskey   "C">
 <!ENTITY crashReporterLearnMore.label    "Learn More">
 
 <!ENTITY networkTab.label                "Network">
 
 <!ENTITY connection.label                "Connection">
--- a/browser/chrome/browser/preferences/colors.dtd
+++ b/browser/chrome/browser/preferences/colors.dtd
@@ -1,21 +1,20 @@
 <!-- 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/. -->
 
 <!ENTITY  colorsDialog.title              "Colours">
 <!ENTITY  window.width                    "38em">
 <!ENTITY  window.macWidth                 "41em">
 
-<!ENTITY  overridePageColors.label        "Override the colours specified by the page with my selections above:">
-<!ENTITY  overridePageColors.accesskey    "O">
+
 
 <!ENTITY  overridePageColors.always.label "Always">
-<!ENTITY  overridePageColors.auto.label   "Only with High Contrast themes">
+
 <!ENTITY  overridePageColors.never.label  "Never">
 
 <!ENTITY  color                           "Text and Background">
 <!ENTITY  textColor.label                 "Text:">
 <!ENTITY  textColor.accesskey             "T">
 <!ENTITY  backgroundColor.label           "Background:">
 <!ENTITY  backgroundColor.accesskey       "B">
 <!ENTITY  useSystemColors.label           "Use system colours">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -37,8 +37,12 @@
   -  These 2 strings are displayed before and after a 'Microsoft Translator'
   -  logo.
   -  The translations for these strings should match the translations in
   -  browser/translation.dtd
   -->
 
 <!ENTITY translation.options.attribution.beforeLogo "Translations by">
 <!ENTITY translation.options.attribution.afterLogo "">
+
+
+
+<!ENTITY  playDRMContent.learnMore.label "Learn more">
--- a/browser/chrome/browser/preferences/cookies.dtd
+++ b/browser/chrome/browser/preferences/cookies.dtd
@@ -6,17 +6,16 @@
 
 <!ENTITY     cookiesonsystem.label          "The following cookies are stored on your computer:">
 <!ENTITY     cookiename.label               "Cookie Name">
 <!ENTITY     cookiedomain.label             "Site"> 
 <!-- LOCALIZATION NOTE (button.removeSelectedCookies.accesskey):
   The label associated with this accesskey can be found in 
   preferences.properties as removeSelectedCookies.
 -->
-<!ENTITY     button.removeSelectedCookies.accesskey "R">
 <!ENTITY     button.removeAllCookies.label "Remove All">
 <!ENTITY     button.removeAllCookies.accesskey "A">
 
 <!ENTITY     props.name.label               "Name:">
 <!ENTITY     props.value.label              "Content:">
 <!ENTITY     props.domain.label             "Host:">
 <!ENTITY     props.path.label               "Path:">
 <!ENTITY     props.secure.label             "Send For:">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -26,18 +26,16 @@
 <!ENTITY saveTo.accesskey "v">
 <!ENTITY chooseFolderWin.label        "Browse…">
 <!ENTITY chooseFolderWin.accesskey    "o">
 <!ENTITY chooseFolderMac.label        "Choose…">
 <!ENTITY chooseFolderMac.accesskey    "e">
 <!ENTITY alwaysAsk.label "Always ask me where to save files">
 <!ENTITY alwaysAsk.accesskey "A">
 
-<!ENTITY alwaysCheckDefault2.label        "Always check if &brandShortName; is your default browser">
-<!ENTITY alwaysCheckDefault2.accesskey    "w">
-<!ENTITY setAsMyDefaultBrowser2.label     "Make Default">
-<!ENTITY setAsMyDefaultBrowser2.accesskey "D">
+
+
+
 <!ENTITY isDefault.label                  "&brandShortName; is currently your default browser">
 <!ENTITY isNotDefault.label               "&brandShortName; is not your default browser">
 
-<!ENTITY separateProfileMode.label        "Allow &brandShortName; and Firefox to run at the same time">
-<!ENTITY useFirefoxSync.label             "Tip: This uses separate profiles. Use Sync to share data between them.">
-<!ENTITY getStarted.label                 "Start using Sync…">
+
+
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -16,13 +16,13 @@
 <!ENTITY  paneGeneral.title       "General">
 <!ENTITY  paneTabs.title          "Tabs">
 <!ENTITY  paneSearch.title        "Search">
 <!ENTITY  paneContent.title       "Content">
 <!ENTITY  paneApplications.title  "Applications">
 <!ENTITY  panePrivacy.title       "Privacy">
 <!ENTITY  paneSecurity.title      "Security">
 <!ENTITY  paneAdvanced.title      "Advanced">
+<!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 
-<!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 <!ENTITY  paneSync.title          "Sync">
 
 <!ENTITY  helpButton.label        "Help">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -8,16 +8,17 @@
 #                    whose privacy policy must be accepted (for enabling
 #                    check-every-page-as-I-load-it phishing protection).
 phishBeforeText=Selecting this option will send the address of web pages you are viewing to %S. To continue, please review and accept the following terms of service.
 
 #### Fonts
 
 labelDefaultFont=Default (%S)
 
+
 #### Permissions Manager
 
 cookiepermissionstext=You can specify which web sites are always or never allowed to use cookies.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
 cookiepermissionstitle=Exceptions - Cookies
 addonspermissionstext=You can specify which web sites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow.
 addons_permissions_title=Allowed Sites - Add-ons Installation
 popuppermissionstext=You can specify which web sites are allowed to open popup windows. Type the exact address of the site you want to allow and then click Allow.
 popuppermissionstitle=Allowed Sites - Popups
@@ -94,17 +95,16 @@ cookiesAll=The following cookies are sto
 cookiesFiltered=The following cookies match your search:
 # LOCALIZATION NOTE (removeSelectedCookies):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # If you need to display the number of selected elements in your language,
 # you can use #1 in your localization as a placeholder for the number.
 # For example this is the English string with numbers:   
 # removeSelectedCookied=Remove #1 Selected;Remove #1 Selected
-removeSelectedCookies=Remove Selected;Remove Selected
 
 #### Offline apps
 offlineAppsList.height=7em
 offlineAppRemoveTitle=Remove offline web site data
 offlineAppRemovePrompt=After removing this data, %S will not be available offline.  Are you sure you want to remove this offline web site?
 offlineAppRemoveConfirm=Remove offline data
 
 # LOCALIZATION NOTE: The next string is for the disk usage of the
@@ -129,18 +129,16 @@ actualDiskCacheSizeCalculated=Calculating web content cache size…
 #LOCALIZATION NOTE: The next string is for the disk usage of the application cache.
 #   e.g., "Your application cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
 actualAppCacheSize=Your application cache is currently using %1$S %2$S of disc space
 
 ###Preferences::Advanced::Update
 #LOCALIZATION NOTE: The next string is for updating in Windows 8 only instead of updateAuto1.label.  %S = brandShortName
-updateAutoDesktop.label=Automatically install updates from desktop %S
-updateAutoDesktop.accessKey=A
 
 syncUnlink.title=Do you want to unlink your device?
 syncUnlink.label=This device will no longer be associated with your Sync account. All of your personal data, both on this device and in your Sync account, will remain intact.
 syncUnlinkConfirm.label=Unlink
 
 # LOCALIZATION NOTE (featureEnableRequiresRestart, featureDisableRequiresRestart, restartTitle): %S = brandShortName
 featureEnableRequiresRestart=%S must restart to enable this feature.
 featureDisableRequiresRestart=%S must restart to disable this feature.
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -6,39 +6,36 @@
 
 <!ENTITY dntTrackingNotOkay.label2      "Tell sites that I do not want to be tracked">
 <!ENTITY dntTrackingNotOkay.accesskey   "n">
 <!ENTITY trackingProtection.label       "Prevent sites from tracking me">
 <!ENTITY trackingProtection.accesskey   "m">
 <!ENTITY trackingProtectionLearnMore.label "Learn more">
 <!ENTITY doNotTrackInfo.label           "Learn More">
 
-<!ENTITY  history.label                 "History">
 
 <!ENTITY  locationBar.label             "Location Bar">
 
-<!ENTITY  locbar.suggest.label          "When using the location bar, suggest:">
-<!ENTITY  locbar.history.label          "History">
-<!ENTITY  locbar.history.accesskey      "H">
-<!ENTITY  locbar.bookmarks.label        "Bookmarks">
-<!ENTITY  locbar.bookmarks.accesskey    "k">
-<!ENTITY  locbar.openpage.label         "Open tabs">
-<!ENTITY  locbar.openpage.accesskey     "O">
+
+
+
+
+
+
 
 <!ENTITY  acceptCookies.label           "Accept cookies from sites">
 <!ENTITY  acceptCookies.accesskey       "A">
 
 <!ENTITY  acceptThirdParty.pre.label      "Accept third-party cookies:">
 <!ENTITY  acceptThirdParty.pre.accesskey  "c">
 <!ENTITY  acceptThirdParty.always.label   "Always">
 <!ENTITY  acceptThirdParty.never.label    "Never">
 <!ENTITY  acceptThirdParty.visited.label  "From visited">
 
-<!ENTITY  keepUntil.label               "Keep until:">
-<!ENTITY  keepUntil.accesskey           "K">
+
 
 <!ENTITY  expire.label                  "they expire">
 <!ENTITY  close.label                   "I close &brandShortName;">
 <!ENTITY  askEachTime.label             "ask me every time">
 
 <!ENTITY  cookieExceptions.label        "Exceptions…">
 <!ENTITY  cookieExceptions.accesskey    "E">
 
--- a/browser/chrome/browser/preferences/search.dtd
+++ b/browser/chrome/browser/preferences/search.dtd
@@ -1,26 +1,16 @@
 <!-- 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/. -->
 
-<!ENTITY defaultSearchEngine.label             "Default Search Engine">
 
-<!ENTITY chooseYourDefaultSearchEngine.label   "Choose your default search engine. &brandShortName; uses it in the location bar, search bar, and start pages.">
 
-<!ENTITY provideSearchSuggestions.label        "Provide search suggestions">
-<!ENTITY provideSearchSuggestions.accesskey    "s">
 
 
-<!ENTITY oneClickSearchEngines.label           "One-click search engines">
 
-<!ENTITY chooseWhichOneToDisplay.label         "The search bar lets you search alternate engines directly. Choose which ones to display.">
-
-<!ENTITY engineNameColumn.label                "Search Engine">
 <!ENTITY engineKeywordColumn.label             "Keyword">
 
-<!ENTITY restoreDefaultSearchEngines.label     "Restore Default Search Engines">
-<!ENTITY restoreDefaultSearchEngines.accesskey "D">
+
 
 <!ENTITY removeEngine.label                    "Remove">
 <!ENTITY removeEngine.accesskey                "R">
 
-<!ENTITY addMoreSearchEngines.label            "Add more search engines…">
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -21,16 +21,18 @@
 <!ENTITY myRecoveryKey.label          "My Recovery Key">
 <!ENTITY resetSync2.label             "Reset Sync…">
 
 <!ENTITY pairDevice.label             "Pair a Device">
 
 <!ENTITY syncMy.label               "Synchronise My">
 <!ENTITY engine.bookmarks.label     "Bookmarks">
 <!ENTITY engine.bookmarks.accesskey "m">
+
+
 <!ENTITY engine.tabs.label          "Tabs">
 <!ENTITY engine.tabs.accesskey      "T">
 <!ENTITY engine.history.label       "History">
 <!ENTITY engine.history.accesskey   "r">
 <!ENTITY engine.passwords.label     "Passwords">
 <!ENTITY engine.passwords.accesskey "P">
 <!ENTITY engine.prefs.label         "Preferences">
 <!ENTITY engine.prefs.accesskey     "s">
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -1,17 +1,14 @@
 <!-- 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/. -->
 
 <!ENTITY safeModeDialog.title         "&brandShortName; Safe Mode">
 <!ENTITY window.maxWidth              "400">
 
 <!ENTITY startSafeMode.label          "Start in Safe Mode">
-<!ENTITY refreshProfile.label         "Refresh &brandShortName;">
+
 
 <!ENTITY safeModeDescription3.label   "Safe Mode is a special mode of &brandShortName; that can be used to troubleshoot issues.">
 <!ENTITY safeModeDescription4.label   "Your add-ons and custom settings will be temporarily disabled.">
 
-<!ENTITY refreshProfileInstead.label  "You can also skip troubleshooting and try refreshing &brandShortName;.">
-
 <!-- LOCALIZATION NOTE (autoSafeModeDescription3.label): Shown on the safe mode dialog after multiple startup crashes. See also chrome/global/resetProfile.dtd -->
-<!ENTITY autoSafeModeDescription3.label "&brandShortName; closed unexpectedly while starting. This might be caused by add-ons or other problems. You can try to resolve the problem by troubleshooting in Safe Mode.">
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -1,14 +1,27 @@
 <!-- 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/. -->
 
 <!ENTITY sanitizePrefs2.title          "Settings for Clearing History">
+<!-- LOCALIZATION NOTE (sanitizePrefs2.modal.width): width of the Clear History on Shutdown dialog.
+     Should be large enough to contain the item* strings on a single line.
+     The column width should be set at half of the dialog width. -->
+<!ENTITY sanitizePrefs2.column.width   "17em">
+<!-- LOCALIZATION NOTE (sanitizePrefs2.inContent.dialog.width): width of the
+     Clear History on Shutdown subdialog in the in-content preferences.
+     Should be large enough to contain the item* strings on a single line.
+     The column width adjusts the width of the first column in the dialog.
+     You can set the column width to a value that makes the dialog look visually balanced,
+     or at half of the dialog width if unsure. -->
+
+
 <!ENTITY sanitizeDialog2.title         "Clear Recent History">
+<!-- LOCALIZATION NOTE (sanitizeDialog2.width): width of the Clear Recent History dialog -->
 
 <!ENTITY clearDataSettings2.label     "When I quit &brandShortName;, it should automatically clear all:">
 <!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
 <!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
      See UI mockup at bug 480169 -->
 
 <!ENTITY clearTimeDuration.label          "Time range to clear: ">
 <!ENTITY clearTimeDuration.accesskey      "T">
@@ -48,15 +61,8 @@ that require it.  -->
 <!ENTITY itemActiveLogins.accesskey        "L">
 <!ENTITY itemSitePreferences.label         "Site Preferences">
 <!ENTITY itemSitePreferences.accesskey     "S">
 <!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
      that appears when "Time range to clear" is set to "Everything".  See UI
      mockup at bug 480169 -->
 
 <!ENTITY sanitizeEverythingUndoWarning     "This action cannot be undone.">
-<!-- LOCALIZATION NOTE (dialog.width2): width of the Clear Recent History and
-     Clear History on Shutdown dialogs.  Should be large enough to contain
-     the item* strings above on a single line.  The column width should be set
-     at half of the dialog width. -->
-
-<!ENTITY dialog.width2                 "34em">
-<!ENTITY column.width2                 "17em">
--- a/browser/chrome/browser/search.properties
+++ b/browser/chrome/browser/search.properties
@@ -6,22 +6,27 @@ searchtip=Search using %S
 
 # LOCALIZATION NOTE (searchPlaceholder): this is shown in the searchbox when
 # the user hasn't typed anything yet.
 searchPlaceholder=Search
 
 # LOCALIZATION NOTE (searchHeader): this is displayed at the top of the panel
 # showing search suggestions.
 # %S is replaced with the name of the current default search engine.
-searchHeader=%S Search
 
 # LOCALIZATION NOTE (cmd_pasteAndSearch): "Search" is a verb, this is the
 # search bar equivalent to the url bar's "Paste & Go"
 cmd_pasteAndSearch=Paste & Search
 
 cmd_clearHistory=Clear Search History
 cmd_clearHistory_accesskey=H
 
 cmd_showSuggestions=Show Suggestions
 cmd_showSuggestions_accesskey=S
 
+# LOCALIZATION NOTE (cmd_addFoundEngine): %S is replaced by the name of
+# a search engine offered by a web page. Each engine is displayed as a
+# menuitem at the bottom of the search panel.
 cmd_addFoundEngine=Add "%S"
-
+# LOCALIZATION NOTE (cmd_addFoundEngineMenu): When more than 5 engines
+# are offered by a web page, instead of listing all of them in the
+# search panel using the cmd_addFoundEngine string, they will be
+# grouped in a submenu using cmd_addFoundEngineMenu as a label.
--- a/browser/chrome/browser/searchbar.dtd
+++ b/browser/chrome/browser/searchbar.dtd
@@ -1,17 +1,6 @@
 <!-- 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/. -->
 
 <!ENTITY cmd_engineManager.label        "Manage Search Engines…">
 <!ENTITY searchEndCap.label             "Search">
-
-<!-- LOCALIZATION NOTE: The SearchHighlight strings are used in the
-   - UITour popups that shows on first use of the new search panel. -->
-<!ENTITY SearchHighlight1.title "One-Click Searches">
-<!ENTITY SearchHighlight1.text "Search any of these sites instantly, without changing your default.">
-
-<!ENTITY SearchHighlight2.title "Smart Suggestions">
-<!ENTITY SearchHighlight2.text "Suggestions from your default search engine appear as you type.">
-
-<!ENTITY SearchHighlightNext "Next">
-<!ENTITY SearchHighlightClose "Thanks!">
--- a/browser/chrome/browser/shellservice.properties
+++ b/browser/chrome/browser/shellservice.properties
@@ -3,29 +3,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 optionsLabel=%S &Options
 safeModeLabel=%S &Safe Mode
 
 # LOCALIZATION NOTE (setDefaultBrowserMessage2, setDefaultBrowserConfirm.label):
 # %S will be replaced by brandShortName
 setDefaultBrowserMessage2          = Get the most out of %S by setting it as your default browser
-setDefaultBrowserConfirm.label     = Use %S as my default browser
-setDefaultBrowserConfirm.accesskey = U
 setDefaultBrowserOptions.label     = Options
 setDefaultBrowserOptions.accesskey = O
-setDefaultBrowserNotNow.label      = Not now
-setDefaultBrowserNotNow.accesskey  = N
 setDefaultBrowserNever.label       = Don't ask me again
 setDefaultBrowserNever.accesskey   = D
 
 # LOCALIZATION NOTE (setDefaultBrowserTitle, setDefaultBrowserMessage, setDefaultBrowserDontAsk, setDefaultBrowserAlertConfirm.label, setDefaultBrowserAlertNotNow.label):
 # These strings are used as an alternative to the ones above, in a modal dialog.
 # %S will be replaced by brandShortName
-setDefaultBrowserTitle=Default Browser
-setDefaultBrowserMessage=%S is not currently set as your default browser. Would you like to make it your default browser?
-setDefaultBrowserDontAsk=Always perform this check when starting %S.
-setDefaultBrowserAlertConfirm.label=Use %S as my default browser
-setDefaultBrowserAlertNotNow.label=Not now
 
 desktopBackgroundLeafNameWin=Desktop Background.bmp
 DesktopBackgroundDownloading=Saving Picture…
 DesktopBackgroundSet=Set Desktop Background
--- a/browser/chrome/browser/syncCustomize.dtd
+++ b/browser/chrome/browser/syncCustomize.dtd
@@ -10,16 +10,18 @@
 <!ENTITY syncCustomizeUnix.description    "You can change this selection in Preferences.">
 <!--
   These engine names are the same as in browser/preferences/sync.dtd except
   for the last two that are marked as being specific to Desktop browsers.
 -->
 
 <!ENTITY engine.bookmarks.label           "Bookmarks">
 <!ENTITY engine.bookmarks.accesskey       "m">
+
+
 <!ENTITY engine.history.label             "History">
 <!ENTITY engine.history.accesskey         "r">
 <!ENTITY engine.tabs.label                "Tabs">
 <!ENTITY engine.tabs.accesskey            "T">
 <!ENTITY engine.passwords.label           "Passwords">
 <!ENTITY engine.passwords.accesskey       "P">
 <!ENTITY engine.addons.label              "Desktop Add-ons">
 <!ENTITY engine.addons.accesskey          "A">
--- a/browser/chrome/browser/translation.properties
+++ b/browser/chrome/browser/translation.properties
@@ -1,12 +1,10 @@
 # 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 (translation.options.neverForLanguage.label):
 #  %S is a language name coming from the global/languageNames.properties file.
-translation.options.neverForLanguage.label=Never translate %S
 
 # LOCALIZATION NOTE (translation.options.neverForLanguage.accesskey):
 # The accesskey value used here should not clash with the values used for
 # translation.options.*.accesskey in translation.dtd
-translation.options.neverForLanguage.accesskey=N
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -26,11 +26,11 @@ unsafeContentType=The page you are tryin
 externalProtocolTitle=External Protocol Request
 externalProtocolPrompt=An external application must be launched to handle %1$S: links.\n\n\nRequested link:\n\n%2$S\n\nApplication: %3$S\n\n\nIf you were not expecting this request it may be an attempt to exploit a weakness in that other program. Cancel this request unless you are sure it is not malicious.\n
 #LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
 externalProtocolUnknown=<Unknown>
 externalProtocolChkMsg=Remember my choice for all links of this type.
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 phishingBlocked=The web site at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
-cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
 remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
+## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -2,18 +2,18 @@
    - 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/. -->
 
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 
 <!ENTITY loadError.label "Problem loading page">
 <!ENTITY retry.label "Try Again">
+<!-- Specific error messages -->
 
-<!-- Specific error messages -->
 
 <!ENTITY connectionFailure.title "Unable to connect">
 <!ENTITY connectionFailure.longDesc "&sharedLongDesc;">
 
 <!ENTITY deniedPortAccess.title "This address is restricted">
 <!ENTITY deniedPortAccess.longDesc "">
 
 <!ENTITY dnsNotFound.title "Server not found">
@@ -153,28 +153,22 @@ button is included here (instead of netE
 functionality specific to firefox. -->
 
 
 <!ENTITY securityOverride.warningContent "<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p> 
  
 <button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button> 
 <button id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>">
 
-<!ENTITY errorReporting.title "Report this error">
-<!ENTITY errorReporting.longDesc "Reporting the address and certificate information for <span id='hostname'></span> will help us identify and block malicious sites. Thanks for helping create a safer web!">
-<!ENTITY errorReporting.automatic "Automatically report errors in the future">
+
+
 <!ENTITY errorReporting.learnMore "Learn more…">
-<!ENTITY errorReporting.sending "Sending report">
-<!ENTITY errorReporting.sent "Report sent">
-<!ENTITY errorReporting.report "Report">
-<!ENTITY errorReporting.tryAgain "Try again">
+
+
+
+
 
 <!ENTITY remoteXUL.title "Remote XUL">
 <!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul></p>">
 
-<!ENTITY oldSecurityProtocol.title "Unable to Connect Securely">
-<!-- LOCALIZATION NOTE (oldSecurityProtocol.longDesc) - Do not translate the
-     <span id='hostname'></span>. -->
-<!ENTITY oldSecurityProtocol.longDesc2 "&brandShortName; cannot guarantee the safety of your data on <span id='hostname'></span> because it uses SSLv3, a broken security protocol.">
-<!-- LOCALIZATION NOTE (oldSecurityProtocol.advancedInfo) - Do not translate
-     the <span id='errorcode'></span>. -->
-<!ENTITY oldSecurityProtocol.advancedInfo "Advanced info: <span id='errorcode'></span>">
-<!ENTITY oldSecurityProtocol.learnMore "Learn More…">
+<!-- LOCALIZATION NOTE (sslv3Used.longDesc) - Do not translate
+     "ssl_error_unsupported_version". -->
+
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -137,24 +137,22 @@ rendering_error=An error occurred while 
 
 # Predefined zoom values
 page_scale_width=Page Width
 page_scale_fit=Page Fit
 page_scale_auto=Automatic Zoom
 page_scale_actual=Actual Size
 # LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
 # numerical scale value.
-page_scale_percent={{scale}}%
 
 # Loading indicator messages
 loading_error_indicator=Error
 loading_error=An error occurred while loading the PDF.
 invalid_file_error=Invalid or corrupted PDF file.
 missing_file_error=Missing PDF file.
-unexpected_response_error=Unexpected server response.
 
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type.alt=[{{type}} Annotation]
 password_label=Enter the password to open this PDF file.
 password_invalid=Invalid password. Please try again.
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -20,43 +20,43 @@
 <!ENTITY newevent.todoStatus.cancelled.label      "Cancelled" >
 <!ENTITY newevent.status.tentative.label          "Tentative" >
 <!ENTITY newevent.status.tentative.accesskey      "T" >
 <!ENTITY newevent.status.confirmed.label          "Confirmed" >
 <!ENTITY newevent.status.confirmed.accesskey      "C" >
 <!ENTITY newevent.status.needsaction.label        "Needs Action" >
 <!ENTITY newevent.status.inprogress.label         "In Process" >
 <!ENTITY newevent.status.completed.label          "Completed on" >
+<!-- The following entity is for New Task dialog only -->
 
-<!-- The following entity is for New Task dialog only -->
-<!ENTITY newtodo.percentcomplete.label      "&#37; complete">
-
+<!ENTITY newtodo.percentcomplete.label      "&#037; complete">
 <!-- LOCALIZATON NOTE(event.attendees.notify.label,event.attendees.notifyundisclosed.label)
    - These two labels are displayed side by side in the event dialog, make sure
    - they still fit in. -->
+
 <!ENTITY event.attendees.notify.label               "Notify attendees">
 <!ENTITY event.attendees.notifyundisclosed.label    "Separate invitation per attendee">
 <!ENTITY event.attendees.notifyundisclosed.tooltip  "This option sends one invitation email per attendee. Each invitation only contains the recipient attendee so that other attendee identities are not disclosed.">
+<!-- Keyboard Shortcuts -->
 
-<!-- Keyboard Shortcuts -->
 <!ENTITY event.dialog.new.event.key2              "I">
 <!ENTITY event.dialog.new.task.key2               "D">
 <!ENTITY event.dialog.new.message.key2            "N">
 <!ENTITY event.dialog.close.key                   "W">
 <!ENTITY event.dialog.save.key                    "S">
 <!ENTITY event.dialog.saveandclose.key            "L">
 <!ENTITY event.dialog.print.key                   "P">
 <!ENTITY event.dialog.undo.key                    "Z">
 <!ENTITY event.dialog.redo.key                    "Y">
 <!ENTITY event.dialog.cut.key                     "X">
 <!ENTITY event.dialog.copy.key                    "C">
 <!ENTITY event.dialog.paste.key                   "V">
 <!ENTITY event.dialog.select.all.key              "A">
+<!-- Menubar -->
 
-<!-- Menubar -->
 <!ENTITY  event.menu.item.new.label                       "New">
 <!ENTITY  event.menu.item.new.accesskey                   "N">
 <!ENTITY  event.menu.item.new.event.label                 "Event">
 <!ENTITY  event.menu.item.new.event.accesskey             "E">
 <!ENTITY  event.menu.item.new.task.label                  "Task">
 <!ENTITY  event.menu.item.new.task.accesskey              "T">
 <!ENTITY  event.menu.item.new.message.label               "Message">
 <!ENTITY  event.menu.item.new.message.accesskey           "M">
@@ -133,33 +133,33 @@
 <!ENTITY  event.menu.options.show.time.free.accesskey         "F">
 
 <!ENTITY event.invite.attendees.label                     "Invite Attendees…">
 <!ENTITY event.invite.attendees.accesskey                 "I">
 <!ENTITY event.email.attendees.label                      "Compose Email to All Attendees…">
 <!ENTITY event.email.attendees.accesskey                  "A">
 <!ENTITY event.email.tentative.attendees.label            "Compose Email to Undecided Attendees…">
 <!ENTITY event.email.tentative.attendees.accesskey        "U">
+<!-- Toolbar -->
 
-<!-- Toolbar -->
 <!ENTITY  event.toolbar.save.label                        "Save and Close">
 <!ENTITY  event.toolbar.delete.label                      "Delete">
 <!ENTITY  event.toolbar.attendees.label                   "Invite Attendees">
 <!ENTITY  event.toolbar.privacy.label                     "Privacy">
 
 <!ENTITY  event.toolbar.save.tooltip                      "Save and Close">
 <!ENTITY  event.toolbar.delete.tooltip                    "Delete">
 <!ENTITY  event.toolbar.attendees.tooltip                 "Invite Attendees">
 <!ENTITY  event.toolbar.attachments.tooltip               "Add Attachments">
 <!ENTITY  event.toolbar.privacy.tooltip                   "Change Privacy">
 <!ENTITY  event.toolbar.priority.tooltip                  "Change Priority">
 <!ENTITY  event.toolbar.status.tooltip                    "Change Status">
 <!ENTITY  event.toolbar.freebusy.tooltip                  "Change Free/Busy time">
+<!-- Main page -->
 
-<!-- Main page -->
 <!ENTITY event.title.textbox.label                        "Title:" >
 <!ENTITY event.title.textbox.accesskey                    "T">
 <!ENTITY event.location.label                             "Location:" >
 <!ENTITY event.location.accesskey                         "L">
 <!ENTITY event.categories.label                           "Category:">
 <!ENTITY event.categories.accesskey                       "y">
 <!ENTITY event.categories.textbox.label                   "Add a new category" >
 <!ENTITY event.calendar.label                             "Calendar:" >
@@ -215,18 +215,18 @@
 <!ENTITY event.reminder.2days.before.label                "2 days before" >
 <!ENTITY event.reminder.1week.before.label                "1 week before" >
 <!ENTITY event.reminder.custom.label                      "Custom…" >
 
 <!ENTITY event.reminder.multiple.label                    "Multiple Reminders…" >
 
 <!ENTITY event.statusbarpanel.freebusy.label              "Time as:">
 <!ENTITY event.statusbarpanel.privacy.label               "Privacy:">
+<!-- Recurrence dialog -->
 
-<!-- Recurrence dialog -->
 <!ENTITY recurrence.title.label                         "Edit Recurrence">
 
 <!ENTITY event.repeat.does.not.repeat.label             "Does not repeat">
 <!ENTITY event.repeat.daily.label                       "Daily">
 <!ENTITY event.repeat.weekly.label                      "Weekly">
 <!ENTITY event.repeat.every.weekday.label               "Every Weekday">
 <!ENTITY event.repeat.bi.weekly.label                   "Bi-weekly">
 <!ENTITY event.repeat.monthly.label                     "Monthly">
@@ -265,24 +265,24 @@
 <!ENTITY event.recurrence.pattern.monthly.week.6.label  "Friday" >
 <!ENTITY event.recurrence.pattern.monthly.week.7.label  "Saturday" >
 <!ENTITY event.recurrence.repeat.dayofmonth.label       "Day of the month">
 <!ENTITY event.recurrence.repeat.recur.label            "Recur on day(s)">
 
 <!ENTITY event.recurrence.every.label                        "Every:" >
 <!ENTITY repeat.units.years.both                             "Year(s)" >
 <!ENTITY event.recurrence.pattern.yearly.every.month.label   "Every" >
-
 <!-- LOCALIZATON NOTE
      Some languages use a preposition when describing dates:
      Portuguese: 6 de Setembro
      English: 6 [of] September
      event.recurrence.pattern.yearly.of.label is "of" in
      Edit recurrence window -> Recurrence pattern -> Repeat yearly
 -->
+
 <!ENTITY event.recurrence.pattern.yearly.of.label            "" >
 
 <!ENTITY event.recurrence.pattern.yearly.month.1.label       "January" >
 <!ENTITY event.recurrence.pattern.yearly.month.2.label       "February" >
 <!ENTITY event.recurrence.pattern.yearly.month.3.label       "March" >
 <!ENTITY event.recurrence.pattern.yearly.month.4.label       "April" >
 <!ENTITY event.recurrence.pattern.yearly.month.5.label       "May" >
 <!ENTITY event.recurrence.pattern.yearly.month.6.label       "June" >
@@ -301,17 +301,17 @@
 <!ENTITY event.recurrence.yearly.last.label                  "The Last">
 <!ENTITY event.recurrence.pattern.yearly.week.1.label        "Sunday" >
 <!ENTITY event.recurrence.pattern.yearly.week.2.label        "Monday" >
 <!ENTITY event.recurrence.pattern.yearly.week.3.label        "Tuesday" >
 <!ENTITY event.recurrence.pattern.yearly.week.4.label        "Wednesday" >
 <!ENTITY event.recurrence.pattern.yearly.week.5.label        "Thursday" >
 <!ENTITY event.recurrence.pattern.yearly.week.6.label        "Friday" >
 <!ENTITY event.recurrence.pattern.yearly.week.7.label        "Saturday" >
-<!ENTITY event.recurrence.pattern.yearly.day.label           "day" >
+
 <!ENTITY event.recurrence.of.label                           "of" >
 <!ENTITY event.recurrence.pattern.yearly.month2.1.label      "January" >
 <!ENTITY event.recurrence.pattern.yearly.month2.2.label      "February" >
 <!ENTITY event.recurrence.pattern.yearly.month2.3.label      "March" >
 <!ENTITY event.recurrence.pattern.yearly.month2.4.label      "April" >
 <!ENTITY event.recurrence.pattern.yearly.month2.5.label      "May" >
 <!ENTITY event.recurrence.pattern.yearly.month2.6.label      "June" >
 <!ENTITY event.recurrence.pattern.yearly.month2.7.label      "July" >
@@ -322,18 +322,18 @@
 <!ENTITY event.recurrence.pattern.yearly.month2.12.label     "December" >
 
 <!ENTITY event.recurrence.range.label                   "Range of recurrence">
 <!ENTITY event.recurrence.forever.label                 "No end date" >
 <!ENTITY event.recurrence.repeat.for.label              "Create" >
 <!ENTITY event.recurrence.appointments.label            "Appointment(s)" >
 <!ENTITY event.repeat.until.label                       "Repeat until" >
 <!ENTITY event.recurrence.preview.label                 "Preview">
+<!-- Attendees dialog -->
 
-<!-- Attendees dialog -->
 <!ENTITY invite.title.label                     "Invite Attendees">
 <!ENTITY event.organizer.label                  "Organiser">
 <!ENTITY event.freebusy.suggest.slot            "Suggest time slot:">
 <!ENTITY event.freebusy.button.next.slot        "Next slot">
 <!ENTITY event.freebusy.button.previous.slot    "Previous slot">
 <!ENTITY event.freebusy.zoom                    "Zoom:">
 <!ENTITY event.freebusy.legend.free             "Free" >
 <!ENTITY event.freebusy.legend.busy             "Busy" >
@@ -343,22 +343,22 @@
 <!ENTITY event.attendee.role.required           "Required Attendee">
 <!ENTITY event.attendee.role.optional           "Optional Attendee">
 <!ENTITY event.attendee.role.chair              "Chair">
 <!ENTITY event.attendee.role.nonparticipant     "Non Participant">
 <!ENTITY event.attendee.usertype.individual     "Individual">
 <!ENTITY event.attendee.usertype.group          "Group">
 <!ENTITY event.attendee.usertype.resource       "Resource">
 <!ENTITY event.attendee.usertype.room           "Room">
+<!-- Timezone dialog -->
 
-<!-- Timezone dialog -->
 <!ENTITY timezone.title.label            "Please Specify the Timezone">
 <!ENTITY event.timezone.custom.label     "More Timezones…">
+<!-- Read-Only dialog -->
 
-<!-- Read-Only dialog -->
 <!ENTITY read.only.general.label         "General">
 <!ENTITY read.only.title.label           "Title:">
 <!ENTITY read.only.event.start.label     "Start Date:">
 <!ENTITY read.only.task.start.label      "Start Date:">
 <!ENTITY read.only.event.end.label       "End Date:">
 <!ENTITY read.only.task.due.label        "Due Date:">
 <!ENTITY read.only.repeat.label          "Repeat:">
 <!ENTITY read.only.location.label        "Location:">
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -188,17 +188,17 @@ yearlyNthOn=every %1$S %2$S;every #3 yea
 # %2$S - weekday
 # %3$S - month
 # #4 - yearly interval
 # e.g. "the second Monday of every March"
 # e.g  "every 3 years the second Monday of March"
 yearlyNthOnNthOfNounclass1=%1$S %2$S of every %3$S;every #4 years on %1$S %2$S of %3$S
 yearlyNthOnNthOfNounclass2=%1$S %2$S of every %3$S;every #4 years on %1$S %2$S of %3$S
 
-# LOCALIZATION NOTE (yearlyOnEveryNthOfNthNounclass1):
+# LOCALIZATION NOTE (yearlyOnEveryNthOfNthNounclass...):
 # Edit recurrence window -> Recurrence pattern -> Yearly repeat rules
 # Translate these strings according to noun class/gender of weekday (%1$S)
 # set in 'repeadDetailsDay...Nounclass' strings.
 # Nounclass1 <-> Masculine gender; Nounclass2 <-> Feminine gender.
 # Add others strings with suffix 3, 4,... for others noun classes if your
 # language need them. In this case, corresponding strings must be added for
 # others rule strings with 'Nounclass...' suffix and corresponding values
 # "nounclass..." must be written in 'repeatDetailsDayxNounclass' strings.
@@ -212,17 +212,16 @@ yearlyOnEveryNthOfNthNounclass2=every %1
 
 #LOCALIZATION NOTE (yearlyEveryDayOf):
 # Edit recurrence window -> Recurrence pattern -> Yearly repeat rules
 # This string describes part of a yearly rule which includes every day of a month.
 # %1$S - month
 # #2   - yearly interval
 # e.g. "every day of December"
 # e.g. "every 3 years every day of December"
-yearlyEveryDayOf=every day of %1$S;every #2 years every day of %1$S
 
 repeatDetailsMonth1=January
 repeatDetailsMonth2=February
 repeatDetailsMonth3=March
 repeatDetailsMonth4=April
 repeatDetailsMonth5=May
 repeatDetailsMonth6=June
 repeatDetailsMonth7=July
@@ -273,51 +272,51 @@ repeatCountAllDay=Occurs %1$S\neffective
 #  from 5:00 PM to 6:00 PM"
 repeatDetailsUntil=Occurs %1$S\neffective %2$S until %3$S\nfrom %4$S to %5$S.
 
 # LOCALIZATION NOTE (repeatDetailsUntilAllDay):
 # Edit recurrence window -> Recurrence details link on Event/Task dialog window
 # %1%$ - A rule string (see above). This is the first line of the link
 # %2%$ - event start date (e.g. mm/gg/yyyy)
 # %3$S - event end date (e.g. mm/gg/yyyy)
-# e.g. with monthlyDayOfNth and all day event:
+# e.g. with monthlyDaysOfNth and all day event:
 # "Occurs day 3 of every 5 month
 #  effective 1/1/2009 until 1/1/2010"
 repeatDetailsUntilAllDay=Occurs %1$S\neffective %2$S until %3$S.
 
 # LOCALIZATION NOTE (repeatDetailsInfinite):
 # Edit recurrence window -> Recurrence details link on Event/Task dialog window
 # %1%$ - A rule string (see above). This is the first line of the link
 # %2%$ - event start date (e.g. mm/gg/yyyy)
 # %3$S - event start time (e.g. hh:mm (PM/AM))
 # %4$S - event end time (e.g. hh:mm (PM/AM))
-# e.g. with monthlyDayOfNth:
+# e.g. with monthlyDaysOfNth:
 # "Occurs day 3 of every 5 month
 #  effective 1/1/2009
 #  from 5:00 PM to 6:00 PM"
 repeatDetailsInfinite=Occurs %1$S\neffective %2$S\nfrom %3$S to %4$S.
 
 # LOCALIZATION NOTE (repeatDetailsInfiniteAllDay):
 # Edit recurrence window -> Recurrence details link on Event/Task dialog window
 # %1%$ - A rule string (see above). This is the first line of the link
 # %2%$ - event start date (e.g. mm/gg/yyyy)
-# e.g. with monthlyDayOfNth and all day event:
+# e.g. with monthlyDaysOfNth and all day event:
 # "Occurs day 3 of every 5 month
 #  effective 1/1/2009"
 repeatDetailsInfiniteAllDay=Occurs %1$S\neffective %2$S.
 
 # LOCALIZATION NOTE (monthlyLastDay):
 # Edit recurrence window -> Recurrence details link on Event/Task dialog window
-# A monthly rule with one or more days of the month (monthlyDayOfNth) and the
+# A monthly rule with one or more days of the month (monthlyDaysOfNth) and the
 # string "the last day" of the month.
 # e.g.: "Occurs day 15, 20, 25 and the last day of every 3 months"
 monthlyLastDay=the last day
 
 # LOCALIZATION NOTE (ruleTooComplex):
-# This string is shown in the reminder details area if our code can't handle the
+# This string is shown in the repeat details area if our code can't handle the
 # complexity of the recurrence rule yet.
 ruleTooComplex=Click here for details
 
 # LOCALIZATION NOTE (ruleTooComplexSummary):
 # This string is shown in the event summary dialog if our code can't handle the
 # complexity of the recurrence rule yet.
 ruleTooComplexSummary=Repeat details unknown
 
--- a/calendar/chrome/calendar/calendar-extract.properties
+++ b/calendar/chrome/calendar/calendar-extract.properties
@@ -6,18 +6,18 @@
 # Strings here are used to create events and tasks with start and end times
 # based on email content.
 # None of the strings are displayed in the user interface.
 #
 # You don't have to fill all from.*, until.*, *.prefix and *.suffix patterns.
 # It's ok to leave some empty.
 # Please consider declensions and gender if your language has them.
 # Don't just translate directly. The number of variants doesn't have to be
-# the same as in en-US. All of 0, 1, 2, etc is allowed in patterns except alphabet.
-# patterns. You can and should add language specific variants.
+# the same as in en-US. All of 0, 1, 2, etc is allowed in patterns except alphabet
+# pattern. You can and should add language specific variants.
 #
 # There are two different ways to find a start time text in email:
 # 1) it matches a from.* pattern and does not have end.prefix or end.suffix next to it
 # 2) it matches until.* pattern and has start.prefix or start.suffix next to it
 # Similar inverse logic applies to end times.
 # These rules enable using prefix and suffix values with only start.* or only until.*
 # patterns localized for some languages and thus not having to repeat the same
 # values in both.
@@ -32,77 +32,76 @@
 # can be a list of values, separate variants by |
 start.prefix =
 
 # LOCALIZATION NOTE (start.suffix):
 # datetimes followed by these are extracted as start times
 start.suffix = by | until | to | - | till | til | and
 
 # LOCALIZATION NOTE (end.prefix):
-# datetimes followed by these are extracted as end times
+# datetimes with these in front are extracted as end times
 end.prefix = by | until | to | - | till | til | and | due: | due | ends | deadline is | deadline:
 
 # LOCALIZATION NOTE (end.suffix):
 # datetimes followed by these are extracted as end times
 # can be a list of values, separate variants by |
 end.suffix =
 
 # LOCALIZATION NOTE (no.datetime.prefix):
 # datetimes with these in front won't be used
 # specify full words here
 no.datetime.prefix = last week | sent | email | e-mail | instead of | > | unfortunately | in | not
 
 # LOCALIZATION NOTE (no.datetime.suffix):
-# datetimes follwed by these won't be used
-no.datetime.suffix = floor | flr | : | email | e-mail | > | % | gbp | pounds
+# datetimes followed by these won't be used
 
 # LOCALIZATION NOTE (from.*):
 # can be a list of values, separate variants by |
 
 # LOCALIZATION NOTE (from.today):
 # must not be empty!
 from.today = today
 
 from.tomorrow = tomorrow
 # LOCALIZATION NOTE (until.*):
 # can be a list of values, separate variants by |
 until.tomorrow =
 
-# LOCALIZATION NOTE (ordinal.date):
+# LOCALIZATION NOTE (from.ordinal.date):
 # %1$S = matches numbers 1-31 and number.x
 # should not have "%1$S" as this would match any single number in email to a time
 from.ordinal.date = %1$Sst | %1$Snd | %1$Srd | %1$Sth
 
 # LOCALIZATION NOTE (until.ordinal.date):
 # %1$S = matches numbers 1-31 and number.x
 until.ordinal.date =
 
 from.noon = noon
 until.noon =
 
-# LOCALIZATION NOTE (hour.only):
+# LOCALIZATION NOTE (from.hour):
 # %1$S = matches numbers 0-23 and number.0-number.23
 # should not have "%1$S" as this would match any single number in email to a time
 from.hour = at %1$S | around %1$S | %1$S - | %1$S to
 
 # LOCALIZATION NOTE (until.hour):
 # %1$S = matches numbers 0-23 and number.0-number.23
 # should also list how to find end of a timeframe
 until.hour = - %1$S | to %1$S | until %1$S | by %1$S
 
-# LOCALIZATION NOTE (hour.only.am):
+# LOCALIZATION NOTE (from.hour.am):
 # %1$S = matches numbers 0-23 and number.0-number.23
 from.hour.am = %1$S am | %1$S a.m
 
 # LOCALIZATION NOTE (until.hour.am):
 # %1$S = matches numbers 0-23 and number.0-number.23
 # should also list how to find end of a timeframe
 until.hour.am =
 
-# LOCALIZATION NOTE (hour.only.pm):
+# LOCALIZATION NOTE (from.hour.pm):
 # %1$S = matches numbers 0-23 and number.0-number.23
 from.hour.pm = %1$S pm | %1$S p.m | %1$S p
 
 # LOCALIZATION NOTE (until.hour.pm):
 # %1$S = matches numbers 0-23 and number.0-number.23
 # should also list how to find end of a timeframe
 until.hour.pm =
 
@@ -117,79 +116,79 @@ until.half.hour.before =
 # LOCALIZATION NOTE (from.half.hour.after):
 # denotes times 30 minutes after last full hour
 from.half.hour.after = half past %1$S
 
 # LOCALIZATION NOTE (until.half.hour.after):
 # denotes times 30 minutes after last full hour
 until.half.hour.after =
 
-# LOCALIZATION NOTE (hour.minutes):
+# LOCALIZATION NOTE (from.hour.minutes):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 from.hour.minutes = %1$S:%2$S | at %1$S%2$S
 
 # LOCALIZATION NOTE (until.hour.minutes):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 until.hour.minutes =
 
-# LOCALIZATION NOTE (hour.minutes.am):
+# LOCALIZATION NOTE (from.hour.minutes.am):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 from.hour.minutes.am = %1$S:%2$S am | %1$S:%2$S a.m
 
 # LOCALIZATION NOTE (until.hour.minutes.am):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 until.hour.minutes.am =
 
-# LOCALIZATION NOTE (hour.minutes.pm):
+# LOCALIZATION NOTE (from.hour.minutes.pm):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 from.hour.minutes.pm = %1$S:%2$S pm | %1$S:%2$S p.m | %1$S:%2$S p
 
 # LOCALIZATION NOTE (until.hour.minutes.pm):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 until.hour.minutes.pm =
 
-# LOCALIZATION NOTE (monthname.day):
+# LOCALIZATION NOTE (from.monthname.day):
 # %1$S = matches numbers 1-31 and number.x
 # %2$S = matches monthname
 from.monthname.day = %1$S %2$S | %2$S %1$S | %2$S %1$Sst | %2$S %1$Snd | %2$S %1$Srd | %2$S %1$Sth | %1$Sst of %2$S | %1$Snd of %2$S | %1$Srd of %2$S | %1$Sth of %2$S
 
 # LOCALIZATION NOTE (until.monthname.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches monthname
 until.monthname.day =
 
-# LOCALIZATION NOTE (month.day):
+# LOCALIZATION NOTE (from.month.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches numbers 1-12
 from.month.day = %1$S/%2$S
 
 # LOCALIZATION NOTE (until.month.day):
 # %1$S = matches numbers 1-31 and number.x
 # %2$S = matches numbers 1-12
 until.month.day =
 
-# LOCALIZATION NOTE (year.month.day):
+# LOCALIZATION NOTE (from.year.month.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches numbers 1-12
 # %3$S = matches 2/4 numbers
 from.year.month.day = %1$S/%2$S/%3$S | %1$S-%2$S-%3$S
 
 # LOCALIZATION NOTE (until.year.month.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches numbers 1-12
 # %3$S = matches 2/4 numbers
 until.year.month.day =
 
-# LOCALIZATION NOTE (year.monthname.day):
+# LOCALIZATION NOTE (from.year.monthname.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches monthname
 # %3$S = matches 2/4 numbers
 from.year.monthname.day = %1$S %2$S %3$S | %1$Sst %2$S %3$S | %1$Snd %2$S %3$S | %1$Srd %2$S %3$S | %1$Sth %2$S %3$S | %1$S %2$S, %3$S | %2$S %1$S, %3$S | %1$S-%2$S-%3$S
 
 # LOCALIZATION NOTE (until.year.monthname.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches monthname
@@ -221,20 +220,20 @@ month.5 = may
 month.6 = june | jun | jun.
 month.7 = july | jul | jul.
 month.8 = august | aug | aug.
 month.9 = september | sep | sep. | sept.
 month.10 = october | oct | oct.
 month.11 = november | nov | nov.
 month.12 = december | dec | dec.
 
-# LOCALIZATION NOTE (weekday.*):
+# LOCALIZATION NOTE (from.weekday.*):
 # used to derive start date based on weekdays mentioned
 # can be a list of values, separate variants by |
-# LOCALIZATION NOTE (weekday.0):
+# LOCALIZATION NOTE (from.weekday.0):
 # Regardless of what the first day of the week is in your country, 0 is Sunday here.
 from.weekday.0 = sunday | sundays | sun
 from.weekday.1 = monday | mondays | mon
 from.weekday.2 = tuesday | tuesdays | tues | tue
 from.weekday.3 = wednesday | wednesdays | weds | wed
 from.weekday.4 = thursday | thursdays | thurs | thur | thu
 from.weekday.5 = friday | fridays | fri
 from.weekday.6 = saturday | saturdays | sat
--- a/calendar/chrome/calendar/calendar-invitations-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-invitations-dialog.dtd
@@ -1,19 +1,19 @@
 <!-- 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/.
 -->
+<!-- Calendar Invitations Dialog -->
 
-<!-- Calendar Invitations Dialog -->
 <!ENTITY calendar.invitations.dialog.invitations.text                   "Invitations">
 <!ENTITY calendar.invitations.dialog.statusmessage.updating.text        "Updating list of invitations.">
 <!ENTITY calendar.invitations.dialog.statusmessage.noinvitations.text   "No unconfirmed invitations found.">
+<!-- Calendar Invitations List -->
 
-<!-- Calendar Invitations List -->
 <!ENTITY calendar.invitations.list.accept.button.label                  "Accept">
 <!ENTITY calendar.invitations.list.decline.button.label                 "Decline">
 <!ENTITY calendar.invitations.list.recurrentevent.text                  "Repeating event">
 <!ENTITY calendar.invitations.list.alldayevent.text                     "All day event">
 <!ENTITY calendar.invitations.list.location.text                        "Location: ">
 <!ENTITY calendar.invitations.list.organizer.text                       "Organiser: ">
 <!ENTITY calendar.invitations.list.attendee.text                        "Attendee: ">
 <!ENTITY calendar.invitations.list.none.text                            "None">
--- a/calendar/chrome/calendar/calendar-occurrence-prompt.dtd
+++ b/calendar/chrome/calendar/calendar-occurrence-prompt.dtd
@@ -1,7 +1,5 @@
 <!-- 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/. -->
 
-<!ENTITY buttons.occurrence.accesskey "t">
-<!ENTITY buttons.allfollowing.accesskey "f">
-<!ENTITY buttons.parent.accesskey "a">
+
--- a/calendar/chrome/calendar/calendar-occurrence-prompt.properties
+++ b/calendar/chrome/calendar/calendar-occurrence-prompt.properties
@@ -1,14 +1,14 @@
 # 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/.
 
 header.isrepeating.event.label=is a repeating event
-header.isrepeating.task.label=is a repeating task 
+header.isrepeating.task.label=is a repeating task\u0020
 
 windowtitle.event.delete=Delete Repeating Event
 windowtitle.task.delete=Delete Repeating Task
 windowtitle.event.edit=Edit Repeating Event
 windowtitle.task.edit=Edit Repeating Task
 
 buttons.occurrence.delete.label=Delete just this occurrence
 buttons.occurrence.edit.label=Edit just this occurrence
--- a/calendar/chrome/calendar/calendar-subscriptions-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-subscriptions-dialog.dtd
@@ -1,14 +1,14 @@
 <!-- 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/.
 -->
+<!-- Calendar Subscriptions Dialog -->
 
-<!-- Calendar Subscriptions Dialog -->
 <!ENTITY calendar.subscriptions.dialog.title                            "Subscribe Calendars">
 <!ENTITY calendar.subscriptions.dialog.search.label.value               "Show calendars that contain:">
 <!ENTITY calendar.subscriptions.dialog.search.button.label              "Search">
 <!ENTITY calendar.subscriptions.dialog.select.label.value               "Select calendars to subscribe to:">
 <!ENTITY calendar.subscriptions.dialog.subscribe.button.label           "Subscribe">
 <!ENTITY calendar.subscriptions.dialog.unsubscribe.button.label         "Unsubscribe">
 <!ENTITY calendar.subscriptions.dialog.statusmessage.busy.label         "Search…">
 <!ENTITY calendar.subscriptions.dialog.statusmessage.nomatches.label    "No matches found.">
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -1,47 +1,47 @@
 <!-- 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/. -->
+<!-- General -->
 
-<!-- General -->
 <!ENTITY calendar.calendar.label     "Calendar">
 <!ENTITY calendar.calendar.accesskey "C">
 
 <!ENTITY calendar.newevent.button.tooltip         "Create a new event" >
 <!ENTITY calendar.newtask.button.tooltip          "Create a new task" >
 
 <!ENTITY calendar.unifinder.todoitems.label       "Tasks" >
 <!ENTITY calendar.unifinder.showcompletedtodos.label "Show completed Tasks">
 
-<!ENTITY calendar.today.button.label       "Today">
+<!ENTITY calendar.today.button.label          "Today">
 <!ENTITY calendar.tomorrow.button.label       "Tomorrow">
-<!ENTITY calendar.soon.button.label           "Soon">
+
 
 <!ENTITY calendar.events.filter.all.label "All Events">
 <!ENTITY calendar.events.filter.today.label "Today's Events">
 <!ENTITY calendar.events.filter.future.label "All Future Events">
 <!ENTITY calendar.events.filter.current.label "Currently Selected Day">
 <!ENTITY calendar.events.filter.currentview.label "Events in Current View">
 <!ENTITY calendar.events.filter.next7Days.label "Events in the Next 7 Days">
 <!ENTITY calendar.events.filter.next14Days.label "Events in the Next 14 Days">
 <!ENTITY calendar.events.filter.next31Days.label "Events in the Next 31 Days">
 <!ENTITY calendar.events.filter.thisCalendarMonth.label "Events in this Calendar Month">
-
 <!-- LOCALIZATION NOTE(calendar.unifinder.tree.done.tooltip)
    - This label and tooltip is used for the column with the checkbox in the
    - task tree view. -->
+
 <!ENTITY calendar.unifinder.tree.done.label                "Done">
 <!ENTITY calendar.unifinder.tree.done.tooltip2             "Sort by completion">
 <!ENTITY calendar.unifinder.tree.priority.label            "Priority">
 <!ENTITY calendar.unifinder.tree.priority.tooltip2         "Sort by priority">
 <!ENTITY calendar.unifinder.tree.title.label               "Title">
 <!ENTITY calendar.unifinder.tree.title.tooltip2            "Sort by title">
-<!ENTITY calendar.unifinder.tree.percentcomplete.label     "&#37; Complete">
-<!ENTITY calendar.unifinder.tree.percentcomplete.tooltip2  "Sort by &#37; complete">
+<!ENTITY calendar.unifinder.tree.percentcomplete.label     "&#037; Complete">
+<!ENTITY calendar.unifinder.tree.percentcomplete.tooltip2  "Sort by &#037; complete">
 <!ENTITY calendar.unifinder.tree.startdate.label           "Start">
 <!ENTITY calendar.unifinder.tree.startdate.tooltip2        "Sort by start date">
 <!ENTITY calendar.unifinder.tree.enddate.label             "End">
 <!ENTITY calendar.unifinder.tree.enddate.tooltip2          "Sort by end date">
 <!ENTITY calendar.unifinder.tree.duedate.label             "Due">
 <!ENTITY calendar.unifinder.tree.duedate.tooltip2          "Sort by due date">
 <!ENTITY calendar.unifinder.tree.completeddate.label       "Completed">
 <!ENTITY calendar.unifinder.tree.completeddate.tooltip2    "Sort by completed date">
@@ -118,22 +118,22 @@
 <!ENTITY calendar.task.filter.notstarted.label      "Not Started Tasks">
 <!ENTITY calendar.task.filter.notstarted.accesskey  "a">
 <!ENTITY calendar.task.filter.overdue.label         "Overdue Tasks">
 <!ENTITY calendar.task.filter.overdue.accesskey     "O">
 <!ENTITY calendar.task.filter.completed.label       "Completed Tasks">
 <!ENTITY calendar.task.filter.completed.accesskey   "C">
 <!ENTITY calendar.task.filter.open.label            "Incomplete Tasks">
 <!ENTITY calendar.task.filter.open.accesskey        "m">
-
 <!-- LOCALIZATION NOTE(calendar.task.filter.current.label)
      "Current Tasks" will show all tasks, except those with a start date set
      that is after today and after the selected date. If a task repeats, a
      separate entry will be shown for each of the occurrences that happen on or
      before today (or the selected date, whichever is later). -->
+
 <!ENTITY calendar.task.filter.current.label         "Current Tasks">
 <!ENTITY calendar.task.filter.current.accesskey     "u">
 
 <!ENTITY calendar.task-details.title.label           "title">
 <!ENTITY calendar.task-details.organizer.label       "from">
 <!ENTITY calendar.task-details.priority.label        "priority">
 <!ENTITY calendar.task-details.priority.low.label    "Low">
 <!ENTITY calendar.task-details.priority.normal.label "Normal">
@@ -147,18 +147,18 @@
 
 <!ENTITY calendar.task.category.button.tooltip  "Categorise tasks">
 <!ENTITY calendar.task.complete.button.tooltip  "Mark selected tasks completed">
 <!ENTITY calendar.task.priority.button.tooltip  "Change the priority">
 
 <!ENTITY calendar.task.text-filter.textbox.emptytext.base            "Filter tasks… #1">
 <!ENTITY calendar.task.text-filter.textbox.emptytext.keylabel.nonmac "&lt;Ctrl+Shift+K&gt;">
 <!ENTITY calendar.task.text-filter.textbox.emptytext.keylabel.mac    "&lt;&#x21E7;&#x2318;K&gt;">
+<!-- Context Menu -->
 
-<!-- Context Menu -->
 <!ENTITY calendar.context.modifyorviewitem.label      "Open">
 <!ENTITY calendar.context.modifyorviewitem.accesskey  "O">
 <!ENTITY calendar.context.modifyorviewtask.label      "Open Task…">
 <!ENTITY calendar.context.modifyorviewtask.accesskey  "O">
 <!ENTITY calendar.context.newevent.label              "New Event…">
 <!ENTITY calendar.context.newevent.accesskey          "N">
 <!ENTITY calendar.context.newtodo.label               "New Task…">
 <!ENTITY calendar.context.newtodo.accesskey           "k">
@@ -173,26 +173,27 @@
 <!ENTITY calendar.context.pasteevent.label            "Paste">
 <!ENTITY calendar.context.pasteevent.accesskey        "P">
 <!ENTITY calendar.context.button.label                "Today Pane" >
 <!ENTITY calendar.context.button.accesskey            "T" >
 <!ENTITY calendar.context.attendance.menu.label       "Attendance" >
 <!ENTITY calendar.context.attendance.menu.accesskey   "d" >
 <!ENTITY calendar.context.attendance.occurrence.label "This Occurrence" >
 <!ENTITY calendar.context.attendance.all.label        "All Occurrences" >
+<!-- Task Context Menu -->
 
-<!-- Task Context Menu -->
 <!ENTITY calendar.context.progress.label              "Progress">
 <!ENTITY calendar.context.progress.accesskey          "P">
 <!ENTITY calendar.context.priority.label              "Priority">
 <!ENTITY calendar.context.priority.accesskey          "r">
 <!ENTITY calendar.context.postpone.label              "Postpone Task">
 <!ENTITY calendar.context.postpone.accesskey          "s">
+<!--=percent sign-->
 
-<!ENTITY percnt "&#38;#37;" ><!--=percent sign-->
+<!ENTITY percnt "&#38;#37;" >
 
 <!ENTITY calendar.context.markcompleted.label     "Mark Completed">
 <!ENTITY calendar.context.markcompleted.accesskey "o">
 
 <!ENTITY progress.level.0             "0&percnt; Completed">
 <!ENTITY progress.level.0.accesskey   "0">
 <!ENTITY progress.level.25            "25&percnt; Completed">
 <!ENTITY progress.level.25.accesskey  "2">
@@ -205,58 +206,61 @@
 
 <!ENTITY priority.level.none                "Not specified">
 <!ENTITY priority.level.none.accesskey      "s">
 <!ENTITY priority.level.low                 "Low">
 <!ENTITY priority.level.low.accesskey       "L">
 <!ENTITY priority.level.normal              "Normal">
 <!ENTITY priority.level.normal.accesskey    "N">
 <!ENTITY priority.level.high                "High">
-<!ENTITY priority.level.high.accesskey      "H">
+
 
 <!ENTITY calendar.context.postpone.1hour.label      "1 Hour">
 <!ENTITY calendar.context.postpone.1hour.accesskey  "H">
 <!ENTITY calendar.context.postpone.1day.label       "1 Day">
 <!ENTITY calendar.context.postpone.1day.accesskey   "D">
 <!ENTITY calendar.context.postpone.1week.label      "1 Week">
 <!ENTITY calendar.context.postpone.1week.accesskey  "W">
 
 <!ENTITY calendar.copylink.label       "Copy Link Location">
 <!ENTITY calendar.copylink.accesskey   "C">
-
 <!-- Task View -->
 <!-- Note that the above *.context.* strings are currently used for the other
      task action buttons -->
-<!ENTITY calendar.taskview.delete.label     "Delete">
 
+<!ENTITY calendar.taskview.delete.label     "Delete">
 <!-- Server Context Menu -->
+
 <!ENTITY calendar.context.newserver.label              "New Calendar…">
 <!ENTITY calendar.context.newserver.accesskey          "N">
 <!ENTITY calendar.context.findcalendar.label           "Find Calendar…" >
 <!ENTITY calendar.context.findcalendar.accesskey       "F" >
-<!ENTITY calendar.context.deleteserver.label           "Delete Calendar">
-<!ENTITY calendar.context.deleteserver.accesskey       "D">
+
+
+<!-- LOCALIZATION NOTE (calendar.context.removeserver.label): Removing the
+      calendar is the general action of removing it, while deleting means to
+      clear the data and unsubscribing means just taking it out of the calendar
+      list. -->
+
+
+
 <!ENTITY calendar.context.synccalendars.label          "Synchronise Calendars">
 <!ENTITY calendar.context.synccalendars.accesskey      "S">
 <!ENTITY calendar.context.publish.label                "Publish Calendar…">
 <!ENTITY calendar.context.publish.accesskey            "b">
 <!ENTITY calendar.context.export.label                 "Export Calendar…">
 <!ENTITY calendar.context.export.accesskey             "E">
 <!ENTITY calendar.context.properties.label             "Properties">
 <!ENTITY calendar.context.properties.accesskey         "P">
-
 <!-- LOCALIZATION NOTE (calendar.context.togglevisible.accesskey)
      This is the access key used for the showCalendar string -->
-<!ENTITY calendar.context.togglevisible.accesskey      "H">
-
 <!-- LOCALIZATION NOTE (calendar.context.showonly.accesskey)
      This is the access key used for the showOnlyCalendar string -->
-<!ENTITY calendar.context.showonly.accesskey           "O">
-<!ENTITY calendar.context.showall.label                "Show All Calendars">
-<!ENTITY calendar.context.showall.accesskey            "A">
+
+
 
 <!ENTITY calendar.context.convertmenu.label              "Convert To">
 <!ENTITY calendar.context.convertmenu.accesskey.mail     "n">
 <!ENTITY calendar.context.convertmenu.accesskey.calendar "v">
 <!ENTITY calendar.context.convertmenu.event.label        "Event…">
 <!ENTITY calendar.context.convertmenu.event.accesskey    "E">
 <!ENTITY calendar.context.convertmenu.message.label      "Message…">
 <!ENTITY calendar.context.convertmenu.message.accesskey  "M">
@@ -266,18 +270,18 @@
 <!ENTITY calendar.tasks.view.minimonth.label           "Mini-Month">
 <!ENTITY calendar.tasks.view.minimonth.accesskey       "M">
 
 <!ENTITY calendar.tasks.view.calendarlist.label        "Calendar List">
 <!ENTITY calendar.tasks.view.calendarlist.accesskey    "L">
 
 <!ENTITY calendar.tasks.view.filtertasks.label           "Filter Tasks">
 <!ENTITY calendar.tasks.view.filtertasks.accesskey       "F">
+<!-- Calendar Alarm Dialog -->
 
-<!-- Calendar Alarm Dialog -->
 
 <!ENTITY calendar.alarm.location.label              "Location:" >
 <!ENTITY calendar.alarm.details.label               "Details…" >
 
 <!ENTITY calendar.alarm.snoozefor.label             "Snooze for" >
 <!ENTITY calendar.alarm.snoozeallfor.label          "Snooze All for" >
 <!ENTITY calendar.alarm.title.label                 "Calendar Reminders" >
 <!ENTITY calendar.alarm.dismiss.label               "Dismiss" >
@@ -286,76 +290,76 @@
 <!ENTITY calendar.alarm.snooze.5minutes.label       "5 Minutes" >
 <!ENTITY calendar.alarm.snooze.10minutes.label      "10 Minutes" >
 <!ENTITY calendar.alarm.snooze.15minutes.label      "15 Minutes" >
 <!ENTITY calendar.alarm.snooze.30minutes.label      "30 Minutes" >
 <!ENTITY calendar.alarm.snooze.45minutes.label      "45 Minutes" >
 <!ENTITY calendar.alarm.snooze.1hour.label          "1 Hour" >
 <!ENTITY calendar.alarm.snooze.2hours.label         "2 Hours" >
 <!ENTITY calendar.alarm.snooze.1day.label           "1 Day" >
-
 <!-- LOCALIZATION NOTE (calendar.alarm.snooze.cancel)
      This string is not seen in the UI, it is read by screen readers when the
      user focuses the "Cancel" button in the "Snooze for..." popup of the alarm
      dialog. -->
-<!ENTITY calendar.alarm.snooze.cancel               "Cancel Snooze">
 
+<!ENTITY calendar.alarm.snooze.cancel               "Cancel Snooze">
 <!-- Calendar Server Dialog -->
+
 <!ENTITY calendar.server.dialog.title.edit          "Edit Calendar">
 <!ENTITY calendar.server.dialog.name.label          "Calendar Name:">
+<!-- Calendar Properties -->
 
-<!-- Calendar Properties -->
 <!ENTITY calendarproperties.color.label                    "Colour:">
 <!ENTITY calendarproperties.webdav.label                   "iCalendar (ICS)">
 <!ENTITY calendarproperties.caldav.label                   "CalDAV">
 <!ENTITY calendarproperties.wcap.label                     "Sun Java System Calendar Server (WCAP)">
 <!ENTITY calendarproperties.format.label                   "Format:">
 <!ENTITY calendarproperties.location.label                 "Location:">
 <!ENTITY calendarproperties.refreshInterval.label          "Refresh Calendar:">
 <!ENTITY calendarproperties.refreshInterval.manual.label   "Manually">
 <!ENTITY calendarproperties.name.label                     "Name:">
 <!ENTITY calendarproperties.readonly.label                 "Read Only">
 <!ENTITY calendarproperties.firealarms.label               "Show Reminders">
 <!ENTITY calendarproperties.cache3.label                   "Offline Support">
 <!ENTITY calendarproperties.enabled.label                  "Switch this calendar on">
 <!ENTITY calendarproperties.forceDisabled.label            "The provider for this calendar could not be found. This often happens if you have disabled or uninstalled certain add-ons.">
 <!ENTITY calendarproperties.unsubscribe.label              "Unsubscribe">
 <!ENTITY calendarproperties.unsubscribe.accesskey          "U">
+<!-- Calendar Publish Dialog -->
 
-<!-- Calendar Publish Dialog -->
 <!ENTITY calendar.publish.dialog.title              "Publish Calendar">
 <!ENTITY calendar.publish.url.label                 "Publishing URL">
 <!ENTITY calendar.publish.publish.button      "Publish">
 <!ENTITY calendar.publish.close.button      "Close">
 
 <!ENTITY calendar.publish.example.url.description   "Something like http://www.myserver.com/webdav/test.ics">
+<!-- Select Calendar Dialog -->
 
-<!-- Select Calendar Dialog -->
 <!ENTITY calendar.select.dialog.title    "Select Calendar">
+<!-- Calendar Printing -->
 
-<!-- Calendar Printing -->
 <!ENTITY calendar.print.window.title "Print A Calendar">
 <!ENTITY calendar.print.title.label "Title:">
 <!ENTITY calendar.print.layout.label "Layout:">
 <!ENTITY calendar.print.range.label "What to Print">
 <!ENTITY calendar.print.currentView2.label "Current view">
 <!ENTITY calendar.print.selectedEventsAndTasks.label "Selected events/tasks">
 <!ENTITY calendar.print.tasks.label "Tasks">
 <!ENTITY calendar.print.events.label "Events">
 <!ENTITY calendar.print.custom.label "Custom date range:">
 <!ENTITY calendar.print.from.label "From:">
 <!ENTITY calendar.print.to.label "To:">
 <!ENTITY calendar.print.settingsGroup.label "Print Settings">
 <!ENTITY calendar.print.optionsGroup.label "Options">
 <!ENTITY calendar.print.taskswithnoduedate.label "Tasks with no due date">
 <!ENTITY calendar.print.completedtasks.label "Completed tasks">
+<!-- Error reporting -->
 
-<!-- Error reporting -->
 <!ENTITY calendar.error.detail "Details…">
 <!ENTITY calendar.error.code "Error code:">
 <!ENTITY calendar.error.description "Description:">
 <!ENTITY calendar.error.title "An error has occurred">
+<!-- Extract buttons in message header -->
 
-<!-- Extract buttons in message header -->
 <!ENTITY calendar.extract.event.button         "Add as event">
 <!ENTITY calendar.extract.task.button          "Add as task">
 <!ENTITY calendar.extract.event.button.tooltip "Extract calendaring information from the message and add it to your calendar as an event">
 <!ENTITY calendar.extract.task.button.tooltip  "Extract calendaring information from the message and add it to your calendar as a task">
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -80,22 +80,30 @@ unableToCreateProvider=An error was enco
 unknownTimezonesError=An error was encountered preparing the calendar located at %1$S for use. The calendar might refer to unknown timezones. Please install the latest calendar-timezones.xpi.
 missingCalendarTimezonesError=No timezones found! Please install calendar-timezones.xpi.
 
 # Sample: Unknown timezone "USPacific" in "Dentist Appt".  Using the 'floating' local timezone instead: 2008/02/28 14:00:00
 unknownTimezoneInItem=Unknown timezone "%1$S" in "%2$S".  Treated as 'floating' local timezone instead: %3$S
 TimezoneErrorsAlertTitle=Timezone Errors
 TimezoneErrorsSeeConsole=See Error Console: Unknown timezones are treated as the 'floating' local timezone.
 
-unsubscribeCalendarTitle=Unsubscribe from Calendar
+# The following strings are for the prompt to delete/unsubscribe from the calendar
+removeCalendarButtonUnsubscribe=Unsubscribe
+
+# LOCALIZATION NOTE (removeCalendarMessageDeleteOrUnsubscribe): Shown for
+# calendar where both deleting and unsubscribing is possible.
+# %1$S:  The name of a calendar
 
-# LOCALIZATION NOTE (unsubscribeCalendarMessage):
-# used for an message like 'Are you sure you want to unsubscribe from calendar "Home"?'
-#    %1$S will be replaced with the name of a calendar
-unsubscribeCalendarMessage=Are you sure you want to unsubscribe from calendar "%1$S"?
+# LOCALIZATION NOTE (removeCalendarMessageDelete): Shown for calendar where
+# deleting is the only option.
+# %1$S:  The name of a calendar
+
+# LOCALIZATION NOTE (removeCalendarMessageUnsubscribe): Shown for calendar
+# where unsubscribing is the only option.
+# %1$S:  The name of a calendar
 
 WeekTitle=Week %1$S
 # Used to format the Multiweek's labels, ie Weeks 2 - 7
 WeeksTitle=Weeks %1$S-%2$S
 None=None
 
 # Error strings
 ## @name UID_NOT_FOUND
@@ -197,19 +205,16 @@ caldavRequestStatusCodeStringGeneric=The
 caldavRequestStatusCodeString400=The request contains bad syntax and cannot be processed.
 caldavRequestStatusCodeString403=The user lacks the required permission to perform the request.
 caldavRequestStatusCodeString404=Resource not found.
 caldavRequestStatusCodeString409=Resource conflict.
 caldavRequestStatusCodeString412=Precondition failed.
 caldavRequestStatusCodeString500=Internal server error.
 caldavRequestStatusCodeString502=Bad gateway (Proxy configuration?).
 caldavRequestStatusCodeString503=Internal server error (Temporary server outage?).
-caldavRedirectTitle=Update location for calendar %1$S?
-caldavRedirectText=The requests for %1$S are being redirected to a new location. Would you like to change the location to the following value?
-caldavRedirectDisableCalendar=Disable Calendar
 
 
 # LOCALIZATION NOTE (likelyTimezone):
 #   Translators, please put the most likely timezone(s) where the people using
 #   your locale will be.  Use the Olson ZoneInfo timezone name *in English*,
 #   ie "Europe/Paris", (continent or ocean)/(largest city in timezone).
 #   Order does not matter, except if two historically different zones now match,
 #   such as America/New_York and America/Toronto, will only find first listed.
@@ -472,59 +477,55 @@ monthInYear.monthFormat=nominative
 # LOCALIZATION NOTE (formatDateLong):
 # used for display dates in long format like 'Mon 15 Oct 2008' when it's
 # impossible to retrieve the formatatted date from the OS.
 #    %1$S will be replaced with name of the day in short format;
 #    %2$S will be replaced with the day-index of the month, possibly followed by an ordinal symbol
 #         (depending on the string dayOrdinalSymbol in dateFormat.properties);
 #    %3$S will be replaced with the name of the month in short format;
 #    %4$S will be replaced with the year.
-formatDateLong=%1$S %2$S %3$S %4$S
 
 # LOCALIZATION NOTE (dayHeaderLabel):
 # used for display the labels in the header of the days in day/week views in short
 # or long format. For example: 'Monday 6 Oct.' or 'Mon. 6 Oct.'
 #    %1$S will be replaced with name of the day in short or long format
 #    %2$S will be replaced with the day-index of the month, possibly followed by an ordinal symbol
 #         (depending on the string dayOrdinalSymbol in dateFormat.properties), plus the name
 #         of the month in short format (the day/month order depends on the OS settings).
-dayHeaderLabel=%1$S %2$S
 
 # LOCALIZATION NOTE (daysIntervalInMonth):
 # used for display of intervals in the form of 'March 3 - 9, 2008'
 #    %1$S will be replaced with name of the month of the start date
 #    %2$S will be replaced with the day-index of the start date possibly followed by an ordinal symbol
 #    %3$S will be replaced with the day-index of the end date possibly followed by an ordinal symbol
 #    %4$S will be replaced with the common year of both dates
 # The presence of the ordinal symbol in the day-indexes depends on the string
 # dayOrdinalSymbol in dateFormat.properties
 daysIntervalInMonth=%2$S – %3$S %1$S %4$S
 
 # LOCALIZATION NOTE (daysIntervalInMonth.monthFormat):
 # If your language requires a different declension, change this to
 # one of the values specified in dateFormat.properties.
 # In any case, DO NOT TRANSLATE.
-daysIntervalInMonth.monthFormat=nominative
 
 # LOCALIZATION NOTE (daysIntervalBetweenMonths):
 # used for display of intervals in the form 'September 29 - October 5, 2008'
 #    %1$S will be replaced with name of the month of the start date
 #    %2$S will be replaced with the day-index of the start date possibly followed by an ordinal symbol
 #    %3$S will be replaced with name of the month of the end date
 #    %4$S will be replaced with the day-index of the end date possibly followed by an ordinal symbol
 #    %5$S will be replaced with the commmon year of both dates
 # The presence of the ordinal symbol in the day-indexes depends on the string
 # dayOrdinalSymbol in dateFormat.properties
 daysIntervalBetweenMonths=%2$S %1$S – %4$S %3$S %5$S
 
 # LOCALIZATION NOTE (daysIntervalBetweenMonths.monthFormat):
 # If your language requires a different declension, change this to 
 # one of the values specified in dateFormat.properties.
 # In any case, DO NOT TRANSLATE.
-daysIntervalBetweenMonths.monthFormat=nominative
 
 # LOCALIZATION NOTE (daysIntervalBetweenYears):
 # used for display of intervals in the form 'December 29, 2008 - January 4, 2009'
 #    %1$S will be replaced with name of the month of the start date
 #    %2$S will be replaced with the day-index of the start date possibly followed by an ordinal symbol
 #    %3$S will be replaced with the year of the start date
 #    %4$S will be replaced with name of the month of the end date
 #    %5$S will be replaced with the day-index of the end date possibly followed by an ordinal symbol
@@ -532,17 +533,16 @@ daysIntervalBetweenMonths.monthFormat=no
 # The presence of the ordinal symbol in the day-indexes depends on the string
 # dayOrdinalSymbol in dateFormat.properties
 daysIntervalBetweenYears=%2$S %1$S %3$S – %5$S %4$S %6$S
 
 # LOCALIZATION NOTE (daysIntervalBetweenYears.monthFormat):
 # If your language requires a different declension, change this to
 # one of the values specified in dateFormat.properties.
 # In any case, DO NOT TRANSLATE.
-daysIntervalBetweenYears.monthFormat=nominative
 
 # LOCALIZATION NOTE (datetimeIntervalOnSameDateTime):
 # used for intervals where end is equals to start
 # displayed form is '5 Jan 2006 13:00'
 #    %1$S will be replaced with the date of the start date
 #    %2$S will be replaced with the time of the start date
 datetimeIntervalOnSameDateTime=%1$S %2$S
 
@@ -618,12 +618,12 @@ extractUsingRegion=Using %1$S (%2$S)
 unitMinutes=#1 minute;#1 minutes
 unitHours=#1 hour;#1 hours
 unitDays=#1 day;#1 days
 
 # LOCALIZATION NOTE (showCalendar)
 # Used in calendar list context menu
 #    %1$S will be replaced with the calendar name
 # uses the access key calendar.context.togglevisible.accesskey
-showCalendar=Show %1$S
-hideCalendar=Hide %1$S
 # uses the access key calendar.context.showonly.accesskey
-showOnlyCalendar=Show Only %1$S
+
+# LOCALIZATION NOTE (modifyConflict)
+# Used by the event dialog to resolve item modification conflicts.
--- a/calendar/chrome/calendar/categories.properties
+++ b/calendar/chrome/calendar/categories.properties
@@ -1,7 +1,6 @@
 # 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/.
 
 # default categories
 
-categories2=Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favourites,Follow up,Gifts,Holidays,Ideas,Issues,Meeting,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation
--- a/calendar/chrome/calendar/global.dtd
+++ b/calendar/chrome/calendar/global.dtd
@@ -1,32 +1,32 @@
 <!-- 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/. -->
 
 <!ENTITY time.midnight "Midnight" >
 <!ENTITY time.noon "Noon" >
-
 <!-- Day Names -->
 <!-- LOCALIZATION NOTE : Accesskeys for day.1.Ddd to day.7.Ddd are currently
      only used in Preferences > Views > Workweek groupbox -->
+
 <!ENTITY day.1.Ddd "Sun" >
-<!ENTITY day.1.Ddd.accesskey "S">
+
 <!ENTITY day.2.Ddd "Mon" >
-<!ENTITY day.2.Ddd.accesskey "M">
+
 <!ENTITY day.3.Ddd "Tue" >
-<!ENTITY day.3.Ddd.accesskey "T">
+
 <!ENTITY day.4.Ddd "Wed" >
-<!ENTITY day.4.Ddd.accesskey "W">
+
 <!ENTITY day.5.Ddd "Thu" >
-<!ENTITY day.5.Ddd.accesskey "h">
+
 <!ENTITY day.6.Ddd "Fri" >
-<!ENTITY day.6.Ddd.accesskey "F">
+
 <!ENTITY day.7.Ddd "Sat" >
-<!ENTITY day.7.Ddd.accesskey "a">
+
 
 <!ENTITY day.1.name "Sunday" >
 <!ENTITY day.2.name "Monday" >
 <!ENTITY day.3.name "Tuesday" >
 <!ENTITY day.4.name "Wednesday" >
 <!ENTITY day.5.name "Thursday" >
 <!ENTITY day.6.name "Friday" >
 <!ENTITY day.7.name "Saturday" >
@@ -43,10 +43,10 @@
 <!ENTITY month.10.name "October" >
 <!ENTITY month.11.name "November" >
 <!ENTITY month.12.name "December" >
 
 <!ENTITY onemonthbackward.tooltip "One Month Backwards" >
 <!ENTITY onemonthforward.tooltip "One Month Forwards" >
 <!ENTITY showToday.tooltip "Go to Today">
 <!ENTITY onedayforward.tooltip "One Day Forwards">
-<!ENTITY onedaybackward.tooltip "One Day Backwards">
-<!ENTITY showselectedday.tooltip "Show events for selected day">
+
+
--- a/calendar/chrome/calendar/menuOverlay.dtd
+++ b/calendar/chrome/calendar/menuOverlay.dtd
@@ -1,13 +1,13 @@
 <!-- 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/. -->
+<!-- Event Menu -->
 
-<!-- Event Menu -->
 <!ENTITY event.new.event                        "New Event…">
 <!ENTITY event.new.event.accesskey              "N">
 
 <!ENTITY event.new.task                         "New Task…">
 <!ENTITY event.new.task.accesskey               "k">
 
 <!ENTITY calendar.import.label                  "Import…">
 <!ENTITY calendar.import.accesskey              "I">
@@ -16,16 +16,23 @@
 <!ENTITY calendar.export.accesskey              "E">
 
 <!ENTITY calendar.publish.label                 "Publish…">
 <!ENTITY calendar.publish.accesskey             "b">
 
 <!ENTITY calendar.deletecalendar.label          "Delete Selected Calendar…">
 <!ENTITY calendar.deletecalendar.accesskey      "D">
 
+
+<!-- LOCALIZATION NOTE (calendar.removecalendar.label): Removing the calendar
+      is the general action of removing it, while deleting means to clear the
+      data and unsubscribing means just taking it out of the calendar list. -->
+
+
+
 <!ENTITY calendar.menu.customize.label          "Customise…">
 <!ENTITY calendar.menu.customize.accesskey      "C">
 
 <!ENTITY showUnifinderCmd.label                 "Find Events">
 <!ENTITY showUnifinderCmd.accesskey             "F">
 
 <!ENTITY calendar.displaytodos.checkbox.label       "Show Tasks in Calendar">
 <!ENTITY calendar.displaytodos.checkbox.accesskey   "T">
--- a/calendar/chrome/calendar/preferences/alarms.dtd
+++ b/calendar/chrome/calendar/preferences/alarms.dtd
@@ -1,26 +1,26 @@
 <!-- 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/. -->
-
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
 
+
 <!ENTITY pref.alarmgoesoff.label "When a Reminder is Due:">
 <!ENTITY pref.playasound "Play a sound">
 <!ENTITY pref.calendar.alarms.playsound.accessKey "s">
 <!ENTITY pref.calendar.alarms.sound.useDefault.label "Use default sound">
 <!ENTITY pref.calendar.alarms.sound.useDefault.accessKey "d">
 <!ENTITY pref.calendar.alarms.sound.browse.label "Browse…">
 <!ENTITY pref.calendar.alarms.sound.browse.accessKey "B">
-<!ENTITY pref.calendar.alarms.sound.preview.label "Preview">
-<!ENTITY pref.calendar.alarms.sound.preview.accessKey "P">
+
+
 <!ENTITY pref.showalarmbox "Show the reminder dialogue">
 <!ENTITY pref.calendar.alarms.showAlarmBox.accessKey "x">
 <!ENTITY pref.missedalarms "Show missed reminders">
 <!ENTITY pref.calendar.alarms.missedAlarms.accessKey "m">
 <!ENTITY pref.calendar.alarms.defaults.label "Reminder Defaults">
 <!ENTITY pref.defalarm4events.label "Default reminder setting for events:">
 <!ENTITY pref.defalarm4events.accesskey "e">
 <!ENTITY pref.defalarm4todos.label "Default reminder setting for tasks:">
--- a/calendar/chrome/calendar/preferences/categories.dtd
+++ b/calendar/chrome/calendar/preferences/categories.dtd
@@ -1,17 +1,17 @@
 <!-- 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/. -->
-
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
 
+
 <!ENTITY pref.categories.add.title "Add Category">
 <!ENTITY pref.categories.addButton.label "Add…">
 <!ENTITY pref.categories.addButton.accesskey "A">
 <!ENTITY pref.categories.edit.title "Edit Category">
 <!ENTITY pref.categories.editButton.label "Edit…">
 <!ENTITY pref.categories.editButton.accesskey "E">
 <!ENTITY pref.categories.removeButton.label "Remove">
 <!ENTITY pref.categories.removeButton.accesskey "R">
--- a/calendar/chrome/calendar/preferences/general.dtd
+++ b/calendar/chrome/calendar/preferences/general.dtd
@@ -1,38 +1,41 @@
 <!-- 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/. -->
-
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
 
+
 <!ENTITY pref.mainbox.label "General Settings" >
 <!ENTITY pref.dateformat.label "Date Text Format:" >
 <!ENTITY pref.dateformat.accesskey "D">
 <!ENTITY pref.dateformat.long "Long" >
 <!ENTITY pref.dateformat.short "Short"  >
 
 <!ENTITY pref.timezones.caption "Timezone">
-<!ENTITY pref.timezones.label "Select the closest city in your timezone:">
-<!ENTITY pref.timezones.accesskey "S">
+
+
 
 <!ENTITY pref.defaults.label "Default Values for New Items">
 <!ENTITY pref.events.label "Events">
 <!ENTITY pref.tasks.label "Tasks">
 
 <!ENTITY pref.default_event_length.label "Default Length:" >
-<!ENTITY pref.default_event_length.accesskey "E">
+<!ENTITY pref.default_event_length.accesskey "e">
 
 <!ENTITY pref.default_task_none.label "None">
 <!ENTITY pref.default_task_start_of_day.label "Start of Day">
 <!ENTITY pref.default_task_end_of_day.label "End of Day">
 <!ENTITY pref.default_task_tomorrow.label "Tomorrow">
 <!ENTITY pref.default_task_next_week.label "Next Week">
 <!ENTITY pref.default_task_offset_current.label "Relative to Current Time">
 <!ENTITY pref.default_task_offset_start.label "Relative to Start">
 <!ENTITY pref.default_task_offset_next_hour.label "Relative to Next Hour">
 
+
+
+
 <!ENTITY pref.accessibility.label "Accessibility" >
 <!ENTITY pref.systemcolors.label "Optimise colours for accessibility" >
 <!ENTITY pref.systemcolors.accesskey "c">
--- a/calendar/chrome/calendar/preferences/views.dtd
+++ b/calendar/chrome/calendar/preferences/views.dtd
@@ -1,17 +1,17 @@
 <!-- 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/. -->
-
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
 
+
 <!ENTITY pref.calendar.view.allview.caption "General">
 <!ENTITY pref.calendar.view.dayandweekviews.caption "Day and Week Views">
 <!ENTITY pref.calendar.view.multiweekview.caption "Multiweek View">
 <!ENTITY pref.calendar.view.workweek.caption "Workweek">
 
 <!ENTITY pref.weekstarts.label "Start the week on:">
 <!ENTITY pref.weekstarts.accesskey "r">
 <!ENTITY pref.daysoff.label "Include these days in the workweek:">
--- a/calendar/chrome/calendar/providers/gdata/amo.properties
+++ b/calendar/chrome/calendar/providers/gdata/amo.properties
@@ -6,22 +6,13 @@
 
 # This is the addon description. The en-US version will sometimes have
 # additional news items at the end of the description. If you notice this and
 # would like them translated, please email the author directly.
 # params: %1$S - See amo.faqlocation
 #         %2$S - See amo.website
 # NOTE: This is a multiline string, be sure to end lines with \n\ to make sure
 # it stays that way.
-amo.description=This extension allows Lightning to read and write events and tasks to a Google Calendar.\n\
-\n\
-Please read <a href="%1$S">the FAQ</a> for more details and before filing a bug. Also, be sure to visit the <a href="%2$S">discussion forums</a>, maybe your bug already has a solution!\n\
-\n\
-To search for and submit bugs, visit http://bugzilla.mozilla.org/ \n\
-Product: Calendar\n\
-Component: Provider: GData
 
 # You can change this if you have localized the FAQ on wiki.mozilla.org
-amo.faqlocation=http://wiki.mozilla.org/Calendar:GDATA_Provider
 
 # You can change this if you would like to provide localized support.
 amo.email=
-amo.website=http://groups.google.com/group/provider-for-google-calendar
--- a/calendar/chrome/calendar/providers/gdata/gdata.dtd
+++ b/calendar/chrome/calendar/providers/gdata/gdata.dtd
@@ -8,15 +8,12 @@
 <!ENTITY gdata.privacy.default.accesskey "D">
 
 <!ENTITY gdata.migration.title "Migrate read-only calendars">
 <!ENTITY gdata.migration.description "The Provider for Google Calendar has detected that you have existing calendars that are only capable of accessing Google Calendar in read-only mode. If you would like to upgrade any of these calendars, please select them below">
 <!ENTITY gdata.migration.upgrade.label "Upgrade">
 <!ENTITY gdata.migration.upgrade.accesskey "U">
 <!ENTITY gdata.migration.showagain.label "Always check ">
 
-<!ENTITY gdata.reminder.default "Default Reminder">
 <!ENTITY gdata.reminder.action.sms.label "Send a Text Message">
 
-<!ENTITY gdata.wizard.session.description "Please pick an existing session or enter your email address to create a new session. You only need one session per account.">
-<!ENTITY gdata.wizard.calendars.description "Please select the calendars and task lists you would like to subscribe to.">
 
-<!ENTITY gdata.wizard.nextstep.description "Please advance to the next step to set up your calendars.">
+
--- a/calendar/chrome/calendar/providers/gdata/gdata.properties
+++ b/calendar/chrome/calendar/providers/gdata/gdata.properties
@@ -16,34 +16,30 @@
 extensions.{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}.description=Allows bidirectional access to Google Calendar
 extensions.{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}.name=Provider for Google Calendar
 
 # LOCALIZATION NOTE (busyTitle):
 # Events with only free/busy access don't have a title, they will use this
 # title instead. The calendar name is used as a parameter, since its often
 # named after the person whose calendar you are viewing.
 # %1$S = The calendar name
-busyTitle=Busy (%1$S)
 
 # LOCALIZATION NOTE (quotaExceeded):
 # This is shown when the request quota has been exceeded.
 # %1$S = The session id (what the user enters as an email
 #                        in the new calendar dialog)
-quotaExceeded=The quota for %1$S has been exceeded, please try again later.
-providerOutdated=This version of the provider has expired, please update to the latest version.
 
-reminderOutOfRange=Google Calendar only allows reminders up to 4 weeks before the event starts.
 
 # LOCALIZATION NOTE (syncProgressEvent):
 # %1$S = The name of the calendar that is being synchronized
 # %2$S = The number of events that have been synchronzed
 # %3$S = The total number of events in the synchronization run
-syncProgressEvent=Synchronising %1$S event %2$S of %3$S
 
 # LOCALIZATION NOTE (syncProgressTask):
 # %1$S = The name of the calendar that is being synchronized
 # %2$S = The number of tasks that have been synchronzed
 # %3$S = The total number of tasks in the synchronization run
-syncProgressTask=Synchronising %1$S task %2$S of %3$S
 
 # LOCALIZATION NOTE (syncStatus):
 # %1$S = The name of the calendar that is being synchronized
-syncStatus=Synchronising Calendar %1$S
+
+# LOCALIZATION NOTE (requestWindowDescription):
+# %1$S - The session id (email) used for authentication
--- a/calendar/chrome/calendar/timezones.properties
+++ b/calendar/chrome/calendar/timezones.properties
@@ -411,46 +411,48 @@ pref.timezone.Pacific.Wallis=Pacific/Wal
 
 # the following have been missing
 pref.timezone.America.Indiana.Tell_City=America/Indiana/Tell City
 pref.timezone.America.Indiana.Winamac=America/Indiana/Winamac
 pref.timezone.America.Marigot=America/Marigot
 pref.timezone.America.Resolute=America/Resolute
 pref.timezone.America.St_Barthelemy=America/St. Barthelemy
 
-# added with 0.1.2008d:
+# added with 2008d:
 pref.timezone.America.Argentina.San_Luis=America/Argentina/San Luis
 pref.timezone.America.Santarem=America/Santarem
 pref.timezone.Asia.Ho_Chi_Minh=Asia/Ho Chi Minh
 pref.timezone.Asia.Kolkata=Asia/Kolkata
 
-# added with 0.1.2008i:
+# added with 2008i:
 pref.timezone.America.Argentina.Salta=America/Argentina/Salta
 
-# added with 0.1.2010i
+# added with 2010i
 pref.timezone.America.Matamoros=America/Matamoros
 pref.timezone.America.Ojinaga=America/Ojinaga
 pref.timezone.America.Santa_Isabel=America/Santa Isabel
 pref.timezone.Antarctica.Macquarie=Antarctica/Macquarie
 pref.timezone.Asia.Novokuznetsk=Asia/Novokuznetsk
 
-#added with 0.1.2011b
+#added with 2011b
 pref.timezone.America.Bahia_Banderas=America/Bahia Banderas
 pref.timezone.America.North_Dakota.Beulah=America/North Dakota/Beulah
 pref.timezone.Pacific.Chuuk=Pacific/Chuuk
 pref.timezone.Pacific.Pohnpei=Pacific/Pohnpei
 
-#added with 0.1.2011n
+#added with 2011n
 pref.timezone.Africa.Juba=Africa/Juba
 pref.timezone.America.Kralendijk=America/Kralendijk
 pref.timezone.America.Lower_Princes=America/Lower Princes
 pref.timezone.America.Metlakatla=America/Metlakatla
 pref.timezone.America.Sitka=America/Sitka
 pref.timezone.Asia.Hebron=Asia/Hebron
 
-#added with 0.1.2013a
+#added with 2013a
 pref.timezone.America.Creston=America/Creston
 pref.timezone.Asia.Khandyga=Asia/Khandyga
 pref.timezone.Asia.Ust-Nera=Asia/Ust-Nera
 pref.timezone.Europe.Busingen=Europe/Busingen
 
-#added with 0.1.2014b
+#added with 2014b
 pref.timezone.Antarctica.Troll=Antarctica/Troll
+
+#added with 2014j
--- a/calendar/chrome/lightning/lightning-toolbar.dtd
+++ b/calendar/chrome/lightning/lightning-toolbar.dtd
@@ -1,44 +1,38 @@
 <!-- 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/. -->
 
-<!ENTITY lightning.toolbar.calendar.name "Calendar Toolbar">
-<!ENTITY lightning.toolbar.calendar.name.accesskey "C">
-<!ENTITY lightning.toolbar.task.name "Task Toolbar">
-<!ENTITY lightning.toolbar.task.name.accesskey "T">
+
+
 
-<!ENTITY lightning.toolbar.sync.label "Synchronise">
 <!ENTITY lightning.toolbar.delete.label "Delete">
-<!ENTITY lightning.toolbar.edit.label "Edit">
+
 <!ENTITY lightning.toolbar.gototoday.label "Go to Today">
-<!ENTITY lightning.toolbar.print.label "Print">
 
 <!-- Mode Toolbar -->
+
 <!ENTITY lightning.toolbar.calendar.label     "Calendar">
-<!ENTITY lightning.toolbar.calendar.tooltip   "Switch to the calendar tab">
+
 <!ENTITY lightning.toolbar.calendar.accesskey "C">
-<!ENTITY lightning.toolbar.task.label         "Tasks">
-<!ENTITY lightning.toolbar.task.tooltip       "Switch to the tasks tab">
-<!ENTITY lightning.toolbar.task.accesskey     "T">
+
+
 
 <!-- Toolbar write button -->
+
 <!ENTITY lightning.toolbar.newevent.label     "Event">
 <!ENTITY lightning.toolbar.newtask.label      "Task">
+<!-- Calendar and Task Mode Toolbar -->
 
-<!-- Calendar and Task Mode Toolbar -->
-<!ENTITY lightning.toolbar.day.label                 "Day">
-<!ENTITY lightning.toolbar.day.accesskey             "D">
-<!ENTITY lightning.toolbar.week.label                "Week">
-<!ENTITY lightning.toolbar.week.accesskey            "W">
-<!ENTITY lightning.toolbar.multiweek.label           "Multiweek">
-<!ENTITY lightning.toolbar.multiweek.accesskey       "u">
-<!ENTITY lightning.toolbar.month.label               "Month">
-<!ENTITY lightning.toolbar.month.accesskey           "M">
+
+
+
+
+
+
 <!-- LOCALIZATION NOTE: the same as appmenuButton.label and appmenuButton1.tooltip
      from messenger.dtd -->
-<!ENTITY lightning.toolbar.appmenuButton.label       "AppMenu">
-<!ENTITY lightning.toolbar.appmenuButton1.tooltip    "Display the &brandShortName; Menu">
-<!ENTITY lightning.toolbar.calendarmenu.label        "Calendar Pane">
-<!ENTITY lightning.toolbar.calendarmenu.accesskey    "P">
-<!ENTITY lightning.toolbar.calendarpane.label        "Show Calendar Pane">
-<!ENTITY lightning.toolbar.calendarpane.accesskey    "P">
+
+
+
+
+
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -1,89 +1,79 @@
 <!-- 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/. -->
-
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
+<!-- Tools menu -->
 
-<!-- Tools menu -->
+
 <!ENTITY lightning.preferencesLabel "Calendar">
+<!-- New menu popup in File menu -->
 
-<!-- New menu popup in File menu -->
 <!ENTITY lightning.menupopup.new.event.label    "Event…">
 <!ENTITY lightning.menupopup.new.event.accesskey "E">
 <!ENTITY lightning.menupopup.new.task.label     "Task…">
 <!ENTITY lightning.menupopup.new.task.accesskey "T">
-<!ENTITY lightning.menupopup.new.calendar.label "Calendar…">
-<!ENTITY lightning.menupopup.new.calendar.accesskey "n">
+
 
 <!-- Open menu popup in File menu -->
+
 <!ENTITY lightning.menupopup.open.label               "Open">
 <!ENTITY lightning.menupopup.open.accesskey           "O">
-<!ENTITY lightning.menupopup.open.message.label       "Saved Message…">
-<!ENTITY lightning.menupopup.open.message.accesskey   "M">
-<!ENTITY lightning.menupopup.open.calendar.label      "Calendar File…">
-<!ENTITY lightning.menupopup.open.calendar.accesskey  "C">
+
+
+
 
 <!-- View Menu -->
-<!ENTITY lightning.menu.view.calendar.label            "Calendar">
-<!ENTITY lightning.menu.view.calendar.accesskey        "n">
-<!ENTITY lightning.menu.view.tasks.label               "Tasks">
-<!ENTITY lightning.menu.view.tasks.accesskey           "k">
+
+
 
 <!-- Events and Tasks menu -->
-<!ENTITY lightning.menu.eventtask.label                "Events and Tasks">
-<!ENTITY lightning.menu.eventtask.accesskey            "n">
 
 <!-- properties dialog, calendar creation wizard -->
-<!ENTITY lightning.calendarproperties.email.label               "Email:">
+<!-- iMIP Bar (meeting support) -->
 
-<!-- iMIP Bar (meeting support) -->
 <!ENTITY lightning.imipbar.btnAccept.label                                  "Accept">
-<!ENTITY lightning.imipbar.btnAccept2.tooltiptext                           "Accept event invitation">
-<!ENTITY lightning.imipbar.btnAcceptRecurrences.label                       "Accept all">
-<!ENTITY lightning.imipbar.btnAcceptRecurrences2.tooltiptext                "Accept event invitation for all occurrences of the event">
-<!ENTITY lightning.imipbar.btnAdd.label                                     "Add">
-<!ENTITY lightning.imipbar.btnAdd.tooltiptext                               "Add the event to the calendar">
+
+
+
+
+
 <!ENTITY lightning.imipbar.btnDecline.label                                 "Decline">
-<!ENTITY lightning.imipbar.btnDecline2.tooltiptext                          "Decline event invitation">
-<!ENTITY lightning.imipbar.btnDeclineRecurrences.label                      "Decline all">
-<!ENTITY lightning.imipbar.btnDeclineRecurrences2.tooltiptext               "Decline event invitation for all occurrences of the event">
+
+
+
 <!ENTITY lightning.imipbar.btnDelete.label                                  "Delete">
-<!ENTITY lightning.imipbar.btnDelete.tooltiptext                            "Delete from calendar">
+
 <!ENTITY lightning.imipbar.btnDetails.label                                 "Details…">
-<!ENTITY lightning.imipbar.btnDetails.tooltiptext                           "Show event details">
-<!ENTITY lightning.imipbar.btnMore.label                                    "More">
-<!ENTITY lightning.imipbar.btnMore.tooltiptext                              "Click to show more options">
-<!ENTITY lightning.imipbar.btnReconfirm2.label                              "Reconfirm">
-<!ENTITY lightning.imipbar.btnReconfirm.tooltiptext                         "Sends a reconfirmation to the organiser">
-<!ENTITY lightning.imipbar.btnSaveCopy.label                                "Save a copy">
-<!ENTITY lightning.imipbar.btnSaveCopy.tooltiptext                          "Save a copy of the event to the calendar independently of replying to the organiser. The list of attendees will be cleared.">
+
+
+
+
+
+
+
 <!ENTITY lightning.imipbar.btnTentative.label                               "Tentative">
-<!ENTITY lightning.imipbar.btnTentative2.tooltiptext                        "Accept event invitation tentatively">
-<!ENTITY lightning.imipbar.btnTentativeRecurrences.label                    "Tentative all">
-<!ENTITY lightning.imipbar.btnTentativeRecurrences2.tooltiptext             "Accept event invitation tentatively for all occurrences of the event">
-<!ENTITY lightning.imipbar.btnUpdate.label                                  "Update">
-<!ENTITY lightning.imipbar.btnUpdate.tooltiptext                            "Update event in calendar">
-<!ENTITY lightning.imipbar.description                                      "This message contains an invitation to an event.">
+
+
+
+
+
 
 <!-- Lightning specific keybindings -->
-<!ENTITY lightning.keys.event.showCalendar.key "C">
-<!ENTITY lightning.keys.event.showTasks.key "D">
-<!ENTITY lightning.keys.event.new "I">
-<!ENTITY lightning.keys.todo.new "D">
+
+
 
 <!-- Account Central page -->
+
 <!ENTITY lightning.acctCentral.newCalendar.label "Create a new calendar">
-
 <!-- today-pane-specific -->
-<!ENTITY todaypane.showMinimonth.label "Show Mini-Month">
-<!ENTITY todaypane.showMinimonth.accesskey "M">
-<!ENTITY todaypane.showMiniday.label "Show Mini-Day">
-<!ENTITY todaypane.showMiniday.accesskey  "d">
-<!ENTITY todaypane.showNone.label "Show None">
-<!ENTITY todaypane.showNone.accesskey "N">
-<!ENTITY todaypane.showTodayPane.label "Show Today Pane">
-<!ENTITY todaypane.showTodayPane.accesskey "o">
-<!ENTITY todaypane.statusButton.label "Today Pane">
+
+
+
+
+
+
+
+
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -1,69 +1,59 @@
 # 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/.
 
 # addon description:
-extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.name=Lightning
-extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Thunderbird
 extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project
 
 # Lightning branding
-brandShortName=Lightning
 
 # Task mode title
-taskModeApplicationTitle=Tasks
 
 # Tab titles
 tabTitleCalendar=Calendar
-tabTitleTasks=Tasks
 
 # Html event display in message
-imipHtml.header=Event Invitation
 imipHtml.summary=Title:
 imipHtml.location=Location:
-imipHtml.when=When:
 imipHtml.organizer=Organiser:
 imipHtml.description=Description:
-imipHtml.comment=Comment:
 imipHtml.attendees=Attendees:
-imipHtml.canceledOccurrences=Cancelled Occurrences:
-imipHtml.modifiedOccurrences=Modified Occurrences:
-imipHtml.newLocation=New Location: %1$S
+
+imipNoIdentity=None
+
+
+
+
+# LOCALIZATION_NOTE(binaryComponentKnown): This is shown when Lightning is
+# missing the binary component and knows how to calculate the expected version
+# number. To test, remove the binary component from the components/
+# subdirectory and start Lightning, or force install into a different
+# Thunderbird version. In the last part of the sentence it should be made clear
+# that the user can install e.g. 3.7, 3.7.1 or anything other 3.7.x version
+# %1$S - The Lightning brand name, from the brandShortName string above.
+# %2$S - The current Lightning version
+# %3$S - The expected Lightning version
 
-imipAddToCalendar.label=Add To Calendar
-imipAddedItemToCal=Event Added to Calendar
-imipCanceledItem=Event has been deleted
-imipUpdatedItem=Event has been updated
-imipBarCancelText=This message contains an event cancellation.
-imipBarRefreshText=This message asks for an event update.
-imipBarPublishText=This message contains an event.
-imipBarRequestText=This message contains an invitation to an event.
-imipBarUpdateText=This message contains an update to an existing event.
-imipBarAlreadyProcessedText=This message contains an event that has already been processed.
-imipBarProcessedNeedsAction=This message contains an event that you have not yet responded to.
-imipBarReplyText=This message contains a reply to an invitation.
-imipBarUnsupportedText=This message contains an event that this version of Lightning cannot process.
-imipBarProcessingFailed=Processing message failed. Status: %1$S.
-imipBarNotWritable=No writable calendars are configured for invitations, please check the calendar properties.
-imipSendMail.title=Email Notification
-imipSendMail.text=Would you like to send out notification Email now?
-imipSendMail.Outlook2000CompatMode.text=Support Outlook 2000 and Outlook 2002/XP
-imipNoIdentity=None
-imipNoCalendarAvailable=There are no writable calendars available.
+# LOCALIZATION_NOTE(binaryComponentUnknown): This is shown when Lightning is
+# missing the binary component but can't calculate the expected version. This
+# happens in the rare case that Lightning is installed into something other
+# than Thunderbird or Seamonkey. You may link to a different page if you can
+# commit to keeping it up to date, I'd recommend staying with the English page.
+# %1$S - The Lightning brand name, from the brandShortName string above.
+# %2$S - The application brand name, e.g. Postbox
+# %3$S - The application version
+# %3$S - The current Lightning version
 
-itipReplySubject=Event Invitation Reply: %1$S
-itipReplyBodyAccept=%1$S has accepted your event invitation.
-itipReplyBodyDecline=%1$S has declined your event invitation.
-itipReplySubjectAccept=Event Invitation Reply (Accepted): %1$S
-itipReplySubjectDecline=Event Invitation Reply (Declined): %1$S
-itipReplySubjectTentative=Event Invitation Reply (Tentative): %1$S
-itipRequestSubject=Event Invitation: %1$S
-itipRequestUpdatedSubject=Updated Event Invitation: %1$S
-itipRequestBody=%1$S has invited you to %2$S
-itipCancelSubject=Event Cancelled: %1$S
-itipCancelBody=%1$S has cancelled this event: « %2$S »
+# LOCALIZATION_NOTE(binaryComponentTitle): The title for the dialog that
+# notifies about a version mismatch.
+# %1$S - The Lightning brand name, from the brandShortName string above.
 
-confirmProcessInvitation=You have recently deleted this item, are you sure you want to process this invitation?
-confirmProcessInvitationTitle=Process Invitation?
+# LOCALIZATION_NOTE(integrationLabel): Used by the notification bar shown when
+# Lightning is installed from the distribution folder. To trigger it, start a
+# new profile without Lightning in a previous Thunderbird version, then upgrade
+# to a Thunderbird that has Lightning packaged. See bug 1130852 for details.
 
-invitationsLink.label=Invitations: %1$S
+# LOCALIZATION_NOTE(integrationRestartLabel): At the current time its not yet
+# clear if we will be completely uninstalling Lightning or disabling it. Please
+# translate this string in a general manner, so that it makes sense for both
+# options.
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -8,17 +8,16 @@
 #  configuring an IRC account.
 irc.usernameHint=nick
 
 # LOCALIZATION NOTE (connection.error.*):
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
 connection.error.lost=Lost connection with server
 connection.error.timeOut=Connection timed out
-connection.error.invalidUsername=%S is not an allowed username
 connection.error.invalidPassword=Invalid server password
 connection.error.passwordRequired=Password required
 
 # LOCALIZATION NOTE (joinChat.*):
 #   These show up on the join chat menu. An underscore is for the access key.
 joinChat.channel=_Channel
 joinChat.password=_Password
 
@@ -96,26 +95,25 @@ message.usermode=Mode %1$S for %2$S set 
 message.channelmode=Channel mode %1$S set by %2$S.
 #    %S is the user's mode.
 message.yourmode=Your mode is %S.
 #    %1$S is the old nick and %2$S is the new nick.
 message.nick=%1$S is now known as %2$S.
 #    %S is your new nick.
 message.nick.you=You are now known as %S.
 #    Could not change the nickname. %S is the user's nick.
-message.nick.fail=Could not use the specified nickname. Your nick remains %S.
-#    The paramter is the message.parted.reason, if a part message is given.
+#    The parameter is the message.parted.reason, if a part message is given.
 message.parted.you=You have left the room (Part%1$S).
 #    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
 message.parted=%1$S has left the room (Part%2$S).
 #    %S is the part message supplied by the user.
 message.parted.reason=: %S
 #    %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.
 message.quit=%1$S has left the room (Quit%2$S).
-#    The paramter is the quit message given by the user.
+#    The parameter is the quit message given by the user.
 message.quit2=: %S
 #    %1$S is the nickname of the user that invited us, %2$S is the conversation
 #    name.
 message.inviteReceived=%1$S has invited you to %2$S.
 #    %1$S is the nickname of the invited user, %2$S is the conversation name
 #    they were invited to.
 message.invited=%1$S was successfully invited to %2$S.
 #    %1$S is the nickname of the invited user, %2$S is the conversation name
@@ -123,17 +121,17 @@ message.invited=%1$S was successfully in
 message.alreadyInChannel=%1$S is already in %2$S.
 #    %S is the nickname of the user who was summoned.
 message.summoned=%S was summoned.
 #    %S is the nickname of the user whose WHOIS information follows this message.
 message.whois=WHOIS information for %S:
 #    %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.
 message.whowas=%1$S is offline. WHOWAS information for %1$S:
 #    %1$S is the entry description (from tooltip.*), %2$S is its value.
-message.whoisEntry=\ua0\ua0\ua0\ua0%1$S: %2$S
+message.whoisEntry=\u00A0   %1$S: %2$S
 #    %S is the nickname that is not known to the server.
 message.unknownNick=%S is an unknown nickname.
 #    %1$S is the nickname of the user who changed the mode and %2$S is the new
 #    channel key (password).
 message.channelKeyAdded=%1$S changed the channel password to %2$S.
 message.channelKeyRemoved=%S removed the channel password.
 #    This will be followed by a list of ban masks.
 message.banMasks=Users connected from the following locations are banned from %S:
@@ -143,17 +141,17 @@ message.banMaskRemoved=Users connected f
 # LOCALIZATION NOTE (message.ping): Semi-colon list of plural forms.
 #  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 #   %1$S is the nickname of the user or the server that was pinged.
 #   #2 is the delay (in milliseconds).
 message.ping=Ping reply from %1$S in #2 millisecond.;Ping reply from %1$S in #2 milliseconds.
 
 
 # LOCALIZATION NOTE (error.*):
-#    These are shown as error messages in the conversation.
+#    These are shown as error messages in the conversation or server tab.
 #    %S is the channel name.
 error.noChannel=There is no channel: %S.
 error.tooManyChannels=Cannot join %S; you've joined too many channels.
 #    %1$S is your new nick, %2$S is the kill message from the server.
 error.nickCollision=Nick already in use, changing nick to %1$S [%2$S].
 error.erroneousNickname=%S is not an allowed nickname.
 error.banned=You are banned from this server.
 error.bannedSoon=You will soon be banned from this server.
@@ -168,16 +166,18 @@ error.channelBanned=You have been banned
 error.cannotSendToChannel=You cannot send messages to %S.
 error.channelFull=The channel %S is full.
 error.inviteOnly=You must be invited to join %S.
 error.nonUniqueTarget=%S is not a unique user@host or shortname or you have tried to join too many channels at once.
 error.notChannelOp=You are not a channel operator on %S.
 error.notChannelOwner=You are not a channel owner of %S.
 error.wrongKey=Cannot join %S, invalid channel password.
 error.sendMessageFailed=An error occurred while sending your last message. Please try again once the connection has been reestablished.
+#    %1$S is the channel the user tried to join, %2$S is the channel
+#    he was forwarded to.
 
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
 #    from a whois response.
 #    The human readable ("realname") description of the user.
 tooltip.realname=Name
 tooltip.server=Connected to
 #    The username and hostname that the user connects from (usually based on the
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -40,17 +40,16 @@ connection.error.failedToGetAResource=Fa
 #   the user has sent wasn't delivered.
 #   %S is replaced by the text of the message that wasn't delivered.
 conversation.error.notDelivered=This message could not be delivered: %S
 #   This is displayed in a conversation as an error message when joining a MUC
 #   fails.
 #   %S is the name of the MUC.
 conversation.error.joinFailed=Could not join: %S
 #   These are displayed in a conversation as a system error message.
-conversation.error.remoteServerNotFound=Could not reach the recipient's server
 conversation.error.unknownError=Unknown error
 
 # LOCALIZATION NOTE (tooltip.*):
 #   These are the titles of lines of information that will appear in
 #   the tooltip showing details about a contact or conversation.
 # LOCALIZATION NOTE (tooltip.status):
 #   %S will be replaced by the XMPP resource identifier
 tooltip.status=Status (%S)
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -152,17 +152,16 @@ tabReload      =      reloading
 # Object states
 stateChecked     =    ticked
 stateNotChecked  =    not ticked
 statePressed     =    pressed
 # No string for a not pressed toggle button
 stateExpanded    =    expanded
 stateCollapsed   =    collapsed
 stateUnavailable =    unavailable
-stateReadonly    =    readonly
 stateRequired    =    required
 stateTraversed   =    visited
 stateHasPopup    =    has pop up
 stateSelected    =    selected
 
 # App modes
 editingMode    =      editing
 navigationMode =      navigating
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -25,11 +25,10 @@ unsafeContentType=The page you are tryin
 externalProtocolTitle=External Protocol Request
 externalProtocolPrompt=An external application must be launched to handle %1$S: links.\n\n\nRequested link:\n\n%2$S\n\nApplication: %3$S\n\n\nIf you were not expecting this request it may be an attempt to exploit a weakness in that other program. Cancel this request unless you are sure it is not malicious.\n
 #LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
 externalProtocolUnknown=<Unknown>
 externalProtocolChkMsg=Remember my choice for all links of this type.
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 phishingBlocked=The web site at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
-cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
 remoteXUL=This page uses an unsupported technology that is no longer available by default.
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -155,11 +155,9 @@ ImplicitMetaViewportTagFallback=No meta-
 DataContainerEventWarning=Use of DataContainerEvent is deprecated. Use CustomEvent instead.
 # LOCALIZATION NOTE: Do not translate "sendAsBinary" or "send(Blob data)"
 SendAsBinaryWarning=The non-standard sendAsBinary method is deprecated and will soon be removed. Use the standard send(Blob data) method instead.
 # LOCALIZATION NOTE: Do not translate "window.controllers"
 Window_ControllersWarning=window.controllers is deprecated. Do not use it for UA detection.
 ImportXULIntoContentWarning=Importing XUL nodes into a content document is deprecated. This functionality may be removed soon.
 XMLDocumentLoadPrincipalMismatch=Use of document.load forbidden on Documents that come from other Windows. Only the Window in which a Document was created is allowed to call .load on that Document. Preferably, use XMLHttpRequest instead.
 # LOCALIZATION NOTE: Do not translate "IndexedDB".
-IndexedDBTransactionAbortNavigation=An IndexedDB transaction that was not yet complete has been aborted due to page navigation.
 # LOCALIZATION NOTE (WillChangeBudgetWarning): Do not translate Will-change, %1$S,%2$S,%3$S are numbers.
-WillChangeBudgetWarning=Will-change memory consumption is too high. Surface area covers %1$S pixels, budget is the document surface area multiplied by %2$S (%3$S pixels). All occurences of will-change in the document are ignored when over budget.
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -51,17 +51,16 @@ PECounterStyleBadName=Name of @counter-s
 PECounterStyleBadBlockStart=Expected '{' to begin @counter-style rule but found '%1$S'.
 PECounterStyleEOF=closing '}' of @counter-style block
 PECounterDescExpected=Expected counter descriptor but found '%1$S'.
 PEUnknownCounterDesc=Unknown descriptor '%1$S' in @counter-style rule.
 PECounterExtendsNotIdent=Expected identifier for extends system but found '%1$S'.
 PECounterASWeight=Each weight in the additive-symbols descriptor must be smaller than the previous weight.
 PEClassSelEOF=class name
 PEClassSelNotIdent=Expected identifier for class selector but found '%1$S'.
-PECoordinatePair=Expected coordinate pair but found '%1$S'.
 PETypeSelEOF=element type
 PETypeSelNotType=Expected element name or '*' but found '%1$S'.
 PEUnknownNamespacePrefix=Unknown namespace prefix '%1$S'.
 PEAttributeNameEOF=attribute name
 PEAttributeNameExpected=Expected identifier for attribute name but found '%1$S'.
 PEAttributeNameOrNamespaceExpected=Expected attribute name or namespace but found '%1$S'.
 PEAttSelNoBar=Expected '|' but found '%1$S'.
 PEAttSelInnerEOF=part of attribute selector
@@ -101,19 +100,16 @@ PEExpectedInt=Expected an integer but fo
 PEColorBadRGBContents=Expected number or percentage in rgb() but found '%1$S'.
 PEColorComponentBadTerm=Expected '%2$S' but found '%1$S'.
 PEColorHueEOF=hue
 PEExpectedComma=Expected ',' but found '%1$S'.
 PEColorSaturationEOF=saturation
 PEColorLightnessEOF=lightness
 PEColorOpacityEOF=opacity in colour value
 PEExpectedNumber=Expected a number but found '%1$S'.
-PEPositionEOF=<position>
-PEExpectedPosition=Expected <position> but found '%1$S'.
-PEExpectedRadius=Expected radius but found '%1$S'.
 PEExpectedCloseParen=Expected ')' but found '%1$S'.
 PEDeclEndEOF=';' or '}' to end declaration
 PEParseDeclarationNoColon=Expected ':' but found '%1$S'.
 PEParseDeclarationDeclExpected=Expected declaration but found '%1$S'.
 PEEndOfDeclEOF=end of declaration
 PEImportantEOF=important
 PEExpectedImportant=Expected 'important' but found '%1$S'.
 PEBadDeclEnd=Expected ';' to terminate declaration but found '%1$S'.
--- a/dom/chrome/plugins.properties
+++ b/dom/chrome/plugins.properties
@@ -1,24 +1,27 @@
 # 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 (plugins.properties):
-#    Those strings are inserted into an HTML page, so you all HTML characters
+#    Those strings are inserted into an HTML page, so all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=About Plugins
 installedplugins_label=Installed plugins
 nopluginsareinstalled_label=No installed plugins found
 findpluginupdates_label=Find updates for installed plugins at
 file_label=File:
 path_label=Path:
 version_label=Version:
 state_label=State:
 state_enabled=Enabled
 state_disabled=Disabled
 mimetype_label=MIME Type
 description_label=Description
 suffixes_label=Suffixes
 
+# GMP Plugins
+
 openH264_name=OpenH264 Video Codec provided by Cisco Systems, Inc.
 openH264_description=Play back web video and use video chats.
+
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -1,27 +1,20 @@
 # Mixed Content Blocker
 # LOCALIZATION NOTE: "%1$S" is the URI of the blocked mixed content resource
 BlockMixedDisplayContent = Blocked loading mixed display content "%1$S"
 BlockMixedActiveContent = Blocked loading mixed active content "%1$S"
 
 # CORS
-CrossSiteRequestBlocked=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. This can be fixed by moving the resource to the same domain or enabling CORS.
+# LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
 
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=The site specified an invalid Strict-Transport-Security header.
 # LOCALIZATION NOTE: Do not translate "Public-Key-Pins or HPKP"
-InvalidPKPHeaders=The site specified an invalid Public-Key-Pins header.
 # LOCALIZATION NOTE: Do not translate "SHA-1"
-SHA1Sig=This site makes use of a SHA-1 Certificate; it's recommended you use certificates with signature algorithms that use hash functions stronger than SHA-1.
 InsecurePasswordsPresentOnPage=Password fields present on an insecure (http://) page. This is a security risk that allows user login credentials to be stolen.
 InsecureFormActionPasswordsPresent=Password fields present in a form with an insecure (http://) form action. This is a security risk that allows user login credentials to be stolen.
 InsecurePasswordsPresentOnIframe=Password fields present on an insecure (http://) iframe. This is a security risk that allows user login credentials to be stolen.
 # LOCALIZATION NOTE: "%1$S" is the URI of the insecure mixed content resource
-LoadingMixedActiveContent2=Loading mixed (insecure) active content "%1$S" on a secure page
-LoadingMixedDisplayContent2=Loading mixed (insecure) display content "%1$S" on a secure page
 # LOCALIZATION NOTE: Do not translate "allow-scripts", "allow-same-origin", "sandbox" or "iframe"
-BothAllowScriptsAndSameOriginPresent=An iframe which has both allow-scripts and allow-same-origin for its sandbox attribute can remove its sandboxing.
 
 # LOCALIZATION NOTE: Do not translate "SSL 3.0".
-WeakProtocolVersionWarning=This site uses the protocol SSL 3.0 for encryption, which is deprecated and insecure.
 # LOCALIZATION NOTE: Do not translate "RC4".
-WeakCipherSuiteWarning=This site uses the cipher RC4 for encryption, which is deprecated and insecure.
--- a/editor/ui/chrome/composer/editingOverlay.dtd
+++ b/editor/ui/chrome/composer/editingOverlay.dtd
@@ -1,13 +1,13 @@
 <!-- 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/. -->
+<!-- File menu items -->
 
-<!-- File menu items -->
 <!ENTITY openFileCmd.label "Open File…">
 <!ENTITY openFileCmd.accesskey "O">
 <!ENTITY openFileCmd.key "O">
 <!ENTITY openRemoteCmd.label "Open Web Location…">
 <!ENTITY openRemoteCmd.accesskey "L">
 <!ENTITY openRemoteCmd.key "L">
 <!ENTITY fileRecentMenu.label "Recent Pages">
 <!ENTITY fileRecentMenu.accesskey "R">
@@ -19,20 +19,20 @@
 <!ENTITY saveAsChangeEncodingCmd.accesskey "E">
 <!ENTITY publishCmd.label "Publish">
 <!ENTITY publishCmd.accesskey "b">
 <!ENTITY publishCmd.key "S">
 <!ENTITY publishAsCmd.label "Publish As…">
 <!ENTITY publishAsCmd.accesskey "h">
 <!ENTITY fileRevert.label "Revert">
 <!ENTITY fileRevert.accesskey "t">
+<!-- Edit menu items -->
 
-<!-- Edit menu items -->
 <!ENTITY publishSettings.label "Publishing Site Settings…">
 <!ENTITY publishSettings.accesskey "b">
+<!-- Toolbar buttons/items -->
 
-<!-- Toolbar buttons/items -->
 <!ENTITY newToolbarCmd.label "New">
 <!ENTITY newToolbarCmd.tooltip "Create a new Composer page">
 <!ENTITY openToolbarCmd.label "Open">
 <!ENTITY openToolbarCmd.tooltip "Open a local file">
 <!ENTITY saveToolbarCmd.tooltip "Save file to a local location">
 <!ENTITY publishToolbarCmd.tooltip "Upload file to a remote location">
--- a/editor/ui/chrome/composer/editor.dtd
+++ b/editor/ui/chrome/composer/editor.dtd
@@ -1,53 +1,53 @@
 <!-- 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/. -->
-
 <!-- Window title -->
 <!-- LOCALIZATION NOTE  (editorWindow.titlemodifier): DONT_TRANSLATE -->
+
 <!ENTITY editorWindow.titlemodifier "Composer"> 
 <!ENTITY editorWindow.titlemodifiermenuseparator " - ">
+<!-- Menu items:  the . means that the menu item isn't implemented yet -->
+<!-- Toolbar-only items -->
 
-<!-- Menu items:  the . means that the menu item isn't implemented yet -->
 
-<!-- Toolbar-only items -->
 <!ENTITY compositionToolbar.tooltip "Composition Toolbar">
 <!ENTITY previewToolbarCmd.label "Browse">
 <!ENTITY previewToolbarCmd.tooltip "Load this page in the browser">
+<!-- File menu items -->
 
-<!-- File menu items -->
 <!ENTITY exportToTextCmd.label "Export to Text…">
 <!ENTITY exportToTextCmd.accesskey "T">
 <!ENTITY previewCmd.label "Browse Page">
 <!ENTITY previewCmd.accesskey "w">
 <!ENTITY sendPageCmd.label "Send Page…">
 <!ENTITY sendPageCmd.accesskey "d">
+<!-- View menu items -->
 
-<!-- View menu items -->
 <!ENTITY compositionToolbarCmd.label "Composition Toolbar">
 <!ENTITY compositionToolbarCmd.accesskey "C">
 <!ENTITY formattingToolbarCmd.label "Format Toolbar">
 <!ENTITY formattingToolbarCmd.accesskey "F">
 <!ENTITY editmodeToolbarCmd.label "Edit Mode Toolbar">
 <!ENTITY editmodeToolbarCmd.accesskey "E">
+<!-- Format menu items -->
 
-<!-- Format menu items -->
 <!ENTITY formatMenu.label "Format">
 <!ENTITY formatMenu.accesskey "o">
 <!ENTITY grid.label "Positioning grid">
 <!ENTITY grid.accesskey "t">
 <!ENTITY pageProperties.label "Page Title and Properties…">
 <!ENTITY pageProperties.accesskey "g">
+<!-- Tools menu items -->
 
-<!-- Tools menu items -->
 <!ENTITY validateCmd.label "Validate HTML">
 <!ENTITY validateCmd.accesskey "V">
+<!-- Display Mode toolbar and View menu items -->
 
-<!-- Display Mode toolbar and View menu items -->
 <!ENTITY NormalModeTab.label "Normal">
 <!ENTITY NormalMode.label "Normal Edit Mode">
 <!ENTITY NormalMode.accesskey "N">
 <!ENTITY NormalMode.tooltip "Show table borders and named anchors">
 <!ENTITY AllTagsModeTab.label "HTML Tags">
 <!ENTITY AllTagsMode.label "HTML Tags">
 <!ENTITY AllTagsMode.accesskey "a">
 <!ENTITY AllTagsMode.tooltip "Display icons for all HTML tags">
--- a/editor/ui/chrome/composer/editor.properties
+++ b/editor/ui/chrome/composer/editor.properties
@@ -1,15 +1,15 @@
 # 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: embedded "\n" represent HTML breaks (<br>)
 # Don't translate embedded "\n".
-# Don't translate strings like this: %variable%
+# Don't translate strings like this: %variable% 
 #  as they will be replaced using JavaScript
 #
 No=No
 Save=Save
 More=More
 Less=Less
 MoreProperties=More Properties
 FewerProperties=Fewer Properties
@@ -37,18 +37,18 @@ InputError=Error
 Alert=Alert
 CantEditFramesetMsg=Composer cannot edit HTML framesets, or pages with inline frames. For framesets, try editing the page for each frame separately. For pages with iframes, save a copy of the page and remove the <iframe> tag.
 CantEditMimeTypeMsg=This type of page can't be edited.
 CantEditDocumentMsg=This page can't be edited for an unknown reason.
 BeforeClosing=before closing
 BeforePreview=before viewing in the browser
 BeforeValidate=before validating the document
 # LOCALIZATION NOTE (SaveFilePrompt, PublishPrompt): Don't translate %title% and %reason% (this is the reason for asking user to close, such as "before closing")
-SaveFilePrompt=Save changes to "%title%" %reason%? 
-PublishPrompt=Save changes to "%title%" %reason%? 
+SaveFilePrompt=Save changes to "%title%" %reason%?\u0020
+PublishPrompt=Save changes to "%title%" %reason%?\u0020
 SaveFileFailed=Saving file failed!
 
 # Publishing error strings:
 # LOCALIZATION NOTE Don't translate %dir% or %file% in the Publishing error strings:
 FileNotFound=%file% not found.
 SubdirDoesNotExist=The subdirectory "%dir%" doesn't exist on this site or the filename "%file%" is already in use by another subdirectory.
 FilenameIsSubdir=The filename "%file%" is already in use by another subdirectory.
 ServerNotAvailable=The server is not available. Check your connection and try again later.
@@ -114,17 +114,17 @@ Percent=percent
 PercentOfCell=% of cell
 PercentOfWindow=% of window
 PercentOfTable=% of table
 #LOCALIZATION NOTE (untitledTitle): %S is the window #.  No plural handling needed.
 untitledTitle=untitled-%S
 untitledDefaultFilename=untitled
 ShowToolbar=Show Toolbar
 HideToolbar=Hide Toolbar
-ImapError=Unable to load image 
+ImapError=Unable to load image\u0020
 ImapCheck=\nPlease select a new location (URL) and try again.
 SaveToUseRelativeUrl=Relative URLs can only be used on pages which have been saved
 NoNamedAnchorsOrHeadings=(No named anchors or headings in this page)
 TextColor=Text Colour
 HighlightColor=Highlight Colour
 PageColor=Page Background Colour
 BlockColor=Block Background Colour
 TableColor=Table Background Colour
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -1,35 +1,35 @@
 <!-- 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/. -->
-
 <!-- Attn: Localization - some of the menus in this dialog directly affect mail also. -->
-
 <!-- File menu items -->
-<!ENTITY saveCmd.key "S">
+
 
+<!ENTITY saveCmd.key "S">
 <!-- Edit menu items -->
+
 <!ENTITY pasteNoFormatting.label "Paste Without Formatting">
 <!ENTITY pasteNoFormatting.accesskey "o">
 <!ENTITY pasteNoFormatting.key "V">
 <!ENTITY pasteAs.label "Paste As">
 <!ENTITY pasteAs.accesskey "a">
 <!ENTITY pasteAsQuotationCmd.label "Paste As Quotation">
 <!ENTITY pasteAsQuotationCmd.accesskey "Q">
 <!ENTITY pasteAsQuotationCmd.key "o">
 <!ENTITY findBarCmd.label "Find…">
 <!ENTITY findReplaceCmd.label "Find and Replace…">
 <!ENTITY enableInlineSpellChecker.label "Spellcheck As You Type">
 <!ENTITY enableInlineSpellChecker.accesskey "S">
 <!ENTITY checkSpellingCmd2.label "Check Spelling…">
 <!ENTITY checkSpellingCmd2.accesskey "h">
 <!ENTITY checkSpellingCmd2.key "p">
+<!-- Insert menu items -->
 
-<!-- Insert menu items -->
 <!ENTITY insertMenu.label "Insert">
 <!ENTITY insertMenu.accesskey "I">
 <!ENTITY insertLinkCmd.label "Link…">
 <!ENTITY insertLinkCmd.accesskey "L">
 <!ENTITY insertLinkCmd.key "L">
 <!ENTITY insertAnchorCmd.label "Named Anchor…">
 <!ENTITY insertAnchorCmd.accesskey "A">
 <!ENTITY insertImageCmd.label "Image…">
@@ -41,49 +41,51 @@
 <!ENTITY insertHTMLCmd.label "HTML…">
 <!ENTITY insertHTMLCmd.accesskey "H">
 <!ENTITY insertMathCmd.label "Mathematical Formula…">
 <!ENTITY insertMathCmd.accesskey "M">
 <!ENTITY insertCharsCmd.label "Characters and Symbols…">
 <!ENTITY insertCharsCmd.accesskey "C">
 <!ENTITY insertBreakAllCmd.label "Break Below Image(s)">
 <!ENTITY insertBreakAllCmd.accesskey "k">
+<!-- Used just in context popup. -->
 
-<!-- Used just in context popup. -->
 <!ENTITY createLinkCmd.label "Create Link…">
 <!ENTITY createLinkCmd.accesskey "k">
 <!ENTITY editLinkCmd.label "Edit Link in New Composer">
 <!ENTITY editLinkCmd.accesskey "i">
+<!-- Font Face SubMenu -->
 
-<!-- Font Face SubMenu -->
 <!ENTITY FontFaceSelect.tooltip "Choose a font">
 <!ENTITY fontfaceMenu.label "Font">
 <!ENTITY fontfaceMenu.accesskey "F">
 <!ENTITY fontVarWidth.label "Variable Width">
 <!ENTITY fontVarWidth.accesskey "V">
 <!ENTITY fontFixedWidth.label "Fixed Width">
 <!ENTITY fontFixedWidth.accesskey "x">
 <!ENTITY fontFixedWidth.key "T">
 <!ENTITY fontHelvetica.label "Helvetica, Arial">
 <!ENTITY fontHelvetica.accesskey "l">
 <!ENTITY fontTimes.label "Times">
 <!ENTITY fontTimes.accesskey "T">
 <!ENTITY fontCourier.label "Courier">
 <!ENTITY fontCourier.accesskey "C">
+<!-- Font Size SubMenu -->
 
-<!-- Font Size SubMenu -->
 <!ENTITY FontSizeSelect.tooltip "Choose a font size">
 <!ENTITY decreaseFontSize.label "Smaller">
 <!ENTITY decreaseFontSize.accesskey "r">
 <!ENTITY decrementFontSize.key "&lt;">
-<!ENTITY decrementFontSize.key2 ","> <!-- < is above this key on many keyboards -->
+<!-- < is above this key on many keyboards -->
+<!ENTITY decrementFontSize.key2 ","> 
 <!ENTITY increaseFontSize.label "Larger">
 <!ENTITY increaseFontSize.accesskey "g">
 <!ENTITY incrementFontSize.key "&gt;">
-<!ENTITY incrementFontSize.key2 "."> <!-- > is above this key on many keyboards -->
+<!-- > is above this key on many keyboards -->
+<!ENTITY incrementFontSize.key2 "."> 
 
 <!ENTITY fontSizeMenu.label "Size">
 <!ENTITY fontSizeMenu.accesskey "z">
 <!ENTITY size-xx-smallCmd.label "xx-small">
 <!ENTITY size-xx-smallCmd.accesskey "a">
 <!ENTITY size-x-smallCmd.label "x-small">
 <!ENTITY size-x-smallCmd.accesskey "m">
 <!ENTITY size-smallCmd.label "small">
@@ -91,18 +93,18 @@
 <!ENTITY size-mediumCmd.label "medium">
 <!ENTITY size-mediumCmd.accesskey "d">
 <!ENTITY size-largeCmd.label "large">
 <!ENTITY size-largeCmd.accesskey "l">
 <!ENTITY size-x-largeCmd.label "x-large">
 <!ENTITY size-x-largeCmd.accesskey "x">
 <!ENTITY size-xx-largeCmd.label "xx-large">
 <!ENTITY size-xx-largeCmd.accesskey "e">
+<!-- Font Style SubMenu -->
 
-<!-- Font Style SubMenu -->
 <!ENTITY fontStyleMenu.label "Text Style">
 <!ENTITY fontStyleMenu.accesskey "S">
 <!ENTITY styleBoldCmd.label "Bold">
 <!ENTITY styleBoldCmd.accesskey "B">
 <!ENTITY styleBoldCmd.key "B">
 <!ENTITY styleItalicCmd.label "Italic">
 <!ENTITY styleItalicCmd.accesskey "I">
 <!ENTITY styleItalicCmd.key "I">
@@ -160,18 +162,18 @@
 <!ENTITY heading5Cmd.label "Heading 5">
 <!ENTITY heading5Cmd.accesskey "5">
 <!ENTITY heading6Cmd.label "Heading 6">
 <!ENTITY heading6Cmd.accesskey "6">
 <!ENTITY paragraphAddressCmd.label "Address">
 <!ENTITY paragraphAddressCmd.accesskey "A">
 <!ENTITY paragraphPreformatCmd.label "Preformat">
 <!ENTITY paragraphPreformatCmd.accesskey "f">
+<!-- List menu items -->
 
-<!-- List menu items -->
 <!ENTITY formatlistMenu.label "List">
 <!ENTITY formatlistMenu.accesskey "L">
 <!ENTITY noneCmd.label "None">
 <!ENTITY noneCmd.accesskey "N">
 <!ENTITY listBulletCmd.label "Bulleted">
 <!ENTITY listBulletCmd.accesskey "B">
 <!ENTITY listNumberedCmd.label "Numbered">
 <!ENTITY listNumberedCmd.accesskey "m">
@@ -184,64 +186,64 @@
 
 <!ENTITY ParagraphSelect.tooltip "Choose a paragraph format">
 <!-- Shared in Paragraph, and Toolbar menulist -->
 <!ENTITY bodyTextCmd.label "Body Text">
 <!ENTITY bodyTextCmd.accesskey "T">
 <!-- isn't used in menu now, but may be added in future -->
 <!ENTITY advancedPropertiesCmd.label "Advanced Properties">
 <!ENTITY advancedPropertiesCmd.accesskey "v">
+<!-- Align menu items -->
 
-<!-- Align menu items -->
 <!ENTITY alignMenu.lab