diff options
| author | axis <qt-info@nokia.com> | 2009-04-24 14:03:55 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-04-27 07:09:01 (GMT) |
| commit | e74c8dc65e2feffb9a55d00aee5ca634fba41df8 (patch) | |
| tree | 3a131f9235fb6a455793178d8313655e4fd0036e /translations/qt_help_de.ts | |
| parent | 8f427b2b914d5b575a4a7c0ed65d2fb8f45acc76 (diff) | |
| parent | 211bea9838bcc2acd7f54b65468fe1be2d81b1e0 (diff) | |
| download | Qt-e74c8dc65e2feffb9a55d00aee5ca634fba41df8.zip Qt-e74c8dc65e2feffb9a55d00aee5ca634fba41df8.tar.gz Qt-e74c8dc65e2feffb9a55d00aee5ca634fba41df8.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Configure.exe recompiled with MSVC6.
Conflicts:
configure.exe
examples/network/network.pro
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qfilesystemmodel_p.h
src/gui/kernel/qapplication.cpp
tests/auto/_Categories/qmake.txt
tests/auto/qfile/test/test.pro
tests/auto/qfile/tst_qfile.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qline/tst_qline.cpp
tests/auto/qstyle/tst_qstyle.cpp
tests/auto/qtextstream/tst_qtextstream.cpp
tests/auto/qtranslator/qtranslator.pro
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
translations/qt_ja_JP.ts
Diffstat (limited to 'translations/qt_help_de.ts')
| -rw-r--r-- | translations/qt_help_de.ts | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/translations/qt_help_de.ts b/translations/qt_help_de.ts index 45ddf03..ed8a3c3 100644 --- a/translations/qt_help_de.ts +++ b/translations/qt_help_de.ts @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de"> -<defaultcodec></defaultcodec> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>QCLuceneResultWidget</name> <message> - <location filename="../tools/assistant/lib/qhelpsearchresultwidget.cpp" line="+80"/> + <location filename="../tools/assistant/lib/qhelpsearchresultwidget.cpp" line="+110"/> <source>Search Results</source> <translation>Ergebnisse</translation> </message> @@ -32,7 +32,7 @@ <context> <name>QHelpCollectionHandler</name> <message> - <location filename="../tools/assistant/lib/qhelpcollectionhandler.cpp" line="+49"/> + <location filename="../tools/assistant/lib/qhelpcollectionhandler.cpp" line="+79"/> <source>The collection file is not set up yet!</source> <translation>Das "Collection File" ist noch nicht eingerichtet.</translation> </message> @@ -111,7 +111,7 @@ <context> <name>QHelpDBReader</name> <message> - <location filename="../tools/assistant/lib/qhelpdbreader.cpp" line="+65"/> + <location filename="../tools/assistant/lib/qhelpdbreader.cpp" line="+95"/> <source>Cannot open database '%1' '%2': %3</source> <translation>Kann Datenbank nicht öffnen: '%1' '%2': %3</translation> </message> @@ -119,7 +119,7 @@ <context> <name>QHelpEngineCore</name> <message> - <location filename="../tools/assistant/lib/qhelpenginecore.cpp" line="+482"/> + <location filename="../tools/assistant/lib/qhelpenginecore.cpp" line="+516"/> <source>The specified namespace does not exist!</source> <translation>Der angegebene Namensraum existiert nicht!</translation> </message> @@ -127,7 +127,7 @@ <context> <name>QHelpEngineCorePrivate</name> <message> - <location line="-390"/> + <location line="-394"/> <source>Cannot open documentation file %1: %2!</source> <translation>Kann Dokumentations-Datei nicht öffnen: %1: %2!</translation> </message> @@ -135,7 +135,7 @@ <context> <name>QHelpGenerator</name> <message> - <location filename="../tools/assistant/lib/qhelpgenerator.cpp" line="+127"/> + <location filename="../tools/assistant/lib/qhelpgenerator.cpp" line="+157"/> <source>Invalid help data!</source> <translation>Ungültige Hilfe-Daten!</translation> </message> @@ -180,7 +180,7 @@ <translation>Dokumentation erfolgreich generiert.</translation> </message> <message> - <location line="+72"/> + <location line="+76"/> <source>Some tables already exist!</source> <translation>Einige Tabellen existieren bereits!</translation> </message> @@ -210,7 +210,7 @@ <translation>Kann Datei %1 nicht öffnen! Überspringe sie.</translation> </message> <message> - <location line="+132"/> + <location line="+134"/> <source>The filter %1 is already registered!</source> <translation>Der Filter %1 is bereits registriert!</translation> </message> @@ -243,7 +243,7 @@ <context> <name>QHelpSearchQueryWidget</name> <message> - <location filename="../tools/assistant/lib/qhelpsearchquerywidget.cpp" line="+170"/> + <location filename="../tools/assistant/lib/qhelpsearchquerywidget.cpp" line="+200"/> <source>Search for:</source> <translation>Suche nach:</translation> </message> @@ -286,7 +286,7 @@ <context> <name>QHelpSearchResultWidget</name> <message> - <location filename="../tools/assistant/lib/qhelpsearchresultwidget.cpp" line="+232"/> + <location filename="../tools/assistant/lib/qhelpsearchresultwidget.cpp" line="+235"/> <source>0 - 0 of 0 Hits</source> <translation>0 - 0 von 0 Treffern</translation> </message> @@ -302,12 +302,12 @@ <context> <name>QObject</name> <message> - <location filename="../tools/assistant/lib/qhelp_global.h" line="+53"/> + <location filename="../tools/assistant/lib/qhelp_global.h" line="+83"/> <source>Untitled</source> <translation>Ohne Titel</translation> </message> <message> - <location filename="../tools/assistant/lib/qhelpprojectdata.cpp" line="+50"/> + <location filename="../tools/assistant/lib/qhelpprojectdata.cpp" line="+80"/> <source>Unknown token.</source> <translation>Unbekanntes Token.</translation> </message> |