From 61991bde16235b2c9c4028466bcdc51a352e7bc5 Mon Sep 17 00:00:00 2001
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Date: Wed, 25 Apr 2018 22:51:37 +0200
Subject: update translatiosn for 6.1.0 alpha1

Change-Id: I0ed5d948cf89a4260c8771057d463448b76a4527
---
 source/cy/sw/messages.po | 7625 ++++++++++++++++++++++------------------------
 1 file changed, 3692 insertions(+), 3933 deletions(-)

(limited to 'source/cy/sw')

diff --git a/source/cy/sw/messages.po b/source/cy/sw/messages.po
index 96ea7f71b61..44f7084570e 100644
--- a/source/cy/sw/messages.po
+++ b/source/cy/sw/messages.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2018-02-19 11:42+0100\n"
-"PO-Revision-Date: 2018-01-23 20:34+0000\n"
+"POT-Creation-Date: 2018-04-25 21:51+0200\n"
+"PO-Revision-Date: 2018-04-18 08:51+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,357 +14,357 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: LibreOffice\n"
-"X-POOTLE-MTIME: 1516739657.000000\n"
+"X-POOTLE-MTIME: 1524041493.000000\n"
 
-#: app.hrc:30
+#: sw/inc/app.hrc:29
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "All Styles"
 msgstr "Pob Arddull"
 
-#: app.hrc:31
+#: sw/inc/app.hrc:30
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "Hidden Styles"
 msgstr "Arddulliau Cudd"
 
-#: app.hrc:32
+#: sw/inc/app.hrc:31
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "Applied Styles"
 msgstr "Arddulliau Gosodedig"
 
-#: app.hrc:33
+#: sw/inc/app.hrc:32
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "Custom Styles"
 msgstr "Arddulliau Cyfaddas"
 
-#: app.hrc:34
+#: sw/inc/app.hrc:33
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: app.hrc:35
+#: sw/inc/app.hrc:34
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "Text Styles"
 msgstr "Arddulliau Testun"
 
-#: app.hrc:36
+#: sw/inc/app.hrc:35
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "Chapter Styles"
 msgstr "Arddulliau Penawdau"
 
-#: app.hrc:37
+#: sw/inc/app.hrc:36
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "List Styles"
 msgstr "Arddulliau Rhestrau"
 
-#: app.hrc:38
+#: sw/inc/app.hrc:37
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "Index Styles"
 msgstr "Arddulliau Mynegeuon"
 
-#: app.hrc:39
+#: sw/inc/app.hrc:38
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "Special Styles"
 msgstr "Arddulliau Arbennig"
 
-#: app.hrc:40
+#: sw/inc/app.hrc:39
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "HTML Styles"
 msgstr "Arddulliau HTML"
 
-#: app.hrc:41
+#: sw/inc/app.hrc:40
 msgctxt "RID_PARAGRAPHSTYLEFAMILY"
 msgid "Conditional Styles"
 msgstr "Arddulliau Amodol"
 
-#: app.hrc:47
+#: sw/inc/app.hrc:46
 msgctxt "RID_CHARACTERSTYLEFAMILY"
 msgid "All Styles"
 msgstr "Pob Arddull"
 
-#: app.hrc:48
+#: sw/inc/app.hrc:47
 msgctxt "RID_CHARACTERSTYLEFAMILY"
 msgid "Hidden Styles"
 msgstr "Arddulliau Cudd"
 
-#: app.hrc:49
+#: sw/inc/app.hrc:48
 msgctxt "RID_CHARACTERSTYLEFAMILY"
 msgid "Applied Styles"
 msgstr "Arddulliau Gosodedig"
 
-#: app.hrc:50
+#: sw/inc/app.hrc:49
 msgctxt "RID_CHARACTERSTYLEFAMILY"
 msgid "Custom Styles"
 msgstr "Arddulliau Cyfaddas"
 
-#: app.hrc:56
+#: sw/inc/app.hrc:55
 msgctxt "RID_FRAMESTYLEFAMILY"
 msgid "All Styles"
 msgstr "Pob Arddull"
 
-#: app.hrc:57
+#: sw/inc/app.hrc:56
 msgctxt "RID_FRAMESTYLEFAMILY"
 msgid "Hidden Styles"
 msgstr "Arddulliau Cudd"
 
-#: app.hrc:58
+#: sw/inc/app.hrc:57
 msgctxt "RID_FRAMESTYLEFAMILY"
 msgid "Applied Styles"
 msgstr "Arddulliau Gosodedig"
 
-#: app.hrc:59
+#: sw/inc/app.hrc:58
 msgctxt "RID_FRAMESTYLEFAMILY"
 msgid "Custom Styles"
 msgstr "Arddulliau Cyfaddas"
 
-#: app.hrc:65
+#: sw/inc/app.hrc:64
 msgctxt "RID_PAGESTYLEFAMILY"
 msgid "All Styles"
 msgstr "Pob Arddull"
 
-#: app.hrc:66
+#: sw/inc/app.hrc:65
 msgctxt "RID_PAGESTYLEFAMILY"
 msgid "Hidden Styles"
 msgstr "Arddulliau Cudd"
 
-#: app.hrc:67
+#: sw/inc/app.hrc:66
 msgctxt "RID_PAGESTYLEFAMILY"
 msgid "Applied Styles"
 msgstr "Arddulliau Gosodedig"
 
-#: app.hrc:68
+#: sw/inc/app.hrc:67
 msgctxt "RID_PAGESTYLEFAMILY"
 msgid "Custom Styles"
 msgstr "Arddulliau Cyfaddas"
 
-#: app.hrc:74
+#: sw/inc/app.hrc:73
 msgctxt "RID_LISTSTYLEFAMILY"
 msgid "All Styles"
 msgstr "Pob Arddull"
 
-#: app.hrc:75
+#: sw/inc/app.hrc:74
 msgctxt "RID_LISTSTYLEFAMILY"
 msgid "Hidden Styles"
 msgstr "Arddulliau Cudd"
 
-#: app.hrc:76
+#: sw/inc/app.hrc:75
 msgctxt "RID_LISTSTYLEFAMILY"
 msgid "Applied Styles"
 msgstr "Arddulliau Gosodedig"
 
-#: app.hrc:77
+#: sw/inc/app.hrc:76
 msgctxt "RID_LISTSTYLEFAMILY"
 msgid "Custom Styles"
 msgstr "Arddulliau Cyfaddas"
 
-#: app.hrc:83
+#: sw/inc/app.hrc:82
 msgctxt "RID_TABLESTYLEFAMILY"
 msgid "All Styles"
 msgstr "Pob Arddull"
 
-#: app.hrc:84
+#: sw/inc/app.hrc:83
 msgctxt "RID_TABLESTYLEFAMILY"
 msgid "Hidden Styles"
 msgstr "Arddulliau Cudd"
 
-#: app.hrc:85
+#: sw/inc/app.hrc:84
 msgctxt "RID_TABLESTYLEFAMILY"
 msgid "Applied Styles"
 msgstr "Arddulliau Gosodedig"
 
-#: app.hrc:86
+#: sw/inc/app.hrc:85
 msgctxt "RID_TABLESTYLEFAMILY"
 msgid "Custom Styles"
 msgstr "Arddulliau Cyfaddas"
 
-#: cnttab.hrc:29
+#: sw/inc/cnttab.hrc:29
 msgctxt "RES_SRCTYPES"
 msgid "%PRODUCTNAME Math"
 msgstr "Math %PRODUCTNAME"
 
-#: cnttab.hrc:30
+#: sw/inc/cnttab.hrc:30
 msgctxt "RES_SRCTYPES"
 msgid "%PRODUCTNAME Chart"
 msgstr "Siart %PRODUCTNAME"
 
-#: cnttab.hrc:31
+#: sw/inc/cnttab.hrc:31
 msgctxt "RES_SRCTYPES"
 msgid "%PRODUCTNAME Calc"
 msgstr "%PRODUCTNAME Calc"
 
-#: cnttab.hrc:32
+#: sw/inc/cnttab.hrc:32
 msgctxt "RES_SRCTYPES"
 msgid "%PRODUCTNAME Draw/%PRODUCTNAME Impress"
 msgstr "%PRODUCTNAME Draw/%PRODUCTNAME Impress"
 
-#: cnttab.hrc:33
+#: sw/inc/cnttab.hrc:33
 msgctxt "RES_SRCTYPES"
 msgid "Other OLE Objects"
 msgstr "Gwrthrychau OLE Eraill"
 
-#: dbui.hrc:45
+#: sw/inc/dbui.hrc:45
 msgctxt "SA_ADDRESS_HEADER"
 msgid "Title"
 msgstr "Teitl"
 
-#: dbui.hrc:46
+#: sw/inc/dbui.hrc:46
 msgctxt "SA_ADDRESS_HEADER"
 msgid "First Name"
 msgstr "Enw Cyntaf"
 
-#: dbui.hrc:47
+#: sw/inc/dbui.hrc:47
 msgctxt "SA_ADDRESS_HEADER"
 msgid "Last Name"
 msgstr "Enw Olaf"
 
-#: dbui.hrc:48
+#: sw/inc/dbui.hrc:48
 msgctxt "SA_ADDRESS_HEADER"
 msgid "Company Name"
 msgstr "Enw Cwmni"
 
-#: dbui.hrc:49
+#: sw/inc/dbui.hrc:49
 msgctxt "SA_ADDRESS_HEADER"
 msgid "Address Line 1"
 msgstr "Cyfeiriad Llinell 1"
 
-#: dbui.hrc:50
+#: sw/inc/dbui.hrc:50
 msgctxt "SA_ADDRESS_HEADER"
 msgid "Address Line 2"
 msgstr "Cyfeiriad Llinell 2"
 
-#: dbui.hrc:51
+#: sw/inc/dbui.hrc:51
 msgctxt "SA_ADDRESS_HEADER"
 msgid "City"
 msgstr "Tref/Dinas"
 
-#: dbui.hrc:52
+#: sw/inc/dbui.hrc:52
 msgctxt "SA_ADDRESS_HEADER"
 msgid "State"
 msgstr "Sir/Talaith"
 
-#: dbui.hrc:53
+#: sw/inc/dbui.hrc:53
 msgctxt "SA_ADDRESS_HEADER"
 msgid "ZIP"
 msgstr "Cod Post/ZIP"
 
-#: dbui.hrc:54
+#: sw/inc/dbui.hrc:54
 msgctxt "SA_ADDRESS_HEADER"
 msgid "Country"
 msgstr "Gwlad"
 
-#: dbui.hrc:55
+#: sw/inc/dbui.hrc:55
 msgctxt "SA_ADDRESS_HEADER"
 msgid "Telephone private"
 msgstr "Ffôn preifat"
 
-#: dbui.hrc:56
+#: sw/inc/dbui.hrc:56
 msgctxt "SA_ADDRESS_HEADER"
 msgid "Telephone business"
 msgstr "Ffôn busnes"
 
-#: dbui.hrc:57
+#: sw/inc/dbui.hrc:57
 msgctxt "SA_ADDRESS_HEADER"
 msgid "E-mail Address"
 msgstr "Cyfeiriad E-bost"
 
-#: dbui.hrc:58
+#: sw/inc/dbui.hrc:58
 msgctxt "SA_ADDRESS_HEADER"
 msgid "Gender"
 msgstr "Rhyw"
 
 #. Import-Errors
-#: error.hrc:33
+#: sw/inc/error.hrc:33
 msgctxt "RID_SW_ERRHDL"
 msgid "File format error found."
 msgstr "Canfod gwall fformat ffeil."
 
-#: error.hrc:34
+#: sw/inc/error.hrc:34
 msgctxt "RID_SW_ERRHDL"
 msgid "Error reading file."
 msgstr "Gwall darllen ffeil."
 
-#: error.hrc:35
+#: sw/inc/error.hrc:35
 msgctxt "RID_SW_ERRHDL"
 msgid "This is not a valid WinWord6 file."
 msgstr "Nid ffeil Winword6 dilys yw hon."
 
-#: error.hrc:36
+#: sw/inc/error.hrc:36
 msgctxt "RID_SW_ERRHDL"
 msgid "File format error found at $(ARG1)(row,col)."
 msgstr "Gwall fformat ffeil wedi ei ganfod ar $(ARG1)(row,col)."
 
-#: error.hrc:37
+#: sw/inc/error.hrc:37
 msgctxt "RID_SW_ERRHDL"
 msgid "This is not a valid WinWord97 file."
 msgstr "Nid ffeil WinWord97 dilys yw hon."
 
-#: error.hrc:38 /home/cl/vc/git/libo-core/sw/inc/error.hrc:57
+#: sw/inc/error.hrc:38 sw/inc/error.hrc:57
 msgctxt "RID_SW_ERRHDL"
 msgid "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."
 msgstr "Cafwyd gwall fformat mewn ffeil yn is ddogfen $(ARG1) yn $(ARG2)(rhes,col)."
 
 #. Export-Errors
-#: error.hrc:40
+#: sw/inc/error.hrc:40
 msgctxt "RID_SW_ERRHDL"
 msgid "Error writing file."
 msgstr "Gwall wrth ysgrifennu ffeil."
 
-#: error.hrc:41
+#: sw/inc/error.hrc:41
 msgctxt "RID_SW_ERRHDL"
 msgid "Wrong AutoText document version."
 msgstr "Fersiwn dogfen AwtoDestun anghywir."
 
-#: error.hrc:42 /home/cl/vc/git/libo-core/sw/inc/error.hrc:56
+#: sw/inc/error.hrc:42 sw/inc/error.hrc:56
 msgctxt "RID_SW_ERRHDL"
 msgid "Error in writing sub-document $(ARG1)."
 msgstr "Gwall wrth ysgrifennu is ddogfen $(ARG1)."
 
 #. Import-/Export-Errors
-#: error.hrc:44 /home/cl/vc/git/libo-core/sw/inc/error.hrc:45
+#: sw/inc/error.hrc:44 sw/inc/error.hrc:45
 msgctxt "RID_SW_ERRHDL"
 msgid "Internal error in %PRODUCTNAME Writer file format."
 msgstr "Gwall mewnol yn fformat ffeil %PRODUCTNAME Writer."
 
-#: error.hrc:46
+#: sw/inc/error.hrc:46
 msgctxt "RID_SW_ERRHDL"
 msgid "$(ARG1) has changed."
 msgstr "Mae $(ARG1) wedi newid."
 
-#: error.hrc:47
+#: sw/inc/error.hrc:47
 msgctxt "RID_SW_ERRHDL"
 msgid "$(ARG1) does not exist."
 msgstr "Nid yw $(ARG1) yn bodoli."
 
-#: error.hrc:48
+#: sw/inc/error.hrc:48
 msgctxt "RID_SW_ERRHDL"
 msgid "Cells cannot be further split."
 msgstr "Methu hollti'r celloedd ymhellach."
 
-#: error.hrc:49
+#: sw/inc/error.hrc:49
 msgctxt "RID_SW_ERRHDL"
 msgid "Additional columns cannot be inserted."
 msgstr "Methu ychwanegu colofnau eraill."
 
-#: error.hrc:50
+#: sw/inc/error.hrc:50
 msgctxt "RID_SW_ERRHDL"
 msgid "The structure of a linked table cannot be modified."
 msgstr "Nid oes modd newid strwythur y tabl cysylltiad."
 
-#: error.hrc:52
+#: sw/inc/error.hrc:52
 msgctxt "RID_SW_ERRHDL"
 msgid "Not all attributes could be read."
 msgstr "Methu darllen yr holl briodoleddau."
 
-#: error.hrc:53
+#: sw/inc/error.hrc:53
 msgctxt "RID_SW_ERRHDL"
 msgid "Not all attributes could be recorded."
 msgstr "Methu recordio'r holl briodoleddau."
 
-#: error.hrc:54
+#: sw/inc/error.hrc:54
 msgctxt "RID_SW_ERRHDL"
 msgid "Document could not be completely saved."
 msgstr "Nid oedd modd cadw'r ddogfen yn llwyr."
 
-#: error.hrc:55
+#: sw/inc/error.hrc:55
 msgctxt "RID_SW_ERRHDL"
 msgid ""
 "This HTML document contains %PRODUCTNAME Basic macros.\n"
@@ -373,1403 +373,1413 @@ msgstr ""
 "Mae'r ddogfen HTML hon yn cynnwys macros %PRODUCTNAME Basic.\n"
 "Dydyn nhw ddim wedi cael eu cadw, oherwydd y gosodiadau allforio presennol."
 
-#: mmaddressblockpage.hrc:27
+#: sw/inc/mmaddressblockpage.hrc:27
 msgctxt "RA_SALUTATION"
 msgid "Dear"
 msgstr "Annwyl"
 
-#: mmaddressblockpage.hrc:28
+#: sw/inc/mmaddressblockpage.hrc:28
 msgctxt "RA_SALUTATION"
 msgid "Hello"
 msgstr "Helo"
 
-#: mmaddressblockpage.hrc:29
+#: sw/inc/mmaddressblockpage.hrc:29
 msgctxt "RA_SALUTATION"
 msgid "Hi"
 msgstr "Smae,"
 
-#: mmaddressblockpage.hrc:34
+#: sw/inc/mmaddressblockpage.hrc:34
 msgctxt "RA_PUNCTUATION"
 msgid ","
 msgstr ","
 
-#: mmaddressblockpage.hrc:35
+#: sw/inc/mmaddressblockpage.hrc:35
 msgctxt "RA_PUNCTUATION"
 msgid ":"
 msgstr ":"
 
-#: mmaddressblockpage.hrc:36
+#: sw/inc/mmaddressblockpage.hrc:36
 msgctxt "RA_PUNCTUATION"
 msgid "!"
 msgstr "!"
 
-#: mmaddressblockpage.hrc:37
+#: sw/inc/mmaddressblockpage.hrc:37
 msgctxt "RA_PUNCTUATION"
 msgid "(none)"
 msgstr "(none)"
 
-#: optload.hrc:27
+#: sw/inc/optload.hrc:27
 msgctxt "STR_ARR_METRIC"
 msgid "Millimeter"
 msgstr "Milimedr"
 
-#: optload.hrc:28
+#: sw/inc/optload.hrc:28
 msgctxt "STR_ARR_METRIC"
 msgid "Centimeter"
 msgstr "Centimedr"
 
-#: optload.hrc:29
+#: sw/inc/optload.hrc:29
 msgctxt "STR_ARR_METRIC"
 msgid "Meter"
 msgstr "Metr"
 
-#: optload.hrc:30
+#: sw/inc/optload.hrc:30
 msgctxt "STR_ARR_METRIC"
 msgid "Kilometer"
 msgstr "Kilometr"
 
-#: optload.hrc:31
+#: sw/inc/optload.hrc:31
 msgctxt "STR_ARR_METRIC"
 msgid "Inch"
 msgstr "Modfedd"
 
-#: optload.hrc:32
+#: sw/inc/optload.hrc:32
 msgctxt "STR_ARR_METRIC"
 msgid "Foot"
 msgstr "Troedfedd"
 
-#: optload.hrc:33
+#: sw/inc/optload.hrc:33
 msgctxt "STR_ARR_METRIC"
 msgid "Miles"
 msgstr "Milltiroedd"
 
-#: optload.hrc:34
+#: sw/inc/optload.hrc:34
 msgctxt "STR_ARR_METRIC"
 msgid "Pica"
 msgstr "Pica"
 
-#: optload.hrc:35
+#: sw/inc/optload.hrc:35
 msgctxt "STR_ARR_METRIC"
 msgid "Point"
 msgstr "Pwynt"
 
-#: optload.hrc:36
+#: sw/inc/optload.hrc:36
 msgctxt "STR_ARR_METRIC"
 msgid "Char"
 msgstr "Nod"
 
-#: optload.hrc:37
+#: sw/inc/optload.hrc:37
 msgctxt "STR_ARR_METRIC"
 msgid "Line"
 msgstr "Llinell"
 
 #. Format names
-#: strings.hrc:26
+#: sw/inc/strings.hrc:26
 msgctxt "STR_POOLCHR_FOOTNOTE"
 msgid "Footnote Characters"
 msgstr "Nodau Troednodyn"
 
-#: strings.hrc:27
+#: sw/inc/strings.hrc:27
 msgctxt "STR_POOLCHR_PAGENO"
 msgid "Page Number"
 msgstr "Rhif Tudalen"
 
-#: strings.hrc:28
+#: sw/inc/strings.hrc:28
 msgctxt "STR_POOLCHR_LABEL"
 msgid "Caption Characters"
 msgstr "Nodau Egluryn"
 
-#: strings.hrc:29
+#: sw/inc/strings.hrc:29
 msgctxt "STR_POOLCHR_DROPCAPS"
 msgid "Drop Caps"
 msgstr "Priflythrennau Bach"
 
-#: strings.hrc:30
+#: sw/inc/strings.hrc:30
 msgctxt "STR_POOLCHR_NUM_LEVEL"
 msgid "Numbering Symbols"
 msgstr "Symbolau Rhifo"
 
-#: strings.hrc:31
+#: sw/inc/strings.hrc:31
 msgctxt "STR_POOLCHR_BUL_LEVEL"
 msgid "Bullets"
 msgstr "Bwledi"
 
-#: strings.hrc:32
+#: sw/inc/strings.hrc:32
 msgctxt "STR_POOLCHR_INET_NORMAL"
 msgid "Internet Link"
 msgstr "Cysylltiad Rhyngrwyd"
 
-#: strings.hrc:33
+#: sw/inc/strings.hrc:33
 msgctxt "STR_POOLCHR_INET_VISIT"
 msgid "Visited Internet Link"
 msgstr "Cysylltiad Rhyngrwyd Ymwelwyd"
 
-#: strings.hrc:34
+#: sw/inc/strings.hrc:34
 msgctxt "STR_POOLCHR_JUMPEDIT"
 msgid "Placeholder"
 msgstr "Dalfan"
 
-#: strings.hrc:35
+#: sw/inc/strings.hrc:35
 msgctxt "STR_POOLCHR_TOXJUMP"
 msgid "Index Link"
 msgstr "Cysylltiad Mynegai"
 
-#: strings.hrc:36
+#: sw/inc/strings.hrc:36
 msgctxt "STR_POOLCHR_ENDNOTE"
 msgid "Endnote Characters"
 msgstr "Nodau Troednodyn"
 
-#: strings.hrc:37
+#: sw/inc/strings.hrc:37
 msgctxt "STR_POOLCHR_LINENUM"
 msgid "Line Numbering"
 msgstr "Rhifo Llinell"
 
-#: strings.hrc:38
+#: sw/inc/strings.hrc:38
 msgctxt "STR_POOLCHR_IDX_MAIN_ENTRY"
 msgid "Main Index Entry"
 msgstr "Prif Gofnod Mynegai"
 
-#: strings.hrc:39
+#: sw/inc/strings.hrc:39
 msgctxt "STR_POOLCHR_FOOTNOTE_ANCHOR"
 msgid "Footnote Anchor"
 msgstr "Angor Troednodyn"
 
-#: strings.hrc:40
+#: sw/inc/strings.hrc:40
 msgctxt "STR_POOLCHR_ENDNOTE_ANCHOR"
 msgid "Endnote Anchor"
 msgstr "Angor Diweddnod"
 
-#: strings.hrc:41
+#: sw/inc/strings.hrc:41
 msgctxt "STR_POOLCHR_RUBYTEXT"
 msgid "Rubies"
 msgstr "Rubies"
 
-#: strings.hrc:42
+#: sw/inc/strings.hrc:42
 msgctxt "STR_POOLCHR_VERT_NUM"
 msgid "Vertical Numbering Symbols"
 msgstr "Symbolau Rhifo Fertigol"
 
 #. Drawing templates for HTML
-#: strings.hrc:44
+#: sw/inc/strings.hrc:44
 msgctxt "STR_POOLCHR_HTML_EMPHASIS"
 msgid "Emphasis"
 msgstr "Pwyslais"
 
-#: strings.hrc:45
+#: sw/inc/strings.hrc:45
 msgctxt "STR_POOLCHR_HTML_CITIATION"
 msgid "Quotation"
 msgstr "Dyfyniad"
 
-#: strings.hrc:46
+#: sw/inc/strings.hrc:46
 msgctxt "STR_POOLCHR_HTML_STRONG"
 msgid "Strong Emphasis"
 msgstr "Pwyslais cryf"
 
-#: strings.hrc:47
+#: sw/inc/strings.hrc:47
 msgctxt "STR_POOLCHR_HTML_CODE"
 msgid "Source Text"
 msgstr "Testun Ffynhonnell"
 
-#: strings.hrc:48
+#: sw/inc/strings.hrc:48
 msgctxt "STR_POOLCHR_HTML_SAMPLE"
 msgid "Example"
 msgstr "Esiampl"
 
-#: strings.hrc:49
+#: sw/inc/strings.hrc:49
 msgctxt "STR_POOLCHR_HTML_KEYBOARD"
 msgid "User Entry"
 msgstr "Cofnod Defnyddiwr"
 
-#: strings.hrc:50
+#: sw/inc/strings.hrc:50
 msgctxt "STR_POOLCHR_HTML_VARIABLE"
 msgid "Variable"
 msgstr "Newidyn"
 
-#: strings.hrc:51
+#: sw/inc/strings.hrc:51
 msgctxt "STR_POOLCHR_HTML_DEFINSTANCE"
 msgid "Definition"
 msgstr "Diffiniad"
 
-#: strings.hrc:52
+#: sw/inc/strings.hrc:52
 msgctxt "STR_POOLCHR_HTML_TELETYPE"
 msgid "Teletype"
 msgstr "Teleteip"
 
 #. Border templates
-#: strings.hrc:54
+#: sw/inc/strings.hrc:54
 msgctxt "STR_POOLFRM_FRAME"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: strings.hrc:55
+#: sw/inc/strings.hrc:55
 msgctxt "STR_POOLFRM_GRAPHIC"
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: strings.hrc:56
+#: sw/inc/strings.hrc:56
 msgctxt "STR_POOLFRM_OLE"
 msgid "OLE"
 msgstr "OLE"
 
-#: strings.hrc:57
+#: sw/inc/strings.hrc:57
 msgctxt "STR_POOLFRM_FORMEL"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: strings.hrc:58
+#: sw/inc/strings.hrc:58
 msgctxt "STR_POOLFRM_MARGINAL"
 msgid "Marginalia"
 msgstr "Ymylnodau"
 
-#: strings.hrc:59
+#: sw/inc/strings.hrc:59
 msgctxt "STR_POOLFRM_WATERSIGN"
 msgid "Watermark"
 msgstr "Dyfrnod"
 
-#: strings.hrc:60
+#: sw/inc/strings.hrc:60
 msgctxt "STR_POOLFRM_LABEL"
 msgid "Labels"
 msgstr "Labeli"
 
 #. Template names
 #. tdf#107211 please don't change STANDARD, except back to "Default"
-#: strings.hrc:63
+#: sw/inc/strings.hrc:63
 msgctxt "STR_POOLCOLL_STANDARD"
 msgid "Default Style"
 msgstr "Arddull Ragosodedig"
 
-#: strings.hrc:64
+#: sw/inc/strings.hrc:64
 msgctxt "STR_POOLCOLL_TEXT"
 msgid "Text Body"
 msgstr "Corff Testun"
 
-#: strings.hrc:65
+#: sw/inc/strings.hrc:65
 msgctxt "STR_POOLCOLL_TEXT_IDENT"
 msgid "First Line Indent"
 msgstr "Mewnoliad y Llinell Gyntaf"
 
-#: strings.hrc:66
+#: sw/inc/strings.hrc:66
 msgctxt "STR_POOLCOLL_TEXT_NEGIDENT"
 msgid "Hanging Indent"
 msgstr "Mewnoliad Crog"
 
-#: strings.hrc:67
+#: sw/inc/strings.hrc:67
 msgctxt "STR_POOLCOLL_TEXT_MOVE"
 msgid "Text Body Indent"
 msgstr "Mewnoliad Corff Testun"
 
-#: strings.hrc:68
+#: sw/inc/strings.hrc:68
 msgctxt "STR_POOLCOLL_GREETING"
 msgid "Complimentary Close"
 msgstr "Cyfarchion wrth Gloi"
 
-#: strings.hrc:69
+#: sw/inc/strings.hrc:69
 msgctxt "STR_POOLCOLL_SIGNATURE"
 msgid "Signature"
 msgstr "Llofnod"
 
-#: strings.hrc:70
+#: sw/inc/strings.hrc:70
 msgctxt "STR_POOLCOLL_HEADLINE_BASE"
 msgid "Heading"
 msgstr "Pennawd"
 
-#: strings.hrc:71
+#: sw/inc/strings.hrc:71
 msgctxt "STR_POOLCOLL_NUMBUL_BASE"
 msgid "List"
 msgstr "Rhestr"
 
-#: strings.hrc:72
+#: sw/inc/strings.hrc:72
 msgctxt "STR_POOLCOLL_REGISTER_BASE"
 msgid "Index"
 msgstr "Mynegai"
 
-#: strings.hrc:73
+#: sw/inc/strings.hrc:73
 msgctxt "STR_POOLCOLL_CONFRONTATION"
 msgid "List Indent"
 msgstr "Mewnoliad Rhestr"
 
-#: strings.hrc:74
+#: sw/inc/strings.hrc:74
 msgctxt "STR_POOLCOLL_MARGINAL"
 msgid "Marginalia"
 msgstr "Ymylnodau"
 
-#: strings.hrc:75
+#: sw/inc/strings.hrc:75
 msgctxt "STR_POOLCOLL_HEADLINE1"
 msgid "Heading 1"
 msgstr "Pennawd 1"
 
-#: strings.hrc:76
+#: sw/inc/strings.hrc:76
 msgctxt "STR_POOLCOLL_HEADLINE2"
 msgid "Heading 2"
 msgstr "Pennawd 2"
 
-#: strings.hrc:77
+#: sw/inc/strings.hrc:77
 msgctxt "STR_POOLCOLL_HEADLINE3"
 msgid "Heading 3"
 msgstr "Pennawd 3"
 
-#: strings.hrc:78
+#: sw/inc/strings.hrc:78
 msgctxt "STR_POOLCOLL_HEADLINE4"
 msgid "Heading 4"
 msgstr "Pennawd 4"
 
-#: strings.hrc:79
+#: sw/inc/strings.hrc:79
 msgctxt "STR_POOLCOLL_HEADLINE5"
 msgid "Heading 5"
 msgstr "Pennawd 5"
 
-#: strings.hrc:80
+#: sw/inc/strings.hrc:80
 msgctxt "STR_POOLCOLL_HEADLINE6"
 msgid "Heading 6"
 msgstr "Pennawd 6"
 
-#: strings.hrc:81
+#: sw/inc/strings.hrc:81
 msgctxt "STR_POOLCOLL_HEADLINE7"
 msgid "Heading 7"
 msgstr "Pennawd 7"
 
-#: strings.hrc:82
+#: sw/inc/strings.hrc:82
 msgctxt "STR_POOLCOLL_HEADLINE8"
 msgid "Heading 8"
 msgstr "Pennawd 8"
 
-#: strings.hrc:83
+#: sw/inc/strings.hrc:83
 msgctxt "STR_POOLCOLL_HEADLINE9"
 msgid "Heading 9"
 msgstr "Pennawd 9"
 
-#: strings.hrc:84
+#: sw/inc/strings.hrc:84
 msgctxt "STR_POOLCOLL_HEADLINE10"
 msgid "Heading 10"
 msgstr "Pennawd 10"
 
-#: strings.hrc:85
+#: sw/inc/strings.hrc:85
 msgctxt "STR_POOLCOLL_NUM_LEVEL1S"
 msgid "Numbering 1 Start"
 msgstr "Cychwyn Rhifo 1"
 
-#: strings.hrc:86
+#: sw/inc/strings.hrc:86
 msgctxt "STR_POOLCOLL_NUM_LEVEL1"
 msgid "Numbering 1"
 msgstr "Rhifo 1"
 
-#: strings.hrc:87
+#: sw/inc/strings.hrc:87
 msgctxt "STR_POOLCOLL_NUM_LEVEL1E"
 msgid "Numbering 1 End"
 msgstr "Rhifo Diwedd 1"
 
-#: strings.hrc:88
+#: sw/inc/strings.hrc:88
 msgctxt "STR_POOLCOLL_NUM_NONUM1"
 msgid "Numbering 1 Cont."
 msgstr "Parhau Rhifo 1."
 
-#: strings.hrc:89
+#: sw/inc/strings.hrc:89
 msgctxt "STR_POOLCOLL_NUM_LEVEL2S"
 msgid "Numbering 2 Start"
 msgstr "Cychwyn Rhifo 2"
 
-#: strings.hrc:90
+#: sw/inc/strings.hrc:90
 msgctxt "STR_POOLCOLL_NUM_LEVEL2"
 msgid "Numbering 2"
 msgstr "Rhifo 2"
 
-#: strings.hrc:91
+#: sw/inc/strings.hrc:91
 msgctxt "STR_POOLCOLL_NUM_LEVEL2E"
 msgid "Numbering 2 End"
 msgstr "Rhifo Diwedd 2"
 
-#: strings.hrc:92
+#: sw/inc/strings.hrc:92
 msgctxt "STR_POOLCOLL_NUM_NONUM2"
 msgid "Numbering 2 Cont."
 msgstr "Parhau Rhifo 2."
 
-#: strings.hrc:93
+#: sw/inc/strings.hrc:93
 msgctxt "STR_POOLCOLL_NUM_LEVEL3S"
 msgid "Numbering 3 Start"
 msgstr "Cychwyn Rhifo 3"
 
-#: strings.hrc:94
+#: sw/inc/strings.hrc:94
 msgctxt "STR_POOLCOLL_NUM_LEVEL3"
 msgid "Numbering 3"
 msgstr "Rhifo 3"
 
-#: strings.hrc:95
+#: sw/inc/strings.hrc:95
 msgctxt "STR_POOLCOLL_NUM_LEVEL3E"
 msgid "Numbering 3 End"
 msgstr "Rhifo Diwedd 3"
 
-#: strings.hrc:96
+#: sw/inc/strings.hrc:96
 msgctxt "STR_POOLCOLL_NUM_NONUM3"
 msgid "Numbering 3 Cont."
 msgstr "Parhau Rhifo 3."
 
-#: strings.hrc:97
+#: sw/inc/strings.hrc:97
 msgctxt "STR_POOLCOLL_NUM_LEVEL4S"
 msgid "Numbering 4 Start"
 msgstr "Cychwyn Rhifo 4"
 
-#: strings.hrc:98
+#: sw/inc/strings.hrc:98
 msgctxt "STR_POOLCOLL_NUM_LEVEL4"
 msgid "Numbering 4"
 msgstr "Rhifo 4"
 
-#: strings.hrc:99
+#: sw/inc/strings.hrc:99
 msgctxt "STR_POOLCOLL_NUM_LEVEL4E"
 msgid "Numbering 4 End"
 msgstr "Rhifo Diwedd 4"
 
-#: strings.hrc:100
+#: sw/inc/strings.hrc:100
 msgctxt "STR_POOLCOLL_NUM_NONUM4"
 msgid "Numbering 4 Cont."
 msgstr "Parhau Rhifo 4."
 
-#: strings.hrc:101
+#: sw/inc/strings.hrc:101
 msgctxt "STR_POOLCOLL_NUM_LEVEL5S"
 msgid "Numbering 5 Start"
 msgstr "Cychwyn Rhifo 5"
 
-#: strings.hrc:102
+#: sw/inc/strings.hrc:102
 msgctxt "STR_POOLCOLL_NUM_LEVEL5"
 msgid "Numbering 5"
 msgstr "Rhifo 5"
 
-#: strings.hrc:103
+#: sw/inc/strings.hrc:103
 msgctxt "STR_POOLCOLL_NUM_LEVEL5E"
 msgid "Numbering 5 End"
 msgstr "Rhifo Diwedd 5"
 
-#: strings.hrc:104
+#: sw/inc/strings.hrc:104
 msgctxt "STR_POOLCOLL_NUM_NONUM5"
 msgid "Numbering 5 Cont."
 msgstr "Parhau Rhifo 5"
 
-#: strings.hrc:105
+#: sw/inc/strings.hrc:105
 msgctxt "STR_POOLCOLL_BUL_LEVEL1S"
 msgid "List 1 Start"
 msgstr "Rhestr Cychwyn 1"
 
-#: strings.hrc:106
+#: sw/inc/strings.hrc:106
 msgctxt "STR_POOLCOLL_BUL_LEVEL1"
 msgid "List 1"
 msgstr "Rhestr 1"
 
-#: strings.hrc:107
+#: sw/inc/strings.hrc:107
 msgctxt "STR_POOLCOLL_BUL_LEVEL1E"
 msgid "List 1 End"
 msgstr "Diwedd Rhestr 1"
 
-#: strings.hrc:108
+#: sw/inc/strings.hrc:108
 msgctxt "STR_POOLCOLL_BUL_NONUM1"
 msgid "List 1 Cont."
 msgstr "Parhau Rhestr 1"
 
-#: strings.hrc:109
+#: sw/inc/strings.hrc:109
 msgctxt "STR_POOLCOLL_BUL_LEVEL2S"
 msgid "List 2 Start"
 msgstr "Cychwyn Rhestr 2"
 
-#: strings.hrc:110
+#: sw/inc/strings.hrc:110
 msgctxt "STR_POOLCOLL_BUL_LEVEL2"
 msgid "List 2"
 msgstr "Rhestr 2"
 
-#: strings.hrc:111
+#: sw/inc/strings.hrc:111
 msgctxt "STR_POOLCOLL_BUL_LEVEL2E"
 msgid "List 2 End"
 msgstr "Diwedd Rhestr 2"
 
-#: strings.hrc:112
+#: sw/inc/strings.hrc:112
 msgctxt "STR_POOLCOLL_BUL_NONUM2"
 msgid "List 2 Cont."
 msgstr "Parhau Rhestr 2"
 
-#: strings.hrc:113
+#: sw/inc/strings.hrc:113
 msgctxt "STR_POOLCOLL_BUL_LEVEL3S"
 msgid "List 3 Start"
 msgstr "Cychwyn Rhestr 3"
 
-#: strings.hrc:114
+#: sw/inc/strings.hrc:114
 msgctxt "STR_POOLCOLL_BUL_LEVEL3"
 msgid "List 3"
 msgstr "Rhestr 3"
 
-#: strings.hrc:115
+#: sw/inc/strings.hrc:115
 msgctxt "STR_POOLCOLL_BUL_LEVEL3E"
 msgid "List 3 End"
 msgstr "Diwedd Rhestr 3"
 
-#: strings.hrc:116
+#: sw/inc/strings.hrc:116
 msgctxt "STR_POOLCOLL_BUL_NONUM3"
 msgid "List 3 Cont."
 msgstr "Parhau Rhestr 3"
 
-#: strings.hrc:117
+#: sw/inc/strings.hrc:117
 msgctxt "STR_POOLCOLL_BUL_LEVEL4S"
 msgid "List 4 Start"
 msgstr "Cychwyn Rhestr 4"
 
-#: strings.hrc:118
+#: sw/inc/strings.hrc:118
 msgctxt "STR_POOLCOLL_BUL_LEVEL4"
 msgid "List 4"
 msgstr "Rhestr 4"
 
-#: strings.hrc:119
+#: sw/inc/strings.hrc:119
 msgctxt "STR_POOLCOLL_BUL_LEVEL4E"
 msgid "List 4 End"
 msgstr "Diwedd Rhestr 4"
 
-#: strings.hrc:120
+#: sw/inc/strings.hrc:120
 msgctxt "STR_POOLCOLL_BUL_NONUM4"
 msgid "List 4 Cont."
 msgstr "Parhau Rhestr 4"
 
-#: strings.hrc:121
+#: sw/inc/strings.hrc:121
 msgctxt "STR_POOLCOLL_BUL_LEVEL5S"
 msgid "List 5 Start"
 msgstr "Cychwyn Rhestr 5"
 
-#: strings.hrc:122
+#: sw/inc/strings.hrc:122
 msgctxt "STR_POOLCOLL_BUL_LEVEL5"
 msgid "List 5"
 msgstr "Rhestr 5"
 
-#: strings.hrc:123
+#: sw/inc/strings.hrc:123
 msgctxt "STR_POOLCOLL_BUL_LEVEL5E"
 msgid "List 5 End"
 msgstr "Diwedd Rhestr 5"
 
-#: strings.hrc:124
+#: sw/inc/strings.hrc:124
 msgctxt "STR_POOLCOLL_BUL_NONUM5"
 msgid "List 5 Cont."
 msgstr "Parhau Rhestr 5"
 
-#: strings.hrc:125
+#: sw/inc/strings.hrc:125
 msgctxt "STR_POOLCOLL_HEADER"
 msgid "Header"
 msgstr "Pennyn"
 
-#: strings.hrc:126
+#: sw/inc/strings.hrc:126
 msgctxt "STR_POOLCOLL_HEADERL"
 msgid "Header Left"
 msgstr "Pennyn i'r Chwith"
 
-#: strings.hrc:127
+#: sw/inc/strings.hrc:127
 msgctxt "STR_POOLCOLL_HEADERR"
 msgid "Header Right"
 msgstr "Pennyn i'r Dde"
 
-#: strings.hrc:128
+#: sw/inc/strings.hrc:128
 msgctxt "STR_POOLCOLL_FOOTER"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: strings.hrc:129
+#: sw/inc/strings.hrc:129
 msgctxt "STR_POOLCOLL_FOOTERL"
 msgid "Footer Left"
 msgstr "Troedyn i'r Chwith"
 
-#: strings.hrc:130
+#: sw/inc/strings.hrc:130
 msgctxt "STR_POOLCOLL_FOOTERR"
 msgid "Footer Right"
 msgstr "Troedyn i'r Dde"
 
-#: strings.hrc:131
+#: sw/inc/strings.hrc:131
 msgctxt "STR_POOLCOLL_TABLE"
 msgid "Table Contents"
 msgstr "Cynnwys Tabl"
 
-#: strings.hrc:132
+#: sw/inc/strings.hrc:132
 msgctxt "STR_POOLCOLL_TABLE_HDLN"
 msgid "Table Heading"
 msgstr "Pennawd Tabl"
 
-#: strings.hrc:133
+#: sw/inc/strings.hrc:133
 msgctxt "STR_POOLCOLL_FRAME"
 msgid "Frame Contents"
 msgstr "Cynnwys Ffrâm"
 
-#: strings.hrc:134
+#: sw/inc/strings.hrc:134
 msgctxt "STR_POOLCOLL_FOOTNOTE"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: strings.hrc:135
+#: sw/inc/strings.hrc:135
 msgctxt "STR_POOLCOLL_ENDNOTE"
 msgid "Endnote"
 msgstr "Diweddnod"
 
-#: strings.hrc:136
+#: sw/inc/strings.hrc:136
 msgctxt "STR_POOLCOLL_LABEL"
 msgid "Caption"
 msgstr "Egluryn"
 
-#: strings.hrc:137
+#: sw/inc/strings.hrc:137
 msgctxt "STR_POOLCOLL_LABEL_ABB"
 msgid "Illustration"
 msgstr "Darlun"
 
-#: strings.hrc:138
+#: sw/inc/strings.hrc:138
 msgctxt "STR_POOLCOLL_LABEL_TABLE"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:139
+#: sw/inc/strings.hrc:139
 msgctxt "STR_POOLCOLL_LABEL_FRAME"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:140
+#: sw/inc/strings.hrc:140
 msgctxt "STR_POOLCOLL_LABEL_DRAWING"
 msgid "Drawing"
 msgstr "Lluniadu"
 
-#: strings.hrc:141
+#: sw/inc/strings.hrc:141
+msgctxt "STR_POOLCOLL_LABEL_FIGURE"
+msgid "Figure"
+msgstr "Ffigwr"
+
+#: sw/inc/strings.hrc:142
 msgctxt "STR_POOLCOLL_JAKETADRESS"
 msgid "Addressee"
 msgstr "Cyfeiriad"
 
-#: strings.hrc:142
+#: sw/inc/strings.hrc:143
 msgctxt "STR_POOLCOLL_SENDADRESS"
 msgid "Sender"
 msgstr "Anfonwr"
 
-#: strings.hrc:143
+#: sw/inc/strings.hrc:144
 msgctxt "STR_POOLCOLL_TOX_IDXH"
 msgid "Index Heading"
 msgstr "Mynegai Pennawd"
 
-#: strings.hrc:144
+#: sw/inc/strings.hrc:145
 msgctxt "STR_POOLCOLL_TOX_IDX1"
 msgid "Index 1"
 msgstr "Mynegai 1"
 
-#: strings.hrc:145
+#: sw/inc/strings.hrc:146
 msgctxt "STR_POOLCOLL_TOX_IDX2"
 msgid "Index 2"
 msgstr "Mynegai 2"
 
-#: strings.hrc:146
+#: sw/inc/strings.hrc:147
 msgctxt "STR_POOLCOLL_TOX_IDX3"
 msgid "Index 3"
 msgstr "Mynegai 3"
 
-#: strings.hrc:147
+#: sw/inc/strings.hrc:148
 msgctxt "STR_POOLCOLL_TOX_IDXBREAK"
 msgid "Index Separator"
 msgstr "Ymwahanydd Mynegai"
 
-#: strings.hrc:148
+#: sw/inc/strings.hrc:149
 msgctxt "STR_POOLCOLL_TOX_CNTNTH"
 msgid "Contents Heading"
 msgstr "Pennawd Cynnwys"
 
-#: strings.hrc:149
+#: sw/inc/strings.hrc:150
 msgctxt "STR_POOLCOLL_TOX_CNTNT1"
 msgid "Contents 1"
 msgstr "Cynnwys 1"
 
-#: strings.hrc:150
+#: sw/inc/strings.hrc:151
 msgctxt "STR_POOLCOLL_TOX_CNTNT2"
 msgid "Contents 2"
 msgstr "Cynnwys 2"
 
-#: strings.hrc:151
+#: sw/inc/strings.hrc:152
 msgctxt "STR_POOLCOLL_TOX_CNTNT3"
 msgid "Contents 3"
 msgstr "Cynnwys 3"
 
-#: strings.hrc:152
+#: sw/inc/strings.hrc:153
 msgctxt "STR_POOLCOLL_TOX_CNTNT4"
 msgid "Contents 4"
 msgstr "Cynnwys 4"
 
-#: strings.hrc:153
+#: sw/inc/strings.hrc:154
 msgctxt "STR_POOLCOLL_TOX_CNTNT5"
 msgid "Contents 5"
 msgstr "Cynnwys 5"
 
-#: strings.hrc:154
+#: sw/inc/strings.hrc:155
 msgctxt "STR_POOLCOLL_TOX_CNTNT6"
 msgid "Contents 6"
 msgstr "Cynnwys 6"
 
-#: strings.hrc:155
+#: sw/inc/strings.hrc:156
 msgctxt "STR_POOLCOLL_TOX_CNTNT7"
 msgid "Contents 7"
 msgstr "Cynnwys 7"
 
-#: strings.hrc:156
+#: sw/inc/strings.hrc:157
 msgctxt "STR_POOLCOLL_TOX_CNTNT8"
 msgid "Contents 8"
 msgstr "Cynnwys 8"
 
-#: strings.hrc:157
+#: sw/inc/strings.hrc:158
 msgctxt "STR_POOLCOLL_TOX_CNTNT9"
 msgid "Contents 9"
 msgstr "Cynnwys 9"
 
-#: strings.hrc:158
+#: sw/inc/strings.hrc:159
 msgctxt "STR_POOLCOLL_TOX_CNTNT10"
 msgid "Contents 10"
 msgstr "Cynnwys 10"
 
-#: strings.hrc:159
+#: sw/inc/strings.hrc:160
 msgctxt "STR_POOLCOLL_TOX_USERH"
 msgid "User Index Heading"
 msgstr "Pennawd Mynegai Defnyddiwr"
 
-#: strings.hrc:160
+#: sw/inc/strings.hrc:161
 msgctxt "STR_POOLCOLL_TOX_USER1"
 msgid "User Index 1"
 msgstr "Mynegai Defnyddiwr 1"
 
-#: strings.hrc:161
+#: sw/inc/strings.hrc:162
 msgctxt "STR_POOLCOLL_TOX_USER2"
 msgid "User Index 2"
 msgstr "Mynegai Defnyddiwr 2"
 
-#: strings.hrc:162
+#: sw/inc/strings.hrc:163
 msgctxt "STR_POOLCOLL_TOX_USER3"
 msgid "User Index 3"
 msgstr "Mynegai Defnyddiwr 3"
 
-#: strings.hrc:163
+#: sw/inc/strings.hrc:164
 msgctxt "STR_POOLCOLL_TOX_USER4"
 msgid "User Index 4"
 msgstr "Mynegai Defnyddiwr 4"
 
-#: strings.hrc:164
+#: sw/inc/strings.hrc:165
 msgctxt "STR_POOLCOLL_TOX_USER5"
 msgid "User Index 5"
 msgstr "Mynegai Defnyddiwr 5"
 
-#: strings.hrc:165
+#: sw/inc/strings.hrc:166
 msgctxt "STR_POOLCOLL_TOX_USER6"
 msgid "User Index 6"
 msgstr "Mynegai Defnyddiwr 6"
 
-#: strings.hrc:166
+#: sw/inc/strings.hrc:167
 msgctxt "STR_POOLCOLL_TOX_USER7"
 msgid "User Index 7"
 msgstr "Mynegai Defnyddiwr 7"
 
-#: strings.hrc:167
+#: sw/inc/strings.hrc:168
 msgctxt "STR_POOLCOLL_TOX_USER8"
 msgid "User Index 8"
 msgstr "Mynegai Defnyddiwr 8"
 
-#: strings.hrc:168
+#: sw/inc/strings.hrc:169
 msgctxt "STR_POOLCOLL_TOX_USER9"
 msgid "User Index 9"
 msgstr "Mynegai Defnyddiwr 9"
 
-#: strings.hrc:169
+#: sw/inc/strings.hrc:170
 msgctxt "STR_POOLCOLL_TOX_USER10"
 msgid "User Index 10"
 msgstr "Mynegai Defnyddiwr 10"
 
-#: strings.hrc:170
+#: sw/inc/strings.hrc:171
 msgctxt "STR_POOLCOLL_TOX_CITATION"
 msgid "Citation"
 msgstr "Dyfyniad"
 
-#: strings.hrc:171
+#: sw/inc/strings.hrc:172
 msgctxt "STR_POOLCOLL_TOX_ILLUSH"
 msgid "Illustration Index Heading"
 msgstr "Pennawd Mynegai Darluniau"
 
-#: strings.hrc:172
+#: sw/inc/strings.hrc:173
 msgctxt "STR_POOLCOLL_TOX_ILLUS1"
 msgid "Illustration Index 1"
 msgstr "Mynegai Darluniau 1"
 
-#: strings.hrc:173
+#: sw/inc/strings.hrc:174
 msgctxt "STR_POOLCOLL_TOX_OBJECTH"
 msgid "Object Index Heading"
 msgstr "Pennawd Mynegai Gwrthrych"
 
-#: strings.hrc:174
+#: sw/inc/strings.hrc:175
 msgctxt "STR_POOLCOLL_TOX_OBJECT1"
 msgid "Object Index 1"
 msgstr "Mynegai Gwrthrych 1"
 
-#: strings.hrc:175
+#: sw/inc/strings.hrc:176
 msgctxt "STR_POOLCOLL_TOX_TABLESH"
 msgid "Table Index Heading"
 msgstr "Pennawd Mynegai Tabl"
 
-#: strings.hrc:176
+#: sw/inc/strings.hrc:177
 msgctxt "STR_POOLCOLL_TOX_TABLES1"
 msgid "Table Index 1"
 msgstr "Mynegai Tabl 1"
 
-#: strings.hrc:177
+#: sw/inc/strings.hrc:178
 msgctxt "STR_POOLCOLL_TOX_AUTHORITIESH"
 msgid "Bibliography Heading"
 msgstr "Pennawd Llyfryddiaeth"
 
-#: strings.hrc:178
+#: sw/inc/strings.hrc:179
 msgctxt "STR_POOLCOLL_TOX_AUTHORITIES1"
 msgid "Bibliography 1"
 msgstr "Llyfryddiaeth 1"
 
 #. Document title style, not to be confused with Heading style
-#: strings.hrc:180
+#: sw/inc/strings.hrc:181
 msgctxt "STR_POOLCOLL_DOC_TITEL"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:181
+#: sw/inc/strings.hrc:182
 msgctxt "STR_POOLCOLL_DOC_SUBTITEL"
 msgid "Subtitle"
 msgstr "Is deitl"
 
-#: strings.hrc:182
+#: sw/inc/strings.hrc:183
 msgctxt "STR_POOLCOLL_HTML_BLOCKQUOTE"
 msgid "Quotations"
 msgstr "Dyfyniadau"
 
-#: strings.hrc:183
+#: sw/inc/strings.hrc:184
 msgctxt "STR_POOLCOLL_HTML_PRE"
 msgid "Preformatted Text"
 msgstr "Testun Rhagffomatiwyd"
 
-#: strings.hrc:184
+#: sw/inc/strings.hrc:185
 msgctxt "STR_POOLCOLL_HTML_HR"
 msgid "Horizontal Line"
 msgstr "Llinell Lorweddol"
 
-#: strings.hrc:185
+#: sw/inc/strings.hrc:186
 msgctxt "STR_POOLCOLL_HTML_DD"
 msgid "List Contents"
 msgstr "Rhestr Cynnwys"
 
-#: strings.hrc:186
+#: sw/inc/strings.hrc:187
 msgctxt "STR_POOLCOLL_HTML_DT"
 msgid "List Heading"
 msgstr "Rhestr Pennawd"
 
 #. page style names
-#: strings.hrc:188
+#: sw/inc/strings.hrc:189
 msgctxt "STR_POOLPAGE_STANDARD"
 msgid "Default Style"
 msgstr "Arddull Ragosodedig"
 
-#: strings.hrc:189
+#: sw/inc/strings.hrc:190
 msgctxt "STR_POOLPAGE_FIRST"
 msgid "First Page"
 msgstr "Tudalen Gyntaf"
 
-#: strings.hrc:190
+#: sw/inc/strings.hrc:191
 msgctxt "STR_POOLPAGE_LEFT"
 msgid "Left Page"
 msgstr "Tudalen Chwith"
 
-#: strings.hrc:191
+#: sw/inc/strings.hrc:192
 msgctxt "STR_POOLPAGE_RIGHT"
 msgid "Right Page"
 msgstr "Tudalen Dde"
 
-#: strings.hrc:192
+#: sw/inc/strings.hrc:193
 msgctxt "STR_POOLPAGE_JAKET"
 msgid "Envelope"
 msgstr "Amlen"
 
-#: strings.hrc:193
+#: sw/inc/strings.hrc:194
 msgctxt "STR_POOLPAGE_REGISTER"
 msgid "Index"
 msgstr "Mynegai"
 
-#: strings.hrc:194
+#: sw/inc/strings.hrc:195
 msgctxt "STR_POOLPAGE_HTML"
 msgid "HTML"
 msgstr "HTML"
 
-#: strings.hrc:195
+#: sw/inc/strings.hrc:196
 msgctxt "STR_POOLPAGE_FOOTNOTE"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: strings.hrc:196
+#: sw/inc/strings.hrc:197
 msgctxt "STR_POOLPAGE_ENDNOTE"
 msgid "Endnote"
 msgstr "Diweddnod"
 
-#: strings.hrc:197
+#: sw/inc/strings.hrc:198
 msgctxt "STR_POOLPAGE_LANDSCAPE"
 msgid "Landscape"
 msgstr "Tirlun"
 
 #. Numbering rules
-#: strings.hrc:199
+#: sw/inc/strings.hrc:200
 msgctxt "STR_POOLNUMRULE_NUM1"
 msgid "Numbering 123"
 msgstr "Rhifo 123"
 
-#: strings.hrc:200
+#: sw/inc/strings.hrc:201
 msgctxt "STR_POOLNUMRULE_NUM2"
 msgid "Numbering ABC"
 msgstr "Rhifo ABC"
 
-#: strings.hrc:201
+#: sw/inc/strings.hrc:202
 msgctxt "STR_POOLNUMRULE_NUM3"
 msgid "Numbering abc"
 msgstr "Rhifo abc"
 
-#: strings.hrc:202
+#: sw/inc/strings.hrc:203
 msgctxt "STR_POOLNUMRULE_NUM4"
 msgid "Numbering IVX"
 msgstr "Rhifo IVX"
 
-#: strings.hrc:203
+#: sw/inc/strings.hrc:204
 msgctxt "STR_POOLNUMRULE_NUM5"
 msgid "Numbering ivx"
 msgstr "Rhifo ivx"
 
-#: strings.hrc:204
+#: sw/inc/strings.hrc:205
 msgctxt "STR_POOLNUMRULE_BUL1"
 msgid "List 1"
 msgstr "Rhestr 1"
 
-#: strings.hrc:205
+#: sw/inc/strings.hrc:206
 msgctxt "STR_POOLNUMRULE_BUL2"
 msgid "List 2"
 msgstr "Rhestr 2"
 
-#: strings.hrc:206
+#: sw/inc/strings.hrc:207
 msgctxt "STR_POOLNUMRULE_BUL3"
 msgid "List 3"
 msgstr "Rhestr 3"
 
-#: strings.hrc:207
+#: sw/inc/strings.hrc:208
 msgctxt "STR_POOLNUMRULE_BUL4"
 msgid "List 4"
 msgstr "Rhestr 4"
 
-#: strings.hrc:208
+#: sw/inc/strings.hrc:209
 msgctxt "STR_POOLNUMRULE_BUL5"
 msgid "List 5"
 msgstr "Rhestr 5"
 
-#: strings.hrc:209
+#: sw/inc/strings.hrc:210
 msgctxt "STR_COLUMN_VALUESET_ITEM0"
 msgid "1 column"
 msgstr "1 colofn"
 
-#: strings.hrc:210
+#: sw/inc/strings.hrc:211
 msgctxt "STR_COLUMN_VALUESET_ITEM1"
 msgid "2 columns with equal size"
 msgstr "2 golofn maint cydradd"
 
-#: strings.hrc:211
+#: sw/inc/strings.hrc:212
 msgctxt "STR_COLUMN_VALUESET_ITEM2"
 msgid "3 columns with equal size"
 msgstr "3 colofn maint cydradd"
 
-#: strings.hrc:212
+#: sw/inc/strings.hrc:213
 msgctxt "STR_COLUMN_VALUESET_ITEM3"
 msgid "2 columns with different size (left > right)"
 msgstr "2 golofn maint gwahanol (chwith > de)"
 
-#: strings.hrc:213
+#: sw/inc/strings.hrc:214
 msgctxt "STR_COLUMN_VALUESET_ITEM4"
 msgid "2 columns with different size (left < right)"
 msgstr "2 golofn maint gwahanol (chwith < de)"
 
 #. Table styles, Writer internal, others are taken from Svx
-#: strings.hrc:215
+#: sw/inc/strings.hrc:216
 msgctxt "STR_TABSTYLE_DEFAULT"
 msgid "Default Style"
 msgstr "Arddull Ragosodedig"
 
-#: strings.hrc:217
+#: sw/inc/strings.hrc:218
 msgctxt "STR_PARAGRAPHSTYLEFAMILY"
 msgid "Paragraph Styles"
 msgstr "Arddulliau Paragraff"
 
-#: strings.hrc:218
+#: sw/inc/strings.hrc:219
 msgctxt "STR_CHARACTERSTYLEFAMILY"
 msgid "Character Styles"
 msgstr "Arddulliau Nod"
 
-#: strings.hrc:219
+#: sw/inc/strings.hrc:220
 msgctxt "STR_FRAMESTYLEFAMILY"
 msgid "Frame Styles"
 msgstr "Arddull Ffrâm"
 
-#: strings.hrc:220
+#: sw/inc/strings.hrc:221
 msgctxt "STR_PAGESTYLEFAMILY"
 msgid "Page Styles"
 msgstr "Arddull Tudalen"
 
-#: strings.hrc:221
+#: sw/inc/strings.hrc:222
 msgctxt "STR_LISTSTYLEFAMILY"
 msgid "List Styles"
 msgstr "Arddull Rhestr"
 
-#: strings.hrc:222
+#: sw/inc/strings.hrc:223
 msgctxt "STR_TABLESTYLEFAMILY"
 msgid "Table Styles"
 msgstr "Arddulliau Tabl"
 
-#: strings.hrc:223
+#: sw/inc/strings.hrc:224
 msgctxt "STR_ENV_TITLE"
 msgid "Envelope"
 msgstr "Amlen"
 
-#: strings.hrc:224
+#: sw/inc/strings.hrc:225
 msgctxt "STR_LAB_TITLE"
 msgid "Labels"
 msgstr "Labeli"
 
 #. ShortName!!!
-#: strings.hrc:226
+#: sw/inc/strings.hrc:227
 msgctxt "STR_HUMAN_SWDOC_NAME"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:227
+#: sw/inc/strings.hrc:228
 msgctxt "STR_WRITER_DOCUMENT_FULLTYPE"
 msgid "%PRODUCTNAME %PRODUCTVERSION Text Document"
 msgstr "Dogfen Testun %PRODUCTNAME %PRODUCTVERSION"
 
-#: strings.hrc:228
+#: sw/inc/strings.hrc:229
 msgctxt "STR_CANTOPEN"
 msgid "Cannot open document."
 msgstr "Methu agor dogfen."
 
-#: strings.hrc:229
+#: sw/inc/strings.hrc:230
 msgctxt "STR_CANTCREATE"
 msgid "Can't create document."
 msgstr "Methu creu dogfen."
 
-#: strings.hrc:230
+#: sw/inc/strings.hrc:231
 msgctxt "STR_DLLNOTFOUND"
 msgid "Filter not found."
 msgstr "Heb ganfod hidl."
 
-#: strings.hrc:231
+#: sw/inc/strings.hrc:232
 msgctxt "STR_LOAD_GLOBAL_DOC"
 msgid "Name and Path of Master Document"
 msgstr "Enw a Llwybr y Prif Ddogfen"
 
-#: strings.hrc:232
+#: sw/inc/strings.hrc:233
 msgctxt "STR_LOAD_HTML_DOC"
 msgid "Name and Path of the HTML Document"
 msgstr "Enw a Llwybr y Ddogfen HTML"
 
-#: strings.hrc:233
+#: sw/inc/strings.hrc:234
 msgctxt "STR_JAVA_EDIT"
 msgid "Edit Script"
 msgstr "Golygu Sgript"
 
-#: strings.hrc:234
+#: sw/inc/strings.hrc:235
 msgctxt "STR_REMOVE_WARNING"
 msgid "The following characters are not valid and have been removed: "
 msgstr "Nid yw'r nodau canlynol yn ddilys ac maent wedi eu tynnu: "
 
-#: strings.hrc:235
+#: sw/inc/strings.hrc:236
 msgctxt "STR_BOOKMARK_DEF_NAME"
 msgid "Bookmark"
 msgstr "Nod Tudalen"
 
-#: strings.hrc:236
+#: sw/inc/strings.hrc:237
 msgctxt "STR_BOOKMARK_NAME"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:237
+#: sw/inc/strings.hrc:238
 msgctxt "STR_BOOKMARK_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:238
+#: sw/inc/strings.hrc:239
 msgctxt "SW_STR_NONE"
 msgid "[None]"
 msgstr "[None]"
 
-#: strings.hrc:239
+#: sw/inc/strings.hrc:240
 msgctxt "STR_CAPTION_BEGINNING"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: strings.hrc:240
+#: sw/inc/strings.hrc:241
 msgctxt "STR_CAPTION_END"
 msgid "End"
 msgstr "Diwedd"
 
-#: strings.hrc:241
+#: sw/inc/strings.hrc:242
 msgctxt "STR_CAPTION_ABOVE"
 msgid "Above"
 msgstr "Uwchlaw"
 
-#: strings.hrc:242
+#: sw/inc/strings.hrc:243
 msgctxt "STR_CAPTION_BELOW"
 msgid "Below"
 msgstr "Islaw"
 
-#: strings.hrc:243
+#: sw/inc/strings.hrc:244
 msgctxt "SW_STR_READONLY"
 msgid "read-only"
 msgstr "darllen yn unig"
 
-#: strings.hrc:244
+#: sw/inc/strings.hrc:245
 msgctxt "STR_READONLY_PATH"
 msgid "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?"
 msgstr "Mae'r cyfeiriadau 'AwtoDestun' yn darllen yn unig? Hoffech chi alw'r deialog gosodiadau llwybr?"
 
-#: strings.hrc:245
+#: sw/inc/strings.hrc:246
 msgctxt "STR_DOC_STAT"
 msgid "Statistics"
 msgstr "Ystadegau"
 
 #. Statusbar-titles
-#: strings.hrc:247
+#: sw/inc/strings.hrc:248
 msgctxt "STR_STATSTR_W4WREAD"
 msgid "Importing document..."
 msgstr "Mewnforio dogfen..."
 
-#: strings.hrc:248
+#: sw/inc/strings.hrc:249
 msgctxt "STR_STATSTR_W4WWRITE"
 msgid "Exporting document..."
 msgstr "Allforio dogfen..."
 
-#: strings.hrc:249
+#: sw/inc/strings.hrc:250
 msgctxt "STR_STATSTR_SWGWRITE"
 msgid "Saving document..."
 msgstr "Cadw dogfen..."
 
-#: strings.hrc:250
+#: sw/inc/strings.hrc:251
 msgctxt "STR_STATSTR_REFORMAT"
 msgid "Repagination..."
 msgstr "Aildudaleniad..."
 
-#: strings.hrc:251
+#: sw/inc/strings.hrc:252
 msgctxt "STR_STATSTR_AUTOFORMAT"
 msgid "Formatting document automatically..."
 msgstr "Fformatio dogfen yn awtomatig..."
 
-#: strings.hrc:252
+#: sw/inc/strings.hrc:253
 msgctxt "STR_STATSTR_SEARCH"
 msgid "Search..."
 msgstr "Chwilio..."
 
-#: strings.hrc:253
+#: sw/inc/strings.hrc:254
 msgctxt "STR_STATSTR_LETTER"
 msgid "Letter"
 msgstr "Llythyr"
 
-#: strings.hrc:254
+#: sw/inc/strings.hrc:255
 msgctxt "STR_STATSTR_SPELL"
 msgid "Spellcheck..."
 msgstr "Gwirio Sillafu..."
 
-#: strings.hrc:255
+#: sw/inc/strings.hrc:256
 msgctxt "STR_STATSTR_HYPHEN"
 msgid "Hyphenation..."
 msgstr "Cysylltnodi..."
 
-#: strings.hrc:256
+#: sw/inc/strings.hrc:257
 msgctxt "STR_STATSTR_TOX_INSERT"
 msgid "Inserting Index..."
 msgstr "Mewnosod Mynegai..."
 
-#: strings.hrc:257
+#: sw/inc/strings.hrc:258
 msgctxt "STR_STATSTR_TOX_UPDATE"
 msgid "Updating Index..."
 msgstr "Diweddaru Mynegai..."
 
-#: strings.hrc:258
+#: sw/inc/strings.hrc:259
 msgctxt "STR_STATSTR_SUMMARY"
 msgid "Creating abstract..."
 msgstr "Creu crynodeb..."
 
-#: strings.hrc:259
+#: sw/inc/strings.hrc:260
 msgctxt "STR_STATSTR_SWGPRTOLENOTIFY"
 msgid "Adapt Objects..."
 msgstr "Addasu Gwrthrychau..."
 
-#: strings.hrc:260
+#: sw/inc/strings.hrc:261
 msgctxt "STR_TABLE_DEFNAME"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:261
+#: sw/inc/strings.hrc:262
 msgctxt "STR_GRAPHIC_DEFNAME"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:262
+#: sw/inc/strings.hrc:263
 msgctxt "STR_OBJECT_DEFNAME"
 msgid "Object"
 msgstr "Gwrthrych"
 
-#: strings.hrc:263
+#: sw/inc/strings.hrc:264
 msgctxt "STR_FRAME_DEFNAME"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: strings.hrc:264
+#: sw/inc/strings.hrc:265
 msgctxt "STR_SHAPE_DEFNAME"
 msgid "Shape"
 msgstr "Siâp"
 
-#: strings.hrc:265
+#: sw/inc/strings.hrc:266
 msgctxt "STR_REGION_DEFNAME"
 msgid "Section"
 msgstr "Adran"
 
-#: strings.hrc:266
+#: sw/inc/strings.hrc:267
 msgctxt "STR_NUMRULE_DEFNAME"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: strings.hrc:267
+#: sw/inc/strings.hrc:268
 msgctxt "STR_EMPTYPAGE"
 msgid "blank page"
 msgstr "tudalen wag"
 
-#: strings.hrc:268
+#: sw/inc/strings.hrc:269
 msgctxt "STR_ABSTRACT_TITLE"
 msgid "Abstract: "
 msgstr "Crynodeb: "
 
-#: strings.hrc:269
+#: sw/inc/strings.hrc:270
 msgctxt "STR_FDLG_TEMPLATE_NAME"
 msgid "separated by: "
 msgstr "ymwahannwyd gan: "
 
-#: strings.hrc:270
+#: sw/inc/strings.hrc:271
 msgctxt "STR_FDLG_OUTLINE_LEVEL"
 msgid "Outline: Level "
 msgstr "Amlinell: Lefel "
 
-#: strings.hrc:271
+#: sw/inc/strings.hrc:272
 msgctxt "STR_FDLG_STYLE"
 msgid "Style: "
 msgstr "Arddull: "
 
-#: strings.hrc:272
+#: sw/inc/strings.hrc:273
 msgctxt "STR_PAGEOFFSET"
 msgid "Page number: "
 msgstr "Rhif tudalen: "
 
-#: strings.hrc:273
+#: sw/inc/strings.hrc:274
 msgctxt "STR_PAGEBREAK"
 msgid "Break before new page"
 msgstr "Toriad cyn tudalen newydd"
 
-#: strings.hrc:274
+#: sw/inc/strings.hrc:275
 msgctxt "STR_WESTERN_FONT"
 msgid "Western text: "
 msgstr "Testun Gorllewinol: "
 
-#: strings.hrc:275
+#: sw/inc/strings.hrc:276
 msgctxt "STR_CJK_FONT"
 msgid "Asian text: "
 msgstr "Testun Asiaidd: "
 
-#: strings.hrc:276
+#: sw/inc/strings.hrc:277
+msgctxt "STR_CTL_FONT"
+msgid "CTL text: "
+msgstr "Testun CTL:"
+
+#: sw/inc/strings.hrc:278
 msgctxt "STR_REDLINE_UNKNOWN_AUTHOR"
 msgid "Unknown Author"
 msgstr "Awdur Anhysbys"
 
-#: strings.hrc:277
+#: sw/inc/strings.hrc:279
 msgctxt "STR_DELETE_NOTE_AUTHOR"
 msgid "Delete ~All Comments by $1"
 msgstr "Dileu ~Pob Sylw gan $1"
 
-#: strings.hrc:278
+#: sw/inc/strings.hrc:280
 msgctxt "STR_HIDE_NOTE_AUTHOR"
 msgid "H~ide All Comments by $1"
 msgstr "Cuddio Pob ~Sylw gan $1"
 
-#: strings.hrc:279
+#: sw/inc/strings.hrc:281
 msgctxt "STR_OUTLINE_NUMBERING"
 msgid "Outline Numbering"
 msgstr "Rhifo Amlinell"
 
-#: strings.hrc:280
+#: sw/inc/strings.hrc:282
 msgctxt "STR_STATUSBAR_WORDCOUNT_NO_SELECTION"
 msgid "%1 words, %2 characters"
 msgstr "%1 gair, %2 nod"
 
-#: strings.hrc:281
+#: sw/inc/strings.hrc:283
 msgctxt "STR_STATUSBAR_WORDCOUNT"
 msgid "%1 words, %2 characters selected"
 msgstr "%1 gair, %2 nod wedi eu dewis"
 
-#: strings.hrc:282
+#: sw/inc/strings.hrc:284
 msgctxt "STR_CONVERT_TEXT_TABLE"
 msgid "Convert Text to Table"
 msgstr "Trosi Testun i Dabl"
 
-#: strings.hrc:283
+#: sw/inc/strings.hrc:285
 msgctxt "STR_ADD_AUTOFORMAT_TITLE"
 msgid "Add AutoFormat"
 msgstr "Ychwanegu AwtoFformat"
 
-#: strings.hrc:284
+#: sw/inc/strings.hrc:286
 msgctxt "STR_ADD_AUTOFORMAT_LABEL"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:285
+#: sw/inc/strings.hrc:287
 msgctxt "STR_DEL_AUTOFORMAT_TITLE"
 msgid "Delete AutoFormat"
 msgstr "Dileu AwtoFformat"
 
-#: strings.hrc:286
+#: sw/inc/strings.hrc:288
 msgctxt "STR_DEL_AUTOFORMAT_MSG"
 msgid "The following AutoFormat entry will be deleted:"
 msgstr "Bydd y cofnod AwtoFformat yn cael ei ddileu:"
 
-#: strings.hrc:287
+#: sw/inc/strings.hrc:289
 msgctxt "STR_RENAME_AUTOFORMAT_TITLE"
 msgid "Rename AutoFormat"
 msgstr "Ailenwi AwtoFformat"
 
-#: strings.hrc:288
+#: sw/inc/strings.hrc:290
 msgctxt "STR_BTN_AUTOFORMAT_CLOSE"
 msgid "~Close"
 msgstr "~Cau"
 
-#: strings.hrc:289
+#: sw/inc/strings.hrc:291
 msgctxt "STR_JAN"
 msgid "Jan"
 msgstr "Ion"
 
-#: strings.hrc:290
+#: sw/inc/strings.hrc:292
 msgctxt "STR_FEB"
 msgid "Feb"
 msgstr "Chw"
 
-#: strings.hrc:291
+#: sw/inc/strings.hrc:293
 msgctxt "STR_MAR"
 msgid "Mar"
 msgstr "Maw"
 
-#: strings.hrc:292
+#: sw/inc/strings.hrc:294
 msgctxt "STR_NORTH"
 msgid "North"
 msgstr "Gogledd"
 
-#: strings.hrc:293
+#: sw/inc/strings.hrc:295
 msgctxt "STR_MID"
 msgid "Mid"
 msgstr "Canol"
 
-#: strings.hrc:294
+#: sw/inc/strings.hrc:296
 msgctxt "STR_SOUTH"
 msgid "South"
 msgstr "De"
 
-#: strings.hrc:295
+#: sw/inc/strings.hrc:297
 msgctxt "STR_SUM"
 msgid "Sum"
 msgstr "Swm"
 
-#: strings.hrc:296
+#: sw/inc/strings.hrc:298
 msgctxt "STR_INVALID_AUTOFORMAT_NAME"
 msgid ""
 "You have entered an invalid name.\n"
@@ -1780,313 +1790,313 @@ msgstr ""
 "Nid oedd modd creu'r AwtoFformat. \n"
 "Ceisiwch eto gan ddefnyddio enw arall."
 
-#: strings.hrc:297
+#: sw/inc/strings.hrc:299
 msgctxt "STR_NUMERIC"
 msgid "Numeric"
 msgstr "Rhifol"
 
-#: strings.hrc:298
+#: sw/inc/strings.hrc:300
 msgctxt "STR_ROW"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: strings.hrc:299
+#: sw/inc/strings.hrc:301
 msgctxt "STR_COL"
 msgid "Column"
 msgstr "Colofn"
 
-#: strings.hrc:300
+#: sw/inc/strings.hrc:302
 msgctxt "STR_AUTHMRK_EDIT"
 msgid "Edit Bibliography Entry"
 msgstr "Golygu Cofnod Llyfryddiaeth"
 
-#: strings.hrc:301
+#: sw/inc/strings.hrc:303
 msgctxt "STR_AUTHMRK_INSERT"
 msgid "Insert Bibliography Entry"
 msgstr "Mewnosod Cofnod Llyfryddiaeth"
 
-#: strings.hrc:302
+#: sw/inc/strings.hrc:304
 msgctxt "STR_ACCESS_PAGESETUP_SPACING"
 msgid "Spacing between %1 and %2"
 msgstr "Bylchu rhwng %1 a %2"
 
-#: strings.hrc:303
+#: sw/inc/strings.hrc:305
 msgctxt "STR_ACCESS_COLUMN_WIDTH"
 msgid "Column %1 Width"
 msgstr "Lled Colofn %1"
 
-#: strings.hrc:304
+#: sw/inc/strings.hrc:306
 msgctxt "STR_CAPTION_TABLE"
 msgid "%PRODUCTNAME Writer Table"
 msgstr "Tabl %PRODUCTNAME Writer"
 
-#: strings.hrc:305
+#: sw/inc/strings.hrc:307
 msgctxt "STR_CAPTION_FRAME"
 msgid "%PRODUCTNAME Writer Frame"
 msgstr "Ffrâm %PRODUCTNAME Writer"
 
-#: strings.hrc:306
+#: sw/inc/strings.hrc:308
 msgctxt "STR_CAPTION_GRAPHIC"
 msgid "%PRODUCTNAME Writer Image"
 msgstr "Delwedd %PRODUCTNAME Writer"
 
-#: strings.hrc:307
+#: sw/inc/strings.hrc:309
 msgctxt "STR_CAPTION_OLE"
 msgid "Other OLE Objects"
 msgstr "Gwrthrychau OLE Eraill"
 
-#: strings.hrc:308
+#: sw/inc/strings.hrc:310
 msgctxt "STR_WRONG_TABLENAME"
 msgid "The name of the table must not contain spaces."
 msgstr "Rhaid i enw'r tabl beidio â chynnwys bylchau."
 
-#: strings.hrc:309
+#: sw/inc/strings.hrc:311
 msgctxt "STR_ERR_TABLE_MERGE"
 msgid "Selected table cells are too complex to merge."
 msgstr "Mae'r celloedd tabl dewiswyd yn rhy gymhleth i'w cyfuno."
 
-#: strings.hrc:310
+#: sw/inc/strings.hrc:312
 msgctxt "STR_SRTERR"
 msgid "Cannot sort selection"
 msgstr "Methu didoli'r dewis"
 
 #. Miscellaneous
-#: strings.hrc:313
+#: sw/inc/strings.hrc:315
 msgctxt "STR_EVENT_OBJECT_SELECT"
 msgid "Click object"
 msgstr "Clicio gwrthrychau"
 
-#: strings.hrc:314
+#: sw/inc/strings.hrc:316
 msgctxt "STR_EVENT_START_INS_GLOSSARY"
 msgid "Before inserting AutoText"
 msgstr "Cyn mewnosod AwtoDestun"
 
-#: strings.hrc:315
+#: sw/inc/strings.hrc:317
 msgctxt "STR_EVENT_END_INS_GLOSSARY"
 msgid "After inserting AutoText"
 msgstr "Wedi mewnforio AwtoDestun"
 
-#: strings.hrc:316
+#: sw/inc/strings.hrc:318
 msgctxt "STR_EVENT_MOUSEOVER_OBJECT"
 msgid "Mouse over object"
 msgstr "Llygoden dros wrthrych"
 
-#: strings.hrc:317
+#: sw/inc/strings.hrc:319
 msgctxt "STR_EVENT_MOUSECLICK_OBJECT"
 msgid "Trigger hyperlink"
 msgstr "Cychwyn dolen"
 
-#: strings.hrc:318
+#: sw/inc/strings.hrc:320
 msgctxt "STR_EVENT_MOUSEOUT_OBJECT"
 msgid "Mouse leaves object"
 msgstr "Llygoden yn gadael gwrthrych"
 
-#: strings.hrc:319
+#: sw/inc/strings.hrc:321
 msgctxt "STR_EVENT_IMAGE_LOAD"
 msgid "Image loaded successfully"
 msgstr "Llwythwyd delwedd yn llwyddiannus"
 
-#: strings.hrc:320
+#: sw/inc/strings.hrc:322
 msgctxt "STR_EVENT_IMAGE_ABORT"
 msgid "Image loading terminated"
 msgstr "Ataliwyd llwytho delwedd"
 
-#: strings.hrc:321
+#: sw/inc/strings.hrc:323
 msgctxt "STR_EVENT_IMAGE_ERROR"
 msgid "Could not load image"
 msgstr "Methu llwytho delwedd"
 
-#: strings.hrc:322
+#: sw/inc/strings.hrc:324
 msgctxt "STR_EVENT_FRM_KEYINPUT_A"
 msgid "Input of alphanumeric characters"
 msgstr "Mewnbwn nodau alffaniwmerig"
 
-#: strings.hrc:323
+#: sw/inc/strings.hrc:325
 msgctxt "STR_EVENT_FRM_KEYINPUT_NOA"
 msgid "Input of non-alphanumeric characters"
 msgstr "Mewnbwn nodau analffaniwmerig"
 
-#: strings.hrc:324
+#: sw/inc/strings.hrc:326
 msgctxt "STR_EVENT_FRM_RESIZE"
 msgid "Resize frame"
 msgstr "Newid maint ffrâm"
 
-#: strings.hrc:325
+#: sw/inc/strings.hrc:327
 msgctxt "STR_EVENT_FRM_MOVE"
 msgid "Move frame"
 msgstr "Symud ffrâm"
 
-#: strings.hrc:326
+#: sw/inc/strings.hrc:328
 msgctxt "STR_CONTENT_TYPE_OUTLINE"
 msgid "Headings"
 msgstr "Penawdau"
 
-#: strings.hrc:327
+#: sw/inc/strings.hrc:329
 msgctxt "STR_CONTENT_TYPE_TABLE"
 msgid "Tables"
 msgstr "Tablau"
 
-#: strings.hrc:328
+#: sw/inc/strings.hrc:330
 msgctxt "STR_CONTENT_TYPE_FRAME"
 msgid "Text frames"
 msgstr "Ffrâm testun"
 
-#: strings.hrc:329
+#: sw/inc/strings.hrc:331
 msgctxt "STR_CONTENT_TYPE_GRAPHIC"
 msgid "Images"
 msgstr "Delweddau"
 
-#: strings.hrc:330
+#: sw/inc/strings.hrc:332
 msgctxt "STR_CONTENT_TYPE_OLE"
 msgid "OLE objects"
 msgstr "Gwrthrychau OLE"
 
-#: strings.hrc:331
+#: sw/inc/strings.hrc:333
 msgctxt "STR_CONTENT_TYPE_BOOKMARK"
 msgid "Bookmarks"
 msgstr "Nodau Tudalen"
 
-#: strings.hrc:332
+#: sw/inc/strings.hrc:334
 msgctxt "STR_CONTENT_TYPE_REGION"
 msgid "Sections"
 msgstr "Adrannau"
 
-#: strings.hrc:333
+#: sw/inc/strings.hrc:335
 msgctxt "STR_CONTENT_TYPE_URLFIELD"
 msgid "Hyperlinks"
 msgstr "Dolenni"
 
-#: strings.hrc:334
+#: sw/inc/strings.hrc:336
 msgctxt "STR_CONTENT_TYPE_REFERENCE"
 msgid "References"
 msgstr "Cyfeirnodau"
 
-#: strings.hrc:335
+#: sw/inc/strings.hrc:337
 msgctxt "STR_CONTENT_TYPE_INDEX"
 msgid "Indexes"
 msgstr "Mynegeion"
 
-#: strings.hrc:336
+#: sw/inc/strings.hrc:338
 msgctxt "STR_CONTENT_TYPE_DRAWOBJECT"
 msgid "Drawing objects"
 msgstr "Gwrthrychau lluniadu"
 
-#: strings.hrc:337
+#: sw/inc/strings.hrc:339
 msgctxt "STR_CONTENT_TYPE_POSTIT"
 msgid "Comments"
 msgstr "Sylwadau"
 
-#: strings.hrc:338
+#: sw/inc/strings.hrc:340
 msgctxt "STR_IDXEXAMPLE_IDXTXT_HEADING1"
 msgid "Heading 1"
 msgstr "Pennawd 1"
 
-#: strings.hrc:339
+#: sw/inc/strings.hrc:341
 msgctxt "STR_IDXEXAMPLE_IDXTXT_ENTRY1"
 msgid "This is the content from the first chapter. This is a user directory entry."
 msgstr "Dyma gynnwys y pennawd cyntaf. Cofnod cyfeiriadur defnyddiwr."
 
-#: strings.hrc:340
+#: sw/inc/strings.hrc:342
 msgctxt "STR_IDXEXAMPLE_IDXTXT_HEADING11"
 msgid "Heading 1.1"
 msgstr "Pennawd 1.1"
 
-#: strings.hrc:341
+#: sw/inc/strings.hrc:343
 msgctxt "STR_IDXEXAMPLE_IDXTXT_ENTRY11"
 msgid "This is the content from chapter 1.1. This is the entry for the table of contents."
 msgstr "Dyma gynnwys pennawd 1.1. Cofnod y tabl cynnwys."
 
-#: strings.hrc:342
+#: sw/inc/strings.hrc:344
 msgctxt "STR_IDXEXAMPLE_IDXTXT_HEADING12"
 msgid "Heading 1.2"
 msgstr "Pennawd 1.2"
 
-#: strings.hrc:343
+#: sw/inc/strings.hrc:345
 msgctxt "STR_IDXEXAMPLE_IDXTXT_ENTRY12"
 msgid "This is the content from chapter 1.2. This keyword is a main entry."
 msgstr "Dyma gynnwys pennawd 1.2. Yr allweddair yma yw'r prif gofnod."
 
-#: strings.hrc:344
+#: sw/inc/strings.hrc:346
 msgctxt "STR_IDXEXAMPLE_IDXTXT_TABLE1"
 msgid "Table 1: This is table 1"
 msgstr "Tabl 1: Dyma dabl 1"
 
-#: strings.hrc:345
+#: sw/inc/strings.hrc:347
 msgctxt "STR_IDXEXAMPLE_IDXTXT_IMAGE1"
 msgid "Image 1: This is image 1"
 msgstr "Delwedd 1: Dyma ddelwedd 1"
 
-#: strings.hrc:346
+#: sw/inc/strings.hrc:348
 msgctxt "STR_CONTENT_TYPE_SINGLE_OUTLINE"
 msgid "Heading"
 msgstr "Pennawd"
 
-#: strings.hrc:347
+#: sw/inc/strings.hrc:349
 msgctxt "STR_CONTENT_TYPE_SINGLE_TABLE"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:348
+#: sw/inc/strings.hrc:350
 msgctxt "STR_CONTENT_TYPE_SINGLE_FRAME"
 msgid "Text frame"
 msgstr "Ffrâm testun"
 
-#: strings.hrc:349
+#: sw/inc/strings.hrc:351
 msgctxt "STR_CONTENT_TYPE_SINGLE_GRAPHIC"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:350
+#: sw/inc/strings.hrc:352
 msgctxt "STR_CONTENT_TYPE_SINGLE_OLE"
 msgid "OLE object"
 msgstr "Gwrthrych OLE"
 
-#: strings.hrc:351
+#: sw/inc/strings.hrc:353
 msgctxt "STR_CONTENT_TYPE_SINGLE_BOOKMARK"
 msgid "Bookmark"
 msgstr "Nod Tudalen"
 
-#: strings.hrc:352
+#: sw/inc/strings.hrc:354
 msgctxt "STR_CONTENT_TYPE_SINGLE_REGION"
 msgid "Section"
 msgstr "Adran"
 
-#: strings.hrc:353
+#: sw/inc/strings.hrc:355
 msgctxt "STR_CONTENT_TYPE_SINGLE_URLFIELD"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: strings.hrc:354
+#: sw/inc/strings.hrc:356
 msgctxt "STR_CONTENT_TYPE_SINGLE_REFERENCE"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: strings.hrc:355
+#: sw/inc/strings.hrc:357
 msgctxt "STR_CONTENT_TYPE_SINGLE_INDEX"
 msgid "Index"
 msgstr "Mynegai"
 
-#: strings.hrc:356
+#: sw/inc/strings.hrc:358
 msgctxt "STR_CONTENT_TYPE_SINGLE_POSTIT"
 msgid "Comment"
 msgstr "Nodyn"
 
-#: strings.hrc:357
+#: sw/inc/strings.hrc:359
 msgctxt "STR_CONTENT_TYPE_SINGLE_DRAWOBJECT"
 msgid "Draw object"
 msgstr "Gwrthrych lluniadu"
 
-#: strings.hrc:358
+#: sw/inc/strings.hrc:360
 msgctxt "STR_DEFINE_NUMBERFORMAT"
 msgid "Additional formats..."
 msgstr "Fformatau eraill..."
 
-#: strings.hrc:359
+#: sw/inc/strings.hrc:361
 msgctxt "RID_STR_SYSTEM"
 msgid "[System]"
 msgstr "[System]"
 
-#: strings.hrc:360
+#: sw/inc/strings.hrc:362
 msgctxt "STR_MULT_INTERACT_HYPH_WARN"
 msgid ""
 "The interactive hyphenation is already active\n"
@@ -2095,2122 +2105,2122 @@ msgstr ""
 "Mae'r cyplysnodi rhyngweithiol eisoes yn\n"
 "weithredol mewn dogfen arall"
 
-#: strings.hrc:361
+#: sw/inc/strings.hrc:363
 msgctxt "STR_HYPH_TITLE"
 msgid "Hyphenation"
 msgstr "Cysylltnodi"
 
-#: strings.hrc:364
+#: sw/inc/strings.hrc:366
 msgctxt "STR_CANT_UNDO"
 msgid "not possible"
 msgstr "nid yw'n bosib"
 
-#: strings.hrc:365
+#: sw/inc/strings.hrc:367
 msgctxt "STR_DELETE_UNDO"
 msgid "Delete $1"
 msgstr "Dileu $1"
 
-#: strings.hrc:366
+#: sw/inc/strings.hrc:368
 msgctxt "STR_INSERT_UNDO"
 msgid "Insert $1"
 msgstr "Mewnosod $1"
 
-#: strings.hrc:367
+#: sw/inc/strings.hrc:369
 msgctxt "STR_OVR_UNDO"
 msgid "Overwrite: $1"
 msgstr "Trosysgrifo: $1"
 
-#: strings.hrc:368
+#: sw/inc/strings.hrc:370
 msgctxt "STR_SPLITNODE_UNDO"
 msgid "New Paragraph"
 msgstr "Paragraff Newydd"
 
-#: strings.hrc:369
+#: sw/inc/strings.hrc:371
 msgctxt "STR_MOVE_UNDO"
 msgid "Move"
 msgstr "Symud"
 
-#: strings.hrc:370
+#: sw/inc/strings.hrc:372
 msgctxt "STR_INSATTR_UNDO"
 msgid "Apply attributes"
 msgstr "Gosod priodoleddau"
 
-#: strings.hrc:371
+#: sw/inc/strings.hrc:373
 msgctxt "STR_SETFMTCOLL_UNDO"
 msgid "Apply Styles: $1"
 msgstr "Gosod Arddulliau: $1"
 
-#: strings.hrc:372
+#: sw/inc/strings.hrc:374
 msgctxt "STR_RESET_ATTR_UNDO"
 msgid "Reset attributes"
 msgstr "Ailosod priodoleddau"
 
-#: strings.hrc:373
+#: sw/inc/strings.hrc:375
 msgctxt "STR_INSFMT_ATTR_UNDO"
 msgid "Change style: $1"
 msgstr "Newid arddull: $1"
 
-#: strings.hrc:374
+#: sw/inc/strings.hrc:376
 msgctxt "STR_INSERT_DOC_UNDO"
 msgid "Insert file"
 msgstr "Mewnosod ffeil"
 
-#: strings.hrc:375
+#: sw/inc/strings.hrc:377
 msgctxt "STR_INSERT_GLOSSARY"
 msgid "Insert AutoText"
 msgstr "Mewnosod AwtoDestun"
 
-#: strings.hrc:376
+#: sw/inc/strings.hrc:378
 msgctxt "STR_DELBOOKMARK"
 msgid "Delete bookmark: $1"
 msgstr "Dileu nod tudalen: $1"
 
-#: strings.hrc:377
+#: sw/inc/strings.hrc:379
 msgctxt "STR_INSBOOKMARK"
 msgid "Insert bookmark: $1"
 msgstr "Mewnosod nod tudalen: $1"
 
-#: strings.hrc:378
+#: sw/inc/strings.hrc:380
 msgctxt "STR_SORT_TBL"
 msgid "Sort table"
 msgstr "Trefnu tabl"
 
-#: strings.hrc:379
+#: sw/inc/strings.hrc:381
 msgctxt "STR_SORT_TXT"
 msgid "Sort text"
 msgstr "Trefnu testun"
 
-#: strings.hrc:380
+#: sw/inc/strings.hrc:382
 msgctxt "STR_INSTABLE_UNDO"
 msgid "Insert table: $1$2$3"
 msgstr "Mewnosod table: $1$2$3"
 
-#: strings.hrc:381
+#: sw/inc/strings.hrc:383
 msgctxt "STR_TEXTTOTABLE_UNDO"
 msgid "Convert text -> table"
 msgstr "Trosi testun -> tabl"
 
-#: strings.hrc:382
+#: sw/inc/strings.hrc:384
 msgctxt "STR_TABLETOTEXT_UNDO"
 msgid "Convert table -> text"
 msgstr "Trosi testun -> testun"
 
-#: strings.hrc:383
+#: sw/inc/strings.hrc:385
 msgctxt "STR_COPY_UNDO"
 msgid "Copy: $1"
 msgstr "Copïo: $1"
 
-#: strings.hrc:384
+#: sw/inc/strings.hrc:386
 msgctxt "STR_REPLACE_UNDO"
 msgid "Replace $1 $2 $3"
 msgstr "Newid $1 $2 $3"
 
-#: strings.hrc:385
+#: sw/inc/strings.hrc:387
 msgctxt "STR_INSERT_PAGE_BREAK_UNDO"
 msgid "Insert page break"
 msgstr "Mewnosod toriad tudalen"
 
-#: strings.hrc:386
+#: sw/inc/strings.hrc:388
 msgctxt "STR_INSERT_COLUMN_BREAK_UNDO"
 msgid "Insert column break"
 msgstr "Mewnosod toriad colofn"
 
-#: strings.hrc:387
+#: sw/inc/strings.hrc:389
 msgctxt "STR_INSERT_ENV_UNDO"
 msgid "Insert Envelope"
 msgstr "Mewnosod Amlen"
 
-#: strings.hrc:388
+#: sw/inc/strings.hrc:390
 msgctxt "STR_DRAG_AND_COPY"
 msgid "Copy: $1"
 msgstr "Copïo: $1"
 
-#: strings.hrc:389
+#: sw/inc/strings.hrc:391
 msgctxt "STR_DRAG_AND_MOVE"
 msgid "Move: $1"
 msgstr "Symud $1"
 
-#: strings.hrc:390
+#: sw/inc/strings.hrc:392
 msgctxt "STR_INSERT_CHART"
 msgid "Insert %PRODUCTNAME Chart"
 msgstr "Mewnosod Siart %PRODUCTNAME"
 
-#: strings.hrc:391
+#: sw/inc/strings.hrc:393
 msgctxt "STR_INSERTFLY"
 msgid "Insert frame"
 msgstr "Mewnosod ffrâm"
 
-#: strings.hrc:392
+#: sw/inc/strings.hrc:394
 msgctxt "STR_DELETEFLY"
 msgid "Delete frame"
 msgstr "Dileu ffrâm"
 
-#: strings.hrc:393
+#: sw/inc/strings.hrc:395
 msgctxt "STR_AUTOFORMAT"
 msgid "AutoFormat"
 msgstr "AwtoFformat"
 
-#: strings.hrc:394
+#: sw/inc/strings.hrc:396
 msgctxt "STR_TABLEHEADLINE"
 msgid "Table heading"
 msgstr "Pennawd tabl"
 
-#: strings.hrc:395
+#: sw/inc/strings.hrc:397
 msgctxt "STR_REPLACE"
 msgid "Replace: $1 $2 $3"
 msgstr "Newid: $1 $2 $3"
 
-#: strings.hrc:396
+#: sw/inc/strings.hrc:398
 msgctxt "STR_INSERTSECTION"
 msgid "Insert section"
 msgstr "Mewnosod adran"
 
-#: strings.hrc:397
+#: sw/inc/strings.hrc:399
 msgctxt "STR_DELETESECTION"
 msgid "Delete section"
 msgstr "Dileu adran"
 
-#: strings.hrc:398
+#: sw/inc/strings.hrc:400
 msgctxt "STR_CHANGESECTION"
 msgid "Modify section"
 msgstr "Newid adran"
 
-#: strings.hrc:399
+#: sw/inc/strings.hrc:401
 msgctxt "STR_CHANGEDEFATTR"
 msgid "Modify default values"
 msgstr "Newid gwerthoedd rhagosodedig"
 
-#: strings.hrc:400
+#: sw/inc/strings.hrc:402
 msgctxt "STR_REPLACE_STYLE"
 msgid "Replace style: $1 $2 $3"
 msgstr "Newid $1 $2 $3"
 
-#: strings.hrc:401
+#: sw/inc/strings.hrc:403
 msgctxt "STR_DELETE_PAGE_BREAK"
 msgid "Delete page break"
 msgstr "Dileu toriad tudalen"
 
-#: strings.hrc:402
+#: sw/inc/strings.hrc:404
 msgctxt "STR_TEXT_CORRECTION"
 msgid "Text Correction"
 msgstr "Cywiro Testun"
 
-#: strings.hrc:403
+#: sw/inc/strings.hrc:405
 msgctxt "STR_OUTLINE_LR"
 msgid "Promote/demote outline"
 msgstr "Dyrchafu/gostwng amlinell"
 
-#: strings.hrc:404
+#: sw/inc/strings.hrc:406
 msgctxt "STR_OUTLINE_UD"
 msgid "Move outline"
 msgstr "Symud amlinell"
 
-#: strings.hrc:405
+#: sw/inc/strings.hrc:407
 msgctxt "STR_INSNUM"
 msgid "Insert numbering"
 msgstr "Mewnosod rhifo"
 
-#: strings.hrc:406
+#: sw/inc/strings.hrc:408
 msgctxt "STR_NUMUP"
 msgid "Promote level"
 msgstr "Dyrchafu lefel"
 
-#: strings.hrc:407
+#: sw/inc/strings.hrc:409
 msgctxt "STR_NUMDOWN"
 msgid "Demote level"
 msgstr "Gostwng lefel"
 
-#: strings.hrc:408
+#: sw/inc/strings.hrc:410
 msgctxt "STR_MOVENUM"
 msgid "Move paragraphs"
 msgstr "Symud paragraffau"
 
-#: strings.hrc:409
+#: sw/inc/strings.hrc:411
 msgctxt "STR_INSERTDRAW"
 msgid "Insert drawing object: $1"
 msgstr "Mewnosod gwrthrych lluniadu: $1"
 
-#: strings.hrc:410
+#: sw/inc/strings.hrc:412
 msgctxt "STR_NUMORNONUM"
 msgid "Number On/Off"
 msgstr "Rhif Ymlaen/Diffodd"
 
-#: strings.hrc:411
+#: sw/inc/strings.hrc:413
 msgctxt "STR_INC_LEFTMARGIN"
 msgid "Increase Indent"
 msgstr "Cynyddu Mewnoliad"
 
-#: strings.hrc:412
+#: sw/inc/strings.hrc:414
 msgctxt "STR_DEC_LEFTMARGIN"
 msgid "Decrease indent"
 msgstr "Cynyddu'r mewnoliad"
 
-#: strings.hrc:413
+#: sw/inc/strings.hrc:415
 msgctxt "STR_INSERTLABEL"
 msgid "Insert caption: $1"
 msgstr "Mewnosod egluryn: $1"
 
-#: strings.hrc:414
+#: sw/inc/strings.hrc:416
 msgctxt "STR_SETNUMRULESTART"
 msgid "Restart numbering"
 msgstr "Ail gychwyn rhifo"
 
-#: strings.hrc:415
+#: sw/inc/strings.hrc:417
 msgctxt "STR_CHANGEFTN"
 msgid "Modify footnote"
 msgstr "Newid troednodyn"
 
-#: strings.hrc:416
+#: sw/inc/strings.hrc:418
 msgctxt "STR_ACCEPT_REDLINE"
 msgid "Accept change: $1"
 msgstr "Derbyn newid: $1"
 
-#: strings.hrc:417
+#: sw/inc/strings.hrc:419
 msgctxt "STR_REJECT_REDLINE"
 msgid "Reject change: $1"
 msgstr "Gwrthod newid: $1"
 
-#: strings.hrc:418
+#: sw/inc/strings.hrc:420
 msgctxt "STR_SPLIT_TABLE"
 msgid "Split Table"
 msgstr "Hollti Tabl"
 
-#: strings.hrc:419
+#: sw/inc/strings.hrc:421
 msgctxt "STR_DONTEXPAND"
 msgid "Stop attribute"
 msgstr "Atal priodoledd"
 
-#: strings.hrc:420
+#: sw/inc/strings.hrc:422
 msgctxt "STR_AUTOCORRECT"
 msgid "AutoCorrect"
 msgstr "AwtoGywiro"
 
-#: strings.hrc:421
+#: sw/inc/strings.hrc:423
 msgctxt "STR_MERGE_TABLE"
 msgid "Merge table"
 msgstr "Uno tablau"
 
-#: strings.hrc:422
+#: sw/inc/strings.hrc:424
 msgctxt "STR_TRANSLITERATE"
 msgid "Change Case"
 msgstr "Newid Maint"
 
-#: strings.hrc:423
+#: sw/inc/strings.hrc:425
 msgctxt "STR_DELNUM"
 msgid "Delete numbering"
 msgstr "Dileu rhifo"
 
-#: strings.hrc:424
+#: sw/inc/strings.hrc:426
 msgctxt "STR_DRAWUNDO"
 msgid "Drawing objects: $1"
 msgstr "Lluniadu gwrthrychau: $1"
 
-#: strings.hrc:425
+#: sw/inc/strings.hrc:427
 msgctxt "STR_DRAWGROUP"
 msgid "Group draw objects"
 msgstr "Grwpio gwrthrychau lluniadu"
 
-#: strings.hrc:426
+#: sw/inc/strings.hrc:428
 msgctxt "STR_DRAWUNGROUP"
 msgid "Ungroup drawing objects"
 msgstr "Dadgrwpio gwrthrychau lluniadu"
 
-#: strings.hrc:427
+#: sw/inc/strings.hrc:429
 msgctxt "STR_DRAWDELETE"
 msgid "Delete drawing objects"
 msgstr "Dileu gwrthrychau lluniadu"
 
-#: strings.hrc:428
+#: sw/inc/strings.hrc:430
 msgctxt "STR_REREAD"
 msgid "Replace Image"
 msgstr "Newid Delwedd"
 
-#: strings.hrc:429
+#: sw/inc/strings.hrc:431
 msgctxt "STR_DELGRF"
 msgid "Delete Image"
 msgstr "Dileu Delwedd"
 
-#: strings.hrc:430
+#: sw/inc/strings.hrc:432
 msgctxt "STR_TABLE_ATTR"
 msgid "Apply table attributes"
 msgstr "Gosod priodoleddau tabl"
 
-#: strings.hrc:431
+#: sw/inc/strings.hrc:433
 msgctxt "STR_UNDO_TABLE_AUTOFMT"
 msgid "AutoFormat Table"
 msgstr "Tabl AwtoFformatio"
 
-#: strings.hrc:432
+#: sw/inc/strings.hrc:434
 msgctxt "STR_UNDO_TABLE_INSCOL"
 msgid "Insert Column"
 msgstr "Mewnosod Colofn"
 
-#: strings.hrc:433
+#: sw/inc/strings.hrc:435
 msgctxt "STR_UNDO_TABLE_INSROW"
 msgid "Insert Row"
 msgstr "Mewnosod Rhes"
 
-#: strings.hrc:434
+#: sw/inc/strings.hrc:436
 msgctxt "STR_UNDO_TABLE_DELBOX"
 msgid "Delete row/column"
 msgstr "Dileu rhes/colofn"
 
-#: strings.hrc:435
+#: sw/inc/strings.hrc:437
 msgctxt "STR_UNDO_COL_DELETE"
 msgid "Delete column"
 msgstr "Dileu colofn"
 
-#: strings.hrc:436
+#: sw/inc/strings.hrc:438
 msgctxt "STR_UNDO_ROW_DELETE"
 msgid "Delete row"
 msgstr "Dileu rhes"
 
-#: strings.hrc:437
+#: sw/inc/strings.hrc:439
 msgctxt "STR_UNDO_TABLE_SPLIT"
 msgid "Split Cells"
 msgstr "Hollti Celloedd"
 
-#: strings.hrc:438
+#: sw/inc/strings.hrc:440
 msgctxt "STR_UNDO_TABLE_MERGE"
 msgid "Merge Cells"
 msgstr "Uno Celloedd"
 
-#: strings.hrc:439
+#: sw/inc/strings.hrc:441
 msgctxt "STR_TABLE_NUMFORMAT"
 msgid "Format cell"
 msgstr "Fformatio cell"
 
-#: strings.hrc:440
+#: sw/inc/strings.hrc:442
 msgctxt "STR_INSERT_TOX"
 msgid "Insert index/table"
 msgstr "Mewnosod mynegai"
 
-#: strings.hrc:441
+#: sw/inc/strings.hrc:443
 msgctxt "STR_CLEAR_TOX_RANGE"
 msgid "Remove index/table"
 msgstr "Tynnu mynegai/tabl"
 
-#: strings.hrc:442
+#: sw/inc/strings.hrc:444
 msgctxt "STR_TABLE_TBLCPYTBL"
 msgid "Copy table"
 msgstr "Copïo tabl"
 
-#: strings.hrc:443
+#: sw/inc/strings.hrc:445
 msgctxt "STR_TABLE_CPYTBL"
 msgid "Copy table"
 msgstr "Copïo tabl"
 
-#: strings.hrc:444
+#: sw/inc/strings.hrc:446
 msgctxt "STR_INS_FROM_SHADOWCRSR"
 msgid "Set cursor"
 msgstr "Gosod cyrchwr"
 
-#: strings.hrc:445
+#: sw/inc/strings.hrc:447
 msgctxt "STR_UNDO_CHAIN"
 msgid "Link text frames"
 msgstr "Cysylltu fframiau testun"
 
-#: strings.hrc:446
+#: sw/inc/strings.hrc:448
 msgctxt "STR_UNDO_UNCHAIN"
 msgid "Unlink text frames"
 msgstr "Datgysylltu fframiau testun"
 
-#: strings.hrc:447
+#: sw/inc/strings.hrc:449
 msgctxt "STR_UNDO_FTNINFO"
 msgid "Modify footnote options"
 msgstr "Newid dewisiadau troednodau"
 
-#: strings.hrc:448
+#: sw/inc/strings.hrc:450
 msgctxt "STR_UNDO_COMPAREDOC"
 msgid "Compare Document"
 msgstr "Cymharu Dogfen"
 
-#: strings.hrc:449
+#: sw/inc/strings.hrc:451
 msgctxt "STR_UNDO_SETFLYFRMFMT"
 msgid "Apply frame style: $1"
 msgstr "Gosod arddull ffrâm: $1"
 
-#: strings.hrc:450
+#: sw/inc/strings.hrc:452
 msgctxt "STR_UNDO_SETRUBYATTR"
 msgid "Ruby Setting"
 msgstr "Gosodiad Ruby"
 
-#: strings.hrc:451
+#: sw/inc/strings.hrc:453
 msgctxt "STR_INSERT_FOOTNOTE"
 msgid "Insert footnote"
 msgstr "Mewnosod troednodyn"
 
-#: strings.hrc:452
+#: sw/inc/strings.hrc:454
 msgctxt "STR_INSERT_URLBTN"
 msgid "insert URL button"
 msgstr "mewnosod botwm URL"
 
-#: strings.hrc:453
+#: sw/inc/strings.hrc:455
 msgctxt "STR_INSERT_URLTXT"
 msgid "Insert Hyperlink"
 msgstr "Mewnosod Dolen"
 
-#: strings.hrc:454
+#: sw/inc/strings.hrc:456
 msgctxt "STR_DELETE_INVISIBLECNTNT"
 msgid "remove invisible content"
 msgstr "tynnu cynnwys anweledig"
 
-#: strings.hrc:455
+#: sw/inc/strings.hrc:457
 msgctxt "STR_TOXCHANGE"
 msgid "Table/index changed"
 msgstr "Tabl/mynegai wedi newid"
 
-#: strings.hrc:456
+#: sw/inc/strings.hrc:458
 msgctxt "STR_START_QUOTE"
 msgid "“"
 msgstr "“"
 
-#: strings.hrc:457
+#: sw/inc/strings.hrc:459
 msgctxt "STR_END_QUOTE"
 msgid "”"
 msgstr "”"
 
-#: strings.hrc:458
+#: sw/inc/strings.hrc:460
 msgctxt "STR_LDOTS"
 msgid "..."
 msgstr "..."
 
-#: strings.hrc:459
+#: sw/inc/strings.hrc:461
 msgctxt "STR_MULTISEL"
 msgid "multiple selection"
 msgstr "amlddewis"
 
-#: strings.hrc:460
+#: sw/inc/strings.hrc:462
 msgctxt "STR_TYPING_UNDO"
 msgid "Typing: $1"
 msgstr "Teipio: $1"
 
-#: strings.hrc:461
+#: sw/inc/strings.hrc:463
 msgctxt "STR_PASTE_CLIPBOARD_UNDO"
 msgid "Paste clipboard"
 msgstr "Gludo i'r clipfwrdd"
 
-#: strings.hrc:462
+#: sw/inc/strings.hrc:464
 msgctxt "STR_YIELDS"
 msgid "→"
 msgstr "→"
 
-#: strings.hrc:463
+#: sw/inc/strings.hrc:465
 msgctxt "STR_OCCURRENCES_OF"
 msgid "occurrences of"
 msgstr "achlysur"
 
-#: strings.hrc:464
+#: sw/inc/strings.hrc:466
 msgctxt "STR_UNDO_TABS"
 msgid "$1 tab(s)"
 msgstr "$1 tab"
 
-#: strings.hrc:465
+#: sw/inc/strings.hrc:467
 msgctxt "STR_UNDO_NLS"
 msgid "$1 line break(s)"
 msgstr "$1 toriad llinell"
 
-#: strings.hrc:466
+#: sw/inc/strings.hrc:468
 msgctxt "STR_UNDO_PAGEBREAKS"
 msgid "page break"
 msgstr "toriad tudalen"
 
-#: strings.hrc:467
+#: sw/inc/strings.hrc:469
 msgctxt "STR_UNDO_COLBRKS"
 msgid "column break"
 msgstr "toriad colofn"
 
-#: strings.hrc:468
+#: sw/inc/strings.hrc:470
 msgctxt "STR_UNDO_REDLINE_INSERT"
 msgid "Insert $1"
 msgstr "Mewnosod $1"
 
-#: strings.hrc:469
+#: sw/inc/strings.hrc:471
 msgctxt "STR_UNDO_REDLINE_DELETE"
 msgid "Delete $1"
 msgstr "Dileu $1"
 
-#: strings.hrc:470
+#: sw/inc/strings.hrc:472
 msgctxt "STR_UNDO_REDLINE_FORMAT"
 msgid "Attributes changed"
 msgstr "Priodoleddau wedi newid"
 
-#: strings.hrc:471
+#: sw/inc/strings.hrc:473
 msgctxt "STR_UNDO_REDLINE_TABLE"
 msgid "Table changed"
 msgstr "Tabl wedi newid"
 
-#: strings.hrc:472
+#: sw/inc/strings.hrc:474
 msgctxt "STR_UNDO_REDLINE_FMTCOLL"
 msgid "Style changed"
 msgstr "Arddull wedi newid"
 
-#: strings.hrc:473
+#: sw/inc/strings.hrc:475
 msgctxt "STR_UNDO_REDLINE_PARAGRAPH_FORMAT"
 msgid "Paragraph formatting changed"
 msgstr "Fformat paragraffau wedi newid"
 
-#: strings.hrc:474
+#: sw/inc/strings.hrc:476
 msgctxt "STR_UNDO_REDLINE_TABLE_ROW_INSERT"
 msgid "Insert Row"
 msgstr "Mewnosod Rhes"
 
-#: strings.hrc:475
+#: sw/inc/strings.hrc:477
 msgctxt "STR_UNDO_REDLINE_TABLE_ROW_DELETE"
 msgid "Delete Row"
 msgstr "Dileu Rhes"
 
-#: strings.hrc:476
+#: sw/inc/strings.hrc:478
 msgctxt "STR_UNDO_REDLINE_TABLE_CELL_INSERT"
 msgid "Insert Cell"
 msgstr "Mewnosod Cell"
 
-#: strings.hrc:477
+#: sw/inc/strings.hrc:479
 msgctxt "STR_UNDO_REDLINE_TABLE_CELL_DELETE"
 msgid "Delete Cell"
 msgstr "Dileu Cell"
 
-#: strings.hrc:478
+#: sw/inc/strings.hrc:480
 msgctxt "STR_N_REDLINES"
 msgid "$1 changes"
 msgstr "$1 newid"
 
-#: strings.hrc:479
+#: sw/inc/strings.hrc:481
 msgctxt "STR_UNDO_PAGEDESC"
 msgid "Change page style: $1"
 msgstr "Newid arddull tudalen: $1"
 
-#: strings.hrc:480
+#: sw/inc/strings.hrc:482
 msgctxt "STR_UNDO_PAGEDESC_CREATE"
 msgid "Create page style: $1"
 msgstr "Creu arddull tudalen: $1"
 
-#: strings.hrc:481
+#: sw/inc/strings.hrc:483
 msgctxt "STR_UNDO_PAGEDESC_DELETE"
 msgid "Delete page style: $1"
 msgstr "Dileu arddull tudalen: $1"
 
-#: strings.hrc:482
+#: sw/inc/strings.hrc:484
 msgctxt "STR_UNDO_PAGEDESC_RENAME"
 msgid "Rename page style: $1 $2 $3"
 msgstr "Ailenwi arddull tudalen: $1 $2 $3"
 
-#: strings.hrc:483
+#: sw/inc/strings.hrc:485
 msgctxt "STR_UNDO_HEADER_FOOTER"
 msgid "Header/footer changed"
 msgstr "Pennyn/troedyn wedi newid"
 
-#: strings.hrc:484
+#: sw/inc/strings.hrc:486
 msgctxt "STR_UNDO_FIELD"
 msgid "Field changed"
 msgstr "Maes wedi newid"
 
-#: strings.hrc:485
+#: sw/inc/strings.hrc:487
 msgctxt "STR_UNDO_TXTFMTCOL_CREATE"
 msgid "Create paragraph style: $1"
 msgstr "Creu arddull paragraff: $1"
 
-#: strings.hrc:486
+#: sw/inc/strings.hrc:488
 msgctxt "STR_UNDO_TXTFMTCOL_DELETE"
 msgid "Delete paragraph style: $1"
 msgstr "Dileu arddull parafraff: $1"
 
-#: strings.hrc:487
+#: sw/inc/strings.hrc:489
 msgctxt "STR_UNDO_TXTFMTCOL_RENAME"
 msgid "Rename paragraph style: $1 $2 $3"
 msgstr "Ailenwi arddull paragraff: $1 $2 $3"
 
-#: strings.hrc:488
+#: sw/inc/strings.hrc:490
 msgctxt "STR_UNDO_CHARFMT_CREATE"
 msgid "Create character style: $1"
 msgstr "Creu arddull nod: $1"
 
-#: strings.hrc:489
+#: sw/inc/strings.hrc:491
 msgctxt "STR_UNDO_CHARFMT_DELETE"
 msgid "Delete character style: $1"
 msgstr "Dileu arddull nod: $1"
 
-#: strings.hrc:490
+#: sw/inc/strings.hrc:492
 msgctxt "STR_UNDO_CHARFMT_RENAME"
 msgid "Rename character style: $1 $2 $3"
 msgstr "Ailenwi arddull nod: $1 $2 $3"
 
-#: strings.hrc:491
+#: sw/inc/strings.hrc:493
 msgctxt "STR_UNDO_FRMFMT_CREATE"
 msgid "Create frame style: $1"
 msgstr "Creu arddull ffrâm: $1"
 
-#: strings.hrc:492
+#: sw/inc/strings.hrc:494
 msgctxt "STR_UNDO_FRMFMT_DELETE"
 msgid "Delete frame style: $1"
 msgstr "Dileu arddull ffrâm: $1"
 
-#: strings.hrc:493
+#: sw/inc/strings.hrc:495
 msgctxt "STR_UNDO_FRMFMT_RENAME"
 msgid "Rename frame style: $1 $2 $3"
 msgstr "Ailenwi arddull ffrâm: $1 $2 $3"
 
-#: strings.hrc:494
+#: sw/inc/strings.hrc:496
 msgctxt "STR_UNDO_NUMRULE_CREATE"
 msgid "Create numbering style: $1"
 msgstr "Creu arddull rhifo : $1"
 
-#: strings.hrc:495
+#: sw/inc/strings.hrc:497
 msgctxt "STR_UNDO_NUMRULE_DELETE"
 msgid "Delete numbering style: $1"
 msgstr "Dileu arddull rhifo : $1"
 
-#: strings.hrc:496
+#: sw/inc/strings.hrc:498
 msgctxt "STR_UNDO_NUMRULE_RENAME"
 msgid "Rename numbering style: $1 $2 $3"
 msgstr "Ailenwi arddull rhifo : $1 $2 $3"
 
-#: strings.hrc:497
+#: sw/inc/strings.hrc:499
 msgctxt "STR_UNDO_BOOKMARK_RENAME"
 msgid "Rename bookmark: $1 $2 $3"
 msgstr "Ailenwi nod tudalen: $1 $2 $3"
 
-#: strings.hrc:498
+#: sw/inc/strings.hrc:500
 msgctxt "STR_UNDO_INDEX_ENTRY_INSERT"
 msgid "Insert index entry"
 msgstr "Mewnosod cofnod mynegai"
 
-#: strings.hrc:499
+#: sw/inc/strings.hrc:501
 msgctxt "STR_UNDO_INDEX_ENTRY_DELETE"
 msgid "Delete index entry"
 msgstr "Dileu cofnod mynegai"
 
-#: strings.hrc:500
+#: sw/inc/strings.hrc:502
 msgctxt "STR_FIELD"
 msgid "field"
 msgstr "maes"
 
 #. undo: STR_PARAGRAPHS, string.text
-#: strings.hrc:502
+#: sw/inc/strings.hrc:504
 msgctxt "STR_PARAGRAPHS"
 msgid "Paragraphs"
 msgstr "Paragraffau"
 
-#: strings.hrc:503
+#: sw/inc/strings.hrc:505
 msgctxt "STR_FRAME"
 msgid "frame"
 msgstr "ffrâm"
 
-#: strings.hrc:504
+#: sw/inc/strings.hrc:506
 msgctxt "STR_OLE"
 msgid "OLE-object"
 msgstr "Gwrthrych OLE"
 
-#: strings.hrc:505
+#: sw/inc/strings.hrc:507
 msgctxt "STR_MATH_FORMULA"
 msgid "formula"
 msgstr "fformiwla"
 
-#: strings.hrc:506
+#: sw/inc/strings.hrc:508
 msgctxt "STR_CHART"
 msgid "chart"
 msgstr "siart"
 
-#: strings.hrc:507
+#: sw/inc/strings.hrc:509
 msgctxt "STR_NOTE"
 msgid "comment"
 msgstr "nodyn"
 
-#: strings.hrc:508
+#: sw/inc/strings.hrc:510
 msgctxt "STR_REFERENCE"
 msgid "cross-reference"
 msgstr "croesgyfeiriad"
 
-#: strings.hrc:509
+#: sw/inc/strings.hrc:511
 msgctxt "STR_SCRIPT"
 msgid "script"
 msgstr "sgript"
 
-#: strings.hrc:510
+#: sw/inc/strings.hrc:512
 msgctxt "STR_AUTHORITY_ENTRY"
 msgid "bibliography entry"
 msgstr "cofnod llyfryddiaeth"
 
-#: strings.hrc:511
+#: sw/inc/strings.hrc:513
 msgctxt "STR_SPECIALCHAR"
 msgid "special character"
 msgstr "nod arbennig"
 
-#: strings.hrc:512
+#: sw/inc/strings.hrc:514
 msgctxt "STR_FOOTNOTE"
 msgid "footnote"
 msgstr "troednodyn"
 
-#: strings.hrc:513
+#: sw/inc/strings.hrc:515
 msgctxt "STR_GRAPHIC"
 msgid "image"
 msgstr "delwedd"
 
-#: strings.hrc:514
+#: sw/inc/strings.hrc:516
 msgctxt "STR_DRAWING_OBJECTS"
 msgid "drawing object(s)"
 msgstr "gwrthrych(au) darlunio"
 
-#: strings.hrc:515
+#: sw/inc/strings.hrc:517
 msgctxt "STR_TABLE_NAME"
 msgid "table: $1$2$3"
 msgstr "tabl: $1$2$3"
 
-#: strings.hrc:516
+#: sw/inc/strings.hrc:518
 msgctxt "STR_PARAGRAPH_UNDO"
 msgid "paragraph"
 msgstr "paragraff"
 
-#: strings.hrc:517
+#: sw/inc/strings.hrc:519
 msgctxt "STR_PARAGRAPH_SIGN_UNDO"
 msgid "Paragraph sign"
 msgstr "Arwydd paragraff"
 
-#: strings.hrc:518
+#: sw/inc/strings.hrc:520
 msgctxt "STR_UNDO_FLYFRMFMT_TITLE"
 msgid "Change object title of $1"
 msgstr "Newid teitl gwrthrych $1"
 
-#: strings.hrc:519
+#: sw/inc/strings.hrc:521
 msgctxt "STR_UNDO_FLYFRMFMT_DESCRITPTION"
 msgid "Change object description of $1"
 msgstr "Newid disgrifiad gwrthrych $1"
 
-#: strings.hrc:520
+#: sw/inc/strings.hrc:522
 msgctxt "STR_UNDO_TBLSTYLE_CREATE"
 msgid "Create table style: $1"
 msgstr "Creu arddull tabl: $1"
 
-#: strings.hrc:521
+#: sw/inc/strings.hrc:523
 msgctxt "STR_UNDO_TBLSTYLE_DELETE"
 msgid "Delete table style: $1"
 msgstr "Dileu arddull tabl: $1"
 
-#: strings.hrc:522
+#: sw/inc/strings.hrc:524
 msgctxt "STR_UNDO_TBLSTYLE_UPDATE"
 msgid "Update table style: $1"
 msgstr "Diweddaru arddull tabl: $1"
 
-#: strings.hrc:523
+#: sw/inc/strings.hrc:525
 msgctxt "STR_UNDO_TABLE_DELETE"
 msgid "Delete table"
 msgstr "Dileu tabl"
 
-#: strings.hrc:525
+#: sw/inc/strings.hrc:527
 msgctxt "STR_ACCESS_DOC_NAME"
 msgid "Document view"
 msgstr "Golwg Dogfen"
 
-#: strings.hrc:526
+#: sw/inc/strings.hrc:528
 msgctxt "STR_ACCESS_DOC_DESC"
 msgid "Document view"
 msgstr "Golwg Dogfen"
 
-#: strings.hrc:527
+#: sw/inc/strings.hrc:529
 msgctxt "STR_ACCESS_HEADER_NAME"
 msgid "Header $(ARG1)"
 msgstr "Pennyn $(ARG1)"
 
-#: strings.hrc:528
+#: sw/inc/strings.hrc:530
 msgctxt "STR_ACCESS_HEADER_DESC"
 msgid "Header page $(ARG1)"
 msgstr "Tudalen pennyn $(ARG1)"
 
-#: strings.hrc:529
+#: sw/inc/strings.hrc:531
 msgctxt "STR_ACCESS_FOOTER_NAME"
 msgid "Footer $(ARG1)"
 msgstr "Troedyn $(ARG1)"
 
-#: strings.hrc:530
+#: sw/inc/strings.hrc:532
 msgctxt "STR_ACCESS_FOOTER_DESC"
 msgid "Footer page $(ARG1)"
 msgstr "Tudalen troedyn $(ARG1)"
 
-#: strings.hrc:531
+#: sw/inc/strings.hrc:533
 msgctxt "STR_ACCESS_FOOTNOTE_NAME"
 msgid "Footnote $(ARG1)"
 msgstr "Troednodyn $(ARG1)"
 
-#: strings.hrc:532
+#: sw/inc/strings.hrc:534
 msgctxt "STR_ACCESS_FOOTNOTE_DESC"
 msgid "Footnote $(ARG1)"
 msgstr "Troednodyn $(ARG1)"
 
-#: strings.hrc:533
+#: sw/inc/strings.hrc:535
 msgctxt "STR_ACCESS_ENDNOTE_NAME"
 msgid "Endnote $(ARG1)"
 msgstr "Diweddnod $(ARG1)"
 
-#: strings.hrc:534
+#: sw/inc/strings.hrc:536
 msgctxt "STR_ACCESS_ENDNOTE_DESC"
 msgid "Endnote $(ARG1)"
 msgstr "Diweddnod $(ARG1)"
 
-#: strings.hrc:535
+#: sw/inc/strings.hrc:537
 msgctxt "STR_ACCESS_TABLE_DESC"
 msgid "$(ARG1) on page $(ARG2)"
 msgstr "$(ARG1) ar dudalen $(ARG2)"
 
-#: strings.hrc:536
+#: sw/inc/strings.hrc:538
 msgctxt "STR_ACCESS_PAGE_NAME"
 msgid "Page $(ARG1)"
 msgstr "Tudalen $(ARG1)"
 
-#: strings.hrc:537
+#: sw/inc/strings.hrc:539
 msgctxt "STR_ACCESS_PAGE_DESC"
 msgid "Page: $(ARG1)"
 msgstr "Tudalen $(ARG1)"
 
-#: strings.hrc:538
+#: sw/inc/strings.hrc:540
 msgctxt "STR_ACCESS_ANNOTATION_AUTHOR_NAME"
 msgid "Author"
 msgstr "Awdur"
 
-#: strings.hrc:539
+#: sw/inc/strings.hrc:541
 msgctxt "STR_ACCESS_ANNOTATION_DATE_NAME"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: strings.hrc:540
+#: sw/inc/strings.hrc:542
 msgctxt "STR_ACCESS_ANNOTATION_BUTTON_NAME"
 msgid "Actions"
 msgstr "Gweithredoedd"
 
-#: strings.hrc:541
+#: sw/inc/strings.hrc:543
 msgctxt "STR_ACCESS_ANNOTATION_BUTTON_DESC"
 msgid "Activate this button to open a list of actions which can be performed on this comment and other comments"
 msgstr "Cychwyn y botwm i agor rhes o weithredoedd y mae modd eu cyflawni ar y sylw hwn a sylwadau eraill"
 
-#: strings.hrc:542
+#: sw/inc/strings.hrc:544
 msgctxt "STR_ACCESS_PREVIEW_DOC_NAME"
 msgid "Document preview"
 msgstr "Rhagolwg dogfen"
 
-#: strings.hrc:543
+#: sw/inc/strings.hrc:545
 msgctxt "STR_ACCESS_PREVIEW_DOC_SUFFIX"
 msgid "(Preview mode)"
 msgstr "(Modd rhagolwg)"
 
-#: strings.hrc:544
+#: sw/inc/strings.hrc:546
 msgctxt "STR_ACCESS_DOC_WORDPROCESSING"
 msgid "%PRODUCTNAME Document"
 msgstr "Dogfen %PRODUCTNAME"
 
-#: strings.hrc:546
+#: sw/inc/strings.hrc:548
 msgctxt "STR_COMCORE_READERROR"
 msgid "Read Error"
 msgstr "Gwall Darllen"
 
-#: strings.hrc:547
+#: sw/inc/strings.hrc:549
 msgctxt "STR_COMCORE_CANT_SHOW"
 msgid "Image cannot be displayed."
 msgstr "Methu dangos delwedd."
 
-#: strings.hrc:548
+#: sw/inc/strings.hrc:550
 msgctxt "STR_ERROR_CLPBRD_READ"
 msgid "Error reading from the clipboard."
 msgstr "Gwall wrth ddarllen o'r clipfwrdd."
 
-#: strings.hrc:550
+#: sw/inc/strings.hrc:552
 msgctxt "STR_COLUMN_BREAK"
 msgid "Manual Column Break"
 msgstr "Toriad Colofn Llaw"
 
-#: strings.hrc:552
+#: sw/inc/strings.hrc:554
 msgctxt "STR_CHART2_ROW_LABEL_TEXT"
 msgid "Row %ROWNUMBER"
 msgstr "Rhes %ROWNUMBER"
 
-#: strings.hrc:553
+#: sw/inc/strings.hrc:555
 #, c-format
 msgctxt "STR_CHART2_COL_LABEL_TEXT"
 msgid "Column %COLUMNLETTER"
 msgstr "Colofn %COLUMNLETTER"
 
-#: strings.hrc:554
+#: sw/inc/strings.hrc:556
 msgctxt "STR_STYLE_FAMILY_CHARACTER"
 msgid "Character"
 msgstr "Nod"
 
-#: strings.hrc:555
+#: sw/inc/strings.hrc:557
 msgctxt "STR_STYLE_FAMILY_PARAGRAPH"
 msgid "Paragraph"
 msgstr "Paragraff"
 
-#: strings.hrc:556
+#: sw/inc/strings.hrc:558
 msgctxt "STR_STYLE_FAMILY_FRAME"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: strings.hrc:557
+#: sw/inc/strings.hrc:559
 msgctxt "STR_STYLE_FAMILY_PAGE"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: strings.hrc:558
+#: sw/inc/strings.hrc:560
 msgctxt "STR_STYLE_FAMILY_NUMBERING"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: strings.hrc:559
+#: sw/inc/strings.hrc:561
 msgctxt "STR_STYLE_FAMILY_TABLE"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:560
+#: sw/inc/strings.hrc:562
 msgctxt "STR_STYLE_FAMILY_CELL"
 msgid "Cell"
 msgstr "Cell"
 
-#: strings.hrc:562
+#: sw/inc/strings.hrc:564
 msgctxt "ST_SCRIPT_ASIAN"
 msgid "Asian"
 msgstr "Asiaidd"
 
-#: strings.hrc:563
+#: sw/inc/strings.hrc:565
 msgctxt "ST_SCRIPT_CTL"
 msgid "CTL"
 msgstr "CTL"
 
-#: strings.hrc:564
+#: sw/inc/strings.hrc:566
 msgctxt "ST_SCRIPT_WESTERN"
 msgid "Western"
 msgstr "Gorllewinol"
 
-#: strings.hrc:565
+#: sw/inc/strings.hrc:567
 msgctxt "STR_PRINTOPTUI_PRODUCTNAME"
 msgid "%PRODUCTNAME %s"
 msgstr "%PRODUCTNAME %s"
 
-#: strings.hrc:566
+#: sw/inc/strings.hrc:568
 msgctxt "STR_PRINTOPTUI_CONTENTS"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: strings.hrc:567
+#: sw/inc/strings.hrc:569
 msgctxt "STR_PRINTOPTUI_PAGE_BACKGROUND"
 msgid "Page ba~ckground"
 msgstr "Cefndir ~tudalen"
 
-#: strings.hrc:568
+#: sw/inc/strings.hrc:570
 msgctxt "STR_PRINTOPTUI_PICTURES"
-msgid "P~ictures and other graphic objects"
-msgstr "~Lluniau a gwrthrychau graffigol eraill"
+msgid "~Images and other graphic objects"
+msgstr "~Delweddau a gwrthrychau graffigol eraill"
 
-#: strings.hrc:569
+#: sw/inc/strings.hrc:571
 msgctxt "STR_PRINTOPTUI_HIDDEN"
 msgid "Hidden te~xt"
 msgstr "~Testun cudd"
 
-#: strings.hrc:570
+#: sw/inc/strings.hrc:572
 msgctxt "STR_PRINTOPTUI_TEXT_PLACEHOLDERS"
 msgid "~Text placeholders"
 msgstr "~Dalfannau testun"
 
-#: strings.hrc:571
+#: sw/inc/strings.hrc:573
 msgctxt "STR_PRINTOPTUI_FORM_CONTROLS"
 msgid "Form control~s"
 msgstr "~Rheolaeth ffurflen"
 
-#: strings.hrc:572
+#: sw/inc/strings.hrc:574
 msgctxt "STR_PRINTOPTUI_COLOR"
 msgid "Color"
 msgstr "Lliw"
 
-#: strings.hrc:573
+#: sw/inc/strings.hrc:575
 msgctxt "STR_PRINTOPTUI_PRINT_BLACK"
 msgid "Print text in blac~k"
 msgstr "Argraffu testun mewn ~du"
 
-#: strings.hrc:574
+#: sw/inc/strings.hrc:576
 msgctxt "STR_PRINTOPTUI_PAGES_TEXT"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: strings.hrc:575
+#: sw/inc/strings.hrc:577
 msgctxt "STR_PRINTOPTUI_PRINT_BLANK"
 msgid "Print ~automatically inserted blank pages"
 msgstr "Argraffu tudalennau gwag mewnosodwyd yn ~awtomatig"
 
-#: strings.hrc:576
+#: sw/inc/strings.hrc:578
 msgctxt "STR_PRINTOPTUI_ONLY_PAPER"
 msgid "~Use only paper tray from printer preferences"
 msgstr "~Defnyddio dim ond y drôr papur o'r dewisiadau argraffu"
 
-#: strings.hrc:577
+#: sw/inc/strings.hrc:579
 msgctxt "STR_PRINTOPTUI_PRINT"
 msgid "Print"
 msgstr "Argraffu"
 
-#: strings.hrc:578
+#: sw/inc/strings.hrc:580
 msgctxt "STR_PRINTOPTUI_NONE"
 msgid "None (document only)"
 msgstr "Dim (dogfen yn unig)"
 
-#: strings.hrc:579
+#: sw/inc/strings.hrc:581
 msgctxt "STR_PRINTOPTUI_COMMENTS_ONLY"
 msgid "Comments only"
 msgstr "Sylwadau'n unig"
 
-#: strings.hrc:580
+#: sw/inc/strings.hrc:582
 msgctxt "STR_PRINTOPTUI_PLACE_END"
 msgid "Place at end of document"
 msgstr "Gosod ar ddiwedd dogfen"
 
-#: strings.hrc:581
+#: sw/inc/strings.hrc:583
 msgctxt "STR_PRINTOPTUI_PLACE_PAGE"
 msgid "Place at end of page"
 msgstr "Gosod ar ddiwedd tudalen"
 
-#: strings.hrc:582
+#: sw/inc/strings.hrc:584
 msgctxt "STR_PRINTOPTUI_COMMENTS"
 msgid "~Comments"
 msgstr "~Nodiadau"
 
-#: strings.hrc:583
+#: sw/inc/strings.hrc:585
 msgctxt "STR_PRINTOPTUI_PAGE_SIDES"
 msgid "Page sides"
 msgstr "Ochrau tudalen"
 
-#: strings.hrc:584
+#: sw/inc/strings.hrc:586
 msgctxt "STR_PRINTOPTUI_ALL_PAGES"
 msgid "All pages"
 msgstr "Pob tudalen"
 
-#: strings.hrc:585
+#: sw/inc/strings.hrc:587
 msgctxt "STR_PRINTOPTUI_BACK_PAGES"
 msgid "Back sides / left pages"
 msgstr "Ochrau cefn / tudalennau chwith"
 
-#: strings.hrc:586
+#: sw/inc/strings.hrc:588
 msgctxt "STR_PRINTOPTUI_FONT_PAGES"
 msgid "Front sides / right pages"
 msgstr "Ochrau blaen / tudalennau de"
 
-#: strings.hrc:587
+#: sw/inc/strings.hrc:589
 msgctxt "STR_PRINTOPTUI_INCLUDE"
 msgid "Include"
 msgstr "Cynnwys"
 
-#: strings.hrc:588
+#: sw/inc/strings.hrc:590
 msgctxt "STR_PRINTOPTUI_BROCHURE"
 msgid "Broch~ure"
 msgstr "~Llyfryn"
 
-#: strings.hrc:589
+#: sw/inc/strings.hrc:591
 msgctxt "STR_PRINTOPTUI_LEFT_SCRIPT"
 msgid "Left-to-right script"
 msgstr "Sgript chwith i'r dde"
 
-#: strings.hrc:590
+#: sw/inc/strings.hrc:592
 msgctxt "STR_PRINTOPTUI_RIGHT_SCRIPT"
 msgid "Right-to-left script"
 msgstr "Sgript de i chwith"
 
-#: strings.hrc:591
+#: sw/inc/strings.hrc:593
 msgctxt "STR_PRINTOPTUI_RANGE_COPIES"
 msgid "Range and copies"
 msgstr "Ystod a chopïau"
 
-#: strings.hrc:592
+#: sw/inc/strings.hrc:594
 msgctxt "STR_PRINTOPTUI_ALLPAGES"
 msgid "~All pages"
 msgstr "~Pob tudalen"
 
-#: strings.hrc:593
+#: sw/inc/strings.hrc:595
 msgctxt "STR_PRINTOPTUI_SOMEPAGES"
 msgid "Pa~ges"
 msgstr "~Tudalennau"
 
-#: strings.hrc:594
+#: sw/inc/strings.hrc:596
 msgctxt "STR_PRINTOPTUI_SELECTION"
 msgid "~Selection"
 msgstr "~Dewis"
 
-#: strings.hrc:595
+#: sw/inc/strings.hrc:597
 msgctxt "STR_PRINTOPTUI_PLACE_MARGINS"
 msgid "Place in margins"
 msgstr "Man yn yr ymyl"
 
-#: strings.hrc:597
+#: sw/inc/strings.hrc:599
 msgctxt "STR_FORMULA_CALC"
 msgid "Functions"
 msgstr "Swyddogaethau"
 
-#: strings.hrc:598
+#: sw/inc/strings.hrc:600
 msgctxt "STR_FORMULA_CANCEL"
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: strings.hrc:599
+#: sw/inc/strings.hrc:601
 msgctxt "STR_FORMULA_APPLY"
 msgid "Apply"
 msgstr "Gosod"
 
-#: strings.hrc:600
+#: sw/inc/strings.hrc:602
 msgctxt "STR_ACCESS_FORMULA_TOOLBAR"
 msgid "Formula Tool Bar"
 msgstr "Bar Offer Fformiwla"
 
-#: strings.hrc:601
+#: sw/inc/strings.hrc:603
 msgctxt "STR_ACCESS_FORMULA_TYPE"
 msgid "Formula Type"
 msgstr "Math o Fformiwla"
 
-#: strings.hrc:602
+#: sw/inc/strings.hrc:604
 msgctxt "STR_ACCESS_FORMULA_TEXT"
 msgid "Formula Text"
 msgstr "Testun Fformiwla"
 
-#: strings.hrc:604
+#: sw/inc/strings.hrc:606
 msgctxt "STR_ACCESS_TL_GLOBAL"
 msgid "Global View"
 msgstr "Golwg Eang"
 
-#: strings.hrc:605
+#: sw/inc/strings.hrc:607
 msgctxt "STR_ACCESS_TL_CONTENT"
 msgid "Content Navigation View"
 msgstr "Golwg Llywio Cynnwys"
 
-#: strings.hrc:606
+#: sw/inc/strings.hrc:608
 msgctxt "STR_OUTLINE_LEVEL"
 msgid "Outline Level"
 msgstr "Lefel Amlinell"
 
-#: strings.hrc:607
+#: sw/inc/strings.hrc:609
 msgctxt "STR_DRAGMODE"
 msgid "Drag Mode"
 msgstr "Modd Llusgo"
 
-#: strings.hrc:608
+#: sw/inc/strings.hrc:610
 msgctxt "STR_HYPERLINK"
 msgid "Insert as Hyperlink"
 msgstr "Mewnosod fel Dolen"
 
-#: strings.hrc:609
+#: sw/inc/strings.hrc:611
 msgctxt "STR_LINK_REGION"
 msgid "Insert as Link"
 msgstr "Mewnosod fel Cysylltiad"
 
-#: strings.hrc:610
+#: sw/inc/strings.hrc:612
 msgctxt "STR_COPY_REGION"
 msgid "Insert as Copy"
 msgstr "Mewnosod fel Copi"
 
-#: strings.hrc:611
+#: sw/inc/strings.hrc:613
 msgctxt "STR_DISPLAY"
 msgid "Display"
 msgstr "Dangos"
 
-#: strings.hrc:612
+#: sw/inc/strings.hrc:614
 msgctxt "STR_ACTIVE_VIEW"
 msgid "Active Window"
 msgstr "Ffenestr Weithredol"
 
-#: strings.hrc:613
+#: sw/inc/strings.hrc:615
 msgctxt "STR_HIDDEN"
 msgid "hidden"
 msgstr "cudd"
 
-#: strings.hrc:614
+#: sw/inc/strings.hrc:616
 msgctxt "STR_ACTIVE"
 msgid "active"
 msgstr "ar waith"
 
-#: strings.hrc:615
+#: sw/inc/strings.hrc:617
 msgctxt "STR_INACTIVE"
 msgid "inactive"
 msgstr "ddim ar waith"
 
-#: strings.hrc:616
+#: sw/inc/strings.hrc:618
 msgctxt "STR_EDIT_ENTRY"
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: strings.hrc:617
+#: sw/inc/strings.hrc:619
 msgctxt "STR_UPDATE"
 msgid "~Update"
 msgstr "~Diweddaru"
 
-#: strings.hrc:618
+#: sw/inc/strings.hrc:620
 msgctxt "STR_EDIT_CONTENT"
 msgid "Edit"
 msgstr "Golygu"
 
-#: strings.hrc:619
+#: sw/inc/strings.hrc:621
 msgctxt "STR_EDIT_LINK"
 msgid "Edit link"
 msgstr "Golygu cysylltiad"
 
-#: strings.hrc:620
+#: sw/inc/strings.hrc:622
 msgctxt "STR_EDIT_INSERT"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: strings.hrc:621
+#: sw/inc/strings.hrc:623
 msgctxt "STR_INDEX"
 msgid "~Index"
 msgstr "~Mynegai"
 
-#: strings.hrc:622
+#: sw/inc/strings.hrc:624
 msgctxt "STR_FILE"
 msgid "File"
 msgstr "Ffeil"
 
-#: strings.hrc:623
+#: sw/inc/strings.hrc:625
 msgctxt "STR_NEW_FILE"
 msgid "New Document"
 msgstr "Dogfen Newydd"
 
-#: strings.hrc:624
+#: sw/inc/strings.hrc:626
 msgctxt "STR_INSERT_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:625
+#: sw/inc/strings.hrc:627
 msgctxt "STR_DELETE"
 msgid "Delete"
 msgstr "Dileu"
 
-#: strings.hrc:626
+#: sw/inc/strings.hrc:628
 msgctxt "STR_DELETE_ENTRY"
 msgid "~Delete"
 msgstr "~Dileu"
 
-#: strings.hrc:627
+#: sw/inc/strings.hrc:629
 msgctxt "STR_UPDATE_SEL"
 msgid "Selection"
 msgstr "Dewis"
 
-#: strings.hrc:628
+#: sw/inc/strings.hrc:630
 msgctxt "STR_UPDATE_INDEX"
 msgid "Indexes"
 msgstr "Mynegeion"
 
-#: strings.hrc:629
+#: sw/inc/strings.hrc:631
 msgctxt "STR_UPDATE_LINK"
 msgid "Links"
 msgstr "Cysylltiadau"
 
-#: strings.hrc:630
+#: sw/inc/strings.hrc:632
 msgctxt "STR_UPDATE_ALL"
 msgid "All"
 msgstr "Popeth"
 
-#: strings.hrc:631
+#: sw/inc/strings.hrc:633
 msgctxt "STR_REMOVE_INDEX"
 msgid "~Remove Index"
 msgstr "~Tynnu Mynegai"
 
-#: strings.hrc:632
+#: sw/inc/strings.hrc:634
 msgctxt "STR_REMOVE_TBL_PROTECTION"
 msgid "~Unprotect"
 msgstr "D~ad-ddiogelu"
 
-#: strings.hrc:633
+#: sw/inc/strings.hrc:635
 msgctxt "STR_INVISIBLE"
 msgid "hidden"
 msgstr "cudd"
 
-#: strings.hrc:634
+#: sw/inc/strings.hrc:636
 msgctxt "STR_BROKEN_LINK"
 msgid "File not found: "
 msgstr "Heb ganfod ffeil: "
 
-#: strings.hrc:635
+#: sw/inc/strings.hrc:637
 msgctxt "STR_RENAME"
 msgid "~Rename"
 msgstr "~Ailenwi"
 
-#: strings.hrc:636
+#: sw/inc/strings.hrc:638
 msgctxt "STR_READONLY_IDX"
 msgid "Read-~only"
 msgstr "Darllen yn ~unig"
 
-#: strings.hrc:637
+#: sw/inc/strings.hrc:639
 msgctxt "STR_POSTIT_SHOW"
 msgid "Show All"
 msgstr "Dangos Popeth"
 
-#: strings.hrc:638
+#: sw/inc/strings.hrc:640
 msgctxt "STR_POSTIT_HIDE"
 msgid "Hide All"
 msgstr "Cuddio Popeth"
 
-#: strings.hrc:639
+#: sw/inc/strings.hrc:641
 msgctxt "STR_POSTIT_DELETE"
 msgid "Delete All"
 msgstr "Dileu Popeth"
 
-#: strings.hrc:641
+#: sw/inc/strings.hrc:643
 msgctxt "STR_MARGIN_TOOLTIP_LEFT"
 msgid "Left: "
 msgstr "Chwith: "
 
-#: strings.hrc:642
+#: sw/inc/strings.hrc:644
 msgctxt "STR_MARGIN_TOOLTIP_RIGHT"
 msgid ". Right: "
 msgstr ". De: "
 
-#: strings.hrc:643
+#: sw/inc/strings.hrc:645
 msgctxt "STR_MARGIN_TOOLTIP_INNER"
 msgid "Inner: "
 msgstr "Mewnol: "
 
-#: strings.hrc:644
+#: sw/inc/strings.hrc:646
 msgctxt "STR_MARGIN_TOOLTIP_OUTER"
 msgid ". Outer: "
 msgstr ". Allanol: "
 
-#: strings.hrc:645
+#: sw/inc/strings.hrc:647
 msgctxt "STR_MARGIN_TOOLTIP_TOP"
 msgid ". Top: "
 msgstr ". Brig: "
 
-#: strings.hrc:646
+#: sw/inc/strings.hrc:648
 msgctxt "STR_MARGIN_TOOLTIP_BOT"
 msgid ". Bottom: "
 msgstr ". Gwaelod: "
 
 #. Error calculator
-#: strings.hrc:649
+#: sw/inc/strings.hrc:651
 msgctxt "STR_POSTIT_PAGE"
 msgid "Page"
 msgstr "Tudalen"
 
-#: strings.hrc:650
+#: sw/inc/strings.hrc:652
 msgctxt "STR_POSTIT_LINE"
 msgid "Line"
 msgstr "Llinell"
 
-#: strings.hrc:651
+#: sw/inc/strings.hrc:653
 msgctxt "STR_POSTIT_AUTHOR"
 msgid "Author"
 msgstr "Awdur"
 
-#: strings.hrc:652
+#: sw/inc/strings.hrc:654
 msgctxt "STR_CALC_SYNTAX"
 msgid "** Syntax Error **"
 msgstr "** Gwall Cystrawen **"
 
-#: strings.hrc:653
+#: sw/inc/strings.hrc:655
 msgctxt "STR_CALC_ZERODIV"
 msgid "** Division by zero **"
 msgstr "** Rhannu gyda sero **"
 
-#: strings.hrc:654
+#: sw/inc/strings.hrc:656
 msgctxt "STR_CALC_BRACK"
 msgid "** Wrong use of brackets **"
 msgstr "** Defnydd anghywir o fracedi **"
 
-#: strings.hrc:655
+#: sw/inc/strings.hrc:657
 msgctxt "STR_CALC_POW"
 msgid "** Square function overflow **"
 msgstr "** Gorlif swyddogaeth sgwâr **"
 
-#: strings.hrc:656
+#: sw/inc/strings.hrc:658
 msgctxt "STR_CALC_OVERFLOW"
 msgid "** Overflow **"
 msgstr "** Gorlif **"
 
-#: strings.hrc:657
+#: sw/inc/strings.hrc:659
 msgctxt "STR_CALC_DEFAULT"
 msgid "** Error **"
 msgstr "** Gwall **"
 
-#: strings.hrc:658
+#: sw/inc/strings.hrc:660
 msgctxt "STR_CALC_ERROR"
 msgid "** Expression is faulty **"
 msgstr "** Mynegiant gwallus **"
 
-#: strings.hrc:659
+#: sw/inc/strings.hrc:661
 msgctxt "STR_GETREFFLD_REFITEMNOTFOUND"
 msgid "Error: Reference source not found"
 msgstr "Gwall: Heb ganfod ffynhonnell cyfeiriad"
 
-#: strings.hrc:660
+#: sw/inc/strings.hrc:662
 msgctxt "STR_TEMPLATE_NONE"
 msgid "None"
 msgstr "Dim"
 
-#: strings.hrc:661
+#: sw/inc/strings.hrc:663
 msgctxt "STR_FIELD_FIXED"
 msgid "(fixed)"
 msgstr "(gosodedig)"
 
-#: strings.hrc:662
+#: sw/inc/strings.hrc:664
 msgctxt "STR_DURATION_FORMAT"
 msgid " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6"
 msgstr " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6"
 
-#: strings.hrc:663
+#: sw/inc/strings.hrc:665
 msgctxt "STR_TOI"
 msgid "Alphabetical Index"
 msgstr "Mynegai yn ôl Trefn yr Wyddor"
 
-#: strings.hrc:664
+#: sw/inc/strings.hrc:666
 msgctxt "STR_TOU"
 msgid "User-Defined"
 msgstr "Defnyddiwr Diffiniedig"
 
-#: strings.hrc:665
+#: sw/inc/strings.hrc:667
 msgctxt "STR_TOC"
 msgid "Table of Contents"
 msgstr "Tabl Cynnwys"
 
-#: strings.hrc:666
+#: sw/inc/strings.hrc:668
 msgctxt "STR_TOX_AUTH"
 msgid "Bibliography"
 msgstr "Llyfryddiaeth"
 
-#: strings.hrc:667
+#: sw/inc/strings.hrc:669
 msgctxt "STR_TOX_CITATION"
 msgid "Citation"
 msgstr "Dyfyniad"
 
-#: strings.hrc:668
+#: sw/inc/strings.hrc:670
 msgctxt "STR_TOX_TBL"
 msgid "Index of Tables"
 msgstr "Mynegai Tablau"
 
-#: strings.hrc:669
+#: sw/inc/strings.hrc:671
 msgctxt "STR_TOX_OBJ"
 msgid "Table of Objects"
 msgstr "Tabl Gwrthrychau"
 
-#: strings.hrc:670
+#: sw/inc/strings.hrc:672
 msgctxt "STR_TOX_ILL"
 msgid "Illustration Index"
 msgstr "Mynegai Darluniau"
 
-#: strings.hrc:671
+#: sw/inc/strings.hrc:673
 #, c-format
 msgctxt "STR_LINK_CTRL_CLICK"
 msgid "%s-Click to follow link"
 msgstr "%s-Clic i ddilyn cysylltiad"
 
-#: strings.hrc:672
+#: sw/inc/strings.hrc:674
 msgctxt "STR_LINK_CLICK"
 msgid "Click to follow link"
 msgstr "Clic i ddilyn cysylltiad"
 
 #. SubType DocInfo
-#: strings.hrc:674
+#: sw/inc/strings.hrc:676
 msgctxt "FLD_DOCINFO_TITEL"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:675
+#: sw/inc/strings.hrc:677
 msgctxt "FLD_DOCINFO_THEMA"
 msgid "Subject"
 msgstr "Pwnc"
 
-#: strings.hrc:676
+#: sw/inc/strings.hrc:678
 msgctxt "FLD_DOCINFO_KEYS"
 msgid "Keywords"
 msgstr "Allweddeiriau"
 
-#: strings.hrc:677
+#: sw/inc/strings.hrc:679
 msgctxt "FLD_DOCINFO_COMMENT"
 msgid "Comments"
 msgstr "Sylwadau"
 
-#: strings.hrc:678
+#: sw/inc/strings.hrc:680
 msgctxt "FLD_DOCINFO_CREATE"
 msgid "Created"
 msgstr "Crëwyd"
 
-#: strings.hrc:679
+#: sw/inc/strings.hrc:681
 msgctxt "FLD_DOCINFO_CHANGE"
 msgid "Modified"
 msgstr "Wedi newid"
 
-#: strings.hrc:680
+#: sw/inc/strings.hrc:682
 msgctxt "FLD_DOCINFO_PRINT"
 msgid "Last printed"
 msgstr "Argraffwyd diwethaf"
 
-#: strings.hrc:681
+#: sw/inc/strings.hrc:683
 msgctxt "FLD_DOCINFO_DOCNO"
 msgid "Revision number"
 msgstr "Rhif adolygu"
 
-#: strings.hrc:682
+#: sw/inc/strings.hrc:684
 msgctxt "FLD_DOCINFO_EDIT"
 msgid "Total editing time"
 msgstr "Cyfanswm amser golygu"
 
-#: strings.hrc:683
+#: sw/inc/strings.hrc:685
 msgctxt "STR_PAGEDESC_NAME"
 msgid "Convert $(ARG1)"
 msgstr "Trosi $(ARG1)"
 
-#: strings.hrc:684
+#: sw/inc/strings.hrc:686
 msgctxt "STR_PAGEDESC_FIRSTNAME"
 msgid "First convert $(ARG1)"
 msgstr "Trosi cyntaf $(ARG1)"
 
-#: strings.hrc:685
+#: sw/inc/strings.hrc:687
 msgctxt "STR_PAGEDESC_FOLLOWNAME"
 msgid "Next convert $(ARG1)"
 msgstr "Trosiad nesaf $(ARG1)"
 
-#: strings.hrc:686
+#: sw/inc/strings.hrc:688
 msgctxt "STR_AUTH_TYPE_ARTICLE"
 msgid "Article"
 msgstr "Erthygl"
 
-#: strings.hrc:687
+#: sw/inc/strings.hrc:689
 msgctxt "STR_AUTH_TYPE_BOOK"
 msgid "Book"
 msgstr "Llyfr"
 
-#: strings.hrc:688
+#: sw/inc/strings.hrc:690
 msgctxt "STR_AUTH_TYPE_BOOKLET"
 msgid "Brochures"
 msgstr "Llyfryn"
 
-#: strings.hrc:689
+#: sw/inc/strings.hrc:691
 msgctxt "STR_AUTH_TYPE_CONFERENCE"
 msgid "Conference proceedings"
 msgstr "Gweithrediadau cynhadledd"
 
-#: strings.hrc:690
+#: sw/inc/strings.hrc:692
 msgctxt "STR_AUTH_TYPE_INBOOK"
 msgid "Book excerpt"
 msgstr "Dyfyniad o lyfr"
 
-#: strings.hrc:691
+#: sw/inc/strings.hrc:693
 msgctxt "STR_AUTH_TYPE_INCOLLECTION"
 msgid "Book excerpt with title"
 msgstr "Dyfyniad o lyfr gyda theitl"
 
-#: strings.hrc:692
+#: sw/inc/strings.hrc:694
 msgctxt "STR_AUTH_TYPE_INPROCEEDINGS"
 msgid "Conference proceedings"
 msgstr "Gweithrediadau cynhadledd"
 
-#: strings.hrc:693
+#: sw/inc/strings.hrc:695
 msgctxt "STR_AUTH_TYPE_JOURNAL"
 msgid "Journal"
 msgstr "Dyddlyfr"
 
-#: strings.hrc:694
+#: sw/inc/strings.hrc:696
 msgctxt "STR_AUTH_TYPE_MANUAL"
 msgid "Techn. documentation"
 msgstr "Dogfennaeth dechnegol"
 
-#: strings.hrc:695
+#: sw/inc/strings.hrc:697
 msgctxt "STR_AUTH_TYPE_MASTERSTHESIS"
 msgid "Thesis"
 msgstr "Thesis"
 
-#: strings.hrc:696
+#: sw/inc/strings.hrc:698
 msgctxt "STR_AUTH_TYPE_MISC"
 msgid "Miscellaneous"
 msgstr "Amrywiol"
 
-#: strings.hrc:697
+#: sw/inc/strings.hrc:699
 msgctxt "STR_AUTH_TYPE_PHDTHESIS"
 msgid "Dissertation"
 msgstr "Traethawd doethuriaeth"
 
-#: strings.hrc:698
+#: sw/inc/strings.hrc:700
 msgctxt "STR_AUTH_TYPE_PROCEEDINGS"
 msgid "Conference proceedings"
 msgstr "Gweithrediadau cynhadledd"
 
-#: strings.hrc:699
+#: sw/inc/strings.hrc:701
 msgctxt "STR_AUTH_TYPE_TECHREPORT"
 msgid "Research report"
 msgstr "Adroddiad ymchwil"
 
-#: strings.hrc:700
+#: sw/inc/strings.hrc:702
 msgctxt "STR_AUTH_TYPE_UNPUBLISHED"
 msgid "Unpublished"
 msgstr "Heb ei gyhoeddi"
 
-#: strings.hrc:701
+#: sw/inc/strings.hrc:703
 msgctxt "STR_AUTH_TYPE_EMAIL"
 msgid "E-mail"
 msgstr "E-bost"
 
-#: strings.hrc:702
+#: sw/inc/strings.hrc:704
 msgctxt "STR_AUTH_TYPE_WWW"
 msgid "WWW document"
 msgstr "Dogfen WWW"
 
-#: strings.hrc:703
+#: sw/inc/strings.hrc:705
 msgctxt "STR_AUTH_TYPE_CUSTOM1"
 msgid "User-defined1"
 msgstr "Defnyddiwr diffinedig1"
 
-#: strings.hrc:704
+#: sw/inc/strings.hrc:706
 msgctxt "STR_AUTH_TYPE_CUSTOM2"
 msgid "User-defined2"
 msgstr "Defnyddiwr diffinedig2"
 
-#: strings.hrc:705
+#: sw/inc/strings.hrc:707
 msgctxt "STR_AUTH_TYPE_CUSTOM3"
 msgid "User-defined3"
 msgstr "Defnyddiwr diffinedig3"
 
-#: strings.hrc:706
+#: sw/inc/strings.hrc:708
 msgctxt "STR_AUTH_TYPE_CUSTOM4"
 msgid "User-defined4"
 msgstr "Defnyddiwr diffinedig4"
 
-#: strings.hrc:707
+#: sw/inc/strings.hrc:709
 msgctxt "STR_AUTH_TYPE_CUSTOM5"
 msgid "User-defined5"
 msgstr "Defnyddiwr diffinedig5"
 
-#: strings.hrc:708
+#: sw/inc/strings.hrc:710
 msgctxt "STR_AUTH_FIELD_IDENTIFIER"
 msgid "Short name"
 msgstr "Enw byr"
 
-#: strings.hrc:709
+#: sw/inc/strings.hrc:711
 msgctxt "STR_AUTH_FIELD_AUTHORITY_TYPE"
 msgid "Type"
 msgstr "Math"
 
-#: strings.hrc:710
+#: sw/inc/strings.hrc:712
 msgctxt "STR_AUTH_FIELD_ADDRESS"
 msgid "Address"
 msgstr "Cyfeiriad"
 
-#: strings.hrc:711
+#: sw/inc/strings.hrc:713
 msgctxt "STR_AUTH_FIELD_ANNOTE"
 msgid "Annotation"
 msgstr "Anodiadau"
 
-#: strings.hrc:712
+#: sw/inc/strings.hrc:714
 msgctxt "STR_AUTH_FIELD_AUTHOR"
 msgid "Author(s)"
 msgstr "Awdur(on)"
 
-#: strings.hrc:713
+#: sw/inc/strings.hrc:715
 msgctxt "STR_AUTH_FIELD_BOOKTITLE"
 msgid "Book title"
 msgstr "Teitl llyfr"
 
-#: strings.hrc:714
+#: sw/inc/strings.hrc:716
 msgctxt "STR_AUTH_FIELD_CHAPTER"
 msgid "Chapter"
 msgstr "Pennod"
 
-#: strings.hrc:715
+#: sw/inc/strings.hrc:717
 msgctxt "STR_AUTH_FIELD_EDITION"
 msgid "Edition"
 msgstr "Argraffiad"
 
-#: strings.hrc:716
+#: sw/inc/strings.hrc:718
 msgctxt "STR_AUTH_FIELD_EDITOR"
 msgid "Editor"
 msgstr "Golygydd"
 
-#: strings.hrc:717
+#: sw/inc/strings.hrc:719
 msgctxt "STR_AUTH_FIELD_HOWPUBLISHED"
 msgid "Publication type"
 msgstr "Math o gyhoeddiad"
 
-#: strings.hrc:718
+#: sw/inc/strings.hrc:720
 msgctxt "STR_AUTH_FIELD_INSTITUTION"
 msgid "Institution"
 msgstr "Sefydliad"
 
-#: strings.hrc:719
+#: sw/inc/strings.hrc:721
 msgctxt "STR_AUTH_FIELD_JOURNAL"
 msgid "Journal"
 msgstr "Dyddlyfr"
 
-#: strings.hrc:720
+#: sw/inc/strings.hrc:722
 msgctxt "STR_AUTH_FIELD_MONTH"
 msgid "Month"
 msgstr "Mis"
 
-#: strings.hrc:721
+#: sw/inc/strings.hrc:723
 msgctxt "STR_AUTH_FIELD_NOTE"
 msgid "Note"
 msgstr "Nodyn"
 
-#: strings.hrc:722
+#: sw/inc/strings.hrc:724
 msgctxt "STR_AUTH_FIELD_NUMBER"
 msgid "Number"
 msgstr "Rhif"
 
-#: strings.hrc:723
+#: sw/inc/strings.hrc:725
 msgctxt "STR_AUTH_FIELD_ORGANIZATIONS"
 msgid "Organization"
 msgstr "Corff"
 
-#: strings.hrc:724
+#: sw/inc/strings.hrc:726
 msgctxt "STR_AUTH_FIELD_PAGES"
 msgid "Page(s)"
 msgstr "Tudalen(nau)"
 
-#: strings.hrc:725
+#: sw/inc/strings.hrc:727
 msgctxt "STR_AUTH_FIELD_PUBLISHER"
 msgid "Publisher"
 msgstr "Cyhoeddwr"
 
-#: strings.hrc:726
+#: sw/inc/strings.hrc:728
 msgctxt "STR_AUTH_FIELD_SCHOOL"
 msgid "University"
 msgstr "Prifysgol"
 
-#: strings.hrc:727
+#: sw/inc/strings.hrc:729
 msgctxt "STR_AUTH_FIELD_SERIES"
 msgid "Series"
 msgstr "Cyfres"
 
-#: strings.hrc:728
+#: sw/inc/strings.hrc:730
 msgctxt "STR_AUTH_FIELD_TITLE"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:729
+#: sw/inc/strings.hrc:731
 msgctxt "STR_AUTH_FIELD_TYPE"
 msgid "Type of report"
 msgstr "Math o adroddiad"
 
-#: strings.hrc:730
+#: sw/inc/strings.hrc:732
 msgctxt "STR_AUTH_FIELD_VOLUME"
 msgid "Volume"
 msgstr "Lefel Sain"
 
-#: strings.hrc:731
+#: sw/inc/strings.hrc:733
 msgctxt "STR_AUTH_FIELD_YEAR"
 msgid "Year"
 msgstr "Blwyddyn"
 
-#: strings.hrc:732
+#: sw/inc/strings.hrc:734
 msgctxt "STR_AUTH_FIELD_URL"
 msgid "URL"
 msgstr "URL"
 
-#: strings.hrc:733
+#: sw/inc/strings.hrc:735
 msgctxt "STR_AUTH_FIELD_CUSTOM1"
 msgid "User-defined1"
 msgstr "Defnyddiwr diffinedig1"
 
-#: strings.hrc:734
+#: sw/inc/strings.hrc:736
 msgctxt "STR_AUTH_FIELD_CUSTOM2"
 msgid "User-defined2"
 msgstr "Defnyddiwr diffinedig2"
 
-#: strings.hrc:735
+#: sw/inc/strings.hrc:737
 msgctxt "STR_AUTH_FIELD_CUSTOM3"
 msgid "User-defined3"
 msgstr "Defnyddiwr diffinedig3"
 
-#: strings.hrc:736
+#: sw/inc/strings.hrc:738
 msgctxt "STR_AUTH_FIELD_CUSTOM4"
 msgid "User-defined4"
 msgstr "Defnyddiwr diffinedig4"
 
-#: strings.hrc:737
+#: sw/inc/strings.hrc:739
 msgctxt "STR_AUTH_FIELD_CUSTOM5"
 msgid "User-defined5"
 msgstr "Defnyddiwr diffinedig5"
 
-#: strings.hrc:738
+#: sw/inc/strings.hrc:740
 msgctxt "STR_AUTH_FIELD_ISBN"
 msgid "ISBN"
 msgstr "ISBN"
 
-#: strings.hrc:740
+#: sw/inc/strings.hrc:742
 msgctxt "STR_IDXMRK_EDIT"
 msgid "Edit Index Entry"
 msgstr "Golygu Cofnod Mynegai"
 
-#: strings.hrc:741
+#: sw/inc/strings.hrc:743
 msgctxt "STR_IDXMRK_INSERT"
 msgid "Insert Index Entry"
 msgstr "Mewnosod Cofnod Mynegai"
 
-#: strings.hrc:742
+#: sw/inc/strings.hrc:744
 msgctxt "STR_QUERY_CHANGE_AUTH_ENTRY"
 msgid "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?"
 msgstr "Mae'r ddogfen eisoes yn cynnwys y cofnod llyfryddiaeth ond gyda data gwahanol. Hoffech chi newid y cofnodion presennol?"
 
-#: strings.hrc:744
+#: sw/inc/strings.hrc:746
 msgctxt "STR_COMMENTS_LABEL"
 msgid "Comments"
 msgstr "Sylwadau"
 
-#: strings.hrc:745
+#: sw/inc/strings.hrc:747
 msgctxt "STR_SHOW_COMMENTS"
 msgid "Show comments"
 msgstr "Dangos sylwadau"
 
-#: strings.hrc:746
+#: sw/inc/strings.hrc:748
 msgctxt "STR_HIDE_COMMENTS"
 msgid "Hide comments"
 msgstr "Cuddio sylwadau"
 
-#: strings.hrc:748
+#: sw/inc/strings.hrc:750
 msgctxt "STR_DOUBLE_SHORTNAME"
 msgid "Shortcut name already exists. Please choose another name."
 msgstr "Enw llwybr byr yn bodoli eisoes. Dewiswch un arall."
 
-#: strings.hrc:749
+#: sw/inc/strings.hrc:751
 msgctxt "STR_QUERY_DELETE"
 msgid "Delete AutoText?"
 msgstr "Dileu AwtoDestun?"
 
-#: strings.hrc:750
+#: sw/inc/strings.hrc:752
 msgctxt "STR_QUERY_DELETE_GROUP1"
 msgid "Delete the category "
 msgstr "Dileu'r categori "
 
-#: strings.hrc:751
+#: sw/inc/strings.hrc:753
 msgctxt "STR_QUERY_DELETE_GROUP2"
 msgid "?"
 msgstr "?"
 
-#: strings.hrc:752
+#: sw/inc/strings.hrc:754
 msgctxt "STR_GLOSSARY"
 msgid "AutoText :"
 msgstr "AwtoDestun :"
 
-#: strings.hrc:753
+#: sw/inc/strings.hrc:755
 msgctxt "STR_SAVE_GLOSSARY"
 msgid "Save AutoText"
 msgstr "Cadw AwtoDestun"
 
-#: strings.hrc:754
+#: sw/inc/strings.hrc:756
 msgctxt "STR_NO_GLOSSARIES"
 msgid "There is no AutoText in this file."
 msgstr "Nid oes AwtoDestun yn y ffeil."
 
-#: strings.hrc:755
+#: sw/inc/strings.hrc:757
 msgctxt "STR_MY_AUTOTEXT"
 msgid "My AutoText"
 msgstr "Fy AwtoDestun"
 
-#: strings.hrc:757
+#: sw/inc/strings.hrc:759
 msgctxt "STR_NOGLOS"
 msgid "AutoText for Shortcut '%1' not found."
 msgstr "Heb ganfod AwtoDestun ar gyfer Llwybr Byr '%1'."
 
-#: strings.hrc:758
+#: sw/inc/strings.hrc:760
 msgctxt "STR_NO_TABLE"
 msgid "A table with no rows or no cells cannot be inserted"
 msgstr "Nid oes modd mewnosod tabl sydd heb resi na chelloedd"
 
-#: strings.hrc:759
+#: sw/inc/strings.hrc:761
 msgctxt "STR_TABLE_TOO_LARGE"
 msgid "The table cannot be inserted because it is too large"
 msgstr "Nid oes modd mewnosod y tabl am ei fod yn rhy fawr"
 
-#: strings.hrc:760
+#: sw/inc/strings.hrc:762
 msgctxt "STR_ERR_INSERT_GLOS"
 msgid "AutoText could not be created."
 msgstr "Methu creu AwtoDestun."
 
-#: strings.hrc:761
+#: sw/inc/strings.hrc:763
 msgctxt "STR_CLPBRD_FORMAT_ERROR"
 msgid "Requested clipboard format is not available."
 msgstr "Nid yw'r fformat clipfwrdd hwn ar gael."
 
-#: strings.hrc:762
+#: sw/inc/strings.hrc:764
 msgctxt "STR_PRIVATETEXT"
-msgid "%PRODUCTNAME Writer"
-msgstr "Writer %PRODUCTNAME"
+msgid "%PRODUCTNAME %PRODUCTVERSION Text Document"
+msgstr "Dogfen Testun %PRODUCTNAME %PRODUCTVERSION"
 
-#: strings.hrc:763
+#: sw/inc/strings.hrc:765
 msgctxt "STR_PRIVATEGRAPHIC"
-msgid "Image [%PRODUCTNAME Writer]"
-msgstr "Delwedd [%PRODUCTNAME Writer]"
+msgid "Image (%PRODUCTNAME %PRODUCTVERSION Text Document)"
+msgstr "Delwedd (Dogfen Testun %PRODUCTNAME %PRODUCTVERSION)"
 
-#: strings.hrc:764
+#: sw/inc/strings.hrc:766
 msgctxt "STR_PRIVATEOLE"
-msgid "Object [%PRODUCTNAME Writer]"
-msgstr "Gwrthrych [%PRODUCTNAME Writer]"
+msgid "Object (%PRODUCTNAME %PRODUCTVERSION Text Document)"
+msgstr "Gwrthrych (Dogfen Testun %PRODUCTNAME %PRODUCTVERSION)"
 
-#: strings.hrc:765
+#: sw/inc/strings.hrc:767
 msgctxt "STR_DDEFORMAT"
-msgid "DDE link"
-msgstr "Cysylltiad DDE"
+msgid "Dynamic Data Exchange (DDE link)"
+msgstr "Dynamic Data Exchange (DDE link)"
 
-#: strings.hrc:767
+#: sw/inc/strings.hrc:769
 msgctxt "STR_DELETE_ALL_NOTES"
 msgid "All Comments"
 msgstr "Pob Sylw"
 
-#: strings.hrc:768
+#: sw/inc/strings.hrc:770
 msgctxt "STR_FORMAT_ALL_NOTES"
 msgid "All Comments"
 msgstr "Pob Sylw"
 
-#: strings.hrc:769
+#: sw/inc/strings.hrc:771
 msgctxt "STR_DELETE_AUTHOR_NOTES"
 msgid "Comments by "
 msgstr "Sylwadau gan "
 
-#: strings.hrc:770
+#: sw/inc/strings.hrc:772
 msgctxt "STR_NODATE"
 msgid "(no date)"
 msgstr "(dim dyddiad)"
 
-#: strings.hrc:771
+#: sw/inc/strings.hrc:773
 msgctxt "STR_NOAUTHOR"
 msgid "(no author)"
 msgstr "(dim awdur)"
 
-#: strings.hrc:772
+#: sw/inc/strings.hrc:774
 msgctxt "STR_REPLY"
 msgid "Reply to $1"
 msgstr "Ateb i $1"
 
-#: strings.hrc:774
+#: sw/inc/strings.hrc:776
 msgctxt "ST_TITLE_EDIT"
 msgid "Edit Address Block"
 msgstr "Golygu'r Bloc Cyfeiriad"
 
-#: strings.hrc:775
+#: sw/inc/strings.hrc:777
 msgctxt "ST_TITLE_MALE"
 msgid "Custom Salutation (Male Recipients)"
 msgstr "Cyfarchiad Cyfaddas (Derbynnydd Gwrywiadd)"
 
-#: strings.hrc:776
+#: sw/inc/strings.hrc:778
 msgctxt "ST_TITLE_FEMALE"
 msgid "Custom Salutation (Female Recipients)"
 msgstr "Cyfarchiad Cyfaddas (Derbynnydd Benywaidd)"
 
-#: strings.hrc:777
+#: sw/inc/strings.hrc:779
 msgctxt "ST_SALUTATIONELEMENTS"
 msgid "Salutation e~lements"
 msgstr "E~lfennau cyfarchiad"
 
-#: strings.hrc:778
+#: sw/inc/strings.hrc:780
 msgctxt "ST_INSERTSALUTATIONFIELD"
 msgid "Add to salutation"
 msgstr "Ychwanegu at gyfarchiad"
 
-#: strings.hrc:779
+#: sw/inc/strings.hrc:781
 msgctxt "ST_REMOVESALUTATIONFIELD"
 msgid "Remove from salutation"
 msgstr "Tynnu o gyfarchiad"
 
-#: strings.hrc:780
+#: sw/inc/strings.hrc:782
 msgctxt "ST_DRAGSALUTATION"
 msgid "1. ~Drag salutation elements into the box below"
 msgstr "1. ~Llusgo elfennau cyfarchiad i'r blwch islaw"
 
-#: strings.hrc:781
+#: sw/inc/strings.hrc:783
 msgctxt "ST_SALUTATION"
 msgid "Salutation"
 msgstr "Cyfarchiad"
 
-#: strings.hrc:782
+#: sw/inc/strings.hrc:784
 msgctxt "ST_PUNCTUATION"
 msgid "Punctuation Mark"
 msgstr "Marc Atalnodi"
 
-#: strings.hrc:783
+#: sw/inc/strings.hrc:785
 msgctxt "ST_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:784
+#: sw/inc/strings.hrc:786
 msgctxt "ST_SALUTATIONMATCHING"
 msgid "Assign the fields from your data source to match the salutation elements."
 msgstr "Neilltuo’r meysydd o'ch ffynhonnell data i gydweddu elfennau'r cyfarchiad."
 
-#: strings.hrc:785
+#: sw/inc/strings.hrc:787
 msgctxt "ST_SALUTATIONPREVIEW"
 msgid "Salutation preview"
 msgstr "Rhagolwg cyfarchiad"
 
-#: strings.hrc:786
+#: sw/inc/strings.hrc:788
 msgctxt "ST_ADDRESSELEMENT"
 msgid "Address elements"
 msgstr "Elfennau cyfeiriad"
 
-#: strings.hrc:787
+#: sw/inc/strings.hrc:789
 msgctxt "ST_SALUTATIONELEMENT"
 msgid "Salutation elements"
 msgstr "Elfennau cyfarchiad"
 
-#: strings.hrc:788
+#: sw/inc/strings.hrc:790
 msgctxt "ST_MATCHESTO"
 msgid "Matches to field:"
 msgstr "Cydweddiad i faes:"
 
-#: strings.hrc:789
+#: sw/inc/strings.hrc:791
 msgctxt "ST_PREVIEW"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: strings.hrc:791
+#: sw/inc/strings.hrc:793
 msgctxt "STR_NOTASSIGNED"
 msgid " not yet matched "
 msgstr " heb ei gydweddu "
 
-#: strings.hrc:792
+#: sw/inc/strings.hrc:794
 msgctxt "STR_FILTER_ALL"
 msgid "All files"
 msgstr "Pob ffeil"
 
-#: strings.hrc:793
+#: sw/inc/strings.hrc:795
 msgctxt "STR_FILTER_ALL_DATA"
 msgid "Address lists(*.*)"
 msgstr "Rhestrau cyfeiriadau (*.*)"
 
-#: strings.hrc:794
+#: sw/inc/strings.hrc:796
 msgctxt "STR_FILTER_SXB"
 msgid "%PRODUCTNAME Base (*.odb)"
 msgstr "Base %PRODUCTNAME (*.odb)"
 
-#: strings.hrc:795
+#: sw/inc/strings.hrc:797
 msgctxt "STR_FILTER_SXC"
 msgid "%PRODUCTNAME Calc (*.ods;*.sxc)"
 msgstr "Calc %PRODUCTNAME (*.ods;*.sxc)"
 
-#: strings.hrc:796
+#: sw/inc/strings.hrc:798
 msgctxt "STR_FILTER_SXW"
 msgid "%PRODUCTNAME Writer (*.odt;*.sxw)"
 msgstr "Writer %PRODUCTNAME (*.ods;*.sxc)"
 
-#: strings.hrc:797
+#: sw/inc/strings.hrc:799
 msgctxt "STR_FILTER_DBF"
 msgid "dBase (*.dbf)"
 msgstr "dBase (*.dbf)"
 
-#: strings.hrc:798
+#: sw/inc/strings.hrc:800
 msgctxt "STR_FILTER_XLS"
 msgid "Microsoft Excel (*.xls;*.xlsx)"
 msgstr "Microsoft Excel (*.xls;*.xlsx)"
 
-#: strings.hrc:799
+#: sw/inc/strings.hrc:801
 msgctxt "STR_FILTER_DOC"
 msgid "Microsoft Word (*.doc;*.docx)"
 msgstr "Microsoft Word (*.doc;*.docx)"
 
-#: strings.hrc:800
+#: sw/inc/strings.hrc:802
 msgctxt "STR_FILTER_TXT"
 msgid "Plain text (*.txt)"
 msgstr "Testun plaen (*.txt)"
 
-#: strings.hrc:801
+#: sw/inc/strings.hrc:803
 msgctxt "STR_FILTER_CSV"
 msgid "Text Comma Separated (*.csv)"
 msgstr "Testun wedi ei wahanu gan atalnod (*.csv)"
 
-#: strings.hrc:802
+#: sw/inc/strings.hrc:804
 msgctxt "STR_FILTER_MDB"
 msgid "Microsoft Access (*.mdb;*.mde)"
 msgstr "Microsoft Access (*.mdb;*.mde)"
 
-#: strings.hrc:803
+#: sw/inc/strings.hrc:805
 msgctxt "STR_FILTER_ACCDB"
 msgid "Microsoft Access 2007 (*.accdb,*.accde)"
 msgstr "Microsoft Access 2007 (*.accdb,*.accde)"
 
-#: strings.hrc:804
+#: sw/inc/strings.hrc:806
 msgctxt "ST_CONFIGUREMAIL"
 msgid ""
 "In order to be able to send mail merge documents by e-mail, %PRODUCTNAME requires information about the e-mail account to be used.\n"
@@ -4221,82 +4231,82 @@ msgstr ""
 "\n"
 " Hoffech chi roi manylion eich cyfrif e-bost?"
 
-#: strings.hrc:805
+#: sw/inc/strings.hrc:807
 msgctxt "ST_FILTERNAME"
 msgid "%PRODUCTNAME Address List (.csv)"
 msgstr "Rhestr Cyfeiriad %PRODUCTNAME (.csv)"
 
-#: strings.hrc:807
+#: sw/inc/strings.hrc:809
 msgctxt "ST_STARTING"
 msgid "Select starting document"
 msgstr "Dewis y ddogfen gychwynnol"
 
-#: strings.hrc:808
+#: sw/inc/strings.hrc:810
 msgctxt "ST_DOCUMENTTYPE"
 msgid "Select document type"
 msgstr "Dewis y math o ddogfen"
 
-#: strings.hrc:809
+#: sw/inc/strings.hrc:811
 msgctxt "ST_ADDRESSBLOCK"
 msgid "Insert address block"
 msgstr "Mewnosod y bloc cyfeiriad"
 
-#: strings.hrc:810
+#: sw/inc/strings.hrc:812
 msgctxt "ST_ADDRESSLIST"
 msgid "Select address list"
 msgstr "Dewis rhestr cyfeiriadau"
 
-#: strings.hrc:811
+#: sw/inc/strings.hrc:813
 msgctxt "ST_GREETINGSLINE"
 msgid "Create salutation"
 msgstr "Creu cyfarchiad"
 
-#: strings.hrc:812
+#: sw/inc/strings.hrc:814
 msgctxt "ST_LAYOUT"
 msgid "Adjust layout"
 msgstr "Newid cynllun"
 
-#: strings.hrc:813
+#: sw/inc/strings.hrc:815
 msgctxt "ST_EXCLUDE"
 msgid "Exclude recipient"
 msgstr "Eithrio'r derbynnydd"
 
-#: strings.hrc:814
+#: sw/inc/strings.hrc:816
 msgctxt "ST_FINISH"
 msgid "~Finish"
 msgstr "~Gorffen"
 
-#: strings.hrc:815
+#: sw/inc/strings.hrc:817
 msgctxt "ST_MMWTITLE"
 msgid "Mail Merge Wizard"
 msgstr "Dewin Cyfuno Post"
 
-#: strings.hrc:817
+#: sw/inc/strings.hrc:819
 msgctxt "ST_NAME"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:818
+#: sw/inc/strings.hrc:820
 msgctxt "ST_TYPE"
 msgid "Type"
 msgstr "Math"
 
-#: strings.hrc:819
+#: sw/inc/strings.hrc:821
 msgctxt "ST_TABLE"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:820
+#: sw/inc/strings.hrc:822
 msgctxt "ST_QUERY"
 msgid "Query"
 msgstr "Ymholiad"
 
-#: strings.hrc:822
+#: sw/inc/strings.hrc:824
 msgctxt "STR_QUERY_SPELL_CONTINUE"
 msgid "Continue checking at beginning of document?"
 msgstr "Parhau gwirio o gychwyn y ddogfen?"
 
-#: strings.hrc:823
+#: sw/inc/strings.hrc:825
 msgctxt "STR_SPELLING_COMPLETED"
 msgid "The spellcheck is complete."
 msgstr "Mae'r gwirio sillafu wedi ei gwblhau."
@@ -4305,212 +4315,212 @@ msgstr "Mae'r gwirio sillafu wedi ei gwblhau."
 #. Description: strings for the types
 #. --------------------------------------------------------------------
 #. range document
-#: strings.hrc:829
+#: sw/inc/strings.hrc:831
 msgctxt "STR_DATEFLD"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: strings.hrc:830
+#: sw/inc/strings.hrc:832
 msgctxt "STR_TIMEFLD"
 msgid "Time"
 msgstr "Amser"
 
-#: strings.hrc:831
+#: sw/inc/strings.hrc:833
 msgctxt "STR_FILENAMEFLD"
 msgid "File name"
 msgstr "Enw ffeil"
 
-#: strings.hrc:832
+#: sw/inc/strings.hrc:834
 msgctxt "STR_DBNAMEFLD"
 msgid "Database Name"
 msgstr "Enw Cronfa Ddata"
 
-#: strings.hrc:833
+#: sw/inc/strings.hrc:835
 msgctxt "STR_CHAPTERFLD"
 msgid "Chapter"
 msgstr "Pennod"
 
-#: strings.hrc:834
+#: sw/inc/strings.hrc:836
 msgctxt "STR_PAGENUMBERFLD"
 msgid "Page numbers"
 msgstr "Rhif tudalen"
 
-#: strings.hrc:835
+#: sw/inc/strings.hrc:837
 msgctxt "STR_DOCSTATFLD"
 msgid "Statistics"
 msgstr "Ystadegau"
 
-#: strings.hrc:836
+#: sw/inc/strings.hrc:838
 msgctxt "STR_AUTHORFLD"
 msgid "Author"
 msgstr "Awdur"
 
-#: strings.hrc:837
+#: sw/inc/strings.hrc:839
 msgctxt "STR_TEMPLNAMEFLD"
 msgid "Templates"
 msgstr "Templedi"
 
-#: strings.hrc:838
+#: sw/inc/strings.hrc:840
 msgctxt "STR_EXTUSERFLD"
 msgid "Sender"
 msgstr "Anfonwr"
 
 #. range functions
-#: strings.hrc:840
+#: sw/inc/strings.hrc:842
 msgctxt "STR_SETFLD"
 msgid "Set variable"
 msgstr "Gosod newidiol"
 
-#: strings.hrc:841
+#: sw/inc/strings.hrc:843
 msgctxt "STR_GETFLD"
 msgid "Show variable"
 msgstr "Dangos newidiol"
 
-#: strings.hrc:842
+#: sw/inc/strings.hrc:844
 msgctxt "STR_FORMELFLD"
 msgid "Insert Formula"
 msgstr "Mewnosod Fformiwla"
 
-#: strings.hrc:843
+#: sw/inc/strings.hrc:845
 msgctxt "STR_INPUTFLD"
 msgid "Input field"
 msgstr "Maes mewnbwn"
 
-#: strings.hrc:844
+#: sw/inc/strings.hrc:846
 msgctxt "STR_SETINPUTFLD"
 msgid "Input field (variable)"
 msgstr "Maes mewnbwn (newidiol)"
 
-#: strings.hrc:845
+#: sw/inc/strings.hrc:847
 msgctxt "STR_USRINPUTFLD"
 msgid "Input field (user)"
 msgstr "Maes mewnbwn (defnyddiwr)"
 
-#: strings.hrc:846
+#: sw/inc/strings.hrc:848
 msgctxt "STR_CONDTXTFLD"
 msgid "Conditional text"
 msgstr "Testun amodol"
 
-#: strings.hrc:847
+#: sw/inc/strings.hrc:849
 msgctxt "STR_DDEFLD"
 msgid "DDE field"
 msgstr "Maes DDE"
 
-#: strings.hrc:848
+#: sw/inc/strings.hrc:850
 msgctxt "STR_MACROFLD"
 msgid "Execute macro"
 msgstr "Gweithredu macro"
 
-#: strings.hrc:849
+#: sw/inc/strings.hrc:851
 msgctxt "STR_SEQFLD"
 msgid "Number range"
 msgstr "Ystod rhif"
 
-#: strings.hrc:850
+#: sw/inc/strings.hrc:852
 msgctxt "STR_SETREFPAGEFLD"
 msgid "Set page variable"
 msgstr "Gosod newidiol tudalen"
 
-#: strings.hrc:851
+#: sw/inc/strings.hrc:853
 msgctxt "STR_GETREFPAGEFLD"
 msgid "Show page variable"
 msgstr "Dangos newidiol tudalen"
 
-#: strings.hrc:852
+#: sw/inc/strings.hrc:854
 msgctxt "STR_INTERNETFLD"
 msgid "Load URL"
 msgstr "Llwytho URL"
 
-#: strings.hrc:853
+#: sw/inc/strings.hrc:855
 msgctxt "STR_JUMPEDITFLD"
 msgid "Placeholder"
 msgstr "Dalfan"
 
-#: strings.hrc:854
+#: sw/inc/strings.hrc:856
 msgctxt "STR_COMBINED_CHARS"
 msgid "Combine characters"
 msgstr "Cyfuno nodau"
 
-#: strings.hrc:855
+#: sw/inc/strings.hrc:857
 msgctxt "STR_DROPDOWN"
 msgid "Input list"
 msgstr "Rhestr mewnbwn"
 
 #. range references
-#: strings.hrc:857
+#: sw/inc/strings.hrc:859
 msgctxt "STR_SETREFFLD"
 msgid "Set Reference"
 msgstr "Gosod Cyfeirnod"
 
-#: strings.hrc:858
+#: sw/inc/strings.hrc:860
 msgctxt "STR_GETREFFLD"
 msgid "Insert Reference"
 msgstr "Mewnosod Cyfeirnod"
 
 #. range database
-#: strings.hrc:860
+#: sw/inc/strings.hrc:862
 msgctxt "STR_DBFLD"
 msgid "Mail merge fields"
 msgstr "Meysydd cyfuno post"
 
-#: strings.hrc:861
+#: sw/inc/strings.hrc:863
 msgctxt "STR_DBNEXTSETFLD"
 msgid "Next record"
 msgstr "Cofnod nesaf"
 
-#: strings.hrc:862
+#: sw/inc/strings.hrc:864
 msgctxt "STR_DBNUMSETFLD"
 msgid "Any record"
 msgstr "Unrhyw gofnod"
 
-#: strings.hrc:863
+#: sw/inc/strings.hrc:865
 msgctxt "STR_DBSETNUMBERFLD"
 msgid "Record number"
 msgstr "Rhif cofnod"
 
-#: strings.hrc:864
+#: sw/inc/strings.hrc:866
 msgctxt "STR_PREVPAGEFLD"
 msgid "Previous page"
 msgstr "Tudalen flaenorol"
 
-#: strings.hrc:865
+#: sw/inc/strings.hrc:867
 msgctxt "STR_NEXTPAGEFLD"
 msgid "Next page"
 msgstr "Tudalen nesaf"
 
-#: strings.hrc:866
+#: sw/inc/strings.hrc:868
 msgctxt "STR_HIDDENTXTFLD"
 msgid "Hidden text"
 msgstr "Testun cudd"
 
 #. range user fields
-#: strings.hrc:868
+#: sw/inc/strings.hrc:870
 msgctxt "STR_USERFLD"
 msgid "User Field"
 msgstr "Maes Defnyddiwr"
 
-#: strings.hrc:869
+#: sw/inc/strings.hrc:871
 msgctxt "STR_POSTITFLD"
 msgid "Note"
 msgstr "Nodyn"
 
-#: strings.hrc:870
+#: sw/inc/strings.hrc:872
 msgctxt "STR_SCRIPTFLD"
 msgid "Script"
 msgstr "Sgript"
 
-#: strings.hrc:871
+#: sw/inc/strings.hrc:873
 msgctxt "STR_AUTHORITY"
 msgid "Bibliography entry"
 msgstr "Cofnod llyfryddiaeth"
 
-#: strings.hrc:872
+#: sw/inc/strings.hrc:874
 msgctxt "STR_HIDDENPARAFLD"
 msgid "Hidden Paragraph"
 msgstr "Paragraff Cudd"
 
 #. range DocumentInfo
-#: strings.hrc:874
+#: sw/inc/strings.hrc:876
 msgctxt "STR_DOCINFOFLD"
 msgid "DocInformation"
 msgstr "Manylion Dogfen"
@@ -4518,74 +4528,74 @@ msgstr "Manylion Dogfen"
 #. --------------------------------------------------------------------
 #. Description: SubCmd-Strings
 #. --------------------------------------------------------------------
-#: strings.hrc:878
+#: sw/inc/strings.hrc:880
 msgctxt "FLD_DATE_STD"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: strings.hrc:879
+#: sw/inc/strings.hrc:881
 msgctxt "FLD_DATE_FIX"
 msgid "Date (fixed)"
 msgstr "Dyddiad (gosodedig)"
 
-#: strings.hrc:880
+#: sw/inc/strings.hrc:882
 msgctxt "FLD_TIME_STD"
 msgid "Time"
 msgstr "Amser"
 
-#: strings.hrc:881
+#: sw/inc/strings.hrc:883
 msgctxt "FLD_TIME_FIX"
 msgid "Time (fixed)"
 msgstr "Amser (gosodedig)"
 
 #. SubCmd Statistic
-#: strings.hrc:883
+#: sw/inc/strings.hrc:885
 msgctxt "FLD_STAT_TABLE"
 msgid "Tables"
 msgstr "Tablau"
 
-#: strings.hrc:884
+#: sw/inc/strings.hrc:886
 msgctxt "FLD_STAT_CHAR"
 msgid "Characters"
 msgstr "Nodau"
 
-#: strings.hrc:885
+#: sw/inc/strings.hrc:887
 msgctxt "FLD_STAT_WORD"
 msgid "Words"
 msgstr "Geiriau"
 
-#: strings.hrc:886
+#: sw/inc/strings.hrc:888
 msgctxt "FLD_STAT_PARA"
 msgid "Paragraphs"
 msgstr "Paragraffau"
 
-#: strings.hrc:887
+#: sw/inc/strings.hrc:889
 msgctxt "FLD_STAT_GRF"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:888
+#: sw/inc/strings.hrc:890
 msgctxt "FLD_STAT_OBJ"
 msgid "Objects"
 msgstr "Gwrthrychau"
 
-#: strings.hrc:889
+#: sw/inc/strings.hrc:891
 msgctxt "FLD_STAT_PAGE"
 msgid "Pages"
 msgstr "Tudalennau"
 
 #. SubCmd DDETypes
-#: strings.hrc:891
+#: sw/inc/strings.hrc:893
 msgctxt "FMT_DDE_HOT"
 msgid "DDE automatic"
 msgstr "DDE awtomatig"
 
-#: strings.hrc:892
+#: sw/inc/strings.hrc:894
 msgctxt "FMT_DDE_NORMAL"
 msgid "DDE manual"
 msgstr "DDE llaw"
 
-#: strings.hrc:893
+#: sw/inc/strings.hrc:895
 msgctxt "FLD_INPUT_TEXT"
 msgid "[Text]"
 msgstr "[Text]"
@@ -4593,87 +4603,87 @@ msgstr "[Text]"
 #. --------------------------------------------------------------------
 #. Description: SubType Extuser
 #. --------------------------------------------------------------------
-#: strings.hrc:898
+#: sw/inc/strings.hrc:900
 msgctxt "FLD_EU_FIRMA"
 msgid "Company"
 msgstr "Cwmni"
 
-#: strings.hrc:899
+#: sw/inc/strings.hrc:901
 msgctxt "FLD_EU_VORNAME"
 msgid "First Name"
 msgstr "Enw Cyntaf"
 
-#: strings.hrc:900
+#: sw/inc/strings.hrc:902
 msgctxt "FLD_EU_NAME"
 msgid "Last Name"
 msgstr "Enw Olaf"
 
-#: strings.hrc:901
+#: sw/inc/strings.hrc:903
 msgctxt "FLD_EU_ABK"
 msgid "Initials"
 msgstr "Llythrennau Blaen"
 
-#: strings.hrc:902
+#: sw/inc/strings.hrc:904
 msgctxt "FLD_EU_STRASSE"
 msgid "Street"
 msgstr "Stryd"
 
-#: strings.hrc:903
+#: sw/inc/strings.hrc:905
 msgctxt "FLD_EU_LAND"
 msgid "Country"
 msgstr "Gwlad"
 
-#: strings.hrc:904
+#: sw/inc/strings.hrc:906
 msgctxt "FLD_EU_PLZ"
 msgid "Zip code"
 msgstr "Cod post"
 
-#: strings.hrc:905
+#: sw/inc/strings.hrc:907
 msgctxt "FLD_EU_ORT"
 msgid "City"
 msgstr "Tref/Dinas"
 
-#: strings.hrc:906
+#: sw/inc/strings.hrc:908
 msgctxt "FLD_EU_TITEL"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:907
+#: sw/inc/strings.hrc:909
 msgctxt "FLD_EU_POS"
 msgid "Position"
 msgstr "Safle"
 
-#: strings.hrc:908
+#: sw/inc/strings.hrc:910
 msgctxt "FLD_EU_TELPRIV"
 msgid "Tel. (Home)"
 msgstr "Ffôn (Cartref)"
 
-#: strings.hrc:909
+#: sw/inc/strings.hrc:911
 msgctxt "FLD_EU_TELFIRMA"
 msgid "Tel. (Work)"
 msgstr "Ffôn (Gwaith)"
 
-#: strings.hrc:910
+#: sw/inc/strings.hrc:912
 msgctxt "FLD_EU_FAX"
 msgid "FAX"
 msgstr "FFACS"
 
-#: strings.hrc:911
+#: sw/inc/strings.hrc:913
 msgctxt "FLD_EU_EMAIL"
 msgid "E-mail"
 msgstr "E-bost"
 
-#: strings.hrc:912
+#: sw/inc/strings.hrc:914
 msgctxt "FLD_EU_STATE"
 msgid "State"
 msgstr "Sir/Talaith"
 
-#: strings.hrc:913
+#: sw/inc/strings.hrc:915
 msgctxt "FLD_PAGEREF_OFF"
 msgid "off"
 msgstr "diffodd"
 
-#: strings.hrc:914
+#: sw/inc/strings.hrc:916
 msgctxt "FLD_PAGEREF_ON"
 msgid "on"
 msgstr "ymlaen"
@@ -4682,32 +4692,32 @@ msgstr "ymlaen"
 #. Description: path name
 #. --------------------------------------------------------------------
 #. Format FileName
-#: strings.hrc:919
+#: sw/inc/strings.hrc:921
 msgctxt "FMT_FF_NAME"
 msgid "File name"
 msgstr "Enw ffeil"
 
-#: strings.hrc:920
+#: sw/inc/strings.hrc:922
 msgctxt "FMT_FF_NAME_NOEXT"
 msgid "File name without extension"
 msgstr "Enw ffeil heb estyniad"
 
-#: strings.hrc:921
+#: sw/inc/strings.hrc:923
 msgctxt "FMT_FF_PATHNAME"
 msgid "Path/File name"
 msgstr "Enw Llwybr/Ffeil"
 
-#: strings.hrc:922
+#: sw/inc/strings.hrc:924
 msgctxt "FMT_FF_PATH"
 msgid "Path"
 msgstr "Llwybr"
 
-#: strings.hrc:923
+#: sw/inc/strings.hrc:925
 msgctxt "FMT_FF_UI_NAME"
 msgid "Style"
 msgstr "Arddull"
 
-#: strings.hrc:924
+#: sw/inc/strings.hrc:926
 msgctxt "FMT_FF_UI_RANGE"
 msgid "Category"
 msgstr "Categori"
@@ -4715,22 +4725,22 @@ msgstr "Categori"
 #. --------------------------------------------------------------------
 #. Description: format chapter
 #. --------------------------------------------------------------------
-#: strings.hrc:928
+#: sw/inc/strings.hrc:930
 msgctxt "FMT_CHAPTER_NAME"
 msgid "Chapter name"
 msgstr "Enw pennawd"
 
-#: strings.hrc:929
+#: sw/inc/strings.hrc:931
 msgctxt "FMT_CHAPTER_NO"
 msgid "Chapter number"
 msgstr "Rhif pennod"
 
-#: strings.hrc:930
+#: sw/inc/strings.hrc:932
 msgctxt "FMT_CHAPTER_NO_NOSEPARATOR"
 msgid "Chapter number without separator"
 msgstr "Rhif pennawd heb ymwahanydd"
 
-#: strings.hrc:931
+#: sw/inc/strings.hrc:933
 msgctxt "FMT_CHAPTER_NAMENO"
 msgid "Chapter number and name"
 msgstr "Rhif ac enw pennawd"
@@ -4738,47 +4748,47 @@ msgstr "Rhif ac enw pennawd"
 #. --------------------------------------------------------------------
 #. Description: formats
 #. --------------------------------------------------------------------
-#: strings.hrc:935
+#: sw/inc/strings.hrc:937
 msgctxt "FMT_NUM_ABC"
 msgid "A B C"
 msgstr "A B C"
 
-#: strings.hrc:936
+#: sw/inc/strings.hrc:938
 msgctxt "FMT_NUM_SABC"
 msgid "a b c"
 msgstr "a b c"
 
-#: strings.hrc:937
+#: sw/inc/strings.hrc:939
 msgctxt "FMT_NUM_ABC_N"
 msgid "A .. AA .. AAA"
 msgstr "A .. AA .. AAA"
 
-#: strings.hrc:938
+#: sw/inc/strings.hrc:940
 msgctxt "FMT_NUM_SABC_N"
 msgid "a .. aa .. aaa"
 msgstr "a .. aa .. aaa"
 
-#: strings.hrc:939
+#: sw/inc/strings.hrc:941
 msgctxt "FMT_NUM_ROMAN"
 msgid "Roman (I II III)"
 msgstr "Rhufeinig (I II III)"
 
-#: strings.hrc:940
+#: sw/inc/strings.hrc:942
 msgctxt "FMT_NUM_SROMAN"
 msgid "Roman (i ii iii)"
 msgstr "Rhufeinig (i ii iii)"
 
-#: strings.hrc:941
+#: sw/inc/strings.hrc:943
 msgctxt "FMT_NUM_ARABIC"
 msgid "Arabic (1 2 3)"
 msgstr "Arabeg (1 2 3)"
 
-#: strings.hrc:942
+#: sw/inc/strings.hrc:944
 msgctxt "FMT_NUM_PAGEDESC"
 msgid "As Page Style"
 msgstr "Fel Arddull Tudalen"
 
-#: strings.hrc:943
+#: sw/inc/strings.hrc:945
 msgctxt "FMT_NUM_PAGESPECIAL"
 msgid "Text"
 msgstr "Testun"
@@ -4786,12 +4796,12 @@ msgstr "Testun"
 #. --------------------------------------------------------------------
 #. Description: Author
 #. --------------------------------------------------------------------
-#: strings.hrc:947
+#: sw/inc/strings.hrc:949
 msgctxt "FMT_AUTHOR_NAME"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:948
+#: sw/inc/strings.hrc:950
 msgctxt "FMT_AUTHOR_SCUT"
 msgid "Initials"
 msgstr "Llythrennau Blaen"
@@ -4799,42 +4809,42 @@ msgstr "Llythrennau Blaen"
 #. --------------------------------------------------------------------
 #. Description:   set variable
 #. --------------------------------------------------------------------
-#: strings.hrc:952
+#: sw/inc/strings.hrc:954
 msgctxt "FMT_SETVAR_SYS"
 msgid "System"
 msgstr "System"
 
-#: strings.hrc:953
+#: sw/inc/strings.hrc:955
 msgctxt "FMT_SETVAR_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:954
+#: sw/inc/strings.hrc:956
 msgctxt "FMT_GETVAR_NAME"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:955
+#: sw/inc/strings.hrc:957
 msgctxt "FMT_GETVAR_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:956
+#: sw/inc/strings.hrc:958
 msgctxt "FMT_USERVAR_CMD"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: strings.hrc:957
+#: sw/inc/strings.hrc:959
 msgctxt "FMT_USERVAR_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:958
+#: sw/inc/strings.hrc:960
 msgctxt "FMT_DBFLD_DB"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: strings.hrc:959
+#: sw/inc/strings.hrc:961
 msgctxt "FMT_DBFLD_SYS"
 msgid "System"
 msgstr "System"
@@ -4842,17 +4852,17 @@ msgstr "System"
 #. --------------------------------------------------------------------
 #. Description: storage fields
 #. --------------------------------------------------------------------
-#: strings.hrc:963
+#: sw/inc/strings.hrc:965
 msgctxt "FMT_REG_AUTHOR"
 msgid "Author"
 msgstr "Awdur"
 
-#: strings.hrc:964
+#: sw/inc/strings.hrc:966
 msgctxt "FMT_REG_TIME"
 msgid "Time"
 msgstr "Amser"
 
-#: strings.hrc:965
+#: sw/inc/strings.hrc:967
 msgctxt "FMT_REG_DATE"
 msgid "Date"
 msgstr "Dyddiad"
@@ -4860,85 +4870,95 @@ msgstr "Dyddiad"
 #. --------------------------------------------------------------------
 #. Description: formats references
 #. --------------------------------------------------------------------
-#: strings.hrc:969
+#: sw/inc/strings.hrc:971
 msgctxt "FMT_REF_TEXT"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: strings.hrc:970
+#: sw/inc/strings.hrc:972
 msgctxt "FMT_REF_PAGE"
 msgid "Page"
 msgstr "Tudalen"
 
-#: strings.hrc:971
+#: sw/inc/strings.hrc:973
 msgctxt "FMT_REF_CHAPTER"
 msgid "Chapter"
 msgstr "Pennod"
 
-#: strings.hrc:972
+#: sw/inc/strings.hrc:974
 msgctxt "FMT_REF_UPDOWN"
 msgid "Above/Below"
 msgstr "Uwchlaw/Islaw"
 
-#: strings.hrc:973
+#: sw/inc/strings.hrc:975
 msgctxt "FMT_REF_PAGE_PGDSC"
 msgid "As Page Style"
 msgstr "Fel Arddull Tudalen"
 
-#: strings.hrc:974
+#: sw/inc/strings.hrc:976
 msgctxt "FMT_REF_ONLYNUMBER"
 msgid "Category and Number"
 msgstr "Categori a Rhif"
 
-#: strings.hrc:975
+#: sw/inc/strings.hrc:977
 msgctxt "FMT_REF_ONLYCAPTION"
 msgid "Caption Text"
 msgstr "Testun Egluryn"
 
-#: strings.hrc:976
+#: sw/inc/strings.hrc:978
 msgctxt "FMT_REF_ONLYSEQNO"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: strings.hrc:977
+#: sw/inc/strings.hrc:979
 msgctxt "FMT_REF_NUMBER"
 msgid "Number"
 msgstr "Rhif"
 
-#: strings.hrc:978
+#: sw/inc/strings.hrc:980
 msgctxt "FMT_REF_NUMBER_NO_CONTEXT"
 msgid "Number (no context)"
 msgstr "Rhif (dim cyd-destun)"
 
-#: strings.hrc:979
+#: sw/inc/strings.hrc:981
 msgctxt "FMT_REF_NUMBER_FULL_CONTEXT"
 msgid "Number (full context)"
 msgstr "Rhif (cyd-destun llawn)"
 
+#: sw/inc/strings.hrc:983
+msgctxt "FMT_REF_WITH_LOWERCASE_HU_ARTICLE"
+msgid "Article a/az + "
+msgstr "Erthygl a/az + "
+
+#: sw/inc/strings.hrc:984
+msgctxt "FMT_REF_WITH_UPPERCASE_HU_ARTICLE"
+msgid "Article A/Az + "
+msgstr "Erthygl A/Az + "
+
 #. --------------------------------------------------------------------
 #. Description: placeholder
 #. --------------------------------------------------------------------
-#: strings.hrc:983
+#: sw/inc/strings.hrc:988
 msgctxt "FMT_MARK_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:984
+#: sw/inc/strings.hrc:989
 msgctxt "FMT_MARK_TABLE"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:985
+#: sw/inc/strings.hrc:990
 msgctxt "FMT_MARK_FRAME"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: strings.hrc:986
+#: sw/inc/strings.hrc:991
 msgctxt "FMT_MARK_GRAFIC"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:987
+#: sw/inc/strings.hrc:992
 msgctxt "FMT_MARK_OLE"
 msgid "Object"
 msgstr "Gwrthrych"
@@ -4946,1288 +4966,1232 @@ msgstr "Gwrthrych"
 #. --------------------------------------------------------------------
 #. Description:   ExchangeStrings for Edit/NameFT
 #. --------------------------------------------------------------------
-#: strings.hrc:991
+#: sw/inc/strings.hrc:996
 msgctxt "STR_COND"
 msgid "~Condition"
 msgstr "~Amod"
 
-#: strings.hrc:992
+#: sw/inc/strings.hrc:997
 msgctxt "STR_TEXT"
 msgid "Then, Else"
 msgstr "Yna, Neu"
 
-#: strings.hrc:993
+#: sw/inc/strings.hrc:998
 msgctxt "STR_DDE_CMD"
 msgid "DDE Statement"
 msgstr "DDE Datganiad"
 
-#: strings.hrc:994
+#: sw/inc/strings.hrc:999
 msgctxt "STR_INSTEXT"
 msgid "Hidden t~ext"
 msgstr "Testun c~udd"
 
-#: strings.hrc:995
+#: sw/inc/strings.hrc:1000
 msgctxt "STR_MACNAME"
 msgid "~Macro name"
 msgstr "~Enw macro"
 
-#: strings.hrc:996
+#: sw/inc/strings.hrc:1001
 msgctxt "STR_PROMPT"
 msgid "~Reference"
 msgstr "~Cyfeirnod"
 
-#: strings.hrc:997
+#: sw/inc/strings.hrc:1002
 msgctxt "STR_COMBCHRS_FT"
 msgid "Ch~aracters"
 msgstr "N~odau"
 
-#: strings.hrc:998
+#: sw/inc/strings.hrc:1003
 msgctxt "STR_OFFSET"
 msgid "O~ffset"
 msgstr "~Atred"
 
-#: strings.hrc:999
+#: sw/inc/strings.hrc:1004
 msgctxt "STR_VALUE"
 msgid "Value"
 msgstr "Gwerth"
 
-#: strings.hrc:1000
+#: sw/inc/strings.hrc:1005
 msgctxt "STR_FORMULA"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: strings.hrc:1001
+#: sw/inc/strings.hrc:1006
 msgctxt "STR_CUSTOM_FIELD"
 msgid "Custom"
 msgstr "Cyfaddas"
 
-#: strings.hrc:1003
+#: sw/inc/strings.hrc:1008
 msgctxt "STR_CUSTOM_LABEL"
 msgid "[User]"
 msgstr "[Defnyddiwr]"
 
-#: strings.hrc:1005
+#: sw/inc/strings.hrc:1010
 msgctxt "STR_HDIST"
 msgid "H. Pitch"
 msgstr "Gogwydd Ll."
 
-#: strings.hrc:1006
+#: sw/inc/strings.hrc:1011
 msgctxt "STR_VDIST"
 msgid "V. Pitch"
 msgstr "Gogwydd F."
 
-#: strings.hrc:1007
+#: sw/inc/strings.hrc:1012
 msgctxt "STR_WIDTH"
 msgid "Width"
 msgstr "Lled"
 
-#: strings.hrc:1008
+#: sw/inc/strings.hrc:1013
 msgctxt "STR_HEIGHT"
 msgid "Height"
 msgstr "Uchder"
 
-#: strings.hrc:1009
+#: sw/inc/strings.hrc:1014
 msgctxt "STR_LEFT"
 msgid "Left margin"
 msgstr "Ymyl chwith"
 
-#: strings.hrc:1010
+#: sw/inc/strings.hrc:1015
 msgctxt "STR_UPPER"
 msgid "Top margin"
 msgstr "Ymyl uchaf"
 
-#: strings.hrc:1011
+#: sw/inc/strings.hrc:1016
 msgctxt "STR_COLS"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: strings.hrc:1012
+#: sw/inc/strings.hrc:1017
 msgctxt "STR_ROWS"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: strings.hrc:1014
+#: sw/inc/strings.hrc:1019
 msgctxt "STR_SERVICE_UNAVAILABLE"
 msgid "The following service is not available: "
 msgstr "Nid yw'r gwasanaeth canlynol ar gael: "
 
-#: strings.hrc:1016
+#: sw/inc/strings.hrc:1021
 msgctxt "STR_WORDCOUNT_HINT"
 msgid "Word and character count. Click to open Word Count dialog."
 msgstr "Cyfrif gair a nod. Cliciwch i agor y ddeialog Cyfrif Geiriau."
 
-#: strings.hrc:1017
+#: sw/inc/strings.hrc:1022
 msgctxt "STR_VIEWLAYOUT_ONE"
 msgid "Single-page view"
 msgstr "Golwg un tudalen"
 
-#: strings.hrc:1018
+#: sw/inc/strings.hrc:1023
 msgctxt "STR_VIEWLAYOUT_MULTI"
 msgid "Multiple-page view"
 msgstr "Golwg tudalen lluosog"
 
-#: strings.hrc:1019
+#: sw/inc/strings.hrc:1024
 msgctxt "STR_VIEWLAYOUT_BOOK"
 msgid "Book view"
 msgstr "Golwg llyfr"
 
-#: strings.hrc:1020
+#: sw/inc/strings.hrc:1025
 msgctxt "STR_BOOKCTRL_HINT"
-msgid "Page number in document. Click to open Navigator window or right-click for bookmark list."
-msgstr "Rhif tudalen mewn dogfen. Cliciwch i agor y ffenestr Llywiwr neu rhoi clic de ar gyfer y rhestr nodau tudalen."
+msgid "Page number in document. Click to open Go to Page dialog or right-click for bookmark list."
+msgstr "Rhif tudalen mewn dogfen. Cliciwch i agor y ddeialog Mynd i Dudalen neu rhoi clic de ar gyfer y rhestr nodau tudalen."
 
-#: strings.hrc:1021
+#: sw/inc/strings.hrc:1026
 msgctxt "STR_BOOKCTRL_HINT_EXTENDED"
-msgid "Page number in document (Page number on printed document). Click to open Navigator window."
-msgstr "Rhif tudalen yn y ddogfen (Rhif tudalen ar ddogfen wedi ei hargraffu). Cliciwch i agor ffenestr Llywio."
+msgid "Page number in document (Page number on printed document). Click to open Go to Page dialog."
+msgstr "Rhif tudalen yn y ddogfen (Rhif tudalen ar ddogfen wedi ei hargraffu). Cliciwch i agor deialog Mynd i Dudalen."
 
-#: strings.hrc:1022
+#: sw/inc/strings.hrc:1027
 msgctxt "STR_TMPLCTRL_HINT"
 msgid "Page Style. Right-click to change style or click to open Style dialog."
 msgstr "Arddull Tudalen. Rhowch glic de i newid arddull neu glicio i agor y ddeialog Arddull."
 
 #. Strings for textual attributes.
-#: strings.hrc:1025
+#: sw/inc/strings.hrc:1030
 msgctxt "STR_DROP_OVER"
 msgid "Drop Caps over"
 msgstr "Priflythrennau Bach dros"
 
-#: strings.hrc:1026
+#: sw/inc/strings.hrc:1031
 msgctxt "STR_DROP_LINES"
 msgid "rows"
 msgstr "rhesi"
 
-#: strings.hrc:1027
+#: sw/inc/strings.hrc:1032
 msgctxt "STR_NO_DROP_LINES"
 msgid "No Drop Caps"
 msgstr "Dim Priflythrennau Bach"
 
-#: strings.hrc:1028
+#: sw/inc/strings.hrc:1033
 msgctxt "STR_NO_PAGEDESC"
 msgid "No page break"
 msgstr "Dim toriad tudalen"
 
-#: strings.hrc:1029
+#: sw/inc/strings.hrc:1034
 msgctxt "STR_NO_MIRROR"
 msgid "Don't mirror"
 msgstr "Peidio adlewyrchu"
 
-#: strings.hrc:1030
+#: sw/inc/strings.hrc:1035
 msgctxt "STR_VERT_MIRROR"
 msgid "Flip vertically"
 msgstr "Gwrthdroi'n fertigol"
 
-#: strings.hrc:1031
+#: sw/inc/strings.hrc:1036
 msgctxt "STR_HORI_MIRROR"
 msgid "Flip horizontal"
 msgstr "Gwrthdroi'n llorweddol"
 
-#: strings.hrc:1032
+#: sw/inc/strings.hrc:1037
 msgctxt "STR_BOTH_MIRROR"
 msgid "Horizontal and Vertical Flip"
 msgstr "Gwrthdroi Llorweddol a Fertigol"
 
-#: strings.hrc:1033
+#: sw/inc/strings.hrc:1038
 msgctxt "STR_MIRROR_TOGGLE"
 msgid "+ mirror horizontal on even pages"
 msgstr "+ adlewyrchu'n llorweddol ar dudalennau eilrif"
 
-#: strings.hrc:1034
+#: sw/inc/strings.hrc:1039
 msgctxt "STR_CHARFMT"
 msgid "Character Style"
 msgstr "Arddull Nod"
 
-#: strings.hrc:1035
+#: sw/inc/strings.hrc:1040
 msgctxt "STR_NO_CHARFMT"
 msgid "No Character Style"
 msgstr "Dim Arddull Nod"
 
-#: strings.hrc:1036
+#: sw/inc/strings.hrc:1041
 msgctxt "STR_FOOTER"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: strings.hrc:1037
+#: sw/inc/strings.hrc:1042
 msgctxt "STR_NO_FOOTER"
 msgid "No footer"
 msgstr "Dim troedyn"
 
-#: strings.hrc:1038
+#: sw/inc/strings.hrc:1043
 msgctxt "STR_HEADER"
 msgid "Header"
 msgstr "Pennyn"
 
-#: strings.hrc:1039
+#: sw/inc/strings.hrc:1044
 msgctxt "STR_NO_HEADER"
 msgid "No header"
 msgstr "Dim pennyn"
 
-#: strings.hrc:1040
+#: sw/inc/strings.hrc:1045
 msgctxt "STR_SURROUND_IDEAL"
 msgid "Optimal wrap"
 msgstr "Amlapio gorau"
 
-#: strings.hrc:1041
+#: sw/inc/strings.hrc:1046
 msgctxt "STR_SURROUND_NONE"
 msgid "No wrap"
 msgstr "Dim amlap"
 
-#: strings.hrc:1042
+#: sw/inc/strings.hrc:1047
 msgctxt "STR_SURROUND_THROUGH"
 msgid "Through"
 msgstr "Parhau"
 
-#: strings.hrc:1043
+#: sw/inc/strings.hrc:1048
 msgctxt "STR_SURROUND_PARALLEL"
 msgid "Parallel wrap"
 msgstr "Amlapio paralel"
 
-#: strings.hrc:1044
+#: sw/inc/strings.hrc:1049
 msgctxt "STR_SURROUND_LEFT"
 msgid "Left wrap"
 msgstr "Amlapio i'r chwith"
 
-#: strings.hrc:1045
+#: sw/inc/strings.hrc:1050
 msgctxt "STR_SURROUND_RIGHT"
 msgid "Right wrap"
 msgstr "Amlapio i'r dde"
 
-#: strings.hrc:1046
+#: sw/inc/strings.hrc:1051
 msgctxt "STR_SURROUND_ANCHORONLY"
 msgid "(Anchor only)"
 msgstr "(Angor yn unig)"
 
-#: strings.hrc:1047
+#: sw/inc/strings.hrc:1052
 msgctxt "STR_FRM_WIDTH"
 msgid "Width:"
 msgstr "Lled:"
 
-#: strings.hrc:1048
+#: sw/inc/strings.hrc:1053
 msgctxt "STR_FRM_FIXEDHEIGHT"
 msgid "Fixed height:"
 msgstr "Uchder gosodedig:"
 
-#: strings.hrc:1049
+#: sw/inc/strings.hrc:1054
 msgctxt "STR_FRM_MINHEIGHT"
 msgid "Min. height:"
 msgstr "Uchder lleiaf:"
 
-#: strings.hrc:1050
+#: sw/inc/strings.hrc:1055
 msgctxt "STR_FLY_AT_PARA"
 msgid "to paragraph"
 msgstr "i baragraff"
 
-#: strings.hrc:1051
+#: sw/inc/strings.hrc:1056
 msgctxt "STR_FLY_AS_CHAR"
 msgid "to character"
 msgstr "i nod"
 
-#: strings.hrc:1052
+#: sw/inc/strings.hrc:1057
 msgctxt "STR_FLY_AT_PAGE"
 msgid "to page"
 msgstr "i dudalen"
 
-#: strings.hrc:1053
+#: sw/inc/strings.hrc:1058
 msgctxt "STR_POS_X"
 msgid "X Coordinate:"
 msgstr "Cyfesuryn X:"
 
-#: strings.hrc:1054
+#: sw/inc/strings.hrc:1059
 msgctxt "STR_POS_Y"
 msgid "Y Coordinate:"
 msgstr "Cyfesuryn Y:"
 
-#: strings.hrc:1055
+#: sw/inc/strings.hrc:1060
 msgctxt "STR_VERT_TOP"
 msgid "at top"
 msgstr "ar y brig"
 
-#: strings.hrc:1056
+#: sw/inc/strings.hrc:1061
 msgctxt "STR_VERT_CENTER"
 msgid "Centered vertically"
 msgstr "Canoli fertigol"
 
-#: strings.hrc:1057
+#: sw/inc/strings.hrc:1062
 msgctxt "STR_VERT_BOTTOM"
 msgid "at bottom"
 msgstr "ar y gwaelod"
 
-#: strings.hrc:1058
+#: sw/inc/strings.hrc:1063
 msgctxt "STR_LINE_TOP"
 msgid "Top of line"
 msgstr "Brig y llinell"
 
-#: strings.hrc:1059
+#: sw/inc/strings.hrc:1064
 msgctxt "STR_LINE_CENTER"
 msgid "Line centered"
 msgstr "Canoli llinell"
 
-#: strings.hrc:1060
+#: sw/inc/strings.hrc:1065
 msgctxt "STR_LINE_BOTTOM"
 msgid "Bottom of line"
 msgstr "Gwaelod y llinell"
 
-#: strings.hrc:1061
+#: sw/inc/strings.hrc:1066
 msgctxt "STR_REGISTER_ON"
 msgid "Register-true"
 msgstr "Cofrestr cywir"
 
-#: strings.hrc:1062
+#: sw/inc/strings.hrc:1067
 msgctxt "STR_REGISTER_OFF"
 msgid "Not register-true"
 msgstr "Nid cofrestr cywir"
 
-#: strings.hrc:1063
+#: sw/inc/strings.hrc:1068
 msgctxt "STR_HORI_RIGHT"
 msgid "at the right"
 msgstr "ar y dde"
 
-#: strings.hrc:1064
+#: sw/inc/strings.hrc:1069
 msgctxt "STR_HORI_CENTER"
 msgid "Centered horizontally"
 msgstr "Canoli llorweddol"
 
-#: strings.hrc:1065
+#: sw/inc/strings.hrc:1070
 msgctxt "STR_HORI_LEFT"
 msgid "at the left"
 msgstr "ar y chwith"
 
-#: strings.hrc:1066
+#: sw/inc/strings.hrc:1071
 msgctxt "STR_HORI_INSIDE"
 msgid "inside"
 msgstr "tu fewn"
 
-#: strings.hrc:1067
+#: sw/inc/strings.hrc:1072
 msgctxt "STR_HORI_OUTSIDE"
 msgid "outside"
 msgstr "tu allan"
 
-#: strings.hrc:1068
+#: sw/inc/strings.hrc:1073
 msgctxt "STR_HORI_FULL"
 msgid "Full width"
 msgstr "Lled llawn"
 
-#: strings.hrc:1069
+#: sw/inc/strings.hrc:1074
 msgctxt "STR_COLUMNS"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: strings.hrc:1070
+#: sw/inc/strings.hrc:1075
 msgctxt "STR_LINE_WIDTH"
 msgid "Separator Width:"
 msgstr "Lled Ymwahanydd:"
 
-#: strings.hrc:1071
+#: sw/inc/strings.hrc:1076
 msgctxt "STR_MAX_FTN_HEIGHT"
 msgid "Max. footnote area:"
 msgstr "Ardal troednodyn eithaf:"
 
-#: strings.hrc:1072
+#: sw/inc/strings.hrc:1077
 msgctxt "STR_EDIT_IN_READONLY"
 msgid "Editable in read-only document"
 msgstr "Golygadwy mewn dogfen darllen yn unig"
 
-#: strings.hrc:1073
+#: sw/inc/strings.hrc:1078
 msgctxt "STR_LAYOUT_SPLIT"
 msgid "Split"
 msgstr "Hollti"
 
-#: strings.hrc:1074
+#: sw/inc/strings.hrc:1079
 msgctxt "STR_NUMRULE_ON"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: strings.hrc:1075
+#: sw/inc/strings.hrc:1080
 msgctxt "STR_NUMRULE_OFF"
 msgid "no numbering"
 msgstr "dim rhifo"
 
-#: strings.hrc:1076
+#: sw/inc/strings.hrc:1081
 msgctxt "STR_CONNECT1"
 msgid "linked to "
 msgstr "cysylltwyd i "
 
-#: strings.hrc:1077
+#: sw/inc/strings.hrc:1082
 msgctxt "STR_CONNECT2"
 msgid "and "
 msgstr "a "
 
-#: strings.hrc:1078
+#: sw/inc/strings.hrc:1083
 msgctxt "STR_LINECOUNT"
 msgid "Count lines"
 msgstr "Cyfrif llinellau"
 
-#: strings.hrc:1079
+#: sw/inc/strings.hrc:1084
 msgctxt "STR_DONTLINECOUNT"
 msgid "don't count lines"
 msgstr "peidio cyfrif llinellau"
 
-#: strings.hrc:1080
+#: sw/inc/strings.hrc:1085
 msgctxt "STR_LINCOUNT_START"
 msgid "restart line count with: "
 msgstr "ailgychwyn cyfrif llinellau gyda: "
 
-#: strings.hrc:1081
+#: sw/inc/strings.hrc:1086
 msgctxt "STR_LUMINANCE"
 msgid "Brightness: "
 msgstr "Disgleirdeb: "
 
-#: strings.hrc:1082
+#: sw/inc/strings.hrc:1087
 msgctxt "STR_CHANNELR"
 msgid "Red: "
 msgstr "Coch: "
 
-#: strings.hrc:1083
+#: sw/inc/strings.hrc:1088
 msgctxt "STR_CHANNELG"
 msgid "Green: "
 msgstr "Gwyrdd: "
 
-#: strings.hrc:1084
+#: sw/inc/strings.hrc:1089
 msgctxt "STR_CHANNELB"
 msgid "Blue: "
 msgstr "Glas: "
 
-#: strings.hrc:1085
+#: sw/inc/strings.hrc:1090
 msgctxt "STR_CONTRAST"
 msgid "Contrast: "
 msgstr "Cyferbyniad: "
 
-#: strings.hrc:1086
+#: sw/inc/strings.hrc:1091
 msgctxt "STR_GAMMA"
 msgid "Gamma: "
 msgstr "Gama: "
 
-#: strings.hrc:1087
+#: sw/inc/strings.hrc:1092
 msgctxt "STR_TRANSPARENCY"
 msgid "Transparency: "
 msgstr "Tryloywder: "
 
-#: strings.hrc:1088
+#: sw/inc/strings.hrc:1093
 msgctxt "STR_INVERT"
 msgid "Invert"
 msgstr "Gwrthdroi"
 
-#: strings.hrc:1089
+#: sw/inc/strings.hrc:1094
 msgctxt "STR_INVERT_NOT"
 msgid "do not invert"
 msgstr "peidio gwrthdroi"
 
-#: strings.hrc:1090
+#: sw/inc/strings.hrc:1095
 msgctxt "STR_DRAWMODE"
 msgid "Graphics mode: "
 msgstr "Modd graffig: "
 
-#: strings.hrc:1091
+#: sw/inc/strings.hrc:1096
 msgctxt "STR_DRAWMODE_STD"
 msgid "Standard"
 msgstr "Safonol"
 
-#: strings.hrc:1092
+#: sw/inc/strings.hrc:1097
 msgctxt "STR_DRAWMODE_GREY"
 msgid "Grayscales"
 msgstr "Graddlwyd"
 
-#: strings.hrc:1093
+#: sw/inc/strings.hrc:1098
 msgctxt "STR_DRAWMODE_BLACKWHITE"
 msgid "Black & White"
 msgstr "Du a Gwyn"
 
-#: strings.hrc:1094
+#: sw/inc/strings.hrc:1099
 msgctxt "STR_DRAWMODE_WATERMARK"
 msgid "Watermark"
 msgstr "Marc Dŵr"
 
-#: strings.hrc:1095
+#: sw/inc/strings.hrc:1100
 msgctxt "STR_ROTATION"
 msgid "Rotation"
 msgstr "Cylchdroi"
 
-#: strings.hrc:1096
+#: sw/inc/strings.hrc:1101
 msgctxt "STR_GRID_NONE"
 msgid "No grid"
 msgstr "Dim grid"
 
-#: strings.hrc:1097
+#: sw/inc/strings.hrc:1102
 msgctxt "STR_GRID_LINES_ONLY"
 msgid "Grid (lines only)"
 msgstr "Grid (llinell yn unig)"
 
-#: strings.hrc:1098
+#: sw/inc/strings.hrc:1103
 msgctxt "STR_GRID_LINES_CHARS"
 msgid "Grid (lines and characters)"
 msgstr "Grid (llinellau a nodau)"
 
-#: strings.hrc:1099
+#: sw/inc/strings.hrc:1104
 msgctxt "STR_FOLLOW_TEXT_FLOW"
 msgid "Follow text flow"
 msgstr "Dilyn llif testun"
 
-#: strings.hrc:1100
+#: sw/inc/strings.hrc:1105
 msgctxt "STR_DONT_FOLLOW_TEXT_FLOW"
 msgid "Do not follow text flow"
 msgstr "Peidio dilyn llif testun"
 
-#: strings.hrc:1101
+#: sw/inc/strings.hrc:1106
 msgctxt "STR_CONNECT_BORDER_ON"
 msgid "Merge borders"
 msgstr "Cyfuno borderi"
 
-#: strings.hrc:1102
+#: sw/inc/strings.hrc:1107
 msgctxt "STR_CONNECT_BORDER_OFF"
 msgid "Do not merge borders"
 msgstr "Peidio cyfuno'r borderi"
 
-#: strings.hrc:1104
+#: sw/inc/strings.hrc:1109
 msgctxt "ST_TBL"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:1105
+#: sw/inc/strings.hrc:1110
 msgctxt "ST_FRM"
 msgid "Text Frame"
 msgstr "Ffrâm Testun"
 
-#: strings.hrc:1106
+#: sw/inc/strings.hrc:1111
 msgctxt "ST_PGE"
 msgid "Page"
 msgstr "Tudalen"
 
-#: strings.hrc:1107
+#: sw/inc/strings.hrc:1112
 msgctxt "ST_DRW"
 msgid "Drawing"
 msgstr "Lluniadu"
 
-#: strings.hrc:1108
+#: sw/inc/strings.hrc:1113
 msgctxt "ST_CTRL"
 msgid "Control"
 msgstr "Rheolaeth"
 
-#: strings.hrc:1109
+#: sw/inc/strings.hrc:1114
 msgctxt "ST_REG"
 msgid "Section"
 msgstr "Adran"
 
-#: strings.hrc:1110
+#: sw/inc/strings.hrc:1115
 msgctxt "ST_BKM"
 msgid "Bookmark"
 msgstr "Nod Tudalen"
 
-#: strings.hrc:1111
+#: sw/inc/strings.hrc:1116
 msgctxt "ST_GRF"
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: strings.hrc:1112
+#: sw/inc/strings.hrc:1117
 msgctxt "ST_OLE"
 msgid "OLE object"
 msgstr "Gwrthrych OLE"
 
-#: strings.hrc:1113
+#: sw/inc/strings.hrc:1118
 msgctxt "ST_OUTL"
 msgid "Headings"
 msgstr "Penynnau"
 
-#: strings.hrc:1114
+#: sw/inc/strings.hrc:1119
 msgctxt "ST_SEL"
 msgid "Selection"
 msgstr "Dewis"
 
-#: strings.hrc:1115
+#: sw/inc/strings.hrc:1120
 msgctxt "ST_FTN"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: strings.hrc:1116
+#: sw/inc/strings.hrc:1121
 msgctxt "ST_MARK"
 msgid "Reminder"
 msgstr "Atgoffwr"
 
-#: strings.hrc:1117
+#: sw/inc/strings.hrc:1122
 msgctxt "ST_POSTIT"
 msgid "Comment"
 msgstr "Sylw"
 
-#: strings.hrc:1118
+#: sw/inc/strings.hrc:1123
 msgctxt "ST_SRCH_REP"
 msgid "Repeat search"
 msgstr "Ailadrodd chwilio"
 
-#: strings.hrc:1119
+#: sw/inc/strings.hrc:1124
 msgctxt "ST_INDEX_ENTRY"
 msgid "Index entry"
 msgstr "Cofnod mynegai"
 
-#: strings.hrc:1120
+#: sw/inc/strings.hrc:1125
 msgctxt "ST_TABLE_FORMULA"
 msgid "Table formula"
 msgstr "Fformiwla tabl"
 
-#: strings.hrc:1121
+#: sw/inc/strings.hrc:1126
 msgctxt "ST_TABLE_FORMULA_ERROR"
 msgid "Wrong table formula"
 msgstr "Fformiwla tabl anghywir"
 
 #. Strings for the quickhelp of the View-PgUp/Down-Buttons
-#: strings.hrc:1123
+#: sw/inc/strings.hrc:1128
 msgctxt "STR_IMGBTN_TBL_DOWN"
 msgid "Next table"
 msgstr "Tabl nesaf"
 
-#: strings.hrc:1124
+#: sw/inc/strings.hrc:1129
 msgctxt "STR_IMGBTN_FRM_DOWN"
 msgid "Next text frame"
 msgstr "Ffrâm testun nesaf"
 
-#: strings.hrc:1125
+#: sw/inc/strings.hrc:1130
 msgctxt "STR_IMGBTN_PGE_DOWN"
 msgid "Next page"
 msgstr "Tudalen nesaf"
 
-#: strings.hrc:1126
+#: sw/inc/strings.hrc:1131
 msgctxt "STR_IMGBTN_DRW_DOWN"
 msgid "Next drawing"
 msgstr "Llun nesaf"
 
-#: strings.hrc:1127
+#: sw/inc/strings.hrc:1132
 msgctxt "STR_IMGBTN_CTRL_DOWN"
 msgid "Next control"
 msgstr "Rheolydd nesaf"
 
-#: strings.hrc:1128
+#: sw/inc/strings.hrc:1133
 msgctxt "STR_IMGBTN_REG_DOWN"
 msgid "Next section"
 msgstr "Adran nesaf"
 
-#: strings.hrc:1129
+#: sw/inc/strings.hrc:1134
 msgctxt "STR_IMGBTN_BKM_DOWN"
 msgid "Next bookmark"
 msgstr "Nod tudalen nesaf"
 
-#: strings.hrc:1130
+#: sw/inc/strings.hrc:1135
 msgctxt "STR_IMGBTN_GRF_DOWN"
 msgid "Next graphic"
 msgstr "Graffig nesaf"
 
-#: strings.hrc:1131
+#: sw/inc/strings.hrc:1136
 msgctxt "STR_IMGBTN_OLE_DOWN"
 msgid "Next OLE object"
 msgstr "Gwrthrych OLE nesaf"
 
-#: strings.hrc:1132
+#: sw/inc/strings.hrc:1137
 msgctxt "STR_IMGBTN_OUTL_DOWN"
 msgid "Next heading"
 msgstr "Pennyn nesaf"
 
-#: strings.hrc:1133
+#: sw/inc/strings.hrc:1138
 msgctxt "STR_IMGBTN_SEL_DOWN"
 msgid "Next selection"
 msgstr "Dewis nesaf"
 
-#: strings.hrc:1134
+#: sw/inc/strings.hrc:1139
 msgctxt "STR_IMGBTN_FTN_DOWN"
 msgid "Next footnote"
 msgstr "Troedyn nesaf"
 
-#: strings.hrc:1135
+#: sw/inc/strings.hrc:1140
 msgctxt "STR_IMGBTN_MARK_DOWN"
 msgid "Next Reminder"
 msgstr "Atgoffwr Nesaf"
 
-#: strings.hrc:1136
+#: sw/inc/strings.hrc:1141
 msgctxt "STR_IMGBTN_POSTIT_DOWN"
 msgid "Next Comment"
 msgstr "Sylw Nesaf"
 
-#: strings.hrc:1137
+#: sw/inc/strings.hrc:1142
 msgctxt "STR_IMGBTN_SRCH_REP_DOWN"
 msgid "Continue search forward"
 msgstr "Parhau i chwilio ymlaen"
 
-#: strings.hrc:1138
+#: sw/inc/strings.hrc:1143
 msgctxt "STR_IMGBTN_INDEX_ENTRY_DOWN"
 msgid "Next index entry"
 msgstr "Cofnod mynegai nesaf"
 
-#: strings.hrc:1139
+#: sw/inc/strings.hrc:1144
 msgctxt "STR_IMGBTN_TBL_UP"
 msgid "Previous table"
 msgstr "Tabl blaenorol"
 
-#: strings.hrc:1140
+#: sw/inc/strings.hrc:1145
 msgctxt "STR_IMGBTN_FRM_UP"
 msgid "Previous text frame"
 msgstr "Ffrâm testun blaenorol"
 
-#: strings.hrc:1141
+#: sw/inc/strings.hrc:1146
 msgctxt "STR_IMGBTN_PGE_UP"
 msgid "Previous page"
 msgstr "Tudalen flaenorol"
 
-#: strings.hrc:1142
+#: sw/inc/strings.hrc:1147
 msgctxt "STR_IMGBTN_DRW_UP"
 msgid "Previous drawing"
 msgstr "Llun blaenorol"
 
-#: strings.hrc:1143
+#: sw/inc/strings.hrc:1148
 msgctxt "STR_IMGBTN_CTRL_UP"
 msgid "Previous control"
 msgstr "Rheolydd blaenorol"
 
-#: strings.hrc:1144
+#: sw/inc/strings.hrc:1149
 msgctxt "STR_IMGBTN_REG_UP"
 msgid "Previous section"
 msgstr "Adran flaenorol"
 
-#: strings.hrc:1145
+#: sw/inc/strings.hrc:1150
 msgctxt "STR_IMGBTN_BKM_UP"
 msgid "Previous bookmark"
 msgstr "Nod tudalen blaenorol"
 
-#: strings.hrc:1146
+#: sw/inc/strings.hrc:1151
 msgctxt "STR_IMGBTN_GRF_UP"
 msgid "Previous graphic"
 msgstr "Graffig blaenorol"
 
-#: strings.hrc:1147
+#: sw/inc/strings.hrc:1152
 msgctxt "STR_IMGBTN_OLE_UP"
 msgid "Previous OLE object"
 msgstr "Gwrthrych OLE blaenorol"
 
-#: strings.hrc:1148
+#: sw/inc/strings.hrc:1153
 msgctxt "STR_IMGBTN_OUTL_UP"
 msgid "Previous heading"
 msgstr "Pennyn blaenorol"
 
-#: strings.hrc:1149
+#: sw/inc/strings.hrc:1154
 msgctxt "STR_IMGBTN_SEL_UP"
 msgid "Previous selection"
 msgstr "Dewis blaenorol"
 
-#: strings.hrc:1150
+#: sw/inc/strings.hrc:1155
 msgctxt "STR_IMGBTN_FTN_UP"
 msgid "Previous footnote"
 msgstr "Troednodyn blaenorol"
 
-#: strings.hrc:1151
+#: sw/inc/strings.hrc:1156
 msgctxt "STR_IMGBTN_MARK_UP"
 msgid "Previous Reminder"
 msgstr "Atgoffwr Blaenorol"
 
-#: strings.hrc:1152
+#: sw/inc/strings.hrc:1157
 msgctxt "STR_IMGBTN_POSTIT_UP"
 msgid "Previous Comment"
 msgstr "Sylwadau Blaenorol"
 
-#: strings.hrc:1153
+#: sw/inc/strings.hrc:1158
 msgctxt "STR_IMGBTN_SRCH_REP_UP"
 msgid "Continue search backwards"
 msgstr "Parhau i chwilio nôl"
 
-#: strings.hrc:1154
+#: sw/inc/strings.hrc:1159
 msgctxt "STR_IMGBTN_INDEX_ENTRY_UP"
 msgid "Previous index entry"
 msgstr "Cofnod mynegai blaenorol"
 
-#: strings.hrc:1155
+#: sw/inc/strings.hrc:1160
 msgctxt "STR_IMGBTN_TBLFML_UP"
 msgid "Previous table formula"
 msgstr "Fformiwla'r tabl blaenorol"
 
-#: strings.hrc:1156
+#: sw/inc/strings.hrc:1161
 msgctxt "STR_IMGBTN_TBLFML_DOWN"
 msgid "Next table formula"
 msgstr "Fformiwla tabl nesaf"
 
-#: strings.hrc:1157
+#: sw/inc/strings.hrc:1162
 msgctxt "STR_IMGBTN_TBLFML_ERR_UP"
 msgid "Previous faulty table formula"
 msgstr "Fformiwla tabl gwallus blaenorol"
 
-#: strings.hrc:1158
+#: sw/inc/strings.hrc:1163
 msgctxt "STR_IMGBTN_TBLFML_ERR_DOWN"
 msgid "Next faulty table formula"
 msgstr "Fformiwla tabl gwallus blaenorol"
 
-#: strings.hrc:1160
+#: sw/inc/strings.hrc:1165
 msgctxt "STR_REDLINE_INSERT"
 msgid "Inserted"
 msgstr "Mewnosodwyd"
 
-#: strings.hrc:1161
+#: sw/inc/strings.hrc:1166
 msgctxt "STR_REDLINE_DELETE"
 msgid "Deleted"
 msgstr "Dilëwyd"
 
-#: strings.hrc:1162
+#: sw/inc/strings.hrc:1167
 msgctxt "STR_REDLINE_FORMAT"
 msgid "Formatted"
 msgstr "Fformatiwyd"
 
-#: strings.hrc:1163
+#: sw/inc/strings.hrc:1168
 msgctxt "STR_REDLINE_TABLE"
 msgid "Table changed"
 msgstr "Tabl wedi newid"
 
-#: strings.hrc:1164
+#: sw/inc/strings.hrc:1169
 msgctxt "STR_REDLINE_FMTCOLL"
 msgid "Applied Paragraph Styles"
 msgstr "Arddulliau Paragraff Gosodedig"
 
-#: strings.hrc:1165
+#: sw/inc/strings.hrc:1170
 msgctxt "STR_REDLINE_PARAGRAPH_FORMAT"
 msgid "Paragraph formatting changed"
 msgstr "Fformat paragraffau wedi newid"
 
-#: strings.hrc:1166
+#: sw/inc/strings.hrc:1171
 msgctxt "STR_REDLINE_TABLE_ROW_INSERT"
 msgid "Row Inserted"
 msgstr "Rhes wedi ei Mewnosod"
 
-#: strings.hrc:1167
+#: sw/inc/strings.hrc:1172
 msgctxt "STR_REDLINE_TABLE_ROW_DELETE"
 msgid "Row Deleted"
 msgstr "Rhes wedi ei Dileu"
 
-#: strings.hrc:1168
+#: sw/inc/strings.hrc:1173
 msgctxt "STR_REDLINE_TABLE_CELL_INSERT"
 msgid "Cell Inserted"
 msgstr "Cell wedi ei Mewnosod"
 
-#: strings.hrc:1169
+#: sw/inc/strings.hrc:1174
 msgctxt "STR_REDLINE_TABLE_CELL_DELETE"
 msgid "Cell Deleted"
 msgstr "Cell wedi ei Dileu"
 
-#: strings.hrc:1170
+#: sw/inc/strings.hrc:1175
 msgctxt "STR_ENDNOTE"
 msgid "Endnote: "
 msgstr "Diweddnod: "
 
-#: strings.hrc:1171
+#: sw/inc/strings.hrc:1176
 msgctxt "STR_FTNNOTE"
 msgid "Footnote: "
 msgstr "Troednodyn: "
 
-#: strings.hrc:1172
-msgctxt "STR_TABLE_COL_ADJUST"
-msgid "Adjust table column"
-msgstr "Newid colofn tabl"
-
-#: strings.hrc:1173
-msgctxt "STR_TABLE_ROW_ADJUST"
-msgid "Adjust table row"
-msgstr "Newid colofn rhes"
-
-#: strings.hrc:1174
-msgctxt "STR_TABLE_SELECT_ALL"
-msgid "Select whole table"
-msgstr "Dewis tabl cyfan"
-
-#: strings.hrc:1175
-msgctxt "STR_TABLE_SELECT_ROW"
-msgid "Select table row"
-msgstr "Dewis rhes tabl"
-
-#: strings.hrc:1176
-msgctxt "STR_TABLE_SELECT_COL"
-msgid "Select table column"
-msgstr "Dewis colofn tabl"
-
-#: strings.hrc:1177
+#: sw/inc/strings.hrc:1177
 #, c-format
 msgctxt "STR_SMARTTAG_CLICK"
 msgid "%s-click to open Smart Tag menu"
 msgstr "%s-clic i agor dewislen Tag Clyfar"
 
-#: strings.hrc:1178
+#: sw/inc/strings.hrc:1178
 msgctxt "STR_HEADER_TITLE"
 msgid "Header (%1)"
 msgstr "Pennyn (%1)"
 
-#: strings.hrc:1179
+#: sw/inc/strings.hrc:1179
 msgctxt "STR_FIRST_HEADER_TITLE"
 msgid "First Page Header (%1)"
 msgstr "Pennyn Tudalen Gyntaf (%1)"
 
-#: strings.hrc:1180
+#: sw/inc/strings.hrc:1180
 msgctxt "STR_LEFT_HEADER_TITLE"
 msgid "Left Page Header (%1)"
 msgstr "Pennyn Tudalen Chwith (%1)"
 
-#: strings.hrc:1181
+#: sw/inc/strings.hrc:1181
 msgctxt "STR_RIGHT_HEADER_TITLE"
 msgid "Right Page Header (%1)"
 msgstr "Pennyn Tudalen De (%1)"
 
-#: strings.hrc:1182
+#: sw/inc/strings.hrc:1182
 msgctxt "STR_FOOTER_TITLE"
 msgid "Footer (%1)"
 msgstr "Troedyn (%1)"
 
-#: strings.hrc:1183
+#: sw/inc/strings.hrc:1183
 msgctxt "STR_FIRST_FOOTER_TITLE"
 msgid "First Page Footer (%1)"
 msgstr "Troedyn Tudalen Gyntaf (%1)"
 
-#: strings.hrc:1184
+#: sw/inc/strings.hrc:1184
 msgctxt "STR_LEFT_FOOTER_TITLE"
 msgid "Left Page Footer (%1)"
 msgstr "Troedyn Tudalen Chwith (%1)"
 
-#: strings.hrc:1185
+#: sw/inc/strings.hrc:1185
 msgctxt "STR_RIGHT_FOOTER_TITLE"
 msgid "Right Page Footer (%1)"
 msgstr "Troedyn Tudalen De (%1)"
 
-#: strings.hrc:1186
+#: sw/inc/strings.hrc:1186
 msgctxt "STR_DELETE_HEADER"
 msgid "Delete Header..."
 msgstr "Dileu Pennyn..."
 
-#: strings.hrc:1187
+#: sw/inc/strings.hrc:1187
 msgctxt "STR_FORMAT_HEADER"
 msgid "Format Header..."
 msgstr "Fformatio Pennyn..."
 
-#: strings.hrc:1188
+#: sw/inc/strings.hrc:1188
 msgctxt "STR_DELETE_FOOTER"
 msgid "Delete Footer..."
 msgstr "Dileu Troedyn..."
 
-#: strings.hrc:1189
+#: sw/inc/strings.hrc:1189
 msgctxt "STR_FORMAT_FOOTER"
 msgid "Format Footer..."
 msgstr "Fformatio Troedyn..."
 
-#: strings.hrc:1191
+#: sw/inc/strings.hrc:1191
 msgctxt "STR_GRFILTER_OPENERROR"
 msgid "Image file cannot be opened"
 msgstr "Methu agor y ffeil delwedd"
 
-#: strings.hrc:1192
+#: sw/inc/strings.hrc:1192
 msgctxt "STR_GRFILTER_IOERROR"
 msgid "Image file cannot be read"
 msgstr "Methu darllen y ffeil delwedd"
 
-#: strings.hrc:1193
+#: sw/inc/strings.hrc:1193
 msgctxt "STR_GRFILTER_FORMATERROR"
 msgid "Unknown image format"
 msgstr "Fformat delwedd anhysbys"
 
-#: strings.hrc:1194
+#: sw/inc/strings.hrc:1194
 msgctxt "STR_GRFILTER_VERSIONERROR"
 msgid "This image file version is not supported"
 msgstr "Nid yw'r fersiwn ffeil delwedd hon yn cael ei chynnal"
 
-#: strings.hrc:1195
+#: sw/inc/strings.hrc:1195
 msgctxt "STR_GRFILTER_FILTERERROR"
 msgid "Image filter not found"
 msgstr "Heb ganfod hidl delwedd"
 
-#: strings.hrc:1196
+#: sw/inc/strings.hrc:1196
 msgctxt "STR_GRFILTER_TOOBIG"
 msgid "Not enough memory to insert the image."
 msgstr "Dim digon o gof ar gael i fewnosod y ddelwedd."
 
-#: strings.hrc:1197
+#: sw/inc/strings.hrc:1197
 msgctxt "STR_INSERT_GRAPHIC"
 msgid "Insert Image"
 msgstr "Mewnosod Delwedd"
 
-#: strings.hrc:1198
+#: sw/inc/strings.hrc:1198
 msgctxt "STR_REDLINE_COMMENT"
 msgid "Comment: "
 msgstr "Sylw: "
 
-#: strings.hrc:1199
+#: sw/inc/strings.hrc:1199
 msgctxt "STR_REDLINE_INSERTED"
 msgid "Insertion"
 msgstr "Mewnosod"
 
-#: strings.hrc:1200
+#: sw/inc/strings.hrc:1200
 msgctxt "STR_REDLINE_DELETED"
 msgid "Deletion"
 msgstr "Dilead"
 
-#: strings.hrc:1201
+#: sw/inc/strings.hrc:1201
 msgctxt "STR_REDLINE_AUTOFMT"
 msgid "AutoCorrect"
 msgstr "AwtoFformat"
 
-#: strings.hrc:1202
+#: sw/inc/strings.hrc:1202
 msgctxt "STR_REDLINE_FORMATED"
 msgid "Formats"
 msgstr "Fformatau"
 
-#: strings.hrc:1203
+#: sw/inc/strings.hrc:1203
 msgctxt "STR_REDLINE_TABLECHG"
 msgid "Table Changes"
 msgstr "Newidiadau Tabl"
 
-#: strings.hrc:1204
+#: sw/inc/strings.hrc:1204
 msgctxt "STR_REDLINE_FMTCOLLSET"
 msgid "Applied Paragraph Styles"
 msgstr "Arddulliau Paragraff Gosodedig"
 
-#: strings.hrc:1205
-msgctxt "STR_REDLINE_TITLE"
-msgid "AutoCorrect"
-msgstr "AwtoFformat"
-
-#: strings.hrc:1206
-msgctxt "STR_REDLINE_MSG"
-msgid ""
-"AutoCorrect completed.\n"
-"You can accept or reject all changes,\n"
-"or accept or reject particular changes."
-msgstr ""
-"AwtoFformat wedi ei gwblhau.\n"
-"Medrwch dderbyn neu wrthod pob newid\n"
-"eu rhai unigol."
-
-#: strings.hrc:1207
-msgctxt "STR_REDLINE_ACCEPT_ALL"
-msgid "Accept All"
-msgstr "Derbyn Popeth"
-
-#: strings.hrc:1208
-msgctxt "STR_REDLINE_REJECT_ALL"
-msgid "Reject All"
-msgstr "Gwrthod Popeth"
-
-#: strings.hrc:1209
-msgctxt "STR_REDLINE_EDIT"
-msgid "Edit Changes"
-msgstr "Golygu Newidiadau"
-
-#: strings.hrc:1210
+#: sw/inc/strings.hrc:1205
 msgctxt "STR_PAGE"
 msgid "Page "
 msgstr "Tudalen "
 
-#: strings.hrc:1211
+#: sw/inc/strings.hrc:1206
 msgctxt "STR_PAGE_COUNT"
 msgid "Page %1 of %2"
 msgstr "Tudalen %1 o %2"
 
-#: strings.hrc:1212
+#: sw/inc/strings.hrc:1207
 msgctxt "STR_PAGE_COUNT_CUSTOM"
 msgid "Page %1 of %2 (Page %3)"
 msgstr "Tudalen %1 o %2 (Tudalen %3)"
 
 #. Strings for gallery/background
-#: strings.hrc:1214
+#: sw/inc/strings.hrc:1209
 msgctxt "STR_SWBG_PARAGRAPH"
 msgid "Paragraph"
 msgstr "Paragraff"
 
-#: strings.hrc:1215
+#: sw/inc/strings.hrc:1210
 msgctxt "STR_SWBG_GRAPHIC"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:1216
+#: sw/inc/strings.hrc:1211
 msgctxt "STR_SWBG_OLE"
 msgid "OLE object"
 msgstr "Gwrthrych OLE"
 
-#: strings.hrc:1217
+#: sw/inc/strings.hrc:1212
 msgctxt "STR_SWBG_FRAME"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: strings.hrc:1218
+#: sw/inc/strings.hrc:1213
 msgctxt "STR_SWBG_TABLE"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:1219
+#: sw/inc/strings.hrc:1214
 msgctxt "STR_SWBG_TABLE_ROW"
 msgid "Table row"
 msgstr "Rhes tabl"
 
-#: strings.hrc:1220
+#: sw/inc/strings.hrc:1215
 msgctxt "STR_SWBG_TABLE_CELL"
 msgid "Table cell"
 msgstr "Cell tabl"
 
-#: strings.hrc:1221
+#: sw/inc/strings.hrc:1216
 msgctxt "STR_SWBG_PAGE"
 msgid "Page"
 msgstr "Tudalen"
 
-#: strings.hrc:1222
+#: sw/inc/strings.hrc:1217
 msgctxt "STR_SWBG_HEADER"
 msgid "Header"
 msgstr "Pennyn"
 
-#: strings.hrc:1223
+#: sw/inc/strings.hrc:1218
 msgctxt "STR_SWBG_FOOTER"
 msgid "Footer"
 msgstr "Troedyn"
 
 #. End: strings for gallery/background
-#: strings.hrc:1226
+#: sw/inc/strings.hrc:1221
 msgctxt "STR_HUMAN_SWWEBDOC_NAME"
 msgid "HTML"
 msgstr "HTML"
 
-#: strings.hrc:1227
+#: sw/inc/strings.hrc:1222
 msgctxt "STR_WRITER_WEBDOC_FULLTYPE"
 msgid "%PRODUCTNAME %PRODUCTVERSION HTML Document"
 msgstr "Dogfen HTML %PRODUCTNAME %PRODUCTVERSION"
 
-#: strings.hrc:1229
+#: sw/inc/strings.hrc:1224
 msgctxt "STR_TITLE"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:1230
+#: sw/inc/strings.hrc:1225
 msgctxt "STR_ALPHA"
 msgid "Separator"
 msgstr "Ymwahanydd"
 
-#: strings.hrc:1231
+#: sw/inc/strings.hrc:1226
 msgctxt "STR_LEVEL"
 msgid "Level "
 msgstr "Lefel "
 
-#: strings.hrc:1232
+#: sw/inc/strings.hrc:1227
 msgctxt "STR_FILE_NOT_FOUND"
 msgid "The file, \"%1\" in the \"%2\" path could not be found."
 msgstr "Methu canfod ffeil \"%1\" yn llwybr \"%2\"."
 
-#: strings.hrc:1233
+#: sw/inc/strings.hrc:1228
 msgctxt "STR_USER_DEFINED_INDEX"
 msgid "User-Defined Index"
 msgstr "Mynegai Defnyddiwr Diffiniedig"
 
-#: strings.hrc:1234
+#: sw/inc/strings.hrc:1229
 msgctxt "STR_NOSORTKEY"
 msgid "<None>"
 msgstr "<Dim>"
 
-#: strings.hrc:1235
+#: sw/inc/strings.hrc:1230
 msgctxt "STR_NO_CHAR_STYLE"
 msgid "<None>"
 msgstr "<Dim>"
 
-#: strings.hrc:1236
+#: sw/inc/strings.hrc:1231
 msgctxt "STR_DELIM"
 msgid "S"
 msgstr "S"
 
-#: strings.hrc:1237
+#: sw/inc/strings.hrc:1232
 msgctxt "STR_TOKEN_ENTRY_NO"
 msgid "E#"
 msgstr "E#"
 
-#: strings.hrc:1238
+#: sw/inc/strings.hrc:1233
 msgctxt "STR_TOKEN_ENTRY"
 msgid "E"
 msgstr "E"
 
-#: strings.hrc:1239
+#: sw/inc/strings.hrc:1234
 msgctxt "STR_TOKEN_TAB_STOP"
 msgid "T"
 msgstr "T"
 
-#: strings.hrc:1240
+#: sw/inc/strings.hrc:1235
 msgctxt "STR_TOKEN_PAGE_NUMS"
 msgid "#"
 msgstr "#"
 
-#: strings.hrc:1241
+#: sw/inc/strings.hrc:1236
 msgctxt "STR_TOKEN_CHAPTER_INFO"
 msgid "CI"
 msgstr "CI"
 
-#: strings.hrc:1242
+#: sw/inc/strings.hrc:1237
 msgctxt "STR_TOKEN_LINK_START"
 msgid "LS"
 msgstr "LS"
 
-#: strings.hrc:1243
+#: sw/inc/strings.hrc:1238
 msgctxt "STR_TOKEN_LINK_END"
 msgid "LE"
 msgstr "LE"
 
-#: strings.hrc:1244
+#: sw/inc/strings.hrc:1239
 msgctxt "STR_TOKEN_AUTHORITY"
 msgid "A"
 msgstr "A"
 
-#: strings.hrc:1245
+#: sw/inc/strings.hrc:1240
 msgctxt "STR_TOKEN_HELP_ENTRY_NO"
 msgid "Chapter number"
 msgstr "Rhif pennod"
 
-#: strings.hrc:1246
+#: sw/inc/strings.hrc:1241
 msgctxt "STR_TOKEN_HELP_ENTRY"
 msgid "Entry"
 msgstr "Cofnod"
 
-#: strings.hrc:1247
+#: sw/inc/strings.hrc:1242
 msgctxt "STR_TOKEN_HELP_TAB_STOP"
 msgid "Tab stop"
 msgstr "Stop tab"
 
-#: strings.hrc:1248
+#: sw/inc/strings.hrc:1243
 msgctxt "STR_TOKEN_HELP_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:1249
+#: sw/inc/strings.hrc:1244
 msgctxt "STR_TOKEN_HELP_PAGE_NUMS"
 msgid "Page number"
 msgstr "Rhif tudalen"
 
-#: strings.hrc:1250
+#: sw/inc/strings.hrc:1245
 msgctxt "STR_TOKEN_HELP_CHAPTER_INFO"
 msgid "Chapter info"
 msgstr "Manylion pennod"
 
-#: strings.hrc:1251
+#: sw/inc/strings.hrc:1246
 msgctxt "STR_TOKEN_HELP_LINK_START"
 msgid "Hyperlink start"
 msgstr "Cychwyn dolen"
 
-#: strings.hrc:1252
+#: sw/inc/strings.hrc:1247
 msgctxt "STR_TOKEN_HELP_LINK_END"
 msgid "Hyperlink end"
 msgstr "Diwedd dolen"
 
-#: strings.hrc:1253
+#: sw/inc/strings.hrc:1248
 msgctxt "STR_TOKEN_HELP_AUTHORITY"
 msgid "Bibliography entry: "
 msgstr "Cofnod llyfryddiaeth: "
 
-#: strings.hrc:1254
+#: sw/inc/strings.hrc:1249
 msgctxt "STR_CHARSTYLE"
 msgid "Character Style: "
 msgstr "Nod Arddull: "
 
-#: strings.hrc:1255
+#: sw/inc/strings.hrc:1250
 msgctxt "STR_STRUCTURE"
 msgid "Structure text"
 msgstr "Testun y strwythur"
 
-#: strings.hrc:1256
+#: sw/inc/strings.hrc:1251
 msgctxt "STR_ADDITIONAL_ACCNAME_STRING1"
 msgid "Press Ctrl+Alt+A to move focus for more operations"
 msgstr "Pwyswch Ctrl+Alt+A i symud y canolbwynt i ragor o weithrediadau"
 
-#: strings.hrc:1257
+#: sw/inc/strings.hrc:1252
 msgctxt "STR_ADDITIONAL_ACCNAME_STRING2"
 msgid "Press left or right arrow to choose the structure controls"
 msgstr "Pwyswch y saeth de neu chwith i ddewis y rheolyddion strwythur"
 
-#: strings.hrc:1258
+#: sw/inc/strings.hrc:1253
 msgctxt "STR_ADDITIONAL_ACCNAME_STRING3"
 msgid "Press Ctrl+Alt+B to move focus back to the current structure control"
 msgstr "Pwyswch Ctrl+Alt+B i symud y canolbwynt nôl i'r rheolydd strwythur cyfredol"
 
-#: strings.hrc:1259
+#: sw/inc/strings.hrc:1254
 msgctxt "STR_AUTOMARK_TYPE"
 msgid "Selection file for the alphabetical index (*.sdi)"
 msgstr "Dewis ffeil ar gyfer mynegai trefn yr wyddor (*.sdi)"
@@ -6235,252 +6199,237 @@ msgstr "Dewis ffeil ar gyfer mynegai trefn yr wyddor (*.sdi)"
 #. -----------------------------------------------------------------------
 #. Description: character alignment for frmsh.cxx - context menu
 #. -----------------------------------------------------------------------
-#: strings.hrc:1264
+#: sw/inc/strings.hrc:1259
 msgctxt "STR_FRMUI_TOP_BASE"
 msgid "Base line at ~top"
 msgstr "Llinell sail ar y ~brig"
 
-#: strings.hrc:1265
+#: sw/inc/strings.hrc:1260
 msgctxt "STR_FRMUI_BOTTOM_BASE"
 msgid "~Base line at bottom"
 msgstr "~Llinell sail ar y gwaelod"
 
-#: strings.hrc:1266
+#: sw/inc/strings.hrc:1261
 msgctxt "STR_FRMUI_CENTER_BASE"
 msgid "Base line ~centered"
 msgstr "Llinell sail yn y ~canol"
 
-#: strings.hrc:1267
-msgctxt "STR_FRMUI_LINE_TOP"
-msgid "Top of line"
-msgstr "Brig y llinell"
-
-#: strings.hrc:1268
-msgctxt "STR_FRMUI_LINE_BOTTOM"
-msgid "Bottom of line"
-msgstr "Gwaelod y llinell"
-
-#: strings.hrc:1269
-msgctxt "STR_FRMUI_LINE_CENTER"
-msgid "Center of line"
-msgstr "Canol y llinell"
-
-#: strings.hrc:1270
+#: sw/inc/strings.hrc:1262
 msgctxt "STR_FRMUI_OLE_INSERT"
 msgid "Insert object"
 msgstr "Mewnosod gwrthrych"
 
-#: strings.hrc:1271
+#: sw/inc/strings.hrc:1263
 msgctxt "STR_FRMUI_OLE_EDIT"
 msgid "Edit object"
 msgstr "Golygu gwrthrych"
 
-#: strings.hrc:1272
+#: sw/inc/strings.hrc:1264
 msgctxt "STR_FRMUI_COLL_HEADER"
 msgid " (Template: "
 msgstr " (Templed: "
 
-#: strings.hrc:1273
+#: sw/inc/strings.hrc:1265
 msgctxt "STR_FRMUI_BORDER"
 msgid "Borders"
 msgstr "Borderi"
 
-#: strings.hrc:1274
+#: sw/inc/strings.hrc:1266
 msgctxt "STR_FRMUI_PATTERN"
 msgid "Background"
 msgstr "Cefndir"
 
-#: strings.hrc:1276
+#: sw/inc/strings.hrc:1268
 msgctxt "STR_TEXTCOLL_HEADER"
 msgid "(Paragraph Style: "
 msgstr "(Arddull Paragraff: "
 
-#: strings.hrc:1277
+#: sw/inc/strings.hrc:1269
 msgctxt "STR_ILLEGAL_PAGENUM"
 msgid "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages."
 msgstr "Ni nid oes modd gosod rhifau tudalen i'r dudalen gyfredol. Mae modd defnyddio eilrifau ar dudalennau chwith, odrifau ar dudalennau dde."
 
-#: strings.hrc:1279
+#: sw/inc/strings.hrc:1271
 msgctxt "STR_HUMAN_SWGLOBDOC_NAME"
 msgid "Master Document"
 msgstr "Prif Ddogfen"
 
-#: strings.hrc:1280
+#: sw/inc/strings.hrc:1272
 msgctxt "STR_WRITER_GLOBALDOC_FULLTYPE"
 msgid "%PRODUCTNAME %PRODUCTVERSION Master Document"
 msgstr "Prif Ddogfen %PRODUCTNAME %PRODUCTVERSION"
 
-#: strings.hrc:1282
+#: sw/inc/strings.hrc:1274
 msgctxt "STR_QUERY_CONNECT"
 msgid "A file connection will delete the contents of the current section. Connect anyway?"
 msgstr "Bydd cyswllt ffeil yn dileu cynnwys yr adran bresennol. Cysylltu beth bynnag?"
 
-#: strings.hrc:1283
+#: sw/inc/strings.hrc:1275
 msgctxt "STR_WRONG_PASSWORD"
 msgid "The password entered is invalid."
 msgstr "Mae'r cyfrinair yn annilys."
 
-#: strings.hrc:1284
+#: sw/inc/strings.hrc:1276
 msgctxt "STR_WRONG_PASSWD_REPEAT"
 msgid "The password has not been set."
 msgstr "Nid yw'r cyfrinair wedi ei osod."
 
-#: strings.hrc:1286
+#: sw/inc/strings.hrc:1278
 msgctxt "STR_HYP_OK"
 msgid "Hyphenation completed"
 msgstr "Cysylltnodi wedi ei gwblhau"
 
-#: strings.hrc:1287
+#: sw/inc/strings.hrc:1279
 msgctxt "STR_LANGSTATUS_NONE"
 msgid "None (Do not check spelling)"
 msgstr "Dim (Peidio gwirio sillafu)"
 
-#: strings.hrc:1288
+#: sw/inc/strings.hrc:1280
 msgctxt "STR_RESET_TO_DEFAULT_LANGUAGE"
 msgid "Reset to Default Language"
 msgstr "Ailosod i'r Iaith Ragosodedig"
 
-#: strings.hrc:1289
+#: sw/inc/strings.hrc:1281
 msgctxt "STR_LANGSTATUS_MORE"
 msgid "More..."
 msgstr "Rhagor..."
 
-#: strings.hrc:1290
+#: sw/inc/strings.hrc:1282
 msgctxt "STR_IGNORE_SELECTION"
 msgid "~Ignore"
 msgstr "A~nwybyddu"
 
-#: strings.hrc:1291
+#: sw/inc/strings.hrc:1283
 msgctxt "STR_EXPLANATION_LINK"
 msgid "Explanations..."
 msgstr "Esboniadau..."
 
-#: strings.hrc:1293
+#: sw/inc/strings.hrc:1285
 msgctxt "STR_QUERY_SPECIAL_FORCED"
 msgid "Check special regions is deactivated. Check anyway?"
 msgstr "Gwiriwch fod yr ardaloedd arbennig wedi eu diffodd. Gwirio beth bynnag?"
 
-#: strings.hrc:1294
+#: sw/inc/strings.hrc:1286
 msgctxt "STR_NO_MERGE_ENTRY"
 msgid "Could not merge documents."
 msgstr "Methu cyfuno'r dogfennau."
 
-#: strings.hrc:1295
+#: sw/inc/strings.hrc:1287
 msgctxt "STR_ERR_SRCSTREAM"
 msgid "The source cannot be loaded."
 msgstr "Methu llwytho'r ffynhonnell."
 
-#: strings.hrc:1296
+#: sw/inc/strings.hrc:1288
 msgctxt "STR_ERR_NO_FAX"
 msgid "No fax printer has been set under Tools/Options/%1/Print."
 msgstr "Does dim ffacs wedi ei osod o dan Offer/Dewisiadau/%1/Argraffu."
 
-#: strings.hrc:1297
+#: sw/inc/strings.hrc:1289
 msgctxt "STR_WEBOPTIONS"
 msgid "HTML document"
 msgstr "Dogfen HTML"
 
-#: strings.hrc:1298
+#: sw/inc/strings.hrc:1290
 msgctxt "STR_TEXTOPTIONS"
 msgid "Text document"
 msgstr "Dogfen testun"
 
-#: strings.hrc:1299
+#: sw/inc/strings.hrc:1291
 msgctxt "STR_SCAN_NOSOURCE"
 msgid "Source not specified."
 msgstr "Ffynhonnell heb ei enwi."
 
-#: strings.hrc:1300
+#: sw/inc/strings.hrc:1292
 msgctxt "STR_NUM_LEVEL"
 msgid "Level "
 msgstr "Lefel "
 
-#: strings.hrc:1301
+#: sw/inc/strings.hrc:1293
 msgctxt "STR_NUM_OUTLINE"
 msgid "Outline "
 msgstr "Amlinell "
 
-#: strings.hrc:1302
+#: sw/inc/strings.hrc:1294
 msgctxt "STR_EDIT_FOOTNOTE"
 msgid "Edit Footnote/Endnote"
 msgstr "Golygu Troednodyn/Diweddnod"
 
-#: strings.hrc:1303
+#: sw/inc/strings.hrc:1295
 msgctxt "STR_NB_REPLACED"
 msgid "Search key replaced XX times."
 msgstr "Allwedd chwilio wedi ei newid XX gwaith."
 
-#: strings.hrc:1304
+#: sw/inc/strings.hrc:1296
 msgctxt "STR_SRCVIEW_ROW"
 msgid "Row "
 msgstr "Rhes "
 
-#: strings.hrc:1305
+#: sw/inc/strings.hrc:1297
 msgctxt "STR_SRCVIEW_COL"
 msgid "Column "
 msgstr "Colofn "
 
-#: strings.hrc:1306
+#: sw/inc/strings.hrc:1298
 msgctxt "STR_SAVEAS_SRC"
 msgid "~Export source..."
 msgstr "~Allforio ffynhonnell..."
 
-#: strings.hrc:1307
+#: sw/inc/strings.hrc:1299
 msgctxt "STR_SAVEACOPY_SRC"
 msgid "~Export copy of source..."
 msgstr "~Allforio copi o'r ffynhonnell..."
 
-#: strings.hrc:1309
+#: sw/inc/strings.hrc:1301
 msgctxt "ST_CONTINUE"
 msgid "~Continue"
 msgstr "~Parhau"
 
-#: strings.hrc:1310
+#: sw/inc/strings.hrc:1302
 msgctxt "ST_TASK"
 msgid "Task"
 msgstr "Tasg"
 
-#: strings.hrc:1311
+#: sw/inc/strings.hrc:1303
 msgctxt "ST_STATUS"
 msgid "Status"
 msgstr "Statws"
 
-#: strings.hrc:1312
+#: sw/inc/strings.hrc:1304
 msgctxt "ST_SENDINGTO"
 msgid "Sending to: %1"
 msgstr "Anfon at: %1"
 
-#: strings.hrc:1313
+#: sw/inc/strings.hrc:1305
 msgctxt "ST_COMPLETED"
 msgid "Successfully sent"
 msgstr "Anfonwyd yn llwyddiannus"
 
-#: strings.hrc:1314
+#: sw/inc/strings.hrc:1306
 msgctxt "ST_FAILED"
 msgid "Sending failed"
 msgstr "Methwyd ag anfon"
 
-#: strings.hrc:1316
+#: sw/inc/strings.hrc:1308
 msgctxt "STR_SENDER_TOKENS"
 msgid "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"
 msgstr "CWMNI;CR;ENWCYNTAF; ;ENWOLAF;CR;CYFEIRIAD;CR;TREF;;SIRTALAITH; ;CODPOST;CRGWLAD;CR;"
 
-#: strings.hrc:1318
+#: sw/inc/strings.hrc:1310
 msgctxt "STR_TBL_FORMULA"
 msgid "Text formula"
 msgstr "Fformiwla testun"
 
-#: strings.hrc:1320
+#: sw/inc/strings.hrc:1312
 msgctxt "STR_MENU_ZOOM"
 msgid "~Zoom"
 msgstr "~Chwyddo"
 
-#: strings.hrc:1321
+#: sw/inc/strings.hrc:1313
 msgctxt "STR_MENU_UP"
 msgid "~Upwards"
 msgstr "I ~Fyny"
 
-#: strings.hrc:1322
+#: sw/inc/strings.hrc:1314
 msgctxt "STR_MENU_DOWN"
 msgid "Do~wnwards"
 msgstr "I ~Lawr"
@@ -6488,7 +6437,7 @@ msgstr "I ~Lawr"
 #. --------------------------------------------------------------------
 #. Description: Classification strings
 #. --------------------------------------------------------------------
-#: strings.hrc:1328
+#: sw/inc/strings.hrc:1320
 msgctxt "STR_CLASSIFICATION_LEVEL_CHANGED"
 msgid "Document classification has changed because a paragraph classification level is higher"
 msgstr "Mae dosbarthiad dogfen wedi newid gan fod lefel dosbarthiad paragraff yn uwch"
@@ -6496,2172 +6445,2162 @@ msgstr "Mae dosbarthiad dogfen wedi newid gan fod lefel dosbarthiad paragraff yn
 #. --------------------------------------------------------------------
 #. Description: Paragraph Signature
 #. --------------------------------------------------------------------
-#: strings.hrc:1333
+#: sw/inc/strings.hrc:1325
 msgctxt "STR_VALID"
 msgid " Valid "
 msgstr " Dilys "
 
-#: strings.hrc:1334
+#: sw/inc/strings.hrc:1326
 msgctxt "STR_INVALID"
 msgid "Invalid"
 msgstr "Annilys"
 
-#: strings.hrc:1335
+#: sw/inc/strings.hrc:1327
 msgctxt "STR_INVALID_SIGNATURE"
 msgid "Invalid Signature"
 msgstr "Llofnod Annilys"
 
-#: strings.hrc:1336
+#: sw/inc/strings.hrc:1328
 msgctxt "STR_SIGNED_BY"
 msgid "Signed-by"
 msgstr "Llofnodwyd gan"
 
-#: strings.hrc:1337
+#: sw/inc/strings.hrc:1329
 msgctxt "STR_PARAGRAPH_SIGNATURE"
 msgid "Paragraph Signature"
 msgstr "Llofnod Paragraff"
 
-#: utlui.hrc:27
+#: sw/inc/strings.hrc:1331
+msgctxt "labeldialog|cards"
+msgid "Business Cards"
+msgstr "Cardiau Busnes"
+
+#: sw/inc/utlui.hrc:27
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Remove empty paragraphs"
 msgstr "Tynnu paragraffau gwag"
 
-#: utlui.hrc:28
+#: sw/inc/utlui.hrc:28
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Use replacement table"
 msgstr "Defnyddio tabl ailosod"
 
-#: utlui.hrc:29
+#: sw/inc/utlui.hrc:29
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Correct TWo INitial CApitals"
 msgstr "Cywiro DWy BRif LYthyren"
 
-#: utlui.hrc:30
+#: sw/inc/utlui.hrc:30
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Capitalize first letter of sentences"
 msgstr "Priflythyren i lythyren cyntaf brawddeg"
 
-#: utlui.hrc:31
+#: sw/inc/utlui.hrc:31
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Replace \"standard\" quotes with %1custom%2 quotes"
 msgstr "Newid dyfyniadau \"safonol\" gyda dyfyniadau %1custom%2"
 
-#: utlui.hrc:32
+#: sw/inc/utlui.hrc:32
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Replace Custom Styles"
 msgstr "Newid Arddulliau Cyfaddas"
 
-#: utlui.hrc:33
+#: sw/inc/utlui.hrc:33
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Bullets replaced"
 msgstr "Newid bwledi"
 
-#: utlui.hrc:34
+#: sw/inc/utlui.hrc:34
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Automatic _underline_"
 msgstr "Tanlinellu _awtomatig_"
 
-#: utlui.hrc:35
+#: sw/inc/utlui.hrc:35
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Automatic *bold*"
 msgstr "*Trwm* awtomatig"
 
-#: utlui.hrc:36
+#: sw/inc/utlui.hrc:36
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Replace 1/2 ... with ½ ..."
 msgstr "Newid 1/2 ... i ½ ..."
 
-#: utlui.hrc:37
+#: sw/inc/utlui.hrc:37
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "URL recognition"
 msgstr "Adnabod URL"
 
-#: utlui.hrc:38
+#: sw/inc/utlui.hrc:38
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Replace dashes"
 msgstr "Newid llinellau toriad"
 
-#: utlui.hrc:39
+#: sw/inc/utlui.hrc:39
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Replace 1st... with 1^st..."
 msgstr "Newid 1af... gyda 1^af..."
 
-#: utlui.hrc:40
+#: sw/inc/utlui.hrc:40
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Combine single line paragraphs"
 msgstr "Uno'n baragraff llinellau sengl"
 
-#: utlui.hrc:41
+#: sw/inc/utlui.hrc:41
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Set \"Text body\" Style"
 msgstr "Gosod Arddull \"Corff testun\""
 
-#: utlui.hrc:42 /home/cl/vc/git/libo-core/sw/inc/utlui.hrc:44
+#: sw/inc/utlui.hrc:42 sw/inc/utlui.hrc:44
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Set \"Text body indent\" Style"
 msgstr "Gosod Arddull \"Mewnoliad corff testun\""
 
-#: utlui.hrc:43
+#: sw/inc/utlui.hrc:43
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Set \"Hanging indent\" Style"
 msgstr "Gosod Arddull \"Mewnoliad crog\""
 
-#: utlui.hrc:45
+#: sw/inc/utlui.hrc:45
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Set \"Heading $(ARG1)\" Style"
 msgstr "Gosod Arddull \"Pennawd $(ARG1)\""
 
-#: utlui.hrc:46
+#: sw/inc/utlui.hrc:46
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Set \"Bullet\" or \"Numbering\" Style"
 msgstr "Gosod Arddull \"Bwled\" neu \"Rhifo\""
 
-#: utlui.hrc:47
+#: sw/inc/utlui.hrc:47
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Combine paragraphs"
 msgstr "Uno paragraffau"
 
-#: utlui.hrc:48
+#: sw/inc/utlui.hrc:48
 msgctxt "RID_SHELLRES_AUTOFMTSTRS"
 msgid "Add non breaking space"
 msgstr "Ychwanegu bwlch dim toriad"
 
-#: abstractdialog.ui:21
+#: sw/uiconfig/swriter/ui/abstractdialog.ui:21
 msgctxt "abstractdialog|AbstractDialog"
 msgid "Create AutoAbstract"
 msgstr "Creu AwtoGrynhoi"
 
-#: abstractdialog.ui:114
+#: sw/uiconfig/swriter/ui/abstractdialog.ui:114
 msgctxt "abstractdialog|label2"
 msgid "Included outline levels"
 msgstr "Lefelau amlinell cynwysiedig"
 
-#: abstractdialog.ui:130
+#: sw/uiconfig/swriter/ui/abstractdialog.ui:130
 msgctxt "abstractdialog|label3"
 msgid "Paragraphs per level"
 msgstr "Paragraf i bob lefel"
 
-#: abstractdialog.ui:146
+#: sw/uiconfig/swriter/ui/abstractdialog.ui:146
 msgctxt "abstractdialog|label4"
 msgid "The abstract contains the selected number of paragraphs from the included outline levels."
 msgstr "Mae'r crynodeb yn cynnwys y nifer dewisedig o baragraffau o'r lefelau amlinell cynwysiedig."
 
-#: abstractdialog.ui:197
+#: sw/uiconfig/swriter/ui/abstractdialog.ui:194
 msgctxt "abstractdialog|label1"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: addentrydialog.ui:8
+#: sw/uiconfig/swriter/ui/addentrydialog.ui:8
 msgctxt "addentrydialog|AddEntryDialog"
 msgid "Add Element"
 msgstr "Ychwanegu Elfen"
 
-#: addentrydialog.ui:99
+#: sw/uiconfig/swriter/ui/addentrydialog.ui:98
 msgctxt "addentrydialog|label1"
 msgid "Element Name"
 msgstr "Enw Elfen"
 
-#: addressblockdialog.ui:8
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:8
 msgctxt "addressblockdialog|AddressBlockDialog"
 msgid "New Address Block"
 msgstr "Bloc Cyfeiriad Newydd"
 
-#: addressblockdialog.ui:84
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:84
 msgctxt "addressblockdialog|addressesft"
 msgid "Address _elements"
 msgstr "_Elfennau cyfeiriad"
 
-#: addressblockdialog.ui:115
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:115
 msgctxt "addressblockdialog|addressdestft"
 msgid "1. Drag address elements here"
 msgstr "1. Llusgo elfennau cyfeiriad yma"
 
-#: addressblockdialog.ui:139
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:139
 msgctxt "addressblockdialog|up|tooltip_text"
 msgid "Move up"
 msgstr "Symud i fyny"
 
-#: addressblockdialog.ui:154
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:154
 msgctxt "addressblockdialog|left|tooltip_text"
 msgid "Move left"
 msgstr "Symud i'r chwith"
 
-#: addressblockdialog.ui:169
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:169
 msgctxt "addressblockdialog|right|tooltip_text"
 msgid "Move right"
 msgstr "Symud i'r dde"
 
-#: addressblockdialog.ui:184
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:184
 msgctxt "addressblockdialog|down|tooltip_text"
 msgid "Move down"
 msgstr "Symud lawr"
 
-#: addressblockdialog.ui:222
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:222
 msgctxt "addressblockdialog|label3"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: addressblockdialog.ui:238
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:238
 msgctxt "addressblockdialog|customft"
 msgid "2. Customi_ze salutation"
 msgstr "2. C_yfaddasu'r cyfarchiad"
 
-#: addressblockdialog.ui:310
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:310
 msgctxt "addressblockdialog|fromaddr|tooltip_text"
 msgid "Remove from address"
 msgstr "Tynnu o gyfeiriad"
 
-#: addressblockdialog.ui:410
+#: sw/uiconfig/swriter/ui/addressblockdialog.ui:410
 msgctxt "addressblockdialog|image5|tooltip_text"
 msgid "Add to address"
 msgstr "Ychwanegu at gyfeiriad"
 
-#: alreadyexistsdialog.ui:6
+#: sw/uiconfig/swriter/ui/alreadyexistsdialog.ui:7
+msgctxt "alreadyexistsdialog|AlreadyExistsDialog"
+msgid "File already exists"
+msgstr "Mae ffeil yn bodoli'n barod"
+
+#: sw/uiconfig/swriter/ui/alreadyexistsdialog.ui:12
 msgctxt "alreadyexistsdialog|textbuffer1"
 msgid "A document with the name '%1' already exists."
 msgstr "Mae dogfen gyda'r enw '%1' yn bodoli eisoes."
 
-#: alreadyexistsdialog.ui:9
+#: sw/uiconfig/swriter/ui/alreadyexistsdialog.ui:13
 msgctxt "alreadyexistsdialog|textbuffer2"
 msgid "Please save this document under a different name."
 msgstr "Cadwch y ddogfen o dan enw arall."
 
-#: alreadyexistsdialog.ui:14
-msgctxt "alreadyexistsdialog|AlreadyExistsDialog"
-msgid "File already exists"
-msgstr "Mae ffeil yn bodoli'n barod"
-
-#: alreadyexistsdialog.ui:126
+#: sw/uiconfig/swriter/ui/alreadyexistsdialog.ui:81
 msgctxt "alreadyexistsdialog|label1"
-msgid "New document name:"
-msgstr "Enw dogfen newydd:"
+msgid "Subject:"
+msgstr "Pwnc:"
 
-#: annotationmenu.ui:12
+#: sw/uiconfig/swriter/ui/annotationmenu.ui:12
 msgctxt "annotationmenu|reply"
 msgid "Reply"
 msgstr "Ateb"
 
-#: annotationmenu.ui:26
+#: sw/uiconfig/swriter/ui/annotationmenu.ui:26
 msgctxt "annotationmenu|delete"
 msgid "Delete _Comment"
 msgstr "Dileu _Sylw"
 
-#: annotationmenu.ui:34
+#: sw/uiconfig/swriter/ui/annotationmenu.ui:34
 msgctxt "annotationmenu|deleteby"
 msgid "Delete _All Comments by $1"
 msgstr "Dileu _Pob Sylw gan $1"
 
-#: annotationmenu.ui:42
+#: sw/uiconfig/swriter/ui/annotationmenu.ui:42
 msgctxt "annotationmenu|deleteall"
 msgid "_Delete All Comments"
 msgstr "Dileu _Pob Sylw"
 
-#: annotationmenu.ui:50
+#: sw/uiconfig/swriter/ui/annotationmenu.ui:50
 msgctxt "annotationmenu|formatall"
 msgid "Format All Comments..."
 msgstr "Fformatio Pob Sylw..."
 
-#: asciifilterdialog.ui:8
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:8
 msgctxt "asciifilterdialog|AsciiFilterDialog"
 msgid "ASCII Filter Options"
 msgstr "Dewisiadau Hidl ASCII"
 
-#: asciifilterdialog.ui:97
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:100
 msgctxt "asciifilterdialog|label2"
 msgid "_Character set"
 msgstr "_Set nod"
 
-#: asciifilterdialog.ui:113
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:114
 msgctxt "asciifilterdialog|fontft"
 msgid "Default fonts"
 msgstr "Ffontiau rhagosodedig"
 
-#: asciifilterdialog.ui:129
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:128
 msgctxt "asciifilterdialog|languageft"
 msgid "Lan_guage"
 msgstr "I_aith"
 
-#: asciifilterdialog.ui:145
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:142
 msgctxt "asciifilterdialog|label5"
 msgid "_Paragraph break"
 msgstr "_Toriad paragraff"
 
-#: asciifilterdialog.ui:204
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:181
 msgctxt "asciifilterdialog|crlf"
 msgid "_CR & LF"
 msgstr "_CR a LF"
 
-#: asciifilterdialog.ui:222
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:198
 msgctxt "asciifilterdialog|cr"
 msgid "C_R"
 msgstr "C_R"
 
-#: asciifilterdialog.ui:240
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:216
 msgctxt "asciifilterdialog|lf"
 msgid "_LF"
 msgstr "_LF"
 
-#: asciifilterdialog.ui:272
+#: sw/uiconfig/swriter/ui/asciifilterdialog.ui:264
 msgctxt "asciifilterdialog|label1"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: asksearchdialog.ui:12
+#: sw/uiconfig/swriter/ui/asksearchdialog.ui:12
 msgctxt "asksearchdialog|AskSearchDialog"
 msgid "To proceed with this action, you must first turn off the \"undo\" function. Do you want to turn off the \"undo\" function?"
 msgstr "I barhau gyda'r weithred, rhaid yn gyntaf ddiffodd y swyddogaeth \" dadwneud\". Hoffech chi ddiffodd y swyddogaeth \"dadwneud\"?"
 
-#: assignfieldsdialog.ui:9
+#: sw/uiconfig/swriter/ui/assignfieldsdialog.ui:9
 msgctxt "assignfieldsdialog|AssignFieldsDialog"
 msgid "Match Fields"
 msgstr "Cydweddu Meysydd"
 
-#: assignfieldsdialog.ui:85
+#: sw/uiconfig/swriter/ui/assignfieldsdialog.ui:85
 msgctxt "assignfieldsdialog|MATCHING_LABEL"
 msgid "Assign the fields from your data source to match the address elements."
 msgstr "Neilltuo’r meysydd o'ch ffynhonnell data i gydweddu elfennau'r cyfeiriad."
 
-#: assignfieldsdialog.ui:111
+#: sw/uiconfig/swriter/ui/assignfieldsdialog.ui:111
 msgctxt "assignfieldsdialog|PREVIEW_LABEL"
 msgid "Address block preview"
 msgstr "Rhagolwg bloc cyfeiriad"
 
-#: assignstylesdialog.ui:19
+#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:19
 msgctxt "assignstylesdialog|AssignStylesDialog"
 msgid "Assign Styles"
 msgstr "Pennu Arddulliau"
 
-#: assignstylesdialog.ui:124
+#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:124
 msgctxt "assignstylesdialog|left-atkobject"
 msgid "Left"
 msgstr "Chwith"
 
-#: assignstylesdialog.ui:142
+#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:142
 msgctxt "assignstylesdialog|right-atkobject"
 msgid "Right"
 msgstr "De"
 
-#: assignstylesdialog.ui:190
+#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:190
 msgctxt "assignstylesdialog|notapplied"
 msgid "Not applied"
 msgstr "Heb osod"
 
-#: assignstylesdialog.ui:207
+#: sw/uiconfig/swriter/ui/assignstylesdialog.ui:207
 msgctxt "assignstylesdialog|label3"
 msgid "Styles"
 msgstr "Arddulliau"
 
-#: attachnamedialog.ui:6
+#: sw/uiconfig/swriter/ui/attachnamedialog.ui:7
+msgctxt "attachnamedialog|AttachNameDialog"
+msgid "No Attachment Name"
+msgstr "Dim Enw Atodiad"
+
+#: sw/uiconfig/swriter/ui/attachnamedialog.ui:12
 msgctxt "attachnamedialog|textbuffer1"
 msgid "You did not specify a new name for the attachment."
 msgstr "Nid ydych wedi enwi enw newydd ar gyfer yr atodiad."
 
-#: attachnamedialog.ui:9
+#: sw/uiconfig/swriter/ui/attachnamedialog.ui:13
 msgctxt "attachnamedialog|textbuffer2"
 msgid "If you would like to provide one, please type it now."
 msgstr "Os hoffech ddarparu un, gwnewch hynny nawr."
 
-#: attachnamedialog.ui:14
-msgctxt "attachnamedialog|AttachNameDialog"
-msgid "No Attachment Name"
-msgstr "Dim Enw Atodiad"
-
-#: attachnamedialog.ui:138
+#: sw/uiconfig/swriter/ui/attachnamedialog.ui:81
 msgctxt "attachnamedialog|label1"
 msgid "Name:"
 msgstr "Enw:"
 
-#: authenticationsettingsdialog.ui:14
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:14
 msgctxt "authenticationsettingsdialog|AuthenticationSettingsDialog"
 msgid "Server Authentication"
 msgstr "Dilysiad Gweinydd"
 
-#: authenticationsettingsdialog.ui:88
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:91
 msgctxt "authenticationsettingsdialog|authentication"
 msgid "The outgoing mail server (SMTP) requires au_thentication"
 msgstr "Mae'r gweinydd e-bost allfynd (SMTP) angen _dilysiad"
 
-#: authenticationsettingsdialog.ui:104
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:107
 msgctxt "authenticationsettingsdialog|separateauthentication"
 msgid "The outgoing mail server (SMTP) requires _separate authentication"
 msgstr "Mae'r gweinydd e-bost allfynd (SMTP) angen ­_dilysiad ­ar wahân"
 
-#: authenticationsettingsdialog.ui:127
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:128
 msgctxt "authenticationsettingsdialog|label1"
 msgid "Outgoing mail server:"
 msgstr "Gweinydd e-bost allfynd:"
 
-#: authenticationsettingsdialog.ui:154
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:155
 msgctxt "authenticationsettingsdialog|username_label"
 msgid "_User name:"
 msgstr "_Enw defnyddiwr:"
 
-#: authenticationsettingsdialog.ui:183
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:185
 msgctxt "authenticationsettingsdialog|outpassword_label"
 msgid "_Password:"
 msgstr "C_yfrinair:"
 
-#: authenticationsettingsdialog.ui:194
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:197
 msgctxt "authenticationsettingsdialog|smtpafterpop"
 msgid "The outgoing mail server uses the same authentication as the _incoming mail server"
 msgstr "Mae'r gweinydd e-bost allfynd yn defnyddio'r un dilysiad â'r gweinydd e-bost i _fewn"
 
-#: authenticationsettingsdialog.ui:217
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:219
 msgctxt "authenticationsettingsdialog|label2"
 msgid "Incoming mail server:"
 msgstr "Gweinydd e-bost i fewn:"
 
-#: authenticationsettingsdialog.ui:244
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:246
 msgctxt "authenticationsettingsdialog|server_label"
 msgid "Server _name:"
 msgstr "_Enw gweinydd:"
 
-#: authenticationsettingsdialog.ui:271
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:273
 msgctxt "authenticationsettingsdialog|port_label"
 msgid "P_ort:"
 msgstr "P_orth:"
 
-#: authenticationsettingsdialog.ui:286
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:288
 msgctxt "authenticationsettingsdialog|label3"
 msgid "Type:"
 msgstr "Math:"
 
-#: authenticationsettingsdialog.ui:295
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:298
 msgctxt "authenticationsettingsdialog|pop3"
 msgid "_POP3"
 msgstr "_POP3"
 
-#: authenticationsettingsdialog.ui:312
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:314
 msgctxt "authenticationsettingsdialog|imap"
 msgid "_IMAP"
 msgstr "_IMAP"
 
-#: authenticationsettingsdialog.ui:360
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:362
 msgctxt "authenticationsettingsdialog|inusername_label"
 msgid "Us_er name:"
 msgstr "Enw _defnyddiwr:"
 
-#: authenticationsettingsdialog.ui:375
+#: sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui:377
 msgctxt "authenticationsettingsdialog|inpassword_label"
 msgid "Pass_word:"
 msgstr "_Cyfrinair:"
 
-#: autoformattable.ui:9
+#: sw/uiconfig/swriter/ui/autoformattable.ui:16
 msgctxt "autoformattable|AutoFormatTableDialog"
 msgid "AutoFormat"
 msgstr "AwtoFformat"
 
-#: autoformattable.ui:95
+#: sw/uiconfig/swriter/ui/autoformattable.ui:208
 msgctxt "autoformattable|rename"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: autoformattable.ui:187
+#: sw/uiconfig/swriter/ui/autoformattable.ui:233
 msgctxt "autoformattable|label1"
 msgid "Format"
 msgstr "Fformat"
 
-#: autoformattable.ui:220
+#: sw/uiconfig/swriter/ui/autoformattable.ui:266
 msgctxt "autoformattable|numformatcb"
 msgid "Number format"
 msgstr "Fformat rhif"
 
-#: autoformattable.ui:237
+#: sw/uiconfig/swriter/ui/autoformattable.ui:281
 msgctxt "autoformattable|bordercb"
 msgid "Borders"
 msgstr "Borderi"
 
-#: autoformattable.ui:254
+#: sw/uiconfig/swriter/ui/autoformattable.ui:296
 msgctxt "autoformattable|fontcb"
 msgid "Font"
 msgstr "Ffont"
 
-#: autoformattable.ui:271
+#: sw/uiconfig/swriter/ui/autoformattable.ui:311
 msgctxt "autoformattable|patterncb"
 msgid "Pattern"
 msgstr "Patrwm"
 
-#: autoformattable.ui:288
+#: sw/uiconfig/swriter/ui/autoformattable.ui:326
 msgctxt "autoformattable|alignmentcb"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: autoformattable.ui:314
+#: sw/uiconfig/swriter/ui/autoformattable.ui:350
 msgctxt "autoformattable|label2"
 msgid "Formatting"
 msgstr "Fformatio"
 
-#: autotext.ui:9
+#: sw/uiconfig/swriter/ui/autotext.ui:9
 msgctxt "autotext|AutoTextDialog"
 msgid "AutoText"
 msgstr "AwtoDestun"
 
-#: autotext.ui:22
+#: sw/uiconfig/swriter/ui/autotext.ui:22
 msgctxt "autotext|insert"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: autotext.ui:67
+#: sw/uiconfig/swriter/ui/autotext.ui:67
 msgctxt "autotext|autotext"
 msgid "AutoTe_xt"
 msgstr "Awto_Destun"
 
-#: autotext.ui:81
+#: sw/uiconfig/swriter/ui/autotext.ui:81
 msgctxt "autotext|categories"
 msgid "Cat_egories..."
 msgstr "C_ategorïau..."
 
-#: autotext.ui:95
+#: sw/uiconfig/swriter/ui/autotext.ui:95
 msgctxt "autotext|path"
 msgid "_Path..."
 msgstr "_Llwybr..."
 
-#: autotext.ui:142
+#: sw/uiconfig/swriter/ui/autotext.ui:142
 msgctxt "autotext|relfile"
 msgid "_File system"
 msgstr "System _ffeiliau"
 
-#: autotext.ui:157
+#: sw/uiconfig/swriter/ui/autotext.ui:157
 msgctxt "autotext|relnet"
 msgid "Inter_net"
 msgstr "_Rhyngrwyd"
 
-#: autotext.ui:178
+#: sw/uiconfig/swriter/ui/autotext.ui:178
 msgctxt "autotext|label1"
 msgid "Save Links Relative To"
 msgstr "Cadw Cysylltiadau'n Berthynol i"
 
-#: autotext.ui:205
+#: sw/uiconfig/swriter/ui/autotext.ui:205
 msgctxt "autotext|inserttip"
 msgid "_Display remainder of name as suggestion while typing"
 msgstr "Dangos _gweddill yr enw fel awgrym wrth deipio"
 
-#: autotext.ui:230
+#: sw/uiconfig/swriter/ui/autotext.ui:230
 msgctxt "autotext|nameft"
 msgid "Name:"
 msgstr "Enw:"
 
-#: autotext.ui:243
+#: sw/uiconfig/swriter/ui/autotext.ui:243
 msgctxt "autotext|shortnameft"
 msgid "Shortcut:"
 msgstr "Llwybr Byr:"
 
-#: autotext.ui:298
+#: sw/uiconfig/swriter/ui/autotext.ui:297
 msgctxt "autotext|category-atkobject"
 msgid "Category"
 msgstr "Categori"
 
-#: autotext.ui:383
+#: sw/uiconfig/swriter/ui/autotext.ui:382
 msgctxt "autotext|new"
 msgid "_New"
 msgstr "_Newydd"
 
-#: autotext.ui:391
+#: sw/uiconfig/swriter/ui/autotext.ui:390
 msgctxt "autotext|newtext"
 msgid "New (text only)"
 msgstr "Newydd (testun un unig)"
 
-#: autotext.ui:399
+#: sw/uiconfig/swriter/ui/autotext.ui:398
 msgctxt "autotext|copy"
 msgid "_Copy"
 msgstr "_Copïo"
 
-#: autotext.ui:407
+#: sw/uiconfig/swriter/ui/autotext.ui:406
 msgctxt "autotext|replace"
 msgid "Replace"
 msgstr "Newid"
 
-#: autotext.ui:415
+#: sw/uiconfig/swriter/ui/autotext.ui:414
 msgctxt "autotext|replacetext"
 msgid "Rep_lace (text only)"
 msgstr "_Newid (testun yn unig)"
 
-#: autotext.ui:423
+#: sw/uiconfig/swriter/ui/autotext.ui:422
 msgctxt "autotext|rename"
 msgid "Rename..."
 msgstr "Ailenwi..."
 
-#: autotext.ui:431
+#: sw/uiconfig/swriter/ui/autotext.ui:430
 msgctxt "autotext|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: autotext.ui:445
+#: sw/uiconfig/swriter/ui/autotext.ui:444
 msgctxt "autotext|edit"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: autotext.ui:459
+#: sw/uiconfig/swriter/ui/autotext.ui:458
 msgctxt "autotext|macro"
 msgid "_Macro..."
 msgstr "_Macro..."
 
-#: autotext.ui:473
+#: sw/uiconfig/swriter/ui/autotext.ui:472
 msgctxt "autotext|import"
 msgid "_Import..."
 msgstr "_Mewnforio..."
 
-#: bibliographyentry.ui:7
+#: sw/uiconfig/swriter/ui/bibliographyentry.ui:7
 msgctxt "bibliographyentry|BibliographyEntryDialog"
 msgid "Insert Bibliography Entry"
 msgstr "Mewnosod Cofnod Llyfryddiaeth"
 
-#: bibliographyentry.ui:20
+#: sw/uiconfig/swriter/ui/bibliographyentry.ui:20
 msgctxt "bibliographyentry|insert"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: bibliographyentry.ui:35
+#: sw/uiconfig/swriter/ui/bibliographyentry.ui:35
 msgctxt "bibliographyentry|modify"
 msgid "Apply"
 msgstr "Gosod"
 
-#: bibliographyentry.ui:137
+#: sw/uiconfig/swriter/ui/bibliographyentry.ui:137
 msgctxt "bibliographyentry|label2"
 msgid "Author"
 msgstr "Awdur"
 
-#: bibliographyentry.ui:154
+#: sw/uiconfig/swriter/ui/bibliographyentry.ui:154
 msgctxt "bibliographyentry|label3"
 msgid "Title"
 msgstr "Teitl"
 
-#: bibliographyentry.ui:185
+#: sw/uiconfig/swriter/ui/bibliographyentry.ui:185
 msgctxt "bibliographyentry|label5"
 msgid "Short name"
 msgstr "Enw byr"
 
-#: bibliographyentry.ui:224
+#: sw/uiconfig/swriter/ui/bibliographyentry.ui:224
 msgctxt "bibliographyentry|frombibliography"
 msgid "From bibliography database"
 msgstr "O gronfa ddata'r llyfryddiaeth"
 
-#: bibliographyentry.ui:242
+#: sw/uiconfig/swriter/ui/bibliographyentry.ui:243
 msgctxt "bibliographyentry|fromdocument"
 msgid "From document content"
 msgstr "O gynnwys y ddogfen"
 
-#: bibliographyentry.ui:279
+#: sw/uiconfig/swriter/ui/bibliographyentry.ui:280
 msgctxt "bibliographyentry|label1"
 msgid "Entry"
 msgstr "Cofnod"
 
-#: bulletsandnumbering.ui:8
+#: sw/uiconfig/swriter/ui/bulletsandnumbering.ui:8
 msgctxt "bulletsandnumbering|BulletsAndNumberingDialog"
 msgid "Bullets and Numbering"
 msgstr "Bwledi a Rhifo"
 
-#: bulletsandnumbering.ui:39
+#: sw/uiconfig/swriter/ui/bulletsandnumbering.ui:39
 msgctxt "bulletsandnumbering|user"
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: bulletsandnumbering.ui:82
+#: sw/uiconfig/swriter/ui/bulletsandnumbering.ui:82
 msgctxt "bulletsandnumbering|reset"
 msgid "Reset"
 msgstr "Ailosod"
 
-#: bulletsandnumbering.ui:120
+#: sw/uiconfig/swriter/ui/bulletsandnumbering.ui:120
 msgctxt "bulletsandnumbering|bullets"
 msgid "Bullets"
 msgstr "Bwledi"
 
-#: bulletsandnumbering.ui:142
+#: sw/uiconfig/swriter/ui/bulletsandnumbering.ui:142
 msgctxt "bulletsandnumbering|singlenum"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: bulletsandnumbering.ui:165
+#: sw/uiconfig/swriter/ui/bulletsandnumbering.ui:165
 msgctxt "bulletsandnumbering|outlinenum"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: bulletsandnumbering.ui:188
+#: sw/uiconfig/swriter/ui/bulletsandnumbering.ui:188
 msgctxt "bulletsandnumbering|graphics"
 msgid "Image"
 msgstr "Delwedd"
 
-#: bulletsandnumbering.ui:211
+#: sw/uiconfig/swriter/ui/bulletsandnumbering.ui:211
 msgctxt "bulletsandnumbering|position"
 msgid "Position"
 msgstr "Safle"
 
-#: bulletsandnumbering.ui:234
+#: sw/uiconfig/swriter/ui/bulletsandnumbering.ui:234
 msgctxt "bulletsandnumbering|customize"
 msgid "Customize"
 msgstr "Cyfaddasu"
 
-#: businessdatapage.ui:28
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:28
 msgctxt "businessdatapage|label5"
 msgid "Company:"
 msgstr "Cwmni:"
 
-#: businessdatapage.ui:42
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:42
 msgctxt "businessdatapage|streetft"
 msgid "Slogan:"
 msgstr "Slogan:"
 
-#: businessdatapage.ui:56
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:56
 msgctxt "businessdatapage|countryft"
 msgid "Co_untry/state:"
 msgstr "_Gwlad/sir/talaith:"
 
-#: businessdatapage.ui:70
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:70
 msgctxt "businessdatapage|label8"
 msgid "Position:"
 msgstr "Safle:"
 
-#: businessdatapage.ui:84
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:84
 msgctxt "businessdatapage|phoneft"
 msgid "Fa_x:"
 msgstr "Ffa_cs:"
 
-#: businessdatapage.ui:89
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:89
 msgctxt "businessdatapage|phoneft-atkobject"
 msgid "Home telephone number"
 msgstr "Rhiff ffôn cartref"
 
-#: businessdatapage.ui:103
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:103
 msgctxt "businessdatapage|faxft"
 msgid "Homepage/e-mail:"
 msgstr "Tudalen gartref/e-bost:"
 
-#: businessdatapage.ui:126
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:125
 msgctxt "businessdatapage|company-atkobject"
 msgid "First name"
 msgstr "Enw cyntaf"
 
-#: businessdatapage.ui:156
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:154
 msgctxt "businessdatapage|position-atkobject"
 msgid "Title"
 msgstr "Teitl"
 
-#: businessdatapage.ui:185
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:182
 msgctxt "businessdatapage|fax-atkobject"
 msgid "Home telephone number"
 msgstr "Rhiff ffôn cartref"
 
-#: businessdatapage.ui:216
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:212
 msgctxt "businessdatapage|url-atkobject"
 msgid "FAX number"
 msgstr "Rhif Ffacs"
 
-#: businessdatapage.ui:234
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:229
 msgctxt "businessdatapage|email-atkobject"
 msgid "email address"
 msgstr "cyfeiriad e-bost"
 
-#: businessdatapage.ui:254
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:249
 msgctxt "businessdatapage|eastnameft"
 msgid "Company 2nd line:"
 msgstr "Ail linell cwmni:"
 
-#: businessdatapage.ui:277
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:271
 msgctxt "businessdatapage|company2-atkobject"
 msgid "Last name"
 msgstr "Enw olaf"
 
-#: businessdatapage.ui:297
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:291
 msgctxt "businessdatapage|icityft"
 msgid "_Zip/city:"
 msgstr "_Cod post/tref:"
 
-#: businessdatapage.ui:320
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:313
 msgctxt "businessdatapage|icity-atkobject"
 msgid "City"
 msgstr "Tref/Dinas"
 
-#: businessdatapage.ui:338
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:330
 msgctxt "businessdatapage|izip-atkobject"
 msgid "Zip code"
 msgstr "Cod ZIP"
 
-#: businessdatapage.ui:420
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:409
 msgctxt "businessdatapage|titleft1"
 msgid "Phone/mobile:"
 msgstr "Ffôn/symudol:"
 
-#: businessdatapage.ui:444
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:432
 msgctxt "businessdatapage|phone-atkobject"
 msgid "Title"
 msgstr "Teitl"
 
-#: businessdatapage.ui:462
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:449
 msgctxt "businessdatapage|mobile-atkobject"
 msgid "Position"
 msgstr "Safle"
 
-#: businessdatapage.ui:482
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:469
 msgctxt "businessdatapage|streetft1"
 msgid "Street:"
 msgstr "Stryd:"
 
-#: businessdatapage.ui:523
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:509
 msgctxt "businessdatapage|label1"
 msgid "Business Data"
 msgstr "Data Busnes"
 
-#: cannotsavelabeldialog.ui:8
+#: sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui:7
 msgctxt "cannotsavelabeldialog|CannotSaveLabelDialog"
 msgid "Cannot Add Label"
 msgstr "Methu Ychwanegu Label"
 
-#: cannotsavelabeldialog.ui:14
+#: sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui:14
 msgctxt "cannotsavelabeldialog|CannotSaveLabelDialog"
 msgid "Cannot add label"
 msgstr "Methu ychwanegu label"
 
-#: cannotsavelabeldialog.ui:15
+#: sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui:15
 msgctxt "cannotsavelabeldialog|CannotSaveLabelDialog"
 msgid "Predefined labels cannot be overwritten, use another name."
 msgstr "Nid oes modd trosysgrifennu labeli sydd wedi eu rhagddiffinio, dewiswch enw arall."
 
-#: captiondialog.ui:8
+#: sw/uiconfig/swriter/ui/captiondialog.ui:8
 msgctxt "captiondialog|CaptionDialog"
 msgid "Caption"
 msgstr "Egluryn"
 
-#: captionoptions.ui:12
-msgctxt "captionoptions|liststore1"
-msgid "Category first"
-msgstr "Categori'n gyntaf"
-
-#: captionoptions.ui:15
-msgctxt "captionoptions|liststore1"
-msgid "Numbering first"
-msgstr "Rhifau'n gyntaf"
-
-#: captionoptions.ui:22
+#: sw/uiconfig/swriter/ui/captionoptions.ui:8
 msgctxt "captionoptions|CaptionOptionsDialog"
 msgid "Caption Options"
 msgstr "Dewisiadau Egluryn"
 
-#: captionoptions.ui:85
+#: sw/uiconfig/swriter/ui/captionoptions.ui:129
 msgctxt "captionoptions|label5"
 msgid "_Level:"
 msgstr "_Lefel:"
 
-#: captionoptions.ui:99
+#: sw/uiconfig/swriter/ui/captionoptions.ui:143
 msgctxt "captionoptions|label6"
 msgid "_Separator:"
 msgstr "_Ymwahanydd:"
 
-#: captionoptions.ui:116
+#: sw/uiconfig/swriter/ui/captionoptions.ui:161
 msgctxt "captionoptions|label1"
 msgid "Numbering Captions by Chapter"
 msgstr "Rhifo Eglurynnau yn ôl Pennawd"
 
-#: captionoptions.ui:154
+#: sw/uiconfig/swriter/ui/captionoptions.ui:198
 msgctxt "captionoptions|label4"
 msgid "Character style:"
 msgstr "Arddull nod:"
 
-#: captionoptions.ui:176
+#: sw/uiconfig/swriter/ui/captionoptions.ui:221
 msgctxt "captionoptions|border_and_shadow"
 msgid "_Apply border and shadow"
 msgstr "_Gosod border a chysgod"
 
-#: captionoptions.ui:199
+#: sw/uiconfig/swriter/ui/captionoptions.ui:244
 msgctxt "captionoptions|label2"
 msgid "Category and Frame Format"
 msgstr "Fformat Categori a Ffrâm"
 
-#: captionoptions.ui:237
+#: sw/uiconfig/swriter/ui/captionoptions.ui:281
 msgctxt "captionoptions|label7"
 msgid "Caption order:"
 msgstr "Trefn eglurynnau:"
 
-#: captionoptions.ui:266
+#: sw/uiconfig/swriter/ui/captionoptions.ui:297
+msgctxt "captionoptions|liststore1"
+msgid "Category first"
+msgstr "Categori'n gyntaf"
+
+#: sw/uiconfig/swriter/ui/captionoptions.ui:298
+msgctxt "captionoptions|liststore1"
+msgid "Numbering first"
+msgstr "Rhifau'n gyntaf"
+
+#: sw/uiconfig/swriter/ui/captionoptions.ui:314
 msgctxt "captionoptions|label3"
 msgid "Caption"
 msgstr "Egluryn"
 
-#: cardformatpage.ui:38
-msgctxt "cardformatpage|label2"
-msgid "AutoText - Section"
-msgstr "AwtoDestun - Adran"
-
-#: cardformatpage.ui:122
-msgctxt "cardformatpage|label1"
-msgid "Content"
-msgstr "Cynnwys"
-
-#: cardmediumpage.ui:63
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:63
 msgctxt "cardmediumpage|address"
 msgid "Address"
 msgstr "Cyfeiriad"
 
-#: cardmediumpage.ui:82
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:83
 msgctxt "cardmediumpage|label2"
 msgid "Label text:"
 msgstr "Testun label:"
 
-#: cardmediumpage.ui:142
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:143
 msgctxt "cardmediumpage|label4"
 msgid "Database:"
 msgstr "Cronfa ddata:"
 
-#: cardmediumpage.ui:180
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:181
 msgctxt "cardmediumpage|label7"
 msgid "Table:"
 msgstr "Tabl:"
 
-#: cardmediumpage.ui:218
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:219
 msgctxt "cardmediumpage|label8"
 msgid "Database field:"
 msgstr "Maes Cronfa Ddata:"
 
-#: cardmediumpage.ui:255
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:256
 msgctxt "cardmediumpage|insert|tooltip_text"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: cardmediumpage.ui:272
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:273
 msgctxt "cardmediumpage|label6"
 msgid "Inscription"
 msgstr "Arysgrif"
 
-#: cardmediumpage.ui:319
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:320
 msgctxt "cardmediumpage|continuous"
 msgid "_Continuous"
 msgstr "_Di-dor"
 
-#: cardmediumpage.ui:335
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:336
 msgctxt "cardmediumpage|sheet"
 msgid "_Sheet"
 msgstr "D_alen"
 
-#: cardmediumpage.ui:368
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:369
 msgctxt "cardmediumpage|label5"
 msgid "Brand:"
 msgstr "Enw Masnachol:"
 
-#: cardmediumpage.ui:382
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:383
 msgctxt "cardmediumpage|label3"
 msgid "_Type:"
 msgstr "_Math:"
 
-#: cardmediumpage.ui:456
+#: sw/uiconfig/swriter/ui/cardmediumpage.ui:457
 msgctxt "cardmediumpage|label1"
 msgid "Format"
 msgstr "Fformat"
 
-#: ccdialog.ui:8
+#: sw/uiconfig/swriter/ui/ccdialog.ui:8
 msgctxt "ccdialog|CCDialog"
 msgid "Copy To"
 msgstr "Copïo i"
 
-#: ccdialog.ui:100
+#: sw/uiconfig/swriter/ui/ccdialog.ui:102
 msgctxt "ccdialog|label2"
 msgid "_Cc:"
 msgstr "­_Cc:"
 
-#: ccdialog.ui:114
+#: sw/uiconfig/swriter/ui/ccdialog.ui:116
 msgctxt "ccdialog|label3"
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ccdialog.ui:128
+#: sw/uiconfig/swriter/ui/ccdialog.ui:130
 msgctxt "ccdialog|label4"
 msgid "Note: Separate e-mail addresses with a semicolon (;)."
 msgstr "Nodyn: Rhannu cyfeiriadau e-bost gyda hanner colon (;)."
 
-#: ccdialog.ui:169
+#: sw/uiconfig/swriter/ui/ccdialog.ui:170
 msgctxt "ccdialog|label1"
 msgid "Send a Copy of This Mail To..."
 msgstr "Anfon Copi o'r E-bost i..."
 
-#: characterproperties.ui:8
+#: sw/uiconfig/swriter/ui/characterproperties.ui:8
 msgctxt "characterproperties|CharacterPropertiesDialog"
 msgid "Character"
 msgstr "Nod"
 
-#: characterproperties.ui:106
+#: sw/uiconfig/swriter/ui/characterproperties.ui:106
 msgctxt "characterproperties|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: characterproperties.ui:128
+#: sw/uiconfig/swriter/ui/characterproperties.ui:128
 msgctxt "characterproperties|fonteffects"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: characterproperties.ui:151
+#: sw/uiconfig/swriter/ui/characterproperties.ui:151
 msgctxt "characterproperties|position"
 msgid "Position"
 msgstr "Safle"
 
-#: characterproperties.ui:174
+#: sw/uiconfig/swriter/ui/characterproperties.ui:174
 msgctxt "characterproperties|asianlayout"
 msgid "Asian Layout"
 msgstr "Cynllun Asiaidd"
 
-#: characterproperties.ui:197
+#: sw/uiconfig/swriter/ui/characterproperties.ui:197
 msgctxt "characterproperties|hyperlink"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: characterproperties.ui:220
+#: sw/uiconfig/swriter/ui/characterproperties.ui:220
 msgctxt "characterproperties|background"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: characterproperties.ui:243
+#: sw/uiconfig/swriter/ui/characterproperties.ui:243
 msgctxt "characterproperties|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: charurlpage.ui:35
+#: sw/uiconfig/swriter/ui/charurlpage.ui:35
 msgctxt "charurlpage|label36"
 msgid "URL:"
 msgstr "URL:"
 
-#: charurlpage.ui:49
+#: sw/uiconfig/swriter/ui/charurlpage.ui:49
 msgctxt "charurlpage|label37"
 msgid "Name:"
 msgstr "Enw:"
 
-#: charurlpage.ui:63
+#: sw/uiconfig/swriter/ui/charurlpage.ui:63
 msgctxt "charurlpage|textft"
 msgid "Text:"
 msgstr "Testun:"
 
-#: charurlpage.ui:77
+#: sw/uiconfig/swriter/ui/charurlpage.ui:77
 msgctxt "charurlpage|label39"
 msgid "Target frame:"
 msgstr "Ffrâm targed:"
 
-#: charurlpage.ui:88
+#: sw/uiconfig/swriter/ui/charurlpage.ui:88
 msgctxt "charurlpage|eventpb"
 msgid "Events..."
 msgstr "Digwyddiad..."
 
-#: charurlpage.ui:138
+#: sw/uiconfig/swriter/ui/charurlpage.ui:135
 msgctxt "charurlpage|urlpb"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: charurlpage.ui:188
+#: sw/uiconfig/swriter/ui/charurlpage.ui:185
 msgctxt "charurlpage|label32"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: charurlpage.ui:224
+#: sw/uiconfig/swriter/ui/charurlpage.ui:221
 msgctxt "charurlpage|label34"
 msgid "Visited links:"
 msgstr "Cysylltiadau ymwelwyd â nhw:"
 
-#: charurlpage.ui:238
+#: sw/uiconfig/swriter/ui/charurlpage.ui:235
 msgctxt "charurlpage|label10"
 msgid "Unvisited links:"
 msgstr "Cysylltiadau heb ymweliad:"
 
-#: charurlpage.ui:275
+#: sw/uiconfig/swriter/ui/charurlpage.ui:272
 msgctxt "charurlpage|label33"
 msgid "Character Styles"
 msgstr "Arddulliau Nod"
 
-#: columndialog.ui:8
+#: sw/uiconfig/swriter/ui/columndialog.ui:8
 msgctxt "columndialog|ColumnDialog"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: columnpage.ui:59
-msgctxt "columnpage|liststore1"
-msgid "Left-to-right"
-msgstr "Chwith i dde"
-
-#: columnpage.ui:63
-msgctxt "columnpage|liststore1"
-msgid "Right-to-left"
-msgstr "De i chwith"
-
-#: columnpage.ui:67
-msgctxt "columnpage|liststore1"
-msgid "Use superordinate object settings"
-msgstr "Defnyddio gosodiadau gwrthrych uwcholyn"
-
-#: columnpage.ui:81
+#: sw/uiconfig/swriter/ui/columnpage.ui:59
 msgctxt "columnpage|liststore2"
 msgid "Selection"
 msgstr "Dewis"
 
-#: columnpage.ui:85
+#: sw/uiconfig/swriter/ui/columnpage.ui:63
 msgctxt "columnpage|liststore2"
 msgid "Current Section"
 msgstr "Dewis presennol"
 
-#: columnpage.ui:89
+#: sw/uiconfig/swriter/ui/columnpage.ui:67
 msgctxt "columnpage|liststore2"
 msgid "Selected section"
 msgstr "Adran dewiswyd"
 
-#: columnpage.ui:93
+#: sw/uiconfig/swriter/ui/columnpage.ui:71
 msgctxt "columnpage|liststore2"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: columnpage.ui:97
+#: sw/uiconfig/swriter/ui/columnpage.ui:75
 msgctxt "columnpage|liststore2"
 msgid "Page Style: "
 msgstr "Arddull Tudalen: "
 
-#: columnpage.ui:134
+#: sw/uiconfig/swriter/ui/columnpage.ui:112
 msgctxt "columnpage|columnft"
 msgid "Column:"
 msgstr "Colofn:"
 
-#: columnpage.ui:195
+#: sw/uiconfig/swriter/ui/columnpage.ui:173
 msgctxt "columnpage|widthft"
 msgid "Width:"
 msgstr "Lled:"
 
-#: columnpage.ui:266
+#: sw/uiconfig/swriter/ui/columnpage.ui:241
 msgctxt "columnpage|distft"
 msgid "Spacing:"
 msgstr "Bylchu:"
 
-#: columnpage.ui:327
+#: sw/uiconfig/swriter/ui/columnpage.ui:300
 msgctxt "columnpage|autowidth"
 msgid "Auto_Width"
 msgstr "_AwtoLled"
 
-#: columnpage.ui:400
+#: sw/uiconfig/swriter/ui/columnpage.ui:373
 msgctxt "columnpage|label4"
 msgid "Width and Spacing"
 msgstr "Lled a Bylchu"
 
-#: columnpage.ui:437
+#: sw/uiconfig/swriter/ui/columnpage.ui:410
 msgctxt "columnpage|linestyleft"
 msgid "St_yle:"
 msgstr "Ar_ddull:"
 
-#: columnpage.ui:451
+#: sw/uiconfig/swriter/ui/columnpage.ui:424
 msgctxt "columnpage|linewidthft"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: columnpage.ui:465
+#: sw/uiconfig/swriter/ui/columnpage.ui:438
 msgctxt "columnpage|lineheightft"
 msgid "H_eight:"
 msgstr "_Uchder:"
 
-#: columnpage.ui:479
+#: sw/uiconfig/swriter/ui/columnpage.ui:452
 msgctxt "columnpage|lineposft"
 msgid "_Position:"
 msgstr "_Safle:"
 
-#: columnpage.ui:505
+#: sw/uiconfig/swriter/ui/columnpage.ui:478
 msgctxt "columnpage|lineposlb"
 msgid "Top"
 msgstr "Brig"
 
-#: columnpage.ui:506
+#: sw/uiconfig/swriter/ui/columnpage.ui:479
 msgctxt "columnpage|lineposlb"
 msgid "Centered"
 msgstr "Canoli"
 
-#: columnpage.ui:507
+#: sw/uiconfig/swriter/ui/columnpage.ui:480
 msgctxt "columnpage|lineposlb"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: columnpage.ui:555
+#: sw/uiconfig/swriter/ui/columnpage.ui:526
 msgctxt "columnpage|linecolorft"
 msgid "_Color:"
 msgstr "_Lliw:"
 
-#: columnpage.ui:579
+#: sw/uiconfig/swriter/ui/columnpage.ui:550
 msgctxt "columnpage|label11"
 msgid "Separator Line"
 msgstr "Llinell Ymwahanydd"
 
-#: columnpage.ui:631
+#: sw/uiconfig/swriter/ui/columnpage.ui:602
 msgctxt "columnpage|label3"
 msgid "Columns:"
 msgstr "Colofnau:"
 
-#: columnpage.ui:666
+#: sw/uiconfig/swriter/ui/columnpage.ui:636
 msgctxt "columnpage|balance"
 msgid "Evenly distribute contents _to all columns"
 msgstr "Dosbarthu'r cynnwys yn gyson _i bob colofn"
 
-#: columnpage.ui:700
+#: sw/uiconfig/swriter/ui/columnpage.ui:670
 msgctxt "columnpage|applytoft"
 msgid "_Apply to:"
 msgstr "_Gosod i:"
 
-#: columnpage.ui:725
+#: sw/uiconfig/swriter/ui/columnpage.ui:695
 msgctxt "columnpage|textdirectionft"
 msgid "Text _direction:"
 msgstr "_Cyfeiriad testun:"
 
-#: columnpage.ui:782
+#: sw/uiconfig/swriter/ui/columnpage.ui:750
 msgctxt "columnpage|label2"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: columnwidth.ui:15
+#: sw/uiconfig/swriter/ui/columnwidth.ui:15
 msgctxt "columnwidth|ColumnWidthDialog"
 msgid "Column Width"
 msgstr "Lled Colofn"
 
-#: columnwidth.ui:102
+#: sw/uiconfig/swriter/ui/columnwidth.ui:105
 msgctxt "columnwidth|label2"
 msgid "Column:"
 msgstr "Colofn:"
 
-#: columnwidth.ui:116
+#: sw/uiconfig/swriter/ui/columnwidth.ui:119
 msgctxt "columnwidth|label3"
 msgid "Width:"
 msgstr "Lled:"
 
-#: columnwidth.ui:158
+#: sw/uiconfig/swriter/ui/columnwidth.ui:162
 msgctxt "columnwidth|label1"
 msgid "Width"
 msgstr "Lled"
 
-#: conditionpage.ui:39
+#: sw/uiconfig/swriter/ui/conditionpage.ui:39
 msgctxt "conditionpage|condstyle"
 msgid "_Conditional Style"
 msgstr "Arddull _Amodol"
 
-#: conditionpage.ui:63
+#: sw/uiconfig/swriter/ui/conditionpage.ui:63
 msgctxt "conditionpage|contextft"
 msgid "Conte_xt"
 msgstr "_Cyd-destun"
 
-#: conditionpage.ui:78
+#: sw/uiconfig/swriter/ui/conditionpage.ui:78
 msgctxt "conditionpage|usedft"
 msgid "Applied Styles"
 msgstr "Arddulliau Gosodedig"
 
-#: conditionpage.ui:92
+#: sw/uiconfig/swriter/ui/conditionpage.ui:92
 msgctxt "conditionpage|styleft"
 msgid "_Paragraph Styles"
 msgstr "Arddulliau _Paragraff"
 
-#: conditionpage.ui:199
+#: sw/uiconfig/swriter/ui/conditionpage.ui:199
 msgctxt "conditionpage|filter"
 msgid "Table Header"
 msgstr "Pennyn Tabl"
 
-#: conditionpage.ui:200
+#: sw/uiconfig/swriter/ui/conditionpage.ui:200
 msgctxt "conditionpage|filter"
 msgid "Table"
 msgstr "Tabl"
 
-#: conditionpage.ui:201
+#: sw/uiconfig/swriter/ui/conditionpage.ui:201
 msgctxt "conditionpage|filter"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: conditionpage.ui:202
+#: sw/uiconfig/swriter/ui/conditionpage.ui:202
 msgctxt "conditionpage|filter"
 msgid "Section"
 msgstr "Adran"
 
-#: conditionpage.ui:203
+#: sw/uiconfig/swriter/ui/conditionpage.ui:203
 msgctxt "conditionpage|filter"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: conditionpage.ui:204
+#: sw/uiconfig/swriter/ui/conditionpage.ui:204
 msgctxt "conditionpage|filter"
 msgid "Endnote"
 msgstr "Diweddnodyn"
 
-#: conditionpage.ui:205
+#: sw/uiconfig/swriter/ui/conditionpage.ui:205
 msgctxt "conditionpage|filter"
 msgid "Header"
 msgstr "Pennyn"
 
-#: conditionpage.ui:206
+#: sw/uiconfig/swriter/ui/conditionpage.ui:206
 msgctxt "conditionpage|filter"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: conditionpage.ui:207
+#: sw/uiconfig/swriter/ui/conditionpage.ui:207
 msgctxt "conditionpage|filter"
 msgid " 1st Outline Level"
 msgstr " Lefel Amlinell 1af"
 
-#: conditionpage.ui:208
+#: sw/uiconfig/swriter/ui/conditionpage.ui:208
 msgctxt "conditionpage|filter"
 msgid " 2nd Outline Level"
 msgstr " Ail Lefel Amlinell"
 
-#: conditionpage.ui:209
+#: sw/uiconfig/swriter/ui/conditionpage.ui:209
 msgctxt "conditionpage|filter"
 msgid " 3rd Outline Level"
 msgstr " Trydydd Lefel Amlinell"
 
-#: conditionpage.ui:210
+#: sw/uiconfig/swriter/ui/conditionpage.ui:210
 msgctxt "conditionpage|filter"
 msgid " 4th Outline Level"
 msgstr " Pedwerydd Lefel Amlinell"
 
-#: conditionpage.ui:211
+#: sw/uiconfig/swriter/ui/conditionpage.ui:211
 msgctxt "conditionpage|filter"
 msgid " 5th Outline Level"
 msgstr " 5ed Lefel Amlinell"
 
-#: conditionpage.ui:212
+#: sw/uiconfig/swriter/ui/conditionpage.ui:212
 msgctxt "conditionpage|filter"
 msgid " 6th Outline Level"
 msgstr " 6ed Lefel Amlinell"
 
-#: conditionpage.ui:213
+#: sw/uiconfig/swriter/ui/conditionpage.ui:213
 msgctxt "conditionpage|filter"
 msgid " 7th Outline Level"
 msgstr " 7fed Lefel Amlinell"
 
-#: conditionpage.ui:214
+#: sw/uiconfig/swriter/ui/conditionpage.ui:214
 msgctxt "conditionpage|filter"
 msgid " 8th Outline Level"
 msgstr " 8fed Lefel Amlinell"
 
-#: conditionpage.ui:215
+#: sw/uiconfig/swriter/ui/conditionpage.ui:215
 msgctxt "conditionpage|filter"
 msgid " 9th Outline Level"
 msgstr " 9fed Lefel Amlinell"
 
-#: conditionpage.ui:216
+#: sw/uiconfig/swriter/ui/conditionpage.ui:216
 msgctxt "conditionpage|filter"
 msgid "10th Outline Level"
 msgstr "10fed Lefel Amlinell"
 
-#: conditionpage.ui:217
+#: sw/uiconfig/swriter/ui/conditionpage.ui:217
 msgctxt "conditionpage|filter"
 msgid " 1st Numbering Level"
 msgstr " Lefel Rhifo 1af"
 
-#: conditionpage.ui:218
+#: sw/uiconfig/swriter/ui/conditionpage.ui:218
 msgctxt "conditionpage|filter"
 msgid " 2nd Numbering Level"
 msgstr " 2il Lefel Rhifo"
 
-#: conditionpage.ui:219
+#: sw/uiconfig/swriter/ui/conditionpage.ui:219
 msgctxt "conditionpage|filter"
 msgid " 3rd Numbering Level"
 msgstr " 3ydd Lefel Rhifo"
 
-#: conditionpage.ui:220
+#: sw/uiconfig/swriter/ui/conditionpage.ui:220
 msgctxt "conditionpage|filter"
 msgid " 4th Numbering Level"
 msgstr " 4ydd Lefel Rhifo"
 
-#: conditionpage.ui:221
+#: sw/uiconfig/swriter/ui/conditionpage.ui:221
 msgctxt "conditionpage|filter"
 msgid " 5th Numbering Level"
 msgstr " 5ed Lefel Rhifo"
 
-#: conditionpage.ui:222
+#: sw/uiconfig/swriter/ui/conditionpage.ui:222
 msgctxt "conditionpage|filter"
 msgid " 6th Numbering Level"
 msgstr " 6ed Lefel Rhifo"
 
-#: conditionpage.ui:223
+#: sw/uiconfig/swriter/ui/conditionpage.ui:223
 msgctxt "conditionpage|filter"
 msgid " 7th Numbering Level"
 msgstr " 7fed Lefel Rhifo"
 
-#: conditionpage.ui:224
+#: sw/uiconfig/swriter/ui/conditionpage.ui:224
 msgctxt "conditionpage|filter"
 msgid " 8th Numbering Level"
 msgstr " 8fed Lefel Rhifo"
 
-#: conditionpage.ui:225
+#: sw/uiconfig/swriter/ui/conditionpage.ui:225
 msgctxt "conditionpage|filter"
 msgid " 9th Numbering Level"
 msgstr " 9fed Lefel Rhifo"
 
-#: conditionpage.ui:226
+#: sw/uiconfig/swriter/ui/conditionpage.ui:226
 msgctxt "conditionpage|filter"
 msgid "10th Numbering Level"
 msgstr "10fed Lefel Rhifo"
 
-#: conditionpage.ui:251
+#: sw/uiconfig/swriter/ui/conditionpage.ui:251
 msgctxt "conditionpage|label11"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: converttexttable.ui:15
+#: sw/uiconfig/swriter/ui/converttexttable.ui:15
 msgctxt "converttexttable|ConvertTextTableDialog"
 msgid "Convert Table to Text"
 msgstr "Trosi Tabl i Destun"
 
-#: converttexttable.ui:114
-msgctxt "converttexttable|othered"
-msgid ","
-msgstr ","
-
-#: converttexttable.ui:120
-msgctxt "converttexttable|othered-atkobject"
-msgid "Symbol"
-msgstr "Symbolau"
-
-#: converttexttable.ui:131
-msgctxt "converttexttable|other"
-msgid "Other:"
-msgstr "Arall:"
+#: sw/uiconfig/swriter/ui/converttexttable.ui:112
+msgctxt "converttexttable|tabs"
+msgid "Tabs"
+msgstr "Tabiau"
 
-#: converttexttable.ui:150
+#: sw/uiconfig/swriter/ui/converttexttable.ui:129
 msgctxt "converttexttable|semicolons"
 msgid "Semicolons"
 msgstr "Hanner colon"
 
-#: converttexttable.ui:167
+#: sw/uiconfig/swriter/ui/converttexttable.ui:146
 msgctxt "converttexttable|paragraph"
 msgid "Paragraph"
 msgstr "Paragraff"
 
-#: converttexttable.ui:183
-msgctxt "converttexttable|tabs"
-msgid "Tabs"
-msgstr "Tabiau"
+#: sw/uiconfig/swriter/ui/converttexttable.ui:162
+msgctxt "converttexttable|other"
+msgid "Other:"
+msgstr "Arall:"
 
-#: converttexttable.ui:201
+#: sw/uiconfig/swriter/ui/converttexttable.ui:186
+msgctxt "converttexttable|othered"
+msgid ","
+msgstr ","
+
+#: sw/uiconfig/swriter/ui/converttexttable.ui:192
+msgctxt "converttexttable|othered-atkobject"
+msgid "Symbol"
+msgstr "Symbolau"
+
+#: sw/uiconfig/swriter/ui/converttexttable.ui:203
 msgctxt "converttexttable|keepcolumn"
 msgid "Equal width for all columns"
 msgstr "Lled gyfartal i bob colofn"
 
-#: converttexttable.ui:222
+#: sw/uiconfig/swriter/ui/converttexttable.ui:225
 msgctxt "converttexttable|label1"
 msgid "Separate Text At"
 msgstr "Gwahanu Testun yn"
 
-#: converttexttable.ui:255
+#: sw/uiconfig/swriter/ui/converttexttable.ui:258
 msgctxt "converttexttable|headingcb"
 msgid "Heading"
 msgstr "Pennawd"
 
-#: converttexttable.ui:269
+#: sw/uiconfig/swriter/ui/converttexttable.ui:273
 msgctxt "converttexttable|repeatheading"
 msgid "Repeat heading"
 msgstr "Ailadrodd pennawd"
 
-#: converttexttable.ui:285
+#: sw/uiconfig/swriter/ui/converttexttable.ui:290
 msgctxt "converttexttable|dontsplitcb"
 msgid "Don't split table"
 msgstr "Peidio hollti'r tabl"
 
-#: converttexttable.ui:299
-msgctxt "converttexttable|bordercb"
-msgid "Border"
-msgstr "Border"
-
-#: converttexttable.ui:323
+#: sw/uiconfig/swriter/ui/converttexttable.ui:314
 msgctxt "converttexttable|label3"
 msgid "The first "
 msgstr "Y cyntaf "
 
-#: converttexttable.ui:336
+#: sw/uiconfig/swriter/ui/converttexttable.ui:327
 msgctxt "converttexttable|label4"
 msgid "rows"
 msgstr "rhesi"
 
-#: converttexttable.ui:366
+#: sw/uiconfig/swriter/ui/converttexttable.ui:356
 msgctxt "converttexttable|autofmt"
 msgid "AutoFormat..."
 msgstr "AwtoFformat..."
 
-#: converttexttable.ui:383
+#: sw/uiconfig/swriter/ui/converttexttable.ui:373
 msgctxt "converttexttable|label2"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: createaddresslist.ui:9
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:9
 msgctxt "createaddresslist|CreateAddressList"
 msgid "New Address List"
 msgstr "Rhestr Cyfeiriadau Newydd"
 
-#: createaddresslist.ui:96
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:96
 msgctxt "createaddresslist|ADDRESS_INFORMATION"
 msgid "Address Information"
 msgstr "Gwybodaeth am y Cyfeiriad"
 
-#: createaddresslist.ui:130
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:130
 msgctxt "createaddresslist|VIEW_ENTRIES"
 msgid "Sho_w entry number"
 msgstr "_Dangos rhif cofnod"
 
-#: createaddresslist.ui:149
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:149
 msgctxt "createaddresslist|START"
 msgid "|<"
 msgstr "|<"
 
-#: createaddresslist.ui:162
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:162
 msgctxt "createaddresslist|PREV"
 msgid "<"
 msgstr "<"
 
-#: createaddresslist.ui:175
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:175
 msgctxt "createaddresslist|END"
 msgid ">|"
 msgstr ">|"
 
-#: createaddresslist.ui:188
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:188
 msgctxt "createaddresslist|NEXT"
 msgid ">"
 msgstr ">"
 
-#: createaddresslist.ui:239
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:239
 msgctxt "createaddresslist|NEW"
 msgid "_New"
 msgstr "_Newydd"
 
-#: createaddresslist.ui:254
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:254
 msgctxt "createaddresslist|DELETE"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: createaddresslist.ui:269
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:269
 msgctxt "createaddresslist|FIND"
 msgid "_Find..."
 msgstr "C_anfod..."
 
-#: createaddresslist.ui:284
+#: sw/uiconfig/swriter/ui/createaddresslist.ui:284
 msgctxt "createaddresslist|CUSTOMIZE"
 msgid "C_ustomize..."
 msgstr "C_yfaddasu..."
 
-#: createauthorentry.ui:8
+#: sw/uiconfig/swriter/ui/createauthorentry.ui:8
 msgctxt "createauthorentry|CreateAuthorEntryDialog"
 msgid "Define Bibliography Entry"
 msgstr "Diffinio Cofnodion y Llyfryddiaeth"
 
-#: createauthorentry.ui:189
+#: sw/uiconfig/swriter/ui/createauthorentry.ui:189
 msgctxt "createauthorentry|label1"
 msgid "Entry Data"
 msgstr "Data Cofnodion"
 
-#: createautomarkdialog.ui:8
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:8
 msgctxt "createautomarkdialog|CreateAutomarkDialog"
 msgid "Edit Concordance File"
 msgstr "Golygu Ffeil Concordans"
 
-#: createautomarkdialog.ui:101
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:101
 msgctxt "createautomarkdialog|searchterm"
 msgid "Search term"
 msgstr "Chwilio term"
 
-#: createautomarkdialog.ui:113
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:113
 msgctxt "createautomarkdialog|alternative"
 msgid "Alternative entry"
 msgstr "Cofnod arall"
 
-#: createautomarkdialog.ui:125
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:125
 msgctxt "createautomarkdialog|key1"
 msgid "1st key"
 msgstr "Allwedd Gyntaf"
 
-#: createautomarkdialog.ui:137
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:137
 msgctxt "createautomarkdialog|key2"
 msgid "2nd key"
 msgstr "Ail Allwedd"
 
-#: createautomarkdialog.ui:149
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:149
 msgctxt "createautomarkdialog|comment"
 msgid "Comment"
 msgstr "Sylw"
 
-#: createautomarkdialog.ui:161
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:161
 msgctxt "createautomarkdialog|casesensitive"
 msgid "Match case"
 msgstr "Cydweddu maint"
 
-#: createautomarkdialog.ui:173
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:173
 msgctxt "createautomarkdialog|wordonly"
 msgid "Word only"
 msgstr "Gair yn unig"
 
-#: createautomarkdialog.ui:185
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:185
 msgctxt "createautomarkdialog|yes"
 msgid "Yes"
 msgstr "Iawn"
 
-#: createautomarkdialog.ui:197
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:197
 msgctxt "createautomarkdialog|no"
 msgid "No"
 msgstr "Na"
 
-#: createautomarkdialog.ui:223
+#: sw/uiconfig/swriter/ui/createautomarkdialog.ui:223
 msgctxt "createautomarkdialog|label1"
 msgid "Entries"
 msgstr "Cofnodion"
 
-#: customizeaddrlistdialog.ui:18
+#: sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui:18
 msgctxt "customizeaddrlistdialog|CustomizeAddrListDialog"
 msgid "Customize Address List"
 msgstr "Cyfaddasu Rhestr Cyfeiriadau"
 
-#: customizeaddrlistdialog.ui:100
+#: sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui:100
 msgctxt "customizeaddrlistdialog|add"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: customizeaddrlistdialog.ui:128
+#: sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui:128
 msgctxt "customizeaddrlistdialog|rename"
 msgid "_Rename..."
 msgstr "_Ailenwi..."
 
-#: customizeaddrlistdialog.ui:158
+#: sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui:158
 msgctxt "customizeaddrlistdialog|label1"
 msgid "A_ddress list elements:"
 msgstr "_Elfennau rhestr cyfeiriadau:"
 
-#: datasourcesunavailabledialog.ui:8
+#: sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui:7
 msgctxt "datasourcesunavailabledialog|DataSourcesUnavailableDialog"
 msgid "Create a New Data Source?"
 msgstr "Creu Ffynhonnell Data Newydd?"
 
-#: datasourcesunavailabledialog.ui:14
+#: sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui:14
 msgctxt "datasourcesunavailabledialog|DataSourcesUnavailableDialog"
 msgid "No data sources are available. Create a new one?"
 msgstr "Dim ffynonellau data ar gael. Creu un newydd?"
 
-#: datasourcesunavailabledialog.ui:15
+#: sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui:15
 msgctxt "datasourcesunavailabledialog|DataSourcesUnavailableDialog"
 msgid "No data source has been set up yet. You need a data source, such as a database, to supply data (for example, names and addresses) for the fields."
 msgstr "Heb osod ffynhonnell data eto. Mae angen ffynhonnell data arnoch, i ddarparu data (e.e. enwau a chyfeiriadau) ar gyfer y meysydd."
 
-#: dropcapspage.ui:56
+#: sw/uiconfig/swriter/ui/dropcapspage.ui:56
 msgctxt "dropcapspage|checkCB_SWITCH"
 msgid "_Display drop caps"
 msgstr "Dangos prif lythrennau _bach"
 
-#: dropcapspage.ui:72
+#: sw/uiconfig/swriter/ui/dropcapspage.ui:72
 msgctxt "dropcapspage|checkCB_WORD"
 msgid "_Whole word"
 msgstr "Geiriau _llawn"
 
-#: dropcapspage.ui:91
+#: sw/uiconfig/swriter/ui/dropcapspage.ui:91
 msgctxt "dropcapspage|labelFT_DROPCAPS"
 msgid "Number of _characters:"
 msgstr "Nifer o _nodau:"
 
-#: dropcapspage.ui:105
+#: sw/uiconfig/swriter/ui/dropcapspage.ui:105
 msgctxt "dropcapspage|labelTXT_LINES"
 msgid "_Lines:"
 msgstr "_Llinellau:"
 
-#: dropcapspage.ui:119
+#: sw/uiconfig/swriter/ui/dropcapspage.ui:119
 msgctxt "dropcapspage|labelTXT_DISTANCE"
 msgid "_Space to text:"
 msgstr "_Bwlch i destun:"
 
-#: dropcapspage.ui:176
+#: sw/uiconfig/swriter/ui/dropcapspage.ui:173
 msgctxt "dropcapspage|labelFL_SETTING"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: dropcapspage.ui:211
+#: sw/uiconfig/swriter/ui/dropcapspage.ui:208
 msgctxt "dropcapspage|labelTXT_TEXT"
 msgid "_Text:"
 msgstr "_Testun:"
 
-#: dropcapspage.ui:225
+#: sw/uiconfig/swriter/ui/dropcapspage.ui:222
 msgctxt "dropcapspage|labelTXT_TEMPLATE"
 msgid "Character st_yle:"
 msgstr "_Arddull nod:"
 
-#: dropcapspage.ui:264
+#: sw/uiconfig/swriter/ui/dropcapspage.ui:260
 msgctxt "dropcapspage|labelFL_CONTENT"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: dropdownfielddialog.ui:7
+#: sw/uiconfig/swriter/ui/dropdownfielddialog.ui:26
 msgctxt "dropdownfielddialog|DropdownFieldDialog"
 msgid "Choose Item: "
 msgstr "Dewis Eitem: "
 
-#: dropdownfielddialog.ui:174
+#: sw/uiconfig/swriter/ui/dropdownfielddialog.ui:212
 msgctxt "dropdownfielddialog|label1"
 msgid "Edit"
 msgstr "Golygu"
 
-#: editcategories.ui:8
+#: sw/uiconfig/swriter/ui/editcategories.ui:8
 msgctxt "editcategories|EditCategoriesDialog"
 msgid "Edit Categories"
 msgstr "Golygu Categorïau"
 
-#: editcategories.ui:93
+#: sw/uiconfig/swriter/ui/editcategories.ui:93
 msgctxt "editcategories|rename"
 msgid "_Rename"
 msgstr "_Ailenwi"
 
-#: editcategories.ui:127
+#: sw/uiconfig/swriter/ui/editcategories.ui:127
 msgctxt "editcategories|label3"
 msgid "Selection list"
 msgstr "Rhestr dewis"
 
-#: editcategories.ui:144
+#: sw/uiconfig/swriter/ui/editcategories.ui:144
 msgctxt "editcategories|group"
 msgid "label"
 msgstr "label"
 
-#: editcategories.ui:171
+#: sw/uiconfig/swriter/ui/editcategories.ui:171
 msgctxt "editcategories|label2"
 msgid "Path"
 msgstr "Llwybr"
 
-#: editcategories.ui:187
+#: sw/uiconfig/swriter/ui/editcategories.ui:187
 msgctxt "editcategories|label1"
 msgid "Category"
 msgstr "Categori"
 
-#: editfielddialog.ui:17
+#: sw/uiconfig/swriter/ui/editfielddialog.ui:18
 msgctxt "editfielddialog|EditFieldDialog"
 msgid "Edit Fields"
 msgstr "Golygu Meysydd"
 
-#: editfielddialog.ui:114
+#: sw/uiconfig/swriter/ui/editfielddialog.ui:92
+msgctxt "editfielddialog|prev_tip"
+msgid "Previous field of same type"
+msgstr "Maes blaenorol o'r un math"
+
+#: sw/uiconfig/swriter/ui/editfielddialog.ui:109
+msgctxt "editfielddialog|next_tip"
+msgid "Next field of same type"
+msgstr "Maes nesaf o'r un math"
+
+#: sw/uiconfig/swriter/ui/editfielddialog.ui:121
 msgctxt "editfielddialog|edit"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: editsectiondialog.ui:9
+#: sw/uiconfig/swriter/ui/editfielddialog.ui:126
+msgctxt "editfielddialog|edit_tip"
+msgid "Edit variable field content"
+msgstr "Golygu cynnwys maes newidyn"
+
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:9
 msgctxt "editsectiondialog|EditSectionDialog"
 msgid "Edit Sections"
 msgstr "Golygu Adran"
 
-#: editsectiondialog.ui:53
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:53
 msgctxt "editsectiondialog|options"
 msgid "_Options..."
 msgstr "_Dewisiadau..."
 
-#: editsectiondialog.ui:168
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:167
 msgctxt "editsectiondialog|label1"
 msgid "Section"
 msgstr "Adran"
 
-#: editsectiondialog.ui:211
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:210
 msgctxt "editsectiondialog|link"
 msgid "_Link"
 msgstr "_Cysylltu"
 
-#: editsectiondialog.ui:228
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:227
 msgctxt "editsectiondialog|dde"
 msgid "DD_E"
 msgstr "DD_E"
 
-#: editsectiondialog.ui:258
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:257
 msgctxt "editsectiondialog|file"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: editsectiondialog.ui:286
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:284
 msgctxt "editsectiondialog|sectionft"
 msgid "_Section"
 msgstr "_Adran"
 
-#: editsectiondialog.ui:324
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:321
 msgctxt "editsectiondialog|filenameft"
 msgid "_File name"
 msgstr "_Enw ffeil"
 
-#: editsectiondialog.ui:339
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:336
 msgctxt "editsectiondialog|ddeft"
 msgid "DDE _Command"
 msgstr "Gorchymyn _DDE"
 
-#: editsectiondialog.ui:371
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:368
 msgctxt "editsectiondialog|label8"
 msgid "Link"
 msgstr "Cysylltiad"
 
-#: editsectiondialog.ui:408
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:405
 msgctxt "editsectiondialog|protect"
 msgid "_Protected"
 msgstr "_Diogel"
 
-#: editsectiondialog.ui:436
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:433
 msgctxt "editsectiondialog|withpassword"
 msgid "Wit_h password"
 msgstr "Gy_da chyfrinair"
 
-#: editsectiondialog.ui:455
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:452
 msgctxt "editsectiondialog|password"
 msgid "Password..."
 msgstr "Cyfrinair..."
 
-#: editsectiondialog.ui:485
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:482
 msgctxt "editsectiondialog|label6"
 msgid "Write Protection"
 msgstr "Diogelu rhag Tros-ysgrifennu"
 
-#: editsectiondialog.ui:522
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:519
 msgctxt "editsectiondialog|hide"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: editsectiondialog.ui:554
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:551
 msgctxt "editsectiondialog|conditionft"
 msgid "_With Condition"
 msgstr "_Gydag Amod"
 
-#: editsectiondialog.ui:592
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:588
 msgctxt "editsectiondialog|label4"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: editsectiondialog.ui:628
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:624
 msgctxt "editsectiondialog|editinro"
 msgid "E_ditable in read-only document"
 msgstr "_Golygadwy mewn dogfen darllen yn unig"
 
-#: editsectiondialog.ui:651
+#: sw/uiconfig/swriter/ui/editsectiondialog.ui:647
 msgctxt "editsectiondialog|label9"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: endnotepage.ui:40
+#: sw/uiconfig/swriter/ui/endnotepage.ui:40
 msgctxt "endnotepage|label19"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: endnotepage.ui:54
+#: sw/uiconfig/swriter/ui/endnotepage.ui:54
 msgctxt "endnotepage|label22"
 msgid "Before"
 msgstr "Cynt"
 
-#: endnotepage.ui:68
+#: sw/uiconfig/swriter/ui/endnotepage.ui:68
 msgctxt "endnotepage|offset"
 msgid "Start at"
 msgstr "Cychwyn yn"
 
-#: endnotepage.ui:82
+#: sw/uiconfig/swriter/ui/endnotepage.ui:82
 msgctxt "endnotepage|label25"
 msgid "After"
 msgstr "Wedi"
 
-#: endnotepage.ui:159
+#: sw/uiconfig/swriter/ui/endnotepage.ui:153
 msgctxt "endnotepage|label26"
 msgid "Autonumbering"
 msgstr "AwtoRhifo"
 
-#: endnotepage.ui:201
+#: sw/uiconfig/swriter/ui/endnotepage.ui:195
 msgctxt "endnotepage|label20"
 msgid "Paragraph"
 msgstr "Paragraff"
 
-#: endnotepage.ui:215
+#: sw/uiconfig/swriter/ui/endnotepage.ui:209
 msgctxt "endnotepage|pagestyleft"
 msgid "Page"
 msgstr "Tudalen"
 
-#: endnotepage.ui:256
+#: sw/uiconfig/swriter/ui/endnotepage.ui:250
 msgctxt "endnotepage|label23"
 msgid "Styles"
 msgstr "Arddulliau"
 
-#: endnotepage.ui:293
+#: sw/uiconfig/swriter/ui/endnotepage.ui:287
 msgctxt "endnotepage|label27"
 msgid "Text area"
 msgstr "Ardal testun"
 
-#: endnotepage.ui:307
+#: sw/uiconfig/swriter/ui/endnotepage.ui:301
 msgctxt "endnotepage|label28"
 msgid "Endnote area"
 msgstr "Ardal diweddnodyn"
 
-#: endnotepage.ui:348
+#: sw/uiconfig/swriter/ui/endnotepage.ui:342
 msgctxt "endnotepage|label29"
 msgid "Character Styles"
 msgstr "Arddulliau Nod"
 
-#: envaddresspage.ui:61
+#: sw/uiconfig/swriter/ui/envaddresspage.ui:61
 msgctxt "envaddresspage|label2"
 msgid "Addr_essee"
 msgstr "C_yfeirydd"
 
-#: envaddresspage.ui:98
+#: sw/uiconfig/swriter/ui/envaddresspage.ui:98
 msgctxt "envaddresspage|label4"
 msgid "Database"
 msgstr "Cronfa ddata"
 
-#: envaddresspage.ui:144
+#: sw/uiconfig/swriter/ui/envaddresspage.ui:144
 msgctxt "envaddresspage|label7"
 msgid "Table"
 msgstr "Tabl"
 
-#: envaddresspage.ui:190
+#: sw/uiconfig/swriter/ui/envaddresspage.ui:190
 msgctxt "envaddresspage|label8"
 msgid "Database field"
 msgstr "Maes Cronfa Ddata"
 
-#: envaddresspage.ui:237
+#: sw/uiconfig/swriter/ui/envaddresspage.ui:237
 msgctxt "envaddresspage|insert|tooltip_text"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: envaddresspage.ui:297
+#: sw/uiconfig/swriter/ui/envaddresspage.ui:297
 msgctxt "envaddresspage|sender"
 msgid "_Sender"
 msgstr "_Anfonwr"
 
-#: envaddresspage.ui:345
+#: sw/uiconfig/swriter/ui/envaddresspage.ui:345
 msgctxt "envaddresspage|preview-atkobject"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: envdialog.ui:8
+#: sw/uiconfig/swriter/ui/envdialog.ui:8
 msgctxt "envdialog|EnvDialog"
 msgid "Envelope"
 msgstr "Amlen"
 
-#: envdialog.ui:21
+#: sw/uiconfig/swriter/ui/envdialog.ui:21
 msgctxt "envdialog|ok"
 msgid "_New Document"
 msgstr "_Dogfen Newydd"
 
-#: envdialog.ui:37
+#: sw/uiconfig/swriter/ui/envdialog.ui:37
 msgctxt "envdialog|user"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: envdialog.ui:51
+#: sw/uiconfig/swriter/ui/envdialog.ui:51
 msgctxt "envdialog|modify"
 msgid "_Modify"
 msgstr "_Newid"
 
-#: envdialog.ui:132
+#: sw/uiconfig/swriter/ui/envdialog.ui:132
 msgctxt "envdialog|envelope"
 msgid "Envelope"
 msgstr "Amlen"
 
-#: envdialog.ui:154
+#: sw/uiconfig/swriter/ui/envdialog.ui:154
 msgctxt "envdialog|format"
 msgid "Format"
 msgstr "Fformat"
 
-#: envdialog.ui:177
+#: sw/uiconfig/swriter/ui/envdialog.ui:177
 msgctxt "envdialog|printer"
 msgid "Printer"
 msgstr "Argraffydd"
 
-#: envformatpage.ui:89
+#: sw/uiconfig/swriter/ui/envformatpage.ui:85
 msgctxt "envformatpage|label5"
 msgid "from left"
 msgstr "o'r chwith"
 
-#: envformatpage.ui:118
+#: sw/uiconfig/swriter/ui/envformatpage.ui:114
 msgctxt "envformatpage|label6"
 msgid "from top"
 msgstr "o'r brig"
 
-#: envformatpage.ui:155
+#: sw/uiconfig/swriter/ui/envformatpage.ui:151
 msgctxt "envformatpage|label7"
 msgid "Format"
 msgstr "Fformat"
 
-#: envformatpage.ui:168
+#: sw/uiconfig/swriter/ui/envformatpage.ui:164
 msgctxt "envformatpage|addredit"
 msgid "Edit"
 msgstr "Golygu"
 
-#: envformatpage.ui:202
+#: sw/uiconfig/swriter/ui/envformatpage.ui:198
 msgctxt "envformatpage|label4"
 msgid "Position"
 msgstr "Safle"
 
-#: envformatpage.ui:213
+#: sw/uiconfig/swriter/ui/envformatpage.ui:209
 msgctxt "envformatpage|label1"
 msgid "Addressee"
 msgstr "Cyfeiriad"
 
-#: envformatpage.ui:308
+#: sw/uiconfig/swriter/ui/envformatpage.ui:300
 msgctxt "envformatpage|label8"
 msgid "from left"
 msgstr "o'r chwith"
 
-#: envformatpage.ui:337
+#: sw/uiconfig/swriter/ui/envformatpage.ui:329
 msgctxt "envformatpage|label9"
 msgid "from top"
 msgstr "o'r brig"
 
-#: envformatpage.ui:374
+#: sw/uiconfig/swriter/ui/envformatpage.ui:366
 msgctxt "envformatpage|label10"
 msgid "Format"
 msgstr "Fformat"
 
-#: envformatpage.ui:387
+#: sw/uiconfig/swriter/ui/envformatpage.ui:379
 msgctxt "envformatpage|senderedit"
 msgid "Edit"
 msgstr "Golygu"
 
-#: envformatpage.ui:421
+#: sw/uiconfig/swriter/ui/envformatpage.ui:413
 msgctxt "envformatpage|label11"
 msgid "Position"
 msgstr "Safle"
 
-#: envformatpage.ui:432
+#: sw/uiconfig/swriter/ui/envformatpage.ui:424
 msgctxt "envformatpage|label2"
 msgid "Sender"
 msgstr "Anfonwr"
 
-#: envformatpage.ui:478
+#: sw/uiconfig/swriter/ui/envformatpage.ui:470
 msgctxt "envformatpage|label12"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: envformatpage.ui:494
+#: sw/uiconfig/swriter/ui/envformatpage.ui:486
 msgctxt "envformatpage|label13"
 msgid "_Width"
 msgstr "_Lled"
 
-#: envformatpage.ui:510
+#: sw/uiconfig/swriter/ui/envformatpage.ui:502
 msgctxt "envformatpage|label14"
 msgid "_Height"
 msgstr "_Uchder"
 
-#: envformatpage.ui:583
+#: sw/uiconfig/swriter/ui/envformatpage.ui:571
 msgctxt "envformatpage|preview-atkobject"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: envformatpage.ui:602
+#: sw/uiconfig/swriter/ui/envformatpage.ui:590
 msgctxt "envformatpage|label3"
 msgid "Size"
 msgstr "Maint"
 
-#: envformatpage.ui:635
+#: sw/uiconfig/swriter/ui/envformatpage.ui:623
 msgctxt "envformatpage|character"
 msgid "C_haracter..."
 msgstr "_Nod..."
 
-#: envformatpage.ui:643
+#: sw/uiconfig/swriter/ui/envformatpage.ui:631
 msgctxt "envformatpage|paragraph"
 msgid "P_aragraph..."
 msgstr "_P­aragraff..."
 
-#: envprinterpage.ui:35
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:35
 msgctxt "envprinterpage|top"
 msgid "_Print from top"
 msgstr "_Argraffu o'r brig"
 
-#: envprinterpage.ui:54
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:54
 msgctxt "envprinterpage|bottom"
 msgid "Print from _bottom"
 msgstr "Argraffu o'r _gwaelod"
 
-#: envprinterpage.ui:75
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:75
 msgctxt "envprinterpage|label3"
 msgid "_Shift right"
 msgstr "_Symud i'r dde"
 
-#: envprinterpage.ui:90
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:90
 msgctxt "envprinterpage|label4"
 msgid "Shift _down"
 msgstr "Symud _lawr"
 
-#: envprinterpage.ui:138
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:135
 msgctxt "envprinterpage|horileft|tooltip_text"
 msgid "Horizontal Left"
 msgstr "Chwith Llorweddol"
 
-#: envprinterpage.ui:140
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:137
 msgctxt "envprinterpage|horileft"
 msgid "Horizontal Left"
 msgstr "Chwith Llorweddol"
 
-#: envprinterpage.ui:152
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:149
 msgctxt "envprinterpage|horicenter|tooltip_text"
 msgid "Horizontal Center"
 msgstr "Canol Llorweddol"
 
-#: envprinterpage.ui:154
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:151
 msgctxt "envprinterpage|horicenter"
 msgid "Horizontal Center"
 msgstr "Canol Llorweddol"
 
-#: envprinterpage.ui:166
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:163
 msgctxt "envprinterpage|horiright|tooltip_text"
 msgid "Horizontal Right"
 msgstr "De Llorweddol"
 
-#: envprinterpage.ui:168
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:165
 msgctxt "envprinterpage|horiright"
 msgid "Horizontal Right"
 msgstr "De Llorweddol"
 
-#: envprinterpage.ui:180
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:177
 msgctxt "envprinterpage|vertleft|tooltip_text"
 msgid "Vertical Left"
 msgstr "Chwith Fertigol"
 
-#: envprinterpage.ui:182
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:179
 msgctxt "envprinterpage|vertleft"
 msgid "Vertical Left"
 msgstr "Chwith Fertigol"
 
-#: envprinterpage.ui:194
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:191
 msgctxt "envprinterpage|vertcenter|tooltip_text"
 msgid "Vertical Center"
 msgstr "Canol Fertigol"
 
-#: envprinterpage.ui:196
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:193
 msgctxt "envprinterpage|vertcenter"
 msgid "Vertical Center"
 msgstr "Canol Fertigol"
 
-#: envprinterpage.ui:208
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:205
 msgctxt "envprinterpage|vertright|tooltip_text"
 msgid "Vertical Right"
 msgstr "De Fertigol"
 
-#: envprinterpage.ui:210
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:207
 msgctxt "envprinterpage|vertright"
 msgid "Vertical Right"
 msgstr "De Fertigol"
 
-#: envprinterpage.ui:234
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:231
 msgctxt "envprinterpage|label1"
 msgid "Envelope Orientation"
 msgstr "Cyfeiriad yr Amlen"
 
-#: envprinterpage.ui:269
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:266
 msgctxt "envprinterpage|setup"
 msgid "Setup..."
 msgstr "Gosodiad..."
 
-#: envprinterpage.ui:288
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:285
 msgctxt "envprinterpage|printername"
 msgid "Printer Name"
 msgstr "Enw Argraffydd"
 
-#: envprinterpage.ui:307
+#: sw/uiconfig/swriter/ui/envprinterpage.ui:304
 msgctxt "envprinterpage|label2"
 msgid "Current Printer"
 msgstr "Argraffydd Cyfredol"
 
-#: exchangedatabases.ui:8
+#: sw/uiconfig/swriter/ui/exchangedatabases.ui:8
 msgctxt "exchangedatabases|ExchangeDatabasesDialog"
 msgid "Exchange Databases"
 msgstr "Cyfnewid Cronfeydd Data"
 
-#: exchangedatabases.ui:21
+#: sw/uiconfig/swriter/ui/exchangedatabases.ui:21
 msgctxt "exchangedatabases|define"
 msgid "Define"
 msgstr "Diffinio"
 
-#: exchangedatabases.ui:106
+#: sw/uiconfig/swriter/ui/exchangedatabases.ui:106
 msgctxt "exchangedatabases|label5"
 msgid "Databases in Use"
 msgstr "Cronfeydd Data ar waith"
 
-#: exchangedatabases.ui:122
+#: sw/uiconfig/swriter/ui/exchangedatabases.ui:122
 msgctxt "exchangedatabases|label6"
 msgid "_Available Databases"
 msgstr "Cronfeydd _Data ar Gael"
 
-#: exchangedatabases.ui:135
+#: sw/uiconfig/swriter/ui/exchangedatabases.ui:135
 msgctxt "exchangedatabases|browse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: exchangedatabases.ui:156
+#: sw/uiconfig/swriter/ui/exchangedatabases.ui:156
 msgctxt "exchangedatabases|label7"
 msgid ""
 "Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left.\n"
@@ -8670,4731 +8609,4517 @@ msgstr ""
 "Defnyddiwch y deialog yma i newid y cronfeydd data rydych yn cael mynediad iddynt yn eich dogfen drwy feysydd y gronfa ddata, gyda chronfeydd data eraill. Dim ond un newid ar y tro sy'n bosibl. Mae dewisiadau lluosog yn bosib yn y rhestr ar y chwith.\n"
 "Defnyddiwch y botwm pori i ddewis ffeil cronfa ddata."
 
-#: exchangedatabases.ui:207
+#: sw/uiconfig/swriter/ui/exchangedatabases.ui:207
 msgctxt "exchangedatabases|label1"
 msgid "Exchange Databases"
 msgstr "Cyfnewid Cronfeydd Data"
 
-#: exchangedatabases.ui:229
+#: sw/uiconfig/swriter/ui/exchangedatabases.ui:229
 msgctxt "exchangedatabases|label2"
 msgid "Database applied to document:"
 msgstr "Cronfa Ddata cysylltiedig â'r ddogfen:"
 
-#: fielddialog.ui:8
+#: sw/uiconfig/swriter/ui/fielddialog.ui:8
 msgctxt "fielddialog|FieldDialog"
 msgid "Fields"
 msgstr "Meysydd"
 
-#: fielddialog.ui:21
+#: sw/uiconfig/swriter/ui/fielddialog.ui:21
 msgctxt "fielddialog|ok"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: fielddialog.ui:104
+#: sw/uiconfig/swriter/ui/fielddialog.ui:129
 msgctxt "fielddialog|document"
 msgid "Document"
 msgstr "Dogfen"
 
-#: fielddialog.ui:126
+#: sw/uiconfig/swriter/ui/fielddialog.ui:175
 msgctxt "fielddialog|ref"
 msgid "Cross-references"
 msgstr "Croes gyfeiriadau"
 
-#: fielddialog.ui:149
+#: sw/uiconfig/swriter/ui/fielddialog.ui:222
 msgctxt "fielddialog|functions"
 msgid "Functions"
 msgstr "Swyddogaethau"
 
-#: fielddialog.ui:172
+#: sw/uiconfig/swriter/ui/fielddialog.ui:269
 msgctxt "fielddialog|docinfo"
 msgid "DocInformation"
 msgstr "Manylion Dogfen"
 
-#: fielddialog.ui:195
+#: sw/uiconfig/swriter/ui/fielddialog.ui:316
 msgctxt "fielddialog|variables"
 msgid "Variables"
 msgstr "Newidolion"
 
-#: fielddialog.ui:218
+#: sw/uiconfig/swriter/ui/fielddialog.ui:363
 msgctxt "fielddialog|database"
 msgid "Database"
 msgstr "Cronfa ddata"
 
-#: findentrydialog.ui:8
+#: sw/uiconfig/swriter/ui/findentrydialog.ui:8
 msgctxt "findentrydialog|FindEntryDialog"
 msgid "Find Entry"
 msgstr "Canfod Cofnod"
 
-#: findentrydialog.ui:91
+#: sw/uiconfig/swriter/ui/findentrydialog.ui:91
 msgctxt "findentrydialog|label1"
 msgid "F_ind"
 msgstr "_Canfod"
 
-#: findentrydialog.ui:131
+#: sw/uiconfig/swriter/ui/findentrydialog.ui:130
 msgctxt "findentrydialog|findin"
 msgid "Find _only in"
 msgstr "_Dim ond canfod yn"
 
-#: flddbpage.ui:57
+#: sw/uiconfig/swriter/ui/flddbpage.ui:57
 msgctxt "flddbpage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: flddbpage.ui:86
+#: sw/uiconfig/swriter/ui/flddbpage.ui:86
 msgctxt "flddbpage|label5"
 msgid "_Condition"
 msgstr "_Gydag Amod"
 
-#: flddbpage.ui:145
+#: sw/uiconfig/swriter/ui/flddbpage.ui:141
 msgctxt "flddbpage|label4"
 msgid "Record number"
 msgstr "Rhif cofnod"
 
-#: flddbpage.ui:218
+#: sw/uiconfig/swriter/ui/flddbpage.ui:214
 msgctxt "flddbpage|label2"
 msgid "Database s_election"
 msgstr "_Dewis cronfa ddata"
 
-#: flddbpage.ui:243
+#: sw/uiconfig/swriter/ui/flddbpage.ui:239
 msgctxt "flddbpage|browseft"
 msgid "Add database file"
 msgstr "Ychwanegu ffeil cronfa ddata"
 
-#: flddbpage.ui:256
+#: sw/uiconfig/swriter/ui/flddbpage.ui:252
 msgctxt "flddbpage|browse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: flddbpage.ui:297
+#: sw/uiconfig/swriter/ui/flddbpage.ui:293
 msgctxt "flddbpage|fromdatabasecb"
 msgid "From database"
 msgstr "O ­gronfa ddata"
 
-#: flddbpage.ui:315
+#: sw/uiconfig/swriter/ui/flddbpage.ui:312
 msgctxt "flddbpage|userdefinedcb"
 msgid "User-defined"
 msgstr "Defnyddiwr diffiniedig"
 
-#: flddbpage.ui:389
+#: sw/uiconfig/swriter/ui/flddbpage.ui:387
 msgctxt "flddbpage|label3"
 msgid "Format"
 msgstr "Fformat"
 
-#: flddocinfopage.ui:42
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:42
 msgctxt "flddocinfopage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: flddocinfopage.ui:88
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:88
 msgctxt "flddocinfopage|label2"
 msgid "S_elect"
 msgstr "_D­ewis"
 
-#: flddocinfopage.ui:138
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:138
 msgctxt "flddocinfopage|fixed"
 msgid "_Fixed content"
 msgstr "_Cynnwys gosodedig"
 
-#: flddocinfopage.ui:161
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:161
 msgctxt "flddocinfopage|label3"
 msgid "F_ormat"
 msgstr "_Ff­ormat"
 
-#: flddocinfopage.ui:183
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:183
 msgctxt "flddocinfopage|liststore1"
 msgid "Author"
 msgstr "Awdur"
 
-#: flddocinfopage.ui:186
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:186
 msgctxt "flddocinfopage|liststore1"
 msgid "Time"
 msgstr "Amser"
 
-#: flddocinfopage.ui:189
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:189
 msgctxt "flddocinfopage|liststore1"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: flddocinfopage.ui:192
+#: sw/uiconfig/swriter/ui/flddocinfopage.ui:192
 msgctxt "flddocinfopage|liststore1"
 msgid "Date Time Author"
 msgstr "Dyddiad Amser Awdur"
 
-#: flddocumentpage.ui:50
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:50
 msgctxt "flddocumentpage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: flddocumentpage.ui:95
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:95
 msgctxt "flddocumentpage|label2"
 msgid "S_elect"
 msgstr "D­_ewis"
 
-#: flddocumentpage.ui:179
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:179
 msgctxt "flddocumentpage|label3"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: flddocumentpage.ui:196
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:196
 msgctxt "flddocumentpage|fixed"
 msgid "_Fixed content"
 msgstr "Cynnwys _gosodedig"
 
-#: flddocumentpage.ui:221
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:221
 msgctxt "flddocumentpage|levelft"
 msgid "Level"
 msgstr "Lefel"
 
-#: flddocumentpage.ui:266
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:262
 msgctxt "flddocumentpage|daysft"
 msgid "Offs_et in days"
 msgstr "_Atred mewn dyddiau"
 
-#: flddocumentpage.ui:282
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:278
 msgctxt "flddocumentpage|minutesft"
 msgid "Offs_et in minutes"
 msgstr "At_red mewn munudau"
 
-#: flddocumentpage.ui:311
+#: sw/uiconfig/swriter/ui/flddocumentpage.ui:307
 msgctxt "flddocumentpage|valueft"
 msgid "_Value"
 msgstr "_Gwerth"
 
-#: fldfuncpage.ui:42
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:42
 msgctxt "fldfuncpage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: fldfuncpage.ui:89
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:89
 msgctxt "fldfuncpage|label4"
 msgid "S_elect"
 msgstr "D_ewis"
 
-#: fldfuncpage.ui:135
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:135
 msgctxt "fldfuncpage|label2"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: fldfuncpage.ui:157
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:157
 msgctxt "fldfuncpage|macro"
 msgid "_Macro..."
 msgstr "_Macro..."
 
-#: fldfuncpage.ui:182
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:182
 msgctxt "fldfuncpage|valueft"
 msgid "_Value"
 msgstr "_Gwerth"
 
-#: fldfuncpage.ui:226
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:225
 msgctxt "fldfuncpage|nameft"
 msgid "Na_me"
 msgstr "E_nw"
 
-#: fldfuncpage.ui:271
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:268
 msgctxt "fldfuncpage|cond1ft"
 msgid "Then"
 msgstr "Yna"
 
-#: fldfuncpage.ui:315
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:310
 msgctxt "fldfuncpage|cond2ft"
 msgid "Else"
 msgstr "Neu"
 
-#: fldfuncpage.ui:365
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:358
 msgctxt "fldfuncpage|itemft"
 msgid "It_em"
 msgstr "_Eitem"
 
-#: fldfuncpage.ui:425
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:416
 msgctxt "fldfuncpage|listitemft"
 msgid "Items on _list"
 msgstr "E_itemau ar y rhestr"
 
-#: fldfuncpage.ui:477
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:468
 msgctxt "fldfuncpage|up"
 msgid "Move _Up"
 msgstr "Symud _Fyny"
 
-#: fldfuncpage.ui:491
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:482
 msgctxt "fldfuncpage|down"
 msgid "Move Do_wn"
 msgstr "Symud _Lawr"
 
-#: fldfuncpage.ui:521
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:512
 msgctxt "fldfuncpage|listnameft"
 msgid "Na_me"
 msgstr "E_nw"
 
-#: fldfuncpage.ui:586
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:575
 msgctxt "fldfuncpage|liststore1"
 msgid "Author"
 msgstr "Awdur"
 
-#: fldfuncpage.ui:589
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:578
 msgctxt "fldfuncpage|liststore1"
 msgid "Time"
 msgstr "Amser"
 
-#: fldfuncpage.ui:592
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:581
 msgctxt "fldfuncpage|liststore1"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: fldfuncpage.ui:595
+#: sw/uiconfig/swriter/ui/fldfuncpage.ui:584
 msgctxt "fldfuncpage|liststore1"
 msgid "Date Time Author"
 msgstr "Dyddiad Amser Awdur"
 
-#: fldrefpage.ui:13
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:13
 msgctxt "fldrefpage|liststore1"
 msgid "Bookmarks"
 msgstr "Nodau Tudalen"
 
-#: fldrefpage.ui:16
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:16
 msgctxt "fldrefpage|liststore1"
 msgid "Footnotes"
 msgstr "Troednodau"
 
-#: fldrefpage.ui:19
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:19
 msgctxt "fldrefpage|liststore1"
 msgid "Endnotes"
 msgstr "Diweddnodau"
 
-#: fldrefpage.ui:22
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:22
 msgctxt "fldrefpage|liststore1"
 msgid "Headings"
 msgstr "Penawdau"
 
-#: fldrefpage.ui:25
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:25
 msgctxt "fldrefpage|liststore1"
 msgid "Numbered Paragraphs"
 msgstr "Paragraffau Rhifedig"
 
-#: fldrefpage.ui:81
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:81
 msgctxt "fldrefpage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: fldrefpage.ui:126
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:126
 msgctxt "fldrefpage|label3"
 msgid "Insert _reference to"
 msgstr "Mewnosod c_yfeiriad at"
 
-#: fldrefpage.ui:169
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:169
 msgctxt "fldrefpage|label4"
 msgid "Selection"
 msgstr "Dewis"
 
-#: fldrefpage.ui:195
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:195
 msgctxt "fldrefpage|filter"
 msgid "Filter Selection"
 msgstr "Hidlo'r Dewis"
 
-#: fldrefpage.ui:269
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:269
 msgctxt "fldrefpage|label2"
 msgid "S_election"
 msgstr "D_ewis"
 
-#: fldrefpage.ui:296
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:296
 msgctxt "fldrefpage|valueft"
 msgid "_Value"
 msgstr "_Gwerth"
 
-#: fldrefpage.ui:323
+#: sw/uiconfig/swriter/ui/fldrefpage.ui:322
 msgctxt "fldrefpage|nameft"
 msgid "Na_me"
 msgstr "E_nw"
 
-#: fldvarpage.ui:52
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:52
 msgctxt "fldvarpage|label1"
 msgid "_Type"
 msgstr "_Math"
 
-#: fldvarpage.ui:77
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:77
 msgctxt "fldvarpage|nameft"
 msgid "Na_me"
 msgstr "E_nw"
 
-#: fldvarpage.ui:154
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:152
 msgctxt "fldvarpage|label2"
 msgid "S_elect"
 msgstr "D_ewis"
 
-#: fldvarpage.ui:179
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:177
 msgctxt "fldvarpage|valueft"
 msgid "_Value"
 msgstr "_Gwerth"
 
-#: fldvarpage.ui:297
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:293
 msgctxt "fldvarpage|label3"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: fldvarpage.ui:313
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:309
 msgctxt "fldvarpage|invisible"
 msgid "Invisi_ble"
 msgstr "Anwel_edig"
 
-#: fldvarpage.ui:352
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:348
 msgctxt "fldvarpage|label5"
 msgid "_Level"
 msgstr "_Lefel"
 
-#: fldvarpage.ui:367
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:363
 msgctxt "fldvarpage|separatorft"
 msgid "_Separator"
 msgstr "_Ymwahanydd"
 
-#: fldvarpage.ui:385
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:381
 msgctxt "fldvarpage|level"
 msgid "None"
 msgstr "Dim"
 
-#: fldvarpage.ui:402
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:397
 msgctxt "fldvarpage|separator"
 msgid "."
 msgstr "."
 
-#: fldvarpage.ui:420
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:415
 msgctxt "fldvarpage|label4"
 msgid "Numbering by Chapter"
 msgstr "Rhifo yn ôl Pennawd"
 
-#: fldvarpage.ui:458
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:453
 msgctxt "fldvarpage|apply|tooltip_text"
 msgid "Apply"
 msgstr "Gosod"
 
-#: fldvarpage.ui:473
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:468
 msgctxt "fldvarpage|delete|tooltip_text"
 msgid "Delete"
 msgstr "Dileu"
 
-#: fldvarpage.ui:528
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:523
 msgctxt "fldvarpage|liststore1"
 msgid "Author"
 msgstr "Awdur"
 
-#: fldvarpage.ui:531
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:526
 msgctxt "fldvarpage|liststore1"
 msgid "Time"
 msgstr "Amser"
 
-#: fldvarpage.ui:534
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:529
 msgctxt "fldvarpage|liststore1"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: fldvarpage.ui:537
+#: sw/uiconfig/swriter/ui/fldvarpage.ui:532
 msgctxt "fldvarpage|liststore1"
 msgid "Date Time Author"
 msgstr "Dyddiad Amser Awdur"
 
-#: floatingnavigation.ui:11
+#: sw/uiconfig/swriter/ui/floatingnavigation.ui:11
 msgctxt "floatingnavigation|FloatingNavigation"
 msgid "Navigation"
 msgstr "Llywio"
 
-#: floatingsync.ui:10
+#: sw/uiconfig/swriter/ui/floatingsync.ui:10
 msgctxt "floatingsync|FloatingSync"
 msgid "Synchronize"
 msgstr "Cydweddu"
 
-#: floatingsync.ui:23
+#: sw/uiconfig/swriter/ui/floatingsync.ui:23
 msgctxt "floatingsync|sync"
 msgid "Synchronize Labels"
 msgstr "Cydweddu Labeli"
 
-#: footendnotedialog.ui:8
+#: sw/uiconfig/swriter/ui/footendnotedialog.ui:8
 msgctxt "footendnotedialog|FootEndnoteDialog"
 msgid "Footnotes/Endnotes Settings"
 msgstr "Gosodiadau Troednodau/Diweddnodau"
 
-#: footendnotedialog.ui:92
+#: sw/uiconfig/swriter/ui/footendnotedialog.ui:92
 msgctxt "footendnotedialog|footnotes"
 msgid "Footnotes"
 msgstr "Troednodau"
 
-#: footendnotedialog.ui:114
+#: sw/uiconfig/swriter/ui/footendnotedialog.ui:114
 msgctxt "footendnotedialog|endnotes"
 msgid "Endnotes"
 msgstr "Diweddnodau"
 
-#: footnoteareapage.ui:66
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:66
 msgctxt "footnoteareapage|maxheightpage"
 msgid "_Not larger than page area"
 msgstr "_Dim mwy nag ardal tudalen"
 
-#: footnoteareapage.ui:86
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:86
 msgctxt "footnoteareapage|maxheight"
 msgid "Maximum footnote _height"
 msgstr "_Uchder mwyaf troednodyn"
 
-#: footnoteareapage.ui:112
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:112
 msgctxt "footnoteareapage|label3"
 msgid "Space to text"
 msgstr "Bwlch i destun"
 
-#: footnoteareapage.ui:173
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:169
 msgctxt "footnoteareapage|label1"
 msgid "Footnote Area"
 msgstr "Ardal Troednodyn"
 
-#: footnoteareapage.ui:213
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:209
 msgctxt "footnoteareapage|label4"
 msgid "_Position"
 msgstr "_Safle"
 
-#: footnoteareapage.ui:230
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:226
 msgctxt "footnoteareapage|label5"
 msgid "_Style"
 msgstr "_Arddull"
 
-#: footnoteareapage.ui:247
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:243
 msgctxt "footnoteareapage|label6"
 msgid "_Thickness"
 msgstr "_Trwch"
 
-#: footnoteareapage.ui:264
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:260
 msgctxt "footnoteareapage|label7"
 msgid "_Color"
 msgstr "_Lliw"
 
-#: footnoteareapage.ui:281
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:277
 msgctxt "footnoteareapage|label8"
 msgid "_Length"
 msgstr "_Hyd"
 
-#: footnoteareapage.ui:298
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:294
 msgctxt "footnoteareapage|label9"
 msgid "_Spacing to footnote contents"
 msgstr "_Bylchu i gynnwys troednodyn"
 
-#: footnoteareapage.ui:318
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:314
 msgctxt "footnoteareapage|position"
 msgid "Left"
 msgstr "Chwith"
 
-#: footnoteareapage.ui:319
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:315
 msgctxt "footnoteareapage|position"
 msgid "Centered"
 msgstr "Canoli"
 
-#: footnoteareapage.ui:320
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:316
 msgctxt "footnoteareapage|position"
 msgid "Right"
 msgstr "De"
 
-#: footnoteareapage.ui:417
+#: sw/uiconfig/swriter/ui/footnoteareapage.ui:409
 msgctxt "footnoteareapage|label2"
 msgid "Separator Line"
 msgstr "Llinell Ymwahanydd"
 
-#: footnotepage.ui:20
+#: sw/uiconfig/swriter/ui/footnotepage.ui:20
 msgctxt "footnotepage|liststore1"
 msgid "Per page"
 msgstr "Y dudalen"
 
-#: footnotepage.ui:23
+#: sw/uiconfig/swriter/ui/footnotepage.ui:23
 msgctxt "footnotepage|liststore1"
 msgid "Per chapter"
 msgstr "Y bennod"
 
-#: footnotepage.ui:26
+#: sw/uiconfig/swriter/ui/footnotepage.ui:26
 msgctxt "footnotepage|liststore1"
 msgid "Per document"
 msgstr "Y ddogfen"
 
-#: footnotepage.ui:58
+#: sw/uiconfig/swriter/ui/footnotepage.ui:58
 msgctxt "footnotepage|label6"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: footnotepage.ui:72
+#: sw/uiconfig/swriter/ui/footnotepage.ui:72
 msgctxt "footnotepage|label7"
 msgid "Counting"
 msgstr "Cyfrifo"
 
-#: footnotepage.ui:86
+#: sw/uiconfig/swriter/ui/footnotepage.ui:86
 msgctxt "footnotepage|label8"
 msgid "Before"
 msgstr "Cynt"
 
-#: footnotepage.ui:100
+#: sw/uiconfig/swriter/ui/footnotepage.ui:100
 msgctxt "footnotepage|pos"
 msgid "Position"
 msgstr "Safle"
 
-#: footnotepage.ui:114
+#: sw/uiconfig/swriter/ui/footnotepage.ui:114
 msgctxt "footnotepage|offset"
 msgid "Start at"
 msgstr "Cychwyn yn"
 
-#: footnotepage.ui:128
+#: sw/uiconfig/swriter/ui/footnotepage.ui:128
 msgctxt "footnotepage|label11"
 msgid "After"
 msgstr "Wedi"
 
-#: footnotepage.ui:140
+#: sw/uiconfig/swriter/ui/footnotepage.ui:140
 msgctxt "footnotepage|pospagecb"
 msgid "End of page"
 msgstr "Diwedd tudalen"
 
-#: footnotepage.ui:160
+#: sw/uiconfig/swriter/ui/footnotepage.ui:161
 msgctxt "footnotepage|posdoccb"
 msgid "End of document"
 msgstr "Diwedd dogfen"
 
-#: footnotepage.ui:280
+#: sw/uiconfig/swriter/ui/footnotepage.ui:276
 msgctxt "footnotepage|label3"
 msgid "Autonumbering"
 msgstr "AwtoRhifo"
 
-#: footnotepage.ui:321
+#: sw/uiconfig/swriter/ui/footnotepage.ui:317
 msgctxt "footnotepage|label4"
 msgid "Paragraph"
 msgstr "Paragraff"
 
-#: footnotepage.ui:335
+#: sw/uiconfig/swriter/ui/footnotepage.ui:331
 msgctxt "footnotepage|pagestyleft"
 msgid "Page"
 msgstr "Tudalen"
 
-#: footnotepage.ui:377
+#: sw/uiconfig/swriter/ui/footnotepage.ui:373
 msgctxt "footnotepage|label12"
 msgid "Styles"
 msgstr "Arddulliau"
 
-#: footnotepage.ui:413
+#: sw/uiconfig/swriter/ui/footnotepage.ui:409
 msgctxt "footnotepage|label15"
 msgid "Text area"
 msgstr "Ardal testun"
 
-#: footnotepage.ui:427
+#: sw/uiconfig/swriter/ui/footnotepage.ui:423
 msgctxt "footnotepage|label16"
 msgid "Footnote area"
 msgstr "Ardal troednodyn"
 
-#: footnotepage.ui:469
+#: sw/uiconfig/swriter/ui/footnotepage.ui:465
 msgctxt "footnotepage|label13"
 msgid "Character Styles"
 msgstr "Arddulliau Nod"
 
-#: footnotepage.ui:513
+#: sw/uiconfig/swriter/ui/footnotepage.ui:509
 msgctxt "footnotepage|label17"
 msgid "End of footnote"
 msgstr "Diwedd troednodyn"
 
-#: footnotepage.ui:527
+#: sw/uiconfig/swriter/ui/footnotepage.ui:523
 msgctxt "footnotepage|label18"
 msgid "Start of next page"
 msgstr "Cychwyn tudalen nesaf"
 
-#: footnotepage.ui:577
+#: sw/uiconfig/swriter/ui/footnotepage.ui:569
 msgctxt "footnotepage|label5"
 msgid "Continuation Notice"
 msgstr "Rhybudd Parhad"
 
-#: footnotesendnotestabpage.ui:49
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:49
 msgctxt "footnotesendnotestabpage|ftnntnum"
 msgid "_Restart numbering"
 msgstr "_Ail gychwyn rhifo"
 
-#: footnotesendnotestabpage.ui:92
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:91
 msgctxt "footnotesendnotestabpage|ftnoffset_label"
 msgid "_Start at:"
 msgstr "_Cychwyn yn:"
 
-#: footnotesendnotestabpage.ui:113
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:112
 msgctxt "footnotesendnotestabpage|ftnntnumfmt"
 msgid "Custom _format"
 msgstr "_Fformat cyfaddas"
 
-#: footnotesendnotestabpage.ui:157
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:155
 msgctxt "footnotesendnotestabpage|ftnsuffix_label"
 msgid "Aft_er:"
 msgstr "We_di:"
 
-#: footnotesendnotestabpage.ui:202
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:199
 msgctxt "footnotesendnotestabpage|ftnprefix_label"
 msgid "Be_fore:"
 msgstr "Cy_n:"
 
-#: footnotesendnotestabpage.ui:231
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:228
 msgctxt "footnotesendnotestabpage|ftnntattextend"
 msgid "Collec_t at end of text"
 msgstr "Cas_glu ar ddiwedd y testun"
 
-#: footnotesendnotestabpage.ui:255
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:252
 msgctxt "footnotesendnotestabpage|label1"
 msgid "Footnotes"
 msgstr "Troednodau"
 
-#: footnotesendnotestabpage.ui:292
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:289
 msgctxt "footnotesendnotestabpage|endntattextend"
 msgid "C_ollect at end of section"
 msgstr "Cas_glu ar ddiwedd yr adran"
 
-#: footnotesendnotestabpage.ui:318
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:315
 msgctxt "footnotesendnotestabpage|endntnum"
 msgid "_Restart numbering"
 msgstr "_Ail gychwyn rhifo"
 
-#: footnotesendnotestabpage.ui:361
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:357
 msgctxt "footnotesendnotestabpage|endoffset_label"
 msgid "_Start at:"
 msgstr "_Cychwyn:"
 
-#: footnotesendnotestabpage.ui:382
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:378
 msgctxt "footnotesendnotestabpage|endntnumfmt"
 msgid "_Custom format"
 msgstr "Ffo_rmat cyfaddas"
 
-#: footnotesendnotestabpage.ui:426
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:421
 msgctxt "footnotesendnotestabpage|endsuffix_label"
 msgid "Aft_er:"
 msgstr "We_di:"
 
-#: footnotesendnotestabpage.ui:471
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:465
 msgctxt "footnotesendnotestabpage|endprefix_label"
 msgid "Be_fore:"
 msgstr "Cy_n:"
 
-#: footnotesendnotestabpage.ui:506
+#: sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui:500
 msgctxt "footnotesendnotestabpage|label2"
 msgid "Endnotes"
 msgstr "Diweddnodau"
 
-#: formatsectiondialog.ui:8
+#: sw/uiconfig/swriter/ui/formatsectiondialog.ui:8
 msgctxt "formatsectiondialog|FormatSectionDialog"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: formatsectiondialog.ui:107
+#: sw/uiconfig/swriter/ui/formatsectiondialog.ui:107
 msgctxt "formatsectiondialog|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: formatsectiondialog.ui:129
+#: sw/uiconfig/swriter/ui/formatsectiondialog.ui:129
 msgctxt "formatsectiondialog|indents"
 msgid "Indents"
 msgstr "Mewnoliadau"
 
-#: formatsectiondialog.ui:152
+#: sw/uiconfig/swriter/ui/formatsectiondialog.ui:152
 msgctxt "formatsectiondialog|background"
 msgid "Background"
 msgstr "Cefndir"
 
-#: formatsectiondialog.ui:175
+#: sw/uiconfig/swriter/ui/formatsectiondialog.ui:175
 msgctxt "formatsectiondialog|notes"
 msgid "Footnotes/Endnotes"
 msgstr "Troednodau/Diweddnodau"
 
-#: formattablepage.ui:61
+#: sw/uiconfig/swriter/ui/formattablepage.ui:63
 msgctxt "formattablepage|nameft"
 msgid "_Name"
 msgstr "_Enw"
 
-#: formattablepage.ui:77
+#: sw/uiconfig/swriter/ui/formattablepage.ui:79
 msgctxt "formattablepage|widthft"
 msgid "W_idth"
 msgstr "_Lled"
 
-#: formattablepage.ui:108
+#: sw/uiconfig/swriter/ui/formattablepage.ui:110
 msgctxt "formattablepage|relwidth"
 msgid "Relati_ve"
 msgstr "_Perthynol"
 
-#: formattablepage.ui:155
+#: sw/uiconfig/swriter/ui/formattablepage.ui:155
 msgctxt "formattablepage|label45"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: formattablepage.ui:194
+#: sw/uiconfig/swriter/ui/formattablepage.ui:194
 msgctxt "formattablepage|leftft"
 msgid "Lef_t"
 msgstr "_Chwith"
 
-#: formattablepage.ui:210
+#: sw/uiconfig/swriter/ui/formattablepage.ui:210
 msgctxt "formattablepage|rightft"
 msgid "Ri_ght"
 msgstr "_De"
 
-#: formattablepage.ui:228
+#: sw/uiconfig/swriter/ui/formattablepage.ui:228
 msgctxt "formattablepage|aboveft"
 msgid "_Above"
 msgstr "_Uwchlaw"
 
-#: formattablepage.ui:245
+#: sw/uiconfig/swriter/ui/formattablepage.ui:245
 msgctxt "formattablepage|belowft"
 msgid "_Below"
 msgstr "_Islaw"
 
-#: formattablepage.ui:328
+#: sw/uiconfig/swriter/ui/formattablepage.ui:320
 msgctxt "formattablepage|label46"
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: formattablepage.ui:370
+#: sw/uiconfig/swriter/ui/formattablepage.ui:362
 msgctxt "formattablepage|full"
 msgid "A_utomatic"
 msgstr "_Awtomatig"
 
-#: formattablepage.ui:388
+#: sw/uiconfig/swriter/ui/formattablepage.ui:380
 msgctxt "formattablepage|left"
 msgid "_Left"
 msgstr "_Chwith"
 
-#: formattablepage.ui:406
+#: sw/uiconfig/swriter/ui/formattablepage.ui:398
 msgctxt "formattablepage|fromleft"
 msgid "_From left"
 msgstr "_O'r chwith"
 
-#: formattablepage.ui:424
+#: sw/uiconfig/swriter/ui/formattablepage.ui:416
 msgctxt "formattablepage|right"
 msgid "R_ight"
 msgstr "_De"
 
-#: formattablepage.ui:443
+#: sw/uiconfig/swriter/ui/formattablepage.ui:435
 msgctxt "formattablepage|center"
 msgid "_Center"
 msgstr "_Canol"
 
-#: formattablepage.ui:461
+#: sw/uiconfig/swriter/ui/formattablepage.ui:453
 msgctxt "formattablepage|free"
 msgid "_Manual"
 msgstr "_Llaw"
 
-#: formattablepage.ui:486
+#: sw/uiconfig/swriter/ui/formattablepage.ui:478
 msgctxt "formattablepage|label43"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: formattablepage.ui:530
+#: sw/uiconfig/swriter/ui/formattablepage.ui:522
 msgctxt "formattablepage|label53"
 msgid "Text _direction"
 msgstr "_Cyfeiriad testun"
 
-#: formattablepage.ui:562
+#: sw/uiconfig/swriter/ui/formattablepage.ui:553
 msgctxt "formattablepage|label44"
 msgid "Properties "
 msgstr "Priodweddau "
 
-#: formattablepage.ui:586
-msgctxt "formattablepage|liststore1"
-msgid "Left-to-right"
-msgstr "Chwith i dde"
-
-#: formattablepage.ui:590
-msgctxt "formattablepage|liststore1"
-msgid "Right-to-left"
-msgstr "De i chwith"
-
-#: formattablepage.ui:594
-msgctxt "formattablepage|liststore1"
-msgid "Use superordinate object settings"
-msgstr "Defnyddio gosodiadau gwrthrych uwcholyn"
-
-#: framedialog.ui:8
+#: sw/uiconfig/swriter/ui/framedialog.ui:8
 msgctxt "framedialog|FrameDialog"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: framedialog.ui:106
+#: sw/uiconfig/swriter/ui/framedialog.ui:106
 msgctxt "framedialog|type"
 msgid "Type"
 msgstr "Math"
 
-#: framedialog.ui:128
+#: sw/uiconfig/swriter/ui/framedialog.ui:128
 msgctxt "framedialog|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: framedialog.ui:151
+#: sw/uiconfig/swriter/ui/framedialog.ui:151
 msgctxt "framedialog|wrap"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: framedialog.ui:174
+#: sw/uiconfig/swriter/ui/framedialog.ui:174
 msgctxt "framedialog|hyperlink"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: framedialog.ui:197
+#: sw/uiconfig/swriter/ui/framedialog.ui:197
 msgctxt "framedialog|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: framedialog.ui:220
+#: sw/uiconfig/swriter/ui/framedialog.ui:220
 msgctxt "framedialog|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: framedialog.ui:243
+#: sw/uiconfig/swriter/ui/framedialog.ui:243
 msgctxt "framedialog|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: framedialog.ui:266
+#: sw/uiconfig/swriter/ui/framedialog.ui:266
 msgctxt "framedialog|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: framedialog.ui:289
+#: sw/uiconfig/swriter/ui/framedialog.ui:289
 msgctxt "framedialog|macro"
 msgid "Macro"
 msgstr "Macro"
 
-#: frmaddpage.ui:14
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:14
 msgctxt "frmaddpage|liststore"
 msgid "Top"
 msgstr "Brig"
 
-#: frmaddpage.ui:18
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:18
 msgctxt "frmaddpage|liststore"
 msgid "Centered"
 msgstr "Canoli"
 
-#: frmaddpage.ui:22
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:22
 msgctxt "frmaddpage|liststore"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: frmaddpage.ui:36
-msgctxt "frmaddpage|liststore1"
-msgid "Left-to-right"
-msgstr "Chwith i dde"
-
-#: frmaddpage.ui:40
-msgctxt "frmaddpage|liststore1"
-msgid "Right-to-left"
-msgstr "De i chwith"
-
-#: frmaddpage.ui:44
-msgctxt "frmaddpage|liststore1"
-msgid "Right-to-left (vertical)"
-msgstr "De i chwith (fertigol)"
-
-#: frmaddpage.ui:48
-msgctxt "frmaddpage|liststore1"
-msgid "Left-to-right (vertical)"
-msgstr "Chwith i'r dde (fertigol)"
-
-#: frmaddpage.ui:52
-msgctxt "frmaddpage|liststore1"
-msgid "Use superordinate object settings"
-msgstr "Defnyddio gosodiadau gwrthrych uwcholyn"
-
-#: frmaddpage.ui:122
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:90
 msgctxt "frmaddpage|name_label"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: frmaddpage.ui:136
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:104
 msgctxt "frmaddpage|altname_label"
 msgid "_Alternative (Text only):"
 msgstr "_Arall (Testun yn unig):"
 
-#: frmaddpage.ui:152
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:120
 msgctxt "frmaddpage|prev"
 msgid "<None>"
 msgstr "<Dim>"
 
-#: frmaddpage.ui:166
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:134
 msgctxt "frmaddpage|next"
 msgid "<None>"
 msgstr "<Dim>"
 
-#: frmaddpage.ui:178
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:146
 msgctxt "frmaddpage|prev_label"
 msgid "_Previous link:"
 msgstr "C_ysylltiad blaenorol:"
 
-#: frmaddpage.ui:192
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:160
 msgctxt "frmaddpage|next_label"
 msgid "_Next link:"
 msgstr "Cysylltiad _nesaf:"
 
-#: frmaddpage.ui:206
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:174
 msgctxt "frmaddpage|description_label"
 msgid "_Description:"
 msgstr "_Disgrifiad:"
 
-#: frmaddpage.ui:243
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:211
 msgctxt "frmaddpage|label1"
 msgid "Names"
 msgstr "Enwau"
 
-#: frmaddpage.ui:282
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:250
 msgctxt "frmaddpage|label2"
 msgid "_Vertical alignment"
 msgstr "_Aliniad fertigol"
 
-#: frmaddpage.ui:309
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:277
 msgctxt "frmaddpage|label7"
 msgid "Content Alignment"
 msgstr "Aliniad Cynnwys"
 
-#: frmaddpage.ui:345
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:313
 msgctxt "frmaddpage|protectcontent"
 msgid "_Contents"
 msgstr "Cy_nnwys"
 
-#: frmaddpage.ui:360
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:328
 msgctxt "frmaddpage|protectframe"
 msgid "P_osition"
 msgstr "_Safle"
 
-#: frmaddpage.ui:375
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:343
 msgctxt "frmaddpage|protectsize"
 msgid "_Size"
 msgstr "_Maint"
 
-#: frmaddpage.ui:396
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:364
 msgctxt "frmaddpage|label8"
 msgid "Protect"
 msgstr "Diogelu"
 
-#: frmaddpage.ui:441
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:409
 msgctxt "frmaddpage|editinreadonly"
 msgid "_Editable in read-only document"
 msgstr "_Golygu mewn dogfen darllen yn unig"
 
-#: frmaddpage.ui:456
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:424
 msgctxt "frmaddpage|printframe"
 msgid "Prin_t"
 msgstr "_Argraffu"
 
-#: frmaddpage.ui:481
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:449
 msgctxt "frmaddpage|textflow_label"
 msgid "_Text direction:"
 msgstr "_Cyfeiriad testun:"
 
-#: frmaddpage.ui:516
+#: sw/uiconfig/swriter/ui/frmaddpage.ui:483
 msgctxt "frmaddpage|label3"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: frmtypepage.ui:73
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:72
 msgctxt "frmtypepage|autowidth"
 msgid "AutoSize"
 msgstr "AwtoFaint"
 
-#: frmtypepage.ui:97
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:96
 msgctxt "frmtypepage|autowidthft"
 msgid "_Width (at least)"
 msgstr "_Lled (o leiaf)"
 
-#: frmtypepage.ui:111
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:110
 msgctxt "frmtypepage|widthft"
 msgid "_Width"
 msgstr "_Lled"
 
-#: frmtypepage.ui:134
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:133
 msgctxt "frmtypepage|relwidth"
 msgid "Relat_ive to"
 msgstr "_Perthynnol i"
 
-#: frmtypepage.ui:198
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:196
 msgctxt "frmtypepage|autoheight"
 msgid "AutoSize"
 msgstr "AwtoFaint"
 
-#: frmtypepage.ui:222
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:220
 msgctxt "frmtypepage|autoheightft"
 msgid "H_eight (at least)"
 msgstr "_Uchder (o leiaf)"
 
-#: frmtypepage.ui:236
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:234
 msgctxt "frmtypepage|heightft"
 msgid "H_eight"
 msgstr "_Uchder"
 
-#: frmtypepage.ui:259
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:257
 msgctxt "frmtypepage|relheight"
 msgid "Re_lative to"
 msgstr "P_erthynol"
 
-#: frmtypepage.ui:304
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:302
 msgctxt "frmtypepage|ratio"
 msgid "_Keep ratio"
 msgstr "_Cadw Cymhareb"
 
-#: frmtypepage.ui:319
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:317
 msgctxt "frmtypepage|origsize"
 msgid "_Original Size"
 msgstr "_Maint Gwreiddiol"
 
-#: frmtypepage.ui:339
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:337
 msgctxt "frmtypepage|label2"
 msgid "Size"
 msgstr "Maint"
 
-#: frmtypepage.ui:395
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:393
 msgctxt "frmtypepage|topage"
 msgid "To _page"
 msgstr "I ­_dudalen"
 
-#: frmtypepage.ui:412
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:410
 msgctxt "frmtypepage|topara"
 msgid "To paragrap_h"
 msgstr "I _baragraff"
 
-#: frmtypepage.ui:428
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:426
 msgctxt "frmtypepage|tochar"
 msgid "To cha_racter"
 msgstr "I _nod"
 
-#: frmtypepage.ui:444
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:442
 msgctxt "frmtypepage|aschar"
 msgid "_As character"
 msgstr "_Fel nod"
 
-#: frmtypepage.ui:460
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:458
 msgctxt "frmtypepage|toframe"
 msgid "To _frame"
 msgstr "_I frâm"
 
-#: frmtypepage.ui:482
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:480
 msgctxt "frmtypepage|label1"
 msgid "Anchor"
 msgstr "Angor"
 
-#: frmtypepage.ui:522
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:520
 msgctxt "frmtypepage|horiposft"
 msgid "Hori_zontal"
 msgstr "Llo_rweddol"
 
-#: frmtypepage.ui:536
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:534
 msgctxt "frmtypepage|horibyft"
 msgid "b_y"
 msgstr "_gan"
 
-#: frmtypepage.ui:550
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:548
 msgctxt "frmtypepage|vertbyft"
 msgid "by"
 msgstr "wrth"
 
-#: frmtypepage.ui:564
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:562
 msgctxt "frmtypepage|horitoft"
 msgid "_to"
 msgstr "_at"
 
-#: frmtypepage.ui:611
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:608
 msgctxt "frmtypepage|vertposft"
 msgid "_Vertical"
 msgstr "_Fertigol"
 
-#: frmtypepage.ui:648
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:644
 msgctxt "frmtypepage|verttoft"
 msgid "t_o"
 msgstr "a_t"
 
-#: frmtypepage.ui:670
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:666
 msgctxt "frmtypepage|mirror"
 msgid "_Mirror on even pages"
 msgstr "_Adlewyrchu ar dudalennau eilrif"
 
-#: frmtypepage.ui:687
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:683
 msgctxt "frmtypepage|followtextflow"
 msgid "Follow text flow"
 msgstr "Dilyn llif testun"
 
-#: frmtypepage.ui:710
+#: sw/uiconfig/swriter/ui/frmtypepage.ui:706
 msgctxt "frmtypepage|label11"
 msgid "Position"
 msgstr "Safle"
 
-#: frmurlpage.ui:66
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:64
 msgctxt "frmurlpage|url_label"
 msgid "_URL:"
 msgstr "_URL:"
 
-#: frmurlpage.ui:82
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:80
 msgctxt "frmurlpage|name_label"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: frmurlpage.ui:98
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:96
 msgctxt "frmurlpage|frame_label"
 msgid "_Frame:"
 msgstr "_Ffrâm:"
 
-#: frmurlpage.ui:116
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:114
 msgctxt "frmurlpage|search"
 msgid "_Browse..."
 msgstr "_Pori..."
 
-#: frmurlpage.ui:171
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:169
 msgctxt "frmurlpage|label1"
 msgid "Link to"
 msgstr "Cysylltiad i"
 
-#: frmurlpage.ui:210
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:208
 msgctxt "frmurlpage|server"
 msgid "_Server-side image map"
 msgstr "Map delwedd _ochr-weinydd"
 
-#: frmurlpage.ui:228
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:226
 msgctxt "frmurlpage|client"
 msgid "_Client-side image map"
 msgstr "_Map delwedd ochr-cleient"
 
-#: frmurlpage.ui:252
+#: sw/uiconfig/swriter/ui/frmurlpage.ui:250
 msgctxt "frmurlpage|label2"
 msgid "Image Map"
 msgstr "Map Delwedd"
 
-#: gotopagedialog.ui:8
+#: sw/uiconfig/swriter/ui/gotopagedialog.ui:8
 msgctxt "gotopagedialog|GotoPageDialog"
 msgid "Go to Page"
 msgstr "Mynd i Dudalen"
 
-#: gotopagedialog.ui:71
+#: sw/uiconfig/swriter/ui/gotopagedialog.ui:73
 msgctxt "gotopagedialog|page_count"
 msgid "of $1"
 msgstr "o $1"
 
-#: gotopagedialog.ui:97
+#: sw/uiconfig/swriter/ui/gotopagedialog.ui:100
 msgctxt "gotopagedialog|page_label"
 msgid "Page:"
 msgstr "Tudalen:"
 
-#: headerfootermenu.ui:19
+#: sw/uiconfig/swriter/ui/headerfootermenu.ui:19
 msgctxt "headerfootermenu|borderback"
 msgid "Border and Background..."
 msgstr "Border a Chefndir..."
 
-#: indentpage.ui:52
+#: sw/uiconfig/swriter/ui/headerfootermenu.ui:34
+msgctxt "headerfootermenu|insert_pagenumber"
+msgid "Insert Page Number"
+msgstr "Mewnosod Rhif Tudalen"
+
+#: sw/uiconfig/swriter/ui/indentpage.ui:52
 msgctxt "indentpage|label1"
 msgid "_Before section"
 msgstr "C_yn yr Adran"
 
-#: indentpage.ui:67
+#: sw/uiconfig/swriter/ui/indentpage.ui:67
 msgctxt "indentpage|label3"
 msgid "_After section"
 msgstr "_Wedi'r Adran"
 
-#: indentpage.ui:116
+#: sw/uiconfig/swriter/ui/indentpage.ui:113
 msgctxt "indentpage|label2"
 msgid "Indent"
 msgstr "Mewnoli"
 
-#: indentpage.ui:145
+#: sw/uiconfig/swriter/ui/indentpage.ui:142
 msgctxt "indentpage|preview-atkobject"
 msgid "Example"
 msgstr "Enghraifft"
 
-#: indexentry.ui:46
+#: sw/uiconfig/swriter/ui/indexentry.ui:46
 msgctxt "indexentry|IndexEntryDialog"
 msgid "Insert Index Entry"
 msgstr "Mewnosod Cofnod Mynegai"
 
-#: indexentry.ui:59
+#: sw/uiconfig/swriter/ui/indexentry.ui:59
 msgctxt "indexentry|insert"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: indexentry.ui:235
+#: sw/uiconfig/swriter/ui/indexentry.ui:235
 msgctxt "indexentry|typeft"
 msgid "Index"
 msgstr "Mynegai"
 
-#: indexentry.ui:261
+#: sw/uiconfig/swriter/ui/indexentry.ui:261
 msgctxt "indexentry|new|tooltip_text"
 msgid "New User-defined Index"
 msgstr "Mynegai Defnyddiwr Diffinedig Newydd"
 
-#: indexentry.ui:277
+#: sw/uiconfig/swriter/ui/indexentry.ui:277
 msgctxt "indexentry|label3"
 msgid "Entry"
 msgstr "Cofnod"
 
-#: indexentry.ui:293
+#: sw/uiconfig/swriter/ui/indexentry.ui:293
 msgctxt "indexentry|key1ft"
 msgid "1st key"
 msgstr "Allwedd Gyntaf"
 
-#: indexentry.ui:309
+#: sw/uiconfig/swriter/ui/indexentry.ui:309
 msgctxt "indexentry|key2ft"
 msgid "2nd key"
 msgstr "Ail Allwedd"
 
-#: indexentry.ui:324
+#: sw/uiconfig/swriter/ui/indexentry.ui:324
 msgctxt "indexentry|levelft"
 msgid "Level"
 msgstr "Lefel"
 
-#: indexentry.ui:350
+#: sw/uiconfig/swriter/ui/indexentry.ui:349
 msgctxt "indexentry|mainentrycb"
 msgid "Main entry"
 msgstr "Prif gofnod"
 
-#: indexentry.ui:365
+#: sw/uiconfig/swriter/ui/indexentry.ui:365
 msgctxt "indexentry|applytoallcb"
 msgid "Apply to all similar texts"
 msgstr "Gosod i bob testun tebyg"
 
-#: indexentry.ui:380
+#: sw/uiconfig/swriter/ui/indexentry.ui:381
 msgctxt "indexentry|searchcasesensitivecb"
 msgid "Match case"
 msgstr "Cydweddu maint"
 
-#: indexentry.ui:396
+#: sw/uiconfig/swriter/ui/indexentry.ui:398
 msgctxt "indexentry|searchcasewordonlycb"
 msgid "Whole words only"
 msgstr "Geiriau cyfan yn unig"
 
-#: indexentry.ui:416
+#: sw/uiconfig/swriter/ui/indexentry.ui:419
 msgctxt "indexentry|phonetic0ft"
 msgid "Phonetic reading"
 msgstr "Darllen ffonetig"
 
-#: indexentry.ui:432
+#: sw/uiconfig/swriter/ui/indexentry.ui:435
 msgctxt "indexentry|phonetic1ft"
 msgid "Phonetic reading"
 msgstr "Darllen ffonetig"
 
-#: indexentry.ui:448
+#: sw/uiconfig/swriter/ui/indexentry.ui:451
 msgctxt "indexentry|phonetic2ft"
 msgid "Phonetic reading"
 msgstr "Darllen ffonetig"
 
-#: indexentry.ui:534
+#: sw/uiconfig/swriter/ui/indexentry.ui:533
 msgctxt "indexentry|sync|tooltip_text"
 msgid "Update entry from selection"
 msgstr "Diweddaru'r cofnod o'r dewis"
 
-#: indexentry.ui:597
+#: sw/uiconfig/swriter/ui/indexentry.ui:595
 msgctxt "indexentry|label1"
 msgid "Selection"
 msgstr "Dewis"
 
-#: infonotfounddialog.ui:8
+#: sw/uiconfig/swriter/ui/infonotfounddialog.ui:7
 msgctxt "infonotfounddialog|InfoNotFoundDialog"
 msgid "Find"
 msgstr "Canfod"
 
-#: infonotfounddialog.ui:13
+#: sw/uiconfig/swriter/ui/infonotfounddialog.ui:13
 msgctxt "infonotfounddialog|InfoNotFoundDialog"
 msgid "Search key not found."
 msgstr "Allwedd chwilio heb ei ganfod."
 
-#: inforeadonlydialog.ui:8
+#: sw/uiconfig/swriter/ui/inforeadonlydialog.ui:7
 msgctxt "inforeadonlydialog|InfoReadonlyDialog"
 msgid "Read-Only Content"
 msgstr "Cynnwys Darllen-yn-Unig"
 
-#: inforeadonlydialog.ui:13
+#: sw/uiconfig/swriter/ui/inforeadonlydialog.ui:13
 msgctxt "inforeadonlydialog|InfoReadonlyDialog"
 msgid "Write-protected content cannot be changed."
 msgstr "Nid oes modd newid cynnwys sydd wedi ei ddiogelu rhag ysgrifennu."
 
-#: inforeadonlydialog.ui:14
+#: sw/uiconfig/swriter/ui/inforeadonlydialog.ui:14
 msgctxt "inforeadonlydialog|InfoReadonlyDialog"
 msgid "No modifications will be accepted."
 msgstr "Methu derbyn newidiadau."
 
-#: inputfielddialog.ui:7
+#: sw/uiconfig/swriter/ui/inputfielddialog.ui:18
 msgctxt "inputfielddialog|InputFieldDialog"
 msgid "Input Field"
 msgstr "Maes Mewnbwn"
 
-#: inputfielddialog.ui:112
+#: sw/uiconfig/swriter/ui/inputfielddialog.ui:136
 msgctxt "inputfielddialog|inputfieldname"
 msgid "Reference:"
 msgstr "Cyfeirnod:"
 
-#: inputwinmenu.ui:12
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:12
 msgctxt "inputwinmenu|sum"
 msgid "Sum"
 msgstr "Swm"
 
-#: inputwinmenu.ui:20
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:20
 msgctxt "inputwinmenu|round"
 msgid "Round"
 msgstr "Crwn"
 
-#: inputwinmenu.ui:28
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:28
 msgctxt "inputwinmenu|phd"
 msgid "Percent"
 msgstr "Canran"
 
-#: inputwinmenu.ui:36
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:36
 msgctxt "inputwinmenu|sqrt"
 msgid "Square Root"
 msgstr "Ail Isradd"
 
-#: inputwinmenu.ui:44
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:44
 msgctxt "inputwinmenu|pow"
 msgid "Power"
 msgstr "Pŵer"
 
-#: inputwinmenu.ui:52
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:52
 msgctxt "inputwinmenu|operators"
 msgid "Operators"
 msgstr "Gweithredwyr"
 
-#: inputwinmenu.ui:62
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:62
 msgctxt "inputwinmenu||"
 msgid "List Separator"
 msgstr "Ymwahanydd Rhestr"
 
-#: inputwinmenu.ui:70
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:70
 msgctxt "inputwinmenu|eq"
 msgid "Equal"
 msgstr "Cydradd"
 
-#: inputwinmenu.ui:78
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:78
 msgctxt "inputwinmenu|neq"
 msgid "Not Equal"
 msgstr "Anghydradd"
 
-#: inputwinmenu.ui:86
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:86
 msgctxt "inputwinmenu|leq"
 msgid "Less Than or Equal"
 msgstr "Yn Llai na neu yn Hafal i"
 
-#: inputwinmenu.ui:94
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:94
 msgctxt "inputwinmenu|geq"
 msgid "Greater Than or Equal"
 msgstr "Yn Fwy na neu yn Hafal i"
 
-#: inputwinmenu.ui:102
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:102
 msgctxt "inputwinmenu|l"
 msgid "Less"
 msgstr "Llai"
 
-#: inputwinmenu.ui:110
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:110
 msgctxt "inputwinmenu|g"
 msgid "Greater"
 msgstr "Mwy"
 
-#: inputwinmenu.ui:124
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:124
 msgctxt "inputwinmenu|or"
 msgid "Boolean Or"
 msgstr "Neu Boole"
 
-#: inputwinmenu.ui:132
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:132
 msgctxt "inputwinmenu|xor"
 msgid "Boolean Xor"
 msgstr "Xor Boole"
 
-#: inputwinmenu.ui:140
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:140
 msgctxt "inputwinmenu|and"
 msgid "Boolean And"
 msgstr "A Boole"
 
-#: inputwinmenu.ui:148
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:148
 msgctxt "inputwinmenu|not"
 msgid "Boolean Not"
 msgstr "Nid Boole"
 
-#: inputwinmenu.ui:160
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:160
 msgctxt "inputwinmenu|statistics"
 msgid "Statistical Functions"
 msgstr "Swyddogaeth Ystadegol"
 
-#: inputwinmenu.ui:170
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:170
 msgctxt "inputwinmenu|mean"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: inputwinmenu.ui:178
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:178
 msgctxt "inputwinmenu|min"
 msgid "Minimum"
 msgstr "Lleiafswm"
 
-#: inputwinmenu.ui:186
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:186
 msgctxt "inputwinmenu|max"
 msgid "Maximum"
 msgstr "Uchafswm"
 
-#: inputwinmenu.ui:198
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:198
 msgctxt "inputwinmenu|functions"
 msgid "Functions"
 msgstr "Ffwythiannau"
 
-#: inputwinmenu.ui:208
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:208
 msgctxt "inputwinmenu|sin"
 msgid "Sine"
 msgstr "Sin"
 
-#: inputwinmenu.ui:216
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:216
 msgctxt "inputwinmenu|cos"
 msgid "Cosine"
 msgstr "Cosin"
 
-#: inputwinmenu.ui:224
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:224
 msgctxt "inputwinmenu|tag"
 msgid "Tangent"
 msgstr "Tangiad"
 
-#: inputwinmenu.ui:232
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:232
 msgctxt "inputwinmenu|asin"
 msgid "Arcsine"
 msgstr "Arcsin"
 
-#: inputwinmenu.ui:240
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:240
 msgctxt "inputwinmenu|acos"
 msgid "Arccosine"
 msgstr "Arccosin"
 
-#: inputwinmenu.ui:248
+#: sw/uiconfig/swriter/ui/inputwinmenu.ui:248
 msgctxt "inputwinmenu|atan"
 msgid "Arctangent"
 msgstr "Arctangiad"
 
-#: insertautotextdialog.ui:8
+#: sw/uiconfig/swriter/ui/insertautotextdialog.ui:8
 msgctxt "insertautotextdialog|InsertAutoTextDialog"
 msgid "Insert AutoText"
 msgstr "Mewnosod AwtoDestun"
 
-#: insertautotextdialog.ui:104
+#: sw/uiconfig/swriter/ui/insertautotextdialog.ui:104
 msgctxt "insertautotextdialog|label1"
 msgid "Autotexts for Shortcut "
 msgstr "Llwybr byr AwtoDestun "
 
-#: insertbookmark.ui:8
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:8
 msgctxt "insertbookmark|InsertBookmarkDialog"
 msgid "Bookmark"
 msgstr "Nodau Tudalen"
 
-#: insertbookmark.ui:40
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:40
 msgctxt "insertbookmark|insert"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: insertbookmark.ui:122
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:122
 msgctxt "insertbookmark|rename"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: insertbookmark.ui:135
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:135
 msgctxt "insertbookmark|delete"
 msgid "Delete"
 msgstr "Dileu"
 
-#: insertbookmark.ui:148
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:148
 msgctxt "insertbookmark|goto"
 msgid "Go to"
 msgstr "Mynd i"
 
-#: insertbreak.ui:14
+#: sw/uiconfig/swriter/ui/insertbreak.ui:14
 msgctxt "insertbreak|BreakDialog"
 msgid "Insert Break"
 msgstr "Mewnosod Toriad"
 
-#: insertbreak.ui:100
+#: sw/uiconfig/swriter/ui/insertbreak.ui:102
 msgctxt "insertbreak|linerb"
 msgid "Line break"
 msgstr "Toriad llinell"
 
-#: insertbreak.ui:116
+#: sw/uiconfig/swriter/ui/insertbreak.ui:112
+msgctxt "insertbreak|linerb-atkobject"
+msgid "Ends the current line, and moves the text found to the right of the cursor to the next line, without creating a new paragraph."
+msgstr "Diweddu'r llinell gyfredol a symud y testun sydd i'r dde o'r cyrchwr i'r llinell nesaf, heb greu paragraff newydd."
+
+#: sw/uiconfig/swriter/ui/insertbreak.ui:124
 msgctxt "insertbreak|columnrb"
 msgid "Column break"
 msgstr "Toriad colofn"
 
-#: insertbreak.ui:132
+#: sw/uiconfig/swriter/ui/insertbreak.ui:134
+msgctxt "insertbreak|columnrb-atkobject"
+msgid "Inserts a manual column break (in a multiple column layout), and moves the text found to the right of the cursor to the beginning of the next column. A manual column break is indicated by a nonprinting border at the top of the new column."
+msgstr "Yn mewnosod toriad llinell â llaw (mewn cynllun colofn luosog), ac yn symud y testun i'r dde o'r cyrchwr i gychwyn y golofn nesaf. Mae toriad colofn â llaw yn cael ei ddynodi gan ymyl dim argraffu ar frig y golofn newydd."
+
+#: sw/uiconfig/swriter/ui/insertbreak.ui:146
 msgctxt "insertbreak|pagerb"
 msgid "Page break"
 msgstr "Toriad tudalen"
 
-#: insertbreak.ui:151
+#: sw/uiconfig/swriter/ui/insertbreak.ui:156
+msgctxt "insertbreak|pagerb-atkobject"
+msgid "Inserts a manual page break, and moves the text found to the right of the cursor to the beginning of the next page. The inserted page break is indicated by a nonprinting border at the top of the new page."
+msgstr "Yn mewnosod toriad tudalen â llaw ac yn symud y testun i'r dde o'r cyrchwr i gychwyn y golofn nesaf. Mae toriad tudalen â llaw yn cael ei ddynodi gan ymyl dim argraffu ar frig y dudalen newydd."
+
+#: sw/uiconfig/swriter/ui/insertbreak.ui:171
 msgctxt "insertbreak|styleft"
 msgid "Style:"
 msgstr "Arddull:"
 
-#: insertbreak.ui:168
+#: sw/uiconfig/swriter/ui/insertbreak.ui:188
 msgctxt "insertbreak|liststore1"
 msgid "[None]"
 msgstr "[None]"
 
-#: insertbreak.ui:179
+#: sw/uiconfig/swriter/ui/insertbreak.ui:192
+msgctxt "insertbreak|stylelb-atkobject"
+msgid "Select the page style for the page that follows the manual page break."
+msgstr "Dewis arddull y dudalen ar gyfer y dudalen sy'n dilyn y toriad tudalen â llaw."
+
+#: sw/uiconfig/swriter/ui/insertbreak.ui:204
 msgctxt "insertbreak|pagenumcb"
 msgid "Change page number"
 msgstr "Newid rhif tudalen"
 
-#: insertbreak.ui:205
+#: sw/uiconfig/swriter/ui/insertbreak.ui:214
+msgctxt "insertbreak|pagenumcb-atkobject"
+msgid "Assigns the page number that you specify to the page that follows the manual page break. This option is only available if you assign a different page style to the page that follows manual page break."
+msgstr "Yn dynodi'r rhif tudalen rydych yn ei bennu i'r dudalen sy'n dilyn y toriad tudalen â llaw. Mae'r dewis hwn ar gael os fyddwch yn dynodi arddull tudalen gwahanol i'r dudalen sy'n dilyn toriad tudalen â llaw."
+
+#: sw/uiconfig/swriter/ui/insertbreak.ui:236
 msgctxt "insertbreak|pagenumsb-atkobject"
-msgid "Change page number"
-msgstr "Newid rhif tudalen"
+msgid "Enter the new page number for the page that follows the manual page break."
+msgstr "Rhowch y rhif tudalen newydd ar gyfer y dudalen sy'n dilyn y toriad tudalen â llaw."
 
-#: insertbreak.ui:223
+#: sw/uiconfig/swriter/ui/insertbreak.ui:254
 msgctxt "insertbreak|label1"
 msgid "Type"
 msgstr "Math"
 
-#: insertcaption.ui:9
+#: sw/uiconfig/swriter/ui/insertcaption.ui:9
 msgctxt "insertcaption|InsertCaptionDialog"
 msgid "Insert Caption"
 msgstr "Mewnosod Egluryn"
 
-#: insertcaption.ui:51
+#: sw/uiconfig/swriter/ui/insertcaption.ui:50
 msgctxt "insertcaption|label1"
 msgid "Caption"
 msgstr "Egluryn"
 
-#: insertcaption.ui:89
+#: sw/uiconfig/swriter/ui/insertcaption.ui:88
 msgctxt "insertcaption|numbering_label"
 msgid "Numbering:"
 msgstr "Rhifo:"
 
-#: insertcaption.ui:103
+#: sw/uiconfig/swriter/ui/insertcaption.ui:102
 msgctxt "insertcaption|separator_label"
 msgid "Separator:"
 msgstr "Ymwahanydd:"
 
-#: insertcaption.ui:117
+#: sw/uiconfig/swriter/ui/insertcaption.ui:116
 msgctxt "insertcaption|position_label"
 msgid "Position:"
 msgstr "Safle:"
 
-#: insertcaption.ui:143
+#: sw/uiconfig/swriter/ui/insertcaption.ui:141
 msgctxt "insertcaption|separator_edit"
 msgid ": "
 msgstr ": "
 
-#: insertcaption.ui:155
+#: sw/uiconfig/swriter/ui/insertcaption.ui:153
 msgctxt "insertcaption|num_separator"
 msgid "Numbering separator:"
 msgstr "Ymwahanydd rhif:"
 
-#: insertcaption.ui:170
+#: sw/uiconfig/swriter/ui/insertcaption.ui:167
 msgctxt "insertcaption|num_separator_edit"
 msgid ". "
 msgstr ". "
 
-#: insertcaption.ui:193
+#: sw/uiconfig/swriter/ui/insertcaption.ui:190
 msgctxt "insertcaption|label4"
 msgid "Category:"
 msgstr "Categori:"
 
-#: insertcaption.ui:226
+#: sw/uiconfig/swriter/ui/insertcaption.ui:223
 msgctxt "insertcaption|label2"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: insertcaption.ui:264
+#: sw/uiconfig/swriter/ui/insertcaption.ui:261
 msgctxt "insertcaption|label3"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: insertcaption.ui:335
+#: sw/uiconfig/swriter/ui/insertcaption.ui:332
 msgctxt "insertcaption|auto"
 msgid "Auto..."
 msgstr "Awto..."
 
-#: insertcaption.ui:348
+#: sw/uiconfig/swriter/ui/insertcaption.ui:345
 msgctxt "insertcaption|options"
 msgid "Options..."
 msgstr "Dewisiadau..."
 
-#: insertcaption.ui:391
+#: sw/uiconfig/swriter/ui/insertcaption.ui:388
 msgctxt "insertcaption|liststore1"
 msgid "[None]"
 msgstr "[None]"
 
-#: insertdbcolumnsdialog.ui:34
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:34
 msgctxt "insertdbcolumnsdialog|InsertDbColumnsDialog"
 msgid "Insert Database Columns"
 msgstr "Mewnosod Colofnau Cronfa Ddata"
 
-#: insertdbcolumnsdialog.ui:116
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:116
 msgctxt "insertdbcolumnsdialog|label1"
 msgid "Insert data as:"
 msgstr "Mewnosod data fel:"
 
-#: insertdbcolumnsdialog.ui:133
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:133
 msgctxt "insertdbcolumnsdialog|astable"
 msgid "T_able"
 msgstr "_Tabl"
 
-#: insertdbcolumnsdialog.ui:150
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:150
 msgctxt "insertdbcolumnsdialog|asfields"
 msgid "_Fields"
 msgstr "M_eysydd"
 
-#: insertdbcolumnsdialog.ui:166
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:166
 msgctxt "insertdbcolumnsdialog|astext"
 msgid "_Text"
 msgstr "_Testun"
 
-#: insertdbcolumnsdialog.ui:219
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:219
 msgctxt "insertdbcolumnsdialog|label4"
 msgid "Database _columns"
 msgstr "_Colofnau cronfa ddata"
 
-#: insertdbcolumnsdialog.ui:233
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:233
 msgctxt "insertdbcolumnsdialog|tablecolft"
 msgid "Tab_le column(s)"
 msgstr "C_olofn(nau) Tabl"
 
-#: insertdbcolumnsdialog.ui:470
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:470
 msgctxt "insertdbcolumnsdialog|tableheading"
 msgid "Insert table heading"
 msgstr "Mewnosod pennawd tudalen"
 
-#: insertdbcolumnsdialog.ui:485
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:485
 msgctxt "insertdbcolumnsdialog|columnname"
 msgid "Apply column _name"
 msgstr "Gosod _enw colofn"
 
-#: insertdbcolumnsdialog.ui:502
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:502
 msgctxt "insertdbcolumnsdialog|rowonly"
 msgid "Create row only"
 msgstr "Creu rhesi'n unig"
 
-#: insertdbcolumnsdialog.ui:519
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:519
 msgctxt "insertdbcolumnsdialog|tableformat"
 msgid "Pr_operties..."
 msgstr "_Priodweddau..."
 
-#: insertdbcolumnsdialog.ui:532
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:532
 msgctxt "insertdbcolumnsdialog|autoformat"
 msgid "Aut_oFormat..."
 msgstr "AwtoFf_ormat..."
 
-#: insertdbcolumnsdialog.ui:548
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:548
 msgctxt "insertdbcolumnsdialog|parastylelabel"
 msgid "Paragraph _style:"
 msgstr "_Arddull paragraff:"
 
-#: insertdbcolumnsdialog.ui:587
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:587
 msgctxt "insertdbcolumnsdialog|fromdatabase"
 msgid "From _database"
 msgstr "O _gronfa ddata"
 
-#: insertdbcolumnsdialog.ui:604
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:604
 msgctxt "insertdbcolumnsdialog|userdefined"
 msgid "_User-defined"
 msgstr "_Defnyddiwr diffiniedig"
 
-#: insertdbcolumnsdialog.ui:649
+#: sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui:649
 msgctxt "insertdbcolumnsdialog|label3"
 msgid "Format"
 msgstr "Fformat"
 
-#: insertfootnote.ui:18
+#: sw/uiconfig/swriter/ui/insertfootnote.ui:18
 msgctxt "insertfootnote|InsertFootnoteDialog"
 msgid "Insert Footnote/Endnote"
 msgstr "Mewnosod Troednodyn/Diweddnodyn"
 
-#: insertfootnote.ui:143
+#: sw/uiconfig/swriter/ui/insertfootnote.ui:148
 msgctxt "insertfootnote|automatic"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: insertfootnote.ui:161
+#: sw/uiconfig/swriter/ui/insertfootnote.ui:166
 msgctxt "insertfootnote|character"
 msgid "Character"
 msgstr "Nod"
 
-#: insertfootnote.ui:193
+#: sw/uiconfig/swriter/ui/insertfootnote.ui:200
 msgctxt "insertfootnote|characterentry-atkobject"
 msgid "Character"
 msgstr "Nod"
 
-#: insertfootnote.ui:204
+#: sw/uiconfig/swriter/ui/insertfootnote.ui:211
 msgctxt "insertfootnote|choosecharacter"
 msgid "Choose…"
 msgstr "Dewis…"
 
-#: insertfootnote.ui:224
+#: sw/uiconfig/swriter/ui/insertfootnote.ui:231
 msgctxt "insertfootnote|label1"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: insertfootnote.ui:257
+#: sw/uiconfig/swriter/ui/insertfootnote.ui:264
 msgctxt "insertfootnote|footnote"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: insertfootnote.ui:275
+#: sw/uiconfig/swriter/ui/insertfootnote.ui:282
 msgctxt "insertfootnote|endnote"
 msgid "Endnote"
 msgstr "Diweddnodyn"
 
-#: insertfootnote.ui:298
+#: sw/uiconfig/swriter/ui/insertfootnote.ui:306
 msgctxt "insertfootnote|label2"
 msgid "Type"
 msgstr "Math"
 
-#: insertscript.ui:18
+#: sw/uiconfig/swriter/ui/insertscript.ui:18
 msgctxt "insertscript|InsertScriptDialog"
 msgid "Insert Script"
 msgstr "Mewnosod Sgript"
 
-#: insertscript.ui:36
+#: sw/uiconfig/swriter/ui/insertscript.ui:136
 msgctxt "insertscript|label1"
 msgid "Script type:"
 msgstr "Math o sgript:"
 
-#: insertscript.ui:48
+#: sw/uiconfig/swriter/ui/insertscript.ui:148
 msgctxt "insertscript|scripttype"
 msgid "JavaScript"
 msgstr "JavaScript"
 
-#: insertscript.ui:58
+#: sw/uiconfig/swriter/ui/insertscript.ui:158
 msgctxt "insertscript|url"
 msgid "URL:"
 msgstr "URL:"
 
-#: insertscript.ui:86
+#: sw/uiconfig/swriter/ui/insertscript.ui:187
 msgctxt "insertscript|browse"
 msgid "Browse…"
 msgstr "Pori…"
 
-#: insertscript.ui:99
+#: sw/uiconfig/swriter/ui/insertscript.ui:200
 msgctxt "insertscript|text"
 msgid "Text:"
 msgstr "Testun:"
 
-#: insertsectiondialog.ui:8
+#: sw/uiconfig/swriter/ui/insertsectiondialog.ui:8
 msgctxt "insertsectiondialog|InsertSectionDialog"
 msgid "Insert Section"
 msgstr "Mewnosod Adran"
 
-#: insertsectiondialog.ui:22
+#: sw/uiconfig/swriter/ui/insertsectiondialog.ui:22
 msgctxt "insertsectiondialog|ok"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: insertsectiondialog.ui:106
+#: sw/uiconfig/swriter/ui/insertsectiondialog.ui:106
 msgctxt "insertsectiondialog|section"
 msgid "Section"
 msgstr "Adran"
 
-#: insertsectiondialog.ui:128
+#: sw/uiconfig/swriter/ui/insertsectiondialog.ui:128
 msgctxt "insertsectiondialog|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: insertsectiondialog.ui:151
+#: sw/uiconfig/swriter/ui/insertsectiondialog.ui:151
 msgctxt "insertsectiondialog|indents"
 msgid "Indents"
 msgstr "Mewnoliadau"
 
-#: insertsectiondialog.ui:174
+#: sw/uiconfig/swriter/ui/insertsectiondialog.ui:174
 msgctxt "insertsectiondialog|background"
 msgid "Background"
 msgstr "Cefndir"
 
-#: insertsectiondialog.ui:197
+#: sw/uiconfig/swriter/ui/insertsectiondialog.ui:197
 msgctxt "insertsectiondialog|notes"
 msgid "Footnotes/Endnotes"
 msgstr "Troednodau/Diweddnodau"
 
-#: inserttable.ui:29
+#: sw/uiconfig/swriter/ui/inserttable.ui:35
 msgctxt "inserttable|InsertTableDialog"
 msgid "Insert Table"
 msgstr "Mewnosod Tab"
 
-#: inserttable.ui:43
+#: sw/uiconfig/swriter/ui/inserttable.ui:51
 msgctxt "inserttable|ok"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: inserttable.ui:138
+#: sw/uiconfig/swriter/ui/inserttable.ui:148
 msgctxt "inserttable|label3"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: inserttable.ui:152
+#: sw/uiconfig/swriter/ui/inserttable.ui:162
 msgctxt "inserttable|3"
 msgid "_Columns:"
 msgstr "_Colofnau:"
 
-#: inserttable.ui:182
+#: sw/uiconfig/swriter/ui/inserttable.ui:192
 msgctxt "inserttable|4"
 msgid "_Rows:"
 msgstr "_Rhesi:"
 
-#: inserttable.ui:216
+#: sw/uiconfig/swriter/ui/inserttable.ui:226
 msgctxt "inserttable|label1"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: inserttable.ui:249
+#: sw/uiconfig/swriter/ui/inserttable.ui:264
 msgctxt "inserttable|headercb"
 msgid "Hea_ding"
 msgstr "_Pennawd"
 
-#: inserttable.ui:264
+#: sw/uiconfig/swriter/ui/inserttable.ui:279
 msgctxt "inserttable|repeatcb"
 msgid "Repeat heading rows on new _pages"
 msgstr "Ailadrodd rhesi penynnau ar dudalennau _newydd"
 
-#: inserttable.ui:282
-msgctxt "inserttable|bordercb"
-msgid "_Border"
-msgstr "_Border"
-
-#: inserttable.ui:298
+#: sw/uiconfig/swriter/ui/inserttable.ui:297
 msgctxt "inserttable|dontsplitcb"
 msgid "Don’t _split table over pages"
 msgstr "Peidio _hollti tabl dros dudalennau"
 
-#: inserttable.ui:338
+#: sw/uiconfig/swriter/ui/inserttable.ui:337
 msgctxt "inserttable|repeatheaderafter"
 msgid "Heading ro_ws:"
 msgstr "R_hesi Pennyn:"
 
-#: inserttable.ui:355
-msgctxt "inserttable|autoformat"
-msgid "Auto_Format"
-msgstr "Awto_Fformat"
-
-#: inserttable.ui:377
+#: sw/uiconfig/swriter/ui/inserttable.ui:360
 msgctxt "inserttable|label2"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: labeldialog.ui:8
+#: sw/uiconfig/swriter/ui/inserttable.ui:454
+msgctxt "inserttable|lbTableStyle"
+msgid "Styles"
+msgstr "Arddulliau"
+
+#: sw/uiconfig/swriter/ui/labeldialog.ui:8
 msgctxt "labeldialog|LabelDialog"
 msgid "Labels"
 msgstr "Labeli"
 
-#: labeldialog.ui:22
+#: sw/uiconfig/swriter/ui/labeldialog.ui:22
 msgctxt "labeldialog|ok"
 msgid "_New Document"
 msgstr "_Dogfen Newydd"
 
-#: labeldialog.ui:106
+#: sw/uiconfig/swriter/ui/labeldialog.ui:106
 msgctxt "labeldialog|medium"
 msgid "Medium"
 msgstr "Canolig"
 
-#: labeldialog.ui:128
+#: sw/uiconfig/swriter/ui/labeldialog.ui:128
 msgctxt "labeldialog|labels"
 msgid "Labels"
 msgstr "Labeli"
 
-#: labeldialog.ui:151
-msgctxt "labeldialog|cards"
-msgid "Business Cards"
-msgstr "Cardiau Busnes"
-
-#: labeldialog.ui:174
+#: sw/uiconfig/swriter/ui/labeldialog.ui:151
 msgctxt "labeldialog|private"
 msgid "Private"
 msgstr "Preifat"
 
-#: labeldialog.ui:197
+#: sw/uiconfig/swriter/ui/labeldialog.ui:174
 msgctxt "labeldialog|business"
 msgid "Business"
 msgstr "Busnes"
 
-#: labeldialog.ui:220
+#: sw/uiconfig/swriter/ui/labeldialog.ui:197
 msgctxt "labeldialog|format"
 msgid "Format"
 msgstr "Fformat"
 
-#: labeldialog.ui:243
+#: sw/uiconfig/swriter/ui/labeldialog.ui:220
 msgctxt "labeldialog|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: labelformatpage.ui:29
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:29
 msgctxt "labelformatpage|label1"
 msgid "Hori_zontal pitch:"
 msgstr "Gogwydd _llorweddol:"
 
-#: labelformatpage.ui:43
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:43
 msgctxt "labelformatpage|label2"
 msgid "_Vertical pitch:"
 msgstr "Gogwydd _fertigol:"
 
-#: labelformatpage.ui:57
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:57
 msgctxt "labelformatpage|label3"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: labelformatpage.ui:71
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:71
 msgctxt "labelformatpage|label4"
 msgid "_Height:"
 msgstr "_Uchder:"
 
-#: labelformatpage.ui:85
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:85
 msgctxt "labelformatpage|label5"
 msgid "_Left margin:"
 msgstr "Ymyl _chwith:"
 
-#: labelformatpage.ui:99
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:99
 msgctxt "labelformatpage|label6"
 msgid "_Top margin:"
 msgstr "Ymyl _uchaf:"
 
-#: labelformatpage.ui:113
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:113
 msgctxt "labelformatpage|label7"
 msgid "_Columns:"
 msgstr "_Colofnau:"
 
-#: labelformatpage.ui:127
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:127
 msgctxt "labelformatpage|label8"
 msgid "R_ows:"
 msgstr "_Rhesi:"
 
-#: labelformatpage.ui:141
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:141
 msgctxt "labelformatpage|label9"
 msgid "P_age width:"
 msgstr "_Lled Tudalen:"
 
-#: labelformatpage.ui:155
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:155
 msgctxt "labelformatpage|label10"
 msgid "Pa_ge height:"
 msgstr "_Uchder tudalen:"
 
-#: labelformatpage.ui:166
+#: sw/uiconfig/swriter/ui/labelformatpage.ui:166
 msgctxt "labelformatpage|save"
 msgid "_Save..."
 msgstr "C_adw..."
 
-#: labeloptionspage.ui:37
+#: sw/uiconfig/swriter/ui/labeloptionspage.ui:44
 msgctxt "labeloptionspage|entirepage"
 msgid "_Entire page"
 msgstr "_Tudalen gyfan"
 
-#: labeloptionspage.ui:56
+#: sw/uiconfig/swriter/ui/labeloptionspage.ui:61
 msgctxt "labeloptionspage|singlelabel"
 msgid "_Single label"
 msgstr "_Label sengl"
 
-#: labeloptionspage.ui:88
+#: sw/uiconfig/swriter/ui/labeloptionspage.ui:90
 msgctxt "labeloptionspage|label4"
 msgid "Colu_mn"
 msgstr "Col_ofn"
 
-#: labeloptionspage.ui:131
+#: sw/uiconfig/swriter/ui/labeloptionspage.ui:126
 msgctxt "labeloptionspage|label5"
 msgid "Ro_w"
 msgstr "_Rhes"
 
-#: labeloptionspage.ui:174
+#: sw/uiconfig/swriter/ui/labeloptionspage.ui:161
 msgctxt "labeloptionspage|synchronize"
 msgid "Synchroni_ze contents"
 msgstr "Cyd_weddu cynnwys"
 
-#: labeloptionspage.ui:197
+#: sw/uiconfig/swriter/ui/labeloptionspage.ui:183
 msgctxt "labeloptionspage|label1"
 msgid "Distribute"
 msgstr "Dosbarthu"
 
-#: labeloptionspage.ui:232
+#: sw/uiconfig/swriter/ui/labeloptionspage.ui:218
 msgctxt "labeloptionspage|setup"
 msgid "Setup..."
 msgstr "Gosodiad..."
 
-#: labeloptionspage.ui:251
+#: sw/uiconfig/swriter/ui/labeloptionspage.ui:234
 msgctxt "labeloptionspage|printername"
 msgid "Printer Name"
 msgstr "Enw Argraffydd"
 
-#: labeloptionspage.ui:270
+#: sw/uiconfig/swriter/ui/labeloptionspage.ui:252
 msgctxt "labeloptionspage|label2"
 msgid "Printer"
 msgstr "Argraffydd"
 
-#: linenumbering.ui:26
-msgctxt "linenumbering|positionstore"
-msgid "Left"
-msgstr "Chwith"
-
-#: linenumbering.ui:29
-msgctxt "linenumbering|positionstore"
-msgid "Right"
-msgstr "De"
-
-#: linenumbering.ui:32
-msgctxt "linenumbering|positionstore"
-msgid "Inner"
-msgstr "Mewnol"
-
-#: linenumbering.ui:35
-msgctxt "linenumbering|positionstore"
-msgid "Outer"
-msgstr "Allanol"
-
-#: linenumbering.ui:48
+#: sw/uiconfig/swriter/ui/linenumbering.ui:27
 msgctxt "linenumbering|LineNumberingDialog"
 msgid "Line Numbering"
 msgstr "Rhifo Llinell"
 
-#: linenumbering.ui:119
+#: sw/uiconfig/swriter/ui/linenumbering.ui:102
 msgctxt "linenumbering|shownumbering"
 msgid "Show numbering"
 msgstr "Dangos rhifo"
 
-#: linenumbering.ui:162
+#: sw/uiconfig/swriter/ui/linenumbering.ui:145
 msgctxt "linenumbering|characterstyle"
 msgid "Character style:"
 msgstr "Arddull nod:"
 
-#: linenumbering.ui:176
+#: sw/uiconfig/swriter/ui/linenumbering.ui:159
 msgctxt "linenumbering|format"
 msgid "Format:"
 msgstr "Fformat:"
 
-#: linenumbering.ui:188
+#: sw/uiconfig/swriter/ui/linenumbering.ui:171
 msgctxt "linenumbering|position"
 msgid "Position:"
 msgstr "Safle:"
 
-#: linenumbering.ui:202
+#: sw/uiconfig/swriter/ui/linenumbering.ui:185
 msgctxt "linenumbering|spacing"
 msgid "Spacing:"
 msgstr "Bylchu:"
 
-#: linenumbering.ui:216
+#: sw/uiconfig/swriter/ui/linenumbering.ui:199
 msgctxt "linenumbering|interval"
 msgid "Interval:"
 msgstr "Cyfwng:"
 
-#: linenumbering.ui:301
+#: sw/uiconfig/swriter/ui/linenumbering.ui:239
+msgctxt "linenumbering|positionstore"
+msgid "Left"
+msgstr "Chwith"
+
+#: sw/uiconfig/swriter/ui/linenumbering.ui:240
+msgctxt "linenumbering|positionstore"
+msgid "Right"
+msgstr "De"
+
+#: sw/uiconfig/swriter/ui/linenumbering.ui:241
+msgctxt "linenumbering|positionstore"
+msgid "Inner"
+msgstr "Mewnol"
+
+#: sw/uiconfig/swriter/ui/linenumbering.ui:242
+msgctxt "linenumbering|positionstore"
+msgid "Outer"
+msgstr "Allanol"
+
+#: sw/uiconfig/swriter/ui/linenumbering.ui:286
 msgctxt "linenumbering|intervallines"
 msgid "lines"
 msgstr "llinellau"
 
-#: linenumbering.ui:324
+#: sw/uiconfig/swriter/ui/linenumbering.ui:310
 msgctxt "linenumbering|view"
 msgid "View"
 msgstr "Golwg"
 
-#: linenumbering.ui:365
+#: sw/uiconfig/swriter/ui/linenumbering.ui:350
 msgctxt "linenumbering|text"
 msgid "Text:"
 msgstr "Testun:"
 
-#: linenumbering.ui:379
+#: sw/uiconfig/swriter/ui/linenumbering.ui:364
 msgctxt "linenumbering|every"
 msgid "Every:"
 msgstr "Pob:"
 
-#: linenumbering.ui:406
+#: sw/uiconfig/swriter/ui/linenumbering.ui:391
 msgctxt "linenumbering|lines"
 msgid "lines"
 msgstr "llinellau"
 
-#: linenumbering.ui:433
+#: sw/uiconfig/swriter/ui/linenumbering.ui:418
 msgctxt "linenumbering|separator"
 msgid "Separator"
 msgstr "Ymwahanydd"
 
-#: linenumbering.ui:466
+#: sw/uiconfig/swriter/ui/linenumbering.ui:451
 msgctxt "linenumbering|blanklines"
 msgid "Blank lines"
 msgstr "Llinellau gwag"
 
-#: linenumbering.ui:482
+#: sw/uiconfig/swriter/ui/linenumbering.ui:468
 msgctxt "linenumbering|linesintextframes"
 msgid "Lines in text frames"
 msgstr "Llinellau mewn ffrâm testun"
 
-#: linenumbering.ui:497
+#: sw/uiconfig/swriter/ui/linenumbering.ui:484
 msgctxt "linenumbering|showfooterheadernumbering"
 msgid "Include header and footer"
 msgstr "Cynnwys pennyn a throedyn"
 
-#: linenumbering.ui:512
+#: sw/uiconfig/swriter/ui/linenumbering.ui:500
 msgctxt "linenumbering|restarteverynewpage"
 msgid "Restart every new page"
 msgstr "Ail gychwyn pob tudalen newydd"
 
-#: linenumbering.ui:534
+#: sw/uiconfig/swriter/ui/linenumbering.ui:523
 msgctxt "linenumbering|count"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: mailconfigpage.ui:85
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:82
 msgctxt "mailconfigpage|displayname_label"
 msgid "_Your name:"
 msgstr "_Eich enw:"
 
-#: mailconfigpage.ui:99
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:96
 msgctxt "mailconfigpage|address_label"
 msgid "_E-mail address:"
 msgstr "_Cyfeiriad e-bost:"
 
-#: mailconfigpage.ui:110
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:107
 msgctxt "mailconfigpage|replytocb"
 msgid "Send replies to _different e-mail address"
 msgstr "Anfon atebion at _gyfeiriadau e-bost gwahanol"
 
-#: mailconfigpage.ui:129
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:126
 msgctxt "mailconfigpage|replyto_label"
 msgid "_Reply address:"
 msgstr "_Cyfeiriad ateb:"
 
-#: mailconfigpage.ui:146
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:143
 msgctxt "mailconfigpage|label1"
 msgid "User Information"
 msgstr "Gwybodaeth Defnyddiwr"
 
-#: mailconfigpage.ui:184
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:181
 msgctxt "mailconfigpage|secure"
 msgid "_Use secure connection (SSL)"
 msgstr "_Defnyddio cysylltiad diogel (SSL)"
 
-#: mailconfigpage.ui:222
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:218
 msgctxt "mailconfigpage|server_label"
 msgid "_Server name:"
 msgstr "_Enw gweinydd:"
 
-#: mailconfigpage.ui:236
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:232
 msgctxt "mailconfigpage|port_label"
 msgid "_Port:"
 msgstr "_Porth:"
 
-#: mailconfigpage.ui:274
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:269
 msgctxt "mailconfigpage|serverauthentication"
 msgid "Ser_ver Authentication…"
 msgstr "Dilysiad Gweinydd…"
 
-#: mailconfigpage.ui:300
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:295
 msgctxt "mailconfigpage|label2"
 msgid "Outgoing Server (SMTP) Settings"
 msgstr "Gosodiadau Gweinydd Allfynd (SMTP)"
 
-#: mailconfigpage.ui:322
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:317
 msgctxt "mailconfigpage|test"
 msgid "_Test Settings"
 msgstr "_Gosodiadau Prawf"
 
-#: mailmerge.ui:12
+#: sw/uiconfig/swriter/ui/mailmerge.ui:12
 msgctxt "mailmerge|MailmergeDialog"
 msgid "Mail Merge"
 msgstr "Cyfuno Post"
 
-#: mailmerge.ui:131
+#: sw/uiconfig/swriter/ui/mailmerge.ui:131
 msgctxt "mailmerge|all"
 msgid "_All"
 msgstr "_Pob Un"
 
-#: mailmerge.ui:149
+#: sw/uiconfig/swriter/ui/mailmerge.ui:149
 msgctxt "mailmerge|selected"
 msgid "_Selected records"
 msgstr "_Cofnodion dewiswyd"
 
-#: mailmerge.ui:172
+#: sw/uiconfig/swriter/ui/mailmerge.ui:172
 msgctxt "mailmerge|rbfrom"
 msgid "_From:"
 msgstr "_O:"
 
-#: mailmerge.ui:206
+#: sw/uiconfig/swriter/ui/mailmerge.ui:205
 msgctxt "mailmerge|label3"
 msgid "_To:"
 msgstr "_Hyd at:"
 
-#: mailmerge.ui:245
+#: sw/uiconfig/swriter/ui/mailmerge.ui:243
 msgctxt "mailmerge|recordslabel"
 msgid "Records"
 msgstr "Cofnodion"
 
-#: mailmerge.ui:285
+#: sw/uiconfig/swriter/ui/mailmerge.ui:283
 msgctxt "mailmerge|printer"
 msgid "_Printer"
 msgstr "_Argraffydd"
 
-#: mailmerge.ui:303
+#: sw/uiconfig/swriter/ui/mailmerge.ui:301
 msgctxt "mailmerge|electronic"
 msgid "_Electronic"
 msgstr "_Electronig"
 
-#: mailmerge.ui:321
+#: sw/uiconfig/swriter/ui/mailmerge.ui:319
 msgctxt "mailmerge|file"
 msgid "File"
 msgstr "Ffeil"
 
-#: mailmerge.ui:345
+#: sw/uiconfig/swriter/ui/mailmerge.ui:344
 msgctxt "mailmerge|singlejobs"
 msgid "_Single print jobs"
 msgstr "_Gwaith argraffu sengl"
 
-#: mailmerge.ui:394
+#: sw/uiconfig/swriter/ui/mailmerge.ui:393
 msgctxt "mailmerge|generate"
 msgid "Generate file name from _database"
 msgstr "Cynhyrchu enw ffeil o _gronfa ddata"
 
-#: mailmerge.ui:415
+#: sw/uiconfig/swriter/ui/mailmerge.ui:414
 msgctxt "mailmerge|fieldlabel"
 msgid "Field:"
 msgstr "Maes:"
 
-#: mailmerge.ui:428
+#: sw/uiconfig/swriter/ui/mailmerge.ui:427
 msgctxt "mailmerge|pathlabel"
 msgid "_Path:"
 msgstr "_Llwybr:"
 
-#: mailmerge.ui:443
+#: sw/uiconfig/swriter/ui/mailmerge.ui:442
 msgctxt "mailmerge|fileformatlabel"
 msgid "F_ile format:"
 msgstr "Fformat _ffeil:"
 
-#: mailmerge.ui:506
+#: sw/uiconfig/swriter/ui/mailmerge.ui:504
 msgctxt "mailmerge|subjectlabel"
 msgid "_Subject:"
 msgstr "_Pwnc:"
 
-#: mailmerge.ui:534
+#: sw/uiconfig/swriter/ui/mailmerge.ui:531
 msgctxt "mailmerge|attachmentslabel"
 msgid "Attachments:"
 msgstr "Atodiadau:"
 
-#: mailmerge.ui:576
+#: sw/uiconfig/swriter/ui/mailmerge.ui:572
 msgctxt "mailmerge|mailformatlabel"
 msgid "Mail format:"
 msgstr "Fformat E-bost:"
 
-#: mailmerge.ui:596
+#: sw/uiconfig/swriter/ui/mailmerge.ui:592
 msgctxt "mailmerge|html"
 msgid "HTM_L"
 msgstr "HTM_L"
 
-#: mailmerge.ui:613
+#: sw/uiconfig/swriter/ui/mailmerge.ui:609
 msgctxt "mailmerge|rtf"
 msgid "RT_F"
 msgstr "RT_F"
 
-#: mailmerge.ui:630
+#: sw/uiconfig/swriter/ui/mailmerge.ui:626
 msgctxt "mailmerge|swriter"
 msgid "%PRODUCTNAME Writer"
 msgstr "Writer %PRODUCTNAME"
 
-#: mailmerge.ui:680
+#: sw/uiconfig/swriter/ui/mailmerge.ui:677
 msgctxt "mailmerge|singledocument"
 msgid "S_ave as single document"
 msgstr "C_adw fel un ddogfen"
 
-#: mailmerge.ui:698
+#: sw/uiconfig/swriter/ui/mailmerge.ui:695
 msgctxt "mailmerge|individualdocuments"
 msgid "Sa_ve as individual documents"
 msgstr "Cadw fel dogfennau _unigol"
 
-#: mailmerge.ui:724
+#: sw/uiconfig/swriter/ui/mailmerge.ui:721
 msgctxt "mailmerge|savemergeddoclabel"
 msgid "Save Merged Document"
 msgstr "Cadw'r Ddogfen Cyfunwyd"
 
-#: mailmerge.ui:745
+#: sw/uiconfig/swriter/ui/mailmerge.ui:742
 msgctxt "mailmerge|outputlabel"
 msgid "Output"
 msgstr "Allbwn"
 
-#: mailmergedialog.ui:7
+#: sw/uiconfig/swriter/ui/mailmergedialog.ui:7
 msgctxt "mailmergedialog|MailMergeDialog"
 msgid "Mail Merge"
 msgstr "Cyfuno Post"
 
-#: mailmergedialog.ui:93
+#: sw/uiconfig/swriter/ui/mailmergedialog.ui:93
 msgctxt "mailmergedialog|document"
 msgid "From this _document"
 msgstr "O gynnwys y _ddogfen"
 
-#: mailmergedialog.ui:112
+#: sw/uiconfig/swriter/ui/mailmergedialog.ui:112
 msgctxt "mailmergedialog|template"
 msgid "From a _template"
 msgstr "Defnyddio _templed"
 
-#: mailmergedialog.ui:136
+#: sw/uiconfig/swriter/ui/mailmergedialog.ui:136
 msgctxt "mailmergedialog|label1"
 msgid "Create"
 msgstr "Creu"
 
-#: managechangessidebar.ui:48
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:48
 msgctxt "managechangessidebar|accept"
 msgid "_Accept"
 msgstr "_Derbyn"
 
-#: managechangessidebar.ui:64
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:64
 msgctxt "managechangessidebar|reject"
 msgid "_Reject"
 msgstr "_Gwrthod"
 
-#: managechangessidebar.ui:80
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:80
 msgctxt "managechangessidebar|acceptall"
 msgid "A_ccept All"
 msgstr "_Derbyn Popeth"
 
-#: managechangessidebar.ui:96
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:96
 msgctxt "managechangessidebar|rejectall"
 msgid "R_eject All"
 msgstr "_Gwrthod Popeth"
 
-#: managechangessidebar.ui:159
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:159
 msgctxt "managechangessidebar|writeredit"
 msgid "Edit Comment..."
 msgstr "Golygu Sylw..."
 
-#: managechangessidebar.ui:166
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:166
 msgctxt "managechangessidebar|writersort"
 msgid "Sort By"
 msgstr "Trefnu yn Ôl"
 
-#: managechangessidebar.ui:176
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:176
 msgctxt "managechangessidebar|writeraction"
 msgid "Action"
 msgstr "Gweithred"
 
-#: managechangessidebar.ui:184
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:184
 msgctxt "managechangessidebar|writerauthor"
 msgid "Author"
 msgstr "Awdur"
 
-#: managechangessidebar.ui:192
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:192
 msgctxt "managechangessidebar|writerdate"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: managechangessidebar.ui:200
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:200
 msgctxt "managechangessidebar|writerdesc"
 msgid "Comment"
 msgstr "Sylw"
 
-#: managechangessidebar.ui:208
+#: sw/uiconfig/swriter/ui/managechangessidebar.ui:208
 msgctxt "managechangessidebar|writerposition"
 msgid "Document Position"
 msgstr "Safle'r Ddogfen"
 
-#: mergeconnectdialog.ui:7
+#: sw/uiconfig/swriter/ui/mergeconnectdialog.ui:7
 msgctxt "mergeconnectdialog|MergeConnectDialog"
 msgid "Data Source Connection"
 msgstr "Cyswllt Data Ffynhonnell"
 
-#: mergeconnectdialog.ui:93
+#: sw/uiconfig/swriter/ui/mergeconnectdialog.ui:93
 msgctxt "mergeconnectdialog|existing"
 msgid "_Use existing"
 msgstr "_Defnyddio'r cyfredol"
 
-#: mergeconnectdialog.ui:112
+#: sw/uiconfig/swriter/ui/mergeconnectdialog.ui:112
 msgctxt "mergeconnectdialog|new"
 msgid "_Create new connection"
 msgstr "C_reu cysyltiad newydd"
 
-#: mergeconnectdialog.ui:134
+#: sw/uiconfig/swriter/ui/mergeconnectdialog.ui:134
 msgctxt "mergeconnectdialog|label2"
 msgid "Fields are used to personalize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."
 msgstr "Mae meysydd yn cael eu defnyddio i bersonoli llythyron ffurflen. Mae'r meysydd yn ddalfannau ar gyfer data o ffynhonnell data, megis cronfa ddata. Rhaid i'r meysydd yn y llythyren ffurflen gael eu cysylltu â'r ffynhonnell data."
 
-#: mergeconnectdialog.ui:153
+#: sw/uiconfig/swriter/ui/mergeconnectdialog.ui:153
 msgctxt "mergeconnectdialog|label1"
 msgid "Connect"
 msgstr "Cysylltu"
 
-#: mergetabledialog.ui:7
+#: sw/uiconfig/swriter/ui/mergetabledialog.ui:8
 msgctxt "mergetabledialog|MergeTableDialog"
 msgid "Merge Tables"
 msgstr "Uno Tablau"
 
-#: mergetabledialog.ui:90
+#: sw/uiconfig/swriter/ui/mergetabledialog.ui:95
 msgctxt "mergetabledialog|prev"
 msgid "Join with _previous table"
 msgstr "Uno gyda'r tabl _blaenorol"
 
-#: mergetabledialog.ui:109
+#: sw/uiconfig/swriter/ui/mergetabledialog.ui:111
 msgctxt "mergetabledialog|next"
 msgid "Join with _next table"
 msgstr "Uno gyda'r tabl _nesaf"
 
-#: mergetabledialog.ui:133
+#: sw/uiconfig/swriter/ui/mergetabledialog.ui:133
 msgctxt "mergetabledialog|label1"
 msgid "Mode"
 msgstr "Modd"
 
-#: mmaddressblockpage.ui:62
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:62
 msgctxt "mmaddressblockpage|addresslist"
 msgid "Select A_ddress List..."
 msgstr "Dewis _Rhestr Cyfeiriadau..."
 
-#: mmaddressblockpage.ui:77
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:77
 msgctxt "mmaddressblockpage|differentlist"
 msgid "Select Different A_ddress List..."
 msgstr "Dewis Rhestr Cyfeiriadau _Gwahanol..."
 
-#: mmaddressblockpage.ui:103
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:103
 msgctxt "mmaddressblockpage|currentaddress"
 msgid "Current address list: %1"
 msgstr "Rhestr cyfeiriadau presennol: %1"
 
-#: mmaddressblockpage.ui:125
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:125
 msgctxt "mmaddressblockpage|label2"
 msgid "Select the address list containing the address data you want to use. This data is needed to create the address block."
 msgstr "Dewiswch y rhestr cyfeiriadau sy'n cynnwys y data cyfeiriad rydych am ei ddefnyddio. Mae angen y data i greu'r bloc cyfeiriad."
 
-#: mmaddressblockpage.ui:142
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:142
 msgctxt "mmaddressblockpage|label3"
 msgid "1."
 msgstr "1."
 
-#: mmaddressblockpage.ui:175
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:175
 msgctxt "mmaddressblockpage|assign"
 msgid "Match _Fields..."
 msgstr "Cydweddu _­Meysydd..."
 
-#: mmaddressblockpage.ui:202
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:202
 msgctxt "mmaddressblockpage|label4"
 msgid "Match the field name used in the mail merge to the column headers in your data source."
 msgstr "Cydweddu enw maes y cyfuno post i benynnau’r colofnau yn eich ffynhonnell data."
 
-#: mmaddressblockpage.ui:219
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:219
 msgctxt "mmaddressblockpage|settingsft1"
 msgid "3."
 msgstr "3."
 
-#: mmaddressblockpage.ui:258
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:258
 msgctxt "mmaddressblockpage|settingsft"
 msgid "2."
 msgstr "2."
 
-#: mmaddressblockpage.ui:269
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:269
 msgctxt "mmaddressblockpage|address"
 msgid "_This document shall contain an address block"
 msgstr "­_Bydd y ddogfen yn cynnwys bloc cyfeiriad"
 
-#: mmaddressblockpage.ui:307
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:307
 msgctxt "mmaddressblockpage|settings"
 msgid "_More..."
 msgstr "_Rhagor..."
 
-#: mmaddressblockpage.ui:345
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:345
 msgctxt "mmaddressblockpage|hideempty"
 msgid "_Suppress lines with just empty fields"
 msgstr "_Atal llinellau gyda meysydd gwag"
 
-#: mmaddressblockpage.ui:423
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:423
 msgctxt "mmaddressblockpage|prev|tooltip_text"
 msgid "Preview Previous Address Block"
 msgstr "Rhagolygu’r Bloc Cyfeiriadau Blaenorol"
 
-#: mmaddressblockpage.ui:438
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:438
 msgctxt "mmaddressblockpage|next|tooltip_text"
 msgid "Preview Next Address Block"
 msgstr "Rhagolygu'r Bloc Cyfeiriadau Nesaf"
 
-#: mmaddressblockpage.ui:454
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:454
 msgctxt "mmaddressblockpage|documentindex"
 msgid "Document: %1"
 msgstr "Dogfen %1"
 
-#: mmaddressblockpage.ui:494
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:494
 msgctxt "mmaddressblockpage|label6"
 msgid "Check if the address data matches correctly."
 msgstr "Gwirio os yw'r data cyfeiriad yn cydweddu'n gywir."
 
-#: mmaddressblockpage.ui:511
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:511
 msgctxt "mmaddressblockpage|settingsft2"
 msgid "4."
 msgstr "4."
 
-#: mmaddressblockpage.ui:544
+#: sw/uiconfig/swriter/ui/mmaddressblockpage.ui:544
 msgctxt "mmaddressblockpage|label1"
 msgid "Insert Address Block"
 msgstr "Mewnosod y Bloc Cyfeiriad"
 
-#: mmcreatingdialog.ui:7
+#: sw/uiconfig/swriter/ui/mmcreatingdialog.ui:7
 msgctxt "mmcreatingdialog|MMCreatingDialog"
 msgid "Mail Merge"
 msgstr "Cyfuno Post"
 
-#: mmcreatingdialog.ui:52
+#: sw/uiconfig/swriter/ui/mmcreatingdialog.ui:52
 msgctxt "mmcreatingdialog|label1"
 msgid "Status:"
 msgstr "Statws:"
 
-#: mmcreatingdialog.ui:66
+#: sw/uiconfig/swriter/ui/mmcreatingdialog.ui:66
 msgctxt "mmcreatingdialog|label2"
 msgid "Progress:"
 msgstr "Cynnydd:"
 
-#: mmcreatingdialog.ui:80
+#: sw/uiconfig/swriter/ui/mmcreatingdialog.ui:80
 msgctxt "mmcreatingdialog|label3"
 msgid "Creating documents..."
 msgstr "Creu dogfennau..."
 
-#: mmcreatingdialog.ui:94
+#: sw/uiconfig/swriter/ui/mmcreatingdialog.ui:94
 msgctxt "mmcreatingdialog|progress"
 msgid "%X of %Y"
 msgstr "%X o %Y"
 
-#: mmlayoutpage.ui:74
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:74
 msgctxt "mmlayoutpage|label6"
 msgid "_From top"
 msgstr "_O'r brig"
 
-#: mmlayoutpage.ui:89
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:89
 msgctxt "mmlayoutpage|top"
 msgid "2.00"
 msgstr "2.00"
 
-#: mmlayoutpage.ui:116
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:116
 msgctxt "mmlayoutpage|align"
 msgid "Align to text body"
 msgstr "Alinio i gorff y testun"
 
-#: mmlayoutpage.ui:163
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:163
 msgctxt "mmlayoutpage|leftft"
 msgid "From _left"
 msgstr "O'r ­_chwith"
 
-#: mmlayoutpage.ui:205
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:205
 msgctxt "mmlayoutpage|label2"
 msgid "Address Block Position"
 msgstr "Safle Bloc Cyfeiriad"
 
-#: mmlayoutpage.ui:242
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:242
 msgctxt "mmlayoutpage|label4"
 msgid "Move"
 msgstr "Symud"
 
-#: mmlayoutpage.ui:258
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:258
 msgctxt "mmlayoutpage|label5"
 msgid "Move"
 msgstr "Symud"
 
-#: mmlayoutpage.ui:271
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:271
 msgctxt "mmlayoutpage|up"
 msgid "_Up"
 msgstr "I _fyny"
 
-#: mmlayoutpage.ui:286
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:286
 msgctxt "mmlayoutpage|down"
 msgid "_Down"
 msgstr "I _lawr"
 
-#: mmlayoutpage.ui:307
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:307
 msgctxt "mmlayoutpage|label3"
 msgid "Salutation Position"
 msgstr "Safle'r Cyfarchiad"
 
-#: mmlayoutpage.ui:347
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:347
 msgctxt "mmlayoutpage|label7"
 msgid "_Zoom"
 msgstr "C_hwyddo"
 
-#: mmlayoutpage.ui:363
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:363
 msgctxt "mmlayoutpage|zoom"
 msgid "Entire page"
 msgstr "Tudalen gyfan"
 
-#: mmlayoutpage.ui:415
+#: sw/uiconfig/swriter/ui/mmlayoutpage.ui:415
 msgctxt "mmlayoutpage|label1"
 msgid "Adjust Layout of Address Block and Salutation"
 msgstr "Newid Cynllun Bloc Cyfeiriadau a Chyfarchiad"
 
-#: mmmailbody.ui:8
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:8
 msgctxt "mmmailbody|MailBodyDialog"
 msgid "E-Mail Message"
 msgstr "Neges E-bost"
 
-#: mmmailbody.ui:91
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:91
 msgctxt "mmmailbody|bodyft"
 msgid "Write your message here"
 msgstr "Ysgrifennu'ch neges yma"
 
-#: mmmailbody.ui:132
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:132
 msgctxt "mmmailbody|greeting"
 msgid "This e-mail should contain a salutation"
 msgstr "Dylai'r e-bost gynnwys cyfarchiad"
 
-#: mmmailbody.ui:164
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:165
 msgctxt "mmmailbody|generalft"
 msgid "General salutation"
 msgstr "Cyfarchiad cyffredinol"
 
-#: mmmailbody.ui:219
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:220
 msgctxt "mmmailbody|femalefi"
 msgid "Address list field indicating a female recipient"
 msgstr "Maes rhestr cyfeiriad yn dangos derbynnydd benywaidd"
 
-#: mmmailbody.ui:233
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:234
 msgctxt "mmmailbody|femaleft"
 msgid "_Female"
 msgstr "_Benyw"
 
-#: mmmailbody.ui:249
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:250
 msgctxt "mmmailbody|maleft"
 msgid "_Male"
 msgstr "_Gwryw"
 
-#: mmmailbody.ui:265
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:266
 msgctxt "mmmailbody|femalecolft"
 msgid "Field name"
 msgstr "Enw maes"
 
-#: mmmailbody.ui:280
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:281
 msgctxt "mmmailbody|femalefieldft"
 msgid "Field value"
 msgstr "Gwerth maes"
 
-#: mmmailbody.ui:292
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:293
 msgctxt "mmmailbody|newfemale"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: mmmailbody.ui:309
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:310
 msgctxt "mmmailbody|newmale"
 msgid "N_ew..."
 msgstr "_Newydd..."
 
-#: mmmailbody.ui:404
+#: sw/uiconfig/swriter/ui/mmmailbody.ui:405
 msgctxt "mmmailbody|personalized"
 msgid "Insert personalized salutation"
 msgstr "Mewnosod cyfarchiad personol"
 
-#: mmoutputtypepage.ui:45
+#: sw/uiconfig/swriter/ui/mmoutputtypepage.ui:45
 msgctxt "mmoutputtypepage|letterft"
 msgid "Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient."
 msgstr "Anfon llythyron at grŵp o dderbynwyr. Gall y llythyron gynnwys bloc cyfeiriad a chyfarchiad. Mae modd personoli'r llythyron ar gyfer pob derbynnydd."
 
-#: mmoutputtypepage.ui:62
+#: sw/uiconfig/swriter/ui/mmoutputtypepage.ui:62
 msgctxt "mmoutputtypepage|emailft"
 msgid "Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient."
 msgstr "Anfon negeseuon e-bost at grŵp o dderbynwyr. Gall y neges e-bost gynnwys cyfarchiad. Mae modd personoli'r neges e-bost ar gyfer pob derbynnydd."
 
-#: mmoutputtypepage.ui:78
+#: sw/uiconfig/swriter/ui/mmoutputtypepage.ui:78
 msgctxt "mmoutputtypepage|letter"
 msgid "_Letter"
 msgstr "_Llythyr"
 
-#: mmoutputtypepage.ui:94
+#: sw/uiconfig/swriter/ui/mmoutputtypepage.ui:94
 msgctxt "mmoutputtypepage|email"
 msgid "_E-mail message"
 msgstr "_Neges E-bost"
 
-#: mmoutputtypepage.ui:134
+#: sw/uiconfig/swriter/ui/mmoutputtypepage.ui:134
 msgctxt "mmoutputtypepage|label1"
 msgid "What Type of Document Do You Want to Create?"
 msgstr "Pa Fath o Ddogfen Hoffech chi ei Chreu?"
 
-#: mmresultemaildialog.ui:14
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:14
 msgctxt "mmresultemaildialog|liststore1"
 msgid "OpenDocument Text"
 msgstr "Testun OpenDocument"
 
-#: mmresultemaildialog.ui:18
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:18
 msgctxt "mmresultemaildialog|liststore1"
 msgid "Adobe PDF-Document"
 msgstr "Dogfen Adobe PDF"
 
-#: mmresultemaildialog.ui:22
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:22
 msgctxt "mmresultemaildialog|liststore1"
 msgid "Microsoft Word Document"
 msgstr "Dogfen Microsoft Word"
 
-#: mmresultemaildialog.ui:26
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:26
 msgctxt "mmresultemaildialog|liststore1"
 msgid "HTML Message"
 msgstr "Neges HTML"
 
-#: mmresultemaildialog.ui:30
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:30
 msgctxt "mmresultemaildialog|liststore1"
 msgid "Plain Text"
 msgstr "Testun Plaen"
 
-#: mmresultemaildialog.ui:38
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:38
 msgctxt "mmresultemaildialog|MMResultEmailDialog"
 msgid "E-Mail merged document"
 msgstr "E-bostio'r _ddogfen cyfunwyd"
 
-#: mmresultemaildialog.ui:51
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:51
 msgctxt "mmresultemaildialog|ok"
 msgid "Send Documents"
 msgstr "Anfon Dogfennau"
 
-#: mmresultemaildialog.ui:133
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:133
 msgctxt "mmresultemaildialog|mailtoft"
 msgid "T_o"
 msgstr "A_t"
 
-#: mmresultemaildialog.ui:155
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:155
 msgctxt "mmresultemaildialog|copyto"
 msgid "_Copy to..."
 msgstr "C_opïo i..."
 
-#: mmresultemaildialog.ui:171
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:171
 msgctxt "mmresultemaildialog|subjectft"
 msgid "S_ubject"
 msgstr "_Pwnc"
 
-#: mmresultemaildialog.ui:196
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:196
 msgctxt "mmresultemaildialog|sendasft"
 msgid "Sen_d as"
 msgstr "Anfon _fel"
 
-#: mmresultemaildialog.ui:219
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:219
 msgctxt "mmresultemaildialog|sendassettings"
 msgid "Pr_operties..."
 msgstr "_Priodweddau..."
 
-#: mmresultemaildialog.ui:265
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:265
 msgctxt "mmresultemaildialog|attachft"
 msgid "Name of the a_ttachment"
 msgstr "Enw'r _atodiad"
 
-#: mmresultemaildialog.ui:284
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:284
 msgctxt "mmresultemaildialog|label2"
 msgid "E-Mail options"
 msgstr "Dewisiadau e-bost"
 
-#: mmresultemaildialog.ui:316
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:316
 msgctxt "mmresultemaildialog|sendallrb"
 msgid "S_end all documents"
 msgstr "_Anfon pob dogfen"
 
-#: mmresultemaildialog.ui:339
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:339
 msgctxt "mmresultemaildialog|fromrb"
 msgid "_From"
 msgstr "_Oddi wrth"
 
-#: mmresultemaildialog.ui:360
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:360
 msgctxt "mmresultemaildialog|toft"
 msgid "_To"
 msgstr "_At"
 
-#: mmresultemaildialog.ui:409
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:409
 msgctxt "mmresultemaildialog|label1"
 msgid "Send records"
 msgstr "Anfon cofnodion"
 
-#: mmresultprintdialog.ui:8
+#: sw/uiconfig/swriter/ui/mmresultprintdialog.ui:20
 msgctxt "mmresultprintdialog|MMResultPrintDialog"
 msgid "Print merged document"
 msgstr "Argraffu'r ddogfen cyfunwyd"
 
-#: mmresultprintdialog.ui:21
+#: sw/uiconfig/swriter/ui/mmresultprintdialog.ui:36
 msgctxt "mmresultprintdialog|ok"
 msgid "Print Documents"
 msgstr "Argraffu Dogfennau"
 
-#: mmresultprintdialog.ui:97
+#: sw/uiconfig/swriter/ui/mmresultprintdialog.ui:112
 msgctxt "mmresultprintdialog|printerft"
 msgid "_Printer"
 msgstr "_Argraffydd"
 
-#: mmresultprintdialog.ui:119
+#: sw/uiconfig/swriter/ui/mmresultprintdialog.ui:135
 msgctxt "mmresultprintdialog|printersettings"
 msgid "P_roperties..."
 msgstr "_Priodweddau..."
 
-#: mmresultprintdialog.ui:138
+#: sw/uiconfig/swriter/ui/mmresultprintdialog.ui:154
 msgctxt "mmresultprintdialog|label2"
 msgid "Printer options"
 msgstr "Dewisiadau argraffydd"
 
-#: mmresultprintdialog.ui:174
+#: sw/uiconfig/swriter/ui/mmresultprintdialog.ui:190
 msgctxt "mmresultprintdialog|printallrb"
 msgid "Print _all documents"
 msgstr "Argraffu _pob dogfen"
 
-#: mmresultprintdialog.ui:199
+#: sw/uiconfig/swriter/ui/mmresultprintdialog.ui:215
 msgctxt "mmresultprintdialog|fromrb"
 msgid "_From"
 msgstr "_Oddi wrth"
 
-#: mmresultprintdialog.ui:220
+#: sw/uiconfig/swriter/ui/mmresultprintdialog.ui:236
 msgctxt "mmresultprintdialog|toft"
 msgid "_To"
 msgstr "_At"
 
-#: mmresultprintdialog.ui:271
+#: sw/uiconfig/swriter/ui/mmresultprintdialog.ui:289
 msgctxt "mmresultprintdialog|label1"
 msgid "Print records"
 msgstr "Argraffu cofnodion"
 
-#: mmresultsavedialog.ui:8
+#: sw/uiconfig/swriter/ui/mmresultsavedialog.ui:8
 msgctxt "mmresultsavedialog|MMResultSaveDialog"
 msgid "Save merged document"
 msgstr "Cadw'r ddogfen cyfunwyd"
 
-#: mmresultsavedialog.ui:21
+#: sw/uiconfig/swriter/ui/mmresultsavedialog.ui:21
 msgctxt "mmresultsavedialog|ok"
 msgid "Save Documents"
 msgstr "Cadw Dogfennau"
 
-#: mmresultsavedialog.ui:94
+#: sw/uiconfig/swriter/ui/mmresultsavedialog.ui:94
 msgctxt "mmresultsavedialog|singlerb"
 msgid "S_ave as a single large document"
 msgstr "C_adw fel un ddogfen fawr"
 
-#: mmresultsavedialog.ui:111
+#: sw/uiconfig/swriter/ui/mmresultsavedialog.ui:111
 msgctxt "mmresultsavedialog|individualrb"
 msgid "Sa_ve as individual documents"
 msgstr "Cadw fel dogfennau _unigol"
 
-#: mmresultsavedialog.ui:132
+#: sw/uiconfig/swriter/ui/mmresultsavedialog.ui:132
 msgctxt "mmresultsavedialog|fromrb"
 msgid "_From"
 msgstr "_Oddi wrth"
 
-#: mmresultsavedialog.ui:153
+#: sw/uiconfig/swriter/ui/mmresultsavedialog.ui:153
 msgctxt "mmresultsavedialog|toft"
 msgid "_To"
 msgstr "_At"
 
-#: mmresultsavedialog.ui:201
+#: sw/uiconfig/swriter/ui/mmresultsavedialog.ui:201
 msgctxt "mmresultsavedialog|label2"
 msgid "Save As options"
 msgstr "Cadw fel dewisiadau"
 
-#: mmsalutationpage.ui:49
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:49
 msgctxt "mmsalutationpage|previewft"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: mmsalutationpage.ui:70
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:70
 msgctxt "mmsalutationpage|assign"
 msgid "_Match fields..."
 msgstr "Cydweddu _meysydd..."
 
-#: mmsalutationpage.ui:108
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:108
 msgctxt "mmsalutationpage|prev|tooltip_text"
 msgid "Preview Previous Address Block"
 msgstr "Rhagolygu’r Bloc Cyfeiriadau Blaenorol"
 
-#: mmsalutationpage.ui:123
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:123
 msgctxt "mmsalutationpage|next|tooltip_text"
 msgid "Preview Next Address Block"
 msgstr "Rhagolygu'r Bloc Cyfeiriadau Nesaf"
 
-#: mmsalutationpage.ui:139
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:139
 msgctxt "mmsalutationpage|documentindex"
 msgid "Document: %1"
 msgstr "Dogfen: %1"
 
-#: mmsalutationpage.ui:180
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:180
 msgctxt "mmsalutationpage|greeting"
 msgid "This document should contain a salutation"
 msgstr "Dylai'r ddogfen gynnwys cyfarchiad"
 
-#: mmsalutationpage.ui:211
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:212
 msgctxt "mmsalutationpage|generalft"
 msgid "General salutation"
 msgstr "Cyfarchiad cyffredinol"
 
-#: mmsalutationpage.ui:266
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:267
 msgctxt "mmsalutationpage|femalefi"
 msgid "Address list field indicating a female recipient"
 msgstr "Maes rhestr cyfeiriad yn dangos derbynnydd benywaidd"
 
-#: mmsalutationpage.ui:280
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:281
 msgctxt "mmsalutationpage|femaleft"
 msgid "_Female"
 msgstr "_Benyw"
 
-#: mmsalutationpage.ui:296
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:297
 msgctxt "mmsalutationpage|maleft"
 msgid "_Male"
 msgstr "_Gwryw"
 
-#: mmsalutationpage.ui:312
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:313
 msgctxt "mmsalutationpage|femalecolft"
 msgid "Field name"
 msgstr "Enw maes"
 
-#: mmsalutationpage.ui:328
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:329
 msgctxt "mmsalutationpage|femalefieldft"
 msgid "Field value"
 msgstr "Gwerth maes"
 
-#: mmsalutationpage.ui:341
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:342
 msgctxt "mmsalutationpage|newfemale"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: mmsalutationpage.ui:357
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:358
 msgctxt "mmsalutationpage|newmale"
 msgid "N_ew..."
 msgstr "_Newydd..."
 
-#: mmsalutationpage.ui:451
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:452
 msgctxt "mmsalutationpage|personalized"
 msgid "Insert personalized salutation"
 msgstr "Mewnosod cyfarchiad personol"
 
-#: mmsalutationpage.ui:499
+#: sw/uiconfig/swriter/ui/mmsalutationpage.ui:501
 msgctxt "mmsalutationpage|label1"
 msgid "Create a Salutation"
 msgstr "Creu Cyfarchiad"
 
-#: mmselectpage.ui:31
+#: sw/uiconfig/swriter/ui/mmselectpage.ui:31
 msgctxt "mmselectpage|currentdoc"
 msgid "Use the current _document"
 msgstr "Defnyddio'r _ddogfen gyfredol"
 
-#: mmselectpage.ui:48
+#: sw/uiconfig/swriter/ui/mmselectpage.ui:48
 msgctxt "mmselectpage|newdoc"
 msgid "Create a ne_w document"
 msgstr "Creu dogfen _newydd"
 
-#: mmselectpage.ui:64
+#: sw/uiconfig/swriter/ui/mmselectpage.ui:64
 msgctxt "mmselectpage|loaddoc"
 msgid "Start from _existing document"
 msgstr "Cychwyn o _ddogfen newydd"
 
-#: mmselectpage.ui:81
+#: sw/uiconfig/swriter/ui/mmselectpage.ui:81
 msgctxt "mmselectpage|template"
 msgid "Start from a t_emplate"
 msgstr "Cychwyn o _dempled"
 
-#: mmselectpage.ui:98
+#: sw/uiconfig/swriter/ui/mmselectpage.ui:98
 msgctxt "mmselectpage|recentdoc"
 msgid "Start fro_m a recently saved starting document"
 msgstr "C_ychwyn o ddogfen gychwyn cadwyd yn ddiweddar"
 
-#: mmselectpage.ui:125
+#: sw/uiconfig/swriter/ui/mmselectpage.ui:125
 msgctxt "mmselectpage|browsedoc"
 msgid "B_rowse..."
 msgstr "_Pori..."
 
-#: mmselectpage.ui:140
+#: sw/uiconfig/swriter/ui/mmselectpage.ui:140
 msgctxt "mmselectpage|browsetemplate"
 msgid "B_rowse..."
 msgstr "_Pori..."
 
-#: mmselectpage.ui:161
+#: sw/uiconfig/swriter/ui/mmselectpage.ui:161
 msgctxt "mmselectpage|label1"
 msgid "Select Starting Document for the Mail Merge"
 msgstr "Dewis Dogfen Gychwynnol ar gyfer Cyfuno Post"
 
-#: mmsendmails.ui:11
+#: sw/uiconfig/swriter/ui/mmsendmails.ui:11
 msgctxt "mmsendmails|SendMailsDialog"
 msgid "Sending E-mail messages"
 msgstr "Anfon negeseuon E-bost"
 
-#: mmsendmails.ui:26
+#: sw/uiconfig/swriter/ui/mmsendmails.ui:26
 msgctxt "mmsendmails|stop"
 msgid "_Pause"
-msgstr ""
+msgstr "_Oedi"
 
-#: mmsendmails.ui:90
+#: sw/uiconfig/swriter/ui/mmsendmails.ui:90
 msgctxt "mmsendmails|label3"
 msgid "The connection to the outgoing mail server has been established"
 msgstr "Wedi creu cyswllt gyda'r gweinydd e-bost allan"
 
-#: mmsendmails.ui:99
+#: sw/uiconfig/swriter/ui/mmsendmails.ui:99
 msgctxt "mmsendmails|label1"
 msgid "Connection status"
 msgstr "Statws y cysylltiad"
 
-#: mmsendmails.ui:150
+#: sw/uiconfig/swriter/ui/mmsendmails.ui:150
 msgctxt "mmsendmails|transferstatus"
 msgid "%1 of %2 e-mails sent"
 msgstr "%1 o %2 e-byst wedi eu hanfon"
 
-#: mmsendmails.ui:166
+#: sw/uiconfig/swriter/ui/mmsendmails.ui:166
 msgctxt "mmsendmails|paused"
 msgid "Sending paused"
 msgstr "Oedi'r anfon"
 
-#: mmsendmails.ui:201
+#: sw/uiconfig/swriter/ui/mmsendmails.ui:201
 msgctxt "mmsendmails|errorstatus"
 msgid "E-mails not sent: %1"
 msgstr "E-byst heb eu hanfon: %1"
 
-#: mmsendmails.ui:229
+#: sw/uiconfig/swriter/ui/mmsendmails.ui:229
 msgctxt "mmsendmails|label5"
 msgid "Details"
 msgstr "Manylion"
 
-#: mmsendmails.ui:248
+#: sw/uiconfig/swriter/ui/mmsendmails.ui:248
 msgctxt "mmsendmails|label2"
 msgid "Transfer status"
 msgstr "Trosglwyddo statws"
 
-#: navigatorpanel.ui:34
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:34
 msgctxt "navigatorpanel|contenttoggle|tooltip_text"
 msgid "Toggle Master View"
 msgstr "Newid y Golwg Meistr"
 
-#: navigatorpanel.ui:47
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:47
 msgctxt "navigatorpanel|navigation|tooltip_text"
 msgid "Navigation"
 msgstr "Llywio"
 
-#: navigatorpanel.ui:60
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:60
 msgctxt "navigatorpanel|back|tooltip_text"
 msgid "Back"
 msgstr "Nôl"
 
-#: navigatorpanel.ui:73
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:73
 msgctxt "navigatorpanel|forward|tooltip_text"
 msgid "Forward"
 msgstr "Ymlaen"
 
-#: navigatorpanel.ui:86
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:86
 msgctxt "navigatorpanel|dragmode|tooltip_text"
 msgid "Drag Mode"
 msgstr "Modd Llusgo"
 
-#: navigatorpanel.ui:109
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:109
 msgctxt "navigatorpanel|chapterup|tooltip_text"
 msgid "Promote Chapter"
 msgstr "Dyrchafu Pennod"
 
-#: navigatorpanel.ui:122
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:122
 msgctxt "navigatorpanel|chapterdown|tooltip_text"
 msgid "Demote Chapter"
 msgstr "Darostwng Pennod"
 
-#: navigatorpanel.ui:135
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:135
 msgctxt "navigatorpanel|listbox|tooltip_text"
 msgid "List Box On/Off"
 msgstr "Blwch Rhestr Ymlaen/Diffodd"
 
-#: navigatorpanel.ui:148
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:148
 msgctxt "navigatorpanel|root|tooltip_text"
 msgid "Content Navigation View"
 msgstr "Golwg Cynnwys Llywio"
 
-#: navigatorpanel.ui:171
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:171
 msgctxt "navigatorpanel|reminder|tooltip_text"
 msgid "Set Reminder"
 msgstr "Gosod Atgof"
 
-#: navigatorpanel.ui:194
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:194
 msgctxt "navigatorpanel|header|tooltip_text"
 msgid "Header"
 msgstr "Pennyn"
 
-#: navigatorpanel.ui:207
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:207
 msgctxt "navigatorpanel|footer|tooltip_text"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: navigatorpanel.ui:220
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:220
 msgctxt "navigatorpanel|anchor|tooltip_text"
 msgid "Anchor<->Text"
 msgstr "Angor<->Testun"
 
-#: navigatorpanel.ui:243
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:243
 msgctxt "navigatorpanel|headings|tooltip_text"
 msgid "Heading Levels Shown"
 msgstr "Dangos Lefelau Pennyn"
 
-#: navigatorpanel.ui:266
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:266
 msgctxt "navigatorpanel|promote|tooltip_text"
 msgid "Promote Level"
 msgstr "Dyrchafu Lefel"
 
-#: navigatorpanel.ui:279
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:279
 msgctxt "navigatorpanel|demote|tooltip_text"
 msgid "Demote Level"
 msgstr "Darostwng Lefel"
 
-#: navigatorpanel.ui:304
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:304
 msgctxt "navigatorpanel|documents|tooltip_text"
 msgid "Document"
 msgstr "Dogfen"
 
-#: navigatorpanel.ui:307
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:307
 msgctxt "navigatorpanel|documents-atkobject"
 msgid "Active Window"
 msgstr "Ffenestr Weithredol"
 
-#: navigatorpanel.ui:341
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:341
 msgctxt "navigatorpanel|globaltoggle|tooltip_text"
 msgid "Toggle Master View"
 msgstr "Newid Golwg Meistr"
 
-#: navigatorpanel.ui:364
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:364
 msgctxt "navigatorpanel|edit|tooltip_text"
 msgid "Edit"
 msgstr "Golygu"
 
-#: navigatorpanel.ui:377
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:377
 msgctxt "navigatorpanel|update|tooltip_text"
 msgid "Update"
 msgstr "Diweddaru"
 
-#: navigatorpanel.ui:390
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:390
 msgctxt "navigatorpanel|insert|tooltip_text"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: navigatorpanel.ui:413
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:413
 msgctxt "navigatorpanel|save|tooltip_text"
 msgid "Save Contents as well"
 msgstr "Cadw'r Cynnwys hefyd"
 
-#: navigatorpanel.ui:436
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:436
 msgctxt "navigatorpanel|moveup|tooltip_text"
 msgid "Move Up"
 msgstr "Symud i Fyny"
 
-#: navigatorpanel.ui:449
+#: sw/uiconfig/swriter/ui/navigatorpanel.ui:449
 msgctxt "navigatorpanel|movedown|tooltip_text"
 msgid "Move Down"
 msgstr "Symud i Lawr"
 
-#: newuserindexdialog.ui:8
+#: sw/uiconfig/swriter/ui/newuserindexdialog.ui:8
 msgctxt "newuserindexdialog|NewUserIndexDialog"
 msgid "Create New User-defined Index"
 msgstr "Creu Mynegai Defnyddiwr Diffiniedig Newydd"
 
-#: newuserindexdialog.ui:100
+#: sw/uiconfig/swriter/ui/newuserindexdialog.ui:103
 msgctxt "newuserindexdialog|label2"
 msgid "_Name"
 msgstr "_Enw"
 
-#: newuserindexdialog.ui:132
+#: sw/uiconfig/swriter/ui/newuserindexdialog.ui:133
 msgctxt "newuserindexdialog|label1"
 msgid "New User Index"
 msgstr "Mynegai Defnyddiwr Newydd"
 
-#: notebookbar.ui:417
-msgctxt "notebookbar|NewSW"
-msgid " "
-msgstr " "
-
-#: notebookbar.ui:421
-msgctxt "notebookbar|NewSW|tooltip_text"
-msgid "Text Document"
-msgstr "Dogfen Testun"
-
-#: notebookbar.ui:434
-msgctxt "notebookbar|NewSC"
-msgid " "
-msgstr " "
-
-#: notebookbar.ui:438
-msgctxt "notebookbar|NewSC|tooltip_text"
-msgid "Spreadsheet"
-msgstr "Taenlen"
-
-#: notebookbar.ui:451
-msgctxt "notebookbar|NewSI"
-msgid " "
-msgstr " "
-
-#: notebookbar.ui:455
-msgctxt "notebookbar|NewSI|tooltip_text"
-msgid "Presentation"
-msgstr "Cyflwyniad"
-
-#: notebookbar.ui:468
-msgctxt "notebookbar|NewSD"
-msgid " "
-msgstr " "
-
-#: notebookbar.ui:472
-msgctxt "notebookbar|NewSD|tooltip_text"
-msgid "Drawing"
-msgstr "Lluniadu"
-
-#: notebookbar.ui:484
-msgctxt "notebookbar|NewSF"
-msgid " "
-msgstr " "
-
-#: notebookbar.ui:488
-msgctxt "notebookbar|NewSF|tooltip_text"
-msgid "Formula"
-msgstr "Fformiwla"
-
-#: notebookbar.ui:500
-msgctxt "notebookbar|NewSB"
-msgid " "
-msgstr " "
-
-#: notebookbar.ui:504
-msgctxt "notebookbar|NewSB|tooltip_text"
-msgid "Database"
-msgstr "Cronfa Ddata"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:2138
+msgctxt "notebookbar|fileb"
+msgid "_File"
+msgstr "_Ffeil"
 
-#: notebookbar.ui:523
-msgctxt "notebookbar|NewSDB|tooltip_text"
-msgid "Spreadsheet"
-msgstr "Taenlen"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:2157
+msgctxt "notebookbar|fileb"
+msgid "_Help"
+msgstr "_Cymorth"
 
-#: notebookbar.ui:1238
+#: sw/uiconfig/swriter/ui/notebookbar.ui:2946
 msgctxt "notebookbar|FileLabel"
 msgid "File"
 msgstr "Ffeil"
 
-#: notebookbar.ui:1371
-msgctxt "notebookbar|FontSection|tooltip_text"
-msgid "Font"
-msgstr "Ffont"
-
-#: notebookbar.ui:1660
-msgctxt "notebookbar|FontSection2|tooltip_text"
-msgid "Font"
-msgstr "Ffont"
-
-#: notebookbar.ui:1769
-msgctxt "notebookbar|OutlineSection|tooltip_text"
-msgid "Outline"
-msgstr "Amlinell"
-
-#: notebookbar.ui:1799
-msgctxt "notebookbar|numberbullet|tooltip_text"
-msgid "Bullets and Numbering"
-msgstr "Bwledi a Rhifo"
-
-#: notebookbar.ui:1852
-msgctxt "notebookbar|level|tooltip_text"
-msgid "Horizontal Alignment"
-msgstr "Alinio Llorweddol"
-
-#: notebookbar.ui:1938
-msgctxt "notebookbar|AlignmentSection|tooltip_text"
-msgid "Alignment"
-msgstr "Alinio"
-
-#: notebookbar.ui:1966
-msgctxt "notebookbar|verticalalignment1|tooltip_text"
-msgid "Vertical Alignment"
-msgstr "Alinio Fertigol"
-
-#: notebookbar.ui:2017
-msgctxt "notebookbar|horizontalalignment|tooltip_text"
-msgid "Horizontal Alignment"
-msgstr "Aliniad Llorweddol"
-
-#: notebookbar.ui:2156
-msgctxt "notebookbar|SpacingSection|tooltip_text"
-msgid "Spacing"
-msgstr "Bylchu"
-
-#: notebookbar.ui:2189
-msgctxt "notebookbar|indent|tooltip_text"
-msgid "Indent"
-msgstr "Mewnoliad"
-
-#: notebookbar.ui:2196
-msgctxt "notebookbar|increaseindent1|tooltip_text"
-msgid "Increase Indent"
-msgstr "Cynyddu Mewnoliad"
-
-#: notebookbar.ui:2212
-msgctxt "notebookbar|decreaseindent1|tooltip_text"
-msgid "Decrease Indent"
-msgstr "Lleihau Mewnoliad"
-
-#: notebookbar.ui:2234
-msgctxt "notebookbar|controlcodes|tooltip_text"
-msgid "Indent"
-msgstr "Mewnoliad"
-
-#: notebookbar.ui:2342
-msgctxt "notebookbar|StyleSection|tooltip_text"
-msgid "Style"
-msgstr "Arddull"
-
-#: notebookbar.ui:2474
-msgctxt "notebookbar|FindSection|tooltip_text"
-msgid "Find"
-msgstr "Chwilio"
-
-#: notebookbar.ui:2530
-msgctxt "notebookbar|FindSection1|tooltip_text"
-msgid "Find"
-msgstr "Chwilio"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:3105
+msgctxt "notebookbar|menub"
+msgid "_Home"
+msgstr "_Cartref"
 
-#: notebookbar.ui:2595
+#: sw/uiconfig/swriter/ui/notebookbar.ui:4491
 msgctxt "notebookbar|HomeLabel"
 msgid "Home"
 msgstr "Cartref"
 
-#: notebookbar.ui:2616
-msgctxt "notebookbar|BreakSection|tooltip_text"
-msgid "Break"
-msgstr "Toriad"
-
-#: notebookbar.ui:2800
-msgctxt "notebookbar|box70|tooltip_text"
-msgid "Gallery"
-msgstr "Oriel"
-
-#: notebookbar.ui:2806
-msgctxt "notebookbar|Gallery|tooltip_text"
-msgid "Open Clip Art and Media Gallery"
-msgstr "Agor Oriel Clip Gelf a Cyfryngau"
-
-#: notebookbar.ui:2850
-msgctxt "notebookbar|box69|tooltip_text"
-msgid "Symbol"
-msgstr "Symbol"
-
-#: notebookbar.ui:2882
-msgctxt "notebookbar|box17|tooltip_text"
-msgid "Basic"
-msgstr "Sylfaenol"
-
-#: notebookbar.ui:2910
-msgctxt "notebookbar|InsertAVMedia|tooltip_text"
-msgid "Insert Audio or Video"
-msgstr "Mewnosod Sain a Fideo"
-
-#: notebookbar.ui:2942
-msgctxt "notebookbar|ShapesSection|tooltip_text"
-msgid "Shapes"
-msgstr "Siapiau"
-
-#: notebookbar.ui:3249
-msgctxt "notebookbar|LinksSection|tooltip_text"
-msgid "Links"
-msgstr "Cysylltiadau"
-
-#: notebookbar.ui:3336
-msgctxt "notebookbar|TextSection|tooltip_text"
-msgid "Text"
-msgstr "Testun"
-
-#: notebookbar.ui:3373
-msgctxt "notebookbar|FontWork"
-msgid "Fontwork"
-msgstr "Fontwork"
-
-#: notebookbar.ui:3455
-msgctxt "notebookbar|FieldsSection|tooltip_text"
-msgid "Fields"
-msgstr "Meysydd"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:5561
+msgctxt "notebookbar|menub"
+msgid "_Insert"
+msgstr "_Mewnosod"
 
-#: notebookbar.ui:3545
+#: sw/uiconfig/swriter/ui/notebookbar.ui:5646
 msgctxt "notebookbar|InsertLabel"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: notebookbar.ui:3715
-msgctxt "notebookbar|box15|tooltip_text"
-msgid "Setup"
-msgstr "Gosod"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:5676
+msgctxt "notebookbar|reviewb"
+msgid "Pag_e"
+msgstr "_Tudalen"
 
-#: notebookbar.ui:3913
+#: sw/uiconfig/swriter/ui/notebookbar.ui:6596
 msgctxt "notebookbar|LayoutLabel"
-msgid "Page layout"
-msgstr "Gosodiad tudalen"
+msgid "Layout"
+msgstr "Cynllun"
 
-#: notebookbar.ui:4295
+#: sw/uiconfig/swriter/ui/notebookbar.ui:6624
+msgctxt "notebookbar|referenceb"
+msgid "Reference_s"
+msgstr "C_yfeirnodau"
+
+#: sw/uiconfig/swriter/ui/notebookbar.ui:7203
 msgctxt "notebookbar|ReferencesLabel"
 msgid "References"
 msgstr "Cyfeiriadau"
 
-#: notebookbar.ui:4790
+#: sw/uiconfig/swriter/ui/notebookbar.ui:7875
+msgctxt "notebookbar|reviewR"
+msgid "_Review"
+msgstr "_Adolygu"
+
+#: sw/uiconfig/swriter/ui/notebookbar.ui:7960
 msgctxt "notebookbar|ReviewLabel"
 msgid "Review"
 msgstr "Adolygu"
 
-#: notebookbar.ui:4806
-msgctxt "notebookbar|PageViewSection|tooltip_text"
-msgid "Page View"
-msgstr "Golwg Tudalen"
-
-#: notebookbar.ui:4900
-msgctxt "notebookbar|DocumentAreaElementsSection|tooltip_text"
-msgid "Document Area Elements"
-msgstr "Elfennau Ardal Dogfen"
-
-#: notebookbar.ui:5056
-msgctxt "notebookbar|ZoomSection|tooltip_text"
-msgid "Zoom"
-msgstr "Chwyddo"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:8574
+msgctxt "notebookbar|viewb"
+msgid "_View"
+msgstr "_Golwg"
 
-#: notebookbar.ui:5177
+#: sw/uiconfig/swriter/ui/notebookbar.ui:8659
 msgctxt "notebookbar|ViewLabel"
 msgid "View"
 msgstr "Golwg"
 
-#: notebookbar.ui:5745
-msgctxt "notebookbar|formattable|tooltip_text"
-msgid "Indent"
-msgstr "Mewnoliad"
-
-#: notebookbar.ui:5787
-msgctxt "notebookbar|formattable1|tooltip_text"
-msgid "Indent"
-msgstr "Mewnoliad"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:9742
+msgctxt "notebookbar|tableT"
+msgid "T_able"
+msgstr "_Tabl"
 
-#: notebookbar.ui:5850
+#: sw/uiconfig/swriter/ui/notebookbar.ui:9826
 msgctxt "notebookbar|TableLabel"
 msgid "Table"
 msgstr "Tabl"
 
-#: notebookbar.ui:5869
-msgctxt "notebookbar|BasicsSection|tooltip_text"
-msgid "Basics"
-msgstr "Sylfaenol"
-
-#: notebookbar.ui:5872
-msgctxt "notebookbar|GraphicDialog"
-msgid "Properties"
-msgstr "Priodweddau"
-
-#: notebookbar.ui:5902
-msgctxt "notebookbar|SizeSection|tooltip_text"
-msgid "Basics"
-msgstr "Sylfaenol"
-
-#: notebookbar.ui:5905
-msgctxt "notebookbar|Crop1"
-msgid "Crop"
-msgstr "Tocio"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:10636
+msgctxt "notebookbar|graphicB"
+msgid "_Graphic"
+msgstr "_Graffig"
 
-#: notebookbar.ui:6537
+#: sw/uiconfig/swriter/ui/notebookbar.ui:10722
 msgctxt "notebookbar|ImageLabel"
 msgid "Image"
 msgstr "Delwedd"
 
-#: notebookbar.ui:6554
-msgctxt "notebookbar|LineFormat"
-msgid "Line"
-msgstr "Llinell"
-
-#: notebookbar.ui:6572
-msgctxt "notebookbar|AreaFormat"
-msgid "Area"
-msgstr "Ardal"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:12077
+msgctxt "notebookbar|drab"
+msgid "D_raw"
+msgstr "_Lluniadu"
 
-#: notebookbar.ui:6705
+#: sw/uiconfig/swriter/ui/notebookbar.ui:12189
 msgctxt "notebookbar|ShapeLabel"
-msgid "Shape / Textbox"
-msgstr "Siâp/Blwch Testun"
+msgid "Draw"
+msgstr "Lluniadu"
 
-#: notebookbar.ui:6734
-msgctxt "notebookbar|AnchorMenu"
-msgid "Anchor"
-msgstr "Angor"
+#: sw/uiconfig/swriter/ui/notebookbar.ui:13043
+msgctxt "notebookbar|frame:MenuDraw"
+msgid "Object"
+msgstr "Gwrthrych"
 
-#: notebookbar.ui:7266
+#: sw/uiconfig/swriter/ui/notebookbar.ui:13132
 msgctxt "notebookbar|FrameLabel"
-msgid "Frame / OLE"
-msgstr "Ffrâm / OLE"
+msgid "Object"
+msgstr "Gwrthrych"
+
+#: sw/uiconfig/swriter/ui/notebookbar.ui:13163
+msgctxt "notebookbar|referenceb"
+msgid "_Tools"
+msgstr "_Offer"
+
+#: sw/uiconfig/swriter/ui/notebookbar.ui:14117
+msgctxt "notebookbar|DevLabel"
+msgid "Tools"
+msgstr "Offer"
 
-#: notebookbar_compact.ui:2380
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:2393
 msgctxt "notebookbar_compact|fileb"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: notebookbar_compact.ui:3093
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:3107
 msgctxt "notebookbar_compact|FileLabel"
 msgid "File"
 msgstr "Ffeil"
 
-#: notebookbar_compact.ui:3142
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:3156
 msgctxt "notebookbar_compact|menub"
 msgid "_Menu"
 msgstr "­_Dewislen"
 
-#: notebookbar_compact.ui:4188
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:4215
 msgctxt "notebookbar_compact|HomeLabel"
 msgid "Home"
 msgstr "Cartref"
 
-#: notebookbar_compact.ui:4241
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:4268
 msgctxt "notebookbar_compact|insertb"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_compact.ui:4870
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:4887
 msgctxt "notebookbar_compact|InsertLabel"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: notebookbar_compact.ui:4920
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5458
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8281
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9114
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9785
+msgctxt "notebookbar_compact|wrapb"
+msgid "Wrap"
+msgstr "Amlapio"
+
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5607
 msgctxt "notebookbar_compact|reviewb"
 msgid "Pag_e"
 msgstr "_Tudalen"
 
-#: notebookbar_compact.ui:5407
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5659
 msgctxt "notebookbar_compact|LayoutLabel"
-msgid "Page layout"
-msgstr "Cynllun tudalen"
+msgid "Layout"
+msgstr "Cynllun"
 
-#: notebookbar_compact.ui:5454
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:5706
 msgctxt "notebookbar_compact|referenceb"
 msgid "Reference_s"
 msgstr "C_yfeirnodau"
 
-#: notebookbar_compact.ui:5844
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6094
 msgctxt "notebookbar_compact|ReferencesLabel"
 msgid "References"
 msgstr "Cyfeirnodau"
 
-#: notebookbar_compact.ui:6340
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6590
 msgctxt "notebookbar_compact|reviewR"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_compact.ui:6372
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:6623
 msgctxt "notebookbar_compact|ReviewLabel"
 msgid "Review"
 msgstr "Adolygu"
 
-#: notebookbar_compact.ui:6841
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:7092
 msgctxt "notebookbar_compact|viewb"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_compact.ui:6892
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:7144
 msgctxt "notebookbar_compact|ViewLabel"
 msgid "View"
 msgstr "Golwg"
 
-#: notebookbar_compact.ui:6940
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:7192
 msgctxt "notebookbar_compact|tableT"
 msgid "T_able"
 msgstr "_Tabl"
 
-#: notebookbar_compact.ui:7673
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:7926
 msgctxt "notebookbar_compact|TableLabel"
 msgid "Table"
 msgstr "Tabl"
 
-#: notebookbar_compact.ui:8028
-#: /home/cl/vc/git/libo-core/sw/uiconfig/swriter/ui/notebookbar_compact.ui:8858
-#: /home/cl/vc/git/libo-core/sw/uiconfig/swriter/ui/notebookbar_compact.ui:9526
-msgctxt "notebookbar_compact|wrapb"
-msgid "Wrap"
-msgstr "Amlapio"
-
-#: notebookbar_compact.ui:8141
-#: /home/cl/vc/git/libo-core/sw/uiconfig/swriter/ui/notebookbar_compact.ui:8971
-#: /home/cl/vc/git/libo-core/sw/uiconfig/swriter/ui/notebookbar_compact.ui:9639
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8395
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9228
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9899
 msgctxt "notebookbar_compact|graphicB"
 msgid "A_lign"
 msgstr "A_linio"
 
-#: notebookbar_compact.ui:8422
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8677
 msgctxt "notebookbar_compact|graphicB"
 msgid "_Graphic"
 msgstr "_Graffig"
 
-#: notebookbar_compact.ui:8454
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:8710
 msgctxt "notebookbar_compact|ImageLabel"
 msgid "Image"
 msgstr "Delwedd"
 
-#: notebookbar_compact.ui:9198
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9456
 msgctxt "notebookbar_compact|drab"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_compact.ui:9252
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:9511
 msgctxt "notebookbar_compact|ShapeLabel"
 msgid "Draw"
 msgstr "_Lluniadu"
 
-#: notebookbar_compact.ui:9776
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10037
 msgctxt "notebookbar_compact|frame:MenuDraw"
 msgid "Object"
 msgstr "Gwrthrych"
 
-#: notebookbar_compact.ui:9831
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10093
 msgctxt "notebookbar_compact|FrameLabel"
 msgid "Object"
 msgstr "Gwrthrych"
 
-#: notebookbar_compact.ui:9881
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:10143
 msgctxt "notebookbar_compact|referenceb"
 msgid "_Tools"
 msgstr "_Offer"
 
-#: notebookbar_compact.ui:10744
+#: sw/uiconfig/swriter/ui/notebookbar_compact.ui:11007
 msgctxt "notebookbar_compact|DevLabel"
 msgid "Tools"
 msgstr "_Offer"
 
-#: notebookbar_groupedbar_compact.ui:1151
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:1152
 msgctxt "notebookbar_groupedbar_compact|menubarD1"
 msgid "Menubar"
 msgstr "Bar Dewis"
 
-#: notebookbar_groupedbar_compact.ui:3106
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3107
 msgctxt "notebookbar_groupedbar_compact|menubarD"
 msgid "Menubar"
 msgstr "Bar Dewis"
 
-#: notebookbar_groupedbar_compact.ui:3363
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3357
 msgctxt "notebookbar_groupedbar_compact|Quotation2"
 msgid "Quotation"
 msgstr "Dyfyniad"
 
-#: notebookbar_groupedbar_compact.ui:4005
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:3999
 msgctxt "notebookbar_groupedbar_compact|menub"
 msgid "_Menu"
 msgstr "­_Dewislen"
 
-#: notebookbar_groupedbar_compact.ui:4060
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4055
 msgctxt "notebookbar_groupedbar_compact|toolsb"
 msgid "_Tools"
 msgstr "_Offer"
 
-#: notebookbar_groupedbar_compact.ui:4148
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4144
 msgctxt "notebookbar_groupedbar_compact|fileb"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: notebookbar_groupedbar_compact.ui:4302
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4299
 msgctxt "notebookbar_groupedbar_compact|editb"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: notebookbar_groupedbar_compact.ui:4441
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4438
 msgctxt "notebookbar_groupedbar_compact|paragraphstyleb"
 msgid "St_yles"
 msgstr "_Arddulliau"
 
-#: notebookbar_groupedbar_compact.ui:4619
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4616
 msgctxt "notebookbar_groupedbar_compact|formatb"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: notebookbar_groupedbar_compact.ui:4872
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:4866
 msgctxt "notebookbar_groupedbar_compact|paragraphb"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: notebookbar_groupedbar_compact.ui:5044
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5038
 msgctxt "notebookbar_groupedbar_compact|insertb"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_compact.ui:5192
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5186
 msgctxt "notebookbar_groupedbar_compact|referenceb"
 msgid "Reference_s"
 msgstr "C_yfeirnodau"
 
-#: notebookbar_groupedbar_compact.ui:5299
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5293
 msgctxt "notebookbar_groupedbar_compact|reviewb"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_groupedbar_compact.ui:5413
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5407
 msgctxt "notebookbar_groupedbar_compact|viewb"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_compact.ui:5516
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5511
 msgctxt "notebookbar_groupedbar_compact|paragraphstylet"
 msgid "St_yles"
 msgstr "_Arddulliau"
 
-#: notebookbar_groupedbar_compact.ui:5691
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5690
 msgctxt "notebookbar_groupedbar_compact|formatt"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: notebookbar_groupedbar_compact.ui:5906
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:5906
 msgctxt "notebookbar_groupedbar_compact|paragrapht"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: notebookbar_groupedbar_compact.ui:6031
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6035
 msgctxt "notebookbar_groupedbar_compact|tableT"
 msgid "T_able"
 msgstr "_Tabl"
 
-#: notebookbar_groupedbar_compact.ui:6167
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6175
 msgctxt "notebookbar_groupedbar_compact|merged"
 msgid "_Merge"
 msgstr "_Cyfuno"
 
-#: notebookbar_groupedbar_compact.ui:6289
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6301
 msgctxt "notebookbar_groupedbar_compact|rowscolumnst"
 msgid "R_ows"
 msgstr "_Rhesi"
 
-#: notebookbar_groupedbar_compact.ui:6414
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6430
 msgctxt "notebookbar_groupedbar_compact|selectt"
 msgid "Selec_t"
 msgstr "_Dewis"
 
-#: notebookbar_groupedbar_compact.ui:6525
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6545
 msgctxt "notebookbar_groupedbar_compact|calculatet"
 msgid "_Calc"
 msgstr "_Calc"
 
-#: notebookbar_groupedbar_compact.ui:6660
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6684
 msgctxt "notebookbar_groupedbar_compact|graphicB"
 msgid "_Graphic"
 msgstr "_Graffig"
 
-#: notebookbar_groupedbar_compact.ui:6775
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:6800
 msgctxt "notebookbar_groupedbar_compact|colorb"
 msgid "C_olor"
 msgstr "_Lliw"
 
-#: notebookbar_groupedbar_compact.ui:7092
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7124
 msgctxt "notebookbar_groupedbar_compact|arrange"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_compact.ui:7252
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7288
 msgctxt "notebookbar_groupedbar_compact|GridB"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_compact.ui:7372
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7412
 msgctxt "notebookbar_groupedbar_compact|languageb"
 msgid "_Language"
 msgstr "_Iaith"
 
-#: notebookbar_groupedbar_compact.ui:7498
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7542
 msgctxt "notebookbar_groupedbar_compact|revieb"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_groupedbar_compact.ui:7648
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7680
 msgctxt "notebookbar_groupedbar_compact|commentsb"
 msgid "_Comments"
 msgstr "_Sylwadau"
 
-#: notebookbar_groupedbar_compact.ui:7748
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7781
 msgctxt "notebookbar_groupedbar_compact|compareb"
 msgid "Com_pare"
 msgstr "_Cymharu"
 
-#: notebookbar_groupedbar_compact.ui:7848
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:7885
 msgctxt "notebookbar_groupedbar_compact|viewA"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_compact.ui:8032
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8073
 msgctxt "notebookbar_groupedbar_compact|editdrawb"
 msgid "St_yles"
 msgstr "_Arddulliau"
 
-#: notebookbar_groupedbar_compact.ui:8248
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8290
 msgctxt "notebookbar_groupedbar_compact|drawb"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_groupedbar_compact.ui:8475
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8521
 msgctxt "notebookbar_groupedbar_compact|arrangeD"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_compact.ui:8611
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8661
 msgctxt "notebookbar_groupedbar_compact|Grid"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_compact.ui:8720
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8774
 msgctxt "notebookbar_groupedbar_compact|viewDrawb"
 msgid "Grou_p"
 msgstr "Grŵ_p"
 
-#: notebookbar_groupedbar_compact.ui:8828
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:8886
 msgctxt "notebookbar_groupedbar_compact|3Db"
 msgid "3_D"
 msgstr "3_D"
 
-#: notebookbar_groupedbar_compact.ui:9011
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9073
 msgctxt "notebookbar_groupedbar_compact|oleB"
 msgid "F_rame"
 msgstr "_Ffrâm"
 
-#: notebookbar_groupedbar_compact.ui:9218
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9281
 msgctxt "notebookbar_groupedbar_compact|arrangeO"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_compact.ui:9327
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9394
 msgctxt "notebookbar_groupedbar_compact|GridO"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_compact.ui:9437
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9508
 msgctxt "notebookbar_groupedbar_compact|viewO"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_compact.ui:9542
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9617
 msgctxt "notebookbar_groupedbar_compact|paragraphstyles"
 msgid "St_yles"
 msgstr "_Arddulliau"
 
-#: notebookbar_groupedbar_compact.ui:9717
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:9796
 msgctxt "notebookbar_groupedbar_compact|formats"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: notebookbar_groupedbar_compact.ui:9978
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10058
 msgctxt "notebookbar_groupedbar_compact|paragraphs"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: notebookbar_groupedbar_compact.ui:10137
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui:10221
 msgctxt "notebookbar_groupedbar_compact|viewc"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:3064
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3064
 msgctxt "notebookbar_groupedbar_full|menubarD"
 msgid "Menubar"
 msgstr "Bar Dewis"
 
-#: notebookbar_groupedbar_full.ui:3281
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3274
 msgctxt "notebookbar_groupedbar_full|Quotation2"
 msgid "Quotation"
 msgstr "Dyfyniad"
 
-#: notebookbar_groupedbar_full.ui:3934
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3927
 msgctxt "notebookbar_groupedbar_full|menub"
 msgid "_Menu"
 msgstr "­_Dewislen"
 
-#: notebookbar_groupedbar_full.ui:3986
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:3980
 msgctxt "notebookbar_groupedbar_full|toolsb"
 msgid "_Tools"
 msgstr "_Offer"
 
-#: notebookbar_groupedbar_full.ui:4040
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4035
 msgctxt "notebookbar_groupedbar_full|helpb"
 msgid "_Help"
 msgstr "_Cymorth"
 
-#: notebookbar_groupedbar_full.ui:4147
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4143
 msgctxt "notebookbar_groupedbar_full|fileb"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: notebookbar_groupedbar_full.ui:4384
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4381
 msgctxt "notebookbar_groupedbar_full|editb"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: notebookbar_groupedbar_full.ui:4580
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4578
 msgctxt "notebookbar_groupedbar_full|paragraphstyleb"
 msgid "St_yles"
 msgstr "_Arddulliau"
 
-#: notebookbar_groupedbar_full.ui:4867
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:4866
 msgctxt "notebookbar_groupedbar_full|formatb"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: notebookbar_groupedbar_full.ui:5218
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5218
 msgctxt "notebookbar_groupedbar_full|paragraphb"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: notebookbar_groupedbar_full.ui:5457
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5458
 msgctxt "notebookbar_groupedbar_full|insertb"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_full.ui:5685
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5687
 msgctxt "notebookbar_groupedbar_full|referenceb"
 msgid "Referen_ce"
 msgstr "_Cyfeirnod"
 
-#: notebookbar_groupedbar_full.ui:5886
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:5889
 msgctxt "notebookbar_groupedbar_full|reviewb"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_groupedbar_full.ui:6035
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6039
 msgctxt "notebookbar_groupedbar_full|viewb"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:6296
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6301
 msgctxt "notebookbar_groupedbar_full|graphicB"
 msgid "_Graphic"
 msgstr "_Graffig"
 
-#: notebookbar_groupedbar_full.ui:6726
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6732
 msgctxt "notebookbar_groupedbar_full|arrange"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_full.ui:6902
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:6909
 msgctxt "notebookbar_groupedbar_full|colorb"
 msgid "C_olor"
 msgstr "_Lliw"
 
-#: notebookbar_groupedbar_full.ui:7156
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7164
 msgctxt "notebookbar_groupedbar_full|GridB"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_full.ui:7333
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7342
 msgctxt "notebookbar_groupedbar_full|paragraphstylet"
 msgid "St_yles"
 msgstr "_Arddulliau"
 
-#: notebookbar_groupedbar_full.ui:7620
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7630
 msgctxt "notebookbar_groupedbar_full|formatt"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: notebookbar_groupedbar_full.ui:7971
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:7982
 msgctxt "notebookbar_groupedbar_full|paragrapht"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: notebookbar_groupedbar_full.ui:8198
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8210
 msgctxt "notebookbar_groupedbar_full|tabled"
 msgid "T_able"
 msgstr "_Tabl"
 
-#: notebookbar_groupedbar_full.ui:8396
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8409
 msgctxt "notebookbar_groupedbar_full|rowscolumnst"
 msgid "R_ows"
 msgstr "_Rhesi"
 
-#: notebookbar_groupedbar_full.ui:8597
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8611
 msgctxt "notebookbar_groupedbar_full|merged"
 msgid "_Merge"
 msgstr "_Cyfuno"
 
-#: notebookbar_groupedbar_full.ui:8825
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:8840
 msgctxt "notebookbar_groupedbar_full|selectt"
 msgid "Sele_ct"
 msgstr "_D­ewis"
 
-#: notebookbar_groupedbar_full.ui:9054
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9070
 msgctxt "notebookbar_groupedbar_full|calculatet"
 msgid "_Calc"
 msgstr "_Calc"
 
-#: notebookbar_groupedbar_full.ui:9282
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9299
 msgctxt "notebookbar_groupedbar_full|referencet"
 msgid "Referen_ce"
 msgstr "C_yfeirnod"
 
-#: notebookbar_groupedbar_full.ui:9418
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9436
 msgctxt "notebookbar_groupedbar_full|languageb"
 msgid "_Language"
 msgstr "_Iaith"
 
-#: notebookbar_groupedbar_full.ui:9646
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9665
 msgctxt "notebookbar_groupedbar_full|revieb"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_groupedbar_full.ui:9858
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:9878
 msgctxt "notebookbar_groupedbar_full|commentsb"
 msgid "_Comments"
 msgstr "_Sylwadau"
 
-#: notebookbar_groupedbar_full.ui:10060
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10081
 msgctxt "notebookbar_groupedbar_full|compareb"
 msgid "Com_pare"
 msgstr "_Cymharu"
 
-#: notebookbar_groupedbar_full.ui:10209
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10231
 msgctxt "notebookbar_groupedbar_full|viewa"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:10654
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:10677
 msgctxt "notebookbar_groupedbar_full|drawb"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_groupedbar_full.ui:11024
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11048
 msgctxt "notebookbar_groupedbar_full|editdrawb"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: notebookbar_groupedbar_full.ui:11254
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11279
 msgctxt "notebookbar_groupedbar_full|wrapb"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: notebookbar_groupedbar_full.ui:11268
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11294
 msgctxt "notebookbar_groupedbar_full|alignb"
 msgid "Align"
 msgstr "Alinio"
 
-#: notebookbar_groupedbar_full.ui:11300
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11327
 msgctxt "notebookbar_groupedbar_full|arrangedrawb"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_full.ui:11467
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11495
 msgctxt "notebookbar_groupedbar_full|GridDrawB"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_full.ui:11668
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11697
 msgctxt "notebookbar_groupedbar_full|viewDrawb"
 msgid "Grou_p"
 msgstr "Grŵ_p"
 
-#: notebookbar_groupedbar_full.ui:11847
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:11877
 msgctxt "notebookbar_groupedbar_full|3Db"
 msgid "3_D"
 msgstr "3_D"
 
-#: notebookbar_groupedbar_full.ui:12158
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12189
 msgctxt "notebookbar_groupedbar_full|formatd"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: notebookbar_groupedbar_full.ui:12424
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12456
 msgctxt "notebookbar_groupedbar_full|paragraphTextb"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: notebookbar_groupedbar_full.ui:12600
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12633
 msgctxt "notebookbar_groupedbar_full|viewd"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:12753
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:12787
 msgctxt "notebookbar_groupedbar_full|insertTextb"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_full.ui:13186
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13221
 msgctxt "notebookbar_groupedbar_full|media"
 msgid "_Media"
 msgstr "_Cyfrwng"
 
-#: notebookbar_groupedbar_full.ui:13423
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13459
 msgctxt "notebookbar_groupedbar_full|oleB"
 msgid "F_rame"
 msgstr "_Ffrâm"
 
-#: notebookbar_groupedbar_full.ui:13853
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:13890
 msgctxt "notebookbar_groupedbar_full|arrageOLE"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_full.ui:14019
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:14057
 msgctxt "notebookbar_groupedbar_full|OleGridB"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_full.ui:14168
+#: sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui:14207
 msgctxt "notebookbar_groupedbar_full|viewf"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groups.ui:34
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:34
 msgctxt "notebookbar_groups|imagestyledefault"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: notebookbar_groups.ui:42
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:42
 msgctxt "notebookbar_groups|imagestylegray"
 msgid "Grayscale"
 msgstr "Graddlwyd"
 
-#: notebookbar_groups.ui:50
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:50
 msgctxt "notebookbar_groups|imagestylebw"
 msgid "Black and White"
 msgstr "Du a Gwyn"
 
-#: notebookbar_groups.ui:58
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:58
 msgctxt "notebookbar_groups|imagestylewater"
 msgid "Watermark"
 msgstr "Dyfrnod"
 
-#: notebookbar_groups.ui:72
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:72
 msgctxt "notebookbar_groups|imagestylecorrectionbc20m"
 msgid "-20% Brightness & Contrast"
 msgstr "-20% Disgleirdeb a Chyferbyniad"
 
-#: notebookbar_groups.ui:80
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:80
 msgctxt "notebookbar_groups|imagestylecorrectionb20m"
 msgid "-20% Brightness"
 msgstr "-20% Disgleirdeb"
 
-#: notebookbar_groups.ui:88
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:88
 msgctxt "notebookbar_groups|imagestylecorrectionc20m"
 msgid "-20% Contrast"
 msgstr "-20% Cyferbyniad"
 
-#: notebookbar_groups.ui:96
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:96
 msgctxt "notebookbar_groups|imagestylecorrectiondefault"
 msgid "0% Brightness & Contrast"
 msgstr "0% Disgleirdeb a Chyferbyniad"
 
-#: notebookbar_groups.ui:104
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:104
 msgctxt "notebookbar_groups|imagestylecorrectionb20p"
 msgid "+20% Brightness"
 msgstr "+20% Disgleirdeb"
 
-#: notebookbar_groups.ui:112
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:112
 msgctxt "notebookbar_groups|imagestylecorrectionc20p"
 msgid "+20% Contrast"
 msgstr "+20% Cyferbyniad"
 
-#: notebookbar_groups.ui:120
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:120
 msgctxt "notebookbar_groups|imagestylecorrectionbc20p"
 msgid "+20% Brightness & Contrast"
 msgstr "+20% Disgleirdeb a Chyferbyniad"
 
-#: notebookbar_groups.ui:134
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:134
 msgctxt "notebookbar_groups|imagestylecolorred"
 msgid "Colorize Red"
 msgstr "Lliwio'n Goch"
 
-#: notebookbar_groups.ui:142
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:142
 msgctxt "notebookbar_groups|imagestylecolorblue"
 msgid "Colorize Blue"
 msgstr "Lliwio'n Las"
 
-#: notebookbar_groups.ui:150
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:150
 msgctxt "notebookbar_groups|imagestylecolorgreen"
 msgid "Colorize Green"
 msgstr "Lliwio'n Wyrdd"
 
-#: notebookbar_groups.ui:158
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:158
 msgctxt "notebookbar_groups|imagestylecolororange"
 msgid "Colorize Orange"
 msgstr "Lliwio'n Oren"
 
-#: notebookbar_groups.ui:186
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:186
 msgctxt "notebookbar_groups|hyperlink"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: notebookbar_groups.ui:200
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:200
 msgctxt "notebookbar_groups|footnote"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: notebookbar_groups.ui:209
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:209
 msgctxt "notebookbar_groups|endnote"
 msgid "Endnote"
 msgstr "Diweddnod"
 
-#: notebookbar_groups.ui:224
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:224
 msgctxt "notebookbar_groups|bookmark"
 msgid "Bookmark"
 msgstr "Nod Tudalen"
 
-#: notebookbar_groups.ui:233
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:233
 msgctxt "notebookbar_groups|crossreference"
 msgid "Cross-Reference"
 msgstr "Croes Gyfeirio"
 
-#: notebookbar_groups.ui:317
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:317
 msgctxt "notebookbar_groups|paradefault"
 msgid "Default Paragraph"
 msgstr "Paragraff Ragosodedig"
 
-#: notebookbar_groups.ui:326
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:326
 msgctxt "notebookbar_groups|title"
 msgid "Title"
 msgstr "Teitl"
 
-#: notebookbar_groups.ui:335
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:335
 msgctxt "notebookbar_groups|heading1"
 msgid "Heading 1"
 msgstr "Pennawd 1"
 
-#: notebookbar_groups.ui:344
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:344
 msgctxt "notebookbar_groups|heading2"
 msgid "Heading 2"
 msgstr "Pennawd 2"
 
-#: notebookbar_groups.ui:353
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:353
 msgctxt "notebookbar_groups|heading3"
 msgid "Heading 3"
 msgstr "Pennawd 3"
 
-#: notebookbar_groups.ui:368
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:368
 msgctxt "notebookbar_groups|chardefault"
 msgid "Default Character"
 msgstr "Nod Ragosodedig"
 
-#: notebookbar_groups.ui:377
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:377
 msgctxt "notebookbar_groups|italic"
 msgid "Emphasis"
 msgstr "Pwyslais"
 
-#: notebookbar_groups.ui:386
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:386
 msgctxt "notebookbar_groups|bold"
 msgid "Strong Emphasis"
 msgstr "Pwyslais Cryf"
 
-#: notebookbar_groups.ui:404
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:404
 msgctxt "notebookbar_groups|tablestylenone"
 msgid "None"
 msgstr "Dim"
 
-#: notebookbar_groups.ui:412
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:412
 msgctxt "notebookbar_groups|tablestyledefault"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: notebookbar_groups.ui:420
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:420
 msgctxt "notebookbar_groups|tablestyle1"
 msgid "Style 1"
 msgstr "Arddull 1"
 
-#: notebookbar_groups.ui:428
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:428
 msgctxt "notebookbar_groups|tablestyle2"
 msgid "Style 2"
 msgstr "Arddull 2"
 
-#: notebookbar_groups.ui:436
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:436
 msgctxt "notebookbar_groups|tablestyle3"
 msgid "Style 3"
 msgstr "Arddull 3"
 
-#: notebookbar_groups.ui:444
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:444
 msgctxt "notebookbar_groups|tablestyle4"
 msgid "Style 4"
 msgstr "Arddull 4"
 
-#: notebookbar_groups.ui:471
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:471
 msgctxt "notebookbar_groups|rowmenuaddup"
 msgid "Insert Rows Above"
 msgstr "Mewnosod Rhes Uwchlaw"
 
-#: notebookbar_groups.ui:480
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:480
 msgctxt "notebookbar_groups|rowmenuadddown"
 msgid "Insert Rows Below"
 msgstr "Mewnosod Rhes Islaw"
 
-#: notebookbar_groups.ui:495
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:495
 msgctxt "notebookbar_groups|rowmenudel"
 msgid "Delete Rows"
 msgstr "Dileu Rhesi"
 
-#: notebookbar_groups.ui:504
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:504
 msgctxt "notebookbar_groups|rowmenuselect"
 msgid "Select Rows"
 msgstr "Dewis Rhesi"
 
-#: notebookbar_groups.ui:519
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:519
 msgctxt "notebookbar_groups|rowmenuheight"
 msgid "Row Height..."
 msgstr "Uchder Rhes..."
 
-#: notebookbar_groups.ui:528
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:528
 msgctxt "notebookbar_groups|rowmenuoptimalrow"
 msgid "Optimal Row Height"
 msgstr "Uchder Rhes Gorau"
 
-#: notebookbar_groups.ui:537
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:537
 msgctxt "notebookbar_groups|rowmenudistribute"
 msgid "Distribute Rows Evenly"
 msgstr "Dosbarthu Colofnau'n Gymesur"
 
-#: notebookbar_groups.ui:736
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:741
 msgctxt "notebookbar_groups|filegrouplabel"
 msgid "File"
 msgstr "Ffeil"
 
-#: notebookbar_groups.ui:889
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:897
 msgctxt "notebookbar_groups|clipboardgrouplabel"
 msgid "Clipboard"
 msgstr "Clipfwrdd"
 
-#: notebookbar_groups.ui:935
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:943
 msgctxt "notebookbar_groups|paragraphstyleb"
 msgid "Style"
 msgstr "Arddull"
 
-#: notebookbar_groups.ui:1448
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:1465
 msgctxt "notebookbar_groups|formatgrouplabel"
 msgid "Text"
 msgstr "Testun"
 
-#: notebookbar_groups.ui:1573
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:1592
 msgctxt "notebookbar_groups|linksb"
 msgid "Links"
 msgstr "Cysylltiadau"
 
-#: notebookbar_groups.ui:1616
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:1637
 msgctxt "notebookbar_groups|shapesb"
 msgid "Shapes"
 msgstr "Siapiau"
 
-#: notebookbar_groups.ui:1722
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:1746
 msgctxt "notebookbar_groups|insertgrouplabel"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: notebookbar_groups.ui:1758
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:1782
 msgctxt "notebookbar_groups|tablestyleb"
 msgid "Style"
 msgstr "Arddull"
 
-#: notebookbar_groups.ui:1780
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:1805
 msgctxt "notebookbar_groups|tablerowsb"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: notebookbar_groups.ui:1798
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:1824
 msgctxt "notebookbar_groups|tablecolumnsb"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: notebookbar_groups.ui:2002
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2032
 msgctxt "notebookbar_groups|tablegrouplabel"
 msgid "Table"
 msgstr "Tabl"
 
-#: notebookbar_groups.ui:2038
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2068
 msgctxt "notebookbar_groups|imagestyleb"
 msgid "Style"
 msgstr "Arddull"
 
-#: notebookbar_groups.ui:2079
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2111
 msgctxt "notebookbar_groups|resetb"
 msgid "Reset"
 msgstr "Ailosod"
 
-#: notebookbar_groups.ui:2126
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2160
 msgctxt "notebookbar_groups|wrapb"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: notebookbar_groups.ui:2143
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2178
 msgctxt "notebookbar_groups|lockb"
 msgid "Lock"
 msgstr "Cloi"
 
-#: notebookbar_groups.ui:2189
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2225
 msgctxt "notebookbar_groups|imagegrouplabel"
 msgid "Image"
 msgstr "Delwedd"
 
-#: notebookbar_groups.ui:2247
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2283
 msgctxt "notebookbar_groups|wrapoff"
 msgid "None"
 msgstr "Dim"
 
-#: notebookbar_groups.ui:2256
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2292
 msgctxt "notebookbar_groups|wrapideal"
 msgid "Optimal"
 msgstr "Gorau"
 
-#: notebookbar_groups.ui:2265
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2301
 msgctxt "notebookbar_groups|wrapon"
 msgid "Parallel"
 msgstr "Paralel"
 
-#: notebookbar_groups.ui:2274
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2310
 msgctxt "notebookbar_groups|wrapleft"
 msgid "Before"
 msgstr "Cyn"
 
-#: notebookbar_groups.ui:2283
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2319
 msgctxt "notebookbar_groups|wrapright"
 msgid "After"
 msgstr "Wedi"
 
-#: notebookbar_groups.ui:2292
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2328
 msgctxt "notebookbar_groups|wrapthrough"
 msgid "Through"
 msgstr "Drwodd"
 
-#: notebookbar_groups.ui:2307
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2343
 msgctxt "notebookbar_groups|wrapcontour"
 msgid "Contour"
 msgstr "Amlinell"
 
-#: notebookbar_groups.ui:2316
+#: sw/uiconfig/swriter/ui/notebookbar_groups.ui:2352
 msgctxt "notebookbar_groups|contourdialog"
 msgid "Edit Contour"
 msgstr "Golygu Amlinell"
 
-#: notebookbar_single.ui:475
+#: sw/uiconfig/swriter/ui/notebookbar_single.ui:475
 msgctxt "notebookbar_single|halignment|tooltip_text"
 msgid "Horizontal Alignment"
 msgstr "Alinio Llorweddol"
 
-#: notebookbar_single.ui:598
+#: sw/uiconfig/swriter/ui/notebookbar_single.ui:598
 msgctxt "notebookbar_single|outlineindent|tooltip_text"
 msgid "Indent"
 msgstr "Mewnoli"
 
-#: notebookbar_single.ui:680
+#: sw/uiconfig/swriter/ui/notebookbar_single.ui:680
 msgctxt "notebookbar_single|insert|tooltip_text"
 msgid "Indent"
 msgstr "Mewnoli"
 
-#: numberingnamedialog.ui:11
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:11
 msgctxt "numberingnamedialog|liststore1"
 msgid "Untitled 1"
 msgstr "Dideitl 1"
 
-#: numberingnamedialog.ui:14
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:14
 msgctxt "numberingnamedialog|liststore1"
 msgid "Untitled 2"
 msgstr "Dideitl 2"
 
-#: numberingnamedialog.ui:17
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:17
 msgctxt "numberingnamedialog|liststore1"
 msgid "Untitled 3"
 msgstr "Dideitl 3"
 
-#: numberingnamedialog.ui:20
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:20
 msgctxt "numberingnamedialog|liststore1"
 msgid "Untitled 4"
 msgstr "Dideitl 4"
 
-#: numberingnamedialog.ui:23
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:23
 msgctxt "numberingnamedialog|liststore1"
 msgid "Untitled 5"
 msgstr "Dideitl 5"
 
-#: numberingnamedialog.ui:26
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:26
 msgctxt "numberingnamedialog|liststore1"
 msgid "Untitled 6"
 msgstr "Dideitl 6"
 
-#: numberingnamedialog.ui:29
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:29
 msgctxt "numberingnamedialog|liststore1"
 msgid "Untitled 7"
 msgstr "Dideitl 7"
 
-#: numberingnamedialog.ui:32
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:32
 msgctxt "numberingnamedialog|liststore1"
 msgid "Untitled 8"
 msgstr "Dideitl 8"
 
-#: numberingnamedialog.ui:35
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:35
 msgctxt "numberingnamedialog|liststore1"
 msgid "Untitled 9"
 msgstr "Dideitl 9"
 
-#: numberingnamedialog.ui:42
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:42
 msgctxt "numberingnamedialog|NumberingNameDialog"
 msgid "Save As"
 msgstr "Cadw Fel"
 
-#: numberingnamedialog.ui:168
+#: sw/uiconfig/swriter/ui/numberingnamedialog.ui:167
 msgctxt "numberingnamedialog|label1"
 msgid "Format"
 msgstr "Fformat"
 
-#: numparapage.ui:50
+#: sw/uiconfig/swriter/ui/numparapage.ui:50
 msgctxt "numparapage|labelFT_OUTLINE_LEVEL"
 msgid "Outline level:"
 msgstr "Lefel amlinell:"
 
-#: numparapage.ui:68
+#: sw/uiconfig/swriter/ui/numparapage.ui:68
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Body text"
 msgstr "Testun corff"
 
-#: numparapage.ui:69
+#: sw/uiconfig/swriter/ui/numparapage.ui:69
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Level 1"
 msgstr "Lefel 1"
 
-#: numparapage.ui:70
+#: sw/uiconfig/swriter/ui/numparapage.ui:70
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Level 2"
 msgstr "Lefel 2"
 
-#: numparapage.ui:71
+#: sw/uiconfig/swriter/ui/numparapage.ui:71
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Level 3"
 msgstr "Lefel 3"
 
-#: numparapage.ui:72
+#: sw/uiconfig/swriter/ui/numparapage.ui:72
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Level 4"
 msgstr "Lefel 4"
 
-#: numparapage.ui:73
+#: sw/uiconfig/swriter/ui/numparapage.ui:73
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Level 5"
 msgstr "Lefel 5"
 
-#: numparapage.ui:74
+#: sw/uiconfig/swriter/ui/numparapage.ui:74
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Level 6"
 msgstr "Lefel 6"
 
-#: numparapage.ui:75
+#: sw/uiconfig/swriter/ui/numparapage.ui:75
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Level 7"
 msgstr "Lefel 7"
 
-#: numparapage.ui:76
+#: sw/uiconfig/swriter/ui/numparapage.ui:76
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Level 8"
 msgstr "Lefel 8"
 
-#: numparapage.ui:77
+#: sw/uiconfig/swriter/ui/numparapage.ui:77
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Level 9"
 msgstr "Lefel 9"
 
-#: numparapage.ui:78
+#: sw/uiconfig/swriter/ui/numparapage.ui:78
 msgctxt "numparapage|comboLB_OUTLINE_LEVEL"
 msgid "Level 10"
 msgstr "Lefel 10"
 
-#: numparapage.ui:95
+#: sw/uiconfig/swriter/ui/numparapage.ui:95
 msgctxt "numparapage|labelOutline"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: numparapage.ui:142
+#: sw/uiconfig/swriter/ui/numparapage.ui:142
 msgctxt "numparapage|labelFT_NUMBER_STYLE"
 msgid "_Numbering style:"
 msgstr "Arddull _rhifo:"
 
-#: numparapage.ui:160
+#: sw/uiconfig/swriter/ui/numparapage.ui:160
 msgctxt "numparapage|comboLB_NUMBER_STYLE"
 msgid "None"
 msgstr "Dim"
 
-#: numparapage.ui:171
+#: sw/uiconfig/swriter/ui/numparapage.ui:171
 msgctxt "numparapage|editnumstyle"
 msgid "Edit Style"
 msgstr "Golygu Arddull"
 
-#: numparapage.ui:190
+#: sw/uiconfig/swriter/ui/numparapage.ui:190
 msgctxt "numparapage|checkCB_NEW_START"
 msgid "R_estart at this paragraph"
 msgstr "A_ilgychwyn yn y paragraff hwn"
 
-#: numparapage.ui:221
+#: sw/uiconfig/swriter/ui/numparapage.ui:221
 msgctxt "numparapage|checkCB_NUMBER_NEW_START"
 msgid "S_tart with:"
 msgstr "C_ychwyn gyda:"
 
-#: numparapage.ui:278
+#: sw/uiconfig/swriter/ui/numparapage.ui:276
 msgctxt "numparapage|label2"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: numparapage.ui:314
+#: sw/uiconfig/swriter/ui/numparapage.ui:312
 msgctxt "numparapage|checkCB_COUNT_PARA"
 msgid "_Include this paragraph in line numbering"
 msgstr "_Cynnwys y paragraff yn rhifo llinellau"
 
-#: numparapage.ui:332
+#: sw/uiconfig/swriter/ui/numparapage.ui:330
 msgctxt "numparapage|checkCB_RESTART_PARACOUNT"
 msgid "Rest_art at this paragraph"
 msgstr "_Ailgychwyn gyda'r paragraff"
 
-#: numparapage.ui:368
+#: sw/uiconfig/swriter/ui/numparapage.ui:366
 msgctxt "numparapage|labelFT_RESTART_NO"
 msgid "_Start with:"
 msgstr "Cychwyn _gyda:"
 
-#: numparapage.ui:416
+#: sw/uiconfig/swriter/ui/numparapage.ui:412
 msgctxt "numparapage|labelLINE_NUMBERING"
 msgid "Line Numbering"
 msgstr "Rhifo Llinell"
 
-#: objectdialog.ui:8
+#: sw/uiconfig/swriter/ui/objectdialog.ui:8
 msgctxt "objectdialog|ObjectDialog"
 msgid "Object"
 msgstr "Gwrthrych"
 
-#: objectdialog.ui:106
+#: sw/uiconfig/swriter/ui/objectdialog.ui:106
 msgctxt "objectdialog|type"
 msgid "Type"
 msgstr "Math"
 
-#: objectdialog.ui:128
+#: sw/uiconfig/swriter/ui/objectdialog.ui:128
 msgctxt "objectdialog|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: objectdialog.ui:151
+#: sw/uiconfig/swriter/ui/objectdialog.ui:151
 msgctxt "objectdialog|wrap"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: objectdialog.ui:174
+#: sw/uiconfig/swriter/ui/objectdialog.ui:174
 msgctxt "objectdialog|hyperlink"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: objectdialog.ui:197
+#: sw/uiconfig/swriter/ui/objectdialog.ui:197
 msgctxt "objectdialog|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: objectdialog.ui:220
+#: sw/uiconfig/swriter/ui/objectdialog.ui:220
 msgctxt "objectdialog|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: objectdialog.ui:243
+#: sw/uiconfig/swriter/ui/objectdialog.ui:243
 msgctxt "objectdialog|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: objectdialog.ui:266
+#: sw/uiconfig/swriter/ui/objectdialog.ui:266
 msgctxt "objectdialog|macro"
 msgid "Macro"
 msgstr "Macro"
 
-#: optcaptionpage.ui:50
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:50
 msgctxt "optcaptionpage|label7"
 msgid "Category:"
 msgstr "Categori:"
 
-#: optcaptionpage.ui:64
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:64
 msgctxt "optcaptionpage|numberingft"
 msgid "_Numbering:"
 msgstr "_Rhifo:"
 
-#: optcaptionpage.ui:78
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:78
 msgctxt "optcaptionpage|numseparatorft"
 msgid "Numbering separator:"
 msgstr "Ymwahanydd rhif:"
 
-#: optcaptionpage.ui:92
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:92
 msgctxt "optcaptionpage|separatorft"
 msgid "Separator:"
 msgstr "Ymwahanydd:"
 
-#: optcaptionpage.ui:106
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:106
 msgctxt "optcaptionpage|label18"
 msgid "Position:"
 msgstr "Safle:"
 
-#: optcaptionpage.ui:147
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:145
 msgctxt "optcaptionpage|numseparator"
 msgid ". "
 msgstr ". "
 
-#: optcaptionpage.ui:192
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:190
 msgctxt "optcaptionpage|label2"
 msgid "Caption"
 msgstr "Egluryn"
 
-#: optcaptionpage.ui:230
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:228
 msgctxt "optcaptionpage|label4"
 msgid "Level:"
 msgstr "Lefel:"
 
-#: optcaptionpage.ui:244
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:242
 msgctxt "optcaptionpage|label6"
 msgid "Separator:"
 msgstr "Ymwahanydd:"
 
-#: optcaptionpage.ui:273
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:270
 msgctxt "optcaptionpage|level"
 msgid "None"
 msgstr "Dim"
 
-#: optcaptionpage.ui:289
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:286
 msgctxt "optcaptionpage|label11"
 msgid "Numbering Captions by Chapter"
 msgstr "Rhifo Eglurynnau yn ôl Pennawd"
 
-#: optcaptionpage.ui:327
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:324
 msgctxt "optcaptionpage|label3"
 msgid "Character style:"
 msgstr "Arddull nod:"
 
-#: optcaptionpage.ui:342
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:339
 msgctxt "optcaptionpage|charstyle"
 msgid "None"
 msgstr "Dim"
 
-#: optcaptionpage.ui:352
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:349
 msgctxt "optcaptionpage|applyborder"
 msgid "Apply border and shadow"
 msgstr "Gosod border a chysgod"
 
-#: optcaptionpage.ui:374
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:371
 msgctxt "optcaptionpage|label10"
 msgid "Category and Frame Format"
 msgstr "Fformat Categori a Ffrâm"
 
-#: optcaptionpage.ui:426
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:423
 msgctxt "optcaptionpage|label1"
 msgid ""
 "Add captions automatically\n"
@@ -13403,832 +13128,822 @@ msgstr ""
 "Ychwanegu egluryn yn awtomatig\n"
 "wrth fewnosod:"
 
-#: optcaptionpage.ui:469
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:466
 msgctxt "optcaptionpage|captionorder"
 msgid "Category first"
 msgstr "Categori'n gyntaf"
 
-#: optcaptionpage.ui:470
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:467
 msgctxt "optcaptionpage|captionorder"
 msgid "Numbering first"
 msgstr "Rhifau'n gyntaf"
 
-#: optcaptionpage.ui:480
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:477
 msgctxt "optcaptionpage|label13"
 msgid "Caption Order"
 msgstr "Trefn Eglurynnau"
 
-#: optcomparison.ui:36
+#: sw/uiconfig/swriter/ui/optcomparison.ui:36
 msgctxt "optcomparison|auto"
 msgid "A_uto"
 msgstr "_Awto"
 
-#: optcomparison.ui:55
+#: sw/uiconfig/swriter/ui/optcomparison.ui:55
 msgctxt "optcomparison|byword"
 msgid "By w_ord"
 msgstr "Yn ôl _gair"
 
-#: optcomparison.ui:73
+#: sw/uiconfig/swriter/ui/optcomparison.ui:73
 msgctxt "optcomparison|bycharacter"
 msgid "By _character"
 msgstr "Yn ôl _nod"
 
-#: optcomparison.ui:96
+#: sw/uiconfig/swriter/ui/optcomparison.ui:96
 msgctxt "optcomparison|label1"
 msgid "Compare Documents"
 msgstr "Cymharu Dogfennau"
 
-#: optcomparison.ui:129
+#: sw/uiconfig/swriter/ui/optcomparison.ui:129
 msgctxt "optcomparison|ignore"
 msgid "Ignore _pieces of length"
 msgstr "Anwybyddu _darnau o hyd"
 
-#: optcomparison.ui:146
+#: sw/uiconfig/swriter/ui/optcomparison.ui:146
 msgctxt "optcomparison|useRSID"
 msgid "Take it into account when comparing"
 msgstr "Ei gymryd i ystyriaeth wrth gymharu"
 
-#: optcomparison.ui:179
+#: sw/uiconfig/swriter/ui/optcomparison.ui:177
 msgctxt "optcomparison|storeRSID"
 msgid "Store it when changing the document"
 msgstr "Ei gadw pan yn newid y ddogfen"
 
-#: optcomparison.ui:207
+#: sw/uiconfig/swriter/ui/optcomparison.ui:205
 msgctxt "optcomparison|setting"
 msgid "Random number to improve accuracy of document comparison"
 msgstr "Rhif hap i wella cywirdeb cymharu dogfennau"
 
-#: optcompatpage.ui:56
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:56
 msgctxt "optcompatpage|format"
 msgid "Use printer metrics for document formatting"
 msgstr "Defnyddio metrics yr argraffydd i fformatio'r ddogfen"
 
-#: optcompatpage.ui:57
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:57
 msgctxt "optcompatpage|format"
 msgid "Add spacing between paragraphs and tables"
 msgstr "Ychwanegu bylchu rhwng paragraffau a thablau"
 
-#: optcompatpage.ui:58
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:58
 msgctxt "optcompatpage|format"
 msgid "Add paragraph and table spacing at tops of pages"
 msgstr "Ychwanegu bylchu paragraff a thabl ar frig tudalennau"
 
-#: optcompatpage.ui:59
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:59
 msgctxt "optcompatpage|format"
 msgid "Use OpenOffice.org 1.1 tabstop formatting"
 msgstr "Defnyddio fformatio tabstop OpenOffice.org 1.1"
 
-#: optcompatpage.ui:60
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:60
 msgctxt "optcompatpage|format"
 msgid "Do not add leading (extra space) between lines of text"
 msgstr "Peidio ychwanegu (bwlch ychwanegol) rhwng llinellau o destun"
 
-#: optcompatpage.ui:61
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:61
 msgctxt "optcompatpage|format"
 msgid "Use OpenOffice.org 1.1 line spacing"
 msgstr "Defnyddio bylchu llinell OpenOffice.org 1.1"
 
-#: optcompatpage.ui:62
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:62
 msgctxt "optcompatpage|format"
 msgid "Add paragraph and table spacing at bottom of table cells"
 msgstr "Ychwanegu bylchu paragraff a thabl ar waelod celloedd tabl"
 
-#: optcompatpage.ui:63
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:63
 msgctxt "optcompatpage|format"
 msgid "Use OpenOffice.org 1.1 object positioning"
 msgstr "Defnyddio lleoli gwrthrych OpenOffice.org 1.1"
 
-#: optcompatpage.ui:64
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:64
 msgctxt "optcompatpage|format"
 msgid "Use OpenOffice.org 1.1 text wrapping around objects"
 msgstr "Defnyddio amlapio testun OpenOffice.org 1.1 o amgylch gwrthrych"
 
-#: optcompatpage.ui:65
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:65
 msgctxt "optcompatpage|format"
 msgid "Consider wrapping style when positioning objects"
 msgstr "Ystyried arddull amlapio wrth leoli gwrthrychau"
 
-#: optcompatpage.ui:66
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:66
 msgctxt "optcompatpage|format"
 msgid "Expand word space on lines with manual line breaks in justified paragraphs"
 msgstr "Estyn gofod geiriau ar linellau gyda thoriad llinell llaw mewn paragraffau unioni"
 
-#: optcompatpage.ui:67
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:67
 msgctxt "optcompatpage|format"
 msgid "Protect form"
 msgstr "Diogelwyd rhag"
 
-#: optcompatpage.ui:68
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:68
 msgctxt "optcompatpage|format"
 msgid "MS Word-compatible trailing blanks"
 msgstr "Bylchau cydweddus MS Word"
 
-#: optcompatpage.ui:69
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:69
 msgctxt "optcompatpage|format"
 msgid "Tolerate white lines of PDF page backgrounds for compatibility with old documents"
 msgstr "Goddef llinellau cefndir tudalen gwyn PDF ar gyfer cydnawsedd gyda hen ddogfennau"
 
-#: optcompatpage.ui:70
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:70
 msgctxt "optcompatpage|format"
 msgid "<User settings>"
 msgstr "<Gosodiadau defnyddiwr>"
 
-#: optcompatpage.ui:82
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:82
 msgctxt "optcompatpage|default"
 msgid "Use as _Default"
 msgstr "Defnyddio fel _Rhagosodedig"
 
-#: optcompatpage.ui:104
+#: sw/uiconfig/swriter/ui/optcompatpage.ui:104
 msgctxt "optcompatpage|label11"
-msgid "Compatibility options for '%DOCNAME'"
+msgid "Compatibility options for “%DOCNAME”"
 msgstr "Dewisiadau cydnawsedd '%DOCNAME'"
 
-#: optfonttabpage.ui:103
+#: sw/uiconfig/swriter/ui/optfonttabpage.ui:103
 msgctxt "optfonttabpage|font_label"
 msgid "Font"
 msgstr "Ffont"
 
-#: optfonttabpage.ui:117
+#: sw/uiconfig/swriter/ui/optfonttabpage.ui:117
 msgctxt "optfonttabpage|size_label"
 msgid "_Size"
 msgstr "_Maint"
 
-#: optfonttabpage.ui:133
+#: sw/uiconfig/swriter/ui/optfonttabpage.ui:133
 msgctxt "optfonttabpage|default_label"
 msgid "De_fault:"
 msgstr "_Rhagosodedig:"
 
-#: optfonttabpage.ui:149
+#: sw/uiconfig/swriter/ui/optfonttabpage.ui:149
 msgctxt "optfonttabpage|heading_label"
 msgid "Headin_g:"
 msgstr "_Pennawd:"
 
-#: optfonttabpage.ui:165
+#: sw/uiconfig/swriter/ui/optfonttabpage.ui:165
 msgctxt "optfonttabpage|list_label"
 msgid "_List:"
 msgstr "_Rhestr:"
 
-#: optfonttabpage.ui:181
+#: sw/uiconfig/swriter/ui/optfonttabpage.ui:181
 msgctxt "optfonttabpage|caption_label"
 msgid "C_aption:"
 msgstr "_Egluryn:"
 
-#: optfonttabpage.ui:197
+#: sw/uiconfig/swriter/ui/optfonttabpage.ui:197
 msgctxt "optfonttabpage|index_label"
 msgid "_Index:"
 msgstr "_Mynegai:"
 
-#: optfonttabpage.ui:319
+#: sw/uiconfig/swriter/ui/optfonttabpage.ui:314
 msgctxt "optfonttabpage|label1"
 msgid "Basic Fonts (%1)"
 msgstr "Ffontiau Elfennol (%1)"
 
-#: optfonttabpage.ui:343
+#: sw/uiconfig/swriter/ui/optfonttabpage.ui:338
 msgctxt "optfonttabpage|standard"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: optformataidspage.ui:44
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:44
 msgctxt "optformataidspage|paragraph"
 msgid "Pa_ragraph end"
 msgstr "Diwedd p_aragraff"
 
-#: optformataidspage.ui:59
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:59
 msgctxt "optformataidspage|hyphens"
 msgid "Soft h_yphens"
 msgstr "Cyplysnodau _meddal"
 
-#: optformataidspage.ui:74
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:74
 msgctxt "optformataidspage|spaces"
 msgid "Spac_es"
 msgstr "By_lchau"
 
-#: optformataidspage.ui:89
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:89
 msgctxt "optformataidspage|nonbreak"
 msgid "Non-breaking s_paces"
 msgstr "Bylchau di_dor"
 
-#: optformataidspage.ui:104
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:104
 msgctxt "optformataidspage|tabs"
 msgid "Ta_bs"
 msgstr "_Tabiau"
 
-#: optformataidspage.ui:119
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:119
 msgctxt "optformataidspage|break"
 msgid "Brea_ks"
 msgstr "Toriad_au"
 
-#: optformataidspage.ui:134
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:134
 msgctxt "optformataidspage|hiddentext"
 msgid "Hidden text"
 msgstr "Testun cudd"
 
-#: optformataidspage.ui:148
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:149
 msgctxt "optformataidspage|hiddentextfield"
 msgid "Fields: Hidden te_xt"
 msgstr "Meysydd: T_estun cudd"
 
-#: optformataidspage.ui:163
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:164
 msgctxt "optformataidspage|hiddenparafield"
 msgid "Fields: Hidden p_aragraphs"
 msgstr "Meysydd: _Paragraffau cudd"
 
-#: optformataidspage.ui:251
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:252
 msgctxt "optformataidspage|displayfl"
 msgid "Display of"
 msgstr "Dangos"
 
-#: optformataidspage.ui:283
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:284
 msgctxt "optformataidspage|mathbaseline"
 msgid "Math baseline alignment"
 msgstr "Aliniad gwaelodlin Math"
 
-#: optformataidspage.ui:303
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:305
 msgctxt "optformataidspage|layoutopt"
 msgid "Layout Assistance"
 msgstr "Cymorth Cynllunio"
 
-#: optformataidspage.ui:347
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:349
 msgctxt "optformataidspage|cursoronoff"
 msgid "_Direct cursor"
 msgstr "Cyrchwr _uniongyrchol"
 
-#: optformataidspage.ui:364
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:366
 msgctxt "optformataidspage|fillmode"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: optformataidspage.ui:386
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:388
 msgctxt "optformataidspage|fillmargin"
 msgid "Para_graph alignment"
 msgstr "Aliniad p_aragraff"
 
-#: optformataidspage.ui:402
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:404
 msgctxt "optformataidspage|fillindent"
 msgid "_Left paragraph margin"
 msgstr "Ymyl paragraff _chwith"
 
-#: optformataidspage.ui:418
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:420
 msgctxt "optformataidspage|filltab"
 msgid "_Tabs"
 msgstr "_Tabiau"
 
-#: optformataidspage.ui:434
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:436
 msgctxt "optformataidspage|filltabandspace"
 msgid "Tabs a_nd spaces"
 msgstr "Tab_iau a bylchau"
 
-#: optformataidspage.ui:450
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:452
 msgctxt "optformataidspage|fillspace"
 msgid "_Spaces"
 msgstr "By_lchau"
 
-#: optformataidspage.ui:480
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:482
 msgctxt "optformataidspage|cursorlabel"
 msgid "Direct Cursor"
 msgstr "Cyrchwr Uniongyrchol"
 
-#: optformataidspage.ui:512
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:514
 msgctxt "optformataidspage|cursorinprot"
 msgid "Enable cursor"
 msgstr "Galluogi cyrchwr"
 
-#: optformataidspage.ui:532
+#: sw/uiconfig/swriter/ui/optformataidspage.ui:535
 msgctxt "optformataidspage|cursoropt"
 msgid "Protected Areas"
 msgstr "Ardaloedd Diogelwyd"
 
-#: optgeneralpage.ui:59
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:59
 msgctxt "optgeneralpage|always"
 msgid "_Always"
 msgstr "_Bob tro"
 
-#: optgeneralpage.ui:76
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:76
 msgctxt "optgeneralpage|onrequest"
 msgid "_On request"
 msgstr "_Ar gais"
 
-#: optgeneralpage.ui:92
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:92
 msgctxt "optgeneralpage|never"
 msgid "_Never"
 msgstr "_Byth"
 
-#: optgeneralpage.ui:114
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:114
 msgctxt "optgeneralpage|label1"
 msgid "Update Links when Loading"
 msgstr "Diweddaru Cysylltiadau wrth Lwytho"
 
-#: optgeneralpage.ui:146
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:146
 msgctxt "optgeneralpage|updatefields"
 msgid "_Fields"
 msgstr "M_eysydd"
 
-#: optgeneralpage.ui:161
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:161
 msgctxt "optgeneralpage|updatecharts"
 msgid "_Charts"
 msgstr "_Siartiau"
 
-#: optgeneralpage.ui:182
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:182
 msgctxt "optgeneralpage|label2"
 msgid "Automatically Update"
 msgstr "Diweddaru Awtomatig"
 
-#: optgeneralpage.ui:228
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:228
 msgctxt "optgeneralpage|label5"
 msgid "_Measurement unit:"
 msgstr "_Uned Fesur:"
 
-#: optgeneralpage.ui:253
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:253
 msgctxt "optgeneralpage|tablabel"
 msgid "_Tab stops:"
 msgstr "_Stop tab:"
 
-#: optgeneralpage.ui:291
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:290
 msgctxt "optgeneralpage|usecharunit"
 msgid "_Enable char unit"
 msgstr "_Galluogi uned nod"
 
-#: optgeneralpage.ui:307
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:306
 msgctxt "optgeneralpage|squaremode"
 msgid "_Use square page mode for text grid"
 msgstr "_Defnyddio modd tudalen sgwâr ar gyfer grid testun"
 
-#: optgeneralpage.ui:335
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:334
 msgctxt "optgeneralpage|label3"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: optgeneralpage.ui:378
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:377
 msgctxt "optgeneralpage|label7"
 msgid "_Additional separators:"
 msgstr "_Ymwahanyddion ychwanegol:"
 
-#: optgeneralpage.ui:412
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:410
 msgctxt "optgeneralpage|standardizedpageshow"
 msgid "Show standardized page count"
 msgstr "Dangos y cyfrif tudalen safonol"
 
-#: optgeneralpage.ui:440
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:438
 msgctxt "optgeneralpage|labelstandardpages"
 msgid "Characters per standardized page:"
 msgstr "Nodau i'r dudalen safonol:"
 
-#: optgeneralpage.ui:486
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:483
 msgctxt "optgeneralpage|label4"
 msgid "Word Count"
 msgstr "Cyfrif Geiriau"
 
-#: optredlinepage.ui:39
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:39
 msgctxt "optredlinepage|insert_label"
 msgid "_Attributes:"
 msgstr "_Priodoleddau:"
 
-#: optredlinepage.ui:53
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:53
 msgctxt "optredlinepage|insertcolor_label"
 msgid "Co_lor:"
 msgstr "_Lliw:"
 
-#: optredlinepage.ui:69
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:69
 msgctxt "optredlinepage|insert"
 msgid "[None]"
 msgstr "[Dim]"
 
-#: optredlinepage.ui:70
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:70
 msgctxt "optredlinepage|insert"
 msgid "Bold"
 msgstr "Trwm"
 
-#: optredlinepage.ui:71
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:71
 msgctxt "optredlinepage|insert"
 msgid "Italic"
 msgstr "Italig"
 
-#: optredlinepage.ui:72
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:72
 msgctxt "optredlinepage|insert"
 msgid "Underlined"
 msgstr "Tanlinellwyd"
 
-#: optredlinepage.ui:73
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:73
 msgctxt "optredlinepage|insert"
 msgid "Underlined: double"
 msgstr "Tanlinellwyd: dwbl"
 
-#: optredlinepage.ui:74
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:74
 msgctxt "optredlinepage|insert"
 msgid "Strikethrough"
 msgstr "Taro drwodd"
 
-#: optredlinepage.ui:75
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:75
 msgctxt "optredlinepage|insert"
 msgid "Uppercase"
 msgstr "Prif Lythennau"
 
-#: optredlinepage.ui:76
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:76
 msgctxt "optredlinepage|insert"
 msgid "Lowercase"
 msgstr "Llythrennau bach"
 
-#: optredlinepage.ui:77
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:77
 msgctxt "optredlinepage|insert"
 msgid "Small caps"
 msgstr "Prif lythrennau bach"
 
-#: optredlinepage.ui:78
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:78
 msgctxt "optredlinepage|insert"
 msgid "Title font"
 msgstr "Ffont teitl"
 
-#: optredlinepage.ui:79
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:79
 msgctxt "optredlinepage|insert"
 msgid "Background color"
 msgstr "Lliw'r cefndir"
 
-#: optredlinepage.ui:94
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:94
 msgctxt "optredlinepage|insertcolor-atkobject"
 msgid "Color of Insertions"
 msgstr "Lliw'r Mewnosodiadau"
 
-#: optredlinepage.ui:108
-msgctxt "optredlinepage|insertedpreview"
-msgid "Insert"
-msgstr "Mewnosod"
-
-#: optredlinepage.ui:124
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:124
 msgctxt "optredlinepage|label2"
 msgid "Insertions"
 msgstr "Mewnosodiadau"
 
-#: optredlinepage.ui:163
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:163
 msgctxt "optredlinepage|deleted_label"
 msgid "Attri_butes:"
 msgstr "_Priodweddau:"
 
-#: optredlinepage.ui:177
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:177
 msgctxt "optredlinepage|deletedcolor_label"
 msgid "Col_or:"
 msgstr "Ll_iw:"
 
-#: optredlinepage.ui:205
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:205
 msgctxt "optredlinepage|deletedcolor-atkobject"
 msgid "Color of Deletions"
 msgstr "Lliw'r Dileadau"
 
-#: optredlinepage.ui:219
-msgctxt "optredlinepage|deletedpreview"
-msgid "Delete"
-msgstr "Dileu"
-
-#: optredlinepage.ui:235
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:235
 msgctxt "optredlinepage|label3"
 msgid "Deletions"
 msgstr "Dileadau"
 
-#: optredlinepage.ui:274
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:274
 msgctxt "optredlinepage|changed_label"
 msgid "Attrib_utes:"
 msgstr "Pr_iodweddau:"
 
-#: optredlinepage.ui:288
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:288
 msgctxt "optredlinepage|changedcolor_label"
 msgid "Colo_r:"
 msgstr "Lli_w:"
 
-#: optredlinepage.ui:316
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:316
 msgctxt "optredlinepage|changedcolor-atkobject"
 msgid "Color of Changed Attributes"
 msgstr "Lliw'r Priodoleddau Newidwyd"
 
-#: optredlinepage.ui:330
-msgctxt "optredlinepage|changedpreview"
-msgid "Attributes"
-msgstr "Priodoleddau"
-
-#: optredlinepage.ui:346
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:346
 msgctxt "optredlinepage|label4"
 msgid "Changed Attributes"
 msgstr "Priodoleddau Newidiwyd"
 
-#: optredlinepage.ui:388
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:388
 msgctxt "optredlinepage|markcolor-atkobject"
 msgid "Color of Mark"
 msgstr "Lliw'r Marc"
 
-#: optredlinepage.ui:401
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:401
 msgctxt "optredlinepage|markpos_label"
 msgid "Mar_k:"
 msgstr "_Marcio:"
 
-#: optredlinepage.ui:415
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:415
 msgctxt "optredlinepage|markcolor_label"
 msgid "_Color:"
 msgstr "_Lliw:"
 
-#: optredlinepage.ui:443
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:443
 msgctxt "optredlinepage|markpos"
 msgid "[None]"
 msgstr "[Dim]"
 
-#: optredlinepage.ui:444
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:444
 msgctxt "optredlinepage|markpos"
 msgid "Left margin"
 msgstr "Ymyl chwith"
 
-#: optredlinepage.ui:445
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:445
 msgctxt "optredlinepage|markpos"
 msgid "Right margin"
 msgstr "UYmyl dde"
 
-#: optredlinepage.ui:446
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:446
 msgctxt "optredlinepage|markpos"
 msgid "Outer margin"
 msgstr "UYmyl allanol"
 
-#: optredlinepage.ui:447
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:447
 msgctxt "optredlinepage|markpos"
 msgid "Inner margin"
 msgstr "Ymyl mewnol"
 
-#: optredlinepage.ui:463
+#: sw/uiconfig/swriter/ui/optredlinepage.ui:463
 msgctxt "optredlinepage|label5"
 msgid "Lines Changed"
 msgstr "Llinellau wedi Newid"
 
-#: opttablepage.ui:46
+#: sw/uiconfig/swriter/ui/opttablepage.ui:46
 msgctxt "opttablepage|header"
 msgid "H_eading"
 msgstr "_Pennawd"
 
-#: opttablepage.ui:61
+#: sw/uiconfig/swriter/ui/opttablepage.ui:61
 msgctxt "opttablepage|repeatheader"
 msgid "Re_peat on each page"
 msgstr "_Ailadrodd ar bob tudalen"
 
-#: opttablepage.ui:77
+#: sw/uiconfig/swriter/ui/opttablepage.ui:77
 msgctxt "opttablepage|dontsplit"
 msgid "_Do not split"
 msgstr "_Peidio hollti"
 
-#: opttablepage.ui:92
+#: sw/uiconfig/swriter/ui/opttablepage.ui:92
 msgctxt "opttablepage|border"
 msgid "B_order"
 msgstr "_Border"
 
-#: opttablepage.ui:113
+#: sw/uiconfig/swriter/ui/opttablepage.ui:113
 msgctxt "opttablepage|label1"
 msgid "New Table Defaults"
 msgstr "Rhagsodiadau Newydd Tabl"
 
-#: opttablepage.ui:149
+#: sw/uiconfig/swriter/ui/opttablepage.ui:149
 msgctxt "opttablepage|numformatting"
 msgid "_Number recognition"
 msgstr "_Adnabod rhif"
 
-#: opttablepage.ui:164
+#: sw/uiconfig/swriter/ui/opttablepage.ui:164
 msgctxt "opttablepage|numfmtformatting"
 msgid "N_umber format recognition"
 msgstr "Adnabod fformat _rhif"
 
-#: opttablepage.ui:180
+#: sw/uiconfig/swriter/ui/opttablepage.ui:180
 msgctxt "opttablepage|numalignment"
 msgid "_Alignment"
 msgstr "_Aliniad"
 
-#: opttablepage.ui:202
+#: sw/uiconfig/swriter/ui/opttablepage.ui:202
 msgctxt "opttablepage|label2"
 msgid "Input in Tables"
 msgstr "Mewnbwn mewn Tablau"
 
-#: opttablepage.ui:256
+#: sw/uiconfig/swriter/ui/opttablepage.ui:256
 msgctxt "opttablepage|label10"
 msgid "Behavior of rows/columns"
 msgstr "Ymddygiad rhesi/colofnau"
 
-#: opttablepage.ui:266
+#: sw/uiconfig/swriter/ui/opttablepage.ui:266
 msgctxt "opttablepage|fix"
 msgid "_Fixed"
 msgstr "_Sefydlog"
 
-#: opttablepage.ui:284
+#: sw/uiconfig/swriter/ui/opttablepage.ui:284
 msgctxt "opttablepage|fixprop"
 msgid "Fi_xed, proportional"
 msgstr "S_efydlog, cymesur"
 
-#: opttablepage.ui:302
+#: sw/uiconfig/swriter/ui/opttablepage.ui:302
 msgctxt "opttablepage|var"
 msgid "_Variable"
 msgstr "_Amrywiolyn"
 
-#: opttablepage.ui:324
+#: sw/uiconfig/swriter/ui/opttablepage.ui:324
 msgctxt "opttablepage|label11"
 msgid "Changes affect the adjacent area only"
 msgstr "Newidiadau yn effeithio'r ardal gyfagos"
 
-#: opttablepage.ui:340
+#: sw/uiconfig/swriter/ui/opttablepage.ui:340
 msgctxt "opttablepage|label12"
 msgid "Changes affect the entire table"
 msgstr "Newidiadau yn effeithio'r tabl cyfan"
 
-#: opttablepage.ui:355
+#: sw/uiconfig/swriter/ui/opttablepage.ui:355
 msgctxt "opttablepage|label13"
 msgid "Changes affect the table size"
 msgstr "Newidiadau'n effeithio maint y tabl"
 
-#: opttablepage.ui:391
+#: sw/uiconfig/swriter/ui/opttablepage.ui:391
 msgctxt "opttablepage|label4"
 msgid "Move cells"
 msgstr "Symud celloedd"
 
-#: opttablepage.ui:433
+#: sw/uiconfig/swriter/ui/opttablepage.ui:431
 msgctxt "opttablepage|label5"
 msgid "_Row:"
 msgstr "_Rhes:"
 
-#: opttablepage.ui:448
+#: sw/uiconfig/swriter/ui/opttablepage.ui:446
 msgctxt "opttablepage|label6"
 msgid "_Column:"
 msgstr "C_olofn:"
 
-#: opttablepage.ui:507
+#: sw/uiconfig/swriter/ui/opttablepage.ui:503
 msgctxt "opttablepage|label15"
 msgid "Ro_w:"
 msgstr "R_hes:"
 
-#: opttablepage.ui:522
+#: sw/uiconfig/swriter/ui/opttablepage.ui:518
 msgctxt "opttablepage|label16"
 msgid "Colu_mn:"
 msgstr "Col_ofn:"
 
-#: opttablepage.ui:536
+#: sw/uiconfig/swriter/ui/opttablepage.ui:532
 msgctxt "opttablepage|label14"
 msgid "Insert cell"
 msgstr "Mewnosod cell"
 
-#: opttablepage.ui:565
+#: sw/uiconfig/swriter/ui/opttablepage.ui:561
 msgctxt "opttablepage|label3"
 msgid "Keyboard Handling"
 msgstr "Trin Bysellfwrdd"
 
-#: outlinenumbering.ui:8
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:8
 msgctxt "outlinenumbering|OutlineNumberingDialog"
 msgid "Chapter Numbering"
 msgstr "Rhifo Penodau"
 
-#: outlinenumbering.ui:39
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:39
 msgctxt "outlinenumbering|user"
 msgid "_Format"
 msgstr "Ffo_rmat"
 
-#: outlinenumbering.ui:121
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:121
 msgctxt "outlinenumbering|numbering"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: outlinenumbering.ui:143
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:143
 msgctxt "outlinenumbering|position"
 msgid "Position"
 msgstr "Safle"
 
-#: outlinenumbering.ui:174
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:174
 msgctxt "outlinenumbering|form1"
 msgid "Untitled 1"
 msgstr "Dideitl 1"
 
-#: outlinenumbering.ui:182
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:182
 msgctxt "outlinenumbering|form2"
 msgid "Untitled 2"
 msgstr "Dideitl 2"
 
-#: outlinenumbering.ui:190
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:190
 msgctxt "outlinenumbering|form3"
 msgid "Untitled 3"
 msgstr "Dideitl 3"
 
-#: outlinenumbering.ui:198
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:198
 msgctxt "outlinenumbering|form4"
 msgid "Untitled 4"
 msgstr "Dideitl 4"
 
-#: outlinenumbering.ui:206
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:206
 msgctxt "outlinenumbering|form5"
 msgid "Untitled 5"
 msgstr "Dideitl 5"
 
-#: outlinenumbering.ui:214
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:214
 msgctxt "outlinenumbering|form6"
 msgid "Untitled 6"
 msgstr "Dideitl 6"
 
-#: outlinenumbering.ui:222
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:222
 msgctxt "outlinenumbering|form7"
 msgid "Untitled 7"
 msgstr "Dideitl 7"
 
-#: outlinenumbering.ui:230
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:230
 msgctxt "outlinenumbering|form8"
 msgid "Untitled 8"
 msgstr "Dideitl 8"
 
-#: outlinenumbering.ui:238
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:238
 msgctxt "outlinenumbering|form9"
 msgid "Untitled 9"
 msgstr "Dideitl 9"
 
-#: outlinenumbering.ui:252
+#: sw/uiconfig/swriter/ui/outlinenumbering.ui:252
 msgctxt "outlinenumbering|saveas"
 msgid "Save _As..."
 msgstr "Cadw _Fel..."
 
-#: outlinenumberingpage.ui:52
+#: sw/uiconfig/swriter/ui/outlinenumberingpage.ui:52
 msgctxt "outlinenumberingpage|label1"
 msgid "Level"
 msgstr "Lefel"
 
-#: outlinenumberingpage.ui:96
+#: sw/uiconfig/swriter/ui/outlinenumberingpage.ui:96
 msgctxt "outlinenumberingpage|label3"
 msgid "Paragraph style:"
 msgstr "Arddull paragraff:"
 
-#: outlinenumberingpage.ui:122
+#: sw/uiconfig/swriter/ui/outlinenumberingpage.ui:122
 msgctxt "outlinenumberingpage|label4"
 msgid "Number:"
 msgstr "Rhif:"
 
-#: outlinenumberingpage.ui:136
+#: sw/uiconfig/swriter/ui/outlinenumberingpage.ui:136
 msgctxt "outlinenumberingpage|label5"
 msgid "Character style:"
 msgstr "Arddull nod:"
 
-#: outlinenumberingpage.ui:150
+#: sw/uiconfig/swriter/ui/outlinenumberingpage.ui:150
 msgctxt "outlinenumberingpage|sublevelsft"
 msgid "Show sublevels:"
 msgstr "Dangos islefelau:"
 
-#: outlinenumberingpage.ui:164
+#: sw/uiconfig/swriter/ui/outlinenumberingpage.ui:164
 msgctxt "outlinenumberingpage|label7"
 msgid "Separator"
 msgstr "Ymwahanydd"
 
-#: outlinenumberingpage.ui:250
+#: sw/uiconfig/swriter/ui/outlinenumberingpage.ui:246
 msgctxt "outlinenumberingpage|label8"
 msgid "Before:"
 msgstr "Cyn:"
 
-#: outlinenumberingpage.ui:271
+#: sw/uiconfig/swriter/ui/outlinenumberingpage.ui:267
 msgctxt "outlinenumberingpage|label9"
 msgid "After:"
 msgstr "Wedi:"
 
-#: outlinenumberingpage.ui:287
+#: sw/uiconfig/swriter/ui/outlinenumberingpage.ui:283
 msgctxt "outlinenumberingpage|label10"
 msgid "Start at:"
 msgstr "Cychwyn yn:"
 
-#: outlinenumberingpage.ui:324
+#: sw/uiconfig/swriter/ui/outlinenumberingpage.ui:320
 msgctxt "outlinenumberingpage|label2"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: outlinepositionpage.ui:24
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:24
 msgctxt "outlinepositionpage|liststore1"
 msgid "Left"
 msgstr "Chwith"
 
-#: outlinepositionpage.ui:27
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:27
 msgctxt "outlinepositionpage|liststore1"
 msgid "Centered"
 msgstr "Canoli"
 
-#: outlinepositionpage.ui:30
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:30
 msgctxt "outlinepositionpage|liststore1"
 msgid "Right"
 msgstr "De"
 
-#: outlinepositionpage.ui:41
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:41
 msgctxt "outlinepositionpage|liststore2"
 msgid "Tab stop"
 msgstr "Stop tab"
 
-#: outlinepositionpage.ui:44
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:44
 msgctxt "outlinepositionpage|liststore2"
 msgid "Space"
 msgstr "Bwlch"
 
-#: outlinepositionpage.ui:47
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:47
 msgctxt "outlinepositionpage|liststore2"
 msgid "Nothing"
 msgstr "Dim"
 
-#: outlinepositionpage.ui:89
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:50
+msgctxt "outlinepositionpage|liststore2"
+msgid "New Line"
+msgstr "Llinell Newydd"
+
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:92
 msgctxt "outlinepositionpage|1"
 msgid "Level"
 msgstr "Lefel"
 
-#: outlinepositionpage.ui:137
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:140
 msgctxt "outlinepositionpage|numalign"
 msgid "Numbering alignment:"
 msgstr "Aliniad rhifo:"
 
-#: outlinepositionpage.ui:162
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:165
 msgctxt "outlinepositionpage|numdist"
 msgid ""
 "Minimum space between\n"
@@ -14237,3402 +13952,3446 @@ msgstr ""
 "Lleiafswm bylchu rhwng\n"
 "rhifo a'r testun:"
 
-#: outlinepositionpage.ui:191
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:193
 msgctxt "outlinepositionpage|numberingwidth"
 msgid "Width of numbering:"
 msgstr "Lled rhifo:"
 
-#: outlinepositionpage.ui:216
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:217
 msgctxt "outlinepositionpage|relative"
 msgid "Relative"
 msgstr "Cymharol"
 
-#: outlinepositionpage.ui:233
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:235
 msgctxt "outlinepositionpage|indent"
 msgid "Indent:"
 msgstr "Mewnoli:"
 
-#: outlinepositionpage.ui:260
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:261
 msgctxt "outlinepositionpage|indentat"
 msgid "Indent at:"
 msgstr "Mewnoliad at:"
 
-#: outlinepositionpage.ui:286
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:286
 msgctxt "outlinepositionpage|num2align"
 msgid "Numbering alignment:"
 msgstr "Aliniad rhifo:"
 
-#: outlinepositionpage.ui:310
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:310
 msgctxt "outlinepositionpage|alignedat"
 msgid "Aligned at:"
 msgstr "Aliniwyd at:"
 
-#: outlinepositionpage.ui:336
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:335
 msgctxt "outlinepositionpage|at"
 msgid "Tab stop at:"
 msgstr "Stop Tab yn:"
 
-#: outlinepositionpage.ui:374
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:372
 msgctxt "outlinepositionpage|numfollowedby"
 msgid "Numbering followed by:"
 msgstr "Rhifo'n cael ei ddilyn gan:"
 
-#: outlinepositionpage.ui:395
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:393
 msgctxt "outlinepositionpage|label10"
 msgid "Position and Spacing"
 msgstr "Safle a Bylchu"
 
-#: outlinepositionpage.ui:417
+#: sw/uiconfig/swriter/ui/outlinepositionpage.ui:415
 msgctxt "outlinepositionpage|standard"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: pagebreakmenu.ui:12
+#: sw/uiconfig/swriter/ui/pagebreakmenu.ui:12
 msgctxt "pagebreakmenu|edit"
 msgid "Edit Page Break..."
 msgstr "Golygu Toriad Tudalen..."
 
-#: pagebreakmenu.ui:20
+#: sw/uiconfig/swriter/ui/pagebreakmenu.ui:20
 msgctxt "pagebreakmenu|delete"
 msgid "Delete Page Break"
 msgstr "Dileu Toriad Tudalen"
 
-#: pagecolumncontrol.ui:76
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:76
 msgctxt "pagecolumncontrol|column1"
 msgid "1 Column"
 msgstr "1 Colofn"
 
-#: pagecolumncontrol.ui:91
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:91
 msgctxt "pagecolumncontrol|column2"
 msgid "2 Columns"
 msgstr "2 Golofn"
 
-#: pagecolumncontrol.ui:106
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:106
 msgctxt "pagecolumncontrol|column3"
 msgid "3 Columns"
 msgstr "3 Colofn"
 
-#: pagecolumncontrol.ui:121
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:121
 msgctxt "pagecolumncontrol|columnleft"
 msgid "Left"
 msgstr "Chwith"
 
-#: pagecolumncontrol.ui:136
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:136
 msgctxt "pagecolumncontrol|columnright"
 msgid "Right"
 msgstr "De"
 
-#: pagecolumncontrol.ui:151
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:151
 msgctxt "pagecolumncontrol|column1L"
 msgid "1 Column"
 msgstr "1 Colofn"
 
-#: pagecolumncontrol.ui:166
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:166
 msgctxt "pagecolumncontrol|column2L"
 msgid "2 Columns"
 msgstr "2 Golofn"
 
-#: pagecolumncontrol.ui:181
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:181
 msgctxt "pagecolumncontrol|column3L"
 msgid "3 Columns"
 msgstr "3 Colofn"
 
-#: pagecolumncontrol.ui:196
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:196
 msgctxt "pagecolumncontrol|columnleftL"
 msgid "Left"
 msgstr "Chwith"
 
-#: pagecolumncontrol.ui:211
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:211
 msgctxt "pagecolumncontrol|columnrightL"
 msgid "Right"
 msgstr "De"
 
-#: pagecolumncontrol.ui:226
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:226
 msgctxt "pagecolumncontrol|moreoptions"
 msgid "_More Options"
 msgstr "_Rhagor o Ddewis"
 
-#: pagecolumncontrol.ui:230
+#: sw/uiconfig/swriter/ui/pagecolumncontrol.ui:230
 msgctxt "pagecolumncontrol|moreoptions|tooltip_text"
 msgid "More Options"
 msgstr "Rhagor o Ddewis"
 
-#: pagefooterpanel.ui:43
+#: sw/uiconfig/swriter/ui/pagefooterpanel.ui:33
+msgctxt "PageHeaderPanel|footertoggle-atkobject"
+msgid "Enable footer"
+msgstr ""
+
+#: sw/uiconfig/swriter/ui/pagefooterpanel.ui:49
 msgctxt "pagefooterpanel|margins"
 msgid "Margins:"
 msgstr "Ymylon:"
 
-#: pagefooterpanel.ui:60
+#: sw/uiconfig/swriter/ui/pagefooterpanel.ui:67
 msgctxt "pagefooterpanel|customlabel"
 msgid "Custom"
 msgstr "Cyfaddas"
 
-#: pagefooterpanel.ui:72
+#: sw/uiconfig/swriter/ui/pagefooterpanel.ui:79
 msgctxt "pagefooterpanel|spacing"
 msgid "Spacing:"
 msgstr "Bylchu:"
 
-#: pagefooterpanel.ui:84
+#: sw/uiconfig/swriter/ui/pagefooterpanel.ui:92
 msgctxt "pagefooterpanel|samecontent"
 msgid "Same Content:"
 msgstr "Yr Un Cynnwys:"
 
-#: pageformatpanel.ui:23
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:23
 msgctxt "pageformatpanel|size"
 msgid "Size:"
 msgstr "Maint:"
 
-#: pageformatpanel.ui:35
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:36
 msgctxt "pageformatpanel|width"
 msgid "Width:"
 msgstr "Lled:"
 
-#: pageformatpanel.ui:47
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:49
 msgctxt "pageformatpanel|height"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: pageformatpanel.ui:59
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:62
 msgctxt "pageformatpanel|orientation"
 msgid "Orientation:"
 msgstr "Cyfeiriadaeth:"
 
-#: pageformatpanel.ui:72
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:76
 msgctxt "pageformatpanel|paperwidth|tooltip_text"
 msgid "Paper Width"
 msgstr "Lled Papur"
 
-#: pageformatpanel.ui:87
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:90
 msgctxt "pageformatpanel|paperheight|tooltip_text"
 msgid "Paper Height"
 msgstr "Uchder Papur"
 
-#: pageformatpanel.ui:103
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:105
 msgctxt "pageformatpanel|paperorientation"
 msgid "Portrait"
 msgstr "Portread"
 
-#: pageformatpanel.ui:104
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:106
 msgctxt "pageformatpanel|paperorientation"
 msgid "Landscape"
 msgstr "Tirlun"
 
-#: pageformatpanel.ui:127
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:129
 msgctxt "pageformatpanel|margin"
 msgid "Margins:"
 msgstr "Ymylon:"
 
-#: pageformatpanel.ui:140
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:143
 msgctxt "pageformatpanel|marginLB"
 msgid "None"
 msgstr "Dim"
 
-#: pageformatpanel.ui:141
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:144
 msgctxt "pageformatpanel|marginLB"
 msgid "Narrow"
 msgstr "Cul"
 
-#: pageformatpanel.ui:142
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:145
 msgctxt "pageformatpanel|marginLB"
 msgid "Moderate"
 msgstr "Cymhedrol"
 
-#: pageformatpanel.ui:143
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:146
 msgctxt "pageformatpanel|marginLB"
 msgid "Normal 0.75\""
 msgstr "Normal 0.75\""
 
-#: pageformatpanel.ui:144
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:147
 msgctxt "pageformatpanel|marginLB"
 msgid "Normal 1\""
 msgstr "Normal 1\""
 
-#: pageformatpanel.ui:145
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:148
 msgctxt "pageformatpanel|marginLB"
 msgid "Normal 1.25\""
 msgstr "Normal 1.25\""
 
-#: pageformatpanel.ui:146
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:149
 msgctxt "pageformatpanel|marginLB"
 msgid "Wide"
 msgstr "Llydan"
 
-#: pageformatpanel.ui:147
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:150
 msgctxt "pageformatpanel|marginLB"
 msgid "Mirrored"
 msgstr "Drychu"
 
-#: pageformatpanel.ui:158
+#: sw/uiconfig/swriter/ui/pageformatpanel.ui:161
 msgctxt "pageformatpanel|customlabel"
 msgid "Custom"
 msgstr "Cyfaddas"
 
-#: pageheaderpanel.ui:43
+#: sw/uiconfig/swriter/ui/pageheaderpanel.ui:33
+msgctxt "PageHeaderPanel|headertoggle-atkobject"
+msgid "Enable header"
+msgstr ""
+
+#: sw/uiconfig/swriter/ui/pageheaderpanel.ui:49
 msgctxt "pageheaderpanel|margins"
 msgid "Margins:"
 msgstr "Ymylon:"
 
-#: pageheaderpanel.ui:60
+#: sw/uiconfig/swriter/ui/pageheaderpanel.ui:67
 msgctxt "pageheaderpanel|customlabel"
 msgid "Custom"
 msgstr "Cyfaddas"
 
-#: pageheaderpanel.ui:72
+#: sw/uiconfig/swriter/ui/pageheaderpanel.ui:79
 msgctxt "pageheaderpanel|spacing"
 msgid "Spacing:"
 msgstr "Bylchu:"
 
-#: pageheaderpanel.ui:84
+#: sw/uiconfig/swriter/ui/pageheaderpanel.ui:92
 msgctxt "pageheaderpanel|samecontent"
 msgid "Same Content:"
 msgstr "Yr Un Cynnwys:"
 
-#: pagemargincontrol.ui:81
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:81
 msgctxt "pagemargincontrol|narrow"
 msgid "Narrow"
 msgstr "Cul"
 
-#: pagemargincontrol.ui:96
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:96
 msgctxt "pagemargincontrol|normal"
 msgid "Normal"
 msgstr "Normal"
 
-#: pagemargincontrol.ui:112
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:112
 msgctxt "pagemargincontrol|wide"
 msgid "Wide"
 msgstr "Llydan"
 
-#: pagemargincontrol.ui:127
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:127
 msgctxt "pagemargincontrol|mirrored"
 msgid "Mirrored"
 msgstr "Drychu"
 
-#: pagemargincontrol.ui:142
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:142
 msgctxt "pagemargincontrol|last"
 msgid "Last Custom Value"
 msgstr "Gwerth Cyfaddas Diwethaf"
 
-#: pagemargincontrol.ui:157
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:157
 msgctxt "pagemargincontrol|narrowL"
 msgid "Narrow"
 msgstr "Cul"
 
-#: pagemargincontrol.ui:172
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:172
 msgctxt "pagemargincontrol|normalL"
 msgid "Normal"
 msgstr "Normal"
 
-#: pagemargincontrol.ui:188
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:188
 msgctxt "pagemargincontrol|wideL"
 msgid "Wide"
 msgstr "Llydan"
 
-#: pagemargincontrol.ui:203
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:203
 msgctxt "pagemargincontrol|mirroredL"
 msgid "Mirrored"
 msgstr "Drychu"
 
-#: pagemargincontrol.ui:218
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:218
 msgctxt "pagemargincontrol|lastL"
 msgid "Last Custom Value"
 msgstr "Gwerth Cyfaddas Diwethaf"
 
-#: pagemargincontrol.ui:252
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:252
 msgctxt "pagemargincontrol|label4"
 msgid "_Top"
 msgstr "_Brig"
 
-#: pagemargincontrol.ui:265
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:265
 msgctxt "pagemargincontrol|label5"
 msgid "_Bottom"
 msgstr "_Gwaelod"
 
-#: pagemargincontrol.ui:282
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:282
 msgctxt "pagemargincontrol|leftLabel"
 msgid "_Left"
 msgstr "_Chwith"
 
-#: pagemargincontrol.ui:296
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:296
 msgctxt "pagemargincontrol|innerLabel"
 msgid "I_nner"
 msgstr "_Mewnol"
 
-#: pagemargincontrol.ui:320
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:320
 msgctxt "pagemargincontrol|rightLabel"
 msgid "_Right"
 msgstr "_De"
 
-#: pagemargincontrol.ui:334
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:334
 msgctxt "pagemargincontrol|outerLabel"
 msgid "O_uter"
 msgstr "_Allanol"
 
-#: pagemargincontrol.ui:410
+#: sw/uiconfig/swriter/ui/pagemargincontrol.ui:410
 msgctxt "pagemargincontrol|label1"
 msgid "Custom"
 msgstr "Cyfaddas"
 
-#: pageorientationcontrol.ui:36
+#: sw/uiconfig/swriter/ui/pageorientationcontrol.ui:36
 msgctxt "pageorientationcontrol|portrait"
 msgid "Portrait"
 msgstr "Portread"
 
-#: pageorientationcontrol.ui:52
+#: sw/uiconfig/swriter/ui/pageorientationcontrol.ui:52
 msgctxt "pageorientationcontrol|landscape"
 msgid "Landscape"
 msgstr "Tirlun"
 
-#: pagesizecontrol.ui:51
+#: sw/uiconfig/swriter/ui/pagesizecontrol.ui:51
 msgctxt "pagesizecontrol|moreoptions"
 msgid "_More Options"
 msgstr "_Rhagor o Ddewis"
 
-#: pagesizecontrol.ui:55
+#: sw/uiconfig/swriter/ui/pagesizecontrol.ui:55
 msgctxt "pagesizecontrol|moreoptions|tooltip_text"
 msgid "More Options"
 msgstr "Rhagor o Ddewisiadau"
 
-#: pagestylespanel.ui:15
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:15
 msgctxt "pagestylespanel|liststorePageLayout"
 msgid "Right and left"
 msgstr "De a chwith"
 
-#: pagestylespanel.ui:19
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:19
 msgctxt "pagestylespanel|liststorePageLayout"
 msgid "Mirrored"
 msgstr "Drychu"
 
-#: pagestylespanel.ui:23
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:23
 msgctxt "pagestylespanel|liststorePageLayout"
 msgid "Only right"
 msgstr "De yn unig"
 
-#: pagestylespanel.ui:27
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:27
 msgctxt "pagestylespanel|liststorePageLayout"
 msgid "Only left"
 msgstr "Chwith yn unig"
 
-#: pagestylespanel.ui:51
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:51
 msgctxt "pagestylespanel|numberslabel"
 msgid "Number:"
 msgstr "Rhif:"
 
-#: pagestylespanel.ui:65
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:66
 msgctxt "pagestylespanel|backgroundlabel"
 msgid "Background:"
 msgstr "Cefndir:"
 
-#: pagestylespanel.ui:91
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:93
 msgctxt "pagestylespanel|layoutlabel"
 msgid "Layout:"
 msgstr "Cynllun:"
 
-#: pagestylespanel.ui:119
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:122
 msgctxt "pagestylespanel|columnlabel"
 msgid "Columns:"
 msgstr "Colofnau:"
 
-#: pagestylespanel.ui:133
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:137
 msgctxt "pagestylespanel|columnbox"
 msgid "1 Column"
 msgstr "1 Colofn"
 
-#: pagestylespanel.ui:134
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:138
 msgctxt "pagestylespanel|columnbox"
 msgid "2 Columns"
 msgstr "2 Golofn"
 
-#: pagestylespanel.ui:135
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:139
 msgctxt "pagestylespanel|columnbox"
 msgid "3 Columns"
 msgstr "3 Colofn"
 
-#: pagestylespanel.ui:136
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:140
 msgctxt "pagestylespanel|columnbox"
 msgid "Left"
 msgstr "Chwith"
 
-#: pagestylespanel.ui:137
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:141
 msgctxt "pagestylespanel|columnbox"
 msgid "Right"
 msgstr "De"
 
-#: pagestylespanel.ui:214
+#: sw/uiconfig/swriter/ui/pagestylespanel.ui:218
 msgctxt "pagestylespanel|customlabel"
 msgid "Custom"
 msgstr "Cyfaddas"
 
-#: paradialog.ui:8
+#: sw/uiconfig/swriter/ui/paradialog.ui:8
 msgctxt "paradialog|ParagraphPropertiesDialog"
 msgid "Paragraph"
 msgstr "Paragraff"
 
-#: paradialog.ui:106
+#: sw/uiconfig/swriter/ui/paradialog.ui:106
 msgctxt "paradialog|labelTP_PARA_STD"
 msgid "Indents & Spacing"
 msgstr "Mewnoliad a Bylchu"
 
-#: paradialog.ui:128
+#: sw/uiconfig/swriter/ui/paradialog.ui:128
 msgctxt "paradialog|labelTP_PARA_ALIGN"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: paradialog.ui:152
+#: sw/uiconfig/swriter/ui/paradialog.ui:152
 msgctxt "paradialog|textflow"
 msgid "Text Flow"
 msgstr "Llif Testun"
 
-#: paradialog.ui:176
+#: sw/uiconfig/swriter/ui/paradialog.ui:176
 msgctxt "paradialog|labelTP_PARA_ASIAN"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: paradialog.ui:199
+#: sw/uiconfig/swriter/ui/paradialog.ui:199
 msgctxt "paradialog|labelTP_NUMPARA"
 msgid "Outline & Numbering"
 msgstr "Amlinelliad a Rhifo"
 
-#: paradialog.ui:222
+#: sw/uiconfig/swriter/ui/paradialog.ui:222
 msgctxt "paradialog|labelTP_TABULATOR"
 msgid "Tabs"
 msgstr "Tabiau"
 
-#: paradialog.ui:245
+#: sw/uiconfig/swriter/ui/paradialog.ui:245
 msgctxt "paradialog|labelTP_DROPCAPS"
 msgid "Drop Caps"
 msgstr "Dim Priflythrennau Bach"
 
-#: paradialog.ui:268
+#: sw/uiconfig/swriter/ui/paradialog.ui:268
 msgctxt "paradialog|labelTP_BORDER"
 msgid "Borders"
 msgstr "Borderi"
 
-#: paradialog.ui:291
+#: sw/uiconfig/swriter/ui/paradialog.ui:291
 msgctxt "paradialog|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: paradialog.ui:314
+#: sw/uiconfig/swriter/ui/paradialog.ui:314
 msgctxt "paradialog|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: picturedialog.ui:8
+#: sw/uiconfig/swriter/ui/picturedialog.ui:8
 msgctxt "picturedialog|PictureDialog"
 msgid "Image"
 msgstr "Delwedd"
 
-#: picturedialog.ui:106
+#: sw/uiconfig/swriter/ui/picturedialog.ui:106
 msgctxt "picturedialog|type"
 msgid "Type"
 msgstr "Math"
 
-#: picturedialog.ui:128
+#: sw/uiconfig/swriter/ui/picturedialog.ui:128
 msgctxt "picturedialog|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: picturedialog.ui:151
+#: sw/uiconfig/swriter/ui/picturedialog.ui:151
 msgctxt "picturedialog|wrap"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: picturedialog.ui:174
+#: sw/uiconfig/swriter/ui/picturedialog.ui:174
 msgctxt "picturedialog|hyperlink"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: picturedialog.ui:197
+#: sw/uiconfig/swriter/ui/picturedialog.ui:197
 msgctxt "picturedialog|picture"
 msgid "Image"
 msgstr "Delwedd"
 
-#: picturedialog.ui:220
+#: sw/uiconfig/swriter/ui/picturedialog.ui:220
 msgctxt "picturedialog|crop"
 msgid "Crop"
 msgstr "Tocio"
 
-#: picturedialog.ui:243
+#: sw/uiconfig/swriter/ui/picturedialog.ui:243
 msgctxt "picturedialog|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: picturedialog.ui:266
+#: sw/uiconfig/swriter/ui/picturedialog.ui:266
 msgctxt "picturedialog|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: picturedialog.ui:289
+#: sw/uiconfig/swriter/ui/picturedialog.ui:289
 msgctxt "picturedialog|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: picturedialog.ui:312
+#: sw/uiconfig/swriter/ui/picturedialog.ui:312
 msgctxt "picturedialog|macro"
 msgid "Macro"
 msgstr "Macro"
 
-#: picturepage.ui:32
+#: sw/uiconfig/swriter/ui/picturepage.ui:32
 msgctxt "picturepage|browse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: picturepage.ui:63
+#: sw/uiconfig/swriter/ui/picturepage.ui:62
 msgctxt "picturepage|label1"
 msgid "_File name"
 msgstr "_Enw ffeil"
 
-#: picturepage.ui:82
+#: sw/uiconfig/swriter/ui/picturepage.ui:81
 msgctxt "picturepage|label11"
 msgid "Link"
 msgstr "Cysylltiad"
 
-#: picturepage.ui:119
+#: sw/uiconfig/swriter/ui/picturepage.ui:118
 msgctxt "picturepage|vert"
 msgid "_Vertically"
 msgstr "_Fertigol"
 
-#: picturepage.ui:136
+#: sw/uiconfig/swriter/ui/picturepage.ui:135
 msgctxt "picturepage|hori"
 msgid "Hori_zontally"
 msgstr "Llor_weddol"
 
-#: picturepage.ui:153
+#: sw/uiconfig/swriter/ui/picturepage.ui:152
 msgctxt "picturepage|allpages"
 msgid "On all pages"
 msgstr "Ar bob tudalen"
 
-#: picturepage.ui:172
+#: sw/uiconfig/swriter/ui/picturepage.ui:172
 msgctxt "picturepage|leftpages"
 msgid "On left pages"
 msgstr "Ar dudalennau chwith"
 
-#: picturepage.ui:190
+#: sw/uiconfig/swriter/ui/picturepage.ui:191
 msgctxt "picturepage|rightpages"
 msgid "On right pages"
 msgstr "Ar dudalennau de"
 
-#: picturepage.ui:249
+#: sw/uiconfig/swriter/ui/picturepage.ui:251
 msgctxt "picturepage|label2"
 msgid "Flip"
 msgstr "Gwrthdroi"
 
-#: picturepage.ui:292
+#: sw/uiconfig/swriter/ui/picturepage.ui:294
 msgctxt "picturepage|FT_ANGLE"
 msgid "_Angle:"
 msgstr "_Ongl:"
 
-#: picturepage.ui:307
-msgctxt "picturepage"
-msgid "0,00"
-msgstr "0,00"
-
-#: picturepage.ui:335
+#: sw/uiconfig/swriter/ui/picturepage.ui:336
 msgctxt "picturepage|FT_ANGLEPRESETS"
 msgid "Default _settings:"
 msgstr "Gosodiadau _rhagosodedig:"
 
-#: picturepage.ui:349
+#: sw/uiconfig/swriter/ui/picturepage.ui:350
 msgctxt "picturepage|CTL_ANGLE|tooltip_text"
 msgid "Rotation Angle"
 msgstr "Ongl Cylchdroi"
 
-#: picturepage.ui:374
+#: sw/uiconfig/swriter/ui/picturepage.ui:375
 msgctxt "picturepage|label2"
 msgid "Rotation Angle"
 msgstr "Ongl Cylchdroi"
 
-#: previewzoomdialog.ui:21
+#: sw/uiconfig/swriter/ui/previewzoomdialog.ui:22
 msgctxt "previewzoomdialog|PreviewZoomDialog"
 msgid "Multiple Pages"
 msgstr "Lluosog"
 
-#: previewzoomdialog.ui:101
+#: sw/uiconfig/swriter/ui/previewzoomdialog.ui:103
 msgctxt "previewzoomdialog|label1"
 msgid "_Rows"
 msgstr "_Rhesi"
 
-#: previewzoomdialog.ui:117
+#: sw/uiconfig/swriter/ui/previewzoomdialog.ui:117
 msgctxt "previewzoomdialog|label2"
 msgid "_Columns"
 msgstr "_Colofnau"
 
-#: printeroptions.ui:30
+#: sw/uiconfig/swriter/ui/printeroptions.ui:30
 msgctxt "printeroptions|pagebackground"
 msgid "Page background"
 msgstr "Papur cefndir"
 
-#: printeroptions.ui:46
+#: sw/uiconfig/swriter/ui/printeroptions.ui:47
 msgctxt "printeroptions|pictures"
 msgid "Images and other graphic objects"
 msgstr "Lluniau a gwrthrychau graffigol eraill"
 
-#: printeroptions.ui:62
+#: sw/uiconfig/swriter/ui/printeroptions.ui:64
 msgctxt "printeroptions|hiddentext"
 msgid "Hidden text"
 msgstr "Testun cudd"
 
-#: printeroptions.ui:78
+#: sw/uiconfig/swriter/ui/printeroptions.ui:81
 msgctxt "printeroptions|placeholders"
 msgid "Text placeholders"
 msgstr "Dalfannau testun"
 
-#: printeroptions.ui:94
+#: sw/uiconfig/swriter/ui/printeroptions.ui:98
 msgctxt "printeroptions|formcontrols"
 msgid "Form controls"
 msgstr "Rheolaeth ffurflenni"
 
-#: printeroptions.ui:116
+#: sw/uiconfig/swriter/ui/printeroptions.ui:121
 msgctxt "printeroptions|label4"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: printeroptions.ui:143
+#: sw/uiconfig/swriter/ui/printeroptions.ui:148
 msgctxt "printeroptions|textinblack"
 msgid "Print text in black"
 msgstr "Argraffu testun mewn du"
 
-#: printeroptions.ui:158
+#: sw/uiconfig/swriter/ui/printeroptions.ui:164
 msgctxt "printeroptions|label5"
 msgid "Color"
 msgstr "Lliw"
 
-#: printeroptions.ui:185
+#: sw/uiconfig/swriter/ui/printeroptions.ui:191
 msgctxt "printeroptions|autoblankpages"
 msgid "Print automatically inserted blank pages"
 msgstr "Argraffu tudalennau gwag mewnosodwyd yn awtomatig"
 
-#: printeroptions.ui:200
+#: sw/uiconfig/swriter/ui/printeroptions.ui:207
 msgctxt "printeroptions|label6"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: printmergedialog.ui:12
+#: sw/uiconfig/swriter/ui/printmergedialog.ui:12
 msgctxt "printmergedialog|PrintMergeDialog"
 msgid "Your document contains address database fields. Do you want to print a form letter?"
 msgstr "Mae eich dogfen yn cynnwys meysydd cyfeiriadau cronfa ddata. Hoffech chi argraffu ffurf llythyr?"
 
-#: printmonitordialog.ui:7
+#: sw/uiconfig/swriter/ui/printmonitordialog.ui:7
 msgctxt "printmonitordialog|PrintMonitorDialog"
 msgid "Print monitor"
 msgstr "Goruchwyliwr argraffu"
 
-#: printmonitordialog.ui:52
+#: sw/uiconfig/swriter/ui/printmonitordialog.ui:52
 msgctxt "printmonitordialog|alttitle"
 msgid "Save-Monitor"
 msgstr "Monitor-Cadw"
 
-#: printmonitordialog.ui:75
+#: sw/uiconfig/swriter/ui/printmonitordialog.ui:75
 msgctxt "printmonitordialog|printing"
 msgid "is being prepared for printing on"
 msgstr "yn cael ei baratoi ar gyfer ei argraffu"
 
-#: printmonitordialog.ui:87
+#: sw/uiconfig/swriter/ui/printmonitordialog.ui:87
 msgctxt "printmonitordialog|saving"
 msgid "is being saved to"
 msgstr "yn cael ei gadw i"
 
-#: printoptionspage.ui:37
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:37
 msgctxt "printoptionspage|graphics"
 msgid "_Images and objects"
 msgstr "_Gwrthrychau a delweddau"
 
-#: printoptionspage.ui:54
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:52
 msgctxt "printoptionspage|formcontrols"
 msgid "Form control_s"
 msgstr "_Rheolaeth"
 
-#: printoptionspage.ui:71
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:67
 msgctxt "printoptionspage|background"
 msgid "Page ba_ckground"
 msgstr "_Cefndir"
 
-#: printoptionspage.ui:88
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:82
 msgctxt "printoptionspage|inblack"
 msgid "Print text in blac_k"
 msgstr "Argraffu d_u"
 
-#: printoptionspage.ui:105
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:97
 msgctxt "printoptionspage|hiddentext"
 msgid "Hidden te_xt"
 msgstr "_Testun cudd"
 
-#: printoptionspage.ui:122
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:112
 msgctxt "printoptionspage|textplaceholder"
 msgid "Text _placeholder"
 msgstr "Dalfan _testun"
 
-#: printoptionspage.ui:145
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:133
 msgctxt "printoptionspage|label2"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: printoptionspage.ui:179
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:165
 msgctxt "printoptionspage|leftpages"
 msgid "_Left pages"
 msgstr "Tudalennau _chwith"
 
-#: printoptionspage.ui:196
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:180
 msgctxt "printoptionspage|rightpages"
 msgid "_Right pages"
 msgstr "Tudalennau _de"
 
-#: printoptionspage.ui:213
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:195
 msgctxt "printoptionspage|brochure"
 msgid "Broch_ure"
 msgstr "_Llyfryn"
 
-#: printoptionspage.ui:230
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:210
 msgctxt "printoptionspage|rtl"
 msgid "Right to Left"
 msgstr "De i Chwith"
 
-#: printoptionspage.ui:254
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:232
 msgctxt "printoptionspage|label10"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: printoptionspage.ui:287
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:263
 msgctxt "printoptionspage|none"
 msgid "_None"
 msgstr "_Dim"
 
-#: printoptionspage.ui:305
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:279
 msgctxt "printoptionspage|only"
 msgid "Comments _only"
 msgstr "Nodiadau'n _unig"
 
-#: printoptionspage.ui:323
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:295
 msgctxt "printoptionspage|end"
 msgid "End of docu_ment"
 msgstr "Diwedd d_ogfen"
 
-#: printoptionspage.ui:341
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:311
 msgctxt "printoptionspage|endpage"
 msgid "_End of page"
 msgstr "Diwedd _tudalen"
 
-#: printoptionspage.ui:359
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:327
 msgctxt "printoptionspage|inmargins"
 msgid "In margins"
 msgstr "Yn yr ymylon"
 
-#: printoptionspage.ui:383
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:349
 msgctxt "printoptionspage|4"
 msgid "Comments"
 msgstr "Sylwadau"
 
-#: printoptionspage.ui:430
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:394
 msgctxt "printoptionspage|label5"
 msgid "_Fax"
 msgstr "_Ffacs"
 
-#: printoptionspage.ui:463
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:421
 msgctxt "printoptionspage|blankpages"
 msgid "Print _automatically inserted blank pages"
 msgstr "Argraffu tudalennau gwag mewnosodwyd yn _awtomatig"
 
-#: printoptionspage.ui:480
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:436
 msgctxt "printoptionspage|papertray"
 msgid "_Paper tray from printer settings"
 msgstr "Dror _papur o'r gosodiadau argraffu"
 
-#: printoptionspage.ui:503
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:457
 msgctxt "printoptionspage|label1"
 msgid "Other"
 msgstr "Arall"
 
-#: privateuserpage.ui:28
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:28
 msgctxt "privateuserpage|nameft"
 msgid "First/last _name/initials:"
 msgstr "_Enw cyntaf/olaf/llythrennau:"
 
-#: privateuserpage.ui:42
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:42
 msgctxt "privateuserpage|streetft"
 msgid "_Street:"
 msgstr "_Stryd:"
 
-#: privateuserpage.ui:56
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:56
 msgctxt "privateuserpage|countryft"
 msgid "Co_untry/state:"
 msgstr "_Gwlad/sir/talaith:"
 
-#: privateuserpage.ui:70
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:70
 msgctxt "privateuserpage|titleft"
 msgid "_Title/profession:"
 msgstr "Teitl/_swydd:"
 
-#: privateuserpage.ui:84
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:84
 msgctxt "privateuserpage|phoneft"
 msgid "Fa_x:"
 msgstr "Ffa_cs:"
 
-#: privateuserpage.ui:89
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:89
 msgctxt "privateuserpage|phoneft-atkobject"
 msgid "Home telephone number"
 msgstr "Rhif ffôn cartref"
 
-#: privateuserpage.ui:103
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:103
 msgctxt "privateuserpage|faxft"
 msgid "Homepage/e-mail:"
 msgstr "Tudalen cartref/e-bost:"
 
-#: privateuserpage.ui:126
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:125
 msgctxt "privateuserpage|firstname-atkobject"
 msgid "First name"
 msgstr "Enw cyntaf"
 
-#: privateuserpage.ui:144
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:142
 msgctxt "privateuserpage|lastname-atkobject"
 msgid "Last name"
 msgstr "Enw olaf"
 
-#: privateuserpage.ui:162
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:159
 msgctxt "privateuserpage|shortname-atkobject"
 msgid "Initials"
 msgstr "Llythrennau Blaen"
 
-#: privateuserpage.ui:192
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:188
 msgctxt "privateuserpage|title-atkobject"
 msgid "Title"
 msgstr "Teitl"
 
-#: privateuserpage.ui:210
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:205
 msgctxt "privateuserpage|job-atkobject"
 msgid "Position"
 msgstr "Safle"
 
-#: privateuserpage.ui:239
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:233
 msgctxt "privateuserpage|fax-atkobject"
 msgid "Home telephone number"
 msgstr "Rhif ffôn cartref"
 
-#: privateuserpage.ui:270
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:263
 msgctxt "privateuserpage|url-atkobject"
 msgid "FAX number"
 msgstr "Rhif Ffacs"
 
-#: privateuserpage.ui:288
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:280
 msgctxt "privateuserpage|email-atkobject"
 msgid "email address"
 msgstr "cyfeiriad e-bost"
 
-#: privateuserpage.ui:308
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:300
 msgctxt "privateuserpage|eastnameft"
 msgid "First/last _name/initials 2:"
 msgstr "Cyntaf/enw _olaf/llythrennau 2:"
 
-#: privateuserpage.ui:331
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:322
 msgctxt "privateuserpage|firstname2-atkobject"
 msgid "Last name"
 msgstr "Enw olaf"
 
-#: privateuserpage.ui:349
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:339
 msgctxt "privateuserpage|lastname2-atkobject"
 msgid "First name"
 msgstr "Enw cyntaf"
 
-#: privateuserpage.ui:367
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:356
 msgctxt "privateuserpage|shortname2-atkobject"
 msgid "Initials"
 msgstr "Llythrennau Blaen"
 
-#: privateuserpage.ui:387
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:376
 msgctxt "privateuserpage|icityft"
 msgid "_Zip/city:"
 msgstr "_Cod post/tref:"
 
-#: privateuserpage.ui:410
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:398
 msgctxt "privateuserpage|icity-atkobject"
 msgid "City"
 msgstr "Tref/Dinas"
 
-#: privateuserpage.ui:428
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:415
 msgctxt "privateuserpage|izip-atkobject"
 msgid "Zip code"
 msgstr "Cod ZIP"
 
-#: privateuserpage.ui:510
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:494
 msgctxt "privateuserpage|titleft1"
 msgid "Phone/mobile:"
 msgstr "Ffôn/symudol:"
 
-#: privateuserpage.ui:534
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:517
 msgctxt "privateuserpage|phone-atkobject"
 msgid "Title"
 msgstr "Teitl"
 
-#: privateuserpage.ui:552
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:534
 msgctxt "privateuserpage|mobile-atkobject"
 msgid "Position"
 msgstr "Safle"
 
-#: privateuserpage.ui:575
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:557
 msgctxt "privateuserpage|label1"
 msgid "Private Data"
 msgstr "Data Preifat"
 
-#: querycontinuebegindialog.ui:8
+#: sw/uiconfig/swriter/ui/querycontinuebegindialog.ui:7
 msgctxt "querycontinuebegindialog|QueryContinueBeginDialog"
 msgid "Continue at the beginning?"
 msgstr "Parhau o'r cychwyn?"
 
-#: querycontinuebegindialog.ui:14
+#: sw/uiconfig/swriter/ui/querycontinuebegindialog.ui:14
 msgctxt "querycontinuebegindialog|QueryContinueBeginDialog"
 msgid "Do you want to continue at the beginning?"
 msgstr "Hoffech chi barhau i wirio ar gychwyn y ddogfen?"
 
-#: querycontinuebegindialog.ui:15
+#: sw/uiconfig/swriter/ui/querycontinuebegindialog.ui:15
 msgctxt "querycontinuebegindialog|QueryContinueBeginDialog"
 msgid "%PRODUCTNAME Writer has searched to the end of the document."
 msgstr "Mae %PRODUCTNAME Writer wedi chwilio i ddiwedd y ddogfen."
 
-#: querycontinueenddialog.ui:8
+#: sw/uiconfig/swriter/ui/querycontinueenddialog.ui:7
 msgctxt "querycontinueenddialog|QueryContinueEndDialog"
 msgid "Continue at the end?"
 msgstr "Parhau gwirio ar ddiwedd y ddogfen?"
 
-#: querycontinueenddialog.ui:14
+#: sw/uiconfig/swriter/ui/querycontinueenddialog.ui:14
 msgctxt "querycontinueenddialog|QueryContinueEndDialog"
 msgid "Do you want to continue at the end?"
 msgstr "Hoffech chi barhau o'r diwedd?"
 
-#: querycontinueenddialog.ui:15
+#: sw/uiconfig/swriter/ui/querycontinueenddialog.ui:15
 msgctxt "querycontinueenddialog|QueryContinueEndDialog"
 msgid "%PRODUCTNAME Writer has searched to the beginning of the document."
 msgstr "Mae %PRODUCTNAME Writer wedi chwilio i ddechrau'r ddogfen."
 
-#: querydefaultcompatdialog.ui:8
+#: sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui:7
 msgctxt "querydefaultcompatdialog|QueryDefaultCompatDialog"
 msgid "Use as default?"
 msgstr "Defnyddio fel y rhagosodedig?"
 
-#: querydefaultcompatdialog.ui:14
+#: sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui:14
 msgctxt "querydefaultcompatdialog|QueryDefaultCompatDialog"
 msgid "Do you want to change the compatibility options of the default template?"
 msgstr "Hoffech chi newid dewisiadau cydweddu'r templed rhagosodedig?"
 
-#: querydefaultcompatdialog.ui:15
+#: sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui:15
 msgctxt "querydefaultcompatdialog|QueryDefaultCompatDialog"
 msgid "This will affect all new documents based on the default template."
 msgstr "Bydd hyn yn effeithio ar holl ddogfennau newydd sy'n seiliedig ar y templed rhagosodedig."
 
-#: queryrotateintostandarddialog.ui:8
+#: sw/uiconfig/swriter/ui/queryredlinedialog.ui:7
+msgctxt "queryredlinedialog|QueryRedlineDialog"
+msgid "Delete this theme?"
+msgstr "Dileu'r thema?"
+
+#: sw/uiconfig/swriter/ui/queryredlinedialog.ui:13
+msgctxt "queryredlinedialog|QueryRedlineDialog"
+msgid "AutoCorrect completed."
+msgstr "AwtoGywiro wedi ei gwblhau."
+
+#: sw/uiconfig/swriter/ui/queryredlinedialog.ui:14
+msgctxt "queryredlinedialog|QueryRedlineDialog"
+msgid ""
+"You can accept or reject all changes,\n"
+"or accept or reject particular changes."
+msgstr ""
+"Gallwch dderbyn neu wrthod pob newid\n"
+"neu dderbyn neu wrthod rhai unigol."
+
+#: sw/uiconfig/swriter/ui/queryredlinedialog.ui:26
+msgctxt "queryredlinedialog|cancel"
+msgid "Reject All"
+msgstr "Gwrthod Popeth"
+
+#: sw/uiconfig/swriter/ui/queryredlinedialog.ui:39
+msgctxt "queryredlinedialog|ok"
+msgid "Accept All"
+msgstr "Derbyn Popeth"
+
+#: sw/uiconfig/swriter/ui/queryredlinedialog.ui:55
+msgctxt "queryredlinedialog|edit"
+msgid "Edit Changes"
+msgstr "Golygu Newidiadau"
+
+#: sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui:7
 msgctxt "queryrotateintostandarddialog|QueryRotateIntoStandardOrientationDialog"
 msgid "Rotate into standard orientation?"
 msgstr "Cylchdroi i'r cyfeiriad safonol?"
 
-#: queryrotateintostandarddialog.ui:14
+#: sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui:14
 msgctxt "queryrotateintostandarddialog|QueryRotateIntoStandardOrientationDialog"
 msgid "This image is rotated. Would you like to rotate it into standard orientation?"
 msgstr "Mae'r ddelwedd wedi ei throi. Hoffech chi ei throi i'w gogwydd safonol?"
 
-#: querysavelabeldialog.ui:8
+#: sw/uiconfig/swriter/ui/querysavelabeldialog.ui:7
 msgctxt "querysavelabeldialog|QuerySaveLabelDialog"
 msgid "Save label?"
 msgstr "Cadw'r label?"
 
-#: querysavelabeldialog.ui:14
+#: sw/uiconfig/swriter/ui/querysavelabeldialog.ui:14
 msgctxt "querysavelabeldialog|QuerySaveLabelDialog"
 msgid "A label named \"%1 / %2\" already exists. Do you want to replace it?"
 msgstr "Mae label o'r enw \"%1 / %2\" yn bodoli eisoes. Hoffech chi ei newid?"
 
-#: querysavelabeldialog.ui:15
+#: sw/uiconfig/swriter/ui/querysavelabeldialog.ui:15
 msgctxt "querysavelabeldialog|QuerySaveLabelDialog"
 msgid "A label already exists with brand \"%1\" and type \"%2\". Replacing it will overwrite its contents."
 msgstr "Mae label yn bodoli gydag enw \"%1\" a math \"%2\" . Bydd ei newid yn trosysgrifo ei gynnwys."
 
-#: queryshowchangesdialog.ui:8
+#: sw/uiconfig/swriter/ui/queryshowchangesdialog.ui:7
 msgctxt "queryshowchangesdialog|QueryShowChangesDialog"
 msgid "Show changes?"
 msgstr "Dangos newidiadau?"
 
-#: queryshowchangesdialog.ui:14
+#: sw/uiconfig/swriter/ui/queryshowchangesdialog.ui:14
 msgctxt "queryshowchangesdialog|QueryShowChangesDialog"
 msgid "Do you want to show changes to avoid delays?"
 msgstr "Hoffech chi ddangos y newidiadau er mwyn osgoi oedi?"
 
-#: queryshowchangesdialog.ui:15
+#: sw/uiconfig/swriter/ui/queryshowchangesdialog.ui:15
 msgctxt "queryshowchangesdialog|QueryShowChangesDialog"
 msgid "In the current document, changes are being recorded but not shown as such. In large documents, delays can occur when the document is edited. Showing changes will avoid delays."
 msgstr "Yn y ddogfen gyfredol, mae newidiadau'n cael eu cofnodi ond heb eu dangos fel y cyfryw. Mewn dogfennau mawr, gall oedi ddigwydd pan fo dogfen yn cael ei golygu. Bydd dangos y newidiadau'n osgoi oedi."
 
-#: readonlymenu.ui:12
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:12
 msgctxt "readonlymenu|openurl"
 msgid "_Open"
 msgstr "_Agor"
 
-#: readonlymenu.ui:20
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:20
 msgctxt "readonlymenu|opendoc"
 msgid "Open in New Window"
 msgstr "Agor mewn Ffenestr Newydd"
 
-#: readonlymenu.ui:28
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:28
 msgctxt "readonlymenu|edit"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: readonlymenu.ui:36
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:36
 msgctxt "readonlymenu|selection"
 msgid "Select Text"
 msgstr "Dewis Testun"
 
-#: readonlymenu.ui:44
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:44
 msgctxt "readonlymenu|reload"
 msgid "Re_load"
 msgstr "_Ail-lwytho"
 
-#: readonlymenu.ui:52
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:52
 msgctxt "readonlymenu|reloadframe"
 msgid "Reload Frame"
 msgstr "Ail-lwytho Ffrâm"
 
-#: readonlymenu.ui:60
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:60
 msgctxt "readonlymenu|html"
 msgid "HT_ML Source"
 msgstr "Ffynhonnell HT_ML"
 
-#: readonlymenu.ui:74
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:74
 msgctxt "readonlymenu|backward"
 msgid "Backwards"
 msgstr "Nôl"
 
-#: readonlymenu.ui:82
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:82
 msgctxt "readonlymenu|forward"
 msgid "_Forward"
 msgstr "_Ymlaen"
 
-#: readonlymenu.ui:96
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:96
 msgctxt "readonlymenu|savegraphic"
 msgid "Save Image..."
 msgstr "Cadw Delwedd..."
 
-#: readonlymenu.ui:104
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:104
 msgctxt "readonlymenu|graphictogallery"
 msgid "Add Image"
 msgstr "Ychwanegu Delwedd"
 
-#: readonlymenu.ui:114
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:114
 msgctxt "readonlymenu|graphicaslink"
 msgid "As Link"
 msgstr "Fel Cyswllt"
 
-#: readonlymenu.ui:122
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:122
 msgctxt "readonlymenu|graphicascopy"
 msgid "Copy"
 msgstr "Copïo"
 
-#: readonlymenu.ui:140
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:140
 msgctxt "readonlymenu|savebackground"
 msgid "Save Background..."
 msgstr "Cadw Cefndir..."
 
-#: readonlymenu.ui:184
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:184
 msgctxt "readonlymenu|copylink"
 msgid "Copy _Link"
 msgstr "Copïo _Cyswllt"
 
-#: readonlymenu.ui:192
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:192
 msgctxt "readonlymenu|copygraphic"
 msgid "Copy _Image"
 msgstr "Copïo _Delwedd"
 
-#: readonlymenu.ui:206
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:206
 msgctxt "readonlymenu|loadgraphic"
 msgid "Load Image"
 msgstr "Llwytho Delwedd"
 
-#: readonlymenu.ui:214
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:214
 msgctxt "readonlymenu|imagesoff"
 msgid "Image Off"
 msgstr "Diffodd Delwedd"
 
-#: readonlymenu.ui:228
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:228
 msgctxt "readonlymenu|fullscreen"
 msgid "Leave Full-Screen Mode"
 msgstr "Gadael y Modd Sgrin Lawn"
 
-#: readonlymenu.ui:242
+#: sw/uiconfig/swriter/ui/readonlymenu.ui:242
 msgctxt "readonlymenu|copy"
 msgid "_Copy"
 msgstr "­_Copïo"
 
-#: renameautotextdialog.ui:8
+#: sw/uiconfig/swriter/ui/renameautotextdialog.ui:8
 msgctxt "renameautotextdialog|RenameAutoTextDialog"
 msgid "Rename AutoText"
 msgstr "Ailenwi AwtoDestun"
 
-#: renameautotextdialog.ui:77
+#: sw/uiconfig/swriter/ui/renameautotextdialog.ui:77
 msgctxt "renameautotextdialog|label2"
 msgid "Na_me"
 msgstr "E_nw"
 
-#: renameautotextdialog.ui:94
+#: sw/uiconfig/swriter/ui/renameautotextdialog.ui:94
 msgctxt "renameautotextdialog|label3"
 msgid "_New"
 msgstr "_Newydd"
 
-#: renameautotextdialog.ui:159
+#: sw/uiconfig/swriter/ui/renameautotextdialog.ui:155
 msgctxt "renameautotextdialog|label4"
 msgid "Short_cut"
 msgstr "Llwybr _byr"
 
-#: renameautotextdialog.ui:176
+#: sw/uiconfig/swriter/ui/renameautotextdialog.ui:172
 msgctxt "renameautotextdialog|label5"
 msgid "_Shortcut"
 msgstr "_Llwybr Byr"
 
-#: renameentrydialog.ui:7
+#: sw/uiconfig/swriter/ui/renameentrydialog.ui:7
 msgctxt "renameentrydialog|RenameEntryDialog"
 msgid "Rename Element"
 msgstr "Ailenwi Elfen"
 
-#: renameentrydialog.ui:98
+#: sw/uiconfig/swriter/ui/renameentrydialog.ui:97
 msgctxt "renameentrydialog|label1"
 msgid "Element Name"
 msgstr "Enw Elfen"
 
-#: renameobjectdialog.ui:8
+#: sw/uiconfig/swriter/ui/renameobjectdialog.ui:9
 msgctxt "renameobjectdialog|RenameObjectDialog"
 msgid "Rename object: "
 msgstr "Ailenwi gwrthrych: "
 
-#: renameobjectdialog.ui:100
+#: sw/uiconfig/swriter/ui/renameobjectdialog.ui:104
 msgctxt "renameobjectdialog|label2"
 msgid "New name"
 msgstr "Enw newydd"
 
-#: renameobjectdialog.ui:132
+#: sw/uiconfig/swriter/ui/renameobjectdialog.ui:133
 msgctxt "renameobjectdialog|label1"
 msgid "Change Name"
 msgstr "Newid Enw"
 
-#: rowheight.ui:14
+#: sw/uiconfig/swriter/ui/rowheight.ui:15
 msgctxt "rowheight|RowHeightDialog"
 msgid "Row Height"
 msgstr "Uchder Rhes"
 
-#: rowheight.ui:111
+#: sw/uiconfig/swriter/ui/rowheight.ui:117
 msgctxt "rowheight|fit"
 msgid "_Fit to size"
 msgstr "_Ffitio i'r maint"
 
-#: rowheight.ui:133
+#: sw/uiconfig/swriter/ui/rowheight.ui:139
 msgctxt "rowheight|label1"
 msgid "Height"
 msgstr "Uchder"
 
-#: saveashtmldialog.ui:8
+#: sw/uiconfig/swriter/ui/saveashtmldialog.ui:7
 msgctxt "saveashtmldialog|SaveAsHTMLDialog"
 msgid "Save as HTML?"
 msgstr "Cadw fel HTML?"
 
-#: saveashtmldialog.ui:14
+#: sw/uiconfig/swriter/ui/saveashtmldialog.ui:14
 msgctxt "saveashtmldialog|SaveAsHTMLDialog"
 msgid "Would you like to save the document as HTML?"
 msgstr "Hoffech chi gadw'r ddogfen fel HTML?"
 
-#: saveashtmldialog.ui:15
+#: sw/uiconfig/swriter/ui/saveashtmldialog.ui:15
 msgctxt "saveashtmldialog|SaveAsHTMLDialog"
 msgid "The source code can only be displayed if the document is saved in HTML format."
 msgstr "Dim ond os yw'r ddogfen wedi ei chadw mewn fformat HTML mae modd dangos y cod ffynhonnell."
 
-#: savelabeldialog.ui:7
+#: sw/uiconfig/swriter/ui/savelabeldialog.ui:8
 msgctxt "savelabeldialog|SaveLabelDialog"
 msgid "Save Label Format"
 msgstr "Cadw Fformat Label"
 
-#: savelabeldialog.ui:95
+#: sw/uiconfig/swriter/ui/savelabeldialog.ui:99
 msgctxt "savelabeldialog|label2"
 msgid "Brand"
 msgstr "Brand"
 
-#: savelabeldialog.ui:110
+#: sw/uiconfig/swriter/ui/savelabeldialog.ui:112
 msgctxt "savelabeldialog|label3"
 msgid "T_ype"
 msgstr "M_ath"
 
-#: savelabeldialog.ui:163
+#: sw/uiconfig/swriter/ui/savelabeldialog.ui:157
 msgctxt "savelabeldialog|label1"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: sectionpage.ui:51
+#: sw/uiconfig/swriter/ui/sectionpage.ui:51
 msgctxt "sectionpage|label4"
 msgid "New Section"
 msgstr "Adran Newydd"
 
-#: sectionpage.ui:92
+#: sw/uiconfig/swriter/ui/sectionpage.ui:92
 msgctxt "sectionpage|link"
 msgid "_Link"
 msgstr "_Cysylltu"
 
-#: sectionpage.ui:108
+#: sw/uiconfig/swriter/ui/sectionpage.ui:108
 msgctxt "sectionpage|dde"
 msgid "DD_E"
 msgstr "DD_E"
 
-#: sectionpage.ui:129
+#: sw/uiconfig/swriter/ui/sectionpage.ui:129
 msgctxt "sectionpage|sectionlabel"
 msgid "_Section"
 msgstr "_Adran"
 
-#: sectionpage.ui:182
+#: sw/uiconfig/swriter/ui/sectionpage.ui:181
 msgctxt "sectionpage|filelabel"
 msgid "_File name"
 msgstr "_Enw ffeil"
 
-#: sectionpage.ui:197
+#: sw/uiconfig/swriter/ui/sectionpage.ui:196
 msgctxt "sectionpage|ddelabel"
 msgid "DDE _command"
 msgstr "Gorchymyn _DDE"
 
-#: sectionpage.ui:215
+#: sw/uiconfig/swriter/ui/sectionpage.ui:214
 msgctxt "sectionpage|selectfile"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: sectionpage.ui:238
+#: sw/uiconfig/swriter/ui/sectionpage.ui:237
 msgctxt "sectionpage|label1"
 msgid "Link"
 msgstr "Cysylltu"
 
-#: sectionpage.ui:273
+#: sw/uiconfig/swriter/ui/sectionpage.ui:272
 msgctxt "sectionpage|protect"
 msgid "_Protect"
 msgstr "_Amddiffyn"
 
-#: sectionpage.ui:289
+#: sw/uiconfig/swriter/ui/sectionpage.ui:288
 msgctxt "sectionpage|selectpassword"
 msgid "Password..."
 msgstr "Cyfrinair..."
 
-#: sectionpage.ui:302
+#: sw/uiconfig/swriter/ui/sectionpage.ui:301
 msgctxt "sectionpage|withpassword"
 msgid "Wit_h password"
 msgstr "Gy_da chyfrinair"
 
-#: sectionpage.ui:325
+#: sw/uiconfig/swriter/ui/sectionpage.ui:324
 msgctxt "sectionpage|label2"
 msgid "Write Protection"
 msgstr "Diogelu rhag Ysgrifennu"
 
-#: sectionpage.ui:373
+#: sw/uiconfig/swriter/ui/sectionpage.ui:372
 msgctxt "sectionpage|hide"
 msgid "H_ide"
 msgstr "C­_uddio"
 
-#: sectionpage.ui:393
+#: sw/uiconfig/swriter/ui/sectionpage.ui:392
 msgctxt "sectionpage|condlabel"
 msgid "_With Condition"
 msgstr "_Gydag Amod"
 
-#: sectionpage.ui:410
+#: sw/uiconfig/swriter/ui/sectionpage.ui:409
 msgctxt "sectionpage|label3"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: sectionpage.ui:438
+#: sw/uiconfig/swriter/ui/sectionpage.ui:437
 msgctxt "sectionpage|editable"
 msgid "E_ditable in read-only document"
 msgstr "_Golygadwy mewn dogfen darllen yn unig"
 
-#: sectionpage.ui:453
+#: sw/uiconfig/swriter/ui/sectionpage.ui:452
 msgctxt "sectionpage|label5"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: selectaddressdialog.ui:9
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:9
 msgctxt "selectaddressdialog|SelectAddressDialog"
 msgid "Select Address List"
 msgstr "Dewis Rhestr Cyfeiriadau"
 
-#: selectaddressdialog.ui:86
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:86
 msgctxt "selectaddressdialog|desc"
 msgid "Select an address list. Click '%1' to select recipients from a different list. If you do not have an address list you can create one by clicking '%2'."
 msgstr "Dewiswch restr cyfeiriadau. Cliciwch '%1' i ddewis derbynnydd o restr gwahannol. Os nad oes gennych restr cyfeiriadau, gallwch greu un drwy glicio '%2'."
 
-#: selectaddressdialog.ui:108
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:108
 msgctxt "selectaddressdialog|label2"
 msgid "Your recipients are currently selected from:"
 msgstr "Mae eich derbynwyr wedi eu dewis o:"
 
-#: selectaddressdialog.ui:125
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:125
 msgctxt "selectaddressdialog|add"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: selectaddressdialog.ui:139
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:139
 msgctxt "selectaddressdialog|create"
 msgid "_Create..."
 msgstr "_Creu..."
 
-#: selectaddressdialog.ui:153
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:153
 msgctxt "selectaddressdialog|filter"
 msgid "_Filter..."
 msgstr "_Hidlo..."
 
-#: selectaddressdialog.ui:167
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:167
 msgctxt "selectaddressdialog|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: selectaddressdialog.ui:181
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:181
 msgctxt "selectaddressdialog|changetable"
 msgid "Change _Table..."
 msgstr "Newid _Tabl..."
 
-#: selectaddressdialog.ui:225
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:225
 msgctxt "selectaddressdialog|name"
 msgid "Name"
 msgstr "Enw"
 
-#: selectaddressdialog.ui:236
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:236
 msgctxt "selectaddressdialog|table"
 msgid "Table"
 msgstr "Tabl"
 
-#: selectaddressdialog.ui:253
+#: sw/uiconfig/swriter/ui/selectaddressdialog.ui:253
 msgctxt "selectaddressdialog|connecting"
 msgid "Connecting to data source..."
 msgstr "Cysylltu â'r ffynhonnell data..."
 
-#: selectautotextdialog.ui:7
+#: sw/uiconfig/swriter/ui/selectautotextdialog.ui:16
 msgctxt "selectautotextdialog|SelectAutoTextDialog"
 msgid "Select AutoText:"
 msgstr "Dewis AwtoDestun:"
 
-#: selectautotextdialog.ui:101
+#: sw/uiconfig/swriter/ui/selectautotextdialog.ui:137
 msgctxt "selectautotextdialog|label1"
 msgid "AutoText - Group"
 msgstr "AwtoDestun - Grŵp"
 
-#: selectblockdialog.ui:9
+#: sw/uiconfig/swriter/ui/selectblockdialog.ui:9
 msgctxt "selectblockdialog|SelectBlockDialog"
 msgid "Select Address Block"
 msgstr "Dewis Bloc Cyfeiriad"
 
-#: selectblockdialog.ui:90
+#: sw/uiconfig/swriter/ui/selectblockdialog.ui:90
 msgctxt "selectblockdialog|new"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: selectblockdialog.ui:104
+#: sw/uiconfig/swriter/ui/selectblockdialog.ui:104
 msgctxt "selectblockdialog|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: selectblockdialog.ui:118
+#: sw/uiconfig/swriter/ui/selectblockdialog.ui:118
 msgctxt "selectblockdialog|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: selectblockdialog.ui:142
+#: sw/uiconfig/swriter/ui/selectblockdialog.ui:142
 msgctxt "selectblockdialog|label1"
 msgid "_Select your preferred address block"
 msgstr "_Dewis eich hoff floc cyfeiriad"
 
-#: selectblockdialog.ui:171
+#: sw/uiconfig/swriter/ui/selectblockdialog.ui:171
 msgctxt "selectblockdialog|never"
 msgid "N_ever include the country/region"
 msgstr "_Peidio cynnwys y wlad/ardal"
 
-#: selectblockdialog.ui:187
+#: sw/uiconfig/swriter/ui/selectblockdialog.ui:187
 msgctxt "selectblockdialog|always"
 msgid "_Always include the country/region"
 msgstr "_Cynnwys y wlad/ardal bob tro"
 
-#: selectblockdialog.ui:203
+#: sw/uiconfig/swriter/ui/selectblockdialog.ui:203
 msgctxt "selectblockdialog|dependent"
 msgid "Only _include the country/region if it is not:"
 msgstr "_Dim ond cynnwys gwlad/ardal os nad yw'n:"
 
-#: selectblockdialog.ui:245
+#: sw/uiconfig/swriter/ui/selectblockdialog.ui:244
 msgctxt "selectblockdialog|label2"
 msgid "Address Block Settings"
 msgstr "Gosodiadau Bloc Cyfeiriad"
 
-#: selectindexdialog.ui:8
+#: sw/uiconfig/swriter/ui/selectindexdialog.ui:16
 msgctxt "selectindexdialog|SelectIndexDialog"
 msgid "Index Markings"
 msgstr "Nodau Mynegai"
 
-#: selectindexdialog.ui:116
+#: sw/uiconfig/swriter/ui/selectindexdialog.ui:150
 msgctxt "selectindexdialog|label1"
 msgid "Selection"
 msgstr "Dewis"
 
-#: selecttabledialog.ui:9
+#: sw/uiconfig/swriter/ui/selecttabledialog.ui:9
 msgctxt "selecttabledialog|SelectTableDialog"
 msgid "Select Table"
 msgstr "Dewis Tabl"
 
-#: selecttabledialog.ui:91
+#: sw/uiconfig/swriter/ui/selecttabledialog.ui:91
 msgctxt "selecttabledialog|select"
 msgid "The file you have selected contains more than one table. Please select the table containing the address list you want to use."
 msgstr "Mae'r ffeil rydych wedi ei dewis yn cynnwys mwy nag un tabl. Dewiswch y tabl sy'n cynnwys y rhestr cyfeiriadau rydych am ei defnyddio."
 
-#: selecttabledialog.ui:127
+#: sw/uiconfig/swriter/ui/selecttabledialog.ui:127
 msgctxt "selecttabledialog|preview"
 msgid "_Preview"
 msgstr "_Rhagolwg"
 
-#: sidebarpage.ui:31
+#: sw/uiconfig/swriter/ui/sidebarpage.ui:31
 msgctxt "sidebarpage|orientation|tooltip_text"
 msgid "Orientation"
 msgstr "Cyfeiriadedd"
 
-#: sidebarpage.ui:57
+#: sw/uiconfig/swriter/ui/sidebarpage.ui:57
 msgctxt "sidebarpage|size|tooltip_text"
 msgid "Size"
 msgstr "Maint"
 
-#: sidebarpage.ui:85
+#: sw/uiconfig/swriter/ui/sidebarpage.ui:85
 msgctxt "sidebarpage|column|tooltip_text"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: sidebarpage.ui:112
+#: sw/uiconfig/swriter/ui/sidebarpage.ui:112
 msgctxt "sidebarpage|margin|tooltip_text"
 msgid "Margin"
 msgstr "Ymyl"
 
-#: sidebartheme.ui:27
+#: sw/uiconfig/swriter/ui/sidebartheme.ui:27
 msgctxt "sidebartheme|label1"
 msgid "Fonts"
 msgstr "Ffontiau"
 
-#: sidebartheme.ui:53
+#: sw/uiconfig/swriter/ui/sidebartheme.ui:53
 msgctxt "sidebartheme|label2"
 msgid "Colors"
 msgstr "Lliwiau"
 
-#: sidebarwrap.ui:29
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:30
 msgctxt "sidebarwrap|buttonnone|tooltip_text"
 msgid "None"
 msgstr "Dim"
 
-#: sidebarwrap.ui:36
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:37
 msgctxt "sidebarwrap|buttonnone-atkobject"
 msgid "None"
 msgstr "Dim"
 
-#: sidebarwrap.ui:52
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:54
 msgctxt "sidebarwrap|buttonparallel|tooltip_text"
 msgid "Parallel"
 msgstr "Paralel"
 
-#: sidebarwrap.ui:59
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:61
 msgctxt "sidebarwrap|buttonparallel-atkobject"
 msgid "Parallel"
 msgstr "Paralel"
 
-#: sidebarwrap.ui:75
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:78
 msgctxt "sidebarwrap|buttonoptimal|tooltip_text"
 msgid "Optimal"
 msgstr "Optimaidd"
 
-#: sidebarwrap.ui:82
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:85
 msgctxt "sidebarwrap|buttonoptimal-atkobject"
 msgid "Optimal"
 msgstr "Gorau"
 
-#: sidebarwrap.ui:98
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:102
 msgctxt "sidebarwrap|buttonbefore|tooltip_text"
 msgid "Before"
 msgstr "Cyn"
 
-#: sidebarwrap.ui:105
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:109
 msgctxt "sidebarwrap|buttonbefore-atkobject"
 msgid "Before"
 msgstr "Cyn"
 
-#: sidebarwrap.ui:121
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:126
 msgctxt "sidebarwrap|buttonafter|tooltip_text"
 msgid "After"
 msgstr "Wedi"
 
-#: sidebarwrap.ui:128
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:133
 msgctxt "sidebarwrap|buttonafter-atkobject"
 msgid "After"
 msgstr "Wedi"
 
-#: sidebarwrap.ui:144
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:150
 msgctxt "sidebarwrap|buttonthrough|tooltip_text"
 msgid "Through"
 msgstr "Drwy"
 
-#: sidebarwrap.ui:151
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:157
 msgctxt "sidebarwrap|buttonthrough-atkobject"
 msgid "Through"
 msgstr "Drwodd"
 
-#: sidebarwrap.ui:175
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:181
 msgctxt "sidebarwrap|enablecontour"
 msgid "Enable Contour"
 msgstr "Galluogi Amlinell"
 
-#: sidebarwrap.ui:179
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:186
 msgctxt "sidebarwrap|enablecontour|tooltip_text"
 msgid "Click to automatically trim unnecessary parts of the image"
 msgstr "Cliciwch i docio'n awtomatig ddarnau diangen o'r ddelwedd"
 
-#: sidebarwrap.ui:191
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:198
 msgctxt "sidebarwrap|editcontour"
 msgid "Edit Contour"
 msgstr "Golygu Amlinell"
 
-#: sidebarwrap.ui:195
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:202
 msgctxt "sidebarwrap|editcontour|tooltip_text"
 msgid "Edit the trimmed area of the image"
 msgstr "Golygu'r darnau o'r ddelwedd a dociwyd"
 
-#: sidebarwrap.ui:219
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:226
 msgctxt "sidebarwrap|label1"
 msgid "Spacing:"
 msgstr "Bylchu:"
 
-#: sidebarwrap.ui:231
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:238
 msgctxt "sidebarwrap|spacingLB|tooltip_text"
 msgid "Set the amount of space between the image and surrounding text"
 msgstr "Gosod maint y gofod rhwng y ddelwedd a'r testun o'i hamgylch"
 
-#: sidebarwrap.ui:249
+#: sw/uiconfig/swriter/ui/sidebarwrap.ui:256
 msgctxt "sidebarwrap|customlabel"
 msgid "Custom"
 msgstr "Cyfaddas"
 
-#: sortdialog.ui:16
+#: sw/uiconfig/swriter/ui/sortdialog.ui:29
 msgctxt "sortdialog|SortDialog"
 msgid "Sort"
 msgstr "Trefnu"
 
-#: sortdialog.ui:111
+#: sw/uiconfig/swriter/ui/sortdialog.ui:127
 msgctxt "sortdialog|column"
 msgid "Column"
 msgstr "Colofn"
 
-#: sortdialog.ui:127
+#: sw/uiconfig/swriter/ui/sortdialog.ui:143
 msgctxt "sortdialog|keytype"
 msgid "Key type"
 msgstr "Math o allwedd"
 
-#: sortdialog.ui:143
+#: sw/uiconfig/swriter/ui/sortdialog.ui:159
 msgctxt "sortdialog|order"
 msgid "Order"
 msgstr "Trefn"
 
-#: sortdialog.ui:157
+#: sw/uiconfig/swriter/ui/sortdialog.ui:173
 msgctxt "sortdialog|up1"
 msgid "Ascending"
 msgstr "Esgyn"
 
-#: sortdialog.ui:177
+#: sw/uiconfig/swriter/ui/sortdialog.ui:192
 msgctxt "sortdialog|down1"
 msgid "Descending"
 msgstr "Disgyn"
 
-#: sortdialog.ui:207
+#: sw/uiconfig/swriter/ui/sortdialog.ui:223
 msgctxt "sortdialog|up2"
 msgid "Ascending"
 msgstr "Esgyn"
 
-#: sortdialog.ui:226
+#: sw/uiconfig/swriter/ui/sortdialog.ui:242
 msgctxt "sortdialog|down2"
 msgid "Descending"
 msgstr "Disgyn"
 
-#: sortdialog.ui:256
+#: sw/uiconfig/swriter/ui/sortdialog.ui:273
 msgctxt "sortdialog|up3"
 msgid "Ascending"
 msgstr "Esgyn"
 
-#: sortdialog.ui:275
+#: sw/uiconfig/swriter/ui/sortdialog.ui:292
 msgctxt "sortdialog|down3"
 msgid "Descending"
 msgstr "Disgyn"
 
-#: sortdialog.ui:300
+#: sw/uiconfig/swriter/ui/sortdialog.ui:318
 msgctxt "sortdialog|key1"
 msgid "Key 1"
 msgstr "Allwedd 1"
 
-#: sortdialog.ui:316
+#: sw/uiconfig/swriter/ui/sortdialog.ui:335
 msgctxt "sortdialog|key2"
 msgid "Key 2"
 msgstr "Allwedd 2"
 
-#: sortdialog.ui:331
+#: sw/uiconfig/swriter/ui/sortdialog.ui:351
 msgctxt "sortdialog|key3"
 msgid "Key 3"
 msgstr "Allwedd 3"
 
-#: sortdialog.ui:408
+#: sw/uiconfig/swriter/ui/sortdialog.ui:428
 msgctxt "sortdialog|typelb1-atkobject"
 msgid "Key type"
 msgstr "Math o fysell"
 
-#: sortdialog.ui:431
+#: sw/uiconfig/swriter/ui/sortdialog.ui:450
 msgctxt "sortdialog|typelb2-atkobject"
 msgid "Key type"
 msgstr "Math fysell"
 
-#: sortdialog.ui:452
+#: sw/uiconfig/swriter/ui/sortdialog.ui:471
 msgctxt "sortdialog|typelb3-atkobject"
 msgid "Key type"
 msgstr "Math fysell"
 
-#: sortdialog.ui:472
+#: sw/uiconfig/swriter/ui/sortdialog.ui:491
 msgctxt "sortdialog|1"
 msgid "Sort Criteria"
 msgstr "Meini Prawf Trefnu"
 
-#: sortdialog.ui:512
+#: sw/uiconfig/swriter/ui/sortdialog.ui:531
 msgctxt "sortdialog|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: sortdialog.ui:528
+#: sw/uiconfig/swriter/ui/sortdialog.ui:547
 msgctxt "sortdialog|rows"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: sortdialog.ui:550
+#: sw/uiconfig/swriter/ui/sortdialog.ui:569
 msgctxt "sortdialog|label3"
 msgid "Direction"
 msgstr "Cyfeiriad"
 
-#: sortdialog.ui:583
+#: sw/uiconfig/swriter/ui/sortdialog.ui:602
 msgctxt "sortdialog|tabs"
 msgid "Tabs"
 msgstr "Tabiau"
 
-#: sortdialog.ui:600
+#: sw/uiconfig/swriter/ui/sortdialog.ui:619
 msgctxt "sortdialog|character"
 msgid "Character "
 msgstr "Nod "
 
-#: sortdialog.ui:641
+#: sw/uiconfig/swriter/ui/sortdialog.ui:662
 msgctxt "sortdialog|delimpb"
 msgid "Select..."
 msgstr "Dewis..."
 
-#: sortdialog.ui:669
+#: sw/uiconfig/swriter/ui/sortdialog.ui:690
 msgctxt "sortdialog|label4"
 msgid "Separator"
 msgstr "Ymwahanydd"
 
-#: sortdialog.ui:719
+#: sw/uiconfig/swriter/ui/sortdialog.ui:746
 msgctxt "sortdialog|label1"
 msgid "Language"
 msgstr "Iaith"
 
-#: sortdialog.ui:745
+#: sw/uiconfig/swriter/ui/sortdialog.ui:772
 msgctxt "sortdialog|matchcase"
 msgid "Match case"
 msgstr "Cydweddu maint"
 
-#: sortdialog.ui:759
+#: sw/uiconfig/swriter/ui/sortdialog.ui:787
 msgctxt "sortdialog|label2"
 msgid "Setting"
 msgstr "Gosodiad"
 
-#: spellmenu.ui:12
+#: sw/uiconfig/swriter/ui/spellmenu.ui:12
 msgctxt "spellmenu|ignoreall"
 msgid "I_gnore All"
 msgstr "Anwybyddu _Popeth"
 
-#: spellmenu.ui:20
+#: sw/uiconfig/swriter/ui/spellmenu.ui:20
 msgctxt "spellmenu|addmenu"
 msgid "_Add to Dictionary"
 msgstr "_Ychwanegu at y Geiriadur"
 
-#: spellmenu.ui:34
+#: sw/uiconfig/swriter/ui/spellmenu.ui:34
 msgctxt "spellmenu|add"
 msgid "_Add to Dictionary"
 msgstr "_Ychwanegu at y Geiriadur"
 
-#: spellmenu.ui:55
+#: sw/uiconfig/swriter/ui/spellmenu.ui:55
 msgctxt "spellmenu|correctmenu"
 msgid "Always correct _to"
 msgstr "Cywiro _Bob Tro i"
 
-#: spellmenu.ui:81
+#: sw/uiconfig/swriter/ui/spellmenu.ui:81
 msgctxt "spellmenu|langselection"
 msgid "Set Language for Selection"
 msgstr "Gosod Iaith ar gyfer y Dewis"
 
-#: spellmenu.ui:94
+#: sw/uiconfig/swriter/ui/spellmenu.ui:94
 msgctxt "spellmenu|langpara"
 msgid "Set Language for Paragraph"
 msgstr "Gosod Iaith ar gyfer y Paragraff"
 
-#: spellmenu.ui:113
+#: sw/uiconfig/swriter/ui/spellmenu.ui:113
 msgctxt "spellmenu|accept"
 msgid "Accept Change"
 msgstr "Derbyn Newid"
 
-#: spellmenu.ui:121
+#: sw/uiconfig/swriter/ui/spellmenu.ui:121
 msgctxt "spellmenu|reject"
 msgid "Reject Change"
 msgstr "Gwrthod Newid"
 
-#: spellmenu.ui:129
+#: sw/uiconfig/swriter/ui/spellmenu.ui:129
 msgctxt "spellmenu|next"
 msgid "Next Change"
 msgstr "Newid Nesaf"
 
-#: spellmenu.ui:137
+#: sw/uiconfig/swriter/ui/spellmenu.ui:137
 msgctxt "spellmenu|prev"
 msgid "Previous Change"
 msgstr "Newid Blaenorol"
 
-#: splittable.ui:7
+#: sw/uiconfig/swriter/ui/splittable.ui:8
 msgctxt "splittable|SplitTableDialog"
 msgid "Split Table"
 msgstr "Hollti Tabl"
 
-#: splittable.ui:89
+#: sw/uiconfig/swriter/ui/splittable.ui:94
 msgctxt "splittable|copyheading"
 msgid "Copy heading"
 msgstr "Copïo pennawd"
 
-#: splittable.ui:108
+#: sw/uiconfig/swriter/ui/splittable.ui:111
 msgctxt "splittable|customheadingapplystyle"
 msgid "Custom heading (apply Style)"
 msgstr "Pennawd cyfaddas (gosod Arddull)"
 
-#: splittable.ui:125
+#: sw/uiconfig/swriter/ui/splittable.ui:127
 msgctxt "splittable|customheading"
 msgid "Custom heading"
 msgstr "Pennawd cyfaddas"
 
-#: splittable.ui:142
+#: sw/uiconfig/swriter/ui/splittable.ui:143
 msgctxt "splittable|noheading"
 msgid "No heading"
 msgstr "Dim pennawd"
 
-#: splittable.ui:165
+#: sw/uiconfig/swriter/ui/splittable.ui:165
 msgctxt "splittable|label1"
 msgid "Mode"
 msgstr "Modd"
 
-#: statisticsinfopage.ui:16
+#: sw/uiconfig/swriter/ui/statisticsinfopage.ui:16
 msgctxt "statisticsinfopage|label4"
 msgid "Pages:"
 msgstr "Tudalennau:"
 
-#: statisticsinfopage.ui:30
+#: sw/uiconfig/swriter/ui/statisticsinfopage.ui:30
 msgctxt "statisticsinfopage|label5"
 msgid "Tables:"
 msgstr "Tablau:"
 
-#: statisticsinfopage.ui:44
+#: sw/uiconfig/swriter/ui/statisticsinfopage.ui:44
 msgctxt "statisticsinfopage|label6"
 msgid "Images:"
 msgstr "Delweddau:"
 
-#: statisticsinfopage.ui:58
+#: sw/uiconfig/swriter/ui/statisticsinfopage.ui:58
 msgctxt "statisticsinfopage|label31"
 msgid "OLE objects:"
 msgstr "Gwrthrychau OLE:"
 
-#: statisticsinfopage.ui:72
+#: sw/uiconfig/swriter/ui/statisticsinfopage.ui:72
 msgctxt "statisticsinfopage|label32"
 msgid "Paragraphs:"
 msgstr "Paragraffau:"
 
-#: statisticsinfopage.ui:86
+#: sw/uiconfig/swriter/ui/statisticsinfopage.ui:86
 msgctxt "statisticsinfopage|label33"
 msgid "Words:"
 msgstr "Geiriau:"
 
-#: statisticsinfopage.ui:100
+#: sw/uiconfig/swriter/ui/statisticsinfopage.ui:100
 msgctxt "statisticsinfopage|label34"
 msgid "Characters:"
 msgstr "Nodau:"
 
-#: statisticsinfopage.ui:114
+#: sw/uiconfig/swriter/ui/statisticsinfopage.ui:114
 msgctxt "statisticsinfopage|label35"
 msgid "Characters excluding spaces:"
 msgstr "Nodau heb gynnwys bylchau:"
 
-#: statisticsinfopage.ui:128
+#: sw/uiconfig/swriter/ui/statisticsinfopage.ui:128
 msgctxt "statisticsinfopage|lineft"
 msgid "Lines:"
 msgstr "Llinellau:"
 
-#: statisticsinfopage.ui:248
+#: sw/uiconfig/swriter/ui/statisticsinfopage.ui:248
 msgctxt "statisticsinfopage|update"
 msgid "Update"
 msgstr "Diweddaru"
 
-#: stringinput.ui:70
+#: sw/uiconfig/swriter/ui/stringinput.ui:73
 msgctxt "stringinput|name"
 msgid "Name"
 msgstr "Enw"
 
-#: subjectdialog.ui:6
+#: sw/uiconfig/swriter/ui/subjectdialog.ui:7
+msgctxt "subjectdialog|SubjectDialog"
+msgid "No Subject"
+msgstr "Dim Pwnc"
+
+#: sw/uiconfig/swriter/ui/subjectdialog.ui:12
 msgctxt "subjectdialog|textbuffer1"
 msgid "You did not specify a subject for this message."
 msgstr "Nid ydych wedi enwi pwnc ar gyfer y neges hon."
 
-#: subjectdialog.ui:9
+#: sw/uiconfig/swriter/ui/subjectdialog.ui:13
 msgctxt "subjectdialog|textbuffer2"
 msgid "If you would like to provide one, please type it now."
 msgstr "Os hoffech ddarparu un, gwnewch hynny nawr."
 
-#: subjectdialog.ui:14
-msgctxt "subjectdialog|SubjectDialog"
-msgid "No Subject"
-msgstr "Dim Pwnc"
-
-#: subjectdialog.ui:138
+#: sw/uiconfig/swriter/ui/subjectdialog.ui:82
 msgctxt "subjectdialog|label1"
 msgid "Subject:"
 msgstr "Pwnc:"
 
-#: tablecolumnpage.ui:36
+#: sw/uiconfig/swriter/ui/tablecolumnpage.ui:36
 msgctxt "tablecolumnpage|adaptwidth"
 msgid "Adapt table _width"
 msgstr "_Addasu lled tabl"
 
-#: tablecolumnpage.ui:51
+#: sw/uiconfig/swriter/ui/tablecolumnpage.ui:51
 msgctxt "tablecolumnpage|adaptcolumns"
 msgid "Ad_just columns proportionally"
 msgstr "_Addasu colofnau'n gymesur"
 
-#: tablecolumnpage.ui:73
+#: sw/uiconfig/swriter/ui/tablecolumnpage.ui:73
 msgctxt "tablecolumnpage|spaceft"
 msgid "Remaining space:"
 msgstr "Bwlch ar ôl:"
 
-#: tablecolumnpage.ui:134
+#: sw/uiconfig/swriter/ui/tablecolumnpage.ui:132
 msgctxt "tablecolumnpage|width2-atkobject"
 msgid "Column 2 Width"
 msgstr "Lled Colofn 2"
 
-#: tablecolumnpage.ui:155
+#: sw/uiconfig/swriter/ui/tablecolumnpage.ui:152
 msgctxt "tablecolumnpage|width3-atkobject"
 msgid "Column 3 Width"
 msgstr "Lled Colofn 3"
 
-#: tablecolumnpage.ui:176
+#: sw/uiconfig/swriter/ui/tablecolumnpage.ui:172
 msgctxt "tablecolumnpage|width4-atkobject"
 msgid "Column 4 Width"
 msgstr "Lled Colofn 4"
 
-#: tablecolumnpage.ui:197
+#: sw/uiconfig/swriter/ui/tablecolumnpage.ui:192
 msgctxt "tablecolumnpage|width5-atkobject"
 msgid "Column 5 Width"
 msgstr "Lled Colofn 5"
 
-#: tablecolumnpage.ui:218
+#: sw/uiconfig/swriter/ui/tablecolumnpage.ui:212
 msgctxt "tablecolumnpage|width6-atkobject"
 msgid "Column 6 Width"
 msgstr "Lled Colofn 6"
 
-#: tablecolumnpage.ui:324
+#: sw/uiconfig/swriter/ui/tablecolumnpage.ui:317
 msgctxt "tablecolumnpage|width1-atkobject"
 msgid "Column 1 Width"
 msgstr "Lled Colofn 1"
 
-#: tablecolumnpage.ui:370
+#: sw/uiconfig/swriter/ui/tablecolumnpage.ui:363
 msgctxt "tablecolumnpage|label26"
 msgid "Column Width"
 msgstr "Lled Colofn"
 
-#: tablepreviewdialog.ui:8
+#: sw/uiconfig/swriter/ui/tablepreviewdialog.ui:8
 msgctxt "tablepreviewdialog|TablePreviewDialog"
 msgid "Mail Merge Recipients"
 msgstr "Derbynwyr Cyfuno Post"
 
-#: tablepreviewdialog.ui:51
+#: sw/uiconfig/swriter/ui/tablepreviewdialog.ui:51
 msgctxt "tablepreviewdialog|description"
 msgid "The list below shows the contents of: %1"
 msgstr "Mae'r rhestr islaw yn dangos cynnwys: %1"
 
-#: tableproperties.ui:8
+#: sw/uiconfig/swriter/ui/tableproperties.ui:8
 msgctxt "tableproperties|TablePropertiesDialog"
 msgid "Table Properties"
 msgstr "Priodoleddau Tabl"
 
-#: tableproperties.ui:106
+#: sw/uiconfig/swriter/ui/tableproperties.ui:106
 msgctxt "tableproperties|table"
 msgid "Table"
 msgstr "Tabl"
 
-#: tableproperties.ui:128
+#: sw/uiconfig/swriter/ui/tableproperties.ui:128
 msgctxt "tableproperties|textflow"
 msgid "Text Flow"
 msgstr "Llif Testun"
 
-#: tableproperties.ui:151
+#: sw/uiconfig/swriter/ui/tableproperties.ui:151
 msgctxt "tableproperties|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: tableproperties.ui:174
+#: sw/uiconfig/swriter/ui/tableproperties.ui:174
 msgctxt "tableproperties|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: tableproperties.ui:197
+#: sw/uiconfig/swriter/ui/tableproperties.ui:197
 msgctxt "tableproperties|background"
 msgid "Background"
 msgstr "Cefndir"
 
-#: tabletextflowpage.ui:25
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:25
 msgctxt "tabletextflowpage|liststore1"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: tabletextflowpage.ui:29
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:29
 msgctxt "tabletextflowpage|liststore1"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: tabletextflowpage.ui:33
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:33
 msgctxt "tabletextflowpage|liststore1"
 msgid "Use superordinate object settings"
 msgstr "Defnyddio gosodiadau gwrthrych uwcholyn"
 
-#: tabletextflowpage.ui:47
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:47
 msgctxt "tabletextflowpage|liststore2"
 msgid "Top"
 msgstr "Brig"
 
-#: tabletextflowpage.ui:51
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:51
 msgctxt "tabletextflowpage|liststore2"
 msgid "Centered"
 msgstr "Canoli"
 
-#: tabletextflowpage.ui:55
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:55
 msgctxt "tabletextflowpage|liststore2"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: tabletextflowpage.ui:97
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:97
 msgctxt "tabletextflowpage|break"
 msgid "_Break"
 msgstr "_Toriad"
 
-#: tabletextflowpage.ui:112
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:112
 msgctxt "tabletextflowpage|page"
 msgid "_Page"
 msgstr "T_udalen"
 
-#: tabletextflowpage.ui:132
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:132
 msgctxt "tabletextflowpage|column"
 msgid "Col_umn"
 msgstr "_Colofn"
 
-#: tabletextflowpage.ui:151
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:151
 msgctxt "tabletextflowpage|before"
 msgid "Be_fore"
 msgstr "Cy_nt"
 
-#: tabletextflowpage.ui:171
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:171
 msgctxt "tabletextflowpage|after"
 msgid "_After"
 msgstr "_Wedi"
 
-#: tabletextflowpage.ui:203
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:203
 msgctxt "tabletextflowpage|pagestyle"
 msgid "With Page St_yle"
 msgstr "Gydag Arddull _Tudalen"
 
-#: tabletextflowpage.ui:224
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:224
 msgctxt "tabletextflowpage|pagenoft"
 msgid "Page _number"
 msgstr "Rhif _tudalen"
 
-#: tabletextflowpage.ui:258
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:257
 msgctxt "tabletextflowpage|pagestylelb-atkobject"
 msgid "With Page Style"
 msgstr "Gydag Arddull Tudalen"
 
-#: tabletextflowpage.ui:275
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:274
 msgctxt "tabletextflowpage|split"
 msgid "Allow _table to split across pages and columns"
 msgstr "Caniatáu i _dabl hollti ar draws tudalennau a cholofnau"
 
-#: tabletextflowpage.ui:290
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:289
 msgctxt "tabletextflowpage|splitrow"
 msgid "Allow row to break a_cross pages and columns"
 msgstr "Caniatáu i _res dorri ar draws tudalennau a cholofnau"
 
-#: tabletextflowpage.ui:307
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:306
 msgctxt "tabletextflowpage|keep"
 msgid "_Keep with next paragraph"
 msgstr "C_adw gyda'r paragraff nesaf"
 
-#: tabletextflowpage.ui:329
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:328
 msgctxt "tabletextflowpage|label40"
 msgid "Text _orientation"
 msgstr "Cyfeiriad _testun"
 
-#: tabletextflowpage.ui:362
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:361
 msgctxt "tabletextflowpage|headline"
 msgid "R_epeat heading"
 msgstr "_Ailadrodd pennawd"
 
-#: tabletextflowpage.ui:384
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:383
 msgctxt "tabletextflowpage|label38"
 msgid "The first "
 msgstr "Y cyntaf "
 
-#: tabletextflowpage.ui:397
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:396
 msgctxt "tabletextflowpage|label39"
 msgid "rows"
 msgstr "rhesi"
 
-#: tabletextflowpage.ui:436
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:434
 msgctxt "tabletextflowpage|label35"
 msgid "Text Flow"
 msgstr "Llif Testun"
 
-#: tabletextflowpage.ui:469
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:467
 msgctxt "tabletextflowpage|label41"
 msgid "_Vertical alignment"
 msgstr "_Aliniad fertigol"
 
-#: tabletextflowpage.ui:497
+#: sw/uiconfig/swriter/ui/tabletextflowpage.ui:495
 msgctxt "tabletextflowpage|label36"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: templatedialog1.ui:8
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:8
 msgctxt "templatedialog1|TemplateDialog1"
 msgid "Character Style"
 msgstr "Arddull Nod"
 
-#: templatedialog1.ui:97
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:51
 msgctxt "templatedialog1|standard"
 msgid "_Standard"
 msgstr "_Safonol"
 
-#: templatedialog1.ui:136
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:161
 msgctxt "templatedialog1|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: templatedialog1.ui:158
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:207
 msgctxt "templatedialog1|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: templatedialog1.ui:181
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:254
 msgctxt "templatedialog1|fonteffect"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: templatedialog1.ui:204
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:301
 msgctxt "templatedialog1|position"
 msgid "Position"
 msgstr "Safle"
 
-#: templatedialog1.ui:227
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:348
 msgctxt "templatedialog1|asianlayout"
 msgid "Asian Layout"
 msgstr "Cynllun Asiaidd"
 
-#: templatedialog1.ui:250
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:395
 msgctxt "templatedialog1|background"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: templatedialog1.ui:273
+#: sw/uiconfig/swriter/ui/templatedialog1.ui:442
 msgctxt "templatedialog1|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: templatedialog16.ui:8
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:8
 msgctxt "templatedialog16|TemplateDialog16"
 msgid "Numbering Style"
 msgstr "Arddull Rhifo"
 
-#: templatedialog16.ui:122
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:147
 msgctxt "templatedialog16|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: templatedialog16.ui:144
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:193
 msgctxt "templatedialog16|bullets"
 msgid "Bullets"
 msgstr "Bwledi"
 
-#: templatedialog16.ui:167
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:240
 msgctxt "templatedialog16|numbering"
 msgid "Numbering Style"
 msgstr "Arddull Rhifo"
 
-#: templatedialog16.ui:190
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:287
 msgctxt "templatedialog16|outline"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: templatedialog16.ui:213
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:334
 msgctxt "templatedialog16|graphics"
 msgid "Image"
 msgstr "Delwedd"
 
-#: templatedialog16.ui:236
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:381
 msgctxt "templatedialog16|position"
 msgid "Position"
 msgstr "Safle"
 
-#: templatedialog16.ui:259
+#: sw/uiconfig/swriter/ui/templatedialog16.ui:428
 msgctxt "templatedialog16|customize"
 msgid "Customize"
 msgstr "Cyfaddasu"
 
-#: templatedialog2.ui:8
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:8
 msgctxt "templatedialog2|TemplateDialog2"
 msgid "Paragraph Style"
 msgstr "Arddull Paragraff"
 
-#: templatedialog2.ui:97
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:51
 msgctxt "templatedialog2|standard"
 msgid "_Standard"
 msgstr "­­_Safonol"
 
-#: templatedialog2.ui:136
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:161
 msgctxt "templatedialog2|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: templatedialog2.ui:158
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:207
 msgctxt "templatedialog2|indents"
 msgid "Indents & Spacing"
 msgstr "Mewnoliad a Bylchu"
 
-#: templatedialog2.ui:181
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:254
 msgctxt "templatedialog2|alignment"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: templatedialog2.ui:204
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:301
 msgctxt "templatedialog2|textflow"
 msgid "Text Flow"
 msgstr "Llif Testun"
 
-#: templatedialog2.ui:227
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:348
 msgctxt "templatedialog2|asiantypo"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: templatedialog2.ui:250
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:395
 msgctxt "templatedialog2|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: templatedialog2.ui:273
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:442
 msgctxt "templatedialog2|fonteffect"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: templatedialog2.ui:296
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:489
 msgctxt "templatedialog2|position"
 msgid "Position"
 msgstr "Safle"
 
-#: templatedialog2.ui:319
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:536
 msgctxt "templatedialog2|asianlayout"
 msgid "Asian Layout"
 msgstr "Cynllun Asiaidd"
 
-#: templatedialog2.ui:342
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:583
 msgctxt "templatedialog2|highlighting"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: templatedialog2.ui:365
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:630
 msgctxt "templatedialog2|tabs"
 msgid "Tabs"
 msgstr "Tabiau"
 
-#: templatedialog2.ui:388
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:677
 msgctxt "templatedialog2|dropcaps"
 msgid "Drop Caps"
 msgstr "Dim Prif Lythrennau Bach"
 
-#: templatedialog2.ui:411
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:724
 msgctxt "templatedialog2|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: templatedialog2.ui:434
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:771
 msgctxt "templatedialog2|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: templatedialog2.ui:457
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:818
 msgctxt "templatedialog2|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: templatedialog2.ui:480
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:865
 msgctxt "templatedialog2|condition"
 msgid "Condition"
 msgstr "Gydag Amod"
 
-#: templatedialog2.ui:503
+#: sw/uiconfig/swriter/ui/templatedialog2.ui:912
 msgctxt "templatedialog2|outline"
 msgid "Outline & Numbering"
 msgstr "Amlinell a Rhifo"
 
-#: templatedialog4.ui:8
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:8
 msgctxt "templatedialog4|TemplateDialog4"
 msgid "Frame Style"
 msgstr "Arddull Ffrâm"
 
-#: templatedialog4.ui:97
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:51
 msgctxt "templatedialog4|standard"
 msgid "_Standard"
 msgstr "_Safonol"
 
-#: templatedialog4.ui:136
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:161
 msgctxt "templatedialog4|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: templatedialog4.ui:158
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:207
 msgctxt "templatedialog4|type"
 msgid "Type"
 msgstr "Math"
 
-#: templatedialog4.ui:181
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:254
 msgctxt "templatedialog4|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: templatedialog4.ui:204
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:301
 msgctxt "templatedialog4|wrap"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: templatedialog4.ui:227
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:348
 msgctxt "templatedialog4|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: templatedialog4.ui:250
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:395
 msgctxt "templatedialog4|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: templatedialog4.ui:273
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:442
 msgctxt "templatedialog4|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: templatedialog4.ui:296
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:489
 msgctxt "templatedialog4|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: templatedialog4.ui:319
+#: sw/uiconfig/swriter/ui/templatedialog4.ui:536
 msgctxt "templatedialog4|macros"
 msgid "Macro"
 msgstr "Macro"
 
-#: templatedialog8.ui:8
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:8
 msgctxt "templatedialog8|TemplateDialog8"
 msgid "Page Style"
 msgstr "Arddull Tudalen"
 
-#: templatedialog8.ui:122
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:147
 msgctxt "templatedialog8|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: templatedialog8.ui:144
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:193
 msgctxt "templatedialog8|page"
 msgid "Page"
 msgstr "Tudalen"
 
-#: templatedialog8.ui:167
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:240
 msgctxt "templatedialog8|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: templatedialog8.ui:190
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:287
 msgctxt "templatedialog8|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: templatedialog8.ui:213
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:334
 msgctxt "templatedialog8|header"
 msgid "Header"
 msgstr "Pennyn"
 
-#: templatedialog8.ui:236
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:381
 msgctxt "templatedialog8|footer"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: templatedialog8.ui:259
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:428
 msgctxt "templatedialog8|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: templatedialog8.ui:282
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:475
 msgctxt "templatedialog8|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: templatedialog8.ui:305
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:522
 msgctxt "templatedialog8|footnotes"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: templatedialog8.ui:328
+#: sw/uiconfig/swriter/ui/templatedialog8.ui:569
 msgctxt "templatedialog8|textgrid"
 msgid "Text Grid"
 msgstr "Grid Testun"
 
-#: testmailsettings.ui:6
+#: sw/uiconfig/swriter/ui/testmailsettings.ui:6
 msgctxt "testmailsettings|textbuffer1"
 msgid "%PRODUCTNAME could not connect to the outgoing mail server. Check your system's settings and the settings in %PRODUCTNAME. Check the server name, the port and the secure connections settings"
 msgstr "Methodd %PRODUCTNAME â chysylltu â'r gweinydd e-bost allfynd. Gwiriwch osodiadau eich system a gosodiadau %PRODUCTNAME. Gwiriwch enw'r gweinydd, y porth a gosodiadau'r cyswllt diogel"
 
-#: testmailsettings.ui:11
+#: sw/uiconfig/swriter/ui/testmailsettings.ui:11
 msgctxt "testmailsettings|TestMailSettings"
 msgid "Test Account Settings"
 msgstr "Gosodiadau Cyfrif Prawf"
 
-#: testmailsettings.ui:124
+#: sw/uiconfig/swriter/ui/testmailsettings.ui:124
 msgctxt "testmailsettings|establish"
 msgid "Establish network connection"
 msgstr "Sefydlu cyswllt rhwydwaith"
 
-#: testmailsettings.ui:136
+#: sw/uiconfig/swriter/ui/testmailsettings.ui:136
 msgctxt "testmailsettings|find"
 msgid "Find outgoing mail server"
 msgstr "Canfod gweinydd e-bost allfynd"
 
-#: testmailsettings.ui:148
+#: sw/uiconfig/swriter/ui/testmailsettings.ui:148
 msgctxt "testmailsettings|result1"
 msgid "Successful"
 msgstr "Llwyddiant"
 
-#: testmailsettings.ui:160
+#: sw/uiconfig/swriter/ui/testmailsettings.ui:160
 msgctxt "testmailsettings|result2"
 msgid "Failed"
 msgstr "Methiant"
 
-#: testmailsettings.ui:175
+#: sw/uiconfig/swriter/ui/testmailsettings.ui:175
 msgctxt "testmailsettings|label8"
 msgid "%PRODUCTNAME is testing the e-mail account settings..."
 msgstr "Mae %PRODUCTNAME yn profi gosodiadau'r cyfrif e-bost..."
 
-#: testmailsettings.ui:241
+#: sw/uiconfig/swriter/ui/testmailsettings.ui:241
 msgctxt "testmailsettings|label1"
 msgid "Errors"
 msgstr "Gwallau"
 
-#: textgridpage.ui:56
+#: sw/uiconfig/swriter/ui/textgridpage.ui:56
 msgctxt "textgridpage|radioRB_NOGRID"
 msgid "No grid"
 msgstr "Dim grid"
 
-#: textgridpage.ui:72
+#: sw/uiconfig/swriter/ui/textgridpage.ui:73
 msgctxt "textgridpage|radioRB_LINESGRID"
 msgid "Grid (lines only)"
 msgstr "Grid (llinell yn unig)"
 
-#: textgridpage.ui:87
+#: sw/uiconfig/swriter/ui/textgridpage.ui:89
 msgctxt "textgridpage|radioRB_CHARSGRID"
 msgid "Grid (lines and characters)"
 msgstr "Grid (llinellau a nodau)"
 
-#: textgridpage.ui:102
+#: sw/uiconfig/swriter/ui/textgridpage.ui:105
 msgctxt "textgridpage|checkCB_SNAPTOCHARS"
 msgid "_Snap to characters"
 msgstr "_Snapio i'r nodau"
 
-#: textgridpage.ui:147
+#: sw/uiconfig/swriter/ui/textgridpage.ui:150
 msgctxt "textgridpage|labelGrid"
 msgid "Grid"
 msgstr "Grid"
 
-#: textgridpage.ui:197
+#: sw/uiconfig/swriter/ui/textgridpage.ui:200
 msgctxt "textgridpage|labelFT_CHARSPERLINE"
 msgid "Characters per line:"
 msgstr "Nod y linell:"
 
-#: textgridpage.ui:236
+#: sw/uiconfig/swriter/ui/textgridpage.ui:238
 msgctxt "textgridpage|labelFT_LINESPERPAGE"
 msgid "Lines per page:"
 msgstr "Llinellau i'r dudalen:"
 
-#: textgridpage.ui:303
+#: sw/uiconfig/swriter/ui/textgridpage.ui:303
 msgctxt "textgridpage|labelFT_CHARWIDTH"
 msgid "Character _width:"
 msgstr "_Lled nodau:"
 
-#: textgridpage.ui:317
+#: sw/uiconfig/swriter/ui/textgridpage.ui:317
 msgctxt "textgridpage|labelFT_RUBYSIZE"
 msgid "Max. Ruby text size:"
 msgstr "Uchafswm maint testun Ruby:"
 
-#: textgridpage.ui:343
+#: sw/uiconfig/swriter/ui/textgridpage.ui:342
 msgctxt "textgridpage|labelFT_TEXTSIZE"
 msgid "Max. base text size:"
 msgstr "Uchafswm maint testun sail:"
 
-#: textgridpage.ui:379
+#: sw/uiconfig/swriter/ui/textgridpage.ui:377
 msgctxt "textgridpage|checkCB_RUBYBELOW"
 msgid "Ruby text below/left from base text"
 msgstr "Testun ruby islaw/chwith o'r testun sail"
 
-#: textgridpage.ui:402
+#: sw/uiconfig/swriter/ui/textgridpage.ui:401
 msgctxt "textgridpage|labelGridLayout"
 msgid "Grid Layout"
 msgstr "Cynllun Grid"
 
-#: textgridpage.ui:435
+#: sw/uiconfig/swriter/ui/textgridpage.ui:434
 msgctxt "textgridpage|checkCB_DISPLAY"
 msgid "Display grid"
 msgstr "Grid dangos"
 
-#: textgridpage.ui:450
+#: sw/uiconfig/swriter/ui/textgridpage.ui:450
 msgctxt "textgridpage|checkCB_PRINT"
 msgid "Print grid"
 msgstr "Grid argraffu"
 
-#: textgridpage.ui:469
+#: sw/uiconfig/swriter/ui/textgridpage.ui:470
 msgctxt "textgridpage|labelFT_COLOR"
 msgid "Grid color:"
 msgstr "Lliw grid:"
 
-#: textgridpage.ui:504
+#: sw/uiconfig/swriter/ui/textgridpage.ui:505
 msgctxt "textgridpage|labelFL_DISPLAY"
 msgid "Grid Display"
 msgstr "Dangos Grid"
 
-#: titlepage.ui:15
+#: sw/uiconfig/swriter/ui/titlepage.ui:15
 msgctxt "titlepage|DLG_TITLEPAGE"
 msgid "Title Page"
 msgstr "Wyneb Ddalen"
 
-#: titlepage.ui:109
+#: sw/uiconfig/swriter/ui/titlepage.ui:109
 msgctxt "titlepage|label6"
 msgid "Number of title pages:"
 msgstr "Nifer o dudalennau teitl:"
 
-#: titlepage.ui:123
+#: sw/uiconfig/swriter/ui/titlepage.ui:123
 msgctxt "titlepage|label7"
 msgid "Place title pages at:"
 msgstr "Gosod tudalennau teitl yn:"
 
-#: titlepage.ui:173
+#: sw/uiconfig/swriter/ui/titlepage.ui:171
 msgctxt "titlepage|RB_USE_EXISTING_PAGES"
 msgid "Converting existing pages to title pages"
 msgstr "Trosi tudalennau sy'n bodoli eisoes i wyneb ddalen"
 
-#: titlepage.ui:191
+#: sw/uiconfig/swriter/ui/titlepage.ui:190
 msgctxt "titlepage|RB_INSERT_NEW_PAGES"
 msgid "Insert new title pages"
 msgstr "Mewnosod gwynebddanlennau"
 
-#: titlepage.ui:209
+#: sw/uiconfig/swriter/ui/titlepage.ui:209
 msgctxt "titlepage|RB_DOCUMENT_START"
 msgid "Document start"
 msgstr "Cychwyn dogfen"
 
-#: titlepage.ui:229
+#: sw/uiconfig/swriter/ui/titlepage.ui:230
 msgctxt "titlepage|RB_PAGE_START"
 msgid "Page"
 msgstr "Tudalen"
 
-#: titlepage.ui:260
+#: sw/uiconfig/swriter/ui/titlepage.ui:262
 msgctxt "titlepage|label1"
 msgid "Make Title Pages"
 msgstr "Gwneud Gwynebddalennau"
 
-#: titlepage.ui:293
+#: sw/uiconfig/swriter/ui/titlepage.ui:295
 msgctxt "titlepage|CB_RESTART_NUMBERING"
 msgid "Reset page numbering after title pages"
 msgstr "Ailosod rhifo tudalennau ar ôl tudalennau teitl"
 
-#: titlepage.ui:320
+#: sw/uiconfig/swriter/ui/titlepage.ui:323
 msgctxt "titlepage|FT_PAGE_COUNT"
 msgid "Page number:"
 msgstr "Rhif tudalen:"
 
-#: titlepage.ui:357
+#: sw/uiconfig/swriter/ui/titlepage.ui:359
 msgctxt "titlepage|CB_SET_PAGE_NUMBER"
 msgid "Set page number for first title page"
 msgstr "Gosod rhif tudalen ar y dudalen gyntaf"
 
-#: titlepage.ui:384
+#: sw/uiconfig/swriter/ui/titlepage.ui:387
 msgctxt "titlepage|FT_PAGE_PAGES"
 msgid "Page number:"
 msgstr "Rhif tudalen:"
 
-#: titlepage.ui:427
+#: sw/uiconfig/swriter/ui/titlepage.ui:429
 msgctxt "titlepage|label2"
 msgid "Page Numbering"
 msgstr "Rhifo Tudalen"
 
-#: titlepage.ui:461
+#: sw/uiconfig/swriter/ui/titlepage.ui:463
 msgctxt "titlepage|label4"
 msgid "_Style:"
 msgstr "_Arddull:"
 
-#: titlepage.ui:484
+#: sw/uiconfig/swriter/ui/titlepage.ui:486
 msgctxt "titlepage|PB_PAGE_PROPERTIES"
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: titlepage.ui:503
+#: sw/uiconfig/swriter/ui/titlepage.ui:505
 msgctxt "titlepage|label3"
 msgid "Edit Page Properties"
 msgstr "Golygu Priodweddau Tudalen"
 
-#: tocdialog.ui:8
+#: sw/uiconfig/swriter/ui/tocdialog.ui:8
 msgctxt "tocdialog|TocDialog"
 msgid "Table of Contents, Index or Bibliography"
 msgstr "Tabl Cynnwys, Mynegai neu Lyfryddiaeth"
 
-#: tocdialog.ui:82
+#: sw/uiconfig/swriter/ui/tocdialog.ui:82
 msgctxt "tocdialog|showexample"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: tocdialog.ui:119
+#: sw/uiconfig/swriter/ui/tocdialog.ui:119
 msgctxt "tocdialog|example-atkobject"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: tocdialog.ui:148
+#: sw/uiconfig/swriter/ui/tocdialog.ui:148
 msgctxt "tocdialog|index"
 msgid "Type"
 msgstr "Math"
 
-#: tocdialog.ui:170
+#: sw/uiconfig/swriter/ui/tocdialog.ui:170
 msgctxt "tocdialog|entries"
 msgid "Entries"
 msgstr "Cofnodion"
 
-#: tocdialog.ui:193
+#: sw/uiconfig/swriter/ui/tocdialog.ui:193
 msgctxt "tocdialog|styles"
 msgid "Styles"
 msgstr "Arddulliau"
 
-#: tocdialog.ui:216
+#: sw/uiconfig/swriter/ui/tocdialog.ui:216
 msgctxt "tocdialog|columns"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: tocdialog.ui:239
+#: sw/uiconfig/swriter/ui/tocdialog.ui:239
 msgctxt "tocdialog|background"
 msgid "Background"
 msgstr "Cefndir"
 
-#: tocentriespage.ui:96
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:96
 msgctxt "tocentriespage|levelft"
 msgid "_Level"
 msgstr "_Lefel"
 
-#: tocentriespage.ui:112
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:112
 msgctxt "tocentriespage|typeft"
 msgid "_Type"
 msgstr "_Math"
 
-#: tocentriespage.ui:168
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:168
 msgctxt "tocentriespage|label4"
 msgid "_Structure:"
 msgstr "_Strwythur:"
 
-#: tocentriespage.ui:180
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:180
 msgctxt "tocentriespage|all"
 msgid "_All"
 msgstr "_Pob Un"
 
-#: tocentriespage.ui:220
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:220
 msgctxt "tocentriespage|label5"
 msgid "Character style:"
 msgstr "Arddull nod:"
 
-#: tocentriespage.ui:232
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:232
 msgctxt "tocentriespage|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: tocentriespage.ui:259
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:259
 msgctxt "tocentriespage|fillcharft"
 msgid "Fill character:"
 msgstr "Nod llanw:"
 
-#: tocentriespage.ui:291
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:291
 msgctxt "tocentriespage|tabstopposft"
 msgid "Tab stop position:"
 msgstr "Safle stop tab:"
 
-#: tocentriespage.ui:318
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:317
 msgctxt "tocentriespage|alignright"
 msgid "Align right"
 msgstr "Alinio de"
 
-#: tocentriespage.ui:335
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:334
 msgctxt "tocentriespage|chapterentryft"
 msgid "Chapter entry:"
 msgstr "Cofnod pennod:"
 
-#: tocentriespage.ui:352
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:351
 msgctxt "tocentriespage|chapterentry"
 msgid "Number range only"
 msgstr "Ystod rhif yn unig"
 
-#: tocentriespage.ui:353
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:352
 msgctxt "tocentriespage|chapterentry"
 msgid "Description only"
 msgstr "Disgrifiad yn unig"
 
-#: tocentriespage.ui:354
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:353
 msgctxt "tocentriespage|chapterentry"
 msgid "Number range and description"
 msgstr "Ystod rhif a disgrifiad"
 
-#: tocentriespage.ui:366
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:365
 msgctxt "tocentriespage|entryoutlinelevelft"
 msgid "Evaluate up to level:"
 msgstr "Codi i lefel:"
 
-#: tocentriespage.ui:394
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:392
 msgctxt "tocentriespage|numberformatft"
 msgid "Format:"
 msgstr "Fformat:"
 
-#: tocentriespage.ui:411
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:409
 msgctxt "tocentriespage|numberformat"
 msgid "Number"
 msgstr "Rhif"
 
-#: tocentriespage.ui:412
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:410
 msgctxt "tocentriespage|numberformat"
 msgid "Number without separator"
 msgstr "Rhif heb ymwahanydd"
 
-#: tocentriespage.ui:464
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:462
 msgctxt "tocentriespage|insert"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: tocentriespage.ui:478
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:476
 msgctxt "tocentriespage|remove"
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: tocentriespage.ui:492
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:490
 msgctxt "tocentriespage|chapterno"
 msgid "Chapter No."
 msgstr "Rhif pennod"
 
-#: tocentriespage.ui:506
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:504
 msgctxt "tocentriespage|entrytext"
 msgid "Entry Text"
 msgstr "Testun Cofnod"
 
-#: tocentriespage.ui:519
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:517
 msgctxt "tocentriespage|tabstop"
 msgid "Tab Stop"
 msgstr "Stop Tab"
 
-#: tocentriespage.ui:533
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:531
 msgctxt "tocentriespage|chapterinfo"
 msgid "_Chapter Info"
 msgstr "Gwybodaeth _Pennod"
 
-#: tocentriespage.ui:547
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:545
 msgctxt "tocentriespage|pageno"
 msgid "Page No."
 msgstr "Rhif Tudalen"
 
-#: tocentriespage.ui:561
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:559
 msgctxt "tocentriespage|hyperlink"
 msgid "H_yperlink"
 msgstr "_Dolen"
 
-#: tocentriespage.ui:594
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:592
 msgctxt "tocentriespage|label1"
 msgid "Structure and Formatting"
 msgstr "Strwythur a Fformatio"
 
-#: tocentriespage.ui:629
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:627
 msgctxt "tocentriespage|reltostyle"
 msgid "Tab position relati_ve to paragraph style indent"
 msgstr "Safle'r tab yn _berthynol i fewnoliad arddull paragraff"
 
-#: tocentriespage.ui:645
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:643
 msgctxt "tocentriespage|commasep"
 msgid "Key separated by commas"
 msgstr "Allwedd wedi ei rannu gan atalnodau"
 
-#: tocentriespage.ui:661
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:659
 msgctxt "tocentriespage|alphadelim"
 msgid "Alphabetical delimiter"
 msgstr "Amffinydd gwyddor"
 
-#: tocentriespage.ui:679
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:677
 msgctxt "tocentriespage|mainstyleft"
 msgid "Character style for main entries:"
 msgstr "Arddull nod ar gyfer prif gofnodion:"
 
-#: tocentriespage.ui:707
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:705
 msgctxt "tocentriespage|label3"
 msgid "Format"
 msgstr "Fformat"
 
-#: tocentriespage.ui:741
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:739
 msgctxt "tocentriespage|sortpos"
 msgid "Document _position"
 msgstr "_Safle dogfen"
 
-#: tocentriespage.ui:758
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:756
 msgctxt "tocentriespage|sortcontents"
 msgid "_Content"
 msgstr "_Cynnwys"
 
-#: tocentriespage.ui:780
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:778
 msgctxt "tocentriespage|label14"
 msgid "Sort by"
 msgstr "Trefnu yn ôl"
 
-#: tocentriespage.ui:817
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:815
 msgctxt "tocentriespage|label15"
 msgid "_1:"
 msgstr "_1:"
 
-#: tocentriespage.ui:841
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:839
 msgctxt "tocentriespage|label16"
 msgid "_2:"
 msgstr "_2:"
 
-#: tocentriespage.ui:853
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:851
 msgctxt "tocentriespage|label17"
 msgid "_3:"
 msgstr "_3:"
 
-#: tocentriespage.ui:890
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:889
 msgctxt "tocentriespage|up1cb|tooltip_text"
 msgid "Ascending"
 msgstr "Esgyn"
 
-#: tocentriespage.ui:907
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:907
 msgctxt "tocentriespage|down1cb|tooltip_text"
 msgid "Descending"
 msgstr "Disgyn"
 
-#: tocentriespage.ui:924
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:925
 msgctxt "tocentriespage|up2cb|tooltip_text"
 msgid "Ascending"
 msgstr "Esgyn"
 
-#: tocentriespage.ui:941
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:943
 msgctxt "tocentriespage|up3cb|tooltip_text"
 msgid "Ascending"
 msgstr "Esgyn"
 
-#: tocentriespage.ui:958
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:961
 msgctxt "tocentriespage|down2cb|tooltip_text"
 msgid "Descending"
 msgstr "Disgyn"
 
-#: tocentriespage.ui:975
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:979
 msgctxt "tocentriespage|down3cb|tooltip_text"
 msgid "Descending"
 msgstr "Disgyn"
 
-#: tocentriespage.ui:994
+#: sw/uiconfig/swriter/ui/tocentriespage.ui:998
 msgctxt "tocentriespage|label13"
 msgid "Sort Keys"
 msgstr "Allweddi Trefnu"
 
-#: tocindexpage.ui:20
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:20
 msgctxt "tocindexpage|open"
 msgid "Open"
 msgstr "Agor"
 
-#: tocindexpage.ui:28
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:28
 msgctxt "tocindexpage|new"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: tocindexpage.ui:36
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:36
 msgctxt "tocindexpage|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: tocindexpage.ui:50
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:50
 msgctxt "tocindexpage|liststore1"
 msgid "Table of Contents"
 msgstr "Tabl Cynnwys"
 
-#: tocindexpage.ui:54
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:54
 msgctxt "tocindexpage|liststore1"
 msgid "Alphabetical Index"
 msgstr "Mynegai yn ôl yr Wyddor"
 
-#: tocindexpage.ui:58
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:58
 msgctxt "tocindexpage|liststore1"
 msgid "Illustration Index"
 msgstr "Mynegai Darluniau"
 
-#: tocindexpage.ui:62
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:62
 msgctxt "tocindexpage|liststore1"
 msgid "Index of Tables"
 msgstr "Mynegai Tablau"
 
-#: tocindexpage.ui:66
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:66
 msgctxt "tocindexpage|liststore1"
 msgid "User-Defined"
 msgstr "Defnyddiwr Diffiniedig"
 
-#: tocindexpage.ui:70
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:70
 msgctxt "tocindexpage|liststore1"
 msgid "Table of Objects"
 msgstr "Tabl Gwrthrychau"
 
-#: tocindexpage.ui:74
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:74
 msgctxt "tocindexpage|liststore1"
 msgid "Bibliography"
 msgstr "Llyfryddiaeth"
 
-#: tocindexpage.ui:111
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:111
 msgctxt "tocindexpage|mainstyleft"
 msgid "_Title:"
 msgstr "­_Teitl:"
 
-#: tocindexpage.ui:137
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:136
 msgctxt "tocindexpage|typeft"
 msgid "Type:"
 msgstr "Math:"
 
-#: tocindexpage.ui:160
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:159
 msgctxt "tocindexpage|readonly"
 msgid "Protected against manual changes"
 msgstr "Diogelwyd rhag newidiadau â llaw"
 
-#: tocindexpage.ui:183
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:182
 msgctxt "tocindexpage|label3"
 msgid "Type and Title"
 msgstr "Math a Theitl"
 
-#: tocindexpage.ui:226
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:225
 msgctxt "tocindexpage|mainstyleft2"
 msgid "For:"
 msgstr "Ar gyfer:"
 
-#: tocindexpage.ui:240
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:239
 msgctxt "tocindexpage|scope"
 msgid "Entire document"
 msgstr "Dogfen gyfan"
 
-#: tocindexpage.ui:241
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:240
 msgctxt "tocindexpage|scope"
 msgid "Chapter"
 msgstr "Pennod"
 
-#: tocindexpage.ui:265
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:264
 msgctxt "tocindexpage|levelft"
 msgid "Evaluate up to level:"
 msgstr "Mesur i lefel:"
 
-#: tocindexpage.ui:300
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:298
 msgctxt "tocindexpage|label1"
 msgid "Create Index or Table of Contents"
 msgstr "Creu Mynegai neu Dabl Cynnwys"
 
-#: tocindexpage.ui:341
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:339
 msgctxt "tocindexpage|fromheadings"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: tocindexpage.ui:357
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:355
 msgctxt "tocindexpage|indexmarks"
 msgid "Inde_x marks"
 msgstr "_Marciau mynegai"
 
-#: tocindexpage.ui:373
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:371
 msgctxt "tocindexpage|fromtables"
 msgid "Tables"
 msgstr "Tablau"
 
-#: tocindexpage.ui:388
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:386
 msgctxt "tocindexpage|fromframes"
 msgid "Te_xt frames"
 msgstr "Fframiau ­_Testun"
 
-#: tocindexpage.ui:403
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:401
 msgctxt "tocindexpage|fromgraphics"
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: tocindexpage.ui:418
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:416
 msgctxt "tocindexpage|fromoles"
 msgid "OLE objects"
 msgstr "UGwrthrychau OLE"
 
-#: tocindexpage.ui:433
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:431
 msgctxt "tocindexpage|uselevel"
 msgid "Use level from source chapter"
 msgstr "UDefnyddio lefel o'r bennod ffynhonnell"
 
-#: tocindexpage.ui:462
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:460
 msgctxt "tocindexpage|addstylescb"
 msgid "_Additional styles"
 msgstr "Arddulliau _Eraill"
 
-#: tocindexpage.ui:478
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:476
 msgctxt "tocindexpage|stylescb"
 msgid "Styl_es"
 msgstr "_Arddulliau"
 
-#: tocindexpage.ui:501
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:499
 msgctxt "tocindexpage|styles"
 msgid "Assign styles..."
 msgstr "Neilltuo arddulliau..."
 
-#: tocindexpage.ui:547
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:545
 msgctxt "tocindexpage|captions"
 msgid "Captions"
 msgstr "Eglurynnau"
 
-#: tocindexpage.ui:562
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:561
 msgctxt "tocindexpage|objnames"
 msgid "Object names"
 msgstr "Enwau gwrthrych"
 
-#: tocindexpage.ui:586
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:586
 msgctxt "tocindexpage|categoryft"
 msgid "Category:"
 msgstr "Categori:"
 
-#: tocindexpage.ui:610
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:610
 msgctxt "tocindexpage|displayft"
 msgid "Display:"
 msgstr "Dangos:"
 
-#: tocindexpage.ui:624
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:624
 msgctxt "tocindexpage|display"
 msgid "References"
 msgstr "Cyfeiriadau"
 
-#: tocindexpage.ui:625
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:625
 msgctxt "tocindexpage|display"
 msgid "Category and Number"
 msgstr "Categori a Rhif"
 
-#: tocindexpage.ui:626
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:626
 msgctxt "tocindexpage|display"
 msgid "Caption Text"
 msgstr "Testun Egluryn"
 
-#: tocindexpage.ui:655
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:655
 msgctxt "tocindexpage|label2"
 msgid "Create From"
 msgstr "Creu o"
 
-#: tocindexpage.ui:698
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:698
 msgctxt "tocindexpage|label6"
 msgid "Create From the Following Objects"
 msgstr "Creu o'r Gwrthrychau Canlynol"
 
-#: tocindexpage.ui:737
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:737
 msgctxt "tocindexpage|mainstyleft9"
 msgid "_Brackets:"
 msgstr "_Bracedi:"
 
-#: tocindexpage.ui:748
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:748
 msgctxt "tocindexpage|numberentries"
 msgid "_Number entries"
 msgstr "_Cofnod rhif"
 
-#: tocindexpage.ui:768
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:768
 msgctxt "tocindexpage|brackets"
 msgid "[none]"
 msgstr "[dim]"
 
-#: tocindexpage.ui:769
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:769
 msgctxt "tocindexpage|brackets"
 msgid "[]"
 msgstr "[]"
 
-#: tocindexpage.ui:770
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:770
 msgctxt "tocindexpage|brackets"
 msgid "()"
 msgstr "()"
 
-#: tocindexpage.ui:771
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:771
 msgctxt "tocindexpage|brackets"
 msgid "{}"
 msgstr "{}"
 
-#: tocindexpage.ui:772
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:772
 msgctxt "tocindexpage|brackets"
 msgid "<>"
 msgstr "<>"
 
-#: tocindexpage.ui:788
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:788
 msgctxt "tocindexpage|label7"
 msgid "Formatting of the Entries"
 msgstr "Fformatio'r Cofnodion"
 
-#: tocindexpage.ui:830
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:830
 msgctxt "tocindexpage|combinesame"
 msgid "Combine identical entries"
 msgstr "Uno endidau yr unfath"
 
-#: tocindexpage.ui:845
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:845
 msgctxt "tocindexpage|useff"
 msgid "Combine identical entries with p or _pp"
 msgstr "Uno endidau yr un fath gyda p neu _pp"
 
-#: tocindexpage.ui:861
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:861
 msgctxt "tocindexpage|usedash"
 msgid "Combine with -"
 msgstr "Cyfuno gyda -"
 
-#: tocindexpage.ui:877
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:877
 msgctxt "tocindexpage|casesens"
 msgid "Case sensitive"
 msgstr "Llythyren fach neu FAWR"
 
-#: tocindexpage.ui:893
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:893
 msgctxt "tocindexpage|initcaps"
 msgid "AutoCapitalize entries"
 msgstr "Cofnodion AwtoBrifLythyren"
 
-#: tocindexpage.ui:908
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:908
 msgctxt "tocindexpage|keyasentry"
 msgid "Keys as separate entries"
 msgstr "Allweddi fel cofnod ar wahân"
 
-#: tocindexpage.ui:923
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:923
 msgctxt "tocindexpage|fromfile"
 msgid "_Concordance file"
 msgstr "Ffeil _concordans"
 
-#: tocindexpage.ui:938
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:938
 msgctxt "tocindexpage|file"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: tocindexpage.ui:959
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:959
 msgctxt "tocindexpage|label5"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: tocindexpage.ui:1002
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:1002
 msgctxt "tocindexpage|mainstyleft3"
 msgid "Language:"
 msgstr "Iaith:"
 
-#: tocindexpage.ui:1037
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:1037
 msgctxt "tocindexpage|mainstyleft5"
 msgid "Key type:"
 msgstr "Math o allwedd:"
 
-#: tocindexpage.ui:1070
+#: sw/uiconfig/swriter/ui/tocindexpage.ui:1070
 msgctxt "tocindexpage|label4"
 msgid "Sort"
 msgstr "Trefnu"
 
-#: tocstylespage.ui:39
+#: sw/uiconfig/swriter/ui/tocstylespage.ui:39
 msgctxt "tocstylespage|label1"
 msgid "_Levels"
 msgstr "_Lefelau"
 
-#: tocstylespage.ui:55
+#: sw/uiconfig/swriter/ui/tocstylespage.ui:55
 msgctxt "tocstylespage|label2"
 msgid "Paragraph _Styles"
 msgstr "Arddulliau _Paragraff"
 
-#: tocstylespage.ui:117
+#: sw/uiconfig/swriter/ui/tocstylespage.ui:117
 msgctxt "tocstylespage|default"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: tocstylespage.ui:134
+#: sw/uiconfig/swriter/ui/tocstylespage.ui:134
 msgctxt "tocstylespage|edit"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: tocstylespage.ui:179
+#: sw/uiconfig/swriter/ui/tocstylespage.ui:179
 msgctxt "tocstylespage|labelGrid"
 msgid "Assignment"
 msgstr "Aseiniad"
 
-#: viewoptionspage.ui:42
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:42
 msgctxt "viewoptionspage|helplines"
 msgid "Helplines _While Moving"
 msgstr "Llinellau Cymorth _Wrth Symud"
 
-#: viewoptionspage.ui:65
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:63
 msgctxt "viewoptionspage|guideslabel"
 msgid "Guides"
 msgstr "Tywysyddion"
 
-#: viewoptionspage.ui:97
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:95
 msgctxt "viewoptionspage|graphics"
 msgid "_Images and objects"
 msgstr "_Gwrthrychau a delweddau"
 
-#: viewoptionspage.ui:114
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:110
 msgctxt "viewoptionspage|tables"
 msgid "_Tables"
 msgstr "_Tablau"
 
-#: viewoptionspage.ui:131
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:125
 msgctxt "viewoptionspage|drawings"
 msgid "Dra_wings and controls"
 msgstr "Ll_uniad a rheolaeth"
 
-#: viewoptionspage.ui:148
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:140
 msgctxt "viewoptionspage|fieldcodes"
 msgid "_Field codes"
 msgstr "_Codau maes"
 
-#: viewoptionspage.ui:165
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:155
 msgctxt "viewoptionspage|comments"
 msgid "_Comments"
 msgstr "_Nodiadau"
 
-#: viewoptionspage.ui:188
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:170
+msgctxt "viewoptionspage|changestooltip"
+msgid "_Tooltips on tracked changes"
+msgstr "_Cynghorion ar newidiadau wedi'u tracio"
+
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:190
 msgctxt "viewoptionspage|displaylabel"
 msgid "Display"
 msgstr "Dangos"
 
-#: viewoptionspage.ui:234
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:234
 msgctxt "viewoptionspage|smoothscroll"
 msgid "S_mooth scroll"
 msgstr "Sgrolio _llyfn"
 
-#: viewoptionspage.ui:256
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:254
 msgctxt "viewoptionspage|vruler"
 msgid "Verti_cal ruler"
 msgstr "Mesurydd fer_tigol"
 
-#: viewoptionspage.ui:297
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:289
 msgctxt "viewoptionspage|vrulerright"
 msgid "Right-aligned"
 msgstr "Alinio i'r dde"
 
-#: viewoptionspage.ui:317
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:308
 msgctxt "viewoptionspage|hruler"
 msgid "Hori_zontal ruler"
 msgstr "Mesurydd ll_orweddol"
 
-#: viewoptionspage.ui:345
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:332
 msgctxt "viewoptionspage|label3"
 msgid "View"
 msgstr "Golwg"
 
-#: viewoptionspage.ui:391
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:376
 msgctxt "viewoptionspage|measureunitlabel"
 msgid "Measurement unit"
 msgstr "Uned fesur"
 
-#: viewoptionspage.ui:408
+#: sw/uiconfig/swriter/ui/viewoptionspage.ui:391
 msgctxt "viewoptionspage|settingslabel"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: warndatasourcedialog.ui:8
+#: sw/uiconfig/swriter/ui/warndatasourcedialog.ui:7
 msgctxt "warndatasourcedialog|WarnDataSourceDialog"
 msgid "Data Source Not Found"
 msgstr "Heb Ganfod Ffynhonnell Data"
 
-#: warndatasourcedialog.ui:13
+#: sw/uiconfig/swriter/ui/warndatasourcedialog.ui:13
 msgctxt "warndatasourcedialog|WarnDataSourceDialog"
 msgid "The data source “%1” was not found."
 msgstr "Heb ganfod ffynhonnell data “%1”."
 
-#: warndatasourcedialog.ui:14
+#: sw/uiconfig/swriter/ui/warndatasourcedialog.ui:14
 msgctxt "warndatasourcedialog|WarnDataSourceDialog"
 msgid "The connection to the data source could not be established. Please check the connection settings."
 msgstr "Methu creu'r cysylltiad gyda'r ffynhonnell data. Gwiriwch gosodiadau'r cysylltiad."
 
-#: warndatasourcedialog.ui:26
+#: sw/uiconfig/swriter/ui/warndatasourcedialog.ui:25
 msgctxt "warndatasourcedialog|check"
 msgid "Check Connection Settings..."
 msgstr "Gwirio Gosodiadau'r Cysylltiad..."
 
-#: warnemaildialog.ui:8
+#: sw/uiconfig/swriter/ui/warnemaildialog.ui:7
 msgctxt "warnemaildialog|WarnEmailDialog"
 msgid "E-Mails could not be sent"
 msgstr "Methu anfon E-Byst"
 
-#: warnemaildialog.ui:14
+#: sw/uiconfig/swriter/ui/warnemaildialog.ui:16
 msgctxt "warnemaildialog|WarnEmailDialog"
 msgid "E-mails could not be sent"
 msgstr "Methu anfon E-Byst"
 
-#: warnemaildialog.ui:15
+#: sw/uiconfig/swriter/ui/warnemaildialog.ui:17
 msgctxt "warnemaildialog|WarnEmailDialog"
 msgid "The following error occurred:"
 msgstr "Digwyddodd y gwall canlynol:"
 
-#: watermarkdialog.ui:19
+#: sw/uiconfig/swriter/ui/watermarkdialog.ui:19
 msgctxt "watermarkdialog|WatermarkDialog"
 msgid "Watermark"
 msgstr "Marc Dŵr"
 
-#: watermarkdialog.ui:85
+#: sw/uiconfig/swriter/ui/watermarkdialog.ui:100
 msgctxt "watermarkdialog|TextLabel"
 msgid "Text"
 msgstr "Testun"
 
-#: watermarkdialog.ui:118
+#: sw/uiconfig/swriter/ui/watermarkdialog.ui:133
 msgctxt "watermarkdialog|FontLabel"
 msgid "Font"
 msgstr "Ffont"
 
-#: watermarkdialog.ui:130
+#: sw/uiconfig/swriter/ui/watermarkdialog.ui:145
 msgctxt "watermarkdialog|AngleLabel"
 msgid "Angle"
 msgstr "Ongl"
 
-#: watermarkdialog.ui:142
+#: sw/uiconfig/swriter/ui/watermarkdialog.ui:157
 msgctxt "watermarkdialog|TransparencyLabel"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: watermarkdialog.ui:154
+#: sw/uiconfig/swriter/ui/watermarkdialog.ui:169
 msgctxt "watermarkdialog|ColorLabel"
 msgid "Color"
 msgstr "Lliw"
 
-#: wordcount.ui:8
+#: sw/uiconfig/swriter/ui/wordcount.ui:8
 msgctxt "wordcount|WordCountDialog"
 msgid "Word Count"
 msgstr "Cyfrif Geiriau"
 
-#: wordcount.ui:72
+#: sw/uiconfig/swriter/ui/wordcount.ui:73
 msgctxt "wordcount|label1"
 msgid "Words"
 msgstr "Geiriau"
 
-#: wordcount.ui:86
+#: sw/uiconfig/swriter/ui/wordcount.ui:85
 msgctxt "wordcount|label2"
 msgid "Characters including spaces"
 msgstr "Nodau yn cynnwys bylchau"
 
-#: wordcount.ui:100
+#: sw/uiconfig/swriter/ui/wordcount.ui:97
 msgctxt "wordcount|label3"
 msgid "Characters excluding spaces"
 msgstr "Nodau heb gynnwys bylchau"
 
-#: wordcount.ui:165
+#: sw/uiconfig/swriter/ui/wordcount.ui:155
 msgctxt "wordcount|label9"
 msgid "Selection"
 msgstr "Dewis"
 
-#: wordcount.ui:182
+#: sw/uiconfig/swriter/ui/wordcount.ui:170
 msgctxt "wordcount|label10"
 msgid "Document"
 msgstr "Dogfen"
 
-#: wordcount.ui:250
+#: sw/uiconfig/swriter/ui/wordcount.ui:229
 msgctxt "wordcount|cjkcharsft"
 msgid "Asian characters and Korean syllables"
 msgstr "Nodau Asiaidd a sillafau Corëeaidd"
 
-#: wordcount.ui:298
+#: sw/uiconfig/swriter/ui/wordcount.ui:271
 msgctxt "wordcount|standardizedpages"
 msgid "Standardized pages"
 msgstr "Tudalennau safonol"
 
-#: wrapdialog.ui:8
+#: sw/uiconfig/swriter/ui/wrapdialog.ui:8
 msgctxt "wrapdialog|WrapDialog"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: wrappage.ui:47
+#: sw/uiconfig/swriter/ui/wrappage.ui:47
 msgctxt "wrappage|after"
 msgid "After"
 msgstr "Wedi"
 
-#: wrappage.ui:104
+#: sw/uiconfig/swriter/ui/wrappage.ui:104
 msgctxt "wrappage|before"
 msgid "Before"
 msgstr "Cyn"
 
-#: wrappage.ui:161
+#: sw/uiconfig/swriter/ui/wrappage.ui:161
 msgctxt "wrappage|none"
 msgid "_None"
 msgstr "_Dim"
 
-#: wrappage.ui:219
+#: sw/uiconfig/swriter/ui/wrappage.ui:219
 msgctxt "wrappage|optimal"
 msgid "_Optimal"
 msgstr "_Optimalaidd"
 
-#: wrappage.ui:276
+#: sw/uiconfig/swriter/ui/wrappage.ui:276
 msgctxt "wrappage|through"
 msgid "Thro_ugh"
 msgstr "Dr_wodd"
 
-#: wrappage.ui:321
+#: sw/uiconfig/swriter/ui/wrappage.ui:321
 msgctxt "wrappage|parallel"
 msgid "_Parallel"
 msgstr "_Paralel"
 
-#: wrappage.ui:380
+#: sw/uiconfig/swriter/ui/wrappage.ui:380
 msgctxt "wrappage|label1"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: wrappage.ui:428
+#: sw/uiconfig/swriter/ui/wrappage.ui:428
 msgctxt "wrappage|label4"
 msgid "L_eft:"
 msgstr "C_hwith:"
 
-#: wrappage.ui:442
+#: sw/uiconfig/swriter/ui/wrappage.ui:442
 msgctxt "wrappage|label5"
 msgid "_Right:"
 msgstr "_De:"
 
-#: wrappage.ui:456
+#: sw/uiconfig/swriter/ui/wrappage.ui:456
 msgctxt "wrappage|label6"
 msgid "_Top:"
 msgstr "_Brig:"
 
-#: wrappage.ui:470
+#: sw/uiconfig/swriter/ui/wrappage.ui:470
 msgctxt "wrappage|label7"
 msgid "_Bottom:"
 msgstr "_Gwaelod:"
 
-#: wrappage.ui:539
+#: sw/uiconfig/swriter/ui/wrappage.ui:535
 msgctxt "wrappage|label2"
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: wrappage.ui:576
+#: sw/uiconfig/swriter/ui/wrappage.ui:572
 msgctxt "wrappage|anchoronly"
 msgid "_First paragraph"
 msgstr "_Paragraff cyntaf"
 
-#: wrappage.ui:591
+#: sw/uiconfig/swriter/ui/wrappage.ui:587
 msgctxt "wrappage|transparent"
 msgid "In bac_kground"
 msgstr "Yn y ce_fndir"
 
-#: wrappage.ui:606
+#: sw/uiconfig/swriter/ui/wrappage.ui:602
 msgctxt "wrappage|outline"
 msgid "_Contour"
 msgstr "­_Amlinell"
 
-#: wrappage.ui:621
+#: sw/uiconfig/swriter/ui/wrappage.ui:617
 msgctxt "wrappage|outside"
 msgid "Outside only"
 msgstr "Allan yn unig"
 
-#: wrappage.ui:642
+#: sw/uiconfig/swriter/ui/wrappage.ui:638
 msgctxt "wrappage|label3"
 msgid "Options"
 msgstr "Dewisiadau"
-- 
cgit