summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-07-23 05:01:40 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-07-23 05:01:40 (GMT)
commitd1072c333225ded9e46cf857bef701cc67f6fc1d (patch)
treed20b15a94385a78f907350a0f74b9faa905eff3d /tools/linguist/lupdate
parent4f35294d737d9059398b2c8f714c8e0ea37079ed (diff)
parentc42f7058dfd7ea551b2d3bca5651b0c802c91259 (diff)
downloadQt-d1072c333225ded9e46cf857bef701cc67f6fc1d.zip
Qt-d1072c333225ded9e46cf857bef701cc67f6fc1d.tar.gz
Qt-d1072c333225ded9e46cf857bef701cc67f6fc1d.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: configure configure.exe src/gui/kernel/qaction.h
Diffstat (limited to 'tools/linguist/lupdate')
-rw-r--r--tools/linguist/lupdate/main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 7cf7b54..e2acbbb 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -203,6 +203,11 @@ static void updateTsFiles(const Translator &fetchedTor, const QStringList &tsFil
out.stripObsoleteMessages();
out.stripEmptyContexts();
+ out.normalizeTranslations(cd);
+ if (!cd.errors().isEmpty()) {
+ printOut(cd.error());
+ cd.clearErrors();
+ }
if (!out.save(fileName, cd, QLatin1String("auto"))) {
printOut(cd.error());
*fail = true;