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

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

Issue 66713002: Get rid of {Enable|Disable|ChromeCaptivePortalDetector flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restored blank line. Created 7 years, 1 month 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 | « no previous file | chrome/app/generated_resources.grd » ('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 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 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 <!-- about:flags --> 700 <!-- about:flags -->
701 <if expr="not pp_ifdef('chromeos')"> 701 <if expr="not pp_ifdef('chromeos')">
702 <message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that h e needs to relaunch Chromium. Shown next to a button that says 'Relaunch Now'."> 702 <message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that h e needs to relaunch Chromium. Shown next to a button that says 'Relaunch Now'.">
703 Your changes will take effect the next time you relaunch Chromium. 703 Your changes will take effect the next time you relaunch Chromium.
704 </message> 704 </message>
705 </if> 705 </if>
706 <if expr="pp_ifdef('chromeos')"> 706 <if expr="pp_ifdef('chromeos')">
707 <message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that h e needs to restart Chromium OS. Shown next to a button that says 'Restart Now'." > 707 <message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that h e needs to restart Chromium OS. Shown next to a button that says 'Restart Now'." >
708 Your changes will take effect the next time you restart your device. 708 Your changes will take effect the next time you restart your device.
709 </message> 709 </message>
710 <message name="IDS_FLAGS_CHROME_CAPTIVE_PORTAL_DETECTOR" desc="Descripti on for the option of Captive Portal detector.">
711 Chromium Captive Portal detector
712 </message>
713 </if> 710 </if>
714 711
715 <!-- Obsolete System info bar --> 712 <!-- Obsolete System info bar -->
716 <message name="IDS_SYSTEM_OBSOLETE_MESSAGE" desc="Message shown when your OS is no longer supported. This message is followed by a 'Learn more' link."> 713 <message name="IDS_SYSTEM_OBSOLETE_MESSAGE" desc="Message shown when your OS is no longer supported. This message is followed by a 'Learn more' link.">
717 Chromium has stopped updating and no longer supports this version of yo ur operating system. 714 Chromium has stopped updating and no longer supports this version of yo ur operating system.
718 </message> 715 </message>
719 716
720 <!-- Google API keys info bar --> 717 <!-- Google API keys info bar -->
721 <message name="IDS_MISSING_GOOGLE_API_KEYS" desc="Message shown when Googl e API keys are missing. This message is followed by a 'Learn more' link."> 718 <message name="IDS_MISSING_GOOGLE_API_KEYS" desc="Message shown when Googl e API keys are missing. This message is followed by a 'Learn more' link.">
722 Google API keys are missing. Some functionality of Chromium will be disa bled. 719 Google API keys are missing. Some functionality of Chromium will be disa bled.
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 <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 <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.">
1061 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 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.
1062 </message> 1059 </message>
1063 <message name="IDS_PROFILE_IN_USE_LINUX_RELAUNCH" desc="Text of button in dialog to delete the profile lock file."> 1060 <message name="IDS_PROFILE_IN_USE_LINUX_RELAUNCH" desc="Text of button in dialog to delete the profile lock file.">
1064 Unlock Profile and Relaunch 1061 Unlock Profile and Relaunch
1065 </message> 1062 </message>
1066 1063
1067 </messages> 1064 </messages>
1068 </release> 1065 </release>
1069 </grit> 1066 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698