Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 63 insertions, 12 deletions

diff --git a/source/bo/reportdesign/source/core/resource.po b/source/bo/reportdesign/source/core/resource.po
index 54ccb20727f..974bbff417b 100644
--- a/source/bo/reportdesign/source/core/resource.po
+++ b/source/bo/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:02+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bo\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"
diff --git a/source/bo/reportdesign/source/ui/dlg.po b/source/bo/reportdesign/source/ui/dlg.po
index 18ee288b873..88067081898 100644
--- a/source/bo/reportdesign/source/ui/dlg.po
+++ b/source/bo/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:04+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: CondFormat.src
 msgctxt ""
@@ -106,6 +106,7 @@ msgid "less than or equal to"
 msgstr "ཆེ་བའམ་མཚུངས།"
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "WIN_CONDITION\n"
@@ -167,6 +168,7 @@ msgid "White"
 msgstr "དཀར་པོ།"
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "STR_CHARCOLOR\n"
@@ -224,6 +226,7 @@ msgid "Remove sorting"
 msgstr ""
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "RID_TB_SORTING\n"
@@ -354,6 +357,7 @@ msgid "Move down"
 msgstr "འོག་ལ་སྤོ།"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.TB_TOOLBOX\n"
@@ -413,6 +417,7 @@ msgid "Sorting"
 msgstr "བང་སྒྲིག"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.LST_ORDER\n"
@@ -430,6 +435,7 @@ msgstr ""
 "གོང་འཕར།"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.LST_ORDER\n"
@@ -605,6 +611,7 @@ msgid "Prefix Characters"
 msgstr ""
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "STR_RPT_YEAR\n"
@@ -641,6 +648,7 @@ msgid "Week"
 msgstr "གཟའ་འཁོར།"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "STR_RPT_DAY\n"
@@ -743,6 +751,7 @@ msgid "Report navigator"
 msgstr ""
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_STR_FUNCTIONS\n"
@@ -803,6 +812,7 @@ msgid "New Function"
 msgstr "ས་ཁོངས་གསར་པ།"
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_MENU_NAVIGATOR\n"
@@ -876,6 +886,7 @@ msgid "Bottom of Page (Footer)"
 msgstr ""
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS\n"
@@ -897,6 +908,7 @@ msgstr ""
 "རྒྱུནགཏན།"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS\n"
@@ -928,6 +940,7 @@ msgstr ""
 "སྙོམས་གཤིབ།"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS.LST_ALIGNMENT\n"
@@ -953,6 +966,7 @@ msgstr ""
 "གཡོན་ལ།"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS.LST_ALIGNMENT\n"
@@ -972,6 +986,7 @@ msgstr ""
 "དཀྱིལ་བསྡུ།"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS.LST_ALIGNMENT\n"
@@ -1120,6 +1135,7 @@ msgid "Section Setup"
 msgstr ""
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1145,6 +1161,7 @@ msgstr ""
 "ཡིག་གཟུགས།"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1189,6 +1206,7 @@ msgid "Background"
 msgstr "རྒྱབ་ལྗོངས།"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1229,6 +1247,7 @@ msgid "Return"
 msgstr "བསྐྱར་ལོག"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR\n"
diff --git a/source/bo/reportdesign/source/ui/inspection.po b/source/bo/reportdesign/source/ui/inspection.po
index 5ca90bae0c9..eacdd6d26e3 100644
--- a/source/bo/reportdesign/source/ui/inspection.po
+++ b/source/bo/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:04+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bo\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"
@@ -284,6 +286,7 @@ msgid "None"
 msgstr "མེད་པ།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_SECTIONPAGEBREAK_CONST\n"
@@ -301,6 +304,7 @@ msgstr ""
 "ཁུལ་ཁོངས།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_SECTIONPAGEBREAK_CONST\n"
@@ -458,6 +462,7 @@ msgid "Data field"
 msgstr "གཞི་གྲངས་ཡིག་དུམ།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_FONT\n"
@@ -614,6 +619,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"
@@ -632,6 +638,7 @@ msgstr ""
 "དཔེ་རིས།ས"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_MASTERLABEL\n"
@@ -656,6 +663,7 @@ msgid "Preview Row(s)"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_AREA\n"
@@ -684,6 +692,7 @@ msgid "Vert. Alignment"
 msgstr "དྲང་འཕྱང་གྲལ་སྒྲིག"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -720,6 +729,7 @@ msgid "Middle"
 msgstr "ནང་།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -755,6 +765,7 @@ msgid "Horz. Alignment"
 msgstr "དྲང་འཕྱང་གྲལ་སྒྲིག"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -780,6 +791,7 @@ msgstr ""
 "གཡོན་ལ།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -814,6 +826,7 @@ msgid "Block"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -849,6 +862,7 @@ msgid "Accumulation"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MINIMUM\n"
@@ -865,6 +879,7 @@ msgstr ""
 "ཐང་ཆུང་ཤོས།"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MAXIMUM\n"
diff --git a/source/bo/reportdesign/source/ui/report.po b/source/bo/reportdesign/source/ui/report.po
index 2994c872ca0..8c74ee3771a 100644
--- a/source/bo/reportdesign/source/ui/report.po
+++ b/source/bo/reportdesign/source/ui/report.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/ui/report
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,15 +7,16 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 00:04+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_BRWTITLE_PROPERTIES\n"
@@ -44,6 +45,7 @@ msgid "Multiselection"
 msgstr "གདམ་ག་མང་ལྡན།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_IMAGECONTROL\n"
@@ -58,6 +60,7 @@ msgstr ""
 "པར་རྣམ་ཚོད་འཛིན།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FIXEDTEXT\n"
@@ -70,6 +73,7 @@ msgstr ""
 "ཤོག་མཆན་ཡིག་དུམ།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FIXEDLINE\n"
@@ -86,6 +90,7 @@ msgstr ""
 "ཐིག་སྐུད།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FORMATTED\n"
@@ -110,6 +115,7 @@ msgid "Shape"
 msgstr "དབྱིབས་ཚུལ།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_REPORT\n"
@@ -294,6 +300,7 @@ msgid "Preview"
 msgstr "སྔོན་ལྟ།"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "STR_RPT_TITLE\n"
@@ -452,6 +459,7 @@ msgid "Grid..."
 msgstr "དྲ་མིག་ཐིག(~G)..."
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -465,6 +473,7 @@ msgstr ""
 "གོང་ལ་རིམ་པ་གཅིག་སྦོ།(~F)"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -478,6 +487,7 @@ msgstr ""
 "གཤམ་ལ་རིམ་པ་གཅིག་སྦོ།(~W)"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT\n"
@@ -581,6 +591,7 @@ msgid "Distribution..."
 msgstr "ཁྱབ་ཚུལ།(~D)..."
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT\n"
@@ -608,6 +619,7 @@ msgid "Add field:"
 msgstr "གསར་སྣོན་ཡིག་དུམ་"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_FILTER\n"
@@ -630,6 +642,7 @@ msgid " - %PRODUCTNAME Base Report"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_APP_NEW_DOC\n"
@@ -682,6 +695,7 @@ msgid "Insert graphics"
 msgstr "རིས་དབྱིབས་བར་འཇུག"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_DELETE\n"
@@ -858,6 +872,7 @@ msgid "Report Footer"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_INSERT\n"