Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 23506011: Improve the UI for handling profile lock contention. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Only do it if we're REALLY sure it's a stale lock. Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
« no previous file with comments | « no previous file | chrome/browser/process_singleton_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 0f8819713f7bafe19b26099091355ccaefb8f139..445336a6bd613852fe4c2a22131e877bbc3629c0 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -13734,7 +13734,10 @@ Some features may be unavailable. Please check that the profile exists and you
<!-- ProcessSingleton -->
<message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
- The profile appears to be in use by process <ph name="PROCESS_ID">$1<ex>12345</ex></ph> on host <ph name="HOST_NAME">$2<ex>example.com</ex></ph>. If you are sure no other processes are using this profile, delete the file <ph name="LOCK_FILE">$3<ex>/home/user/.config/google-chrome/SingletonLock</ex></ph> and relaunch <ph name="PRODUCT_NAME">$4<ex>Google Chrome</ex></ph>.
+ The profile appears to be in use by another <ph name="PRODUCT_NAME">$3<ex>Google Chrome</ex></ph> process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). (To protect against data corruption, <ph name="PRODUCT_NAME">$3<ex>Google Chrome</ex></ph> locks profiles so that only one instance of <ph name="PRODUCT_NAME">$3<ex>Google Chrome</ex></ph> can use the profile.) If you are sure no other processes are using this profile, click Unlock Profile and Relaunch. Otherwise, click Quit.
Nico 2013/09/04 15:58:04 This won't localize well. Put this into the chromi
+ </message>
+ <message name="IDS_PROFILE_IN_USE_LINUX_RELAUNCH" desc="Text of button in dialog to delete the profile lock file.">
+ Unlock Profile and Relaunch
</message>
<!-- Update Recommended dialog -->
« no previous file with comments | « no previous file | chrome/browser/process_singleton_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698