Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3525)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 904513002: Update sync promo string in chrome://settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try to clean up ifdef soup and not break everything Created 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 72b1c38a0d112c11e146178148ca5053acc781d3..521ebfd12b5175ee3a2db7196f474a3690835bf8 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -211,10 +211,12 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
#endif // defined(OS_CHROMEOS)
static OptionsStringResource resources[] = {
- { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT },
- { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY },
+ // Please keep these in alphabetical order.
+ { "accessibilityFeaturesLink", IDS_OPTIONS_ACCESSIBILITY_FEATURES_LINK },
+ { "accessibilityTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
{ "advancedSectionTitleCertificates",
IDS_OPTIONS_ADVANCED_SECTION_TITLE_CERTIFICATES },
+ { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT },
{ "advancedSectionTitleContent",
IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT },
{ "advancedSectionTitleLanguages",
@@ -223,32 +225,31 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK },
{ "advancedSectionTitlePrivacy",
IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY },
- { "autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE },
- { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN },
+ { "advancedSectionTitleSystem", IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM },
+ { "autoLaunchText", IDS_AUTOLAUNCH_TEXT },
{ "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY },
{ "autoOpenFileTypesResetToDefault",
IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT },
- { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE },
+ { "autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE },
+ { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN },
{ "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON },
+ { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE },
{ "childLabel", IDS_PROFILES_LIST_CHILD_LABEL },
+ { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY },
{ "customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL },
+ { "defaultBrowserUnknown",
+ IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, IDS_PRODUCT_NAME },
+ { "defaultBrowserUseAsDefault", IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT },
{ "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL },
{ "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
{ "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL },
-#if defined(OS_CHROMEOS)
- { "disableGData", IDS_OPTIONS_DISABLE_GDATA },
-#endif
{ "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES },
-#if defined(OS_CHROMEOS)
- { "displayOptions",
- IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_BUTTON_LABEL },
-#endif
{ "doNotTrack", IDS_OPTIONS_ENABLE_DO_NOT_TRACK },
- { "doNotTrackConfirmMessage", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TEXT },
- { "doNotTrackConfirmEnable",
- IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_ENABLE },
{ "doNotTrackConfirmDisable",
- IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_DISABLE },
+ IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_DISABLE },
+ { "doNotTrackConfirmEnable",
+ IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_ENABLE },
+ { "doNotTrackConfirmMessage", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TEXT },
{ "downloadLocationAskForSaveLocation",
IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION },
{ "downloadLocationBrowseTitle",
@@ -256,8 +257,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
{ "downloadLocationChangeButton",
IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON },
{ "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME },
- { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING },
- { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART },
{ "easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION,
device_type_resource_id },
{ "easyUnlockRequireProximityLabel",
@@ -267,6 +266,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
{ "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON },
{ "easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO,
device_type_resource_id },
+ { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING },
{ "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED },
{ "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE },
{ "fontSettingsCustomizeFontsButton",
@@ -284,28 +284,31 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
{ "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL },
{ "hotwordAlwaysOnAudioHistoryDescription",
IDS_HOTWORD_ALWAYS_ON_AUDIO_HISTORY_DESCRIPTION },
+ { "hotwordAlwaysOnDesc", IDS_HOTWORD_SEARCH_ALWAYS_ON_DESCRIPTION },
{ "hotwordAudioHistoryManage", IDS_HOTWORD_AUDIO_HISTORY_MANAGE_LINK },
- { "hotwordSearchEnable", IDS_HOTWORD_SEARCH_PREF_CHKBOX },
- { "hotwordConfirmEnable", IDS_HOTWORD_CONFIRM_BUBBLE_ENABLE },
+ { "hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE },
{ "hotwordConfirmDisable", IDS_HOTWORD_CONFIRM_BUBBLE_DISABLE },
+ { "hotwordConfirmEnable", IDS_HOTWORD_CONFIRM_BUBBLE_ENABLE },
{ "hotwordConfirmMessage", IDS_HOTWORD_SEARCH_PREF_DESCRIPTION },
{ "hotwordNoDSPDesc", IDS_HOTWORD_SEARCH_NO_DSP_DESCRIPTION },
- { "hotwordAlwaysOnDesc", IDS_HOTWORD_SEARCH_ALWAYS_ON_DESCRIPTION },
{ "hotwordRetrainLink", IDS_HOTWORD_RETRAIN_LINK },
- { "hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE },
+ { "hotwordSearchEnable", IDS_HOTWORD_SEARCH_PREF_CHKBOX },
{ "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON },
{ "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE },
{ "languageAndSpellCheckSettingsButton",
IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS },
+ { "languageSectionLabel", IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
+ IDS_SHORT_PRODUCT_NAME },
{ "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF },
{ "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK },
{ "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES },
{ "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK },
+ { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART },
{ "networkPredictionEnabledDescription",
IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
+ { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
{ "passwordsAndAutofillGroupName",
IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
- { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
{ "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
{ "privacyContentSettingsButton",
IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
@@ -316,11 +319,10 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
{ "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL },
{ "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT },
{ "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
+ { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE,
+ IDS_PRODUCT_NAME },
{ "profilesSupervisedDashboardTip",
IDS_PROFILES_SUPERVISED_USER_DASHBOARD_TIP },
-#if defined(ENABLE_SETTINGS_APP)
- { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },
-#endif
{ "proxiesLabelExtension", IDS_OPTIONS_EXTENSION_PROXIES_LABEL },
{ "proxiesLabelSystem", IDS_OPTIONS_SYSTEM_PROXIES_LABEL,
IDS_PRODUCT_NAME },
@@ -329,22 +331,22 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
IDS_RESET_PROFILE_SETTINGS_DESCRIPTION },
{ "resetProfileSettingsSectionTitle",
IDS_RESET_PROFILE_SETTINGS_SECTION_TITLE },
- { "safeBrowsingEnableProtection",
- IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },
{ "safeBrowsingEnableExtendedReporting",
IDS_OPTIONS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING },
+ { "safeBrowsingEnableProtection",
+ IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },
{ "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME },
{ "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
- { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME },
{ "sectionTitleProxy", IDS_OPTIONS_PROXY_GROUP_NAME },
{ "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
{ "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME },
{ "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME },
+ { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME },
{ "settingsTitle", IDS_SETTINGS_TITLE },
{ "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS },
- { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT },
- { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE },
{ "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE },
+ { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE },
+ { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT },
{ "spellingPref", IDS_OPTIONS_SPELLING_PREF },
{ "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION },
{ "startupSetPages", IDS_OPTIONS_STARTUP_SET_PAGES },
@@ -353,70 +355,62 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
{ "suggestPref", IDS_OPTIONS_SUGGEST_PREF },
{ "supervisedUserLabel", IDS_PROFILES_LIST_SUPERVISED_USER_LABEL },
{ "syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS },
+ { "syncButtonTextSignIn", IDS_SYNC_START_SYNC_BUTTON_LABEL,
+ IDS_SHORT_PRODUCT_NAME },
{ "syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL },
+ { "syncOverview", IDS_SYNC_OVERVIEW },
+ { "tabsToLinksPref", IDS_OPTIONS_TABS_TO_LINKS_PREF },
{ "themesGallery", IDS_THEMES_GALLERY_BUTTON },
{ "themesGalleryURL", IDS_THEMES_GALLERY_URL },
- { "tabsToLinksPref", IDS_OPTIONS_TABS_TO_LINKS_PREF },
+ { "themesReset", IDS_THEMES_RESET_BUTTON },
{ "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR },
{ "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
{ "translateEnableTranslate",
IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
- { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
- { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
- { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
-#else
- { "themes", IDS_THEMES_GROUP_NAME },
-#endif
- { "themesReset", IDS_THEMES_RESET_BUTTON },
-#if defined(OS_CHROMEOS)
- { "wakeOnWifiLabel", IDS_OPTIONS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION },
-#endif
- { "accessibilityTitle",
- IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
- { "accessibilityFeaturesLink",
- IDS_OPTIONS_ACCESSIBILITY_FEATURES_LINK },
#if defined(OS_CHROMEOS)
+ { "accessibilityAlwaysShowMenu",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU },
+ { "accessibilityAutoclick",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DESCRIPTION },
+ { "accessibilityAutoclickDropdown",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DROPDOWN_DESCRIPTION },
{ "accessibilityExplanation",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_EXPLANATION },
- { "accessibilitySettings",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SETTINGS },
{ "accessibilityHighContrast",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_HIGH_CONTRAST_DESCRIPTION },
+ { "accessibilityLargeCursor",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_LARGE_CURSOR_DESCRIPTION },
{ "accessibilityScreenMagnifier",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_DESCRIPTION },
- { "accessibilityTapDragging",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION },
- { "accessibilityScreenMagnifierOff",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF },
{ "accessibilityScreenMagnifierFull",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL },
+ { "accessibilityScreenMagnifierOff",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF },
{ "accessibilityScreenMagnifierPartial",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL },
- { "accessibilityLargeCursor",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_LARGE_CURSOR_DESCRIPTION },
- { "accessibilityStickyKeys",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION },
+ { "accessibilitySettings",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SETTINGS },
{ "accessibilitySpokenFeedback",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION },
+ { "accessibilityStickyKeys",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION },
+ { "accessibilityTapDragging",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION },
{ "accessibilityVirtualKeyboard",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
- { "accessibilityAlwaysShowMenu",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU },
- { "accessibilityAutoclick",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DESCRIPTION },
- { "accessibilityAutoclickDropdown",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DROPDOWN_DESCRIPTION },
{ "autoclickDelayExtremelyShort",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT },
- { "autoclickDelayVeryShort",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT },
- { "autoclickDelayShort",
- IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT },
{ "autoclickDelayLong",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG },
+ { "autoclickDelayShort",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT },
{ "autoclickDelayVeryLong",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG },
+ { "autoclickDelayVeryShort",
+ IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT },
+ { "batteryButton", IDS_OPTIONS_SETTINGS_BATTERY_DESCRIPTION},
+ { "changePicture", IDS_OPTIONS_CHANGE_PICTURE },
+ { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION },
{ "consumerManagementDescription",
IDS_OPTIONS_CONSUMER_MANAGEMENT_DESCRIPTION },
{ "consumerManagementEnrollButton",
@@ -427,85 +421,79 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
IDS_OPTIONS_CONSUMER_MANAGEMENT_UNENROLL_BUTTON },
{ "consumerManagementUnenrollingButton",
IDS_OPTIONS_CONSUMER_MANAGEMENT_UNENROLLING_BUTTON },
+ { "datetimeTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME },
{ "deviceControlTitle", IDS_OPTIONS_DEVICE_CONTROL_SECTION_TITLE },
+ { "deviceGroupDescription", IDS_OPTIONS_DEVICE_GROUP_DESCRIPTION },
+ { "deviceGroupPointer", IDS_OPTIONS_DEVICE_GROUP_POINTER_SECTION },
+ { "disableGData", IDS_OPTIONS_DISABLE_GDATA },
+ { "displayOptions", IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_BUTTON_LABEL },
{ "enableContentProtectionAttestation",
IDS_OPTIONS_ENABLE_CONTENT_PROTECTION_ATTESTATION },
+ { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX },
+ { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON },
+ { "factoryResetDescription", IDS_OPTIONS_FACTORY_RESET_DESCRIPTION,
+ IDS_SHORT_PRODUCT_NAME },
{ "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING },
- { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
+ { "factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL },
{ "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
- { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON },
+ { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
{ "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING },
- { "factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL },
- { "changePicture", IDS_OPTIONS_CHANGE_PICTURE },
- { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION },
- { "datetimeTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME },
- { "deviceGroupDescription", IDS_OPTIONS_DEVICE_GROUP_DESCRIPTION },
- { "powerSettingsButton",
- IDS_OPTIONS_DEVICE_GROUP_POWER_SETTINGS_BUTTON },
- { "deviceGroupPointer", IDS_OPTIONS_DEVICE_GROUP_POINTER_SECTION },
- { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION },
- { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION },
- { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX },
{ "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE },
{ "keyboardSettingsButtonTitle",
IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE },
{ "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE },
+ { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION },
{ "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES },
+ { "powerSettingsButton",
+ IDS_OPTIONS_DEVICE_GROUP_POWER_SETTINGS_BUTTON },
+ { "resolveTimezoneByGeoLocation",
+ IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION },
{ "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME },
{ "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
- { "syncOverview", IDS_SYNC_OVERVIEW },
+ { "storageButton", IDS_OPTIONS_SETTINGS_STORAGE_DESCRIPTION},
{ "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
- { "thirdPartyImeConfirmEnable", IDS_OK },
{ "thirdPartyImeConfirmDisable", IDS_CANCEL },
+ { "thirdPartyImeConfirmEnable", IDS_OK },
{ "thirdPartyImeConfirmMessage",
IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_MESSAGE },
{ "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION },
+ { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION },
{ "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION },
- { "batteryButton", IDS_OPTIONS_SETTINGS_BATTERY_DESCRIPTION},
- { "storageButton", IDS_OPTIONS_SETTINGS_STORAGE_DESCRIPTION},
+ { "wakeOnWifiLabel", IDS_OPTIONS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION },
#else
- { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
-#endif
-#if defined(OS_CHROMEOS) && defined(USE_ASH)
- { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
-#endif
- { "advancedSectionTitleSystem",
- IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM },
-#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
- { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE },
-#endif
-#if !defined(OS_CHROMEOS)
{ "gpuModeCheckbox",
IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE },
{ "gpuModeResetRestart",
IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE_RESTART },
- // Strings with product-name substitutions.
- { "syncOverview", IDS_SYNC_OVERVIEW, IDS_PRODUCT_NAME },
+ { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
{ "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
-#endif
- { "syncButtonTextSignIn", IDS_SYNC_START_SYNC_BUTTON_LABEL,
- IDS_SHORT_PRODUCT_NAME },
- { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE,
- IDS_PRODUCT_NAME },
- { "defaultBrowserUnknown", IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN,
- IDS_PRODUCT_NAME },
- { "defaultBrowserUseAsDefault", IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT },
- { "autoLaunchText", IDS_AUTOLAUNCH_TEXT },
-#if defined(OS_CHROMEOS)
- { "factoryResetDescription", IDS_OPTIONS_FACTORY_RESET_DESCRIPTION,
- IDS_SHORT_PRODUCT_NAME },
-#endif
- { "languageSectionLabel", IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
- IDS_SHORT_PRODUCT_NAME },
+#endif // defined(OS_CHROMEOS)
+
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
+ { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
+ { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
+#else
+ { "themes", IDS_THEMES_GROUP_NAME },
+#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+
+#if defined(OS_CHROMEOS) && defined(USE_ASH)
+ { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
+#endif // defined(OS_CHROMEOS) && defined(USE_ASH)
+
+#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
+ { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE },
+#endif // defined(OS_MACOSX) && !defined(OS_CHROMEOS)
+
+#if defined(ENABLE_SETTINGS_APP)
+ { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },
+#endif // defined(ENABLE_SETTINGS_APP)
+
#if defined(ENABLE_SERVICE_DISCOVERY)
{ "cloudPrintDevicesPageButton", IDS_LOCAL_DISCOVERY_DEVICES_PAGE_BUTTON },
{ "cloudPrintEnableNotificationsLabel",
IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL },
-#endif
-#if defined(OS_CHROMEOS)
- { "resolveTimezoneByGeoLocation",
- IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION },
-#endif
+#endif // defined(ENABLE_SERVICE_DISCOVERY)
};
#if defined(ENABLE_SETTINGS_APP)
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698