[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit bd35a601a5163ecc60ad426543283cc32200a249
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 24 08:11:48 2009 +0000

    Fix QApp::translate() calls to provide the correct class name without
    a trailing comma.
    
    Patch by Oswald Buddenhagen <oswald.buddenhagen at nokia.com> on 2009-09-24
    Reviewed by Simon Hausmann.
    
    * platform/qt/Localizations.cpp:
    (WebCore::localizedMediaTimeDescription):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48709 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6486004..5d83c7b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-24  Oswald Buddenhagen  <oswald.buddenhagen at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Fix QApp::translate() calls to provide the correct class name without
+        a trailing comma.
+
+        * platform/qt/Localizations.cpp:
+        (WebCore::localizedMediaTimeDescription):
+
 2009-09-24  Geoffrey Garen  <ggaren at apple.com>
 
         More build fix: Removed JSSharedWorkerContextCustom.cpp from project
diff --git a/WebCore/platform/qt/Localizations.cpp b/WebCore/platform/qt/Localizations.cpp
index 0733617..977b284 100644
--- a/WebCore/platform/qt/Localizations.cpp
+++ b/WebCore/platform/qt/Localizations.cpp
@@ -444,7 +444,7 @@ String localizedMediaControlElementHelpText(const String& name)
 String localizedMediaTimeDescription(float time)
 {
     if (!isfinite(time))
-        return QCoreApplication::translate("QWebPage," "Indefinite time", "Media time description");
+        return QCoreApplication::translate("QWebPage", "Indefinite time", "Media time description");
 
     int seconds = (int)fabsf(time);
     int days = seconds / (60 * 60 * 24);
@@ -453,18 +453,18 @@ String localizedMediaTimeDescription(float time)
     seconds %= 60;
 
     if (days) {
-        return QCoreApplication::translate("QWebPage," "%1 days %2 hours %3 minutes %4 seconds", "Media time description").arg(days).arg(hours).arg(minutes).arg(seconds);
+        return QCoreApplication::translate("QWebPage", "%1 days %2 hours %3 minutes %4 seconds", "Media time description").arg(days).arg(hours).arg(minutes).arg(seconds);
     }
 
     if (hours) {
-        return QCoreApplication::translate("QWebPage," "%1 hours %2 minutes %3 seconds", "Media time description").arg(hours).arg(minutes).arg(seconds);
+        return QCoreApplication::translate("QWebPage", "%1 hours %2 minutes %3 seconds", "Media time description").arg(hours).arg(minutes).arg(seconds);
     }
 
     if (minutes) {
-        return QCoreApplication::translate("QWebPage," "%1 minutes %2 seconds", "Media time description").arg(minutes).arg(seconds);
+        return QCoreApplication::translate("QWebPage", "%1 minutes %2 seconds", "Media time description").arg(minutes).arg(seconds);
     }
 
-    return QCoreApplication::translate("QWebPage," "%1 seconds", "Media time description").arg(seconds);
+    return QCoreApplication::translate("QWebPage", "%1 seconds", "Media time description").arg(seconds);
 }
 #endif  // ENABLE(VIDEO)
 

-- 
WebKit Debian packaging