diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 02:47:19 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 02:47:19 (GMT) |
| commit | 5173a42be2d0121c0f33217cc4d8399070a8aa3b (patch) | |
| tree | 0f8b6cde906ae1d014e730506c2a58fbe2b6079c /tools/linguist/lconvert/main.cpp | |
| parent | 883da42f7c75775502c818aa456c8576d8457ff8 (diff) | |
| parent | 0d156972b868c951fa33f21735040ab1e7a76f21 (diff) | |
| download | Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.zip Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.tar.gz Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/kernel/qmetaobject.cpp
tools/qdoc3/generator.cpp
tools/qdoc3/test/qt-cpp-ignore.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
Diffstat (limited to 'tools/linguist/lconvert/main.cpp')
| -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 534bc11..4bed02f 100644 --- a/tools/linguist/lconvert/main.cpp +++ b/tools/linguist/lconvert/main.cpp @@ -81,10 +81,10 @@ static int usage(const QStringList &args) " --output-format <outformat>\n" " Specify output format. See -if.\n\n" " --input-codec <codec>\n" - " Specify encoding for .qm input files. Default is 'Latin1'.\n" + " Specify encoding for QM input files. Default is 'Latin1'.\n" " UTF-8 is always tried as well, corresponding to the trUtf8() function.\n\n" " --drop-tags <regexp>\n" - " Drop named extra tags when writing 'ts' or 'xlf' files.\n" + " Drop named extra tags when writing TS or XLIFF files.\n" " May be specified repeatedly.\n\n" " --drop-translations\n" " Drop existing translations and reset the status to 'unfinished'.\n" @@ -101,10 +101,10 @@ static int usage(const QStringList &args) " --no-finished\n" " Drop finished messages.\n\n" " --locations {absolute|relative|none}\n" - " Override how source code references are saved in ts files.\n" + " Override how source code references are saved in TS files.\n" " Default is absolute.\n\n" " --no-ui-lines\n" - " Drop line numbers from references to .ui files.\n\n" + " Drop line numbers from references to UI files.\n\n" " --verbose\n" " be a bit more verbose\n\n" "Long options can be specified with only one leading dash, too.\n\n" |