Backed out changeset f2b7c868c0a7 (bug 1562006) for browser chrome failures. CLOSED TREE
authorMihai Alexandru Michis <malexandru@mozilla.com>
Mon, 29 Jul 2019 23:37:58 +0300
changeset 11829 fa8fa4403361a1864b363c9f8e942dc43430199a
parent 11828 716570f5b4cf08746d7a8472d56ac63e595a50f5
child 11830 e400c98745bcd4de4956df852f93ddb7f0a15da8
push id157
push userflodolo@mozilla.com
push dateFri, 02 Aug 2019 11:41:38 +0000
bugs1562006
Backed out changeset f2b7c868c0a7 (bug 1562006) for browser chrome failures. CLOSED TREE X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: d6ce560581af17b5aadc7957d5c0472faa27ccb6 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: e5d98eda2ec359a0968c567076b1a625cb6c99ce X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 2fb19d0466d2f61674c0af80813645cccd510593 X-Channel-Repo: releases/mozilla-esr68 X-Channel-Revision: a8da73ce90a4110e14caaba3e93d8a086b3a0669
browser/chrome/browser/accounts.properties
browser/chrome/browser/browser.dtd
--- a/browser/chrome/browser/accounts.properties
+++ b/browser/chrome/browser/accounts.properties
@@ -101,22 +101,8 @@ unnamedTabsArrivingNotificationNoDevice.
 # Used when a tab from a remote device arrives but the URL must be truncated.
 # Should display the URL with an indication that it's benen truncated.
 # %S is the portion of the URL that remains after truncation.
 singleTabArrivingWithTruncatedURL.body = %S…
 
 # LOCALIZATION NOTE (account.title):
 # Used as a default header for the FxA toolbar menu.
 account.title = Account
-
-# LOCALIZATION NOTE (account.manageAccount):
-# Used as the description below user's email in the FxA toolbar menu.
-account.manageAccount = Manage Account
-
-# LOCALIZATION NOTE (account.finishAccountSetup):
-# Used as the FxA toolbar menu item value when user has not
-# finished setting up an account.
-account.finishAccountSetup = Finish Account Setup
-
-# LOCALIZATION NOTE (account.reconnectToSync):
-# Used as the FxA toolbar menu item title when the user
-# needs to reconnect Sync. %S is the Sync brand name.
-account.reconnectToSync = Reconnect to %S
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -133,35 +133,24 @@ These should match what Safari and other
 
 <!-- LOCALIZATION NOTE (fxa.unverified) Used to define the different labels
      for the Firefox Account toolbar unverified menu screen. -->
 <!ENTITY fxa.unverified.callout.label "Check Your Email">
 <!ENTITY fxa.unverified.description.label "You’ll need to verify your account before you can sync.">
 <!ENTITY fxa.unverified.button.label "Open &syncBrand.shortName.label; Settings…">
 
 <!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
-     for the Firefox Account toolbar menu screen. The `Signed in as` text is
+     for the Firefox Account toolbart menu screen. The `Signed in as` text is
      followed by the user's email. -->
 <!ENTITY fxa.menu.signedInAs.label "Signed in as">
 <!ENTITY fxa.menu.manageAccount.label "Manage Account…">
 <!ENTITY fxa.menu.syncSettings.label "&syncBrand.shortName.label; Settings…">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Connect Another Device…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
 
-<!ENTITY fxa.menu.signin.label "Sign in to &brandProductName;">
-<!ENTITY fxa.menu.turnOnSync.label "Turn on &syncBrand.shortName.label;">
-<!ENTITY fxa.menu.account.label "Account">
-
-<!-- LOCALIZATION NOTE (fxa.service) Used to define the different FxA services
-     for the Firefox Account toolbar menu screen.  -->
-<!ENTITY fxa.service.send.description "Upload and share files with end-to-end encryption plus a link that automatically expires.">
-<!ENTITY fxa.service.send.launch "Launch &sendShortName;">
-<!ENTITY fxa.service.monitor.description "Check if your email has appeared in a data breach and get alerted if it appears in a new breach.">
-<!ENTITY fxa.service.monitor.launch "Launch &monitorShortName;">
-
 <!-- LOCALIZATION NOTE (fullscreenWarning.beforeDomain.label,
      fullscreenWarning.afterDomain.label): these two strings are used
      respectively before and after the domain requiring fullscreen.
      Localizers can use one of them, or both, to better adapt this
      sentence to their language. -->
 <!ENTITY fullscreenWarning.beforeDomain.label "">
 <!ENTITY fullscreenWarning.afterDomain.label "is now full screen">
 <!ENTITY fullscreenWarning.generic.label "This document is now full screen">