diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-26 09:26:53 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-26 09:26:53 +1000 |
| commit | cbb1b29d397c063fc3bcae04c5b062f20cbd12c5 (patch) | |
| tree | d89cebe45c9f6dfdcab34a95da19ee0d670e30f5 /tools/linguist/lupdate/main.cpp | |
| parent | ed7d58f6668be4ffb5f915722dee81c864f74844 (diff) | |
| parent | 9aa00de1d277763c0f7a380fde27face60e5f686 (diff) | |
| download | qt4-tools-cbb1b29d397c063fc3bcae04c5b062f20cbd12c5.tar.gz | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
tools/qdoc3/cppcodemarker.cpp
Diffstat (limited to 'tools/linguist/lupdate/main.cpp')
| -rw-r--r-- | tools/linguist/lupdate/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index d570e0240a..af40616343 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -160,6 +160,8 @@ static void updateTsFiles(const Translator &fetchedTor, const QStringList &tsFil tor.setCodecName(codecForTr); if (!targetLanguage.isEmpty()) tor.setLanguageCode(targetLanguage); + else + tor.setLanguageCode(Translator::guessLanguageCodeFromFileName(fileName)); if (!sourceLanguage.isEmpty()) tor.setSourceLanguageCode(sourceLanguage); } |