Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

16 files changed, 48 insertions, 48 deletions

diff --git a/source/tg/helpcontent2/source/text/scalc/02.po b/source/tg/helpcontent2/source/text/scalc/02.po
index 240c8b3cbaa..b191154fa25 100644
--- a/source/tg/helpcontent2/source/text/scalc/02.po
+++ b/source/tg/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 02:18+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/schart/01.po b/source/tg/helpcontent2/source/text/schart/01.po
index b4602699ad7..faf4e804d86 100644
--- a/source/tg/helpcontent2/source/text/schart/01.po
+++ b/source/tg/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 16:34+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/sdraw.po b/source/tg/helpcontent2/source/text/sdraw.po
index f31ce5c5abb..5c8de18df54 100644
--- a/source/tg/helpcontent2/source/text/sdraw.po
+++ b/source/tg/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: 2012-07-04 18:47+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/shared.po b/source/tg/helpcontent2/source/text/shared.po
index 5fbb220b345..773289cfa97 100644
--- a/source/tg/helpcontent2/source/text/shared.po
+++ b/source/tg/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 02:18+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/shared/00.po b/source/tg/helpcontent2/source/text/shared/00.po
index fa82de35b75..dbc24149c6e 100644
--- a/source/tg/helpcontent2/source/text/shared/00.po
+++ b/source/tg/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-07-04 18:47+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/shared/01.po b/source/tg/helpcontent2/source/text/shared/01.po
index 98b2697162c..831b3a87996 100644
--- a/source/tg/helpcontent2/source/text/shared/01.po
+++ b/source/tg/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-07-04 18:48+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/shared/autopi.po b/source/tg/helpcontent2/source/text/shared/autopi.po
index 5998841fed8..3875f1c0580 100644
--- a/source/tg/helpcontent2/source/text/shared/autopi.po
+++ b/source/tg/helpcontent2/source/text/shared/autopi.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/autopi
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-07-04 18:49+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01100200.xhp
 msgctxt ""
diff --git a/source/tg/helpcontent2/source/text/shared/guide.po b/source/tg/helpcontent2/source/text/shared/guide.po
index 6f2426b6f98..4bab2b07c02 100644
--- a/source/tg/helpcontent2/source/text/shared/guide.po
+++ b/source/tg/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-07-04 18:49+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/shared/optionen.po b/source/tg/helpcontent2/source/text/shared/optionen.po
index 95a5daf9338..5c0ea92209b 100644
--- a/source/tg/helpcontent2/source/text/shared/optionen.po
+++ b/source/tg/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:49+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/simpress.po b/source/tg/helpcontent2/source/text/simpress.po
index 866047cce12..424544eb888 100644
--- a/source/tg/helpcontent2/source/text/simpress.po
+++ b/source/tg/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: 2012-07-04 18:49+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/smath/00.po b/source/tg/helpcontent2/source/text/smath/00.po
index 4bf29a8dddc..789d23864a2 100644
--- a/source/tg/helpcontent2/source/text/smath/00.po
+++ b/source/tg/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 02:21+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/smath/01.po b/source/tg/helpcontent2/source/text/smath/01.po
index 45df9988eda..a421b27d7ed 100644
--- a/source/tg/helpcontent2/source/text/smath/01.po
+++ b/source/tg/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-07-04 18:50+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/swriter/01.po b/source/tg/helpcontent2/source/text/swriter/01.po
index 1881762c58a..36389f4b3ad 100644
--- a/source/tg/helpcontent2/source/text/swriter/01.po
+++ b/source/tg/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-07-04 18:50+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/swriter/02.po b/source/tg/helpcontent2/source/text/swriter/02.po
index 43efe597077..6b4ceb8b698 100644
--- a/source/tg/helpcontent2/source/text/swriter/02.po
+++ b/source/tg/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: 2012-07-04 18:50+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/swriter/04.po b/source/tg/helpcontent2/source/text/swriter/04.po
index 28e379d61f0..cc4b6159f8d 100644
--- a/source/tg/helpcontent2/source/text/swriter/04.po
+++ b/source/tg/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: 2012-07-04 18:50+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\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/tg/helpcontent2/source/text/swriter/guide.po b/source/tg/helpcontent2/source/text/swriter/guide.po
index b33f94b5634..275c6555fff 100644
--- a/source/tg/helpcontent2/source/text/swriter/guide.po
+++ b/source/tg/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-07-04 18:50+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: hyperlinks.xhp
 msgctxt ""