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

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

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Forgotten to upload the mergeconflict resolutions (trybots happiness aplies to this upload). 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
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 3863 matching lines...) Expand 10 before | Expand all | Expand 10 after
3874 </message> 3874 </message>
3875 <message name="IDS_PLUGINS_ENABLE" desc="The link for enabling a plug-in." > 3875 <message name="IDS_PLUGINS_ENABLE" desc="The link for enabling a plug-in." >
3876 Enable 3876 Enable
3877 </message> 3877 </message>
3878 <message name="IDS_PLUGINS_DOWNLOAD" desc="The link label to download the latest version of this plug-in"> 3878 <message name="IDS_PLUGINS_DOWNLOAD" desc="The link label to download the latest version of this plug-in">
3879 Download Critical Security Update 3879 Download Critical Security Update
3880 </message> 3880 </message>
3881 <message name="IDS_PLUGINS_NAME" desc="The label for the name of this plug -in"> 3881 <message name="IDS_PLUGINS_NAME" desc="The label for the name of this plug -in">
3882 Name: 3882 Name:
3883 </message> 3883 </message>
3884 <message name="IDS_PLUGINS_PRIORITY" desc="The label for the priority of t his plug-in in the list">
3885 Priority:
3886 </message>
3887 3884
3888 <!-- about:flags --> 3885 <!-- about:flags -->
3889 <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for t he about:flags page."> 3886 <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for t he about:flags page.">
3890 Careful, these experiments may bite 3887 Careful, these experiments may bite
3891 </message> 3888 </message>
3892 <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments tabl e on the about:flags page."> 3889 <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments tabl e on the about:flags page.">
3893 Experiments 3890 Experiments
3894 </message> 3891 </message>
3895 <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warni ng body text."> 3892 <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warni ng body text.">
3896 WARNING 3893 WARNING
(...skipping 7331 matching lines...) Expand 10 before | Expand all | Expand 10 after
11228 </includes> 11225 </includes>
11229 <structures fallback_to_english="true"> 11226 <structures fallback_to_english="true">
11230 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 11227 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
11231 </structure> 11228 </structure>
11232 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 11229 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
11233 </structure> 11230 </structure>
11234 </structures> 11231 </structures>
11235 11232
11236 </release> 11233 </release>
11237 </grit> 11234 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/automation/testing_automation_provider.cc » ('j') | webkit/plugins/npapi/plugin_list.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698