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

Side by Side Diff: chrome/app/google_chrome_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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/about_flags.cc » ('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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 <!-- about:flags --> 624 <!-- about:flags -->
625 <if expr="not pp_ifdef('chromeos')"> 625 <if expr="not pp_ifdef('chromeos')">
626 <message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that h e needs to relaunch Chrome. Shown next to a button that says 'Relaunch Now'."> 626 <message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that h e needs to relaunch Chrome. Shown next to a button that says 'Relaunch Now'.">
627 Your changes will take effect the next time you relaunch Google Chrome . 627 Your changes will take effect the next time you relaunch Google Chrome .
628 </message> 628 </message>
629 </if> 629 </if>
630 <if expr="pp_ifdef('chromeos')"> 630 <if expr="pp_ifdef('chromeos')">
631 <message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that h e needs to restart Chrome OS. Shown next to a button that says 'Restart Now'."> 631 <message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that h e needs to restart Chrome OS. Shown next to a button that says 'Restart Now'.">
632 Your changes will take effect the next time you restart your device. 632 Your changes will take effect the next time you restart your device.
633 </message> 633 </message>
634 <message name="IDS_FLAGS_CHROME_CAPTIVE_PORTAL_DETECTOR" desc="Descripti on for the option of Captive Portal detector.">
635 Chrome Captive Portal detector
636 </message>
637 </if> 634 </if>
638 635
639 <!-- Obsolete System info bar --> 636 <!-- Obsolete System info bar -->
640 <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."> 637 <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.">
641 Google Chrome has stopped updating and no longer supports this version of your operating system. 638 Google Chrome has stopped updating and no longer supports this version of your operating system.
642 </message> 639 </message>
643 640
644 <!-- Google API keys info bar --> 641 <!-- Google API keys info bar -->
645 <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."> 642 <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.">
646 Google API keys are missing. Some functionality of Google Chrome will be disabled. 643 Google API keys are missing. Some functionality of Google Chrome will be disabled.
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 <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."> 981 <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.">
985 The profile appears to be in use by another Google Chrome process (<ph n ame="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME ">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn' t get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. 982 The profile appears to be in use by another Google Chrome process (<ph n ame="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME ">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn' t get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
986 </message> 983 </message>
987 <message name="IDS_PROFILE_IN_USE_LINUX_RELAUNCH" desc="Text of button in dialog to delete the profile lock file."> 984 <message name="IDS_PROFILE_IN_USE_LINUX_RELAUNCH" desc="Text of button in dialog to delete the profile lock file.">
988 Unlock Profile and Relaunch 985 Unlock Profile and Relaunch
989 </message> 986 </message>
990 987
991 </messages> 988 </messages>
992 </release> 989 </release>
993 </grit> 990 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698