summaryrefslogtreecommitdiffstats
path: root/translations/qt_de.ts
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-19 08:19:49 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-19 08:19:49 (GMT)
commitde0858687898f6e0e54cce3f986779c7aa1a350e (patch)
treedb90ba9785f4492dac7971bbc060be81605b6802 /translations/qt_de.ts
parent85611635a3589d56c2670445ea5272e864e57a98 (diff)
parent650fefd7e25b10d88048d2a465a27c479d80636d (diff)
downloadQt-de0858687898f6e0e54cce3f986779c7aa1a350e.zip
Qt-de0858687898f6e0e54cce3f986779c7aa1a350e.tar.gz
Qt-de0858687898f6e0e54cce3f986779c7aa1a350e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: removed test file, part of mediaservice removal. Rebuild configure.exe Rebuild configure following the removal of media services. More mediaservices removal work. Removed mediaservices.
Diffstat (limited to 'translations/qt_de.ts')
-rw-r--r--translations/qt_de.ts9
1 files changed, 0 insertions, 9 deletions
diff --git a/translations/qt_de.ts b/translations/qt_de.ts
index 86d5edb..226b7da 100644
--- a/translations/qt_de.ts
+++ b/translations/qt_de.ts
@@ -3683,15 +3683,6 @@ Möchten Sie die Datei trotzdem löschen?</translation>
</message>
</context>
<context>
- <name>QGstreamerPlayerSession</name>
- <message>
- <location filename="../src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp" line="+423"/>
- <location line="+16"/>
- <source>Unable to play %1</source>
- <translation>%1 kann nicht abgespielt werden</translation>
- </message>
-</context>
-<context>
<name>QHostInfo</name>
<message>
<location filename="../src/network/kernel/qhostinfo_p.h" line="+103"/>