Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

16 files changed, 48 insertions, 48 deletions

diff --git a/source/om/helpcontent2/source/text/scalc/01.po b/source/om/helpcontent2/source/text/scalc/01.po
index 95215149344..d6ddf73b9ca 100644
--- a/source/om/helpcontent2/source/text/scalc/01.po
+++ b/source/om/helpcontent2/source/text/scalc/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/scalc/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-07-04 18:25+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 04090000.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/scalc/guide.po b/source/om/helpcontent2/source/text/scalc/guide.po
index 7b9a1140f46..4f95832c923 100644
--- a/source/om/helpcontent2/source/text/scalc/guide.po
+++ b/source/om/helpcontent2/source/text/scalc/guide.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/scalc/guide
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-09 12:03+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: scenario.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/shared.po b/source/om/helpcontent2/source/text/shared.po
index f58c3075ed2..b00d6bd34b6 100644
--- a/source/om/helpcontent2/source/text/shared.po
+++ b/source/om/helpcontent2/source/text/shared.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-09 12:03+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: main0212.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/shared/00.po b/source/om/helpcontent2/source/text/shared/00.po
index 6cafa82a00e..180ac81a719 100644
--- a/source/om/helpcontent2/source/text/shared/00.po
+++ b/source/om/helpcontent2/source/text/shared/00.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/00
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:14+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 00000407.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/shared/01.po b/source/om/helpcontent2/source/text/shared/01.po
index c0a191dcf9d..04e7dc6dba2 100644
--- a/source/om/helpcontent2/source/text/shared/01.po
+++ b/source/om/helpcontent2/source/text/shared/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:15+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: extensionupdate.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/shared/02.po b/source/om/helpcontent2/source/text/shared/02.po
index 969f53a2e0b..c3ad12e5a57 100644
--- a/source/om/helpcontent2/source/text/shared/02.po
+++ b/source/om/helpcontent2/source/text/shared/02.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/02
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-09 12:03+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01170101.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/shared/explorer/database.po b/source/om/helpcontent2/source/text/shared/explorer/database.po
index 015c621f37b..da8bd83a0f9 100644
--- a/source/om/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/om/helpcontent2/source/text/shared/explorer/database.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/explorer/database
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-09 12:03+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 11170100.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/shared/guide.po b/source/om/helpcontent2/source/text/shared/guide.po
index 54fb5bf6b2c..352b6adfeed 100644
--- a/source/om/helpcontent2/source/text/shared/guide.po
+++ b/source/om/helpcontent2/source/text/shared/guide.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/guide
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-01-11 17:56+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: pageformat_max.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/shared/optionen.po b/source/om/helpcontent2/source/text/shared/optionen.po
index 5c25b8f9f8e..aeb75491a27 100644
--- a/source/om/helpcontent2/source/text/shared/optionen.po
+++ b/source/om/helpcontent2/source/text/shared/optionen.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/optionen
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-07-04 18:27+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01060500.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/simpress/01.po b/source/om/helpcontent2/source/text/simpress/01.po
index 38fae1d041b..7b6ae7d48fb 100644
--- a/source/om/helpcontent2/source/text/simpress/01.po
+++ b/source/om/helpcontent2/source/text/simpress/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/simpress/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-09 12:03+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 13050000.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/simpress/guide.po b/source/om/helpcontent2/source/text/simpress/guide.po
index 1f9cdc01012..d271ee79cb3 100644
--- a/source/om/helpcontent2/source/text/simpress/guide.po
+++ b/source/om/helpcontent2/source/text/simpress/guide.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/simpress/guide
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-09 12:04+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: line_draw.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/smath/00.po b/source/om/helpcontent2/source/text/smath/00.po
index ee39af06775..a342d549d9f 100644
--- a/source/om/helpcontent2/source/text/smath/00.po
+++ b/source/om/helpcontent2/source/text/smath/00.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/smath/00
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-09 12:04+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 00000004.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/smath/01.po b/source/om/helpcontent2/source/text/smath/01.po
index fe4e1f7f7c3..7d1b8cd823c 100644
--- a/source/om/helpcontent2/source/text/smath/01.po
+++ b/source/om/helpcontent2/source/text/smath/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/smath/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-02-21 02:08+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 03090400.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/swriter/01.po b/source/om/helpcontent2/source/text/swriter/01.po
index ff961fd0d81..4327335bd2b 100644
--- a/source/om/helpcontent2/source/text/swriter/01.po
+++ b/source/om/helpcontent2/source/text/swriter/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/swriter/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-01-11 17:57+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 04090000.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/swriter/04.po b/source/om/helpcontent2/source/text/swriter/04.po
index c7e798c4968..c72c5b8da0e 100644
--- a/source/om/helpcontent2/source/text/swriter/04.po
+++ b/source/om/helpcontent2/source/text/swriter/04.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/swriter/04
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-09 12:04+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01020000.xhp
 msgctxt ""
diff --git a/source/om/helpcontent2/source/text/swriter/guide.po b/source/om/helpcontent2/source/text/swriter/guide.po
index 5a0cf33195b..a85ab7eac8c 100644
--- a/source/om/helpcontent2/source/text/swriter/guide.po
+++ b/source/om/helpcontent2/source/text/swriter/guide.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/swriter/guide
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-06-13 02:15+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: om\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: om\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: hyperlinks.xhp
 msgctxt ""