diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-06 22:40:23 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-06 22:58:01 +0100 |
commit | a66698f947e8ded2e020defa626b154aca1fde9f (patch) | |
tree | b91a1233b0d600ee44bee356b18065b60a4ed8f5 /tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result | |
parent | 44cc160733a70f5dc613faed2051005de7e48f04 (diff) |
handle messages with ids (more) correctly
when comparing two messages which both have ids, compare only the ids.
this affects finding/reporting duplicates and merging.
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result')
-rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result index be4e02ee9d..e9abf89587 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result @@ -2,6 +2,20 @@ <!DOCTYPE TS> <TS version="2.0" language="zh_CN"> <context> + <name></name> + <message id="xx_hello"> + <location filename="finddialog.cpp" line="70"/> + <source>Hello</source> + <translation>Hallo</translation> + </message> + <message id="xx_world"> + <location filename="finddialog.cpp" line="73"/> + <source>New world</source> + <oldsource>World</oldsource> + <translation type="unfinished">Welt</translation> + </message> +</context> +<context> <name>FindDialog</name> <message> <source></source> @@ -45,5 +59,10 @@ <numerusform></numerusform> </translation> </message> + <message id="new_id"> + <location filename="finddialog.cpp" line="77"/> + <source>this is just some text</source> + <translation type="unfinished">Unfertige Uebersetzung</translation> + </message> </context> </TS> |