summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-14 21:18:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-14 21:18:16 (GMT)
commit817e6fef7c538a87cfc62b6f02d14b3e5aa39468 (patch)
tree7e48a8c60513a32139d87ce2c14e8667e0c5bdff /doc/src/snippets/code
parent9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff)
parent830df741afc987f12d744bfab8a4b9ee538c212a (diff)
downloadQt-817e6fef7c538a87cfc62b6f02d14b3e5aa39468.zip
Qt-817e6fef7c538a87cfc62b6f02d14b3e5aa39468.tar.gz
Qt-817e6fef7c538a87cfc62b6f02d14b3e5aa39468.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (61 commits) tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11 tst_qcompleter.cpp: fix test on mac. Fixed autotest that was missing focus on Windows QGraphicsLayoutItem - user set sizes should always override, even if there's a constraint QGridLayoutEngine - Rework height-for-width support so that row/col spanning works Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"" Fixed statement about const_iterator and some whitespace fixes. Adjust the parent index for the itemsMoved call. Correctly handle both 16bit and 32bit live pixmaps in meego graphics system. Correctly remove the egl alpha surface flags in meego graphics system. Proper dither & proper alpha checking. In meego graphics system, use always 16bit textures. QCompleter: do not auto complete when directory is changed. tst_qcompleter: Add a test for QFileSystemModel Doc: adjusting the search field width Doc - remove disclaimer Added the default format of QTime::toString(). Moved the property documentation to its proper location. Added Q_INVOKABLE to ignore file. Made several QMenuBar functions visible to qdoc and added documentation. ...
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r--doc/src/snippets/code/doc_src_linguist-manual.qdoc10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/src/snippets/code/doc_src_linguist-manual.qdoc b/doc/src/snippets/code/doc_src_linguist-manual.qdoc
index db99120..294afe0 100644
--- a/doc/src/snippets/code/doc_src_linguist-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_linguist-manual.qdoc
@@ -92,8 +92,15 @@ Options:
Usage:
lrelease [options] project-file
lrelease [options] ts-files [-qm qm-file]
+
+lrelease is part of Qt's Linguist tool chain. It can be used as a
+stand-alone tool to convert XML-based translations files in the TS
+format into the 'compiled' QM format used by QTranslator objects.
+
Options:
-help Display this information and exit
+ -idbased
+ Use IDs instead of source strings for message keying
-compress
Compress the QM files
-nounfinished
@@ -101,6 +108,9 @@ Options:
-removeidentical
If the translated text is the same as
the source text, do not include the message
+ -markuntranslated <prefix>
+ If a message has no real translation, use the source text
+ prefixed with the given string instead
-silent
Do not explain what is being done
-version