From 24d29a0d16fd466274c8a0d5ef10659ff772d387 Mon Sep 17 00:00:00 2001
From: "kairo%kairo.at" <kairo%kairo.at@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 30 Sep 2007 17:36:00 +0000
Subject: [PATCH] bug 397846 - Remove "Navigator" branding from SeaMonkey UI,
 part 1, r+sr=Neil

git-svn-id: svn://10.0.0.236/trunk@236949 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/locales/en-US/chrome/browser/navigator.dtd | 4 ++--
 .../locales/en-US/chrome/browser/navigator.properties    | 2 +-
 .../suite/locales/en-US/chrome/common/openLocation.dtd   | 6 +++---
 .../locales/en-US/chrome/common/openLocation.properties  | 2 +-
 .../locales/en-US/chrome/common/pref/pref-appearance.dtd | 5 ++---
 .../locales/en-US/chrome/common/pref/pref-navigator.dtd  | 4 ++--
 .../locales/en-US/chrome/common/pref/pref-popups.dtd     | 4 ++--
 .../locales/en-US/chrome/common/pref/pref-scripts.dtd    | 4 ++--
 .../suite/locales/en-US/chrome/common/pref/preftree.dtd  | 3 +--
 .../suite/locales/en-US/chrome/common/tasksOverlay.dtd   | 9 ++++-----
 .../suite/locales/en-US/chrome/common/utilityOverlay.dtd | 7 +++----
 .../en-US/chrome/mailnews/addressbook/abMainWindow.dtd   | 2 +-
 12 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd b/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
index c2357bcd99e..b3608e9d283 100644
--- a/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -12,9 +12,9 @@
 
 <!ENTITY nothingAvailable.label "(Nothing Available)">
 
-<!ENTITY browserCmd.label	"New Navigator Window">
+<!ENTITY browserCmd.label	"New Browser Window">
 <!ENTITY browserCmd.accesskey	"N">
-<!ENTITY tabCmd.label "Navigator Tab">
+<!ENTITY tabCmd.label "Browser Tab">
 <!ENTITY tabCmd.accesskey "T">
 <!ENTITY tabCmd.commandkey "t">
 <!ENTITY openCmd.label "Open Web Location...">
diff --git a/mozilla/suite/locales/en-US/chrome/browser/navigator.properties b/mozilla/suite/locales/en-US/chrome/browser/navigator.properties
index b9d1a11c6fa..818ea9320d7 100644
--- a/mozilla/suite/locales/en-US/chrome/browser/navigator.properties
+++ b/mozilla/suite/locales/en-US/chrome/browser/navigator.properties
@@ -80,7 +80,7 @@ tabs.close=Close
 tabs.recentlyClosed.format=%1$S %2$S
 
 tabs.closeWarningTitle=Confirm close
-tabs.closeWarning=This Navigator window has %S tabs open. Do you want to close it and all its tabs?
+tabs.closeWarning=This browser window has %S tabs open. Do you want to close it and all its tabs?
 tabs.closeButton=Close all tabs
 tabs.closeWarningPromptMe=Warn me when closing multiple tabs
 tabs.historyItem=Group of Tabs
diff --git a/mozilla/suite/locales/en-US/chrome/common/openLocation.dtd b/mozilla/suite/locales/en-US/chrome/common/openLocation.dtd
index a11c87d3ada..0b5ad1ae39a 100644
--- a/mozilla/suite/locales/en-US/chrome/common/openLocation.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/openLocation.dtd
@@ -4,9 +4,9 @@
 <!ENTITY enter.accesskey "E">
 <!ENTITY chooseFile.label "Choose File...">
 <!ENTITY chooseFile.accesskey "C">
-<!ENTITY newWindow.label "New Navigator window">
-<!ENTITY newTab.label "New Navigator tab">
-<!ENTITY topWindow.label "Current Navigator window">
+<!ENTITY newWindow.label "New browser window">
+<!ENTITY newTab.label "New browser tab">
+<!ENTITY topWindow.label "Current browser window">
 <!ENTITY editNewWindow.label "New Composer window">
 <!ENTITY open.label "Open">
 <!ENTITY caption.label "Open Web Location">
diff --git a/mozilla/suite/locales/en-US/chrome/common/openLocation.properties b/mozilla/suite/locales/en-US/chrome/common/openLocation.properties
index 83b818c3260..f8c21e18fb9 100644
--- a/mozilla/suite/locales/en-US/chrome/common/openLocation.properties
+++ b/mozilla/suite/locales/en-US/chrome/common/openLocation.properties
@@ -1,2 +1,2 @@
 chooseFileDialogTitle=Choose File
-existingNavigatorWindow=Existing Navigator window
+existingNavigatorWindow=Existing browser window
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd
index 46a27820218..15e88459a5e 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/pref/pref-appearance.dtd
@@ -7,9 +7,8 @@
 	 appear
 -->
 <!ENTITY onStartLegend.label                    "When &brandShortName; starts up, open">
-<!--LOCALIZATION NOTE (navCheck.label): DONT_TRANSLATE -->
-<!ENTITY navCheck.label                         "Navigator">
-<!ENTITY navCheck.accesskey                     "N">
+<!ENTITY navCheck.label                         "Browser">
+<!ENTITY navCheck.accesskey                     "B">
 <!--LOCALIZATION NOTE (compCheck.label): DONT_TRANSLATE -->
 <!ENTITY compCheck.label                        "Composer">
 <!ENTITY compCheck.accesskey                    "C">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd
index d300ff9a8b1..342357e8ebd 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/pref/pref-navigator.dtd
@@ -1,7 +1,7 @@
-<!ENTITY  pref.navigator.title      "Navigator">
+<!ENTITY  pref.navigator.title      "Browser">
 
 <!ENTITY  navRadio                  "Display on">
-<!ENTITY  navStartPageMenu.label    "Navigator Startup">
+<!ENTITY  navStartPageMenu.label    "Browser Startup">
 <!ENTITY  newWinPageMenu.label      "New Window">
 <!ENTITY  newTabPageMenu.label      "New Tab">
 
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-popups.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-popups.dtd
index 57c918b9d76..dab040af636 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-popups.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/pref/pref-popups.dtd
@@ -2,7 +2,7 @@
 
 <!ENTITY pref.popups.caption            "Popup Windows">
 
-<!ENTITY popupDesc.label                "Specify how to handle popup windows that appear on top of or under the current Navigator window:">
+<!ENTITY popupDesc.label                "Specify how to handle popup windows that appear on top of or under the current browser window:">
 
 <!ENTITY popupBlock.label               "Block unrequested popup windows">
 <!ENTITY popupBlock.accesskey           "B">
@@ -20,7 +20,7 @@
 <!ENTITY previewSound.accesskey         "P">
 <!ENTITY selectSound.title              "Select Popup Block Sound">
 
-<!ENTITY displayIcon.label              "Display an icon in the Navigator status bar">
+<!ENTITY displayIcon.label              "Display an icon in the browser status bar">
 <!ENTITY displayIcon.accesskey          "D">
 
 <!ENTITY popupNote.description          "Note: Blocking all popups may prevent important features of some websites from working, such as login windows for banks and shopping sites. For details of how to allow specific sites to use popups while blocking all others, click Help. Even if blocked, sites may use other methods to show popups.">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/pref-scripts.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/pref-scripts.dtd
index 1761c34358a..bd5f7265906 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/pref-scripts.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/pref/pref-scripts.dtd
@@ -3,8 +3,8 @@
 <!--LOCALIZATION NOTE : FILE The 'Scripts & Plug-ins' preferences dialog -->
 <!ENTITY pref.scripts.title              "Scripts &amp; Plug-ins">
 
-<!ENTITY navigator.label                 "Navigator">
-<!ENTITY navigator.accesskey             "N">
+<!ENTITY navigator.label                 "Browser">
+<!ENTITY navigator.accesskey             "B">
 
 <!--LOCALIZATION NOTE (enableJavaScript.label): 'JavaScript' should never be translated -->
 <!ENTITY enableJavaScript.label          "Enable JavaScript for">
diff --git a/mozilla/suite/locales/en-US/chrome/common/pref/preftree.dtd b/mozilla/suite/locales/en-US/chrome/common/pref/preftree.dtd
index 45b8edec947..503cfbcf580 100644
--- a/mozilla/suite/locales/en-US/chrome/common/pref/preftree.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/pref/preftree.dtd
@@ -6,8 +6,7 @@
 <!ENTITY colors.label "Colors">
 <!ENTITY themes.label "Themes">
 <!ENTITY locales.label "Languages">
-<!--LOCALIZATION NOTE (navigator.label): DONT_TRANSLATE -->
-<!ENTITY navigator.label "Navigator">
+<!ENTITY navigator.label "Browser">
 <!ENTITY history.label "History">
 <!ENTITY bidi.label "Bidi Options">
 <!ENTITY languages.label "Languages">
diff --git a/mozilla/suite/locales/en-US/chrome/common/tasksOverlay.dtd b/mozilla/suite/locales/en-US/chrome/common/tasksOverlay.dtd
index d7756e34e82..5ad6b6a7e80 100644
--- a/mozilla/suite/locales/en-US/chrome/common/tasksOverlay.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/tasksOverlay.dtd
@@ -1,8 +1,7 @@
 <!-- extracted from tasksOverlay.xul -->
-<!-- LOCALIZATION NOTE (navigatorCmd.label): DONT_TRANSLATE -->  
-<!ENTITY navigatorCmd.label					"Navigator">  
-<!ENTITY navigatorCmd.accesskey             "n">
-<!ENTITY navigatorCmd.commandkey            "1">
+<!ENTITY navigatorCmd.label "Browser">
+<!ENTITY navigatorCmd.accesskey "B">
+<!ENTITY navigatorCmd.commandkey "1">
 <!-- LOCALIZATION NOTE (editorCmd.label): DONT_TRANSLATE -->
 <!ENTITY editorCmd.label					"Composer">
 <!ENTITY editorCmd.accesskey				"c">
@@ -20,7 +19,7 @@
 <!ENTITY privacyMenu.label "Privacy &amp; Security">
 <!ENTITY privacyMenu.accesskey "p">
 
-<!ENTITY taskNavigator.tooltip  "Navigator">
+<!ENTITY taskNavigator.tooltip  "Browser">
 <!ENTITY taskComposer.tooltip  "Composer">
 <!ENTITY taskBar.tooltip  "Status Bar">
 
diff --git a/mozilla/suite/locales/en-US/chrome/common/utilityOverlay.dtd b/mozilla/suite/locales/en-US/chrome/common/utilityOverlay.dtd
index 42fde114848..9001d982be3 100644
--- a/mozilla/suite/locales/en-US/chrome/common/utilityOverlay.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/utilityOverlay.dtd
@@ -15,10 +15,9 @@
 <!ENTITY newPageFromTemplateCmd.accesskey "t">
 <!ENTITY newPageFromDraftCmd.label "Page Using Draft">
 <!ENTITY newPageFromDraftCmd.accesskey "d">
-<!-- LOCALIZATION NOTE  (newNavigatorCmd.label): Do NOT translate "Navigator" -->
-<!ENTITY newNavigatorCmd.label				"Navigator Window">
-<!ENTITY newNavigatorCmd.key				"N">
-<!ENTITY newNavigatorCmd.accesskey			"N">
+<!ENTITY newNavigatorCmd.label "Browser Window">
+<!ENTITY newNavigatorCmd.key "N">
+<!ENTITY newNavigatorCmd.accesskey "B">
 
 <!ENTITY editMenu.label					"Edit"> 
 <!ENTITY editMenu.accesskey				"e"> 
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
index fbfc114adc4..e45fcf3f897 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -48,7 +48,7 @@
 <!-- LOCALIZATION NOTE (newListCmd.accesskey) : DONT_TRANSLATE -->  
 <!ENTITY newListCmd.accesskey                           "L">  
 <!ENTITY newAddressBookCmd.label                        "Address Book..."> 
-<!ENTITY newAddressBookCmd.accesskey                    "B">  
+<!ENTITY newAddressBookCmd.accesskey                    "o">  
 <!ENTITY renameAddressBookCmd.label                     "Rename Address Book..."> 
 <!ENTITY renameAddressBookCmd.accesskey                 "R">  
 <!ENTITY newLDAPDirectoryCmd.label                      "LDAP Directory...">