chrome/app/generated_resources.grd - Issue 12316144: Merge 183832

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

Side-by-side diff isn't available for this file because of its large size.

Issue 12316144: Merge 183832 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/

Patch Set: Created 7 years, 9 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

===================================================================

--- chrome/app/generated_resources.grd (revision 184791)

+++ chrome/app/generated_resources.grd (working copy)

@@ -7154,11 +7154,11 @@

Allow web pages to request access to the screen contents via the getUserMedia() API.

</message>

- <message name="IDS_FLAGS_ENABLE_SPDY_PROXY_NAME" desc="Name of the flag to enable SPDY proxy.">

- Enable SPDY proxy.

+ <message name="IDS_FLAGS_ENABLE_SPDY_PROXY_AUTH_NAME" desc="Name of the flag to enable SPDY proxy authentication.">

+ Enable SPDY proxy authentication.

</message>

- <message name="IDS_FLAGS_ENABLE_SPDY_PROXY_DESCRIPTION" desc="Description of flag to enable SPDY proxy.">

-

+ <message name="IDS_FLAGS_ENABLE_SPDY_PROXY_AUTH_DESCRIPTION" desc="Description of flag to enable SPDY proxy authentication.">

+

</message>

</if>

« no previous file with comments | « build/common.gypi ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »