summaryrefslogtreecommitdiffstats
path: root/tools/linguist
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-10-01 16:10:22 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-10-01 16:10:22 (GMT)
commit30d9101ecabeb0778c829c3578f1fcf5ec276a8c (patch)
treed6d67506c2bae71bf967845ff503e02dd41372ae /tools/linguist
parent6ee282013b82b5f46fa972296b801eab55c614c1 (diff)
parent984fe9ebfc6d9582d21bcf1d09cb0578fd163f54 (diff)
downloadQt-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')
-rw-r--r--tools/linguist/lconvert/main.cpp8
-rw-r--r--tools/linguist/lupdate/main.cpp9
2 files changed, 8 insertions, 9 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)
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index e8cf121..6b554e0 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -114,12 +114,11 @@ static void printUsage()
" Name of a .pro file. Useful for files with .pro\n"
" file syntax but different file suffix\n"
" -source-language <language>[_<region>]\n"
- " Specify/override the language of the source strings. Defaults to\n"
- " POSIX if not specified and the file does not name it yet.\n"
+ " Specify the language of the source strings for new files.\n"
+ " Defaults to POSIX if not specified.\n"
" -target-language <language>[_<region>]\n"
- " Specify/override the language of the translation.\n"
- " The target language is guessed from the file name if this option\n"
- " is not specified and the file contents name no language yet.\n"
+ " Specify the language of the translations for new files.\n"
+ " Guessed from the file name if not specified.\n"
" -version\n"
" Display the version of lupdate and exit.\n"
).arg(m_defaultExtensions));