Commit 3323bbd4 authored by Christian Dullweber's avatar Christian Dullweber

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

This reverts commit 7b6fabaa.

Reason for revert: Lots of crostini tests are failing since https://ci.chromium.org/p/chrome/builders/ci/chromeos-eve-chrome/11029

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}

TBR=khorimoto@chromium.org,nverne@chromium.org,davidmunro@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1140370
Change-Id: Icc3b386e702e544e153d1e8893e5781a281d29c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519452Reviewed-by: default avatarChristian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823976}
parent 23532e5f
...@@ -751,15 +751,12 @@ ...@@ -751,15 +751,12 @@
</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, Developers'"> <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'">
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, Developers'"> <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'">
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
...@@ -1187,11 +1187,11 @@ ...@@ -1187,11 +1187,11 @@
</message> </message>
<!-- Crostini --> <!-- Crostini -->
<message name="IDS_SETTINGS_CROSTINI_TITLE" desc="The title of Crostini section. It is meant to be used by software developers."> <message name="IDS_SETTINGS_CROSTINI_TITLE" desc="The title of Crostini section.">
Developers Linux (Beta)
</message> </message>
<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."> <message name="IDS_SETTINGS_CROSTINI_LABEL" desc="The text associated with the primary section setting.">
Linux development environment Linux
</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,8 +41,7 @@ const std::vector<SearchConcept>& GetCrostiniOptedInSearchConcepts() { ...@@ -41,8 +41,7 @@ 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, IDS_OS_SETTINGS_TAG_CROSTINI_ALT2, {IDS_OS_SETTINGS_TAG_CROSTINI_ALT1, SearchConcept::kAltTagEnd}},
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,
...@@ -94,8 +93,7 @@ const std::vector<SearchConcept>& GetCrostiniOptedOutSearchConcepts() { ...@@ -94,8 +93,7 @@ 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, IDS_OS_SETTINGS_TAG_CROSTINI_ALT2, {IDS_OS_SETTINGS_TAG_CROSTINI_ALT1, SearchConcept::kAltTagEnd}},
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