From 1f5194b5f1deb0f36b36ed886d94ce5f8b62ca9d Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Mon, 18 Mar 2019 20:51:28 -0400 Subject: Issue #756 - Remove Contextual Identity from Basilisk --- .../en-US/chrome/browser/browser.properties | 31 ---------------------- .../chrome/browser/preferences/containers.dtd | 24 ----------------- .../browser/preferences/containers.properties | 31 ---------------------- .../en-US/chrome/browser/preferences/cookies.dtd | 1 - .../chrome/browser/preferences/preferences.dtd | 1 - .../browser/preferences/preferences.properties | 14 ---------- .../en-US/chrome/browser/preferences/privacy.dtd | 7 ----- application/basilisk/locales/jar.mn | 2 -- 8 files changed, 111 deletions(-) delete mode 100644 application/basilisk/locales/en-US/chrome/browser/preferences/containers.dtd delete mode 100644 application/basilisk/locales/en-US/chrome/browser/preferences/containers.properties (limited to 'application/basilisk/locales') diff --git a/application/basilisk/locales/en-US/chrome/browser/browser.properties b/application/basilisk/locales/en-US/chrome/browser/browser.properties index f1c39839b..abec30bf1 100644 --- a/application/basilisk/locales/en-US/chrome/browser/browser.properties +++ b/application/basilisk/locales/en-US/chrome/browser/browser.properties @@ -638,37 +638,6 @@ e10s.accessibilityNotice.acceptButton.accesskey = O e10s.accessibilityNotice.enableAndRestart.label = Enable (Requires Restart) e10s.accessibilityNotice.enableAndRestart.accesskey = E -# LOCALIZATION NOTE (userContextPersonal.label, -# userContextWork.label, -# userContextShopping.label, -# userContextBanking.label, -# userContextNone.label): -# These strings specify the four predefined contexts included in support of the -# Contextual Identity / Containers project. Each context is meant to represent -# the context that the user is in when interacting with the site. Different -# contexts will store cookies and other information from those sites in -# different, isolated locations. You can enable the feature by typing -# about:config in the URL bar and changing privacy.userContext.enabled to true. -# Once enabled, you can open a new tab in a specific context by clicking -# File > New Container Tab > (1 of 4 contexts). Once opened, you will see these -# strings on the right-hand side of the URL bar. -userContextPersonal.label = Personal -userContextWork.label = Work -userContextBanking.label = Banking -userContextShopping.label = Shopping -userContextNone.label = No Container - -userContextPersonal.accesskey = P -userContextWork.accesskey = W -userContextBanking.accesskey = B -userContextShopping.accesskey = S -userContextNone.accesskey = N - -userContext.aboutPage.label = Manage containers -userContext.aboutPage.accesskey = O - -userContextOpenLink.label = Open Link in New %S Tab - muteTab.label = Mute Tab muteTab.accesskey = M unmuteTab.label = Unmute Tab diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/containers.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/containers.dtd deleted file mode 100644 index 58eca1ace..000000000 --- a/application/basilisk/locales/en-US/chrome/browser/preferences/containers.dtd +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/containers.properties b/application/basilisk/locales/en-US/chrome/browser/preferences/containers.properties deleted file mode 100644 index 9866a0659..000000000 --- a/application/basilisk/locales/en-US/chrome/browser/preferences/containers.properties +++ /dev/null @@ -1,31 +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/. - -containers.removeButton = Remove -containers.preferencesButton = Preferences -containers.colorHeading = Color: -containers.labelMinWidth = 4rem -containers.nameLabel = Name: -containers.namePlaceholder = Enter a container name -containers.submitButton = Done -containers.iconHeading = Icon: -containers.updateContainerTitle = %S Container Preferences - -containers.blue.label = Blue -containers.turquoise.label = Turquoise -containers.green.label = Green -containers.yellow.label = Yellow -containers.orange.label = Orange -containers.red.label = Red -containers.pink.label = Pink -containers.purple.label = Purple - -containers.fingerprint.label = Fingerprint -containers.briefcase.label = Briefcase -# LOCALIZATION NOTE (containers.dollar.label) -# String represents a money sign but currently uses a dollar sign so don't change to local currency -# See Bug 1291672 -containers.dollar.label = Dollar sign -containers.cart.label = Shopping cart -containers.circle.label = Dot diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/cookies.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/cookies.dtd index 5e7df9609..c83331328 100644 --- a/application/basilisk/locales/en-US/chrome/browser/preferences/cookies.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/preferences/cookies.dtd @@ -14,7 +14,6 @@ - diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.dtd index 7702c8c51..353e627d7 100644 --- a/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.dtd @@ -18,7 +18,6 @@ - diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties index 84fac427d..c0b7e1be0 100644 --- a/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties +++ b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties @@ -191,17 +191,3 @@ revertNoRestartButton=Revert restartNow=Restart Now restartLater=Restart Later - -disableContainersAlertTitle=Close All Container Tabs? - -# LOCALIZATION NOTE (disableContainersMsg): Semi-colon list of plural forms. -# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals -# #S is the number of container tabs -disableContainersMsg=If you disable Container Tabs now, #S container tab will be closed. Are you sure you want to disable Container Tabs?;If you disable Container Tabs now, #S container tabs will be closed. Are you sure you want to disable Container Tabs? - -# LOCALIZATION NOTE (disableContainersOkButton): Semi-colon list of plural forms. -# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals -# #S is the number of container tabs -disableContainersOkButton=Close #S Container Tab;Close #S Container Tabs - -disableContainersButton2=Keep enabled diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd index f743c4040..8820e92ab 100644 --- a/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -110,10 +110,3 @@ - - - - - - - diff --git a/application/basilisk/locales/jar.mn b/application/basilisk/locales/jar.mn index 5c5a72a1f..dfa6d4e00 100644 --- a/application/basilisk/locales/jar.mn +++ b/application/basilisk/locales/jar.mn @@ -79,10 +79,8 @@ locale/browser/preferences/permissions.dtd (%chrome/browser/preferences/permissions.dtd) locale/browser/preferences/preferences.dtd (%chrome/browser/preferences/preferences.dtd) locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties) - locale/browser/preferences/containers.properties (%chrome/browser/preferences/containers.properties) * locale/browser/preferences/privacy.dtd (%chrome/browser/preferences/privacy.dtd) locale/browser/preferences/security.dtd (%chrome/browser/preferences/security.dtd) - locale/browser/preferences/containers.dtd (%chrome/browser/preferences/containers.dtd) locale/browser/preferences/sync.dtd (%chrome/browser/preferences/sync.dtd) locale/browser/preferences/tabs.dtd (%chrome/browser/preferences/tabs.dtd) locale/browser/preferences/search.dtd (%chrome/browser/preferences/search.dtd) -- cgit v1.2.3 From 91d17efc6885e71de63393075aed680d2a7b53b1 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 26 Mar 2019 14:38:16 +0100 Subject: Clean up installer scripts a little. --- application/basilisk/locales/en-US/installer/custom.properties | 4 ---- 1 file changed, 4 deletions(-) (limited to 'application/basilisk/locales') diff --git a/application/basilisk/locales/en-US/installer/custom.properties b/application/basilisk/locales/en-US/installer/custom.properties index 4abb1a550..0f86f5528 100644 --- a/application/basilisk/locales/en-US/installer/custom.properties +++ b/application/basilisk/locales/en-US/installer/custom.properties @@ -25,10 +25,6 @@ OPTIONS_PAGE_TITLE=Setup Type OPTIONS_PAGE_SUBTITLE=Choose setup options SHORTCUTS_PAGE_TITLE=Set Up Shortcuts SHORTCUTS_PAGE_SUBTITLE=Create Program Icons -COMPONENTS_PAGE_TITLE=Set Up Optional Components -COMPONENTS_PAGE_SUBTITLE=Optional Recommended Components -OPTIONAL_COMPONENTS_DESC=The Maintenance Service will allow you to update $BrandShortName silently in the background. -MAINTENANCE_SERVICE_CHECKBOX_DESC=Install &Maintenance Service SUMMARY_PAGE_TITLE=Summary SUMMARY_PAGE_SUBTITLE=Ready to start installing $BrandShortName SUMMARY_INSTALLED_TO=$BrandShortName will be installed to the following location: -- cgit v1.2.3 From 711c9cd6cd08f4fe10eb7544aa3a51dfb863bfeb Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 30 Mar 2019 13:28:49 -0400 Subject: [BASILISK] Remove FxA Synced Tabs Sidebar --- .../locales/en-US/chrome/browser/browser.dtd | 25 ---------------------- 1 file changed, 25 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 d02a6eedb..892fb4fec 100644 --- a/application/basilisk/locales/en-US/chrome/browser/browser.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/browser.dtd @@ -726,31 +726,6 @@ you can use these alternative items. Otherwise, their values should be empty. - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 12885d44108a1fcb43e25a3add30d83c13fcaf14 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 30 Mar 2019 20:21:40 -0400 Subject: [BASILISK] Remove FxA infected Sync - Part 3: Remove about:accounts --- .../locales/en-US/chrome/browser/aboutAccounts.dtd | 16 ---------------- application/basilisk/locales/jar.mn | 1 - 2 files changed, 17 deletions(-) delete mode 100644 application/basilisk/locales/en-US/chrome/browser/aboutAccounts.dtd (limited to 'application/basilisk/locales') diff --git a/application/basilisk/locales/en-US/chrome/browser/aboutAccounts.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutAccounts.dtd deleted file mode 100644 index 358722156..000000000 --- a/application/basilisk/locales/en-US/chrome/browser/aboutAccounts.dtd +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/application/basilisk/locales/jar.mn b/application/basilisk/locales/jar.mn index dfa6d4e00..c6cb7cafe 100644 --- a/application/basilisk/locales/jar.mn +++ b/application/basilisk/locales/jar.mn @@ -7,7 +7,6 @@ @AB_CD@.jar: % locale browser @AB_CD@ %locale/browser/ * locale/browser/bookmarks.html (generic/profile/bookmarks.html.in) - locale/browser/aboutAccounts.dtd (%chrome/browser/aboutAccounts.dtd) locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd) locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd) locale/browser/aboutPrivateBrowsing.properties (%chrome/browser/aboutPrivateBrowsing.properties) -- cgit v1.2.3 From f98cdab7a516a3896cb03faf3dbec6bb0ee060b7 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 31 Mar 2019 18:48:11 -0400 Subject: [BASILISK] Port PM Sync Client - Part 1: Initial transfer --- .../locales/en-US/chrome/browser/syncProgress.dtd | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 application/basilisk/locales/en-US/chrome/browser/syncProgress.dtd (limited to 'application/basilisk/locales') diff --git a/application/basilisk/locales/en-US/chrome/browser/syncProgress.dtd b/application/basilisk/locales/en-US/chrome/browser/syncProgress.dtd new file mode 100644 index 000000000..db45cb935 --- /dev/null +++ b/application/basilisk/locales/en-US/chrome/browser/syncProgress.dtd @@ -0,0 +1,15 @@ + + + + %brandDTD; + + + + + + + + -- cgit v1.2.3 From f6c16cff36048c583ca0e1d019b622336ca861a0 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 31 Mar 2019 18:49:29 -0400 Subject: [BASILISK] Port PM Sync Client - Part 2: Basic Integration with glue and preferences --- .../en-US/chrome/browser/preferences/sync.dtd | 73 +--------------------- .../locales/en-US/chrome/browser/syncBrand.dtd | 1 - .../locales/en-US/chrome/browser/syncKey.dtd | 8 +-- .../en-US/chrome/browser/syncQuota.properties | 2 +- .../locales/en-US/chrome/browser/syncSetup.dtd | 18 +++--- .../en-US/chrome/browser/syncSetup.properties | 28 ++------- 6 files changed, 22 insertions(+), 108 deletions(-) (limited to 'application/basilisk/locales') diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/sync.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/sync.dtd index a5b290052..f6ef3b876 100644 --- a/application/basilisk/locales/en-US/chrome/browser/preferences/sync.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/preferences/sync.dtd @@ -39,80 +39,9 @@ - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/application/basilisk/locales/en-US/chrome/browser/syncBrand.dtd b/application/basilisk/locales/en-US/chrome/browser/syncBrand.dtd index 71a9f68af..bc4d1b3e0 100644 --- a/application/basilisk/locales/en-US/chrome/browser/syncBrand.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/syncBrand.dtd @@ -4,4 +4,3 @@ - diff --git a/application/basilisk/locales/en-US/chrome/browser/syncKey.dtd b/application/basilisk/locales/en-US/chrome/browser/syncKey.dtd index 2ff001842..f37f2c92e 100644 --- a/application/basilisk/locales/en-US/chrome/browser/syncKey.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/syncKey.dtd @@ -5,12 +5,12 @@ - + - - - + + + diff --git a/application/basilisk/locales/en-US/chrome/browser/syncQuota.properties b/application/basilisk/locales/en-US/chrome/browser/syncQuota.properties index 099090ec9..0e1b857ca 100644 --- a/application/basilisk/locales/en-US/chrome/browser/syncQuota.properties +++ b/application/basilisk/locales/en-US/chrome/browser/syncQuota.properties @@ -30,7 +30,7 @@ quota.remove.label = Remove quota.treeCaption.label = Uncheck items to stop syncing them and free up space on the server. # LOCALIZATION NOTE (quota.removal.label): %S is a list of engines that will be # disabled and whose data will be removed once the user confirms. -quota.removal.label = Firefox Sync will remove the following data: %S. +quota.removal.label = Sync will remove the following data: %S. # LOCALIZATION NOTE (quota.list.separator): This is the separator string used # for the list of engines (incl. spaces where appropriate) quota.list.separator = ,\u0020 diff --git a/application/basilisk/locales/en-US/chrome/browser/syncSetup.dtd b/application/basilisk/locales/en-US/chrome/browser/syncSetup.dtd index 2657156b7..7ee938e5d 100644 --- a/application/basilisk/locales/en-US/chrome/browser/syncSetup.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/syncSetup.dtd @@ -6,13 +6,13 @@ - + - - + + @@ -33,6 +33,8 @@ + + @@ -60,7 +62,7 @@ - + @@ -72,7 +74,7 @@ - + @@ -96,14 +98,14 @@ - + - + - + diff --git a/application/basilisk/locales/en-US/chrome/browser/syncSetup.properties b/application/basilisk/locales/en-US/chrome/browser/syncSetup.properties index 9d388af86..8a5170adb 100644 --- a/application/basilisk/locales/en-US/chrome/browser/syncSetup.properties +++ b/application/basilisk/locales/en-US/chrome/browser/syncSetup.properties @@ -35,33 +35,17 @@ passwordsCount.label = #1 password;#1 passwords # LOCALIZATION NOTE (addonsCount.label): Semicolon-separated list of plural forms. # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals # #1 is the number of add-ons, see the link above for forms -addonsCount.label = #1 add-on;#1 add-ons +addonsCount.label = #1 addon;#1 addons save.recoverykey.title = Save Recovery Key -save.recoverykey.defaultfilename = Firefox Recovery Key.html +save.recoverykey.defaultfilename = Pale Moon Recovery Key.html -newAccount.action.label = Firefox Sync is now set up to automatically sync all of your browser data. +newAccount.action.label = Sync is now set up to automatically sync all of your browser data. newAccount.change.label = You can choose exactly what to sync by selecting Sync Options below. -resetClient.change2.label = Firefox Sync will now merge all this device’s browser data into your Sync account. -wipeClient.change2.label = Firefox Sync will now replace all of the browser data on this device with the data in your Sync account. -wipeRemote.change2.label = Firefox Sync will now replace all of the browser data in your Sync account with the data on this device. +resetClient.change2.label = Sync will now merge all this device's browser data into your Sync account. +wipeClient.change2.label = Sync will now replace all of the browser data on this device with the data in your Sync account. +wipeRemote.change2.label = Sync will now replace all of the browser data in your Sync account with the data on this device. existingAccount.change.label = You can change this preference by selecting Sync Options below. # Several other strings are used (via Weave.Status.login), but they come from # /services/sync - -# Firefox Accounts based setup. -continue.label = Continue - -# LOCALIZATION NOTE (disconnect.label, disconnect.verify.title, disconnect.verify.bodyHeading, disconnect.verify.bodyText): -# These strings are used in the confirmation dialog shown when the user hits the disconnect button -# LOCALIZATION NOTE (disconnect.label): This is the label for the disconnect button -disconnect.label = Disconnect -disconnect.verify.title = Disconnect -disconnect.verify.bodyHeading = Disconnect from Sync? -disconnect.verify.bodyText = Your browsing data will remain on this computer, but it will no longer sync with your account. - -relinkVerify.title = Merge Warning -relinkVerify.heading = Are you sure you want to sign in to Sync? -# LOCALIZATION NOTE (relinkVerify.description): Email address of a user previously signed into sync. -relinkVerify.description = A different user was previously signed in to Sync on this computer. Signing in will merge this browser’s bookmarks, passwords and other settings with %S -- cgit v1.2.3 From 6e4da38d2d63cbecbb3bca29450ab84a759dff24 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 5 Apr 2019 15:12:51 +0200 Subject: Zap the robots. Resolves #1036 --- .../locales/en-US/chrome/browser/aboutRobots.dtd | 29 ---------------------- application/basilisk/locales/jar.mn | 1 - 2 files changed, 30 deletions(-) delete mode 100644 application/basilisk/locales/en-US/chrome/browser/aboutRobots.dtd (limited to 'application/basilisk/locales') diff --git a/application/basilisk/locales/en-US/chrome/browser/aboutRobots.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutRobots.dtd deleted file mode 100644 index 23447add1..000000000 --- a/application/basilisk/locales/en-US/chrome/browser/aboutRobots.dtd +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/application/basilisk/locales/jar.mn b/application/basilisk/locales/jar.mn index dfa6d4e00..1a9b7f315 100644 --- a/application/basilisk/locales/jar.mn +++ b/application/basilisk/locales/jar.mn @@ -11,7 +11,6 @@ locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd) locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd) locale/browser/aboutPrivateBrowsing.properties (%chrome/browser/aboutPrivateBrowsing.properties) - locale/browser/aboutRobots.dtd (%chrome/browser/aboutRobots.dtd) locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd) locale/browser/accounts.properties (%chrome/browser/accounts.properties) #ifdef MOZ_SERVICES_HEALTHREPORT -- cgit v1.2.3 From 0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" 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! --> - - +#ifdef MOZ_SERVICES_SYNC + + @@ -735,6 +736,7 @@ you can use these alternative items. Otherwise, their values should be empty. - +#endif 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 From 519d0cf5523b3e83d647ebbf0fd132dea7826d95 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 16 Apr 2019 08:11:41 -0400 Subject: [BASILISK] Port PM Sync Client - Part 4: Tools menu items (Set Up Sync/Sync Now) --- application/basilisk/locales/en-US/chrome/browser/browser.dtd | 8 +++----- 1 file changed, 3 insertions(+), 5 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 86833fc18..9632602d5 100644 --- a/application/basilisk/locales/en-US/chrome/browser/browser.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/browser.dtd @@ -725,16 +725,14 @@ you can use these alternative items. Otherwise, their values should be empty. - #ifdef MOZ_SERVICES_SYNC - + - - + + - - #endif -- cgit v1.2.3 From 868c9b8d7f6771b7540ace735229f02f8cc46aaf Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 16 Apr 2019 14:51:15 -0400 Subject: [BASILISK] Port PM Sync Client - Part 5: Port the original sync toolbar button and create a synced tabs toolbar button --- application/basilisk/locales/en-US/chrome/browser/browser.dtd | 1 + 1 file changed, 1 insertion(+) (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 9632602d5..87f4a7807 100644 --- a/application/basilisk/locales/en-US/chrome/browser/browser.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/browser.dtd @@ -734,6 +734,7 @@ you can use these alternative items. Otherwise, their values should be empty. - + #endif -- cgit v1.2.3 From 7008afd8e0c91fa97f37f0cf72b4a225e681c4be Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Wed, 17 Apr 2019 04:52:39 -0400 Subject: [BASILISK] Port PM Sync Client - Part 6a: Obvious ifdef'ing and clean up --- .../locales/en-US/chrome/browser/aboutHome.dtd | 4 ++++ .../locales/en-US/chrome/browser/browser.dtd | 28 ---------------------- application/basilisk/locales/jar.mn | 6 +++-- 3 files changed, 8 insertions(+), 30 deletions(-) (limited to 'application/basilisk/locales') diff --git a/application/basilisk/locales/en-US/chrome/browser/aboutHome.dtd b/application/basilisk/locales/en-US/chrome/browser/aboutHome.dtd index 17b401c6c..40681c337 100644 --- a/application/basilisk/locales/en-US/chrome/browser/aboutHome.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/aboutHome.dtd @@ -4,8 +4,10 @@ %brandDTD; +#ifdef MOZ_SERVICES_SYNC %syncBrandDTD; +#endif @@ -32,7 +34,9 @@ +#ifdef MOZ_SERVICES_SYNC +#endif - - - - - - @@ -115,11 +109,6 @@ These should match what Safari and other Apple applications use on OS X Lion. -- - - - - - @@ -333,23 +322,6 @@ These should match what Safari and other Apple applications use on OS X Lion. -- - - - - - - - - - - - - - diff --git a/application/basilisk/locales/jar.mn b/application/basilisk/locales/jar.mn index 1e1e9be2f..345c0525a 100644 --- a/application/basilisk/locales/jar.mn +++ b/application/basilisk/locales/jar.mn @@ -10,7 +10,7 @@ locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd) locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd) locale/browser/aboutPrivateBrowsing.properties (%chrome/browser/aboutPrivateBrowsing.properties) - locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd) +* locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd) locale/browser/accounts.properties (%chrome/browser/accounts.properties) #ifdef MOZ_SERVICES_HEALTHREPORT locale/browser/aboutHealthReport.dtd (%chrome/browser/aboutHealthReport.dtd) @@ -78,9 +78,12 @@ locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties) * locale/browser/preferences/privacy.dtd (%chrome/browser/preferences/privacy.dtd) locale/browser/preferences/security.dtd (%chrome/browser/preferences/security.dtd) +#ifdef MOZ_SERVICES_SYNC locale/browser/preferences/sync.dtd (%chrome/browser/preferences/sync.dtd) +#endif locale/browser/preferences/tabs.dtd (%chrome/browser/preferences/tabs.dtd) locale/browser/preferences/search.dtd (%chrome/browser/preferences/search.dtd) +#ifdef MOZ_SERVICES_SYNC locale/browser/syncBrand.dtd (%chrome/browser/syncBrand.dtd) locale/browser/syncSetup.dtd (%chrome/browser/syncSetup.dtd) locale/browser/syncSetup.properties (%chrome/browser/syncSetup.properties) @@ -88,7 +91,6 @@ 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 -- cgit v1.2.3