Commit 09e38cd4 authored by Andre Le's avatar Andre Le Committed by Commit Bot

[CrOS PhoneHub] Update PhoneHub strings.

Update strings in ash and settings to match the finalized strings.

Screenshot:
https://screenshot.googleplex.com/9cL3Tgpcc32GCUK
https://screenshot.googleplex.com/8Sh9naEynbxcsfJ
https://screenshot.googleplex.com/36S9sebanwfmfZS
https://screenshot.googleplex.com/4WLBHUFN8rmZbNE
https://screenshot.googleplex.com/BuSim7d7cvQPFG6
https://screenshot.googleplex.com/9jAkWjLYmHEJyRp
https://screenshot.googleplex.com/9JiPk3S7L7w2tjC
https://screenshot.googleplex.com/862pdYr9XPuRRsL

BUG=1106937,1126208,1144844

Change-Id: I5c03cd00cf6383ad67a8e9fc15a18b68cd50c1ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518362
Commit-Queue: Andre Le <leandre@chromium.org>
Reviewed-by: default avatarTim Song <tengs@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824528}
parent 1c28c6e4
......@@ -1001,13 +1001,13 @@ This file contains the strings for ash.
Phone Hub
</message>
<message name="IDS_ASH_PHONE_HUB_ENABLE_HOTSPOT_TITLE" desc="Title of the enable hotspot toggle in the phone hub bubble.">
Enable Hotspot
Enable hotspot
</message>
<message name="IDS_ASH_PHONE_HUB_SILENCE_PHONE_TITLE" desc="Title of the silence phone toggle in the phone hub bubble.">
Silence
Silence phone
</message>
<message name="IDS_ASH_PHONE_HUB_LOCATE_PHONE_TITLE" desc="Title of the locate phone toggle in the phone hub bubble.">
Locate Phone
Locate phone
</message>
<message name="IDS_ASH_PHONE_HUB_QUICK_ACTIONS_TOGGLE_TOOLTIP" desc="The tooltip text used for the button in phone hube bubble to toggle quick actions feature on or off.">
Toggle <ph name="FEATURE_NAME">$1<ex>Silence</ex></ph>. <ph name="STATE_TEXT">$2<ex>Silence is on.</ex></ph>
......@@ -1049,13 +1049,13 @@ This file contains the strings for ash.
Not available
</message>
<message name="IDS_ASH_PHONE_HUB_TASK_CONTINUATION_TITLE" desc="Title of the task continuation section (where users pick up unfinished task left off from their phone, currently only support web browsing) in phone hub bubble.">
Continue browsing
Recent Chrome tabs
</message>
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_TITLE" desc="The title of the onboarding dialog that pops up for existing multidevice users to ask for permission when the user enables this feature.">
Turn on Phone Hub
</message>
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_DESCRIPTION" desc="The description of the onboarding dialog that pops up for existing multidevice users to ask for permission when the user enables this feature." translateable="false">
View quick actions to extend the phone internet connection, control DND and locate your phone. Also view active Chrome tabs from your phone on your Chromebook.
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_DESCRIPTION" desc="The description of the onboarding dialog that pops up for existing multidevice users to ask for permission when the user enables this feature.">
Extend your phone’s internet connection, control Do Not Disturb and locate your device. View active Chrome tabs from your phone on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>.
</message>
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_DISMISS_BUTTON" desc="Dimiss button on the onboarding dialog for user to opt out this feature.">
Dismiss
......@@ -1066,26 +1066,26 @@ This file contains the strings for ash.
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_TITLE" desc="The title of the dialog that pops up after user clicks the dismiss button on the onboarding dialog.">
Set up Phone Hub later
</message>
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1" desc="The description of the dialog that pops up after user clicks the dismiss button on the onboarding dialog. Also see IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_2." translateable="false">
View quick actions to extend the phone internet connection, control DND and locate your phone. Also view active Chrome tabs from your phone on your Chromebook.
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1" desc="The description of the dialog that pops up after user clicks the dismiss button on the onboarding dialog. Also see IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_2.">
Extend your phone’s internet connection, control Do Not Disturb and locate your phone. View active Chrome tabs from your phone on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>.
</message>
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_2" desc="The description of the dialog that pops up after user clicks the dismiss button on the onboarding dialog. Also see IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1." translateable="false">
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_2" desc="The description of the dialog that pops up after user clicks the dismiss button on the onboarding dialog. Also see IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1.">
You can always set up later from Settings.
</message>
<message name="IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_OK_BUTTON" desc="Confirm button on the onboarding dismiss dialog to acknowledge.">
Ok, got it
OK
</message>
<message name="IDS_ASH_PHONE_HUB_INITIAL_CONNECTING_DIALOG_TITLE" desc="The title of the initial connecting dialog that indicates the device is trying to connect to your phone after the user has opted in the Phone Hub feature.">
Connecting to your phone...
Connecting...
</message>
<message name="IDS_ASH_PHONE_HUB_INITIAL_CONNECTING_DIALOG_DESCRIPTION" desc="The description of the onboarding dialog that indicates the device is trying to connect to your phone after the user has opted in the Phone Hub feature." translateable="false">
Make sure your phone is nearby with Bluetooth and Wi-Fi turned on.
<message name="IDS_ASH_PHONE_HUB_INITIAL_CONNECTING_DIALOG_DESCRIPTION" desc="The description of the onboarding dialog that indicates the device is trying to connect to your phone after the user has opted in the Phone Hub feature.">
Make sure your phone is nearby with Bluetooth and Wi-Fi is turned on.
</message>
<message name="IDS_ASH_PHONE_HUB_CONNECTION_ERROR_DIALOG_TITLE" desc="The title of the dialog that pops up when the Phone Hub feature is not available because there is currently no active connection to the phone.">
Uh Oh! Can’t find phone
Can’t find your phone
</message>
<message name="IDS_ASH_PHONE_HUB_CONNECTION_ERROR_DIALOG_DESCRIPTION" desc="The description of the dialog that pops up when the Phone Hub feature is not available because there is currently no active connection to the phone.">
Looks like your phone is not online and we are not able to get all the goodies from it for you now.
Looks like your phone is not online and we are not able to connect to it.
</message>
<message name="IDS_ASH_PHONE_HUB_CONNECTION_ERROR_DIALOG_REFRESH_BUTTON" desc="Refresh button on the connection error dialog to retry the connection attempt to the phone.">
Refresh
......@@ -1094,10 +1094,10 @@ This file contains the strings for ash.
Learn more
</message>
<message name="IDS_ASH_PHONE_HUB_BLUETOOTH_DISABLED_DIALOG_TITLE" desc="The title of the dialog that pops up when the phone hub feature is not available because Bluetooth is disabled on this device.">
Uh Oh! Check your connection
Check your connection
</message>
<message name="IDS_ASH_PHONE_HUB_BLUETOOTH_DISABLED_DIALOG_DESCRIPTION" desc="The description of the dialog that pops up when the phone hub feature is not available because Bluetooth is disabled on this device.">
Looks like your Bluetooth or Wi-Fi is turned off on your Chromebook. Please check your connection to use Phone Hub.
Looks like your Bluetooth or Wi-Fi is turned off on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>. Please check your connection to use Phone Hub.
</message>
<message name="IDS_ASH_PHONE_HUB_BLUETOOTH_DISABLED_DIALOG_OK_BUTTON" desc="Confirm button on the bluetooth disabled dialog to acknowledge.">
Ok, got it
......@@ -1112,7 +1112,7 @@ This file contains the strings for ash.
Reply
</message>
<message name="IDS_ASH_PHONE_HUB_NOTIFICATION_OPT_IN_DESCRIPTION" desc="Description for the notification opt in view.">
Turn on Notifications from your Android phone
Get notifications from your phone on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
</message>
<message name="IDS_ASH_PHONE_HUB_NOTIFICATION_OPT_IN_SET_UP_BUTTON" desc="Label for the set up button to start the opt in flow to show notifications from the phone.">
Set up
......
17de05a6cb257232bfafaf3b29b6bc674ab83a4a
\ No newline at end of file
b3ee721c9aed0855dfb4a5dedf460b0d6ed29fdb
\ No newline at end of file
582e2049918105497eaef5e364fd6089b483e156
\ No newline at end of file
b3ee721c9aed0855dfb4a5dedf460b0d6ed29fdb
\ No newline at end of file
41c34a5188e7dcdcb8d01415aaa4dc366894f89e
\ No newline at end of file
4d218cdf721211bc4342dc2320c5ecd3720c64d8
\ No newline at end of file
ffba8f7a47fc10ca5efd170bb91decc594bff24f
\ No newline at end of file
4d218cdf721211bc4342dc2320c5ecd3720c64d8
\ No newline at end of file
9c58b5129b9ad36befda19e1ceb8687a4eacc00e
\ No newline at end of file
838e2b58a62db7651a665353081aaa3d377c7e21
\ No newline at end of file
0b45af8839833cef94368b5f2d8a32985879a6f0
\ No newline at end of file
11e0cec900673f197970ef1b4708dc6e79b51810
\ No newline at end of file
66c77af10cb52b8d8b2e28a881c346c5cdcb1083
\ No newline at end of file
11e0cec900673f197970ef1b4708dc6e79b51810
\ No newline at end of file
6172ae58a33bef16a5311ed0193f132102818471
\ No newline at end of file
838e2b58a62db7651a665353081aaa3d377c7e21
\ No newline at end of file
b4ed88fa864bf36f803e3d3d1d33647c686a9a67
\ No newline at end of file
02e3ebceb70c32bbbc9a8ab8b577c7d59e7c4aa6
\ No newline at end of file
800ae8d74defeb2085d8aef35f359369bd30a44d
\ No newline at end of file
49d1877727962300a1e64f84ab41c96f1bcc31ae
\ No newline at end of file
962622fc21f95ff1f4b6af60f918c7f05ea36136
\ No newline at end of file
962622fc21f95ff1f4b6af60f918c7f05ea36136
\ No newline at end of file
dd7eee95aaa308c38ffacf4198c1c8618c8029b4
\ No newline at end of file
962622fc21f95ff1f4b6af60f918c7f05ea36136
\ No newline at end of file
8cb7009e66bd5aec3c3eedc3a50cc8c0e2691b6c
\ No newline at end of file
838e2b58a62db7651a665353081aaa3d377c7e21
\ No newline at end of file
1ac32cceb9bdf23779cf4be7bb55d52652062a5a
\ No newline at end of file
59faacb8a71f3066a8f240cfd4661bfb0ea3341a
\ No newline at end of file
......@@ -19,6 +19,7 @@
#include "ash/system/status_area_widget.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/chromeos/devicetype_utils.h"
#include "ui/views/layout/fill_layout.h"
#include "ui/views/metadata/metadata_impl_macros.h"
......@@ -41,8 +42,9 @@ BluetoothDisabledView::BluetoothDisabledView() {
content_view->SetImage(*image);
content_view->SetTitle(l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_BLUETOOTH_DISABLED_DIALOG_TITLE));
content_view->SetDescription(l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_BLUETOOTH_DISABLED_DIALOG_DESCRIPTION));
content_view->SetDescription(l10n_util::GetStringFUTF16(
IDS_ASH_PHONE_HUB_BLUETOOTH_DISABLED_DIALOG_DESCRIPTION,
ui::GetChromeOSDeviceName()));
// Add "Learn more" button.
auto learn_more = std::make_unique<InterstitialViewButton>(
......
......@@ -17,6 +17,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chromeos/components/phonehub/notification_access_manager.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/chromeos/devicetype_utils.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/views/border.h"
#include "ui/views/controls/label.h"
......@@ -117,8 +118,9 @@ void NotificationOptInView::InitLayout() {
.DeriveWithWeight(gfx::Font::Weight::MEDIUM));
text_label_->SetLineHeight(kTextLabelLineHeightDip);
text_label_->SetBorder(views::CreateEmptyBorder(kTextLabelBorderInsets));
text_label_->SetText(l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_NOTIFICATION_OPT_IN_DESCRIPTION));
text_label_->SetText(l10n_util::GetStringFUTF16(
IDS_ASH_PHONE_HUB_NOTIFICATION_OPT_IN_DESCRIPTION,
ui::GetChromeOSDeviceName()));
// Set up layout row for the buttons.
layout->StartRow(views::GridLayout::kFixedSize, kColumnSetId);
......
......@@ -29,6 +29,7 @@
#include "chromeos/components/phonehub/onboarding_ui_tracker.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/chromeos/devicetype_utils.h"
#include "ui/views/layout/fill_layout.h"
#include "ui/views/metadata/metadata_impl_macros.h"
......@@ -74,8 +75,9 @@ class OnboardingMainView : public PhoneHubInterstitialView {
SetImage(*image);
SetTitle(
l10n_util::GetStringUTF16(IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_TITLE));
SetDescription(l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_DESCRIPTION));
SetDescription(l10n_util::GetStringFUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DIALOG_DESCRIPTION,
ui::GetChromeOSDeviceName()));
// Add "Dismiss" and "Get started" buttons.
auto dismiss = std::make_unique<InterstitialViewButton>(
......@@ -133,8 +135,9 @@ class OnboardingDismissPromptView : public PhoneHubInterstitialView {
// Adds title and description.
SetTitle(l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_TITLE));
base::string16 part1 = l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1);
base::string16 part1 = l10n_util::GetStringFUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_1,
ui::GetChromeOSDeviceName());
base::string16 part2 = l10n_util::GetStringUTF16(
IDS_ASH_PHONE_HUB_ONBOARDING_DISMISS_DIALOG_DESCRIPTION_PART_2);
// Uses "\n" to create a newline separator between two text paragraphs.
......
......@@ -2314,23 +2314,23 @@
<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 <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 name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_SECTION_TITLE" translateable="false" desc="The title of the Phone Hub section on the settings page.">
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_SECTION_TITLE" desc="The title of the Phone Hub section on the settings page.">
Phone Hub
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_NOTIFICATIONS_SECTION_TITLE" translateable="false" desc="The title of the Phone Hub Notifications section on the settings page.">
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_NOTIFICATIONS_SECTION_TITLE" desc="The title of the Phone Hub Notifications section on the settings page.">
Notifications
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_TASK_CONTINUATION_SECTION_TITLE" translateable="false" desc="The title of the Phone Hub Task Continuation section on the settings page.">
Task Continuation
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_TASK_CONTINUATION_SECTION_TITLE" desc="The title of the Phone Hub Task Continuation section on the settings page.">
Recent Chrome tabs
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_SUMMARY" translateable="false" desc="Description of for the 'Phone Hub' setting. This feature lets the user stay productive on Chrome OS by ensuring that their phones' apps, content, and connectivity are available on their Chrome OS device.">
Make the best of your Android phone on your your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_SUMMARY" desc="Description of for the 'Phone Hub' setting. This feature lets the user stay productive on Chrome OS by ensuring that their phones' apps, content, and connectivity are available on their Chrome OS device.">
Extend the best of your Android phone to your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_NOTIFICATIONS_SUMMARY" translateable="false" desc="Description of for the 'Phone Hub Notifications' setting. This feature mirrors notifications from a connected Android phone to Chrome OS devices.">
View your phones notifications on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_NOTIFICATIONS_SUMMARY" desc="Description of for the 'Phone Hub Notifications' setting. This feature mirrors notifications from a connected Android phone to Chrome OS devices.">
View notifications from your chat apps on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_TASK_CONTINUATION_SUMMARY" translateable="false" desc="Description of for the 'Phone Hub Task Continuation' setting. This feature lets users resume in-app actions and chrome tabs that are open on a connected Android phone from Chrome OS devices.">
View your active Chrome tabs in Phone Hub
<message name="IDS_SETTINGS_MULTIDEVICE_PHONE_HUB_TASK_CONTINUATION_SUMMARY" desc="Description of for the 'Phone Hub Task Continuation' setting. This feature lets users resume in-app actions and chrome tabs that are open on a connected Android phone from Chrome OS devices.">
View recent Chrome tabs from your phone
</message>
<message name="IDS_SETTINGS_MULTIDEVICE_NOTIFICATION_ACCESS_SETUP_DIALOG_ACK_TITLE" translateable="false" desc="The title of the dialog containing the Phone Hub notification opt-in flow shown when the Phone Hub 'Notifications' toggle is switched on.">
Turn on notifications on Android phone
......
666eb9b018cee4e05ba058af7fe98336430d61ea
\ No newline at end of file
666eb9b018cee4e05ba058af7fe98336430d61ea
\ No newline at end of file
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