[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 2a8edb63904db1f566501a1a3e13a11e0a0b6996
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 17:39:09 2010 +0000

    WebKit: Updated localizable strings.
    
    * English.lproj/Localizable.strings:
    
    WebKit/mac: Build fix after r67628. Added context menu item localizable strings for the items
    added in r67628, following equivalent menu items in Mac OS X when possible. However,
    this set of menu items does not make much sense for Mac OS X, and this should be
    addressed separately.
    
    * WebCoreSupport/WebPlatformStrategies.h:
    * WebCoreSupport/WebPlatformStrategies.mm:
    (WebPlatformStrategies::contextMenuItemTagOpenMediaInNewWindow):
    (WebPlatformStrategies::contextMenuItemTagCopyMediaLinkToClipboard):
    (WebPlatformStrategies::contextMenuItemTagToggleMediaControls):
    (WebPlatformStrategies::contextMenuItemTagToggleMediaLoop):
    (WebPlatformStrategies::contextMenuItemTagEnterVideoFullscreen):
    (WebPlatformStrategies::contextMenuItemTagMediaPlay):
    (WebPlatformStrategies::contextMenuItemTagMediaPause):
    (WebPlatformStrategies::contextMenuItemTagMediaMute):
    (WebPlatformStrategies::contextMenuItemTagMediaUnMute):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67638 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2727bfb..c987fdf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-16  Dan Bernstein  <mitz at apple.com>
+
+        Updated localizable strings.
+
+        * English.lproj/Localizable.strings:
+
 2010-09-10  Darin Adler  <darin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 615dc9a..8bdefc7 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 3cf4991..bdfb9e0 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-16  Dan Bernstein  <mitz at apple.com>
+
+        Build fix after r67628. Added context menu item localizable strings for the items
+        added in r67628, following equivalent menu items in Mac OS X when possible. However,
+        this set of menu items does not make much sense for Mac OS X, and this should be
+        addressed separately.
+
+        * WebCoreSupport/WebPlatformStrategies.h:
+        * WebCoreSupport/WebPlatformStrategies.mm:
+        (WebPlatformStrategies::contextMenuItemTagOpenMediaInNewWindow):
+        (WebPlatformStrategies::contextMenuItemTagCopyMediaLinkToClipboard):
+        (WebPlatformStrategies::contextMenuItemTagToggleMediaControls):
+        (WebPlatformStrategies::contextMenuItemTagToggleMediaLoop):
+        (WebPlatformStrategies::contextMenuItemTagEnterVideoFullscreen):
+        (WebPlatformStrategies::contextMenuItemTagMediaPlay):
+        (WebPlatformStrategies::contextMenuItemTagMediaPause):
+        (WebPlatformStrategies::contextMenuItemTagMediaMute):
+        (WebPlatformStrategies::contextMenuItemTagMediaUnMute):
+
 2010-09-16  Eric Uhrhane  <ericu at chromium.org>
 
         Reviewed by Jian Li.
diff --git a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h
index 53f39f8..680f9ab 100644
--- a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h
+++ b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h
@@ -113,6 +113,15 @@ private:
     virtual WTF::String contextMenuItemTagCapitalize();
     virtual WTF::String contextMenuItemTagChangeBack(const WTF::String& replacedString);
     virtual WTF::String contextMenuItemTagInspectElement();
+    virtual WTF::String contextMenuItemTagOpenMediaInNewWindow();
+    virtual WTF::String contextMenuItemTagCopyMediaLinkToClipboard();
+    virtual WTF::String contextMenuItemTagToggleMediaControls();
+    virtual WTF::String contextMenuItemTagToggleMediaLoop();
+    virtual WTF::String contextMenuItemTagEnterVideoFullscreen();
+    virtual WTF::String contextMenuItemTagMediaPlay();
+    virtual WTF::String contextMenuItemTagMediaPause();
+    virtual WTF::String contextMenuItemTagMediaMute();
+    virtual WTF::String contextMenuItemTagMediaUnMute();
 #endif // ENABLE(CONTEXT_MENUS)
     virtual WTF::String searchMenuNoRecentSearchesText();
     virtual WTF::String searchMenuRecentSearchesText();
diff --git a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
index 2900ccf..a74829c 100644
--- a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
+++ b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
@@ -449,6 +449,51 @@ String WebPlatformStrategies::contextMenuItemTagInspectElement()
     return UI_STRING("Inspect Element", "Inspect Element context menu item");
 }
 
+String WebPlatformStrategies::contextMenuItemTagOpenMediaInNewWindow()
+{
+    return UI_STRING("Open Media in New Window", "Open Media in New Window context menu item");
+}
+
+String WebPlatformStrategies::contextMenuItemTagCopyMediaLinkToClipboard()
+{
+    return UI_STRING("Copy Media Address", "Copy Media Address context menu item");
+}
+
+String WebPlatformStrategies::contextMenuItemTagToggleMediaControls()
+{
+    return UI_STRING("Toggle Media Controls", "Toggle Media Controls context menu item");
+}
+
+String WebPlatformStrategies::contextMenuItemTagToggleMediaLoop()
+{
+    return UI_STRING("Toggle Media Loop Playback", "Toggle Media Loop Playback context menu item");
+}
+
+String WebPlatformStrategies::contextMenuItemTagEnterVideoFullscreen()
+{
+    return UI_STRING("Fullscreen", "Fullscreen context menu item");
+}
+
+String WebPlatformStrategies::contextMenuItemTagMediaPlay()
+{
+    return UI_STRING("Play", "Play context menu item");
+}
+
+String WebPlatformStrategies::contextMenuItemTagMediaPause()
+{
+    return UI_STRING("Pause", "Pause context menu item");
+}
+
+String WebPlatformStrategies::contextMenuItemTagMediaMute()
+{
+    return UI_STRING("Mute", "Mute context menu item");
+}
+
+String WebPlatformStrategies::contextMenuItemTagMediaUnMute()
+{
+    return UI_STRING("Unmute", "Unmute context menu item");
+}
+
 #endif // ENABLE(CONTEXT_MENUS)
 
 String WebPlatformStrategies::searchMenuNoRecentSearchesText()

-- 
WebKit Debian packaging