Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Another fix for the non unified title+toolbar regarding text under icons
  My 4.6.2 changes
  Added my changes to changes file.
  Doc: Correcting image
  My changes for 4.6.2
  My changelog for 4.6.2
  My Changelog entries for 4.6.2
  Add the QMAKE_FILE_EXT variable to extra compilers generation.
  Doc: Removed promisse to fix a problem
  Add some entries to the change log
  Change log updated
  Improve raster graphics system performance on Mac (second try).
  I10n/German: Update translations for 4.6.2
  I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverb

16 files changed, 625 insertions, 198 deletions

diff --git a/dist/changes-4.6.2 b/dist/changes-4.6.2
index f5e4e5750a..aa8d40b21f 100644
--- a/dist/changes-4.6.2
+++ b/dist/changes-4.6.2
@@ -1,7 +1,7 @@
 Qt 4.6.2 is a bug-fix release. It maintains both forward and backward
-compatibility (source and binary) with Qt 4.6.0.  For more details,
-refer to the online documentation included in this distribution. The
-documentation is also available online:
+compatibility (source and binary) with Qt 4.6.0 and 4.6.1.  For more
+details, refer to the online documentation included in this
+distribution. The documentation is also available online:
 
   http://qt.nokia.com/doc/4.6
 
@@ -40,6 +40,26 @@ Optimizations
 QtCore
 ------
 
+ - QAtomicPointer
+    * [QTBUG-7356] Fixed a compilation failure when using the Intel
+    compiler on IA-64
+
+ - QFile
+    * Fixed double-buffering issue when opening files in buffered mode.
+    * [QTBUG-7285] QFile::remove would fail if an unrelated operation on the
+      same instance had been previously failed. This manisfested itself in
+      QTemporaryFile failing to auto-remove files and QFile::copy leaving
+      temporary files behind in certain situations.
+
+ - QFSFileEngine
+    * Fix typo that made realpath() not being used
+
+ - QIODevice
+    * Optimized readAll()
+
+ - QReadWriteLock
+    * [MR 426] Fixed documentation
+
  - QXmlStreamWriter
     * [QTBUG-6893] Fixed adding extra Byte Order Marks when writing to a xml file.
 
@@ -49,20 +69,44 @@ QtGui
  - foo
     * bar
 
+ - QApplication
+    * [QTBUG-6098] Added a flag to avoid construction of application panes.
+ - QInputContext
+    * [QTBUG-7439] Avoided the loss of preedit text when losing focus on Symbian.
+
+ * [QT-2629] Implemented event filter functions for Symbian.
  * [QTBUG-7029] Fixed a crash when re-creating QApplication object due to a
    dangling gesture manager pointer.
+ * [QTBUG-7198] Setting a style sheet could break the checkbox position in item views.
+ * [QTBUG-7253] Fixed wrong stroke clipping with the raster engine when using a QPen
+   with a style other than SolidLine.
+
+
+ * [MR 2077] Integrated merge request 2077
 
 QtDBus
 ------
 
- - foo
-    * bar
+ - QDBusConnection
+    * [QT-2307] Fixed sending of D-Bus method calls with QDBus::BlockWithGui
 
 QtNetwork
 ---------
 
- - foo
-    * bar
+ - QNetworkAccessManager
+    * Optimizations
+    * HTTP: Get rid of QAbstractSocket warnings that were sometimes displayed
+    * HTTP: setReadBufferSize() of the QNetworkReply finally is working on all layers
+    * [QTBUG-7713] HTTP: Fix bug related to re-sending a request
+    * [QTBUG-7060] Fixed an issue with parsing of HTTP headers like
+    "private, max-age=300"
+
+ - QSslCertificate
+    * [QTBUG-6466] Fix issuerInfo() and subjectInfo()
+
+ - QTcpSocket
+    * [QTBUG-7344] Fix performance degredation with write() on Windows
+    * [QTBUG-7316,QTBUG-7317] Also handle unknown errors from socket engine
 
 QtOpenGL
 --------
@@ -105,6 +149,15 @@ Qt Plugins
  - foo
     * bar
 
+Examples
+--------
+
+ - QtMultimedia
+    * [MR 418] Fixed the example for QAudioOutput
+
+ - WebKit
+    * [MR 2235] Added the framecapture example to the default build
+
 Third party components
 ----------------------
 
@@ -120,7 +173,7 @@ Third party components
 Qt for Unix (X11 and Mac OS X)
 ------------------------------
 
- - 
+ -
 
 Qt for Linux/X11
 ----------------
@@ -130,18 +183,25 @@ Qt for Linux/X11
   * Fixed a crash when an input method tries to create a widget after the
     application is destroyed.
 
+  - [QTBUG-6952] Fixed a problem using NoButtons in spinbox with QGtkStyle
+  - [QTBUG-7504] Fixed missing focus rect on check- and radiobutton with
+     some GTK+ themes.
+  - [QTBUG-6522] Fixed missing menu separator in some GTK+ themes.
+
 Qt for Windows
 --------------
 
- -
-
 Qt for Mac OS X
 ---------------
 
+ - [QTBUG-7832]: Restored missing margins around non-unified toolbars.
  - [QTBUG-7312]: Menubar and dock disappear after hiding a fullscreen widget on Cocoa.
  - [QTBUG-7522]: Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.
  - [QTBUG-7625]: Calling showFullScreen() then showNormal() on a widget results in top menu hiding.
-
+ - [QTBUG-7086]: QFileDialog now correctly responds to fileMode & acceptMode changes.
+ - [QTBUG-7162]: Fixed a crash in Designer when previewing a QMainWindow with native toolbar.
+ - [QTBUG-7305]: Fixed a crash when deleting QMainWindow with native toolbar on Cocoa.
+ - [QTBUG-6882]: Fixed a text layout issue with QHeaderView in right-to-left mode.
 
 Qt for Embedded Linux
 ---------------------
@@ -204,5 +264,12 @@ Qt for Symbian
 * Important Behavior Changes *
 ****************************************************************************
 
- -
+ - QNetworkAccessManager cache
+    * QNetworkAccessManager will no longer return expired pages, as
+      stated in the documentation
+    * The behaviour of PreferCache and PreferNetwork modes now match
+      the documentation more closely
 
+ - QUrl
+    * QUrl will now accept hostnames ending in dot and will not treat
+      those as invalid hostnames
diff --git a/doc/src/images/qpainter-text.png b/doc/src/images/qpainter-text.png
index af7821c9d4..e95c965d7b 100644
--- a/doc/src/images/qpainter-text.png
+++ b/doc/src/images/qpainter-text.png
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 69e1d8aac7..db2737bd5f 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1513,6 +1513,19 @@ MakefileGenerator::replaceExtraCompilerVariables(const QString &orig_var, const
                         base = fi.fileName();
                     val += base;
                 }
+            } else if(var == QLatin1String("QMAKE_FILE_EXT")) {
+                filePath = true;
+                for(int i = 0; i < in.size(); ++i) {
+                    QFileInfo fi(fileInfo(Option::fixPathToLocalOS(in.at(i))));
+                    QString ext;
+                    // Ensure complementarity with QMAKE_FILE_BASE
+                    int baseLen = fi.completeBaseName().length();
+                    if(baseLen == 0)
+                        ext = fi.fileName();
+                    else
+                        ext = fi.fileName().remove(0, baseLen);
+                    val += ext;
+                }
             } else if(var == QLatin1String("QMAKE_FILE_PATH") || var == QLatin1String("QMAKE_FILE_IN_PATH")) {
                 filePath = true;
                 for(int i = 0; i < in.size(); ++i)
diff --git a/src/3rdparty/phonon/mmf/environmentalreverb.cpp b/src/3rdparty/phonon/mmf/environmentalreverb.cpp
index 4a6ce2947e..d4f522314f 100644
--- a/src/3rdparty/phonon/mmf/environmentalreverb.cpp
+++ b/src/3rdparty/phonon/mmf/environmentalreverb.cpp
@@ -139,77 +139,68 @@ bool EnvironmentalReverb::getParameters(CMdaAudioOutputStream *stream,
         TInt32 min, max;
         TUint32 umin, umax;
 
-        // DecayHFRatio
-	// Ratio of high-frequency decay time to the value specified by
-	// DecayTime.
         effect->DecayHFRatioRange(umin, umax);
+        //: DecayHFRatio: Ratio of high-frequency decay time to the value specified by
+        //: DecayTime.
         parameters.append(createParameter(
             DecayHFRatio, tr("Decay HF ratio (%)"), effect->DecayHFRatio(),
             umin, umax));
 
-        // DecayTime
-	// Time over which reverberation is diminished.
         effect->DecayTimeRange(umin, umax);
+        //: DecayTime: Time over which reverberation is diminished.
         parameters.append(createParameter(
             DecayTime, tr("Decay time (ms)"), effect->DecayTime(),
             umin, umax));
 
-        // Density
-	// Delay between first and subsequent reflections.
-	// Note that the S60 platform documentation does not make clear
-	// the distinction between this value and the Diffusion value.
+        //: Density Delay between first and subsequent reflections.
+        //: Note that the S60 platform documentation does not make clear
+        //: the distinction between this value and the Diffusion value.
         parameters.append(createParameter(
             Density, tr("Density (%)"), effect->Density(), 0, 100));
 
-        // Diffusion
-	// Delay between first and subsequent reflections.
-	// Note that the S60 platform documentation does not make clear
-	// the distinction between this value and the Density value.
+        //: Diffusion: Delay between first and subsequent reflections.
+        //: Note that the S60 platform documentation does not make clear
+        //: the distinction between this value and the Density value.
         parameters.append(createParameter(
             Diffusion, tr("Diffusion (%)"), effect->Diffusion(), 0, 100));
 
-        // ReflectionsDelay
-	// Amount of delay between the arrival the direct path from the
-	// source and the arrival of the first reflection.
+        //: ReflectionsDelay: Amount of delay between the arrival the direct
+        //: path from the source and the arrival of the first reflection.
         parameters.append(createParameter(
             ReflectionsDelay, tr("Reflections delay (ms)"),
             effect->ReflectionsDelay(), 0, effect->ReflectionsDelayMax()));
 
-        // ReflectionsLevel
-	// Amplitude of reflections.  This value is corrected by the RoomLevel
-        // to give the final reflection amplitude.
-	effect->ReflectionLevelRange(min, max);
+        effect->ReflectionLevelRange(min, max);
+        //: ReflectionsLevel: Amplitude of reflections. This value is
+        //: corrected by the RoomLevel to give the final reflection amplitude.
         parameters.append(createParameter(
             ReflectionsLevel, tr("Reflections level (mB)"),
             effect->ReflectionsLevel(),
             min, max, EffectParameter::LogarithmicHint));
 
-        // ReverbDelay
-	// Amount of time between arrival of the first reflection and start of
-	// the late reverberation.
+        //: ReverbDelay: Amount of time between arrival of the first
+        //: reflection and start of the late reverberation.
         parameters.append(createParameter(
             ReverbDelay, tr("Reverb delay (ms)"), effect->ReverbDelay(),
             0, effect->ReverbDelayMax()));
 
-        // ReverbLevel
-	// Amplitude of reverberations.  This value is corrected by the
-	// RoomLevel to give the final reverberation amplitude.
         effect->ReverbLevelRange(min, max);
+        //: ReverbLevel Amplitude of reverberations.  This value is
+        //: corrected by the RoomLevel to give the final reverberation
+        //: amplitude.
         parameters.append(createParameter(
             ReverbLevel, tr("Reverb level (mB)"), effect->ReverbLevel(),
             min, max, EffectParameter::LogarithmicHint));
 
-        // RoomHFLevel
-	// Amplitude of low-pass filter used to attenuate the high frequency
-	// component of reflected sound.
         effect->RoomHFLevelRange(min, max);
+        //: RoomHFLevel: Amplitude of low-pass filter used to attenuate the
+        //: high frequency component of reflected sound.
         parameters.append(createParameter(
             RoomHFLevel, tr("Room HF level"), effect->RoomHFLevel(),
             min, max));
 
-        // RoomLevel
-	// Master volume control for all reflected sound.
         effect->RoomLevelRange(min, max);
+        //: RoomLevel: Master volume control for all reflected sound.
         parameters.append(createParameter(
             RoomLevel, tr("Room level (mB)"), effect->RoomLevel(),
             min, max, EffectParameter::LogarithmicHint));
diff --git a/src/gui/kernel/qcocoapanel_mac.mm b/src/gui/kernel/qcocoapanel_mac.mm
index e535aac920..5e24c84ac6 100644
--- a/src/gui/kernel/qcocoapanel_mac.mm
+++ b/src/gui/kernel/qcocoapanel_mac.mm
@@ -46,6 +46,9 @@
 #import <private/qcocoawindowdelegate_mac_p.h>
 #import <private/qcocoaview_mac_p.h>
 #import <private/qcocoawindowcustomthemeframe_mac_p.h>
+#include <private/qapplication_p.h>
+#include <private/qbackingstore_p.h>
+
 
 #include <QtGui/QWidget>
 
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
index 1a265d029a..d2b74d7420 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
@@ -51,6 +51,9 @@
  NSPanel, while QCocoaWindow needs to inherit NSWindow rather than NSPanel).
 ****************************************************************************/
 
+// WARNING: Don't include any header files from within this file. Put them
+// directly into qcocoawindow_mac_p.h and qcocoapanel_mac_p.h
+
 QT_BEGIN_NAMESPACE
 extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm
 extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
@@ -185,3 +188,20 @@ QT_END_NAMESPACE
     return [super frameViewClassForStyleMask:styleMask];
 }
 
+- (void)displayIfNeeded
+{
+
+    QWidget *qwidget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self];
+    if (qwidget == 0) {
+        [super displayIfNeeded];
+        return;
+    }
+
+    if (QApplicationPrivate::graphicsSystem() != 0) {
+        if (QWidgetBackingStore *bs = qt_widget_private(qwidget)->maybeBackingStore())
+            bs->sync(qwidget, qwidget->rect());
+    }
+    [super displayIfNeeded];
+}
+
+
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index d255604f18..2c35be2135 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -520,10 +520,11 @@ extern "C" {
 - (void)drawRect:(NSRect)aRect
 {
     if (QApplicationPrivate::graphicsSystem() != 0) {
-        if (QWidgetBackingStore *bs = qwidgetprivate->maybeBackingStore())
-            bs->markDirty(qwidget->rect(), qwidget);
-        qwidgetprivate->syncBackingStore(qwidget->rect());
-        return;
+        if (QWidgetBackingStore *bs = qwidgetprivate->maybeBackingStore()) {
+            // Drawing is handled on the window level
+            // See qcocoasharedwindowmethods_mac_p.
+            return;
+        }
     }
     CGContextRef cg = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
     qwidgetprivate->hd = cg;
diff --git a/src/gui/kernel/qcocoawindow_mac_p.h b/src/gui/kernel/qcocoawindow_mac_p.h
index c0d8252664..04748822ce 100644
--- a/src/gui/kernel/qcocoawindow_mac_p.h
+++ b/src/gui/kernel/qcocoawindow_mac_p.h
@@ -53,6 +53,9 @@
 #ifdef QT_MAC_USE_COCOA
 #include "qmacdefines_mac.h"
 #import <Cocoa/Cocoa.h>
+#include <private/qapplication_p.h>
+#include <private/qbackingstore_p.h>
+
 
 enum { QtMacCustomizeWindow = 1 << 21 }; // This will one day be run over by
 
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index e06a810d7f..65c04e5a47 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -1162,7 +1162,7 @@ CGContextRef qt_mac_graphicsContextFor(QWidget *widget)
     CGrafPtr port = GetWindowPort(qt_mac_window_for(widget));
     QDBeginCGContext(port, &context);
 #else
-    CGContextRef context = (CGContextRef)[[NSGraphicsContext graphicsContextWithWindow:qt_mac_window_for(widget)] graphicsPort];
+    CGContextRef context = reinterpret_cast<CGContextRef>([[qt_mac_window_for(widget) graphicsContext] graphicsPort]);
 #endif
     return context;
 }
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index ffad38b894..78a25acf45 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1660,7 +1660,13 @@ void QWidgetPrivate::syncBackingStore()
         repaint_sys(dirty);
         dirty = QRegion();
     } else if (QWidgetBackingStore *bs = maybeBackingStore()) {
+#ifdef QT_MAC_USE_COCOA
+        Q_UNUSED(bs);
+        void qt_mac_set_needs_display(QWidget *, QRegion);
+        qt_mac_set_needs_display(q_func(), QRegion());
+#else
         bs->sync();
+#endif
     }
 }
 
@@ -1668,8 +1674,15 @@ void QWidgetPrivate::syncBackingStore(const QRegion &region)
 {
     if (paintOnScreen())
         repaint_sys(region);
-    else if (QWidgetBackingStore *bs = maybeBackingStore())
+    else if (QWidgetBackingStore *bs = maybeBackingStore()) {
+#ifdef QT_MAC_USE_COCOA
+        Q_UNUSED(bs);
+        void qt_mac_set_needs_display(QWidget *, QRegion);
+        qt_mac_set_needs_display(q_func(), region);
+#else
         bs->sync(q_func(), region);
+#endif
+    }
 }
 
 void QWidgetPrivate::setUpdatesEnabled_helper(bool enable)
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 78c1562868..b5888b4107 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -565,6 +565,25 @@ inline static void qt_mac_set_window_group_to_popup(OSWindowRef window)
 }
 #endif
 
+#ifdef QT_MAC_USE_COCOA
+void qt_mac_set_needs_display(QWidget *widget, QRegion region)
+{
+    NSView *theNSView = qt_mac_nativeview_for(widget);
+    if (region.isNull()) {
+        [theNSView setNeedsDisplay:YES];
+        return;
+    }
+
+    QVector<QRect> rects = region.rects();
+    for (int i = 0; i<rects.count(); ++i) {
+        const QRect &rect = rects.at(i);
+        NSRect nsrect = NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height());
+        [theNSView setNeedsDisplayInRect:nsrect];
+    }
+
+}
+#endif
+
 inline static bool updateRedirectedToGraphicsProxyWidget(QWidget *widget, const QRect &rect)
 {
     if (!widget)
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index a0d2b9bd3a..eee6befe87 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -295,10 +295,8 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
     CGContextRestoreGState(context);
 #ifndef QT_MAC_USE_COCOA
     QDEndCGContext(port, &context);
-#else
-    CGContextFlush(context);
-#endif
 #endif
+#endif // Q_WS_MAC
 
 #ifdef Q_OS_SYMBIAN
     Q_UNUSED(widget);
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index aab16cb10d..78074c798f 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -3380,8 +3380,14 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
                         if (tb->toolButtonStyle != Qt::ToolButtonIconOnly) {
                             needText = true;
                             if (tb->toolButtonStyle == Qt::ToolButtonTextUnderIcon) {
-                                pr.setHeight(pixmap.size().height());
-                                cr.adjust(0, pr.bottom() + 1, 0, 1);
+                                QMainWindow *mw = qobject_cast<QMainWindow *>(w->window());
+                                if (mw && mw->unifiedTitleAndToolBarOnMac()) {
+                                    pr.setHeight(pixmap.size().height());
+                                    cr.adjust(0, pr.bottom() + 1, 0, 1);
+                                } else {
+                                    pr.setHeight(pixmap.size().height() + 6);
+                                    cr.adjust(0, pr.bottom(), 0, -3);
+                                }       
                                 alignment |= Qt::AlignCenter;
                             } else {
                                 pr.setWidth(pixmap.width() + 8);
diff --git a/src/gui/widgets/qtoolbar.cpp b/src/gui/widgets/qtoolbar.cpp
index 53050ac1f0..8beda554b1 100644
--- a/src/gui/widgets/qtoolbar.cpp
+++ b/src/gui/widgets/qtoolbar.cpp
@@ -441,8 +441,7 @@ void QToolBarPrivate::plug(const QRect &r)
     When a QToolBar is not a child of a QMainWindow, it looses the ability
     to populate the extension pop up with widgets added to the toolbar using
     addWidget(). Please use widget actions created by inheriting QWidgetAction
-    and implementing QWidgetAction::createWidget() instead. This is a known
-    issue which will be fixed in a future release.
+    and implementing QWidgetAction::createWidget() instead.
 
     \sa QToolButton, QMenu, QAction, {Application Example}
 */
diff --git a/translations/designer_de.ts b/translations/designer_de.ts
index b731595cf2..8c1ba68335 100644
--- a/translations/designer_de.ts
+++ b/translations/designer_de.ts
@@ -517,12 +517,12 @@
     </message>
     <message>
         <location line="+89"/>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="+907"/>
+        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="+915"/>
         <source>Move action</source>
         <translation>Aktion verschieben</translation>
     </message>
     <message>
-        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-424"/>
+        <location filename="../tools/designer/src/lib/shared/qdesigner_menubar.cpp" line="-432"/>
         <source>Change Title</source>
         <translation>Titel ändern</translation>
     </message>
@@ -1027,7 +1027,7 @@
 <context>
     <name>FormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="+359"/>
+        <location filename="../tools/designer/src/lib/uilib/formbuilderextra.cpp" line="+375"/>
         <source>Invalid stretch value for &apos;%1&apos;: &apos;%2&apos;</source>
         <extracomment>Parsing layout stretch values</extracomment>
         <translation>Ungültiger Stretch-Wert für &apos;%1&apos;: &apos;%2&apos;</translation>
@@ -1412,7 +1412,7 @@
         <translation>Fehler beim Lesen der ui-Datei: Das Wurzelelement &lt;ui&gt; fehlt.</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+104"/>
         <source>The creation of a widget of the class &apos;%1&apos; failed.</source>
         <translation>Es konnte kein Widget der Klasse &apos;%1&apos; erzeugt werden.</translation>
     </message>
@@ -2273,7 +2273,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier
 <context>
     <name>QFormBuilder</name>
     <message>
-        <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="+163"/>
+        <location filename="../tools/designer/src/lib/uilib/formbuilder.cpp" line="+168"/>
         <source>An empty class name was passed on to %1 (object name: &apos;%2&apos;).</source>
         <extracomment>Empty class name passed to widget factory method</extracomment>
         <translation>Der Methode %1 wurde ein leerer Klassennamen übergeben (Name &apos;%2&apos;).</translation>
@@ -2313,6 +2313,16 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier
         <source>The property %1 could not be written. The type %2 is not supported yet.</source>
         <translation>Die Eigenschaft %1 konnte nicht geschrieben werden, da der Typ %2 nicht unterstützt wird.</translation>
     </message>
+    <message>
+        <location filename="../tools/designer/src/lib/uilib/properties_p.h" line="+132"/>
+        <source>The enumeration-value &apos;%1&apos; is invalid. The default value &apos;%2&apos; will be used instead.</source>
+        <translation>Der Aufzählungswert &apos;%1&apos; ist ungültig. Es wird der Vorgabewert &apos;%2&apos; verwendet.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>The flag-value &apos;%1&apos; is invalid. Zero will be used instead.</source>
+        <translation>Der Flag-Wert &apos;%1&apos; ist ungültig. Es wird der Wert 0 verwendet.</translation>
+    </message>
 </context>
 <context>
     <name>QStackedWidgetEventFilter</name>
@@ -2446,7 +2456,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier
 <context>
     <name>QtBoolEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+226"/>
+        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+247"/>
         <location line="+10"/>
         <location line="+25"/>
         <source>True</source>
@@ -2475,7 +2485,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier
 <context>
     <name>QtCharEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="+1581"/>
+        <location filename="../tools/shared/qtpropertybrowser/qteditorfactory.cpp" line="+1584"/>
         <source>Clear Char</source>
         <translation>Zeichen löschen</translation>
     </message>
@@ -2491,7 +2501,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier
 <context>
     <name>QtColorPropertyManager</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+4743"/>
+        <location filename="../tools/shared/qtpropertybrowser/qtpropertymanager.cpp" line="+4750"/>
         <source>Red</source>
         <translation>Rot</translation>
     </message>
@@ -2514,7 +2524,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier
 <context>
     <name>QtCursorDatabase</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-206"/>
+        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-226"/>
         <source>Arrow</source>
         <translation>Pfeil</translation>
     </message>
@@ -3062,6 +3072,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier
     <name>QtGradientViewDialog</name>
     <message>
         <location filename="../tools/shared/qtgradienteditor/qtgradientviewdialog.ui"/>
+        <location filename="../tools/shared/qtgradienteditor/qtgradientviewdialog.h" line="+62"/>
         <source>Select Gradient</source>
         <translation>Gradienten auswählen</translation>
     </message>
@@ -3069,7 +3080,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier
 <context>
     <name>QtKeySequenceEdit</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+221"/>
+        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="+241"/>
         <source>Clear Shortcut</source>
         <translation>Tastenkürzel löschen</translation>
     </message>
@@ -3131,7 +3142,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier
 <context>
     <name>QtPropertyBrowserUtils</name>
     <message>
-        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-136"/>
+        <location filename="../tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp" line="-156"/>
         <source>[%1, %2, %3] (%4)</source>
         <translation>[%1, %2, %3] (%4)</translation>
     </message>
@@ -3904,7 +3915,7 @@ Möchten Sie sie überschreiben?</translation>
 <context>
     <name>VersionDialog</name>
     <message>
-        <location filename="../tools/designer/src/designer/versiondialog.cpp" line="+171"/>
+        <location filename="../tools/designer/src/designer/versiondialog.cpp" line="+170"/>
         <source>&lt;h3&gt;%1&lt;/h3&gt;&lt;br/&gt;&lt;br/&gt;Version %2</source>
         <translation>&lt;h3&gt;%1&lt;/h3&gt;&lt;br/&gt;&lt;br/&gt;Version %2</translation>
     </message>
@@ -4742,7 +4753,7 @@ Möchten Sie sie überschreiben?</translation>
         <translation>Fehler beim Einfügen</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+450"/>
         <source>Lay out</source>
         <translation>Layout</translation>
     </message>
@@ -4753,7 +4764,7 @@ Möchten Sie sie überschreiben?</translation>
         <translation>Widget einfügen</translation>
     </message>
     <message numerus="yes">
-        <location line="-1058"/>
+        <location line="-1063"/>
         <source>Paste %n action(s)</source>
         <translation>
             <numerusform>Eine Aktion einfügen</numerusform>
@@ -4794,12 +4805,12 @@ Möchten Sie sie überschreiben?</translation>
         <translation>Übergeordnetes Widget auswählen</translation>
     </message>
     <message>
-        <location line="+576"/>
+        <location line="+581"/>
         <source>A QMainWindow-based form does not contain a central widget.</source>
         <translation>Ein auf QMainWindow basierendes Formular enthält kein zentrales Widget.</translation>
     </message>
     <message>
-        <location line="-797"/>
+        <location line="-802"/>
         <source>Raise widgets</source>
         <translation>Widgets nach vorn bringen</translation>
     </message>
@@ -4825,7 +4836,7 @@ Möchten Sie sie überschreiben?</translation>
 <context>
     <name>qdesigner_internal::FormWindowManager</name>
     <message>
-        <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="+364"/>
+        <location filename="../tools/designer/src/components/formeditor/formwindowmanager.cpp" line="+365"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
diff --git a/translations/qt_de.ts b/translations/qt_de.ts
index d9167332a3..8cbf402335 100644
--- a/translations/qt_de.ts
+++ b/translations/qt_de.ts
@@ -4,7 +4,7 @@
 <context>
     <name>CloseButton</name>
     <message>
-        <location filename="../src/gui/widgets/qtabbar.cpp" line="+2262"/>
+        <location filename="../src/gui/widgets/qtabbar.cpp" line="+2264"/>
         <source>Close Tab</source>
         <translation>Schließen</translation>
     </message>
@@ -12,7 +12,7 @@
 <context>
     <name>FakeReply</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp" line="+2198"/>
+        <location filename="../src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp" line="+2200"/>
         <source>Fake error !</source>
         <translation>Fake error !</translation>
     </message>
@@ -143,7 +143,7 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass
 <context>
     <name>Phonon::MMF</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audiooutput.cpp" line="+108"/>
+        <location filename="../src/3rdparty/phonon/mmf/audiooutput.cpp" line="+103"/>
         <source>Audio Output</source>
         <translation>Audio-Ausgabe</translation>
     </message>
@@ -152,60 +152,333 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass
         <source>The audio output device</source>
         <translation>Audio-Ausgabegerät</translation>
     </message>
-</context>
-<context>
-    <name>Phonon::MMF::AudioEqualizer</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/audioequalizer.cpp" line="+75"/>
-        <source>Frequency band, %1 Hz</source>
-        <translation>Frequenzband, %1 Hz</translation>
+        <location filename="../src/3rdparty/phonon/mmf/utils.cpp" line="+87"/>
+        <source>No error</source>
+        <translation>Kein Fehler</translation>
     </message>
-</context>
-<context>
-    <name>Phonon::MMF::EffectFactory</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/effectfactory.cpp" line="+65"/>
-        <source>Audio Equalizer</source>
-        <translation>Audio-Equalizer</translation>
+        <location line="+2"/>
+        <source>Not found</source>
+        <translation>Nicht gefunden</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Bass Boost</source>
-        <translation>Bass-Boost</translation>
+        <source>Out of memory</source>
+        <translation>Es ist kein Speicher mehr verfügbar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Not supported</source>
+        <translation>Nicht unterstützt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Overflow</source>
+        <translation>Überlauf</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Underflow</source>
+        <translation>Unterlauf</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Already exists</source>
+        <translation>Existiert bereits</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Path not found</source>
+        <translation>Pfad konnte nicht gefunden werden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>In use</source>
+        <translation>Bereits in Verwendung</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Not ready</source>
+        <translation>Nicht bereit</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Access denied</source>
+        <translation>Zugriff verweigert</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Could not connect</source>
+        <translation>Es konnte keine Verbindung hergestellt werden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Disconnected</source>
+        <translation>Getrennt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Permission denied</source>
+        <translation>Zugriff verweigert</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Insufficient bandwidth</source>
+        <translation>Unzureichende Bandweite</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Network unavailable</source>
+        <translation>Netzwerk nicht verfügbar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Network communication error</source>
+        <translation>Fehler bei der Kommunikation über das Netzwerk</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Distance Attenuation</source>
-        <translation>Abschwächung in Abhängigkeit von der Entfernung</translation>
+        <source>Streaming not supported</source>
+        <translation>Streaming nicht unterstützt</translation>
     </message>
     <message>
         <location line="+2"/>
+        <source>Server alert</source>
+        <translation>Server alert</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Invalid protocol</source>
+        <translation>Ungültiges Protokoll</translation>
+    </message>
+    <message>
         <location line="+2"/>
-        <source>Environmental Reverb</source>
-        <translation>Hall-Effekt der Umgebung</translation>
+        <source>Invalid URL</source>
+        <translation>Ungültige URL</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Loudness</source>
-        <translation>Lautstärke</translation>
+        <source>Multicast error</source>
+        <translation>Multicast-Fehler</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Proxy server error</source>
+        <translation>Fehler bei Proxy-Server-Kommunikation</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Source Orientation</source>
-        <translation>Ausrichtung der Quelle</translation>
+        <source>Proxy server not supported</source>
+        <translation>Proxy-Server nicht unterstützt</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Stereo Widening</source>
-        <translation>Stereo-Basisverbreiterung</translation>
+        <source>Audio output error</source>
+        <translation>Fehler bei Audio-Ausgabe</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Video output error</source>
+        <translation>Fehler bei Video-Ausgabe</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Decoder error</source>
+        <translation>Fehler im Decoder</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Audio or video components could not be played</source>
+        <translation>Audio- oder Videokomponenten konnten nicht abgespielt werden</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DRM error</source>
+        <translation>DRM-Fehler</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Unknown error (%1)</source>
+        <translation>Unbekannter Fehler (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::AbstractMediaPlayer</name>
+    <message>
+        <location filename="../src/3rdparty/phonon/mmf/abstractmediaplayer.cpp" line="+73"/>
+        <source>Not ready to play</source>
+        <translation>Das Abspielen ist im Grundzustand nicht möglich</translation>
+    </message>
+    <message>
+        <location line="+161"/>
+        <location line="+10"/>
+        <source>Error opening file</source>
+        <translation>Die Datei konnte nicht geöffnet werden</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Error opening URL</source>
+        <translation>Der URL konnte nicht geöffnet werden</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Setting volume failed</source>
+        <translation>Die Lautstärke konnte nicht eingestellt werden</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Playback complete</source>
+        <translation>Abspielen beendet</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::AudioEqualizer</name>
+    <message>
+        <location filename="../src/3rdparty/phonon/mmf/audioequalizer.cpp" line="+92"/>
+        <source>%1 Hz</source>
+        <translation>%1 Hz</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::AudioPlayer</name>
+    <message>
+        <location filename="../src/3rdparty/phonon/mmf/audioplayer.cpp" line="+173"/>
+        <source>Getting position failed</source>
+        <translation>Die Position konnte nicht bestimmt werden</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Opening clip failed</source>
+        <translation>Der Clip konnte nicht geöffnet werden</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::EffectFactory</name>
+    <message>
+        <location filename="../src/3rdparty/phonon/mmf/effectfactory.cpp" line="+181"/>
+        <source>Enabled</source>
+        <translation>Aktiviert</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::EnvironmentalReverb</name>
+    <message>
+        <location filename="../src/3rdparty/phonon/mmf/environmentalreverb.cpp" line="+146"/>
+        <source>Decay HF ratio (%)</source>
+        <extracomment>DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime.</extracomment>
+        <translation>Hochfrequenz-Abklingverhältnis (%)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Decay time (ms)</source>
+        <translation>Abklingzeit (ms)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Density (%)</source>
+        <extracomment>Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value.</extracomment>
+        <translation>Dichte (%)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Diffusion (%)</source>
+        <extracomment>Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value.</extracomment>
+        <translation>Diffusion (%)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Reflections delay (ms)</source>
+        <extracomment>ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection.</extracomment>
+        <translation>Verzögerung des Echos (ms)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Reflections level (mB)</source>
+        <extracomment>ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude.</extracomment>
+        <translation>Stärke des Echos (mB)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Reverb delay (ms)</source>
+        <extracomment>ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation.</extracomment>
+        <translation>Verzögerung des Nachhalls (ms)</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Reverb level (mB)</source>
+        <extracomment>ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude.</extracomment>
+        <translation>Stärke des Nachhalls (mB)</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Room HF level</source>
+        <extracomment>RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound.</extracomment>
+        <translation>Hochfrequenz-Pegel des Raums</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Room level (mB)</source>
+        <extracomment>RoomLevel: Master volume control for all reflected sound.</extracomment>
+        <translation>Pegel des Raums (mB)</translation>
     </message>
 </context>
 <context>
     <name>Phonon::MMF::MediaObject</name>
     <message>
-        <location filename="../src/3rdparty/phonon/mmf/mediaobject.cpp" line="+291"/>
-        <source>Media type could not be determined</source>
-        <translation>Der Typ des Mediums konnte nicht bestimmt werden</translation>
+        <location filename="../src/3rdparty/phonon/mmf/mediaobject.cpp" line="+270"/>
+        <source>Error opening source: type not supported</source>
+        <translation>Die Quelle konnte nicht geöffnet werden: Dieser Typ wird nicht unterstützt</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Error opening source: media type could not be determined</source>
+        <translation>Die Quelle konnte nicht geöffnet werden: Der Medientyp konnte nicht bestimmt werden</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::StereoWidening</name>
+    <message>
+        <location filename="../src/3rdparty/phonon/mmf/stereowidening.cpp" line="+79"/>
+        <source>Level (%)</source>
+        <translation>Stärke (%)</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::VideoPlayer</name>
+    <message>
+        <location filename="../src/3rdparty/phonon/mmf/mmf_videoplayer.cpp" line="+125"/>
+        <source>Pause failed</source>
+        <translation>Fehler bei Pause-Funktion</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Seek failed</source>
+        <translation>Suchoperation fehlgeschlagen</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <source>Getting position failed</source>
+        <translation>Die Position konnte nicht bestimmt werden</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Opening clip failed</source>
+        <translation>Der Clip konnte nicht geöffnet werden</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Buffering clip failed</source>
+        <translation>Fehler beim Puffern des Clips</translation>
+    </message>
+    <message>
+        <location line="+174"/>
+        <location line="+12"/>
+        <location line="+176"/>
+        <location line="+15"/>
+        <location line="+6"/>
+        <source>Video display error</source>
+        <translation>Fehler bei der Video-Anzeige</translation>
     </message>
 </context>
 <context>
@@ -275,7 +548,7 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass
 <context>
     <name>Q3FileDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+829"/>
+        <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+827"/>
         <source>Copy or Move a File</source>
         <translation>Datei kopieren oder verschieben</translation>
     </message>
@@ -300,7 +573,7 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass
         <location line="-157"/>
         <location line="+49"/>
         <location line="+2149"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_mac.cpp" line="+112"/>
+        <location filename="../src/qt3support/dialogs/q3filedialog_mac.cpp" line="+133"/>
         <source>All Files (*)</source>
         <translation>Alle Dateien (*)</translation>
     </message>
@@ -912,8 +1185,8 @@ nach
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+899"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+643"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+903"/>
+        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+629"/>
         <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+661"/>
         <location line="+26"/>
         <source>Host not found</source>
@@ -932,19 +1205,20 @@ nach
         <translation>Das Zeitlimit für die Verbindung wurde überschritten</translation>
     </message>
     <message>
-        <location line="-555"/>
-        <location line="+805"/>
+        <location line="-559"/>
+        <location line="+809"/>
         <location line="+208"/>
         <source>Operation on socket is not supported</source>
         <translation>Diese Socket-Operation wird nicht unterstützt</translation>
     </message>
     <message>
-        <location line="+200"/>
+        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+585"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+200"/>
         <source>Socket operation timed out</source>
         <translation>Das Zeitlimit für die Operation wurde überschritten</translation>
     </message>
     <message>
-        <location line="+380"/>
+        <location filename="../src/network/socket/qabstractsocket.cpp" line="+380"/>
         <source>Socket is not connected</source>
         <translation>Nicht verbunden</translation>
     </message>
@@ -957,7 +1231,7 @@ nach
 <context>
     <name>QAbstractSpinBox</name>
     <message>
-        <location filename="../src/gui/widgets/qabstractspinbox.cpp" line="+1217"/>
+        <location filename="../src/gui/widgets/qabstractspinbox.cpp" line="+1260"/>
         <source>&amp;Step up</source>
         <translation>&amp;Inkrementieren</translation>
     </message>
@@ -983,7 +1257,7 @@ nach
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/gui/kernel/qapplication.cpp" line="+2279"/>
+        <location filename="../src/gui/kernel/qapplication.cpp" line="+2287"/>
         <source>QT_LAYOUT_DIRECTION</source>
         <comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
         <translation>LTR</translation>
@@ -1053,7 +1327,7 @@ nach
 <context>
     <name>QColorDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qcolordialog.cpp" line="+1349"/>
+        <location filename="../src/gui/dialogs/qcolordialog.cpp" line="+1356"/>
         <source>Hu&amp;e:</source>
         <translation>Farb&amp;ton:</translation>
     </message>
@@ -1093,7 +1367,7 @@ nach
         <translation>Farbauswahl</translation>
     </message>
     <message>
-        <location line="+180"/>
+        <location line="+184"/>
         <source>&amp;Basic colors</source>
         <translation>Grundfar&amp;ben</translation>
     </message>
@@ -1180,7 +1454,7 @@ nach
 <context>
     <name>QDB2Driver</name>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+1254"/>
+        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+1253"/>
         <source>Unable to connect</source>
         <translation>Es kann keine Verbindung aufgebaut werden</translation>
     </message>
@@ -1203,7 +1477,7 @@ nach
 <context>
     <name>QDB2Result</name>
     <message>
-        <location line="-1031"/>
+        <location line="-1030"/>
         <location line="+240"/>
         <source>Unable to execute statement</source>
         <translation>Der Befehl kann nicht ausgeführt werden</translation>
@@ -1278,7 +1552,7 @@ nach
 <context>
     <name>QDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qdialog.cpp" line="+636"/>
+        <location filename="../src/gui/dialogs/qdialog.cpp" line="+652"/>
         <source>What&apos;s This?</source>
         <translation>Direkthilfe</translation>
     </message>
@@ -1291,9 +1565,9 @@ nach
 <context>
     <name>QDialogButtonBox</name>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1872"/>
+        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1876"/>
         <location line="+464"/>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+622"/>
+        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+650"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -1505,7 +1779,7 @@ nach
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/corelib/io/qfile.cpp" line="+697"/>
+        <location filename="../src/corelib/io/qfile.cpp" line="+698"/>
         <location line="+155"/>
         <source>Destination file exists</source>
         <translation>Die Zieldatei existiert bereits</translation>
@@ -1545,7 +1819,7 @@ nach
     <name>QFileDialog</name>
     <message>
         <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+558"/>
-        <location line="+450"/>
+        <location line="+471"/>
         <source>All Files (*)</source>
         <translation>Alle Dateien (*)</translation>
     </message>
@@ -1568,13 +1842,13 @@ nach
         <translation>Details</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qfileiconprovider.cpp" line="+464"/>
+        <location filename="../src/gui/itemviews/qfileiconprovider.cpp" line="+465"/>
         <location line="+1"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-467"/>
+        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-488"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
@@ -1584,25 +1858,25 @@ nach
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location line="+689"/>
-        <location line="+50"/>
-        <location line="+1528"/>
+        <location line="+699"/>
+        <location line="+55"/>
+        <location line="+1532"/>
         <source>&amp;Open</source>
         <translation>&amp;Öffnen</translation>
     </message>
     <message>
-        <location line="-1578"/>
-        <location line="+50"/>
+        <location line="-1587"/>
+        <location line="+55"/>
         <source>&amp;Save</source>
         <translation>S&amp;peichern</translation>
     </message>
     <message>
-        <location line="+1801"/>
+        <location line="+1805"/>
         <source>Recent Places</source>
         <translation>Zuletzt besucht</translation>
     </message>
     <message>
-        <location line="-2511"/>
+        <location line="-2530"/>
         <source>&amp;Rename</source>
         <translation>&amp;Umbenennen</translation>
     </message>
@@ -1617,17 +1891,17 @@ nach
         <translation>&amp;Versteckte Dateien anzeigen</translation>
     </message>
     <message>
-        <location line="+1957"/>
+        <location line="+1976"/>
         <source>New Folder</source>
         <translation>Neues Verzeichnis</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-2011"/>
         <source>Find Directory</source>
         <translation>Verzeichnis suchen</translation>
     </message>
     <message>
-        <location line="+696"/>
+        <location line="+706"/>
         <source>Directories</source>
         <translation>Verzeichnisse</translation>
     </message>
@@ -1637,13 +1911,13 @@ nach
         <translation>Alle Dateien (*.*)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-655"/>
-        <location line="+659"/>
+        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-665"/>
+        <location line="+669"/>
         <source>Directory:</source>
         <translation>Verzeichnis:</translation>
     </message>
     <message>
-        <location line="+810"/>
+        <location line="+819"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation>Die Datei %1 existiert bereits.
@@ -1737,7 +2011,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Unbekannt</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-2111"/>
+        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-2130"/>
         <source>Show </source>
         <translation>Anzeigen </translation>
     </message>
@@ -1753,8 +2027,8 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>&amp;Neues Verzeichnis</translation>
     </message>
     <message>
-        <location line="+667"/>
-        <location line="+38"/>
+        <location line="+677"/>
+        <location line="+43"/>
         <source>&amp;Choose</source>
         <translation>&amp;Auswählen</translation>
     </message>
@@ -1764,8 +2038,8 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-698"/>
-        <location line="+663"/>
+        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-713"/>
+        <location line="+673"/>
         <source>File &amp;name:</source>
         <translation>Datei&amp;name:</translation>
     </message>
@@ -2286,7 +2560,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QHostInfo</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_p.h" line="+185"/>
+        <location filename="../src/network/kernel/qhostinfo_p.h" line="+101"/>
         <source>Unknown error</source>
         <translation>Unbekannter Fehler</translation>
     </message>
@@ -2296,7 +2570,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
     <message>
         <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+257"/>
         <location line="+32"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="+220"/>
+        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="+216"/>
         <location line="+27"/>
         <source>Host not found</source>
         <translation>Rechner konnte nicht gefunden werden</translation>
@@ -2330,7 +2604,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QHttp</name>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+578"/>
+        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="-6"/>
         <location filename="../src/qt3support/network/q3http.cpp" line="+1835"/>
         <source>Connection refused</source>
         <translation>Verbindung verweigert</translation>
@@ -2350,8 +2624,6 @@ Möchten Sie die Datei trotzdem löschen?</translation>
     </message>
     <message>
         <location line="+82"/>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+10"/>
-        <location line="+19"/>
         <location filename="../src/qt3support/network/q3http.cpp" line="+48"/>
         <source>HTTP request failed</source>
         <translation>HTTP-Anfrage fehlgeschlagen</translation>
@@ -2382,7 +2654,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Verbindung mit %1 beendet</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="-22"/>
+        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+7"/>
         <location filename="../src/qt3support/network/q3http.cpp" line="+14"/>
         <source>Connection closed</source>
         <translation>Verbindung beendet</translation>
@@ -2647,7 +2919,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/corelib/global/qglobal.cpp" line="+2072"/>
+        <location filename="../src/corelib/global/qglobal.cpp" line="+2096"/>
         <source>Permission denied</source>
         <translation>Zugriff verweigert</translation>
     </message>
@@ -2667,7 +2939,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Kein freier Speicherplatz auf dem Gerät vorhanden</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qiodevice.cpp" line="+1561"/>
+        <location filename="../src/corelib/io/qiodevice.cpp" line="+1565"/>
         <source>Unknown error</source>
         <translation>Unbekannter Fehler</translation>
     </message>
@@ -2731,7 +3003,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Operation unmap fehlgeschlagen für &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location line="+344"/>
+        <location line="+345"/>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
         <translation>Das Plugin &apos;%1&apos; verwendet eine inkompatible Qt-Bibliothek. (%2.%3.%4) [%5]</translation>
     </message>
@@ -2783,12 +3055,12 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QLineEdit</name>
     <message>
-        <location filename="../src/gui/widgets/qlineedit.cpp" line="+2035"/>
+        <location filename="../src/gui/widgets/qlineedit.cpp" line="+2112"/>
         <source>Select All</source>
         <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="-40"/>
         <source>&amp;Undo</source>
         <translation>&amp;Rückgängig</translation>
     </message>
@@ -2798,22 +3070,22 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Wieder&amp;herstellen</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+9"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>&amp;Paste</source>
         <translation>Einf&amp;ügen</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
@@ -2916,7 +3188,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QMYSQLDriver</name>
     <message>
-        <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1261"/>
+        <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1270"/>
         <source>Unable to open database &apos;</source>
         <translation>Die Datenbankverbindung kann nicht geöffnet werden &apos;</translation>
     </message>
@@ -2926,7 +3198,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Es kann keine Verbindung aufgebaut werden</translation>
     </message>
     <message>
-        <location line="+151"/>
+        <location line="+150"/>
         <source>Unable to begin transaction</source>
         <translation>Es kann keine Transaktion gestartet werden</translation>
     </message>
@@ -2944,12 +3216,13 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QMYSQLResult</name>
     <message>
-        <location line="-969"/>
+        <location line="-977"/>
+        <location line="+31"/>
         <source>Unable to fetch data</source>
         <translation>Es konnten keine Daten abgeholt werden</translation>
     </message>
     <message>
-        <location line="+183"/>
+        <location line="+161"/>
         <source>Unable to execute query</source>
         <translation>Die Abfrage konnte nicht ausgeführt werden</translation>
     </message>
@@ -3127,7 +3400,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="../src/gui/widgets/qmenu_symbian.cpp" line="+410"/>
+        <location filename="../src/gui/widgets/qmenu_symbian.cpp" line="+436"/>
         <source>Actions</source>
         <translation>Optionen</translation>
     </message>
@@ -3163,7 +3436,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location line="-1099"/>
+        <location line="-1102"/>
         <source>Show Details...</source>
         <translation>Details einblenden...</translation>
     </message>
@@ -3346,13 +3619,13 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QNetworkAccessFileBackend</name>
     <message>
-        <location filename="../src/network/access/qfilenetworkreply.cpp" line="+83"/>
+        <location filename="../src/network/access/qfilenetworkreply.cpp" line="+85"/>
         <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+100"/>
         <source>Request for opening non-local file %1</source>
         <translation>Anforderung zum Öffnen einer Datei über Netzwerk %1</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+33"/>
         <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+45"/>
         <source>Error opening %1: %2</source>
         <translation>%1 konnte nicht geöffnet werden: %2</translation>
@@ -3363,7 +3636,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Fehler beim Schreiben zur Datei %1: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qfilenetworkreply.cpp" line="-11"/>
+        <location filename="../src/network/access/qfilenetworkreply.cpp" line="-13"/>
         <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+48"/>
         <source>Cannot open %1: Path is a directory</source>
         <translation>%1 kann nicht geöffnet werden: Der Pfad spezifiziert ein Verzeichnis</translation>
@@ -3405,7 +3678,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+585"/>
+        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+599"/>
         <source>No suitable proxy found</source>
         <translation>Es konnte kein geeigneter Proxy-Server gefunden werden</translation>
     </message>
@@ -3413,12 +3686,12 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location line="+95"/>
+        <location line="+101"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Beim Herunterladen von %1 trat ein Fehler auf - Die Antwort des Servers ist: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+77"/>
+        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+80"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Das Protokoll &quot;%1&quot; ist unbekannt</translation>
     </message>
@@ -3426,7 +3699,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QNetworkReplyImpl</name>
     <message>
-        <location line="+519"/>
+        <location line="+525"/>
         <location line="+28"/>
         <source>Operation canceled</source>
         <translation>Operation abgebrochen</translation>
@@ -3509,7 +3782,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QODBCDriver</name>
     <message>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1790"/>
+        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1806"/>
         <source>Unable to connect</source>
         <translation>Es kann keine Verbindung aufgebaut werden</translation>
     </message>
@@ -3542,14 +3815,14 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QODBCResult</name>
     <message>
-        <location line="-932"/>
-        <location line="+346"/>
+        <location line="-937"/>
+        <location line="+351"/>
         <source>QODBCResult::reset: Unable to set &apos;SQL_CURSOR_STATIC&apos; as statement attribute. Please check your ODBC driver configuration</source>
         <translation>QODBCResult::reset: &apos;SQL_CURSOR_STATIC&apos; konnte nicht als Attribut des Befehls gesetzt werden. Bitte prüfen Sie die Konfiguration Ihres ODBC-Treibers</translation>
     </message>
     <message>
-        <location line="-329"/>
-        <location line="+623"/>
+        <location line="-334"/>
+        <location line="+628"/>
         <source>Unable to execute statement</source>
         <translation>Der Befehl konnte nicht ausgeführt werden</translation>
     </message>
@@ -3569,7 +3842,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Die Variable konnte nicht gebunden werden</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+190"/>
+        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+189"/>
         <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-467"/>
         <location line="+576"/>
         <source>Unable to fetch last</source>
@@ -3619,7 +3892,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
         <translation>Der entfernte Rechner hat die Verbindung zu %1 vorzeitig beendet</translation>
     </message>
     <message>
-        <location filename="../src/network/kernel/qhostinfo.cpp" line="+175"/>
+        <location filename="../src/network/kernel/qhostinfo.cpp" line="+168"/>
         <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+0"/>
         <source>No host name given</source>
         <translation>Es wurde kein Hostname angegeben</translation>
@@ -3803,7 +4076,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+108"/>
+        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+110"/>
         <source>locally connected</source>
         <translation>direkt verbunden</translation>
     </message>
@@ -4232,12 +4505,12 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
 <context>
     <name>QPrintPreviewDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintpreviewdialog.cpp" line="+246"/>
+        <location filename="../src/gui/dialogs/qprintpreviewdialog.cpp" line="+249"/>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+71"/>
         <source>Print Preview</source>
         <translation>Druckvorschau</translation>
     </message>
@@ -4317,7 +4590,12 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>Seite einrichten</translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+6"/>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <location line="+148"/>
         <source>Export to PDF</source>
         <translation>PDF exportieren</translation>
     </message>
@@ -4530,7 +4808,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>Zeitüberschreitung</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qprocess.cpp" line="+855"/>
+        <location filename="../src/corelib/io/qprocess.cpp" line="+856"/>
         <location line="+52"/>
         <location filename="../src/corelib/io/qprocess_win.cpp" line="-211"/>
         <location line="+50"/>
@@ -4645,7 +4923,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
 <context>
     <name>QSQLite2Driver</name>
     <message>
-        <location filename="../src/sql/drivers/sqlite2/qsql_sqlite2.cpp" line="+391"/>
+        <location filename="../src/sql/drivers/sqlite2/qsql_sqlite2.cpp" line="+399"/>
         <source>Error opening database</source>
         <translation>Die Datenbankverbindung konnte nicht geöffnet werden</translation>
     </message>
@@ -4668,12 +4946,12 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
 <context>
     <name>QSQLite2Result</name>
     <message>
-        <location line="-319"/>
+        <location line="-326"/>
         <source>Unable to fetch results</source>
         <translation>Das Ergebnis konnte nicht abgeholt werden</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+150"/>
         <source>Unable to execute statement</source>
         <translation>Der Befehl konnte nicht ausgeführt werden</translation>
     </message>
@@ -4681,7 +4959,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
 <context>
     <name>QSQLiteDriver</name>
     <message>
-        <location filename="../src/sql/drivers/sqlite/qsql_sqlite.cpp" line="+540"/>
+        <location filename="../src/sql/drivers/sqlite/qsql_sqlite.cpp" line="+547"/>
         <source>Error opening database</source>
         <translation>Die Datenbankverbindung konnte nicht geöffnet werden</translation>
     </message>
@@ -5184,7 +5462,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
     </message>
     <message>
         <location filename="../src/corelib/kernel/qsharedmemory_symbian.cpp" line="+83"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+79"/>
+        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+81"/>
         <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+87"/>
         <source>%1: permission denied</source>
         <translation>%1: Zugriff verweigert</translation>
@@ -6150,7 +6428,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>Umdrehen</translation>
     </message>
     <message>
-        <location line="+573"/>
+        <location line="+575"/>
         <location line="+135"/>
         <source>Ctrl</source>
         <translation>Strg</translation>
@@ -6184,7 +6462,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>F%1</translation>
     </message>
     <message>
-        <location line="-869"/>
+        <location line="-871"/>
         <source>Home Page</source>
         <translation>Startseite</translation>
     </message>
@@ -6293,7 +6571,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
 <context>
     <name>QSoftKeyManager</name>
     <message>
-        <location filename="../src/gui/kernel/qsoftkeymanager.cpp" line="+79"/>
+        <location filename="../src/gui/kernel/qsoftkeymanager.cpp" line="+63"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -6318,7 +6596,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location line="+172"/>
+        <location filename="../src/gui/kernel/qsoftkeymanager_s60.cpp" line="+273"/>
         <source>Exit</source>
         <translation>Beenden</translation>
     </message>
@@ -6401,7 +6679,12 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>Die Daten konnten nicht geschrieben werden: %1</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+63"/>
+        <source>Unable to decrypt data: %1</source>
+        <translation>Die Daten konnten nicht entschlüsselt werden: %1</translation>
+    </message>
+    <message>
+        <location line="+76"/>
         <source>Error while reading: %1</source>
         <translation>Beim Lesen ist ein Fehler aufgetreten: %1</translation>
     </message>
@@ -6411,7 +6694,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>Im Ablauf des SSL-Protokolls ist ein Fehler aufgetreten: %1</translation>
     </message>
     <message>
-        <location line="-501"/>
+        <location line="-521"/>
         <source>Error creating SSL context (%1)</source>
         <translation>Es konnte keine SSL-Kontextstruktur erzeugt werden (%1)</translation>
     </message>
@@ -6657,7 +6940,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
 <context>
     <name>QTextControl</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+2024"/>
+        <location filename="../src/gui/text/qtextcontrol.cpp" line="+2027"/>
         <source>&amp;Undo</source>
         <translation>&amp;Rückgängig</translation>
     </message>
@@ -7375,7 +7658,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>%1 (%2x%3 Pixel)</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp" line="+412"/>
+        <location filename="../src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp" line="+416"/>
         <source>Bad HTTP request</source>
         <translation>Ungültige HTTP-Anforderung</translation>
     </message>
@@ -7460,7 +7743,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp" line="+1822"/>
+        <location filename="../src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp" line="+1833"/>
         <source>JavaScript Alert - %1</source>
         <translation>JavaScript-Hinweis - %1</translation>
     </message>
@@ -7470,7 +7753,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>JavaScript-Bestätigung - %1</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+19"/>
         <source>JavaScript Prompt - %1</source>
         <translation>JavaScript-Eingabeaufforderung - %1</translation>
     </message>
@@ -7706,7 +7989,7 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
 <context>
     <name>QWidget</name>
     <message>
-        <location filename="../src/gui/kernel/qwidget.cpp" line="+5720"/>
+        <location filename="../src/gui/kernel/qwidget.cpp" line="+5728"/>
         <source>*</source>
         <translation>*</translation>
     </message>