Title: [87559] branches/safari-534-branch/Source/WebKit2
- Revision
- 87559
- Author
- mr...@apple.com
- Date
- 2011-05-27 13:59:11 -0700 (Fri, 27 May 2011)
Log Message
Merge r87397.
Modified Paths
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87558 => 87559)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-27 20:56:13 UTC (rev 87558)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-27 20:59:11 UTC (rev 87559)
@@ -1,5 +1,38 @@
2011-05-27 Mark Rowe <mr...@apple.com>
+ Merge r87397.
+
+ 2011-05-26 Steve Falkenburg <sfal...@apple.com>
+
+ Reviewed by Adam Roben.
+
+ WebKit2 bundle missing localization subdirectories
+ https://bugs.webkit.org/show_bug.cgi?id=61512
+
+ Better fix for this. We just need to specify CFBundleAllowMixedLocalizations.
+
+ * win/WebKit2WebProcess.resources/English.lproj: Removed.
+ * win/WebKit2WebProcess.resources/Info.plist:
+ * win/WebKit2WebProcess.resources/da.lproj: Removed.
+ * win/WebKit2WebProcess.resources/de.lproj: Removed.
+ * win/WebKit2WebProcess.resources/es.lproj: Removed.
+ * win/WebKit2WebProcess.resources/fi.lproj: Removed.
+ * win/WebKit2WebProcess.resources/fr.lproj: Removed.
+ * win/WebKit2WebProcess.resources/it.lproj: Removed.
+ * win/WebKit2WebProcess.resources/ja.lproj: Removed.
+ * win/WebKit2WebProcess.resources/ko.lproj: Removed.
+ * win/WebKit2WebProcess.resources/nb.lproj: Removed.
+ * win/WebKit2WebProcess.resources/nl.lproj: Removed.
+ * win/WebKit2WebProcess.resources/pl.lproj: Removed.
+ * win/WebKit2WebProcess.resources/pt.lproj: Removed.
+ * win/WebKit2WebProcess.resources/pt_PT.lproj: Removed.
+ * win/WebKit2WebProcess.resources/ru.lproj: Removed.
+ * win/WebKit2WebProcess.resources/sv.lproj: Removed.
+ * win/WebKit2WebProcess.resources/zh_CN.lproj: Removed.
+ * win/WebKit2WebProcess.resources/zh_TW.lproj: Removed.
+
+2011-05-27 Mark Rowe <mr...@apple.com>
+
Merge r87305.
2011-05-25 Dan Bernstein <m...@apple.com>
Modified: branches/safari-534-branch/Source/WebKit2/win/WebKit2WebProcess.resources/Info.plist (87558 => 87559)
--- branches/safari-534-branch/Source/WebKit2/win/WebKit2WebProcess.resources/Info.plist 2011-05-27 20:56:13 UTC (rev 87558)
+++ branches/safari-534-branch/Source/WebKit2/win/WebKit2WebProcess.resources/Info.plist 2011-05-27 20:59:11 UTC (rev 87559)
@@ -16,5 +16,7 @@
<string>WebKit2WebProcess</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
+ <key>CFBundleAllowMixedLocalizations</key>
+ <string>YES</string>
</dict>
</plist>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
