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

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

Unified Diff: chrome/app/google_chrome_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, 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:

Index: chrome/app/google_chrome_strings.grd

diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd

index 3142ad5f2f603d21cc48f3cc8443d072abc07549..f97248545f83a84214c0d4c3e6321a7c4885f469 100644

--- a/chrome/app/google_chrome_strings.grd

+++ b/chrome/app/google_chrome_strings.grd

@@ -881,6 +881,13 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth

Chrome Canary Apps

</message>

+

+ <if expr="is_win">

+ <message name="IDS_OPTIONS_CONFLICTING_MODULE" desc="Shown in a bubble when a conflict has been detected.">

+ Software running on your computer is incompatible with Google Chrome.

+ </message>

+ </if>