diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-20 13:51:58 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-20 13:51:58 +0200 |
| commit | 1a632e1bc677fce4b8d5450ce4a971fdde3ed42f (patch) | |
| tree | 222c48a9d90097b3ea61cb2839b6541eff185c3a /tools/linguist/lupdate/main.cpp | |
| parent | 9bd8df2b405ef517d2d1b209b8004aaaa4994242 (diff) | |
| parent | 3d6381b47a6048d04dbfc7b6984cae81c02d4fe6 (diff) | |
Merge commit 'origin/4.5'
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
src/3rdparty/webkit/WebCore/page/DOMWindow.idl
src/corelib/io/qdiriterator.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
tests/auto/qxmlquery/tst_qxmlquery.cpp
tools/linguist/lconvert/main.cpp
Diffstat (limited to 'tools/linguist/lupdate/main.cpp')
| -rw-r--r-- | tools/linguist/lupdate/main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index ba5f45efbf..6a1edc484a 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; |