summaryrefslogtreecommitdiffstats
path: root/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2009-11-23 13:07:40 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2009-11-23 13:07:40 (GMT)
commitf54e239174cea9ce54acd8fd7e6360a663bcfcae (patch)
tree9b1016cde186982a757a3764167bd1d509d2b281 /tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result
parent772dffde89f33d7738207a32455b8b7c81e73551 (diff)
parentc7f14f778b3e974631d29cb1ad87891f6b350f61 (diff)
downloadQt-f54e239174cea9ce54acd8fd7e6360a663bcfcae.zip
Qt-f54e239174cea9ce54acd8fd7e6360a663bcfcae.tar.gz
Qt-f54e239174cea9ce54acd8fd7e6360a663bcfcae.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result')
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result16
1 files changed, 13 insertions, 3 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result
index 26eb245..d548e24 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.ts.result
@@ -11,17 +11,27 @@
</message>
<message>
<location filename="main.cpp" line="52"/>
- <source>this contains an umlaut ü &amp;uuml;</source>
+ <source>this contains an umlaut ü &amp;uuml; literally</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cpp" line="53"/>
+ <source>this contains an umlaut ü &amp;uuml; escaped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="main.cpp" line="54"/>
<source>random ascii only in utf8</source>
<translation type="unfinished"></translation>
</message>
<message utf8="true">
- <location filename="main.cpp" line="54"/>
- <source>umlaut ü &amp;uuml; in utf8</source>
+ <location filename="main.cpp" line="55"/>
+ <source>umlaut ü &amp;uuml; in literal utf8</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message utf8="true">
+ <location filename="main.cpp" line="56"/>
+ <source>umlaut ü &amp;uuml; in escaped utf8</source>
<translation type="unfinished"></translation>
</message>
</context>