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 397859 a584dc4c226660ff0ea7ead726f9f2a3e8177982
parent 397858 e2d86922b3ef78df0a0774ef1326f4fd979de371
child 397860 38b6a5527c296912c8399255dce0bedf7513bcc5
push id33193
push usertoros@mozilla.com
push dateFri, 05 Jan 2018 09:57:05 +0000
treeherdermozilla-central@df1519b33fe0 [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">