[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 34bfc33bd3bbe9476c61b83ea9261c7a281226b7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 21 23:50:34 2004 +0000

            * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6906 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3ddd856..438f9d4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-21  Darin Adler  <darin at apple.com>
+
+        * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
+
 2004-06-21  Chris Blumenberg  <cblu at apple.com>
 
 	Made WebKitErrorDescriptionPlugInCancelledConnection have its own description string
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 94e3682..e2a172c 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -45,6 +45,7 @@
 ":/?#"
 ";"
 "<!--framePath "
+"<%@ %@>"
 "="
 "=================\nARGUMENT BAD: %s, %s (%s:%d %s)\n=================\n"
 "=================\nASSERTION FAILED: "
@@ -286,6 +287,10 @@
 "com.apple.WebKit"
 "com.apple.hiview"
 "com.apple.universalaccess"
+"destination-atop"
+"destination-in"
+"destination-out"
+"destination-over"
 "displayTitle"
 "estimatedProgress"
 "ftp:"
@@ -307,9 +312,14 @@
 "mainFrameIcon"
 "mainFrameTitle"
 "mainFrameURL"
+"missing_image"
 "nullplugin"
 "pluginspage"
 "rgb(%.0f,%.0f,%.0f)"
+"source-atop"
+"source-in"
+"source-out"
+"source-over"
 "src"
 "text/"
 "text/calendar"
@@ -353,6 +363,12 @@ Plugins.subproj/WebPluginDatabase.m:"Java Applet Plugin Enabler"
 WebCoreSupport.subproj/WebBridge.m:"height"
 WebCoreSupport.subproj/WebBridge.m:"width"
 WebCoreSupport.subproj/WebCookieAdapter.m:"Cookie"
+WebCoreSupport.subproj/WebImageRendererFactory.m:"clear"
+WebCoreSupport.subproj/WebImageRendererFactory.m:"copy"
+WebCoreSupport.subproj/WebImageRendererFactory.m:"darker"
+WebCoreSupport.subproj/WebImageRendererFactory.m:"highlight"
+WebCoreSupport.subproj/WebImageRendererFactory.m:"lighter"
+WebCoreSupport.subproj/WebImageRendererFactory.m:"xor"
 WebCoreSupport.subproj/WebTextRenderer.m:"Times New Roman"
 WebCoreSupport.subproj/WebTextRenderer.m:"YES"
 WebCoreSupport.subproj/WebTextRenderer.m:"not known"

-- 
WebKit Debian packaging