diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-11 11:17:22 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-11 11:17:22 (GMT) |
| commit | 97447d569999372d43f22dbb1e0fc5193b73615c (patch) | |
| tree | 5b1fb557d6356e4eebe5045009eaa0c4c2138dea /tests/auto/qundostack/testdata/qundostack.ts | |
| parent | eabcaaa9be03674d45e6bb53e098d5b5b3e9ef81 (diff) | |
| parent | 1a742a039802b32cfe2a92d8ef1a04c3a21a964f (diff) | |
| download | Qt-97447d569999372d43f22dbb1e0fc5193b73615c.zip Qt-97447d569999372d43f22dbb1e0fc5193b73615c.tar.gz Qt-97447d569999372d43f22dbb1e0fc5193b73615c.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Conflicts:
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/socket/qabstractsocket.cpp
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
Diffstat (limited to 'tests/auto/qundostack/testdata/qundostack.ts')
| -rw-r--r-- | tests/auto/qundostack/testdata/qundostack.ts | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/qundostack/testdata/qundostack.ts b/tests/auto/qundostack/testdata/qundostack.ts new file mode 100644 index 0000000..4584036 --- /dev/null +++ b/tests/auto/qundostack/testdata/qundostack.ts @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="en"> +<context> + <name>QUndoStack</name> + <message> + <source>Undo %1</source> + <translation>undo-prefix %1 undo-suffix</translation> + </message> + <message> + <source>Undo</source> + <comment>Default text for undo action</comment> + <translation>Undo-default-text</translation> + </message> + <message> + <source>Redo %1</source> + <translation>redo-prefix %1 redo-suffix</translation> + </message> + <message> + <source>Redo</source> + <comment>Default text for redo action</comment> + <translation>Redo-default-text</translation> + </message> +</context> +</TS> |