1 files changed, 14 insertions, 13 deletions
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index f561d5d39..9fbb5f84a 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -67,10 +67,10 @@ index d7fec75..d531b83 100644
  component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
  contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
 diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index 52722e9..0448444 100644
+index 23e021d..469e504 100644
 --- a/browser/components/migration/src/FirefoxProfileMigrator.js
 +++ b/browser/components/migration/src/FirefoxProfileMigrator.js
-@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
+@@ -89,7 +89,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
  
  
  FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
@@ -80,22 +80,23 @@ index 52722e9..0448444 100644
  
  this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
 diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 401623a..4ce7a3e 100644
+index 3d23a98..4ce7a3e 100644
 --- a/browser/components/migration/src/MigrationUtils.jsm
 +++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -404,11 +404,6 @@ this.MigrationUtils = Object.freeze({
+@@ -404,12 +404,6 @@ this.MigrationUtils = Object.freeze({
     * @see nsIStringBundle
     */
    getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
 -    const OVERRIDES = {
--      "4_firefox": "4_firefox_history_and_bookmarks"
+-      "4_firefox": "4_firefox_history_and_bookmarks",
+-      "64_firefox": "64_firefox_other"
 -    };
 -    aKey = OVERRIDES[aKey] || aKey;
 -
      if (aReplacements === undefined)
        return getMigrationBundle().GetStringFromName(aKey);
      return getMigrationBundle().formatStringFromName(
-@@ -623,6 +618,17 @@ this.MigrationUtils = Object.freeze({
+@@ -624,6 +618,17 @@ this.MigrationUtils = Object.freeze({
    },
  
    /**
@@ -139,7 +140,7 @@ index 21cf405..f3c1a6b 100644
  <!ENTITY noMigrationSources.label       "No programs that contain bookmarks, history or password data could be found.">
  
 diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index 260bc29..52b32cc 100644
+index b1cb03d..1755ae7 100644
 --- a/browser/locales/en-US/chrome/browser/migration/migration.properties
 +++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
 @@ -8,7 +8,6 @@ profileName_format=%S %S
@@ -181,13 +182,13 @@ index 260bc29..52b32cc 100644
  64_ie=Other Data
  64_safari=Other Data
  64_chrome=Other Data
--64_firefox=Bookmarks Backups
-+64_self=Bookmarks Backups
+-64_firefox_other=Other Data
++64_self=Other Data
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 0541ebf..f983ae4 100644
+index 5c23509..54b82bd 100644
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -42,7 +42,7 @@ toolkit.jar:
+@@ -43,7 +43,7 @@ toolkit.jar:
  +  content/global/mozilla.xhtml               (mozilla.xhtml)
     content/global/nsDragAndDrop.js            (nsDragAndDrop.js)
     content/global/resetProfile.css            (resetProfile.css)
@@ -267,10 +268,10 @@ index f35c227..7062886 100644
  
  %{C++
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 17f5598..0b9a24a 100644
+index 90641ed..1806e0c 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3743,7 +3743,7 @@ XREMain::XRE_mainRun()
+@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun()
          if (gDoProfileReset) {
            // Automatically migrate from the current application if we just
            // reset the profile.