[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[sullivan at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 7f318993d9636e54e32801fed20e3cdadf76a6b3
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 22:00:09 2010 +0000

    Fixed localized string key collision. update-webkit-localized-strings now
    runs without errors.
    
    Reviewed by Adam Roben.
    
    WebKit:
    
    * English.lproj/Localizable.strings:
    Regenerated.
    
    WebKit/win:
    
    * WebCoreLocalizedStrings.cpp:
    (WebCore::AXMenuListPopupActionVerb):
    Used LPCTSTR_UI_STRING_KEY for the 2nd use of "press".
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index edfc7b6..9e46cf9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2010-03-09  John Sullivan  <sullivan at apple.com>
 
+        Fixed localized string key collision. update-webkit-localized-strings now
+        runs without errors.
+
+        Reviewed by Adam Roben.
+
+        * English.lproj/Localizable.strings:
+        Regenerated.
+
+2010-03-09  John Sullivan  <sullivan at apple.com>
+
         * StringsNotToBeLocalized.txt:
         Brought this file up to date. update-webkit-localizable-strings still lists
         one key collision, but that's a separate issue.
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 42c1386..3ba90af 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 82cee40..670034f 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-09  John Sullivan  <sullivan at apple.com>
+
+        Fixed localized string key collision. update-webkit-localized-strings now
+        runs without errors.
+
+        Reviewed by Adam Roben.
+
+        * WebCoreLocalizedStrings.cpp:
+        (WebCore::AXMenuListPopupActionVerb):
+        Used LPCTSTR_UI_STRING_KEY for the 2nd use of "press".
+
 2010-03-08  Adam Treat  <atreat at rim.com>
 
         Unreviewed build fix for Windows.
diff --git a/WebKit/win/WebCoreLocalizedStrings.cpp b/WebKit/win/WebCoreLocalizedStrings.cpp
index 5850605..cd04406 100644
--- a/WebKit/win/WebCoreLocalizedStrings.cpp
+++ b/WebKit/win/WebCoreLocalizedStrings.cpp
@@ -93,7 +93,7 @@ String WebCore::AXCheckedCheckBoxActionVerb() { return String(LPCTSTR_UI_STRING(
 String WebCore::AXUncheckedCheckBoxActionVerb() { return String(LPCTSTR_UI_STRING("check", "Verb stating the action that will occur when an unchecked checkbox is clicked, as used by accessibility")); }
 String WebCore::AXLinkActionVerb() { return String(LPCTSTR_UI_STRING("jump", "Verb stating the action that will occur when a link is clicked, as used by accessibility")); }
 String WebCore::AXMenuListActionVerb() { return String(LPCTSTR_UI_STRING("open", "Verb stating the action that will occur when a select element is clicked, as used by accessibility")); }
-String WebCore::AXMenuListPopupActionVerb() { return String(LPCTSTR_UI_STRING("press", "Verb stating the action that will occur when a select element's popup list is clicked, as used by accessibility")); }
+String WebCore::AXMenuListPopupActionVerb() { return String(LPCTSTR_UI_STRING_KEY("press", "press (select element)", "Verb stating the action that will occur when a select element's popup list is clicked, as used by accessibility")); }
 String WebCore::unknownFileSizeText() { return String(LPCTSTR_UI_STRING("Unknown", "Unknown filesize FTP directory listing item")); }
 String WebCore::uploadFileText() { return String(LPCTSTR_UI_STRING("Upload file", "(Windows) Form submit file upload dialog title")); }
 String WebCore::allFilesText() { return String(LPCTSTR_UI_STRING("All Files", "(Windows) Form submit file upload all files pop-up")); }

-- 
WebKit Debian packaging