chrome/app/generated_resources.grd - Issue 12256046: Added interstitial page for merge session.

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/generated_resources.grd

Issue 12256046: Added interstitial page for merge session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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/generated_resources.grd

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

index 0c53a93ffd74f886237c2b0e8e9bf7c87d3059d5..22aa6f718636be14af4504ca3bdc27a1eeb5fbc8 100644

--- a/chrome/app/generated_resources.grd

+++ b/chrome/app/generated_resources.grd

@@ -11981,6 +11981,13 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>"

</message>

</if>

+

+ <if expr="pp_ifdef('chromeos')">

+ <message name="IDS_MERGE_SESSION_LOAD_HEADLINE" desc="Merge session interstitial page headline">

+ Signing into Google...

+ </message>

+ </if>

Users