diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 18:29:23 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 18:29:23 +0000 |
| commit | d2504e9b314d766f39a4eff9e63b450e56ddc709 (patch) | |
| tree | 97c41391fd02bf5675662d53f7e45df1e91251a6 /chrome/app | |
| parent | 8d5d761a7afc59fe9ab870b3c8a3aa4db3ac7bb3 (diff) | |
| download | chromium_src-d2504e9b314d766f39a4eff9e63b450e56ddc709.zip chromium_src-d2504e9b314d766f39a4eff9e63b450e56ddc709.tar.gz chromium_src-d2504e9b314d766f39a4eff9e63b450e56ddc709.tar.bz2 | |
Add network import settings to network options.
BUG=chromium-os:19398,chromium-os:21361
TEST=Go to chrome://settings, select Internet, choose a file to import network settings.
Review URL: http://codereview.chromium.org/8243002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 109bff5..b564d8e 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -11699,6 +11699,12 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_OPTIONS_SETTINGS_ENABLE_DATA_ROAMING" desc="In the settings tab, the text next to the checkbox for data roaming."> Allow mobile data roaming </message> + <message name="IDS_OPTIONS_SETTINGS_IMPORT_NETWORK_SETTINGS" desc="In the settings tab, the text next to the file input selector."> + Import network settings: + </message> + <message name="IDS_OPTIONS_SETTINGS_INVALID_NETWORK_SETTINGS" desc="Dialog when network settings file is of invalid format."> + Invalid network settings file + </message> <message name="IDS_OPTIONS_ACCOUNTS_ALLOW_BWSI_DESCRIPTION" desc="In the Accounts settings tab, the text on the checkbox to allow browse without signing in."> Enable guest browsing </message> |