245765 - Preferences should live under Edit...Preferences on Unix and terminology should be consistent

2004-06-07 08:17:00 +00:00 · 2004-06-07 08:17:00 +00:00 · 1a3ea9199c
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@ -113,6 +113,15 @@
                <menuseparator/>
                <menuitem label="&findOnCmd.label;" accesskey="&findOnCmd.accesskey;" key="key_find" command="cmd_find"/>
                <menuitem label="&findAgainCmd.label;" accesskey="&findAgainCmd.accesskey;" key="key_findAgain" command="cmd_findAgain"/>
+#ifdef XP_UNIX
+#ifndef XP_MACOSX
+                <menuseparator/>
+                <menuitem id="menu_preferences"
+                          label="&preferencesCmdUnix.label;"
+                          accesskey="&preferencesCmdUnix.accesskey;"
+                          oncommand="openPreferences();"/>
+#endif
+#endif
              </menupopup>
            </menu>
  
@ -313,13 +322,17 @@
                        oncommand="toJavaScriptConsole();"/>
              <menuitem accesskey="&pageInfoCmd.accesskey;" label="&pageInfoCmd.label;"   
                        key="key_viewInfo" command="View:PageInfo"/>
-#ifndef XP_MACOSX
+#ifndef XP_UNIX
              <menuseparator id="prefSep"/>
-#endif
              <menuitem id="menu_preferences"
                        label="&preferencesCmd.label;"
                        accesskey="&preferencesCmd.accesskey;"
                        oncommand="openPreferences();"/>
+#else
+#ifdef XP_MACOSX
+              <menuitem id="menu_preferences" oncommand="openPreferences();"/>
+#endif
+#endif
            </menupopup>
          </menu>
    
--- a/browser/base/locale/browser.dtd
+++ b/browser/base/locale/browser.dtd
@ -160,6 +160,8 @@
 <!ENTITY selectAllCmd.accesskey       "A"> 
 <!ENTITY preferencesCmd.label       "Options...">
 <!ENTITY preferencesCmd.accesskey     "O"> 
+<!ENTITY preferencesCmdUnix.label       "Preferences">
+<!ENTITY preferencesCmdUnix.accesskey     "n"> 

 <!ENTITY viewMenu.label         "View"> 
 <!ENTITY viewMenu.accesskey       "V"> 
--- a/browser/components/migration/content/migration.xul
+++ b/browser/components/migration/content/migration.xul
@ -55,7 +55,11 @@
              label="&importSource.title;"
              onpageshow="MigrationWizard.onImportSourcePageShow();"
              onpageadvanced="MigrationWizard.onImportSourcePageAdvanced();">
+#ifdef XP_WIN
    <description>&importFrom.label;</description>
+#else
+    <description>&importFromUnix.label;</description>
+#endif
    
    <radiogroup id="importSourceGroup">
 #ifdef XP_UNIX
--- a/browser/components/migration/locale/migration.dtd
+++ b/browser/components/migration/locale/migration.dtd
@ -2,6 +2,7 @@
 <!ENTITY migrationWizard.title          "Import Wizard">

 <!ENTITY importFrom.label               "Import Options, Bookmarks, History, Passwords and other data from:">
+<!ENTITY importFromUnix.label           "Import Preferences, Bookmarks, History, Passwords and other data from:">

 <!ENTITY importFromIE.label             "Microsoft Internet Explorer">
 <!ENTITY importFromIE.accesskey         "M">
--- a/browser/components/prefwindow/content/pref.xul
+++ b/browser/components/prefwindow/content/pref.xul
@ -7,7 +7,11 @@

 <dialog id="prefDialog" 
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+#ifdef XP_WIN
        title="&prefWindow.title;" 
+#else
+        title="&prefWindowUnix.title;"
+#endif
        style="&prefWindow.size;"
        buttons="accept,cancel" windowtype="Browser:Options"
        onload="Startup();" onunload="Shutdown();"
--- a/browser/components/prefwindow/locale/pref.dtd
+++ b/browser/components/prefwindow/locale/pref.dtd
@ -1,23 +0,0 @@
-<!-- extracted from content/PrefsWindow.xul -->
-
-<!-- LOCALIZATION NOTE : FILE UI for the outer parts of the Prefs dialog -->
-<!ENTITY  prefWindow.title            "Options">
-
-<!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the
-     preference dialog's <window> node, which specifies the width and height
-     in em units of the dialog. Localizers ONLY can increase these widths 
-     if they are having difficulty getting panel content to fit. 1em = the 
-     width of the letter 'm' in the selected font.
-     XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct
-     size of this window for en-US. -->
-<!ENTITY  prefWindow.size             "width: 52.3em; height: 41em;">
-<!--LOCALIZATION NOTE : FILE Lists preferences categories that appear on the left of the preferences dialog -->
-<!ENTITY themes.label "Themes">
-<!ENTITY ext.label    "Extensions">
-<!ENTITY general.label "General">
-<!ENTITY privacy.label "Privacy">
-<!ENTITY downloads.label "Downloads">
-<!ENTITY features.label "Web Features">
-<!ENTITY advanced.label "Advanced">
-
-
--- a/toolkit/mozapps/downloads/content/downloads.xul
+++ b/toolkit/mozapps/downloads/content/downloads.xul
@ -164,9 +164,15 @@
              label="&cmd.cleanUp.label;" accesskey="&cmd.cleanUp.accesskey;" tooltiptext="&cmd.cleanUp.tooltip;" 
              command="cmd_cleanUp"/>
      <separator id="commandBarSeparator"/>              
+#ifdef XP_WIN
      <button id="optionsButton" 
              label="&cmd.options.label;" accesskey="&cmd.options.accesskey;" 
              oncommand="onDownloadShowOptions();"/>
+#else
+      <button id="optionsButton" 
+              label="&cmd.optionsUnix.label;" accesskey="&cmd.optionsUnix.accesskey;" 
+              oncommand="onDownloadShowOptions();"/>
+#endif
    </hbox>
    
    <resizer id="windowResizer" dir="bottomright"/>
--- a/toolkit/mozapps/downloads/content/unknownContentType.xul
+++ b/toolkit/mozapps/downloads/content/unknownContentType.xul
@ -97,8 +97,12 @@
      </hbox>
      
      <separator/>
+#ifdef XP_UNIX
 #ifdef XP_MACOSX
      <description id="settingsChange" hidden="true">&settingsChangeMac.label;</description>
+#else
+      <description id="settingsChange" hidden="true">&settingsChangeUnix.label;</description>
+#endif
 #else
      <description id="settingsChange" hidden="true">&settingsChange.label;</description>
 #endif
--- a/toolkit/mozapps/downloads/locale/downloads.dtd
+++ b/toolkit/mozapps/downloads/locale/downloads.dtd
@ -34,6 +34,8 @@

 <!ENTITY cmd.options.label                "Options">
 <!ENTITY cmd.options.accesskey            "O">
+<!ENTITY cmd.optionsUnix.label            "Preferences">
+<!ENTITY cmd.optionsUnix.accesskey        "n">

 <!ENTITY closeWhenDone.label              "Close when downloads complete">
 <!ENTITY closeWhenDone.tooltip            "Closes the Downloads window when all files are done downloading">
--- a/toolkit/mozapps/downloads/locale/unknownContentType.dtd
+++ b/toolkit/mozapps/downloads/locale/unknownContentType.dtd
@ -51,6 +51,7 @@

 <!ENTITY  settingsChange.label        "Settings can be changed in the Downloads section of Tools, Options.">
 <!ENTITY  settingsChangeMac.label     "Settings can be changed in the Downloads section of &brandShortName;, Preferences.">
+<!ENTITY  settingsChangeUnix.label    "Settings can be changed in the Downloads section of Edit, Preferences.">

 <!ENTITY  whichIsA.label              "which is a:">

--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@ -69,6 +69,11 @@
        </xul:vbox>
        <xul:vbox pack="start">
          <xul:image class="extension-button" anonid="options-button" 
+#ifdef XP_WIN
+                     tooltiptext="&options.tooltip;" 
+#else
+                     tooltiptext="&optionsUnix.tooltip;" 
+#endif
                     tooltiptext="&options.tooltip;" 
                     onclick="this.parentNode.parentNode.parentNode.fireEvent('options');"/>
          <xul:image class="extension-button" anonid="about-button" 
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@ -72,7 +72,7 @@
         oncommand="gExtensionsViewController.doCommand('cmd_close');"/>
    <key id="key_about"   key="&cmd.info.commandKey;"     modifiers="accel" command="cmd_about" 
         oncommand="gExtensionsViewController.doCommand('cmd_about');"/>
-    <key id="key_options" key="&cmd.options.commandKey;"  modifiers="accel" command="cmd_options" 
+    <key id="key_options" key="&cmd.options.commandKey;"  modifiers="accel" command="cmd_options"
         oncommand="gExtensionsViewController.doCommand('cmd_options');"/>
  </keyset>
  
@ -99,7 +99,11 @@
    <menuitem id="menuitem_useTheme" default="true" command="cmd_useTheme"
              label="&cmd.useTheme.label;" accesskey="&cmd.useTheme.accesskey;"/>
    <menuitem id="menuitem_options" default="true" command="cmd_options"
+#ifdef XP_WIN
              label="&cmd.options.label;" accesskey="&cmd.options.accesskey;"/>
+#else
+              label="&cmd.optionsUnix.label;" accesskey="&cmd.optionsUnix.accesskey;"/>
+#endif
    <menuitem id="menuitem_homepage" command="cmd_homepage"
              label="&cmd.homepage.label;" accesskey="&cmd.homepage.accesskey;"/>
    <menuitem id="menuitem_about" command="cmd_about"
--- a/toolkit/mozapps/extensions/locale/extensions.dtd
+++ b/toolkit/mozapps/extensions/locale/extensions.dtd
@ -18,6 +18,8 @@
 <!-- Context Menu Options: Extension -->
 <!ENTITY cmd.options.label                "Options">
 <!ENTITY cmd.options.accesskey            "O">
+<!ENTITY cmd.optionsUnix.label            "Preferences">
+<!ENTITY cmd.optionsUnix.accesskey        "r">
 <!ENTITY cmd.homepage.label               "Visit Home Page">
 <!ENTITY cmd.homepage.accesskey           "H">
 <!ENTITY cmd.about.label                  "About this Extension">
@ -39,6 +41,7 @@

 <!-- Extension Items -->
 <!ENTITY options.tooltip                  "Options">
+<!ENTITY optionsUnix.tooltip              "Preferences">
 <!ENTITY about.tooltip                    "About">
 <!ENTITY homepage.tooltip                 "Home Page">