| Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
| diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
| index 374fb389b5f427f41bde415e613c6622938f6f6e..8aeb7d25c52f2113e83e715d43de2b7907e142ad 100644
|
| --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
| +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
|
| @@ -232,22 +232,20 @@ void AddAppearanceStrings(content::WebUIDataSource* html_source) {
|
| #if defined(OS_CHROMEOS)
|
| void AddBluetoothStrings(content::WebUIDataSource* html_source) {
|
| LocalizedString localized_strings[] = {
|
| - {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},
|
| - {"bluetoothAddDevicePageTitle", IDS_SETTINGS_BLUETOOTH_ADD_DEVICE},
|
| - {"bluetoothPairDevicePageTitle", IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE},
|
| - {"bluetoothEnable", IDS_SETTINGS_BLUETOOTH_ENABLE},
|
| - {"bluetoothConnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT},
|
| + {"bluetoothAccept", IDS_OPTIONS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY},
|
| {"bluetoothAddDevice", IDS_OPTIONS_SETTINGS_ADD_BLUETOOTH_DEVICE},
|
| - {"bluetoothNoDevices", IDS_OPTIONS_SETTINGS_BLUETOOTH_NO_DEVICES},
|
| + {"bluetoothAddDevicePageTitle", IDS_SETTINGS_BLUETOOTH_ADD_DEVICE},
|
| {"bluetoothConnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT},
|
| + {"bluetoothConnecting", IDS_SETTINGS_BLUETOOTH_CONNECTING},
|
| {"bluetoothDisconnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISCONNECT},
|
| - {"bluetoothConnecting", IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECTING},
|
| + {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR},
|
| + {"bluetoothEnable", IDS_SETTINGS_BLUETOOTH_ENABLE},
|
| + {"bluetoothNoDevices", IDS_OPTIONS_SETTINGS_BLUETOOTH_NO_DEVICES},
|
| + {"bluetoothPageTitle", IDS_SETTINGS_BLUETOOTH},
|
| + {"bluetoothPairDevicePageTitle", IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE},
|
| + {"bluetoothReject", IDS_OPTIONS_SETTINGS_BLUETOOTH_REJECT_PASSKEY},
|
| {"bluetoothRemove", IDS_SETTINGS_BLUETOOTH_REMOVE},
|
| {"bluetoothScanning", IDS_OPTIONS_SETTINGS_BLUETOOTH_SCANNING},
|
| - {"bluetoothAccept", IDS_OPTIONS_SETTINGS_BLUETOOTH_ACCEPT_PASSKEY},
|
| - {"bluetoothReject", IDS_OPTIONS_SETTINGS_BLUETOOTH_REJECT_PASSKEY},
|
| - {"bluetoothConnect", IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECT},
|
| - {"bluetoothDismiss", IDS_OPTIONS_SETTINGS_BLUETOOTH_DISMISS_ERROR},
|
| // Device connecting and pairing.
|
| {"bluetoothStartConnecting", IDS_SETTINGS_BLUETOOTH_START_CONNECTING},
|
| {"bluetoothEnterKey", IDS_OPTIONS_SETTINGS_BLUETOOTH_ENTER_KEY},
|
| @@ -259,6 +257,35 @@ void AddBluetoothStrings(content::WebUIDataSource* html_source) {
|
| {"bluetooth_requestPasskey", IDS_SETTINGS_BLUETOOTH_REQUEST_PASSKEY},
|
| {"bluetooth_displayPasskey", IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY},
|
| {"bluetooth_confirmPasskey", IDS_SETTINGS_BLUETOOTH_CONFIRM_PASSKEY},
|
| + // These ids are generated in JS using 'bluetooth_result_' + a value from
|
| + // bluetoothPrivate.ConnectResultType (see bluetooth_private.idl).
|
| + {"bluetooth_connect_attributeLengthInvalid",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_ATTRIBUTE_LENGTH_INVALID},
|
| + {"bluetooth_connect_authCanceled",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_CANCELED},
|
| + {"bluetooth_connect_authFailed",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_FAILED},
|
| + {"bluetooth_connect_authRejected",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_REJECTED},
|
| + {"bluetooth_connect_authTimeout",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_AUTH_TIMEOUT},
|
| + {"bluetooth_connect_connectionCongested",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_CONNECTION_CONGESTED},
|
| + {"bluetooth_connect_failed", IDS_SETTINGS_BLUETOOTH_CONNECT_FAILED},
|
| + {"bluetooth_connect_inProgress",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_IN_PROGRESS},
|
| + {"bluetooth_connect_insufficientEncryption",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_INSUFFICIENT_ENCRYPTION},
|
| + {"bluetooth_connect_offsetInvalid",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_OFFSET_INVALID},
|
| + {"bluetooth_connect_readNotPermitted",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_READ_NOT_PERMITTED},
|
| + {"bluetooth_connect_requestNotSupported",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_REQUEST_NOT_SUPPORTED},
|
| + {"bluetooth_connect_unsupportedDevice",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_UNSUPPORTED_DEVICE},
|
| + {"bluetooth_connect_writeNotPermitted",
|
| + IDS_SETTINGS_BLUETOOTH_CONNECT_WRITE_NOT_PERMITTED},
|
| };
|
| AddLocalizedStringsBulk(html_source, localized_strings,
|
| arraysize(localized_strings));
|
|
|