Better names for some IDS_FULLSCREEN messages.
* IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_FULLSCREEN is now used with
keys other than Escape.
* Be consistent about having _TWO_KEYS be a suffix.
Translations are keyed off the message content so this shouldn't
cause them to be re-translated.
BUG=b:203622329
Change-Id: I1ffb88533f0776ee47d47bd949cc0129e16d8fbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3462614
Reviewed-by: Peter Kasting <[email protected]>
Commit-Queue: Chloe Pelling <[email protected]>
Auto-Submit: Chloe Pelling <[email protected]>
Reviewed-by: Mitsuru Oshima <[email protected]>
Commit-Queue: Mitsuru Oshima <[email protected]>
Cr-Commit-Position: refs/heads/main@{#971681}
diff --git a/ash/session/fullscreen_notification_bubble.cc b/ash/session/fullscreen_notification_bubble.cc
index 5778819..c072c2e1 100644
--- a/ash/session/fullscreen_notification_bubble.cc
+++ b/ash/session/fullscreen_notification_bubble.cc
@@ -40,7 +40,7 @@
// Set the text displayed in the bubble, including the keyboard key.
view_->UpdateContent(l10n_util::GetStringFUTF16(
- IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_FULLSCREEN,
+ IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN,
l10n_util::GetStringUTF16(IDS_APP_FULLSCREEN_KEY)));
// The view used to parent the bubble widget
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc b/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc
index 4aaec9d..e6d406f6 100644
--- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc
@@ -121,11 +121,11 @@
// Both fullscreen and fullscreen + mouselock have the same message (the
// user does not care about mouse lock when in fullscreen mode). All ways
// to trigger fullscreen result in the same message.
- return l10n_util::GetStringFUTF16(
- IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_FULLSCREEN, accelerator);
+ return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN,
+ accelerator);
case EXCLUSIVE_ACCESS_BUBBLE_TYPE_KEYBOARD_LOCK_EXIT_INSTRUCTION:
- return l10n_util::GetStringFUTF16(
- IDS_FULLSCREEN_HOLD_ESC_TO_EXIT_FULLSCREEN, accelerator);
+ return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_HOLD_TO_EXIT_FULLSCREEN,
+ accelerator);
case EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION:
return l10n_util::GetStringFUTF16(
IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_MOUSELOCK, accelerator);
diff --git a/components/exo/ui_lock_controller.cc b/components/exo/ui_lock_controller.cc
index 728062c..1d7383cd 100644
--- a/components/exo/ui_lock_controller.cc
+++ b/components/exo/ui_lock_controller.cc
@@ -283,19 +283,19 @@
if (window_->GetProperty(chromeos::kUseOverviewToExitFullscreen)) {
if (ash::KeyboardController::Get()->AreTopRowKeysFunctionKeys()) {
fullscreen_esc_notification_ = CreateEscNotification(
- window_, IDS_FULLSCREEN_PRESS_TWO_KEYS_TO_EXIT_FULLSCREEN,
+ window_, IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN_TWO_KEYS,
{IDS_APP_SEARCH_KEY, IDS_APP_OVERVIEW_KEY});
} else {
fullscreen_esc_notification_ = CreateEscNotification(
- window_, IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_FULLSCREEN,
+ window_, IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN,
{IDS_APP_OVERVIEW_KEY});
}
} else {
fullscreen_esc_notification_ = CreateEscNotification(
window_,
window_->GetProperty(chromeos::kEscHoldToExitFullscreen)
- ? IDS_FULLSCREEN_HOLD_ESC_TO_EXIT_FULLSCREEN
- : IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_FULLSCREEN,
+ ? IDS_FULLSCREEN_HOLD_TO_EXIT_FULLSCREEN
+ : IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN,
{IDS_APP_ESC_KEY});
}
diff --git a/components/fullscreen_control_strings.grdp b/components/fullscreen_control_strings.grdp
index 9344428e..a25d25b 100644
--- a/components/fullscreen_control_strings.grdp
+++ b/components/fullscreen_control_strings.grdp
@@ -3,13 +3,13 @@
<message name="IDS_EXIT_FULLSCREEN_MODE" desc="Clickable message displayed on entering full screen mode. Clicking on the link exits full screen mode.">
Exit full screen
</message>
- <message name="IDS_FULLSCREEN_HOLD_ESC_TO_EXIT_FULLSCREEN" desc="Text displayed in the bubble to tell users how to return from fullscreen mode (where the web page occupies the entire screen) to normal mode. Please surround the name of the key (e.g. 'Esc') in pipe characters so it can be rendered as a key.">
+ <message name="IDS_FULLSCREEN_HOLD_TO_EXIT_FULLSCREEN" desc="Text displayed in the bubble to tell users how to return from fullscreen mode (where the web page occupies the entire screen) to normal mode. Please surround the name of the key (e.g. 'Esc') in pipe characters so it can be rendered as a key.">
Press and hold |<ph name="ACCELERATOR">$1<ex>Esc</ex></ph>| to exit full screen
</message>
- <message name="IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_FULLSCREEN" desc="Text displayed in the bubble to tell users how to return from fullscreen mode (where the web page occupies the entire screen) to normal mode. Please surround the name of the key (e.g. 'Esc') in pipe characters so it can be rendered as a key.">
+ <message name="IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN" desc="Text displayed in the bubble to tell users how to return from fullscreen mode (where the web page occupies the entire screen) to normal mode. Please surround the name of the key (e.g. 'Esc') in pipe characters so it can be rendered as a key.">
Press |<ph name="ACCELERATOR">$1<ex>Esc</ex></ph>| to exit full screen
</message>
- <message name="IDS_FULLSCREEN_PRESS_TWO_KEYS_TO_EXIT_FULLSCREEN" desc="Text displayed in the bubble to tell users how to leave fullscreen mode, in the case where two keys must be pressed together. Please surround the names of the keys (e.g. 'Overview') in pipe characters so it can be rendered as a key.">
+ <message name="IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN_TWO_KEYS" desc="Text displayed in the bubble to tell users how to leave fullscreen mode, in the case where two keys must be pressed together. Please surround the names of the keys (e.g. 'Overview') in pipe characters so it can be rendered as a key.">
Press |<ph name="ACCELERATOR1">$1<ex>Search</ex></ph>| + |<ph name="ACCELERATOR2">$2<ex>Overview</ex></ph>| to exit full screen
</message>
<message name="IDS_PRESS_TO_EXIT_MOUSELOCK" desc="Text displayed in the bubble to tell users how to escape from mouselock mode (where the mouse cursor is hidden) by activating Chrome OS's Overview mode. Please surround the name of the key (e.g. 'Overview') in pipe characters so it can be rendered as a key.">
diff --git a/components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_HOLD_ESC_TO_EXIT_FULLSCREEN.png.sha1 b/components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_HOLD_TO_EXIT_FULLSCREEN.png.sha1
similarity index 100%
rename from components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_HOLD_ESC_TO_EXIT_FULLSCREEN.png.sha1
rename to components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_HOLD_TO_EXIT_FULLSCREEN.png.sha1
diff --git a/components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_FULLSCREEN.png.sha1 b/components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN.png.sha1
similarity index 100%
rename from components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_PRESS_ESC_TO_EXIT_FULLSCREEN.png.sha1
rename to components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN.png.sha1
diff --git a/components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_PRESS_TWO_KEYS_TO_EXIT_FULLSCREEN.png.sha1 b/components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN_TWO_KEYS.png.sha1
similarity index 100%
rename from components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_PRESS_TWO_KEYS_TO_EXIT_FULLSCREEN.png.sha1
rename to components/fullscreen_control_strings_grdp/IDS_FULLSCREEN_PRESS_TO_EXIT_FULLSCREEN_TWO_KEYS.png.sha1
