From 08f4b5ef4e1063e4f43470602f56146edb7a3d33 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Fri, 29 Jul 2005 15:54:34 +0000 Subject: [PATCH] Bug 302039 - Locked profile dialog needs a better message, r=mconnor+beltzner, a=asa git-svn-id: svn://10.0.0.236/trunk@176837 18797224-902f-48f8-a5cc-f745e15eee43 --- .../en-US/chrome/mozapps/profile/profileSelection.properties | 5 +++-- mozilla/toolkit/xre/nsAppRunner.cpp | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mozilla/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties b/mozilla/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties index 9b096595b07..46b64206cc2 100644 --- a/mozilla/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties +++ b/mozilla/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties @@ -1,7 +1,8 @@ # LOCALIZATION NOTE: Do not translate -restartTitle=Restart %S -restartMessage=%S is already running, but is not responding. To open a new window, you must restart %S. +restartTitle=Close %S +restartMessageNoUnlocker=%S is already running, but is not responding. To open a new window, you must first close the existing %S process, or restart your system. +restartMessageUnlocker=%S is already running, but is not responding. The old %S process must be closed to open a new window. profileTooltip=Profile: '%S' - Path: '%S' diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp index 245565821ec..0d8aa1e6178 100644 --- a/mozilla/toolkit/xre/nsAppRunner.cpp +++ b/mozilla/toolkit/xre/nsAppRunner.cpp @@ -1250,7 +1250,10 @@ ProfileLockedDialog(nsILocalFile* aProfileDir, nsILocalFile* aProfileLocalDir, const PRUnichar* params[] = {appName.get(), appName.get()}; nsXPIDLString killMessage; - sb->FormatStringFromName(NS_LITERAL_STRING("restartMessage").get(), + static const PRUnichar kRestartNoUnlocker[] = {'r','e','s','t','a','r','t','M','e','s','s','a','g','e','N','o','U','n','l','o','c','k','e','r'}; + static const PRUnichar kRestartUnlocker[] = {'r','e','s','t','a','r','t','M','e','s','s','a','g','e','U','n','l','o','c','k','e','r'}; + + sb->FormatStringFromName(aUnlocker ? kRestartUnlocker : kRestartNoUnlocker, params, 2, getter_Copies(killMessage)); nsXPIDLString killTitle;