Title: [119049] branches/safari-536-branch/Source/WebCore
- Revision
- 119049
- Author
- lforsch...@apple.com
- Date
- 2012-05-30 21:23:37 -0700 (Wed, 30 May 2012)
Log Message
Merged r118820 -> <rdar://problem/11550048>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (119048 => 119049)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-31 04:20:17 UTC (rev 119048)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-31 04:23:37 UTC (rev 119049)
@@ -1,5 +1,24 @@
2012-05-30 Lucas Forschler <lforsch...@apple.com>
+ Merge 118820
+
+ 2012-05-29 John Sullivan <sulli...@apple.com>
+
+ Update label for blacklisted plug-in
+ https://bugs.webkit.org/show_bug.cgi?id=87767
+ rdar://problem/11550048
+
+ Reviewed by Kevin Decker.
+
+ * English.lproj/Localizable.strings:
+ Regenerated.
+
+ * platform/LocalizedStrings.cpp:
+ (WebCore::insecurePluginVersionText):
+ Changed this string.
+
+2012-05-30 Lucas Forschler <lforsch...@apple.com>
+
Merge 118553
2012-05-25 Dean Jackson <d...@apple.com>
Modified: branches/safari-536-branch/Source/WebCore/English.lproj/Localizable.strings (119048 => 119049)
--- branches/safari-536-branch/Source/WebCore/English.lproj/Localizable.strings 2012-05-31 04:20:17 UTC (rev 119048)
+++ branches/safari-536-branch/Source/WebCore/English.lproj/Localizable.strings 2012-05-31 04:23:37 UTC (rev 119049)
@@ -55,6 +55,9 @@
/ * 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 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 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 " ;
@@ -172,9 +175,6 @@
/ * U n d o a c t i o n n a m e * /
" I n d e n t ( U n d o a c t i o n n a m e ) " = " I n d e n t " ;
- / * 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 * /
- " I n s e c u r e P l u g - I n V e r s i o n " = " I n s e c u r e P l u g - I n V e r s i o n " ;
-
/ * U n d o a c t i o n n a m e * /
" I n s e r t L i s t ( U n d o a c t i o n n a m e ) " = " I n s e r t L i s t " ;
Modified: branches/safari-536-branch/Source/WebCore/platform/LocalizedStrings.cpp (119048 => 119049)
--- branches/safari-536-branch/Source/WebCore/platform/LocalizedStrings.cpp 2012-05-31 04:20:17 UTC (rev 119048)
+++ branches/safari-536-branch/Source/WebCore/platform/LocalizedStrings.cpp 2012-05-31 04:23:37 UTC (rev 119049)
@@ -675,7 +675,7 @@
String insecurePluginVersionText()
{
- return WEB_UI_STRING("Insecure Plug-In Version", "Label text to be used when an insecure plug-in version was blocked from loading");
+ return WEB_UI_STRING("Blocked 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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
