diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-02 18:56:04 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-02 18:56:04 +0200 |
| commit | 87d9469e428296a2fb8d0f266900cdfe816eaf0a (patch) | |
| tree | f8219cadd57c0013f619030b44068adc009e2058 /tools/linguist/lrelease/main.cpp | |
| parent | ceb253c234f840f7aeec10fa4450e840c6b242f4 (diff) | |
| parent | 7c09fda559760b8488d3130a5932fee04b2f6979 (diff) | |
| download | qt4-tools-87d9469e428296a2fb8d0f266900cdfe816eaf0a.tar.gz | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tools/linguist/shared/profileevaluator.cpp
Diffstat (limited to 'tools/linguist/lrelease/main.cpp')
| -rw-r--r-- | tools/linguist/lrelease/main.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp index 0440325442..7d0452f152 100644 --- a/tools/linguist/lrelease/main.cpp +++ b/tools/linguist/lrelease/main.cpp @@ -93,19 +93,6 @@ static bool loadTsFile(Translator &tor, const QString &tsFileName, bool /* verbo } else { if (!cd.errors().isEmpty()) printOut(cd.error()); - const QList<TranslatorMessage> dupes = tor.findDuplicates(); - if (!dupes.isEmpty()) { - qWarning("lrelease error: duplicate messages found in '%s':", - qPrintable(tsFileName)); - foreach (const TranslatorMessage &msg, dupes) { - qWarning("\n* Context: %s\n* Source: %s", - qPrintable(msg.context()), - qPrintable(msg.sourceText())); - if (!msg.comment().isEmpty()) - qWarning("\n* Comment: %s", qPrintable(msg.comment())); - } - ok = false; - } } return ok; } @@ -114,6 +101,8 @@ static bool releaseTranslator(Translator &tor, const QString &qmFileName, bool verbose, bool ignoreUnfinished, bool removeIdentical, TranslatorSaveMode mode) { + Translator::reportDuplicates(tor.resolveDuplicates(), qmFileName, verbose); + if (verbose) printOut(QCoreApplication::tr( "Updating '%1'...\n").arg(qmFileName)); if (removeIdentical) { |