ash/ash_chromeos_strings.grdp - Issue 1414483011: Deprecate Shift+Alt to switch IME and use Ctrl+Shift+Space instead.

Side by Side Diff: ash/ash_chromeos_strings.grdp

Issue 1414483011: Deprecate Shift+Alt to switch IME and use Ctrl+Shift+Space instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ensure no line breaks in the middle of shortcuts texts Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« ash/accelerators/accelerator_controller.cc ('K') | « ash/accelerators/accelerator_table_unittest.cc ('k') | chrome/browser/resources/chromeos/keyboard_overlay_data.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- ChromeOS-specific strings (included from ash_strings.grd).	2 <!-- ChromeOS-specific strings (included from ash_strings.grd).

3 Everything in this file is wrapped in <if expr="chromeos">. -->	3 Everything in this file is wrapped in <if expr="chromeos">. -->

4 <grit-part>	4 <grit-part>

5	5

6 <!-- Device types -->	6 <!-- Device types -->

7 <message name="IDS_ASH_CHROMEBASE" desc="The device name for a Chromebase (ver sus say Chromebox)">	7 <message name="IDS_ASH_CHROMEBASE" desc="The device name for a Chromebase (ver sus say Chromebox)">

8 Chromebase	8 Chromebase

9 </message>	9 </message>

10 <message name="IDS_ASH_CHROMEBIT" desc="The device name for a Chromebit (versu s say Chromebox)">	10 <message name="IDS_ASH_CHROMEBIT" desc="The device name for a Chromebit (versu s say Chromebox)">

(...skipping 423 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
434 You will automatically be signed out in <ph name="LOGOUT_TIME_LEFT">$1<ex>5 seconds</ex></ph>.	434 You will automatically be signed out in <ph name="LOGOUT_TIME_LEFT">$1<ex>5 seconds</ex></ph>.

435 </message>	435 </message>

436 <message name="IDS_ASH_LOGOUT_CONFIRMATION_WARNING_NOW" desc="The text for the logout confirmation dialog with no time left.">	436 <message name="IDS_ASH_LOGOUT_CONFIRMATION_WARNING_NOW" desc="The text for the logout confirmation dialog with no time left.">

437 You will be signed out now.	437 You will be signed out now.

438 </message>	438 </message>

439 <message name="IDS_ASH_LOGOUT_CONFIRMATION_BUTTON" desc="The text for okay but ton of the logout confirmation dialog.">	439 <message name="IDS_ASH_LOGOUT_CONFIRMATION_BUTTON" desc="The text for okay but ton of the logout confirmation dialog.">

440 Sign out now	440 Sign out now

441 </message>	441 </message>

442	442

443 <!-- Deprecated Accelerators Messages -->	443 <!-- Deprecated Accelerators Messages -->

	444 <!-- Shortcut keys MUST be connected with pluses (e.g. Ctrl+Shift+L). -->

	445 <message name="IDS_SHORTCUT_LOCK_SCREEN_OLD" desc="the old deprecated shortcut to lock the screen.">

	446 Ctrl+Shift+L

	447 </message>

	448 <message name="IDS_SHORTCUT_LOCK_SCREEN_NEW" desc="the new shortcut to lock th e screen.">

	449 Search+L

	450 </message>

	451 <message name="IDS_SHORTCUT_TASK_MANAGER_OLD" desc="the old deprecated shortcu t to open the task manager.">

	452 Shift+Esc

	453 </message>

	454 <message name="IDS_SHORTCUT_TASK_MANAGER_NEW" desc="the new shortcut to open t he task manager.">

	455 Search+Esc

	456 </message>

	457 <message name="IDS_SHORTCUT_NEXT_IME_OLD" desc="the old deprecated shortcut to switch to the next input method.">

	458 Shift+Alt

	459 </message>

	460 <message name="IDS_SHORTCUT_NEXT_IME_NEW" desc="the new shortcut to switch to the next input method.">

	461 Ctrl+Shift+Space

	462 </message>

444 <message name="IDS_DEPRECATED_LOCK_SCREEN_MSG"	463 <message name="IDS_DEPRECATED_LOCK_SCREEN_MSG"

445 desc="Notification message to tell users about the deprecation of Ctr l+Shift+L shortcut to lock the screen.">	464 desc="Notification message to tell users about the deprecation of Ctr l+Shift+L shortcut to lock the screen.">

446 The screen lock shortcut has changed. Please use Search+L instead of Ctrl+Sh ift+L.	465 The shortcut to lock the screen has changed. Please use <ph name="NEW_SHORTC UT">$1<ex>Search+L</ex></ph> instead of <ph name="OLD_SHORTCUT">$2<ex>Ctrl+Shift +L</ex></ph>.

447 </message>	466 </message>

448 <message name="IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG"	467 <message name="IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG"

449 desc="Notification message to tell users about the deprecation of Shi ft+ESC shortcut to show the task manager.">	468 desc="Notification message to tell users about the deprecation of Shi ft+ESC shortcut to show the task manager.">

450 The task manager shortcut has changed. Please use Search+Esc instead of Shif t+Esc.	469 The shortcut to open the task manager has changed. Please use <ph name="NEW_ SHORTCUT">$1<ex>Search+Esc</ex></ph> instead of <ph name="OLD_SHORTCUT">$2<ex>Sh ift+Esc</ex></ph>.

	470 </message>

	471 <message name="IDS_DEPRECATED_NEXT_IME_MSG"

	472 desc="Notification message to tell users about the deprecation of Shi ft+Alt shortcut to switch to the next input method.">

	473 The shortcut to switch to the next input method has changed. Please use <ph name="NEW_SHORTCUT">$1<ex>Ctrl+Shift+Space</ex></ph> instead of <ph name="OLD_SH ORTCUT">$2<ex>Shift+Alt</ex></ph>.

451 </message>	474 </message>

452 </grit-part>	475 </grit-part>

OLD	NEW