[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 76f24540a79c5ab4c4db5a9b8ab511b0eb199887
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 6 21:00:43 2004 +0000

    WebKit:
    
    	Fixed: <rdar://problem/3613974>: remove "to Clipboard" from context menus because it is redundant
    
            Reviewed by john.
    
            * English.lproj/Localizable.strings:
            * WebView.subproj/WebDefaultContextMenuDelegate.m:
            (-[WebDefaultUIDelegate menuItemWithTag:]):
    
    WebBrowser:
    
    	Fixed: <rdar://problem/3316489>: ER: Safari� image context menu should have "Copy Image Address"
    
            Reviewed by john.
    
            * ContextMenuHandler.m:
            (-[BrowserWebView webView:contextMenuItemsForElement:defaultMenuItems:]): added "Copy Image Address" for Tiger only, moved "Add Link to Bookmarks" above "Copy Link" to keep all copy-related menu items at the bottom
            (-[BrowserWebView copyImageAddress:]): new
            * English.lproj/Localizable.strings:
            * English.lproj/StringsNotToBeLocalized.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6319 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index eddb63d..aa3815b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-06  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3613974>: remove "to Clipboard" from context menus because it is redundant
+
+        Reviewed by john.
+
+        * English.lproj/Localizable.strings:
+        * WebView.subproj/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultUIDelegate menuItemWithTag:]):
+
 2004-04-06  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Dave
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 628c542..0708e50 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 5799a0e..22a94d9 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -45,7 +45,7 @@
             action = @selector(downloadLinkToDisk:);
             break;
         case WebMenuItemTagCopyLinkToClipboard:
-            title = UI_STRING("Copy Link to Clipboard", "Copy Link to Clipboard context menu item");
+            title = UI_STRING("Copy Link", "Copy Link context menu item");
             action = @selector(copyLinkToClipboard:);
             break;
         case WebMenuItemTagOpenImageInNewWindow:
@@ -57,7 +57,7 @@
             action = @selector(downloadImageToDisk:);
             break;
         case WebMenuItemTagCopyImageToClipboard:
-            title = UI_STRING("Copy Image to Clipboard", "Copy Image to Clipboard context menu item");
+            title = UI_STRING("Copy Image", "Copy Image context menu item");
             action = @selector(copyImageToClipboard:);
             break;
         case WebMenuItemTagOpenFrameInNewWindow:
@@ -69,23 +69,23 @@
             action = @selector(copy:);
             [menuItem setTarget:nil];
             break;
-		case WebMenuItemTagGoBack:
-			title = UI_STRING("Back", "Back context menu item");
+        case WebMenuItemTagGoBack:
+            title = UI_STRING("Back", "Back context menu item");
             action = @selector(goBack:);
             [menuItem setTarget:nil];
             break;
-		case WebMenuItemTagGoForward:
-			title = UI_STRING("Forward", "Forward context menu item");
+        case WebMenuItemTagGoForward:
+            title = UI_STRING("Forward", "Forward context menu item");
             action = @selector(goForward:);
             [menuItem setTarget:nil];
             break;
-		case WebMenuItemTagStop:
-			title = UI_STRING("Stop", "Stop context menu item");
+        case WebMenuItemTagStop:
+            title = UI_STRING("Stop", "Stop context menu item");
             action = @selector(stopLoading:);
             [menuItem setTarget:nil];
             break;
-		case WebMenuItemTagReload:
-			title = UI_STRING("Reload", "Reload context menu item");
+        case WebMenuItemTagReload:
+            title = UI_STRING("Reload", "Reload context menu item");
             action = @selector(reload:);
             [menuItem setTarget:nil];
             break;

-- 
WebKit Debian packaging