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

Side by Side Diff: chrome/app/resources/locale_settings.grd

Issue 15969017: Warn by default when certain DLL conflicts exist on XP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Freshly sync'ed Created 7 years, 6 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 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/locale_settings.h" type="rc_header"> 4 <output filename="grit/locale_settings.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="locale_settings_am.pak" type="data_package" lang="am" /> 7 <output filename="locale_settings_am.pak" type="data_package" lang="am" />
8 <output filename="locale_settings_ar.pak" type="data_package" lang="ar" /> 8 <output filename="locale_settings_ar.pak" type="data_package" lang="ar" />
9 <if expr="pp_ifdef('use_third_party_translations')"> 9 <if expr="pp_ifdef('use_third_party_translations')">
10 <output filename="locale_settings_ast.pak" type="data_package" lang="ast" /> 10 <output filename="locale_settings_ast.pak" type="data_package" lang="ast" />
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 <!-- The width of the Crucial Notification bubble in characters (See above ). --> 251 <!-- The width of the Crucial Notification bubble in characters (See above ). -->
252 <message name="IDS_CRUCIAL_NOTIFICATION_BUBBLE_WIDTH_CHARS" use_name_for_i d="true"> 252 <message name="IDS_CRUCIAL_NOTIFICATION_BUBBLE_WIDTH_CHARS" use_name_for_i d="true">
253 55 253 55
254 </message> 254 </message>
255 255
256 <!-- The width of the ash/ChromeOS system tray menu in pixels. --> 256 <!-- The width of the ash/ChromeOS system tray menu in pixels. -->
257 <message name="IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS" use_name_for_id=" true"> 257 <message name="IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS" use_name_for_id=" true">
258 300 258 300
259 </message> 259 </message>
260 260
261 <!-- The width of the Disabled Extensions bubble in characters (See above) . --> 261 <!-- The width of the Conflicting Module bubble in characters (See above). -->
262 <message name="IDS_DISABLED_EXTENSIONS_BUBBLE_WIDTH_CHARS" use_name_for_id ="true"> 262 <message name="IDS_CONFLICTING_MODULE_BUBBLE_WIDTH_CHARS" use_name_for_id= "true">
263 46 263 46
264 </message> 264 </message>
265 265
266 <!-- The width and height of the Join Wi-Fi network dialog box in --> 266 <!-- The width and height of the Join Wi-Fi network dialog box in -->
267 <!-- characters and lines (See above). --> 267 <!-- characters and lines (See above). -->
268 <message name="IDS_JOIN_WIFI_NETWORK_DIALOG_WIDTH_CHARS" use_name_for_id=" true"> 268 <message name="IDS_JOIN_WIFI_NETWORK_DIALOG_WIDTH_CHARS" use_name_for_id=" true">
269 60 269 60
270 </message> 270 </message>
271 <message name="IDS_JOIN_WIFI_NETWORK_DIALOG_MINIMUM_HEIGHT_LINES" use_name _for_id="true"> 271 <message name="IDS_JOIN_WIFI_NETWORK_DIALOG_MINIMUM_HEIGHT_LINES" use_name _for_id="true">
272 4 272 4
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 </message> 447 </message>
448 448
449 <if expr="pp_ifdef('chromeos')"> 449 <if expr="pp_ifdef('chromeos')">
450 <message name="IDS_FACTORY_RESET_HELP_URL" translateable="false"> 450 <message name="IDS_FACTORY_RESET_HELP_URL" translateable="false">
451 http://support.google.com/chromeos/bin/answer.py?answer=183084&amp;hl= [GRITLANGCODE] 451 http://support.google.com/chromeos/bin/answer.py?answer=183084&amp;hl= [GRITLANGCODE]
452 </message> 452 </message>
453 </if> 453 </if>
454 </messages> 454 </messages>
455 </release> 455 </release>
456 </grit> 456 </grit>
OLDNEW
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/enumerate_modules_model_unittest_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698