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

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

Issue 298953002: Remove --disable-app-shims. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 <!-- 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 6212 matching lines...) Expand 10 before | Expand all | Expand 10 after
6223 <message name="IDS_FLAGS_ENABLE_SYNC_DIRECTORY_OPERATION_DESCRIPTION" desc ="Description of the flag to enable syncfs directory support."> 6223 <message name="IDS_FLAGS_ENABLE_SYNC_DIRECTORY_OPERATION_DESCRIPTION" desc ="Description of the flag to enable syncfs directory support.">
6224 Enables directory support for sync filesystem. 6224 Enables directory support for sync filesystem.
6225 </message> 6225 </message>
6226 <if expr="is_macosx"> 6226 <if expr="is_macosx">
6227 <message name="IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_NAME" desc="Title for th e flag to prevent Chrome from quitting when Chrome Apps are open."> 6227 <message name="IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_NAME" desc="Title for th e flag to prevent Chrome from quitting when Chrome Apps are open.">
6228 Apps keep Chrome alive. 6228 Apps keep Chrome alive.
6229 </message> 6229 </message>
6230 <message name="IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_DESCRIPTION" desc="Descr iption for the flag to prevent Chrome from quitting when Chrome Apps are open."> 6230 <message name="IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_DESCRIPTION" desc="Descr iption for the flag to prevent Chrome from quitting when Chrome Apps are open.">
6231 Prevent Chrome from quitting when Chrome Apps are open. 6231 Prevent Chrome from quitting when Chrome Apps are open.
6232 </message> 6232 </message>
6233 <message name="IDS_FLAGS_DISABLE_APP_SHIMS_NAME" desc="Title for the fla g to disable shortcuts for packaged apps from being added to Applications and fr om appearing in the dock.">
6234 Disable packaged app shortcuts.
6235 </message>
6236 <message name="IDS_FLAGS_DISABLE_APP_SHIMS_DESCRIPTION" desc="Descriptio n for the flag to disable packaged apps appearing in the dock in OSX.">
6237 Disables packaged app shortcuts from being added to Applications and f rom appearing in the dock.
6238 </message>
6239 <message name="IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_NAME" desc="Title for the flag to enable a simplified Mac fullscreen interface."> 6233 <message name="IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_NAME" desc="Title for the flag to enable a simplified Mac fullscreen interface.">
6240 Enables simplified fullscreen. 6234 Enables simplified fullscreen.
6241 </message> 6235 </message>
6242 <message name="IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_DESCRIPTION" desc= "Description for the flag to enable a simplified Mac fullscreen interface."> 6236 <message name="IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_DESCRIPTION" desc= "Description for the flag to enable a simplified Mac fullscreen interface.">
6243 Enables a simplified and improved fullscreen experience on Mac. 6237 Enables a simplified and improved fullscreen experience on Mac.
6244 </message> 6238 </message>
6245 </if> 6239 </if>
6246 <message name="IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME" desc="Name of the flag to reset the app launcher install state."> 6240 <message name="IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME" desc="Name of the flag to reset the app launcher install state.">
6247 Reset the App Launcher install state on every restart. 6241 Reset the App Launcher install state on every restart.
6248 </message> 6242 </message>
(...skipping 7893 matching lines...) Expand 10 before | Expand all | Expand 10 after
14142 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE" desc="Descr iption of the 'Extension Content Verification' enforce mode"> 14136 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE" desc="Descr iption of the 'Extension Content Verification' enforce mode">
14143 Enforce (try to get hashes, and enforce them if successful) 14137 Enforce (try to get hashes, and enforce them if successful)
14144 </message> 14138 </message>
14145 14139
14146 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT" desc ="Description of the 'Extension Content Verification' enforce strict mode"> 14140 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT" desc ="Description of the 'Extension Content Verification' enforce strict mode">
14147 Enforce strict (hard fail if we can't get hashes) 14141 Enforce strict (hard fail if we can't get hashes)
14148 </message> 14142 </message>
14149 </messages> 14143 </messages>
14150 </release> 14144 </release>
14151 </grit> 14145 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698