Bug 564097 - Move prompts.properties into commonDialog.properties. r=gavin, sr=bs
authorJustin Dolske <dolske@mozilla.com>
Wed, 16 Jun 2010 17:06:15 -0700
changeset 43705 9e30f01745880bb289371fba29ad7a12eca3acd8
parent 43704 71f62ccea4577e1e9de5f0d78e205a5a133a37cf
child 43706 dbe1e5c26aa3c4fecc5d31160fcfd21f0041af3f
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin, bs
bugs564097
milestone1.9.3a6pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 564097 - Move prompts.properties into commonDialog.properties. r=gavin, sr=bs
dom/locales/en-US/chrome/prompts.properties
dom/locales/jar.mn
embedding/components/windowwatcher/src/nsPrompt.cpp
extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp
toolkit/locales/en-US/chrome/global/commonDialogs.properties
deleted file mode 100644
--- a/dom/locales/en-US/chrome/prompts.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-# ***** 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
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 *****
-
-# LOCALIZATION NOTE (EnterLoginForRealm, EnterLoginForProxy):
-# %1 is an untrusted string provided by a remote server. It could try to
-# take advantage of sentence structure in order to mislead the user (see
-# bug 244273). %1 should be integrated into the translated sentences as
-# little as possible. %2 is the url of the site being accessed.
-EnterLoginForRealm=A username and password are being requested by %2$S. The site says: "%1$S"
-EnterLoginForProxy=The proxy %2$S is requesting a username and password. The site says: "%1$S"
-
-EnterUserPasswordFor=Enter username and password for %1$S
-EnterPasswordFor=Enter password for %1$S on %2$S
-
--- a/dom/locales/jar.mn
+++ b/dom/locales/jar.mn
@@ -23,9 +23,8 @@
   locale/@AB_CD@/global/layout/xmlparser.properties            (%chrome/layout/xmlparser.properties)
   locale/@AB_CD@/global/layout/HtmlForm.properties             (%chrome/layout/HtmlForm.properties)
   locale/@AB_CD@/global/security/caps.properties               (%chrome/security/caps.properties)
   locale/@AB_CD@/global/xml/prettyprint.dtd                    (%chrome/xml/prettyprint.dtd)
   locale/@AB_CD@/global-platform/win/accessible.properties     (%chrome/accessibility/win/accessible.properties)
   locale/@AB_CD@/global-platform/mac/accessible.properties     (%chrome/accessibility/mac/accessible.properties)
   locale/@AB_CD@/global-platform/unix/accessible.properties    (%chrome/accessibility/unix/accessible.properties)
   locale/@AB_CD@/global/storage.properties                     (%chrome/storage.properties)
-  locale/@AB_CD@/global/prompts.properties                     (%chrome/prompts.properties)
--- a/embedding/components/windowwatcher/src/nsPrompt.cpp
+++ b/embedding/components/windowwatcher/src/nsPrompt.cpp
@@ -389,17 +389,17 @@ MakeDialogText(nsIChannel* aChannel, nsI
                nsXPIDLString& message)
 {
   nsresult rv;
   nsCOMPtr<nsIStringBundleService> bundleSvc =
     do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIStringBundle> bundle;
-  rv = bundleSvc->CreateBundle("chrome://global/locale/prompts.properties",
+  rv = bundleSvc->CreateBundle("chrome://global/locale/commonDialogs.properties",
                                getter_AddRefs(bundle));
   NS_ENSURE_SUCCESS(rv, rv);
 
   // figure out what message to display...
   nsCAutoString host;
   PRInt32 port;
   NS_GetAuthHostPort(aChannel, aAuthInfo, PR_FALSE, host, &port);
 
--- a/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp
+++ b/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp
@@ -237,17 +237,17 @@ ProxiedAuthCallback(gconstpointer in,
   // nsHttpChannel.cpp.
 
   nsCOMPtr<nsIStringBundleService> bundleSvc =
       do_GetService(NS_STRINGBUNDLE_CONTRACTID);
   if (!bundleSvc)
     return;
 
   nsCOMPtr<nsIStringBundle> bundle;
-  bundleSvc->CreateBundle("chrome://global/locale/prompts.properties",
+  bundleSvc->CreateBundle("chrome://global/locale/commonDialogs.properties",
                           getter_AddRefs(bundle));
   if (!bundle)
     return;
 
   nsString message;
   if (!realm.IsEmpty())
   {
     const PRUnichar *strings[] = { realm.get(), dispHost.get() };
--- a/toolkit/locales/en-US/chrome/global/commonDialogs.properties
+++ b/toolkit/locales/en-US/chrome/global/commonDialogs.properties
@@ -9,8 +9,17 @@ OK=OK
 Cancel=Cancel
 Yes=&Yes
 No=&No
 Save=&Save
 Revert=&Revert
 DontSave=&Don't Save
 ScriptDlgGenericHeading=[JavaScript Application]
 ScriptDlgHeading=The page at %S says:
+# LOCALIZATION NOTE (EnterLoginForRealm, EnterLoginForProxy):
+# %1 is an untrusted string provided by a remote server. It could try to
+# take advantage of sentence structure in order to mislead the user (see
+# bug 244273). %1 should be integrated into the translated sentences as
+# little as possible. %2 is the url of the site being accessed.
+EnterLoginForRealm=A username and password are being requested by %2$S. The site says: "%1$S"
+EnterLoginForProxy=The proxy %2$S is requesting a username and password. The site says: "%1$S"
+EnterUserPasswordFor=Enter username and password for %1$S
+EnterPasswordFor=Enter password for %1$S on %2$S