Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

8 files changed, 24 insertions, 24 deletions

diff --git a/source/id/helpcontent2/source/text/shared/00.po b/source/id/helpcontent2/source/text/shared/00.po
index 9f53c518402..7c258b55821 100644
--- a/source/id/helpcontent2/source/text/shared/00.po
+++ b/source/id/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-08-13 21:34+0000\n"
 "Last-Translator: Andika <andika@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1344893690.0\n"
 
 #: 00000407.xhp
diff --git a/source/id/helpcontent2/source/text/shared/01.po b/source/id/helpcontent2/source/text/shared/01.po
index 05fba27c6ca..6dcb3a17f45 100644
--- a/source/id/helpcontent2/source/text/shared/01.po
+++ b/source/id/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-27 14:08+0000\n"
 "Last-Translator: Andika <andika@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1343398095.0\n"
 
 #: extensionupdate.xhp
diff --git a/source/id/helpcontent2/source/text/shared/02.po b/source/id/helpcontent2/source/text/shared/02.po
index b8faa95b8de..8a071624f37 100644
--- a/source/id/helpcontent2/source/text/shared/02.po
+++ b/source/id/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: 2012-08-13 21:37+0000\n"
 "Last-Translator: Andika <andika@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1344893828.0\n"
 
 #: 01170101.xhp
diff --git a/source/id/helpcontent2/source/text/shared/explorer/database.po b/source/id/helpcontent2/source/text/shared/explorer/database.po
index 024018aee3b..546a54eb44d 100644
--- a/source/id/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/id/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-07-28 12:31+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 11170100.xhp
 msgctxt ""
diff --git a/source/id/helpcontent2/source/text/shared/optionen.po b/source/id/helpcontent2/source/text/shared/optionen.po
index 148dda27dcf..ea1c79e2cd6 100644
--- a/source/id/helpcontent2/source/text/shared/optionen.po
+++ b/source/id/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:58+0200\n"
 "Last-Translator: Andika <andika@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01060500.xhp
 msgctxt ""
diff --git a/source/id/helpcontent2/source/text/simpress/01.po b/source/id/helpcontent2/source/text/simpress/01.po
index b53579e7864..043cd95347d 100644
--- a/source/id/helpcontent2/source/text/simpress/01.po
+++ b/source/id/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: 2012-10-19 06:02+0000\n"
 "Last-Translator: Andika <andika@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1350626555.0\n"
 
 #: 13050000.xhp
diff --git a/source/id/helpcontent2/source/text/simpress/guide.po b/source/id/helpcontent2/source/text/simpress/guide.po
index d50cc660ad8..c939927570f 100644
--- a/source/id/helpcontent2/source/text/simpress/guide.po
+++ b/source/id/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-07-27 11:41+0200\n"
 "Last-Translator: Andika <andika@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: line_draw.xhp
 msgctxt ""
diff --git a/source/id/helpcontent2/source/text/swriter/guide.po b/source/id/helpcontent2/source/text/swriter/guide.po
index bfaec1c301b..90f2e064ce0 100644
--- a/source/id/helpcontent2/source/text/swriter/guide.po
+++ b/source/id/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-08-11 16:27+0200\n"
 "Last-Translator: dirgita <dirgitadevina@yahoo.co.id>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: hyperlinks.xhp
 msgctxt ""