Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

19 files changed, 57 insertions, 57 deletions

diff --git a/source/ne/helpcontent2/source/text/scalc/02.po b/source/ne/helpcontent2/source/text/scalc/02.po
index 6b345ba13d5..eef1f0c5aa6 100644
--- a/source/ne/helpcontent2/source/text/scalc/02.po
+++ b/source/ne/helpcontent2/source/text/scalc/02.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/scalc/02
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 00:35+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 10060000.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/scalc/guide.po b/source/ne/helpcontent2/source/text/scalc/guide.po
index d002765f523..7459b065d95 100644
--- a/source/ne/helpcontent2/source/text/scalc/guide.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-07-28 13:01+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: scenario.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/schart/01.po b/source/ne/helpcontent2/source/text/schart/01.po
index 745ec2e8215..7b19b942c18 100644
--- a/source/ne/helpcontent2/source/text/schart/01.po
+++ b/source/ne/helpcontent2/source/text/schart/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/schart/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 08:41+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: type_pie.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/sdraw.po b/source/ne/helpcontent2/source/text/sdraw.po
index 0eeb9c3f2c8..2dfb868f814 100644
--- a/source/ne/helpcontent2/source/text/sdraw.po
+++ b/source/ne/helpcontent2/source/text/sdraw.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/sdraw
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 00:35+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: main0106.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/shared.po b/source/ne/helpcontent2/source/text/shared.po
index b0bb114bbae..4f358811e8f 100644
--- a/source/ne/helpcontent2/source/text/shared.po
+++ b/source/ne/helpcontent2/source/text/shared.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 00:35+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: main0212.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/shared/00.po b/source/ne/helpcontent2/source/text/shared/00.po
index 38145d2d335..c1a5ad02afa 100644
--- a/source/ne/helpcontent2/source/text/shared/00.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:05+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 00000407.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/shared/01.po b/source/ne/helpcontent2/source/text/shared/01.po
index ff3be6d39ff..cb664391019 100644
--- a/source/ne/helpcontent2/source/text/shared/01.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:05+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: extensionupdate.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/shared/04.po b/source/ne/helpcontent2/source/text/shared/04.po
index 0a78b318c07..98c4514a2ab 100644
--- a/source/ne/helpcontent2/source/text/shared/04.po
+++ b/source/ne/helpcontent2/source/text/shared/04.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/04
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:05+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01010000.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/shared/explorer/database.po b/source/ne/helpcontent2/source/text/shared/explorer/database.po
index 03a2914ca0e..cfe1c668351 100644
--- a/source/ne/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 09:08+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 11170100.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/shared/guide.po b/source/ne/helpcontent2/source/text/shared/guide.po
index bd123bdf4d9..90031323348 100644
--- a/source/ne/helpcontent2/source/text/shared/guide.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-01-11 17:47+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: pageformat_max.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/shared/optionen.po b/source/ne/helpcontent2/source/text/shared/optionen.po
index f842d72aef6..ce6e0baca20 100644
--- a/source/ne/helpcontent2/source/text/shared/optionen.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-07-04 18:20+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01060500.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/simpress.po b/source/ne/helpcontent2/source/text/simpress.po
index 0f0296ad46c..4475e88bec0 100644
--- a/source/ne/helpcontent2/source/text/simpress.po
+++ b/source/ne/helpcontent2/source/text/simpress.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/simpress
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 00:36+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: main0212.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/simpress/01.po b/source/ne/helpcontent2/source/text/simpress/01.po
index 3f57f28f11d..39f47380645 100644
--- a/source/ne/helpcontent2/source/text/simpress/01.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 09:10+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 13050000.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/smath/00.po b/source/ne/helpcontent2/source/text/smath/00.po
index 9a528f5b4d7..d472d9ed3fd 100644
--- a/source/ne/helpcontent2/source/text/smath/00.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 00:37+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 00000004.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/smath/01.po b/source/ne/helpcontent2/source/text/smath/01.po
index 635c08339ca..0d038bdcdfd 100644
--- a/source/ne/helpcontent2/source/text/smath/01.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-02-21 01:51+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 03090400.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/swriter/01.po b/source/ne/helpcontent2/source/text/swriter/01.po
index aa18f52747d..a658feca627 100644
--- a/source/ne/helpcontent2/source/text/swriter/01.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-01-11 17:47+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 04090000.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/swriter/02.po b/source/ne/helpcontent2/source/text/swriter/02.po
index 69e7442d904..4f4908c723e 100644
--- a/source/ne/helpcontent2/source/text/swriter/02.po
+++ b/source/ne/helpcontent2/source/text/swriter/02.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/swriter/02
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 09:12+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 04090000.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/swriter/04.po b/source/ne/helpcontent2/source/text/swriter/04.po
index d3967541e34..806af5143c8 100644
--- a/source/ne/helpcontent2/source/text/swriter/04.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-07-28 13:03+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01020000.xhp
 msgctxt ""
diff --git a/source/ne/helpcontent2/source/text/swriter/guide.po b/source/ne/helpcontent2/source/text/swriter/guide.po
index 159c14a0d65..a516af244bf 100644
--- a/source/ne/helpcontent2/source/text/swriter/guide.po
+++ b/source/ne/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-13 02:00+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: hyperlinks.xhp
 msgctxt ""