Reviewed by Adam Roben

        Cleaned up localizable strings

        * English.lproj/Localizable.strings:
        updated
        * StringsNotToBeLocalized.txt:
        updated
        * WebKit.xcodeproj/project.pbxproj:
        StringsNotToBeLocalized.txt recently moved but project file wasn't updated to match; now it is

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@26661 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2621af02a5a80cf623c45b7a4f92da54757ffccd..1761bde6d9bf80c6543bc6db7a8a716fe72fc10e 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2007-10-16  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Adam Roben
+        
+        Cleaned up localizable strings
+
+        * English.lproj/Localizable.strings:
+        updated
+        * StringsNotToBeLocalized.txt:
+        updated
+        * WebKit.xcodeproj/project.pbxproj:
+        StringsNotToBeLocalized.txt recently moved but project file wasn't updated to match; now it is
+
 2007-10-15  Kevin Decker  <kdecker@apple.com>
 
         Reviewed by Darin Adler.

diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 71ec161e212b2ceb65e36527ebf5b6e919a73c96..a63e904bc6908e44106011931112cb834cc48149 100644 (file)
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ

diff --git a/WebKit/StringsNotToBeLocalized.txt b/WebKit/StringsNotToBeLocalized.txt
index 4ae840cf1f6d1711304eb92b34bbb333e42c9ad5..325bab59eb519949cc141b8ee02bcd602a6755ae 100644 (file)
--- a/WebKit/StringsNotToBeLocalized.txt
+++ b/WebKit/StringsNotToBeLocalized.txt
@@ -1,4 +1,3 @@
-"420+"
 "    "
 " "
 " #%*[^\n\r]%*[\n\r]"
@@ -11,14 +10,12 @@
 " Mac OS X; %@) AppleWebKit/%@ (KHTML, like Gecko)"
 " webViewDrawResizer delegate call"
 "#"
-"########-####-####-####-############"
 "%"
 "%.0f"
 "%.1lf"
 "%.2lu/%.2lu/%.10lu-%.10lu.cache"
 "%.2u/%.2u/%.10u-%.10u.cache"
 "%0.fpx"
-"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X"
 "%20"
 "%2d) "
 "%@ %.0fpx %.0fpx %.0fpx"
@@ -68,6 +65,7 @@
 "1px"
 "2"
 "419"
+"420+"
 "422"
 "7"
 "9"
@@ -93,7 +91,6 @@
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-."
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+.-"
 "AllowsUndo"
-"Apple Chancery"
 "Apple Web Archive pasteboard type"
 "AppleKeyboardUIMode"
 "AppleLanguages"
@@ -101,17 +98,12 @@
 "BEGIN:VCARD"
 "BP_CreatePluginMIMETypesPreferences"
 "BackwardDelete"
-"CFDictionaryPropertyBag"
-"CLSID\\{########-####-####-####-############}"
-"CLSID\\{########-####-####-####-############}\\InprocServer32"
-"CLSID\\{########-####-####-####-############}\\ProgID"
-"CLSID\\{########-####-####-####-############}\\VersionIndependentProgID"
+"CFNetwork"
 "CSS"
 "Cache-Control"
 "Content-Encoding"
 "Content-Length"
 "Content-Type"
-"Courier"
 "DCMDictionaryServiceWindowShow"
 "DELEGATE METHODS"
 "DOCBASE"
@@ -128,12 +120,12 @@
 "IDNScriptWhiteList"
 "IDNScriptWhiteList.txt"
 "IMM32.DLL"
-"ISO-8859-1"
 "If-Match"
 "If-Modified-Since"
 "If-None-Match"
 "If-Range"
 "If-Unmodified-Since"
+"ImmAssociateContextEx"
 "ImmGetCompositionStringW"
 "ImmGetContext"
 "ImmNotifyIME"
@@ -176,10 +168,7 @@
 "MoveWordRight"
 "MoveWordRightAndModifySelection"
 "Mozilla/5.0 (Macintosh; U; "
-"Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en) AppleWebKit/418.9.1 (KHTML, like Gecko) Safari/419.3"
-"Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en) AppleWebKit/522.7 (KHTML, like Gecko) Version/3.0 Safari/522.7"
 "Mozilla/5.0 (Windows; U; %s; %s) AppleWebKit/%s (KHTML, like Gecko)%s%s"
-"Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3"
 "NP_GetEntryPoints"
 "NP_Initialize"
 "NP_Shutdown"
@@ -197,19 +186,16 @@
 "PDFViewChangedPage"
 "PDFViewDisplayModeChanged"
 "PDFViewScaleChanged"
-"PNG"
 "POST"
 "PPC"
-"Papyrus"
 "Quartz.framework"
 "RTL"
 "Referer"
 "SAMILang"
 "SAMIStyle"
-"SOFTWARE\\CLASSES"
+"STInitialize"
 "Safari.exe"
 "Safari/419.3"
-"ThreadingModel"
 "Times"
 "ToggleBold"
 "ToggleItalic"
@@ -228,10 +214,7 @@
 "WebActionOriginalURLKey"
 "WebAuthenticationPanel"
 "WebBackForwardList:\n"
-"WebCache"
 "WebDataRequest"
-"WebDebugProgram"
-"WebDownload"
 "WebElementDOMNode"
 "WebElementFrame"
 "WebElementImage"
@@ -247,12 +230,9 @@
 "WebElementSpellingToolTip"
 "WebElementTargetFrame"
 "WebElementTitle"
-"WebError"
-"WebHistory"
 "WebHistoryAllItemsRemovedNotification"
 "WebHistoryDates"
 "WebHistoryFileVersion"
-"WebHistoryItem"
 "WebHistoryItemChangedNotification"
 "WebHistoryItems"
 "WebHistoryItemsAddedNotification"
@@ -260,7 +240,6 @@
 "WebHistoryItemsRemovedNotification"
 "WebHistoryLoadedNotification"
 "WebHistorySavedNotification"
-"WebIconDatabase"
 "WebIconDatabaseDidAddIconNotification"
 "WebIconDatabaseDidRemoveAllIconsNotification"
 "WebIconDatabaseDirectoryDefaultsKey"
@@ -270,7 +249,6 @@
 "WebIconNotificationUserInfoURLKey"
 "WebInspectorPointer"
 "WebInspectorWindowClass"
-"WebJavaScriptCollector"
 "WebJavaScriptTextInputPanel"
 "WebKitDeveloperExtras"
 "WebKitErrorDomain"
@@ -286,15 +264,12 @@
 "WebKitOriginalTopMargin"
 "WebKitPDFs-XXXXXX"
 "WebKitScriptDebuggerEnabled"
-"WebKitStatistics"
 "WebLoginWindowDidSwitchFromUserNotification"
 "WebLoginWindowDidSwitchToUserNotification"
 "WebMainResource"
 "WebModalDialogPretendWindow"
-"WebMutableURLRequest"
 "WebNodeHighlightPointer"
 "WebNodeHighlightWindowClass"
-"WebNotificationCenter"
 "WebPageCacheDataSourceKey"
 "WebPageCacheDocumentViewKey"
 "WebPageCacheEntryDateKey"
@@ -308,9 +283,6 @@
 "WebPluginBaseURL"
 "WebPluginContainer"
 "WebPluginWillPresentNativeUserInterface"
-"WebPreferences"
-"WebPreferences%d"
-"WebPreferencesChangedNotification"
 "WebProgressEstimateChangedNotification"
 "WebProgressFinishedNotification"
 "WebProgressStartedNotification"
@@ -332,15 +304,9 @@
 "WebScriptErrorDescription"
 "WebScriptErrorDomain"
 "WebScriptErrorLineNumber"
-"WebScrollBar"
 "WebSiteURLToIconURLKey"
 "WebSubframeArchives"
 "WebSubresources"
-"WebURLCredential"
-"WebURLProtectionSpace"
-"WebURLRequest"
-"WebURLResponse"
-"WebView"
 "WebViewDidBeginEditingNotification"
 "WebViewDidChangeNotification"
 "WebViewDidChangeSelectionNotification"
@@ -354,7 +320,6 @@
 "\0"
 "\\"
 "\\Apple Computer\\"
-"\\CLSID"
 "\\StringFileInfo\\%04x%04x\\ProductVersion"
 "\\VarFileInfo\\Translation"
 "\\WebKit.resources"
@@ -378,6 +343,7 @@
 "application/pdf"
 "application/postscript"
 "application/rss+xml"
+"application/x-apple-msg-attachment"
 "application/x-java-applet"
 "application/x-webarchive"
 "application/xhtml+xml"
@@ -421,15 +387,13 @@
 "doctype"
 "en"
 "estimatedProgress"
+"file:"
 "flickr.com"
 "ftp:"
 "htm"
 "html"
-"http"
 "http://"
-"http://www.adobe.com/shockwave/download/"
 "http://www.google.com/search?q="
-"https"
 "i"
 "icon.db"
 "image.pict"
@@ -439,7 +403,6 @@
 "image/svg+xml"
 "image/tiff"
 "img"
-"investing.schwab.com"
 "isLoading"
 "isindex"
 "javascript:"
@@ -454,10 +417,8 @@
 "mainFrameIcon"
 "mainFrameTitle"
 "mainFrameURL"
-"missingImage"
 "must-revalidate"
 "name: %@\npath: %@\nmimeTypes:\n%@\npluginDescription:%@"
-"nullPlugin"
 "nullplugin"
 "pluginspage"
 "png"
@@ -486,21 +447,18 @@
 "text/x-vcalendar"
 "text/x-vcard"
 "text/x-vcf"
-"textAreaResizeCorner"
 "tiff"
 "txt"
 "u"
 "urlIcon"
 "utf-16"
 "visitCount"
-"volvocars.us"
 "webkit-fake-url"
 "webplugin"
 "x"
 "x-apple-web-kit/"
 "xml"
 "yahoo.com"
-"{########-####-####-####-############}"
 "~/Library/Icons"
 WebKit/DOM/WebDOMOperations.mm:"background"
 WebKit/DOM/WebDOMOperations.mm:"data"
@@ -512,6 +470,8 @@ WebKit/History/WebHistoryItem.mm:"children"
 WebKit/History/WebHistoryItem.mm:"title"
 WebKit/Misc/WebCache.mm:"Images"
 WebKit/Misc/WebKitVersionChecks.m:"WebKit"
+WebKit/Misc/WebNSNotificationCenterExtras.m
+WebKit/Misc/WebNSPasteboardExtras.mm
 WebKit/Misc/WebNSURLExtras.mm:"file"
 WebKit/Plugins/WebBaseNetscapePluginStream.mm:" OK\n"
 WebKit/Plugins/WebBaseNetscapePluginStream.mm:": "
@@ -558,13 +518,23 @@ WebKit/WebView/WebHTMLView.mm:"super"
 WebKit/WebView/WebHTMLView.mm:"transparent"
 WebKit/WebView/WebHTMLView.mm:"underline"
 WebKit/WebView/WebHTMLView.mm:"white"
-WebKit/WebView/WebPreferences.m:"Identifier"
-WebKit/WebView/WebPreferences.m:"Values"
+WebKit/WebView/WebPreferences.m
 WebKit/WebView/WebView.mm:"Preferences"
 WebKit/WebView/WebView.mm:"Search With Google"
 WebKit/WebView/WebView.mm:"Show DOM Tree"
 WebKit/WebView/WebView.mm:"control"
 WebKit/WebView/WebView.mm:"return "
+WebKit/qt/Api/qwebframe.cpp
+WebKit/qt/Api/qwebnetworkinterface.cpp
+WebKit/qt/Api/qwebobjectplugin.cpp
+WebKit/qt/Api/qwebpage.cpp
+WebKit/qt/Api/qwebsettings.cpp
+WebKit/qt/Plugins/ICOHandler.cpp
+WebKit/qt/QtLauncher/main.cpp
+WebKit/qt/WebCoreSupport/EditorClientQt.cpp
+WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+WebKit/qt/WebKitPart/WebKitFactory.cpp
+WebKit/qt/WebKitPart/WebKitPart.cpp
 WebKit/win/WebCache.cpp:"images"
 WebKit/win/WebCache.cpp:"scripts"
 WebKit/win/WebCache.cpp:"style sheets"
@@ -573,7 +543,7 @@ WebKit/win/WebIconDatabase.cpp:"WebKit"
 WebKit/win/WebInspectorClient.cpp:"Web Inspector "
 WebKit/win/WebInspectorClient.cpp:"Web Inspector"
 WebKit/win/WebInspectorClient.cpp:"inspector"
-WebKit/win/WebKitDLL.cpp:"Apartment"
+WebKit/win/WebKitDLL.cpp
 WebKit/win/WebPreferences.cpp:"Arial"
 WebKit/win/WebPreferences.cpp:"Comic Sans MS"
 WebKit/win/WebPreferences.cpp:"Courier New"

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 0b102aeff984d875afb157deac46773988c94eac..fac2a81d5b683a9064ff492314001cc3f7c72495 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -276,6 +276,7 @@
                DD7CDEE70A23BA9E00069928 /* WebTypesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */; };
                DD89682009AA87240097E7F0 /* WebElementDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = DD89681E09AA87240097E7F0 /* WebElementDictionary.h */; };
                DD89682109AA87240097E7F0 /* WebElementDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD89681F09AA87240097E7F0 /* WebElementDictionary.mm */; };
+               ED3B48DF0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt in Resources */ = {isa = PBXBuildFile; fileRef = ED3B48DE0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt */; };
                ED6BE2E7088C32B50044DEDC /* WebNSAttributedStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6BE2E5088C32B50044DEDC /* WebNSAttributedStringExtras.h */; };
                ED6BE2E8088C32B50044DEDC /* WebNSAttributedStringExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED6BE2E6088C32B50044DEDC /* WebNSAttributedStringExtras.mm */; };
                ED7F6D8B0980683500C235ED /* WebNSDataExtrasPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = ED7F6D8A0980683500C235ED /* WebNSDataExtrasPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -468,7 +469,6 @@
                931633EE0AEDFFAE0062B92D /* WebFrameLoaderClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameLoaderClient.mm; sourceTree = "<group>"; };
                93185DB506679F42005D5E7E /* WebHTMLViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHTMLViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                931A72D203265920008635CE /* WebBaseNetscapePluginViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebBaseNetscapePluginViewPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               932399D8034CF7F6008635CE /* English */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = text; name = English; path = English.lproj/StringsNotToBeLocalized.txt; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9325FBDC07D829AE00159862 /* IDNScriptWhiteList.txt */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = text; name = IDNScriptWhiteList.txt; path = Resources/IDNScriptWhiteList.txt; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                933D659903413FF2008635CE /* WebClipView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebClipView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                933D659A03413FF2008635CE /* WebClipView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebClipView.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -518,6 +518,7 @@
                ED21B9810528F7AA003299AC /* WebDocumentInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDocumentInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                ED2B2474033A2DA800C1A526 /* WebNSPasteboardExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSPasteboardExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                ED2B2475033A2DA800C1A526 /* WebNSPasteboardExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNSPasteboardExtras.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               ED3B48DE0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = StringsNotToBeLocalized.txt; sourceTree = "<group>"; };
                ED6BE2E5088C32B50044DEDC /* WebNSAttributedStringExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSAttributedStringExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                ED6BE2E6088C32B50044DEDC /* WebNSAttributedStringExtras.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNSAttributedStringExtras.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                ED7F6D8A0980683500C235ED /* WebNSDataExtrasPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNSDataExtrasPrivate.h; sourceTree = "<group>"; };
@@ -663,8 +664,8 @@
                        isa = PBXGroup;
                        children = (
                                939811320824BF01008DF038 /* Info.plist */,
+                               ED3B48DE0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt */,
                                35F3577E0198AAB80ACA1520 /* Localizable.strings */,
-                               932399D7034CF7F6008635CE /* StringsNotToBeLocalized.txt */,
                                F5883BDE025E5C6A01000102 /* nullplugin.tiff */,
                                F5B67130023EDF8901C1A525 /* url_icon.tiff */,
                                9345D4E70365C58D008635CE /* WebJavaScriptTextInputPanel.nib */,
@@ -1310,7 +1311,6 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
@@ -1344,6 +1344,7 @@
                                939810B90824BF01008DF038 /* WebViewEditingContextMenu.nib in Resources */,
                                939810BA0824BF01008DF038 /* IDNScriptWhiteList.txt in Resources */,
                                EDD6132C0AED9990000B75CA /* WebViewEditingContextMenuOld.nib in Resources */,
+                               ED3B48DF0CC51F7E00DFF1EB /* StringsNotToBeLocalized.txt in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -1573,14 +1574,6 @@
                        name = WebViewEditingContextMenu.nib;
                        sourceTree = "<group>";
                };
-               932399D7034CF7F6008635CE /* StringsNotToBeLocalized.txt */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               932399D8034CF7F6008635CE /* English */,
-                       );
-                       name = StringsNotToBeLocalized.txt;
-                       sourceTree = "<group>";
-               };
                9345D17B0365BF35008635CE /* WebAuthenticationPanel.nib */ = {
                        isa = PBXVariantGroup;
                        children = (