[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
sullivan at apple.com
sullivan at apple.com
Thu Apr 8 02:18:05 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit fc6cbb9a3c951f86f3e268c2882b9b3ec26857c0
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 9 21:49:30 2010 +0000
* StringsNotToBeLocalized.txt:
Brought this file up to date. update-webkit-localizable-strings still lists
one key collision, but that's a separate issue.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55745 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index efdbe8b..edfc7b6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-09 John Sullivan <sullivan at apple.com>
+
+ * StringsNotToBeLocalized.txt:
+ Brought this file up to date. update-webkit-localizable-strings still lists
+ one key collision, but that's a separate issue.
+
2010-03-04 Mark Rowe <mrowe at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit/StringsNotToBeLocalized.txt b/WebKit/StringsNotToBeLocalized.txt
index b39a1b0..df34bbe 100644
--- a/WebKit/StringsNotToBeLocalized.txt
+++ b/WebKit/StringsNotToBeLocalized.txt
@@ -38,10 +38,14 @@
"%d_%d_%d"
"%dpx"
"%ld"
+"%s%01d:%02d:%02d"
+"%s%02d:%02d"
+"%s%02d:%02d:%02d"
"%u"
"&ie=UTF-8&oe=UTF-8"
"(%.0f, %.0f)"
"+"
+", "
","
"-"
"-1px"
@@ -59,6 +63,7 @@
"/Library/Internet Plug-Ins"
"/System/Library/Frameworks/ApplicationServices.framework/Frameworks/LangAnalysis.framework/LangAnalysis"
"/System/Library/Frameworks/Carbon.framework/Frameworks/HIToolbox.framework/HIToolbox"
+"/System/Library/Frameworks/CoreVideo.framework"
"/Volumes"
"/tmp/XXXXXX.tiff"
"0"
@@ -72,6 +77,7 @@
"1px"
"2"
"3.1"
+"3dbd565b-db22-4d88-8e0e-778bde54524a"
"420+"
"5CACD637-F82F-491F-947A-5DCA38AA0FEA"
"6EB8D98F-2723-4472-88D3-5936F9D6E631"
@@ -154,6 +160,8 @@
"DeleteWordBackward"
"DeleteWordForward"
"DisableWebKitDeveloperExtras"
+"FAKETRACKPOINTHSCROLLBAR"
+"FAKETRACKPOINTVSCROLLBAR"
"FD3B2381-0BB6-4B59-AF09-0E599C8901CF"
"FastMallocFreeSizeInCaches"
"FastMallocFreeSizeInHeap"
@@ -161,6 +169,7 @@
"FastMallocReturnedSize"
"FrameName"
"FullscreenButton"
+"GCS_COMPATTR"
"GEN_DOMObject"
"GET"
"GroupName"
@@ -172,6 +181,26 @@
"IDNScriptWhiteList"
"IDNScriptWhiteList.txt"
"IMM32.DLL"
+"IMN_CHANGECANDIDATE"
+"IMN_CLOSECANDIDATE"
+"IMN_CLOSESTATUSWINDOW"
+"IMN_GUIDELINE"
+"IMN_OPENCANDIDATE"
+"IMN_OPENSTATUSWINDOW"
+"IMN_SETCANDIDATEPOS"
+"IMN_SETCOMPOSITIONFONT"
+"IMN_SETCOMPOSITIONWINDOW"
+"IMN_SETCONVERSIONMODE"
+"IMN_SETOPENSTATUS"
+"IMN_SETSENTENCEMODE"
+"IMN_SETSTATUSWINDOWPOS"
+"IMR_CANDIDATEWINDOW"
+"IMR_COMPOSITIONFONT"
+"IMR_COMPOSITIONWINDOW"
+"IMR_CONFIRMRECONVERTSTRING"
+"IMR_DOCUMENTFEED"
+"IMR_QUERYCHARPOSITION"
+"IMR_RECONVERTSTRING"
"If-Match"
"If-Modified-Since"
"If-None-Match"
@@ -249,11 +278,11 @@
"PDFViewChangedPage"
"PDFViewDisplayModeChanged"
"PDFViewScaleChanged"
-"PNG"
"POST"
"PPC"
"PauseButton"
"PlayButton"
+"ProxyRuntimeObject"
"Quartz.framework"
"RTL"
"Referer"
@@ -261,6 +290,7 @@
"RewindButton"
"SAMILang"
"SAMIStyle"
+"SCROLLBAR"
"Safari.exe"
"SeekBackButton"
"SeekForwardButton"
@@ -268,6 +298,11 @@
"ShowClosedCaptionsButton"
"Slider"
"SliderThumb"
+"Software\\Alps\\Apoint\\TrackPoint"
+"Software\\Lenovo\\TrackPoint"
+"Software\\Lenovo\\UltraNav"
+"Software\\Synaptics\\SynTPEnh\\UltraNavPS2"
+"Software\\Synaptics\\SynTPEnh\\UltraNavUSB"
"StatusDisplay"
"TimeRemainingDisplay"
"Times"
@@ -317,6 +352,7 @@
"WebElementImageRect"
"WebElementImageURL"
"WebElementIsContentEditableKey"
+"WebElementIsInScrollBar"
"WebElementIsSelected"
"WebElementLinkIsLive"
"WebElementLinkLabel"
@@ -336,6 +372,8 @@
"WebFrameUsesApplicationCacheKey"
"WebFrameUsesDatabasesKey"
"WebFrameUsesGeolocationKey"
+"WebGeolocationPolicyListener"
+"WebGeolocationPosition"
"WebHTMLRepresentation"
"WebHistory"
"WebHistoryAllItemsRemovedNotification"
@@ -481,11 +519,13 @@
"a"
"ab"
"about:"
+"acceleratedCompositingEnabled"
"actions"
"allowedFileTypes"
"allowsMultipleSelection"
"allowsOtherFileTypes"
"anchorPoint"
+"apple-dashboard://stylesheet"
"applewebdata"
"applewebdata://%@"
"application.pdf"
@@ -590,9 +630,16 @@
"estimatedProgress"
"fi.karppinen.Pyro"
"file:"
+"file:///System/Library/PrivateFrameworks/DashboardClient.framework/Resources/widget.css"
"frameName"
+"fsVideoAudioVolumeHigh"
+"fsVideoAudioVolumeLow"
+"fsVideoExitFullscreen"
+"fsVideoPause"
+"fsVideoPlay"
"ftp:"
"fullFrame"
+"fullscreenVideeoHUDWindowClass"
"groupName"
"htm"
"html"
@@ -639,24 +686,13 @@
"mainFrameTitle"
"mainFrameURL"
"mimeType"
-"missingImage"
"name: %@\npath: %@\nmimeTypes:\n%@\npluginDescription:%@"
"nameFieldLabel"
"net.hmdt-web.Shiira"
-"nullPlugin"
"nullplugin"
"oleacc.dll"
"opacity"
"org.xlife.NewsFire"
-"panEastCursor"
-"panIcon"
-"panNorthCursor"
-"panNorthEastCursor"
-"panNorthWestCursor"
-"panSouthCursor"
-"panSouthEastCursor"
-"panSouthWestCursor"
-"panWestCursor"
"pluginHostPath"
"pluginspage"
"position"
@@ -671,10 +707,6 @@
"rgb(%.0f,%.0f,%.0f)"
"rgba(%.0f,%.0f,%.0f,%f)"
"s"
-"searchCancel"
-"searchCancelPressed"
-"searchMagnifier"
-"searchMagnifierResults"
"showsHiddenFiles"
"sourceURL"
"src"
@@ -697,7 +729,6 @@
"text/x-vcalendar"
"text/x-vcard"
"text/x-vcf"
-"textAreaResizeCorner"
"tiff"
"transform"
"treatsFilePackagesAsDirectories"
@@ -708,7 +739,6 @@
"userAgent"
"userInfo"
"utf-16"
-"verticalTextCursor"
"visibleName"
"visitCount"
"webkit-fake-url"
@@ -717,8 +747,6 @@
"x-apple-web-kit/"
"xml"
"xsl"
-"zoomInCursor"
-"zoomOutCursor"
"{A3676398-4485-4a9d-87DC-CB5A40E6351D}"
"~/Library/Icons"
"~/Library/WebKit/Databases"
@@ -740,6 +768,7 @@ WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm:"filenames"
WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm:"message"
WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm:"prompt"
WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm:"title"
+WebKit/mac/Plugins/Hosted/ProxyInstance.mm
WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm:" OK\n"
WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm:": "
WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm:"identity"
@@ -836,12 +865,14 @@ WebKit/win/WebCoreSupport/WebInspectorClient.cpp:"inspector"
WebKit/win/WebCoreSupport/WebInspectorClient.cpp:"true"
WebKit/win/WebDatabaseManager.cpp:"Databases"
WebKit/win/WebHistoryItem.cpp:"title"
+WebKit/win/WebKitDLL.cpp
WebKit/win/WebPreferenceKeysPrivate.h
WebKit/win/WebPreferences.cpp:"Arial"
WebKit/win/WebPreferences.cpp:"Comic Sans MS"
WebKit/win/WebPreferences.cpp:"Courier New"
WebKit/win/WebPreferences.cpp:"Times New Roman"
WebKit/win/WebURLResponse.cpp:"Extension"
+WebKit/win/WebView.cpp:")"
WebKit/win/WebView.cpp:"Cancel"
WebKit/win/WebView.cpp:"Copy"
WebKit/win/WebView.cpp:"Cut"
@@ -849,4 +880,5 @@ WebKit/win/WebView.cpp:"Delete"
WebKit/win/WebView.cpp:"Paste"
WebKit/win/WebView.cpp:"Redo"
WebKit/win/WebView.cpp:"Undo"
+WebKit/win/WebView.cpp:"Unknown ("
WebKit/win/WebView.cpp:"about"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list