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/en-US/chrome/browser') 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 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 application/basilisk/locales/en-US/chrome/browser/aboutAccounts.dtd (limited to 'application/basilisk/locales/en-US/chrome/browser') 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 @@ - - - - - - - - - - - - - - -- 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/en-US/chrome/browser') 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/en-US/chrome/browser') 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 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 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'application/basilisk/locales/en-US/chrome/browser') 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 -- 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/en-US/chrome/browser') 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/en-US/chrome/browser') 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 ---------------------- 2 files changed, 4 insertions(+), 28 deletions(-) (limited to 'application/basilisk/locales/en-US/chrome/browser') 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. -- - - - - - - - - - - - - - -- cgit v1.2.3