diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-01 15:51:27 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-02 07:56:07 (GMT) |
commit | 385bb34a9dc8e7bd6d1d3c11247862b87978d629 (patch) | |
tree | a93c84529181ab715bf44648ea9287727bd01a55 /tools/linguist/lconvert | |
parent | 4e036ebbc6351a9bd6597e89a803f5c4de746092 (diff) | |
download | Qt-385bb34a9dc8e7bd6d1d3c11247862b87978d629.zip Qt-385bb34a9dc8e7bd6d1d3c11247862b87978d629.tar.gz Qt-385bb34a9dc8e7bd6d1d3c11247862b87978d629.tar.bz2 |
duplicate message handling improvements
- lrelease will not abort on duplicates any more
- lconvert now gets noisy, but only if messages within one file are
duplicated (combining files with identical messages is ok)
- lupdate stays silent, but will eliminate duplicates again
- consolidate handling of dual-encoded and duplicate messages - for
performance
- instead of the format loader, now the app is responsible for calling
the duplicate handler. this allows for the fine-grained control
necessary for optimal performance.
Task-number: 247738
Diffstat (limited to 'tools/linguist/lconvert')
-rw-r--r-- | tools/linguist/lconvert/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp index 2842bc7..9ccc60e 100644 --- a/tools/linguist/lconvert/main.cpp +++ b/tools/linguist/lconvert/main.cpp @@ -210,6 +210,7 @@ int main(int argc, char *argv[]) qWarning() << qPrintable(cd.error()); return 2; } + Translator::reportDuplicates(tr.resolveDuplicates(), inFiles[0].name, verbose); for (int i = 1; i < inFiles.size(); ++i) { Translator tr2; @@ -217,6 +218,7 @@ int main(int argc, char *argv[]) qWarning() << qPrintable(cd.error()); return 2; } + Translator::reportDuplicates(tr2.resolveDuplicates(), inFiles[i].name, verbose); for (int j = 0; j < tr2.messageCount(); ++j) tr.replaceSorted(tr2.message(j)); } |