chrome/app/chromium_strings.grd - Issue 15969017: Warn by default when certain DLL conflicts exist on XP.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/app/chromium_strings.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: Ready for try servers 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

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <!-- This file contains definitions of strings that are distribution specific.	2 <!-- This file contains definitions of strings that are distribution specific.

3 These strings will not be translated and only english versions will	3 These strings will not be translated and only english versions will

4 be available for now. -->	4 be available for now. -->

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/chromium_strings.h" type="rc_header">	9 <output filename="grit/chromium_strings.h" type="rc_header">

10 <emit emit_type='prepend'></emit>	10 <emit emit_type='prepend'></emit>

(...skipping 939 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
950 </message>	950 </message>

951	951

952 <!-- App shortcuts -->	952 <!-- App shortcuts -->

953 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chromium Apps Start Menu folder name.">	953 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chromium Apps Start Menu folder name.">

954 Chromium Apps	954 Chromium Apps

955 </message>	955 </message>

956 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Ch rome Apps Start Menu folder name.">	956 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Ch rome Apps Start Menu folder name.">

957 Chromium Apps	957 Chromium Apps

958 </message>	958 </message>

959	959

	960 <!-- Chrome Conflicts bubble -->

	961 <if expr="is_win">

	962 <message name="IDS_OPTIONS_CONFLICTING_MODULE" desc="Shown in a bubble w hen a conflict has been detected.">

	963 Software running on your computer is incompatible with Chromium.

	964 </message>

	965 </if>

	966

960 <!-- Chrome OS OOBE Terms of Service screen-->	967 <!-- Chrome OS OOBE Terms of Service screen-->

961 <if expr="pp_ifdef('chromeos')">	968 <if expr="pp_ifdef('chromeos')">

962 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen.">	969 <message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen.">

963 <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read a nd accept the following Terms of Service before using this device. These terms d o not expand, modify or limit the Chromium OS Terms.	970 <ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read a nd accept the following Terms of Service before using this device. These terms d o not expand, modify or limit the Chromium OS Terms.

964 </message>	971 </message>

965 </if>	972 </if>

966 </messages>	973 </messages>

967 </release>	974 </release>

968 </grit>	975 </grit>

OLD	NEW

« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('J')