Changeset 128098 in webkit

Timestamp:

Sep 10, 2012 1:31:17 PM (12 years ago)

Author:

andersca@apple.com

Message:

Silence a warning when running update-webkit-localizable-strings
​https://bugs.webkit.org/show_bug.cgi?id=96307

Reviewed by John Sullivan.

Since both the blockedPluginByContentSecurityPolicyText and insecurePluginVersionText strings use exact the same wording,
use WEB_UI_STRING_KEY to indicate that they are different.

• English.lproj/Localizable.strings:

Update the localizable strings file.

• platform/LocalizedStrings.cpp:

(WebCore::blockedPluginByContentSecurityPolicyText):
(WebCore::insecurePluginVersionText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/Localizable.strings (modified) (1 diff)
• platform/LocalizedStrings.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-10  Anders Carlsson  <andersca@apple.com>
+
+        Silence a warning when running update-webkit-localizable-strings
+        https://bugs.webkit.org/show_bug.cgi?id=96307
+
+        Reviewed by John Sullivan.
+
+        Since both the blockedPluginByContentSecurityPolicyText and insecurePluginVersionText strings use exact the same wording,
+        use WEB_UI_STRING_KEY to indicate that they are different.
+
+        * English.lproj/Localizable.strings:
+        Update the localizable strings file.
+
+        * platform/LocalizedStrings.cpp:
+        (WebCore::blockedPluginByContentSecurityPolicyText):
+        (WebCore::insecurePluginVersionText):
+
 2012-09-10  Adam Barth  <abarth@chromium.org>
 

trunk/Source/WebCore/English.lproj/Localizable.strings

@@ -56 +56 @@
 "Back" = "Back";
 
+/* Label text to be used if plugin is blocked by a page's Content Security Policy */
+"Blocked Plug-In (Blocked by page's Content Security Policy)" = "Blocked Plug-in";
+
 /* Label text to be used when an insecure plug-in version was blocked from loading */
-"Blocked Plug-in" = "Blocked Plug-in";
+"Blocked Plug-In (Insecure plug-in)" = "Blocked Plug-in";
 
 /* Bold context menu item */

trunk/Source/WebCore/platform/LocalizedStrings.cpp

@@ -677 +677 @@
 String blockedPluginByContentSecurityPolicyText()
 {
-    return WEB_UI_STRING("Blocked Plug-in", "Label text to be used if plugin is blocked by a page's Content Security Policy");
+    return WEB_UI_STRING_KEY("Blocked Plug-in", "Blocked Plug-In (Blocked by page's Content Security Policy)", "Label text to be used if plugin is blocked by a page's Content Security Policy");
 }
 
 String insecurePluginVersionText()
 {
-    return WEB_UI_STRING("Blocked Plug-in", "Label text to be used when an insecure plug-in version was blocked from loading");
+    return WEB_UI_STRING_KEY("Blocked Plug-in", "Blocked Plug-In (Insecure plug-in)", "Label text to be used when an insecure plug-in version was blocked from loading");
 }