diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-22 16:13:23 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-22 16:13:23 +1000 |
| commit | 430ec8741e6c42a9f618b7d5246838bd50edd292 (patch) | |
| tree | e2e16199bb116d936a86da40b3466b406f8027f0 /tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.ts | |
| parent | f60a61157cb361e19c50eb53391f18b82990a026 (diff) | |
| parent | 6938289ce3e1e29cc81f0e007390e0b5f6ef1a43 (diff) | |
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8
Conflicts:
src/declarative/items/qsgcontext2d.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
tests/auto/declarative/declarative.pro
tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
Diffstat (limited to 'tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.ts')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.ts | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.ts b/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.ts new file mode 100644 index 0000000000..bff39b80b6 --- /dev/null +++ b/tests/auto/declarative/qdeclarativetranslation/data/qmlid_fr.ts @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="fr"> +<context> + <name></name> + <message id="qtn_hello_world"> + <location filename="idtranslation.qml" line="4"/> + <location filename="idtranslation.qml" line="5"/> + <source></source> + <translation>bonjour tout le monde</translation> + </message> +</context> +</TS> |