From 59c395041fe36918ab7b2e1bf894241b20b816a4 Mon Sep 17 00:00:00 2001
From: "jag%tty.nl" <jag%tty.nl>
Date: Wed, 16 Jun 2004 22:12:11 +0000
Subject: [PATCH] Bug 111842: tabbed browser prefs text "load links in the
 background" misleading. Patch by Tim Meader <tmeader@gmail.com>, r=neil,
 sr=jag

---
 .../help/resources/locale/en-US/cs_nav_prefs_navigator.html   | 4 ++--
 .../help/resources/locale/en-US/cs_nav_prefs_navigator.xhtml  | 4 ++--
 xpfe/components/prefwindow/resources/content/pref-tabs.xul    | 3 ++-
 .../prefwindow/resources/locale/en-US/pref-tabs.dtd           | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.html b/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.html
index 1d1820d04285..2ec43c4b0248 100644
--- a/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.html
+++ b/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.html
@@ -308,8 +308,8 @@ instead.</p>
 <ul>
 <li><b>Hide the tab bar when only one tab is open</b>: Select this to display 
 the Tabbed Browsing bar only when more then one Navigator tab is open.</li>
-<li><b>Load links in the background</b>: Select this to prevent Mozilla from 
-switching to a new tab when using &quot;Open in a New Tab&quot; to open a link.</li>
+<li><b>Select new tabs opened from links</b>: Select this to make Mozilla switch 
+to the new tab when using &quot;Open in a New Tab&quot; to open a link.</li>
 </ul>
 <li><b>Open tabs instead of windows for</b>: </li>
 <ul>
diff --git a/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.xhtml b/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.xhtml
index 2e446bdf3f54..8b2b91b9f689 100644
--- a/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.xhtml
+++ b/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.xhtml
@@ -307,8 +307,8 @@ instead.</p>
 <ul>
 <li><b>Hide the tab bar when only one tab is open</b>: Select this to display 
 the Tabbed Browsing bar only when more then one Navigator tab is open.</li>
-<li><b>Load links in the background</b>: Select this to prevent Mozilla from 
-switching to a new tab when using &quot;Open in a New Tab&quot; to open a link.</li>
+<li><b>Select new tabs opened from links</b>: Select this to make Mozilla switch 
+to the new tab when using &quot;Open in a New Tab&quot; to open a link.</li>
 </ul>
 <li><b>Open tabs instead of windows for</b>: </li>
 <ul>
diff --git a/xpfe/components/prefwindow/resources/content/pref-tabs.xul b/xpfe/components/prefwindow/resources/content/pref-tabs.xul
index 2108adae1afe..cebf8762101d 100644
--- a/xpfe/components/prefwindow/resources/content/pref-tabs.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-tabs.xul
@@ -61,7 +61,8 @@
               prefstring="browser.tabs.autoHide"/>
     <checkbox id="tabBackground"
               label="&background.label;" 
-              prefstring="browser.tabs.loadInBackground"/>
+              prefstring="browser.tabs.loadInBackground"
+              reversed="true"/>
   </groupbox>
 
   <groupbox id="loadGroupPreferences" align="start">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-tabs.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-tabs.dtd
index ae27097611a4..07ca1baaf33f 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-tabs.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-tabs.dtd
@@ -1,7 +1,7 @@
 <!ENTITY tabHeader.label "Tabbed Browsing">
 <!ENTITY tabDisplay.label "Tab Display">
 <!ENTITY autoHide.label "Hide the tab bar when only one tab is open">
-<!ENTITY background.label "Load links in the background">
+<!ENTITY background.label "Select new tabs opened from links">
 <!ENTITY loadGroup.label "When opening a bookmark group">
 <!ENTITY loadGroupAppend.label "Add tabs">
 <!ENTITY loadGroupAppend.accesskey "A">