Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 61 insertions, 12 deletions

diff --git a/source/rw/cui/source/customize.po b/source/rw/cui/source/customize.po
index b70f1d6e05b..ddfd1098ed1 100644
--- a/source/rw/cui/source/customize.po
+++ b/source/rw/cui/source/customize.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/customize
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,15 +7,16 @@ msgstr ""
 "PO-Revision-Date: 2013-02-17 21:23+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: rw\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136187.0\n"
 
 #: acccfg.src
+#, fuzzy
 msgctxt ""
 "acccfg.src\n"
 "PUSHBUTTON_TEXT_SAVE\n"
@@ -46,6 +47,7 @@ msgid "~Load..."
 msgstr "Gutangiza..."
 
 #: acccfg.src
+#, fuzzy
 msgctxt ""
 "acccfg.src\n"
 "PUSHBUTTON_TEXT_REMOVE\n"
diff --git a/source/rw/cui/source/dialogs.po b/source/rw/cui/source/dialogs.po
index 42ebfd74139..be5b9ee5310 100644
--- a/source/rw/cui/source/dialogs.po
+++ b/source/rw/cui/source/dialogs.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/dialogs
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-02-17 21:23+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: rw\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136187.0\n"
 
 #: colorpicker.src
@@ -204,6 +204,7 @@ msgid "Always I~gnore"
 msgstr ""
 
 #: commonlingui.src
+#, fuzzy
 msgctxt ""
 "commonlingui.src\n"
 "RID_SVX_WND_COMMON_LINGU\n"
@@ -361,6 +362,7 @@ msgid "Insert Columns"
 msgstr "Kongeramo inkingi"
 
 #: cuires.src
+#, fuzzy
 msgctxt ""
 "cuires.src\n"
 "RID_SVXSTR_AUTO_ENTRY\n"
@@ -863,6 +865,7 @@ msgid "Maddin2"
 msgstr ""
 
 #: gallery.src
+#, fuzzy
 msgctxt ""
 "gallery.src\n"
 "RID_SVXDLG_GALLERY_TITLE\n"
@@ -1001,6 +1004,7 @@ msgid "Object;Objects"
 msgstr ""
 
 #: gallery.src
+#, fuzzy
 msgctxt ""
 "gallery.src\n"
 "RID_SVXSTR_GALLERY_READONLY\n"
@@ -1427,6 +1431,7 @@ msgid "New..."
 msgstr "Bishya..."
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA_OPT\n"
@@ -1649,6 +1654,7 @@ msgid "~Login name"
 msgstr ""
 
 #: hyperdlg.src
+#, fuzzy
 msgctxt ""
 "hyperdlg.src\n"
 "RID_SVXPAGE_HYPERLINK_INTERNET\n"
@@ -2441,6 +2447,7 @@ msgid "Mark the default path for new files."
 msgstr ""
 
 #: multipat.src
+#, fuzzy
 msgctxt ""
 "multipat.src\n"
 "RID_SVXDLG_MULTIPATH\n"
@@ -2922,6 +2929,7 @@ msgid "Font Effects"
 msgstr "Imyitwarire y'imyandikire"
 
 #: sdrcelldlg.src
+#, fuzzy
 msgctxt ""
 "sdrcelldlg.src\n"
 "RID_SVX_FORMAT_CELLS_DLG.1\n"
@@ -3020,6 +3028,7 @@ msgid "Asian Layout"
 msgstr "Imigaragarire Nyaziya"
 
 #: srchxtra.src
+#, fuzzy
 msgctxt ""
 "srchxtra.src\n"
 "RID_SVXDLG_SEARCHFORMAT.1\n"
@@ -3035,6 +3044,7 @@ msgstr ""
 "Utugerampera & Itandukanya"
 
 #: srchxtra.src
+#, fuzzy
 msgctxt ""
 "srchxtra.src\n"
 "RID_SVXDLG_SEARCHFORMAT.1\n"
@@ -3077,6 +3087,7 @@ msgid "Text Flow"
 msgstr "Ukuza k'umwandiko"
 
 #: srchxtra.src
+#, fuzzy
 msgctxt ""
 "srchxtra.src\n"
 "RID_SVXDLG_SEARCHFORMAT.1\n"
@@ -3233,6 +3244,7 @@ msgid "~Update"
 msgstr "Kuvugurura"
 
 #: svuidlg.src
+#, fuzzy
 msgctxt ""
 "svuidlg.src\n"
 "MD_UPDATE_BASELINKS\n"
@@ -3308,6 +3320,7 @@ msgid "Update:"
 msgstr "Kuvugurura"
 
 #: svuidlg.src
+#, fuzzy
 msgctxt ""
 "svuidlg.src\n"
 "MD_UPDATE_BASELINKS\n"
@@ -3340,6 +3353,7 @@ msgid "Ma~nual"
 msgstr "N'Intoki"
 
 #: svuidlg.src
+#, fuzzy
 msgctxt ""
 "svuidlg.src\n"
 "MD_UPDATE_BASELINKS\n"
diff --git a/source/rw/cui/source/options.po b/source/rw/cui/source/options.po
index a7910505227..6a8e60031c6 100644
--- a/source/rw/cui/source/options.po
+++ b/source/rw/cui/source/options.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/options
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-02-17 21:23+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: rw\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136187.0\n"
 
 #: certpath.src
@@ -34,6 +34,7 @@ msgid "Select or add the correct Network Security Services Certificate directory
 msgstr ""
 
 #: certpath.src
+#, fuzzy
 msgctxt ""
 "certpath.src\n"
 "RID_SVXDLG_CERTPATH\n"
@@ -176,6 +177,7 @@ msgid "Timeout"
 msgstr ""
 
 #: connpooloptions.src
+#, fuzzy
 msgctxt ""
 "connpooloptions.src\n"
 "RID_OFAPAGE_CONNPOOLOPTIONS\n"
@@ -195,6 +197,7 @@ msgstr ""
 "Yes"
 
 #: connpooloptions.src
+#, fuzzy
 msgctxt ""
 "connpooloptions.src\n"
 "RID_OFAPAGE_CONNPOOLOPTIONS\n"
@@ -500,6 +503,7 @@ msgid "~Language"
 msgstr "Ururimi"
 
 #: optasian.src
+#, fuzzy
 msgctxt ""
 "optasian.src\n"
 "RID_SVXPAGE_ASIAN_LAYOUT\n"
@@ -572,6 +576,7 @@ msgid "Color table"
 msgstr ""
 
 #: optchart.src
+#, fuzzy
 msgctxt ""
 "optchart.src\n"
 "RID_OPTPAGE_CHART_DEFCOLORS\n"
@@ -599,6 +604,7 @@ msgstr ""
 "Kongeraho"
 
 #: optchart.src
+#, fuzzy
 msgctxt ""
 "optchart.src\n"
 "RID_OPTPAGE_CHART_DEFCOLORS\n"
@@ -618,6 +624,7 @@ msgstr ""
 "Gukuraho"
 
 #: optchart.src
+#, fuzzy
 msgctxt ""
 "optchart.src\n"
 "RID_OPTPAGE_CHART_DEFCOLORS\n"
@@ -933,6 +940,7 @@ msgid "~Delete"
 msgstr "Gusiba"
 
 #: optdict.src
+#, fuzzy
 msgctxt ""
 "optdict.src\n"
 "RID_SFXDLG_EDITDICT\n"
@@ -946,6 +954,7 @@ msgstr ""
 "Gusimbuza"
 
 #: optdict.src
+#, fuzzy
 msgctxt ""
 "optdict.src\n"
 "RID_SFXDLG_EDITDICT\n"
@@ -1331,6 +1340,7 @@ msgid "Ignore ~font settings"
 msgstr ""
 
 #: opthtml.src
+#, fuzzy
 msgctxt ""
 "opthtml.src\n"
 "RID_OFAPAGE_HTMLOPT\n"
@@ -1449,6 +1459,7 @@ msgid "For example: -Dmyprop=c:program filesjava"
 msgstr ""
 
 #: optjava.src
+#, fuzzy
 msgctxt ""
 "optjava.src\n"
 "RID_SVXDLG_JAVA_PARAMETER\n"
@@ -1503,6 +1514,7 @@ msgid "Add ~Folder"
 msgstr ""
 
 #: optjava.src
+#, fuzzy
 msgctxt ""
 "optjava.src\n"
 "RID_SVXDLG_JAVA_CLASSPATH\n"
@@ -1784,6 +1796,7 @@ msgid "Move Up"
 msgstr "Kuzamura"
 
 #: optlingu.src
+#, fuzzy
 msgctxt ""
 "optlingu.src\n"
 "RID_SVXDLG_EDIT_MODULES\n"
@@ -1815,6 +1828,7 @@ msgid "~Get more dictionaries online..."
 msgstr ""
 
 #: optlingu.src
+#, fuzzy
 msgctxt ""
 "optlingu.src\n"
 "RID_SVXDLG_EDIT_MODULES\n"
@@ -2242,6 +2256,7 @@ msgid "Help"
 msgstr "Ifashayobora"
 
 #: optpath.src
+#, fuzzy
 msgctxt ""
 "optpath.src\n"
 "RID_SVXSTR_KEY_GALLERY_DIR\n"
@@ -2844,6 +2859,7 @@ msgid "General"
 msgstr "Rusange"
 
 #: treeopt.src
+#, fuzzy
 msgctxt ""
 "treeopt.src\n"
 "RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS\n"
diff --git a/source/rw/cui/source/tabpages.po b/source/rw/cui/source/tabpages.po
index e4b883fa756..3f788d34650 100644
--- a/source/rw/cui/source/tabpages.po
+++ b/source/rw/cui/source/tabpages.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/tabpages
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-02-17 21:23+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: rw\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136187.0\n"
 
 #: autocdlg.src
@@ -570,6 +570,7 @@ msgid "Currently installed smart tags"
 msgstr ""
 
 #: autocdlg.src
+#, fuzzy
 msgctxt ""
 "autocdlg.src\n"
 "RID_OFAPAGE_SMARTTAG_OPTIONS\n"
@@ -1159,6 +1160,7 @@ msgid "H~eight"
 msgstr "Ubuhagarike"
 
 #: grfpage.src
+#, fuzzy
 msgctxt ""
 "grfpage.src\n"
 "RID_SVXPAGE_GRFCROP\n"
@@ -1459,6 +1461,7 @@ msgid "~Assign"
 msgstr "Kugena"
 
 #: macroass.src
+#, fuzzy
 msgctxt ""
 "macroass.src\n"
 "RID_SVXPAGE_EVENTASSIGN\n"
@@ -2564,6 +2567,7 @@ msgid "Bottom"
 msgstr "Hasi"
 
 #: paragrph.src
+#, fuzzy
 msgctxt ""
 "paragrph.src\n"
 "RID_SVXPAGE_ALIGN_PARAGRAPH\n"
@@ -2612,6 +2616,7 @@ msgid "Example"
 msgstr "Urugero"
 
 #: paragrph.src
+#, fuzzy
 msgctxt ""
 "paragrph.src\n"
 "STR_PAGE_STYLE\n"
@@ -2748,6 +2753,7 @@ msgid "Modify"
 msgstr "Guhindura"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_SVXSTR_ADD\n"
@@ -2900,6 +2906,7 @@ msgid "Font"
 msgstr "Imyandikire"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_SVXSTR_CHARNAME_STYLE\n"
@@ -3510,6 +3517,7 @@ msgid "Area"
 msgstr "Ubuso"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_SHADOW\n"
@@ -3586,6 +3594,7 @@ msgid "Shadow"
 msgstr "Igicucu"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_HATCH\n"
@@ -3743,6 +3752,7 @@ msgid "Hatching"
 msgstr "Icamirongonyuranamo"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_BITMAP\n"
@@ -3820,6 +3830,7 @@ msgid "~Modify..."
 msgstr "Guhindura..."
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_BITMAP\n"
@@ -4012,6 +4023,7 @@ msgid "Arrow styles"
 msgstr "Imisusire y'akambi"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINE\n"
@@ -4249,6 +4261,7 @@ msgid "Keep ratio"
 msgstr "Kugumana ikigero"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINE\n"
@@ -4332,6 +4345,7 @@ msgid "Lines"
 msgstr "Ihuza"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINE_DEF\n"
@@ -4829,6 +4843,7 @@ msgid "Character"
 msgstr "Inyuguti"
 
 #: tabstpge.src
+#, fuzzy
 msgctxt ""
 "tabstpge.src\n"
 "RID_SVXPAGE_TABULATOR\n"
@@ -4949,6 +4964,7 @@ msgid "To Bottom"
 msgstr "Hasi"
 
 #: textanim.src
+#, fuzzy
 msgctxt ""
 "textanim.src\n"
 "RID_SVXPAGE_TEXTANIMATION\n"
@@ -4999,6 +5015,7 @@ msgid "Animation cycles"
 msgstr ""
 
 #: textanim.src
+#, fuzzy
 msgctxt ""
 "textanim.src\n"
 "RID_SVXPAGE_TEXTANIMATION\n"