author | Matthew Noorenberghe <mozilla@noorenberghe.ca> |
Tue, 24 Dec 2019 17:03:47 +0000 | |
changeset 508351 | cd50ce18a6c75e6c77507b230efbc0254046b58b |
parent 508350 | 56535429a7fb5020ea698b022c3c07a754bc417a |
child 508352 | 325f8606c0c17dd22f45263d63f87e9e32315de5 |
push id | 36947 |
push user | btara@mozilla.com |
push date | Tue, 24 Dec 2019 21:23:27 +0000 |
treeherder | mozilla-central@48159e53bfb8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | zombie |
bugs | 1605871 |
milestone | 73.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/components/migration/content/migration.js +++ b/browser/components/migration/content/migration.js @@ -198,17 +198,16 @@ var MigrationWizard = { group.selectedItem = selectedMigrator; toggleCloseBrowserWarning(); } else { // We didn't find a migrator, notify the user document.getElementById("noSources").hidden = false; this._wiz.canAdvance = false; - document.getElementById("importBookmarks").hidden = true; document.getElementById("importAll").hidden = true; } // Advance to the next page if the caller told us to. if (this._migrator && this._skipImportSourcePage) { this._wiz.advance(); this._wiz.canRewind = false; }
--- a/browser/components/migration/content/migration.xhtml +++ b/browser/components/migration/content/migration.xhtml @@ -23,17 +23,16 @@ <wizard> <wizardpage id="importSource" pageid="importSource" next="selectProfile" label="&importSource.title;"> #ifdef XP_WIN <description id="importAll" control="importSourceGroup">&importFrom.label;</description> #else <description id="importAll" control="importSourceGroup">&importFromUnix.label;</description> #endif - <description id="importBookmarks" control="importSourceGroup" hidden="true">&importFromBookmarks.label;</description> <radiogroup id="importSourceGroup" align="start"> # NB: if you add items to this list, please also assign them a unique migrator ID in MigrationUtils.jsm <radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/> #ifdef XP_WIN <radio id="edge" label="&importFromEdge.label;" accesskey="&importFromEdge.accesskey;"/> <radio id="ie" label="&importFromIE.label;" accesskey="&importFromIE.accesskey;"/> <radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd +++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd @@ -2,17 +2,16 @@ - 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/. --> <!ENTITY migrationWizard.title "Import Wizard"> <!ENTITY importFrom.label "Import Options, Bookmarks, History, Passwords and other data from:"> <!ENTITY importFromUnix.label "Import Preferences, Bookmarks, History, Passwords and other data from:"> -<!ENTITY importFromBookmarks.label "Import Bookmarks from:"> <!ENTITY importFromIE.label "Microsoft Internet Explorer"> <!ENTITY importFromIE.accesskey "M"> <!ENTITY importFromEdge.label "Microsoft Edge"> <!ENTITY importFromEdge.accesskey "E"> <!ENTITY importFromNothing.label "Don’t import anything"> <!ENTITY importFromNothing.accesskey "D"> <!ENTITY importFromSafari.label "Safari">