Bug 1260015 - Update en-GB for Gecko 47 - Firefox part r=me
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 27 Mar 2016 17:00:23 +0100
changeset 596 a7dcc463add473e2f7b4f5bbf58c185fb36c3c9e
parent 595 b978b586904501eade26bcda447d76ec6b7465c8
child 597 9f4ae52968c896c3eb41dff844cb1323fa3b84ab
push id124
push useriann_cvs@blueyonder.co.uk
push dateSun, 27 Mar 2016 16:00:46 +0000
reviewersme
bugs1260015
Bug 1260015 - Update en-GB for Gecko 47 - Firefox part r=me
browser/chrome/browser/aboutCertError.dtd
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/feeds/subscribe.properties
browser/chrome/browser/loop/loop.properties
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
browser/chrome/browser/safebrowsing/report-phishing.dtd
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
devtools/client/aboutdebugging.dtd
devtools/client/aboutdebugging.properties
devtools/client/animationinspector.properties
devtools/client/jit-optimizations.properties
devtools/client/markers.properties
devtools/client/memory.properties
devtools/client/performance.dtd
devtools/client/performance.properties
devtools/client/responsive.properties
devtools/client/responsiveUI.properties
devtools/client/storage.dtd
devtools/client/storage.properties
devtools/client/tilt.properties
devtools/client/toolbox.dtd
devtools/client/webconsole.properties
devtools/client/webide.dtd
webapprt/webapprt/overrides/appstrings.properties
webapprt/webapprt/overrides/dom.properties
webapprt/webapprt/webapp.properties
--- a/browser/chrome/browser/aboutCertError.dtd
+++ b/browser/chrome/browser/aboutCertError.dtd
@@ -31,11 +31,8 @@ can tell &brandShortName; to start trust
 <b>Even if you trust the site, this error could mean that someone is 
 tampering with your connection.</b>">
 <!ENTITY certerror.expert.contentPara2 "Don't add an exception unless 
 you know there's a good reason why this site doesn't use trusted identification.">
 <!ENTITY certerror.addException.label "Add Exception…">
 <!ENTITY certerror.copyToClipboard.label "Copy text to clipboard">
 
 <!ENTITY errorReporting.automatic "Report errors like this to help Mozilla identify misconfigured sites">
-<!ENTITY errorReporting.sending "Sending report">
-<!ENTITY errorReporting.sent "Report sent">
-<!ENTITY errorReporting.tryAgain "Try again">
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -28,8 +28,13 @@
      preferences/options item on about:home on Windows -->
 <!ENTITY abouthome.preferencesButtonWin.label  "Options">
 <!-- LOCALIZATION NOTE (abouthome.preferencesButtonUnix.label): The label for the
      preferences/options item on about:home on Linux and OS X -->
 <!ENTITY abouthome.preferencesButtonUnix.label  "Preferences">
 <!ENTITY abouthome.addonsButton.label    "Add-ons">
 <!ENTITY abouthome.downloadsButton.label "Downloads">
 <!ENTITY abouthome.syncButton.label      "&syncBrand.shortName.label;">
+
+<!-- LOCALIZATION NOTE (abouthome.aboutMozilla.label): The (invisible) label for
+     the mozilla wordmark in the top-right corner that links to Mozilla's main
+     about page. -->
+<!ENTITY abouthome.aboutMozilla.label    "About Mozilla">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -158,17 +158,17 @@ These should match what Safari and other
 <!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 feedsMenu2.label "Subscribe to This Page">
 <!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">
 
 <!ENTITY backCmd.label                "Backwards">
@@ -252,16 +252,19 @@ These should match what Safari and other
 <!ENTITY addons.commandkey            "A">
 
 <!ENTITY webDeveloperMenu.label       "Web Developer">
 <!ENTITY webDeveloperMenu.accesskey   "W">
 
 <!ENTITY devToolsCmd.keycode          "VK_F12">
 <!ENTITY devToolsCmd.keytext          "F12">
 
+<!ENTITY devtoolsServiceWorkers.label      "Service Workers">
+<!ENTITY devtoolsServiceWorkers.accesskey  "k">
+
 <!ENTITY devtoolsConnect.label        "Connect…">
 <!ENTITY devtoolsConnect.accesskey    "e">
 
 <!ENTITY errorConsoleCmd.label        "Error Console">
 <!ENTITY errorConsoleCmd.accesskey    "C">
 
 <!ENTITY remoteWebConsoleCmd.label    "Remote Web Console">
 
@@ -416,16 +419,17 @@ These should match what Safari and other
 <!ENTITY appMenuRemoteTabs.tabsnotsyncing.label "Turn on tab synchronising to view a list of tabs from your other devices.">
 <!-- LOCALIZATION NOTE (appMenuRemoteTabs.noclients.label): This is shown
      when Sync is configured but this appears to be the only device attached to
      the account. We also show links to download Firefox for android/ios. -->
 <!ENTITY appMenuRemoteTabs.noclients.label "Sign in to Firefox from your other devices to view their tabs here.">
 <!ENTITY appMenuRemoteTabs.openprefs.label "Sync Preferences">
 <!ENTITY appMenuRemoteTabs.notsignedin.label "Sign in to view a list of tabs from your other devices.">
 <!ENTITY appMenuRemoteTabs.signin.label "Sign in to Sync">
+<!ENTITY appMenuRemoteTabs.sidebar.label "View Synced Tabs Sidebar">
 
 <!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">
 <!ENTITY customizeMenu.moveToToolbar.accesskey "o">
 <!-- LOCALIZATION NOTE (customizeMenu.moveToPanel.accesskey) can appear on the
@@ -522,16 +526,18 @@ These should match what Safari and other
 <!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 openLinkCmdInContainerTab.label "Open Link in New Container Tab">
+<!ENTITY openLinkCmdInContainerTab.accesskey "C">
 <!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 
@@ -736,17 +742,16 @@ you can use these alternative items. Oth
 <!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.connectionSecure "Secure Connection">
 <!ENTITY identity.connectionNotSecure "Connection is Not Secure">
 <!ENTITY identity.connectionFile "This page is stored on your computer.">
 <!ENTITY identity.connectionVerified1 "You are securely connected to this site, run by:">
 <!ENTITY identity.connectionInternal "This is a secure &brandShortName; page.">
 <!ENTITY identity.insecureLoginForms2 "Logins entered on this page could be compromised.">
@@ -770,28 +775,47 @@ you can use these alternative items. Oth
 <!ENTITY identity.description.activeLoaded2 "Information you share with this site could be viewed by others (like passwords, messages, credit cards, etc.).">
 
 <!ENTITY identity.enableMixedContentBlocking.label "Enable protection">
 <!ENTITY identity.enableMixedContentBlocking.accesskey "E">
 <!ENTITY identity.disableMixedContentBlocking.label "Disable protection for now">
 <!ENTITY identity.disableMixedContentBlocking.accesskey "D">
 <!ENTITY identity.learnMore "Learn More">
 
+<!ENTITY identity.removeCertException.label "Remove Exception">
+<!ENTITY identity.removeCertException.accesskey "R">
+
 <!ENTITY identity.moreInfoLinkText2 "More Information">
 
 <!ENTITY identity.permissions "Permissions">
 <!ENTITY identity.permissionsEmpty "You have not granted this site any special permissions.">
 
 <!-- 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">
 
 <!-- LOCALIZATION NOTE (syncTabsMenu3.label): This appears in the history menu and history panel -->
 <!ENTITY syncTabsMenu3.label     "Synced Tabs">
 
+<!ENTITY syncedTabs.sidebar.label              "Synced Tabs">
+<!ENTITY syncedTabs.sidebar.fetching.label     "Fetching Synced Tabs…">
+<!ENTITY syncedTabs.sidebar.noclients.label    "Sign in to Firefox from your other devices to view their tabs here.">
+<!ENTITY syncedTabs.sidebar.notsignedin.label  "Sign in to view a list of tabs from your other devices.">
+<!ENTITY syncedTabs.sidebar.notabs.label       "No open tabs">
+<!ENTITY syncedTabs.sidebar.openprefs.label    "Open &syncBrand.shortName.label; Preferences">
+<!-- LOCALIZATION NOTE (syncedTabs.sidebar.tabsnotsyncing.label): This is shown
+          when Sync is configured but syncing tabs is disabled. -->
+<!ENTITY syncedTabs.sidebar.tabsnotsyncing.label       "Turn on tab synchronisation to view a list of tabs from your other devices.">
+
+<!ENTITY syncedTabs.context.openTab.label                   "Open This Tab">
+<!ENTITY syncedTabs.context.openTab.accesskey               "O">
+<!ENTITY syncedTabs.context.bookmarkSingleTab.label         "Bookmark This Tab…">
+<!ENTITY syncedTabs.context.bookmarkSingleTab.accesskey     "B">
+
+
 <!ENTITY syncBrand.shortName.label    "Sync">
 
 <!ENTITY syncSignIn.label             "Sign In To &syncBrand.shortName.label;…">
 <!ENTITY syncSignIn.accesskey         "Y">
 <!ENTITY syncSyncNowItem.label        "Synchronise Now">
 <!ENTITY syncSyncNowItem.accesskey    "S">
 <!ENTITY syncReAuthItem.label         "Reconnect to &syncBrand.shortName.label;…">
 <!ENTITY syncReAuthItem.accesskey     "R">
@@ -818,17 +842,16 @@ you can use these alternative items. Oth
 <!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">
@@ -924,12 +947,8 @@ you can use these alternative items. Oth
 <!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 emeLearnMoreContextMenu.label            "Learn more about DRM…">
 <!ENTITY emeLearnMoreContextMenu.accesskey        "D">
-<!ENTITY emeNotificationsNotNow.label             "Not now">
-<!ENTITY emeNotificationsNotNow.accesskey         "N">
-<!ENTITY emeNotificationsDontAskAgain.label       "Don't ask me again">
-<!ENTITY emeNotificationsDontAskAgain.accesskey   "D">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -239,19 +239,16 @@ sanitizeEverythingWarning2=All history w
 # 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
 # LOCALIZATION NOTE (menuRestoreAllTabsSubview.label): like menuRestoreAllTabs.label,
 # but used in the history subview in the panel UI, so needs to mention these are *closed* tabs.
 menuRestoreAllTabsSubview.label=Restore Closed Tabs
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
@@ -327,18 +324,20 @@ offlineApps.manageUsageAccessKey=S
 
 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.unknown.tooltip=This web site does not supply identity information.
 
 trackingProtection.intro.title=How Tracking Protection works
-# LOCALIZATION NOTE (trackingProtection.intro.description): %S is brandShortName
-trackingProtection.intro.description=When the shield is visible, that means Firefox is actively blocking content that tracks you.
+# LOCALIZATION NOTE (trackingProtection.intro.description2):
+# %S is brandShortName. This string should match the one from Step 1 of the tour
+# when it starts from the button shown when a new private window is opened.
+trackingProtection.intro.description2=When you see the shield, %S is blocking some parts of the page that could track your browsing activity.
 # LOCALIZATION NOTE (trackingProtection.intro.step1of3): Indicates that the intro panel is step one of three in a tour.
 trackingProtection.intro.step1of3=1 of 3
 trackingProtection.intro.nextButton.label=Next
 
 trackingProtection.icon.activeTooltip=Tracking attempts blocked
 trackingProtection.icon.disabledTooltip=Tracking content detected
 
 # Edit Bookmark UI
@@ -399,19 +398,19 @@ pointerLock.title3=Would you like to all
 pointerLock.autoLock.title3=This site 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.deceptiveSite=Deceptive Site!
+safebrowsing.notADeceptiveSiteButton.label=This isn't a deceptive site…
+safebrowsing.notADeceptiveSiteButton.accessKey=D
 safebrowsing.reportedAttackSite=Reported Attack Site!
 safebrowsing.notAnAttackButton.label=This isn't an attack site…
 safebrowsing.notAnAttackButton.accessKey=a
 safebrowsing.reportedUnwantedSite=Reported Unwanted Software Site!
 
 # 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.
@@ -509,35 +508,16 @@ social.error.message=%1$S is unable to c
 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, getUserMedia.shareCameraAndAudioCapture.message,
 #                    getUserMedia.shareAudioCapture.message, getUserMedia.shareScreenAndAudioCapture.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?
@@ -680,24 +660,19 @@ emeNotifications.drmContentCDMNotSupport
 emeNotifications.drmContentCDMNotSupported.learnMoreLabel = Learn More
 
 # LOCALIZATION NOTE(emeNotifications.drmContentCDMInsufficientVersion.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S is brandShortName
 emeNotifications.drmContentCDMInsufficientVersion.message = %S is installing updates needed to play the audio or video on this page. Please try again later.
 
 # LOCALIZATION NOTE(emeNotifications.drmContentCDMInstalling.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S is brandShortName
 emeNotifications.drmContentCDMInstalling.message = %S is installing components needed to play the audio or video on this page. Please try again later.
 
-# 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
-emeNotifications.drmContentCDMNotSupported.64bit.message = The audio or video on this page requires DRM software that this 64-bit build of %1$S does not support. %2$S
 # 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
 emeNotifications.drmContentCDMNotSupported.unsupportedOS.message = The audio or video on this page requires DRM software that %1$S does not support on %2$S. %3$S
 
-emeNotifications.optionsButton.label = Options
-emeNotifications.optionsButton.accesskey = O
-
 emeNotifications.unknownDRMSoftware = Unknown
 
 # 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
@@ -709,16 +684,19 @@ flashHang.helpButton.accesskey = L
 
 # 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 (customizeMode.tabTitle): %S is brandShortName
+customizeMode.tabTitle = Customise %S
+
 # 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
@@ -800,9 +778,8 @@ revokeOverride.accesskey = D
 certErrorDetailsHSTS.label = HTTP Strict Transport Security: %S
 certErrorDetailsKeyPinning.label = HTTP Public Key Pinning: %S
 certErrorDetailsCertChain.label = Certificate chain:
 
 # LOCALIZATION NOTE (tabgroups.migration.anonGroup):
 # %S is the group number/ID
 tabgroups.migration.anonGroup = Group %S
 tabgroups.migration.tabGroupBookmarkFolderName = Bookmarked Tab Groups
-
--- a/browser/chrome/browser/feeds/subscribe.properties
+++ b/browser/chrome/browser/feeds/subscribe.properties
@@ -44,8 +44,9 @@ feedSubscriptionVideoPodcast1=This is a 
 feedSubscriptionFeed2=You can subscribe to this feed to receive updates when this content changes.
 feedSubscriptionAudioPodcast2=You can subscribe to this podcast to receive updates when this content changes.
 feedSubscriptionVideoPodcast2=You can subscribe to this video podcast to receive updates when this content changes.
 
 # Protocol Handling
 # "Add %appName (%appDomain) as an application for %protocolType links?"
 addProtocolHandler=Add %S (%S) as an application for %S links?
 addProtocolHandlerAddButton=Add Application
+addProtocolHandlerAddButtonAccesskey=A
--- a/browser/chrome/browser/loop/loop.properties
+++ b/browser/chrome/browser/loop/loop.properties
@@ -2,267 +2,8 @@
 # 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
-clientSuperShortname=Hello
-
-## LOCALIZATION_NOTE(loopMenuItem_label): Label of the menu item that is placed
-## inside the browser 'Tools' menu. Use the unicode ellipsis char, \u2026, or
-## use "..." if \u2026 doesn't suit traditions in your locale.
-loopMenuItem_label=Start a Conversation…
-loopMenuItem_accesskey=t
-
-## LOCALIZATION_NOTE(sign_in_again_title_line_one, sign_in_again_title_line_two2):
-## These are displayed together at the top of the panel when a user is needed to
-## sign-in again. The emphesis is on the first line to get the user to sign-in again,
-## and this is displayed in slightly larger font. Please arrange as necessary for
-## your locale.
-## {{clientShortname2}} will be replaced by the brand name for either string.
-sign_in_again_title_line_one=Please sign in again
-sign_in_again_title_line_two2=to continue using {{clientShortname2}}
-sign_in_again_button=Sign In
-## LOCALIZATION_NOTE(sign_in_again_use_as_guest_button2): {{clientSuperShortname}}
-## will be replaced by the super short brandname.
-sign_in_again_use_as_guest_button2=Use {{clientSuperShortname}} as a Guest
-
-panel_browse_with_friend_button=Browse this page with a friend
-panel_stop_sharing_tabs_button=Stop sharing your tabs
-
-## LOCALIZATION_NOTE(first_time_experience_subheading2): Message inviting the
-## user to create his or her first conversation.
-first_time_experience_subheading2=Click the Hello button to browse Web pages with a friend.
-
-## LOCALIZATION_NOTE(first_time_experience_content): Message describing
-## ways to use Hello project.
-first_time_experience_content=Use it to plan together, work together, laugh together.
-first_time_experience_button_label2=See how it works
-
-
-
-## LOCALIZATION NOTE (invite_header_text2) will be removed when bug 1230058 is implemented.
-invite_header_text2=Invite a friend to join you
-invite_header_text_bold=Invite someone to browse this page with you!
-invite_header_text3=It takes two to use Firefox Hello, so send a friend a link to browse the Web with you!
-## LOCALIZATION_NOTE(invite_copy_link_button, invite_copied_link_button,
-## invite_email_link_button, invite_facebook_button2): These labels appear under
-## an iconic button for the invite view.
-invite_copy_link_button=Copy Link
-invite_copied_link_button=Copied!
-invite_email_link_button=Email Link
-invite_facebook_button3=Facebook
-invite_your_link=Your link:
-
-# Status text
-display_name_guest=Guest
-
-# Error bars
-## LOCALIZATION NOTE(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.
-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.
-retry_button=Retry
-
-share_email_subject7=Your invitation to browse the Web together
-## LOCALIZATION NOTE (share_email_body7): In this item, don't translate the
-## part between {{..}} and leave the \n\n part alone
-share_email_body7=A friend is waiting for you on Firefox Hello. Click the link to connect and browse the Web together: {{callUrl}}
-## LOCALIZATION NOTE (share_email_body_context3): In this item, don't translate
-## the part between {{..}} and leave the \n\n part alone.
-share_email_body_context3=A friend is waiting for you on Firefox Hello. Click the link to connect and browse {{title}} together: {{callUrl}}
-## LOCALIZATION NOTE (share_email_footer2): Common footer content for both email types
-share_email_footer2=\n\n____________\nFirefox Hello lets you browse the Web with your friends. Use it when you want to get things done: plan together, work together, laugh together. Learn more at http://www.firefox.com/hello
-## LOCALIZATION NOTE (share_tweeet): In this item, don't translate the part
-## between {{..}}. Please keep the text below 117 characters to make sure it fits
-## in a tweet.
-share_tweet=Join me for a video conversation on {{clientShortname2}}!
-
-share_add_service_button=Add a Service
-
-## LOCALIZATION NOTE (copy_link_menuitem, email_link_menuitem, delete_conversation_menuitem):
-## These menu items are displayed from a panel's context menu for a conversation.
-copy_link_menuitem=Copy Link
-email_link_menuitem=Email Link
-delete_conversation_menuitem2=Delete
-
-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
-settings_menu_item_turnnotificationson=Turn Notifications On
-settings_menu_item_turnnotificationsoff=Turn Notifications Off
-settings_menu_item_feedback=Submit Feedback
-settings_menu_button_tooltip=Settings
-
-
-# Conversation Window Strings
-
-initiate_call_button_label2=Ready to start your conversation?
-incoming_call_title2=Conversation Request
-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_title2=Disable video
-unmute_local_video_button_title2=Enable video
-self_view_hidden_message=Self-view hidden but still being sent; resize window to show
-
-
-## LOCALIZATION NOTE (call_with_contact_title): The title displayed
-## when calling a contact. Don't translate the part between {{..}} because
-## this will be replaced by the contact's name.
-call_with_contact_title=Conversation with {{contactName}}
-
-# Outgoing conversation
-
-outgoing_call_title=Start conversation?
-initiate_audio_video_call_button2=Start
-initiate_audio_video_call_tooltip2=Start a video conversation
-initiate_audio_call_button2=Voice conversation
-
-peer_ended_conversation2=The person you were calling has ended the conversation.
-conversation_has_ended=Your conversation has ended.
-restart_call=Rejoin
-
-generic_failure_message=We're having technical difficulties…
-generic_failure_no_reason2=Would you like to try again?
-## LOCALIZATION NOTE (tos_failure_message): Don't translate {{clientShortname2}}
-## as this will be replaced by the shortname.
-tos_failure_message={{clientShortname}} is not available in your country.
-
-## LOCALIZATION NOTE (contact_offline_title): Title which is displayed when the
-## contact is offline.
-contact_offline_title=This person is not online
-## LOCALIZATION NOTE (call_timeout_notification_text): Title which is displayed
-## when the call didn't go through.
-call_timeout_notification_text=Your call did not go through.
-
-## LOCALIZATION NOTE (retry_call_button, cancel_button):
-## These buttons are displayed when a call has failed.
-retry_call_button=Retry
-cancel_button=Cancel
-rejoin_button=Rejoin Conversation
-
-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.
-no_media_failure_message=No camera or microphone found.
-ice_failure_message=Connection failed. Your firewall may be blocking calls.
-
-## 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_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=
-
-## LOCALIZATION_NOTE (feedback_rejoin_button): Displayed on the feedback form after
-## a signed-in to signed-in user call.
-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
-feedback_window_heading=How was your conversation?
-feedback_request_button=Leave Feedback
-
-help_label=Help
-tour_label=Tour
-
-rooms_leave_button_label=Leave
-## LOCALIZATION NOTE (rooms_list_recently_browsed) will be removed when bug 1230058 is implemented.
-## String is in all caps for emphasis reasons, it is a heading. Proceed as appropriate for locale.
-rooms_list_recently_browsed=RECENTLY BROWSED
-rooms_list_recently_browsed2=Recently browsed
-## LOCALIZATION NOTE (rooms_list_currently_browsing) will be removed when bug 1230058 is implemented.
-## String is in all caps for emphasis reasons, it is a heading. Proceed as appropriate for locale.
-rooms_list_currently_browsing=CURRENTLY BROWSING
-rooms_list_currently_browsing2=Currently browsing
-rooms_change_failed_label=Conversation cannot be updated
-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
-room_name_untitled_page=Untitled Page
-
-## LOCALIZATION NOTE (door_hanger_return, door_hanger_prompt_name, door_hanger_button): Dialog message on leaving conversation
-door_hanger_return=See you later! You can return to this shared session at any time through the Hello panel.
-door_hanger_prompt_name=Would you like to give it a name that's easier to remember? Current name:
-door_hanger_button=OK
-
-# Infobar strings
-
-infobar_screenshare_browser_message2=You are sharing your tabs. Any tab you click on can be seen by your friends
-infobar_screenshare_paused_browser_message=Tab sharing is paused
-infobar_button_gotit_label=Got it!
-infobar_button_gotit_accesskey=G
-infobar_button_pause_label=Pause
-infobar_button_pause_accesskey=P
-infobar_button_restart_label=Restart
-infobar_button_restart_accesskey=e
-infobar_button_resume_label=Resume
-infobar_button_resume_accesskey=R
-infobar_button_stop_label=Stop
-infobar_button_stop_accesskey=S
-infobar_menuitem_dontshowagain_label=Don't show this again
-infobar_menuitem_dontshowagain_accesskey=D
-
-# Context in conversation strings
-
-## LOCALIZATION NOTE(no_conversations_message_heading2): Title shown when user
-## has no conversations available.
-no_conversations_message_heading2=No conversations yet.
-## LOCALIZATION NOTE(no_conversations_start_message2): Subheading inviting the
-## user to start a new conversation.
-no_conversations_start_message2=Start a new one!
-
-# LOCALIZATION NOTE (context_inroom_header): this string is displayed in the
-# conversation window when the user edits context. It is a header to the edit
-# section.
-context_inroom_header=Let's Talk About…
-# LOCALIZATION NOTE (context_inroom_label2): this string is followed by the
-# title and domain of the website you are having a conversation about, displayed on a
-# separate line. If this structure doesn't work for your locale, you might want
-# to consider this as a stand-alone title. See example screenshot:
-# https://bug1115342.bugzilla.mozilla.org/attachment.cgi?id=8563677
-context_edit_name_placeholder=Conversation Name
-context_edit_comments_placeholder=Comments
-context_cancel_label=Cancel
-context_done_label=Done
-conversation_settings_menu_edit_context=Edit Context
-conversation_settings_menu_hide_context=Hide Context
-
-
-# Text chat strings
-
-chat_textbox_placeholder=Type here…
-
-# E10s not supported strings
-
-e10s_not_supported_button_label=Launch New Window
-e10s_not_supported_subheading={{brandShortname}} doesn't work in a multi-process window.
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -31,34 +31,32 @@ notificationspermissionstext4=Control wh
 notificationspermissionstitle=Notification Permissions
 invalidURI=Please enter a valid hostname
 invalidURITitle=Invalid Hostname Entered
 
 #### Block List Manager
 
 blockliststext=You can choose which list Firefox will use to block Web elements that may track your browsing activity.
 blockliststitle=Block Lists
-blockliststitle=Block Lists
 # LOCALIZATION NOTE (mozNameTemplate): This template constructs the name of the
 # block list in the block lists dialog. It combines the list name and
 # description.
 #   e.g. mozNameTemplate : "Standard (Recommended). This list does a pretty good job."
 #   %1$S = list name (fooName), %2$S = list descriptive text (fooDesc)
 mozNameTemplate=%1$S %2$S
 # LOCALIZATION NOTE (mozstdName, etc.): These labels appear in the tracking
 # protection block lists dialog, mozNameTemplate is used to create the final
 # string. Note that in the future these two strings (name, desc) could be
 # displayed on two different lines.
 mozstdName=Disconnect.me basic protection (Recommended).
 mozstdDesc=Allows some trackers so web sites function properly.
 mozfullName=Disconnect.me strict protection.
 mozfullDesc=Blocks known trackers. Some sites may not function properly.
-# LOCALIZATION NOTE (blocklistChangeRequiresRestart, restartTitle): %S = brandShortName
+# LOCALIZATION NOTE (blocklistChangeRequiresRestart): %S = brandShortName
 blocklistChangeRequiresRestart=%S must restart to change block lists.
-shouldRestartTitle=Restart %S
 
 #### Master Password
 
 pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
 pw_change_failed_title=Password Change Failed
 
 #### Fonts
 
@@ -126,16 +124,17 @@ cookiesFiltered=The following cookies ma
 # 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
+defaultUserContextLabel=None
 
 #### 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
@@ -167,12 +166,15 @@ syncUnlink.title=Do you want to unlink y
 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.
 shouldRestartTitle=Restart %S
 
+restartNow=Restart Now
+restartLater=Restart Later
+
 #### e10S
 # LOCALIZATION NOTE (e10sFeedbackAfterRestart): This message appears when the user
 # unchecks "Enable multi-process" on the "General" preferences tab.
 e10sFeedbackAfterRestart=After restart, a tab will open to input.mozilla.org where you can provide us feedback about your e10s experience.
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -86,23 +86,23 @@ both, to better adapt this sentence to t
 <!ENTITY signedOut.caption            "Take your Web with you">
 <!ENTITY signedOut.description        "Synchronise your bookmarks, history, tabs, passwords, add-ons, and preferences across all your devices.">
 <!ENTITY signedOut.accountBox.title   "Connect with a &syncBrand.fxAccount.label;">
 <!ENTITY signedOut.accountBox.create  "Create Account">
 <!ENTITY signedOut.accountBox.signin  "Sign In">
 
 <!ENTITY signedIn.engines.label       "Synchronise across all devices">
 
-<!-- LOCALIZATION NOTE (mobilePromo2.*): the following strings will be used to
+<!-- LOCALIZATION NOTE (mobilePromo3.*): the following strings will be used to
      create a single sentence with active links.
-     The resulting sentence in English is: "Sync to your mobile device.
-     Download Firefox for Android or Firefox for iOS." -->
+     The resulting sentence in English is: "Download Firefox for
+     Android or iOS to sync with your mobile device." -->
 
-<!ENTITY mobilePromo2.start            "Sync to your mobile device. Download ">
-<!-- LOCALIZATION NOTE (mobilePromo2.androidLink): This is a link title that links to https://www.mozilla.org/firefox/android/ -->
-<!ENTITY mobilePromo2.androidLink      "Firefox for Android">
+<!ENTITY mobilePromo3.start            "Download Firefox for ">
+<!-- LOCALIZATION NOTE (mobilePromo3.androidLink): This is a link title that links to https://www.mozilla.org/firefox/android/ -->
+<!ENTITY mobilePromo3.androidLink      "Android">
 
-<!-- LOCALIZATION NOTE (mobilePromo2.iOSBefore): This is text displayed between mobilePromo2.androidLink and mobilePromo2.iosLink -->
-<!ENTITY mobilePromo2.iOSBefore         " or ">
-<!-- LOCALIZATION NOTE (mobilePromo2.iOSLink): This is a link title that links to https://www.mozilla.org/firefox/ios/ -->
-<!ENTITY mobilePromo2.iOSLink          "Firefox for iOS">
+<!-- LOCALIZATION NOTE (mobilePromo3.iOSBefore): This is text displayed between mobilePromo3.androidLink and mobilePromo3.iosLink -->
+<!ENTITY mobilePromo3.iOSBefore         " or ">
+<!-- LOCALIZATION NOTE (mobilePromo3.iOSLink): This is a link title that links to https://www.mozilla.org/firefox/ios/ -->
+<!ENTITY mobilePromo3.iOSLink          "iOS">
 
-<!ENTITY mobilePromo2.end              ".">
+<!ENTITY mobilePromo3.end              " to synchronise with your mobile device.">
--- a/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ b/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
@@ -1,28 +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/. -->
 
 <!ENTITY safeb.palm.accept.label "Get me out of here!">
 <!ENTITY safeb.palm.decline.label "Ignore this warning">
-<!ENTITY safeb.palm.notforgery.label2 "This isn't a web forgery…">
+<!-- Localization note (safeb.palm.notdeceptive.label) - Label of the Help menu item. -->
+<!ENTITY safeb.palm.notdeceptive.label "This isn't a deceptive site…">
 <!ENTITY safeb.palm.reportPage.label "Why was this page blocked?">
 <!ENTITY safeb.palm.whyForbidden.label "Why was this page blocked?">
 
 <!ENTITY safeb.blocked.malwarePage.title "Reported Attack Page!">
 <!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.malwarePage.shortDesc "This web page at <span id='malware_sitename'/> has been reported as an attack page and has been blocked based on your security preferences.">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.</p><p>Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.</p>">
 
 <!ENTITY safeb.blocked.unwantedPage.title "Reported Unwanted Software Page!">
 <!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="unwanted_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.unwantedPage.shortDesc "This web page at <span id='unwanted_sitename'/> has been reported to contain unwanted software and has been blocked based on your security preferences.">
 <!ENTITY safeb.blocked.unwantedPage.longDesc "<p>Unwanted software pages try to install software that can be deceptive and affect your system in unexpected ways.</p>">
 
-<!ENTITY safeb.blocked.phishingPage.title "Reported Web Forgery!">
-<!-- Localization note (safeb.blocked.phishing.shortDesc) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
-<!ENTITY safeb.blocked.phishingPage.shortDesc "This web page at <span id='phishing_sitename'/> has been reported as a web forgery and has been blocked based on your security preferences.">
-<!ENTITY safeb.blocked.phishingPage.longDesc "<p>Web forgeries are designed to trick you into revealing personal or financial information by imitating sources you may trust.</p><p>Entering any information on this web page may result in identity theft or other fraud.</p>">
+<!ENTITY safeb.blocked.phishingPage.title2 "Deceptive Site!">
+<!-- Localization note (safeb.blocked.phishingPage.shortDesc2) - Please don't translate the contents of the <span id="phishing_sitename"/> tag. It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.phishingPage.shortDesc2 "This web page at <span id='phishing_sitename'/> has been reported as a deceptive site and has been blocked based on your security preferences.">
+<!ENTITY safeb.blocked.phishingPage.longDesc2 "<p>Deceptive sites are designed to trick you into doing something dangerous, like installing software, or revealing your personal information, like passwords, phone numbers or credit cards.</p><p>Entering any information on this web page may result in identity theft or other fraud.</p>">
 
 <!ENTITY safeb.blocked.forbiddenPage.title2 "Blocked Site">
 <!-- Localization note (safeb.blocked.forbiddenPage.shortDesc2) - Please don't translate the contents of the <span id="forbidden_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.forbiddenPage.shortDesc2 "The Web page at <span id='forbidden_sitename'/> has been blocked by your admin profile.">
--- a/browser/chrome/browser/safebrowsing/report-phishing.dtd
+++ b/browser/chrome/browser/safebrowsing/report-phishing.dtd
@@ -1,6 +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 reportPhishSiteMenu.title2         "Report Web Forgery…">
-<!ENTITY reportPhishSiteMenu.accesskey      "F">
+<!ENTITY reportDeceptiveSiteMenu.title      "Report deceptive site…">
+<!ENTITY reportDeceptiveSiteMenu.accesskey  "d">
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -26,17 +26,17 @@ 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.
 unwantedBlocked=The site at %S has been reported as serving unwanted software 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.
+deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
 forbiddenBlocked=The site at %S has been blocked by your browser configuration.
 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".
 sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
 ## LOCALIZATION NOTE (weakCryptoUsed) - Do not translate "%S".
 weakCryptoUsed=The owner of %S has configured their web site improperly. To protect your information from being stolen, Firefox has not connected to this web site
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -155,37 +155,16 @@ be temporary, and you can try again late
     moments.</li> 
   <li>If you are unable to load any pages, check your computer's network 
     connection.</li> 
   <li>If your computer or network is protected by a firewall or proxy, make sure
     that &brandShortName; is permitted to access the Web.</li> 
 </ul>
 ">
 
-<!ENTITY malwareBlocked.title "Suspected Attack Site!">
-<!ENTITY malwareBlocked.longDesc "
-<p>Attack sites try to install programs that steal private information, use your computer to attack others, or damage your system.</p> 
-<p>Web site owners who believe their site has been reported as an attack site in error may <a href='http://www.stopbadware.org/home/reviewinfo' >request a review</a>.</p>
-">
-
-<!ENTITY unwantedBlocked.title "Suspected Unwanted Software Site!">
-<!ENTITY unwantedBlocked.longDesc "
-<p>Unwanted software pages try to install software that can be deceptive and affect your system in unexpected ways.</p>
-">
-
-<!ENTITY phishingBlocked.title "Suspected Web Forgery!">
-<!ENTITY phishingBlocked.longDesc "
-<p>Entering any personal information on this page may result in identity theft or other fraud.</p> 
-<p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>
-">
-
-<!ENTITY forbiddenBlocked.title "Forbidden Site">
-<!ENTITY forbiddenBlocked.longDesc "<p>&brandShortName; prevented this page from loading because it is configured to block it.</p>
-">
-
 <!ENTITY cspBlocked.title "Blocked by Content Security Policy">
 <!ENTITY cspBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 
 <!ENTITY corruptedContentError.title "Corrupted Content Error">
 <!ENTITY corruptedContentError.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">
 
 
 <!ENTITY securityOverride.linkText "Or you can add an exception…">
@@ -201,19 +180,16 @@ functionality specific to firefox. -->
 <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.automatic2 "Report errors like this to help Mozilla identify and block malicious sites">
 <!ENTITY errorReporting.learnMore "Learn more…">
-<!ENTITY errorReporting.sending "Sending report">
-<!ENTITY errorReporting.sent "Report sent">
-<!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 sslv3Used.title "Unable to Connect Securely">
 <!-- LOCALIZATION NOTE (sslv3Used.longDesc2) - Do not translate
      "SSL_ERROR_UNSUPPORTED_VERSION". -->
 <!ENTITY sslv3Used.longDesc2 "Advanced info: SSL_ERROR_UNSUPPORTED_VERSION">
--- a/devtools/client/aboutdebugging.dtd
+++ b/devtools/client/aboutdebugging.dtd
@@ -1,10 +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 aboutDebugging.title                      "about:debugging">
-<!ENTITY aboutDebugging.addons                     "Add-ons">
-<!ENTITY aboutDebugging.addonDebugging.label       "Enable add-on debugging">
-<!ENTITY aboutDebugging.addonDebugging.tooltip     "Turning this on will allow you to debug add-ons and various other parts of the browser chrome">
-<!ENTITY aboutDebugging.loadTemporaryAddon         "Load Temporary Add-on">
-<!ENTITY aboutDebugging.workers                    "Workers">
+<!ENTITY aboutDebugging.fullTitle    "Debugging with Firefox Developer Tools">
--- a/devtools/client/aboutdebugging.properties
+++ b/devtools/client/aboutdebugging.properties
@@ -1,13 +1,23 @@
 # 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/.
 
 debug = Debug
+push = Push
+start = Start
 
+addons = Add-ons
+addonDebugging.label = Enable add-on debugging
+addonDebugging.tooltip = Turning this on will allow you to debug add-ons and various other parts of the browser chrome
+addonDebugging.moreInfo = more info
+loadTemporaryAddon = Load Temporary Add-on
 extensions = Extensions
 selectAddonFromFile = Select Add-on Directory or XPI File
+
+workers = Workers
 serviceWorkers = Service Workers
 sharedWorkers = Shared Workers
 otherWorkers = Other Workers
 
 nothing = Nothing yet.
+
--- a/devtools/client/animationinspector.properties
+++ b/devtools/client/animationinspector.properties
@@ -64,16 +64,37 @@ player.timeLabel=%Ss
 # animation runs (1x being the default, 2x being twice as fast).
 player.playbackRateLabel=%Sx
 
 # LOCALIZATION NOTE (player.runningOnCompositorTooltip):
 # This string is displayed as a tooltip for the icon that indicates that the
 # animation is running on the compositor thread.
 player.runningOnCompositorTooltip=This animation is running on compositor thread
 
+# LOCALIZATION NOTE (timeline.rateSelectorTooltip):
+# This string is displayed in the timeline toolbar, as the tooltip of the
+# drop-down list that can be used to change the rate at which the animations
+# run.
+timeline.rateSelectorTooltip=Set the animations playback rates
+
+# LOCALIZATION NOTE (timeline.pauseResumeButtonTooltip):
+# This string is displayed in the timeline toolbar, as the tooltip of the
+# pause/resume button that can be used to pause or resume the animations
+timeline.pausedButtonTooltip=Resume the animations
+
+# LOCALIZATION NOTE (timeline.pauseResumeButtonTooltip):
+# This string is displayed in the timeline toolbar, as the tooltip of the
+# pause/resume button that can be used to pause or resume the animations
+timeline.resumedButtonTooltip=Pause the animations
+
+# LOCALIZATION NOTE (timeline.rewindButtonTooltip):
+# This string is displayed in the timeline toolbar, as the tooltip of the
+# rewind button that can be used to rewind the animations
+timeline.rewindButtonTooltip=Rewind the animations
+
 # LOCALIZATION NOTE (timeline.timeGraduationLabel):
 # This string is displayed at the top of the animation panel, next to each time
 # graduation, to indicate what duration (in milliseconds) this graduation
 # corresponds to.
 timeline.timeGraduationLabel=%Sms
 
 # LOCALIZATION NOTE (timeline.cssanimation.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
@@ -82,14 +103,25 @@ timeline.timeGraduationLabel=%Sms
 timeline.cssanimation.nameLabel=%S - CSS Animation
 
 # LOCALIZATION NOTE (timeline.csstransition.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a CSS Transition in the timeline UI.
 # %S will be replaced by the name of the transition at run-time.
 timeline.csstransition.nameLabel=%S - CSS Transition
 
+# LOCALIZATION NOTE (timeline.scriptanimation.nameLabel):
+# This string is displayed in a tooltip of the animation panel that is shown
+# when hovering over the name of a script-generated animation in the timeline UI.
+# %S will be replaced by the name of the animation at run-time.
+timeline.scriptanimation.nameLabel=%S - Script Animation
+
+# LOCALIZATION NOTE (timeline.scriptanimation.unnamedLabel):
+# This string is displayed in a tooltip of the animation panel that is shown
+# when hovering over an unnamed script-generated animation in the timeline UI.
+timeline.scriptanimation.unnamedLabel=Script Animation
+
 # LOCALIZATION NOTE (timeline.unknown.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of an unknown animation type in the timeline UI.
 # This can happen if devtools couldn't figure out the type of the animation.
 # %S will be replaced by the name of the transition at run-time.
 timeline.unknown.nameLabel=%S
new file mode 100644
--- /dev/null
+++ b/devtools/client/jit-optimizations.properties
@@ -0,0 +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/.
+
+# LOCALIZATION NOTE These strings are used within the JIT tools
+# in the Performance Tools which is available from the Web Developer
+# sub-menu -> 'Performance' 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 (jit.title):
+# This string is displayed in the header of the JIT Optimizations view.
+jit.title=JIT Optimisations
+
+# LOCALIZATION NOTE (jit.optimizationFailure):
+# This string is displayed in a tooltip when no JIT optimizations were detected.
+jit.optimizationFailure=Optimisation failed
+
+# LOCALIZATION NOTE (jit.samples):
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This string is displayed for the unit representing the number of times a
+# frame is sampled.
+# "#1" represents the number of samples
+# example: 30 samples
+jit.samples=#1 sample;#1 samples
+
+# LOCALIZATION NOTE (jit.types):
+# This string is displayed for the group of Ion Types in the optimizations view.
+jit.types=Types
+
+# LOCALIZATION NOTE (jit.attempts):
+# This string is displayed for the group of optimization attempts in the optimizations view.
+jit.attempts=Attempts
--- a/devtools/client/markers.properties
+++ b/devtools/client/markers.properties
@@ -27,16 +27,17 @@ marker.label.consoleTime=Console
 marker.label.garbageCollection2=Garbage Collection
 marker.label.garbageCollection.incremental=Incremental GC
 marker.label.garbageCollection.nonIncremental=Non-incremental GC
 marker.label.minorGC=Minor GC
 marker.label.cycleCollection=Cycle Collection
 marker.label.cycleCollection.forgetSkippable=CC Graph Reduction
 marker.label.timestamp=Timestamp
 marker.label.worker=Worker
+marker.label.messagePort=MessagePort
 marker.label.unknown=Unknown
 
 # LOCALIZATION NOTE (marker.label.javascript.*):
 # These strings are displayed as JavaScript markers that have special
 # reasons that can be translated.
 marker.label.javascript.scriptElement=Script Tag
 marker.label.javascript.promiseCallback=Promise Callback
 marker.label.javascript.promiseInit=Promise Init
@@ -77,16 +78,19 @@ marker.field.restyleHint=Restyle Hint:
 marker.field.causeName=Cause:
 # General "type" for a marker (Cycle Collection, Garbage Collection)
 marker.field.type=Type:
 # The type of operation performed by a Worker.
 marker.worker.serializeDataOffMainThread=Serialise data in Worker
 marker.worker.serializeDataOnMainThread=Serialise data on the main thread
 marker.worker.deserializeDataOffMainThread=Deserialise data in Worker
 marker.worker.deserializeDataOnMainThread=Deserialise data on the main thread
+# The type of operation performed by a MessagePort
+marker.messagePort.serializeData=Serialise data
+marker.messagePort.deserializeData=Deserialise data
 
 # Strings used in the waterfall sidebar as values.
 marker.value.unknownFrame=<unknown location>
 marker.value.DOMEventTargetPhase=Target
 marker.value.DOMEventCapturingPhase=Capture
 marker.value.DOMEventBubblingPhase=Bubbling
 
 # LOCALIZATION NOTE (marker.gcreason.label.*):
--- a/devtools/client/memory.properties
+++ b/devtools/client/memory.properties
@@ -43,68 +43,121 @@ snapshot.io.filter=Firefox Heap Snapshot
 # megabytes) in a snapshot. %S represents the value, rounded to 2 decimal
 # points.
 aggregate.mb=%S MB
 
 # LOCALIZATION NOTE (snapshot-title.loading): The title for a snapshot before
 # it has a creation time to display.
 snapshot-title.loading=Processing…
 
-# LOCALIZATION NOTE (checkbox.invertTree): The label describing the boolean
-# checkbox whether or not to invert the tree.
-checkbox.invertTree=Invert tree
-
 # LOCALIZATION NOTE (checkbox.recordAllocationStacks): The label describing the
 # boolean checkbox whether or not to record allocation stacks.
 checkbox.recordAllocationStacks=Record allocation stacks
 
-# LOCALIZATION NOTE (toolbar.breakdownBy): The label describing the select menu
-# options of the breakdown options.
-toolbar.breakdownBy=Group by:
+# LOCALIZATION NOTE (checkbox.recordAllocationStacks.tooltip): The tooltip for
+# the label describing the boolean checkbox whether or not to record allocation
+# stacks.
+checkbox.recordAllocationStacks.tooltip=Toggle the recording of allocation stacks. Subsequent heap snapshots will be able to label and group objects created when allocation stack recording is active by their allocation stack. Recording allocation stacks has a performance overhead.
+
+# LOCALIZATION NOTE (toolbar.displayBy): The label describing the select menu
+# options of the display options.
+toolbar.displayBy=Group by:
+
+# LOCALIZATION NOTE (toolbar.displayBy.tooltip): The tooltip for the label
+# describing the select menu options of the display options.
+toolbar.displayBy.tooltip=Change how objects are grouped
+
+# LOCALIZATION NOTE (censusDisplays.coarseType.tooltip): The tooltip for the
+# "coarse type" display option.
+censusDisplays.coarseType.tooltip=Group items by their type
+
+# LOCALIZATION NOTE (censusDisplays.allocationStack.tooltip): The tooltip for
+# the "allocation stack" display option.
+censusDisplays.allocationStack.tooltip=Group items by the JavaScript stack recorded when the object was allocated
+
+# LOCALIZATION NOTE (censusDisplays.invertedAllocationStack.tooltip): The
+# tooltip for the "inverted allocation stack" display option.
+censusDisplays.invertedAllocationStack.tooltip=Group items by the inverted JavaScript call stack recorded when the object was created
+
+# LOCALIZATION NOTE (censusDisplays.objectClass.tooltip): The tooltip for the
+# "object class" display option.
+censusDisplays.objectClass.tooltip=Group items by their JavaScript Object [[class]] name
+
+# LOCALIZATION NOTE (censusDisplays.internalType.tooltip): The tooltip for the
+# "internal type" display option.
+censusDisplays.internalType.tooltip=Group items by their internal C++ type
 
 # LOCALIZATION NOTE (toolbar.labelBy): The label describing the select menu
 # options of the label options.
 toolbar.labelBy=Label by:
 
+# LOCALIZATION NOTE (toolbar.labelBy): The tooltip for the label describing the
+# select menu options of the label options.
+toolbar.labelBy.tooltip=Change how objects are labeled
+
+# LOCALIZATION NOTE (dominatorTreeDisplays.coarseType.tooltip): The tooltip for
+# the "coarse type" dominator tree display option.
+dominatorTreeDisplays.coarseType.tooltip=Label objects by the broad categories they fit in
+
+# LOCALIZATION NOTE (dominatorTreeDisplays.allocationStack.tooltip): The
+# tooltip for the "allocation stack" dominator tree display option.
+dominatorTreeDisplays.allocationStack.tooltip=Label objects by the JavaScript stack recorded when it was allocated
+
+# LOCALIZATION NOTE (dominatorTreeDisplays.internalType.tooltip): The
+# tooltip for the "internal type" dominator tree display option.
+dominatorTreeDisplays.internalType.tooltip=Label objects by their internal C++ type name
+
 # LOCALIZATION NOTE (toolbar.view): The label for the view selector in the
 # toolbar.
 toolbar.view=View:
 
+# LOCALIZATION NOTE (toolbar.view.tooltip): The tooltip for the label for the
+# view selector in the toolbar.
+toolbar.view.tooltip=Change the view of the heap snapshot
+
 # LOCALIZATION NOTE (toolbar.view.census): The label for the census view option
 # in the toolbar.
 toolbar.view.census=Aggregate
 
+# LOCALIZATION NOTE (toolbar.view.census.tooltip): The tooltip for the label for
+# the census view option in the toolbar.
+toolbar.view.census.tooltip=View a summary of the heap snapshot's contents by aggregating objects into groups
+
 # LOCALIZATION NOTE (toolbar.view.dominators): The label for the dominators view
 # option in the toolbar.
 toolbar.view.dominators=Dominators
 
+# LOCALIZATION NOTE (toolbar.view.dominators.tooltip): The tooltip for the label
+# for the dominators view option in the toolbar.
+toolbar.view.dominators.tooltip=View the dominator tree and surface the largest structures in the heap snapshot
+
 # LOCALIZATION NOTE (take-snapshot): The label describing the button that
 # initiates taking a snapshot, either as the main label, or a tooltip.
 take-snapshot=Take snapshot
 
 # LOCALIZATION NOTE (import-snapshot): The label describing the button that
 # initiates importing a snapshot.
 import-snapshot=Import…
 
-# LOCALIZATION NOTE (clear-snapshots): The label describing the button that clears
-# existing snapshot.
-clear-snapshots=Clear
-
-# LOCALIZATION NOTE (diff-snapshots): The label for the button that initiates
-# selecting two snapshots to diff with each other.
-diff-snapshots=+/-
+# LOCALIZATION NOTE (clear-snapshots.tooltip): The tooltip for the button that
+# deletes existing snapshot.
+clear-snapshots.tooltip=Delete all snapshots
 
 # LOCALIZATION NOTE (diff-snapshots.tooltip): The tooltip for the button that
 # initiates selecting two snapshots to diff with each other.
 diff-snapshots.tooltip=Compare snapshots
 
 # LOCALIZATION NOTE (filter.placeholder): The placeholder text used for the
 # memory tool's filter search box.
 filter.placeholder=Filter
 
+# LOCALIZATION NOTE (filter.tooltip): The tooltip text used for the memory
+# tool's filter search box.
+filter.tooltip=Filter the contents of the heap snapshot
+
 # LOCALIZATION NOTE (tree-item.load-more): The label for the links to fetch the
 # lazily loaded sub trees in the dominator tree view.
 tree-item.load-more=Load more…
 
 # LOCALIZATION NOTE (tree-item.rootlist): The label for the root of the
 # dominator tree.
 tree-item.rootlist=GC Roots
 
@@ -247,26 +300,74 @@ snapshot.state.error=Error
 # users when selecting a breakdown by "allocation stack" but no allocation
 # stacks were recorded in the heap snapshot.
 heapview.noAllocationStacks=No allocation stacks found. Record allocation stacks before taking a heap snapshot.
 
 # LOCALIZATION NOTE (heapview.field.retainedSize): The name of the column in the
 # dominator tree view for retained byte sizes.
 heapview.field.retainedSize=Retained Size (Bytes)
 
+# LOCALIZATION NOTE (heapview.field.retainedSize.tooltip): The tooltip for the
+# column header in the dominator tree view for retained byte sizes.
+heapview.field.retainedSize.tooltip=The sum of the size of the object itself, and the sizes of all the other objects kept alive by it
+
 # LOCALIZATION NOTE (heapview.field.shallowSize): The name of the column in the
 # dominator tree view for shallow byte sizes.
 heapview.field.shallowSize=Shallow Size (Bytes)
 
+# LOCALIZATION NOTE (heapview.field.shallowSize.tooltip): The tooltip for the
+# column header in the dominator tree view for shallow byte sizes.
+heapview.field.shallowSize.tooltip=The size of the object itself
+
+# LOCALIZATION NOTE (dominatortree.field.label): The name of the column in the
+# dominator tree for an object's label.
+dominatortree.field.label=Label
+
+# LOCALIZATION NOTE (dominatortree.field.label.tooltip): The tooltip for the column
+# header in the dominator tree view for an object's label.
+dominatortree.field.label.tooltip=The label for an object in the heap
+
 # LOCALIZATION NOTE (heapview.field.bytes): The name of the column in the heap view for bytes.
 heapview.field.bytes=Bytes
 
-# LOCALIZATION NOTE (heapview.field.count): The name of the column in the heap view for count.
+# LOCALIZATION NOTE (heapview.field.bytes.tooltip): The tooltip for the column
+# header in the heap view for bytes.
+heapview.field.bytes.tooltip=The number of bytes consumed by this group, excluding subgroups
+
+# LOCALIZATION NOTE (heapview.field.count): The name of the column in the heap
+# view for count.
 heapview.field.count=Count
 
-# LOCALIZATION NOTE (heapview.field.totalbytes): The name of the column in the heap view for total bytes.
+# LOCALIZATION NOTE (heapview.field.count.tooltip): The tooltip for the column
+# header in the heap view for count.
+heapview.field.count.tooltip=The number of reachable objects in this group, excluding subgroups
+
+# LOCALIZATION NOTE (heapview.field.totalbytes): The name of the column in the
+# heap view for total bytes.
 heapview.field.totalbytes=Total Bytes
 
-# LOCALIZATION NOTE (heapview.field.totalcount): The name of the column in the heap view for total count.
+# LOCALIZATION NOTE (heapview.field.totalbytes.tooltip): The tooltip for the
+# column header in the heap view for total bytes.
+heapview.field.totalbytes.tooltip=The number of bytes consumed by this group, including subgroups
+
+# LOCALIZATION NOTE (heapview.field.totalcount): The name of the column in the
+# heap view for total count.
 heapview.field.totalcount=Total Count
 
-# LOCALIZATION NOTE (heapview.field.name): The name of the column in the heap view for name.
+# LOCALIZATION NOTE (heapview.field.totalcount.tooltip): The tooltip for the
+# column header in the heap view for total count.
+heapview.field.totalcount.tooltip=The number of reachable objects in this group, including subgroups
+
+# LOCALIZATION NOTE (heapview.field.name): The name of the column in the heap
+# view for name.
 heapview.field.name=Name
+
+# LOCALIZATION NOTE (heapview.field.name.tooltip): The tooltip for the column
+# header in the heap view for name.
+heapview.field.name.tooltip=The name of this group
+
+# LOCALIZATION NOTE (shortest-paths.header): The header label for the shortest
+# paths pane.
+shortest-paths.header=Retaining Paths from GC Roots
+
+# LOCALIZATION NOTE (shortest-paths.select-node): The message displayed in the
+# shortest paths pane when a node is not yet selected.
+shortest-paths.select-node=Select a node to view its retaining paths
--- a/devtools/client/performance.dtd
+++ b/devtools/client/performance.dtd
@@ -85,18 +85,18 @@
 <!ENTITY performanceUI.table.totalAlloc.tooltip       "The total number of Object allocations sampled at this location and in callees.">
 <!ENTITY performanceUI.table.selfAlloc                "Self Sampled Allocations">
 <!ENTITY performanceUI.table.selfAlloc.tooltip        "The number of Object allocations sampled at this location.">
 
 <!-- LOCALIZATION NOTE (performanceUI.toolbar.filter.tooltiptext): This string
   -  is displayed next to the filter button-->
 <!ENTITY performanceUI.options.filter.tooltiptext "Select what data to display in the timeline">
 
-<!-- LOCALIZATION NOTE (performanceUI.options.tooltiptext): This is the tooltip
-  -  for the options button. -->
+<!-- LOCALIZATION NOTE (performanceUI.options.gear.tooltiptext): This is the
+  -  tooltip for the options button. -->
 <!ENTITY performanceUI.options.gear.tooltiptext "Configure performance preferences.">
 
 <!-- LOCALIZATION NOTE (performanceUI.invertTree): This is the label shown next to
   -  a checkbox that inverts and un-inverts the profiler's call tree. -->
 <!ENTITY performanceUI.invertTree             "Invert Call Tree">
 <!ENTITY performanceUI.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 (performanceUI.invertFlameGraph): This is the label shown next to
@@ -105,16 +105,22 @@
 <!ENTITY performanceUI.invertFlameGraph.tooltiptext "Inverting the flame chart displays the profiled call paths starting from the youngest frames and expanding out to the older frames.">
 
 <!-- LOCALIZATION NOTE (performanceUI.showPlatformData): This is the
   -  label for the checkbox that toggles whether or not Gecko platform data
   -  is displayed in the profiler. -->
 <!ENTITY performanceUI.showPlatformData             "Show Gecko Platform Data">
 <!ENTITY performanceUI.showPlatformData.tooltiptext "Showing platform data enables the JavaScript Profiler reports to include Gecko platform symbols.">
 
+<!-- LOCALIZATION NOTE (performanceUI.showJITOptimizations): This string
+  -  is displayed next to a checkbox determining whether or not JIT optimization data
+  -  should be displayed. -->
+<!ENTITY performanceUI.showJITOptimizations             "Show JIT Optimisations">
+<!ENTITY performanceUI.showJITOptimizations.tooltiptext "Show JIT optimisation data sampled in each JavaScript frame.">
+
 <!-- LOCALIZATION NOTE (performanceUI.flattenTreeRecursion): This is the
   -  label for the checkbox that toggles the flattening of tree recursion in inspected
   -  functions in the profiler. -->
 <!ENTITY performanceUI.flattenTreeRecursion             "Flatten Tree Recursion">
 <!ENTITY performanceUI.flattenTreeRecursion.tooltiptext "Flatten recursion when inspecting functions.">
 
 <!-- LOCALIZATION NOTE (performanceUI.enableMemory): This string
   -  is displayed next to a checkbox determining whether or not memory
@@ -129,26 +135,16 @@
 <!ENTITY performanceUI.enableAllocations.tooltiptext "Record Object allocations while profiling.">
 
 <!-- LOCALIZATION NOTE (performanceUI.enableFramerate): This string
   -  is displayed next to a checkbox determining whether or not framerate
   -  is recorded. -->
 <!ENTITY performanceUI.enableFramerate             "Record Framerate">
 <!ENTITY performanceUI.enableFramerate.tooltiptext "Record framerate while profiling.">
 
-<!-- LOCALIZATION NOTE (performanceUI.enableJITOptimizations): This string
-  -  is displayed next to a checkbox determining whether or not JIT optimization data
-  -  should be recorded. -->
-<!ENTITY performanceUI.enableJITOptimizations             "Record JIT Optimisations">
-<!ENTITY performanceUI.enableJITOptimizations.tooltiptext "Record JIT optimisation data sampled in each JavaScript frame.">
-
-<!-- LOCALIZATION NOTE (performanceUI.JITOptimizationsTitle): This string
-  -  is displayed as the title of the JIT Optimizations panel. -->
-<!ENTITY performanceUI.JITOptimizationsTitle "JIT Optimisations">
-
 <!-- LOCALIZATION NOTE (performanceUI.console.recordingNoticeStart/recordingNoticeEnd):
   -  This string is displayed when a recording is selected that started via console.profile.
   -  Wraps the command used to start, like "Currently recording via console.profile("label")" -->
 <!ENTITY performanceUI.console.recordingNoticeStart "Currently recording via">
 <!ENTITY performanceUI.console.recordingNoticeEnd   "">
 
 <!-- LOCALIZATION NOTE (performanceUI.console.stopCommandStart/stopCommandEnd):
   -  This string is displayed when a recording is selected that started via console.profile.
--- a/devtools/client/performance.properties
+++ b/devtools/client/performance.properties
@@ -136,32 +136,16 @@ recordingsList.saveDialogTitle=Save recording…
 # 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
 
-# LOCALIZATION NOTE (jit.optimizationFailure):
-# This string is displayed in a tooltip when no JIT optimizations were detected.
-jit.optimizationFailure=Optimisation failed
-
-# LOCALIZATION NOTE (jit.samples):
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# This string is displayed for the unit representing the number of times a
-# frame is sampled.
-# "#1" represents the number of samples
-# example: 30 samples
-jit.samples=#1 sample;#1 samples
-
-# LOCALIZATION NOTE (jit.empty):
-# This string is displayed when there are no JIT optimizations to display.
-jit.empty=No JIT optimisations recorded for this frame.
-
 # 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
new file mode 100644
--- /dev/null
+++ b/devtools/client/responsive.properties
@@ -0,0 +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/.
+
+# LOCALIZATION NOTE These strings are used inside the Responsive Design Mode,
+# available from the Web Developer sub-menu -> 'Responsive Design Mode'.
+#
+# 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  (responsive.title): the title displayed in the global
+# toolbar
+responsive.title=Responsive Design Mode
+
+# LOCALIZATION NOTE (responsive.exit): tooltip text of the exit button.
+responsive.exit=Close Responsive Design Mode
--- a/devtools/client/responsiveUI.properties
+++ b/devtools/client/responsiveUI.properties
@@ -13,16 +13,19 @@
 
 
 # LOCALIZATION NOTE  (responsiveUI.rotate2): tooltip of the rotate button.
 responsiveUI.rotate2=Rotate
 
 # LOCALIZATION NOTE  (responsiveUI.screenshot): tooltip of the screenshot button.
 responsiveUI.screenshot=Screenshot
 
+# LOCALIZATION NOTE  (responsiveUI.userAgentPlaceholder): placeholder for the user agent input.
+responsiveUI.userAgentPlaceholder=Custom User Agent
+
 # LOCALIZATION NOTE (responsiveUI.screenshotGeneratedFilename): The auto generated filename.
 # The first argument (%1$S) is the date string in yyyy-mm-dd format and the second
 # argument (%2$S) is the time string in HH.MM.SS format.
 responsiveUI.screenshotGeneratedFilename=Screen Shot %1$S at %2$S
 
 # LOCALIZATION NOTE  (responsiveUI.touch): tooltip of the touch button.
 responsiveUI.touch=Simulate touch events (page reload might be needed)
 
new file mode 100644
--- /dev/null
+++ b/devtools/client/storage.dtd
@@ -0,0 +1,8 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : This file contains the Storage Inspector strings. -->
+
+<!-- LOCALIZATION NOTE : Placeholder for the searchbox that allows you to filter the table items. -->
+<!ENTITY searchBox.placeholder         "Filter items">
--- a/devtools/client/storage.properties
+++ b/devtools/client/storage.properties
@@ -49,16 +49,17 @@ table.emptyText=No data present for sele
 
 # LOCALIZATION NOTE (tree.labels.*):
 # These strings are the labels for Storage type groups present in the Storage
 # Tree, like cookies, local storage etc.
 tree.labels.cookies=Cookies
 tree.labels.localStorage=Local Storage
 tree.labels.sessionStorage=Session Storage
 tree.labels.indexedDB=Indexed DB
+tree.labels.Cache=Cache Storage
 
 # LOCALIZATION NOTE (table.headers.*.*):
 # These strings are the header names of the columns in the Storage Table for
 # each type of storage available through the Storage Tree to the side.
 table.headers.cookies.name=Name
 table.headers.cookies.path=Path
 table.headers.cookies.host=Domain
 table.headers.cookies.expires=Expires on
@@ -79,16 +80,19 @@ table.headers.cookies.isSecure=isSecure
 table.headers.cookies.isDomain=isDomain
 
 table.headers.localStorage.name=Key
 table.headers.localStorage.value=Value
 
 table.headers.sessionStorage.name=Key
 table.headers.sessionStorage.value=Value
 
+table.headers.Cache.url=URL
+table.headers.Cache.status=Status
+
 table.headers.indexedDB.name=Key
 table.headers.indexedDB.db=Database Name
 table.headers.indexedDB.objectStore=Object Store Name
 table.headers.indexedDB.value=Value
 table.headers.indexedDB.origin=Origin
 table.headers.indexedDB.version=Version
 table.headers.indexedDB.objectStores=Object Stores
 table.headers.indexedDB.keyPath=Key
deleted file mode 100644
--- a/devtools/client/tilt.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE These strings are used inside the Tilt Inspector
-# which is available from the Web Developer sub-menu -> 'Tilt'.
-#
-# 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 (initTilt.error): Tilt requires WebGL capabilities, which
-# are not available on every hardware. This message is displayed as an modal
-# popup window when initialization fails because of unsupported hardware.
-initTilt.error = Could not initialise Tilt, please check the\ntroubleshooting information available at http://get.webgl.org/troubleshooting
-
-# LOCALIZATION NOTE (initWebGL.error): Tilt requires WebGL capabilities, which
-# are not available on every hardware. This message is displayed in the console
-# when initialization fails because of unsupported hardware.
-initWebGL.error = Could not initialise the WebGL context, your hardware or drivers may not support it.
-
-# LOCALIZATION NOTE (linkProgram.error): This error happens when the WebGL
-# context can't link two compiled shader programs together. It is displayed in
-# the Error Console.
-linkProgram.error = Could not initialise shader program: %S
-
-# LOCALIZATION NOTE (compileShader.source.error): This error is caused when the
-# source (uri or path) of a shader is not the expected one. It is displayed in
-# the Error Console.
-compileShader.source.error = Bad shader source type (expected String).
-
-# LOCALIATION NOTE (compileShader.type.error): There are two types of shader
-# programs - vertex and fragment. At a shader initialization, if none of these
-# two types is specified, this compile-time error is shown. It is displayed in
-# the Error Console.
-compileShader.type.error = Wrong shader type specified for: %S
-
-# LOCALIZATION NOTE (compileShader.compile.error): If the shader source and
-# type are correctly specified, there may be syntax errors in the shader code.
-# If this is the case, this compile-time error is shown. It is displayed in
-# the Error Console.
-compileShader.compile.error = Shader compile status:\n%S
-
-# LOCALIZATION NOTE (compileShader.source.error): This error is caused when the
-# source (canvas or image) of a texture is not as expected. It is displayed in
-# the Error Console.
-initTexture.source.error = Bad texture source type (expected Image).
--- a/devtools/client/toolbox.dtd
+++ b/devtools/client/toolbox.dtd
@@ -36,16 +36,22 @@ values from browser.dtd.  -->
 <!ENTITY toolboxToggleMinimize.key     "U">
 
 <!ENTITY toolboxToggle.key             "d">
 <!-- 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 (toolboxNoAutoHideButton): This is the label for
+  -  the button to force the popups/panels to stay visible on blur.
+  -  This is only visible in the browser toolbox as it is meant for
+  -  addon developers and Firefox contributors. -->
+<!ENTITY toolboxNoAutoHideTooltip      "Disable popup auto hide">
+
 <!-- LOCALIZATION NOTE (browserToolboxErrorMessage): This is the label
   -  shown next to error details when the Browser Toolbox is unable to open. -->
 <!ENTITY browserToolboxErrorMessage          "Error opening Browser Toolbox:">
 
 <!-- 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">
 
@@ -54,16 +60,22 @@ values from browser.dtd.  -->
 <!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.collapseAttrs.label): This is the label
+  -  for the checkbox option to enable collapse attributes in the Inspector
+  -  panel. -->
+<!ENTITY options.collapseAttrs.label "Truncate DOM attributes">
+<!ENTITY options.collapseAttrs.tooltip "Truncate long attributes in the inspector">
+
 <!-- 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. -->
--- a/devtools/client/webconsole.properties
+++ b/devtools/client/webconsole.properties
@@ -93,21 +93,16 @@ reflow.messageLinkText=function %1$S, %2
 # anonymous. Test console.trace() in the webconsole.
 stacktrace.anonymousFunction=<anonymous>
 
 # LOCALIZATION NOTE (stacktrace.asyncStack): this string is used to
 # indicate that a given stack frame has an async parent.
 # %S is the "Async Cause" of the frame.
 stacktrace.asyncStack=(Async: %S)
 
-# LOCALIZATION NOTE (unknownLocation): this string is used to
-# display messages with sources that have an unknown location, eg. from
-# console.trace() calls.
-unknownLocation=<unknown>
-
 # LOCALIZATION NOTE (timerStarted): this string is used to display the result
 # of the console.time() call. Parameters: %S is the name of the timer.
 timerStarted=%S: timer started
 
 # LOCALIZATION NOTE (timeEnd): this string is used to display the result of
 # the console.timeEnd() call. Parameters: %1$S is the name of the timer, %2$S
 # is the number of milliseconds.
 timeEnd=%1$S: %2$Sms
--- a/devtools/client/webide.dtd
+++ b/devtools/client/webide.dtd
@@ -70,19 +70,16 @@
 <!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">
-<!-- reload WebIDE and devtools from local checkout -->
-<!-- this binding is with accel+alt, whereas all others are just accel -->
-<!ENTITY key_reload_devtools "R">
 
 <!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">
@@ -194,16 +191,17 @@
      devices that can't scan a QR code. -->
 <!ENTITY wifi_auth_no_scanner "No QR scanner prompt?">
 <!-- LOCALIZATION NOTE (wifi_auth_yes_scanner): Link text to assist users with
      devices that can scan a QR code. -->
 <!ENTITY wifi_auth_yes_scanner "Have a QR scanner prompt?">
 <!-- LOCALIZATION NOTE (wifi_auth_token_request): Instructions requesting the
      user to transfer authentication info by transferring a token. -->
 <!ENTITY wifi_auth_token_request "If your other device asks for a token instead of scanning a QR code, please copy the value below to the other device:">
+<!ENTITY wifi_auth_qr_size_note "If the QR code appears too small for the connection to be successfully established, try zooming or enlarging the window.">
 
 <!-- Logs panel -->
 <!ENTITY logs_title "Pre-packaging Command Logs">
 
 <!-- Simulator Options -->
 <!ENTITY simulator_title "Simulator Options">
 <!ENTITY simulator_remove "Delete Simulator">
 <!ENTITY simulator_reset "Restore Defaults">
--- a/webapprt/webapprt/overrides/appstrings.properties
+++ b/webapprt/webapprt/overrides/appstrings.properties
@@ -25,15 +25,15 @@ unsafeContentType=The application cannot
 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.
 unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
-phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
+deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
 forbiddenBlocked=The site at %S has been blocked by your browser configuration.
 cspBlocked=This application tried to access a resource that has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The application cannot continue loading because an error in the data transmission was detected.
 remoteXUL=This application tried to use an unsupported technology that is no longer available.
 sslv3Used=This application cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
 weakCryptoUsed=The owner of %S has configured their web site improperly. To protect your information from being stolen, this application has not connected to this web site.
--- a/webapprt/webapprt/overrides/dom.properties
+++ b/webapprt/webapprt/overrides/dom.properties
@@ -59,29 +59,29 @@ CreateAttributeWarning=Use of document.c
 CreateAttributeNSWarning=Use of document.createAttributeNS() is deprecated. Use element.setAttributeNS() instead.
 OwnerElementWarning=Use of attributes' ownerElement attribute is deprecated.
 NodeValueWarning=Use of attributes' nodeValue attribute is deprecated. Use value instead.
 TextContentWarning=Use of attributes' textContent attribute is deprecated. Use value instead.
 EnablePrivilegeWarning=Use of enablePrivilege is deprecated.  Please use code that runs with the system principal (e.g. an extension) instead.
 nsIJSONDecodeDeprecatedWarning=nsIJSON.decode is deprecated.  Please use JSON.parse instead.
 nsIJSONEncodeDeprecatedWarning=nsIJSON.encode is deprecated.  Please use JSON.stringify instead.
 nsIDOMWindowInternalWarning=Use of nsIDOMWindowInternal is deprecated. Use nsIDOMWindow instead.
-FullScreenDeniedDisabled=Request for full-screen was denied because full-screen API is disabled by user preference.
-FullScreenDeniedFocusedPlugin=Request for full-screen was denied because a windowed plugin is focused.
-FullScreenDeniedHidden=Request for full-screen was denied because the document is no longer visible.
-FullScreenDeniedContainerNotAllowed=Request for full-screen was denied because at least one of the document's containing element is not iframe or does not have an "allowfullscreen" attribute.
-FullScreenDeniedNotInputDriven=Request for full-screen was denied because Element.mozRequestFullScreen() was not called from inside a short running user-generated event handler.
-FullScreenDeniedNotInDocument=Request for full-screen was denied because requesting element is no longer in its document.
-FullScreenDeniedMovedDocument=Request for full-screen was denied because requesting element has moved document.
-FullScreenDeniedLostWindow=Request for full-screen was denied because we no longer have a window.
-FullScreenDeniedSubDocFullScreen=Request for full-screen was denied because a subdocument of the document requesting full-screen is already full-screen.
-FullScreenDeniedNotDescendant=Request for full-screen was denied because requesting element is not a descendant of the current full-screen element.
-FullScreenDeniedNotFocusedTab=Request for full-screen was denied because requesting element is not in the currently focused tab.
-RemovedFullScreenElement=Exited full-screen because full-screen element was removed from document.
-FocusedWindowedPluginWhileFullScreen=Exited full-screen because windowed plugin was focused.
+FullscreenDeniedDisabled=Request for fullscreen was denied because Fullscreen API is disabled by user preference.
+FullscreenDeniedFocusedPlugin=Request for fullscreen was denied because a windowed plugin is focused.
+FullscreenDeniedHidden=Request for fullscreen was denied because the document is no longer visible.
+FullscreenDeniedContainerNotAllowed=Request for fullscreen was denied because at least one of the document's containing elements is not an iframe or does not have an "allowfullscreen" attribute.
+FullscreenDeniedNotInputDriven=Request for fullscreen was denied because Element.requestFullscreen() was not called from inside a short running user-generated event handler.
+FullscreenDeniedNotInDocument=Request for fullscreen was denied because requesting element is no longer in its document.
+FullscreenDeniedMovedDocument=Request for fullscreen was denied because requesting element has moved document.
+FullscreenDeniedLostWindow=Request for fullscreen was denied because we no longer have a window.
+FullscreenDeniedSubDocFullscreen=Request for fullscreen was denied because a subdocument of the document requesting fullscreen is already fullscreen.
+FullscreenDeniedNotDescendant=Request for fullscreen was denied because requesting element is not a descendant of the current fullscreen element.
+FullscreenDeniedNotFocusedTab=Request for fullscreen was denied because requesting element is not in the currently focused tab.
+RemovedFullscreenElement=Exited fullscreen because fullscreen element was removed from document.
+FocusedWindowedPluginWhileFullscreen=Exited fullscreen because windowed plugin was focused.
 HTMLSyncXHRWarning=HTML parsing in XMLHttpRequest is not supported in the synchronous mode.
 InvalidRedirectChannelWarning=Unable to redirect to %S because the channel doesn't implement nsIWritablePropertyBag2.
 ResponseTypeSyncXHRWarning=Use of XMLHttpRequest's responseType attribute is no longer supported in the synchronous mode in window context.
 WithCredentialsSyncXHRWarning=Use of XMLHttpRequest's withCredentials attribute is no longer supported in the synchronous mode in window context.
 TimeoutSyncXHRWarning=Use of XMLHttpRequest's timeout attribute is not supported in the synchronous mode in window context.
 JSONCharsetWarning=An attempt was made to declare a non-UTF-8 encoding for JSON retrieved using XMLHttpRequest. Only UTF-8 is supported for decoding JSON.
 # LOCALIZATION NOTE: Do not translate AudioBufferSourceNode
 MediaBufferSourceNodeResampleOutOfMemory=Insufficient memory to resample the AudioBufferSourceNode for playback.
@@ -114,16 +114,17 @@ NoExposedPropsWarning=Exposing chrome JS
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=Use of Mutation Events is deprecated. Use MutationObserver instead.
 # LOCALIZATION NOTE: Do not translate "Components"
 ComponentsWarning=The Components object is deprecated. It will soon be removed.
 PluginHangUITitle=Warning: Unresponsive plugin
 PluginHangUIMessage=%S may be busy, or it may have stopped responding. You can stop the plugin now, or you can continue to see if the plugin will complete.
 PluginHangUIWaitButton=Continue
 PluginHangUIStopButton=Stop plugin
+PrefixedFullscreenAPIWarning=Prefixed Fullscreen API is deprecated. Please use unprefixed API for fullscreen. For more help https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API
 # LOCALIZATION NOTE: Do not translate "mozHidden", "mozVisibilityState", "hidden", or "visibilityState"
 PrefixedVisibilityAPIWarning='mozHidden' and 'mozVisibilityState' are deprecated. Please use the unprefixed 'hidden' and 'visibilityState' instead.
 # LOCALIZATION NOTE: Do not translate "NodeIterator" or "detach()".
 NodeIteratorDetachWarning=Calling detach() on a NodeIterator no longer has an effect.
 # LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
 LenientThisWarning=Ignoring get or set of property that has [LenientThis] because the "this" object is incorrect.
 # LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
 GetWindowWithOuterIdWarning=Use of nsIDOMWindowUtils.getOuterWindowWithId() is deprecated.  Instead, use the nsIWindowMediator method of the same name.
--- a/webapprt/webapprt/webapp.properties
+++ b/webapprt/webapprt/webapp.properties
@@ -46,8 +46,13 @@ webapps.uninstall.title=Uninstall %S
 # LOCALIZATION NOTE (webapps.uninstall.description): %S will be replaced with the
 # name of the webapp being uninstalled.
 webapps.uninstall.description=Do you want to uninstall %S?
 webapps.uninstall.uninstall=Uninstall App
 webapps.uninstall.dontuninstall=Don't Uninstall
 
 paymentDialog.title=Payment
 paymentDialog.message=Which payment provider do you want to use?
+
+disable-warning.title=Warning: App Will Be Disabled
+disable-warning.description=This app will be disabled after you upgrade to a newer version of Firefox, which no longer includes a feature to run web apps separately from the browser.
+disable-warning.info.label=More information…
+disable-warning.show-again=Show this warning the next time I start this app