Skip to content

GitLab

T
tangled
Commit e7eb6fe1 authored by James Cook's avatar James Cook Committed by Commit Bot
Browse files
Options

chromeos: Ensure settings uses "Chromebox" vs "Chromebook" strings 

Specifically, in multidevice settings and Play Store.

Bug: 987732
Test: manually paired phone, checked strings
Change-Id: I774fb80d26250b219b4dfd255ac88828e693f2b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1716043Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Auto-Submit: James Cook <jamescook@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681072}
parent 897593ff
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 12 deletions
chrome/app/settings_strings.grdp
View file @ e7eb6fe1
...@@ -685,7 +685,7 @@ ...@@ -685,7 +685,7 @@
Google Play Store Google Play Store
</message> </message>
<message name="IDS_SETTINGS_ANDROID_APPS_SUBTEXT" desc="Description for the section for enabling and managing Google Play Store (Android) apps."> <message name="IDS_SETTINGS_ANDROID_APPS_SUBTEXT" desc="Description for the section for enabling and managing Google Play Store (Android) apps.">
Install apps and games from Google Play on your Chromebook. &lt;a target="_blank" href="<ph name="URL">$1<ex>https://google.com/</ex></ph>"&gt;Learn more&lt;/a&gt; Install apps and games from Google Play on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. &lt;a target="_blank" href="<ph name="URL">$2<ex>https://google.com/</ex></ph>"&gt;Learn more&lt;/a&gt;
</message> </message>
<message name="IDS_SETTINGS_ANDROID_APPS_MANAGE_APPS" desc="Label for launching Android apps settings."> <message name="IDS_SETTINGS_ANDROID_APPS_MANAGE_APPS" desc="Label for launching Android apps settings.">
Manage Android preferences Manage Android preferences
...@@ -697,6 +697,8 @@ ...@@ -697,6 +697,8 @@
<message name="IDS_SETTINGS_ANDROID_APPS_DISABLE_DIALOG_TITLE" desc="Title of the confirmation dialog for disabling android apps."> <message name="IDS_SETTINGS_ANDROID_APPS_DISABLE_DIALOG_TITLE" desc="Title of the confirmation dialog for disabling android apps.">
Remove Android apps? Remove Android apps?
</message> </message>
<!-- TODO(jamescook): Use device type instead of "Chromebook", which may
require changing ArcPlayTermsOfServiceConsent resource id handling. -->
<message name="IDS_SETTINGS_ANDROID_APPS_DISABLE_DIALOG_MESSAGE" desc="Describes what will happen if the user opts out of android apps."> <message name="IDS_SETTINGS_ANDROID_APPS_DISABLE_DIALOG_MESSAGE" desc="Describes what will happen if the user opts out of android apps.">
Apps you’ve downloaded from Google Play will be deleted from this Chromebook. Apps you’ve downloaded from Google Play will be deleted from this Chromebook.
<ph name="LINE_BREAKS1">&lt;br&gt;&lt;br&gt;</ph> <ph name="LINE_BREAKS1">&lt;br&gt;&lt;br&gt;</ph>
...@@ -4843,7 +4845,7 @@ ...@@ -4843,7 +4845,7 @@
Android phone Android phone
</message> </message>
<message name="IDS_SETTINGS_MULTIDEVICE_SETUP_SUMMARY" desc="Tells the user to connect their Chromebook to their phone."> <message name="IDS_SETTINGS_MULTIDEVICE_SETUP_SUMMARY" desc="Tells the user to connect their Chromebook to their phone.">
Connect your Chromebook with your phone. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph> Connect your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> with your phone. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
</message> </message>
<message name="IDS_SETTINGS_MULTIDEVICE_NO_ELIGIBLE_HOSTS" desc="Tells the user that there is no phone with their account on it that can connect to their Chromebook."> <message name="IDS_SETTINGS_MULTIDEVICE_NO_ELIGIBLE_HOSTS" desc="Tells the user that there is no phone with their account on it that can connect to their Chromebook.">
No eligible devices. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph> No eligible devices. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
...@@ -4864,7 +4866,7 @@ ...@@ -4864,7 +4866,7 @@
Disabled Disabled
</message> </message>
<message name="IDS_SETTINGS_MULTIDEVICE_SMART_LOCK_SUMMARY" desc="Description of for the 'Smart Lock' setting. This feature automatically unlocks the user's Chromebook if their phone is nearby and unlocked."> <message name="IDS_SETTINGS_MULTIDEVICE_SMART_LOCK_SUMMARY" desc="Description of for the 'Smart Lock' setting. This feature automatically unlocks the user's Chromebook if their phone is nearby and unlocked.">
Unlock your Chromebook with your phone. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph> Unlock your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> with your phone. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
</message> </message>
<message name="IDS_SETTINGS_MULTIDEVICE_INSTANT_TETHERING" desc="Name of a feature. This feature automatically offers the user to tether to their phone if their Chromebook is offline and their phone supports tethering."> <message name="IDS_SETTINGS_MULTIDEVICE_INSTANT_TETHERING" desc="Name of a feature. This feature automatically offers the user to tether to their phone if their Chromebook is offline and their phone supports tethering.">
Instant Tethering Instant Tethering
...@@ -4876,16 +4878,16 @@ ...@@ -4876,16 +4878,16 @@
Messages Messages
</message> </message>
<message name="IDS_SETTINGS_MULTIDEVICE_ANDROID_MESSAGES_SUMMARY" desc="Description of for the 'Android Messages' setting. This feature lets the user read and reply to text messages from their Chromebook. New text messages will appear as notifications."> <message name="IDS_SETTINGS_MULTIDEVICE_ANDROID_MESSAGES_SUMMARY" desc="Description of for the 'Android Messages' setting. This feature lets the user read and reply to text messages from their Chromebook. New text messages will appear as notifications.">
Send and receive text messages from your Chromebook. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph> Send and receive text messages from your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$2<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
</message> </message>
<message name="IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE" desc="Header to tell the user an action will make their Chromebook forget their phone. This means they will no longer have access to multidevice features."> <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE" desc="Header to tell the user an action will make their Chromebook forget their phone. This means they will no longer have access to multidevice features.">
Forget phone Forget phone
</message> </message>
<message name="IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE_EXPLANATION" desc="Explanation on a clickable menu item that makes the Chromebook forget the user's phone. It tells the user that the menu item will cause their phone to stop acting as a partner for their Chromebook for multidevice features."> <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE_EXPLANATION" desc="Explanation on a clickable menu item that makes the Chromebook forget the user's phone. It tells the user that the menu item will cause their phone to stop acting as a partner for their Chromebook for multidevice features.">
Disconnect your phone from your Chromebook Disconnect your phone from your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
</message> </message>
<message name="IDS_SETTINGS_MULTIDEVICE_FORGET_DEVICE_DIALOG_MESSAGE" desc="Text of a dialog that lets the user choose if their Chromebook should forget their phone. This means they will no longer have access to multidevice features."> <message name="IDS_SETTINGS_MULTIDEVICE_FORGET_DEVICE_DIALOG_MESSAGE" desc="Text of a dialog that lets the user choose if their Chromebook should forget their phone. This means they will no longer have access to multidevice features.">
Disconnect your phone from your Chromebook. They will no longer connect automatically. Disconnect your phone from your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. They will no longer connect automatically.
</message> </message>
</if> </if>
......
chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
View file @ e7eb6fe1
...@@ -615,7 +615,7 @@ void AddAndroidAppStrings(content::WebUIDataSource* html_source) { ...@@ -615,7 +615,7 @@ void AddAndroidAppStrings(content::WebUIDataSource* html_source) {
html_source->AddString( html_source->AddString(
"androidAppsSubtext", "androidAppsSubtext",
l10n_util::GetStringFUTF16( l10n_util::GetStringFUTF16(
IDS_SETTINGS_ANDROID_APPS_SUBTEXT, IDS_SETTINGS_ANDROID_APPS_SUBTEXT, ui::GetChromeOSDeviceName(),
GetHelpUrlWithBoard(chrome::kAndroidAppsLearnMoreURL))); GetHelpUrlWithBoard(chrome::kAndroidAppsLearnMoreURL)));
} }
...@@ -3066,16 +3066,20 @@ void AddMultideviceStrings(content::WebUIDataSource* html_source) { ...@@ -3066,16 +3066,20 @@ void AddMultideviceStrings(content::WebUIDataSource* html_source) {
{"multideviceAndroidMessagesItemTitle", {"multideviceAndroidMessagesItemTitle",
IDS_SETTINGS_MULTIDEVICE_ANDROID_MESSAGES}, IDS_SETTINGS_MULTIDEVICE_ANDROID_MESSAGES},
{"multideviceForgetDevice", IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE}, {"multideviceForgetDevice", IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE},
{"multideviceForgetDeviceSummary",
IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE_EXPLANATION},
{"multideviceForgetDeviceDialogMessage",
IDS_SETTINGS_MULTIDEVICE_FORGET_DEVICE_DIALOG_MESSAGE},
{"multideviceSmartLockOptions", {"multideviceSmartLockOptions",
IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS_LOCK}, IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS_LOCK},
}; };
AddLocalizedStringsBulk(html_source, kLocalizedStrings, AddLocalizedStringsBulk(html_source, kLocalizedStrings,
base::size(kLocalizedStrings)); base::size(kLocalizedStrings));
html_source->AddString(
"multideviceForgetDeviceSummary",
ui::SubstituteChromeOSDeviceType(
IDS_SETTINGS_MULTIDEVICE_FORGET_THIS_DEVICE_EXPLANATION));
html_source->AddString(
"multideviceForgetDeviceDialogMessage",
ui::SubstituteChromeOSDeviceType(
IDS_SETTINGS_MULTIDEVICE_FORGET_DEVICE_DIALOG_MESSAGE));
html_source->AddString( html_source->AddString(
"multideviceVerificationText", "multideviceVerificationText",
l10n_util::GetStringFUTF16( l10n_util::GetStringFUTF16(
...@@ -3087,7 +3091,7 @@ void AddMultideviceStrings(content::WebUIDataSource* html_source) { ...@@ -3087,7 +3091,7 @@ void AddMultideviceStrings(content::WebUIDataSource* html_source) {
html_source->AddString( html_source->AddString(
"multideviceSetupSummary", "multideviceSetupSummary",
l10n_util::GetStringFUTF16( l10n_util::GetStringFUTF16(
IDS_SETTINGS_MULTIDEVICE_SETUP_SUMMARY, IDS_SETTINGS_MULTIDEVICE_SETUP_SUMMARY, ui::GetChromeOSDeviceName(),
base::UTF8ToUTF16( base::UTF8ToUTF16(
chromeos::multidevice_setup:: chromeos::multidevice_setup::
GetBoardSpecificBetterTogetherSuiteLearnMoreUrl() GetBoardSpecificBetterTogetherSuiteLearnMoreUrl()
...@@ -3104,6 +3108,7 @@ void AddMultideviceStrings(content::WebUIDataSource* html_source) { ...@@ -3104,6 +3108,7 @@ void AddMultideviceStrings(content::WebUIDataSource* html_source) {
"multideviceAndroidMessagesItemSummary", "multideviceAndroidMessagesItemSummary",
l10n_util::GetStringFUTF16( l10n_util::GetStringFUTF16(
IDS_SETTINGS_MULTIDEVICE_ANDROID_MESSAGES_SUMMARY, IDS_SETTINGS_MULTIDEVICE_ANDROID_MESSAGES_SUMMARY,
ui::GetChromeOSDeviceName(),
base::UTF8ToUTF16(chromeos::multidevice_setup:: base::UTF8ToUTF16(chromeos::multidevice_setup::
GetBoardSpecificMessagesLearnMoreUrl() GetBoardSpecificMessagesLearnMoreUrl()
.spec()))); .spec())));
...@@ -3111,6 +3116,7 @@ void AddMultideviceStrings(content::WebUIDataSource* html_source) { ...@@ -3111,6 +3116,7 @@ void AddMultideviceStrings(content::WebUIDataSource* html_source) {
"multideviceSmartLockItemSummary", "multideviceSmartLockItemSummary",
l10n_util::GetStringFUTF16( l10n_util::GetStringFUTF16(
IDS_SETTINGS_MULTIDEVICE_SMART_LOCK_SUMMARY, IDS_SETTINGS_MULTIDEVICE_SMART_LOCK_SUMMARY,
ui::GetChromeOSDeviceName(),
GetHelpUrlWithBoard(chrome::kEasyUnlockLearnMoreUrl))); GetHelpUrlWithBoard(chrome::kEasyUnlockLearnMoreUrl)));
} }
#endif #endif
......
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