From 3bbc6ce96d0fb08d96214691afbcbe05494b003e Mon Sep 17 00:00:00 2001
From: hefee <me@hefee.de>
Date: Thu, 22 Mar 2018 17:01:25 +0100
Subject: [PATCH] conflict test added.

---
 tests/confict/base   | 40 ++++++++++++++++++++++++++++++++++++++++
 tests/confict/local  | 38 ++++++++++++++++++++++++++++++++++++++
 tests/confict/merged | 42 ++++++++++++++++++++++++++++++++++++++++++
 tests/confict/pot    | 36 ++++++++++++++++++++++++++++++++++++
 tests/confict/remote | 38 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 194 insertions(+)
 create mode 100644 tests/confict/base
 create mode 100644 tests/confict/local
 create mode 100644 tests/confict/merged
 create mode 100644 tests/confict/pot
 create mode 100644 tests/confict/remote

diff --git a/tests/confict/base b/tests/confict/base
new file mode 100644
index 0000000..47cc167
--- /dev/null
+++ b/tests/confict/base
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2017-07-31 21:51+0000\n"
+"PO-Revision-Date: 2017-08-03 18:52+0000\n"
+"Last-Translator: \n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"About\"]]\n"
+msgstr "[[!meta title=\"À propos\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> **amnesia**, *noun*:<br/>\n"
+"> forgetfulness; loss of long-term memory.\n"
+msgstr ""
+"> **amnésie**, *nom*:<br/>\n"
+"> perte de mémoire; de la mémoire à long terme.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> **incognito**, *adjective & adverb*:<br/>\n"
+"> (of a person) having one's true identity concealed.\n"
+msgstr ""
+"> **incognito**, *adjectif & adverbe*:<br/>\n"
+"> se dit d'une personne dont la véritable identité est cachée.\n"
diff --git a/tests/confict/local b/tests/confict/local
new file mode 100644
index 0000000..423c0bd
--- /dev/null
+++ b/tests/confict/local
@@ -0,0 +1,38 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2017-07-31 21:51+0000\n"
+"PO-Revision-Date: 2017-08-03 18:52+0000\n"
+"Last-Translator: \n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"About\"]]\n"
+msgstr "[[!meta title=\"À propos\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> **amnesia**, *noun*:<br/>\n"
+"> forgetfulness; loss of long-term memory.\n"
+msgstr "> Je ne sais pas \n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> **incognito**, *adjective & adverb*:<br/>\n"
+"> (of a person) having one's true identity concealed.\n"
+msgstr ""
+"> **incognito**, *adjectif & adverbe*:<br/>\n"
+"> se dit d'une personne dont la véritable identité est cachée.\n"
diff --git a/tests/confict/merged b/tests/confict/merged
new file mode 100644
index 0000000..afd535e
--- /dev/null
+++ b/tests/confict/merged
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2017-07-31 21:51+0000\n"
+"PO-Revision-Date: 2017-08-03 18:52+0000\n"
+"Last-Translator: \n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"About\"]]\n"
+msgstr "Un nouveau traduction."
+
+#. type: Plain text
+#, fuzzy, no-wrap
+msgid ""
+"> **amnesia**, *noun*:<br/>\n"
+"> forgetfulness; loss of long-term memory.\n"
+msgstr ""
+"#-#-#-#-#  merge-po.PE9w.local-only (Tails)  #-#-#-#-#\n"
+"> Je ne sais pas \n"
+"#-#-#-#-#  merge-po.PE9w.remote-only (Tails)  #-#-#-#-#\n"
+"Un deuxième traduction."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> **incognito**, *adjective & adverb*:<br/>\n"
+"> (of a person) having one's true identity concealed.\n"
+msgstr ""
+"> **incognito**, *adjectif & adverbe*:<br/>\n"
+"> se dit d'une personne dont la véritable identité est cachée.\n"
diff --git a/tests/confict/pot b/tests/confict/pot
new file mode 100644
index 0000000..6296239
--- /dev/null
+++ b/tests/confict/pot
@@ -0,0 +1,36 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr "Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2017-07-31 21:51+0000\n"
+"PO-Revision-Date: 2017-08-03 18:52+0000\n"
+"Last-Translator: \n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"About\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "> **amnesia**, *noun*:<br/>\n"
+"> forgetfulness; loss of long-term memory.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> **incognito**, *adjective & adverb*:<br/>\n"
+"> (of a person) having one's true identity concealed.\n"
+msgstr ""
+
+
diff --git a/tests/confict/remote b/tests/confict/remote
new file mode 100644
index 0000000..a2d2064
--- /dev/null
+++ b/tests/confict/remote
@@ -0,0 +1,38 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2017-07-31 21:51+0000\n"
+"PO-Revision-Date: 2017-08-03 18:52+0000\n"
+"Last-Translator: \n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"About\"]]\n"
+msgstr "Un nouveau traduction."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> **amnesia**, *noun*:<br/>\n"
+"> forgetfulness; loss of long-term memory.\n"
+msgstr "Un deuxième traduction."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> **incognito**, *adjective & adverb*:<br/>\n"
+"> (of a person) having one's true identity concealed.\n"
+msgstr ""
+"> **incognito**, *adjectif & adverbe*:<br/>\n"
+"> se dit d'une personne dont la véritable identité est cachée.\n"
-- 
GitLab