Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

7 files changed, 23 insertions, 21 deletions

diff --git a/source/ko/helpcontent2/source/text/scalc/01.po b/source/ko/helpcontent2/source/text/scalc/01.po
index c0951639511..d2319aa9d79 100644
--- a/source/ko/helpcontent2/source/text/scalc/01.po
+++ b/source/ko/helpcontent2/source/text/scalc/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/scalc/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-05-14 05:00+0200\n"
 "Last-Translator: Jihui <jihui.choi@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 04090000.xhp
 msgctxt ""
diff --git a/source/ko/helpcontent2/source/text/shared/01.po b/source/ko/helpcontent2/source/text/shared/01.po
index 8b650bc4cb6..2c7875645d8 100644
--- a/source/ko/helpcontent2/source/text/shared/01.po
+++ b/source/ko/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-05-14 05:00+0200\n"
 "Last-Translator: Jihui <jihui.choi@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: extensionupdate.xhp
 msgctxt ""
diff --git a/source/ko/helpcontent2/source/text/shared/explorer/database.po b/source/ko/helpcontent2/source/text/shared/explorer/database.po
index d706ce8a0df..0f766719e50 100644
--- a/source/ko/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/ko/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-06 00:13+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\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/ko/helpcontent2/source/text/shared/optionen.po b/source/ko/helpcontent2/source/text/shared/optionen.po
index 7faf70eddd8..22b51892fcd 100644
--- a/source/ko/helpcontent2/source/text/shared/optionen.po
+++ b/source/ko/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-05-14 05:00+0200\n"
 "Last-Translator: Jihui <jihui.choi@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\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/ko/helpcontent2/source/text/swriter/04.po b/source/ko/helpcontent2/source/text/swriter/04.po
index 786674efab9..140e4d6382b 100644
--- a/source/ko/helpcontent2/source/text/swriter/04.po
+++ b/source/ko/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:15+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01020000.xhp
 msgctxt ""
diff --git a/source/ko/helpcontent2/source/text/swriter/guide.po b/source/ko/helpcontent2/source/text/swriter/guide.po
index b1689c81c59..fcd8e9c586c 100644
--- a/source/ko/helpcontent2/source/text/swriter/guide.po
+++ b/source/ko/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-05-14 05:00+0200\n"
 "Last-Translator: Jihui <jihui.choi@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: hyperlinks.xhp
 msgctxt ""
diff --git a/source/ko/officecfg/registry/data/org/openoffice/Office/UI.po b/source/ko/officecfg/registry/data/org/openoffice/Office/UI.po
index 439af11f97b..d588d782979 100644
--- a/source/ko/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/ko/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -1,4 +1,4 @@
-#. extracted from officecfg/registry/data/org/openoffice/Office/UI
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-05-08 00:23+0000\n"
 "Last-Translator: Jihui <jihui.choi@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1367972586.0\n"
 
 #: BaseWindowState.xcu
@@ -25057,6 +25057,7 @@ msgid "Fontwork Shape"
 msgstr "폰트워크 모양"
 
 #: WriterGlobalWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterGlobalWindowState.xcu\n"
 "..WriterGlobalWindowState.UIElements.States.private:resource/toolbar/navigationobjectbar\n"
@@ -26037,6 +26038,7 @@ msgid "Fontwork Shape"
 msgstr "폰트워크 모양"
 
 #: WriterWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterWindowState.xcu\n"
 "..WriterWindowState.UIElements.States.private:resource/toolbar/navigationobjectbar\n"