[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 27e0a676a976cfef9d7ac90ad475b3ef6eefc1fd
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 19 23:45:18 2003 +0000

    	Fixed: <rdar://problem/3489935>: Mentioning "to Disk" in context menus such as "Download Linked File To Disk..." is redundant
    
            Reviewed by john.
    
            * English.lproj/Localizable.strings:
            * English.lproj/StringsNotToBeLocalized.txt:
            * WebView.subproj/WebDefaultContextMenuDelegate.m:
            (-[WebDefaultUIDelegate menuItemWithTag:]): use "Download Linked File" and "Download Image"
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5593 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c22a003..53d3b9d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2003-11-19  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: <rdar://problem/3489935>: Mentioning "to Disk" in context menus such as "Download Linked File To Disk..." is redundant
+
+        Reviewed by john.
+
+        * English.lproj/Localizable.strings:
+        * English.lproj/StringsNotToBeLocalized.txt:
+        * WebView.subproj/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultUIDelegate menuItemWithTag:]): use "Download Linked File" and "Download Image"
+
+2003-11-19  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3488783>: Flash at http://www.sjwilson.net/reef/ does not load photos
 	
         Reviewed by rjw.
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index b539430..7239682 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 0b1c2e4..bedef4c 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -234,6 +234,7 @@
 "\nDict data: %ld items\n"
 "\nHeap data: %ld items\n"
 "\nList root path: %s\n"
+"\r"
 "\r\n"
 "__KHTML__"
 "_blank"
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 6a99bc3..551fdb1 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -36,7 +36,7 @@
             action = @selector(openLinkInNewWindow:);
             break;
         case WebMenuItemTagDownloadLinkToDisk:
-            title = UI_STRING("Download Linked File to Disk", "Download Linked File to Disk context menu item");
+            title = UI_STRING("Download Linked File", "Download Linked File context menu item");
             action = @selector(downloadLinkToDisk:);
             break;
         case WebMenuItemTagCopyLinkToClipboard:
@@ -48,7 +48,7 @@
             action = @selector(openImageInNewWindow:);
             break;
         case WebMenuItemTagDownloadImageToDisk:
-            title = UI_STRING("Download Image to Disk", "Download Image To Disk context menu item");
+            title = UI_STRING("Download Image", "Download Image context menu item");
             action = @selector(downloadImageToDisk:);
             break;
         case WebMenuItemTagCopyImageToClipboard:

-- 
WebKit Debian packaging