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

Side by Side Diff: chrome/app/google_chrome_strings.grd

Issue 218883008: Use process_singleton_linux on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and rebase Created 6 years, 7 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
« no previous file with comments | « chrome/app/chromium_strings.grd ('k') | chrome/browser/process_singleton.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 specific to 2 <!-- This file contains definitions of strings that are specific to
3 Google Chrome. These strings will be translated for each locale that Google 3 Google Chrome. These strings will be translated for each locale that Google
4 Chrome supports. --> 4 Chrome supports. -->
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/google_chrome_strings.h" type="rc_header"> 9 <output filename="grit/google_chrome_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after
1010 Google Chrome is using your camera and microphone. 1010 Google Chrome is using your camera and microphone.
1011 </message> 1011 </message>
1012 <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"> 1012 <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">
1013 Google Chrome is using your microphone. 1013 Google Chrome is using your microphone.
1014 </message> 1014 </message>
1015 <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"> 1015 <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">
1016 Google Chrome is using your camera. 1016 Google Chrome is using your camera.
1017 </message> 1017 </message>
1018 1018
1019 <!-- ProcessSingleton --> 1019 <!-- ProcessSingleton -->
1020 <if expr="is_linux"> 1020 <if expr="is_linux or is_macosx">
1021 <message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the br owser cannot start because the profile is in use on a different host."> 1021 <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the br owser cannot start because the profile is in use on a different host.">
1022 The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NA ME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it does n't get corrupted. If you are sure no other processes are using this profile, y ou can unlock the profile and relaunch Chrome. 1022 The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NA ME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it does n't get corrupted. If you are sure no other processes are using this profile, y ou can unlock the profile and relaunch Chrome.
1023 </message> 1023 </message>
1024 </if> 1024 </if>
1025 1025
1026 <!-- Mac First-run dialog messages --> 1026 <!-- Mac First-run dialog messages -->
1027 <if expr="is_macosx"> 1027 <if expr="is_macosx">
1028 <message name="IDS_FIRSTRUN_DLG_MAC_SET_DEFAULT_BROWSER_LABEL" desc="Lab el for checkbox that sets the default browser"> 1028 <message name="IDS_FIRSTRUN_DLG_MAC_SET_DEFAULT_BROWSER_LABEL" desc="Lab el for checkbox that sets the default browser">
1029 Set Google Chrome as your default browser 1029 Set Google Chrome as your default browser
1030 </message> 1030 </message>
1031 </if> 1031 </if>
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 <message name="IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE" 1132 <message name="IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE"
1133 desc="Explanation in a new OTR window that extensions have been disabled while in OTR."> 1133 desc="Explanation in a new OTR window that extensions have been disabled while in OTR.">
1134 Because Google Chrome does not control how extensions handle your pers onal data, all extensions have been disabled for incognito windows. You can reen able them individually in the 1134 Because Google Chrome does not control how extensions handle your pers onal data, all extensions have been disabled for incognito windows. You can reen able them individually in the
1135 <ph name="BEGIN_LINK">&lt;a href="$1"&gt;</ph>extensions manager<ph na me="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>. 1135 <ph name="BEGIN_LINK">&lt;a href="$1"&gt;</ph>extensions manager<ph na me="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
1136 </message> 1136 </message>
1137 </if> 1137 </if>
1138 1138
1139 </messages> 1139 </messages>
1140 </release> 1140 </release>
1141 </grit> 1141 </grit>
OLDNEW
« no previous file with comments | « chrome/app/chromium_strings.grd ('k') | chrome/browser/process_singleton.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698