Modified: trunk/Source/WebCore/ChangeLog (285233 => 285234)
--- trunk/Source/WebCore/ChangeLog 2021-11-03 22:03:05 UTC (rev 285233)
+++ trunk/Source/WebCore/ChangeLog 2021-11-03 22:07:25 UTC (rev 285234)
@@ -1,3 +1,31 @@
+2021-11-03 David Kilzer <[email protected]>
+
+ Fix consistency issues with localized strings and regenerate localizable.strings
+ <https://webkit.org/b/232642>
+
+ Reviewed by Megan Gardner.
+
+ * en.lproj/Localizable.strings:
+ - Regenerate the file using update-webkit-localizable-strings.
+ - List of strings realphabetized, except as noted below.
+ ("%@ (%@ Internet plug-in)"): Delete.
+ - Removed in r285047 for Bug 232462.
+
+ * platform/LocalizedStrings.cpp:
+ (WebCore::addTextTrackKindEasyReaderSuffix):
+ - Fix unlocalized string that regressed in r278202 for
+ Bug 226361.
+ (WebCore::useBlockedPlugInContextMenuTitle):
+ - Remove unneeded call to WebCore::formatLocalizedString() since
+ there are no placeholders to replace.
+
+ * platform/cocoa/LocalizedStringsCocoa.mm:
+ (WebCore::contextMenuItemTagSearchWeb):
+ (WebCore::contextMenuItemTagShowFonts):
+ - Switch from calling WebCore::localizedNSString() directly to
+ using WEB_UI_NSSTRING() so these strings will be found by
+ update-webkit-localizable-strings.
+
2021-11-03 Rob Buis <[email protected]>
Return nullopt in aspect-ratio+intrinsic width case
Modified: trunk/Source/WebCore/en.lproj/Localizable.strings (285233 => 285234)
--- trunk/Source/WebCore/en.lproj/Localizable.strings 2021-11-03 22:03:05 UTC (rev 285233)
+++ trunk/Source/WebCore/en.lproj/Localizable.strings 2021-11-03 22:07:25 UTC (rev 285234)
@@ -13,9 +13,6 @@
/* window title for a standalone image (uses multiplication symbol, not x) */
"%@ %@×%@ pixels" = "%@ %@×%@ pixels";
-/* visible name of the plug-in host process. The first argument is the plug-in name and the second argument is the application name. */
-"%@ (%@ Internet plug-in)" = "%@ (%@ Internet plug-in)";
-
/* Audio/Text track display name format that includes the label and language of the track, in the form of 'Language (Label)'. */
"%@ (%@) (audio/text track)" = "%@ (%@)";
@@ -103,8 +100,8 @@
/* Present the element <select multiple> when a single <option> is selected (iOS only) */
"1 Item" = "1 Item";
-/* 1× media controls context menu playback speed label */
-"1× (Media Controls Menu Playback Speed)" = "1×";
+/* Option in segmented control for choosing list type in text editing */
+"1. 2. 3." = "1. 2. 3.";
/* 1.25× media controls context menu playback speed label */
"1.25× (Media Controls Menu Playback Speed)" = "1.25×";
@@ -112,15 +109,15 @@
/* 1.5× media controls context menu playback speed label */
"1.5× (Media Controls Menu Playback Speed)" = "1.5×";
-/* Option in segmented control for choosing list type in text editing */
-"1. 2. 3." = "1. 2. 3.";
+/* 1× media controls context menu playback speed label */
+"1× (Media Controls Menu Playback Speed)" = "1×";
+/* Menu item title for KEYGEN pop-up menu */
+"2048 (High Grade)" = "2048 (High Grade)";
+
/* 2× media controls context menu playback speed label */
"2× (Media Controls Menu Playback Speed)" = "2×";
-/* Menu item title for KEYGEN pop-up menu */
-"2048 (High Grade)" = "2048 (High Grade)";
-
/* Name of application's single WebCrypto master key in Keychain */
"<application> WebCrypto Master Key" = "<application> WebCrypto Master Key";
@@ -130,9 +127,6 @@
/* WKErrorJavaScriptExceptionOccurred description */
"A _javascript_ exception occurred" = "A _javascript_ exception occurred";
-/* Add to Quick Note context menu item. */
-"Add to Quick Note" = "Add to Quick Note";
-
/* Label for the add money with Apple Pay button. */
"Add money with Apple Pay" = "Add money with Apple Pay";
@@ -139,6 +133,9 @@
/* Title for Add to Photos action button */
"Add to Photos" = "Add to Photos";
+/* Add to Quick Note context menu item. */
+"Add to Quick Note" = "Add to Quick Note";
+
/* Title for Add to Reading List action button */
"Add to Reading List" = "Add to Reading List";
@@ -157,6 +154,9 @@
/* Allow button title in geolocation prompt */
"Allow (geolocation)" = "Allow";
+/* Allow button title in screen sharing prompt */
+"Allow (screensharing)" = "Allow";
+
/* Allow button title in speech recognition prompt */
"Allow (speechrecognition)" = "Allow";
@@ -163,18 +163,15 @@
/* Allow button title in user media prompt */
"Allow (usermedia)" = "Allow";
-/* Allow button title in screen sharing prompt */
-"Allow (screensharing)" = "Allow";
-
/* Message for requesting cross-site cookie and website data access. */
"Allow “%@” and “%@” to use cookies and website data while browsing “%@”?" = "Allow “%@” and “%@” to use cookies and website data while browsing “%@”?";
-/* Message for geolocation prompt */
-"Allow “%@” to use your current location?" = "Allow “%@” to use your current location?";
-
/* Message for spechrecognition prompt */
"Allow “%@” to capture your audio and use it for speech recognition?" = "Allow “%@” to capture your audio and use it for speech recognition?";
+/* Message for screen sharing prompt */
+"Allow “%@” to observe your screen?" = "Allow “%@” to observe your screen?";
+
/* Message for requesting cross-site cookie and website data access. */
"Allow “%@” to use cookies and website data while browsing “%@”?" = "Allow “%@” to use cookies and website data while browsing “%@”?";
@@ -184,12 +181,12 @@
/* Message for user camera access prompt */
"Allow “%@” to use your camera?" = "Allow “%@” to use your camera?";
+/* Message for geolocation prompt */
+"Allow “%@” to use your current location?" = "Allow “%@” to use your current location?";
+
/* Message for user microphone access prompt */
"Allow “%@” to use your microphone?" = "Allow “%@” to use your microphone?";
-/* Message for screen sharing prompt. */
-"Allow “%@” to observe your screen?" = "Allow “%@” to observe your screen?";
-
/* WKErrorUnknown description */
"An unknown error occurred" = "An unknown error occurred";
@@ -391,6 +388,9 @@
/* Disallow button title in geolocation prompt */
"Don’t Allow (geolocation)" = "Don’t Allow";
+/* Disallow button title in screen sharing prompt */
+"Don’t Allow (screensharing)" = "Don’t Allow";
+
/* Disallow button title in speech recognition prompt */
"Don’t Allow (speechrecognition)" = "Don’t Allow";
@@ -397,9 +397,6 @@
/* Disallow button title in user media prompt */
"Don’t Allow (usermedia)" = "Don’t Allow";
-/* Disallow button title in screen sharing prompt */
-"Don’t Allow (screensharing)" = "Don’t Allow";
-
/* Download Audio To Disk context menu item */
"Download Audio" = "Download Audio";
@@ -739,12 +736,12 @@
/* Media Play context menu item */
"Play" = "Play";
+/* accessibility help text for enter full screen button */
+"Play movie in full screen mode" = "Play movie in full screen mode";
+
/* Playback Speed media controls context menu title */
"Playback Speed (Media Controls Menu)" = "Playback Speed";
-/* accessibility help text for enter full screen button */
-"Play movie in full screen mode" = "Play movie in full screen mode";
-
/* Label text to be used when a plug-in was blocked from loading because it was too small */
"Plug-In too small" = "Plug-In too small";
@@ -1090,12 +1087,12 @@
/* Undo action name */
"Underline (Undo action name)" = "Underline";
+/* Menu item label for a audio/text track that has no other name. */
+"Unknown (audio/text track)" = "Unknown";
+
/* Unknown filesize FTP directory listing item */
"Unknown (filesize)" = "Unknown";
-/* Menu item label for a audio/text track that has no other name. */
-"Unknown (audio/text track)" = "Unknown";
-
/* Undo action name */
"Unlink (Undo action name)" = "Unlink";
@@ -1639,6 +1636,9 @@
/* Message for requesting access to the device motion and orientation */
"“%@” Would Like to Access Motion and Orientation" = "“%@” Would Like to Access Motion and Orientation";
+/* The domain and application using the camera and/or microphone. The first argument is domain, the second is the application name (iOS only). */
+"“%@” in “%%@”" = "“%@” in “%%@”";
+
/* Allow the specified bundle to sign in to the specified website */
"“%@” would like to sign in to “%@”." = "“%@” would like to sign in to “%@”.";
@@ -1648,5 +1648,3 @@
/* Option in segmented control for choosing list type in text editing */
"•" = "•";
-/* The domain and application using the camera and/or microphone. The first argument is domain, the second is the application name (iOS only). */
-"“%@” in “%%@”" = "“%@” in “%%@”";
Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (285233 => 285234)
--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2021-11-03 22:03:05 UTC (rev 285233)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2021-11-03 22:07:25 UTC (rev 285234)
@@ -1193,7 +1193,7 @@
{
if (text.isEmpty())
return textTrackKindEasyReaderDisplayName();
- return formatLocalizedString(WEB_UI_CFSTRING_KEY("%@ Easy Reader", "%@ Easy (text track)", "Easy Reader (i.e. 3rd-grade level) text track display name format that includes the language and/or locale (e.g. 'English Easy Reader')."), text.createCFString().get());
+ return formatLocalizedString(WEB_UI_CFSTRING_KEY("%@ Easy Reader", "%@ Easy Reader (text track)", "Easy Reader (i.e. 3rd-grade level) text track display name format that includes the language and/or locale (e.g. 'English Easy Reader')."), text.createCFString().get());
}
String textTrackKindForcedDisplayName()
@@ -1248,7 +1248,7 @@
String useBlockedPlugInContextMenuTitle()
{
- return formatLocalizedString(WEB_UI_STRING("Show in blocked plug-in", "Title of the context menu item to show when PDFPlugin was used instead of a blocked plugin"));
+ return WEB_UI_STRING("Show in blocked plug-in", "Title of the context menu item to show when PDFPlugin was used instead of a blocked plugin");
}
#if ENABLE(WEB_CRYPTO)
Modified: trunk/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm (285233 => 285234)
--- trunk/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm 2021-11-03 22:03:05 UTC (rev 285233)
+++ trunk/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm 2021-11-03 22:07:25 UTC (rev 285234)
@@ -57,15 +57,16 @@
{
return WEB_UI_STRING("unknown", "Unknown filename");
}
+
#if ENABLE(APP_HIGHLIGHTS)
String contextMenuItemTagAddHighlightToCurrentQuickNote()
{
- return localizedNSString(@"Add to Quick Note");
+ return WEB_UI_NSSTRING(@"Add to Quick Note", "Add to Quick Note context menu item.");
}
String contextMenuItemTagAddHighlightToNewQuickNote()
{
- return localizedNSString(@"New Quick Note");
+ return WEB_UI_NSSTRING(@"New Quick Note", "New Quick Note context menu item.");
}
#endif
