author | Mark Banner <standard8@mozilla.com> |
Thu, 17 Oct 2019 12:32:10 +0000 | |
changeset 498267 | 4a95ac39f66b1ca32102cb562f96f8fb8129ea28 |
parent 498266 | 98575a5ca794cb67b8d569e8a95188a30532e336 |
child 498268 | 29b831ba782de6ee59b707b829bf7cbd854ced74 |
push id | 36709 |
push user | aiakab@mozilla.com |
push date | Sat, 19 Oct 2019 09:53:21 +0000 |
treeherder | mozilla-central@b98968eb71d3 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mikedeboer, fluent-reviewers |
bugs | 1587840 |
milestone | 71.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/preferences/in-content/search.inc.xul +++ b/browser/components/preferences/in-content/search.inc.xul @@ -19,17 +19,17 @@ <radio id="searchBarShownRadio" value="true" data-l10n-id="search-bar-shown"/> <image class="searchBarImage searchBarShownImage" role="presentation"/> </radiogroup> </groupbox> <!-- Default Search Engine --> <groupbox id="defaultEngineGroup" data-category="paneSearch" hidden="true"> <label><html:h2 data-l10n-id="search-engine-default-header" /></label> - <description data-l10n-id="search-engine-default-desc" /> + <description data-l10n-id="search-engine-default-desc-2" /> <hbox id="browserDefaultSearchExtensionContent" align="center" hidden="true" class="extension-controlled"> <description control="disableDefaultSearchExtension" flex="1"/> </hbox> <hbox> <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. --> @@ -38,17 +38,17 @@ <menupopup/> </menulist> </hbox> </hbox> <checkbox id="browserSeparateDefaultEngine" data-l10n-id="search-separate-default-engine" hidden="true"/> <vbox id="browserPrivateEngineSelection" class="indent" hidden="true"> - <description data-l10n-id="search-engine-default-private-desc" /> + <description data-l10n-id="search-engine-default-private-desc-2" /> <hbox> <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. --> <hbox> <menulist id="defaultPrivateEngine"> <menupopup/> </menulist> </hbox> </hbox>
--- a/browser/locales/en-US/browser/preferences/preferences.ftl +++ b/browser/locales/en-US/browser/preferences/preferences.ftl @@ -628,18 +628,18 @@ home-prefs-sections-rows-option = search-bar-header = Search Bar search-bar-hidden = .label = Use the address bar for search and navigation search-bar-shown = .label = Add search bar in toolbar search-engine-default-header = Default Search Engine -search-engine-default-desc = Choose the default search engine to use in the address bar and search bar. -search-engine-default-private-desc = Choose the default search engine to use in Private Windows. +search-engine-default-desc-2 = This is your default search engine in the address bar and search bar. You can switch it at any time. +search-engine-default-private-desc-2 = Choose a different default search engine for Private Windows only search-separate-default-engine = .label = Use this search engine in Private Windows .accesskey = U search-suggestions-header = Search Suggestions search-suggestions-desc = Choose how suggestions from search engines appear. search-suggestions-option =