trunk/src/chrome/app/chromium_strings.grd - Issue 23708026: Revert 222159 "Improve the UI for handling profile lock contention."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: trunk/src/chrome/app/chromium_strings.grd

Issue 23708026: Revert 222159 "Improve the UI for handling profile lock contention." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <!-- This file contains definitions of strings that are distribution specific.	2 <!-- This file contains definitions of strings that are distribution specific.

3 These strings will not be translated and only english versions will	3 These strings will not be translated and only english versions will

4 be available for now. -->	4 be available for now. -->

5	5

6 <grit base_dir="." latest_public_release="0" current_release="1"	6 <grit base_dir="." latest_public_release="0" current_release="1"

7 source_lang_id="en" enc_check="möl">	7 source_lang_id="en" enc_check="möl">

8 <outputs>	8 <outputs>

9 <output filename="grit/chromium_strings.h" type="rc_header">	9 <output filename="grit/chromium_strings.h" type="rc_header">

10 <emit emit_type='prepend'></emit>	10 <emit emit_type='prepend'></emit>

(...skipping 1033 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1044 <!-- MediaStream capture status tray icon -->	1044 <!-- MediaStream capture status tray icon -->

1045 <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_AND_VIDEO" desc="To ol tip for the capture status tray icon when microphone and camera are being use d">	1045 <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_AND_VIDEO" desc="To ol tip for the capture status tray icon when microphone and camera are being use d">

1046 Chromium is using your camera and microphone.	1046 Chromium is using your camera and microphone.

1047 </message>	1047 </message>

1048 <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_ONLY" desc="Tool ti p for the capture status tray icon when microphone is being used">	1048 <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_ONLY" desc="Tool ti p for the capture status tray icon when microphone is being used">

1049 Chromium is using your microphone.	1049 Chromium is using your microphone.

1050 </message>	1050 </message>

1051 <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_VIDEO_ONLY" desc="Tool ti p for the capture status tray icon when camera is being used">	1051 <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_VIDEO_ONLY" desc="Tool ti p for the capture status tray icon when camera is being used">

1052 Chromium is using your camera.	1052 Chromium is using your camera.

1053 </message>	1053 </message>

1054

1055 <!-- ProcessSingleton -->

1056 <message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the brow ser cannot start because the profile is in use on a different host.">

1057 The profile appears to be in use by another Chromium process (<ph name=" PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2< ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't ge t corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.

1058 </message>

1059 <message name="IDS_PROFILE_IN_USE_LINUX_RELAUNCH" desc="Text of button in dialog to delete the profile lock file.">

1060 Unlock Profile and Relaunch

1061 </message>

1062

1063 </messages>	1054 </messages>

1064 </release>	1055 </release>

1065 </grit>	1056 </grit>

OLD	NEW

« no previous file with comments | « no previous file | trunk/src/chrome/app/generated_resources.grd » ('j') | no next file with comments »