Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

12 files changed, 36 insertions, 36 deletions

diff --git a/source/mk/helpcontent2/source/text/sdraw.po b/source/mk/helpcontent2/source/text/sdraw.po
index 2aabb7b8ed0..5c7274b2dbc 100644
--- a/source/mk/helpcontent2/source/text/sdraw.po
+++ b/source/mk/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:23+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: main0106.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/shared.po b/source/mk/helpcontent2/source/text/shared.po
index 50bc8c1a72d..8072271f06d 100644
--- a/source/mk/helpcontent2/source/text/shared.po
+++ b/source/mk/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:23+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: main0212.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/shared/00.po b/source/mk/helpcontent2/source/text/shared/00.po
index ee3cbd0dd69..52e4d64e084 100644
--- a/source/mk/helpcontent2/source/text/shared/00.po
+++ b/source/mk/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:59+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 00000407.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/shared/01.po b/source/mk/helpcontent2/source/text/shared/01.po
index 130a11d7018..57561778ee5 100644
--- a/source/mk/helpcontent2/source/text/shared/01.po
+++ b/source/mk/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:59+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: extensionupdate.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/shared/guide.po b/source/mk/helpcontent2/source/text/shared/guide.po
index 40b41ec21ba..7fb615793a4 100644
--- a/source/mk/helpcontent2/source/text/shared/guide.po
+++ b/source/mk/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:41+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: pageformat_max.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/shared/optionen.po b/source/mk/helpcontent2/source/text/shared/optionen.po
index cde92916d1a..434dd2288c8 100644
--- a/source/mk/helpcontent2/source/text/shared/optionen.po
+++ b/source/mk/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:15+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01060500.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/simpress.po b/source/mk/helpcontent2/source/text/simpress.po
index a2f684f738a..8dbd07b43b7 100644
--- a/source/mk/helpcontent2/source/text/simpress.po
+++ b/source/mk/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:25+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: main0212.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/simpress/01.po b/source/mk/helpcontent2/source/text/simpress/01.po
index 1f8a653fe38..7677c097426 100644
--- a/source/mk/helpcontent2/source/text/simpress/01.po
+++ b/source/mk/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 22:40+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 13050000.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/smath/00.po b/source/mk/helpcontent2/source/text/smath/00.po
index 9603544f908..42c5f7cbe02 100644
--- a/source/mk/helpcontent2/source/text/smath/00.po
+++ b/source/mk/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-12 22:40+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 00000004.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/swriter/01.po b/source/mk/helpcontent2/source/text/swriter/01.po
index f152500fbdf..d4951d0e159 100644
--- a/source/mk/helpcontent2/source/text/swriter/01.po
+++ b/source/mk/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:41+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 04090000.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/swriter/04.po b/source/mk/helpcontent2/source/text/swriter/04.po
index 3ab3beaf77e..5313068208f 100644
--- a/source/mk/helpcontent2/source/text/swriter/04.po
+++ b/source/mk/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-06 00:26+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01020000.xhp
 msgctxt ""
diff --git a/source/mk/helpcontent2/source/text/swriter/guide.po b/source/mk/helpcontent2/source/text/swriter/guide.po
index 40892298414..833eea4dc20 100644
--- a/source/mk/helpcontent2/source/text/swriter/guide.po
+++ b/source/mk/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 01:49+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: hyperlinks.xhp
 msgctxt ""