chrome/app/generated_resources.grd - Issue 8949056: This adds support for encrypted ONC import

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 8949056: This adds support for encrypted ONC import (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed merge Created 8 years, 11 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 side-by-side diff with in-line comments

Download patch

Index: chrome/app/generated_resources.grd

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

index 30ef5fa92ff3798ad05d3bbbade4f72bf8480ee3..00cfb5ca959ae4b69a1b543f52ab56b56249d214 100644

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

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

@@ -11763,6 +11763,21 @@ Some features may be unavailable. Please check that the profile exists and you

Certificate import error

</message>

+ <message name="IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_MALFORMED" desc="Displayed when importing an encrypted ONC file and the ONC file is malformed.">

+ Encrypted ONC file is malformed.

+ </message>

+ <message name="IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_UNSUPPORTED_ENCRYPTION" desc="Displayed when importing an encrypted ONC file and the ONC file uses an encryption protocol that is not supported.">

+ Encrypted ONC file uses an unsupported encryption scheme.

+ </message>

+ <message name="IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_UNABLE_TO_DECODE" desc="Displayed when importing an encrypted ONC file and the encryption parameters are not able to be parsed.">

+ Unable to parse some parameters in the encrypted ONC file.

+ </message>

+ <message name="IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_UNABLE_TO_DECRYPT" desc="Displayed when importing an encrypted ONC file and it is not able to be decrypted.">

+ Unable to decrypt the encrypted ONC file.

+ </message>

+ <message name="IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_TOO_MANY_ITERATIONS" desc="Displayed when importing an encrypted ONC file and the iteration count is too large.">

+ Passphrase iteration count is too large.

+ </message>

Buy plan...

</message>

« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/network_library.cc » ('j') | no next file with comments »