From dd71c7387d78da9963ad46827dea818b39849ede Mon Sep 17 00:00:00 2001
From: "myk%mozilla.org" <myk%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 3 Oct 2007 20:46:53 +0000
Subject: [PATCH] bug 395317: make the download dialog directions for changing
 content handling preferences be correct now that we have the new Applications
 prefpane; r=gavin

git-svn-id: svn://10.0.0.236/trunk@237203 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../en-US/chrome/overrides/settingsChange.dtd | 42 +++++++++++++++++++
 mozilla/browser/locales/jar.mn                |  1 +
 .../mozapps/downloads/settingsChange.dtd      | 42 +++++++++++++++++++
 .../mozapps/downloads/unknownContentType.dtd  |  4 --
 mozilla/toolkit/locales/jar.mn                |  1 +
 .../downloads/content/unknownContentType.xul  | 10 ++---
 6 files changed, 90 insertions(+), 10 deletions(-)
 create mode 100644 mozilla/browser/locales/en-US/chrome/overrides/settingsChange.dtd
 create mode 100644 mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/settingsChange.dtd

diff --git a/mozilla/browser/locales/en-US/chrome/overrides/settingsChange.dtd b/mozilla/browser/locales/en-US/chrome/overrides/settingsChange.dtd
new file mode 100644
index 00000000000..4f90e8e40ca
--- /dev/null
+++ b/mozilla/browser/locales/en-US/chrome/overrides/settingsChange.dtd
@@ -0,0 +1,42 @@
+<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.org Code.
+#
+# The Initial Developer of the Original Code is
+# Doron Rosenberg.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Ben Goodger <ben@bengoodger.com>
+#   Myk Melez <myk@mozilla.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+-->
+
+<!ENTITY  settingsChangePreferences.label  "Settings can be changed using the Applications tab in &brandShortName;'s Preferences.">
+<!ENTITY  settingsChangeOptions.label      "Settings can be changed using the Applications tab in &brandShortName;'s Options.">
diff --git a/mozilla/browser/locales/jar.mn b/mozilla/browser/locales/jar.mn
index 89b41eb6266..830120e52d1 100644
--- a/mozilla/browser/locales/jar.mn
+++ b/mozilla/browser/locales/jar.mn
@@ -86,6 +86,7 @@
 # the following files are browser-specific overrides
 *   locale/@AB_CD@/global/netError.dtd                (%chrome/overrides/netError.dtd)
 *   locale/@AB_CD@/global/appstrings.properties       (%chrome/overrides/appstrings.properties)
+*   locale/@AB_CD@/mozapps/downloads/settingsChange.dtd  (%chrome/overrides/settingsChange.dtd)
 #ifdef MOZ_USE_GENERIC_BRANDING
 % locale branding @AB_CD@ %locale/branding/
     locale/branding/brand.dtd         (%chrome/branding/brand.dtd)
diff --git a/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/settingsChange.dtd b/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/settingsChange.dtd
new file mode 100644
index 00000000000..a4dd4ffe9b9
--- /dev/null
+++ b/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/settingsChange.dtd
@@ -0,0 +1,42 @@
+<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.org Code.
+#
+# The Initial Developer of the Original Code is
+# Doron Rosenberg.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Ben Goodger <ben@bengoodger.com>
+#   Myk Melez <myk@mozilla.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+-->
+
+<!ENTITY  settingsChangePreferences.label  "Settings can be changed in &brandShortName;'s Preferences.">
+<!ENTITY  settingsChangeOptions.label      "Settings can be changed in &brandShortName;'s Options.">
diff --git a/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.dtd b/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.dtd
index 7e3a1521372..39e80c006c1 100755
--- a/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.dtd
+++ b/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.dtd
@@ -51,10 +51,6 @@
 <!ENTITY  rememberChoice.label        "Do this automatically for files like this from now on.">
 <!ENTITY  rememberChoice.accesskey    "a">
 
-<!ENTITY  settingsChange.label        "Settings can be changed in the Content section of Tools, Options.">
-<!ENTITY  settingsChangeMac.label     "Settings can be changed in the Content section of &brandShortName;, Preferences.">
-<!ENTITY  settingsChangeUnix.label    "Settings can be changed in the Content section of Edit, Preferences.">
-
 <!ENTITY  whichIsA.label              "which is a:">
 
 <!ENTITY  chooseHandlerMac.label      "Choose...">
diff --git a/mozilla/toolkit/locales/jar.mn b/mozilla/toolkit/locales/jar.mn
index 9c36bbc3fb8..9a29efd5d12 100644
--- a/mozilla/toolkit/locales/jar.mn
+++ b/mozilla/toolkit/locales/jar.mn
@@ -67,6 +67,7 @@
 % locale mozapps @AB_CD@ %locale/@AB_CD@/mozapps/
 * locale/@AB_CD@/mozapps/downloads/unknownContentType.properties  (%chrome/mozapps/downloads/unknownContentType.properties)
 * locale/@AB_CD@/mozapps/downloads/unknownContentType.dtd         (%chrome/mozapps/downloads/unknownContentType.dtd)
+* locale/@AB_CD@/mozapps/downloads/settingsChange.dtd             (%chrome/mozapps/downloads/settingsChange.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.dtd                  (%chrome/mozapps/downloads/downloads.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.properties           (%chrome/mozapps/downloads/downloads.properties)
   locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/extensions/extensions.dtd)
diff --git a/mozilla/toolkit/mozapps/downloads/content/unknownContentType.xul b/mozilla/toolkit/mozapps/downloads/content/unknownContentType.xul
index 895297bfaa7..6186c23237c 100755
--- a/mozilla/toolkit/mozapps/downloads/content/unknownContentType.xul
+++ b/mozilla/toolkit/mozapps/downloads/content/unknownContentType.xul
@@ -46,6 +46,8 @@
   %brandDTD;
   <!ENTITY % uctDTD SYSTEM "chrome://mozapps/locale/downloads/unknownContentType.dtd" >
   %uctDTD;
+  <!ENTITY % scDTD SYSTEM "chrome://mozapps/locale/downloads/settingsChange.dtd" >
+  %scDTD;
 ]>            
 
 <dialog id="unknownContentType"
@@ -117,13 +119,9 @@
       
       <separator/>
 #ifdef XP_UNIX
-#ifdef XP_MACOSX
-      <description id="settingsChange" hidden="true">&settingsChangeMac.label;</description>
+      <description id="settingsChange" hidden="true">&settingsChangePreferences.label;</description>
 #else
-      <description id="settingsChange" hidden="true">&settingsChangeUnix.label;</description>
-#endif
-#else
-      <description id="settingsChange" hidden="true">&settingsChange.label;</description>
+      <description id="settingsChange" hidden="true">&settingsChangeOptions.label;</description>
 #endif
       <separator class="thin"/>
     </groupbox>