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

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 specific to	2 <!-- This file contains definitions of strings that are specific to

3 Google Chrome. These strings will be translated for each locale that Google	3 Google Chrome. These strings will be translated for each locale that Google

4 Chrome supports. -->	4 Chrome supports. -->

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

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

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

887	887

888 <!-- App shortcuts -->	888 <!-- App shortcuts -->

889 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chrome Ap ps Start Menu folder name.">	889 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chrome Ap ps Start Menu folder name.">

890 Chrome Apps	890 Chrome Apps

891 </message>	891 </message>

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

893 Chrome Canary Apps	893 Chrome Canary Apps

894 </message>	894 </message>

895	895

	896 <!-- Chrome Conflicts bubble -->

	897 <if expr="is_win">

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

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

	900 </message>

	901 </if>

	902

896 <!-- Chrome OS OOBE Terms of Service screen-->	903 <!-- Chrome OS OOBE Terms of Service screen-->

897 <if expr="pp_ifdef('chromeos')">	904 <if expr="pp_ifdef('chromeos')">

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

899 <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 Google Chrome OS Terms.	906 <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 Google Chrome OS Terms.

900 </message>	907 </message>

901 </if>	908 </if>

902 </messages>	909 </messages>

903 </release>	910 </release>

904 </grit>	911 </grit>

OLD	NEW

« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/app/resources/locale_settings.grd » ('j') | no next file with comments »