Bug 1424970 - adjust label for preferring tabs over windows for _blank links, r=jaws
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Thu, 04 Jan 2018 15:09:02 +0000
changeset 397768 e3512368ff7a1d5c3c2fa395aa0aea84efa3e63e
parent 397767 982eb37f52f62f4801d0fa85a89c64260ae09d3f
child 397769 9b7b27dd0cefc6c9539966127eec2a91610a5c7d
push id33190
push userapavel@mozilla.com
push dateThu, 04 Jan 2018 21:27:29 +0000
treeherdermozilla-central@95704f0aec0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1424970
milestone59.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
Bug 1424970 - adjust label for preferring tabs over windows for _blank links, r=jaws MozReview-Commit-ID: 555cehqwoLg
browser/components/preferences/in-content/main.xul
browser/locales/en-US/chrome/browser/preferences/tabs.dtd
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -380,18 +380,18 @@
 <groupbox data-category="paneGeneral"
           hidden="true">
     <caption><label>&tabsGroup.label;</label></caption>
 
     <checkbox id="ctrlTabRecentlyUsedOrder" label="&ctrlTabRecentlyUsedOrder.label;"
               accesskey="&ctrlTabRecentlyUsedOrder.accesskey;"
               preference="browser.ctrlTab.previews"/>
 
-    <checkbox id="linkTargeting" label="&newWindowsAsTabs.label;"
-              accesskey="&newWindowsAsTabs.accesskey;"
+    <checkbox id="linkTargeting" label="&newWindowsAsTabs2.label;"
+              accesskey="&newWindowsAsTabs2.accesskey;"
               preference="browser.link.open_newwindow"
               onsyncfrompreference="return gMainPane.readLinkTarget();"
               onsynctopreference="return gMainPane.writeLinkTarget();"/>
 
     <checkbox id="warnCloseMultiple" label="&warnOnCloseMultipleTabs.label;"
               accesskey="&warnOnCloseMultipleTabs.accesskey;"
               preference="browser.tabs.warnOnClose"/>
 
--- a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/tabs.dtd
@@ -1,17 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - 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 ctrlTabRecentlyUsedOrder.label       "Ctrl+Tab cycles through tabs in recently used order">
 <!ENTITY ctrlTabRecentlyUsedOrder.accesskey   "T">
 
-<!ENTITY newWindowsAsTabs.label       "Open new windows in a new tab instead">
-<!ENTITY newWindowsAsTabs.accesskey   "w">
+<!ENTITY newWindowsAsTabs2.label       "Open links as tabs instead of new windows">
+<!ENTITY newWindowsAsTabs2.accesskey   "w">
 
 <!ENTITY warnOnCloseMultipleTabs.label      "Warn you when closing multiple tabs">
 <!ENTITY warnOnCloseMultipleTabs.accesskey  "m">
 
 <!ENTITY warnOnOpenManyTabs.label       "Warn you when opening multiple tabs might slow down &brandShortName;">
 <!ENTITY warnOnOpenManyTabs.accesskey   "d">
 
 <!ENTITY switchLinksToNewTabs.label        "When you open a link in a new tab, switch to it immediately">