From 50123887ba0f33cf47520bee7c419d68742af2d1 Mon Sep 17 00:00:00 2001
From: Qt by Nokia <qt-info@nokia.com>
Date: Wed, 27 Apr 2011 12:05:43 +0200
Subject: Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12
---
 .../testdata/good/mergeui_obsolete/project.pro     |  3 +++
 .../good/mergeui_obsolete/project.ts.before        | 16 +++++++++++++
 .../good/mergeui_obsolete/project.ts.result        | 22 ++++++++++++++++++
 .../testdata/good/mergeui_obsolete/project.ui      | 26 ++++++++++++++++++++++
 4 files changed, 67 insertions(+)
 create mode 100644 tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
 create mode 100644 tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.before
 create mode 100644 tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.result
 create mode 100644 tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ui

(limited to 'tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete')

diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
new file mode 100644
index 000000000..fa56972dd
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
@@ -0,0 +1,3 @@
+FORMS += project.ui
+
+TRANSLATIONS = project.ts
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.before
new file mode 100644
index 000000000..f06c22ca8
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.before
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE TS><TS version="1.1">
+<context>
+    <name>FindDialog</name>
+    <message>
+        <location filename="project.ui" line="20"/>
+        <source>Test similarity</source>
+        <translation type="unfinished">Test likhet (test1)</translation>
+    </message>
+    <message>
+        <location filename="project.ui" line="23"/>
+        <source>Similarity should have kicked in here!</source>
+        <translation type="unfinished">Test likhet (test2)</translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.result
new file mode 100644
index 000000000..6bc565c1e
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.result
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>Test similarity</source>
+        <translation type="obsolete">Test likhet (test1)</translation>
+    </message>
+    <message>
+        <location filename="project.ui" line="20"/>
+        <source>This should not be considered to be more or less equal to the corresponding one in the TS file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="project.ui" line="23"/>
+        <source>Here, similarity should kick in!</source>
+        <oldsource>Similarity should have kicked in here!</oldsource>
+        <translation type="unfinished">Test likhet (test2)</translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ui b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ui
new file mode 100644
index 000000000..a5f8e9f79
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ui
@@ -0,0 +1,26 @@
+<ui version="4.0" >
+ <author></author>
+ <comment><!--
+*********************************************************************
+**
+** Do not change the location (linenumber) of the <string> elements in this file!
+** That will make the test break!
+**
+** If you need to add some tests, please add them to the end of the file!
+**
+**
+*********************************************************************
+-->
+</comment>
+ <exportmacro></exportmacro>
+ <class>FindDialog</class>
+ <widget class="QWidget" name="FindDialog" >
+  <property name="test1">
+    <!-- If the sourcetext is not similar to the vernacular sourcetext, mark the old one as obsolete and the new one as unfinished -->
+    <string>This should not be considered to be more or less equal to the corresponding one in the TS file.</string>
+  </property>
+  <property name="test2">
+    <string>Here, similarity should kick in!</string>
+  </property>
+ </widget>
+</ui>
-- 
cgit v1.2.3