diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-10-01 16:10:22 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-10-01 16:10:22 (GMT) |
| commit | 30d9101ecabeb0778c829c3578f1fcf5ec276a8c (patch) | |
| tree | d6d67506c2bae71bf967845ff503e02dd41372ae /tools/linguist/lconvert | |
| parent | 6ee282013b82b5f46fa972296b801eab55c614c1 (diff) | |
| parent | 984fe9ebfc6d9582d21bcf1d09cb0578fd163f54 (diff) | |
| download | Qt-30d9101ecabeb0778c829c3578f1fcf5ec276a8c.zip Qt-30d9101ecabeb0778c829c3578f1fcf5ec276a8c.tar.gz Qt-30d9101ecabeb0778c829c3578f1fcf5ec276a8c.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/linguist/lconvert')
| -rw-r--r-- | tools/linguist/lconvert/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp index 67553a0..6f5f86a 100644 --- a/tools/linguist/lconvert/main.cpp +++ b/tools/linguist/lconvert/main.cpp @@ -234,10 +234,6 @@ int main(int argc, char *argv[]) return usage(args); tr.setLanguageCode(Translator::guessLanguageCodeFromFileName(inFiles[0].name)); - if (!targetLanguage.isEmpty()) - tr.setLanguageCode(targetLanguage); - if (!sourceLanguage.isEmpty()) - tr.setSourceLanguageCode(sourceLanguage); if (!tr.load(inFiles[0].name, cd, inFiles[0].format)) { qWarning() << qPrintable(cd.error()); @@ -256,6 +252,10 @@ int main(int argc, char *argv[]) tr.replaceSorted(tr2.message(j)); } + if (!targetLanguage.isEmpty()) + tr.setLanguageCode(targetLanguage); + if (!sourceLanguage.isEmpty()) + tr.setSourceLanguageCode(sourceLanguage); if (noObsolete) tr.stripObsoleteMessages(); if (noFinished) |