Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

12 files changed, 36 insertions, 36 deletions

diff --git a/source/gu/helpcontent2/source/text/sbasic/shared/01.po b/source/gu/helpcontent2/source/text/sbasic/shared/01.po
index 46235104716..de2a83410d1 100644
--- a/source/gu/helpcontent2/source/text/sbasic/shared/01.po
+++ b/source/gu/helpcontent2/source/text/sbasic/shared/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/sbasic/shared/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-05 20:15+0200\n"
 "Last-Translator: sweta <swkothar@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 06130500.xhp
 msgctxt ""
diff --git a/source/gu/helpcontent2/source/text/schart/01.po b/source/gu/helpcontent2/source/text/schart/01.po
index e13d9febe92..3d5114e1b7e 100644
--- a/source/gu/helpcontent2/source/text/schart/01.po
+++ b/source/gu/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 21:25+0200\n"
 "Last-Translator: sweta <swkothar@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\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/gu/helpcontent2/source/text/shared/00.po b/source/gu/helpcontent2/source/text/shared/00.po
index 4bdeda0c909..d7d65c4c218 100644
--- a/source/gu/helpcontent2/source/text/shared/00.po
+++ b/source/gu/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 14:21+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\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/gu/helpcontent2/source/text/shared/01.po b/source/gu/helpcontent2/source/text/shared/01.po
index becf1931e56..b3aa39711bd 100644
--- a/source/gu/helpcontent2/source/text/shared/01.po
+++ b/source/gu/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 14:21+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\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/gu/helpcontent2/source/text/shared/02.po b/source/gu/helpcontent2/source/text/shared/02.po
index 4321cc372b5..343777d9fa3 100644
--- a/source/gu/helpcontent2/source/text/shared/02.po
+++ b/source/gu/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 21:26+0200\n"
 "Last-Translator: sweta <swkothar@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01170101.xhp
 msgctxt ""
diff --git a/source/gu/helpcontent2/source/text/shared/explorer/database.po b/source/gu/helpcontent2/source/text/shared/explorer/database.po
index 6a7f3a9e5ee..72bd8a19d74 100644
--- a/source/gu/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/gu/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 21:27+0200\n"
 "Last-Translator: sweta <swkothar@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\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/gu/helpcontent2/source/text/shared/optionen.po b/source/gu/helpcontent2/source/text/shared/optionen.po
index 54e4e95a2d3..714673f9395 100644
--- a/source/gu/helpcontent2/source/text/shared/optionen.po
+++ b/source/gu/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 17:48+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\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/gu/helpcontent2/source/text/simpress/01.po b/source/gu/helpcontent2/source/text/simpress/01.po
index 21a2ba4298e..c7d0f32154f 100644
--- a/source/gu/helpcontent2/source/text/simpress/01.po
+++ b/source/gu/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 21:27+0200\n"
 "Last-Translator: sweta <swkothar@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\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/gu/helpcontent2/source/text/smath/00.po b/source/gu/helpcontent2/source/text/smath/00.po
index 461a5434979..08160721c8f 100644
--- a/source/gu/helpcontent2/source/text/smath/00.po
+++ b/source/gu/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-11 11:22+0200\n"
 "Last-Translator: sweta <swkothar@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\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/gu/helpcontent2/source/text/smath/01.po b/source/gu/helpcontent2/source/text/smath/01.po
index 9491725c7f3..43773b0e4a9 100644
--- a/source/gu/helpcontent2/source/text/smath/01.po
+++ b/source/gu/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 00:30+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\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/gu/helpcontent2/source/text/swriter/01.po b/source/gu/helpcontent2/source/text/swriter/01.po
index 7486a45594b..dc46b36a4ca 100644
--- a/source/gu/helpcontent2/source/text/swriter/01.po
+++ b/source/gu/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:06+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\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/gu/helpcontent2/source/text/swriter/04.po b/source/gu/helpcontent2/source/text/swriter/04.po
index def310427fb..ad86614f584 100644
--- a/source/gu/helpcontent2/source/text/swriter/04.po
+++ b/source/gu/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-04-11 11:24+0200\n"
 "Last-Translator: sweta <swkothar@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01020000.xhp
 msgctxt ""