Title: [128098] trunk/Source/WebCore
- Revision
- 128098
- Author
- [email protected]
- Date
- 2012-09-10 13:31:17 -0700 (Mon, 10 Sep 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128097 => 128098)
--- trunk/Source/WebCore/ChangeLog 2012-09-10 20:27:29 UTC (rev 128097)
+++ trunk/Source/WebCore/ChangeLog 2012-09-10 20:31:17 UTC (rev 128098)
@@ -1,3 +1,20 @@
+2012-09-10 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
[V8] V8HTMLDocument::write and friends should not indirect through Frame
Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (128097 => 128098)
--- trunk/Source/WebCore/English.lproj/Localizable.strings 2012-09-10 20:27:29 UTC (rev 128097)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2012-09-10 20:31:17 UTC (rev 128098)
@@ -55,8 +55,11 @@
/ * B a c k c o n t e x t m e n u i t e m * /
" B a c k " = " B a c k " ;
+ / * L a b e l t e x t t o b e u s e d i f p l u g i n i s b l o c k e d b y a p a g e ' s C o n t e n t S e c u r i t y P o l i c y * /
+ " B l o c k e d P l u g - I n ( B l o c k e d b y p a g e ' s C o n t e n t S e c u r i t y P o l i c y ) " = " B l o c k e d P l u g - i n " ;
+
/ * L a b e l t e x t t o b e u s e d w h e n a n i n s e c u r e p l u g - i n v e r s i o n w a s b l o c k e d f r o m l o a d i n g * /
- " B l o c k e d P l u g - i n " = " B l o c k e d P l u g - i n " ;
+ " B l o c k e d P l u g - I n ( I n s e c u r e p l u g - i n ) " = " B l o c k e d P l u g - i n " ;
/ * B o l d c o n t e x t m e n u i t e m * /
" B o l d " = " B o l d " ;
Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (128097 => 128098)
--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2012-09-10 20:27:29 UTC (rev 128097)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2012-09-10 20:31:17 UTC (rev 128098)
@@ -676,12 +676,12 @@
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");
}
String multipleFileUploadText(unsigned numberOfFiles)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
