Commit 46ef2f1b authored by My Nguyen's avatar My Nguyen Committed by Commit Bot

Reland "[InputMethodNames] Update English-related strings"

This reverts commit 7cca28c8.

Reason for revert:

Updating test at https://crrev.com/c/2518956

Original change's description:
> Revert "[InputMethodNames] Update English-related strings"
>
> This reverts commit d90a3ba0.
>
> Reason for revert: This breaks inputs.VirtualKeyboardChangeInput.stable
>  because it refers to "US keyboard" by name.
> https://ci.chromium.org/p/chrome/builders/ci/chromeos-betty-pi-arc-cfi-thin-lto-chrome/12881
>
> Original change's description:
> > [InputMethodNames] Update English-related strings
> >
> > Proposal: http://go/cros-input-methods-naming
> > Proposed names: http://go/cros-input-methods column C
> > Screenshot view: http://screen/9RB3jeFjhWq4kvS
> >
> > Bug: 889763
> > Change-Id: I5393f7e64ecc5251ab31127f9337ebe2b579a417
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517402
> > Commit-Queue: My Nguyen <myy@chromium.org>
> > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#823898}
>
> TBR=xiyuan@chromium.org,myy@chromium.org
>
> Change-Id: Ia59ebb17355dca65e4221e4ecfbcc24b4a372c89
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 889763
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517565
> Reviewed-by: Christian Dullweber <dullweber@chromium.org>
> Commit-Queue: Christian Dullweber <dullweber@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#823943}

TBR=xiyuan@chromium.org,dullweber@chromium.org,myy@chromium.org

# Not skipping CQ checks because this is a reland.

Bug: 889763
Change-Id: I46173a9358766b79cc43d57fa376916f06efe74a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519337Reviewed-by: default avatarShuo-Peng Liao <deanliao@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarMy Nguyen <myy@chromium.org>
Commit-Queue: My Nguyen <myy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825607}
parent 341fb3bb
...@@ -749,7 +749,7 @@ ...@@ -749,7 +749,7 @@
Bulgarian with Phonetic keyboard Bulgarian with Phonetic keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_CANADIAN_ENGLISH" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_CANADIAN_ENGLISH" desc="The input method name shows in system tray menu and settings page.">
Canadian English keyboard English (Canada)
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_CANADIAN_FRENCH" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_CANADIAN_FRENCH" desc="The input method name shows in system tray menu and settings page.">
French (Canada) French (Canada)
...@@ -917,40 +917,40 @@ ...@@ -917,40 +917,40 @@
Turkish with F-keyboard Turkish with F-keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_UK_DVORAK" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_UK_DVORAK" desc="The input method name shows in system tray menu and settings page.">
UK Dvorak keyboard English (UK) with Dvorak keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_UK" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_UK" desc="The input method name shows in system tray menu and settings page.">
UK keyboard English (UK)
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_UKRAINIAN" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_UKRAINIAN" desc="The input method name shows in system tray menu and settings page.">
Ukrainian Ukrainian
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_US_COLEMAK" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_US_COLEMAK" desc="The input method name shows in system tray menu and settings page.">
US Colemak keyboard English (US) with Colemak keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_US_DVORAK" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_US_DVORAK" desc="The input method name shows in system tray menu and settings page.">
US Dvorak keyboard English (US) with Dvorak keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_US_DVP" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_US_DVP" desc="The input method name shows in system tray menu and settings page.">
US Programmer Dvorak keyboard English (US) with Programmer Dvorak keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_US_EXTENDED" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_US_EXTENDED" desc="The input method name shows in system tray menu and settings page.">
US Extended keyboard English (US) with Extended keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_US_INTERNATIONAL" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_US_INTERNATIONAL" desc="The input method name shows in system tray menu and settings page.">
US International keyboard English (US) with International keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_US_INTERNATIONAL_PC" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_US_INTERNATIONAL_PC" desc="The input method name shows in system tray menu and settings page.">
US International (PC) keyboard English (US) with International PC keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_US_WORKMAN" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_US_WORKMAN" desc="The input method name shows in system tray menu and settings page.">
US Workman keyboard English (US) with Workman keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_US_WORKMAN_INTERNATIONAL" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_US_WORKMAN_INTERNATIONAL" desc="The input method name shows in system tray menu and settings page.">
US Workman international keyboard English (US) with Workman International keyboard
</message> </message>
<message name="IDS_IME_NAME_KEYBOARD_US" desc="The input method name shows in system tray menu and settings page."> <message name="IDS_IME_NAME_KEYBOARD_US" desc="The input method name shows in system tray menu and settings page.">
US keyboard English (US)
</message> </message>
<message name="IDS_IME_NAME_INPUTMETHOD_ARRAY" desc="The input method name shows in system tray menu, this is Array (\u884c\u5217) input method for Traditional Chinese."> <message name="IDS_IME_NAME_INPUTMETHOD_ARRAY" desc="The input method name shows in system tray menu, this is Array (\u884c\u5217) input method for Traditional Chinese.">
......
3f67fbfb1b7ce72bf24cefcfff56c821fb6c1a51
\ No newline at end of file
3f67fbfb1b7ce72bf24cefcfff56c821fb6c1a51
\ No newline at end of file
3f67fbfb1b7ce72bf24cefcfff56c821fb6c1a51
\ No newline at end of file
3f67fbfb1b7ce72bf24cefcfff56c821fb6c1a51
\ No newline at end of file
3f67fbfb1b7ce72bf24cefcfff56c821fb6c1a51
\ No newline at end of file
3f67fbfb1b7ce72bf24cefcfff56c821fb6c1a51
\ No newline at end of file
83c7cf7e150311a76f551b90ebc0cb767e4b7ebc
\ No newline at end of file
3f67fbfb1b7ce72bf24cefcfff56c821fb6c1a51
\ No newline at end of file
3f67fbfb1b7ce72bf24cefcfff56c821fb6c1a51
\ No newline at end of file
83c7cf7e150311a76f551b90ebc0cb767e4b7ebc
\ No newline at end of file
83c7cf7e150311a76f551b90ebc0cb767e4b7ebc
\ No newline at end of file
83c7cf7e150311a76f551b90ebc0cb767e4b7ebc
\ 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