diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
| commit | 9c54d0ef8f6442e32d5762edccef46db80b68681 (patch) | |
| tree | 0fdbc2be98a2e7fd7728a3860d56c94db3e173bb /examples/qml/i18n | |
| parent | 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763 (diff) | |
| parent | 36a42ed6b11dce102d0e0f93fbd441011b003157 (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
Diffstat (limited to 'examples/qml/i18n')
| -rw-r--r-- | examples/qml/i18n/doc/src/i18n.qdoc | 9 | ||||
| -rw-r--r-- | examples/qml/i18n/i18n.qml | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/examples/qml/i18n/doc/src/i18n.qdoc b/examples/qml/i18n/doc/src/i18n.qdoc index 888a98105b..a342e99ea5 100644 --- a/examples/qml/i18n/doc/src/i18n.qdoc +++ b/examples/qml/i18n/doc/src/i18n.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -35,14 +35,21 @@ The files are created/updated by running: +\code lupdate i18n.qml -ts i18n/base.ts +\endcode Translations for new languages are created by copying i18n/base.ts to i18n/qml_<lang>.ts The .ts files can then be edited with Linguist: +\code linguist i18n/qml_fr.ts +\endcode The run-time translation files are then generated by running: +\code lrelease i18n/*.ts +\endcode + */ diff --git a/examples/qml/i18n/i18n.qml b/examples/qml/i18n/i18n.qml index c02082ca34..00fc310a6c 100644 --- a/examples/qml/i18n/i18n.qml +++ b/examples/qml/i18n/i18n.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. |