From f0e285381800c0809e5bfd3a4871a2283ea10fb9 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 12 Aug 2013 15:24:03 +0200 Subject: Doc: Renamed and moved examples/qml/i18n to examples/qml/qml-i18n -the generated HTML page conflicts with the i18n.html page from qtdoc. -edited the content. Task-number: QTBUG-32580 Change-Id: I32ded1913d9faecb95e28043983e957ccd0e8749 Reviewed-by: Martin Smith --- .../qml/qml-i18n/doc/images/qml-i18n-example.png | Bin 0 -> 1945 bytes examples/qml/qml-i18n/doc/src/i18n.qdoc | 55 +++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 examples/qml/qml-i18n/doc/images/qml-i18n-example.png create mode 100644 examples/qml/qml-i18n/doc/src/i18n.qdoc (limited to 'examples/qml/qml-i18n/doc') diff --git a/examples/qml/qml-i18n/doc/images/qml-i18n-example.png b/examples/qml/qml-i18n/doc/images/qml-i18n-example.png new file mode 100644 index 0000000000..02f645e702 Binary files /dev/null and b/examples/qml/qml-i18n/doc/images/qml-i18n-example.png differ diff --git a/examples/qml/qml-i18n/doc/src/i18n.qdoc b/examples/qml/qml-i18n/doc/src/i18n.qdoc new file mode 100644 index 0000000000..5a61906497 --- /dev/null +++ b/examples/qml/qml-i18n/doc/src/i18n.qdoc @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** 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. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ +/*! + \title QML Examples - Internationalization + \example qml-i18n + \image qml-i18n-example.png + \brief This is an internationalization example + + The QML runtime automatically loads a translation from the i18n subdirectory of the root + QML file, based on the system language. + + The files are created or updated by running: + +\code + lupdate qml-i18n.qml -ts i18n/base.ts +\endcode + + Translations for new languages are created by copying \e i18n/base.ts to \e i18n/qml_.ts + The .ts files can then be edited with \l {Qt Linguist}: + +\code + linguist i18n/qml_fr.ts +\endcode + + The run-time translation files are then generated by running: + +\code + lrelease i18n/*.ts +\endcode + +*/ -- cgit v1.2.3