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

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

Issue 13471007: New network error pages: Update format of suggestions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Remove bonus linebreaks added by MSVC Created 7 years, 8 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 | « 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 872 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 </message> 883 </message>
884 884
885 <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="The value of the Autofill options menu entry."> 885 <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="The value of the Autofill options menu entry.">
886 Chromium Autofill settings 886 Chromium Autofill settings
887 </message> 887 </message>
888 <message name="IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_CHECKBOX" desc="Checkbox t hat controls whether info the user types into the autofill dialog is saved by ch rome."> 888 <message name="IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_CHECKBOX" desc="Checkbox t hat controls whether info the user types into the autofill dialog is saved by ch rome.">
889 Save details in Chromium 889 Save details in Chromium
890 </message> 890 </message>
891 891
892 <!-- Network Error Pages --> 892 <!-- Network Error Pages -->
893 <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION" desc="When a page fails to load, sometimes we suggest disabling network prediction."> 893 <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_BODY" desc="Wh en a page fails to load, sometimes we suggest disabling predicting network actio ns. These are details below a header.">
894 Try disabling network prediction by following these steps:
895 Go to 894 Go to
896 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
897 the Chromium menu &gt; 895 the Chromium menu &gt;
898 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/spa n&gt;<ex>Settings</ex></ph> 896 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/spa n&gt;<ex>Settings</ex></ph>
899 &gt; 897 &gt;
900 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/spa n&gt;<ex>Under the Hood</ex></ph> 898 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/spa n&gt;<ex>Under the Hood</ex></ph>
901 <ph name="END_BOLD">&lt;/strong&gt;</ph>
902 and deselect &quot;<ph name="NO_PREFETCH_DESCRIPTION">&lt;span jscontent ="noNetworkPredictionTitle"&gt;&lt;/span&gt;<ex>Predict network actions to impro ve page load performance</ex></ph>.&quot; 899 and deselect &quot;<ph name="NO_PREFETCH_DESCRIPTION">&lt;span jscontent ="noNetworkPredictionTitle"&gt;&lt;/span&gt;<ex>Predict network actions to impro ve page load performance</ex></ph>.&quot;
903 If this does not resolve the issue, we recommend selecting this option 900 If this does not resolve the issue, we recommend selecting this option
904 again for improved performance. 901 again for improved performance.
905 </message> 902 </message>
903 <message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER" desc="Whe n a webpage fails to load, in some cases we suggest reconfiguring the firewall. This is a header above some details.">
904 Allow Chromium to access the network in your firewall or antivirus
905 settings.
906 </message>
906 <if expr="is_macosx and not pp_ifdef('ios')"> 907 <if expr="is_macosx and not pp_ifdef('ios')">
907 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="M ac OSX instructions for disabling use of a proxy server."> 908 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="M ac OSX instructions for disabling use of a proxy server.">
908 Go to 909 Go to
909 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
910 Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; P roxies 910 Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; P roxies
911 <ph name="END_BOLD">&lt;/strong&gt;</ph>
912 and deselect any proxies that have been selected. 911 and deselect any proxies that have been selected.
913 </message> 912 </message>
914 </if> 913 </if>
915 <if expr="pp_ifdef('chromeos')"> 914 <if expr="pp_ifdef('chromeos')">
916 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="C hromeOS instructions for disabling use of a proxy server."> 915 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="C hromeOS instructions for disabling use of a proxy server.">
917 Go to 916 Go to
918 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
919 the Chromium menu &gt; 917 the Chromium menu &gt;
920 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph> 918 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph>
921 &gt; 919 &gt;
922 <ph name="INTERNET_TITLE">&lt;span jscontent="internetTitle"&gt;&lt;/s pan&gt;<ex>Internet</ex></ph> 920 <ph name="INTERNET_TITLE">&lt;span jscontent="internetTitle"&gt;&lt;/s pan&gt;<ex>Internet</ex></ph>
923 &gt; 921 &gt;
924 &quot;<ph name="OPTIONS_BUTTON">&lt;span jscontent="optionsButton"&gt; &lt;/span&gt;<ex>Options...</ex></ph>&quot; 922 &quot;<ph name="OPTIONS_BUTTON">&lt;span jscontent="optionsButton"&gt; &lt;/span&gt;<ex>Options...</ex></ph>&quot;
925 <ph name="END_BOLD">&lt;/strong&gt;</ph>
926 (for the current Network). If the 923 (for the current Network). If the
927 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
928 &quot;<ph name="PROXY_BUTTON">&lt;span jscontent="proxyButton"&gt;&lt; /span&gt;<ex>Change proxy settings...</ex></ph>&quot; 924 &quot;<ph name="PROXY_BUTTON">&lt;span jscontent="proxyButton"&gt;&lt; /span&gt;<ex>Change proxy settings...</ex></ph>&quot;
929 <ph name="END_BOLD">&lt;/strong&gt;</ph>button (in the 925 button (in the
930 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
931 <ph name="NETWORK_TAB">&lt;span jscontent="networkTab"&gt;&lt;/span&gt ;<ex>Network</ex></ph> 926 <ph name="NETWORK_TAB">&lt;span jscontent="networkTab"&gt;&lt;/span&gt ;<ex>Network</ex></ph>
932 <ph name="END_BOLD">&lt;/strong&gt;</ph>
933 tab) is present, click on that and make sure your configuration 927 tab) is present, click on that and make sure your configuration
934 is set to &quot;Direct&quot;. 928 is set to &quot;Direct&quot;.
935 </message> 929 </message>
936 </if> 930 </if>
937 <if expr="pp_ifdef('android') or pp_ifdef('ios')"> 931 <if expr="pp_ifdef('android') or pp_ifdef('ios')">
938 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="I nstructions for disabling use of a proxy server (leave empty for Android and iOS )."> 932 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="I nstructions for disabling use of a proxy server (leave empty for Android and iOS ).">
939 </message> 933 </message>
940 </if> 934 </if>
941 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not pp_ifdef('android') and not pp_ifdef('ios')"> 935 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not pp_ifdef('android') and not pp_ifdef('ios')">
942 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="L inux instructions for disabling use of a proxy server."> 936 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="L inux instructions for disabling use of a proxy server.">
943 Go to 937 Go to
944 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
945 the Chromium menu &gt; 938 the Chromium menu &gt;
946 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph> 939 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph>
947 &gt; 940 &gt;
948 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph> 941 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph>
949 &gt; 942 &gt;
950 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph> 943 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph>
951 <ph name="END_BOLD">&lt;/strong&gt;</ph>
952 and make sure your configuration is set to &quot;no proxy&quot; or &qu ot;direct.&quot; 944 and make sure your configuration is set to &quot;no proxy&quot; or &qu ot;direct.&quot;
953 </message> 945 </message>
954 </if> 946 </if>
955 <if expr="is_win"> 947 <if expr="is_win">
956 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="W indows instructions for disabling use of a proxy server."> 948 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="W indows instructions for disabling use of a proxy server.">
957 Go to 949 Go to
958 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
959 the Chromium menu &gt; 950 the Chromium menu &gt;
960 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph> 951 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph>
961 &gt; 952 &gt;
962 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph> 953 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph>
963 &gt; 954 &gt;
964 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph> 955 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph>
965 &gt; 956 &gt;
966 LAN Settings 957 LAN Settings
967 <ph name="END_BOLD">&lt;/strong&gt;</ph>
968 and deselect the &quot;Use a proxy server for your LAN&quot; checkbox. 958 and deselect the &quot;Use a proxy server for your LAN&quot; checkbox.
969 </message> 959 </message>
970 </if> 960 </if>
971 961
972 <!-- Chrome OS keyboard overlay--> 962 <!-- Chrome OS keyboard overlay-->
973 <if expr="pp_ifdef('chromeos')"> 963 <if expr="pp_ifdef('chromeos')">
974 <message name="IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU" desc="The text in the keyboard overlay to explain the shortcut that opens the main Chrome menu."> 964 <message name="IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU" desc="The text in the keyboard overlay to explain the shortcut that opens the main Chrome menu.">
975 Show the Chromium menu 965 Show the Chromium menu
976 </message> 966 </message>
977 </if> 967 </if>
(...skipping 11 matching lines...) Expand all
989 979
990 <!-- Chrome OS OOBE Terms of Service screen--> 980 <!-- Chrome OS OOBE Terms of Service screen-->
991 <if expr="pp_ifdef('chromeos')"> 981 <if expr="pp_ifdef('chromeos')">
992 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen."> 982 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen.">
993 <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. 983 <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.
994 </message> 984 </message>
995 </if> 985 </if>
996 </messages> 986 </messages>
997 </release> 987 </release>
998 </grit> 988 </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