update translations for 5.2.0 alpha1

and force-fix errors using pocheck

Change-Id: I75bca3b0cc0333302eac4d11c98ad26dfdc35fd6

12 files changed, 823 insertions, 1812 deletions

diff --git a/source/cy/sw/source/ui/app.po b/source/cy/sw/source/ui/app.po
index 69c95d4da9f..f4d3e13c527 100644
--- a/source/cy/sw/source/ui/app.po
+++ b/source/cy/sw/source/ui/app.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-11-10 19:33+0100\n"
-"PO-Revision-Date: 2016-02-09 15:43+0000\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2016-04-06 08:33+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1455032583.000000\n"
+"X-POOTLE-MTIME: 1459931619.000000\n"
 
 #: app.src
 msgctxt ""
@@ -426,6 +426,24 @@ msgid "The following characters are not valid and have been removed: "
 msgstr "Nid yw'r nodau canlynol yn ddilys ac maent wedi eu tynnu: "
 
 #: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"STR_BOOKMARK_NAME\n"
+"string.text"
+msgid "Name"
+msgstr "Enw"
+
+#: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"STR_BOOKMARK_TEXT\n"
+"string.text"
+msgid "Text"
+msgstr "Testun"
+
+#: app.src
 msgctxt ""
 "app.src\n"
 "SW_STR_NONE\n"
@@ -796,6 +814,22 @@ msgstr "Awdur Anhysbys"
 #: app.src
 msgctxt ""
 "app.src\n"
+"STR_DELETE_NOTE_AUTHOR\n"
+"string.text"
+msgid "Delete ~All Comments by $1"
+msgstr "Dileu ~Pob Sylw gan $1"
+
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_HIDE_NOTE_AUTHOR\n"
+"string.text"
+msgid "H~ide All Comments by $1"
+msgstr "Cuddio Pob ~Sylw gan $1"
+
+#: app.src
+msgctxt ""
+"app.src\n"
 "STR_DONT_ASK_AGAIN\n"
 "string.text"
 msgid "~Do not show warning again"
@@ -1397,567 +1431,50 @@ msgid "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(ro
 msgstr "Cafwyd gwall fformat mewn ffeil yn isddogfen $(ARG1) yn $(ARG2)(rhes,col)."
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_PAGE\n"
-"FN_FORMAT_PAGE_DLG\n"
-"menuitem.text"
-msgid "Pa~ge..."
-msgstr "~Tudalen..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_FIELD\n"
-"FN_EDIT_FIELD\n"
-"menuitem.text"
-msgid "Fields..."
-msgstr "Meysydd..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_FIELD._MN_EDIT_FOOTNOTE\n"
-"FN_EDIT_FOOTNOTE\n"
-"menuitem.text"
-msgid "Footnote/Endnote~..."
-msgstr "Troednodyn/Diweddnod~..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_FIELD._MN_EDIT_FOOTNOTE._MN_EDIT_IDX_ENTRY_DLG\n"
-"FN_EDIT_IDX_ENTRY_DLG\n"
-"menuitem.text"
-msgid "Edit Inde~x Entry..."
-msgstr "~Golygu Cofnod Mynegai..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_BIB_ENTRY_DLG\n"
-"FN_EDIT_AUTH_ENTRY_DLG\n"
-"menuitem.text"
-msgid "~Bibliography Entry..."
-msgstr "Cofnod ~Llyfryddiaeth..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_EDIT_HYPERLINK\n"
-"menuitem.text"
-msgid "Edit Hyperlink..."
-msgstr "Golygu'r Ddolen..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_COPY_HYPERLINK_LOCATION\n"
-"menuitem.text"
-msgid "Copy Hyper~link"
-msgstr "Copïo ~Hyperddolen"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_MN_EDIT_OPEN_HYPERLINK\n"
-"FN_REMOVE_HYPERLINK\n"
-"menuitem.text"
-msgid "Remo~ve Hyperlink"
-msgstr "~Tynnu Dolen"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_RESET\n"
-"FN_FORMAT_RESET\n"
-"menuitem.text"
-msgid "Clear ~Direct Formatting"
-msgstr "Clirio Fformatio ~Uniongyrchol"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUMBER_NEWSTART\n"
-"menuitem.text"
-msgid "Restart Numbering"
-msgstr "Ail gychwyn Rhifo"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_CONTINUE\n"
-"menuitem.text"
-msgid "Continue previous numbering"
-msgstr "Parhau'r rhifo blaenorol"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_BULLET_UP\n"
-"menuitem.text"
-msgid "Up One Level"
-msgstr "Fyny Un Lefel"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"_NUMBERING_RELATED_MENU\n"
-"FN_NUM_BULLET_DOWN\n"
-"menuitem.text"
-msgid "Down One Level"
-msgstr "Lawr Un Lefel"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL.SID_MENU_PASTE_SPECIAL\n"
-"SID_PASTE_UNFORMATTED\n"
-"menuitem.text"
-msgid "~Unformatted Text"
-msgstr "~Testun Difformat"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL.SID_MENU_PASTE_SPECIAL\n"
-"SID_PASTE_SPECIAL\n"
-"menuitem.text"
-msgid "~More Options..."
-msgstr "~Rhagor o Ddewisiadau..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MENU_PASTE_SPECIAL\n"
-"SID_MENU_PASTE_SPECIAL\n"
-"menuitem.text"
-msgid "Paste ~Special"
-msgstr "Gludo ~Arbennig"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"BASE_TEXT_POPUPMENU_NOWEB\n"
-"FN_UPDATE_CUR_TOX\n"
-"menuitem.text"
-msgid "~Update Index or Table of Contents"
-msgstr "~Diweddaru Mynegai neu Dabl Cynnwys"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"BASE_TEXT_POPUPMENU_NOWEB\n"
-"FN_EDIT_CURRENT_TOX\n"
-"menuitem.text"
-msgid "~Edit Index or Table of Contents"
-msgstr "~Golygu Mynegai neu Dabl Cynnwys"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"BASE_TEXT_POPUPMENU_NOWEB\n"
-"FN_REMOVE_CUR_TOX\n"
-"menuitem.text"
-msgid "Delete Index or Table of Contents"
-msgstr "Dileu Mynegai neu Dabl Cynnwys"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_FRM_CAPTION_ITEM\n"
-"FN_INSERT_CAPTION\n"
-"menuitem.text"
-msgid "Insert ~Caption..."
-msgstr "Mewnosod ~Egluryn..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_BEFORE\n"
-"menuitem.text"
-msgid "Rows Above"
-msgstr "Rhesi Uwchlaw"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_AFTER\n"
-"menuitem.text"
-msgid "Rows Below"
-msgstr "Rhes Islaw"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_ROW_DLG\n"
-"menuitem.text"
-msgid "~Rows..."
-msgstr "~Rhesi..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_BEFORE\n"
-"menuitem.text"
-msgid "Columns Left"
-msgstr "Colofnau Chwith"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_AFTER\n"
-"menuitem.text"
-msgid "Columns Right"
-msgstr "Colofnau De"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY\n"
-"FN_TABLE_INSERT_COL_DLG\n"
-"menuitem.text"
-msgid "~Columns..."
-msgstr "~Colofnau..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY\n"
-"menuitem.text"
-msgid "~Insert"
-msgstr "~Mewnosod"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_ROW\n"
-"menuitem.text"
-msgid "~Rows"
-msgstr "~Rhesi"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_COL\n"
-"menuitem.text"
-msgid "~Columns"
-msgstr "~Colofnau"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+1\n"
-"FN_TABLE_DELETE_TABLE\n"
-"menuitem.text"
-msgid "~Table"
-msgstr "~Tabl"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+1\n"
-"menuitem.text"
-msgid "~Delete"
-msgstr "~Dileu"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_ROW\n"
-"menuitem.text"
-msgid "~Rows"
-msgstr "~Rhesi"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_COL\n"
-"menuitem.text"
-msgid "~Columns"
-msgstr "~Colofnau"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_ALL\n"
-"menuitem.text"
-msgid "~Table"
-msgstr "~Tabl"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+2\n"
-"FN_TABLE_SELECT_CELL\n"
-"menuitem.text"
-msgid "C~ell"
-msgstr "C~ell"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+2\n"
-"menuitem.text"
-msgid "~Select"
-msgstr "~Dewis"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_TABLE_MERGE_CELLS\n"
-"menuitem.text"
-msgid "~Merge"
-msgstr "~Cyfuno"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_NONE\n"
-"menuitem.text"
-msgid "~Top"
-msgstr "~Brig"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_CENTER\n"
-"menuitem.text"
-msgid "C~enter"
-msgstr "C~anoli"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.MN_FORMAT_ALGN\n"
-"SID_TABLE_VERT_BOTTOM\n"
-"menuitem.text"
-msgid "~Bottom"
-msgstr "~Gwaelod"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"MN_FORMAT_ALGN\n"
-"menuitem.text"
-msgid "A~lignment"
-msgstr "A~liniad"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_SET_COL_WIDTH\n"
-"menuitem.text"
-msgid "~Column Width..."
-msgstr "~Lled Colofn..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_ADJUST_CELLS\n"
-"menuitem.text"
-msgid "~Optimal Column Width"
-msgstr "Ll~ed Colofn Gorau"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_BALANCE_CELLS\n"
-"menuitem.text"
-msgid "~Distribute Columns Equally"
-msgstr "~Dosbarthu Colofnau'n Gydradd"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_SET_ROW_HEIGHT\n"
-"menuitem.text"
-msgid "~Row Height..."
-msgstr "Uchder ~Rhes..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_OPTIMAL_HEIGHT\n"
-"menuitem.text"
-msgid "Optimal Row ~Height"
-msgstr "~Uchder Rhes Gorau"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE.DUMMY+4\n"
-"FN_TABLE_BALANCE_ROWS\n"
-"menuitem.text"
-msgid "Distribute Rows ~Equally"
-msgstr "Dosbarthu Rhesi yn ~Gydradd"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"DUMMY+4\n"
-"menuitem.text"
-msgid "Si~ze"
-msgstr "~Maint"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_NUM_FORMAT_TABLE_DLG\n"
-"menuitem.text"
-msgid "N~umber Format..."
-msgstr "Ffo~rmat Rhif..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TABLE\n"
-"FN_FORMAT_TABLE_DLG\n"
-"menuitem.text"
-msgid "~Table Properties..."
-msgstr "Priodweddau ~Tabl..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRWTXTATTR\n"
-"FN_DRAWTEXT_ATTR_DLG\n"
-"menuitem.text"
-msgid "Te~xt..."
-msgstr "~Testun..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_NAME_SHAPE\n"
-"FN_NAME_SHAPE\n"
-"menuitem.text"
-msgid "Name..."
-msgstr "Enw..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TITLE_DESCRIPTION_SHAPE\n"
-"FN_TITLE_DESCRIPTION_SHAPE\n"
-"menuitem.text"
-msgid "Description..."
-msgstr "Disgrifiad..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_FRM\n"
-"FN_FORMAT_FRAME_DLG\n"
-"menuitem.text"
-msgid "~Frame..."
-msgstr "~Ffrâm..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ONE_STEP\n"
-"FN_FRAME_UP\n"
-"menuitem.text"
-msgid "Bring ~Forward"
-msgstr "Dwyn ~Ymlaen"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ONE_STEP\n"
-"FN_FRAME_DOWN\n"
-"menuitem.text"
-msgid "Send Back~ward"
-msgstr "Anfon ~Nôl"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW5\n"
-"MN_SUB_ARRANGE\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "~Trefnu"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW6\n"
-"MN_SUB_ARRANGE\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "~Trefnu"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_REPLY\n"
 "menuitem.text"
 msgid "Reply"
 msgstr "Ateb"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_DELETE_COMMENT\n"
 "menuitem.text"
 msgid "Delete ~Comment"
 msgstr "Dileu ~Sylw"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_DELETE_NOTE_AUTHOR\n"
 "menuitem.text"
 msgid "Delete ~All Comments by $1"
 msgstr "Dileu ~Pob Sylw gan $1"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_DELETE_ALL_NOTES\n"
 "menuitem.text"
 msgid "~Delete All Comments"
 msgstr "Dileu ~Pob Sylw"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
-"MN_ANNOTATIONS\n"
+"MN_ANNOTATION_BUTTON\n"
 "FN_FORMAT_ALL_NOTES\n"
 "menuitem.text"
 msgid "~Format All Comments..."
@@ -1966,482 +1483,6 @@ msgstr "~Fformatio Pob Sylw..."
 #: mn.src
 msgctxt ""
 "mn.src\n"
-"MN_TEXT_POPUPMENU\n"
-"string.text"
-msgid "Text"
-msgstr "Testun"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_TAB_POPUPMENU\n"
-"string.text"
-msgid "Table"
-msgstr "Tabl"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_CONTOUR\n"
-"FN_FRAME_WRAP_CONTOUR\n"
-"menuitem.text"
-msgid "Enable ~Contour"
-msgstr "Galluogi ~Amlinell"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_EDIT_CONTOUR\n"
-"SID_CONTOUR_DLG\n"
-"menuitem.text"
-msgid "~Edit Contour..."
-msgstr "~Golygu Amlinell..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_NOWRAP\n"
-"menuitem.text"
-msgid "~No Wrap"
-msgstr "~Dim Amlapio"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP\n"
-"menuitem.text"
-msgid "~Page Wrap"
-msgstr "Amlapio ~Tudalen"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_IDEAL\n"
-"menuitem.text"
-msgid "~Optimal Page Wrap"
-msgstr "Amlapio Tudalen ~Gorau"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_LEFT\n"
-"menuitem.text"
-msgid "Wrap ~Before"
-msgstr "Amlapio ~Cyn"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAP_RIGHT\n"
-"menuitem.text"
-msgid "Wrap ~After"
-msgstr "Amlapio ~Wedi"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU\n"
-"menuitem.text"
-msgid "~Wrap Through"
-msgstr "Amlapio ~Drwodd"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU_TRANSP\n"
-"menuitem.text"
-msgid "In ~Background"
-msgstr "Yn y ~Cefndir"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN.MN_WRAP\n"
-"FN_WRAP_ANCHOR_ONLY\n"
-"menuitem.text"
-msgid "~First Paragraph"
-msgstr "~Paragraff Cyntaf"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MOUSE_FRAME_BEGIN\n"
-"MN_WRAP\n"
-"menuitem.text"
-msgid "~Wrap"
-msgstr "~Amlapio"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"string.text"
-msgid "Graphic"
-msgstr "Graffig"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_NOWRAP\n"
-"menuitem.text"
-msgid "~No Wrap"
-msgstr "~Dim Amlapio"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAP\n"
-"menuitem.text"
-msgid "~Page Wrap"
-msgstr "Amlapio ~Tudalen"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAP_IDEAL\n"
-"menuitem.text"
-msgid "~Optimal Page Wrap"
-msgstr "Amlapio Tudalen ~Gorau"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU\n"
-"menuitem.text"
-msgid "~Wrap Through"
-msgstr "Amlapio ~Drwodd"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_FRAME_WRAPTHRU_TRANSP\n"
-"menuitem.text"
-msgid "In ~Background"
-msgstr "Yn y ~Cefndir"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_WRAP_ANCHOR_ONLY\n"
-"menuitem.text"
-msgid "~First Paragraph"
-msgstr "~Paragraff Cyntaf"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW.MN_WRAP\n"
-"FN_DRAW_WRAP_DLG\n"
-"menuitem.text"
-msgid "~Edit..."
-msgstr "~Golygu..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_WRAP_DRAW\n"
-"MN_WRAP\n"
-"menuitem.text"
-msgid "~Wrap"
-msgstr "~Amlapio"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_AT_FRAME\n"
-"FN_TOOL_ANCHOR_FRAME\n"
-"menuitem.text"
-msgid "To ~Frame"
-msgstr "I ~Ffrâm"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_PAGE\n"
-"menuitem.text"
-msgid "To P~age"
-msgstr "I ~Dudalen"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_PARAGRAPH\n"
-"menuitem.text"
-msgid "To ~Paragraph"
-msgstr "I ~Baragraff"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_AT_CHAR\n"
-"menuitem.text"
-msgid "To ~Character"
-msgstr "I ~Nod"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR.FN_TOOL_ANCHOR\n"
-"FN_TOOL_ANCHOR_CHAR\n"
-"menuitem.text"
-msgid "As C~haracter"
-msgstr "Fel N~od"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ANCHOR\n"
-"FN_TOOL_ANCHOR\n"
-"menuitem.text"
-msgid "An~chor"
-msgstr "~Angor"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"FN_ADD_TEXT_BOX\n"
-"menuitem.text"
-msgid "Add Text Box"
-msgstr "Ychwanegu Blwch Testun"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAW_POPUPMENU\n"
-"FN_REMOVE_TEXT_BOX\n"
-"menuitem.text"
-msgid "Remove Text Box"
-msgstr "Tynnu'r Bwlch Testun"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRAWFORM_POPUPMENU\n"
-"string.text"
-msgid "Control"
-msgstr "Rheolaeth"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_DRWTXT_POPUPMENU\n"
-"string.text"
-msgid "Draw Object text"
-msgstr "Testun Gwrthrych Draw"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_GRF_POPUPMENU\n"
-"string.text"
-msgid "Graphic"
-msgstr "Graffig"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ARRANGE_FRAME\n"
-"MN_SUB_ALIGN\n"
-"menuitem.text"
-msgid "~Arrange"
-msgstr "~Trefnu"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_HORZ_LEFT\n"
-"menuitem.text"
-msgid "~Left"
-msgstr "~Chwith"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_HORZ_CENTER\n"
-"menuitem.text"
-msgid "~Centered"
-msgstr "~Canoli"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_HORZ_RIGHT\n"
-"menuitem.text"
-msgid "~Right"
-msgstr "~De"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_VERT_TOP\n"
-"menuitem.text"
-msgid "Base at ~Top"
-msgstr "Sail ar y ~Brig"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_VERT_CENTER\n"
-"menuitem.text"
-msgid "Base in ~Middle"
-msgstr "Sail yn y ~Canol"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME.MN_FORMAT_FRM_HORZ\n"
-"FN_FRAME_ALIGN_VERT_BOTTOM\n"
-"menuitem.text"
-msgid "Base at ~Bottom"
-msgstr "Sail ar y ~Gwaelod"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ALIGNMENT_FRAME\n"
-"MN_FORMAT_FRM_HORZ\n"
-"menuitem.text"
-msgid "A~lignment"
-msgstr "A~liniad"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ROTATE_IMAGE.SID_MENU_MANAGE_GRAPHIC\n"
-"SID_ROTATE_GRAPHIC_LEFT\n"
-"menuitem.text"
-msgid "Rotate 90° Left"
-msgstr "Cylchdroi 90° i'r Chwith"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ROTATE_IMAGE.SID_MENU_MANAGE_GRAPHIC\n"
-"SID_ROTATE_GRAPHIC_RIGHT\n"
-"menuitem.text"
-msgid "Rotate 90° Right"
-msgstr "Cylchdroi 90° i'r Dde"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_ROTATE_IMAGE\n"
-"SID_MENU_MANAGE_GRAPHIC\n"
-"menuitem.text"
-msgid "~Rotate"
-msgstr "C~ylchdroi"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_GRF_POPUPMENU\n"
-"FN_FORMAT_GRAFIC_DLG\n"
-"menuitem.text"
-msgid "Format ~Image..."
-msgstr "~Fformatio Delwedd..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_OLE_POPUPMENU\n"
-"string.text"
-msgid "Object"
-msgstr "Gwrthrych"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_OLE_POPUPMENU\n"
-"FN_FORMAT_FRAME_DLG\n"
-"menuitem.text"
-msgid "Object..."
-msgstr "Gwrthrych..."
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_FRM_POPUPMENU\n"
-"string.text"
-msgid "Frame"
-msgstr "Ffrâm"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"string.text"
-msgid "Draw Object text"
-msgstr "Testun Gwrthrych Draw"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PAGEUP\n"
-"menuitem.text"
-msgid "Previous Page"
-msgstr "Tudalen Flaenorol"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PAGEDOWN\n"
-"menuitem.text"
-msgid "Next Page"
-msgstr "Tudalen Nesaf"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"FN_PRINT_PAGEPREVIEW\n"
-"menuitem.text"
-msgid "Print"
-msgstr "Argraffu"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_PPREVIEW_POPUPMENU\n"
-"SID_PRINTPREVIEW\n"
-"menuitem.text"
-msgid "Close Preview"
-msgstr "Cau'r Rhagolwg"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
-"MN_MEDIA_POPUPMENU\n"
-"string.text"
-msgid "Media object"
-msgstr "Gwrthrych cyfrwng"
-
-#: mn.src
-msgctxt ""
-"mn.src\n"
 "MN_HEADERFOOTER_BUTTON\n"
 "FN_HEADERFOOTER_BORDERBACK\n"
 "menuitem.text"
diff --git a/source/cy/sw/source/ui/config.po b/source/cy/sw/source/ui/config.po
index 95fef99077e..71eb6328006 100644
--- a/source/cy/sw/source/ui/config.po
+++ b/source/cy/sw/source/ui/config.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-04-22 23:40+0200\n"
-"PO-Revision-Date: 2016-02-08 17:41+0000\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2016-04-06 08:37+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1454953293.000000\n"
+"X-POOTLE-MTIME: 1459931825.000000\n"
 
 #: optdlg.src
 msgctxt ""
@@ -43,279 +43,248 @@ msgstr "Gorllewinol"
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"%PRODUCTNAME %s\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRODUCTNAME\n"
+"string.text"
 msgid "%PRODUCTNAME %s"
 msgstr "%PRODUCTNAME %s"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Contents\n"
-"itemlist.text"
+"STR_PRINTOPTUI_CONTENTS\n"
+"string.text"
 msgid "Contents"
 msgstr "Cynnwys"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Page ba~ckground\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PAGE_BACKGROUND\n"
+"string.text"
 msgid "Page ba~ckground"
-msgstr "~Cefndir"
+msgstr "Cefndir ~tudalen"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"P~ictures and other graphic objects\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PICTURES\n"
+"string.text"
 msgid "P~ictures and other graphic objects"
 msgstr "~Lluniau a gwrthrychau graffigol eraill"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Hidden te~xt\n"
-"itemlist.text"
+"STR_PRINTOPTUI_HIDDEN\n"
+"string.text"
 msgid "Hidden te~xt"
 msgstr "~Testun cudd"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Text placeholders\n"
-"itemlist.text"
+"STR_PRINTOPTUI_TEXT_PLACEHOLDERS\n"
+"string.text"
 msgid "~Text placeholders"
 msgstr "~Dalfannau testun"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Form control~s\n"
-"itemlist.text"
+"STR_PRINTOPTUI_FORM_CONTROLS\n"
+"string.text"
 msgid "Form control~s"
-msgstr "~Rheolaeth"
+msgstr "~Rheolaeth ffurflen"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Color\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COLOR\n"
+"string.text"
 msgid "Color"
 msgstr "Lliw"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Print text in blac~k\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRINT_BLACK\n"
+"string.text"
 msgid "Print text in blac~k"
-msgstr "Argraffu d~u"
+msgstr "Argraffu testun mewn ~du"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PAGES_TEXT\n"
+"string.text"
 msgid "Pages"
 msgstr "Tudalennau"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Print ~automatically inserted blank pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRINT_BLANK\n"
+"string.text"
 msgid "Print ~automatically inserted blank pages"
 msgstr "Argraffu tudalennau gwag mewnosodwyd yn ~awtomatig"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Use only paper tray from printer preferences\n"
-"itemlist.text"
+"STR_PRINTOPTUI_ONLY_PAPER\n"
+"string.text"
 msgid "~Use only paper tray from printer preferences"
 msgstr "~Defnyddio dim ond y drôr papur o'r dewisiadau argraffu"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Print\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PRINT\n"
+"string.text"
 msgid "Print"
 msgstr "Argraffu"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"None (document only)\n"
-"itemlist.text"
+"STR_PRINTOPTUI_NONE\n"
+"string.text"
 msgid "None (document only)"
 msgstr "Dim (dogfen yn unig)"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Comments only\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COMMENTS_ONLY\n"
+"string.text"
 msgid "Comments only"
 msgstr "Sylwadau'n unig"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Place at end of document\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PLACE_END\n"
+"string.text"
 msgid "Place at end of document"
 msgstr "Gosod ar ddiwedd dogfen"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Place at end of page\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PLACE_PAGE\n"
+"string.text"
 msgid "Place at end of page"
 msgstr "Gosod ar ddiwedd tudalen"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Comments\n"
-"itemlist.text"
+"STR_PRINTOPTUI_COMMENTS\n"
+"string.text"
 msgid "~Comments"
 msgstr "~Nodiadau"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Page sides\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PAGE_SIDES\n"
+"string.text"
 msgid "Page sides"
-msgstr "Dalennau"
+msgstr "Ochrau tudalen"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"All pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_ALL_PAGES\n"
+"string.text"
 msgid "All pages"
-msgstr "Popeth"
+msgstr "Pob tudalen"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Back sides / left pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_BACK_PAGES\n"
+"string.text"
 msgid "Back sides / left pages"
 msgstr "Ochrau cefn / tudalennau chwith"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Front sides / right pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_FONT_PAGES\n"
+"string.text"
 msgid "Front sides / right pages"
 msgstr "Ochrau blaen / tudalennau de"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Include\n"
-"itemlist.text"
+"STR_PRINTOPTUI_INCLUDE\n"
+"string.text"
 msgid "Include"
 msgstr "Cynnwys"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Broch~ure\n"
-"itemlist.text"
+"STR_PRINTOPTUI_BROCHURE\n"
+"string.text"
 msgid "Broch~ure"
 msgstr "~Llyfryn"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Left-to-right script\n"
-"itemlist.text"
+"STR_PRINTOPTUI_LEFT_SCRIPT\n"
+"string.text"
 msgid "Left-to-right script"
 msgstr "Sgript chwith i'r dde"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Right-to-left script\n"
-"itemlist.text"
+"STR_PRINTOPTUI_RIGHT_SCRIPT\n"
+"string.text"
 msgid "Right-to-left script"
 msgstr "Sgript de i chwith"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Range and copies\n"
-"itemlist.text"
+"STR_PRINTOPTUI_RANGE_COPIES\n"
+"string.text"
 msgid "Range and copies"
 msgstr "Ystod a chopïau"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~All pages\n"
-"itemlist.text"
+"STR_PRINTOPTUI_ALLPAGES\n"
+"string.text"
 msgid "~All pages"
 msgstr "~Pob tudalen"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Pa~ges\n"
-"itemlist.text"
+"STR_PRINTOPTUI_SOMEPAGES\n"
+"string.text"
 msgid "Pa~ges"
 msgstr "~Tudalennau"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"~Selection\n"
-"itemlist.text"
+"STR_PRINTOPTUI_SELECTION\n"
+"string.text"
 msgid "~Selection"
 msgstr "~Dewis"
 
 #: optdlg.src
 msgctxt ""
 "optdlg.src\n"
-"STR_PRINTOPTUI\n"
-"Place in margins\n"
-"itemlist.text"
+"STR_PRINTOPTUI_PLACE_MARGINS\n"
+"string.text"
 msgid "Place in margins"
 msgstr "Man yn yr ymyl"
 
diff --git a/source/cy/sw/source/ui/dbui.po b/source/cy/sw/source/ui/dbui.po
index 7f5dad12dfd..6c10050f89a 100644
--- a/source/cy/sw/source/ui/dbui.po
+++ b/source/cy/sw/source/ui/dbui.po
@@ -3,18 +3,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2014-11-18 11:23+0100\n"
-"PO-Revision-Date: 2014-12-08 11:11+0000\n"
-"Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2016-04-06 08:37+0000\n"
+"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1418037099.000000\n"
+"X-POOTLE-MTIME: 1459931828.000000\n"
 
 #: dbui.src
 msgctxt ""
@@ -215,19 +215,21 @@ msgid "Text Comma Separated (*.csv)"
 msgstr "Testun wedi ei wahanu gan atalnod (*.csv)"
 
 #: dbui.src
+#, fuzzy
 msgctxt ""
 "dbui.src\n"
 "STR_FILTER_MDB\n"
 "string.text"
-msgid "Microsoft Access (*.mdb)"
+msgid "Microsoft Access (*.mdb;*.mde)"
 msgstr "Microsoft Access (*.mdb)"
 
 #: dbui.src
+#, fuzzy
 msgctxt ""
 "dbui.src\n"
 "STR_FILTER_ACCDB\n"
 "string.text"
-msgid "Microsoft Access 2007 (*.accdb)"
+msgid "Microsoft Access 2007 (*.accdb,*.accde)"
 msgstr "Microsoft Access 2007 (*.accdb)"
 
 #: dbui.src
@@ -311,7 +313,7 @@ msgstr "Dewis y ddogfen gychwynnol"
 #: mailmergewizard.src
 msgctxt ""
 "mailmergewizard.src\n"
-"ST_DOCUMETNTYPE\n"
+"ST_DOCUMENTTYPE\n"
 "string.text"
 msgid "Select document type"
 msgstr "Dewis y math o ddogfen"
@@ -351,26 +353,10 @@ msgstr "Newid cynllun"
 #: mailmergewizard.src
 msgctxt ""
 "mailmergewizard.src\n"
-"ST_PREPAREMERGE\n"
+"ST_EXCLUDE\n"
 "string.text"
-msgid "Edit document"
-msgstr "Golygu dogfen"
-
-#: mailmergewizard.src
-msgctxt ""
-"mailmergewizard.src\n"
-"ST_MERGE\n"
-"string.text"
-msgid "Personalize document"
-msgstr "Personoli dogfen"
-
-#: mailmergewizard.src
-msgctxt ""
-"mailmergewizard.src\n"
-"ST_OUTPUT\n"
-"string.text"
-msgid "Save, print or send"
-msgstr "Cadw, argraffu neu anfon"
+msgid "Exclude recipient"
+msgstr ""
 
 #: mailmergewizard.src
 msgctxt ""
diff --git a/source/cy/sw/source/ui/ribbar.po b/source/cy/sw/source/ui/ribbar.po
deleted file mode 100644
index ec94d542586..00000000000
--- a/source/cy/sw/source/ui/ribbar.po
+++ /dev/null
@@ -1,61 +0,0 @@
-#. extracted from sw/source/ui/ribbar
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2014-05-02 00:02+0200\n"
-"PO-Revision-Date: 2012-06-26 11:19+0200\n"
-"Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: cy\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
-"X-Generator: LibreOffice\n"
-"X-Accelerator-Marker: ~\n"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_PAGE\n"
-"menuitem.text"
-msgid "To Page"
-msgstr "I Dudalen"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_PARAGRAPH\n"
-"menuitem.text"
-msgid "To Paragraph"
-msgstr "I Baragraff"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_AT_CHAR\n"
-"menuitem.text"
-msgid "To Character"
-msgstr "I Nod"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_CHAR\n"
-"menuitem.text"
-msgid "As Character"
-msgstr "Fel Nod"
-
-#: tbxanchr.src
-msgctxt ""
-"tbxanchr.src\n"
-"MN_ANCHOR_POPUP\n"
-"FN_TOOL_ANCHOR_FRAME\n"
-"menuitem.text"
-msgid "To Frame"
-msgstr "I Ffrâm"
diff --git a/source/cy/sw/source/ui/utlui.po b/source/cy/sw/source/ui/utlui.po
index b001383f8f5..a89843bfe70 100644
--- a/source/cy/sw/source/ui/utlui.po
+++ b/source/cy/sw/source/ui/utlui.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-04-22 23:40+0200\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
 "PO-Revision-Date: 2016-02-08 17:41+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1848,11 +1848,12 @@ msgid "Indexes"
 msgstr "Mynegeion"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_DRAWOBJECT\n"
 "string.text"
-msgid "Draw objects"
+msgid "Drawing objects"
 msgstr "Gwrthrychau lluniadu"
 
 #: utlui.src
diff --git a/source/cy/sw/source/uibase/inc.po b/source/cy/sw/source/uibase/inc.po
deleted file mode 100644
index 370ed7765da..00000000000
--- a/source/cy/sw/source/uibase/inc.po
+++ /dev/null
@@ -1,53 +0,0 @@
-#. extracted from sw/source/uibase/inc
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2014-11-18 11:23+0100\n"
-"PO-Revision-Date: 2014-12-03 10:42+0000\n"
-"Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: cy\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
-"X-Generator: LibreOffice\n"
-"X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1417603338.000000\n"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_ACCEPT_DIRECT\n"
-"menuitem.text"
-msgid "Accept Change"
-msgstr "Derbyn Newid"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_REJECT_DIRECT\n"
-"menuitem.text"
-msgid "Reject Change"
-msgstr "Gwrthod Newid"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_NEXT_CHANGE\n"
-"menuitem.text"
-msgid "Next Change"
-msgstr "Newid Nesaf"
-
-#: redline_tmpl.hrc
-msgctxt ""
-"redline_tmpl.hrc\n"
-"MN_EDIT_REDLINE\n"
-"FN_REDLINE_PREV_CHANGE\n"
-"menuitem.text"
-msgid "Previous Change"
-msgstr "Newid Blaenorol"
diff --git a/source/cy/sw/source/uibase/lingu.po b/source/cy/sw/source/uibase/lingu.po
index 9177ffc57f4..04fdba063a2 100644
--- a/source/cy/sw/source/uibase/lingu.po
+++ b/source/cy/sw/source/uibase/lingu.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-11-10 19:33+0100\n"
-"PO-Revision-Date: 2016-02-08 17:41+0000\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2016-04-06 08:37+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1454953315.000000\n"
+"X-POOTLE-MTIME: 1459931862.000000\n"
 
 #: olmenu.src
 msgctxt ""
@@ -73,6 +73,42 @@ msgstr "Gosod Iaith ar gyfer y Paragraff"
 #: olmenu.src
 msgctxt ""
 "olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_ACCEPT_DIRECT\n"
+"menuitem.text"
+msgid "Accept Change"
+msgstr "Derbyn y Newid"
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_REJECT_DIRECT\n"
+"menuitem.text"
+msgid "Reject Change"
+msgstr "Gwrthod y Newid"
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_NEXT_CHANGE\n"
+"menuitem.text"
+msgid "Next Change"
+msgstr "Y Newid Nesaf"
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
+"MN_SPELL_POPUP\n"
+"FN_REDLINE_PREV_CHANGE\n"
+"menuitem.text"
+msgid "Previous Change"
+msgstr "Y Newid Diwethaf"
+
+#: olmenu.src
+msgctxt ""
+"olmenu.src\n"
 "STR_WORD\n"
 "string.text"
 msgid "Word is "
diff --git a/source/cy/sw/source/uibase/ribbar.po b/source/cy/sw/source/uibase/ribbar.po
index 3f7d240edda..e6a6fda7359 100644
--- a/source/cy/sw/source/uibase/ribbar.po
+++ b/source/cy/sw/source/uibase/ribbar.po
@@ -3,18 +3,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2014-11-18 11:23+0100\n"
-"PO-Revision-Date: 2014-12-08 11:21+0000\n"
-"Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
+"PO-Revision-Date: 2016-04-06 08:37+0000\n"
+"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1418037710.000000\n"
+"X-POOTLE-MTIME: 1459931866.000000\n"
 
 #: inputwin.src
 msgctxt ""
@@ -22,8 +22,8 @@ msgctxt ""
 "RID_TBX_FORMULA\n"
 "FN_FORMULA_CALC\n"
 "toolboxitem.text"
-msgid "Formula"
-msgstr "Fformiwla"
+msgid "Functions"
+msgstr "Swyddogaethau"
 
 #: inputwin.src
 msgctxt ""
@@ -330,78 +330,6 @@ msgstr "Testun Fformiwla"
 #: workctrl.src
 msgctxt ""
 "workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_PGNUMBER\n"
-"menuitem.text"
-msgid "Page Number"
-msgstr "Rhif Tudalen"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_PGCOUNT\n"
-"menuitem.text"
-msgid "Page Count"
-msgstr "Cyfrif Tudalen"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_DATE\n"
-"menuitem.text"
-msgid "Date"
-msgstr "Dyddiad"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TIME\n"
-"menuitem.text"
-msgid "Time"
-msgstr "Amser"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TITLE\n"
-"menuitem.text"
-msgid "Title"
-msgstr "Teitl"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_AUTHOR\n"
-"menuitem.text"
-msgid "Author"
-msgstr "Awdur"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FLD_TOPIC\n"
-"menuitem.text"
-msgid "Subject"
-msgstr "Pwnc"
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
-"RID_INSERT_FIELD_CTRL\n"
-"FN_INSERT_FIELD\n"
-"menuitem.text"
-msgid "More Fields..."
-msgstr "Mwy o Feysydd..."
-
-#: workctrl.src
-msgctxt ""
-"workctrl.src\n"
 "ST_TBL\n"
 "string.text"
 msgid "Table"
diff --git a/source/cy/sw/source/uibase/smartmenu.po b/source/cy/sw/source/uibase/smartmenu.po
deleted file mode 100644
index 8cd5dc07af3..00000000000
--- a/source/cy/sw/source/uibase/smartmenu.po
+++ /dev/null
@@ -1,26 +0,0 @@
-#. extracted from sw/source/uibase/smartmenu
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2014-11-18 11:23+0100\n"
-"PO-Revision-Date: 2014-12-03 10:55+0000\n"
-"Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: cy\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
-"X-Generator: LibreOffice\n"
-"X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1417604144.000000\n"
-
-#: stmenu.src
-msgctxt ""
-"stmenu.src\n"
-"MN_SMARTTAG_POPUP\n"
-"MN_SMARTTAG_OPTIONS\n"
-"menuitem.text"
-msgid "Smart Tag Options..."
-msgstr "Dewisiadau Tagiau Clyfar..."
diff --git a/source/cy/sw/source/uibase/uiview.po b/source/cy/sw/source/uibase/uiview.po
index fe1ced396be..385875ef913 100644
--- a/source/cy/sw/source/uibase/uiview.po
+++ b/source/cy/sw/source/uibase/uiview.po
@@ -3,16 +3,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2014-11-18 11:23+0100\n"
+"POT-Creation-Date: 2016-03-09 20:49+0100\n"
 "PO-Revision-Date: 2014-12-05 11:53+0000\n"
-"Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
+"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
 "X-POOTLE-MTIME: 1417780417.000000\n"
 
@@ -179,24 +179,7 @@ msgstr "~Allforio ffynhonnell..."
 #: view.src
 msgctxt ""
 "view.src\n"
-"MN_SRCVIEW_POPUPMENU\n"
-"string.text"
-msgid "HTML source"
-msgstr "Ffynhonnell HTML"
-
-#: view.src
-msgctxt ""
-"view.src\n"
 "RID_PVIEW_TOOLBOX\n"
 "string.text"
 msgid "Print Preview"
 msgstr "Rhagolwg Argraffu"
-
-#: view.src
-msgctxt ""
-"view.src\n"
-"MN_SRCVIEW_POPUPMENU\n"
-"SID_SOURCEVIEW\n"
-"menuitem.text"
-msgid "HTML Source"
-msgstr "Ffynhonnell HTML"
diff --git a/source/cy/sw/source/uibase/utlui.po b/source/cy/sw/source/uibase/utlui.po
index 5e03373db6c..1e840e94942 100644
--- a/source/cy/sw/source/uibase/utlui.po
+++ b/source/cy/sw/source/uibase/utlui.po
@@ -3,9 +3,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-11-10 19:33+0100\n"
-"PO-Revision-Date: 2016-02-10 13:33+0000\n"
-"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2016-04-06 08:38+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1455111231.000000\n"
+"X-POOTLE-MTIME: 1459931896.000000\n"
 
 #: attrdesc.src
 msgctxt ""
@@ -1458,215 +1458,230 @@ msgid "ISBN"
 msgstr "ISBN"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"DLG_NAVIGATION_PI\n"
-"window.text"
-msgid "Navigator"
-msgstr "Llywiwr"
-
-#: navipi.src
-msgctxt ""
-"navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_GLOBAL_SWITCH\n"
 "toolboxitem.text"
-msgid "Toggle"
-msgstr "Toglo"
+msgid "Toggle Master View"
+msgstr "Toglo'r Prif Olwg"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_CREATE_NAVIGATION\n"
 "toolboxitem.text"
 msgid "Navigation"
 msgstr "Llywio"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_UP\n"
 "toolboxitem.text"
 msgid "Back"
 msgstr "Nôl"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_DOWN\n"
 "toolboxitem.text"
 msgid "Forward"
 msgstr "Ymlaen"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_DROP_REGION\n"
 "toolboxitem.text"
 msgid "Drag Mode"
 msgstr "Modd Llusgo"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_UP\n"
 "toolboxitem.text"
 msgid "Promote Chapter"
 msgstr "Dyrchafu Pennod"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_DOWN\n"
 "toolboxitem.text"
 msgid "Demote Chapter"
 msgstr "Darostwng Pennod"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SHOW_CONTENT_BOX\n"
 "toolboxitem.text"
 msgid "List Box On/Off"
 msgstr "Blwch Rhestr Ymlaen/Diffodd"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SHOW_ROOT\n"
 "toolboxitem.text"
-msgid "Content View"
-msgstr "Golwg Cynnwys"
+msgid "Content Navigation View"
+msgstr "Golwg Llywio Cynnwys"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_SET_AUTO_BOOKMARK\n"
 "toolboxitem.text"
 msgid "Set Reminder"
 msgstr "Gosod Atgoffwr"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_HEADER\n"
 "toolboxitem.text"
 msgid "Header"
 msgstr "Pennyn"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_FOOTER\n"
 "toolboxitem.text"
 msgid "Footer"
 msgstr "Troedyn"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_SELECT_FOOTNOTE\n"
 "toolboxitem.text"
 msgid "Anchor<->Text"
 msgstr "Angor<->Testun"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_OUTLINE_LEVEL\n"
 "toolboxitem.text"
 msgid "Heading Levels Shown"
 msgstr "Dangos Lefelau Pennawd"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_LEFT\n"
 "toolboxitem.text"
 msgid "Promote Level"
 msgstr "Dyrchafu lefel"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_CONTENT\n"
+"DLG_NAVIGATION_PI.TB_CONTENT\n"
 "FN_ITEM_RIGHT\n"
 "toolboxitem.text"
 msgid "Demote Level"
 msgstr "Gostwng lefel"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_SWITCH\n"
 "toolboxitem.text"
-msgid "Toggle"
-msgstr "Toglo"
+msgid "Toggle Master View"
+msgstr "Toglo'r Prif Olwg"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_EDIT\n"
 "toolboxitem.text"
 msgid "Edit"
 msgstr "Golygu"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_UPDATE\n"
 "toolboxitem.text"
 msgid "Update"
 msgstr "Diweddaru"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_OPEN\n"
 "toolboxitem.text"
 msgid "Insert"
 msgstr "Mewnosod"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_GLOBAL_SAVE_CONTENT\n"
 "toolboxitem.text"
 msgid "Save Contents as well"
 msgstr "Cadw'r Cynnwys hefyd"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_ITEM_UP\n"
 "toolboxitem.text"
 msgid "Move Up"
 msgstr "Symud i Fyny"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
-"TB_GLOBAL\n"
+"DLG_NAVIGATION_PI.TB_GLOBAL\n"
 "FN_ITEM_DOWN\n"
 "toolboxitem.text"
 msgid "Move Down"
@@ -1675,6 +1690,14 @@ msgstr "Symud i Lawr"
 #: navipi.src
 msgctxt ""
 "navipi.src\n"
+"DLG_NAVIGATION_PI\n"
+"window.text"
+msgid "Navigator"
+msgstr "Llywiwr"
+
+#: navipi.src
+msgctxt ""
+"navipi.src\n"
 "STR_ACCESS_TL_GLOBAL\n"
 "string.text"
 msgid "Global View"
@@ -1685,8 +1708,8 @@ msgctxt ""
 "navipi.src\n"
 "STR_ACCESS_TL_CONTENT\n"
 "string.text"
-msgid "Content View"
-msgstr "Golwg Cynnwys"
+msgid "Content Navigation View"
+msgstr "Golwg Llywio Cynnwys"
 
 #: navipi.src
 msgctxt ""
diff --git a/source/cy/sw/uiconfig/swriter/ui.po b/source/cy/sw/uiconfig/swriter/ui.po
index 9d4f3878cb7..cd78db7313d 100644
--- a/source/cy/sw/uiconfig/swriter/ui.po
+++ b/source/cy/sw/uiconfig/swriter/ui.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibO 40l10n\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-11-10 19:33+0100\n"
-"PO-Revision-Date: 2016-02-10 13:33+0000\n"
+"POT-Creation-Date: 2016-04-16 21:40+0200\n"
+"PO-Revision-Date: 2016-04-06 08:39+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: none\n"
 "Language: cy\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1455111238.000000\n"
+"X-POOTLE-MTIME: 1459931965.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -4172,20 +4172,29 @@ msgstr "Mewnosod c_yfeiriad at"
 #: fldrefpage.ui
 msgctxt ""
 "fldrefpage.ui\n"
-"label2\n"
+"label4\n"
 "label\n"
 "string.text"
-msgid "S_election"
-msgstr "D_ewis"
+msgid "Selection"
+msgstr "Dewis"
 
 #: fldrefpage.ui
 msgctxt ""
 "fldrefpage.ui\n"
-"nameft\n"
+"filter\n"
+"placeholder_text\n"
+"string.text"
+msgid "Filter Selection"
+msgstr "Hidlo'r Dewis"
+
+#: fldrefpage.ui
+msgctxt ""
+"fldrefpage.ui\n"
+"label2\n"
 "label\n"
 "string.text"
-msgid "Na_me"
-msgstr "E_nw"
+msgid "S_election"
+msgstr "D_ewis"
 
 #: fldrefpage.ui
 msgctxt ""
@@ -4199,6 +4208,15 @@ msgstr "_Gwerth"
 #: fldrefpage.ui
 msgctxt ""
 "fldrefpage.ui\n"
+"nameft\n"
+"label\n"
+"string.text"
+msgid "Na_me"
+msgstr "E_nw"
+
+#: fldrefpage.ui
+msgctxt ""
+"fldrefpage.ui\n"
 "liststore1\n"
 "0\n"
 "stringlist.text"
@@ -4412,24 +4430,6 @@ msgctxt ""
 msgid "Date Time Author"
 msgstr "Dyddiad Amser Awdur"
 
-#: floatingmmchild.ui
-msgctxt ""
-"floatingmmchild.ui\n"
-"FloatingMMChild\n"
-"title\n"
-"string.text"
-msgid "Mail Merge Wizard"
-msgstr "Dewin Cyfuno Post"
-
-#: floatingmmchild.ui
-msgctxt ""
-"floatingmmchild.ui\n"
-"return\n"
-"label\n"
-"string.text"
-msgid "Return to Mail Merge Wizard"
-msgstr "Dychwelyd i'r Dewin Cyfuno Post"
-
 #: floatingnavigation.ui
 msgctxt ""
 "floatingnavigation.ui\n"
@@ -6033,13 +6033,34 @@ msgid "Autotexts for Shortcut "
 msgstr "Llwybr byr AwtoDestun "
 
 #: insertbookmark.ui
+#, fuzzy
 msgctxt ""
 "insertbookmark.ui\n"
 "InsertBookmarkDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Bookmark"
-msgstr "Mewnosod Nod Tudalen"
+msgid "Bookmark"
+msgstr "Nodau Tudalen"
+
+#: insertbookmark.ui
+#, fuzzy
+msgctxt ""
+"insertbookmark.ui\n"
+"insert\n"
+"label\n"
+"string.text"
+msgid "Insert"
+msgstr "Mewnosod"
+
+#: insertbookmark.ui
+#, fuzzy
+msgctxt ""
+"insertbookmark.ui\n"
+"rename\n"
+"label\n"
+"string.text"
+msgid "Rename"
+msgstr "Ailenwi"
 
 #: insertbookmark.ui
 msgctxt ""
@@ -6050,6 +6071,15 @@ msgctxt ""
 msgid "Delete"
 msgstr "Dileu"
 
+#: insertbookmark.ui
+msgctxt ""
+"insertbookmark.ui\n"
+"goto\n"
+"label\n"
+"string.text"
+msgid "Go to"
+msgstr ""
+
 #: insertbreak.ui
 msgctxt ""
 "insertbreak.ui\n"
@@ -7223,20 +7253,20 @@ msgstr "_Defnyddio cysylltiad diogel (SSL)"
 #: mailconfigpage.ui
 msgctxt ""
 "mailconfigpage.ui\n"
-"port_label\n"
+"server_label\n"
 "label\n"
 "string.text"
-msgid "_Port:"
-msgstr "_Porth:"
+msgid "_Server name:"
+msgstr "_Enw gweinydd:"
 
 #: mailconfigpage.ui
 msgctxt ""
 "mailconfigpage.ui\n"
-"server_label\n"
+"port_label\n"
 "label\n"
 "string.text"
-msgid "_Server name:"
-msgstr "_Enw gweinydd:"
+msgid "_Port:"
+msgstr "_Porth:"
 
 #: mailconfigpage.ui
 msgctxt ""
@@ -7244,8 +7274,8 @@ msgctxt ""
 "serverauthentication\n"
 "label\n"
 "string.text"
-msgid "Server Au_thentication"
-msgstr "Dilysiad _Gweinydd"
+msgid "Ser_ver Authentication…"
+msgstr "Dilysiad Gweinydd…"
 
 #: mailconfigpage.ui
 msgctxt ""
@@ -7262,8 +7292,8 @@ msgctxt ""
 "test\n"
 "label\n"
 "string.text"
-msgid "Test S_ettings..."
-msgstr "_Gosodiadau Prawf..."
+msgid "_Test Settings"
+msgstr "_Gosodiadau Prawf"
 
 #: mailmerge.ui
 msgctxt ""
@@ -8066,533 +8096,411 @@ msgctxt ""
 msgid "Insert personalized salutation"
 msgstr "Mewnosod cyfarchiad personol"
 
-#: mmmergepage.ui
-msgctxt ""
-"mmmergepage.ui\n"
-"helplabel\n"
-"label\n"
-"string.text"
-msgid "You can personalize particular documents. Clicking '%1' will temporarily reduce the wizard to a small window so you can edit your document. After editing the document, return to the wizard by clicking 'Return to Mail Merge Wizard' in the small window."
-msgstr "Mae modd i chi bersonoli dogfennau arbennig. Bydd clicio '%1' yn lleihau'r dewin dros dro i ffenestr fechan fel bo modd i chi olygu eich dogfen. Wedi golygu'r ddogfen, dychwelyd i'r dewin drwy glicio 'Dychwelyd at Ddewin Cyfuno Post' yn y ffenestr."
-
-#: mmmergepage.ui
-msgctxt ""
-"mmmergepage.ui\n"
-"edit\n"
-"label\n"
-"string.text"
-msgid "_Edit individual document..."
-msgstr "_Golygu dogfennau unigol..."
-
-#: mmmergepage.ui
-msgctxt ""
-"mmmergepage.ui\n"
-"label1\n"
-"label\n"
-"string.text"
-msgid "Personalize the Mail Merge Documents"
-msgstr "Personoli'r Dogfennau Cyfuno Post"
-
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"find\n"
+"mmoutputtypepage.ui\n"
+"letterft\n"
 "label\n"
 "string.text"
-msgid "_Find..."
-msgstr "C_anfod..."
+msgid "Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient."
+msgstr "Anfon llythyron at grŵp o dderbynwyr. Gall y llythyron gynnwys bloc cyfeiriad a chyfarchiad. Mae modd personoli'r llythyron ar gyfer pob derbynnydd."
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"label4\n"
+"mmoutputtypepage.ui\n"
+"emailft\n"
 "label\n"
 "string.text"
-msgid "_Search for:"
-msgstr "C_hwilio am:"
+msgid "Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient."
+msgstr "Anfon negeseuon e-bost at grŵp o dderbynwyr. Gall y neges e-bost gynnwys cyfarchiad. Mae modd personoli'r neges e-bost ar gyfer pob derbynnydd."
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"wholewords\n"
+"mmoutputtypepage.ui\n"
+"letter\n"
 "label\n"
 "string.text"
-msgid "Whole wor_ds only"
-msgstr "_Geiriau cyfan yn unig"
+msgid "_Letter"
+msgstr "_Llythyr"
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"backwards\n"
+"mmoutputtypepage.ui\n"
+"email\n"
 "label\n"
 "string.text"
-msgid "Back_wards"
-msgstr "_Nôl"
+msgid "_E-mail message"
+msgstr "_Neges E-bost"
 
-#: mmmergepage.ui
+#: mmoutputtypepage.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"matchcase\n"
+"mmoutputtypepage.ui\n"
+"label1\n"
 "label\n"
 "string.text"
-msgid "Ma_tch case"
-msgstr "Cydweddu _maint"
+msgid "What Type of Document Do You Want to Create?"
+msgstr "Pa Fath o Ddogfen Hoffech chi ei Chreu?"
 
-#: mmmergepage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmmergepage.ui\n"
-"label2\n"
-"label\n"
+"mmresultemaildialog.ui\n"
+"MMResultEmailDialog\n"
+"title\n"
 "string.text"
-msgid "Find"
-msgstr "Canfod"
+msgid "E-Mail merged document"
+msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"savestarting\n"
+"mmresultemaildialog.ui\n"
+"ok\n"
 "label\n"
 "string.text"
-msgid "_Save starting document"
-msgstr "_Cadw'r ddogfen gychwynnol"
+msgid "Send Documents"
+msgstr "Anfon _dogfennau"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"savemerged\n"
+"mmresultemaildialog.ui\n"
+"mailtoft\n"
 "label\n"
 "string.text"
-msgid "Save _merged document"
-msgstr "Cadw'r _ddogfen cyfunwyd"
+msgid "T_o"
+msgstr "a_t"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"printmerged\n"
+"mmresultemaildialog.ui\n"
+"copyto\n"
 "label\n"
 "string.text"
-msgid "_Print merged document"
-msgstr "_Argraffu'r ddogfen cyfunwyd"
+msgid "_Copy to..."
+msgstr "C_opïo i..."
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"sendmerged\n"
+"mmresultemaildialog.ui\n"
+"subjectft\n"
 "label\n"
 "string.text"
-msgid "Send merged document as _E-Mail"
-msgstr "Anfon dogfen cyfunwyd fel _E-bost"
+msgid "S_ubject"
+msgstr "_Pwnc"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"label3\n"
+"mmresultemaildialog.ui\n"
+"sendasft\n"
 "label\n"
 "string.text"
-msgid "Select one of the options below:"
-msgstr "Dewis un o'r dewisiadau isod:"
+msgid "Sen_d as"
+msgstr "Anfon _fel"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"label1\n"
+"mmresultemaildialog.ui\n"
+"sendassettings\n"
 "label\n"
 "string.text"
-msgid "Save, Print or Send the Document"
-msgstr "Cadw, Argraffu neu Anfon Dogfen"
+msgid "Pr_operties..."
+msgstr "_Priodweddau..."
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"savestartingdoc\n"
+"mmresultemaildialog.ui\n"
+"attachft\n"
 "label\n"
 "string.text"
-msgid "Save starting _document"
-msgstr "­Cadw'r ddogfen _gychwynnol"
+msgid "Name of the a_ttachment"
+msgstr "Enw'r _atodiad"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"singlerb\n"
+"mmresultemaildialog.ui\n"
+"label2\n"
 "label\n"
 "string.text"
-msgid "S_ave as single document"
-msgstr "C_adw fel dogfen unigol"
+msgid "E-Mail options"
+msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
-"individualrb\n"
+"mmresultemaildialog.ui\n"
+"sendallrb\n"
 "label\n"
 "string.text"
-msgid "Sa_ve as individual documents"
-msgstr "Cadw fel dogfennau _unigol"
+msgid "S_end all documents"
+msgstr "_Anfon pob dogfen"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "fromrb\n"
 "label\n"
 "string.text"
 msgid "_From"
 msgstr "_Oddi wrth"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "toft\n"
 "label\n"
 "string.text"
 msgid "_To"
 msgstr "_At"
 
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"savenow\n"
-"label\n"
-"string.text"
-msgid "Save Do_cuments"
-msgstr "Cadw D_ogfennau"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printallrb\n"
-"label\n"
-"string.text"
-msgid "Print _all documents"
-msgstr "Argraffu _pob dogfen"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printnow\n"
-"label\n"
-"string.text"
-msgid "Prin_t Documents"
-msgstr "Argraffu _Dogfennau"
-
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"sendallrb\n"
-"label\n"
-"string.text"
-msgid "S_end all documents"
-msgstr "_Anfon pob dogfen"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendnow\n"
-"label\n"
-"string.text"
-msgid "Se_nd documents"
-msgstr "Anfon _dogfennau"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"mailtoft\n"
-"label\n"
-"string.text"
-msgid "T_o"
-msgstr "a_t"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"subjectft\n"
-"label\n"
-"string.text"
-msgid "S_ubject"
-msgstr "_Pwnc"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendasft\n"
-"label\n"
-"string.text"
-msgid "Sen_d as"
-msgstr "Anfon _fel"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"copyto\n"
-"label\n"
-"string.text"
-msgid "_Copy to..."
-msgstr "C_opïo i..."
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"sendassettings\n"
-"label\n"
-"string.text"
-msgid "Pr_operties..."
-msgstr "_Priodweddau..."
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printerft\n"
-"label\n"
-"string.text"
-msgid "_Printer"
-msgstr "_Argraffydd"
-
-#: mmoutputpage.ui
-msgctxt ""
-"mmoutputpage.ui\n"
-"printersettings\n"
-"label\n"
+"mmresultemaildialog.ui\n"
+"from-nospin\n"
+"text\n"
 "string.text"
-msgid "P_roperties..."
-msgstr "_Priodweddau..."
+msgid "1"
+msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
 msgctxt ""
-"mmoutputpage.ui\n"
-"attachft\n"
+"mmresultemaildialog.ui\n"
+"label1\n"
 "label\n"
 "string.text"
-msgid "Name of the a_ttachment"
-msgstr "Enw'r _atodiad"
+msgid "Send records"
+msgstr ""
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "0\n"
 "stringlist.text"
 msgid "OpenDocument Text"
 msgstr "Testun OpenDocument"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "1\n"
 "stringlist.text"
 msgid "Adobe PDF-Document"
 msgstr "Dogfen Adobe PDF"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "2\n"
 "stringlist.text"
 msgid "Microsoft Word Document"
 msgstr "Dogfen Microsoft Word"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "3\n"
 "stringlist.text"
 msgid "HTML Message"
 msgstr "Neges HTML"
 
-#: mmoutputpage.ui
+#: mmresultemaildialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputpage.ui\n"
+"mmresultemaildialog.ui\n"
 "liststore1\n"
 "4\n"
 "stringlist.text"
 msgid "Plain Text"
 msgstr "Testun Plaen"
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"letterft\n"
-"label\n"
+"mmresultprintdialog.ui\n"
+"MMResultPrintDialog\n"
+"title\n"
 "string.text"
-msgid "Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient."
-msgstr "Anfon llythyron at grŵp o dderbynwyr. Gall y llythyron gynnwys bloc cyfeiriad a chyfarchiad. Mae modd personoli'r llythyron ar gyfer pob derbynnydd."
+msgid "Print merged document"
+msgstr "_Argraffu'r ddogfen cyfunwyd"
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"emailft\n"
+"mmresultprintdialog.ui\n"
+"ok\n"
 "label\n"
 "string.text"
-msgid "Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient."
-msgstr "Anfon negeseuon e-bost at grŵp o dderbynwyr. Gall y neges e-bost gynnwys cyfarchiad. Mae modd personoli'r neges e-bost ar gyfer pob derbynnydd."
+msgid "Print Documents"
+msgstr "Argraffu _Dogfennau"
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"letter\n"
+"mmresultprintdialog.ui\n"
+"printerft\n"
 "label\n"
 "string.text"
-msgid "_Letter"
-msgstr "_Llythyr"
+msgid "_Printer"
+msgstr "_Argraffydd"
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"email\n"
+"mmresultprintdialog.ui\n"
+"printersettings\n"
 "label\n"
 "string.text"
-msgid "_E-mail message"
-msgstr "_Neges E-bost"
+msgid "P_roperties..."
+msgstr "_Priodweddau..."
 
-#: mmoutputtypepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmoutputtypepage.ui\n"
-"label1\n"
+"mmresultprintdialog.ui\n"
+"label2\n"
 "label\n"
 "string.text"
-msgid "What Type of Document Do You Want to Create?"
-msgstr "Pa Fath o Ddogfen Hoffech chi ei Chreu?"
+msgid "Printer options"
+msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"label3\n"
+"mmresultprintdialog.ui\n"
+"printallrb\n"
 "label\n"
 "string.text"
-msgid "The preview of a merged document is visible now. To see the preview of another document click one of the arrows."
-msgstr "Mae rhagolwg o'r ddogfen a gyfunwyd nawr yn weladwy. I weld rhagolwg o ddogfen arall cliciwch un o'r saethau."
+msgid "Print _all documents"
+msgstr "Argraffu _pob dogfen"
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"label4\n"
+"mmresultprintdialog.ui\n"
+"fromrb\n"
 "label\n"
 "string.text"
-msgid "_Recipient"
-msgstr "_Derbynnydd"
+msgid "_From"
+msgstr "_Oddi wrth"
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"first\n"
+"mmresultprintdialog.ui\n"
+"toft\n"
 "label\n"
 "string.text"
-msgid "|<"
-msgstr "|<"
+msgid "_To"
+msgstr "_At"
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"first\n"
-"tooltip_text\n"
+"mmresultprintdialog.ui\n"
+"from-nospin\n"
+"text\n"
 "string.text"
-msgid "First"
-msgstr "Cyntaf"
+msgid "1"
+msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultprintdialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"prev\n"
+"mmresultprintdialog.ui\n"
+"label1\n"
 "label\n"
 "string.text"
-msgid "<"
-msgstr "<"
+msgid "Print records"
+msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"prev\n"
-"tooltip_text\n"
+"mmresultsavedialog.ui\n"
+"MMResultSaveDialog\n"
+"title\n"
 "string.text"
-msgid "Previous"
-msgstr "Blaenorol"
+msgid "Save merged document"
+msgstr "Cadw'r _ddogfen cyfunwyd"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"next\n"
+"mmresultsavedialog.ui\n"
+"ok\n"
 "label\n"
 "string.text"
-msgid ">"
-msgstr ">"
-
-#: mmpreparepage.ui
-msgctxt ""
-"mmpreparepage.ui\n"
-"next\n"
-"tooltip_text\n"
-"string.text"
-msgid "Next"
-msgstr "Nesaf"
+msgid "Save Documents"
+msgstr "Cadw D_ogfennau"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"last\n"
+"mmresultsavedialog.ui\n"
+"singlerb\n"
 "label\n"
 "string.text"
-msgid ">|"
-msgstr ">|"
-
-#: mmpreparepage.ui
-msgctxt ""
-"mmpreparepage.ui\n"
-"last\n"
-"tooltip_text\n"
-"string.text"
-msgid "Last"
-msgstr "Olaf"
+msgid "S_ave as a single large document"
+msgstr "C_adw fel dogfen unigol"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"exclude\n"
+"mmresultsavedialog.ui\n"
+"individualrb\n"
 "label\n"
 "string.text"
-msgid "E_xclude this recipient"
-msgstr "_Eithrio'r derbynnydd hwn"
+msgid "Sa_ve as individual documents"
+msgstr "Cadw fel dogfennau _unigol"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"label1\n"
+"mmresultsavedialog.ui\n"
+"fromrb\n"
 "label\n"
 "string.text"
-msgid "Preview Document"
-msgstr "Rhagolwg Dogfen"
+msgid "_From"
+msgstr "_Oddi wrth"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
+#, fuzzy
 msgctxt ""
-"mmpreparepage.ui\n"
-"label5\n"
+"mmresultsavedialog.ui\n"
+"toft\n"
 "label\n"
 "string.text"
-msgid ""
-"Write or edit your document now if you have not already done so. The changes will affect all merged documents.\n"
-"\n"
-"Clicking 'Edit Document...' will temporarily reduce the wizard to a small window so you can edit the mail merge document. After editing the document, return to the wizard by clicking 'Return to Mail Merge Wizard' in the small window."
-msgstr ""
-"Ysgrifennwch neu golygwch eich dogfen os nad ydych wedi gwneud hynny'n barod. Bydd y newidiadau'n effeithio ar yr holl ddogfennau i'w cyfuno.\n"
-"\n"
-"Bydd clicio ar 'Golygu Dogfen...' yn lleihau'r dewin dros dro i ffenestr fechan fel bod modd i chi olygu'r ddogfen cyfuno. Wedi golygu'r ddogfen, dychwelwch i'r dewin drwy glicio 'Dychwelyd i'r Dewin Cyfuno Post'."
+msgid "_To"
+msgstr "_At"
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
-"edit\n"
-"label\n"
+"mmresultsavedialog.ui\n"
+"from-nospin\n"
+"text\n"
 "string.text"
-msgid "_Edit Document..."
-msgstr "_Golygu Dogfen..."
+msgid "1"
+msgstr ""
 
-#: mmpreparepage.ui
+#: mmresultsavedialog.ui
 msgctxt ""
-"mmpreparepage.ui\n"
+"mmresultsavedialog.ui\n"
 "label2\n"
 "label\n"
 "string.text"
-msgid "Edit Document"
-msgstr "Golygu Dogfen"
+msgid "Save As options"
+msgstr ""
 
 #: mmsalutationpage.ui
 msgctxt ""
@@ -8918,6 +8826,281 @@ msgctxt ""
 msgid "New User Index"
 msgstr "Mynegai Defnyddiwr Newydd"
 
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label9\n"
+"label\n"
+"string.text"
+msgid "File"
+msgstr "Ffeil"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"controlcodes\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Mewnoli"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"numberbullet\n"
+"tooltip_text\n"
+"string.text"
+msgid "Bullets and Numbering"
+msgstr "Bwledi a Rhifo"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"indent\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Mewnoli"
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"increaseindent\n"
+"tooltip_text\n"
+"string.text"
+msgid "Increase Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"decreaseindent\n"
+"tooltip_text\n"
+"string.text"
+msgid "Decrease Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"horizontalalignment\n"
+"tooltip_text\n"
+"string.text"
+msgid "Horizontal Alignment"
+msgstr ""
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"verticalalignment\n"
+"tooltip_text\n"
+"string.text"
+msgid "Vertical Alignment"
+msgstr "_Aliniad fertigol"
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"backgroundcolor\n"
+"tooltip_text\n"
+"string.text"
+msgid "Paragraph Background Color"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label1\n"
+"label\n"
+"string.text"
+msgid "Home"
+msgstr ""
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label3\n"
+"label\n"
+"string.text"
+msgid "Insert"
+msgstr "Mewnosod"
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"aboveparaspacing\n"
+"tooltip_text\n"
+"string.text"
+msgid "Above Paragraph Spacing"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"belowparaspacing\n"
+"tooltip_text\n"
+"string.text"
+msgid "Below Paragraph Spacing"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"aftertextindent\n"
+"tooltip_text\n"
+"string.text"
+msgid "After Text Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"beforetextindent\n"
+"tooltip_text\n"
+"string.text"
+msgid "Before Text Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"firstlineindent\n"
+"tooltip_text\n"
+"string.text"
+msgid "First Line Indent"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"setlinespacing\n"
+"tooltip_text\n"
+"string.text"
+msgid "Line Spacing"
+msgstr ""
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"spacinglabel\n"
+"label\n"
+"string.text"
+msgid "_Spacing:"
+msgstr "Bylchu:"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"indentlabel\n"
+"label\n"
+"string.text"
+msgid "_Indent:"
+msgstr "Mewnoli:"
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label5\n"
+"label\n"
+"string.text"
+msgid "Page layout"
+msgstr ""
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"InsertMultiIndex\n"
+"label\n"
+"string.text"
+msgid "Table of Contents"
+msgstr "Tabl Cynnwys"
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"UpdateCurIndex\n"
+"label\n"
+"string.text"
+msgid "Update Index"
+msgstr ""
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"UpdateAllIndexes\n"
+"label\n"
+"string.text"
+msgid "Update All"
+msgstr ""
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label7\n"
+"label\n"
+"string.text"
+msgid "References"
+msgstr "Cyfeiriadau"
+
+#: notebookbar.ui
+msgctxt ""
+"notebookbar.ui\n"
+"label8\n"
+"label\n"
+"string.text"
+msgid "Review"
+msgstr ""
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label4\n"
+"label\n"
+"string.text"
+msgid "View"
+msgstr "Golwg"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"formattable1\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Mewnoli"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"formattable\n"
+"tooltip_text\n"
+"string.text"
+msgid "Indent"
+msgstr "Mewnoli"
+
+#: notebookbar.ui
+#, fuzzy
+msgctxt ""
+"notebookbar.ui\n"
+"label6\n"
+"label\n"
+"string.text"
+msgid "Table"
+msgstr "Tabl"
+
 #: numberingnamedialog.ui
 msgctxt ""
 "numberingnamedialog.ui\n"
@@ -11434,8 +11617,8 @@ msgctxt ""
 "graphics\n"
 "label\n"
 "string.text"
-msgid "_Pictures and objects"
-msgstr "Graff_igau"
+msgid "_Images and objects"
+msgstr "_Gwrthrychau a delweddau"
 
 #: printoptionspage.ui
 msgctxt ""
@@ -14539,8 +14722,8 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index or Table of Contents"
-msgstr "Mewnosod Mynegai neu Dabl Cynnwys"
+msgid "Table of Contents, Index or Bibliography"
+msgstr ""
 
 #: tocdialog.ui
 msgctxt ""
@@ -14552,13 +14735,14 @@ msgid "Preview"
 msgstr "Rhagolwg"
 
 #: tocdialog.ui
+#, fuzzy
 msgctxt ""
 "tocdialog.ui\n"
 "index\n"
 "label\n"
 "string.text"
-msgid "Index or Table of Contents"
-msgstr "Mynegai neu Dabl Cynnwys"
+msgid "Type"
+msgstr "Math"
 
 #: tocdialog.ui
 msgctxt ""
@@ -15619,8 +15803,8 @@ msgctxt ""
 "graphics\n"
 "label\n"
 "string.text"
-msgid "_Graphics and objects"
-msgstr "Graff_igau a gwrthrychau"
+msgid "_Images and objects"
+msgstr "_Gwrthrychau a delweddau"
 
 #: viewoptionspage.ui
 msgctxt ""