Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

14 files changed, 42 insertions, 42 deletions

diff --git a/source/nn/helpcontent2/source/text/sbasic/shared.po b/source/nn/helpcontent2/source/text/sbasic/shared.po
index 1a525a1d909..14baa14a5bd 100644
--- a/source/nn/helpcontent2/source/text/sbasic/shared.po
+++ b/source/nn/helpcontent2/source/text/sbasic/shared.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/sbasic/shared
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-17 13:51+0000\n"
 "Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0-beta1\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: Pootle 2.5.0-beta1\n"
 "X-POOTLE-MTIME: 1366206696.0\n"
 
 #: 01170101.xhp
diff --git a/source/nn/helpcontent2/source/text/scalc/01.po b/source/nn/helpcontent2/source/text/scalc/01.po
index 658e3e0eca7..a30186fb10a 100644
--- a/source/nn/helpcontent2/source/text/scalc/01.po
+++ b/source/nn/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: 2013-04-17 14:36+0000\n"
 "Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0-beta1\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: Pootle 2.5.0-beta1\n"
 "X-POOTLE-MTIME: 1366209361.0\n"
 
 #: 04090000.xhp
diff --git a/source/nn/helpcontent2/source/text/schart/01.po b/source/nn/helpcontent2/source/text/schart/01.po
index e5e75823f2a..35ad2c96741 100644
--- a/source/nn/helpcontent2/source/text/schart/01.po
+++ b/source/nn/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-07-28 13:07+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\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/nn/helpcontent2/source/text/shared/01.po b/source/nn/helpcontent2/source/text/shared/01.po
index f7d5c5188ab..dda2310f3fa 100644
--- a/source/nn/helpcontent2/source/text/shared/01.po
+++ b/source/nn/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: 2013-03-21 12:10+0000\n"
 "Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0-beta1\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: Pootle 2.5.0-beta1\n"
 "X-POOTLE-MTIME: 1363867849.0\n"
 
 #: extensionupdate.xhp
diff --git a/source/nn/helpcontent2/source/text/shared/02.po b/source/nn/helpcontent2/source/text/shared/02.po
index d2aa97f6a0e..dbb58a4ad4a 100644
--- a/source/nn/helpcontent2/source/text/shared/02.po
+++ b/source/nn/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 22:46+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\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/nn/helpcontent2/source/text/shared/04.po b/source/nn/helpcontent2/source/text/shared/04.po
index 2faa925fec3..868a39d13bd 100644
--- a/source/nn/helpcontent2/source/text/shared/04.po
+++ b/source/nn/helpcontent2/source/text/shared/04.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/04
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:12+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01010000.xhp
 msgctxt ""
diff --git a/source/nn/helpcontent2/source/text/shared/autopi.po b/source/nn/helpcontent2/source/text/shared/autopi.po
index 93bacf9219e..63c4a20fc40 100644
--- a/source/nn/helpcontent2/source/text/shared/autopi.po
+++ b/source/nn/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: 2013-03-14 20:24+0000\n"
 "Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0-beta1\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: Pootle 2.5.0-beta1\n"
 "X-POOTLE-MTIME: 1363292648.0\n"
 
 #: 01100200.xhp
diff --git a/source/nn/helpcontent2/source/text/shared/explorer/database.po b/source/nn/helpcontent2/source/text/shared/explorer/database.po
index 7c599c51932..4742a8c96ae 100644
--- a/source/nn/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/nn/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: 2013-03-14 20:48+0000\n"
 "Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.0-beta1\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: Pootle 2.5.0-beta1\n"
 "X-POOTLE-MTIME: 1363294099.0\n"
 
 #: 11170100.xhp
diff --git a/source/nn/helpcontent2/source/text/simpress/02.po b/source/nn/helpcontent2/source/text/simpress/02.po
index 436853991fb..2fab681ca91 100644
--- a/source/nn/helpcontent2/source/text/simpress/02.po
+++ b/source/nn/helpcontent2/source/text/simpress/02.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/simpress/02
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-01-15 19:42+0000\n"
 "Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1358278927.0\n"
 
 #: 10060000.xhp
diff --git a/source/nn/helpcontent2/source/text/simpress/04.po b/source/nn/helpcontent2/source/text/simpress/04.po
index bbd0c016a17..23d0fb76f39 100644
--- a/source/nn/helpcontent2/source/text/simpress/04.po
+++ b/source/nn/helpcontent2/source/text/simpress/04.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/simpress/04
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-01-15 12:05+0000\n"
 "Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1358251532.0\n"
 
 #: 01020000.xhp
diff --git a/source/nn/helpcontent2/source/text/simpress/guide.po b/source/nn/helpcontent2/source/text/simpress/guide.po
index 5ccc0ea24d6..84128592642 100644
--- a/source/nn/helpcontent2/source/text/simpress/guide.po
+++ b/source/nn/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: 2013-01-15 12:16+0000\n"
 "Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1358252191.0\n"
 
 #: line_draw.xhp
diff --git a/source/nn/helpcontent2/source/text/smath/01.po b/source/nn/helpcontent2/source/text/smath/01.po
index 2254ee69887..df942e3e17b 100644
--- a/source/nn/helpcontent2/source/text/smath/01.po
+++ b/source/nn/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: 2013-01-30 16:22+0000\n"
 "Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1359562968.0\n"
 
 #: 03090400.xhp
diff --git a/source/nn/helpcontent2/source/text/swriter/01.po b/source/nn/helpcontent2/source/text/swriter/01.po
index 23384834638..0240fc95a82 100644
--- a/source/nn/helpcontent2/source/text/swriter/01.po
+++ b/source/nn/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:54+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\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/nn/helpcontent2/source/text/swriter/04.po b/source/nn/helpcontent2/source/text/swriter/04.po
index 8b9d1fb7632..955fda33a6a 100644
--- a/source/nn/helpcontent2/source/text/swriter/04.po
+++ b/source/nn/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 01:01+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01020000.xhp
 msgctxt ""