Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

2 files changed, 30 insertions, 6 deletions

diff --git a/source/my/officecfg/registry/data/org/openoffice/Office.po b/source/my/officecfg/registry/data/org/openoffice/Office.po
index 878614fa6d2..68d1bd06c38 100644
--- a/source/my/officecfg/registry/data/org/openoffice/Office.po
+++ b/source/my/officecfg/registry/data/org/openoffice/Office.po
@@ -1,4 +1,4 @@
-#. extracted from officecfg/registry/data/org/openoffice/Office
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 11:55+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: my\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: my\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366026911.0\n"
 
 #: Addons.xcu
@@ -628,6 +628,7 @@ msgid "Custom 4"
 msgstr "စိတ်ကြိုက် ၄"
 
 #: DataAccess.xcu
+#, fuzzy
 msgctxt ""
 "DataAccess.xcu\n"
 "..DataAccess.DriverSettings.com.sun.star.comp.sdbc.MozabDriver.ColumnAliases\n"
@@ -2836,6 +2837,7 @@ msgid "EmailAddr"
 msgstr "အီးမေးလ် လိပ်စာ"
 
 #: TableWizard.xcu
+#, fuzzy
 msgctxt ""
 "TableWizard.xcu\n"
 "..TableWizard.TableWizard.business.Tables.contacts.Fields.salutation\n"
@@ -2849,6 +2851,7 @@ msgstr ""
 "နှုတ်ခွန်းဆက်စကား"
 
 #: TableWizard.xcu
+#, fuzzy
 msgctxt ""
 "TableWizard.xcu\n"
 "..TableWizard.TableWizard.business.Tables.contacts.Fields.salutation\n"
@@ -6966,6 +6969,7 @@ msgid "CurrentVal"
 msgstr "လက်ရှိတန်ဖိုး"
 
 #: TableWizard.xcu
+#, fuzzy
 msgctxt ""
 "TableWizard.xcu\n"
 "..TableWizard.TableWizard.business.Tables.assets.Fields.comments\n"
@@ -6987,6 +6991,7 @@ msgstr ""
 "မှတ်ချက်များ"
 
 #: TableWizard.xcu
+#, fuzzy
 msgctxt ""
 "TableWizard.xcu\n"
 "..TableWizard.TableWizard.business.Tables.assets.Fields.comments\n"
@@ -7800,6 +7805,7 @@ msgid "EmailAddr"
 msgstr "အီးမေးလ် လိပ်စာ"
 
 #: TableWizard.xcu
+#, fuzzy
 msgctxt ""
 "TableWizard.xcu\n"
 "..TableWizard.TableWizard.private.Tables.addresses.Fields.salutation\n"
@@ -7813,6 +7819,7 @@ msgstr ""
 "နှုတ်ခွန်းဆက်စကား"
 
 #: TableWizard.xcu
+#, fuzzy
 msgctxt ""
 "TableWizard.xcu\n"
 "..TableWizard.TableWizard.private.Tables.addresses.Fields.salutation\n"
diff --git a/source/my/officecfg/registry/data/org/openoffice/Office/UI.po b/source/my/officecfg/registry/data/org/openoffice/Office/UI.po
index ec99a694d4b..dc42b33d458 100644
--- a/source/my/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/my/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,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 11:55+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: my\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: my\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366026915.0\n"
 
 #: BaseWindowState.xcu
@@ -2230,6 +2230,7 @@ msgid "Merge Cells"
 msgstr "ဆဲလ်အကွက်များပေါင်းပါ"
 
 #: CalcCommands.xcu
+#, fuzzy
 msgctxt ""
 "CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:SplitCell\n"
@@ -4988,6 +4989,7 @@ msgid "Delete"
 msgstr "ဖျက်ပါ"
 
 #: DbuCommands.xcu
+#, fuzzy
 msgctxt ""
 "DbuCommands.xcu\n"
 "..DbuCommands.UserInterface.Commands..uno:DBRename\n"
@@ -5039,6 +5041,7 @@ msgid "Delete"
 msgstr "ဖျက်ပါ"
 
 #: DbuCommands.xcu
+#, fuzzy
 msgctxt ""
 "DbuCommands.xcu\n"
 "..DbuCommands.UserInterface.Commands..uno:DBTableRename\n"
@@ -5081,6 +5084,7 @@ msgid "Delete"
 msgstr "ဖျက်ပါ"
 
 #: DbuCommands.xcu
+#, fuzzy
 msgctxt ""
 "DbuCommands.xcu\n"
 "..DbuCommands.UserInterface.Commands..uno:DBQueryRename\n"
@@ -5123,6 +5127,7 @@ msgid "Delete"
 msgstr "ဖျက်ပါ"
 
 #: DbuCommands.xcu
+#, fuzzy
 msgctxt ""
 "DbuCommands.xcu\n"
 "..DbuCommands.UserInterface.Commands..uno:DBFormRename\n"
@@ -5165,6 +5170,7 @@ msgid "Delete"
 msgstr "ဖျက်ပါ"
 
 #: DbuCommands.xcu
+#, fuzzy
 msgctxt ""
 "DbuCommands.xcu\n"
 "..DbuCommands.UserInterface.Commands..uno:DBReportRename\n"
@@ -7826,6 +7832,7 @@ msgid "Merge Cells"
 msgstr "ဆဲလ်အကွက်များပေါင်းပါ"
 
 #: DrawImpressCommands.xcu
+#, fuzzy
 msgctxt ""
 "DrawImpressCommands.xcu\n"
 "..DrawImpressCommands.UserInterface.Popups..uno:SplitCell\n"
@@ -14627,6 +14634,7 @@ msgid "Symmetric Transition"
 msgstr "ခေါက်ချိုးညီအကူးအပြောင်း"
 
 #: GenericCommands.xcu
+#, fuzzy
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:OutlineUp\n"
@@ -16064,6 +16072,7 @@ msgid "Move Down"
 msgstr "အောက်သို့ရွှေ့ပါ"
 
 #: GenericCommands.xcu
+#, fuzzy
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:GoUp\n"
@@ -16115,6 +16124,7 @@ msgid "Page Up"
 msgstr "စာမျက်နှာအထက်သို့"
 
 #: GenericCommands.xcu
+#, fuzzy
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:BmpMask\n"
@@ -19462,6 +19472,7 @@ msgid "Master View"
 msgstr "အဓိကမြင်ကွင်း"
 
 #: ImpressWindowState.xcu
+#, fuzzy
 msgctxt ""
 "ImpressWindowState.xcu\n"
 "..ImpressWindowState.UIElements.States.private:resource/toolpanel/DrawingFramework/MasterPages\n"
@@ -20357,6 +20368,7 @@ msgid "Gallery"
 msgstr "ပြခန်း"
 
 #: Sidebar.xcu
+#, fuzzy
 msgctxt ""
 "Sidebar.xcu\n"
 "..Sidebar.Content.DeckList.ImpressMasterPagesDeck\n"
@@ -22593,6 +22605,7 @@ msgid "~Table"
 msgstr "~ဇယား"
 
 #: WriterCommands.xcu
+#, fuzzy
 msgctxt ""
 "WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Commands..uno:SplitCell\n"
@@ -22921,6 +22934,7 @@ msgid "To Next Paragraph in Level"
 msgstr "ရှေ့စာမျက်နှာအဆင့်တစ်ခုသို့"
 
 #: WriterCommands.xcu
+#, fuzzy
 msgctxt ""
 "WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Commands..uno:MoveUp\n"
@@ -24448,6 +24462,7 @@ msgid "Continue previous numbering"
 msgstr "ယခင်နံပါတ်စဉ်တပ်ခြင်းကိုဆက်လုပ်သည်"
 
 #: WriterCommands.xcu
+#, fuzzy
 msgctxt ""
 "WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Popups..uno:NavigateBack\n"
@@ -25144,6 +25159,7 @@ msgid "Fontwork Shape"
 msgstr "စာလုံးစုပုံစံပုံသဏ္ဍာန် "
 
 #: WriterGlobalWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterGlobalWindowState.xcu\n"
 "..WriterGlobalWindowState.UIElements.States.private:resource/toolbar/navigationobjectbar\n"
@@ -26124,6 +26140,7 @@ msgid "Fontwork Shape"
 msgstr "စာလုံးစုပုံစံပုံသဏ္ဍာန် "
 
 #: WriterWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterWindowState.xcu\n"
 "..WriterWindowState.UIElements.States.private:resource/toolbar/navigationobjectbar\n"