[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 1b0078ccd9cfe731c1772e88cb96af11711d65d8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 3 21:18:32 2002 +0000

    WebFoundation:
    
    	Reviewed by Maciej.
    
            * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
    
    WebKit:
    
    	Reviewed by Maciej.
    
            * WebView.subproj/WebView.m: Fixed a pair of strings that conflict.
            * English.lproj/Localizable.strings: Regenerated.
            * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2907 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6b1d666..34f7b5d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-03  Darin Adler  <darin at apple.com>
+
+	Reviewed by Maciej.
+
+        * WebView.subproj/WebView.m: Fixed a pair of strings that conflict.
+        * English.lproj/Localizable.strings: Regenerated.
+        * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
+
 2002-12-02  Trey Matteson  <trey at apple.com>
 
 	Refined bookmark notifications to be more detailed.  We now have added, removed,
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6b1d666..34f7b5d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-12-03  Darin Adler  <darin at apple.com>
+
+	Reviewed by Maciej.
+
+        * WebView.subproj/WebView.m: Fixed a pair of strings that conflict.
+        * English.lproj/Localizable.strings: Regenerated.
+        * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
+
 2002-12-02  Trey Matteson  <trey at apple.com>
 
 	Refined bookmark notifications to be more detailed.  We now have added, removed,
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 98b2fef..a8daacc 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 159c8f1..38f41a5 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -83,12 +83,11 @@
 "WebActionButtonKey"
 "WebActionModifierFlagsKey"
 "WebActionNavigationTypeKey"
+"WebActionOriginalURLKey"
 "WebAuthenticationPanel"
 "WebBackForwardList:\n"
-"WebBookmarkChildrenChangedKey"
 "WebBookmarkChildrenKey"
 "WebBookmarkDidChangeNotification"
-"WebBookmarkGroupChangedNotification"
 "WebBookmarkIdentifier"
 "WebBookmarkType"
 "WebBookmarkTypeLeaf"
@@ -97,6 +96,7 @@
 "WebBookmarkWillChangeNotification"
 "WebBookmarksWereAddedNotification"
 "WebBookmarksWereRemovedNotification"
+"WebCorePageState"
 "WebCurrentFrameState"
 "WebElementFrame"
 "WebElementImage"
@@ -109,13 +109,19 @@
 "WebElementString"
 "WebElementTargetFrame"
 "WebErrorDomainWebKit"
+"WebFrameLoadTypeBack"
+"WebFrameLoadTypeForward"
+"WebFrameLoadTypeIndexedBackForward"
+"WebFrameLoadTypeInternal"
+"WebFrameLoadTypeReload"
+"WebFrameLoadTypeReloadAllowingStaleData"
+"WebFrameLoadTypeStandard"
 "WebFrameStateChangedNotification"
 "WebFrameStateCommittedPage"
 "WebFrameStateComplete"
 "WebFrameStateCompleting"
 "WebFrameStateLayoutAcceptable"
 "WebFrameStateProvisional"
-"WebHTMLView"
 "WebHistoryAllEntriesRemovedNotification"
 "WebHistoryEntriesAddedNotification"
 "WebHistoryEntriesRemovedNotification"
@@ -130,10 +136,12 @@
 "WebKitAllowAnimatedImageLoopingPreferenceKey"
 "WebKitAllowAnimatedImagesPreferenceKey"
 "WebKitCursiveFont"
+"WebKitDataSource"
 "WebKitDefaultFixedFontSize"
 "WebKitDefaultFontSize"
 "WebKitDefaultTextEncodingName"
 "WebKitDisplayImagesKey"
+"WebKitDocumentView"
 "WebKitFantasyFont"
 "WebKitFixedFont"
 "WebKitHistoryAgeInDaysLimit"
@@ -185,6 +193,7 @@
 "_self"
 "_top"
 "application/octet-stream"
+"application/pdf"
 "application/x-java-applet"
 "application/x-javascript"
 "com.apple.WebKit"
@@ -194,9 +203,6 @@
 "html"
 "http"
 "https"
-"image/gif"
-"image/jpeg"
-"image/png"
 "isTargetItem"
 "javascript"
 "lastVisitedDate"
@@ -209,6 +215,7 @@
 "url_icon"
 "x"
 "~"
+Bookmarks.subproj/WebBookmarkLeaf.m:"%@: %@"
 Bookmarks.subproj/WebBookmarkList.m:"Children"
 Bookmarks.subproj/WebBookmarkList.m:"Title"
 Bookmarks.subproj/WebBookmarkProxy.m:"Title"
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 65e6945..9a683c2 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -52,8 +52,8 @@ NSString *WebErrorDomainWebKit = @"WebErrorDomainWebKit";
 #define WebErrorDescriptionWebErrorCannotFindPlugin UI_STRING("Cannot find plug-in", "WebErrorCannotFindPlugin description")
 #define WebErrorDescriptionWebErrorCannotLoadPlugin UI_STRING("Cannot load plug-in", "WebErrorCannotLoadPlugin description")
 #define WebErrorDescriptionWebErrorJavaUnavailable UI_STRING("Java is unavailable", "WebErrorJavaUnavailable description")
-#define WebErrorDescriptionDownloadDecodingFailedToComplete UI_STRING("Download decoding failed", "WebErrorDownloadDecodingFailedToComplete description")
-#define WebErrorDescriptionDownloadDecodingFailedMidStream UI_STRING("Download decoding failed", "WebErrorDownloadDecodingFailedMidStream description")
+#define WebErrorDescriptionDownloadDecodingFailedToComplete UI_STRING_KEY("Download decoding failed", "Download decoding failed (at end)", "WebErrorDownloadDecodingFailedToComplete description")
+#define WebErrorDescriptionDownloadDecodingFailedMidStream UI_STRING_KEY("Download decoding failed", "Download decoding failed (midstream)", "WebErrorDownloadDecodingFailedMidStream description")
 
 + (void)initialize
 {

-- 
WebKit Debian packaging