summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 11:48:18 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 11:48:18 (GMT)
commitc0194be546e436cdc3294bca4c3c378a15d3b9cc (patch)
treef72cbdd3bfb4da6c25112aa92a13f2bff685012d /doc/src/snippets/code
parent264e471fd780ea9570daa7be608939c9fff75114 (diff)
parentcb50699b39e016a64a2a06088042622546c428a2 (diff)
downloadQt-c0194be546e436cdc3294bca4c3c378a15d3b9cc.zip
Qt-c0194be546e436cdc3294bca4c3c378a15d3b9cc.tar.gz
Qt-c0194be546e436cdc3294bca4c3c378a15d3b9cc.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (167 commits) Fix warning introduced by last commit on hiding of the 'd' member Fix access to uninitialised memory in case of new throwing Remove accidentially committed .qmlproject.user file, ignore this filetype Corrected build fail for autotests QComboBox popup is shown in incorrect location with bottom CBA Fix Flipable docs Fall back to Qt for loading images with DICAPS_COLORKEY. Implement QWidget::metric PdmNumColors for QWS Adding ::scroll capabilities to live pixmaps. Major refactoring: creating a new QPixmapData subclass for live textures. QS60Style: The QComboBox/QSpinBox text color is not according to theme Using TLS to store QThreadData on Symbian In meego, support Format_RGB32 too for eglShared images. Remove unnecessary rounding Functions that are externally defined to QtOpenGL needs to be imported. Make sure d->ranges does not have invalid ranges before processing it. Added include for missing file for Symbian3 Support for clipboard between Qt and Symbian applications Flickable 'moving' parameter stays at true when setting contentY. Fix network request completion crashing on a canceled pixmap request ...
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