From 0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 13 Apr 2019 06:52:08 -0400
Subject: [BASILISK] Restore Tabs from Other Devices history menu item and Add
 First Sync Progress

---
 application/basilisk/locales/en-US/chrome/browser/browser.dtd | 6 ++++--
 application/basilisk/locales/jar.mn                           | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'application/basilisk/locales')

diff --git a/application/basilisk/locales/en-US/chrome/browser/browser.dtd b/application/basilisk/locales/en-US/chrome/browser/browser.dtd
index 892fb4fec..86833fc18 100644
--- a/application/basilisk/locales/en-US/chrome/browser/browser.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/browser.dtd
@@ -723,8 +723,9 @@ you can use these alternative items. Otherwise, their values should be empty.  -
      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 -->
-<!ENTITY syncTabsMenu3.label     "Synced Tabs">
+#ifdef MOZ_SERVICES_SYNC
+<!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
+ <!ENTITY syncTabsMenu2.label "Tabs From Other Devices">
 
 <!ENTITY syncBrand.shortName.label    "Sync">
 
@@ -735,6 +736,7 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY syncReAuthItem.label         "Reconnect to &syncBrand.shortName.label;…">
 <!ENTITY syncReAuthItem.accesskey     "R">
 <!ENTITY syncToolbarButton.label      "Sync">
+#endif
 
 <!ENTITY customizeMode.menuAndToolbars.header2 "Additional Tools and Features">
 <!ENTITY customizeMode.menuAndToolbars.empty "Want more tools?">
diff --git a/application/basilisk/locales/jar.mn b/application/basilisk/locales/jar.mn
index b8507ade3..1e1e9be2f 100644
--- a/application/basilisk/locales/jar.mn
+++ b/application/basilisk/locales/jar.mn
@@ -19,8 +19,7 @@
     locale/browser/aboutSessionRestore.dtd         (%chrome/browser/aboutSessionRestore.dtd)
     locale/browser/aboutTabCrashed.dtd             (%chrome/browser/aboutTabCrashed.dtd)
     locale/browser/syncCustomize.dtd               (%chrome/browser/syncCustomize.dtd)
-    locale/browser/aboutSyncTabs.dtd               (%chrome/browser/aboutSyncTabs.dtd)
-    locale/browser/browser.dtd                     (%chrome/browser/browser.dtd)
+*   locale/browser/browser.dtd                     (%chrome/browser/browser.dtd)
     locale/browser/baseMenuOverlay.dtd             (%chrome/browser/baseMenuOverlay.dtd)
     locale/browser/browser.properties              (%chrome/browser/browser.properties)
     locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties)
@@ -89,6 +88,10 @@
     locale/browser/syncKey.dtd                  (%chrome/browser/syncKey.dtd)
     locale/browser/syncQuota.dtd                (%chrome/browser/syncQuota.dtd)
     locale/browser/syncQuota.properties         (%chrome/browser/syncQuota.properties)
+#ifdef MOZ_SERVICES_SYNC
+    locale/browser/syncProgress.dtd                               (%chrome/browser/syncProgress.dtd)
+    locale/browser/aboutSyncTabs.dtd                              (%chrome/browser/aboutSyncTabs.dtd)
+#endif
 % resource search-plugins chrome://browser/locale/searchplugins/
 #if BUILD_FASTER
     locale/browser/searchplugins/               (searchplugins/*.xml)
-- 
cgit v1.2.3