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

Side by Side Diff: chrome/app/chromium_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/bookmarks_strings.grdp ('k') | 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 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 465
466 Chromium is unable to recover your settings. 466 Chromium is unable to recover your settings.
467 </message> 467 </message>
468 <!-- Crash Recovery Dialog --> 468 <!-- Crash Recovery Dialog -->
469 <message name="IDS_CRASH_RECOVERY_TITLE" desc="Title of dialog shown when the browser crashes."> 469 <message name="IDS_CRASH_RECOVERY_TITLE" desc="Title of dialog shown when the browser crashes.">
470 Chromium 470 Chromium
471 </message> 471 </message>
472 <message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed."> 472 <message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed.">
473 Whoa! Chromium has crashed. Relaunch now? 473 Whoa! Chromium has crashed. Relaunch now?
474 </message> 474 </message>
475 <if expr="not pp_ifdef('android')"> 475 <if expr="not is_android">
476 <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Info bar message to save a password"> 476 <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Info bar message to save a password">
477 Do you want Chromium to save your password? 477 Do you want Chromium to save your password?
478 </message> 478 </message>
479 </if> 479 </if>
480 <if expr="pp_ifdef('android')"> 480 <if expr="is_android">
481 <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Mobile: Info bar message to save a password"> 481 <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Mobile: Info bar message to save a password">
482 Do you want Chromium to save your password for this site? 482 Do you want Chromium to save your password for this site?
483 </message> 483 </message>
484 </if> 484 </if>
485 <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." > 485 <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." >
486 Exit Chromium 486 Exit Chromium
487 </message> 487 </message>
488 <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."> 488 <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.">
489 An administrator has installed Chromium on this system, and it is availa ble for all users. The system-level Chromium will replace your user-level instal lation now. 489 An administrator has installed Chromium on this system, and it is availa ble for all users. The system-level Chromium will replace your user-level instal lation now.
490 </message> 490 </message>
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 <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."> 682 <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.">
683 Chromium has stopped updating and no longer supports this version of yo ur operating system. 683 Chromium has stopped updating and no longer supports this version of yo ur operating system.
684 </message> 684 </message>
685 685
686 <!-- Google API keys info bar --> 686 <!-- Google API keys info bar -->
687 <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."> 687 <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.">
688 Google API keys are missing. Some functionality of Chromium will be disa bled. 688 Google API keys are missing. Some functionality of Chromium will be disa bled.
689 </message> 689 </message>
690 690
691 <!-- about:memory --> 691 <!-- about:memory -->
692 <if expr="not pp_ifdef('android')"> 692 <if expr="not is_android">
693 <message name="IDS_MEMORY_USAGE_SUMMARY_DESC" desc="Describes the browse r summary table in the about memory page, which shows memory usage for Chromium and any other active browsers." translateable="false"> 693 <message name="IDS_MEMORY_USAGE_SUMMARY_DESC" desc="Describes the browse r summary table in the about memory page, which shows memory usage for Chromium and any other active browsers." translateable="false">
694 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. 694 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.
695 695
696 For Chromium, processes used to display diagnostics information (such as this "a bout:memory") are excluded. 696 For Chromium, processes used to display diagnostics information (such as this "a bout:memory") are excluded.
697 </message> 697 </message>
698 </if> 698 </if>
699 <if expr="pp_ifdef('android')"> 699 <if expr="is_android">
700 <message name="IDS_MEMORY_USAGE_SUMMARY_DESC" desc="Describes the browse r summary table in the about memory page, which shows memory usage for Chromium. " translateable="false"> 700 <message name="IDS_MEMORY_USAGE_SUMMARY_DESC" desc="Describes the browse r summary table in the about memory page, which shows memory usage for Chromium. " translateable="false">
701 Summary of memory used by Chromium. Since Chromium uses multiple processes, memo ry reflects aggregate memory used across all browser processes. 701 Summary of memory used by Chromium. Since Chromium uses multiple processes, memo ry reflects aggregate memory used across all browser processes.
702 702
703 For Chromium, processes used to display diagnostics information (such as this "a bout:memory") are excluded. 703 For Chromium, processes used to display diagnostics information (such as this "a bout:memory") are excluded.
704 </message> 704 </message>
705 </if> 705 </if>
706 706
707 <!-- About Chrome page --> 707 <!-- About Chrome page -->
708 <if expr="not pp_ifdef('chromeos')"> 708 <if expr="not pp_ifdef('chromeos')">
709 <message name="IDS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Succ essfully updated Chromium"> 709 <message name="IDS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Succ essfully updated Chromium">
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 Allow Chromium to access the network in your firewall or antivirus 890 Allow Chromium to access the network in your firewall or antivirus
891 settings. 891 settings.
892 </message> 892 </message>
893 <if expr="is_macosx and not pp_ifdef('ios')"> 893 <if expr="is_macosx and not pp_ifdef('ios')">
894 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="M ac OSX instructions for disabling use of a proxy server."> 894 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="M ac OSX instructions for disabling use of a proxy server.">
895 Go to 895 Go to
896 Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; P roxies 896 Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; P roxies
897 and deselect any proxies that have been selected. 897 and deselect any proxies that have been selected.
898 </message> 898 </message>
899 </if> 899 </if>
900 <if expr="pp_ifdef('android') or pp_ifdef('ios')"> 900 <if expr="is_android or pp_ifdef('ios')">
901 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="I nstructions for disabling use of a proxy server (leave empty for Android and iOS )."> 901 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="I nstructions for disabling use of a proxy server (leave empty for Android and iOS ).">
902 </message> 902 </message>
903 </if> 903 </if>
904 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not pp_ifdef('android') and not pp_ifdef('ios')"> 904 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not is_android and not pp_ifdef('ios')">
905 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="L inux instructions for disabling use of a proxy server."> 905 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="L inux instructions for disabling use of a proxy server.">
906 Go to 906 Go to
907 the Chromium menu &gt; 907 the Chromium menu &gt;
908 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph> 908 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph>
909 &gt; 909 &gt;
910 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph> 910 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph>
911 &gt; 911 &gt;
912 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph> 912 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph>
913 and make sure your configuration is set to &quot;no proxy&quot; or &qu ot;direct.&quot; 913 and make sure your configuration is set to &quot;no proxy&quot; or &qu ot;direct.&quot;
914 </message> 914 </message>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 959
960 <!-- Chrome OS OOBE Terms of Service screen--> 960 <!-- Chrome OS OOBE Terms of Service screen-->
961 <if expr="pp_ifdef('chromeos')"> 961 <if expr="pp_ifdef('chromeos')">
962 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen."> 962 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen.">
963 <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 Chromium OS Terms. 963 <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 Chromium OS Terms.
964 </message> 964 </message>
965 </if> 965 </if>
966 </messages> 966 </messages>
967 </release> 967 </release>
968 </grit> 968 </grit>
OLDNEW
« no previous file with comments | « chrome/app/bookmarks_strings.grdp ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698