Commit 1e89ff9f authored by Meilin Wang's avatar Meilin Wang Committed by Commit Bot

assistant: reuse chromeos_strings in Chrome Settings.

Reused string pairs:

IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD ->
IDS_ASSISTANT_HOTWORD_TITLE

IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS_DESCRIPTION ->
IDS_ASSISTANT_VOICE_MATCH_RECORDING

IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_CONTEXT -> IDS_ASSISTANT_SCREEN_CONTEXT_TITLE

IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_CONTEXT_DESCRIPTION ->
IDS_ASSISTANT_SCREEN_CONTEXT_DESC

Bug: b/117182991
Test: local compile and manually test.

Change-Id: I1894c6bb9292f01fd8cc72ca1ab59b0b19971d87
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1682620Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Meilin Wang <meilinw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676170}
parent 92b64929
......@@ -3035,15 +3035,6 @@
<message name="IDS_SETTINGS_GOOGLE_ASSISTANT" desc="Name of the settings page for Google Assistant.">
Google Assistant
</message>
<message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_CONTEXT" desc="Title for a toggle that lets the assistant use whats on the screen.">
Related info
</message>
<message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_CONTEXT_DESCRIPTION" desc="Sub label for context-enable toggle.">
Let the Assistant show you info related to what's on your screen
</message>
<message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD" desc="Title for a toggle that lets the assistant detect hotword.">
"Ok Google"
</message>
<message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_DESCRIPTION" desc="Sub label for hotword-enable toggle.">
Access your Assistant any time you say "Ok Google"
</message>
......@@ -3062,9 +3053,6 @@
<message name="IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS" desc="Title for the Assistant voice settings.">
Voice match
</message>
<message name="IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS_DESCRIPTION" desc="Sub label for the Assistant voice settings.">
Teach your Assistant to recognize your voice
</message>
<message name="IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS_RETRAIN" desc="Button label for retrain voice model.">
Retrain
</message>
......
......@@ -2497,18 +2497,16 @@ void AddGoogleAssistantStrings(content::WebUIDataSource* html_source,
Profile* profile) {
static constexpr LocalizedString kLocalizedStrings[] = {
{"googleAssistantPageTitle", IDS_SETTINGS_GOOGLE_ASSISTANT},
{"googleAssistantEnableContext",
IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_CONTEXT},
{"googleAssistantEnableContext", IDS_ASSISTANT_SCREEN_CONTEXT_TITLE},
{"googleAssistantEnableContextDescription",
IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_CONTEXT_DESCRIPTION},
{"googleAssistantEnableHotword",
IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD},
IDS_ASSISTANT_SCREEN_CONTEXT_DESC},
{"googleAssistantEnableHotword", IDS_ASSISTANT_HOTWORD_TITLE},
{"googleAssistantEnableHotwordDescription",
IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_HOTWORD_DESCRIPTION},
{"googleAssistantVoiceSettings",
IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS},
{"googleAssistantVoiceSettingsDescription",
IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS_DESCRIPTION},
IDS_ASSISTANT_VOICE_MATCH_RECORDING},
{"googleAssistantVoiceSettingsRetrainButton",
IDS_SETTINGS_GOOGLE_ASSISTANT_VOICE_SETTINGS_RETRAIN},
{"googleAssistantEnableHotwordWithoutDspDescription",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment