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/google_chrome_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 | « chrome/app/generated_resources.grd ('k') | chrome/common/localized_error.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 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 </message> 807 </message>
808 808
809 <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="The value of the Autofill options menu entry."> 809 <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="The value of the Autofill options menu entry.">
810 Chrome Autofill settings 810 Chrome Autofill settings
811 </message> 811 </message>
812 <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."> 812 <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.">
813 Save details in Chrome 813 Save details in Chrome
814 </message> 814 </message>
815 815
816 <!-- Network Error Pages --> 816 <!-- Network Error Pages -->
817 <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION" desc="When a page fails to load, sometimes we suggest disabling network prediction."> 817 <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.">
818 Try disabling network prediction by following these steps:
819 Go to 818 Go to
820 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
821 the Chrome menu &gt; 819 the Chrome menu &gt;
822 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/spa n&gt;<ex>Settings</ex></ph> 820 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/spa n&gt;<ex>Settings</ex></ph>
823 &gt; 821 &gt;
824 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/spa n&gt;<ex>Under the Hood</ex></ph> 822 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/spa n&gt;<ex>Under the Hood</ex></ph>
825 <ph name="END_BOLD">&lt;/strong&gt;</ph>
826 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; 823 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;
827 If this does not resolve the issue, we recommend selecting this option 824 If this does not resolve the issue, we recommend selecting this option
828 again for improved performance. 825 again for improved performance.
829 </message> 826 </message>
827 <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.">
828 Allow Chrome to access the network in your firewall or antivirus
829 settings.
830 </message>
830 <if expr="is_macosx and not pp_ifdef('ios')"> 831 <if expr="is_macosx and not pp_ifdef('ios')">
831 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="M ac OSX instructions for disabling use of a proxy server."> 832 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="M ac OSX instructions for disabling use of a proxy server.">
832 Go to 833 Go to
833 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
834 Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; P roxies 834 Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; P roxies
835 <ph name="END_BOLD">&lt;/strong&gt;</ph>
836 and deselect any proxies that have been selected. 835 and deselect any proxies that have been selected.
837 </message> 836 </message>
838 </if> 837 </if>
839 <if expr="pp_ifdef('chromeos')"> 838 <if expr="pp_ifdef('chromeos')">
840 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="C hromeOS instructions for disabling use of a proxy server."> 839 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="C hromeOS instructions for disabling use of a proxy server.">
841 Go to 840 Go to
842 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
843 the Chrome menu &gt; 841 the Chrome menu &gt;
844 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph> 842 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph>
845 &gt; 843 &gt;
846 <ph name="INTERNET_TITLE">&lt;span jscontent="internetTitle"&gt;&lt;/s pan&gt;<ex>Internet</ex></ph> 844 <ph name="INTERNET_TITLE">&lt;span jscontent="internetTitle"&gt;&lt;/s pan&gt;<ex>Internet</ex></ph>
847 &gt; 845 &gt;
848 &quot;<ph name="OPTIONS_BUTTON">&lt;span jscontent="optionsButton"&gt; &lt;/span&gt;<ex>Options...</ex></ph>&quot; 846 &quot;<ph name="OPTIONS_BUTTON">&lt;span jscontent="optionsButton"&gt; &lt;/span&gt;<ex>Options...</ex></ph>&quot;
849 <ph name="END_BOLD">&lt;/strong&gt;</ph>
850 (for the current Network). If the 847 (for the current Network). If the
851 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
852 &quot;<ph name="PROXY_BUTTON">&lt;span jscontent="proxyButton"&gt;&lt; /span&gt;<ex>Change proxy settings...</ex></ph>&quot; 848 &quot;<ph name="PROXY_BUTTON">&lt;span jscontent="proxyButton"&gt;&lt; /span&gt;<ex>Change proxy settings...</ex></ph>&quot;
853 <ph name="END_BOLD">&lt;/strong&gt;</ph>button (in the 849 button (in the
854 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
855 <ph name="NETWORK_TAB">&lt;span jscontent="networkTab"&gt;&lt;/span&gt ;<ex>Network</ex></ph> 850 <ph name="NETWORK_TAB">&lt;span jscontent="networkTab"&gt;&lt;/span&gt ;<ex>Network</ex></ph>
856 <ph name="END_BOLD">&lt;/strong&gt;</ph>
857 tab) is present, click on that and make sure your configuration 851 tab) is present, click on that and make sure your configuration
858 is set to &quot;Direct&quot;. 852 is set to &quot;Direct&quot;.
859 </message> 853 </message>
860 </if> 854 </if>
861 <if expr="pp_ifdef('android') or pp_ifdef('ios')"> 855 <if expr="pp_ifdef('android') or pp_ifdef('ios')">
862 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="I nstructions for disabling use of a proxy server (leave empty for Android and iOS )."> 856 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="I nstructions for disabling use of a proxy server (leave empty for Android and iOS ).">
863 </message> 857 </message>
864 </if> 858 </if>
865 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not pp_ifdef('android') and not pp_ifdef('ios')"> 859 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not pp_ifdef('android') and not pp_ifdef('ios')">
866 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="L inux instructions for disabling use of a proxy server."> 860 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="L inux instructions for disabling use of a proxy server.">
867 Go to 861 Go to
868 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
869 the Chrome menu &gt; 862 the Chrome menu &gt;
870 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph> 863 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph>
871 &gt; 864 &gt;
872 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph> 865 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph>
873 &gt; 866 &gt;
874 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph> 867 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph>
875 <ph name="END_BOLD">&lt;/strong&gt;</ph>
876 and make sure your configuration is set to &quot;no proxy&quot; or &qu ot;direct.&quot; 868 and make sure your configuration is set to &quot;no proxy&quot; or &qu ot;direct.&quot;
877 </message> 869 </message>
878 </if> 870 </if>
879 <if expr="is_win"> 871 <if expr="is_win">
880 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="W indows instructions for disabling use of a proxy server."> 872 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="W indows instructions for disabling use of a proxy server.">
881 Go to 873 Go to
882 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
883 the Chrome menu &gt; 874 the Chrome menu &gt;
884 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph> 875 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/s pan&gt;<ex>Settings</ex></ph>
885 &gt; 876 &gt;
886 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph> 877 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/s pan&gt;<ex>Under the Hood</ex></ph>
887 &gt; 878 &gt;
888 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph> 879 <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span& gt;<ex>Change proxy settings...</ex></ph>
889 &gt; 880 &gt;
890 LAN Settings 881 LAN Settings
891 <ph name="END_BOLD">&lt;/strong&gt;</ph> 882 and deselect &quot;Use a proxy server for your LAN&quot;.
892 and deselect the &quot;Use a proxy server for your LAN&quot; checkbox.
893 </message> 883 </message>
894 </if> 884 </if>
895 885
896 <!-- Chrome OS keyboard overlay--> 886 <!-- Chrome OS keyboard overlay-->
897 <if expr="pp_ifdef('chromeos')"> 887 <if expr="pp_ifdef('chromeos')">
898 <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."> 888 <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.">
899 Show the Chrome menu 889 Show the Chrome menu
900 </message> 890 </message>
901 </if> 891 </if>
902 892
(...skipping 10 matching lines...) Expand all
913 903
914 <!-- Chrome OS OOBE Terms of Service screen--> 904 <!-- Chrome OS OOBE Terms of Service screen-->
915 <if expr="pp_ifdef('chromeos')"> 905 <if expr="pp_ifdef('chromeos')">
916 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen."> 906 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen.">
917 <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. 907 <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.
918 </message> 908 </message>
919 </if> 909 </if>
920 </messages> 910 </messages>
921 </release> 911 </release>
922 </grit> 912 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/localized_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698