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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f06a4d762d1de43e4d3ee80b6321450e0ce6d236
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 1 22:12:00 2009 +0000

    2009-12-01  Daniel Bates  <dbates at webkit.org>
    
            Reviewed by Pavel Feldman.
    
            https://bugs.webkit.org/show_bug.cgi?id=32001
    
            Updated layout test to reflect change to localized string and
            rebased the result.
    
            * inspector/elements-img-tooltip-expected.txt:
            * inspector/elements-img-tooltip.html:
    2009-12-01  Daniel Bates  <dbates at webkit.org>
    
            Reviewed by Pavel Feldman.
    
            https://bugs.webkit.org/show_bug.cgi?id=32001
    
            Added missing localized strings (that I left out of the patch for bug #21554):
            %d × %d pixels
            %d × %d pixels (Natural: %d × %d pixels)
    
            Also, changed formatting of these stings to conform with existing ones (added
            a space on both sides of the multiply sign).
    
            * English.lproj/localizedStrings.js: Added stings.
            * inspector/front-end/ElementsTreeOutline.js:
            (WebInspector.ElementsTreeElement.prototype.createTooltipForImageNode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51559 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 279edc9..1104d36 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-01  Daniel Bates  <dbates at webkit.org>
+
+        Reviewed by Pavel Feldman.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32001
+
+        Updated layout test to reflect change to localized string and
+        rebased the result.
+
+        * inspector/elements-img-tooltip-expected.txt:
+        * inspector/elements-img-tooltip.html:
+
 2009-12-01  Adam Roben  <aroben at apple.com>
 
         Skip a test that fails with some versions of CFNetwork on Windows
diff --git a/LayoutTests/inspector/elements-img-tooltip-expected.txt b/LayoutTests/inspector/elements-img-tooltip-expected.txt
index 1c80d6f..9e480ee 100644
--- a/LayoutTests/inspector/elements-img-tooltip-expected.txt
+++ b/LayoutTests/inspector/elements-img-tooltip-expected.txt
@@ -1,5 +1,5 @@
-Tests that the tooltip text for the image (below) is "215×174 pixels".
+Tests that the tooltip text for the image (below) is "215 × 174 pixels".
 
 
-PASSED, tooltip text is "215×174 pixels".
+PASSED, tooltip text is "215 × 174 pixels".
 
diff --git a/LayoutTests/inspector/elements-img-tooltip.html b/LayoutTests/inspector/elements-img-tooltip.html
index 8140e31..da8302c 100644
--- a/LayoutTests/inspector/elements-img-tooltip.html
+++ b/LayoutTests/inspector/elements-img-tooltip.html
@@ -4,7 +4,7 @@
 <script src="inspector-test.js"></script>
 <script src="elements-tests.js"></script>
 <script>
-var EXPECTED_TOOLTIP_TEXT = "215\xd7174 pixels";
+var EXPECTED_TOOLTIP_TEXT = "215 \xd7 174 pixels";
 function doit()
 {
     function callback(tooltipText)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index affad17..76822ac 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-12-01  Daniel Bates  <dbates at webkit.org>
+
+        Reviewed by Pavel Feldman.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32001
+
+        Added missing localized strings (that I left out of the patch for bug #21554):
+        %d × %d pixels
+        %d × %d pixels (Natural: %d × %d pixels)
+
+        Also, changed formatting of these stings to conform with existing ones (added
+        a space on both sides of the multiply sign).
+
+        * English.lproj/localizedStrings.js: Added stings.
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeElement.prototype.createTooltipForImageNode):
+
 2009-12-01  Dave Hyatt  <hyatt at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index ef981c7..e0b974c 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/front-end/ElementsTreeOutline.js b/WebCore/inspector/front-end/ElementsTreeOutline.js
index 6880770..d6326f0 100644
--- a/WebCore/inspector/front-end/ElementsTreeOutline.js
+++ b/WebCore/inspector/front-end/ElementsTreeOutline.js
@@ -336,9 +336,9 @@ WebInspector.ElementsTreeElement.prototype = {
 
             var tooltipText = null;
             if (properties.offsetHeight === properties.naturalHeight && properties.offsetWidth === properties.naturalWidth)
-                tooltipText = WebInspector.UIString("%d\u00d7%d pixels", properties.offsetWidth, properties.offsetHeight);
+                tooltipText = WebInspector.UIString("%d × %d pixels", properties.offsetWidth, properties.offsetHeight);
             else
-                tooltipText = WebInspector.UIString("%d\u00d7%d pixels (Natural: %d\u00d7%d pixels)", properties.offsetWidth, properties.offsetHeight, properties.naturalWidth, properties.naturalHeight);
+                tooltipText = WebInspector.UIString("%d × %d pixels (Natural: %d × %d pixels)", properties.offsetWidth, properties.offsetHeight, properties.naturalWidth, properties.naturalHeight);
             callback(tooltipText);
         }
         var objectProxy = new WebInspector.ObjectProxy(node.id);

-- 
WebKit Debian packaging