Bug 302039 - Locked profile dialog needs a better message, r=mconnor+beltzner, a=asa

toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties

@@ -1,7 +1,8 @@
 # LOCALIZATION NOTE: Do not translate <html:br/> 
 
-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'
 

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;