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

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

Issue 5981012: Polish about:conflicts a bit as requested by Clem/UI review.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/browser/dom_ui/conflicts_ui.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 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 4247 matching lines...) Expand 10 before | Expand all | Expand 10 after
4258 </message> 4258 </message>
4259 <message name="IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_DISABLE" desc="A disabl e label. 'It' refers to 'a module'."> 4259 <message name="IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_DISABLE" desc="A disabl e label. 'It' refers to 'a module'.">
4260 Disabling 4260 Disabling
4261 </message> 4261 </message>
4262 <message name="IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_SEPERATOR" desc="The se parator separating the words 'Uninstalling it', 'Updating it' and 'Disabling it' "> 4262 <message name="IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_SEPERATOR" desc="The se parator separating the words 'Uninstalling it', 'Updating it' and 'Disabling it' ">
4263 / 4263 /
4264 </message> 4264 </message>
4265 <message name="IDS_CONFLICTS_NO_MODULES_LOADED" desc="Error message for wh en no modules were found in the process"> 4265 <message name="IDS_CONFLICTS_NO_MODULES_LOADED" desc="Error message for wh en no modules were found in the process">
4266 Unable to detect any modules loaded. 4266 Unable to detect any modules loaded.
4267 </message> 4267 </message>
4268 <message name="IDS_CONFLICTS_HEADER_SOFTWARE" desc="The 'Software:' header for each module item in the list"> 4268 <message name="IDS_CONFLICTS_HEADER_SOFTWARE" desc="The 'Software' header for each module item in the list">
4269 Software 4269 Software
4270 </message> 4270 </message>
4271 <message name="IDS_CONFLICTS_HEADER_SIGNED_BY" desc="The 'Signed by:' head er for each module item in the list"> 4271 <message name="IDS_CONFLICTS_HEADER_SIGNED_BY" desc="The 'Signed by' heade r for each module item in the list">
4272 Signed by 4272 Signed by
4273 </message> 4273 </message>
4274 <message name="IDS_CONFLICTS_HEADER_LOCATION" desc="The 'Location:' header for each module item in the list"> 4274 <message name="IDS_CONFLICTS_HEADER_LOCATION" desc="The 'Location' header for each module item in the list">
4275 Location 4275 Location
4276 </message> 4276 </message>
4277 <message name="IDS_CONFLICTS_HEADER_WARNING" desc="The 'Warning:' header f or each module item in the list"> 4277 <message name="IDS_CONFLICTS_HEADER_VERSION" desc="The 'Version' header fo r each module item in the list">
4278 Warning 4278 Version
4279 </message> 4279 </message>
4280 <message name="IDS_CONFLICTS_HEADER_HELP_TIP" desc="The 'Help tip:' header for each module item in the list"> 4280 <message name="IDS_CONFLICTS_HEADER_HELP_TIP" desc="The 'Help tip:' header for each module item in the list">
4281 Help tip 4281 Help tip
4282 </message> 4282 </message>
4283 <message name="IDS_CONFLICTS_NOT_LOADED_YET" desc="Shown next to a module that has not been loaded into memory yet"> 4283 <message name="IDS_CONFLICTS_NOT_LOADED_YET" desc="Shown next to a module that has not been loaded into memory yet">
4284 Not loaded yet 4284 Not loaded yet
4285 </message> 4285 </message>
4286 <message name="IDS_HELP_CENTER_VIEW_CONFLICTS" desc="The url of the Help c enter article for the View Conflicts page" translateable="false"> 4286 <message name="IDS_HELP_CENTER_VIEW_CONFLICTS" desc="The url of the Help c enter article for the View Conflicts page" translateable="false">
4287 http://www.google.com/support/chrome/bin/answer.py?answer=1093113&amp;to pic=21605&amp;hl=[GRITLANGCODE]&amp;n=<ph name="NAME">$1<ex>Hash</ex></ph>&amp;l =<ph name="LOCATION">$2<ex>Hash</ex></ph>&amp;d=<ph name="DESC">$3<ex>Hash</ex>< /ph>&amp;s=<ph name="SIGNER">$4<ex>Hash</ex></ph> 4287 http://www.google.com/support/chrome/bin/answer.py?answer=1093113&amp;to pic=21605&amp;hl=[GRITLANGCODE]&amp;n=<ph name="NAME">$1<ex>Hash</ex></ph>&amp;l =<ph name="LOCATION">$2<ex>Hash</ex></ph>&amp;d=<ph name="DESC">$3<ex>Hash</ex>< /ph>&amp;s=<ph name="SIGNER">$4<ex>Hash</ex></ph>
4288 </message> 4288 </message>
(...skipping 7180 matching lines...) Expand 10 before | Expand all | Expand 10 after
11469 </includes> 11469 </includes>
11470 <structures fallback_to_english="true"> 11470 <structures fallback_to_english="true">
11471 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 11471 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
11472 </structure> 11472 </structure>
11473 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 11473 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
11474 </structure> 11474 </structure>
11475 </structures> 11475 </structures>
11476 11476
11477 </release> 11477 </release>
11478 </grit> 11478 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/dom_ui/conflicts_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698