Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

1 files changed, 17 insertions, 3 deletions

diff --git a/source/si/officecfg/registry/data/org/openoffice/Office/UI.po b/source/si/officecfg/registry/data/org/openoffice/Office/UI.po
index e4c339ad934..bb96392c05a 100644
--- a/source/si/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/si/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,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-02-17 21:25+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: si\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136304.0\n"
 
 #: BaseWindowState.xcu
@@ -1205,6 +1205,7 @@ msgid "~Edit Print Area..."
 msgstr "මුද්‍රණ ප්‍රදේශය සකස් කරන්න... (~E)"
 
 #: CalcCommands.xcu
+#, fuzzy
 msgctxt ""
 "CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:EditPrintArea\n"
@@ -2247,6 +2248,7 @@ msgid "Merge Cells"
 msgstr "සෙල් ඒකාබද්ධ කරන්න"
 
 #: CalcCommands.xcu
+#, fuzzy
 msgctxt ""
 "CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:SplitCell\n"
@@ -7813,6 +7815,7 @@ msgid "Merge Cells"
 msgstr "සෙල් ඒකාබද්ධ කරන්න"
 
 #: DrawImpressCommands.xcu
+#, fuzzy
 msgctxt ""
 "DrawImpressCommands.xcu\n"
 "..DrawImpressCommands.UserInterface.Popups..uno:SplitCell\n"
@@ -13289,6 +13292,7 @@ msgid "Open Circle (Pour)"
 msgstr "විවෘත කවය (වක්‍රය)"
 
 #: GenericCommands.xcu
+#, fuzzy
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:UndoAction\n"
@@ -15347,6 +15351,7 @@ msgid "Line Color (of the border)"
 msgstr "රේඛා වර්ණය (දාරය සඳහා)"
 
 #: GenericCommands.xcu
+#, fuzzy
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:OpenTemplate\n"
@@ -15921,6 +15926,7 @@ msgid "Redo"
 msgstr "නැවත කරන්න"
 
 #: GenericCommands.xcu
+#, fuzzy
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:Undo\n"
@@ -16114,6 +16120,7 @@ msgid "Page Up"
 msgstr "පිටුව ඉහළට"
 
 #: GenericCommands.xcu
+#, fuzzy
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:BmpMask\n"
@@ -16815,6 +16822,7 @@ msgid "~Ungroup"
 msgstr "කණ්ඩායම විසුරුවන්න (~U)"
 
 #: GenericCommands.xcu
+#, fuzzy
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:SetDefault\n"
@@ -20826,6 +20834,7 @@ msgid "Propert~ies..."
 msgstr "වත්කම්... (~i)"
 
 #: StartModuleCommands.xcu
+#, fuzzy
 msgctxt ""
 "StartModuleCommands.xcu\n"
 "..StartModuleCommands.UserInterface.Commands..uno:Undo\n"
@@ -22594,6 +22603,7 @@ msgid "~Table"
 msgstr "වගුව (~T)"
 
 #: WriterCommands.xcu
+#, fuzzy
 msgctxt ""
 "WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Commands..uno:SplitCell\n"
@@ -23966,6 +23976,7 @@ msgid "Text Wrap..."
 msgstr "පෙළ එතීම..."
 
 #: WriterCommands.xcu
+#, fuzzy
 msgctxt ""
 "WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Commands..uno:TextWrap\n"
@@ -24459,6 +24470,7 @@ msgid "Continue previous numbering"
 msgstr "පෙර අංකනය ඉදිරියට ගෙනයන්න"
 
 #: WriterCommands.xcu
+#, fuzzy
 msgctxt ""
 "WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Popups..uno:NavigateBack\n"
@@ -25155,6 +25167,7 @@ msgid "Fontwork Shape"
 msgstr "අකුරු වැඩ හැඩ"
 
 #: WriterGlobalWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterGlobalWindowState.xcu\n"
 "..WriterGlobalWindowState.UIElements.States.private:resource/toolbar/navigationobjectbar\n"
@@ -26135,6 +26148,7 @@ msgid "Fontwork Shape"
 msgstr "අකුරු වැඩ හැඩ"
 
 #: WriterWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterWindowState.xcu\n"
 "..WriterWindowState.UIElements.States.private:resource/toolbar/navigationobjectbar\n"