Backed out changeset 4695136f7e82 (bug 1549049) for assertion failures at ErrorResult.h on a CLOSED TREE draft
authorAndreea Pavel <apavel@mozilla.com>
Fri, 11 Oct 2019 00:53:42 +0300
changeset 12296 639c760c6b925fdbe482ebf0cafc6a4dafe55121
parent 12295 057dfbc2ba0cb10dd74673be0ec7f163e5a53cf7
child 12297 9edf5df3e5fe1de40e3f80e85a74304724c735c7
push id404
push userflodolo@mozilla.com
push dateFri, 11 Oct 2019 10:08:55 +0000
bugs1549049
Backed out changeset 4695136f7e82 (bug 1549049) for assertion failures at ErrorResult.h on a CLOSED TREE X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 595a7ff758ed1390f7d7fbfc3f116032b6aa6788 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: e62d13f0a325d0be38225507a93babccd76c3008 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: b19ffb3ca153242cc668db6549940b421f176d4b X-Channel-Repo: releases/mozilla-esr68 X-Channel-Revision: 2eed5fdce27200f4596a1ce5cf7e7eaebcab160d
browser/browser/sync.ftl
browser/browser/syncedTabs.ftl
--- a/browser/browser/sync.ftl
+++ b/browser/browser/sync.ftl
@@ -1,16 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-fxa-toolbar-sync-now =
-    .label = Sync Now
-fxa-toolbar-sync-syncing =
-    .label = Syncing…
-fxa-toolbar-sync-syncing-tabs =
-    .label = Syncing Tabs…
-
 sync-disconnect-dialog-title = Disconnect { -sync-brand-short-name }?
 sync-disconnect-dialog-body = { -brand-product-name } will stop syncing your account but won’t delete any of your browsing data on this device.
 fxa-disconnect-dialog-title = Disconnect { -brand-product-name }?
 fxa-disconnect-dialog-body = { -brand-product-name } will disconnect from your account but won’t delete any of your browsing data on this device.
 sync-disconnect-dialog-button = Disconnect
--- a/browser/browser/syncedTabs.ftl
+++ b/browser/browser/syncedTabs.ftl
@@ -32,13 +32,10 @@ synced-tabs-context-copy =
     .label = Copy
     .accesskey = C
 synced-tabs-context-open-all-in-tabs =
     .label = Open All in Tabs
     .accesskey = O
 synced-tabs-context-manage-devices =
     .label = Manage Devices…
     .accesskey = D
-synced-tabs-context-sync-now =
-    .label = Sync Now
-    .accesskey = S
 fxa-sign-in = Sign in to { -sync-brand-short-name }
 turn-on-sync = Turn on { -sync-brand-short-name }