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

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

Issue 14834011: Android: use grit target platform instead of define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missed pp_ifdef(android) Created 7 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/generated_resources.grd ('k') | chrome/app/resources/locale_settings.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 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 388
389 Google Chrome is unable to recover your settings. 389 Google Chrome is unable to recover your settings.
390 </message> 390 </message>
391 <!-- Crash Recovery Dialog --> 391 <!-- Crash Recovery Dialog -->
392 <message name="IDS_CRASH_RECOVERY_TITLE" desc="Title of dialog shown when the browser crashes."> 392 <message name="IDS_CRASH_RECOVERY_TITLE" desc="Title of dialog shown when the browser crashes.">
393 Google Chrome 393 Google Chrome
394 </message> 394 </message>
395 <message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed."> 395 <message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed.">
396 Whoa! Google Chrome has crashed. Relaunch now? 396 Whoa! Google Chrome has crashed. Relaunch now?
397 </message> 397 </message>
398 <if expr="not pp_ifdef('android')"> 398 <if expr="not is_android">
399 <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Info bar message to save a password"> 399 <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Info bar message to save a password">
400 Do you want Google Chrome to save your password? 400 Do you want Google Chrome to save your password?
401 </message> 401 </message>
402 </if> 402 </if>
403 <if expr="pp_ifdef('android')"> 403 <if expr="is_android">
404 <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Mobile: Info bar message to save a password"> 404 <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Mobile: Info bar message to save a password">
405 Do you want Google Chrome to save your password for this site? 405 Do you want Google Chrome to save your password for this site?
406 </message> 406 </message>
407 </if> 407 </if>
408 <message name="IDS_CANT_WRITE_USER_DIRECTORY_EXIT_BUTTON" desc="Text on bu tton of dialog that closes Chrome if we can't create a directory for this user." > 408 <message name="IDS_CANT_WRITE_USER_DIRECTORY_EXIT_BUTTON" desc="Text on bu tton of dialog that closes Chrome if we can't create a directory for this user." >
409 Exit Chrome 409 Exit Chrome
410 </message> 410 </message>
411 <message name="IDS_MACHINE_LEVEL_INSTALL_CONFLICT" desc="Error message to display when user tries to run user level Chromium even though machine level Chr omium is already installed."> 411 <message name="IDS_MACHINE_LEVEL_INSTALL_CONFLICT" desc="Error message to display when user tries to run user level Chromium even though machine level Chr omium is already installed.">
412 An administrator has installed Google Chrome on this system, and it is a vailable for all users. The system-level Google Chrome will replace your user-le vel installation now. 412 An administrator has installed Google Chrome on this system, and it is a vailable for all users. The system-level Google Chrome will replace your user-le vel installation now.
413 </message> 413 </message>
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 <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."> 606 <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.">
607 Google Chrome has stopped updating and no longer supports this version of your operating system. 607 Google Chrome has stopped updating and no longer supports this version of your operating system.
608 </message> 608 </message>
609 609
610 <!-- Google API keys info bar --> 610 <!-- Google API keys info bar -->
611 <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."> 611 <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.">
612 Google API keys are missing. Some functionality of Google Chrome will be disabled. 612 Google API keys are missing. Some functionality of Google Chrome will be disabled.
613 </message> 613 </message>
614 614
615 <!-- about:memory --> 615 <!-- about:memory -->
616 <if expr="not pp_ifdef('android')"> 616 <if expr="not is_android">
617 <message name="IDS_MEMORY_USAGE_SUMMARY_DESC" desc="Describes the browse r summary table in the about memory page, which shows memory usage for Google Ch rome and any other active browsers." translateable="false"> 617 <message name="IDS_MEMORY_USAGE_SUMMARY_DESC" desc="Describes the browse r summary table in the about memory page, which shows memory usage for Google Ch rome and any other active browsers." translateable="false">
618 Summary of memory used by currently active browsers. For browsers which use mult iple processes, memory reflects aggregate memory used across all browser process es. 618 Summary of memory used by currently active browsers. For browsers which use mult iple processes, memory reflects aggregate memory used across all browser process es.
619 619
620 For Google Chrome, processes used to display diagnostics information (such as th is "about:memory") are excluded. 620 For Google Chrome, processes used to display diagnostics information (such as th is "about:memory") are excluded.
621 </message> 621 </message>
622 </if> 622 </if>
623 <if expr="pp_ifdef('android')"> 623 <if expr="is_android">
624 <message name="IDS_MEMORY_USAGE_SUMMARY_DESC" desc="Describes the browse r summary table in the about memory page, which shows memory usage for Google Ch rome." translateable="false"> 624 <message name="IDS_MEMORY_USAGE_SUMMARY_DESC" desc="Describes the browse r summary table in the about memory page, which shows memory usage for Google Ch rome." translateable="false">
625 Summary of memory used by Google Chrome. Since Google Chrome uses multiple proce sses, memory reflects aggregate memory used across all browser processes. 625 Summary of memory used by Google Chrome. Since Google Chrome uses multiple proce sses, memory reflects aggregate memory used across all browser processes.
626 626
627 For Google Chrome, processes used to display diagnostics information (such as th is "about:memory") are excluded. 627 For Google Chrome, processes used to display diagnostics information (such as th is "about:memory") are excluded.
628 </message> 628 </message>
629 </if> 629 </if>
630 630
631 <!-- About Chrome page --> 631 <!-- About Chrome page -->
632 <if expr="not pp_ifdef('chromeos')"> 632 <if expr="not pp_ifdef('chromeos')">
633 <message name="IDS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Succ essfully updated Google Chrome"> 633 <message name="IDS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Succ essfully updated Google Chrome">
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 Allow Chrome to access the network in your firewall or antivirus 814 Allow Chrome to access the network in your firewall or antivirus
815 settings. 815 settings.
816 </message> 816 </message>
817 <if expr="is_macosx and not pp_ifdef('ios')"> 817 <if expr="is_macosx and not pp_ifdef('ios')">
818 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="M ac OSX instructions for disabling use of a proxy server."> 818 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="M ac OSX instructions for disabling use of a proxy server.">
819 Go to 819 Go to
820 Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; P roxies 820 Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; P roxies
821 and deselect any proxies that have been selected. 821 and deselect any proxies that have been selected.
822 </message> 822 </message>
823 </if> 823 </if>
824 <if expr="pp_ifdef('android') or pp_ifdef('ios')"> 824 <if expr="is_android or pp_ifdef('ios')">
825 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="I nstructions for disabling use of a proxy server (leave empty for Android and iOS )."> 825 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="I nstructions for disabling use of a proxy server (leave empty for Android and iOS ).">
826 </message> 826 </message>
827 </if> 827 </if>
828 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not pp_ifdef('android') and not pp_ifdef('ios')"> 828 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not is_android and not pp_ifdef('ios')">
829 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="L inux instructions for disabling use of a proxy server."> 829 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="L inux instructions for disabling use of a proxy server.">
830 Go to 830 Go to
831 the Chrome menu &gt; 831 the Chrome menu &gt;
832 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph> 832 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph>
833 &gt; 833 &gt;
834 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph> 834 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph>
835 &gt; 835 &gt;
836 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph> 836 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph>
837 and make sure your configuration is set to &quot;no proxy&quot; or &qu ot;direct.&quot; 837 and make sure your configuration is set to &quot;no proxy&quot; or &qu ot;direct.&quot;
838 </message> 838 </message>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 883
884 <!-- Chrome OS OOBE Terms of Service screen--> 884 <!-- Chrome OS OOBE Terms of Service screen-->
885 <if expr="pp_ifdef('chromeos')"> 885 <if expr="pp_ifdef('chromeos')">
886 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen."> 886 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen.">
887 <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read a nd accept the following Terms of Service before using this device. These terms d o not expand, modify or limit the Google Chrome OS Terms. 887 <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read a nd accept the following Terms of Service before using this device. These terms d o not expand, modify or limit the Google Chrome OS Terms.
888 </message> 888 </message>
889 </if> 889 </if>
890 </messages> 890 </messages>
891 </release> 891 </release>
892 </grit> 892 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/app/resources/locale_settings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698