Commit 333f5ec1 authored by Nicholas Verne's avatar Nicholas Verne Committed by Commit Bot

Reland "Reland "Reland "Crostini settings string changes."""

This is a reland of 7b6fabaa

We appear to be going for a record of reland/revert of strings.
The relevant tast tests are submitted and have survived rollback.
The chromeos LKGM uprev is stil not successful (for the last two weeks).
I'll wait for that before submitting.

Original change's description:
> Reland "Reland "Crostini settings string changes.""
>
> This is a reland of 6b11534a
>
> OK, this time for sure. The tast-test change below was submitted, but the
> relevant ChromeOS uprev was blocked for days. This is now through so we
> can reland again, for real this time.
>
> Original change's description:
> > Reland "Crostini settings string changes."
> >
> > This is a reland of da531d49
> >
> > Now that https://chromium-review.googlesource.com/c/chromiumos/platform/tast-tests/+/2505407
> > is landed, this should be safe.
> >
> > Original change's description:
> > > Crostini settings string changes.
> > >
> > > Instead of "Linux (Beta)", now shows as "Developers"
> > >
> > > Bug: 1140370
> > > Change-Id: Id4e076b5d918e41e22e5c59d65958da9e75a3f55
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2486528
> > > Commit-Queue: Nicholas Verne <nverne@chromium.org>
> > > Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> > > Reviewed-by: David Munro <davidmunro@google.com>
> > > Auto-Submit: Nicholas Verne <nverne@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#820205}
> >
> > Bug: 1140370
> > Change-Id: Ibb5bd28f9647847dddaf109e9da86d91b17dd863
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505324
> > Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> > Reviewed-by: David Munro <davidmunro@google.com>
> > Commit-Queue: Nicholas Verne <nverne@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#822525}
>
> Bug: 1140370
> Change-Id: I76e0dfa45877db5d633a70126c0f5bd2a70a15f9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2515799
> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> Commit-Queue: Nicholas Verne <nverne@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#823503}

Bug: 1140370
Change-Id: Id55048b7c50b3eaa3e13572d1dbde544708a4dcb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526864Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarDavid Munro <davidmunro@google.com>
Commit-Queue: Nicholas Verne <nverne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829064}
parent 6858190c
...@@ -760,12 +760,15 @@ ...@@ -760,12 +760,15 @@
</message> </message>
<!-- Crostini section. --> <!-- Crostini section. -->
<message name="IDS_OS_SETTINGS_TAG_CROSTINI" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings. Alternate phrase for: 'Crostini'"> <message name="IDS_OS_SETTINGS_TAG_CROSTINI" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings. Alternate phrase for: 'Crostini, Developers'">
Linux Linux
</message> </message>
<message name="IDS_OS_SETTINGS_TAG_CROSTINI_ALT1" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings. Alternate phrase for: 'Linux'"> <message name="IDS_OS_SETTINGS_TAG_CROSTINI_ALT1" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings. Alternate phrase for: 'Linux, Developers'">
Crostini Crostini
</message> </message>
<message name="IDS_OS_SETTINGS_TAG_CROSTINI_ALT2" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings. Alternate phrase for: 'Linux, Crostini'">
Developers
</message>
<message name="IDS_OS_SETTINGS_TAG_CROSTINI_SHARED_FOLDERS" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings, with the option to share folders with the Chromebook. Alternate phrase for: 'Linux shared directories', 'Crostini shared folders', 'Crostini shared directories'"> <message name="IDS_OS_SETTINGS_TAG_CROSTINI_SHARED_FOLDERS" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings, with the option to share folders with the Chromebook. Alternate phrase for: 'Linux shared directories', 'Crostini shared folders', 'Crostini shared directories'">
Linux shared folders Linux shared folders
</message> </message>
......
479226be7e58aca337d957fd411b0b628b37d76d
\ No newline at end of file
...@@ -1207,11 +1207,11 @@ ...@@ -1207,11 +1207,11 @@
</message> </message>
<!-- Crostini --> <!-- Crostini -->
<message name="IDS_SETTINGS_CROSTINI_TITLE" desc="The title of Crostini section."> <message name="IDS_SETTINGS_CROSTINI_TITLE" desc="The title of Crostini section. It is meant to be used by software developers.">
Linux (Beta) Developers
</message> </message>
<message name="IDS_SETTINGS_CROSTINI_LABEL" desc="The text associated with the primary section setting."> <message name="IDS_SETTINGS_CROSTINI_LABEL" desc="The text associated with the primary section setting. This contains settings for a Linux container running in a virtual machine for use by software developers.">
Linux Linux development environment
</message> </message>
<message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS" desc="Label for managing shared folders in Crostini."> <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS" desc="Label for managing shared folders in Crostini.">
Manage shared folders Manage shared folders
......
479226be7e58aca337d957fd411b0b628b37d76d
\ No newline at end of file
479226be7e58aca337d957fd411b0b628b37d76d
\ No newline at end of file
...@@ -41,7 +41,8 @@ const std::vector<SearchConcept>& GetCrostiniOptedInSearchConcepts() { ...@@ -41,7 +41,8 @@ const std::vector<SearchConcept>& GetCrostiniOptedInSearchConcepts() {
mojom::SearchResultDefaultRank::kHigh, mojom::SearchResultDefaultRank::kHigh,
mojom::SearchResultType::kSubpage, mojom::SearchResultType::kSubpage,
{.subpage = mojom::Subpage::kCrostiniDetails}, {.subpage = mojom::Subpage::kCrostiniDetails},
{IDS_OS_SETTINGS_TAG_CROSTINI_ALT1, SearchConcept::kAltTagEnd}}, {IDS_OS_SETTINGS_TAG_CROSTINI_ALT1, IDS_OS_SETTINGS_TAG_CROSTINI_ALT2,
SearchConcept::kAltTagEnd}},
{IDS_OS_SETTINGS_TAG_CROSTINI_USB_PREFERENCES, {IDS_OS_SETTINGS_TAG_CROSTINI_USB_PREFERENCES,
mojom::kCrostiniUsbPreferencesSubpagePath, mojom::kCrostiniUsbPreferencesSubpagePath,
mojom::SearchResultIcon::kPenguin, mojom::SearchResultIcon::kPenguin,
...@@ -93,7 +94,8 @@ const std::vector<SearchConcept>& GetCrostiniOptedOutSearchConcepts() { ...@@ -93,7 +94,8 @@ const std::vector<SearchConcept>& GetCrostiniOptedOutSearchConcepts() {
mojom::SearchResultDefaultRank::kMedium, mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSection, mojom::SearchResultType::kSection,
{.section = mojom::Section::kCrostini}, {.section = mojom::Section::kCrostini},
{IDS_OS_SETTINGS_TAG_CROSTINI_ALT1, SearchConcept::kAltTagEnd}}, {IDS_OS_SETTINGS_TAG_CROSTINI_ALT1, IDS_OS_SETTINGS_TAG_CROSTINI_ALT2,
SearchConcept::kAltTagEnd}},
{IDS_OS_SETTINGS_TAG_CROSTINI_SETUP, {IDS_OS_SETTINGS_TAG_CROSTINI_SETUP,
mojom::kCrostiniSectionPath, mojom::kCrostiniSectionPath,
mojom::SearchResultIcon::kPenguin, mojom::SearchResultIcon::kPenguin,
......
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