diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 08:19:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 08:19:49 (GMT) |
| commit | de0858687898f6e0e54cce3f986779c7aa1a350e (patch) | |
| tree | db90ba9785f4492dac7971bbc060be81605b6802 /translations | |
| parent | 85611635a3589d56c2670445ea5272e864e57a98 (diff) | |
| parent | 650fefd7e25b10d88048d2a465a27c479d80636d (diff) | |
| download | Qt-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')
| -rw-r--r-- | translations/qt_de.ts | 9 | ||||
| -rw-r--r-- | translations/qt_pl.ts | 42 |
2 files changed, 0 insertions, 51 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"/> diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts index a089cb6..1f5ceb0 100644 --- a/translations/qt_pl.ts +++ b/translations/qt_pl.ts @@ -3757,15 +3757,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</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>Nie można odtworzyć %1</translation> - </message> -</context> -<context> <name>QHostInfo</name> <message> <location filename="../src/network/kernel/qhostinfo_p.h" line="+103"/> @@ -4592,39 +4583,6 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation> </message> </context> <context> - <name>QMediaPlayer</name> - <message> - <location filename="../src/multimedia/mediaservices/playback/qmediaplayer.cpp" line="+496"/> - <source>The QMediaPlayer object does not have a valid service</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>QMediaPlaylist</name> - <message> - <location filename="../src/multimedia/mediaservices/base/qmediaplaylist.cpp" line="+455"/> - <location line="+46"/> - <source>Could not add items to read only playlist.</source> - <translation>Nie można dodać elementów do listy odtwarzania (tylko do odczytu).</translation> - </message> - <message> - <location line="-27"/> - <location line="+46"/> - <source>Playlist format is not supported</source> - <translation>Format listy odtwarzania nie jest obsługiwany</translation> - </message> - <message> - <location line="+26"/> - <source>The file could not be accessed.</source> - <translation>Brak dostępu do pliku.</translation> - </message> - <message> - <location line="+35"/> - <source>Playlist format is not supported.</source> - <translation>Format listy odtwarzania nie jest obsługiwany.</translation> - </message> -</context> -<context> <name>QMenu</name> <message> <location filename="../src/plugins/accessible/widgets/qaccessiblemenu.cpp" line="+157"/> |