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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 08b2e0d4e51fa1290c216782cb1a235c8fd432a4
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 21 22:05:33 2004 +0000

    	Made WebKitErrorDescriptionPlugInCancelledConnection properly reuse an already localized string to avoid loc changes.
    
            Reviewed by john.
    
            * ChangeLog:
            * Misc.subproj/WebKitErrors.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 139c371..b2b8d4f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2004-06-21  Chris Blumenberg  <cblu at apple.com>
 
+	Made WebKitErrorDescriptionPlugInCancelledConnection properly reuse an already localized string to avoid loc changes.
+
+        Reviewed by john.
+
+        * ChangeLog:
+        * Misc.subproj/WebKitErrors.m:
+
+2004-06-21  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3701269> change in error handling behavior from 10.3.3 to 10.3.4 breaks unreleased Adobe PDF plug-in
 
         Reviewed by john.
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index e0995f6..f306e24 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -34,7 +34,7 @@ NSString * const WebKitErrorPlugInPageURLStringKey = 	@"WebKitErrorPlugInPageURL
 #define WebKitErrorDescriptionJavaUnavailable UI_STRING("Java is unavailable", "WebKitErrorJavaUnavailable description")
 
 // FIXME: We use "Cannot load plug-in" to avoid localization changes. Update the string when localization is not an issue.
-#define WebKitErrorDescriptionPlugInCancelledConnection UI_STRING("Cannot load plug-in", "WebKitErrorDescriptionPlugInCancelledConnection description")
+#define WebKitErrorDescriptionPlugInCancelledConnection WebKitErrorDescriptionCannotLoadPlugin
 
 static pthread_once_t registerErrorsControl = PTHREAD_ONCE_INIT;
 static void registerErrors(void);

-- 
WebKit Debian packaging