diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-17 12:39:11 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-17 12:39:11 +0200 |
commit | e137877eaaa3975a6769fd2dd574bd75876fcfa5 (patch) | |
tree | a397bdb1389ea02e6fb7b083e3e149b8a0de50cf /examples/qml/qml-i18n/i18n/qml_en_AU.ts | |
parent | 6b53e7e16df0a2451d2b7948ad35485301c564b6 (diff) | |
parent | 369998639b37b5de46ab1b19b3dd6ca6c2b77d34 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
examples/quick/demos/photoviewer/i18n/qml_de.ts
examples/quick/demos/photoviewer/i18n/qml_fr.ts
examples/quick/demos/photoviewer/photoviewer.pro
examples/quick/demos/photoviewer/qml.qrc
src/qml/compiler/qv4instr_moth_p.h
tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
Change-Id: Ibea76b468577c2a68bd305cee82ae6444d0f8073
Diffstat (limited to 'examples/qml/qml-i18n/i18n/qml_en_AU.ts')
-rw-r--r-- | examples/qml/qml-i18n/i18n/qml_en_AU.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/qml/qml-i18n/i18n/qml_en_AU.ts b/examples/qml/qml-i18n/i18n/qml_en_AU.ts index 047817d006..86ccfb7bf8 100644 --- a/examples/qml/qml-i18n/i18n/qml_en_AU.ts +++ b/examples/qml/qml-i18n/i18n/qml_en_AU.ts @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="en_AU" sourcelanguage="en"> +<TS version="2.1" language="en_AU" sourcelanguage="en"> <context> <name>qml-i18n</name> <message> - <location filename="../qml-i18n.qml" line="56"/> + <location filename="../qml-i18n.qml" line="66"/> <source>Hello</source> <translation>G'day</translation> </message> |