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

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

Issue 4524002: First cut of the about:conflicts page, listing all DLLs loaded in the Chrome ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- This file contains definitions of resources that will be translated for 3 <!-- This file contains definitions of resources that will be translated for
4 each locale. --> 4 each locale. -->
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/generated_resources.h" type="rc_header"> 9 <output filename="grit/generated_resources.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 </message> 1009 </message>
1010 <message name="IDS_HELP_PAGE" desc="The text label of the Help menu item "> 1010 <message name="IDS_HELP_PAGE" desc="The text label of the Help menu item ">
1011 H&amp;elp 1011 H&amp;elp
1012 </message> 1012 </message>
1013 <message name="IDS_ABOUT" desc="The text label of the About Chrome menu item"> 1013 <message name="IDS_ABOUT" desc="The text label of the About Chrome menu item">
1014 About &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> 1014 About &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
1015 </message> 1015 </message>
1016 <message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome Now menu item"> 1016 <message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome Now menu item">
1017 Update &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> 1017 Update &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
1018 </message> 1018 </message>
1019 <message name="IDS_VIEW_INCOMPATIBILITIES" desc="The text label of the V iew incompatibilities menu item">
1020 View incompatibilities
1021 </message>
1019 <message name="IDS_EXIT" desc="The text label of the Exit menu item"> 1022 <message name="IDS_EXIT" desc="The text label of the Exit menu item">
1020 E&amp;xit 1023 E&amp;xit
1021 </message> 1024 </message>
1022 </if> 1025 </if>
1023 <if expr="pp_ifdef('use_titlecase')"> 1026 <if expr="pp_ifdef('use_titlecase')">
1024 <message name="IDS_SHOW_HISTORY" desc="In Title Case: The show history m enu in the app menu"> 1027 <message name="IDS_SHOW_HISTORY" desc="In Title Case: The show history m enu in the app menu">
1025 &amp;History 1028 &amp;History
1026 </message> 1029 </message>
1027 <message name="IDS_SHOW_BOOKMARK_BAR" desc="In Title Case: The toggle to show the bookmark bar"> 1030 <message name="IDS_SHOW_BOOKMARK_BAR" desc="In Title Case: The toggle to show the bookmark bar">
1028 &amp;Always Show Bookmarks Bar 1031 &amp;Always Show Bookmarks Bar
(...skipping 18 matching lines...) Expand all
1047 </message> 1050 </message>
1048 <message name="IDS_HELP_PAGE" desc="In Title Case: The text label of the Help menu item"> 1051 <message name="IDS_HELP_PAGE" desc="In Title Case: The text label of the Help menu item">
1049 H&amp;elp 1052 H&amp;elp
1050 </message> 1053 </message>
1051 <message name="IDS_ABOUT" desc="In Title Case: The text label of the Abo ut Chrome menu item"> 1054 <message name="IDS_ABOUT" desc="In Title Case: The text label of the Abo ut Chrome menu item">
1052 About &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> 1055 About &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
1053 </message> 1056 </message>
1054 <message name="IDS_UPDATE_NOW" desc="In Title Case: The text label of th e Update Chrome Now menu item"> 1057 <message name="IDS_UPDATE_NOW" desc="In Title Case: The text label of th e Update Chrome Now menu item">
1055 Update &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> 1058 Update &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
1056 </message> 1059 </message>
1060 <message name="IDS_VIEW_INCOMPATIBILITIES" desc="The text label of the V iew incompatibilities menu item">
1061 View Incompatibilities
1062 </message>
1057 <message name="IDS_EXIT" desc="In Title Case: The text label of the Exit menu item"> 1063 <message name="IDS_EXIT" desc="In Title Case: The text label of the Exit menu item">
1058 E&amp;xit 1064 E&amp;xit
1059 </message> 1065 </message>
1060 </if> 1066 </if>
1061 <if expr="pp_ifdef('chromeos')"> 1067 <if expr="pp_ifdef('chromeos')">
1062 <message name="IDS_SIGN_OUT" desc="The text label of the Sign Out menu i tem"> 1068 <message name="IDS_SIGN_OUT" desc="The text label of the Sign Out menu i tem">
1063 Sign out 1069 Sign out
1064 </message> 1070 </message>
1065 <message name="IDS_EXIT_GUEST_MODE" desc="The text label of the Exit gue st mode menu item"> 1071 <message name="IDS_EXIT_GUEST_MODE" desc="The text label of the Exit gue st mode menu item">
1066 Exit guest mode 1072 Exit guest mode
(...skipping 2996 matching lines...) Expand 10 before | Expand all | Expand 10 after
4063 </message> 4069 </message>
4064 <message name="IDS_FLAGS_BACKGROUND_WEBAPPS_DESCRIPTION" desc="Description of the 'Background WebApps' lab."> 4070 <message name="IDS_FLAGS_BACKGROUND_WEBAPPS_DESCRIPTION" desc="Description of the 'Background WebApps' lab.">
4065 Allows installed web apps to run in the background at system startup and continue running after all windows are closed. 4071 Allows installed web apps to run in the background at system startup and continue running after all windows are closed.
4066 </message> 4072 </message>
4067 <message name="IDS_FLAGS_CLOUD_PRINT_PROXY_NAME" desc="Title of the Cloud Print Proxy lab"> 4073 <message name="IDS_FLAGS_CLOUD_PRINT_PROXY_NAME" desc="Title of the Cloud Print Proxy lab">
4068 Cloud Print Proxy 4074 Cloud Print Proxy
4069 </message> 4075 </message>
4070 <message name="IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION" desc="Description of the Cloud Print Proxy lab"> 4076 <message name="IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION" desc="Description of the Cloud Print Proxy lab">
4071 Enables a background service that connects the <ph name="CLOUD_PRINT_NAM E">Google Cloud Print</ph> service to any printers installed on this computer. O nce this lab is enabled, you can turn <ph name="CLOUD_PRINT_NAME">Google Cloud P rint</ph> on by logging in with your Google account in the Options/Preferences i n the Under the Hood section. 4077 Enables a background service that connects the <ph name="CLOUD_PRINT_NAM E">Google Cloud Print</ph> service to any printers installed on this computer. O nce this lab is enabled, you can turn <ph name="CLOUD_PRINT_NAME">Google Cloud P rint</ph> on by logging in with your Google account in the Options/Preferences i n the Under the Hood section.
4072 </message> 4078 </message>
4079 <message name="IDS_FLAGS_CONFLICTS_CHECK_NAME" desc="Title of the run conf licts check flag">
4080 Check for known conflicts with 3rd party modules.
4081 </message>
4082 <message name="IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION" desc="Description of the conflicts check flag">
4083 Enables a background check that warns you when a software incompatibilit y is detected (ie. 3rd party modules that crash the browser).
4084 </message>
4073 <message name="IDS_FLAGS_ACCELERATED_COMPOSITING_NAME" desc="Name of the ' GPU Accelerated Compositing' lab."> 4085 <message name="IDS_FLAGS_ACCELERATED_COMPOSITING_NAME" desc="Name of the ' GPU Accelerated Compositing' lab.">
4074 GPU Accelerated Compositing 4086 GPU Accelerated Compositing
4075 </message> 4087 </message>
4076 <message name="IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION" desc="Descri ption of the 'GPU Accelerated Compositing' lab."> 4088 <message name="IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION" desc="Descri ption of the 'GPU Accelerated Compositing' lab.">
4077 Enables 3D CSS and higher performance compositing of web pages using Gra phics Processor Unit (GPU) hardware. 4089 Enables 3D CSS and higher performance compositing of web pages using Gra phics Processor Unit (GPU) hardware.
4078 </message> 4090 </message>
4079 <message name="IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME" desc="Name of the 'GP U Accelerated Canvas 2D' lab."> 4091 <message name="IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME" desc="Name of the 'GP U Accelerated Canvas 2D' lab.">
4080 GPU Accelerated Canvas 2D 4092 GPU Accelerated Canvas 2D
4081 </message> 4093 </message>
4082 <message name="IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION" desc="Descript ion of the 'GPU Accelerated Canvas 2D' lab."> 4094 <message name="IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION" desc="Descript ion of the 'GPU Accelerated Canvas 2D' lab.">
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
4123 <message name="IDS_INSTANT_OPT_IN_MESSAGE" desc="Message shown in the inst ant opt-in dialog"> 4135 <message name="IDS_INSTANT_OPT_IN_MESSAGE" desc="Message shown in the inst ant opt-in dialog">
4124 Instant lets you view web pages and search results faster than ever!\n\n With Instant enabled, most web pages begin loading as soon as you type a URL in the omnibox, before you hit Enter. In addition, if supported by your default sea rch engine, search results appear instantly as you type queries in the omnibox, and in-line predictions help guide your search.\n\nBecause new search results ar e requested each time you press a key, anything you type into the omnibox may be logged as a search query by your default search engine.\n\n 4136 Instant lets you view web pages and search results faster than ever!\n\n With Instant enabled, most web pages begin loading as soon as you type a URL in the omnibox, before you hit Enter. In addition, if supported by your default sea rch engine, search results appear instantly as you type queries in the omnibox, and in-line predictions help guide your search.\n\nBecause new search results ar e requested each time you press a key, anything you type into the omnibox may be logged as a search query by your default search engine.\n\n
4125 </message> 4137 </message>
4126 <message name="IDS_INSTANT_PREF" desc="Preference for enabling instant"> 4138 <message name="IDS_INSTANT_PREF" desc="Preference for enabling instant">
4127 Enable Instant for faster searching and browsing 4139 Enable Instant for faster searching and browsing
4128 </message> 4140 </message>
4129 <message name="IDS_INSTANT_PREF_WARNING" desc="Warning displayed beneath i nstant pref"> 4141 <message name="IDS_INSTANT_PREF_WARNING" desc="Warning displayed beneath i nstant pref">
4130 Omnibox input may be logged 4142 Omnibox input may be logged
4131 </message> 4143 </message>
4132 4144
4145 <!-- Conflicts page -->
4146 <message name="IDS_CONFLICTS_CHECK_PAGE_TABLE_TITLE_SUFFIX_ONE" desc="What gets appended after the page title if no conflicts were found.">
4147 Modules (<ph name="TOTAL_COUNT">$1<ex>50</ex></ph>) - No conflicts detec ted
4148 </message>
4149 <message name="IDS_CONFLICTS_CHECK_PAGE_TABLE_TITLE_SUFFIX_TWO" desc="What gets appended after the page title (number of conflicts found).">
4150 Modules (<ph name="TOTAL_COUNT">$1<ex>50</ex></ph>) - Known conflicts: < ph name="BAD_COUNT">$2<ex>3</ex></ph>, suspected: <ph name="SUSPICIOUS_COUNT">$3 <ex>2</ex></ph>
4151 </message>
4152 <message name="IDS_CONFLICTS_EXPLANATION_TEXT" desc="The text blurb explai ning what the compatibility page is.">
4153 This page lists all modules loaded into the main process and modules reg istered to load at a later point.
4154 </message>
4155 <message name="IDS_CONFLICTS_HELP_CENTER_LINK" desc="The text for the Help Center link.">
4156 Learn more
4157 </message>
4158 <message name="IDS_CONFLICTS_CHECK_WARNING_PREFIX" desc="Warning label pre fix on the compatibility page">
4159 Warning:
4160 </message>
4161 <message name="IDS_CONFLICTS_CHECK_VERSION_STRING" desc="The version strin g to show on the compatibility page">
4162 Version <ph name="VERSION">$1<ex>1.2.3.4</ex></ph>.
4163 </message>
4164 <message name="IDS_CONFLICTS_CHECK_INVESTIGATING" desc="A label on the com patibility page saying we are investigating.">
4165 We are currently investigating this issue.
4166 </message>
4167 <message name="IDS_CONFLICTS_CHECK_POSSIBLE_ACTIONS" desc="A label on the compatibility page describing possible resolutions.">
4168 If you are experiencing frequent problems, you could try the following t o resolve the issue with this module:
4169 </message>
4170 <message name="IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_UNINSTALL" desc="An uni nstall label. 'It' refers to 'a module'.">
4171 Uninstalling
4172 </message>
4173 <message name="IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_UPDATE" desc="An update label. 'It' refers to 'a module'.">
4174 Updating
4175 </message>
4176 <message name="IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_DISABLE" desc="A disabl e label. 'It' refers to 'a module'.">
4177 Disabling
4178 </message>
4179 <message name="IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_SEPERATOR" desc="The se parator separating the words 'Uninstalling it', 'Updating it' and 'Disabling it' ">
4180 /
4181 </message>
4182 <message name="IDS_CONFLICTS_NO_MODULES_LOADED" desc="Error message for wh en no modules were found in the process">
4183 Unable to detect any modules loaded.
4184 </message>
4185 <message name="IDS_CONFLICTS_HEADER_SOFTWARE" desc="The 'Software:' header for each module item in the list">
4186 Software:
4187 </message>
4188 <message name="IDS_CONFLICTS_HEADER_SIGNED_BY" desc="The 'Signed by:' head er for each module item in the list">
4189 Signed by:
4190 </message>
4191 <message name="IDS_CONFLICTS_HEADER_LOCATION" desc="The 'Location:' header for each module item in the list">
4192 Location:
4193 </message>
4194 <message name="IDS_CONFLICTS_HEADER_WARNING" desc="The 'Warning:' header f or each module item in the list">
4195 Warning:
4196 </message>
4197 <message name="IDS_CONFLICTS_HEADER_HELP_TIP" desc="The 'Help tip:' header for each module item in the list">
4198 Help tip:
4199 </message>
4200 <message name="IDS_HELP_CENTER_VIEW_CONFLICTS" desc="The url of the Help c enter article for the View Conflicts page">
4201 http://www.google.com/support/chrome/bin/answer.py?answer=666386&amp;hl= [GRITLANGCODE]&amp;n=<ph name="NAME">$1<ex>Hash</ex></ph>&amp;l=<ph name="LOCATI ON">$2<ex>Hash</ex></ph>&amp;d=<ph name="DESC">$3<ex>Hash</ex></ph>&amp;s=<ph na me="SIGNER">$4<ex>Hash</ex></ph>
4202 </message>
4203
4133 <!-- Click-to-load --> 4204 <!-- Click-to-load -->
4134 <message name="IDS_PLUGIN_LOAD" desc="The link for loading a blocked plug- in, displayed in the click-to-play UI."> 4205 <message name="IDS_PLUGIN_LOAD" desc="The link for loading a blocked plug- in, displayed in the click-to-play UI.">
4135 Click to run this plug-in 4206 Click to run this plug-in
4136 </message> 4207 </message>
4137 <message name="IDS_PLUGIN_LOAD_SHORT" desc="The link for loading all block ed plug-ins, displayed in the infobar."> 4208 <message name="IDS_PLUGIN_LOAD_SHORT" desc="The link for loading all block ed plug-ins, displayed in the infobar.">
4138 Allow 4209 Allow
4139 </message> 4210 </message>
4140 <message name="IDS_PLUGIN_UPDATE" desc="The link for updating an outdated plug-in."> 4211 <message name="IDS_PLUGIN_UPDATE" desc="The link for updating an outdated plug-in.">
4141 Update plug-in... 4212 Update plug-in...
4142 </message> 4213 </message>
(...skipping 6811 matching lines...) Expand 10 before | Expand all | Expand 10 after
10954 11025
10955 </messages> 11026 </messages>
10956 11027
10957 <structures fallback_to_english="true"> 11028 <structures fallback_to_english="true">
10958 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 11029 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
10959 </structure> 11030 </structure>
10960 </structures> 11031 </structures>
10961 11032
10962 </release> 11033 </release>
10963 </grit> 11034 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698