post-login: Update some strings for the post login dialogs
Updates the strings which are finalized. Remove pine usage in .grd file. Test: manual Bug: b/342667577 Change-Id: Ia30b6935b2af7e5a9a6a8665e8ce5f150a8316f8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5689301 Commit-Queue: Sammie Quon <sammiequon@chromium.org> Reviewed-by: Sophie Wen <sophiewen@chromium.org> Cr-Commit-Position: refs/heads/main@{#1326251}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
314658c455
commit
6e243c852e
ash
ash_strings.grd
ash_strings_grd
IDS_ASH_INFORMED_RESTORE_DIALOG_CRASH_DESCRIPTION.png.sha1IDS_ASH_INFORMED_RESTORE_DIALOG_DESCRIPTION.png.sha1IDS_ASH_INFORMED_RESTORE_DIALOG_NO_THANKS_BUTTON.png.sha1IDS_ASH_INFORMED_RESTORE_DIALOG_RESTORE_BUTTON.png.sha1IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_OFF_ACCEPT.png.sha1IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_OFF_CANCEL.png.sha1IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_ON_ACCEPT.png.sha1
wm
@ -8279,70 +8279,58 @@ To shut down the device, press and hold the power button on the device again.
|
||||
View details in browser
|
||||
</message>
|
||||
|
||||
<!-- Forest -->
|
||||
<message name="IDS_ASH_FOREST_WINDOW_OVERFLOW_COUNT" translateable="false" desc="Text summarizing how many windows left to restore. [ICU Syntax]">
|
||||
<!-- Post login glanceables -->
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_WINDOW_OVERFLOW_COUNT" translateable="false" desc="Text summarizing how many windows left to restore. [ICU Syntax]">
|
||||
{NUM_OVERFLOW, plural,
|
||||
=1 {1 more window}
|
||||
other {# more windows}}
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_TITLE" translateable="false" desc="Label of the title for the pine dialog.">
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_DIALOG_TITLE" translateable="false" desc="Label of the title for the informed restore dialog.">
|
||||
Welcome Back
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_CRASH_TITLE" translateable="false" desc="Label of the title for the pine dialog, if the previous session ended with a crash.">
|
||||
Your Chromebook restarted because of a problem
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_DIALOG_DESCRIPTION" desc="Label of the description for the informed restore dialog. Gives a little more information than the title.">
|
||||
Open your previous windows and apps
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_DESCRIPTION" translateable="false" desc="Label of the description for the pine dialog. Gives a little more information than the title.">
|
||||
Continue from where you left off?
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_DIALOG_CRASH_DESCRIPTION" desc="Label of the description for the informed restore dialog, if the previous session ended with a crash. Gives a little more information than the title.">
|
||||
Your Chromebook restarted unexpectedly. Open your previous windows and apps.
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_CRASH_DESCRIPTION" translateable="false" desc="Label of the description for the pine dialog, if the previous session ended with a crash. Gives a little more information than the title.">
|
||||
Restore last opened apps and sites?
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_DIALOG_NO_THANKS_BUTTON" desc="Label of the no thanks button for the informed restore dialog, which users can click if they choose not to restore.">
|
||||
No thanks
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_NO_THANKS_BUTTON" translateable="false" desc="Label of the no thanks button for the pine dialog, which users can click if they choose not to restore.">
|
||||
No Thanks
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_DIALOG_RESTORE_BUTTON" desc="Label of the restore button for the informed restore dialog.">
|
||||
Open
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_RESTORE_BUTTON" translateable="false" desc="Label of the restore button for the pine dialog.">
|
||||
Restore
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_CONTEXT_MENU_TITLE" translateable="false" desc="Title of the pine dialog context menu.">
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_DIALOG_CONTEXT_MENU_TITLE" translateable="false" desc="Title of the informed restore dialog context menu.">
|
||||
Continue where you left off
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_CONTEXT_MENU_ASK_OPTION" translateable="false" desc="Ask every time option for the pine dialog context menu.">
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_DIALOG_CONTEXT_MENU_ASK_OPTION" translateable="false" desc="Ask every time option for the informed restore dialog context menu.">
|
||||
Ask every time
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_CONTEXT_MENU_ALWAYS_OPTION" translateable="false" desc="Always restore option for the pine dialog context menu.">
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_DIALOG_CONTEXT_MENU_ALWAYS_OPTION" translateable="false" desc="Always restore option for the informed restore dialog context menu.">
|
||||
Always restore
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_CONTEXT_MENU_NEVER_OPTION" translateable="false" desc="Do not restore option for the pine dialog context menu.">
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_DIALOG_CONTEXT_MENU_NEVER_OPTION" translateable="false" desc="Do not restore option for the informed restore dialog context menu.">
|
||||
Off
|
||||
</message>
|
||||
<message name="IDS_ASH_PINE_DIALOG_CONTEXT_MENU_EXTRA_INFO" translateable="false" desc="Text in the pine dialog's context menu. Gives users some information about the full restore setting.">
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_DIALOG_CONTEXT_MENU_EXTRA_INFO" translateable="false" desc="Text in the informed restore dialog's context menu. Gives users some information about the full restore setting.">
|
||||
Change will be applied next time when you sign in. You can also change settings in Settings > System preferences > On startup.
|
||||
</message>
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_ON_TITLE" translateable="false" desc="Title of the onboarding message if the user had Restore set to Ask every time.">
|
||||
A start page personalized for you
|
||||
</message>
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_ON_DESCRIPTION" translateable="false" desc="Description of the onboarding message if the user had Restore set to Ask every time.">
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_DESCRIPTION" translateable="false" desc="Description of the onboarding message if the user had Restore set to Ask every time.">
|
||||
Get started with options to resume your last opened windows and tabs along with personalized suggestions.
|
||||
</message>
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_ON_ACCEPT" translateable="false" desc="Label of the accept button if the user had Restore set to Ask every time.">
|
||||
Continue
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_ON_ACCEPT" desc="Label of the accept button if the user had Restore set to Ask every time.">
|
||||
Got it
|
||||
</message>
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_OFF_TITLE" translateable="false" desc="Title of the onboarding message if the user had Restore off.">
|
||||
Try a new start page personalized for you?
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_OFF_ACCEPT" desc="Label of the accept button if the user had Restore off.">
|
||||
Turn on
|
||||
</message>
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_OFF_DESCRIPTION" translateable="false" desc="Description of the onboarding message if the user had Restore off.">
|
||||
Set your Restore options to "Ask every time" to see and resume your last opened windows along with personalized suggestions.
|
||||
</message>
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_OFF_ACCEPT" translateable="false" desc="Label of the accept button if the user had Restore off.">
|
||||
Turn on restore
|
||||
</message>
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_OFF_CANCEL" translateable="false" desc="Label of the cancel button if the user had Restore off.">
|
||||
Keep restore off
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_OFF_CANCEL" desc="Label of the cancel button if the user had Restore off.">
|
||||
No thanks
|
||||
</message>
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_ONBOARDING_TOAST" translateable="false" desc="Label of the toast the user sees, if the user had Restore off and they clicked accept in the onboarding dialog.">
|
||||
Your windows and apps will be restored next time when you sign in
|
||||
Your windows and apps will be restored next time when you sign in
|
||||
</message>
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_EDUCATION_NUDGE" translateable="false" desc="Text of the Pine education nudge.">
|
||||
<message name="IDS_ASH_INFORMED_RESTORE_EDUCATION_NUDGE" translateable="false" desc="Text of the informed restore education nudge.">
|
||||
You can go back to Overview at anytime to get back to suggestions
|
||||
</message>
|
||||
<message name="IDS_ASH_BIRCH_CALENDAR_ONGOING_SUBTITLE" desc="Subtitle for the suggestion chip for an ongoing calendar event (e.g. a meeting that is happening right now)">
|
||||
|
@ -0,0 +1 @@
|
||||
e596f1d772a17be7ebae636d33836a298ec6c04e
|
@ -0,0 +1 @@
|
||||
119aa2ec0aa721e9d025b953306320012e4b661a
|
@ -0,0 +1 @@
|
||||
119aa2ec0aa721e9d025b953306320012e4b661a
|
@ -0,0 +1 @@
|
||||
119aa2ec0aa721e9d025b953306320012e4b661a
|
@ -0,0 +1 @@
|
||||
12f726453f4252c8b8979c9c0b1e789707c4b54f
|
@ -0,0 +1 @@
|
||||
12f726453f4252c8b8979c9c0b1e789707c4b54f
|
@ -0,0 +1 @@
|
||||
fffed65d8a7cf4a623c3004d1867d28d5e988503
|
@ -239,8 +239,9 @@ void InformedRestoreContentsView::OnSettingsButtonPressed() {
|
||||
// will not take place until the next time they sign in.
|
||||
views::MenuItemView* container = root_menu_item->AppendMenuItem(
|
||||
InformedRestoreContextMenuModel::kDescriptionId);
|
||||
auto context_label = std::make_unique<views::Label>(
|
||||
l10n_util::GetStringUTF16(IDS_ASH_PINE_DIALOG_CONTEXT_MENU_EXTRA_INFO));
|
||||
const std::u16string label = l10n_util::GetStringUTF16(
|
||||
IDS_ASH_INFORMED_RESTORE_DIALOG_CONTEXT_MENU_EXTRA_INFO);
|
||||
auto context_label = std::make_unique<views::Label>(label);
|
||||
context_label->SetMultiLine(true);
|
||||
context_label->SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_LEFT);
|
||||
context_label->SizeToFit(kContextMenuMaxWidth);
|
||||
@ -252,8 +253,7 @@ void InformedRestoreContentsView::OnSettingsButtonPressed() {
|
||||
|
||||
// Set the label container's a11y name to be the same as the label text so
|
||||
// that it can be read out by screen readers.
|
||||
container->SetAccessibleName(
|
||||
l10n_util::GetStringUTF16(IDS_ASH_PINE_DIALOG_CONTEXT_MENU_EXTRA_INFO));
|
||||
container->SetAccessibleName(label);
|
||||
|
||||
menu_runner_ =
|
||||
std::make_unique<views::MenuRunner>(std::move(root_menu_item), run_types);
|
||||
@ -290,14 +290,16 @@ InformedRestoreContentsView::CreateButtonContainerBuilder() {
|
||||
weak_ptr_factory_.GetWeakPtr()))
|
||||
.SetID(informed_restore::kCancelButtonID)
|
||||
.SetPillButtonType(PillButton::Type::kDefaultLargeWithoutIcon)
|
||||
.SetTextWithStringId(IDS_ASH_PINE_DIALOG_NO_THANKS_BUTTON),
|
||||
.SetTextWithStringId(
|
||||
IDS_ASH_INFORMED_RESTORE_DIALOG_NO_THANKS_BUTTON),
|
||||
views::Builder<PillButton>()
|
||||
.SetCallback(base::BindRepeating(
|
||||
&InformedRestoreContentsView::OnRestoreButtonPressed,
|
||||
weak_ptr_factory_.GetWeakPtr()))
|
||||
.SetID(informed_restore::kRestoreButtonID)
|
||||
.SetPillButtonType(PillButton::Type::kPrimaryLargeWithoutIcon)
|
||||
.SetTextWithStringId(IDS_ASH_PINE_DIALOG_RESTORE_BUTTON));
|
||||
.SetTextWithStringId(
|
||||
IDS_ASH_INFORMED_RESTORE_DIALOG_RESTORE_BUTTON));
|
||||
}
|
||||
|
||||
void InformedRestoreContentsView::CreateChildViews() {
|
||||
@ -312,12 +314,11 @@ void InformedRestoreContentsView::CreateChildViews() {
|
||||
const InformedRestoreContentsData* contents_data =
|
||||
Shell::Get()->informed_restore_controller()->contents_data();
|
||||
CHECK(contents_data);
|
||||
const int title_message_id = contents_data->last_session_crashed
|
||||
? IDS_ASH_PINE_DIALOG_CRASH_TITLE
|
||||
: IDS_ASH_PINE_DIALOG_TITLE;
|
||||
const int description_message_id = contents_data->last_session_crashed
|
||||
? IDS_ASH_PINE_DIALOG_CRASH_DESCRIPTION
|
||||
: IDS_ASH_PINE_DIALOG_DESCRIPTION;
|
||||
const int title_message_id = IDS_ASH_INFORMED_RESTORE_DIALOG_TITLE;
|
||||
const int description_message_id =
|
||||
contents_data->last_session_crashed
|
||||
? IDS_ASH_INFORMED_RESTORE_DIALOG_CRASH_DESCRIPTION
|
||||
: IDS_ASH_INFORMED_RESTORE_DIALOG_DESCRIPTION;
|
||||
|
||||
auto* primary_container_view = AddChildView(
|
||||
// In landscape mode, this box layout view is the container for the left
|
||||
|
@ -17,16 +17,16 @@ namespace ash {
|
||||
InformedRestoreContextMenuModel::InformedRestoreContextMenuModel()
|
||||
: ui::SimpleMenuModel(this) {
|
||||
const int group = 0;
|
||||
AddTitleWithStringId(IDS_ASH_PINE_DIALOG_CONTEXT_MENU_TITLE);
|
||||
AddTitleWithStringId(IDS_ASH_INFORMED_RESTORE_DIALOG_CONTEXT_MENU_TITLE);
|
||||
AddRadioItemWithStringId(
|
||||
static_cast<int>(full_restore::RestoreOption::kAskEveryTime),
|
||||
IDS_ASH_PINE_DIALOG_CONTEXT_MENU_ASK_OPTION, group);
|
||||
IDS_ASH_INFORMED_RESTORE_DIALOG_CONTEXT_MENU_ASK_OPTION, group);
|
||||
AddRadioItemWithStringId(
|
||||
static_cast<int>(full_restore::RestoreOption::kAlways),
|
||||
IDS_ASH_PINE_DIALOG_CONTEXT_MENU_ALWAYS_OPTION, group);
|
||||
IDS_ASH_INFORMED_RESTORE_DIALOG_CONTEXT_MENU_ALWAYS_OPTION, group);
|
||||
AddRadioItemWithStringId(
|
||||
static_cast<int>(full_restore::RestoreOption::kDoNotRestore),
|
||||
IDS_ASH_PINE_DIALOG_CONTEXT_MENU_NEVER_OPTION, group);
|
||||
IDS_ASH_INFORMED_RESTORE_DIALOG_CONTEXT_MENU_NEVER_OPTION, group);
|
||||
AddSeparator(ui::MenuSeparatorType::NORMAL_SEPARATOR);
|
||||
}
|
||||
|
||||
|
@ -117,14 +117,10 @@ void InformedRestoreController::MaybeShowInformedRestoreOnboarding(
|
||||
|
||||
auto dialog =
|
||||
views::Builder<SystemDialogDelegateView>()
|
||||
.SetTitleText(l10n_util::GetStringUTF16(
|
||||
restore_on
|
||||
? IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_ON_TITLE
|
||||
: IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_OFF_TITLE))
|
||||
.SetTitleText(
|
||||
l10n_util::GetStringUTF16(IDS_ASH_INFORMED_RESTORE_DIALOG_TITLE))
|
||||
.SetDescription(l10n_util::GetStringUTF16(
|
||||
restore_on
|
||||
? IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_ON_DESCRIPTION
|
||||
: IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_OFF_DESCRIPTION))
|
||||
IDS_ASH_INFORMED_RESTORE_ONBOARDING_DESCRIPTION))
|
||||
.SetAcceptButtonText(l10n_util::GetStringUTF16(
|
||||
restore_on
|
||||
? IDS_ASH_INFORMED_RESTORE_ONBOARDING_RESTORE_ON_ACCEPT
|
||||
|
@ -142,7 +142,7 @@ InformedRestoreItemsOverflowView::InformedRestoreItemsOverflowView(
|
||||
.SetEnabledColorId(informed_restore::kItemTextColorId)
|
||||
.SetHorizontalAlignment(gfx::ALIGN_LEFT)
|
||||
.SetText(l10n_util::GetPluralStringFUTF16(
|
||||
IDS_ASH_FOREST_WINDOW_OVERFLOW_COUNT,
|
||||
IDS_ASH_INFORMED_RESTORE_WINDOW_OVERFLOW_COUNT,
|
||||
num_elements - informed_restore::kOverflowMinThreshold))
|
||||
.Build());
|
||||
TypographyProvider::Get()->StyleLabel(TypographyToken::kCrosButton2,
|
||||
|
Reference in New Issue
Block a user