diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 02:21:39 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 02:21:39 (GMT) |
commit | 2b6339d3b8f333a686b5e215de280819a6c178bd (patch) | |
tree | 431955cffb241f1a82b47b1d4e8397c4743829e3 /examples/declarative/i18n | |
parent | 7f3d9a76e9d956d9e7e4398ac20785070e214958 (diff) | |
parent | 2e0b872ed3f15db3f54fcf0cff7f2e412ba56e46 (diff) | |
download | Qt-2b6339d3b8f333a686b5e215de280819a6c178bd.zip Qt-2b6339d3b8f333a686b5e215de280819a6c178bd.tar.gz Qt-2b6339d3b8f333a686b5e215de280819a6c178bd.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add screenshots for most examples and demos
Rename example: edit -> textselection
Clean up some examples
Rename example and add minor improvements
Rename example image file
Spelling fix
Diffstat (limited to 'examples/declarative/i18n')
-rw-r--r-- | examples/declarative/i18n/i18n.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/i18n/i18n.qml b/examples/declarative/i18n/i18n.qml index 7bbb19c..5c2702c 100644 --- a/examples/declarative/i18n/i18n.qml +++ b/examples/declarative/i18n/i18n.qml @@ -65,7 +65,7 @@ Rectangle { anchors.fill: parent; spacing: 20 Text { - text: "If a translation is available for the system language (eg. French) then the string below will translated (eg. 'Bonjour'). Otherwise is will show 'Hello'." + text: "If a translation is available for the system language (eg. French) then the string below will translated (eg. 'Bonjour'). Otherwise it will show 'Hello'." width: parent.width; wrapMode: Text.WordWrap } |