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: (96 commits)
  Unbreak the Maemo 5 build after the Symbian fix
  QNAM HTTP: Fix problem with cached files and metaDataChanged()
  Add a testcase for QTBUG-11213 to prevent future regressions.
  Autotest: reenable the NTLM proxy test on tst_QTcpSocket
  Autotest: add a small, boring test for QAuthenticator
  Add documentation for the QAuthenticator options.
  Expose the QAuthenticator map of options in the API.
  Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader
  Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC"
  Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa
  Add unit tests for QMimeData.
  fix qconfig.h reference for shadow builds
  Drag and drop cursor doesnot change on invalid drop areas (Cocoa)
  Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa
  fix qconfig.h aliased header creation
  fix warning directive on gnuc
  qdoc: Removed navigation arrow that was causing display problems.
  Silence warning when building with MSVC 2005
  Fix an Assert in QTextTable
  Revert "Fix an Assert in QTextTable"
  ...

2 files changed, 49 insertions, 7 deletions

diff --git a/translations/qt_de.ts b/translations/qt_de.ts
index 7d32ead..74bd048 100644
--- a/translations/qt_de.ts
+++ b/translations/qt_de.ts
@@ -2024,6 +2024,11 @@ nach
         <translation>Signalnamen dürfen nicht mit einem Großbuchstaben beginnen</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Illegal signal name</source>
+        <translation>Ungültiger Name für Signal</translation>
+    </message>
+    <message>
         <location line="+6"/>
         <source>Duplicate method name</source>
         <translation>Mehrfaches Auftreten eines Methodennamens</translation>
@@ -2034,6 +2039,11 @@ nach
         <translation>Methodennamen dürfen nicht mit einem Großbuchstaben beginnen</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Illegal method name</source>
+        <translation>Ungültiger Name für Methode</translation>
+    </message>
+    <message>
         <location line="+21"/>
         <source>Property value set multiple times</source>
         <translation>Mehrfache Zuweisung eines Wertes an eine Eigenschaft</translation>
@@ -7713,21 +7723,53 @@ Bitte wählen Sie einen anderen Dateinamen.</translation>
         <translation>Kontext4</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Call</source>
+        <extracomment>Button to start a call (note: a separate button is used to end the call)</extracomment>
         <translation>Anruf</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Hangup</source>
+        <extracomment>Button to end a call (note: a separate button is used to start the call)</extracomment>
         <translation>Auflegen</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Toggle Call/Hangup</source>
+        <extracomment>Button that will hang up if we&apos;re in call, or make a call if we&apos;re not.</extracomment>
+        <translation>Anrufen/Aufhängen</translation>
+    </message>
+    <message>
         <location line="+1"/>
         <source>Flip</source>
         <translation>Umdrehen</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>Voice Dial</source>
+        <extracomment>Button to trigger voice dialling</extracomment>
+        <translation>Sprachwahl</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Last Number Redial</source>
+        <extracomment>Button to redial the last number called</extracomment>
+        <translation>Wahlwiederholung</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Camera Shutter</source>
+        <extracomment>Button to trigger the camera shutter (take a picture)</extracomment>
+        <translation>Auslöser</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Camera Focus</source>
+        <extracomment>Button to focus the camera</extracomment>
+        <translation>Scharfstellen</translation>
+    </message>
+    <message>
         <location line="+4"/>
         <source>Kanji</source>
         <translation>Kanji</translation>
diff --git a/translations/translations.pri b/translations/translations.pri
index 9ab72fc..f5e54ca 100644
--- a/translations/translations.pri
+++ b/translations/translations.pri
@@ -40,7 +40,7 @@ ts-qt.depends = sub-tools
 ###### Designer
 
 ts-designer.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
-                                    ../tools/designer/translations/translations.pro)
+                                    ../tools/designer/designer.pro)
 ts-designer.depends = sub-tools
 
 ###### Linguist
@@ -52,21 +52,21 @@ ts-linguist.depends = sub-tools
 ###### Assistant
 
 ts-assistant.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
-                                    ../tools/assistant/translations/translations.pro \
+                                    ../tools/assistant/tools/assistant/assistant.pro \
                                     && $$LUPDATE \
-                                    ../tools/assistant/translations/qt_help.pro)
+                                    ../tools/assistant/lib/lib.pro)
 ts-assistant.depends = sub-tools
 
 ###### Qtconfig
 
 ts-qtconfig.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
-                                    ../tools/qtconfig/translations/translations.pro)
+                                    ../tools/qtconfig/qtconfig.pro)
 ts-qtconfig.depends = sub-tools
 
 ###### Qvfp
 
 ts-qvfb.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \
-                                    ../tools/qvfb/translations/translations.pro)
+                                    ../tools/qvfb/qvfb.pro)
 ts-qvfb.depends = sub-tools
 
 ###### Overall Rules