merge

1 files changed, 65 insertions, 89 deletions

diff --git a/newmoon/debian/patches/pm-to-nm.patch b/newmoon/debian/patches/pm-to-nm.patch
index f667644..28d3de5 100644
--- a/newmoon/debian/patches/pm-to-nm.patch
+++ b/newmoon/debian/patches/pm-to-nm.patch
@@ -1,12 +1,11 @@
-Date: 2020-10-01
-Upstream version: 28.15.0
+Last-modified: 2023-03-23
+Upstream-version: 32.1.0
 Purpose: Use newmoon branding instead of palemoon
 Message: Some of the changes include using ~/.config/newmoon for the profile location, using "newmoon" branding instead of "palemoon" or "browser", some bookmark tweaks to hide the old branding,
 I used newmoon itself to save a bookmark, and then export the bookmarks to an html file. Then I grabbed the relevant entries and placed them here. Also, I move the "Most Visited" link to bookmarks menu and not on the toolbar.
 
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/app/application.ini Pale-Moon-28.14.1_Release.new/palemoon/app/application.ini
---- Pale-Moon-28.14.1_Release/palemoon/app/application.ini	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/app/application.ini	2020-10-01 17:14:07.439179218 -0400
+--- a/palemoon/app/application.ini
++++ b/palemoon/app/application.ini
 @@ -20,10 +20,10 @@
  
  [App]
@@ -21,37 +20,27 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/app/application.ini Pale-Moon-28.1
  #ifdef MOZ_APP_DISPLAYNAME
  CodeName=@MOZ_APP_DISPLAYNAME@
  #endif
-@@ -47,4 +47,4 @@
+@@ -47,4 +47,4 @@ MaxVersion=@GRE_MILESTONE@
  [XRE]
  #ifdef MOZ_PROFILE_MIGRATOR
  EnableProfileMigrator=1
 -#endif
 \ No newline at end of file
 +#endif
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/shared/locales/browserconfig.properties Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/locales/browserconfig.properties
---- pale-moon.orig/palemoon/branding/shared/locales/browserconfig.properties  2020-10-24 07:14:54.000000000 -0400
-+++ pale-moon/palemoon/branding/shared/locales/browserconfig.properties 2020-10-27 20:35:29.301883148 -0400
-@@ -1,3 +1,3 @@
- # Do NOT localize or otherwise change these values
--browser.startup.homepage=http://start.palemoon.org/
--browser.startup.homepage_reset=http://start.palemoon.org/
-+browser.startup.homepage=http://start.duckduckgo.com/
-+browser.startup.homepage_reset=http://start.duckduckgo.com/
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/shared/pref/preferences.inc Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/pref/preferences.inc
---- Pale-Moon-28.14.1_Release/palemoon/branding/shared/pref/preferences.inc	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/pref/preferences.inc	2020-10-01 17:14:16.203289213 -0400
+--- a/palemoon/branding/shared/pref/preferences.inc
++++ b/palemoon/branding/shared/pref/preferences.inc
 @@ -1,8 +1,8 @@
  // ===| General |==============================================================
  
--pref("startup.homepage_welcome_url","http://www.palemoon.org/firstrun.shtml");
+-pref("startup.homepage_welcome_url","https://www.palemoon.org/firstrun.shtml");
 +pref("startup.homepage_welcome_url","");
  
--pref("app.vendorURL", "http://www.palemoon.org/");
+-pref("app.vendorURL", "https://www.palemoon.org/");
 +pref("app.vendorURL", "");
  
  
  // User Interface
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ pref("app.update.promptWaitTime", 172800
  // ===| Add-ons Manager |======================================================
  
  // Add-on window fixes
@@ -60,28 +49,27 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/shared/pref/preferences.i
  
  pref("extensions.update.autoUpdateDefault", true); // Automatically update extensions by default
  pref("extensions.getAddons.maxResults", 10);
-@@ -64,12 +64,12 @@
+@@ -64,12 +64,12 @@ pref("image.mem.decode_bytes_at_a_time",
  // ===| Sync |=================================================================
  
  // Pale Moon Sync server URLs
 -pref("services.sync.serverURL","https://pmsync.palemoon.org/sync/index.php/");
 -pref("services.sync.jpake.serverURL","https://keyserver.palemoon.org/");
--pref("services.sync.termsURL", "http://www.palemoon.org/sync/terms.shtml");
--pref("services.sync.privacyURL", "http://www.palemoon.org/sync/privacy.shtml");
+-pref("services.sync.termsURL", "https://www.palemoon.org/sync/terms.shtml");
+-pref("services.sync.privacyURL", "https://www.palemoon.org/sync/privacy.shtml");
 -pref("services.sync.statusURL", "https://pmsync.palemoon.org/status/");
--pref("services.sync.syncKeyHelpURL", "http://www.palemoon.org/sync/help/recoverykey.shtml");
-+pref("services.sync.serverURL","https://localhost:9999/sync/index.php/");
+-pref("services.sync.syncKeyHelpURL", "https://www.palemoon.org/sync/help/recoverykey.shtml");
++pref("services.sync.serverURL","https://localhost:9999/");
 +pref("services.sync.jpake.serverURL","https://localhost:9999/");
-+pref("services.sync.termsURL", "http://localhost:9999/sync/terms.shtml");
-+pref("services.sync.privacyURL", "http://localhost:9999/sync/privacy.shtml");
-+pref("services.sync.statusURL", "https://localhost:9999/status/");
-+pref("services.sync.syncKeyHelpURL", "http://localhost:9999/sync/help/recoverykey.shtml");
++pref("services.sync.termsURL", "https://localhost:9999/");
++pref("services.sync.privacyURL", "https://localhost:9999/");
++pref("services.sync.statusURL", "https://localhost:9999/");
++pref("services.sync.syncKeyHelpURL", "https://localhost:9999/");
  
  pref("services.sync.APILevel", 1); // FSyncMS doesn't support 'info/configuration' requests
  
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/branding.nsi Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/branding.nsi
---- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/branding.nsi	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/branding.nsi	2020-10-01 17:17:03.761408034 -0400
+--- a/palemoon/branding/unofficial/branding.nsi
++++ b/palemoon/branding/unofficial/branding.nsi
 @@ -8,8 +8,8 @@
  
  # BrandFullNameInternal is used for some registry and file system values
@@ -93,9 +81,8 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/branding.nsi P
  !define URLInfoAbout          " "
  !define URLUpdateInfo         " "
  !define HelpLink              " "
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/browser.desktop Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/browser.desktop
---- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/browser.desktop	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/browser.desktop	2020-10-01 17:15:25.608161879 -0400
+--- a/palemoon/branding/unofficial/browser.desktop
++++ b/palemoon/branding/unofficial/browser.desktop
 @@ -2,24 +2,24 @@
  Name=Browser
  GenericName=Web Browser
@@ -127,18 +114,16 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/browser.deskto
  Name=New private window
 -Exec=palemoon -private-window
 +Exec=newmoon -private-window
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/configure.sh Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/configure.sh
---- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/configure.sh	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/configure.sh	2020-10-01 17:17:33.697789678 -0400
+--- a/palemoon/branding/unofficial/configure.sh
++++ b/palemoon/branding/unofficial/configure.sh
 @@ -2,4 +2,4 @@
  # 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/.
  
 -MOZ_APP_DISPLAYNAME="Browser"
 +MOZ_APP_DISPLAYNAME="newmoon"
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/brand.dtd Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/locales/en-US/brand.dtd
---- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/brand.dtd	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/locales/en-US/brand.dtd	2020-10-01 17:17:26.793700936 -0400
+--- a/palemoon/branding/unofficial/locales/en-US/brand.dtd
++++ b/palemoon/branding/unofficial/locales/en-US/brand.dtd
 @@ -2,7 +2,7 @@
     - 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/. -->
@@ -150,9 +135,8 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/
 +<!ENTITY  brandFullName         "newmoon">
 +<!ENTITY  vendorShortName       "custom">
  <!ENTITY  trademarkInfo.part1   " ">
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/brand.properties Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/locales/en-US/brand.properties
---- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/brand.properties	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/locales/en-US/brand.properties	2020-10-01 17:17:15.509557191 -0400
+--- a/palemoon/branding/unofficial/locales/en-US/brand.properties
++++ b/palemoon/branding/unofficial/locales/en-US/brand.properties
 @@ -2,8 +2,8 @@
  # 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/.
@@ -165,10 +149,9 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/
 +vendorShortName=custom
  
  syncBrandShortName=Sync
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/pref/palemoon-branding.js Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/pref/palemoon-branding.js
---- pale-moon.orig/palemoon/branding/unofficial/pref/palemoon-branding.js	2020-10-24 07:14:54.000000000 -0400
-+++ pale-moon/palemoon/branding/unofficial/pref/palemoon-branding.js	2020-10-27 21:06:40.837761688 -0400
-@@ -18,18 +18,18 @@
+--- a/palemoon/branding/unofficial/pref/palemoon-branding.js
++++ b/palemoon/branding/unofficial/pref/palemoon-branding.js
+@@ -18,18 +18,18 @@ pref("nglayout.initialpaint.delay", 300)
  pref("image.mem.max_ms_before_yield", 50);

  pref("image.mem.decode_bytes_at_a_time", 65536);

  

@@ -196,10 +179,9 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/pref/palemoon-
 +pref("app.releaseNotesURL", "");

  pref("app.update.enabled", false);

  pref("app.update.url", "");

-diff -Naur Pale-Moon-28.14.1_Release/palemoon/components/nsBrowserGlue.js Pale-Moon-28.14.1_Release.new/palemoon/components/nsBrowserGlue.js
---- Pale-Moon-28.14.1_Release/palemoon/components/nsBrowserGlue.js	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/components/nsBrowserGlue.js	2020-10-01 17:14:16.203289213 -0400
-@@ -1695,8 +1695,8 @@
+--- a/palemoon/components/nsBrowserGlue.js
++++ b/palemoon/components/nsBrowserGlue.js
+@@ -1708,8 +1708,8 @@ BrowserGlue.prototype = {
              uri: NetUtil.newURI("place:sort=" +
                                  Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING +
                                  "&maxResults=" + MAX_RESULTS),
@@ -210,9 +192,8 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/components/nsBrowserGlue.js Pale-M
              newInVersion: 1
            },
            RecentlyBookmarked: {
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/palemoon.dtd Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/palemoon.dtd
---- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/palemoon.dtd	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/palemoon.dtd	2020-10-01 17:14:16.199289163 -0400
+--- a/palemoon/locales/en-US/chrome/browser/palemoon.dtd
++++ b/palemoon/locales/en-US/chrome/browser/palemoon.dtd
 @@ -3,13 +3,11 @@
     - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
  
@@ -231,9 +212,8 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/palem
  <!ENTITY chronicles.from.66.1
 -'from <strong>The Chronicles of the Pale Moon,</strong> 66:1'>
 +'custom build'>
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd
---- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd	2020-10-01 17:14:16.199289163 -0400
+--- a/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd
++++ b/palemoon/locales/en-US/chrome/browser/preferences/tabs.dtd
 @@ -31,6 +31,6 @@
  <!ENTITY newtabPage.label                   "When opening a new tab, show:">
  <!ENTITY newtabPage.custom.label            "A custom URL">
@@ -242,9 +222,8 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/prefe
 +<!ENTITY newtabPage.home.label              "The newmoon start page">
  <!ENTITY newtabPage.myhome.label            "My home page">
  <!ENTITY newtabPage.quickdial.label         "The Quickdial page">
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
---- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd	2020-10-01 17:14:16.199289163 -0400
+--- a/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
++++ b/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
 @@ -5,6 +5,6 @@
  <!ENTITY status4evar.throbber.widget.title "Activity Indicator">
  <!ENTITY status4evar.download.widget.title "Download Status">
@@ -253,9 +232,8 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/statu
 +<!ENTITY status4evar.options.widget.label "newmoon status bar">
  <!ENTITY status4evar.menu.options.label "Status Bar Preferences">
  
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd
---- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd	2020-10-01 17:14:16.199289163 -0400
+--- a/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd
++++ b/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-prefs.dtd
 @@ -1,4 +1,4 @@
 -<!ENTITY status4evar.window.title "Pale Moon status bar preferences">
 +<!ENTITY status4evar.window.title "newmoon status bar preferences">
@@ -271,19 +249,17 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/statu
  <!ENTITY status4evar.option.download.library "Library">
  <!ENTITY status4evar.option.download.tab "Tab">
  <!ENTITY status4evar.option.download.thirdparty "3rd Party">
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/syncBrand.dtd Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/syncBrand.dtd
---- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/syncBrand.dtd	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/syncBrand.dtd	2020-10-01 17:14:16.199289163 -0400
+--- a/palemoon/locales/en-US/chrome/browser/syncBrand.dtd
++++ b/palemoon/locales/en-US/chrome/browser/syncBrand.dtd
 @@ -3,4 +3,4 @@
     - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
  
  <!ENTITY syncBrand.shortName.label  "Sync">
 -<!ENTITY syncBrand.fullName.label   "Pale Moon Sync">
 +<!ENTITY syncBrand.fullName.label   "newmoon Sync">
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/syncSetup.properties Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/syncSetup.properties
---- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/syncSetup.properties	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/browser/syncSetup.properties	2020-10-01 17:14:16.199289163 -0400
-@@ -38,7 +38,7 @@
+--- a/palemoon/locales/en-US/chrome/browser/syncSetup.properties
++++ b/palemoon/locales/en-US/chrome/browser/syncSetup.properties
+@@ -38,7 +38,7 @@ passwordsCount.label        = #1 passwor
  addonsCount.label        = #1 addon;#1 addons
  
  save.recoverykey.title = Save Recovery Key
@@ -292,9 +268,8 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/browser/syncS
  
  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.
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/overrides/appstrings.properties Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/overrides/appstrings.properties
---- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/overrides/appstrings.properties	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/chrome/overrides/appstrings.properties	2020-10-01 17:14:16.199289163 -0400
+--- a/palemoon/locales/en-US/chrome/overrides/appstrings.properties
++++ b/palemoon/locales/en-US/chrome/overrides/appstrings.properties
 @@ -3,24 +3,24 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
@@ -330,7 +305,7 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/overrides/app
  contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
  unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
  externalProtocolTitle=External Protocol Request
-@@ -32,6 +32,6 @@
+@@ -32,6 +32,6 @@ externalProtocolLaunchBtn=Launch applica
  cspBlocked=This page has a content security policy that prevents it from being embedded in this way.
  xssBlockMode=This page contains an XSS attack that has been blocked for your security.
  corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
@@ -339,9 +314,8 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/chrome/overrides/app
  ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
 -sslv3Used=Pale Moon cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
 +sslv3Used=newmoon cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml
---- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml	2020-10-01 17:14:16.199289163 -0400
+--- a/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml
++++ b/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml
 @@ -6,7 +6,7 @@
    <LongName>Search Plugin for DuckDuckGo (HTTPS version)</LongName> 

    <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA11RgALs6oACbQ9wAj0v8AI9L/ACfQ9wAu0agANdUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzzN4CNdL/oK/z//////////////////////+jsPv/BDXX/wAz0t4AAAAAAAAAAAAAAAAAAAAAAAAAAAAyzvNSduD//////8jK/v+P+Lf/IbQL/17RPP+J3Y//wOKX//////9YeuX/ADLO8wAAAAAAAAAAAAAAAAAw091piOX/8/X9/1Fx5P9xhu//WOWZ/0W9Lv9Lwjn/J8BB/xyDAP9bdfL/9fP//2mI5v8AMNPdAAAAAAc610YRQ9f//////0Zr4P8AGdD/sb32////////////wrv//wAh1/8MPab/ACPc/05r4///////EkPX/wc610YANtWkrr/y/6S48P8AJ9L/AB3R/+/w/v///////////3+D7f8AQeL/AYTw/wFr5/8AMNb/p7Tv/6698v8AM9WkADLW//////8yXt//AC3V/wAw1/////////////z///8A0P7/AKb1/wWI7P8AuPf/AJ3w/zZW3P//////ADHV/wAx2P//////AzrZ/wAu1/84ZOL////////////e////AND//wC1+f8Atff/AZbv/wY62f8ELNf//////wAw1/8AMtn//////wAw2f8ALNn/kKrz////+//cwbH////////////R////Rcb8/wDO/f8A/P//AHzo//////8AMNj/ADXa//////8vXuL/ACna/4yq9///79T/jUkg/9i+r///////r2Q0/7Cozv8BKdr/AirY/zdZ4P//////ADTa/wI72tOuv/T/prr0/wAl2v+JqPb//7yW/+bUxv/9+/n////u//W+n/+Op/L/ADPd/wAv2v+ru/T/r7/0/wI72tMLQd1DEEjg//////9Cbef/ADng///////////////////////R3///AC3g/wAy3v9SeOn//////xFI4P8LQd1DAAAAAAM64PNmiuz/9/j//2mN7f/m7P3///////////9Cb+n/ACXd/wAt3v9rju3//////2iL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/P8J0vz/ELDz/xt85v8mSdj/JknY/yZJ2P8lStowJUjXYCZJ2P8nSdhwJErZryZK2f8oSNcgJUnajyZK2f8mStn/JkrZ/yZK2f8mStn/iJPA////////////////////////////0ff+/xjV/P8J0vz/Drn1/xiO6/8Yjuv/GI7r/xCw8/8Lyvr/CdL8/xmF6P8mStn/JkrZ/yVJ2o8oSNcgJkrZ/yRK2a8jStrfI0rZ3wAAAAAlSdq/Jkra/yZK2v8mStr/Jkra/yZK2v+xtsf///////////////////////////8o2Pz/CdL8/wvK+v8mStr/Jkra/yZK2v8mStr/Jkra/yZK2v8iW97/Jkra/yZK2v8mStr/JUnavwAAAAAjStnfI0ra3yZK2v8lSdq/AAAAACZH2O8mStr/Jkra/yZK2v8mStr/L1HY/9HR0f///////////////////////////yjY/P8J0vz/CdL8/xCw9P8QsPT/ELD0/xSf7/8ddeX/Jkra/yZK2v8mStr/Jkra/yZK2v8mR9jvAAAAACVJ2r8mStr/Jkvb/yVJ2r8AAAAAJkvb/yZL2/8mS9v/Jkvb/yZL2/9KZtL/4+Pj////////////////////////////4Pn//0fd/f8J0vz/CdL8/wnS/P8J0vz/CdL8/wnS/P8Lyvr/Fpfu/yJc3/8mS9v/Jkvb/yZL2/8AAAAAJUnavyZL2/8mS9z/JUncvwAAAAAmS9z/Jkvc/yZL3P8mS9z/Jkvc/26AyP/x8fH//////////////////////////////////////9H3/v/C9P7/o+7+/2fa+/8Oufb/CdL8/wnS/P8J0vz/CdL8/xiP7P8mS9z/Jkvc/wAAAAAlSdy/Jkvc/yZM3P8lTNy/AAAAACZJ2e8mTNz/Jkzc/yZM3P8mTNz/iJTB////////////qnth/5VaOf/x6eX///////////////////////Hp5f/x6eX/ydL2/yZM3P8kVN7/G37o/xKo8v8QsfT/HXbm/yZM3P8mSdnvAAAAACVM3L8mTNz/I0vc3yZJ2u8AAAAAJUzevyZM3f8mTN3/Jkzd/yZM3f+fqc3///////////+VWjn/v5yI/+re1///////////////////////jk8s/7iRe//J0vb/Jkzd/yZM3f8mTN3/Jkzd/yZM3f8mTN3/Jkzd/yVM3r8AAAAAI0vc3yNL3N8kTd2vJk3d/yhQ3yAlTd2PJk3d/yZN3f8mTd3/Jk3d/6St0v////////////Hp5f/q3tf///////////////////////////+xhm7/49PK/6Cx8P8mTd3/Jk3d/yZN3f8mTd3/Jk3d/yZN3f8mTd3/JU3djyhQ3yAmTd3/JE3drydN33AmTd7/J03fcCVK3zAmTd7/Jk3e/yZN3v8mTd7/pK7S///////Sp5r/////////////////////////////////////////////////T27k/yZN3v8mTd7/Jk3e/yZN3v8mTd7/Jk3e/yZN3v8lSt8wJ03fcCZN3v8nTd9wKFDfICZO3/8mTt3PAAAAACVN3r8mTt//Jk7f/yZO3/+EltX//////+fRyv/SqaD/59LO///////////////////////at63/vIBy/7Glxf8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8mTt//JU3evwAAAAAmTt3PJk7f/yhQ3yAAAAAAJE/dryZO3/8oUN9AKFDfQCZO3/8mTt//Jk7f/zhb2v/o6/T/////////////////////////////////////////////////XHrn/yZO3/8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8oUN9AKFDfQCZO3/8kT92vAAAAAAAAAAAoUN9AJk7g/yZO4M8AAAAAJk/hnyZO4P8mTuD/Jk7g/05v5v/k6fv//////////////////////////////////////3eR7P8mTuD/Jk7g/yZO4P8mTuD/Jk7g/yZO4P8mTuD/Jk/hnwAAAAAmTuDPJk7g/yhQ30AAAAAAAAAAAAAAAAAjT+GfJU/h/yVO4Y8gUN8QIk7gzyVP4f8lT+H/SWnW/0lp1v+bq+H/8fHx/////////////////6Cy8v9OcOb/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yJO4M8gUN8QJU7hjyVP4f8jT+GfAAAAAAAAAAAAAAAAAAAAACBQ3xAlTOHvJU/h/yVQ4mAgUN8QIk7hzyVP4f+ktOv///////////////////////H0/f9phur/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yVP4f8iTuHPIFDfECVQ4mAlT+H/JUzh7yBQ3xAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ3zAlUOLvJVDi/yVQ4mAgUN8QI1Din4mb2//J0/j/ydP4/6299P93ku3/M1vk/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/I1DinyBQ3xAlUOJgJVDi/yVQ4u8lUN8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAlUOLvJVDi/yVQ4o8AAAAAJFDjQCVQ4r8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDivyRQ40AAAAAAJVDijyVQ4v8lUOLvJVDkMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAjUeTfJVHj/yNR5N8kUONAAAAAACVQ5DAmUuOAJVHivyNR5N8lUeP/JVHj/yNR5N8lUeK/JlLjgCVQ5DAAAAAAJFDjQCNR5N8lUeP/I1Hk3yVQ5DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBQ3xAjUuSfJVHk/yVR5P8jUeTfJFLkcChQ5yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoUOcgJFLkcCNR5N8lUeT/JVHk/yNS5J8gUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkUONAI1LknyVS5P8lUuT/JVLk/yVS5O8lUeS/JVHkvyVR5L8lUeS/JVLk7yVS5P8lUuT/JVLk/yRS468kUONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIFDfECVS5GAjUuWfIlPlzyVS5f8lUuX/JVLl/yVS5f8iU+XPI1LlnyVS5GAgUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/ggBB/wgAEP4AAAB8AAAAPAAAADiAAAEYAAAAEQAAAIAAAAAAAAAAAgAAAEIAAABCAAAAQgAAAEIAAABCAAAAQAAAAAAAAAABAAAAiAAAABiAAAEcAAAAPAAAAD4AAAB/CAAQ/4IAQf/AfgP/8AAP//wAP/</Image>

@@ -351,9 +325,8 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/searchplugins/duckdu
      <Param name="q" value="{searchTerms}"/>  

    </Url>

    <Url type="application/x-suggestions+json" method="GET" template="https://duckduckgo.com/ac/">

-diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/searchplugins/ekoru.xml Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/searchplugins/ekoru.xml
---- Pale-Moon-28.14.1_Release/palemoon/locales/en-US/searchplugins/ekoru.xml	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/locales/en-US/searchplugins/ekoru.xml	2020-10-01 17:14:16.199289163 -0400
+--- a/palemoon/locales/en-US/searchplugins/ekoru.xml
++++ b/palemoon/locales/en-US/searchplugins/ekoru.xml
 @@ -5,6 +5,6 @@
      <InputEncoding>UTF-8</InputEncoding>

      <LongName>Ekoru Search</LongName>

@@ -363,13 +336,8 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/en-US/searchplugins/ekoru.
 +    <Url type="text/html" method="get" template="https://www.ekoru.org/?ext=newmoon&amp;q={searchTerms}"/>

 +    <Url type="application/x-suggestions+json" template="https://ac.ekoru.org/?ext=newmoon&amp;q={searchTerms}"/>

  </OpenSearchDescription>

-#######################################
-
-Message: Fix the bookmarks
-I used newmoon itself to save a bookmark, and then export the bookmarks to an html file. Then I grabbed the relevant entries and placed them here. Also, I move the "Most Visited" link to bookmarks menu and not on the toolbar.
-diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/generic/profile/bookmarks.html.in Pale-Moon-28.14.1_Release.new/palemoon/locales/generic/profile/bookmarks.html.in
---- Pale-Moon-28.14.1_Release/palemoon/locales/generic/profile/bookmarks.html.in	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/locales/generic/profile/bookmarks.html.in	2020-10-01 17:14:16.199289163 -0400
+--- a/palemoon/locales/generic/profile/bookmarks.html.in
++++ b/palemoon/locales/generic/profile/bookmarks.html.in
 @@ -11,9 +11,6 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
@@ -381,3 +349,11 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/locales/generic/profile/bookmarks.
 +        <DT><A HREF="https://start.duckduckgo.com/" ICON_URI="https://start.duckduckgo.com/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFnklEQVRYhcVXb0wTZxzmEyZsbovJnG7xw0j2wZm55K4jWzQh0wwkZFsMgetVMhVB0Bm3ocEMo2MoEZcwkzlYLIHJUIGJdraoiAwq2yRz0TEcTgz3p73SUQo97or0P88+dDutvXqd27I3edP70N/7/N7n97y/PykpSS5U5adyhoxshibqOYrsZyjdKEMR3ujWjXIU2c/QRD1nyMhGVX5qsudqrpFNK5ZwFNnA0DqJ1ZNwVBbC3VwL0dQE2WqGbDVDNDXB3VwLR2UhWD0JhtZJHEU2jGxaseSRgZGTs4AvIKs5mpi178iF1N2O0LQLwQkBcp8Jnk4j3I01cDfWwNNphNxnQnBCQGjaBam7HfYdueBoYpYvIKuRk7PgEW5NDPJFmZixtCLslSCaWyDsLgCrJx+6hd0FEM0tCHslzFhawW3OBEcRg0mzwdLESobWCUJ5HoJOG+SBLti2rdMEfnDbtq2DPNCFoNMGoTwPDK0ThA3kS5o3Z2id4KwuRVgS4TYeBKsnMb6/CFJ3B6Tes5g++RnsO99O2hG38SDCkghndSkYWickZAI5OQs4ihgUyvOiBjXblUM8HV8gLHlw//L9dgNCeV5STjhrtiMsiRDK88BRxKCqJvgCspovykTQaVNurtBZlg1bWTZcR/fCPzaiOBGWRbiNB8AXr9FmorEGQacNfFEm+AKyOl50NDE7Y2mFfMUSZ8xveR13b3yHRCvsnYHz4xJNJ+SBrqgwaWI2JhQcRTbYd+Qi7JVUBecf+zUhuOKEOAW+9A1NYYa9UvSJUmRDNPZV+akMrZOk7naI547HGU0cqQAAcOMeXP2Zx5w/FAd+i3HhwsBtOCwdmiyI5hZI3e1gaJ2EqvzUFM6Qkc3qSYSmXarvfOZiGwDg+ohDk4VIwAe+ZK1mnghNu8DqSXCGjOwUhibqHZWFCE4Iqgaz1/oVgEAwDFH2qYK3fHMdg0M2uI7u1WQhOCHAUVkIhibqUziK7Hc3H4bcZ1IXjtWigBTv68T6nV/BF4gPQ/4HJ/BJkxVSz2ltMfaZ4G6uBUeR/SkMpRsVTU3wdBpV/+w506iAtJ0fwv6jPaoMzM9Hf2Xrn6/IQMJZsRyexmWY+fI5jO968d6ZnUaIpiYwlG40haEIr2w1w91Yo+rARN1uzdhjfg7w3QS8vZjrN2D2zGKEf3ockeE0RIbTEPzhCTgrlsfkBNlqBkMRXk0HbO/mPgTYj3nnLkRuPqmAKfuXNNw1Pw3XgRfAbohPSrLVDIbWyZohYPVkXBpW8IWSKNjQY5BOLYW3YwnktqWYqkuHbevLCc+LCUFUhLUJRcjqyYRZcF4oRmQ4Db5LizSFl1iEGs+Q1ZPwnD6mHoKwiLnL6YgMp2HWtBhTdelwH07H1KfPY6blWfguLULo2kLYy1Y+5BlqJCJWT+L3w+8llIH9/fWwl67EVF06vJ3PIDDwFELXFsLXswieY8tgL40Fj0tEManY3KLqAF+yNqEDQgX1t+iPS8XJFCNWTyI4Oa7qwOTn+5IGVy1GceV4oEvV2HtVPQE9WL5vF+rA0AnEl6gcazUkrJ7EVOsRAAAj3cJ57hQm56KMRO56wRa+ijFahxOHVmN7dxa697wWZ+82HkTQaQO3WaUh0WrJWD2J8Y+2AACuOLpQ0puFrd9m49CPu7CzLx9ll9Zh79drUNKbhZLeLLTXrI6xTaoli2lKD8Q2payeBPfOKsxHwrjq7FGADJYs5bu49953a+3qmJsn1ZT+teLa8isWRZgB/g6G3IMK0Mbzb8LQlYWii2+h7dRGVJ2MsnC6etWjteUxonxwMDl3HN7By3DNjWPP94W4wLfDH55TxBhwcGDpV8B8SMFj+QeDyf2aUBvNQqIbfv4O/PwoAvYxBOxj8POj8PN3EJp0/jujWTwb/8NwGsfIfzSe/wEDn3UUirFnMwAAAABJRU5ErkJggg==">ddg</A>
      </DL><p>
  </DL><p>
+--- a/palemoon/branding/shared/locales/browserconfig.properties
++++ b/palemoon/branding/shared/locales/browserconfig.properties
+@@ -1,3 +1,3 @@
+ # Do NOT localize or otherwise change these values
+-browser.startup.homepage=http://start.palemoon.org/
+-browser.startup.homepage_reset=http://start.palemoon.org/
++browser.startup.homepage=http://start.duckduckgo.com/
++browser.startup.homepage_reset=http://start.duckduckgo.com/