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

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

Issue 8429023: Add platform_app flag to manifest. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge conflict resolution. Created 9 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
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('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 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 4850 matching lines...) Expand 10 before | Expand all | Expand 10 after
4861 </message> 4861 </message>
4862 <message name="IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION" desc="Descriptio n for the flag to enable the Media Source API on &lt;video&gt; elements."> 4862 <message name="IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION" desc="Descriptio n for the flag to enable the Media Source API on &lt;video&gt; elements.">
4863 Enable experimental Media Source API on the video elements. This API all ows JavaScript to send media data directly to a video element. 4863 Enable experimental Media Source API on the video elements. This API all ows JavaScript to send media data directly to a video element.
4864 </message> 4864 </message>
4865 <message name="IDS_FLAGS_AURA_WINDOWS_NAME" desc="Title for the flag to en able fancy translucent windows."> 4865 <message name="IDS_FLAGS_AURA_WINDOWS_NAME" desc="Title for the flag to en able fancy translucent windows.">
4866 Translucent windows 4866 Translucent windows
4867 </message> 4867 </message>
4868 <message name="IDS_FLAGS_AURA_WINDOWS_DESCRIPTION" desc="Description for t he flag to enable fancy translucent windows."> 4868 <message name="IDS_FLAGS_AURA_WINDOWS_DESCRIPTION" desc="Description for t he flag to enable fancy translucent windows.">
4869 Enable the "Aura" style for translucent window frames and constrained wi ndow dragging. 4869 Enable the "Aura" style for translucent window frames and constrained wi ndow dragging.
4870 </message> 4870 </message>
4871 <message name="IDS_FLAGS_ENABLE_PLATFORM_APPS_NAME" desc="Title for the fl ag to enable platform apps.">
4872 Enable platform apps
4873 </message>
4874 <message name="IDS_FLAGS_ENABLE_PLATFORM_APPS_DESCRIPTION" desc="Descripti on for the flag to enable platform apps.">
4875 Enable advanced application capabilities.
4876 </message>
4871 4877
4872 <!-- Crashes --> 4878 <!-- Crashes -->
4873 <message name="IDS_CRASHES_TITLE" desc="Title for the chrome://crashes pag e."> 4879 <message name="IDS_CRASHES_TITLE" desc="Title for the chrome://crashes pag e.">
4874 Crashes 4880 Crashes
4875 </message> 4881 </message>
4876 <message name="IDS_CRASHES_CRASH_COUNT_BANNER_FORMAT" desc="Format for cra sh count banner on chrome://crashes"> 4882 <message name="IDS_CRASHES_CRASH_COUNT_BANNER_FORMAT" desc="Format for cra sh count banner on chrome://crashes">
4877 Crashes (<ph name="CRASH_COUNT">$1<ex>3</ex></ph>) 4883 Crashes (<ph name="CRASH_COUNT">$1<ex>3</ex></ph>)
4878 </message> 4884 </message>
4879 <message name="IDS_CRASHES_CRASH_HEADER_FORMAT" desc="Format for crash ent ry headings on chrome://crashes"> 4885 <message name="IDS_CRASHES_CRASH_HEADER_FORMAT" desc="Format for crash ent ry headings on chrome://crashes">
4880 Crash ID <ph name="CRASH_ID">$1<ex>8fa95dbb6f2ec862</ex></ph> 4886 Crash ID <ph name="CRASH_ID">$1<ex>8fa95dbb6f2ec862</ex></ph>
(...skipping 9697 matching lines...) Expand 10 before | Expand all | Expand 10 after
14578 </messages> 14584 </messages>
14579 <structures fallback_to_english="true"> 14585 <structures fallback_to_english="true">
14580 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14586 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14581 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14587 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14582 </structure> 14588 </structure>
14583 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14589 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14584 </structure> 14590 </structure>
14585 </structures> 14591 </structures>
14586 </release> 14592 </release>
14587 </grit> 14593 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698