Bug 1424970 - adjust label for preferring tabs over windows for _blank links, r?jaws draft
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Thu, 04 Jan 2018 15:09:02 +0000
changeset 715736 0af39f8ceb24f9a0ff0ea91b29005414eb0044ba
parent 715168 351c75ab74c9a83db5c0662ba271b49479adb1f1
child 744866 c2dccb76a656ab69064429115ba475ad0e9d0544
push id94239
push usergijskruitbosch@gmail.com
push dateThu, 04 Jan 2018 15:09:27 +0000
reviewersjaws
bugs1424970
milestone59.0a1
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
@@ -383,18 +383,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">