update translations for 6.2.0 rc1

and force-fix errors using pocheck Change-Id: Iccf11f743d0aa5c3f7fd2f0fcc12dfe105d1c071
author: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> 2018-12-19 18:02:31 +0100
committer: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> 2018-12-19 19:06:47 +0100
commit: 46a65ed74391c4b44de7cc244d63bd603b6485a5 (patch)
tree: 6dde2b8882980b977854f412da8f7cd0f7868060 /source/cy/sw
parent: 552fa2fbab0570d8f7747620cf8744662ce43d9c (diff)
1 files changed, 768 insertions, 881 deletions
diff --git a/source/cy/sw/messages.po b/source/cy/sw/messages.po
index 49c997c07d5..43d1566e15f 100644
--- a/source/cy/sw/messages.po
+++ b/source/cy/sw/messages.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: 2018-11-16 22:42+0100\n"
-"PO-Revision-Date: 2018-11-14 11:35+0000\n"
-"Last-Translator: Anonymous Pootle User\n"
+"POT-Creation-Date: 2018-12-18 19:47+0100\n"
+"PO-Revision-Date: 2018-11-19 14:40+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"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: LibreOffice\n"
-"X-POOTLE-MTIME: 1542195328.000000\n"
+"X-POOTLE-MTIME: 1542638448.000000\n"
 
 #: sw/inc/app.hrc:29
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
@@ -373,6 +373,51 @@ msgstr ""
 "Mae'r ddogfen HTML hon yn cynnwys macros %PRODUCTNAME Basic.\n"
 "Dydyn nhw ddim wedi cael eu cadw, oherwydd y gosodiadau allforio presennol."
 
+#: sw/inc/flddinf.hrc:27
+msgctxt "flddocinfopage|liststore1"
+msgid "Author"
+msgstr "Awdur"
+
+#: sw/inc/flddinf.hrc:28
+msgctxt "flddocinfopage|liststore1"
+msgid "Time"
+msgstr "Amser"
+
+#: sw/inc/flddinf.hrc:29
+msgctxt "flddocinfopage|liststore1"
+msgid "Date"
+msgstr "Dyddiad"
+
+#: sw/inc/flddinf.hrc:30
+msgctxt "flddocinfopage|liststore1"
+msgid "Date Time Author"
+msgstr "Dyddiad Amser Awdur"
+
+#: sw/inc/fldref.hrc:27
+msgctxt "fldrefpage|liststore1"
+msgid "Bookmarks"
+msgstr "Nodau Tudalen"
+
+#: sw/inc/fldref.hrc:28
+msgctxt "fldrefpage|liststore1"
+msgid "Footnotes"
+msgstr "Troednodau"
+
+#: sw/inc/fldref.hrc:29
+msgctxt "fldrefpage|liststore1"
+msgid "Endnotes"
+msgstr "Diweddnodau"
+
+#: sw/inc/fldref.hrc:30
+msgctxt "fldrefpage|liststore1"
+msgid "Headings"
+msgstr "Penawdau"
+
+#: sw/inc/fldref.hrc:31
+msgctxt "fldrefpage|liststore1"
+msgid "Numbered Paragraphs"
+msgstr "Paragraffau Rhifedig"
+
 #: sw/inc/mmaddressblockpage.hrc:27
 msgctxt "RA_SALUTATION"
 msgid "Dear"
@@ -463,85 +508,130 @@ msgctxt "STR_ARR_METRIC"
 msgid "Line"
 msgstr "Llinell"
 
+#: sw/inc/outline.hrc:27
+msgctxt "numberingnamedialog|liststore1"
+msgid "Untitled 1"
+msgstr "Dideitl 1"
+
+#: sw/inc/outline.hrc:28
+msgctxt "numberingnamedialog|liststore1"
+msgid "Untitled 2"
+msgstr "Dideitl 2"
+
+#: sw/inc/outline.hrc:29
+msgctxt "numberingnamedialog|liststore1"
+msgid "Untitled 3"
+msgstr "Dideitl 3"
+
+#: sw/inc/outline.hrc:30
+msgctxt "numberingnamedialog|liststore1"
+msgid "Untitled 4"
+msgstr "Dideitl 4"
+
+#: sw/inc/outline.hrc:31
+msgctxt "numberingnamedialog|liststore1"
+msgid "Untitled 5"
+msgstr "Dideitl 5"
+
+#: sw/inc/outline.hrc:32
+msgctxt "numberingnamedialog|liststore1"
+msgid "Untitled 6"
+msgstr "Dideitl 6"
+
+#: sw/inc/outline.hrc:33
+msgctxt "numberingnamedialog|liststore1"
+msgid "Untitled 7"
+msgstr "Dideitl 7"
+
+#: sw/inc/outline.hrc:34
+msgctxt "numberingnamedialog|liststore1"
+msgid "Untitled 8"
+msgstr "Dideitl 8"
+
+#: sw/inc/outline.hrc:35
+msgctxt "numberingnamedialog|liststore1"
+msgid "Untitled 9"
+msgstr "Dideitl 9"
+
 #: sw/inc/pageformatpanel.hrc:18
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH"
 msgid "None"
-msgstr ""
+msgstr "Dim"
 
 #: sw/inc/pageformatpanel.hrc:19
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH"
 msgid "Narrow"
-msgstr ""
+msgstr "Cul"
 
 #: sw/inc/pageformatpanel.hrc:20
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH"
 msgid "Moderate"
-msgstr ""
+msgstr "Cymedrol"
 
 #: sw/inc/pageformatpanel.hrc:21
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH"
 msgid "Normal (0.75\")"
-msgstr ""
+msgstr "Normal (0.75\")"
 
 #: sw/inc/pageformatpanel.hrc:22
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH"
 msgid "Normal (1\")"
-msgstr ""
+msgstr "Normal (1\")"
 
 #: sw/inc/pageformatpanel.hrc:23
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH"
 msgid "Normal (1.25\")"
-msgstr ""
+msgstr "Normal (1.25\")"
 
 #: sw/inc/pageformatpanel.hrc:24
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH"
 msgid "Wide"
-msgstr ""
+msgstr "Lled"
 
 #: sw/inc/pageformatpanel.hrc:25
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH"
 msgid "Mirrored"
-msgstr ""
+msgstr "Drychu"
 
 #: sw/inc/pageformatpanel.hrc:31
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM"
 msgid "None"
-msgstr ""
+msgstr "Dim"
 
 #: sw/inc/pageformatpanel.hrc:32
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM"
 msgid "Narrow"
-msgstr ""
+msgstr "Cul"
 
 #: sw/inc/pageformatpanel.hrc:33
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM"
 msgid "Moderate"
-msgstr ""
+msgstr "Cymedrol"
 
 #: sw/inc/pageformatpanel.hrc:34
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM"
 msgid "Normal (1.9cm)"
-msgstr ""
+msgstr "Normal (1.9cm)"
 
 #: sw/inc/pageformatpanel.hrc:35
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM"
 msgid "Normal (2.54cm)"
-msgstr ""
+msgstr "Normal (2.54cm)"
 
 #: sw/inc/pageformatpanel.hrc:36
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM"
 msgid "Normal (3.18cm)"
-msgstr ""
+msgstr "Normal (3.18cm)"
 
 #: sw/inc/pageformatpanel.hrc:37
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM"
 msgid "Wide"
-msgstr ""
+msgstr "Lled"
 
 #: sw/inc/pageformatpanel.hrc:38
 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM"
 msgid "Mirrored"
-msgstr ""
+msgstr "Drychu"
 
 #. Format names
 #: sw/inc/strings.hrc:27
@@ -1793,30 +1883,30 @@ msgstr "Rhifo Amlinell"
 #: sw/inc/strings.hrc:286
 msgctxt "STR_WORDCOUNT"
 msgid "Selected: $1, $2"
-msgstr ""
+msgstr "Dewiswyd: $1, $2"
 
 #. To translators: STR_WORDCOUNT_WORDARG is $1 of STR_WORDCOUNT. $1 of STR_WORDCOUNT is number of words
 #: sw/inc/strings.hrc:288
 msgctxt "STR_WORDCOUNT_WORDARG"
 msgid "$1 word"
 msgid_plural "$1 words"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "$1 gair"
+msgstr[1] "$1 air"
 
 #. To translators: STR_WORDCOUNT_CHARARG is $1 of STR_WORDCOUNT. $1 of STR_WORDCOUNT_CHARARG is number of characters
 #: sw/inc/strings.hrc:290
 msgctxt "STR_WORDCOUNT_CHARARG"
 msgid "$1 character"
 msgid_plural "$1 characters"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "$1 nod"
+msgstr[1] "$1 nod"
 
 #. To translators: $1 == will be replaced by STR_WORDCOUNT_WORDARG, and $2 by STR_WORDCOUNT_COLARG
 #. e.g. 1 word, 2 characters
 #: sw/inc/strings.hrc:293
 msgctxt "STR_WORDCOUNT_NO_SELECTION"
 msgid "$1, $2"
-msgstr ""
+msgstr "$1, $2"
 
 #. To translators: STR_WORDCOUNT_WORDARG_NO_SELECTION is $1 of STR_WORDCOUNT_NO_SELECTION.
 #. $1 of STR_WORDCOUNT_NO_SELECTION is number of words
@@ -1824,8 +1914,8 @@ msgstr ""
 msgctxt "STR_WORDCOUNT_WORDARG_NO_SELECTION"
 msgid "$1 word"
 msgid_plural "$1 words"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "$1 gair"
+msgstr[1] "$1 air"
 
 #. To translators: STR_WORDCOUNT_CHARARG_NO_SELECTION is $1 of STR_WORDCOUNT_NO_SELECTION.
 #. $1 of STR_WORDCOUNT_CHARARG_NO_SELECTION is number of characters
@@ -1833,8 +1923,8 @@ msgstr[1] ""
 msgctxt "STR_WORDCOUNT_CHARARG_NO_SELECTION"
 msgid "$1 character"
 msgid_plural "$1 characters"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "$1 nod"
+msgstr[1] "$1 nod"
 
 #: sw/inc/strings.hrc:300
 msgctxt "STR_CONVERT_TEXT_TABLE"
@@ -6851,47 +6941,47 @@ msgctxt "asciifilterdialog|AsciiFilterDialog"
 msgid "ASCII Filter Options"
 msgstr "Dewisiadau Hidl ASCII"
 
-#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:100
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:104
 msgctxt "asciifilterdialog|label2"
-msgid "_Character set"
-msgstr "_Set nod"
+msgid "_Character set:"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:114
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:118
 msgctxt "asciifilterdialog|fontft"
-msgid "Default fonts"
-msgstr "Ffontiau rhagosodedig"
+msgid "Default fonts:"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:128
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:132
 msgctxt "asciifilterdialog|languageft"
-msgid "Lan_guage"
-msgstr "I_aith"
+msgid "Lan_guage:"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:142
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:146
 msgctxt "asciifilterdialog|label5"
-msgid "_Paragraph break"
-msgstr "_Toriad paragraff"
+msgid "_Paragraph break:"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:181
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:184
 msgctxt "asciifilterdialog|crlf"
 msgid "_CR & LF"
 msgstr "_CR a LF"
 
-#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:198
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:201
 msgctxt "asciifilterdialog|cr"
 msgid "C_R"
 msgstr "C_R"
 
-#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:216
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:219
 msgctxt "asciifilterdialog|lf"
 msgid "_LF"
 msgstr "_LF"
 
-#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:258
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:261
 msgctxt "asciifilterdialog|includebom"
-msgid "Include byte-order-mark"
+msgid "Include byte-order mark"
 msgstr ""
 
-#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:280
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:284
 msgctxt "asciifilterdialog|label1"
 msgid "Properties"
 msgstr "Priodweddau"
@@ -6916,27 +7006,27 @@ msgctxt "assignfieldsdialog|PREVIEW_LABEL"
 msgid "Address block preview"
 msgstr "Rhagolwg bloc cyfeiriad"
 
-#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:19
+#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:48
 msgctxt "assignstylesdialog|AssignStylesDialog"
 msgid "Assign Styles"
 msgstr "Pennu Arddulliau"
 
-#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:128
+#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:160
 msgctxt "assignstylesdialog|left-atkobject"
 msgid "Left"
 msgstr "Chwith"
 
-#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:146
+#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:178
 msgctxt "assignstylesdialog|right-atkobject"
 msgid "Right"
 msgstr "De"
 
-#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:187
-msgctxt "assignstylesdialog|notapplied"
-msgid "Not applied"
-msgstr "Heb osod"
+#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:224
+msgctxt "assignstylesdialog|stylecolumn"
+msgid "Style"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:203
+#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:416
 msgctxt "assignstylesdialog|label3"
 msgid "Styles"
 msgstr "Arddulliau"
@@ -7786,167 +7876,167 @@ msgctxt "columnwidth|label1"
 msgid "Width"
 msgstr "Lled"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:39
+#: sw/uiconfig/swriter/ui/conditionpage.ui:57
 msgctxt "conditionpage|condstyle"
 msgid "_Conditional Style"
 msgstr "Arddull _Amodol"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:63
+#: sw/uiconfig/swriter/ui/conditionpage.ui:99
 msgctxt "conditionpage|contextft"
-msgid "Conte_xt"
-msgstr "_Cyd-destun"
+msgid "Context"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:78
+#: sw/uiconfig/swriter/ui/conditionpage.ui:112
 msgctxt "conditionpage|usedft"
 msgid "Applied Styles"
 msgstr "Arddulliau Gosodedig"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:92
+#: sw/uiconfig/swriter/ui/conditionpage.ui:208
 msgctxt "conditionpage|styleft"
-msgid "_Paragraph Styles"
-msgstr "Arddulliau _Paragraff"
+msgid "Paragraph Styles"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:199
+#: sw/uiconfig/swriter/ui/conditionpage.ui:232
 msgctxt "conditionpage|filter"
 msgid "Table Header"
 msgstr "Pennyn Tabl"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:200
+#: sw/uiconfig/swriter/ui/conditionpage.ui:233
 msgctxt "conditionpage|filter"
 msgid "Table"
 msgstr "Tabl"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:201
+#: sw/uiconfig/swriter/ui/conditionpage.ui:234
 msgctxt "conditionpage|filter"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:202
+#: sw/uiconfig/swriter/ui/conditionpage.ui:235
 msgctxt "conditionpage|filter"
 msgid "Section"
 msgstr "Adran"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:203
+#: sw/uiconfig/swriter/ui/conditionpage.ui:236
 msgctxt "conditionpage|filter"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:204
+#: sw/uiconfig/swriter/ui/conditionpage.ui:237
 msgctxt "conditionpage|filter"
 msgid "Endnote"
 msgstr "Diweddnodyn"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:205
+#: sw/uiconfig/swriter/ui/conditionpage.ui:238
 msgctxt "conditionpage|filter"
 msgid "Header"
 msgstr "Pennyn"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:206
+#: sw/uiconfig/swriter/ui/conditionpage.ui:239
 msgctxt "conditionpage|filter"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:207
+#: sw/uiconfig/swriter/ui/conditionpage.ui:240
 msgctxt "conditionpage|filter"
 msgid " 1st Outline Level"
 msgstr " Lefel Amlinell 1af"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:208
+#: sw/uiconfig/swriter/ui/conditionpage.ui:241
 msgctxt "conditionpage|filter"
 msgid " 2nd Outline Level"
 msgstr " Ail Lefel Amlinell"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:209
+#: sw/uiconfig/swriter/ui/conditionpage.ui:242
 msgctxt "conditionpage|filter"
 msgid " 3rd Outline Level"
 msgstr " Trydydd Lefel Amlinell"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:210
+#: sw/uiconfig/swriter/ui/conditionpage.ui:243
 msgctxt "conditionpage|filter"
 msgid " 4th Outline Level"
 msgstr " Pedwerydd Lefel Amlinell"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:211
+#: sw/uiconfig/swriter/ui/conditionpage.ui:244
 msgctxt "conditionpage|filter"
 msgid " 5th Outline Level"
 msgstr " 5ed Lefel Amlinell"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:212
+#: sw/uiconfig/swriter/ui/conditionpage.ui:245
 msgctxt "conditionpage|filter"
 msgid " 6th Outline Level"
 msgstr " 6ed Lefel Amlinell"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:213
+#: sw/uiconfig/swriter/ui/conditionpage.ui:246
 msgctxt "conditionpage|filter"
 msgid " 7th Outline Level"
 msgstr " 7fed Lefel Amlinell"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:214
+#: sw/uiconfig/swriter/ui/conditionpage.ui:247
 msgctxt "conditionpage|filter"
 msgid " 8th Outline Level"
 msgstr " 8fed Lefel Amlinell"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:215
+#: sw/uiconfig/swriter/ui/conditionpage.ui:248
 msgctxt "conditionpage|filter"
 msgid " 9th Outline Level"
 msgstr " 9fed Lefel Amlinell"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:216
+#: sw/uiconfig/swriter/ui/conditionpage.ui:249
 msgctxt "conditionpage|filter"
 msgid "10th Outline Level"
 msgstr "10fed Lefel Amlinell"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:217
+#: sw/uiconfig/swriter/ui/conditionpage.ui:250
 msgctxt "conditionpage|filter"
 msgid " 1st Numbering Level"
 msgstr " Lefel Rhifo 1af"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:218
+#: sw/uiconfig/swriter/ui/conditionpage.ui:251
 msgctxt "conditionpage|filter"
 msgid " 2nd Numbering Level"
 msgstr " 2il Lefel Rhifo"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:219
+#: sw/uiconfig/swriter/ui/conditionpage.ui:252
 msgctxt "conditionpage|filter"
 msgid " 3rd Numbering Level"
 msgstr " 3ydd Lefel Rhifo"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:220
+#: sw/uiconfig/swriter/ui/conditionpage.ui:253
 msgctxt "conditionpage|filter"
 msgid " 4th Numbering Level"
 msgstr " 4ydd Lefel Rhifo"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:221
+#: sw/uiconfig/swriter/ui/conditionpage.ui:254
 msgctxt "conditionpage|filter"
 msgid " 5th Numbering Level"
 msgstr " 5ed Lefel Rhifo"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:222
+#: sw/uiconfig/swriter/ui/conditionpage.ui:255
 msgctxt "conditionpage|filter"
 msgid " 6th Numbering Level"
 msgstr " 6ed Lefel Rhifo"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:223
+#: sw/uiconfig/swriter/ui/conditionpage.ui:256
 msgctxt "conditionpage|filter"
 msgid " 7th Numbering Level"
 msgstr " 7fed Lefel Rhifo"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:224
+#: sw/uiconfig/swriter/ui/conditionpage.ui:257
 msgctxt "conditionpage|filter"
 msgid " 8th Numbering Level"
 msgstr " 8fed Lefel Rhifo"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:225
+#: sw/uiconfig/swriter/ui/conditionpage.ui:258
 msgctxt "conditionpage|filter"
 msgid " 9th Numbering Level"
 msgstr " 9fed Lefel Rhifo"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:226
+#: sw/uiconfig/swriter/ui/conditionpage.ui:259
 msgctxt "conditionpage|filter"
 msgid "10th Numbering Level"
 msgstr "10fed Lefel Rhifo"
 
-#: sw/uiconfig/swriter/ui/conditionpage.ui:251
+#: sw/uiconfig/swriter/ui/conditionpage.ui:282
 msgctxt "conditionpage|label11"
 msgid "Options"
 msgstr "Dewisiadau"
@@ -8241,32 +8331,27 @@ msgctxt "dropdownfielddialog|label1"
 msgid "Edit"
 msgstr "Golygu"
 
-#: sw/uiconfig/swriter/ui/editcategories.ui:8
+#: sw/uiconfig/swriter/ui/editcategories.ui:18
 msgctxt "editcategories|EditCategoriesDialog"
 msgid "Edit Categories"
 msgstr "Golygu Categorïau"
 
-#: sw/uiconfig/swriter/ui/editcategories.ui:93
+#: sw/uiconfig/swriter/ui/editcategories.ui:67
 msgctxt "editcategories|rename"
 msgid "_Rename"
 msgstr "_Ailenwi"
 
-#: sw/uiconfig/swriter/ui/editcategories.ui:127
+#: sw/uiconfig/swriter/ui/editcategories.ui:146
 msgctxt "editcategories|label3"
 msgid "Selection list"
 msgstr "Rhestr dewis"
 
-#: sw/uiconfig/swriter/ui/editcategories.ui:144
-msgctxt "editcategories|group"
-msgid "label"
-msgstr "label"
-
-#: sw/uiconfig/swriter/ui/editcategories.ui:171
+#: sw/uiconfig/swriter/ui/editcategories.ui:226
 msgctxt "editcategories|label2"
 msgid "Path"
 msgstr "Llwybr"
 
-#: sw/uiconfig/swriter/ui/editcategories.ui:187
+#: sw/uiconfig/swriter/ui/editcategories.ui:240
 msgctxt "editcategories|label1"
 msgid "Category"
 msgstr "Categori"
@@ -8815,47 +8900,47 @@ msgctxt "findentrydialog|findin"
 msgid "Find _only in"
 msgstr "_Dim ond canfod yn"
 
-#: sw/uiconfig/swriter/ui/flddbpage.ui:57
+#: sw/uiconfig/swriter/ui/flddbpage.ui:58
 msgctxt "flddbpage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: sw/uiconfig/swriter/ui/flddbpage.ui:86
+#: sw/uiconfig/swriter/ui/flddbpage.ui:87
 msgctxt "flddbpage|label5"
 msgid "_Condition"
 msgstr "_Gydag Amod"
 
-#: sw/uiconfig/swriter/ui/flddbpage.ui:141
+#: sw/uiconfig/swriter/ui/flddbpage.ui:142
 msgctxt "flddbpage|label4"
 msgid "Record number"
 msgstr "Rhif cofnod"
 
-#: sw/uiconfig/swriter/ui/flddbpage.ui:214
+#: sw/uiconfig/swriter/ui/flddbpage.ui:215
 msgctxt "flddbpage|label2"
 msgid "Database s_election"
 msgstr "_Dewis cronfa ddata"
 
-#: sw/uiconfig/swriter/ui/flddbpage.ui:239
+#: sw/uiconfig/swriter/ui/flddbpage.ui:240
 msgctxt "flddbpage|browseft"
 msgid "Add database file"
 msgstr "Ychwanegu ffeil cronfa ddata"
 
-#: sw/uiconfig/swriter/ui/flddbpage.ui:252
+#: sw/uiconfig/swriter/ui/flddbpage.ui:253
 msgctxt "flddbpage|browse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: sw/uiconfig/swriter/ui/flddbpage.ui:293
+#: sw/uiconfig/swriter/ui/flddbpage.ui:294
 msgctxt "flddbpage|fromdatabasecb"
 msgid "From database"
 msgstr "O gronfa ddata"
 
-#: sw/uiconfig/swriter/ui/flddbpage.ui:312
+#: sw/uiconfig/swriter/ui/flddbpage.ui:313
 msgctxt "flddbpage|userdefinedcb"
 msgid "User-defined"
 msgstr "Defnyddiwr diffiniedig"
 
-#: sw/uiconfig/swriter/ui/flddbpage.ui:383
+#: sw/uiconfig/swriter/ui/flddbpage.ui:384
 msgctxt "flddbpage|label3"
 msgid "Format"
 msgstr "Fformat"
@@ -8865,311 +8950,226 @@ msgctxt "flddocinfopage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: sw/uiconfig/swriter/ui/flddocinfopage.ui:88
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:89
 msgctxt "flddocinfopage|label2"
 msgid "S_elect"
 msgstr "_Dewis"
 
-#: sw/uiconfig/swriter/ui/flddocinfopage.ui:138
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:139
 msgctxt "flddocinfopage|fixed"
 msgid "_Fixed content"
 msgstr "_Cynnwys gosodedig"
 
-#: sw/uiconfig/swriter/ui/flddocinfopage.ui:161
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:162
 msgctxt "flddocinfopage|label3"
 msgid "F_ormat"
 msgstr "_Fformat"
 
-#: sw/uiconfig/swriter/ui/flddocinfopage.ui:183
-msgctxt "flddocinfopage|liststore1"
-msgid "Author"
-msgstr "Awdur"
-
-#: sw/uiconfig/swriter/ui/flddocinfopage.ui:186
-msgctxt "flddocinfopage|liststore1"
-msgid "Time"
-msgstr "Amser"
-
-#: sw/uiconfig/swriter/ui/flddocinfopage.ui:189
-msgctxt "flddocinfopage|liststore1"
-msgid "Date"
-msgstr "Dyddiad"
-
-#: sw/uiconfig/swriter/ui/flddocinfopage.ui:192
-msgctxt "flddocinfopage|liststore1"
-msgid "Date Time Author"
-msgstr "Dyddiad Amser Awdur"
-
-#: sw/uiconfig/swriter/ui/flddocumentpage.ui:50
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:51
 msgctxt "flddocumentpage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: sw/uiconfig/swriter/ui/flddocumentpage.ui:95
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:97
 msgctxt "flddocumentpage|label2"
 msgid "S_elect"
 msgstr "D_ewis"
 
-#: sw/uiconfig/swriter/ui/flddocumentpage.ui:179
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:182
 msgctxt "flddocumentpage|label3"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: sw/uiconfig/swriter/ui/flddocumentpage.ui:196
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:199
 msgctxt "flddocumentpage|fixed"
 msgid "_Fixed content"
 msgstr "Cynnwys _gosodedig"
 
-#: sw/uiconfig/swriter/ui/flddocumentpage.ui:221
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:224
 msgctxt "flddocumentpage|levelft"
 msgid "Level"
 msgstr "Lefel"
 
-#: sw/uiconfig/swriter/ui/flddocumentpage.ui:262
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:265
 msgctxt "flddocumentpage|daysft"
 msgid "Offs_et in days"
 msgstr "_Atred mewn dyddiau"
 
-#: sw/uiconfig/swriter/ui/flddocumentpage.ui:278
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:281
 msgctxt "flddocumentpage|minutesft"
 msgid "Offs_et in minutes"
 msgstr "At_red mewn munudau"
 
-#: sw/uiconfig/swriter/ui/flddocumentpage.ui:307
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:310
 msgctxt "flddocumentpage|valueft"
 msgid "_Value"
 msgstr "_Gwerth"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:42
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:43
 msgctxt "fldfuncpage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:89
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:91
 msgctxt "fldfuncpage|label4"
 msgid "S_elect"
 msgstr "D_ewis"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:135
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:138
 msgctxt "fldfuncpage|label2"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:157
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:160
 msgctxt "fldfuncpage|macro"
 msgid "_Macro..."
 msgstr "_Macro..."
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:182
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:185
 msgctxt "fldfuncpage|valueft"
 msgid "_Value"
 msgstr "_Gwerth"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:225
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:228
 msgctxt "fldfuncpage|nameft"
 msgid "Na_me"
 msgstr "E_nw"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:268
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:271
 msgctxt "fldfuncpage|cond1ft"
 msgid "Then"
 msgstr "Yna"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:310
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:313
 msgctxt "fldfuncpage|cond2ft"
 msgid "Else"
 msgstr "Neu"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:358
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:361
 msgctxt "fldfuncpage|itemft"
 msgid "It_em"
 msgstr "_Eitem"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:416
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:419
 msgctxt "fldfuncpage|listitemft"
 msgid "Items on _list"
 msgstr "E_itemau ar y rhestr"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:468
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:472
 msgctxt "fldfuncpage|up"
 msgid "Move _Up"
 msgstr "Symud _Fyny"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:482
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:486
 msgctxt "fldfuncpage|down"
 msgid "Move Do_wn"
 msgstr "Symud _Lawr"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:512
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:516
 msgctxt "fldfuncpage|listnameft"
 msgid "Na_me"
 msgstr "E_nw"
 
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:575
-msgctxt "fldfuncpage|liststore1"
-msgid "Author"
-msgstr "Awdur"
-
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:578
-msgctxt "fldfuncpage|liststore1"
-msgid "Time"
-msgstr "Amser"
-
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:581
-msgctxt "fldfuncpage|liststore1"
-msgid "Date"
-msgstr "Dyddiad"
-
-#: sw/uiconfig/swriter/ui/fldfuncpage.ui:584
-msgctxt "fldfuncpage|liststore1"
-msgid "Date Time Author"
-msgstr "Dyddiad Amser Awdur"
-
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:13
-msgctxt "fldrefpage|liststore1"
-msgid "Bookmarks"
-msgstr "Nodau Tudalen"
-
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:16
-msgctxt "fldrefpage|liststore1"
-msgid "Footnotes"
-msgstr "Troednodau"
-
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:19
-msgctxt "fldrefpage|liststore1"
-msgid "Endnotes"
-msgstr "Diweddnodau"
-
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:22
-msgctxt "fldrefpage|liststore1"
-msgid "Headings"
-msgstr "Penawdau"
-
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:25
-msgctxt "fldrefpage|liststore1"
-msgid "Numbered Paragraphs"
-msgstr "Paragraffau Rhifedig"
-
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:81
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:65
 msgctxt "fldrefpage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:126
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:111
 msgctxt "fldrefpage|label3"
 msgid "Insert _reference to"
 msgstr "Mewnosod c_yfeiriad at"
 
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:169
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:154
 msgctxt "fldrefpage|label4"
 msgid "Selection"
 msgstr "Dewis"
 
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:195
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:180
 msgctxt "fldrefpage|filter"
 msgid "Filter Selection"
 msgstr "Hidlo'r Dewis"
 
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:269
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:255
 msgctxt "fldrefpage|label2"
 msgid "S_election"
 msgstr "D_ewis"
 
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:296
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:282
 msgctxt "fldrefpage|valueft"
 msgid "_Value"
 msgstr "_Gwerth"
 
-#: sw/uiconfig/swriter/ui/fldrefpage.ui:322
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:308
 msgctxt "fldrefpage|nameft"
 msgid "Na_me"
 msgstr "E_nw"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:52
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:53
 msgctxt "fldvarpage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:77
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:78
 msgctxt "fldvarpage|nameft"
 msgid "Na_me"
 msgstr "E_nw"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:152
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:153
 msgctxt "fldvarpage|label2"
 msgid "S_elect"
 msgstr "D_ewis"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:177
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:178
 msgctxt "fldvarpage|valueft"
 msgid "_Value"
 msgstr "_Gwerth"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:293
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:295
 msgctxt "fldvarpage|label3"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:309
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:311
 msgctxt "fldvarpage|invisible"
 msgid "Invisi_ble"
 msgstr "Anwel_edig"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:348
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:350
 msgctxt "fldvarpage|label5"
 msgid "_Level"
 msgstr "_Lefel"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:363
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:365
 msgctxt "fldvarpage|separatorft"
 msgid "_Separator"
 msgstr "_Ymwahanydd"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:381
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:383
 msgctxt "fldvarpage|level"
 msgid "None"
 msgstr "Dim"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:397
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:399
 msgctxt "fldvarpage|separator"
 msgid "."
 msgstr "."
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:415
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:417
 msgctxt "fldvarpage|label4"
 msgid "Numbering by Chapter"
 msgstr "Rhifo yn ôl Pennawd"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:453
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:455
 msgctxt "fldvarpage|apply|tooltip_text"
 msgid "Apply"
 msgstr "Gosod"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:468
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:470
 msgctxt "fldvarpage|delete|tooltip_text"
 msgid "Delete"
 msgstr "Dileu"
 
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:523
-msgctxt "fldvarpage|liststore1"
-msgid "Author"
-msgstr "Awdur"
-
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:526
-msgctxt "fldvarpage|liststore1"
-msgid "Time"
-msgstr "Amser"
-
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:529
-msgctxt "fldvarpage|liststore1"
-msgid "Date"
-msgstr "Dyddiad"
-
-#: sw/uiconfig/swriter/ui/fldvarpage.ui:532
-msgctxt "fldvarpage|liststore1"
-msgid "Date Time Author"
-msgstr "Dyddiad Amser Awdur"
-
 #: sw/uiconfig/swriter/ui/floatingnavigation.ui:11
 msgctxt "floatingnavigation|FloatingNavigation"
 msgid "Navigation"
@@ -9565,282 +9565,282 @@ msgctxt "framedialog|FrameDialog"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: sw/uiconfig/swriter/ui/framedialog.ui:108
+#: sw/uiconfig/swriter/ui/framedialog.ui:135
 msgctxt "framedialog|type"
 msgid "Type"
 msgstr "Math"
 
-#: sw/uiconfig/swriter/ui/framedialog.ui:130
+#: sw/uiconfig/swriter/ui/framedialog.ui:181
 msgctxt "framedialog|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: sw/uiconfig/swriter/ui/framedialog.ui:153
+#: sw/uiconfig/swriter/ui/framedialog.ui:228
 msgctxt "framedialog|wrap"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: sw/uiconfig/swriter/ui/framedialog.ui:176
+#: sw/uiconfig/swriter/ui/framedialog.ui:275
 msgctxt "framedialog|hyperlink"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: sw/uiconfig/swriter/ui/framedialog.ui:199
+#: sw/uiconfig/swriter/ui/framedialog.ui:322
 msgctxt "framedialog|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: sw/uiconfig/swriter/ui/framedialog.ui:222
+#: sw/uiconfig/swriter/ui/framedialog.ui:369
 msgctxt "framedialog|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: sw/uiconfig/swriter/ui/framedialog.ui:245
+#: sw/uiconfig/swriter/ui/framedialog.ui:416
 msgctxt "framedialog|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: sw/uiconfig/swriter/ui/framedialog.ui:268
+#: sw/uiconfig/swriter/ui/framedialog.ui:463
 msgctxt "framedialog|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: sw/uiconfig/swriter/ui/framedialog.ui:291
+#: sw/uiconfig/swriter/ui/framedialog.ui:510
 msgctxt "framedialog|macro"
 msgid "Macro"
 msgstr "Macro"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:70
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:73
 msgctxt "frmaddpage|name_label"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:84
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:87
 msgctxt "frmaddpage|altname_label"
 msgid "_Alternative (Text only):"
 msgstr "_Arall (Testun yn unig):"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:100
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:103
 msgctxt "frmaddpage|prev"
 msgid "<None>"
 msgstr "<Dim>"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:114
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:117
 msgctxt "frmaddpage|next"
 msgid "<None>"
 msgstr "<Dim>"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:126
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:129
 msgctxt "frmaddpage|prev_label"
 msgid "_Previous link:"
 msgstr "C_ysylltiad blaenorol:"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:140
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:143
 msgctxt "frmaddpage|next_label"
 msgid "_Next link:"
 msgstr "Cysylltiad _nesaf:"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:154
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:157
 msgctxt "frmaddpage|description_label"
 msgid "_Description:"
 msgstr "_Disgrifiad:"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:191
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:196
 msgctxt "frmaddpage|label1"
 msgid "Names"
 msgstr "Enwau"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:230
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:235
 msgctxt "frmaddpage|label2"
 msgid "_Vertical alignment"
 msgstr "_Aliniad fertigol"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:243
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:248
 msgctxt "frmaddpage|liststore"
 msgid "Top"
 msgstr "Brig"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:244
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:249
 msgctxt "frmaddpage|liststore"
 msgid "Centered"
 msgstr "Canoli"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:245
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:250
 msgctxt "frmaddpage|liststore"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:261
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:266
 msgctxt "frmaddpage|label7"
 msgid "Content Alignment"
 msgstr "Aliniad Cynnwys"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:297
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:302
 msgctxt "frmaddpage|protectcontent"
 msgid "_Contents"
 msgstr "Cy_nnwys"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:312
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:317
 msgctxt "frmaddpage|protectframe"
 msgid "P_osition"
 msgstr "_Safle"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:327
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:332
 msgctxt "frmaddpage|protectsize"
 msgid "_Size"
 msgstr "_Maint"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:348
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:353
 msgctxt "frmaddpage|label8"
 msgid "Protect"
 msgstr "Diogelu"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:393
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:398
 msgctxt "frmaddpage|editinreadonly"
 msgid "_Editable in read-only document"
 msgstr "_Golygu mewn dogfen darllen yn unig"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:408
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:413
 msgctxt "frmaddpage|printframe"
 msgid "Prin_t"
 msgstr "_Argraffu"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:433
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:438
 msgctxt "frmaddpage|textflow_label"
 msgid "_Text direction:"
 msgstr "_Cyfeiriad testun:"
 
-#: sw/uiconfig/swriter/ui/frmaddpage.ui:467
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:472
 msgctxt "frmaddpage|label3"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:72
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:85
 msgctxt "frmtypepage|autowidth"
 msgid "AutoSize"
 msgstr "AwtoFaint"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:96
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:109
 msgctxt "frmtypepage|autowidthft"
 msgid "_Width (at least)"
 msgstr "_Lled (o leiaf)"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:110
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:123
 msgctxt "frmtypepage|widthft"
 msgid "_Width"
 msgstr "_Lled"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:133
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:146
 msgctxt "frmtypepage|relwidth"
 msgid "Relat_ive to"
 msgstr "_Perthynnol i"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:196
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:210
 msgctxt "frmtypepage|autoheight"
 msgid "AutoSize"
 msgstr "AwtoFaint"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:220
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:234
 msgctxt "frmtypepage|autoheightft"
 msgid "H_eight (at least)"
 msgstr "_Uchder (o leiaf)"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:234
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:248
 msgctxt "frmtypepage|heightft"
 msgid "H_eight"
 msgstr "_Uchder"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:257
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:271
 msgctxt "frmtypepage|relheight"
 msgid "Re_lative to"
 msgstr "P_erthynol"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:302
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:316
 msgctxt "frmtypepage|ratio"
 msgid "_Keep ratio"
 msgstr "_Cadw Cymhareb"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:317
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:331
 msgctxt "frmtypepage|origsize"
 msgid "_Original Size"
 msgstr "_Maint Gwreiddiol"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:337
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:351
 msgctxt "frmtypepage|label2"
 msgid "Size"
 msgstr "Maint"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:393
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:407
 msgctxt "frmtypepage|topage"
 msgid "To _page"
 msgstr "I _dudalen"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:410
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:423
 msgctxt "frmtypepage|topara"
 msgid "To paragrap_h"
 msgstr "I _baragraff"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:426
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:439
 msgctxt "frmtypepage|tochar"
 msgid "To cha_racter"
 msgstr "I _nod"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:442
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:455
 msgctxt "frmtypepage|aschar"
 msgid "_As character"
 msgstr "_Fel nod"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:458
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:471
 msgctxt "frmtypepage|toframe"
 msgid "To _frame"
 msgstr "_I frâm"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:480
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:493
 msgctxt "frmtypepage|label1"
 msgid "Anchor"
 msgstr "Angor"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:520
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:533
 msgctxt "frmtypepage|horiposft"
 msgid "Hori_zontal"
 msgstr "Llo_rweddol"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:534
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:547
 msgctxt "frmtypepage|horibyft"
 msgid "b_y"
 msgstr "_gan"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:548
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:561
 msgctxt "frmtypepage|vertbyft"
 msgid "by"
 msgstr "wrth"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:562
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:575
 msgctxt "frmtypepage|horitoft"
 msgid "_to"
 msgstr "_at"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:608
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:622
 msgctxt "frmtypepage|vertposft"
 msgid "_Vertical"
 msgstr "_Fertigol"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:644
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:659
 msgctxt "frmtypepage|verttoft"
 msgid "t_o"
 msgstr "a_t"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:666
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:681
 msgctxt "frmtypepage|mirror"
 msgid "_Mirror on even pages"
 msgstr "_Adlewyrchu ar dudalennau eilrif"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:683
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:698
 msgctxt "frmtypepage|followtextflow"
 msgid "Follow text flow"
 msgstr "Dilyn llif testun"
 
-#: sw/uiconfig/swriter/ui/frmtypepage.ui:706
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:721
 msgctxt "frmtypepage|label11"
 msgid "Position"
 msgstr "Safle"
@@ -9850,37 +9850,37 @@ msgctxt "frmurlpage|url_label"
 msgid "_URL:"
 msgstr "_URL:"
 
-#: sw/uiconfig/swriter/ui/frmurlpage.ui:80
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:78
 msgctxt "frmurlpage|name_label"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: sw/uiconfig/swriter/ui/frmurlpage.ui:96
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:92
 msgctxt "frmurlpage|frame_label"
 msgid "_Frame:"
 msgstr "_Ffrâm:"
 
-#: sw/uiconfig/swriter/ui/frmurlpage.ui:114
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:109
 msgctxt "frmurlpage|search"
 msgid "_Browse..."
 msgstr "_Pori..."
 
-#: sw/uiconfig/swriter/ui/frmurlpage.ui:169
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:159
 msgctxt "frmurlpage|label1"
 msgid "Link to"
 msgstr "Cysylltiad i"
 
-#: sw/uiconfig/swriter/ui/frmurlpage.ui:208
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:198
 msgctxt "frmurlpage|server"
 msgid "_Server-side image map"
 msgstr "Map delwedd _ochr-weinydd"
 
-#: sw/uiconfig/swriter/ui/frmurlpage.ui:226
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:214
 msgctxt "frmurlpage|client"
 msgid "_Client-side image map"
 msgstr "_Map delwedd ochr-cleient"
 
-#: sw/uiconfig/swriter/ui/frmurlpage.ui:250
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:236
 msgctxt "frmurlpage|label2"
 msgid "Image Map"
 msgstr "Map Delwedd"
@@ -10200,7 +10200,7 @@ msgctxt "insertautotextdialog|InsertAutoTextDialog"
 msgid "Insert AutoText"
 msgstr "Mewnosod AwtoDestun"
 
-#: sw/uiconfig/swriter/ui/insertautotextdialog.ui:119
+#: sw/uiconfig/swriter/ui/insertautotextdialog.ui:120
 msgctxt "insertautotextdialog|label1"
 msgid "Autotexts for Shortcut "
 msgstr "Llwybr byr AwtoDestun "
@@ -10310,72 +10310,72 @@ msgctxt "insertbreak|label1"
 msgid "Type"
 msgstr "Math"
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:9
+#: sw/uiconfig/swriter/ui/insertcaption.ui:8
 msgctxt "insertcaption|InsertCaptionDialog"
 msgid "Insert Caption"
 msgstr "Mewnosod Egluryn"
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:50
+#: sw/uiconfig/swriter/ui/insertcaption.ui:27
+msgctxt "insertcaption|auto"
+msgid "Auto..."
+msgstr "Awto..."
+
+#: sw/uiconfig/swriter/ui/insertcaption.ui:40
+msgctxt "insertcaption|options"
+msgid "Options..."
+msgstr "Dewisiadau..."
+
+#: sw/uiconfig/swriter/ui/insertcaption.ui:139
 msgctxt "insertcaption|label1"
 msgid "Caption"
 msgstr "Egluryn"
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:88
+#: sw/uiconfig/swriter/ui/insertcaption.ui:177
 msgctxt "insertcaption|numbering_label"
 msgid "Numbering:"
 msgstr "Rhifo:"
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:102
+#: sw/uiconfig/swriter/ui/insertcaption.ui:191
 msgctxt "insertcaption|separator_label"
 msgid "Separator:"
 msgstr "Ymwahanydd:"
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:116
+#: sw/uiconfig/swriter/ui/insertcaption.ui:205
 msgctxt "insertcaption|position_label"
 msgid "Position:"
 msgstr "Safle:"
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:141
+#: sw/uiconfig/swriter/ui/insertcaption.ui:231
 msgctxt "insertcaption|separator_edit"
 msgid ": "
 msgstr ": "
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:153
+#: sw/uiconfig/swriter/ui/insertcaption.ui:243
 msgctxt "insertcaption|num_separator"
 msgid "Numbering separator:"
 msgstr "Ymwahanydd rhif:"
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:167
+#: sw/uiconfig/swriter/ui/insertcaption.ui:258
 msgctxt "insertcaption|num_separator_edit"
 msgid ". "
 msgstr ". "
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:190
+#: sw/uiconfig/swriter/ui/insertcaption.ui:281
 msgctxt "insertcaption|label4"
 msgid "Category:"
 msgstr "Categori:"
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:223
+#: sw/uiconfig/swriter/ui/insertcaption.ui:315
 msgctxt "insertcaption|label2"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:261
+#: sw/uiconfig/swriter/ui/insertcaption.ui:368
 msgctxt "insertcaption|label3"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: sw/uiconfig/swriter/ui/insertcaption.ui:332
-msgctxt "insertcaption|auto"
-msgid "Auto..."
-msgstr "Awto..."
-
-#: sw/uiconfig/swriter/ui/insertcaption.ui:345
-msgctxt "insertcaption|options"
-msgid "Options..."
-msgstr "Dewisiadau..."
-
-#: sw/uiconfig/swriter/ui/insertcaption.ui:388
+#: sw/uiconfig/swriter/ui/insertcaption.ui:412
 msgctxt "insertcaption|liststore1"
 msgid "[None]"
 msgstr "[None]"
@@ -10415,47 +10415,47 @@ msgctxt "insertdbcolumnsdialog|tablecolft"
 msgid "Tab_le column(s)"
 msgstr "C_olofn(nau) Tabl"
 
-#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:470
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:473
 msgctxt "insertdbcolumnsdialog|tableheading"
 msgid "Insert table heading"
 msgstr "Mewnosod pennawd tudalen"
 
-#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:485
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:488
 msgctxt "insertdbcolumnsdialog|columnname"
 msgid "Apply column _name"
 msgstr "Gosod _enw colofn"
 
-#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:502
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:505
 msgctxt "insertdbcolumnsdialog|rowonly"
 msgid "Create row only"
 msgstr "Creu rhesi'n unig"
 
-#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:519
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:522
 msgctxt "insertdbcolumnsdialog|tableformat"
 msgid "Pr_operties..."
 msgstr "_Priodweddau..."
 
-#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:532
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:535
 msgctxt "insertdbcolumnsdialog|autoformat"
 msgid "Aut_oFormat..."
 msgstr "AwtoFf_ormat..."
 
-#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:548
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:551
 msgctxt "insertdbcolumnsdialog|parastylelabel"
 msgid "Paragraph _style:"
 msgstr "_Arddull paragraff:"
 
-#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:587
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:590
 msgctxt "insertdbcolumnsdialog|fromdatabase"
 msgid "From _database"
 msgstr "O _gronfa ddata"
 
-#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:604
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:607
 msgctxt "insertdbcolumnsdialog|userdefined"
 msgid "_User-defined"
 msgstr "_Defnyddiwr diffiniedig"
 
-#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:649
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:652
 msgctxt "insertdbcolumnsdialog|label3"
 msgid "Format"
 msgstr "Fformat"
@@ -10935,122 +10935,122 @@ msgctxt "mailconfigpage|test"
 msgid "_Test Settings"
 msgstr "_Gosodiadau Prawf"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:12
+#: sw/uiconfig/swriter/ui/mailmerge.ui:16
 msgctxt "mailmerge|MailmergeDialog"
 msgid "Mail Merge"
 msgstr "Cyfuno Post"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:128
+#: sw/uiconfig/swriter/ui/mailmerge.ui:135
 msgctxt "mailmerge|all"
 msgid "_All"
 msgstr "_Pob Un"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:145
+#: sw/uiconfig/swriter/ui/mailmerge.ui:152
 msgctxt "mailmerge|selected"
 msgid "_Selected records"
 msgstr "_Cofnodion dewiswyd"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:167
+#: sw/uiconfig/swriter/ui/mailmerge.ui:174
 msgctxt "mailmerge|rbfrom"
 msgid "_From:"
 msgstr "_O:"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:199
+#: sw/uiconfig/swriter/ui/mailmerge.ui:207
 msgctxt "mailmerge|label3"
 msgid "_To:"
 msgstr "_Hyd at:"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:237
+#: sw/uiconfig/swriter/ui/mailmerge.ui:246
 msgctxt "mailmerge|recordslabel"
 msgid "Records"
 msgstr "Cofnodion"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:277
+#: sw/uiconfig/swriter/ui/mailmerge.ui:286
 msgctxt "mailmerge|printer"
 msgid "_Printer"
 msgstr "_Argraffydd"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:294
+#: sw/uiconfig/swriter/ui/mailmerge.ui:303
 msgctxt "mailmerge|electronic"
 msgid "_Electronic"
 msgstr "_Electronig"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:311
+#: sw/uiconfig/swriter/ui/mailmerge.ui:320
 msgctxt "mailmerge|file"
 msgid "File"
 msgstr "Ffeil"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:335
+#: sw/uiconfig/swriter/ui/mailmerge.ui:344
 msgctxt "mailmerge|singlejobs"
 msgid "_Single print jobs"
 msgstr "_Gwaith argraffu sengl"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:383
+#: sw/uiconfig/swriter/ui/mailmerge.ui:392
 msgctxt "mailmerge|generate"
 msgid "Generate file name from _database"
 msgstr "Cynhyrchu enw ffeil o _gronfa ddata"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:403
+#: sw/uiconfig/swriter/ui/mailmerge.ui:411
 msgctxt "mailmerge|fieldlabel"
 msgid "Field:"
 msgstr "Maes:"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:416
+#: sw/uiconfig/swriter/ui/mailmerge.ui:424
 msgctxt "mailmerge|pathlabel"
 msgid "_Path:"
 msgstr "_Llwybr:"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:431
+#: sw/uiconfig/swriter/ui/mailmerge.ui:439
 msgctxt "mailmerge|fileformatlabel"
 msgid "F_ile format:"
 msgstr "Fformat _ffeil:"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:492
+#: sw/uiconfig/swriter/ui/mailmerge.ui:501
 msgctxt "mailmerge|subjectlabel"
 msgid "_Subject:"
 msgstr "_Pwnc:"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:519
+#: sw/uiconfig/swriter/ui/mailmerge.ui:529
 msgctxt "mailmerge|attachmentslabel"
 msgid "Attachments:"
 msgstr "Atodiadau:"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:559
+#: sw/uiconfig/swriter/ui/mailmerge.ui:570
 msgctxt "mailmerge|mailformatlabel"
 msgid "Mail format:"
 msgstr "Fformat E-bost:"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:579
+#: sw/uiconfig/swriter/ui/mailmerge.ui:591
 msgctxt "mailmerge|html"
 msgid "HTM_L"
 msgstr "HTM_L"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:595
+#: sw/uiconfig/swriter/ui/mailmerge.ui:607
 msgctxt "mailmerge|rtf"
 msgid "RT_F"
 msgstr "RT_F"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:611
+#: sw/uiconfig/swriter/ui/mailmerge.ui:623
 msgctxt "mailmerge|swriter"
 msgid "%PRODUCTNAME Writer"
 msgstr "Writer %PRODUCTNAME"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:661
+#: sw/uiconfig/swriter/ui/mailmerge.ui:673
 msgctxt "mailmerge|singledocument"
 msgid "S_ave as single document"
 msgstr "C_adw fel un ddogfen"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:678
+#: sw/uiconfig/swriter/ui/mailmerge.ui:690
 msgctxt "mailmerge|individualdocuments"
 msgid "Sa_ve as individual documents"
 msgstr "Cadw fel dogfennau _unigol"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:703
+#: sw/uiconfig/swriter/ui/mailmerge.ui:715
 msgctxt "mailmerge|savemergeddoclabel"
 msgid "Save Merged Document"
 msgstr "Cadw'r Ddogfen Cyfunwyd"
 
-#: sw/uiconfig/swriter/ui/mailmerge.ui:724
+#: sw/uiconfig/swriter/ui/mailmerge.ui:736
 msgctxt "mailmerge|outputlabel"
 msgid "Output"
 msgstr "Allbwn"
@@ -11915,733 +11915,700 @@ msgctxt "newuserindexdialog|label1"
 msgid "New User Index"
 msgstr "Mynegai Defnyddiwr Newydd"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:340
+#: sw/uiconfig/swriter/ui/notebookbar.ui:500
 msgctxt "WriterNotebookbar|Help"
 msgid "_Check for Updates..."
 msgstr "_Gwirio am Ddiweddariadau"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:1659
-msgctxt "WriterNotebookbar|Tools"
-msgid "_Check for Updates..."
-msgstr "_Gwirio am Ddiweddariadau..."
-
-#: sw/uiconfig/swriter/ui/notebookbar.ui:1929
+#: sw/uiconfig/swriter/ui/notebookbar.ui:2080
 msgctxt "WriterNotebookbar|FileMenuButton"
 msgid "_File"
 msgstr "_Ffeil:"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:1948
+#: sw/uiconfig/swriter/ui/notebookbar.ui:2100
 msgctxt "WriterNotebookbar|HelpMenuButton"
 msgid "_Help"
 msgstr "_Cymorth"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:2718
+#: sw/uiconfig/swriter/ui/notebookbar.ui:2871
 msgctxt "WriterNotebookbar|FileLabel"
-msgid "File"
-msgstr "Ffeil"
+msgid "~File"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:2877
+#: sw/uiconfig/swriter/ui/notebookbar.ui:3030
 msgctxt "WriterNotebookbar|HomeMenuButton"
 msgid "_Home"
 msgstr "_Cartref"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:4227
+#: sw/uiconfig/swriter/ui/notebookbar.ui:4405
 msgctxt "WriterNotebookbar|HomeLabel"
-msgid "Home"
-msgstr "Cartref"
+msgid "~Home"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:5279
+#: sw/uiconfig/swriter/ui/notebookbar.ui:5484
 msgctxt "WriterNotebookbar|InsertMenuButton"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:5364
+#: sw/uiconfig/swriter/ui/notebookbar.ui:5570
 msgctxt "WriterNotebookbar|InsertLabel"
-msgid "Insert"
-msgstr "Mewnosod"
+msgid "~Insert"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:5394
+#: sw/uiconfig/swriter/ui/notebookbar.ui:5600
 msgctxt "WriterNotebookbar|LayoutMenuButton"
-msgid "Layout"
-msgstr "Cynllun"
+msgid "_Layout"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:6296
+#: sw/uiconfig/swriter/ui/notebookbar.ui:6503
 msgctxt "WriterNotebookbar|LayoutLabel"
-msgid "Layout"
-msgstr "Cynllun"
+msgid "~Layout"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:6324
+#: sw/uiconfig/swriter/ui/notebookbar.ui:6531
 msgctxt "WriterNotebookbar|ReferencesMenuButton"
 msgid "Reference_s"
 msgstr "C_yfeirnodau"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:6885
+#: sw/uiconfig/swriter/ui/notebookbar.ui:7093
 msgctxt "WriterNotebookbar|ReferencesLabel"
-msgid "References"
-msgstr "Cyfeiriadaeth"
+msgid "Reference~s"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:7539
+#: sw/uiconfig/swriter/ui/notebookbar.ui:7805
 msgctxt "WriterNotebookbar|ReviewMenuButton"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:7624
+#: sw/uiconfig/swriter/ui/notebookbar.ui:7891
 msgctxt "WriterNotebookbar|ReviewLabel"
-msgid "Review"
-msgstr "Adolygu"
+msgid "~Review"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:8220
+#: sw/uiconfig/swriter/ui/notebookbar.ui:8519
 msgctxt "WriterNotebookbar|ViewMenuButton"
 msgid "_View"
 msgstr "_Golwg"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:8305
+#: sw/uiconfig/swriter/ui/notebookbar.ui:8605
 msgctxt "WriterNotebookbar|ViewLabel"
-msgid "View"
-msgstr "Golwg"
+msgid "~View"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:9506
+#: sw/uiconfig/swriter/ui/notebookbar.ui:9817
 msgctxt "WriterNotebookbar|TableMenuButton"
-msgid "T_able"
-msgstr "_Tabl"
+msgid "_Table"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:9590
+#: sw/uiconfig/swriter/ui/notebookbar.ui:9902
 msgctxt "WriterNotebookbar|TableLabel"
-msgid "Table"
-msgstr "Tabl"
+msgid "~Table"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:10716
+#: sw/uiconfig/swriter/ui/notebookbar.ui:11028
 msgctxt "WriterNotebookbar|ImageMenuButton"
-msgid "Image"
-msgstr "Delwedd"
+msgid "Ima_ge"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:10815
+#: sw/uiconfig/swriter/ui/notebookbar.ui:11128
 msgctxt "WriterNotebookbar|ImageLabel"
-msgid "Image"
-msgstr "Delwedd"
+msgid "Ima~ge"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:11926
+#: sw/uiconfig/swriter/ui/notebookbar.ui:12239
 msgctxt "WriterNotebookbar|DrawMenuButton"
-msgid "D_raw"
-msgstr "_Lluniadu"
+msgid "_Draw"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:12035
+#: sw/uiconfig/swriter/ui/notebookbar.ui:12349
 msgctxt "WriterNotebookbar|DrawLabel"
-msgid "Draw"
-msgstr "Lluniadu"
+msgid "~Draw"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:12477
-msgctxt "WriterNotebookbar|PrintMenuButton"
-msgid "_Print"
-msgstr "_Argraffu"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:13191
+msgctxt "WriterNotebookbar|ObjectMenuButton"
+msgid "_Object"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:12561
-msgctxt "WriterNotebookbar|PrintLabel"
-msgid "Print"
-msgstr "Argraffu"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:13277
+msgctxt "WriterNotebookbar|ObjectLabel"
+msgid "~Object"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:13295
+#: sw/uiconfig/swriter/ui/notebookbar.ui:14013
 msgctxt "WriterNotebookbar|MediaMenuButton"
 msgid "_Media"
 msgstr "_Cyfrwng"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:13378
+#: sw/uiconfig/swriter/ui/notebookbar.ui:14096
 msgctxt "WriterNotebookbar|MediaLabel"
-msgid "Media"
-msgstr "Cyfrwng"
+msgid "~Media"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:14216
-msgctxt "WriterNotebookbar|ObjectMenuButton"
-msgid "Object"
-msgstr "Gwrthrych"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:14517
+msgctxt "WriterNotebookbar|PrintMenuButton"
+msgid "_Print"
+msgstr "_Argraffu"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:14301
-msgctxt "WriterNotebookbar|ObjectLabel"
-msgid "Object"
-msgstr "Gwrthrych"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:14600
+msgctxt "WriterNotebookbar|PrintLabel"
+msgid "~Print"
+msgstr ""
+
+#: sw/uiconfig/swriter/ui/notebookbar.ui:14631
+msgctxt "WriterNotebookbar|FormMenuButton"
+msgid "Fo_rm"
+msgstr ""
+
+#: sw/uiconfig/swriter/ui/notebookbar.ui:15393
+msgctxt "WriterNotebookbar|FormLabel"
+msgid "Fo~rm"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:14332
+#: sw/uiconfig/swriter/ui/notebookbar.ui:15424
 msgctxt "WriterNotebookbar|ToolsMenuButton"
 msgid "_Tools"
 msgstr "_Offer"
 
-#: sw/uiconfig/swriter/ui/notebookbar.ui:15257
+#: sw/uiconfig/swriter/ui/notebookbar.ui:16349
 msgctxt "WriterNotebookbar|ToolsLabel"
-msgid "Tools"
-msgstr "Offer"
+msgid "~Tools"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:1891
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:1898
 msgctxt "notebookbar_compact|Update"
 msgid "_Check for Updates..."
 msgstr "_Gwirio am Ddiweddariadau..."
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:2201
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:2208
 msgctxt "notebookbar_compact|FileMenuButton"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:2915
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:2922
 msgctxt "notebookbar_compact|FileLabel"
 msgid "File"
 msgstr "Ffeil"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:2964
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:2971
 msgctxt "notebookbar_compact|HomeMenuButton"
 msgid "_Menu"
 msgstr "_Dewislen"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:4023
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:4030
 msgctxt "notebookbar_compact|HomeLabel"
 msgid "Home"
 msgstr "Cartref"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:4076
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:4083
 msgctxt "notebookbar_compact|InsertMenuButton"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:4695
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:4702
 msgctxt "notebookbar_compact|InsertLabel"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5265
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5272
 msgctxt "notebookbar_compact|WrapButton"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5414
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5421
 msgctxt "notebookbar_compact|LayoutMenuButton"
 msgid "Layout"
 msgstr "Cynllun"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5466
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5473
 msgctxt "notebookbar_compact|LayoutLabel"
 msgid "Layout"
 msgstr "Cynllun"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5513
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5520
 msgctxt "notebookbar_compact|ReferencesMenuButton"
 msgid "Reference_s"
 msgstr "C_yfeirnodau"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5901
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5908
 msgctxt "notebookbar_compact|ReferencesLabel"
 msgid "References"
 msgstr "Cyfeirnodau"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6397
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6404
 msgctxt "notebookbar_compact|ReviewMenuButton"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6430
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6437
 msgctxt "notebookbar_compact|ReviewLabel"
 msgid "Review"
 msgstr "Adolygu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6899
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6906
 msgctxt "notebookbar_compact|ViewMenuButton"
 msgid "_View"
 msgstr "_Golwg"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6951
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6958
 msgctxt "notebookbar_compact|ViewLabel"
 msgid "View"
 msgstr "Golwg"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6999
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:7006
 msgctxt "notebookbar_compact|TableMenuButton"
 msgid "T_able"
 msgstr "_Tabl"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:7731
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:7738
 msgctxt "notebookbar_compact|TableLabel"
 msgid "Table"
 msgstr "Tabl"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8079
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8909
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9579
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8086
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8916
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9587
 msgctxt "notebookbar_compact|WrapMenuButton"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8193
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9023
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9693
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8200
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9030
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9701
 msgctxt "notebookbar_compact|AlignMenuButton"
 msgid "A_lign"
 msgstr "A_linio"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8475
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8482
 msgctxt "notebookbar_compact|ImageMenuButton"
 msgid "Image"
 msgstr "Delwedd"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8508
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8515
 msgctxt "notebookbar_compact|ImageLabel"
 msgid "Image"
 msgstr "Delwedd"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9251
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9258
 msgctxt "notebookbar_compact|DrawMenuButton"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9306
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9313
 msgctxt "notebookbar_compact|ShapeLabel"
 msgid "Draw"
 msgstr "_Lluniadu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9831
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9839
 msgctxt "notebookbar_compact|ObjectMenuButton"
 msgid "Object"
 msgstr "Gwrthrych"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9887
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9895
 msgctxt "notebookbar_compact|FrameLabel"
 msgid "Object"
 msgstr "Gwrthrych"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10348
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10357
 msgctxt "notebookbar_compact|MediaButton"
 msgid "_Media"
 msgstr "_Cyfrwng"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10402
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10411
 msgctxt "notebookbar_compact|MediaLabel"
 msgid "Media"
 msgstr "Cyfrwng"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10844
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10854
 msgctxt "notebookbar_compact|PrintPreviewButton"
 msgid "Print"
 msgstr "Argraffu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10899
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10909
 msgctxt "notebookbar_compact|PrintPreviewLabel"
 msgid "Print"
 msgstr "Argraffu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10948
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10959
 msgctxt "notebookbar_compact|ToolsMenuButton"
 msgid "_Tools"
 msgstr "_Offer"
 
-#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:11791
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:11802
 msgctxt "notebookbar_compact|DevLabel"
 msgid "Tools"
 msgstr "_Offer"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:2565
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:2483
 msgctxt "notebookbar_groupedbar_compact|MenubarAction"
 msgid "Menubar"
 msgstr "Bar dewislen"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:2620
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:2538
 msgctxt "notebookbar_groupedbar_compact|MenuAction"
 msgid "_Check for Updates..."
 msgstr "Gwirio am _Ddiweddariadau..."
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:2755
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:2704
 msgctxt "notebookbar_groupedbar_compact|QuotationAction"
 msgid "Quotation"
 msgstr "Dyfyniad"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3049
-msgctxt "notebookbar_groupedbar_compact|ToolsButton"
-msgid "_Check for Updates..."
-msgstr "Gwirio am _Ddiweddariadau..."
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3062
+msgctxt "notebookbar_groupedbar_compact|MenubarView"
+msgid "Menubar"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3375
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3280
 msgctxt "notebookbar_groupedbar_compact|MenuButton"
 msgid "_Menu"
 msgstr "_Dewislen"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3431
-msgctxt "notebookbar_groupedbar_compact|ToolsButton"
-msgid "_Tools"
-msgstr "_Offer"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3520
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3382
 msgctxt "notebookbar_groupedbar_compact|FileButton"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3675
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3496
 msgctxt "notebookbar_groupedbar_compact|EditButton"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3814
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9230
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3596
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4692
 msgctxt "notebookbar_groupedbar_compact|StyleButton"
 msgid "St_yles"
 msgstr "_Arddulliau"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3992
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8701
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9409
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3784
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4879
 msgctxt "notebookbar_groupedbar_compact|FormatButton"
-msgid "F_ormat"
-msgstr "Ff_ormat"
+msgid "F_ont"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4242
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8963
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9625
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4041
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5136
 msgctxt "notebookbar_groupedbar_compact|ParagraphButton"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4414
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4203
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5881
 msgctxt "notebookbar_groupedbar_compact|InsertButton"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4562
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4354
 msgctxt "notebookbar_groupedbar_compact|ReferenceButton"
 msgid "Reference_s"
 msgstr "C_yfeirnodau"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4669
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4468
 msgctxt "notebookbar_groupedbar_compact|ReviewButton"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4783
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6794
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8414
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9126
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4582
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10844
 msgctxt "notebookbar_groupedbar_compact|ViewButton"
 msgid "_View"
 msgstr "_Golwg"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4899
-msgctxt "notebookbar_groupedbar_compact|PrintMenuButton"
-msgid "_Print"
-msgstr "_Argraffu"
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5383
+msgctxt "notebookbar_groupedbar_compact|rowscolumnst"
+msgid "_Table"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5050
-msgctxt "notebookbar_groupedbar_compact|PrintMenuButton"
-msgid "Slide Layout"
-msgstr "Cynllun Sleid"
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5767
+msgctxt "notebookbar_groupedbar_compact|CalculateButton"
+msgid "_Calc"
+msgstr "_Calc"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5186
-msgctxt "notebookbar_groupedbar_compact|PrintMenuButton"
-msgid "Navigate"
-msgstr "Llywio"
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6030
+msgctxt "notebookbar_groupedbar_compact|editdrawb"
+msgid "D_raw"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5311
-msgctxt "notebookbar_groupedbar_compact|PrintMenuButton"
-msgid "Zoom"
-msgstr "Ehangu"
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6412
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7776
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8861
+msgctxt "notebookbar_groupedbar_compact|ArrangeButton"
+msgid "_Arrange"
+msgstr "_Trefnu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5449
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6782
+msgctxt "notebookbar_groupedbar_compact|draw"
+msgid "_Shape"
+msgstr ""
+
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6944
+msgctxt "notebookbar_groupedbar_compact|viewDrawb"
+msgid "Grou_p"
+msgstr "Grŵ_p"
+
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7091
+msgctxt "notebookbar_groupedbar_compact|3Db"
+msgid "3_D"
+msgstr "3_D"
+
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7242
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8327
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9159
+msgctxt "notebookbar_groupedbar_compact|GridButton"
+msgid "_Grid"
+msgstr "_Grid"
+
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7383
 msgctxt "notebookbar_groupedbar_compact|ImageButton"
-msgid "Image"
-msgstr "Delwedd"
+msgid "_Image"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5565
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8051
 msgctxt "notebookbar_groupedbar_compact|ColorButton"
 msgid "C_olor"
 msgstr "L_liw"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5900
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7430
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8187
-msgctxt "notebookbar_groupedbar_compact|ArrangeButton"
-msgid "_Arrange"
-msgstr "_Trefnu"
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8469
+msgctxt "notebookbar_groupedbar_compact|graphicB"
+msgid "_Object"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6197
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7570
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8300
-msgctxt "notebookbar_groupedbar_compact|GridButton"
-msgid "_Grid"
-msgstr "_Grid"
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9299
+msgctxt "notebookbar_groupedbar_compact|graphicB"
+msgid "_Media"
+msgstr ""
+
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9816
+msgctxt "notebookbar_groupedbar_compact|PrintMenuButton"
+msgid "_Layout"
+msgstr ""
+
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10217
+msgctxt "notebookbar_groupedbar_compact|PrintMenuButton"
+msgid "_Print"
+msgstr "_Argraffu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6321
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10365
 msgctxt "notebookbar_groupedbar_compact|LanguageButton"
 msgid "_Language"
 msgstr "_Iaith"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6451
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10493
 msgctxt "notebookbar_groupedbar_compact|reviewButton"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6589
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10632
 msgctxt "notebookbar_groupedbar_compact|CommentsButton"
 msgid "_Comments"
 msgstr "_Sylwadau"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6690
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10738
 msgctxt "notebookbar_groupedbar_compact|CompareButton"
 msgid "Com_pare"
 msgstr "_Cymharu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6982
-msgctxt "notebookbar_groupedbar_compact|DrawEditButton"
-msgid "St_yles"
-msgstr "_Arddulliau"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7199
-msgctxt "notebookbar_groupedbar_compact|DrawButton"
-msgid "D_raw"
-msgstr "_Lluniadu"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7683
-msgctxt "notebookbar_groupedbar_compact|GroupButton"
-msgid "Grou_p"
-msgstr "Grŵ_p"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7795
-msgctxt "notebookbar_groupedbar_compact|3DButton"
-msgid "3_D"
-msgstr "3_D"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7980
-msgctxt "notebookbar_groupedbar_compact|FrameButton"
-msgid "F_rame"
-msgstr "_Ffrâm"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8523
-msgctxt "notebookbar_groupedbar_compact|StylesButton"
-msgid "St_yles"
-msgstr "_Arddulliau"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9754
-msgctxt "notebookbar_groupedbar_compact|TableButton"
-msgid "T_able"
-msgstr "T_abl"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9894
-msgctxt "notebookbar_groupedbar_compact|MergeButton"
-msgid "_Merge"
-msgstr "_Cyfuno"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10020
-msgctxt "notebookbar_groupedbar_compact|RowsColumnsButton"
-msgid "R_ows"
-msgstr "_Rhesi"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10149
-msgctxt "notebookbar_groupedbar_compact|SelectButton"
-msgid "Selec_t"
-msgstr "_Dewis"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10264
-msgctxt "notebookbar_groupedbar_compact|CalculateButton"
-msgid "_Calc"
-msgstr "_Calc"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10383
-msgctxt "notebookbar_groupedbar_compact|MediaButton"
-msgid "_Media"
-msgstr "_Cyfrwng"
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10974
+msgctxt "notebookbar_groupedbar_compact|FormButton"
+msgid "Fo_rm"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:1506
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:1505
 msgctxt "notebookbar_groupedbar_full|HelpButton"
 msgid "_Check for Updates..."
 msgstr "Gwirio am _Ddiweddariadau..."
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:2641
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:2640
+msgctxt "notebookbar_groupedbar_full|MenubarAction"
+msgid "Menubar"
+msgstr ""
+
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:2695
 msgctxt "notebookbar_groupedbar_full|MenuButton"
 msgid "_Check for Updates..."
 msgstr "Gwirio am _Ddiweddariadau..."
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:2776
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:2841
 msgctxt "notebookbar_groupedbar_full|QuotationButton"
 msgid "Quotation"
 msgstr "Dyfyniad"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3070
-msgctxt "notebookbar_groupedbar_full|ToolsButton"
-msgid "_Check for Updates..."
-msgstr "Gwirio am _Ddiweddariadau..."
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3199
+msgctxt "notebookbar_groupedbar_full|MenubarView"
+msgid "Menubar"
+msgstr ""
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3375
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3379
 msgctxt "notebookbar_groupedbar_full|MenuButton"
 msgid "_Menu"
 msgstr "_Dewislen"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3428
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3432
 msgctxt "notebookbar_groupedbar_full|ToolsButton"
 msgid "_Tools"
 msgstr "_Offer"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3483
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3487
 msgctxt "notebookbar_groupedbar_full|HelpButton"
 msgid "_Help"
 msgstr "_Cymorth"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3591
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3595
 msgctxt "notebookbar_groupedbar_full|FileButton"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3829
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3833
 msgctxt "notebookbar_groupedbar_full|EditButton"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4026
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6776
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4030
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6780
 msgctxt "notebookbar_groupedbar_full|StyleButton"
 msgid "St_yles"
 msgstr "_Arddulliau"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4311
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7061
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11605
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4315
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7065
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11631
 msgctxt "notebookbar_groupedbar_full|FormatButton"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4661
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7411
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11870
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4665
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7415
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11896
 msgctxt "notebookbar_groupedbar_full|ParagraphButton"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4900
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12201
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4904
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12227
 msgctxt "notebookbar_groupedbar_full|InsertButton"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5129
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8724
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5133
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8728
 msgctxt "notebookbar_groupedbar_full|ReferenceButton"
 msgid "Referen_ce"
 msgstr "C_yfeirnod"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5331
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9090
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5335
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9094
 msgctxt "notebookbar_groupedbar_full|ReviewButton"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5481
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9656
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12047
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13630
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5485
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9660
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12073
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13656
 msgctxt "notebookbar_groupedbar_full|ViewButton"
 msgid "_View"
 msgstr "_Golwg"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5743
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5747
 msgctxt "notebookbar_groupedbar_full|GraphicButton"
 msgid "Image"
 msgstr "Delwedd"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6174
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10750
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13314
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6178
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10776
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13340
 msgctxt "notebookbar_groupedbar_full|ArrangeButton"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6347
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6351
 msgctxt "notebookbar_groupedbar_full|ColorButton"
 msgid "C_olor"
 msgstr "L_liw"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6598
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10917
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13480
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6602
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10943
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13506
 msgctxt "notebookbar_groupedbar_full|GridButton"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7636
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7640
 msgctxt "notebookbar_groupedbar_full|TableButton"
 msgid "T_able"
 msgstr "T_abl"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7835
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7839
 msgctxt "notebookbar_groupedbar_full|RowsColumnsButton"
 msgid "R_ows"
 msgstr "_Rhesi"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8037
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8041
 msgctxt "notebookbar_groupedbar_full|MergeButton"
 msgid "_Merge"
 msgstr "_Cyfuno"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8266
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8270
 msgctxt "notebookbar_groupedbar_full|SelectButton"
 msgid "Sele_ct"
 msgstr "_Dewis"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8495
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8499
 msgctxt "notebookbar_groupedbar_full|CalculateButton"
 msgid "_Calc"
 msgstr "_Calc"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8861
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8865
 msgctxt "notebookbar_groupedbar_full|LanguageButton"
 msgid "_Language"
 msgstr "_Iaith"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9303
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9307
 msgctxt "notebookbar_groupedbar_full|CommentsButton"
 msgid "_Comments"
 msgstr "_Sylwadau"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9506
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9510
 msgctxt "notebookbar_groupedbar_full|CompareButton"
 msgid "Com_pare"
 msgstr "_Cymharu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10102
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10106
 msgctxt "notebookbar_groupedbar_full|DrawButton"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10471
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10475
 msgctxt "notebookbar_groupedbar_full|DrawEditButton"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10702
-msgctxt "notebookbar_groupedbar_full|WrapButton"
-msgid "Wrap"
-msgstr "Amlapio"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10717
-msgctxt "notebookbar_groupedbar_full|AlignButton"
-msgid "Align"
-msgstr "Alinio"
-
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11119
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11145
 msgctxt "notebookbar_groupedbar_full|GroupButton"
 msgid "Grou_p"
 msgstr "Grŵ_p"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11296
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11322
 msgctxt "notebookbar_groupedbar_full|3DButton"
 msgid "3_D"
 msgstr "3_D"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12649
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12675
 msgctxt "notebookbar_groupedbar_full|MediaButton"
 msgid "_Media"
 msgstr "_Cyfrwng"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12883
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12909
 msgctxt "notebookbar_groupedbar_full|FrameButton"
 msgid "F_rame"
 msgstr "_Ffrâm"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13914
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13940
 msgctxt "notebookbar_groupedbar_full|PrintMenuButton"
 msgid "_Print"
 msgstr "_Argraffu"
 
-#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:14146
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:14172
 msgctxt "notebookbar_groupedbar_full|PrintMenuButton"
 msgid "Slide Layout"
 msgstr "Cynllun Sleid"
@@ -12991,57 +12958,12 @@ msgctxt "notebookbar_single|insert|tooltip_text"
 msgid "Indent"
 msgstr "Mewnoli"
 
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:14
-msgctxt "numberingnamedialog|liststore1"
-msgid "Untitled 1"
-msgstr "Dideitl 1"
-
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:17
-msgctxt "numberingnamedialog|liststore1"
-msgid "Untitled 2"
-msgstr "Dideitl 2"
-
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:20
-msgctxt "numberingnamedialog|liststore1"
-msgid "Untitled 3"
-msgstr "Dideitl 3"
-
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:23
-msgctxt "numberingnamedialog|liststore1"
-msgid "Untitled 4"
-msgstr "Dideitl 4"
-
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:26
-msgctxt "numberingnamedialog|liststore1"
-msgid "Untitled 5"
-msgstr "Dideitl 5"
-
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:29
-msgctxt "numberingnamedialog|liststore1"
-msgid "Untitled 6"
-msgstr "Dideitl 6"
-
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:32
-msgctxt "numberingnamedialog|liststore1"
-msgid "Untitled 7"
-msgstr "Dideitl 7"
-
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:35
-msgctxt "numberingnamedialog|liststore1"
-msgid "Untitled 8"
-msgstr "Dideitl 8"
-
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:38
-msgctxt "numberingnamedialog|liststore1"
-msgid "Untitled 9"
-msgstr "Dideitl 9"
-
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:45
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:16
 msgctxt "numberingnamedialog|NumberingNameDialog"
 msgid "Save As"
 msgstr "Cadw Fel"
 
-#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:196
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:167
 msgctxt "numberingnamedialog|label1"
 msgid "Format"
 msgstr "Fformat"
@@ -13206,82 +13128,82 @@ msgctxt "objectdialog|macro"
 msgid "Macro"
 msgstr "Macro"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:50
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:58
 msgctxt "optcaptionpage|label7"
 msgid "Category:"
 msgstr "Categori:"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:64
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:72
 msgctxt "optcaptionpage|numberingft"
 msgid "_Numbering:"
 msgstr "_Rhifo:"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:78
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:86
 msgctxt "optcaptionpage|numseparatorft"
 msgid "Numbering separator:"
 msgstr "Ymwahanydd rhif:"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:92
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:100
 msgctxt "optcaptionpage|separatorft"
 msgid "Separator:"
 msgstr "Ymwahanydd:"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:106
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:114
 msgctxt "optcaptionpage|label18"
 msgid "Position:"
 msgstr "Safle:"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:145
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:156
 msgctxt "optcaptionpage|numseparator"
 msgid ". "
 msgstr ". "
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:190
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:202
 msgctxt "optcaptionpage|label2"
 msgid "Caption"
 msgstr "Egluryn"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:228
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:239
 msgctxt "optcaptionpage|label4"
 msgid "Level:"
 msgstr "Lefel:"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:242
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:253
 msgctxt "optcaptionpage|label6"
 msgid "Separator:"
 msgstr "Ymwahanydd:"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:270
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:283
 msgctxt "optcaptionpage|level"
 msgid "None"
 msgstr "Dim"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:286
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:299
 msgctxt "optcaptionpage|label11"
 msgid "Numbering Captions by Chapter"
 msgstr "Rhifo Eglurynnau yn ôl Pennawd"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:324
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:336
 msgctxt "optcaptionpage|label3"
 msgid "Character style:"
 msgstr "Arddull nod:"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:339
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:352
 msgctxt "optcaptionpage|charstyle"
 msgid "None"
 msgstr "Dim"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:349
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:362
 msgctxt "optcaptionpage|applyborder"
 msgid "Apply border and shadow"
 msgstr "Gosod border a chysgod"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:371
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:384
 msgctxt "optcaptionpage|label10"
 msgid "Category and Frame Format"
 msgstr "Fformat Categori a Ffrâm"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:423
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:478
 msgctxt "optcaptionpage|label1"
 msgid ""
 "Add captions automatically\n"
@@ -13290,17 +13212,17 @@ msgstr ""
 "Ychwanegu egluryn yn awtomatig\n"
 "wrth fewnosod:"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:466
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:541
 msgctxt "optcaptionpage|captionorder"
 msgid "Category first"
 msgstr "Categori'n gyntaf"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:467
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:542
 msgctxt "optcaptionpage|captionorder"
 msgid "Numbering first"
 msgstr "Rhifau'n gyntaf"
 
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:477
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:552
 msgctxt "optcaptionpage|label13"
 msgid "Caption Order"
 msgstr "Trefn Eglurynnau"
@@ -14594,52 +14516,52 @@ msgctxt "picturedialog|PictureDialog"
 msgid "Image"
 msgstr "Delwedd"
 
-#: sw/uiconfig/swriter/ui/picturedialog.ui:108
+#: sw/uiconfig/swriter/ui/picturedialog.ui:135
 msgctxt "picturedialog|type"
 msgid "Type"
 msgstr "Math"
 
-#: sw/uiconfig/swriter/ui/picturedialog.ui:130
+#: sw/uiconfig/swriter/ui/picturedialog.ui:181
 msgctxt "picturedialog|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: sw/uiconfig/swriter/ui/picturedialog.ui:153
+#: sw/uiconfig/swriter/ui/picturedialog.ui:228
 msgctxt "picturedialog|wrap"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: sw/uiconfig/swriter/ui/picturedialog.ui:176
+#: sw/uiconfig/swriter/ui/picturedialog.ui:275
 msgctxt "picturedialog|hyperlink"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: sw/uiconfig/swriter/ui/picturedialog.ui:199
+#: sw/uiconfig/swriter/ui/picturedialog.ui:322
 msgctxt "picturedialog|picture"
 msgid "Image"
 msgstr "Delwedd"
 
-#: sw/uiconfig/swriter/ui/picturedialog.ui:222
+#: sw/uiconfig/swriter/ui/picturedialog.ui:369
 msgctxt "picturedialog|crop"
 msgid "Crop"
 msgstr "Tocio"
 
-#: sw/uiconfig/swriter/ui/picturedialog.ui:245
+#: sw/uiconfig/swriter/ui/picturedialog.ui:416
 msgctxt "picturedialog|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: sw/uiconfig/swriter/ui/picturedialog.ui:268
+#: sw/uiconfig/swriter/ui/picturedialog.ui:463
 msgctxt "picturedialog|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: sw/uiconfig/swriter/ui/picturedialog.ui:291
+#: sw/uiconfig/swriter/ui/picturedialog.ui:510
 msgctxt "picturedialog|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: sw/uiconfig/swriter/ui/picturedialog.ui:314
+#: sw/uiconfig/swriter/ui/picturedialog.ui:557
 msgctxt "picturedialog|macro"
 msgid "Macro"
 msgstr "Macro"
@@ -15076,8 +14998,8 @@ msgstr "Bydd hyn yn effeithio ar holl ddogfennau newydd sy'n seiliedig ar y temp
 
 #: sw/uiconfig/swriter/ui/queryredlinedialog.ui:7
 msgctxt "queryredlinedialog|QueryRedlineDialog"
-msgid "Delete this theme?"
-msgstr "Dileu'r thema?"
+msgid "AutoCorrect"
+msgstr ""
 
 #: sw/uiconfig/swriter/ui/queryredlinedialog.ui:13
 msgctxt "queryredlinedialog|QueryRedlineDialog"
@@ -15598,7 +15520,7 @@ msgctxt "sidebartheme|label1"
 msgid "Fonts"
 msgstr "Ffontiau"
 
-#: sw/uiconfig/swriter/ui/sidebartheme.ui:53
+#: sw/uiconfig/swriter/ui/sidebartheme.ui:54
 msgctxt "sidebartheme|label2"
 msgid "Colors"
 msgstr "Lliwiau"
@@ -16203,37 +16125,37 @@ msgctxt "templatedialog1|TemplateDialog1"
 msgid "Character Style"
 msgstr "Arddull Nod"
 
-#: sw/uiconfig/swriter/ui/templatedialog1.ui:166
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:165
 msgctxt "templatedialog1|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: sw/uiconfig/swriter/ui/templatedialog1.ui:212
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:211
 msgctxt "templatedialog1|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: sw/uiconfig/swriter/ui/templatedialog1.ui:259
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:258
 msgctxt "templatedialog1|fonteffect"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: sw/uiconfig/swriter/ui/templatedialog1.ui:306
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:305
 msgctxt "templatedialog1|position"
 msgid "Position"
 msgstr "Safle"
 
-#: sw/uiconfig/swriter/ui/templatedialog1.ui:353
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:352
 msgctxt "templatedialog1|asianlayout"
 msgid "Asian Layout"
 msgstr "Cynllun Asiaidd"
 
-#: sw/uiconfig/swriter/ui/templatedialog1.ui:400
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:399
 msgctxt "templatedialog1|background"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: sw/uiconfig/swriter/ui/templatedialog1.ui:447
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:446
 msgctxt "templatedialog1|borders"
 msgid "Borders"
 msgstr "Borderi"
@@ -16243,37 +16165,37 @@ msgctxt "templatedialog16|TemplateDialog16"
 msgid "Numbering Style"
 msgstr "Arddull Rhifo"
 
-#: sw/uiconfig/swriter/ui/templatedialog16.ui:166
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:165
 msgctxt "templatedialog16|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: sw/uiconfig/swriter/ui/templatedialog16.ui:212
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:211
 msgctxt "templatedialog16|bullets"
 msgid "Bullets"
 msgstr "Bwledi"
 
-#: sw/uiconfig/swriter/ui/templatedialog16.ui:259
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:258
 msgctxt "templatedialog16|numbering"
 msgid "Numbering Style"
 msgstr "Arddull Rhifo"
 
-#: sw/uiconfig/swriter/ui/templatedialog16.ui:306
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:305
 msgctxt "templatedialog16|outline"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: sw/uiconfig/swriter/ui/templatedialog16.ui:353
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:352
 msgctxt "templatedialog16|graphics"
 msgid "Image"
 msgstr "Delwedd"
 
-#: sw/uiconfig/swriter/ui/templatedialog16.ui:400
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:399
 msgctxt "templatedialog16|position"
 msgid "Position"
 msgstr "Safle"
 
-#: sw/uiconfig/swriter/ui/templatedialog16.ui:447
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:446
 msgctxt "templatedialog16|customize"
 msgid "Customize"
 msgstr "Cyfaddasu"
@@ -16283,87 +16205,87 @@ msgctxt "templatedialog2|TemplateDialog2"
 msgid "Paragraph Style"
 msgstr "Arddull Paragraff"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:166
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:165
 msgctxt "templatedialog2|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:212
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:211
 msgctxt "templatedialog2|indents"
 msgid "Indents & Spacing"
 msgstr "Mewnoliad a Bylchu"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:259
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:258
 msgctxt "templatedialog2|alignment"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:306
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:305
 msgctxt "templatedialog2|textflow"
 msgid "Text Flow"
 msgstr "Llif Testun"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:353
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:352
 msgctxt "templatedialog2|asiantypo"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:400
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:399
 msgctxt "templatedialog2|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:447
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:446
 msgctxt "templatedialog2|fonteffect"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:494
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:493
 msgctxt "templatedialog2|position"
 msgid "Position"
 msgstr "Safle"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:541
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:540
 msgctxt "templatedialog2|asianlayout"
 msgid "Asian Layout"
 msgstr "Cynllun Asiaidd"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:588
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:587
 msgctxt "templatedialog2|highlighting"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:635
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:634
 msgctxt "templatedialog2|tabs"
 msgid "Tabs"
 msgstr "Tabiau"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:682
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:681
 msgctxt "templatedialog2|dropcaps"
 msgid "Drop Caps"
 msgstr "Dim Prif Lythrennau Bach"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:729
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:728
 msgctxt "templatedialog2|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:776
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:775
 msgctxt "templatedialog2|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:823
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:822
 msgctxt "templatedialog2|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:870
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:869
 msgctxt "templatedialog2|condition"
 msgid "Condition"
 msgstr "Gydag Amod"
 
-#: sw/uiconfig/swriter/ui/templatedialog2.ui:917
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:916
 msgctxt "templatedialog2|outline"
 msgid "Outline & Numbering"
 msgstr "Amlinell a Rhifo"
@@ -16373,47 +16295,47 @@ msgctxt "templatedialog4|TemplateDialog4"
 msgid "Frame Style"
 msgstr "Arddull Ffrâm"
 
-#: sw/uiconfig/swriter/ui/templatedialog4.ui:166
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:165
 msgctxt "templatedialog4|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: sw/uiconfig/swriter/ui/templatedialog4.ui:212
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:211
 msgctxt "templatedialog4|type"
 msgid "Type"
 msgstr "Math"
 
-#: sw/uiconfig/swriter/ui/templatedialog4.ui:259
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:258
 msgctxt "templatedialog4|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: sw/uiconfig/swriter/ui/templatedialog4.ui:306
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:305
 msgctxt "templatedialog4|wrap"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: sw/uiconfig/swriter/ui/templatedialog4.ui:353
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:352
 msgctxt "templatedialog4|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: sw/uiconfig/swriter/ui/templatedialog4.ui:400
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:399
 msgctxt "templatedialog4|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: sw/uiconfig/swriter/ui/templatedialog4.ui:447
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:446
 msgctxt "templatedialog4|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: sw/uiconfig/swriter/ui/templatedialog4.ui:494
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:493
 msgctxt "templatedialog4|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: sw/uiconfig/swriter/ui/templatedialog4.ui:541
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:540
 msgctxt "templatedialog4|macros"
 msgid "Macro"
 msgstr "Macro"
@@ -16423,52 +16345,52 @@ msgctxt "templatedialog8|TemplateDialog8"
 msgid "Page Style"
 msgstr "Arddull Tudalen"
 
-#: sw/uiconfig/swriter/ui/templatedialog8.ui:167
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:166
 msgctxt "templatedialog8|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: sw/uiconfig/swriter/ui/templatedialog8.ui:213
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:212
 msgctxt "templatedialog8|page"
 msgid "Page"
 msgstr "Tudalen"
 
-#: sw/uiconfig/swriter/ui/templatedialog8.ui:260
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:259
 msgctxt "templatedialog8|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: sw/uiconfig/swriter/ui/templatedialog8.ui:307
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:306
 msgctxt "templatedialog8|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: sw/uiconfig/swriter/ui/templatedialog8.ui:354
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:353
 msgctxt "templatedialog8|header"
 msgid "Header"
 msgstr "Pennyn"
 
-#: sw/uiconfig/swriter/ui/templatedialog8.ui:401
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:400
 msgctxt "templatedialog8|footer"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: sw/uiconfig/swriter/ui/templatedialog8.ui:448
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:447
 msgctxt "templatedialog8|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: sw/uiconfig/swriter/ui/templatedialog8.ui:495
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:494
 msgctxt "templatedialog8|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: sw/uiconfig/swriter/ui/templatedialog8.ui:542
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:541
 msgctxt "templatedialog8|footnotes"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: sw/uiconfig/swriter/ui/templatedialog8.ui:589
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:588
 msgctxt "templatedialog8|textgrid"
 msgid "Text Grid"
 msgstr "Grid Testun"
@@ -16933,292 +16855,257 @@ msgctxt "tocentriespage|label13"
 msgid "Sort Keys"
 msgstr "Allweddi Trefnu"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:20
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:19
 msgctxt "tocindexpage|open"
 msgid "Open"
 msgstr "Agor"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:28
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:27
 msgctxt "tocindexpage|new"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:36
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:35
 msgctxt "tocindexpage|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:50
-msgctxt "tocindexpage|liststore1"
-msgid "Table of Contents"
-msgstr "Tabl Cynnwys"
-
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:54
-msgctxt "tocindexpage|liststore1"
-msgid "Alphabetical Index"
-msgstr "Mynegai yn ôl yr Wyddor"
-
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:58
-msgctxt "tocindexpage|liststore1"
-msgid "Table of Figures"
-msgstr "Tabl Ffigyrau"
-
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:62
-msgctxt "tocindexpage|liststore1"
-msgid "Index of Tables"
-msgstr "Mynegai Tablau"
-
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:66
-msgctxt "tocindexpage|liststore1"
-msgid "User-Defined"
-msgstr "Defnyddiwr Diffiniedig"
-
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:70
-msgctxt "tocindexpage|liststore1"
-msgid "Table of Objects"
-msgstr "Tabl Gwrthrychau"
-
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:74
-msgctxt "tocindexpage|liststore1"
-msgid "Bibliography"
-msgstr "Llyfryddiaeth"
-
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:111
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:81
 msgctxt "tocindexpage|mainstyleft"
 msgid "_Title:"
 msgstr "_Teitl:"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:136
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:107
 msgctxt "tocindexpage|typeft"
 msgid "Type:"
 msgstr "Math:"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:159
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:139
 msgctxt "tocindexpage|readonly"
 msgid "Protected against manual changes"
 msgstr "Diogelwyd rhag newidiadau â llaw"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:182
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:162
 msgctxt "tocindexpage|label3"
 msgid "Type and Title"
 msgstr "Math a Theitl"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:225
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:204
 msgctxt "tocindexpage|mainstyleft2"
 msgid "For:"
 msgstr "Ar gyfer:"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:239
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:219
 msgctxt "tocindexpage|scope"
 msgid "Entire document"
 msgstr "Dogfen gyfan"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:240
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:220
 msgctxt "tocindexpage|scope"
 msgid "Chapter"
 msgstr "Pennod"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:264
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:243
 msgctxt "tocindexpage|levelft"
 msgid "Evaluate up to level:"
 msgstr "Mesur i lefel:"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:298
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:279
 msgctxt "tocindexpage|label1"
 msgid "Create Index or Table of Contents"
 msgstr "Creu Mynegai neu Dabl Cynnwys"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:339
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:320
 msgctxt "tocindexpage|fromheadings"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:355
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:336
 msgctxt "tocindexpage|indexmarks"
 msgid "Inde_x marks"
 msgstr "_Marciau mynegai"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:371
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:352
 msgctxt "tocindexpage|fromtables"
 msgid "Tables"
 msgstr "Tablau"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:386
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:367
 msgctxt "tocindexpage|fromframes"
 msgid "Te_xt frames"
 msgstr "Fframiau _Testun"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:401
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:382
 msgctxt "tocindexpage|fromgraphics"
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:416
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:397
 msgctxt "tocindexpage|fromoles"
 msgid "OLE objects"
 msgstr "UGwrthrychau OLE"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:431
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:412
 msgctxt "tocindexpage|uselevel"
 msgid "Use level from source chapter"
 msgstr "UDefnyddio lefel o'r bennod ffynhonnell"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:460
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:441
 msgctxt "tocindexpage|addstylescb"
 msgid "_Additional styles"
 msgstr "Arddulliau _Eraill"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:476
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:457
 msgctxt "tocindexpage|stylescb"
 msgid "Styl_es"
 msgstr "_Arddulliau"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:499
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:480
 msgctxt "tocindexpage|styles"
 msgid "Assign styles..."
 msgstr "Neilltuo arddulliau..."
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:545
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:526
 msgctxt "tocindexpage|captions"
 msgid "Captions"
 msgstr "Eglurynnau"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:561
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:542
 msgctxt "tocindexpage|objnames"
 msgid "Object names"
 msgstr "Enwau gwrthrych"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:586
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:566
 msgctxt "tocindexpage|categoryft"
 msgid "Category:"
 msgstr "Categori:"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:610
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:590
 msgctxt "tocindexpage|displayft"
 msgid "Display:"
 msgstr "Dangos:"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:624
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:605
 msgctxt "tocindexpage|display"
 msgid "References"
 msgstr "Cyfeiriadau"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:625
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:606
 msgctxt "tocindexpage|display"
 msgid "Category and Number"
 msgstr "Categori a Rhif"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:626
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:607
 msgctxt "tocindexpage|display"
 msgid "Caption Text"
 msgstr "Testun Egluryn"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:655
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:636
 msgctxt "tocindexpage|label2"
 msgid "Create From"
 msgstr "Creu o"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:698
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:723
 msgctxt "tocindexpage|label6"
 msgid "Create From the Following Objects"
 msgstr "Creu o'r Gwrthrychau Canlynol"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:737
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:761
 msgctxt "tocindexpage|mainstyleft9"
 msgid "_Brackets:"
 msgstr "_Bracedi:"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:748
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:773
 msgctxt "tocindexpage|numberentries"
 msgid "_Number entries"
 msgstr "_Cofnod rhif"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:768
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:793
 msgctxt "tocindexpage|brackets"
 msgid "[none]"
 msgstr "[dim]"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:769
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:794
 msgctxt "tocindexpage|brackets"
 msgid "[]"
 msgstr "[]"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:770
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:795
 msgctxt "tocindexpage|brackets"
 msgid "()"
 msgstr "()"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:771
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:796
 msgctxt "tocindexpage|brackets"
 msgid "{}"
 msgstr "{}"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:772
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:797
 msgctxt "tocindexpage|brackets"
 msgid "<>"
 msgstr "<>"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:788
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:813
 msgctxt "tocindexpage|label7"
 msgid "Formatting of the Entries"
 msgstr "Fformatio'r Cofnodion"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:830
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:855
 msgctxt "tocindexpage|combinesame"
 msgid "Combine identical entries"
 msgstr "Uno endidau yr unfath"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:845
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:870
 msgctxt "tocindexpage|useff"
 msgid "Combine identical entries with p or _pp"
 msgstr "Uno endidau yr un fath gyda p neu _pp"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:861
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:886
 msgctxt "tocindexpage|usedash"
 msgid "Combine with -"
 msgstr "Cyfuno gyda -"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:877
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:902
 msgctxt "tocindexpage|casesens"
 msgid "Case sensitive"
 msgstr "Llythyren fach neu FAWR"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:893
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:918
 msgctxt "tocindexpage|initcaps"
 msgid "AutoCapitalize entries"
 msgstr "Cofnodion AwtoBrifLythyren"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:908
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:933
 msgctxt "tocindexpage|keyasentry"
 msgid "Keys as separate entries"
 msgstr "Allweddi fel cofnod ar wahân"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:923
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:948
 msgctxt "tocindexpage|fromfile"
 msgid "_Concordance file"
 msgstr "Ffeil _concordans"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:938
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:963
 msgctxt "tocindexpage|file"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:959
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:989
 msgctxt "tocindexpage|label5"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:1002
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:1031
 msgctxt "tocindexpage|mainstyleft3"
 msgid "Language:"
 msgstr "Iaith:"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:1037
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:1066
 msgctxt "tocindexpage|mainstyleft5"
 msgid "Key type:"
 msgstr "Math o allwedd:"
 
-#: sw/uiconfig/swriter/ui/tocindexpage.ui:1070
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:1100
 msgctxt "tocindexpage|label4"
 msgid "Sort"
 msgstr "Trefnu"
author	Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>	2018-12-19 18:02:31 +0100
committer	Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>	2018-12-19 19:06:47 +0100
commit	46a65ed74391c4b44de7cc244d63bd603b6485a5 (patch)
tree	6dde2b8882980b977854f412da8f7cd0f7868060 /source/cy/sw
parent	552fa2fbab0570d8f7747620cf8744662ce43d9c (diff)