ash/ash_chromeos_strings.grdp - Issue 1202923002: Revert "Deprecating high-conflict accelerators"

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/ash_chromeos_strings.grdp

Issue 1202923002: Revert "Deprecating high-conflict accelerators" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 months 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

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 <!-- Status tray charging strings. -->	6 <!-- Status tray charging strings. -->

7 <message name="IDS_ASH_STATUS_TRAY_LOW_POWER_CHARGER_TITLE" desc="The title of a notification indicating that a low-current USB charger has been connected.">	7 <message name="IDS_ASH_STATUS_TRAY_LOW_POWER_CHARGER_TITLE" desc="The title of a notification indicating that a low-current USB charger has been connected.">

8 Low-power charger connected	8 Low-power charger connected

9 </message>	9 </message>

10 <message name="IDS_ASH_STATUS_TRAY_LOW_POWER_CHARGER_MESSAGE" desc="The messag e body of a notification indicating that a low-current USB charger has been conn ected.">	10 <message name="IDS_ASH_STATUS_TRAY_LOW_POWER_CHARGER_MESSAGE" desc="The messag e body of a notification indicating that a low-current USB charger has been conn ected.">

(...skipping 403 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
414 </message>	414 </message>

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

416 Sign out now	416 Sign out now

417 </message>	417 </message>

418 <message name="IDS_ASH_STATUS_TRAY_NEW_LOGIN_UI_ENABLED" desc="The text shown in the tray menu when the WebView-based sign-in is enabled.">	418 <message name="IDS_ASH_STATUS_TRAY_NEW_LOGIN_UI_ENABLED" desc="The text shown in the tray menu when the WebView-based sign-in is enabled.">

419 New login UI is ON	419 New login UI is ON

420 </message>	420 </message>

421 <message name="IDS_ASH_STATUS_TRAY_NEW_LOGIN_UI_DISABLED" desc="The text shown in the tray menu when the WebView-based sign-in is disabled.">	421 <message name="IDS_ASH_STATUS_TRAY_NEW_LOGIN_UI_DISABLED" desc="The text shown in the tray menu when the WebView-based sign-in is disabled.">

422 New login UI is OFF	422 New login UI is OFF

423 </message>	423 </message>

424

425 <!-- Deprecated Accelerators Messages -->

426 <message name="IDS_DEPRECATED_LOCK_SCREEN_MSG"

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

428 Ctrl+Shift+L is deprecated. Please use Search+L instead.

429 </message>

430 <message name="IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG"

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

432 Shift+Esc is deprecated. Please use Search+Esc instead.

433 </message>

434 </grit-part>	424 </grit-part>

OLD	NEW

« no previous file with comments | « ash/accelerators/accelerator_table_unittest.cc ('k') | ash/system/system_notifier.h » ('j') | no next file with comments »