Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 59 insertions, 12 deletions

diff --git a/source/dz/reportdesign/source/core/resource.po b/source/dz/reportdesign/source/core/resource.po
index 7b3ff924371..1cd0a4482ac 100644
--- a/source/dz/reportdesign/source/core/resource.po
+++ b/source/dz/reportdesign/source/core/resource.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/core/resource
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-05 19:33+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: dz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: strings.src
 msgctxt ""
@@ -96,6 +96,7 @@ msgid "The element is invalid."
 msgstr ""
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_STR_FIXEDTEXT\n"
@@ -124,6 +125,7 @@ msgid "Image control"
 msgstr "གཟུགས་བརྙན་ཚད་འཛིན།"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_STR_REPORT\n"
@@ -140,6 +142,7 @@ msgstr ""
 "སྙན་ཞུ།"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_STR_SHAPE\n"
diff --git a/source/dz/reportdesign/source/ui/dlg.po b/source/dz/reportdesign/source/ui/dlg.po
index 722c2f12bde..91d890e7571 100644
--- a/source/dz/reportdesign/source/ui/dlg.po
+++ b/source/dz/reportdesign/source/ui/dlg.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/ui/dlg
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 00:11+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: dz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: CondFormat.src
 msgctxt ""
@@ -34,6 +34,7 @@ msgid "Expression Is"
 msgstr ""
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "WIN_CONDITION.LB_OP\n"
@@ -161,6 +162,7 @@ msgid "White"
 msgstr "དཀརཔོ།"
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "STR_CHARCOLOR\n"
@@ -220,6 +222,7 @@ msgid "Remove sorting"
 msgstr ""
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "RID_TB_SORTING\n"
@@ -350,6 +353,7 @@ msgid "Move down"
 msgstr "མར་སྤོ།"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.TB_TOOLBOX\n"
@@ -389,6 +393,7 @@ msgstr ""
 "བཏོན་གཏང་།(~D)"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING\n"
@@ -519,6 +524,7 @@ msgid "Keep Together"
 msgstr ""
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.LST_KEEPTOGETHERLST\n"
@@ -615,6 +621,7 @@ msgid "Quarter"
 msgstr "ལོའི་བཞི་དཔྱ།"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "STR_RPT_MONTH\n"
@@ -731,6 +738,7 @@ msgid "Report navigator"
 msgstr ""
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_STR_FUNCTIONS\n"
@@ -791,6 +799,7 @@ msgid "New Function"
 msgstr "དབྱེ་ཚན་གསརཔ།"
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_MENU_NAVIGATOR\n"
@@ -864,6 +873,7 @@ msgid "Bottom of Page (Footer)"
 msgstr ""
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS\n"
@@ -885,6 +895,7 @@ msgstr ""
 "ཡོངས་ཁྱབ།"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS\n"
@@ -916,6 +927,7 @@ msgstr ""
 "ཕྲང་སྒྲིག"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS.LST_ALIGNMENT\n"
@@ -941,6 +953,7 @@ msgstr ""
 "གཡོན།"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS.LST_ALIGNMENT\n"
@@ -960,6 +973,7 @@ msgstr ""
 "དབུས།"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS.LST_ALIGNMENT\n"
@@ -1117,6 +1131,7 @@ msgid "Font"
 msgstr "ཡིག་གཟུགས།"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1161,6 +1176,7 @@ msgid "Background"
 msgstr "རྒྱབ་གཞི།"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1201,6 +1217,7 @@ msgid "Return"
 msgstr "སླར་ལོག"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR\n"
diff --git a/source/dz/reportdesign/source/ui/inspection.po b/source/dz/reportdesign/source/ui/inspection.po
index a808b6cd65d..1354449cd2c 100644
--- a/source/dz/reportdesign/source/ui/inspection.po
+++ b/source/dz/reportdesign/source/ui/inspection.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/ui/inspection
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,15 +7,16 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 00:11+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: dz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PROPPAGE_DEFAULT\n"
@@ -53,6 +54,7 @@ msgid "No"
 msgstr "མེན་"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_BOOL\n"
@@ -293,6 +295,7 @@ msgid "Section"
 msgstr "དབྱེ་ཚན།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_SECTIONPAGEBREAK_CONST\n"
@@ -460,6 +463,7 @@ msgid "Font"
 msgstr "ཡིག་གཟུགས།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_BACKCOLOR\n"
@@ -598,6 +602,7 @@ msgid "Charts can be used to display detailed data about the current record of t
 msgstr "འབྲི་ཤོག་ཡན་ལག་ཚུ་ འབྲི་ཤོག་ཨམ་གྱི་ད་ལྟོའི་དྲན་ཐོའི་སྐོར་ལས་ རྒྱས་བཤད་ཅན་གྱི་གནད་སྡུད་བཀྲམ་སྟོན་འབད་ནི་གི་དོན་ལུ་ ལག་ལེན་འཐབ་བཏུབ། དེ་འབད་ནི་གི་དོན་ལུ་ ཁྱོད་ཀྱིས་འབྲི་ཤོག་ཡན་ལག་ནང་གྱི་ཀེར་ཐིག་ཚུ་ག་ཅི་རང་ འབྲི་ཤོག་ཨམ་ནང་གྱི་ཀེར་ཐིག་ཚུ་དང་ མཐུན་སྒྲིག་ཡོདཔ་ཨིན་ན་ གསལ་བཀོད་འབད་བཏུབ།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_DETAILLABEL\n"
@@ -616,6 +621,7 @@ msgstr ""
 "དཔེ་རིས་ཚུ།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_MASTERLABEL\n"
@@ -664,6 +670,7 @@ msgid "Vert. Alignment"
 msgstr "ཝིཊི་ཕྲང་སྒྲིག"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -700,6 +707,7 @@ msgid "Middle"
 msgstr "བར་མ།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -735,6 +743,7 @@ msgid "Horz. Alignment"
 msgstr "ཝིཊི་ཕྲང་སྒྲིག"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -760,6 +769,7 @@ msgstr ""
 "གཡོན།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -794,6 +804,7 @@ msgid "Block"
 msgstr "གནགཔོ།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -829,6 +840,7 @@ msgid "Accumulation"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MINIMUM\n"
@@ -843,6 +855,7 @@ msgstr ""
 "ཉུང་མཐའ།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MAXIMUM\n"
diff --git a/source/dz/reportdesign/source/ui/report.po b/source/dz/reportdesign/source/ui/report.po
index cf32f46d5bf..9b1f9fafeb3 100644
--- a/source/dz/reportdesign/source/ui/report.po
+++ b/source/dz/reportdesign/source/ui/report.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/ui/report
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,16 +7,17 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 11:05+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: dz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366023934.0\n"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_BRWTITLE_PROPERTIES\n"
@@ -37,6 +38,7 @@ msgid "No Control marked"
 msgstr "ཚད་འཛིན་ལུ་ རྟགས་མ་བཀལ་བས།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_BRWTITLE_MULTISELECT\n"
@@ -59,6 +61,7 @@ msgid "Image Control"
 msgstr "གཟུགས་བརྙན་ཚད་འཛིན།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FIXEDTEXT\n"
@@ -79,6 +82,7 @@ msgid "Line"
 msgstr "གྲལ་ཐིག"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FORMATTED\n"
@@ -95,6 +99,7 @@ msgstr ""
 "རྩ་སྒྲིག་སྒྲིག་པའི་ས་སྒོ།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_SHAPE\n"
@@ -107,6 +112,7 @@ msgstr ""
 "དབྱིབས།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_REPORT\n"
@@ -291,6 +297,7 @@ msgid "Preview"
 msgstr "སྔོན་ལྟ།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "STR_RPT_TITLE\n"
@@ -449,6 +456,7 @@ msgid "Grid..."
 msgstr "གི་རིཊིསི།(~G)"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -462,6 +470,7 @@ msgstr ""
 "གདོང་བསྐྱོད་འབག་ཤོག(~F)"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -475,6 +484,7 @@ msgstr ""
 "རྒྱབ་བསྐྱོད་གཏང་།(~w)"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT\n"
@@ -578,6 +588,7 @@ msgid "Distribution..."
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT\n"
@@ -621,6 +632,7 @@ msgid " - %PRODUCTNAME Base Report"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_APP_NEW_DOC\n"
@@ -673,6 +685,7 @@ msgid "Insert graphics"
 msgstr "ཚད་རིས་ཚུ་བཙུགས།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_DELETE\n"
@@ -849,6 +862,7 @@ msgid "Report Footer"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_INSERT\n"