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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  L10n: Update German translations for 4.7.1, part 1.
  build fix for configure.exe
  I18n: Fix some lupdate warnings.
  Fix compile warnings.
  expose GestureType for using in QML

22 files changed, 1414 insertions, 93 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 68702c4..3952836 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -92,6 +92,7 @@ Qt {
     Q_ENUMS(ConnectionType)
 #ifndef QT_NO_GESTURES
     Q_ENUMS(GestureState)
+    Q_ENUMS(GestureType)
 #endif
 #endif // (defined(Q_MOC_RUN) || defined(QT_JAMBI_RUN))
 
diff --git a/src/corelib/plugin/qsystemlibrary.cpp b/src/corelib/plugin/qsystemlibrary.cpp
index a11ed50..eeb142b 100644
--- a/src/corelib/plugin/qsystemlibrary.cpp
+++ b/src/corelib/plugin/qsystemlibrary.cpp
@@ -78,7 +78,7 @@
     (http://msdn.microsoft.com/en-us/library/ms886736.aspx)
 */
 #if defined(Q_OS_WINCE)
-HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory/*= true*/)
+HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory /* = true */)
 {
     return ::LoadLibrary(libraryName);
 }
@@ -101,7 +101,7 @@ static QString qSystemDirectory()
     return QString::fromWCharArray(fullPath.constData(), int(retLen));
 }
 
-HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory/*= true*/)
+HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirectory /* = true */)
 {
     QStringList searchOrder;
 
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index 9d74238..ab6ff74 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -843,7 +843,7 @@ QDeclarativeObjectMethodScriptClass::Value QDeclarativeObjectMethodScriptClass::
         for (int ii = 0; ii < argTypeNames.count(); ++ii) {
             argTypes[ii] = QMetaType::type(argTypeNames.at(ii));
             if (argTypes[ii] == QVariant::Invalid) 
-                argTypes[ii] = enumType(method->object->metaObject(), argTypeNames.at(ii));
+                argTypes[ii] = enumType(method->object->metaObject(), QString::fromLatin1(argTypeNames.at(ii)));
             if (argTypes[ii] == QVariant::Invalid) 
                 return Value(ctxt, ctxt->throwError(QString::fromLatin1("Unknown method parameter type: %1").arg(QLatin1String(argTypeNames.at(ii)))));
         }
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp
index c956051..57cc9ab 100644
--- a/src/declarative/qml/qdeclarativescriptparser.cpp
+++ b/src/declarative/qml/qdeclarativescriptparser.cpp
@@ -895,7 +895,7 @@ QList<QDeclarativeError> QDeclarativeScriptParser::errors() const
 static void replaceWithSpace(QString &str, int idx, int n) 
 {
     QChar *data = str.data() + idx;
-    QChar space(' ');
+    const QChar space(QLatin1Char(' '));
     for (int ii = 0; ii < n; ++ii)
         *data++ = space;
 }
diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp
index 9b42065..061f309 100644
--- a/src/declarative/qml/qdeclarativetypeloader.cpp
+++ b/src/declarative/qml/qdeclarativetypeloader.cpp
@@ -804,7 +804,7 @@ void QDeclarativeTypeData::done()
             error.setUrl(finalUrl());
             error.setLine(script.location.line);
             error.setColumn(script.location.column);
-            error.setDescription(typeLoader()->tr("Script %1 unavailable").arg(script.script->url().toString()));
+            error.setDescription(QDeclarativeTypeLoader::tr("Script %1 unavailable").arg(script.script->url().toString()));
             errors.prepend(error);
             setError(errors);
         }
@@ -822,7 +822,7 @@ void QDeclarativeTypeData::done()
             error.setUrl(finalUrl());
             error.setLine(type.location.line);
             error.setColumn(type.location.column);
-            error.setDescription(typeLoader()->tr("Type %1 unavailable").arg(typeName));
+            error.setDescription(QDeclarativeTypeLoader::tr("Type %1 unavailable").arg(typeName));
             errors.prepend(error);
             setError(errors);
         }
@@ -995,9 +995,9 @@ void QDeclarativeTypeData::resolveTypes()
             QString userTypeName = parserRef->name;
             userTypeName.replace(QLatin1Char('/'),QLatin1Char('.'));
             if (typeNamespace)
-                error.setDescription(typeLoader()->tr("Namespace %1 cannot be used as a type").arg(userTypeName));
+                error.setDescription(QDeclarativeTypeLoader::tr("Namespace %1 cannot be used as a type").arg(userTypeName));
             else
-                error.setDescription(typeLoader()->tr("%1 %2").arg(userTypeName).arg(errorString));
+                error.setDescription(QDeclarativeTypeLoader::tr("%1 %2").arg(userTypeName).arg(errorString));
 
             if (!parserRef->refObjects.isEmpty()) {
                 QDeclarativeParser::Object *obj = parserRef->refObjects.first();
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index d832638..332acc4 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -1640,8 +1640,8 @@ static QScriptValue qmlxmlhttprequest_responseXML(QScriptContext *context, QScri
         THROW_REFERENCE("Not an XMLHttpRequest object");
 
     if (!request->receivedXml() ||
-        request->readyState() != QDeclarativeXMLHttpRequest::Loading &&
-        request->readyState() != QDeclarativeXMLHttpRequest::Done)
+        (request->readyState() != QDeclarativeXMLHttpRequest::Loading &&
+         request->readyState() != QDeclarativeXMLHttpRequest::Done))
         return engine->nullValue();
     else  
         return Document::load(engine, request->rawResponseBody());
diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/gui/accessible/qaccessible_win.cpp
index 132d01f..31e7245 100644
--- a/src/gui/accessible/qaccessible_win.cpp
+++ b/src/gui/accessible/qaccessible_win.cpp
@@ -76,71 +76,71 @@ QT_END_INCLUDE_NAMESPACE
 static const char *roleString(QAccessible::Role role)
 {
     static const char *roles[] = {
-       "NoRole"         /*= 0x00000000*/,
-       "TitleBar"       /*= 0x00000001*/,
-       "MenuBar"        /*= 0x00000002*/,
-       "ScrollBar"      /*= 0x00000003*/,
-       "Grip"           /*= 0x00000004*/,
-       "Sound"          /*= 0x00000005*/,
-       "Cursor"         /*= 0x00000006*/,
-       "Caret"          /*= 0x00000007*/,
-       "AlertMessage"   /*= 0x00000008*/,
-       "Window"         /*= 0x00000009*/,
-       "Client"         /*= 0x0000000A*/,
-       "PopupMenu"      /*= 0x0000000B*/,
-       "MenuItem"       /*= 0x0000000C*/,
-       "ToolTip"        /*= 0x0000000D*/,
-       "Application"    /*= 0x0000000E*/,
-       "Document"       /*= 0x0000000F*/,
-       "Pane"           /*= 0x00000010*/,
-       "Chart"          /*= 0x00000011*/,
-       "Dialog"         /*= 0x00000012*/,
-       "Border"         /*= 0x00000013*/,
-       "Grouping"       /*= 0x00000014*/,
-       "Separator"      /*= 0x00000015*/,
-       "ToolBar"        /*= 0x00000016*/,
-       "StatusBar"      /*= 0x00000017*/,
-       "Table"          /*= 0x00000018*/,
-       "ColumnHeader"   /*= 0x00000019*/,
-       "RowHeader"      /*= 0x0000001A*/,
-       "Column"         /*= 0x0000001B*/,
-       "Row"            /*= 0x0000001C*/,
-       "Cell"           /*= 0x0000001D*/,
-       "Link"           /*= 0x0000001E*/,
-       "HelpBalloon"    /*= 0x0000001F*/,
-       "Assistant"      /*= 0x00000020*/,
-       "List"           /*= 0x00000021*/,
-       "ListItem"       /*= 0x00000022*/,
-       "Tree"           /*= 0x00000023*/,
-       "TreeItem"       /*= 0x00000024*/,
-       "PageTab"        /*= 0x00000025*/,
-       "PropertyPage"   /*= 0x00000026*/,
-       "Indicator"      /*= 0x00000027*/,
-       "Graphic"        /*= 0x00000028*/,
-       "StaticText"     /*= 0x00000029*/,
-       "EditableText"   /*= 0x0000002A*/,  // Editable, selectable, etc.
-       "PushButton"     /*= 0x0000002B*/,
-       "CheckBox"       /*= 0x0000002C*/,
-       "RadioButton"    /*= 0x0000002D*/,
-       "ComboBox"       /*= 0x0000002E*/,
-       "DropList"       /*= 0x0000002F*/,    // commented out
-       "ProgressBar"    /*= 0x00000030*/,
-       "Dial"           /*= 0x00000031*/,
-       "HotkeyField"    /*= 0x00000032*/,
-       "Slider"         /*= 0x00000033*/,
-       "SpinBox"        /*= 0x00000034*/,
-       "Canvas"         /*= 0x00000035*/,
-       "Animation"      /*= 0x00000036*/,
-       "Equation"       /*= 0x00000037*/,
-       "ButtonDropDown" /*= 0x00000038*/,
-       "ButtonMenu"     /*= 0x00000039*/,
-       "ButtonDropGrid" /*= 0x0000003A*/,
-       "Whitespace"     /*= 0x0000003B*/,
-       "PageTabList"    /*= 0x0000003C*/,
-       "Clock"          /*= 0x0000003D*/,
-       "Splitter"       /*= 0x0000003E*/,
-       "LayeredPane"    /*= 0x0000003F*/,
-       "UserRole"       /*= 0x0000ffff*/
+       "NoRole"         /* = 0x00000000 */,
+       "TitleBar"       /* = 0x00000001 */,
+       "MenuBar"        /* = 0x00000002 */,
+       "ScrollBar"      /* = 0x00000003 */,
+       "Grip"           /* = 0x00000004 */,
+       "Sound"          /* = 0x00000005 */,
+       "Cursor"         /* = 0x00000006 */,
+       "Caret"          /* = 0x00000007 */,
+       "AlertMessage"   /* = 0x00000008 */,
+       "Window"         /* = 0x00000009 */,
+       "Client"         /* = 0x0000000A */,
+       "PopupMenu"      /* = 0x0000000B */,
+       "MenuItem"       /* = 0x0000000C */,
+       "ToolTip"        /* = 0x0000000D */,
+       "Application"    /* = 0x0000000E */,
+       "Document"       /* = 0x0000000F */,
+       "Pane"           /* = 0x00000010 */,
+       "Chart"          /* = 0x00000011 */,
+       "Dialog"         /* = 0x00000012 */,
+       "Border"         /* = 0x00000013 */,
+       "Grouping"       /* = 0x00000014 */,
+       "Separator"      /* = 0x00000015 */,
+       "ToolBar"        /* = 0x00000016 */,
+       "StatusBar"      /* = 0x00000017 */,
+       "Table"          /* = 0x00000018 */,
+       "ColumnHeader"   /* = 0x00000019 */,
+       "RowHeader"      /* = 0x0000001A */,
+       "Column"         /* = 0x0000001B */,
+       "Row"            /* = 0x0000001C */,
+       "Cell"           /* = 0x0000001D */,
+       "Link"           /* = 0x0000001E */,
+       "HelpBalloon"    /* = 0x0000001F */,
+       "Assistant"      /* = 0x00000020 */,
+       "List"           /* = 0x00000021 */,
+       "ListItem"       /* = 0x00000022 */,
+       "Tree"           /* = 0x00000023 */,
+       "TreeItem"       /* = 0x00000024 */,
+       "PageTab"        /* = 0x00000025 */,
+       "PropertyPage"   /* = 0x00000026 */,
+       "Indicator"      /* = 0x00000027 */,
+       "Graphic"        /* = 0x00000028 */,
+       "StaticText"     /* = 0x00000029 */,
+       "EditableText"   /* = 0x0000002A */,  // Editable, selectable, etc.
+       "PushButton"     /* = 0x0000002B */,
+       "CheckBox"       /* = 0x0000002C */,
+       "RadioButton"    /* = 0x0000002D */,
+       "ComboBox"       /* = 0x0000002E */,
+       "DropList"       /* = 0x0000002F */,    // commented out
+       "ProgressBar"    /* = 0x00000030 */,
+       "Dial"           /* = 0x00000031 */,
+       "HotkeyField"    /* = 0x00000032 */,
+       "Slider"         /* = 0x00000033 */,
+       "SpinBox"        /* = 0x00000034 */,
+       "Canvas"         /* = 0x00000035 */,
+       "Animation"      /* = 0x00000036 */,
+       "Equation"       /* = 0x00000037 */,
+       "ButtonDropDown" /* = 0x00000038 */,
+       "ButtonMenu"     /* = 0x00000039 */,
+       "ButtonDropGrid" /* = 0x0000003A */,
+       "Whitespace"     /* = 0x0000003B */,
+       "PageTabList"    /* = 0x0000003C */,
+       "Clock"          /* = 0x0000003D */,
+       "Splitter"       /* = 0x0000003E */,
+       "LayeredPane"    /* = 0x0000003F */,
+       "UserRole"       /* = 0x0000ffff*/
    };
 
    if (role >=0x40)
diff --git a/src/gui/embedded/qsoundqss_qws.cpp b/src/gui/embedded/qsoundqss_qws.cpp
index 3958cf0..c77c35c 100644
--- a/src/gui/embedded/qsoundqss_qws.cpp
+++ b/src/gui/embedded/qsoundqss_qws.cpp
@@ -286,7 +286,7 @@ public:
 	rightVolume = maxVolume>>1;
 	isPriority = false;
         samples_due = 0;
-	max1 = max2 = out = 0;//= sound_buffer_size;
+	max1 = max2 = out = 0;// = sound_buffer_size;
 	data = data1;
 	max = &max1;
 	sampleRunin = 0;
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index a6d2594..f7e0751 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -82,8 +82,9 @@ static QString qt_strippedText(QString s)
 QActionPrivate::QActionPrivate() : group(0), enabled(1), forceDisabled(0),
                                    visible(1), forceInvisible(0), checkable(0), checked(0), separator(0), fontSet(false),
                                    forceEnabledInSoftkeys(false), menuActionSoftkeys(false),
+                                   iconVisibleInMenu(-1),
                                    menuRole(QAction::TextHeuristicRole), softKeyRole(QAction::NoSoftKey),
-                                   priority(QAction::NormalPriority), iconVisibleInMenu(-1)
+                                   priority(QAction::NormalPriority)
 {
 #ifdef QT3_SUPPORT
     static int qt_static_action_id = -1;
diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h
index 2e279b0..8416708 100644
--- a/src/gui/kernel/qgesture.h
+++ b/src/gui/kernel/qgesture.h
@@ -54,6 +54,7 @@
 QT_BEGIN_HEADER
 
 Q_DECLARE_METATYPE(Qt::GestureState)
+Q_DECLARE_METATYPE(Qt::GestureType)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 31ee2a4..5850494 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -588,6 +588,7 @@ void QNetworkReplyImplPrivate::appendDownstreamData(QIODevice *data)
 
 void QNetworkReplyImplPrivate::appendDownstreamData(const QByteArray &data)
 {
+    Q_UNUSED(data)
     // TODO implement
 
     // TODO call
diff --git a/tools/assistant/tools/assistant/helpenginewrapper.cpp b/tools/assistant/tools/assistant/helpenginewrapper.cpp
index 9748702..a53a9ee 100644
--- a/tools/assistant/tools/assistant/helpenginewrapper.cpp
+++ b/tools/assistant/tools/assistant/helpenginewrapper.cpp
@@ -114,7 +114,7 @@ private:
     QMap<QString, RecentSignal> m_recentQchUpdates;
 };
 
-const QString HelpEngineWrapper::TrUnfiltered = tr("Unfiltered");
+const QString HelpEngineWrapper::TrUnfiltered = HelpEngineWrapper::tr("Unfiltered");
 
 HelpEngineWrapper *HelpEngineWrapper::helpEngineWrapper = 0;
 
diff --git a/tools/assistant/tools/qhelpconverter/filespage.cpp b/tools/assistant/tools/qhelpconverter/filespage.cpp
index 4ebf391..fd4a40e 100644
--- a/tools/assistant/tools/qhelpconverter/filespage.cpp
+++ b/tools/assistant/tools/qhelpconverter/filespage.cpp
@@ -59,8 +59,8 @@ FilesPage::FilesPage(QWidget *parent)
     connect(m_ui.removeAllButton, SIGNAL(clicked()),
         this, SLOT(removeAllFiles()));
 
-    m_ui.fileLabel->setText(tr("<p><b>Warning:</b> Be aware "
-        "when removing images or stylesheets since those files "
+    m_ui.fileLabel->setText(tr("<p><b>Warning:</b> "
+        "When removing images or stylesheets, be aware that those files "
         "are not directly referenced by the .adp or .dcf "
         "file.</p>"));
 }
diff --git a/tools/assistant/tools/qhelpconverter/filterpage.cpp b/tools/assistant/tools/qhelpconverter/filterpage.cpp
index c782943..c15a580 100644
--- a/tools/assistant/tools/qhelpconverter/filterpage.cpp
+++ b/tools/assistant/tools/qhelpconverter/filterpage.cpp
@@ -50,7 +50,7 @@ FilterPage::FilterPage(QWidget *parent)
     setTitle(tr("Filter Settings"));
     setSubTitle(tr("Specify the filter attributes for the "
         "documentation. If filter attributes are used, "
-        "also define a custom filter for it. Both, the "
+        "also define a custom filter for it. Both the "
         "filter attributes and the custom filters are "
         "optional."));
 
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index a3473af..8a62fe1 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -92,6 +92,7 @@ SOURCES  = main.cpp configureapp.cpp environment.cpp tools.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qiodevice.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qtextstream.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qtemporaryfile.cpp \
+           $$QT_SOURCE_TREE/src/corelib/plugin/qsystemlibrary.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qbitarray.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qdatetime.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qmap.cpp \
diff --git a/tools/designer/src/components/formeditor/formeditor_optionspage.cpp b/tools/designer/src/components/formeditor/formeditor_optionspage.cpp
index 102f44a..8e0cc66 100644
--- a/tools/designer/src/components/formeditor/formeditor_optionspage.cpp
+++ b/tools/designer/src/components/formeditor/formeditor_optionspage.cpp
@@ -86,9 +86,11 @@ ZoomSettingsWidget::ZoomSettingsWidget(QWidget *parent) :
     m_zoomCombo->setEditable(false);
     const IntList zoomValues = ZoomMenu::zoomValues();
     const IntList::const_iterator cend = zoomValues.constEnd();
-    //: Zoom percentage
-    for (IntList::const_iterator it = zoomValues.constBegin(); it != cend; ++it)
+
+    for (IntList::const_iterator it = zoomValues.constBegin(); it != cend; ++it) {
+        //: Zoom percentage
         m_zoomCombo->addItem(QCoreApplication::translate("FormEditorOptionsPage", "%1 %").arg(*it), QVariant(*it));
+    }
 
     // Layout
     setCheckable(true);
diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h
index cfb2178..02cfb07 100644
--- a/tools/linguist/shared/translator.h
+++ b/tools/linguist/shared/translator.h
@@ -123,8 +123,8 @@ class Translator
 public:
     Translator();
 
-    bool load(const QString &filename, ConversionData &err, const QString &format /*= "auto"*/);
-    bool save(const QString &filename, ConversionData &err, const QString &format /*= "auto"*/) const;
+    bool load(const QString &filename, ConversionData &err, const QString &format /* = "auto" */);
+    bool save(const QString &filename, ConversionData &err, const QString &format /* = "auto" */) const;
     bool release(QFile *iod, ConversionData &cd) const;
 
     int find(const TranslatorMessage &msg) const;
diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts
index 0f4d0d6..95fabaf 100644
--- a/translations/assistant_de.ts
+++ b/translations/assistant_de.ts
@@ -75,7 +75,7 @@ Grund:
     </message>
     <message>
         <source>Error reading collection file &apos;%1&apos;: %2</source>
-        <translation>Fehler beim Lesen der Katalogdatei &apos;%1&apos;: %2</translation>
+        <translation type="obsolete">Fehler beim Lesen der Katalogdatei &apos;%1&apos;: %2</translation>
     </message>
     <message>
         <source>Cannot load sqlite database driver!</source>
@@ -110,6 +110,17 @@ Grund:
     </message>
 </context>
 <context>
+    <name>BookmarkItem</name>
+    <message>
+        <source>New Folder</source>
+        <translation>Neuer Ordner</translation>
+    </message>
+    <message>
+        <source>Untitled</source>
+        <translation>Ohne Titel</translation>
+    </message>
+</context>
+<context>
     <name>BookmarkManager</name>
     <message>
         <source>Untitled</source>
@@ -327,6 +338,39 @@ Grund:
         <translation>Die Katalogdatei &apos;%1&apos; existiert nicht.</translation>
     </message>
     <message>
+        <source>Usage: assistant [Options]
+
+-collectionFile file       Uses the specified collection
+                           file instead of the default one
+-showUrl url               Shows the document with the
+                           url.
+-enableRemoteControl       Enables Assistant to be
+                           remotely controlled.
+-show widget               Shows the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-activate widget           Activates the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;,
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-hide widget               Hides the specified dockwidget
+                           which can be &quot;contents&quot;, &quot;index&quot;
+                           &quot;bookmarks&quot; or &quot;search&quot;.
+-register helpFile         Registers the specified help file
+                           (.qch) in the given collection
+                           file.
+-unregister helpFile       Unregisters the specified help file
+                           (.qch) from the give collection
+                           file.
+-setCurrentFilter filter   Set the filter as the active filter.
+-remove-search-index       Removes the full text search index.
+-rebuild-search-index      Re-builds the full text search index (potentially slow).
+-quiet                     Does not display any error or
+                           status message.
+-help                      Displays this help.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Missing collection file.</source>
         <translation>Fehlende Katalogdatei.</translation>
     </message>
@@ -375,6 +419,60 @@ Grund:
     </message>
 </context>
 <context>
+    <name>ConversionWizard</name>
+    <message>
+        <source>Help Conversion Wizard</source>
+        <translation>Konvertierungsassistant für Hilfedateien</translation>
+    </message>
+    <message>
+        <source>Converting %1...</source>
+        <translation>Konvertiere %1...</translation>
+    </message>
+    <message>
+        <source>Writing help collection file...</source>
+        <translation>Schreibe Hilfedatei...</translation>
+    </message>
+    <message>
+        <source>Done.</source>
+        <translation>Beendet.</translation>
+    </message>
+</context>
+<context>
+    <name>FilesPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Files:</source>
+        <translation>Dateien:</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+    <message>
+        <source>Remove All</source>
+        <translation>Alle entfernen</translation>
+    </message>
+    <message>
+        <source>Unreferenced Files</source>
+        <translation>Unreferenzierte Dateien</translation>
+    </message>
+    <message>
+        <source>Remove files which are neither referenced by a keyword nor by the TOC.</source>
+        <translation>Entfernt Dateien, die weder vom Inhaltsverzeichnis noch von einem Schlüsselwort referenziert werden.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; When removing images or stylesheets, be aware that those files are not directly referenced by the .adp or .dcf file.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;b&gt;Warnhinweis:&lt;/b&gt; Beachten Sie beim Löschen von Bilddateien oder Stylesheet-Dateien, dass diese nicht direkt von den .adp- oder .dcf-Dateien referenziert werden.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Warning:&lt;/b&gt; Be aware when removing images or stylesheets since those files are not directly referenced by the .adp or .dcf file.&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;&lt;b&gt;Warnhinweis:&lt;/b&gt; Be aware when removing images or stylesheets since those files are not directly referenced by the .adp or .dcf file.&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
     <name>FilterNameDialogClass</name>
     <message>
         <source>Add Filter Name</source>
@@ -386,6 +484,70 @@ Grund:
     </message>
 </context>
 <context>
+    <name>FilterPage</name>
+    <message>
+        <source>Form</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Filter attributes for current documentation (comma separated list):</source>
+        <translation>Attribute der Filter für die angezeigte Dokumentation (durch Komma getrennte Liste):</translation>
+    </message>
+    <message>
+        <source>Custom Filters</source>
+        <translation>Benutzerdefinierte Filter</translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Hinzufügen</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation>Filtereinstellungen</translation>
+    </message>
+    <message>
+        <source>Specify the filter attributes for the documentation. If filter attributes are used, also define a custom filter for it. Both, the filter attributes and the custom filters are optional.</source>
+        <translation type="obsolete">Geben Sie die Attribute der Filter für die Dokumentation an. Wenn Attribute verwendet werden, sollte auch ein benutzerdefiniertes Filter festgelegt werden. Sowohl Filter-Attribute als auch benutzerdefinierte Filter sind jedoch optional.</translation>
+    </message>
+    <message>
+        <source>Specify the filter attributes for the documentation. If filter attributes are used, also define a custom filter for it. Both the filter attributes and the custom filters are optional.</source>
+        <translation>Geben Sie die Attribute der Filter für die Dokumentation an. Wenn Attribute verwendet werden, sollte auch ein benutzerdefiniertes Filter festgelegt werden. Sowohl Filter-Attribute als auch benutzerdefinierte Filter sind jedoch optional.</translation>
+    </message>
+    <message>
+        <source>Filter Name</source>
+        <translation>Filtername</translation>
+    </message>
+    <message>
+        <source>Filter Attributes</source>
+        <translation>Attribute des Filters</translation>
+    </message>
+    <message>
+        <source>The custom filter &apos;%1&apos; is defined multiple times.</source>
+        <translation>Das benutzerdefinierte Filter &apos;%1&apos; wurde mehrfach definiert.</translation>
+    </message>
+    <message>
+        <source>The attributes for custom filter &apos;%1&apos; are defined multiple times.</source>
+        <translation>Die Attribute des benutzerdefinierten Filters &apos;%1&apos; wurden mehrfach definiert.</translation>
+    </message>
+    <message>
+        <source>unfiltered</source>
+        <comment>list of available documentation</comment>
+        <translation>Ungefiltert</translation>
+    </message>
+</context>
+<context>
     <name>FindWidget</name>
     <message>
         <source>Previous</source>
@@ -405,6 +567,17 @@ Grund:
     </message>
 </context>
 <context>
+    <name>FinishPage</name>
+    <message>
+        <source>Converting File</source>
+        <translation>Konvertiere Datei</translation>
+    </message>
+    <message>
+        <source>Creating the new Qt help files from the old ADP file.</source>
+        <translation>Erzeuge die neuen Qt-Hilfedateien aus den alten ADP-Dateien.</translation>
+    </message>
+</context>
+<context>
     <name>FontPanel</name>
     <message>
         <source>Font</source>
@@ -428,6 +601,59 @@ Grund:
     </message>
 </context>
 <context>
+    <name>GeneralPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Namespace:</source>
+        <translation>Namensraum:</translation>
+    </message>
+    <message>
+        <source>Virtual Folder:</source>
+        <translation>Virtueller Ordner:</translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation>Allgemeine Einstellungen</translation>
+    </message>
+    <message>
+        <source>Specify the namespace and the virtual folder for the documentation.</source>
+        <translation>Geben Sie den Namensraum und den virtuellen Ordner für die Dokumentation an.</translation>
+    </message>
+    <message>
+        <source>Namespace Error</source>
+        <translation>Fehlerhafter Namensraum</translation>
+    </message>
+    <message>
+        <source>The namespace contains some invalid characters.</source>
+        <translation>Der Namensraum enthält einige ungültige Zeichen.</translation>
+    </message>
+    <message>
+        <source>Virtual Folder Error</source>
+        <translation>Fehlerhafter virtueller Ordner</translation>
+    </message>
+    <message>
+        <source>The virtual folder contains some invalid characters.</source>
+        <translation>Der virtuelle Ornder enthält einige ungültige Zeichen.</translation>
+    </message>
+</context>
+<context>
+    <name>HelpEngineWrapper</name>
+    <message>
+        <source>Unfiltered</source>
+        <translation>Ungefiltert</translation>
+    </message>
+</context>
+<context>
+    <name>HelpGenerator</name>
+    <message>
+        <source>Warning: %1</source>
+        <translation>Warnung: %1</translation>
+    </message>
+</context>
+<context>
     <name>HelpViewer</name>
     <message>
         <source>&lt;title&gt;about:blank&lt;/title&gt;</source>
@@ -451,6 +677,40 @@ Grund:
     </message>
 </context>
 <context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Wizard Assistant&lt;/b&gt;&lt;/center&gt;</source>
+        <translation>&lt;center&gt;&lt;b&gt;Assistent&lt;/b&gt;&lt;/center&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>IdentifierPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Create identifiers</source>
+        <translation>Bezeichner erzeugen</translation>
+    </message>
+    <message>
+        <source>Global prefix:</source>
+        <translation>Globaler Präfix:</translation>
+    </message>
+    <message>
+        <source>Inherit prefix from file names</source>
+        <translation>Präfixe aus Dateinamen entnehmen</translation>
+    </message>
+    <message>
+        <source>Identifiers</source>
+        <translation>Bezeichner</translation>
+    </message>
+    <message>
+        <source>This page allows you to create identifiers from the keywords found in the .adp or .dcf file.</source>
+        <translation>Diese Seite gestattet das Erzeugen von Bezeichnern aus den Schlüsselwörtern, die in den .adp- oder .dcf-Dateien gefunden werden.</translation>
+    </message>
+</context>
+<context>
     <name>IndexWindow</name>
     <message>
         <source>&amp;Look for:</source>
@@ -466,6 +726,53 @@ Grund:
     </message>
 </context>
 <context>
+    <name>InputPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>File name:</source>
+        <translation>Dateiname:</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <source>Input File</source>
+        <translation>Eingabedatei:</translation>
+    </message>
+    <message>
+        <source>Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format.</source>
+        <translation>Geben Sie die .adp- oder .dcf-Datei an, die Sie in die neuen Qt-Hilfedateiformate konvertieren möchten.</translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation>Datei öffnen</translation>
+    </message>
+    <message>
+        <source>Qt Help Files (*.adp *.dcf)</source>
+        <translation>Qt-Hilfedateien (*.adp *.dcf)</translation>
+    </message>
+    <message>
+        <source>File Open Error</source>
+        <translation>Fehler beim Öffnen der Datei</translation>
+    </message>
+    <message>
+        <source>The specified file could not be opened!</source>
+        <translation>Die angegebene Datei konnte nicht geöffnet werden.</translation>
+    </message>
+    <message>
+        <source>File Parsing Error</source>
+        <translation>Fehler beim Auslesen der Datei</translation>
+    </message>
+    <message>
+        <source>Parsing error in line %1!</source>
+        <translation>Fehler bei Zeile %1.</translation>
+    </message>
+</context>
+<context>
     <name>InstallDialog</name>
     <message>
         <source>Install Documentation</source>
@@ -681,6 +988,10 @@ Grund:
         <translation>Ctrl+Alt+Left</translation>
     </message>
     <message>
+        <source>&lt;center&gt;&lt;h3&gt;%1&lt;/h3&gt;&lt;p&gt;Version %2&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Could not register file &apos;%1&apos;: %2</source>
         <translation>Die Datei &apos;%1&apos; konnte nicht registriert werden: %2</translation>
     </message>
@@ -778,6 +1089,92 @@ Grund:
     </message>
 </context>
 <context>
+    <name>OutputPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Project file name:</source>
+        <translation>Name der Projektdatei:</translation>
+    </message>
+    <message>
+        <source>Collection file name:</source>
+        <translation>Name der Katalogdatei:</translation>
+    </message>
+    <message>
+        <source>Output File Names</source>
+        <translation>Ausgabedateien</translation>
+    </message>
+    <message>
+        <source>Specify the file names for the output files.</source>
+        <translation>Geben Sie die Namen der Ausgabedateien an.</translation>
+    </message>
+    <message>
+        <source>Convert...</source>
+        <translation>Konvertiere ...</translation>
+    </message>
+    <message>
+        <source>Qt Help Project File</source>
+        <translation>Qt-Hilfe-Projektdatei</translation>
+    </message>
+    <message>
+        <source>Qt Help Collection Project File</source>
+        <translation>Qt-Hilfe-Katalogdatei</translation>
+    </message>
+    <message>
+        <source>The specified file %1 already exist.
+
+Do you want to remove it?</source>
+        <translation>Die Datei %1 existiert bereits.
+
+Möchten Sie sie löschen?</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+</context>
+<context>
+    <name>PathPage</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>File filters:</source>
+        <translation>Dateifilter:</translation>
+    </message>
+    <message>
+        <source>Documentation source file paths:</source>
+        <translation>Pfade der Dokumentations-Quelldateien:</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Hinzufügen</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+    <message>
+        <source>Source File Paths</source>
+        <translation>Pfade der Quelldateien</translation>
+    </message>
+    <message>
+        <source>Specify the paths where the sources files are located. By default, all files in those directories matched by the file filter will be included.</source>
+        <translation>Geben Sie die Pfade an, unter denen sich die Quelldateien befinden. Es werden alle Dateien aus diesen Verzeichnissen aufgenommen, die dem Dateifilter entsprechen.</translation>
+    </message>
+    <message>
+        <source>Source File Path</source>
+        <translation>Pfade der Quelldateien</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesDialog</name>
     <message>
         <source>Add Documentation</source>
@@ -912,6 +1309,147 @@ Grund:
     </message>
 </context>
 <context>
+    <name>QCollectionGenerator</name>
+    <message>
+        <source>Unknown token at line %1.</source>
+        <translation>Unbekanntes Schlüsselwort bei Zeile %1.</translation>
+    </message>
+    <message>
+        <source>Unknown token at line %1. Expected &quot;QtHelpCollectionProject&quot;.</source>
+        <translation>Unbekanntes Schlüsselwort bei Zeile %1. Es wird &quot;QtHelpCollectionProject&quot; erwartet.</translation>
+    </message>
+    <message>
+        <source>Missing end tags.</source>
+        <translation>Es fehlen schließende Elemente.</translation>
+    </message>
+    <message>
+        <source>Missing input or output file for help file generation.</source>
+        <translation>Es fehlen einige der für die Erzeugung der Hilfedateien benötigte Eingabe- oder Ausgabedateien.</translation>
+    </message>
+    <message>
+        <source>Missing output file name.</source>
+        <translation>Es wurde kein Name für die Ausgabedatei angegeben.</translation>
+    </message>
+    <message>
+        <source>Qt Collection Generator version 1.0 (Qt %1)
+</source>
+        <translation>Qt Collection Generator Version 1.0 (Qt %1)
+</translation>
+    </message>
+    <message>
+        <source>Missing collection config file.</source>
+        <translation>Die für den Katalog benötigte Konfigurationsdatei fehlt.</translation>
+    </message>
+    <message>
+        <source>
+Usage:
+
+qcollectiongenerator &lt;collection-config-file&gt; [options]
+
+  -o &lt;collection-file&gt;   Generates a collection file
+                         called &lt;collection-file&gt;. If
+                         this option is not specified
+                         a default name will be used.
+  -v                     Displays the version of
+                         qcollectiongenerator.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open %1.
+</source>
+        <translation>Die Datei &apos;%1&apos; konnte nicht geöffnet werden.
+</translation>
+    </message>
+    <message>
+        <source>Reading collection config file...
+</source>
+        <translation>Lese Konfigurationsdatei des Katalogs...
+</translation>
+    </message>
+    <message>
+        <source>Collection config file error: %1
+</source>
+        <translation>Fehler in der Konfigurationsdatei des Katalogs %1</translation>
+    </message>
+    <message>
+        <source>Generating help for %1...
+</source>
+        <translation>Erzeuge Hilfe für %1...
+</translation>
+    </message>
+    <message>
+        <source>Creating collection file...
+</source>
+        <translation>Erzeuge Katalogdatei...
+</translation>
+    </message>
+    <message>
+        <source>The file %1 cannot be overwritten.
+</source>
+        <translation>Die Datei %1 konnte nicht überschrieben werden.</translation>
+    </message>
+    <message>
+        <source>Cannot open %1.
+</source>
+        <translation>Die Datei &apos;%1&apos; konnte nicht geöffnet werden.
+</translation>
+    </message>
+    <message>
+        <source>Cannot open referenced image file %1.
+</source>
+        <translation>Die referenzierte Bilddatei %1 konnte nicht geöffnet werden.
+</translation>
+    </message>
+</context>
+<context>
+    <name>QHelpGenerator</name>
+    <message>
+        <source>Missing output file name.</source>
+        <translation>Es wurde kein Name für die Ausgabedatei angegeben.</translation>
+    </message>
+    <message>
+        <source>Qt Help Generator version 1.0 (Qt %1)
+</source>
+        <translation>Qt Help Generator Version 1.0 (Qt %1)
+</translation>
+    </message>
+    <message>
+        <source>Missing Qt help project file.</source>
+        <translation>Die Qt-Hilfe-Projektdatei fehlt.</translation>
+    </message>
+    <message>
+        <source>
+Usage:
+
+qhelpgenerator &lt;help-project-file&gt; [options]
+
+  -o &lt;compressed-file&gt;   Generates a Qt compressed help
+                         file called &lt;compressed-file&gt;.
+                         If this option is not specified
+                         a default name will be used.
+  -c                     Checks whether all links in HTML files
+                         point to files in this help project.
+  -v                     Displays the version of 
+                         qhelpgenerator.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open %1.
+</source>
+        <translation>Die Datei &apos;%1&apos; konnte nicht geöffnet werden.
+</translation>
+    </message>
+    <message>
+        <source>Could not create output directory: %1
+</source>
+        <translation>Der Ausgabeordner &apos;%1 konnte nicht erzeugt werden</translation>
+    </message>
+</context>
+<context>
     <name>RemoteControl</name>
     <message>
         <source>Debugging Remote Control</source>
diff --git a/translations/designer_de.ts b/translations/designer_de.ts
index 9ff5099..f0546c7 100644
--- a/translations/designer_de.ts
+++ b/translations/designer_de.ts
@@ -25,6 +25,49 @@
     </message>
 </context>
 <context>
+    <name>AbstractItemEditor</name>
+    <message>
+        <source>Selectable</source>
+        <translation>Selectable</translation>
+    </message>
+    <message>
+        <source>Editable</source>
+        <translation>Editable</translation>
+    </message>
+    <message>
+        <source>DragEnabled</source>
+        <translation>DragEnabled</translation>
+    </message>
+    <message>
+        <source>DropEnabled</source>
+        <translation>DropEnabled</translation>
+    </message>
+    <message>
+        <source>UserCheckable</source>
+        <translation>UserCheckable</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Enabled</translation>
+    </message>
+    <message>
+        <source>Tristate</source>
+        <translation>Tristate</translation>
+    </message>
+    <message>
+        <source>Unchecked</source>
+        <translation>Unchecked</translation>
+    </message>
+    <message>
+        <source>PartiallyChecked</source>
+        <translation>PartiallyChecked</translation>
+    </message>
+    <message>
+        <source>Checked</source>
+        <translation>Checked</translation>
+    </message>
+</context>
+<context>
     <name>AddLinkDialog</name>
     <message>
         <source>Insert Link</source>
@@ -851,6 +894,7 @@ Parsing grid layout minimum size values</extracomment>
     <name>FormEditorOptionsPage</name>
     <message>
         <source>%1 %</source>
+        <extracomment>Zoom percentage</extracomment>
         <translation>%1 %</translation>
     </message>
     <message>
@@ -2509,6 +2553,10 @@ Empty class name passed to widget factory method</extracomment>
 <context>
     <name>QtLocalePropertyManager</name>
     <message>
+        <source>&lt;Invalid&gt;</source>
+        <translation>&lt;Ungültig&gt;</translation>
+    </message>
+    <message>
         <source>%1, %2</source>
         <translation>%1, %2</translation>
     </message>
@@ -4730,6 +4778,14 @@ Please select another name.</source>
         <translation>Nach neu installierten Plugins mit benutzerdefinierten Widgets suchen.</translation>
     </message>
     <message>
+        <source>Loaded Plugins</source>
+        <translation>Geladene Plugins</translation>
+    </message>
+    <message>
+        <source>Failed Plugins</source>
+        <translation>Fehlgeschlagene Plugins</translation>
+    </message>
+    <message>
         <source>Qt Designer couldn&apos;t find any plugins</source>
         <translation>Qt Designer kann keine Plugins finden</translation>
     </message>
diff --git a/translations/linguist_de.ts b/translations/linguist_de.ts
index b4e0a45..aa992a9 100644
--- a/translations/linguist_de.ts
+++ b/translations/linguist_de.ts
@@ -257,6 +257,99 @@ Es wird mit einer einfachen Universalform gearbeitet.</translation>
     </message>
 </context>
 <context>
+    <name>LConvert</name>
+    <message>
+        <source>
+Usage:
+    lconvert [options] &lt;infile&gt; [&lt;infile&gt;...]
+
+lconvert is part of Qt&apos;s Linguist tool chain. It can be used as a
+stand-alone tool to convert and filter translation data files.
+The following file formats are supported:
+
+%1
+If multiple input files are specified, they are merged with
+translations from later files taking precedence.
+
+Options:
+    -h
+    --help  Display this information and exit.
+
+    -i &lt;infile&gt;
+    --input-file &lt;infile&gt;
+           Specify input file. Use if &lt;infile&gt; might start with a dash.
+           This option can be used several times to merge inputs.
+           May be &apos;-&apos; (standard input) for use in a pipe.
+
+    -o &lt;outfile&gt;
+    --output-file &lt;outfile&gt;
+           Specify output file. Default is &apos;-&apos; (standard output).
+
+    -if &lt;informat&gt;
+    --input-format &lt;format&gt;
+           Specify input format for subsequent &lt;infile&gt;s.
+           The format is auto-detected from the file name and defaults to &apos;ts&apos;.
+
+    -of &lt;outformat&gt;
+    --output-format &lt;outformat&gt;
+           Specify output format. See -if.
+
+    --input-codec &lt;codec&gt;
+           Specify encoding for QM and PO input files. Default is &apos;Latin1&apos;
+           for QM and &apos;UTF-8&apos; for PO files. UTF-8 is always tried as well for
+           QM, corresponding to the possible use of the trUtf8() function.
+
+    --output-codec &lt;codec&gt;
+           Specify encoding for PO output files. Default is &apos;UTF-8&apos;.
+
+    --drop-tags &lt;regexp&gt;
+           Drop named extra tags when writing TS or XLIFF files.
+           May be specified repeatedly.
+
+    --drop-translations
+           Drop existing translations and reset the status to &apos;unfinished&apos;.
+           Note: this implies --no-obsolete.
+
+    --source-language &lt;language&gt;[_&lt;region&gt;]
+           Specify/override the language of the source strings. Defaults to
+           POSIX if not specified and the file does not name it yet.
+
+    --target-language &lt;language&gt;[_&lt;region&gt;]
+           Specify/override the language of the translation.
+           The target language is guessed from the file name if this option
+           is not specified and the file contents name no language yet.
+
+    --no-obsolete
+           Drop obsolete messages.
+
+    --no-finished
+           Drop finished messages.
+
+    --sort-contexts
+           Sort contexts in output TS file alphabetically.
+
+    --locations {absolute|relative|none}
+           Override how source code references are saved in TS files.
+           Default is absolute.
+
+    --no-ui-lines
+           Drop line numbers from references to UI files.
+
+    --verbose
+           be a bit more verbose
+
+Long options can be specified with only one leading dash, too.
+
+Return value:
+    0 on success
+    1 on command line parse failures
+    2 on read failures
+    3 on write failures
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LRelease</name>
     <message numerus="yes">
         <source>Dropped %n message(s) which had no ID.</source>
@@ -306,6 +399,586 @@ Es wird mit einer einfachen Universalform gearbeitet.</translation>
 </numerusform>
         </translation>
     </message>
+    <message>
+        <source>Usage:
+    lrelease [options] project-file
+    lrelease [options] ts-files [-qm qm-file]
+
+lrelease is part of Qt&apos;s Linguist tool chain. It can be used as a
+stand-alone tool to convert XML-based translations files in the TS
+format into the &apos;compiled&apos; QM format used by QTranslator objects.
+
+Options:
+    -help  Display this information and exit
+    -idbased
+           Use IDs instead of source strings for message keying
+    -compress
+           Compress the QM files
+    -nounfinished
+           Do not include unfinished translations
+    -removeidentical
+           If the translated text is the same as
+           the source text, do not include the message
+    -markuntranslated &lt;prefix&gt;
+           If a message has no real translation, use the source text
+           prefixed with the given string instead
+    -silent
+           Do not explain what is being done
+    -version
+           Display the version of lrelease and exit
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lrelease error: %1</source>
+        <translation>Fehler in lrelease: %1</translation>
+    </message>
+    <message>
+        <source>Updating &apos;%1&apos;...
+</source>
+        <translation>Bringe &apos;%1&apos; auf aktuellen Stand...
+</translation>
+    </message>
+    <message>
+        <source>Removing translations equal to source text in &apos;%1&apos;...
+</source>
+        <translation>Entferne Übersetzungen, die dem unübersetzten Text entsprechen, in &apos;%1&apos;...
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot create &apos;%1&apos;: %2
+</source>
+        <translation>Fehler in lrelease: &apos;%1&apos; kann nicht erzeugt werden: %2
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot save &apos;%1&apos;: %2</source>
+        <translation>Fehler in lrelease: &apos;%1&apos; kann nicht gespeichert werden: %2
+</translation>
+    </message>
+    <message>
+        <source>lrelease version %1
+</source>
+        <translation>lrelease Version %1
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot read project file &apos;%1&apos;.
+</source>
+        <translation>Fehler in lrelease: Die Projektdatei &apos;%1&apos; kann nicht gelesen werden.
+</translation>
+    </message>
+    <message>
+        <source>lrelease error: cannot process project file &apos;%1&apos;.
+</source>
+        <translation>Fehler in lrelease: Die Projektdatei &apos;%1&apos; kann verarbeitet werden.
+</translation>
+    </message>
+    <message>
+        <source>lrelease warning: Met no &apos;TRANSLATIONS&apos; entry in project file &apos;%1&apos;
+</source>
+        <translation>Warnung in lrelease : Die Projektdatei &apos;%1&apos; enthält keinen &apos;TRANSLATIONS&apos;-Eintrag
+</translation>
+    </message>
+</context>
+<context>
+    <name>LUpdate</name>
+    <message>
+        <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parenthesis/brace mismatch between #if and #else branches; using #if branch
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unterminated C++ comment
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unterminated C++ string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Excess closing brace in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Excess closing parenthesis in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Excess closing bracket in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>circular inclusion of %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1: %2
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>//% cannot be used with tr() / QT_TR_NOOP(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qualifying with unknown namespace/class %1::%2
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tr() cannot be called without context
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Class &apos;%1&apos; lacks Q_OBJECT macro
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>It is not recommended to call tr() from within a constructor &apos;%1::%2&apos;
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unexpected character in meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unterminated meta string
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot invoke tr() like this
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Discarding unconsumed meta data
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unbalanced opening brace in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unbalanced opening parenthesis in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unbalanced opening bracket in C++ code (or abuse of the C++ preprocessor)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unterminated Java comment.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Unicode value.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unterminated string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String used in translation can contain only literals concatenated with other literals, not expressions or numbers.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&apos;class&apos; must be followed by a class name.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Excess closing brace.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&apos;package&apos; must be followed by package name.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unbalanced opening brace.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unbalanced opening parenthesis.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Usage:
+    lupdate [options] [project-file]...
+    lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file
+
+lupdate is part of Qt&apos;s Linguist tool chain. It extracts translatable
+messages from Qt UI files, C++, Java and JavaScript/QtScript source code.
+Extracted messages are stored in textual translation source files (typically
+Qt TS XML). New and modified messages can be merged into existing TS files.
+
+Options:
+    -help  Display this information and exit.
+    -no-obsolete
+           Drop all obsolete strings.
+    -extensions &lt;ext&gt;[,&lt;ext&gt;]...
+           Process files with the given extensions only.
+           The extension list must be separated with commas, not with whitespace.
+           Default: &apos;%1&apos;.
+    -pluralonly
+           Only include plural form messages.
+    -silent
+           Do not explain what is being done.
+    -no-sort
+           Do not sort contexts in TS files.
+    -no-recursive
+           Do not recursively scan the following directories.
+    -recursive
+           Recursively scan the following directories (default).
+    -I &lt;includepath&gt; or -I&lt;includepath&gt;
+           Additional location to look for include files.
+           May be specified multiple times.
+    -locations {absolute|relative|none}
+           Specify/override how source code references are saved in TS files.
+           Default is absolute.
+    -no-ui-lines
+           Do not record line numbers in references to UI files.
+    -disable-heuristic {sametext|similartext|number}
+           Disable the named merge heuristic. Can be specified multiple times.
+    -pro &lt;filename&gt;
+           Name of a .pro file. Useful for files with .pro file syntax but
+           different file suffix. Projects are recursed into and merged.
+    -source-language &lt;language&gt;[_&lt;region&gt;]
+           Specify the language of the source strings for new files.
+           Defaults to POSIX if not specified.
+    -target-language &lt;language&gt;[_&lt;region&gt;]
+           Specify the language of the translations for new files.
+           Guessed from the file name if not specified.
+    -ts &lt;ts-file&gt;...
+           Specify the output file(s). This will override the TRANSLATIONS
+           and nullify the CODECFORTR from possibly specified project files.
+    -codecfortr &lt;codec&gt;
+           Specify the codec assumed for tr() calls. Effective only with -ts.
+    -version
+           Display the version of lupdate and exit.
+    @lst-file
+           Read additional file names (one per line) from lst-file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: Codec for tr() &apos;%1&apos; disagrees with existing file&apos;s codec &apos;%2&apos;. Expect trouble.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: Specified target language &apos;%1&apos; disagrees with existing file&apos;s language &apos;%2&apos;. Ignoring.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: Specified source language &apos;%1&apos; disagrees with existing file&apos;s language &apos;%2&apos;. Ignoring.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Updating &apos;%1&apos;...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stripping non plural forms in &apos;%1&apos;...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: Codec for source &apos;%1&apos; is invalid. Falling back to codec for tr().
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: TS files from command line will override TRANSLATIONS in %1.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: TS files from command line prevent recursing into %1.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: no TS files specified. Only diagnostics will be produced for &apos;%1&apos;.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The option -target-language requires a parameter.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The option -source-language requires a parameter.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The option -disable-heuristic requires a parameter.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid heuristic name passed to -disable-heuristic.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The option -locations requires a parameter.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid parameter passed to -locations.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The -codecfortr option should be followed by a codec name.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The -extensions option should be followed by an extension list.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The -pro option should be followed by a filename of .pro file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The -I option should be followed by a path.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unrecognized option &apos;%1&apos;.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate error: List file &apos;%1&apos; is not readable.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: For some reason, &apos;%1&apos; is not writable.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate error: File &apos;%1&apos; has no recognized extension.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate error: File &apos;%1&apos; does not exist.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning directory &apos;%1&apos;...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: -target-language usually only makes sense with exactly one TS file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: -codecfortr has no effect without -ts.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate warning: no TS files specified. Only diagnostics will be produced.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lupdate error: Both project and source files / include paths specified.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>    Found %n source text(s) (%1 new and %2 already existing)
+</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Removed %n obsolete entries
+</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Kept %n obsolete entries
+</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Number heuristic provided %n translation(s)
+</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Same-text heuristic provided %n translation(s)
+</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>    Similar-text heuristic provided %n translation(s)
+</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Illegal character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unclosed string at end of line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Illegal escape squence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Illegal unicode escape sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unclosed comment at end of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Illegal syntax for exponential number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Identifier cannot start with numeric literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unterminated regular expression literal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>//% cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1() requires at least two arguments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1(): both arguments must be literal strings.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1() requires at least one argument.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1(): text to translate must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>//= cannot be used with %1(). Ignoring
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1(): identifier must be a literal string.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expected </source>
+        <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML error: Parse error at line %1, column %2 (%3).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parse error in UI file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -1307,6 +1980,13 @@ Zeile: %2</translation>
     </message>
 </context>
 <context>
+    <name>PhraseBook</name>
+    <message>
+        <source>Parse error at line %1, column %2 (%3).</source>
+        <translation>Parse-Fehler bei Zeile %1, Spalte %2 (%3).</translation>
+    </message>
+</context>
+<context>
     <name>PhraseBookBox</name>
     <message>
         <source></source>
@@ -1478,6 +2158,12 @@ Zeile: %2</translation>
         <source>Qt Linguist &apos;Phrase Book&apos;</source>
         <translation>Qt-Linguist-Wörterbuch</translation>
     </message>
+    <message>
+        <source>lupdate version %1
+</source>
+        <translation>lupdate Version %1
+</translation>
+    </message>
 </context>
 <context>
     <name>SourceCodeView</name>
diff --git a/translations/qt_de.ts b/translations/qt_de.ts
index 7a062dc..3b9bbb0 100644
--- a/translations/qt_de.ts
+++ b/translations/qt_de.ts
@@ -1707,19 +1707,19 @@ nach
     <name>QDeclarativeCompositeTypeManager</name>
     <message>
         <source>Resource %1 unavailable</source>
-        <translation>Auf die Ressource %1 konnte nicht zugegriffen werden</translation>
+        <translation type="obsolete">Auf die Ressource %1 konnte nicht zugegriffen werden</translation>
     </message>
     <message>
         <source>Namespace %1 cannot be used as a type</source>
-        <translation>Der Namensraum %1 kann nicht als Typangabe verwendet werden</translation>
+        <translation type="obsolete">Der Namensraum %1 kann nicht als Typangabe verwendet werden</translation>
     </message>
     <message>
         <source>%1 %2</source>
-        <translation>%1 %2</translation>
+        <translation type="obsolete">%1 %2</translation>
     </message>
     <message>
         <source>Type %1 unavailable</source>
-        <translation>Der Typ  %1 ist nicht verfügbar</translation>
+        <translation type="obsolete">Der Typ  %1 ist nicht verfügbar</translation>
     </message>
 </context>
 <context>
@@ -2122,6 +2122,40 @@ nach
     </message>
 </context>
 <context>
+    <name>QDeclarativeTypeData</name>
+    <message>
+        <source>Type %1 unavailable</source>
+        <translation type="obsolete">Der Typ  %1 ist nicht verfügbar</translation>
+    </message>
+    <message>
+        <source>Namespace %1 cannot be used as a type</source>
+        <translation type="obsolete">Der Namensraum %1 kann nicht als Typangabe verwendet werden</translation>
+    </message>
+    <message>
+        <source>%1 %2</source>
+        <translation type="obsolete">%1 %2</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeTypeLoader</name>
+    <message>
+        <source>Script %1 unavailable</source>
+        <translation>Das Skript %1 ist nicht verfügbar</translation>
+    </message>
+    <message>
+        <source>Type %1 unavailable</source>
+        <translation>Der Typ %1 ist nicht verfügbar</translation>
+    </message>
+    <message>
+        <source>Namespace %1 cannot be used as a type</source>
+        <translation>Der Namensraum %1 kann nicht als Typangabe verwendet werden</translation>
+    </message>
+    <message>
+        <source>%1 %2</source>
+        <translation>%1 %2</translation>
+    </message>
+</context>
+<context>
     <name>QDeclarativeVME</name>
     <message>
         <source>Unable to create object of type %1</source>
@@ -3340,7 +3374,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
     <name>QLibrary</name>
     <message>
         <source>Could not mmap &apos;%1&apos;: %2</source>
-        <translation>Operation mmap fehlgeschlagen für &apos;%1&apos;: %2</translation>
+        <translation type="obsolete">Operation mmap fehlgeschlagen für &apos;%1&apos;: %2</translation>
     </message>
     <message>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
@@ -3348,7 +3382,7 @@ Möchten Sie die Datei trotzdem löschen?</translation>
     </message>
     <message>
         <source>Could not unmap &apos;%1&apos;: %2</source>
-        <translation>Operation unmap fehlgeschlagen für &apos;%1&apos;: %2</translation>
+        <translation type="obsolete">Operation unmap fehlgeschlagen für &apos;%1&apos;: %2</translation>
     </message>
     <message>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
diff --git a/translations/qt_help_de.ts b/translations/qt_help_de.ts
index 1f0cf32..ceee5a7 100644
--- a/translations/qt_help_de.ts
+++ b/translations/qt_help_de.ts
@@ -28,7 +28,7 @@
     <name>QHelp</name>
     <message>
         <source>Untitled</source>
-        <translation type="unfinished"></translation>
+        <translation>Ohne Titel</translation>
     </message>
 </context>
 <context>