43 files changed, 24147 insertions, 24220 deletions

diff --git a/source/cy/accessibility/messages.po b/source/cy/accessibility/messages.po
index f9d20bc6944..0e65e06817e 100644
--- a/source/cy/accessibility/messages.po
+++ b/source/cy/accessibility/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
+"POT-Creation-Date: 2018-02-27 13:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,58 +13,58 @@ msgstr ""
 "X-Accelerator-Marker: ~\n"
 "X-Generator: LibreOffice\n"
 
-#: strings.hrc:25
+#: accessibility/inc/strings.hrc:25
 msgctxt "RID_STR_ACC_NAME_BROWSEBUTTON"
 msgid "Browse"
 msgstr "Pori"
 
-#: strings.hrc:26
+#: accessibility/inc/strings.hrc:26
 msgctxt "STR_SVT_ACC_ACTION_EXPAND"
 msgid "Expand"
 msgstr "Ehangu"
 
-#: strings.hrc:27
+#: accessibility/inc/strings.hrc:27
 msgctxt "STR_SVT_ACC_ACTION_COLLAPSE"
 msgid "Collapse"
 msgstr "Cwympo"
 
-#: strings.hrc:28
+#: accessibility/inc/strings.hrc:28
 msgctxt "STR_SVT_ACC_LISTENTRY_SELCTED_STATE"
 msgid "(Selected)"
 msgstr "(Dewiswyd)"
 
-#: strings.hrc:29
+#: accessibility/inc/strings.hrc:29
 msgctxt "RID_STR_ACC_ACTION_CHECK"
 msgid "Check"
 msgstr "Gwirio"
 
-#: strings.hrc:30
+#: accessibility/inc/strings.hrc:30
 msgctxt "RID_STR_ACC_ACTION_UNCHECK"
 msgid "Uncheck"
 msgstr "Dadwirio"
 
-#: strings.hrc:31
+#: accessibility/inc/strings.hrc:31
 msgctxt "RID_STR_ACC_SCROLLBAR_NAME_VERTICAL"
 msgid "Vertical scroll bar"
 msgstr "Bar sgrolio fertigol"
 
-#: strings.hrc:32
+#: accessibility/inc/strings.hrc:32
 msgctxt "RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL"
 msgid "Horizontal scroll bar"
 msgstr "Bar sgrolio llorweddol"
 
-#: strings.hrc:33
+#: accessibility/inc/strings.hrc:33
 msgctxt "RID_STR_ACC_PANEL_DESCRIPTION"
 msgid "Please press enter to go into child control for more operations"
 msgstr "Pwyswch Enter i fynd i reolydd plentyn am ragor o weithrediadau"
 
-#: strings.hrc:34
+#: accessibility/inc/strings.hrc:34
 #, c-format
 msgctxt "RID_STR_ACC_COLUMN_NUM"
 msgid "Column %COLUMNNUMBER"
 msgstr "Colofn %COLUMNNUMBER"
 
-#: strings.hrc:35
+#: accessibility/inc/strings.hrc:35
 msgctxt "RID_STR_ACC_ROW_NUM"
 msgid "Row %ROWNUMBER"
 msgstr "Rhes %ROWNUMBER"
diff --git a/source/cy/avmedia/messages.po b/source/cy/avmedia/messages.po
index fb3434f9c5c..632d9c28bbd 100644
--- a/source/cy/avmedia/messages.po
+++ b/source/cy/avmedia/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-11-22 13:53+0100\n"
+"POT-Creation-Date: 2018-02-27 13:56+0100\n"
 "PO-Revision-Date: 2017-12-02 15:45+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,115 +13,115 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1512229524.000000\n"
 
-#: strings.hrc:25
+#: avmedia/inc/strings.hrc:25
 msgctxt "AVMEDIA_STR_OPEN"
 msgid "Open"
 msgstr "Agor"
 
-#: strings.hrc:26
+#: avmedia/inc/strings.hrc:26
 msgctxt "AVMEDIA_STR_INSERT"
 msgid "Apply"
 msgstr "Gosod"
 
-#: strings.hrc:27
+#: avmedia/inc/strings.hrc:27
 msgctxt "AVMEDIA_STR_PLAY"
 msgid "Play"
 msgstr "Chwarae"
 
-#: strings.hrc:28
+#: avmedia/inc/strings.hrc:28
 msgctxt "AVMEDIA_STR_PAUSE"
 msgid "Pause"
 msgstr "Oedi"
 
-#: strings.hrc:29
+#: avmedia/inc/strings.hrc:29
 msgctxt "AVMEDIA_STR_STOP"
 msgid "Stop"
 msgstr "Atal"
 
-#: strings.hrc:30
+#: avmedia/inc/strings.hrc:30
 msgctxt "AVMEDIA_STR_LOOP"
 msgid "Repeat"
 msgstr "Ailadrodd"
 
-#: strings.hrc:31
+#: avmedia/inc/strings.hrc:31
 msgctxt "AVMEDIA_STR_MUTE"
 msgid "Mute"
 msgstr "Tawel"
 
-#: strings.hrc:32
+#: avmedia/inc/strings.hrc:32
 msgctxt "AVMEDIA_STR_ZOOM"
 msgid "View"
 msgstr "Golwg"
 
-#: strings.hrc:33
+#: avmedia/inc/strings.hrc:33
 msgctxt "AVMEDIA_STR_ZOOM_50"
 msgid "50%"
 msgstr "50%"
 
-#: strings.hrc:34
+#: avmedia/inc/strings.hrc:34
 msgctxt "AVMEDIA_STR_ZOOM_100"
 msgid "100%"
 msgstr "100%"
 
-#: strings.hrc:35
+#: avmedia/inc/strings.hrc:35
 msgctxt "AVMEDIA_STR_ZOOM_200"
 msgid "200%"
 msgstr "200%"
 
-#: strings.hrc:36
+#: avmedia/inc/strings.hrc:36
 msgctxt "AVMEDIA_STR_ZOOM_FIT"
 msgid "Scaled"
 msgstr "Graddiwyd"
 
-#: strings.hrc:37
+#: avmedia/inc/strings.hrc:37
 msgctxt "AVMEDIA_STR_VOLUME"
 msgid "Volume"
 msgstr "Lefel Sain"
 
-#: strings.hrc:38
+#: avmedia/inc/strings.hrc:38
 msgctxt "AVMEDIA_STR_POSITION"
 msgid "Position"
 msgstr "Safle"
 
-#: strings.hrc:39
+#: avmedia/inc/strings.hrc:39
 msgctxt "AVMEDIA_STR_MEDIAPLAYER"
 msgid "Media Player"
 msgstr "Chwaraewr Cyfrwng"
 
-#: strings.hrc:40
+#: avmedia/inc/strings.hrc:40
 msgctxt "AVMEDIA_MEDIA_PATH"
 msgid "Media Path"
 msgstr "Llwybr Cyfrwng"
 
-#: strings.hrc:41
+#: avmedia/inc/strings.hrc:41
 msgctxt "AVMEDIA_MEDIA_PATH_DEFAULT"
 msgid "No Media Selected"
 msgstr "Heb Ddewis Cyfrwng"
 
-#: strings.hrc:42
+#: avmedia/inc/strings.hrc:42
 msgctxt "AVMEDIA_STR_INSERTMEDIA_DLG"
 msgid "Insert Audio or Video"
 msgstr "Mewnosod Sain neu Fideo"
 
-#: strings.hrc:43
+#: avmedia/inc/strings.hrc:43
 msgctxt "AVMEDIA_STR_OPENMEDIA_DLG"
 msgid "Open Audio or Video"
 msgstr "Agor Sain neu Fideo"
 
-#: strings.hrc:44
+#: avmedia/inc/strings.hrc:44
 msgctxt "AVMEDIA_STR_ALL_MEDIAFILES"
 msgid "All audio and video files"
 msgstr "Pob ffeil sain a fideo"
 
-#: strings.hrc:45
+#: avmedia/inc/strings.hrc:45
 msgctxt "AVMEDIA_STR_ALL_FILES"
 msgid "All files"
 msgstr "Pob ffeil"
 
-#: strings.hrc:46
+#: avmedia/inc/strings.hrc:46
 msgctxt "AVMEDIA_STR_ERR_URL"
 msgid "The format of the selected file is not supported."
 msgstr "Nid yw'r fformat ffeil hwn yn cael ei gynnal."
diff --git a/source/cy/basctl/messages.po b/source/cy/basctl/messages.po
index 7c767f7bab4..6a088b8f85c 100644
--- a/source/cy/basctl/messages.po
+++ b/source/cy/basctl/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-11-22 13:53+0100\n"
+"POT-Creation-Date: 2018-04-23 18:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,82 +13,82 @@ msgstr ""
 "X-Accelerator-Marker: ~\n"
 "X-Generator: LibreOffice\n"
 
-#: strings.hrc:25
+#: basctl/inc/strings.hrc:25
 msgctxt "RID_STR_FILTER_ALLFILES"
 msgid "<All>"
 msgstr "<Pob>"
 
-#: strings.hrc:26
+#: basctl/inc/strings.hrc:26
 msgctxt "RID_STR_NOMODULE"
 msgid "< No Module >"
 msgstr "< Dim Modiwl >"
 
-#: strings.hrc:27
+#: basctl/inc/strings.hrc:27
 msgctxt "RID_STR_WRONGPASSWORD"
 msgid "Incorrect Password"
 msgstr "Cyfrinair Anghywir"
 
-#: strings.hrc:28
+#: basctl/inc/strings.hrc:28
 msgctxt "RID_STR_NOLIBINSTORAGE"
 msgid "The file does not contain any BASIC libraries"
 msgstr "Nid yw'r ffeil yn cynnwys unrhyw lyfrgelloedd BASIC"
 
-#: strings.hrc:29
+#: basctl/inc/strings.hrc:29
 msgctxt "RID_STR_BADSBXNAME"
 msgid "Invalid Name"
 msgstr "Enw Annilys"
 
-#: strings.hrc:30
+#: basctl/inc/strings.hrc:30
 msgctxt "RID_STR_LIBNAMETOLONG"
 msgid "A library name can have up to 30 characters."
 msgstr "Mae enw llyfrgell yn gallu cael hyd at 30 nod."
 
-#: strings.hrc:31
+#: basctl/inc/strings.hrc:31
 msgctxt "RID_STR_ERRORCHOOSEMACRO"
 msgid "Macros from other documents are not accessible."
 msgstr "Nid oes modd estyn at facros o ddogfennau eraill."
 
-#: strings.hrc:32
+#: basctl/inc/strings.hrc:32
 msgctxt "RID_STR_LIBISREADONLY"
 msgid "This library is read-only."
 msgstr "Darllen yn unig yw'r llyfrgell."
 
-#: strings.hrc:33
+#: basctl/inc/strings.hrc:33
 msgctxt "RID_STR_REPLACELIB"
 msgid "'XX' cannot be replaced."
 msgstr "Methu adfer 'XX'."
 
-#: strings.hrc:34
+#: basctl/inc/strings.hrc:34
 msgctxt "RID_STR_IMPORTNOTPOSSIBLE"
 msgid "'XX' cannot be added."
 msgstr "Methu ychwanegu 'XX'."
 
-#: strings.hrc:35
+#: basctl/inc/strings.hrc:35
 msgctxt "RID_STR_NOIMPORT"
 msgid "'XX' was not added."
 msgstr "Nid oedd 'XX' wedi ei ychwanegu."
 
-#: strings.hrc:36
+#: basctl/inc/strings.hrc:36
 msgctxt "RID_STR_ENTERPASSWORD"
 msgid "Enter password for 'XX'"
 msgstr "Rhowch gyfrinair am 'XX'"
 
-#: strings.hrc:37
+#: basctl/inc/strings.hrc:37
 msgctxt "RID_STR_SBXNAMEALLREADYUSED"
 msgid "Name already exists"
 msgstr "Enw'n bodoli'n barod"
 
-#: strings.hrc:38
+#: basctl/inc/strings.hrc:38
 msgctxt "RID_STR_SIGNED"
 msgid "(Signed)"
 msgstr "(Llofnodwyd)"
 
-#: strings.hrc:39
+#: basctl/inc/strings.hrc:39
 msgctxt "RID_STR_SBXNAMEALLREADYUSED2"
 msgid "Object with same name already exists"
 msgstr "Mae gwrthrych gyda'r un enw'n bodoli'n barod"
 
-#: strings.hrc:40
+#: basctl/inc/strings.hrc:40
 msgctxt "RID_STR_CANNOTRUNMACRO"
 msgid ""
 "For security reasons, you cannot run this macro.\n"
@@ -99,164 +99,164 @@ msgstr ""
 "\n"
 "Am ragor o wybodaeth, gwiriwch y gosodiadau diogelwch."
 
-#: strings.hrc:41
+#: basctl/inc/strings.hrc:41
 msgctxt "RID_STR_SEARCHNOTFOUND"
 msgid "Search key not found"
 msgstr "Allwedd chwilio heb ei ganfod"
 
-#: strings.hrc:42
+#: basctl/inc/strings.hrc:42
 msgctxt "RID_STR_SEARCHFROMSTART"
 msgid "Search to last module complete. Continue at first module?"
 msgstr "Chwilio'r modiwl cyfan olaf. Parhau o'r modiwl cyntaf?"
 
-#: strings.hrc:43
+#: basctl/inc/strings.hrc:43
 msgctxt "RID_STR_SEARCHREPLACES"
 msgid "Search key replaced XX times"
 msgstr "Allwedd chwilio wedi ei newid XX gwaith"
 
-#: strings.hrc:44
+#: basctl/inc/strings.hrc:44
 msgctxt "RID_STR_COULDNTREAD"
 msgid "The file could not be read"
 msgstr "Methu darllen y ffeil"
 
-#: strings.hrc:45
+#: basctl/inc/strings.hrc:45
 msgctxt "RID_STR_COULDNTWRITE"
 msgid "The file could not be saved"
 msgstr "Methu cadw'r ffeil"
 
-#: strings.hrc:46
+#: basctl/inc/strings.hrc:46
 msgctxt "RID_STR_CANNOTCHANGENAMESTDLIB"
 msgid "The name of the default library cannot be changed."
 msgstr "Methu newid enw'r llyfrgell rhagosodedig."
 
-#: strings.hrc:47
+#: basctl/inc/strings.hrc:47
 msgctxt "RID_STR_GENERATESOURCE"
 msgid "Generating source"
 msgstr "Cynhyrchu'r ffynhonnell"
 
-#: strings.hrc:48
+#: basctl/inc/strings.hrc:48
 msgctxt "RID_STR_FILENAME"
 msgid "File name:"
 msgstr "Enw ffeil:"
 
-#: strings.hrc:49
+#: basctl/inc/strings.hrc:49
 msgctxt "RID_STR_APPENDLIBS"
 msgid "Import Libraries"
 msgstr "Mewnforio Llyfrgelloedd"
 
-#: strings.hrc:50
+#: basctl/inc/strings.hrc:50
 msgctxt "RID_STR_QUERYDELMACRO"
 msgid "Do you want to delete the macro XX?"
 msgstr "Hoffech chi ddileu'r macro XX?"
 
-#: strings.hrc:51
+#: basctl/inc/strings.hrc:51
 msgctxt "RID_STR_QUERYDELDIALOG"
 msgid "Do you want to delete the XX dialog?"
 msgstr "Hoffech chi ddileu'r deialog XX?"
 
-#: strings.hrc:52
+#: basctl/inc/strings.hrc:52
 msgctxt "RID_STR_QUERYDELLIB"
 msgid "Do you want to delete the XX library?"
 msgstr "Hoffech chi ddileu'r llyfrgell XX?"
 
-#: strings.hrc:53
+#: basctl/inc/strings.hrc:53
 msgctxt "RID_STR_QUERYDELLIBREF"
 msgid "Do you want to delete the reference to the XX library?"
 msgstr "Hoffech chi ddileu'r cyfeiriad at lyfrgell XX?"
 
-#: strings.hrc:54
+#: basctl/inc/strings.hrc:54
 msgctxt "RID_STR_QUERYDELMODULE"
 msgid "Do you want to delete the XX module?"
 msgstr "Hoffech chi ddileu'r modiwl XX?"
 
-#: strings.hrc:55
+#: basctl/inc/strings.hrc:55
 msgctxt "RID_STR_BASIC"
 msgid "BASIC"
 msgstr "BASIC"
 
 #. Abbreviation for 'line'
-#: strings.hrc:57
+#: basctl/inc/strings.hrc:57
 msgctxt "RID_STR_LINE"
 msgid "Ln"
 msgstr "Ln"
 
 #. Abbreviation for 'column'
-#: strings.hrc:59
+#: basctl/inc/strings.hrc:59
 msgctxt "RID_STR_COLUMN"
 msgid "Col"
 msgstr "Col"
 
-#: strings.hrc:60
+#: basctl/inc/strings.hrc:60
 msgctxt "RID_STR_CANNOTCLOSE"
 msgid "The window cannot be closed while BASIC is running."
 msgstr "Nid oes modd cau'r ffenestr tra bo BASIC yn rhedeg."
 
-#: strings.hrc:61
+#: basctl/inc/strings.hrc:61
 msgctxt "RID_STR_REPLACESTDLIB"
 msgid "The default library cannot be replaced."
 msgstr "Methu newid y llyfrgell rhagosodedig."
 
-#: strings.hrc:62
+#: basctl/inc/strings.hrc:62
 msgctxt "RID_STR_REFNOTPOSSIBLE"
 msgid "Reference to 'XX' not possible."
 msgstr "Methu cyfeirio at 'XX'."
 
-#: strings.hrc:63
+#: basctl/inc/strings.hrc:63
 msgctxt "RID_STR_WATCHNAME"
 msgid "Watch"
 msgstr "Gwylio"
 
-#: strings.hrc:64
+#: basctl/inc/strings.hrc:64
 msgctxt "RID_STR_WATCHVARIABLE"
 msgid "Variable"
 msgstr "Amrywiolyn"
 
-#: strings.hrc:65
+#: basctl/inc/strings.hrc:65
 msgctxt "RID_STR_WATCHVALUE"
 msgid "Value"
 msgstr "Gwerth"
 
-#: strings.hrc:66
+#: basctl/inc/strings.hrc:66
 msgctxt "RID_STR_WATCHTYPE"
 msgid "Type"
 msgstr "Math"
 
-#: strings.hrc:67
+#: basctl/inc/strings.hrc:67
 msgctxt "RID_STR_STACKNAME"
 msgid "Call Stack"
 msgstr "Galw Stac"
 
-#: strings.hrc:68
+#: basctl/inc/strings.hrc:68
 msgctxt "RID_STR_STDDIALOGNAME"
 msgid "Dialog"
 msgstr "Deialog"
 
-#: strings.hrc:69
+#: basctl/inc/strings.hrc:69
 msgctxt "RID_STR_NEWLIB"
 msgid "New Library"
 msgstr "Llyfrgell Newydd"
 
-#: strings.hrc:70
+#: basctl/inc/strings.hrc:70
 msgctxt "RID_STR_NEWMOD"
 msgid "New Module"
 msgstr "Modiwl Newydd"
 
-#: strings.hrc:71
+#: basctl/inc/strings.hrc:71
 msgctxt "RID_STR_NEWDLG"
 msgid "New Dialog"
 msgstr "Deialog Newydd"
 
-#: strings.hrc:72
+#: basctl/inc/strings.hrc:72
 msgctxt "RID_STR_ALL"
 msgid "All"
 msgstr "Popeth"
 
-#: strings.hrc:73
+#: basctl/inc/strings.hrc:73
 msgctxt "RID_STR_PAGE"
 msgid "Page"
 msgstr "Tudalen"
 
-#: strings.hrc:74
+#: basctl/inc/strings.hrc:74
 msgctxt "RID_STR_WILLSTOPPRG"
 msgid ""
 "You will have to restart the program after this edit.\n"
@@ -265,107 +265,107 @@ msgstr ""
 "Rhaid ailgychwyn y rhaglen ar ól y golygu.\n"
 "Parhau?"
 
-#: strings.hrc:75
+#: basctl/inc/strings.hrc:75
 msgctxt "RID_STR_SEARCHALLMODULES"
 msgid "Do you want to replace the text in all active modules?"
 msgstr "Hoffech chi ailosod y testun ym mhob modiwl gweithredol?"
 
-#: strings.hrc:76
+#: basctl/inc/strings.hrc:76
 msgctxt "RID_STR_REMOVEWATCH"
 msgid "Watch:"
 msgstr "Gwylio:"
 
-#: strings.hrc:77
+#: basctl/inc/strings.hrc:77
 msgctxt "RID_STR_STACK"
 msgid "Calls: "
 msgstr "Galwadau: "
 
-#: strings.hrc:78
+#: basctl/inc/strings.hrc:78
 msgctxt "RID_STR_USERMACROS"
 msgid "My Macros"
 msgstr "Golygu Macro"
 
-#: strings.hrc:79
+#: basctl/inc/strings.hrc:79
 msgctxt "RID_STR_USERDIALOGS"
 msgid "My Dialogs"
 msgstr "Deialogau"
 
-#: strings.hrc:80
+#: basctl/inc/strings.hrc:80
 msgctxt "RID_STR_USERMACROSDIALOGS"
 msgid "My Macros & Dialogs"
 msgstr "Deialogau Agor/Cadw"
 
-#: strings.hrc:81
+#: basctl/inc/strings.hrc:81
 msgctxt "RID_STR_SHAREMACROS"
 msgid "%PRODUCTNAME Macros"
 msgstr "Macros %PRODUCTNAME"
 
-#: strings.hrc:82
+#: basctl/inc/strings.hrc:82
 msgctxt "RID_STR_SHAREDIALOGS"
 msgid "%PRODUCTNAME Dialogs"
 msgstr "Defnyddio deialogau %PRODUCTNAME"
 
-#: strings.hrc:83
+#: basctl/inc/strings.hrc:83
 msgctxt "RID_STR_SHAREMACROSDIALOGS"
 msgid "%PRODUCTNAME Macros & Dialogs"
 msgstr "Defnyddio deialogau %PRODUCTNAME"
 
-#: strings.hrc:84
+#: basctl/inc/strings.hrc:84
 msgctxt "RID_STR_REMOVEWATCHTIP"
 msgid "Remove Watch"
 msgstr "Tynnu Gwylio"
 
-#: strings.hrc:85
+#: basctl/inc/strings.hrc:85
 msgctxt "RID_STR_QUERYREPLACEMACRO"
 msgid "Do you want to overwrite the XX macro?"
 msgstr "Hoffech chi drosysgrifo macro XX?"
 
-#: strings.hrc:86
+#: basctl/inc/strings.hrc:86
 msgctxt "RID_STR_TRANSLATION_NOTLOCALIZED"
 msgid "<Not localized>"
 msgstr "<Heb ei leoleiddio>"
 
-#: strings.hrc:87
+#: basctl/inc/strings.hrc:87
 msgctxt "RID_STR_TRANSLATION_DEFAULT"
 msgid "[Default Language]"
 msgstr "[Iaith Rhagosodedig]"
 
-#: strings.hrc:88
+#: basctl/inc/strings.hrc:88
 msgctxt "RID_STR_DOCUMENT_OBJECTS"
 msgid "Document Objects"
 msgstr "Gwrthrychau Dogfen"
 
-#: strings.hrc:89
+#: basctl/inc/strings.hrc:89
 msgctxt "RID_STR_USERFORMS"
 msgid "Forms"
 msgstr "Ffurflenni"
 
-#: strings.hrc:90
+#: basctl/inc/strings.hrc:90
 msgctxt "RID_STR_NORMAL_MODULES"
 msgid "Modules"
 msgstr "Modiwlau"
 
-#: strings.hrc:91
+#: basctl/inc/strings.hrc:91
 msgctxt "RID_STR_CLASS_MODULES"
 msgid "Class Modules"
 msgstr "Modiwlau Dosbarth"
 
-#: strings.hrc:92
+#: basctl/inc/strings.hrc:92
 msgctxt "RID_STR_DLGIMP_CLASH_RENAME"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: strings.hrc:93
+#: basctl/inc/strings.hrc:93
 msgctxt "RID_STR_DLGIMP_CLASH_REPLACE"
 msgid "Replace"
 msgstr "Newid"
 
-#: strings.hrc:94
+#: basctl/inc/strings.hrc:94
 msgctxt "RID_STR_DLGIMP_CLASH_TITLE"
 msgid "Dialog Import - Name already used"
 msgstr "Mewnforio Deialog - Enw wedi ei ddefnyddio eisoes"
 
-#: strings.hrc:95
+#: basctl/inc/strings.hrc:95
 msgctxt "RID_STR_DLGIMP_CLASH_TEXT"
 msgid ""
 "The library already contains a dialog with the name:\n"
@@ -382,22 +382,22 @@ msgstr ""
 "Ailenwi'r ddeialog i gadw'r ddeialog gyfredol neu newid y ddeialog gyfredol.\n"
 " "
 
-#: strings.hrc:96
+#: basctl/inc/strings.hrc:96
 msgctxt "RID_STR_DLGIMP_MISMATCH_ADD"
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: strings.hrc:97
+#: basctl/inc/strings.hrc:97
 msgctxt "RID_STR_DLGIMP_MISMATCH_OMIT"
 msgid "Omit"
 msgstr "Hepgor"
 
-#: strings.hrc:98
+#: basctl/inc/strings.hrc:98
 msgctxt "RID_STR_DLGIMP_MISMATCH_TITLE"
 msgid "Dialog Import - Language Mismatch"
 msgstr "Mewnforio Deialog - Anghydweddu Iaith"
 
-#: strings.hrc:99
+#: basctl/inc/strings.hrc:99
 msgctxt "RID_STR_DLGIMP_MISMATCH_TEXT"
 msgid ""
 "The dialog to be imported supports other languages than the target library.\n"
@@ -414,413 +414,413 @@ msgstr ""
 "Nodyn: Ar gyfer ieithoedd sydd ddim yn cael eu cynnal gan y ddeialog bydd adnoddau iaith y ddeialog yn cael eu defnyddio.\n"
 " "
 
-#: strings.hrc:100
+#: basctl/inc/strings.hrc:100
 msgctxt "RID_STR_PRINTDLG_RANGE"
 msgid "Print range"
 msgstr "Ystod argraffu"
 
-#: strings.hrc:101
+#: basctl/inc/strings.hrc:101
 msgctxt "RID_STR_PRINTDLG_ALLPAGES"
 msgid "All ~Pages"
 msgstr "Pob ~Tudalen"
 
-#: strings.hrc:102
+#: basctl/inc/strings.hrc:102
 msgctxt "RID_STR_PRINTDLG_PAGES"
 msgid "Pa~ges"
 msgstr "~Tudalennau"
 
-#: strings.hrc:103
+#: basctl/inc/strings.hrc:103
 msgctxt "RID_STR_BTNDEL"
 msgid "~Delete"
 msgstr "~Dileu"
 
-#: strings.hrc:104
+#: basctl/inc/strings.hrc:104
 msgctxt "RID_STR_BTNNEW"
 msgid "~New"
 msgstr "~Newydd"
 
-#: strings.hrc:105
+#: basctl/inc/strings.hrc:105
 msgctxt "RID_STR_CHOOSE"
 msgid "Choose"
 msgstr "Dewis"
 
-#: strings.hrc:106
+#: basctl/inc/strings.hrc:106
 msgctxt "RID_STR_RUN"
 msgid "Run"
 msgstr "Rhedeg"
 
-#: strings.hrc:107
+#: basctl/inc/strings.hrc:107
 msgctxt "RID_STR_RECORD"
 msgid "~Save"
 msgstr "~Cadw"
 
-#: strings.hrc:108
+#: basctl/inc/strings.hrc:108
 msgctxt "RID_BASICIDE_OBJCAT"
 msgid "Object Catalog"
 msgstr "Catalog Gwrthrychau"
 
-#: strings.hrc:109
+#: basctl/inc/strings.hrc:109
 msgctxt "RID_STR_TLB_MACROS"
 msgid "Objects Tree"
 msgstr "Coeden Gwrthrychau"
 
 #. Property Browser Headline ----------------------------------------------------------------
-#: strings.hrc:111
+#: basctl/inc/strings.hrc:111
 msgctxt "RID_STR_BRWTITLE_PROPERTIES"
 msgid "Properties: "
 msgstr "Priodweddau: "
 
-#: strings.hrc:112
+#: basctl/inc/strings.hrc:112
 msgctxt "RID_STR_BRWTITLE_NO_PROPERTIES"
 msgid "No Control marked"
 msgstr "Dim Rheolaeth wedi ei nodi"
 
-#: strings.hrc:113
+#: basctl/inc/strings.hrc:113
 msgctxt "RID_STR_BRWTITLE_MULTISELECT"
 msgid "Multiselection"
 msgstr "Amladran"
 
-#: strings.hrc:114
+#: basctl/inc/strings.hrc:114
 msgctxt "RID_STR_DEF_LANG"
 msgid "[Default Language]"
 msgstr "[Iaith Rhagosodedig]"
 
-#: strings.hrc:115
+#: basctl/inc/strings.hrc:115
 msgctxt "RID_STR_CREATE_LANG"
 msgid "<Press 'Add' to create language resources>"
 msgstr "<Pwyswch 'Ychwanegu' i greu adnodd iaith>"
 
-#: strings.hrc:116
+#: basctl/inc/strings.hrc:116
 msgctxt "RID_STR_EXPORTPACKAGE"
 msgid "Export library as extension"
 msgstr "Allforio llyfrgell fel estyniad"
 
-#: strings.hrc:117
+#: basctl/inc/strings.hrc:117
 msgctxt "RID_STR_EXPORTBASIC"
 msgid "Export as BASIC library"
 msgstr "Allforio fel llyfrgell BASIC"
 
-#: strings.hrc:118
+#: basctl/inc/strings.hrc:118
 msgctxt "RID_STR_PACKAGE_BUNDLE"
 msgid "Extension"
 msgstr "Estyniad"
 
-#: basicmacrodialog.ui:9
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:9
 msgctxt "basicmacrodialog|BasicMacroDialog"
 msgid "%PRODUCTNAME Basic Macros"
 msgstr "Macros Basic %PRODUCTNAME"
 
-#: basicmacrodialog.ui:25
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:25
 msgctxt "basicmacrodialog|run"
 msgid "Run"
 msgstr "Rhedeg"
 
-#: basicmacrodialog.ui:124
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:124
 msgctxt "basicmacrodialog|existingmacrosft"
 msgid "Existing Macros In:"
 msgstr "MacrosPpresennol Yn:"
 
-#: basicmacrodialog.ui:178
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:178
 msgctxt "basicmacrodialog|macrofromft"
 msgid "Macro From"
 msgstr "Macro o"
 
-#: basicmacrodialog.ui:194
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:194
 msgctxt "basicmacrodialog|macrotoft"
 msgid "Save Macro In"
 msgstr "Cadw'r Macro yn"
 
-#: basicmacrodialog.ui:243
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:242
 msgctxt "basicmacrodialog|libraryft1"
 msgid "Macro Name"
 msgstr "Enw'r Macro"
 
-#: basicmacrodialog.ui:265
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:264
 msgctxt "basicmacrodialog|assign"
 msgid "Assign..."
 msgstr "Dynodi..."
 
-#: basicmacrodialog.ui:278
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:277
 msgctxt "basicmacrodialog|edit"
 msgid "Edit"
 msgstr "Golygu"
 
-#: basicmacrodialog.ui:305
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:304
 msgctxt "basicmacrodialog|organize"
 msgid "Organizer..."
 msgstr "Trefnydd..."
 
-#: basicmacrodialog.ui:318
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:317
 msgctxt "basicmacrodialog|newlibrary"
 msgid "New Library"
 msgstr "Llyfrgell Newydd"
 
-#: basicmacrodialog.ui:331
+#: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:330
 msgctxt "basicmacrodialog|newmodule"
 msgid "New Module"
 msgstr "Modiwl Newydd"
 
-#: breakpointmenus.ui:12
+#: basctl/uiconfig/basicide/ui/breakpointmenus.ui:12
 msgctxt "breakpointmenus|manage"
 msgid "Manage Breakpoints..."
 msgstr "Rheoli Torbwyntiau..."
 
-#: breakpointmenus.ui:23
+#: basctl/uiconfig/basicide/ui/breakpointmenus.ui:23
 msgctxt "breakpointmenus|active"
 msgid "_Active"
 msgstr "_Gweithredol"
 
-#: breakpointmenus.ui:37
+#: basctl/uiconfig/basicide/ui/breakpointmenus.ui:37
 msgctxt "breakpointmenus|properties"
 msgid "_Properties..."
 msgstr "_Priodweddau..."
 
-#: defaultlanguage.ui:9
+#: basctl/uiconfig/basicide/ui/defaultlanguage.ui:9
 msgctxt "defaultlanguage|DefaultLanguageDialog"
 msgid "Set Default User Interface Language"
 msgstr "Gosod yr Iaith Rhngwyneb Defnyddiwr Rhagosodedig"
 
-#: defaultlanguage.ui:93
+#: basctl/uiconfig/basicide/ui/defaultlanguage.ui:93
 msgctxt "defaultlanguage|defaultlabel"
 msgid "Default language:"
 msgstr "Iaith y rhyngwyneb:"
 
-#: defaultlanguage.ui:135
+#: basctl/uiconfig/basicide/ui/defaultlanguage.ui:135
 msgctxt "defaultlanguage|checkedlabel"
 msgid "Available languages:"
 msgstr "Ieithoedd sydd ar gael:"
 
-#: defaultlanguage.ui:155
+#: basctl/uiconfig/basicide/ui/defaultlanguage.ui:155
 msgctxt "defaultlanguage|defined"
 msgid "Select a language to define the default user interface language. All currently present strings will be assigned to the resources created for the selected language."
 msgstr "Dewiswch iaith i ddiffinio iaith rhagosodedig y rhyngwyneb defnyddiwr. Bydd yr holl linynnau presennol yn cael eu dynodi i'r adnoddau a grëir ar gyfer yr iaith honno."
 
-#: defaultlanguage.ui:170
+#: basctl/uiconfig/basicide/ui/defaultlanguage.ui:170
 msgctxt "defaultlanguage|added"
 msgid "Select languages to be added. Resources for these languages will be created in the library. Strings of the current default user interface language will be copied to these new resources by default."
 msgstr "Dewiswch ieithoedd i'w hychwanegu. Bydd adnoddau ar gyfer y rhain yn cael eu creu yn y llyfrgell. Bydd llinynnau'r iaith rhyngwyneb defnyddiwr rhagosodedig yn cael eu copïo yn awtomatig i'r adnoddau newydd."
 
-#: defaultlanguage.ui:184
+#: basctl/uiconfig/basicide/ui/defaultlanguage.ui:184
 msgctxt "defaultlanguage|alttitle"
 msgid "Add User Interface Languages"
 msgstr "Ychwanegu Ieithoedd Rhyngwyneb Defnyddiwr"
 
-#: deletelangdialog.ui:8
+#: basctl/uiconfig/basicide/ui/deletelangdialog.ui:7
 msgctxt "deletelangdialog|DeleteLangDialog"
 msgid "Delete Language Resources"
 msgstr "Dileu Adnoddau Iaith"
 
-#: deletelangdialog.ui:14
+#: basctl/uiconfig/basicide/ui/deletelangdialog.ui:14
 msgctxt "deletelangdialog|DeleteLangDialog"
 msgid "Do you want to delete the resources of the selected language(s)?"
 msgstr "Hoffech chi am ddileu adnoddau'r ieithoedd hyn?"
 
-#: deletelangdialog.ui:15
+#: basctl/uiconfig/basicide/ui/deletelangdialog.ui:15
 msgctxt "deletelangdialog|DeleteLangDialog"
 msgid "You are about to delete the resources for the selected language(s). All user interface strings for this language(s) will be deleted."
 msgstr "Rydych ar fin dileu adnoddau'r ieithoedd hyn. Bydd holl linynnau rhyngwyneb defnyddiwr yr ieithoedd hyn yn cael eu dileu."
 
-#: dialogpage.ui:30
+#: basctl/uiconfig/basicide/ui/dialogpage.ui:30
 msgctxt "dialogpage|label1"
 msgid "Dialog:"
 msgstr "Deialog:"
 
-#: dialogpage.ui:84
+#: basctl/uiconfig/basicide/ui/dialogpage.ui:84
 msgctxt "dialogpage|newmodule"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: dialogpage.ui:99
+#: basctl/uiconfig/basicide/ui/dialogpage.ui:99
 msgctxt "dialogpage|newdialog"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: dialogpage.ui:130
+#: basctl/uiconfig/basicide/ui/dialogpage.ui:130
 msgctxt "dialogpage|password"
 msgid "_Password..."
 msgstr "_Cyfrinair..."
 
-#: dialogpage.ui:144
+#: basctl/uiconfig/basicide/ui/dialogpage.ui:144
 msgctxt "dialogpage|import"
 msgid "_Import..."
 msgstr "_Mewnforio..."
 
-#: dialogpage.ui:158
+#: basctl/uiconfig/basicide/ui/dialogpage.ui:158
 msgctxt "dialogpage|export"
 msgid "_Export..."
 msgstr "_Allforio..."
 
-#: exportdialog.ui:8
+#: basctl/uiconfig/basicide/ui/exportdialog.ui:8
 msgctxt "exportdialog|ExportDialog"
 msgid "Export Basic library"
 msgstr "Allforio llyfrgell Basic"
 
-#: exportdialog.ui:83
+#: basctl/uiconfig/basicide/ui/exportdialog.ui:83
 msgctxt "exportdialog|extension"
 msgid "Export as _extension"
 msgstr "Allforio fel ­_estyniad"
 
-#: exportdialog.ui:100
+#: basctl/uiconfig/basicide/ui/exportdialog.ui:100
 msgctxt "exportdialog|basic"
 msgid "Export as BASIC library"
 msgstr "Allforio llyfrgell BASIC"
 
-#: gotolinedialog.ui:8
+#: basctl/uiconfig/basicide/ui/gotolinedialog.ui:8
 msgctxt "gotolinedialog|GotoLineDialog"
 msgid "Go to Line"
 msgstr "Llinell Mynd Ato"
 
-#: gotolinedialog.ui:85
+#: basctl/uiconfig/basicide/ui/gotolinedialog.ui:87
 msgctxt "gotolinedialog|area"
 msgid "_Line number:"
 msgstr "_Rhif llinell:"
 
-#: importlibdialog.ui:9
+#: basctl/uiconfig/basicide/ui/importlibdialog.ui:9
 msgctxt "importlibdialog|ImportLibDialog"
 msgid "Import Libraries"
 msgstr "Mewnforio Llyfrgelloedd"
 
-#: importlibdialog.ui:98
+#: basctl/uiconfig/basicide/ui/importlibdialog.ui:98
 msgctxt "importlibdialog|ref"
 msgid "Insert as reference (read-only)"
 msgstr "Mewnosod fel cyfeirnod (darllen yn unig)"
 
-#: importlibdialog.ui:113
+#: basctl/uiconfig/basicide/ui/importlibdialog.ui:113
 msgctxt "importlibdialog|replace"
 msgid "Replace existing libraries"
 msgstr "Ailosod y llyfrgelloedd presennol"
 
-#: importlibdialog.ui:134
+#: basctl/uiconfig/basicide/ui/importlibdialog.ui:134
 msgctxt "importlibdialog|label1"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: libpage.ui:31
+#: basctl/uiconfig/basicide/ui/libpage.ui:31
 msgctxt "libpage|label1"
 msgid "L_ocation:"
 msgstr "L_leoliad:"
 
-#: libpage.ui:70
+#: basctl/uiconfig/basicide/ui/libpage.ui:70
 msgctxt "libpage|lingudictsft"
 msgid "_Library:"
 msgstr "_Llyfrgell:"
 
-#: libpage.ui:124
+#: basctl/uiconfig/basicide/ui/libpage.ui:124
 msgctxt "libpage|password"
 msgid "_Password..."
 msgstr "C_yfrinair..."
 
-#: libpage.ui:138
+#: basctl/uiconfig/basicide/ui/libpage.ui:138
 msgctxt "libpage|new"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: libpage.ui:153
+#: basctl/uiconfig/basicide/ui/libpage.ui:153
 msgctxt "libpage|import"
 msgid "_Import..."
 msgstr "_Mewnforio..."
 
-#: libpage.ui:168
+#: basctl/uiconfig/basicide/ui/libpage.ui:168
 msgctxt "libpage|export"
 msgid "_Export..."
 msgstr "_Allforio..."
 
-#: managebreakpoints.ui:9
+#: basctl/uiconfig/basicide/ui/managebreakpoints.ui:9
 msgctxt "managebreakpoints|ManageBreakpointsDialog"
 msgid "Manage Breakpoints"
 msgstr "Rheoli Torbwyntiau"
 
-#: managebreakpoints.ui:129
+#: basctl/uiconfig/basicide/ui/managebreakpoints.ui:129
 msgctxt "managebreakpoints|active"
 msgid "Active"
 msgstr "Gweithredol"
 
-#: managebreakpoints.ui:182
+#: basctl/uiconfig/basicide/ui/managebreakpoints.ui:182
 msgctxt "managebreakpoints|label2"
 msgid "Pass count:"
 msgstr "Cyfrif pasio:"
 
-#: managebreakpoints.ui:205
+#: basctl/uiconfig/basicide/ui/managebreakpoints.ui:205
 msgctxt "managebreakpoints|label1"
 msgid "Breakpoints"
 msgstr "Torbwyntiau"
 
-#: managelanguages.ui:8
+#: basctl/uiconfig/basicide/ui/managelanguages.ui:8
 msgctxt "managelanguages|ManageLanguagesDialog"
 msgid "Manage User Interface Languages [$1]"
 msgstr "Rheoli Ieithoedd Rhyngwyneb Defnyddiwr [$1]"
 
-#: managelanguages.ui:69
+#: basctl/uiconfig/basicide/ui/managelanguages.ui:69
 msgctxt "managelanguages|label1"
 msgid "Present languages:"
 msgstr "Ieithoedd cyfredol:"
 
-#: managelanguages.ui:83
+#: basctl/uiconfig/basicide/ui/managelanguages.ui:83
 msgctxt "managelanguages|label2"
 msgid "The default language is used if no localization for a user interface locale is present. Furthermore all strings from the default language are copied to resources of newly added languages."
 msgstr "Bydd yr iaith ragosodedig yn cael ei defnyddio os nad oes iaith rhyngwyneb defnyddiwr ar gael. Ymhellach bydd pob llinyn o'r iaith ragosodedig yn cael eu copïo i adnoddau'r ieithoedd sydd newydd eu hychwanegu."
 
-#: managelanguages.ui:108
+#: basctl/uiconfig/basicide/ui/managelanguages.ui:108
 msgctxt "managelanguages|add"
 msgid "Add..."
 msgstr "Ychwanegu..."
 
-#: managelanguages.ui:136
+#: basctl/uiconfig/basicide/ui/managelanguages.ui:136
 msgctxt "managelanguages|default"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: modulepage.ui:30
+#: basctl/uiconfig/basicide/ui/modulepage.ui:30
 msgctxt "modulepage|label1"
 msgid "M_odule:"
 msgstr "_Modiwl:"
 
-#: modulepage.ui:84
+#: basctl/uiconfig/basicide/ui/modulepage.ui:84
 msgctxt "modulepage|newmodule"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: modulepage.ui:99
+#: basctl/uiconfig/basicide/ui/modulepage.ui:99
 msgctxt "modulepage|newdialog"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: modulepage.ui:130
+#: basctl/uiconfig/basicide/ui/modulepage.ui:130
 msgctxt "modulepage|password"
 msgid "_Password..."
 msgstr "C_yfrinair..."
 
-#: modulepage.ui:144
+#: basctl/uiconfig/basicide/ui/modulepage.ui:144
 msgctxt "modulepage|import"
 msgid "_Import..."
 msgstr "_Mewnforio..."
 
-#: modulepage.ui:158
+#: basctl/uiconfig/basicide/ui/modulepage.ui:158
 msgctxt "modulepage|export"
 msgid "_Export..."
 msgstr "_Allforio..."
 
-#: newlibdialog.ui:84
+#: basctl/uiconfig/basicide/ui/newlibdialog.ui:86
 msgctxt "newlibdialog|area"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: organizedialog.ui:8
+#: basctl/uiconfig/basicide/ui/organizedialog.ui:8
 msgctxt "organizedialog|OrganizeDialog"
 msgid "%PRODUCTNAME Basic Macro Organizer"
 msgstr "Trefnydd Macro Basic %PRODUCTNAME"
 
-#: organizedialog.ui:78
+#: basctl/uiconfig/basicide/ui/organizedialog.ui:78
 msgctxt "organizedialog|modules"
 msgid "Modules"
 msgstr "Modiwlau"
 
-#: organizedialog.ui:100
+#: basctl/uiconfig/basicide/ui/organizedialog.ui:100
 msgctxt "organizedialog|dialogs"
 msgid "Dialogs"
 msgstr "Deialogau"
 
-#: organizedialog.ui:123
+#: basctl/uiconfig/basicide/ui/organizedialog.ui:123
 msgctxt "organizedialog|libraries"
 msgid "Libraries"
 msgstr "Llyfrgelloedd"
diff --git a/source/cy/basic/messages.po b/source/cy/basic/messages.po
index 2cff9309e4a..47a14f0e85d 100644
--- a/source/cy/basic/messages.po
+++ b/source/cy/basic/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
+"POT-Creation-Date: 2018-02-27 15:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,679 +13,679 @@ msgstr ""
 "X-Accelerator-Marker: ~\n"
 "X-Generator: LibreOffice\n"
 
-#: basic.hrc:27
+#: basic/inc/basic.hrc:27
 msgctxt "RID_BASIC_START"
 msgid "Syntax error."
 msgstr "Gwall cystrawen."
 
-#: basic.hrc:28
+#: basic/inc/basic.hrc:28
 msgctxt "RID_BASIC_START"
 msgid "Return without Gosub."
 msgstr "Return heb Gosub."
 
-#: basic.hrc:29
+#: basic/inc/basic.hrc:29
 msgctxt "RID_BASIC_START"
 msgid "Incorrect entry; please retry."
 msgstr "Cofnod anghywir; ceisiwch eto."
 
-#: basic.hrc:30
+#: basic/inc/basic.hrc:30
 msgctxt "RID_BASIC_START"
 msgid "Invalid procedure call."
 msgstr "Galwad gweithdrefn annilys."
 
-#: basic.hrc:31
+#: basic/inc/basic.hrc:31
 msgctxt "RID_BASIC_START"
 msgid "Overflow."
 msgstr "Gorlif."
 
-#: basic.hrc:32
+#: basic/inc/basic.hrc:32
 msgctxt "RID_BASIC_START"
 msgid "Not enough memory."
 msgstr "Dim digon o gof."
 
-#: basic.hrc:33
+#: basic/inc/basic.hrc:33
 msgctxt "RID_BASIC_START"
 msgid "Array already dimensioned."
 msgstr "Arae wedi ei ddimensiynu eisoes."
 
-#: basic.hrc:34
+#: basic/inc/basic.hrc:34
 msgctxt "RID_BASIC_START"
 msgid "Index out of defined range."
 msgstr "Mynegai allan o ystod diffiniedig."
 
-#: basic.hrc:35
+#: basic/inc/basic.hrc:35
 msgctxt "RID_BASIC_START"
 msgid "Duplicate definition."
 msgstr "Diffiniad dyblyg."
 
-#: basic.hrc:36
+#: basic/inc/basic.hrc:36
 msgctxt "RID_BASIC_START"
 msgid "Division by zero."
 msgstr "Rhannu gyda sero."
 
-#: basic.hrc:37
+#: basic/inc/basic.hrc:37
 msgctxt "RID_BASIC_START"
 msgid "Variable not defined."
 msgstr "Newidyn heb ei ddiffinio."
 
-#: basic.hrc:38
+#: basic/inc/basic.hrc:38
 msgctxt "RID_BASIC_START"
 msgid "Data type mismatch."
 msgstr "Anghydweddiad math data."
 
-#: basic.hrc:39
+#: basic/inc/basic.hrc:39
 msgctxt "RID_BASIC_START"
 msgid "Invalid parameter."
 msgstr "Paramedr annilys."
 
-#: basic.hrc:40
+#: basic/inc/basic.hrc:40
 msgctxt "RID_BASIC_START"
 msgid "Process interrupted by user."
 msgstr "Tarfu ar y broses gan y defnyddiwr."
 
-#: basic.hrc:41
+#: basic/inc/basic.hrc:41
 msgctxt "RID_BASIC_START"
 msgid "Resume without error."
 msgstr "Ailgychwyn heb wall."
 
-#: basic.hrc:42
+#: basic/inc/basic.hrc:42
 msgctxt "RID_BASIC_START"
 msgid "Not enough stack memory."
 msgstr "Dim digon o gof stac."
 
-#: basic.hrc:43
+#: basic/inc/basic.hrc:43
 msgctxt "RID_BASIC_START"
 msgid "Sub-procedure or function procedure not defined."
 msgstr "Trefn is weithrediad neu swyddogaeth heb ei ddiffinio."
 
-#: basic.hrc:44
+#: basic/inc/basic.hrc:44
 msgctxt "RID_BASIC_START"
 msgid "Error loading DLL file."
 msgstr "Gwall llwytho ffeil DLL."
 
-#: basic.hrc:45
+#: basic/inc/basic.hrc:45
 msgctxt "RID_BASIC_START"
 msgid "Wrong DLL call convention."
 msgstr "Confensiwn galw DLL anghywir."
 
-#: basic.hrc:46
+#: basic/inc/basic.hrc:46
 msgctxt "RID_BASIC_START"
 msgid "Internal error $(ARG1)."
 msgstr "Gwall mewnol $(ARG1)."
 
-#: basic.hrc:47
+#: basic/inc/basic.hrc:47
 msgctxt "RID_BASIC_START"
 msgid "Invalid file name or file number."
 msgstr "Enw neu rif ffeil anghywir."
 
-#: basic.hrc:48
+#: basic/inc/basic.hrc:48
 msgctxt "RID_BASIC_START"
 msgid "File not found."
 msgstr "Heb ganfod ffeil."
 
-#: basic.hrc:49
+#: basic/inc/basic.hrc:49
 msgctxt "RID_BASIC_START"
 msgid "Incorrect file mode."
 msgstr "Modd ffeil anghywir."
 
-#: basic.hrc:50
+#: basic/inc/basic.hrc:50
 msgctxt "RID_BASIC_START"
 msgid "File already open."
 msgstr "Ffeil ar agor yn barod."
 
-#: basic.hrc:51
+#: basic/inc/basic.hrc:51
 msgctxt "RID_BASIC_START"
 msgid "Device I/O error."
 msgstr "Gwall I/O dyfais."
 
-#: basic.hrc:52
+#: basic/inc/basic.hrc:52
 msgctxt "RID_BASIC_START"
 msgid "File already exists."
 msgstr "Mae'r ffeil yn bodoli eisoes."
 
-#: basic.hrc:53
+#: basic/inc/basic.hrc:53
 msgctxt "RID_BASIC_START"
 msgid "Incorrect record length."
 msgstr "Hyd cofnod anghywir."
 
-#: basic.hrc:54
+#: basic/inc/basic.hrc:54
 msgctxt "RID_BASIC_START"
 msgid "Disk or hard drive full."
 msgstr "Disg neu ddisg caled yn llawn."
 
-#: basic.hrc:55
+#: basic/inc/basic.hrc:55
 msgctxt "RID_BASIC_START"
 msgid "Reading exceeds EOF."
 msgstr "Darllen y tu hwnt i EOF."
 
-#: basic.hrc:56
+#: basic/inc/basic.hrc:56
 msgctxt "RID_BASIC_START"
 msgid "Incorrect record number."
 msgstr "Rhif cofnod anghywir."
 
-#: basic.hrc:57
+#: basic/inc/basic.hrc:57
 msgctxt "RID_BASIC_START"
 msgid "Too many files."
 msgstr "Gormod o ffeiliau."
 
-#: basic.hrc:58
+#: basic/inc/basic.hrc:58
 msgctxt "RID_BASIC_START"
 msgid "Device not available."
 msgstr "Dyfais ddim ar gael."
 
-#: basic.hrc:59
+#: basic/inc/basic.hrc:59
 msgctxt "RID_BASIC_START"
 msgid "Access denied."
 msgstr "Mynediad wedi'i wrthod."
 
-#: basic.hrc:60
+#: basic/inc/basic.hrc:60
 msgctxt "RID_BASIC_START"
 msgid "Disk not ready."
 msgstr "Disg ddim yn barod."
 
-#: basic.hrc:61
+#: basic/inc/basic.hrc:61
 msgctxt "RID_BASIC_START"
 msgid "Not implemented."
 msgstr "Heb ei weithredu."
 
-#: basic.hrc:62
+#: basic/inc/basic.hrc:62
 msgctxt "RID_BASIC_START"
 msgid "Renaming on different drives impossible."
 msgstr "Ailenwi ar ddisgiau gwahanol yn amhosibl."
 
-#: basic.hrc:63
+#: basic/inc/basic.hrc:63
 msgctxt "RID_BASIC_START"
 msgid "Path/File access error."
 msgstr "Gwall mynediad llwybr/ffeil."
 
-#: basic.hrc:64
+#: basic/inc/basic.hrc:64
 msgctxt "RID_BASIC_START"
 msgid "Path not found."
 msgstr "Heb ganfod llwybr."
 
-#: basic.hrc:65
+#: basic/inc/basic.hrc:65
 msgctxt "RID_BASIC_START"
 msgid "Object variable not set."
 msgstr "Newidyn gwrthrych heb ei osod."
 
-#: basic.hrc:66
+#: basic/inc/basic.hrc:66
 msgctxt "RID_BASIC_START"
 msgid "Invalid string pattern."
 msgstr "Patrwm llinell annilys."
 
-#: basic.hrc:67
+#: basic/inc/basic.hrc:67
 msgctxt "RID_BASIC_START"
 msgid "Use of zero not permitted."
 msgstr "Dim caniatâd i ddefnyddio sero."
 
-#: basic.hrc:68
+#: basic/inc/basic.hrc:68
 msgctxt "RID_BASIC_START"
 msgid "DDE Error."
 msgstr "Gwall DDE."
 
-#: basic.hrc:69
+#: basic/inc/basic.hrc:69
 msgctxt "RID_BASIC_START"
 msgid "Awaiting response to DDE connection."
 msgstr "Disgwyl ymateb i gysylltiad DDE."
 
-#: basic.hrc:70
+#: basic/inc/basic.hrc:70
 msgctxt "RID_BASIC_START"
 msgid "No DDE channels available."
 msgstr "Dim sianeli DDE ar gael."
 
-#: basic.hrc:71
+#: basic/inc/basic.hrc:71
 msgctxt "RID_BASIC_START"
 msgid "No application responded to DDE connect initiation."
 msgstr "Dim ymateb gan raglen i gychwyn cysylltiad DDE."
 
-#: basic.hrc:72
+#: basic/inc/basic.hrc:72
 msgctxt "RID_BASIC_START"
 msgid "Too many applications responded to DDE connect initiation."
 msgstr "Gormod o raglenni wedi ymateb i gychwyn cysylltiad DDE."
 
-#: basic.hrc:73
+#: basic/inc/basic.hrc:73
 msgctxt "RID_BASIC_START"
 msgid "DDE channel locked."
 msgstr "Sianeli DDE wedi eu cloi."
 
-#: basic.hrc:74
+#: basic/inc/basic.hrc:74
 msgctxt "RID_BASIC_START"
 msgid "External application cannot execute DDE operation."
 msgstr "Rhaglenni allanol methu gweithredu gweithred DDE."
 
-#: basic.hrc:75
+#: basic/inc/basic.hrc:75
 msgctxt "RID_BASIC_START"
 msgid "Timeout while waiting for DDE response."
 msgstr "Amser allan wrth ddisgwyl ymateb DDE."
 
-#: basic.hrc:76
+#: basic/inc/basic.hrc:76
 msgctxt "RID_BASIC_START"
 msgid "User pressed ESCAPE during DDE operation."
 msgstr "Pwysodd y defnyddiwr ESCAPE yn ystod gweithrediad DDE."
 
-#: basic.hrc:77
+#: basic/inc/basic.hrc:77
 msgctxt "RID_BASIC_START"
 msgid "External application busy."
 msgstr "Rhaglen allanol yn brysur."
 
-#: basic.hrc:78
+#: basic/inc/basic.hrc:78
 msgctxt "RID_BASIC_START"
 msgid "DDE operation without data."
 msgstr "Gweithrediad DDE heb ddata."
 
-#: basic.hrc:79
+#: basic/inc/basic.hrc:79
 msgctxt "RID_BASIC_START"
 msgid "Data are in wrong format."
 msgstr "Data mewn fformat anghywir."
 
-#: basic.hrc:80
+#: basic/inc/basic.hrc:80
 msgctxt "RID_BASIC_START"
 msgid "External application has been terminated."
 msgstr "Rhaglen allanol wedi ei derfynu."
 
-#: basic.hrc:81
+#: basic/inc/basic.hrc:81
 msgctxt "RID_BASIC_START"
 msgid "DDE connection interrupted or modified."
 msgstr "Cysylltiad DDE wedi ei darfu neu ei newid."
 
-#: basic.hrc:82
+#: basic/inc/basic.hrc:82
 msgctxt "RID_BASIC_START"
 msgid "DDE method invoked with no channel open."
 msgstr "Cychwyn dull DDE heb sianel ar agor."
 
-#: basic.hrc:83
+#: basic/inc/basic.hrc:83
 msgctxt "RID_BASIC_START"
 msgid "Invalid DDE link format."
 msgstr "Fformat cysylltiad DDE annilys."
 
-#: basic.hrc:84
+#: basic/inc/basic.hrc:84
 msgctxt "RID_BASIC_START"
 msgid "DDE message has been lost."
 msgstr "Neges DDE wedi ei golli."
 
-#: basic.hrc:85
+#: basic/inc/basic.hrc:85
 msgctxt "RID_BASIC_START"
 msgid "Paste link already performed."
 msgstr "Wedi gweithredu cysylltiad gludo."
 
-#: basic.hrc:86
+#: basic/inc/basic.hrc:86
 msgctxt "RID_BASIC_START"
 msgid "Link mode cannot be set due to invalid link topic."
 msgstr "Methu gosod modd cysylltiad oherwydd pwnc cyswllt annilys."
 
-#: basic.hrc:87
+#: basic/inc/basic.hrc:87
 msgctxt "RID_BASIC_START"
 msgid "DDE requires the DDEML.DLL file."
 msgstr "DDE angen ffeil DDEML.DLL."
 
-#: basic.hrc:88
+#: basic/inc/basic.hrc:88
 msgctxt "RID_BASIC_START"
 msgid "Module cannot be loaded; invalid format."
 msgstr "Methu llwytho modiwl; fformat annilys."
 
-#: basic.hrc:89
+#: basic/inc/basic.hrc:89
 msgctxt "RID_BASIC_START"
 msgid "Invalid object index."
 msgstr "Mynegai gwrthrych annilys."
 
-#: basic.hrc:90
+#: basic/inc/basic.hrc:90
 msgctxt "RID_BASIC_START"
 msgid "Object is not available."
 msgstr "Gwrthrych ddim ar gael."
 
-#: basic.hrc:91
+#: basic/inc/basic.hrc:91
 msgctxt "RID_BASIC_START"
 msgid "Incorrect property value."
 msgstr "Gwerth priodwedd anghywir."
 
-#: basic.hrc:92
+#: basic/inc/basic.hrc:92
 msgctxt "RID_BASIC_START"
 msgid "This property is read-only."
 msgstr "Priodwedd darllen yn unig."
 
-#: basic.hrc:93
+#: basic/inc/basic.hrc:93
 msgctxt "RID_BASIC_START"
 msgid "This property is write only."
 msgstr "Priodwedd ysgrifennu'n unig."
 
-#: basic.hrc:94
+#: basic/inc/basic.hrc:94
 msgctxt "RID_BASIC_START"
 msgid "Invalid object reference."
 msgstr "Cyfeiriad gwrthrych annilys."
 
-#: basic.hrc:95
+#: basic/inc/basic.hrc:95
 msgctxt "RID_BASIC_START"
 msgid "Property or method not found: $(ARG1)."
 msgstr "Heb ganfod priodoledd na dull: $(ARG1)."
 
-#: basic.hrc:96
+#: basic/inc/basic.hrc:96
 msgctxt "RID_BASIC_START"
 msgid "Object required."
 msgstr "Angen gwrthrych."
 
-#: basic.hrc:97
+#: basic/inc/basic.hrc:97
 msgctxt "RID_BASIC_START"
 msgid "Invalid use of an object."
 msgstr "Defnydd annilys gwrthrych."
 
-#: basic.hrc:98
+#: basic/inc/basic.hrc:98
 msgctxt "RID_BASIC_START"
 msgid "OLE Automation is not supported by this object."
 msgstr "Awtomeiddio OLE ddim yn cael ei gynnal gan y gwrthrych."
 
-#: basic.hrc:99
+#: basic/inc/basic.hrc:99
 msgctxt "RID_BASIC_START"
 msgid "This property or method is not supported by the object."
 msgstr "Priodwedd na dull yn cael ei gynnal gan y gwrthrych."
 
-#: basic.hrc:100
+#: basic/inc/basic.hrc:100
 msgctxt "RID_BASIC_START"
 msgid "OLE Automation Error."
 msgstr "Gwall Awtomeiddio OLE."
 
-#: basic.hrc:101
+#: basic/inc/basic.hrc:101
 msgctxt "RID_BASIC_START"
 msgid "This action is not supported by given object."
 msgstr "Nid yw'r weithred yn cael ei chynnal gan wrthrych dynodedig."
 
-#: basic.hrc:102
+#: basic/inc/basic.hrc:102
 msgctxt "RID_BASIC_START"
 msgid "Named arguments are not supported by given object."
 msgstr "Nid yw ymresymiadau a enwyd yn cael eu cynnal gan wrthrych."
 
-#: basic.hrc:103
+#: basic/inc/basic.hrc:103
 msgctxt "RID_BASIC_START"
 msgid "The current locale setting is not supported by the given object."
 msgstr "Nid yw gosodiadau'r locale presennol yn cael eu cynnal gan wrthrych."
 
-#: basic.hrc:104
+#: basic/inc/basic.hrc:104
 msgctxt "RID_BASIC_START"
 msgid "Named argument not found."
 msgstr "Methu canfod yr ymresymiad enwyd."
 
-#: basic.hrc:105
+#: basic/inc/basic.hrc:105
 msgctxt "RID_BASIC_START"
 msgid "Argument is not optional."
 msgstr "Ymresymiad dewisol."
 
-#: basic.hrc:106 /home/cl/vc/git/libo-core/basic/inc/basic.hrc:114
+#: basic/inc/basic.hrc:106 basic/inc/basic.hrc:114
 msgctxt "RID_BASIC_START"
 msgid "Invalid number of arguments."
 msgstr "Nifer annilys o ymresymiadau."
 
-#: basic.hrc:107
+#: basic/inc/basic.hrc:107
 msgctxt "RID_BASIC_START"
 msgid "Object is not a list."
 msgstr "Nid rhestr yw'r gwrthrych."
 
-#: basic.hrc:108
+#: basic/inc/basic.hrc:108
 msgctxt "RID_BASIC_START"
 msgid "Invalid ordinal number."
 msgstr "Rhif trefnol annilys."
 
-#: basic.hrc:109
+#: basic/inc/basic.hrc:109
 msgctxt "RID_BASIC_START"
 msgid "Specified DLL function not found."
 msgstr "Heb ganfod swyddogaeth DLL penodol."
 
-#: basic.hrc:110
+#: basic/inc/basic.hrc:110
 msgctxt "RID_BASIC_START"
 msgid "Invalid clipboard format."
 msgstr "Fformat clipfwrdd annilys."
 
-#: basic.hrc:111
+#: basic/inc/basic.hrc:111
 msgctxt "RID_BASIC_START"
 msgid "Object does not have this property."
 msgstr "Nid oes gan y gwrthrych y briodwedd hwn."
 
-#: basic.hrc:112
+#: basic/inc/basic.hrc:112
 msgctxt "RID_BASIC_START"
 msgid "Object does not have this method."
 msgstr "Nid oes gan y gwrthrych y dull hwn."
 
-#: basic.hrc:113
+#: basic/inc/basic.hrc:113
 msgctxt "RID_BASIC_START"
 msgid "Required argument lacking."
 msgstr "Ymresymiad angenrheidiol yn brin."
 
-#: basic.hrc:115
+#: basic/inc/basic.hrc:115
 msgctxt "RID_BASIC_START"
 msgid "Error executing a method."
 msgstr "Gwall gweithredu dull."
 
-#: basic.hrc:116
+#: basic/inc/basic.hrc:116
 msgctxt "RID_BASIC_START"
 msgid "Unable to set property."
 msgstr "Methu gosod priodwedd."
 
-#: basic.hrc:117
+#: basic/inc/basic.hrc:117
 msgctxt "RID_BASIC_START"
 msgid "Unable to determine property."
 msgstr "Methu dyfalu priodwedd."
 
 #. Compiler errors. These are not runtime errors.
-#: basic.hrc:119
+#: basic/inc/basic.hrc:119
 msgctxt "RID_BASIC_START"
 msgid "Unexpected symbol: $(ARG1)."
 msgstr "Symbol annisgwyl: $(ARG1)."
 
-#: basic.hrc:120
+#: basic/inc/basic.hrc:120
 msgctxt "RID_BASIC_START"
 msgid "Expected: $(ARG1)."
 msgstr "Disgwyl: $(ARG1)."
 
-#: basic.hrc:121
+#: basic/inc/basic.hrc:121
 msgctxt "RID_BASIC_START"
 msgid "Symbol expected."
 msgstr "Disgwyl symbol."
 
-#: basic.hrc:122
+#: basic/inc/basic.hrc:122
 msgctxt "RID_BASIC_START"
 msgid "Variable expected."
 msgstr "Disgwyl amrywiolyn."
 
-#: basic.hrc:123
+#: basic/inc/basic.hrc:123
 msgctxt "RID_BASIC_START"
 msgid "Label expected."
 msgstr "Disgwyl label."
 
-#: basic.hrc:124
+#: basic/inc/basic.hrc:124
 msgctxt "RID_BASIC_START"
 msgid "Value cannot be applied."
 msgstr "Methu gosod gwerth."
 
-#: basic.hrc:125
+#: basic/inc/basic.hrc:125
 msgctxt "RID_BASIC_START"
 msgid "Variable $(ARG1) already defined."
 msgstr "Amrywiolyn $(ARG1) wedi ei ddiffinio eisoes."
 
-#: basic.hrc:126
+#: basic/inc/basic.hrc:126
 msgctxt "RID_BASIC_START"
 msgid "Sub procedure or function procedure $(ARG1) already defined."
 msgstr "Is weithdrefn neu weithdrefn swyddogaeth $(ARG1) wedi ei ddiffinio."
 
-#: basic.hrc:127
+#: basic/inc/basic.hrc:127
 msgctxt "RID_BASIC_START"
 msgid "Label $(ARG1) already defined."
 msgstr "Label $(ARG1) wedi ei ddiffinio eisoes."
 
-#: basic.hrc:128
+#: basic/inc/basic.hrc:128
 msgctxt "RID_BASIC_START"
 msgid "Variable $(ARG1) not found."
 msgstr "Amrywiolyn $(ARG1) heb ei ganfod."
 
-#: basic.hrc:129
+#: basic/inc/basic.hrc:129
 msgctxt "RID_BASIC_START"
 msgid "Array or procedure $(ARG1) not found."
 msgstr "Heb ganfod arae neu weithdrefn $(ARG1)."
 
-#: basic.hrc:130
+#: basic/inc/basic.hrc:130
 msgctxt "RID_BASIC_START"
 msgid "Procedure $(ARG1) not found."
 msgstr "Heb ganfod gweithdrefn $(ARG1)."
 
-#: basic.hrc:131
+#: basic/inc/basic.hrc:131
 msgctxt "RID_BASIC_START"
 msgid "Label $(ARG1) undefined."
 msgstr "Label $(ARG1) heb ei ddiffinio."
 
-#: basic.hrc:132
+#: basic/inc/basic.hrc:132
 msgctxt "RID_BASIC_START"
 msgid "Unknown data type $(ARG1)."
 msgstr "Math data anhysbys $(ARG1)."
 
-#: basic.hrc:133
+#: basic/inc/basic.hrc:133
 msgctxt "RID_BASIC_START"
 msgid "Exit $(ARG1) expected."
 msgstr "Gadael $(ARG1) yn cael ei ddisgwyl."
 
-#: basic.hrc:134
+#: basic/inc/basic.hrc:134
 msgctxt "RID_BASIC_START"
 msgid "Statement block still open: $(ARG1) missing."
 msgstr "Rhwystr gosodiad dal ar agor: $(ARG1) ar goll."
 
-#: basic.hrc:135
+#: basic/inc/basic.hrc:135
 msgctxt "RID_BASIC_START"
 msgid "Parentheses do not match."
 msgstr "Parenthesisau ddim yn cydweddu."
 
-#: basic.hrc:136
+#: basic/inc/basic.hrc:136
 msgctxt "RID_BASIC_START"
 msgid "Symbol $(ARG1) already defined differently."
 msgstr "Symbol $(ARG1) wedi ei ddiffinio'n wahanol."
 
-#: basic.hrc:137
+#: basic/inc/basic.hrc:137
 msgctxt "RID_BASIC_START"
 msgid "Parameters do not correspond to procedure."
 msgstr "Nid yw'r paramedrau'n cyfateb i'r weithdrefn."
 
-#: basic.hrc:138
+#: basic/inc/basic.hrc:138
 msgctxt "RID_BASIC_START"
 msgid "Invalid character in number."
 msgstr "Nod annilys mewn rhif."
 
-#: basic.hrc:139
+#: basic/inc/basic.hrc:139
 msgctxt "RID_BASIC_START"
 msgid "Array must be dimensioned."
 msgstr "Rhaid dimensiynu'r arae."
 
-#: basic.hrc:140
+#: basic/inc/basic.hrc:140
 msgctxt "RID_BASIC_START"
 msgid "Else/Endif without If."
 msgstr "Else/Endif heb If."
 
-#: basic.hrc:141
+#: basic/inc/basic.hrc:141
 msgctxt "RID_BASIC_START"
 msgid "$(ARG1) not allowed within a procedure."
 msgstr "Dim caniatâd i $(ARG1) mewn gweithdrefn."
 
-#: basic.hrc:142
+#: basic/inc/basic.hrc:142
 msgctxt "RID_BASIC_START"
 msgid "$(ARG1) not allowed outside a procedure."
 msgstr "Nid oes caniatâd i $(ARG1) tu allan i weithdrefn."
 
-#: basic.hrc:143
+#: basic/inc/basic.hrc:143
 msgctxt "RID_BASIC_START"
 msgid "Dimension specifications do not match."
 msgstr "Manyleb dimensiwn ddim yn cydweddu."
 
-#: basic.hrc:144
+#: basic/inc/basic.hrc:144
 msgctxt "RID_BASIC_START"
 msgid "Unknown option: $(ARG1)."
 msgstr "Dewis anhysbys $(ARG1)."
 
-#: basic.hrc:145
+#: basic/inc/basic.hrc:145
 msgctxt "RID_BASIC_START"
 msgid "Constant $(ARG1) redefined."
 msgstr "Ail ddiffinio cyson $(ARG1)."
 
-#: basic.hrc:146
+#: basic/inc/basic.hrc:146
 msgctxt "RID_BASIC_START"
 msgid "Program too large."
 msgstr "Rhaglen yn rhy fawr."
 
-#: basic.hrc:147
+#: basic/inc/basic.hrc:147
 msgctxt "RID_BASIC_START"
 msgid "Strings or arrays not permitted."
 msgstr "Dim caniatâd i linellau nag arae."
 
-#: basic.hrc:148
+#: basic/inc/basic.hrc:148
 msgctxt "RID_BASIC_START"
 msgid "An exception occurred $(ARG1)."
 msgstr "Digwyddodd eithriad $(ARG1)."
 
-#: basic.hrc:149
+#: basic/inc/basic.hrc:149
 msgctxt "RID_BASIC_START"
 msgid "This array is fixed or temporarily locked."
 msgstr "Mae'r arae yn un sefydlog neu wedi ei gloi dros dro."
 
-#: basic.hrc:150
+#: basic/inc/basic.hrc:150
 msgctxt "RID_BASIC_START"
 msgid "Out of string space."
 msgstr "Dim gofod llinyn ar ôl."
 
-#: basic.hrc:151
+#: basic/inc/basic.hrc:151
 msgctxt "RID_BASIC_START"
 msgid "Expression Too Complex."
 msgstr "Mynegiad yn Rhy Gymhleth."
 
-#: basic.hrc:152
+#: basic/inc/basic.hrc:152
 msgctxt "RID_BASIC_START"
 msgid "Can't perform requested operation."
 msgstr "Methu cyflawni'r weithred."
 
-#: basic.hrc:153
+#: basic/inc/basic.hrc:153
 msgctxt "RID_BASIC_START"
 msgid "Too many DLL application clients."
 msgstr "Gormod o gleientiaid rhaglenni DLL."
 
-#: basic.hrc:154
+#: basic/inc/basic.hrc:154
 msgctxt "RID_BASIC_START"
 msgid "For loop not initialized."
 msgstr "Ar gyfer cylch heb ei chychwyn."
 
-#: basic.hrc:155
+#: basic/inc/basic.hrc:155
 msgctxt "RID_BASIC_START"
 msgid "$(ARG1)"
 msgstr "$(ARG1)"
 
-#: strings.hrc:25
+#: basic/inc/strings.hrc:25
 msgctxt "STR_BASICKEY_FORMAT_ON"
 msgid "On"
 msgstr "Ymlaen"
 
-#: strings.hrc:26
+#: basic/inc/strings.hrc:26
 msgctxt "STR_BASICKEY_FORMAT_OFF"
 msgid "Off"
 msgstr "Diffodd"
 
-#: strings.hrc:27
+#: basic/inc/strings.hrc:27
 msgctxt "STR_BASICKEY_FORMAT_TRUE"
 msgid "True"
 msgstr "Gwir"
 
-#: strings.hrc:28
+#: basic/inc/strings.hrc:28
 msgctxt "STR_BASICKEY_FORMAT_FALSE"
 msgid "False"
 msgstr "Gau"
 
-#: strings.hrc:29
+#: basic/inc/strings.hrc:29
 msgctxt "STR_BASICKEY_FORMAT_YES"
 msgid "Yes"
 msgstr "Iawn"
 
-#: strings.hrc:30
+#: basic/inc/strings.hrc:30
 msgctxt "STR_BASICKEY_FORMAT_NO"
 msgid "No"
 msgstr "Na"
 
 #. format currency
-#: strings.hrc:32
+#: basic/inc/strings.hrc:32
 msgctxt "STR_BASICKEY_FORMAT_CURRENCY"
 msgid "@0.00 $;@(0.00 $)"
 msgstr "@0.00 $;@(0.00 $)"
 
-#: strings.hrc:34
+#: basic/inc/strings.hrc:34
 msgctxt "IDS_SBERR_TERMINATED"
 msgid "The macro running has been interrupted"
 msgstr "Mae'r macro sy'n rhedeg wedi cael ei darfu"
diff --git a/source/cy/chart2/messages.po b/source/cy/chart2/messages.po
index 01753d148ea..72db11ec704 100644
--- a/source/cy/chart2/messages.po
+++ b/source/cy/chart2/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: 2017-11-22 13:53+0100\n"
-"PO-Revision-Date: 2017-10-06 10:18+0000\n"
+"POT-Creation-Date: 2018-04-23 18:10+0200\n"
+"PO-Revision-Date: 2018-03-01 08:53+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,597 +14,602 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: LibreOffice\n"
-"X-POOTLE-MTIME: 1507285114.000000\n"
+"X-POOTLE-MTIME: 1519894394.000000\n"
 
-#: strings.hrc:24
+#: chart2/inc/strings.hrc:24
 msgctxt "STR_DLG_CHART_WIZARD"
 msgid "Chart Wizard"
 msgstr "Dewin Siart"
 
-#: strings.hrc:25
+#: chart2/inc/strings.hrc:25
 msgctxt "STR_DLG_SMOOTH_LINE_PROPERTIES"
 msgid "Smooth Lines"
 msgstr "Llinellau Llyfn"
 
-#: strings.hrc:26
+#: chart2/inc/strings.hrc:26
 msgctxt "STR_DLG_STEPPED_LINE_PROPERTIES"
 msgid "Stepped Lines"
 msgstr "Llinellau Stepiog"
 
-#: strings.hrc:27
+#: chart2/inc/strings.hrc:27
+msgctxt "STR_DLG_REMOVE_DATA_TABLE"
+msgid "This chart currently contains an internal data table. Do you want to proceed, deleting the internal data table, and set a new data range?"
+msgstr "Mae'r siart ar hyn o bryd yn cynnwys tabl data mewnol. Hoffech chi barhau, dileu'r tabl data mewnol a gosod ystod data newydd?"
+
+#: chart2/inc/strings.hrc:28
 msgctxt "STR_PAGE_CHARTTYPE"
 msgid "Chart Type"
 msgstr "Math o Siart"
 
-#: strings.hrc:28
+#: chart2/inc/strings.hrc:29
 msgctxt "STR_PAGE_DATA_RANGE"
 msgid "Data Range"
 msgstr "Ystod Data"
 
-#: strings.hrc:29
+#: chart2/inc/strings.hrc:30
 msgctxt "STR_PAGE_CHART_ELEMENTS"
 msgid "Chart Elements"
 msgstr "Elfennau Siart"
 
-#: strings.hrc:30
+#: chart2/inc/strings.hrc:31
 msgctxt "STR_PAGE_LINE"
 msgid "Line"
 msgstr "Llinell"
 
-#: strings.hrc:31
+#: chart2/inc/strings.hrc:32
 msgctxt "STR_PAGE_BORDER"
 msgid "Borders"
 msgstr "Borderi"
 
-#: strings.hrc:32
+#: chart2/inc/strings.hrc:33
 msgctxt "STR_PAGE_AREA"
 msgid "Area"
 msgstr "Ardal"
 
-#: strings.hrc:33
+#: chart2/inc/strings.hrc:34
 msgctxt "STR_PAGE_TRANSPARENCY"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: strings.hrc:34
+#: chart2/inc/strings.hrc:35
 msgctxt "STR_PAGE_FONT"
 msgid "Font"
 msgstr "Ffont"
 
-#: strings.hrc:35
+#: chart2/inc/strings.hrc:36
 msgctxt "STR_PAGE_FONT_EFFECTS"
 msgid "Font Effects"
 msgstr "Effeithiau"
 
-#: strings.hrc:36
+#: chart2/inc/strings.hrc:37
 msgctxt "STR_PAGE_NUMBERS"
 msgid "Numbers"
 msgstr "Rhifau"
 
-#: strings.hrc:37
+#: chart2/inc/strings.hrc:38
 msgctxt "STR_PAGE_POSITION"
 msgid "Position"
 msgstr "Safle"
 
-#: strings.hrc:38
+#: chart2/inc/strings.hrc:39
 msgctxt "STR_PAGE_LAYOUT"
 msgid "Layout"
 msgstr "Cynllun"
 
-#: strings.hrc:39
+#: chart2/inc/strings.hrc:40
 msgctxt "STR_PAGE_OPTIONS"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: strings.hrc:40
+#: chart2/inc/strings.hrc:41
 msgctxt "STR_PAGE_SCALE"
 msgid "Scale"
 msgstr "Graddfa"
 
-#: strings.hrc:41
+#: chart2/inc/strings.hrc:42
 msgctxt "STR_PAGE_POSITIONING"
 msgid "Positioning"
 msgstr "Lleoli"
 
-#: strings.hrc:42
+#: chart2/inc/strings.hrc:43
 msgctxt "STR_PAGE_TRENDLINE_TYPE"
 msgid "Type"
 msgstr "Math"
 
-#: strings.hrc:43
+#: chart2/inc/strings.hrc:44
 msgctxt "STR_PAGE_XERROR_BARS"
 msgid "X Error Bars"
 msgstr "Barrau Gwall X"
 
-#: strings.hrc:44
+#: chart2/inc/strings.hrc:45
 msgctxt "STR_PAGE_YERROR_BARS"
 msgid "Y Error Bars"
 msgstr "Barrau Gwall Y"
 
-#: strings.hrc:45
+#: chart2/inc/strings.hrc:46
 msgctxt "STR_PAGE_ALIGNMENT"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: strings.hrc:46
+#: chart2/inc/strings.hrc:47
 msgctxt "STR_PAGE_PERSPECTIVE"
 msgid "Perspective"
 msgstr "Persbectif"
 
-#: strings.hrc:47
+#: chart2/inc/strings.hrc:48
 msgctxt "STR_PAGE_APPEARANCE"
 msgid "Appearance"
 msgstr "Gwedd"
 
-#: strings.hrc:48
+#: chart2/inc/strings.hrc:49
 msgctxt "STR_PAGE_ILLUMINATION"
 msgid "Illumination"
 msgstr "Goleuad"
 
-#: strings.hrc:49
+#: chart2/inc/strings.hrc:50
 msgctxt "STR_PAGE_ASIAN"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: strings.hrc:50
+#: chart2/inc/strings.hrc:51
 #, c-format
 msgctxt "STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS"
 msgid "Mean value line with value %AVERAGE_VALUE and standard deviation %STD_DEVIATION"
 msgstr "Llinell gwerth cymedr gyda gwerth %AVERAGE_VALUE a gwyriad safonnol %STD_DEVIATION"
 
-#: strings.hrc:51
+#: chart2/inc/strings.hrc:52
 msgctxt "STR_OBJECT_AXIS"
 msgid "Axis"
 msgstr "Echelin"
 
-#: strings.hrc:52
+#: chart2/inc/strings.hrc:53
 msgctxt "STR_OBJECT_AXIS_X"
 msgid "X Axis"
 msgstr "Echelin X"
 
-#: strings.hrc:53
+#: chart2/inc/strings.hrc:54
 msgctxt "STR_OBJECT_AXIS_Y"
 msgid "Y Axis"
 msgstr "Echelin Y"
 
-#: strings.hrc:54
+#: chart2/inc/strings.hrc:55
 msgctxt "STR_OBJECT_AXIS_Z"
 msgid "Z Axis"
 msgstr "Echelin Z"
 
-#: strings.hrc:55
+#: chart2/inc/strings.hrc:56
 msgctxt "STR_OBJECT_SECONDARY_X_AXIS"
 msgid "Secondary X Axis"
 msgstr "Ail Echelin X"
 
-#: strings.hrc:56
+#: chart2/inc/strings.hrc:57
 msgctxt "STR_OBJECT_SECONDARY_Y_AXIS"
 msgid "Secondary Y Axis"
 msgstr "Ail Echelin Y"
 
-#: strings.hrc:57
+#: chart2/inc/strings.hrc:58
 msgctxt "STR_OBJECT_AXES"
 msgid "Axes"
 msgstr "Prif echel"
 
-#: strings.hrc:58
+#: chart2/inc/strings.hrc:59
 msgctxt "STR_OBJECT_GRIDS"
 msgid "Grids"
 msgstr "Grid"
 
-#: strings.hrc:59
+#: chart2/inc/strings.hrc:60
 msgctxt "STR_OBJECT_GRID"
 msgid "Grid"
 msgstr "Grid"
 
-#: strings.hrc:60
+#: chart2/inc/strings.hrc:61
 msgctxt "STR_OBJECT_GRID_MAJOR_X"
 msgid "X Axis Major Grid"
 msgstr "Grid Mawr Echelin X"
 
-#: strings.hrc:61
+#: chart2/inc/strings.hrc:62
 msgctxt "STR_OBJECT_GRID_MAJOR_Y"
 msgid "Y Axis Major Grid"
 msgstr "Grid Mawr Echelin Y"
 
-#: strings.hrc:62
+#: chart2/inc/strings.hrc:63
 msgctxt "STR_OBJECT_GRID_MAJOR_Z"
 msgid "Z Axis Major Grid"
 msgstr "Grid Mawr Echelin Z"
 
-#: strings.hrc:63
+#: chart2/inc/strings.hrc:64
 msgctxt "STR_OBJECT_GRID_MINOR_X"
 msgid "X Axis Minor Grid"
 msgstr "Grid Bach Echelin X"
 
-#: strings.hrc:64
+#: chart2/inc/strings.hrc:65
 msgctxt "STR_OBJECT_GRID_MINOR_Y"
 msgid "Y Axis Minor Grid"
 msgstr "Grid Bach Echelin Y"
 
-#: strings.hrc:65
+#: chart2/inc/strings.hrc:66
 msgctxt "STR_OBJECT_GRID_MINOR_Z"
 msgid "Z Axis Minor Grid"
 msgstr "Grid Bach Echelin Z"
 
-#: strings.hrc:66
+#: chart2/inc/strings.hrc:67
 msgctxt "STR_OBJECT_LEGEND"
 msgid "Legend"
 msgstr "Allwedd"
 
-#: strings.hrc:67
+#: chart2/inc/strings.hrc:68
 msgctxt "STR_OBJECT_TITLE"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:68
+#: chart2/inc/strings.hrc:69
 msgctxt "STR_OBJECT_TITLES"
 msgid "Titles"
 msgstr "Teitlau"
 
-#: strings.hrc:69
+#: chart2/inc/strings.hrc:70
 msgctxt "STR_OBJECT_TITLE_MAIN"
 msgid "Main Title"
 msgstr "Prif Deitl"
 
-#: strings.hrc:70
+#: chart2/inc/strings.hrc:71
 msgctxt "STR_OBJECT_TITLE_SUB"
 msgid "Subtitle"
 msgstr "Is deitl"
 
-#: strings.hrc:71
+#: chart2/inc/strings.hrc:72
 msgctxt "STR_OBJECT_TITLE_X_AXIS"
 msgid "X Axis Title"
 msgstr "Teitl Echelin X"
 
-#: strings.hrc:72
+#: chart2/inc/strings.hrc:73
 msgctxt "STR_OBJECT_TITLE_Y_AXIS"
 msgid "Y Axis Title"
 msgstr "Teitl Echelin Y"
 
-#: strings.hrc:73
+#: chart2/inc/strings.hrc:74
 msgctxt "STR_OBJECT_TITLE_Z_AXIS"
 msgid "Z Axis Title"
 msgstr "Teitl Echelin Z"
 
-#: strings.hrc:74
+#: chart2/inc/strings.hrc:75
 msgctxt "STR_OBJECT_TITLE_SECONDARY_X_AXIS"
 msgid "Secondary X Axis Title"
 msgstr "Teitl Echelin X Eilradd"
 
-#: strings.hrc:75
+#: chart2/inc/strings.hrc:76
 msgctxt "STR_OBJECT_TITLE_SECONDARY_Y_AXIS"
 msgid "Secondary Y Axis Title"
 msgstr "Teitl Echelin Y Eilradd"
 
-#: strings.hrc:76
+#: chart2/inc/strings.hrc:77
 msgctxt "STR_OBJECT_LABEL"
 msgid "Label"
 msgstr "Label"
 
-#: strings.hrc:77
+#: chart2/inc/strings.hrc:78
 msgctxt "STR_OBJECT_DATALABELS"
 msgid "Data Labels"
 msgstr "Labeli Data"
 
-#: strings.hrc:78
+#: chart2/inc/strings.hrc:79
 msgctxt "STR_OBJECT_DATAPOINT"
 msgid "Data Point"
 msgstr "Pwynt Data"
 
-#: strings.hrc:79
+#: chart2/inc/strings.hrc:80
 msgctxt "STR_OBJECT_DATAPOINTS"
 msgid "Data Points"
 msgstr "Pwyntiau Data"
 
-#: strings.hrc:80
+#: chart2/inc/strings.hrc:81
 msgctxt "STR_OBJECT_LEGEND_SYMBOL"
 msgid "Legend Key"
 msgstr "Allwedd Esboniad"
 
-#: strings.hrc:81
+#: chart2/inc/strings.hrc:82
 msgctxt "STR_OBJECT_DATASERIES"
 msgid "Data Series"
 msgstr "Cyfres Data"
 
-#: strings.hrc:82
+#: chart2/inc/strings.hrc:83
 msgctxt "STR_OBJECT_DATASERIES_PLURAL"
 msgid "Data Series"
 msgstr "Cyfres Data"
 
-#: strings.hrc:83
+#: chart2/inc/strings.hrc:84
 msgctxt "STR_OBJECT_CURVE"
 msgid "Trend Line"
 msgstr "Llinell Tuedd"
 
-#: strings.hrc:84
+#: chart2/inc/strings.hrc:85
 msgctxt "STR_OBJECT_CURVES"
 msgid "Trend Lines"
 msgstr "Llinellau Tuedd"
 
-#: strings.hrc:85
+#: chart2/inc/strings.hrc:86
 msgctxt "STR_OBJECT_CURVE_WITH_PARAMETERS"
 msgid "Trend line %FORMULA with accuracy R² = %RSQUARED"
 msgstr "Cromlin atchweliad %FORMULA gyda chywirdeg R² = %RSQUARED"
 
-#: strings.hrc:86
+#: chart2/inc/strings.hrc:87
 msgctxt "STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS"
 msgid "Moving average trend line with period = %PERIOD"
 msgstr "Symud llinell cyfartalog gyda chyfnod = %PERIOD"
 
-#: strings.hrc:87
+#: chart2/inc/strings.hrc:88
 msgctxt "STR_OBJECT_AVERAGE_LINE"
 msgid "Mean Value Line"
 msgstr "Llinell Gwerth Cyfartalog"
 
-#: strings.hrc:88
+#: chart2/inc/strings.hrc:89
 msgctxt "STR_OBJECT_CURVE_EQUATION"
 msgid "Equation"
 msgstr "Hafaliad"
 
-#: strings.hrc:89
+#: chart2/inc/strings.hrc:90
 msgctxt "STR_OBJECT_ERROR_BARS_X"
 msgid "X Error Bars"
 msgstr "Barrau Gwall X"
 
-#: strings.hrc:90
+#: chart2/inc/strings.hrc:91
 msgctxt "STR_OBJECT_ERROR_BARS_Y"
 msgid "Y Error Bars"
 msgstr "Barrau Gwall Y"
 
-#: strings.hrc:91
+#: chart2/inc/strings.hrc:92
 msgctxt "STR_OBJECT_ERROR_BARS_Z"
 msgid "Z Error Bars"
 msgstr "Barrau Gwall Z"
 
-#: strings.hrc:92
+#: chart2/inc/strings.hrc:93
 msgctxt "STR_OBJECT_STOCK_LOSS"
 msgid "Stock Loss"
 msgstr "Colled Stoc"
 
-#: strings.hrc:93
+#: chart2/inc/strings.hrc:94
 msgctxt "STR_OBJECT_STOCK_GAIN"
 msgid "Stock Gain"
 msgstr "Cynnydd Stoc"
 
-#: strings.hrc:94
+#: chart2/inc/strings.hrc:95
 msgctxt "STR_OBJECT_PAGE"
 msgid "Chart Area"
 msgstr "Ardal Siart"
 
-#: strings.hrc:95
+#: chart2/inc/strings.hrc:96
 msgctxt "STR_OBJECT_DIAGRAM"
 msgid "Chart"
 msgstr "Siart"
 
-#: strings.hrc:96
+#: chart2/inc/strings.hrc:97
 msgctxt "STR_OBJECT_DIAGRAM_WALL"
 msgid "Chart Wall"
 msgstr "Wal Siart"
 
-#: strings.hrc:97
+#: chart2/inc/strings.hrc:98
 msgctxt "STR_OBJECT_DIAGRAM_FLOOR"
 msgid "Chart Floor"
 msgstr "Llawr Siart"
 
-#: strings.hrc:98
+#: chart2/inc/strings.hrc:99
 msgctxt "STR_OBJECT_SHAPE"
 msgid "Drawing Object"
 msgstr "Gwrthrych Lluniadu"
 
-#: strings.hrc:99
+#: chart2/inc/strings.hrc:100
 #, c-format
 msgctxt "STR_TIP_DATASERIES"
 msgid "Data Series '%SERIESNAME'"
 msgstr "Cyfres Data '%SERIESNAME'"
 
-#: strings.hrc:100
+#: chart2/inc/strings.hrc:101
 msgctxt "STR_TIP_DATAPOINT_INDEX"
 msgid "Data Point %POINTNUMBER"
 msgstr "Pwynt Data %POINTNUMBER"
 
-#: strings.hrc:101
+#: chart2/inc/strings.hrc:102
 msgctxt "STR_TIP_DATAPOINT_VALUES"
 msgid "Values: %POINTVALUES"
 msgstr "Gwerth: %POINTVALUES"
 
-#: strings.hrc:102
+#: chart2/inc/strings.hrc:103
 msgctxt "STR_TIP_DATAPOINT"
 msgid "Data Point %POINTNUMBER, data series %SERIESNUMBER, values: %POINTVALUES"
 msgstr "Pwynt Data %POINTNUMBER, cyfres data %SERIESNUMBER, gwerth: %POINTVALUES"
 
-#: strings.hrc:103
+#: chart2/inc/strings.hrc:104
 msgctxt "STR_STATUS_DATAPOINT_MARKED"
 msgid "Data point %POINTNUMBER in data series %SERIESNUMBER selected, values: %POINTVALUES"
 msgstr "Pwynt data %POINTNUMBER mewn cyfres data %SERIESNUMBER wedi ei ddewis, gwerth: %POINTVALUES"
 
-#: strings.hrc:104
+#: chart2/inc/strings.hrc:105
 msgctxt "STR_STATUS_OBJECT_MARKED"
 msgid "%OBJECTNAME selected"
 msgstr "Wedi dewis %OBJECTNAME"
 
-#: strings.hrc:105
+#: chart2/inc/strings.hrc:106
 msgctxt "STR_STATUS_PIE_SEGMENT_EXPLODED"
 msgid "Pie exploded by %PERCENTVALUE percent"
 msgstr "Siart gylch wedi ei chwyddo gyda %PERCENTVALUE y cant"
 
-#: strings.hrc:106
+#: chart2/inc/strings.hrc:107
 msgctxt "STR_OBJECT_FOR_SERIES"
 msgid "%OBJECTNAME for Data Series '%SERIESNAME'"
 msgstr "%OBJECTNAME ar gyfer Cyfres Data '%SERIESNAME'"
 
-#: strings.hrc:107
+#: chart2/inc/strings.hrc:108
 msgctxt "STR_OBJECT_FOR_ALL_SERIES"
 msgid "%OBJECTNAME for all Data Series"
 msgstr "%OBJECTNAME ar gyfer pob Cyfres Data"
 
-#: strings.hrc:108
+#: chart2/inc/strings.hrc:109
 msgctxt "STR_ACTION_EDIT_CHARTTYPE"
 msgid "Edit chart type"
 msgstr "Golygu'r math o siart"
 
-#: strings.hrc:109
+#: chart2/inc/strings.hrc:110
 msgctxt "STR_ACTION_EDIT_DATA_RANGES"
 msgid "Edit data ranges"
 msgstr "Golygu'r ystod data"
 
-#: strings.hrc:110
+#: chart2/inc/strings.hrc:111
 msgctxt "STR_ACTION_EDIT_3D_VIEW"
 msgid "Edit 3D view"
 msgstr "Golygu golwg 3D"
 
-#: strings.hrc:111
+#: chart2/inc/strings.hrc:112
 msgctxt "STR_ACTION_EDIT_CHART_DATA"
 msgid "Edit chart data"
 msgstr "Golygu data'r siart"
 
-#: strings.hrc:112
+#: chart2/inc/strings.hrc:113
 msgctxt "STR_ACTION_TOGGLE_LEGEND"
 msgid "Legend on/off"
 msgstr "Esboniad ymlaen/diffodd"
 
-#: strings.hrc:113
+#: chart2/inc/strings.hrc:114
 msgctxt "STR_ACTION_TOGGLE_GRID_HORZ"
 msgid "Horizontal grid major/major&minor/off"
 msgstr "Grid llorweddol mawr/mawr&bach/diffodd"
 
-#: strings.hrc:114
+#: chart2/inc/strings.hrc:115
 msgctxt "STR_ACTION_TOGGLE_GRID_VERTICAL"
 msgid "Vertical grid major/major&minor/off"
 msgstr "Grid fertigol mawr/mawr&bach/diffodd"
 
-#: strings.hrc:115
+#: chart2/inc/strings.hrc:116
 msgctxt "STR_ACTION_SCALE_TEXT"
 msgid "Scale Text"
 msgstr "Testun Graddfa"
 
-#: strings.hrc:116
+#: chart2/inc/strings.hrc:117
 msgctxt "STR_ACTION_REARRANGE_CHART"
 msgid "Automatic Layout"
 msgstr "Ad-drefnu Siart"
 
-#: strings.hrc:117
+#: chart2/inc/strings.hrc:118
 msgctxt "STR_ACTION_NOTPOSSIBLE"
 msgid "This function cannot be completed with the selected objects."
 msgstr "Nid oes modd cwblhau'r swyddogaethau hyn gyda'r gwrthrychau dewiswyd."
 
-#: strings.hrc:118
+#: chart2/inc/strings.hrc:119
 msgctxt "STR_ACTION_EDIT_TEXT"
 msgid "Edit text"
 msgstr "Golygu testun"
 
-#: strings.hrc:119
+#: chart2/inc/strings.hrc:120
 #, c-format
 msgctxt "STR_COLUMN_LABEL"
 msgid "Column %COLUMNNUMBER"
 msgstr "Colofn %COLUMNNUMBER"
 
-#: strings.hrc:120
+#: chart2/inc/strings.hrc:121
 msgctxt "STR_ROW_LABEL"
 msgid "Row %ROWNUMBER"
 msgstr "Rhes %ROWNUMBER"
 
-#: strings.hrc:121
+#: chart2/inc/strings.hrc:122
 msgctxt "STR_DATA_ROLE_LABEL"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:122
+#: chart2/inc/strings.hrc:123
 msgctxt "STR_DATA_ROLE_X"
 msgid "X-Values"
 msgstr "Gwerthoedd-X"
 
-#: strings.hrc:123
+#: chart2/inc/strings.hrc:124
 msgctxt "STR_DATA_ROLE_Y"
 msgid "Y-Values"
 msgstr "Gwerthoedd-Y"
 
-#: strings.hrc:124
+#: chart2/inc/strings.hrc:125
 msgctxt "STR_DATA_ROLE_SIZE"
 msgid "Bubble Sizes"
 msgstr "Maint Swigod"
 
-#: strings.hrc:125
+#: chart2/inc/strings.hrc:126
 msgctxt "STR_DATA_ROLE_X_ERROR"
 msgid "X-Error-Bars"
 msgstr "Barrau-Gwall-X"
 
-#: strings.hrc:126
+#: chart2/inc/strings.hrc:127
 msgctxt "STR_DATA_ROLE_X_ERROR_POSITIVE"
 msgid "Positive X-Error-Bars"
 msgstr "Barrau-Gwall-X Posidol"
 
-#: strings.hrc:127
+#: chart2/inc/strings.hrc:128
 msgctxt "STR_DATA_ROLE_X_ERROR_NEGATIVE"
 msgid "Negative X-Error-Bars"
 msgstr "Barrau-Gwall-X Negyddol"
 
-#: strings.hrc:128
+#: chart2/inc/strings.hrc:129
 msgctxt "STR_DATA_ROLE_Y_ERROR"
 msgid "Y-Error-Bars"
 msgstr "Barrau-Gwall-Y"
 
-#: strings.hrc:129
+#: chart2/inc/strings.hrc:130
 msgctxt "STR_DATA_ROLE_Y_ERROR_POSITIVE"
 msgid "Positive Y-Error-Bars"
 msgstr "Barrau-Gwall-Y Posidol"
 
-#: strings.hrc:130
+#: chart2/inc/strings.hrc:131
 msgctxt "STR_DATA_ROLE_Y_ERROR_NEGATIVE"
 msgid "Negative Y-Error-Bars"
 msgstr "Barrau-Gwall-Y Negyddol"
 
-#: strings.hrc:131
+#: chart2/inc/strings.hrc:132
 msgctxt "STR_DATA_ROLE_FIRST"
 msgid "Open Values"
 msgstr "Agor Gwerthoedd"
 
-#: strings.hrc:132
+#: chart2/inc/strings.hrc:133
 msgctxt "STR_DATA_ROLE_LAST"
 msgid "Close Values"
 msgstr "Cau Gwerthoedd"
 
-#: strings.hrc:133
+#: chart2/inc/strings.hrc:134
 msgctxt "STR_DATA_ROLE_MIN"
 msgid "Low Values"
 msgstr "Gwerthoedd Isel"
 
-#: strings.hrc:134
+#: chart2/inc/strings.hrc:135
 msgctxt "STR_DATA_ROLE_MAX"
 msgid "High Values"
 msgstr "Gwerthoedd Uchel"
 
-#: strings.hrc:135
+#: chart2/inc/strings.hrc:136
 msgctxt "STR_DATA_ROLE_CATEGORIES"
 msgid "Categories"
 msgstr "Categorïau"
 
-#: strings.hrc:136
+#: chart2/inc/strings.hrc:137
 msgctxt "STR_DATA_UNNAMED_SERIES"
 msgid "Unnamed Series"
 msgstr "Cyfres Dienw"
 
-#: strings.hrc:137
+#: chart2/inc/strings.hrc:138
 msgctxt "STR_DATA_UNNAMED_SERIES_WITH_INDEX"
 msgid "Unnamed Series %NUMBER"
 msgstr "Cyfres Dienw %NUMBER"
 
-#: strings.hrc:138
+#: chart2/inc/strings.hrc:139
 msgctxt "STR_DATA_SELECT_RANGE_FOR_SERIES"
 msgid "Select Range for %VALUETYPE of %SERIESNAME"
 msgstr "Dewis Ystod %VALUETYPE o %SERIESNAME"
 
-#: strings.hrc:139
+#: chart2/inc/strings.hrc:140
 msgctxt "STR_DATA_SELECT_RANGE_FOR_CATEGORIES"
 msgid "Select Range for Categories"
 msgstr "Dewis Ystod ar gyfer Categorïau"
 
-#: strings.hrc:140
+#: chart2/inc/strings.hrc:141
 msgctxt "STR_DATA_SELECT_RANGE_FOR_DATALABELS"
 msgid "Select Range for data labels"
 msgstr "Dewis Ystod ar gyfer labeli data"
 
-#: strings.hrc:141
+#: chart2/inc/strings.hrc:142
 msgctxt "STR_DATA_EDITOR_INCORRECT_INPUT"
 msgid ""
 "Your last input is incorrect.\n"
@@ -613,2522 +618,2522 @@ msgstr ""
 "Roedd eich mewnbwn diwethaf yn anghywir.\n"
 "Anwybyddu'r newid a chau'r deialog?"
 
-#: strings.hrc:142
+#: chart2/inc/strings.hrc:143
 msgctxt "STR_TEXT_DIRECTION_LTR"
 msgid "Left-to-right"
 msgstr "Chwith i'r dde"
 
-#: strings.hrc:143
+#: chart2/inc/strings.hrc:144
 msgctxt "STR_TEXT_DIRECTION_RTL"
 msgid "Right-to-left"
 msgstr "De i chwith"
 
-#: strings.hrc:144
+#: chart2/inc/strings.hrc:145
 msgctxt "STR_TEXT_DIRECTION_SUPER"
 msgid "Use superordinate object settings"
 msgstr "Defnyddio gosodiadau gwrthrych uwcholyn"
 
-#: strings.hrc:145
+#: chart2/inc/strings.hrc:146
 msgctxt "STR_PROPERTY_ROLE_FILLCOLOR"
 msgid "Fill Color"
 msgstr "Lliw Llanw"
 
-#: strings.hrc:146
+#: chart2/inc/strings.hrc:147
 msgctxt "STR_PROPERTY_ROLE_BORDERCOLOR"
 msgid "Border Color"
 msgstr "Lliw Border"
 
-#: strings.hrc:148
+#: chart2/inc/strings.hrc:149
 msgctxt "STR_CONTROLTEXT_ERROR_BARS_FROM_DATA"
 msgid "From Data Table"
 msgstr "O'r Tabl Data"
 
-#: strings.hrc:149
+#: chart2/inc/strings.hrc:150
 msgctxt "STR_REGRESSION_LINEAR"
 msgid "Linear"
 msgstr "Llinol"
 
-#: strings.hrc:150
+#: chart2/inc/strings.hrc:151
 msgctxt "STR_REGRESSION_LOG"
 msgid "Logarithmic"
 msgstr "Logarithmig"
 
-#: strings.hrc:151
+#: chart2/inc/strings.hrc:152
 msgctxt "STR_REGRESSION_EXP"
 msgid "Exponential"
 msgstr "Esbonyddol"
 
-#: strings.hrc:152
+#: chart2/inc/strings.hrc:153
 msgctxt "STR_REGRESSION_POWER"
 msgid "Power"
 msgstr "Pŵer"
 
-#: strings.hrc:153
+#: chart2/inc/strings.hrc:154
 msgctxt "STR_REGRESSION_POLYNOMIAL"
 msgid "Polynomial"
 msgstr "Polynomaidd"
 
-#: strings.hrc:154
+#: chart2/inc/strings.hrc:155
 msgctxt "STR_REGRESSION_MOVING_AVERAGE"
 msgid "Moving average"
 msgstr "Cyfartaledd symudol"
 
-#: strings.hrc:155
+#: chart2/inc/strings.hrc:156
 msgctxt "STR_REGRESSION_MEAN"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: strings.hrc:157
+#: chart2/inc/strings.hrc:158
 msgctxt "STR_TYPE_COLUMN"
 msgid "Column"
 msgstr "Colofn"
 
-#: strings.hrc:158
+#: chart2/inc/strings.hrc:159
 msgctxt "STR_TYPE_BAR"
 msgid "Bar"
 msgstr "Bar"
 
-#: strings.hrc:159
+#: chart2/inc/strings.hrc:160
 msgctxt "STR_TYPE_AREA"
 msgid "Area"
 msgstr "Ardal"
 
-#: strings.hrc:160
+#: chart2/inc/strings.hrc:161
 msgctxt "STR_TYPE_PIE"
 msgid "Pie"
 msgstr "Cylch"
 
-#: strings.hrc:161
+#: chart2/inc/strings.hrc:162
 msgctxt "STR_PIE_EXPLODED"
 msgid "Exploded Pie Chart"
 msgstr "Siart Cylch Taenedig"
 
-#: strings.hrc:162
+#: chart2/inc/strings.hrc:163
 msgctxt "STR_DONUT_EXPLODED"
 msgid "Exploded Donut Chart"
 msgstr "Siart Toesen Taenedig"
 
-#: strings.hrc:163
+#: chart2/inc/strings.hrc:164
 msgctxt "STR_DONUT"
 msgid "Donut"
 msgstr "Toesen"
 
-#: strings.hrc:164
+#: chart2/inc/strings.hrc:165
 msgctxt "STR_TYPE_LINE"
 msgid "Line"
 msgstr "Llinell"
 
-#: strings.hrc:165
+#: chart2/inc/strings.hrc:166
 msgctxt "STR_TYPE_XY"
 msgid "XY (Scatter)"
 msgstr "XY (Chwâl)"
 
-#: strings.hrc:166
+#: chart2/inc/strings.hrc:167
 msgctxt "STR_POINTS_AND_LINES"
 msgid "Points and Lines"
 msgstr "Pwyntiau a Llinellau"
 
-#: strings.hrc:167
+#: chart2/inc/strings.hrc:168
 msgctxt "STR_POINTS_ONLY"
 msgid "Points Only"
 msgstr "Pwyntiau'n unig"
 
-#: strings.hrc:168
+#: chart2/inc/strings.hrc:169
 msgctxt "STR_LINES_ONLY"
 msgid "Lines Only"
 msgstr "Llinellau yn Unig"
 
-#: strings.hrc:169
+#: chart2/inc/strings.hrc:170
 msgctxt "STR_LINES_3D"
 msgid "3D Lines"
 msgstr "Llinellau 3D"
 
-#: strings.hrc:170
+#: chart2/inc/strings.hrc:171
 msgctxt "STR_TYPE_COMBI_COLUMN_LINE"
 msgid "Column and Line"
 msgstr "Llinell a Cholofn"
 
-#: strings.hrc:171
+#: chart2/inc/strings.hrc:172
 msgctxt "STR_LINE_COLUMN"
 msgid "Columns and Lines"
 msgstr "Siart Cyfuniad: Llinellau a Cholofnau"
 
-#: strings.hrc:172
+#: chart2/inc/strings.hrc:173
 msgctxt "STR_LINE_STACKEDCOLUMN"
 msgid "Stacked Columns and Lines"
 msgstr "Siart Cyfuniad: Llinellau a cholofnau wedi stacio"
 
-#: strings.hrc:173
+#: chart2/inc/strings.hrc:174
 msgctxt "STR_TYPE_NET"
 msgid "Net"
 msgstr "Rhwyd"
 
-#: strings.hrc:174
+#: chart2/inc/strings.hrc:175
 msgctxt "STR_TYPE_STOCK"
 msgid "Stock"
 msgstr "Stoc"
 
-#: strings.hrc:175
+#: chart2/inc/strings.hrc:176
 msgctxt "STR_STOCK_1"
 msgid "Stock Chart 1"
 msgstr "Siart Stoc 1"
 
-#: strings.hrc:176
+#: chart2/inc/strings.hrc:177
 msgctxt "STR_STOCK_2"
 msgid "Stock Chart 2"
 msgstr "Siart Stoc 2"
 
-#: strings.hrc:177
+#: chart2/inc/strings.hrc:178
 msgctxt "STR_STOCK_3"
 msgid "Stock Chart 3"
 msgstr "Siart Stoc 3"
 
-#: strings.hrc:178
+#: chart2/inc/strings.hrc:179
 msgctxt "STR_STOCK_4"
 msgid "Stock Chart 4"
 msgstr "Siart Stoc 4"
 
-#: strings.hrc:179
+#: chart2/inc/strings.hrc:180
 msgctxt "STR_NORMAL"
 msgid "Normal"
 msgstr "Normal"
 
-#: strings.hrc:180
+#: chart2/inc/strings.hrc:181
 msgctxt "STR_STACKED"
 msgid "Stacked"
 msgstr "Staciwyd"
 
-#: strings.hrc:181
+#: chart2/inc/strings.hrc:182
 msgctxt "STR_PERCENT"
 msgid "Percent Stacked"
 msgstr "Canran"
 
-#: strings.hrc:182
+#: chart2/inc/strings.hrc:183
 msgctxt "STR_DEEP"
 msgid "Deep"
 msgstr "Dwfn"
 
-#: strings.hrc:183
+#: chart2/inc/strings.hrc:184
 msgctxt "STR_FILLED"
 msgid "Filled"
 msgstr "Llanwyd"
 
-#: strings.hrc:184
+#: chart2/inc/strings.hrc:185
 msgctxt "STR_TYPE_BUBBLE"
 msgid "Bubble"
 msgstr "Swigen"
 
-#: strings.hrc:185
+#: chart2/inc/strings.hrc:186
 msgctxt "STR_BUBBLE_1"
 msgid "Bubble Chart"
 msgstr "Siart Swigen"
 
-#: strings.hrc:186
+#: chart2/inc/strings.hrc:187
 msgctxt "STR_TYPE_GL3D_BAR"
 msgid "GL3D Bar"
 msgstr "Bar GL3D"
 
-#: strings.hrc:187
+#: chart2/inc/strings.hrc:188
 msgctxt "STR_GL3D_BAR"
 msgid "GL3D Bar Chart"
 msgstr "Siart Bar GL3D"
 
-#: strings.hrc:189
+#: chart2/inc/strings.hrc:190
 msgctxt "STR_INVALID_NUMBER"
 msgid "Numbers are required. Check your input."
 msgstr "Mae angen rhifau. Gwiriwch eich mewnbwn."
 
-#: strings.hrc:190
+#: chart2/inc/strings.hrc:191
 msgctxt "STR_STEP_GT_ZERO"
 msgid "The major interval requires a positive number. Check your input."
 msgstr "Mae'r cyfwng mawr angen rhif positif. Gwiriwch eich mewnbwn."
 
-#: strings.hrc:191
+#: chart2/inc/strings.hrc:192
 msgctxt "STR_BAD_LOGARITHM"
 msgid "The logarithmic scale requires positive numbers. Check your input."
 msgstr "Mae'r graddfa logarithmig angen rhifau positif. Gwiriwch eich mewnbwn."
 
-#: strings.hrc:192
+#: chart2/inc/strings.hrc:193
 msgctxt "STR_MIN_GREATER_MAX"
 msgid "The minimum must be lower than the maximum. Check your input."
 msgstr "Rhaid i'r lleiafswm fod yn llai na'r uchafswm. Gwiriwch eich mewnbwn."
 
-#: strings.hrc:193
+#: chart2/inc/strings.hrc:194
 msgctxt "STR_INVALID_INTERVALS"
 msgid "The major interval needs to be greater than the minor interval. Check your input."
 msgstr "Rhaid i'r cyfnod mawr fod yn fwy na'r cyfnod bach. Gwiriwch eich mewnbwn."
 
-#: strings.hrc:194
+#: chart2/inc/strings.hrc:195
 msgctxt "STR_INVALID_TIME_UNIT"
 msgid "The major and minor interval need to be greater or equal to the resolution. Check your input."
 msgstr "Rhaid i'r cyfnod mawr fod yn fwy neu'n gydradd a'r cydraniad. Gwiriwch eich mewnbwn."
 
-#: 3dviewdialog.ui:8
+#: chart2/uiconfig/ui/3dviewdialog.ui:8
 msgctxt "3dviewdialog|3DViewDialog"
 msgid "3D View"
 msgstr "Golwg 3D"
 
-#: chardialog.ui:8
+#: chart2/uiconfig/ui/chardialog.ui:8
 msgctxt "chardialog|CharDialog"
 msgid "Character"
 msgstr "Nod"
 
-#: chardialog.ui:105
+#: chart2/uiconfig/ui/chardialog.ui:105
 msgctxt "chardialog|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: chardialog.ui:127
+#: chart2/uiconfig/ui/chardialog.ui:127
 msgctxt "chardialog|fonteffects"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: chardialog.ui:150
+#: chart2/uiconfig/ui/chardialog.ui:150
 msgctxt "chardialog|position"
 msgid "Position"
 msgstr "Safle"
 
-#: chartdatadialog.ui:8
+#: chart2/uiconfig/ui/chartdatadialog.ui:8
 msgctxt "chartdatadialog|ChartDataDialog"
 msgid "Data Table"
 msgstr "Tabl Data"
 
-#: chartdatadialog.ui:88
+#: chart2/uiconfig/ui/chartdatadialog.ui:88
 msgctxt "chartdatadialog|InsertRow"
 msgid "Insert Row"
 msgstr "Mewnosod Rhes"
 
-#: chartdatadialog.ui:102
+#: chart2/uiconfig/ui/chartdatadialog.ui:102
 msgctxt "chartdatadialog|InsertColumn"
 msgid "Insert Series"
 msgstr "Mewnosod Cyfres"
 
-#: chartdatadialog.ui:116
+#: chart2/uiconfig/ui/chartdatadialog.ui:116
 msgctxt "chartdatadialog|InsertTextColumn"
 msgid "Insert Text Column"
 msgstr "Mewnosod Colofn Testun"
 
-#: chartdatadialog.ui:130
+#: chart2/uiconfig/ui/chartdatadialog.ui:130
 msgctxt "chartdatadialog|RemoveRow"
 msgid "Delete Row"
 msgstr "Dileu Rhes"
 
-#: chartdatadialog.ui:144
+#: chart2/uiconfig/ui/chartdatadialog.ui:144
 msgctxt "chartdatadialog|RemoveColumn"
 msgid "Delete Series"
 msgstr "Dileu Cyfres"
 
-#: chartdatadialog.ui:168
+#: chart2/uiconfig/ui/chartdatadialog.ui:168
 msgctxt "chartdatadialog|MoveLeftColumn"
 msgid "Move Series Left"
 msgstr "Symud Cyfres i'r Chwith"
 
-#: chartdatadialog.ui:182
+#: chart2/uiconfig/ui/chartdatadialog.ui:182
 msgctxt "chartdatadialog|MoveRightColumn"
 msgid "Move Series Right"
 msgstr "Symud Cyfres i'r Dde"
 
-#: chartdatadialog.ui:196
+#: chart2/uiconfig/ui/chartdatadialog.ui:196
 msgctxt "chartdatadialog|MoveUpRow"
 msgid "Move Row Up"
 msgstr "Symud Rhes i Fyny"
 
-#: chartdatadialog.ui:210
+#: chart2/uiconfig/ui/chartdatadialog.ui:210
 msgctxt "chartdatadialog|MoveDownRow"
 msgid "Move Row Down"
 msgstr "Symud Rhes i Lawr"
 
-#: charttypedialog.ui:8
+#: chart2/uiconfig/ui/charttypedialog.ui:8
 msgctxt "charttypedialog|ChartTypeDialog"
 msgid "Chart Type"
 msgstr "Math o Siart"
 
-#: datarangedialog.ui:8
+#: chart2/uiconfig/ui/datarangedialog.ui:8
 msgctxt "datarangedialog|DataRangeDialog"
 msgid "Data Ranges"
 msgstr "Ystodau Data"
 
-#: dlg_DataLabel.ui:20
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:20
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Best fit"
 msgstr "Ffit orau"
 
-#: dlg_DataLabel.ui:24
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:24
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Center"
 msgstr "Canoli"
 
-#: dlg_DataLabel.ui:28
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:28
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Above"
 msgstr "Uwchlaw"
 
-#: dlg_DataLabel.ui:32
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:32
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Top left"
 msgstr "Brig chwith"
 
-#: dlg_DataLabel.ui:36
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:36
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Left"
 msgstr "Chwith"
 
-#: dlg_DataLabel.ui:40
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:40
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Bottom left"
 msgstr "Gwaelod chwith"
 
-#: dlg_DataLabel.ui:44
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:44
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Below"
 msgstr "Islaw"
 
-#: dlg_DataLabel.ui:48
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:48
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Bottom right"
 msgstr "Gwaelod de"
 
-#: dlg_DataLabel.ui:52
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:52
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Right"
 msgstr "De"
 
-#: dlg_DataLabel.ui:56
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:56
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Top right"
 msgstr "Brig de"
 
-#: dlg_DataLabel.ui:60
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:60
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Inside"
 msgstr "Tu fewn"
 
-#: dlg_DataLabel.ui:64
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:64
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Outside"
 msgstr "Tu allan"
 
-#: dlg_DataLabel.ui:68
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:68
 msgctxt "dlg_DataLabel|liststorePLACEMENT"
 msgid "Near origin"
 msgstr "Ger y ffynhonell"
 
-#: dlg_DataLabel.ui:82
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:82
 msgctxt "dlg_DataLabel|liststoreSEPARATOR"
 msgid "Space"
 msgstr "Gofod"
 
-#: dlg_DataLabel.ui:86
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:86
 msgctxt "dlg_DataLabel|liststoreSEPARATOR"
 msgid "Comma"
 msgstr "Collnod"
 
-#: dlg_DataLabel.ui:90
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:90
 msgctxt "dlg_DataLabel|liststoreSEPARATOR"
 msgid "Semicolon"
 msgstr "Hanner colon"
 
-#: dlg_DataLabel.ui:94
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:94
 msgctxt "dlg_DataLabel|liststoreSEPARATOR"
 msgid "New line"
 msgstr "Llinell newydd"
 
-#: dlg_DataLabel.ui:102
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:102
 msgctxt "dlg_DataLabel|dlg_DataLabels"
 msgid "Data Labels for all Data Series"
 msgstr "Labeli Data ar gyfer pob Cyfres Data"
 
-#: dlg_DataLabel.ui:194
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:194
 msgctxt "dlg_DataLabel|CB_VALUE_AS_NUMBER"
 msgid "Show value as _number"
 msgstr "Dangos gwerth fel _rhif"
 
-#: dlg_DataLabel.ui:209
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:209
 msgctxt "dlg_DataLabel|CB_VALUE_AS_PERCENTAGE"
 msgid "Show value as _percentage"
 msgstr "Dangos gwerth fel _canran"
 
-#: dlg_DataLabel.ui:224
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:224
 msgctxt "dlg_DataLabel|CB_CATEGORY"
 msgid "Show _category"
 msgstr "Dangos _categori"
 
-#: dlg_DataLabel.ui:239
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:239
 msgctxt "dlg_DataLabel|CB_SYMBOL"
 msgid "Show _legend key"
 msgstr "Dangos eicon _allwedd"
 
-#: dlg_DataLabel.ui:254
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:254
 msgctxt "dlg_DataLabel|CB_WRAP_TEXT"
 msgid "Auto text _wrap"
 msgstr "Awto _amlapio testun"
 
-#: dlg_DataLabel.ui:269
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:269
 msgctxt "dlg_DataLabel|PB_NUMBERFORMAT"
 msgid "Number _format..."
 msgstr "Fformat _rhif..."
 
-#: dlg_DataLabel.ui:283
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:283
 msgctxt "dlg_DataLabel|PB_PERCENT_NUMBERFORMAT"
 msgid "Percentage f_ormat..."
 msgstr "Ff_ormat canran..."
 
-#: dlg_DataLabel.ui:299
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:299
 msgctxt "dlg_DataLabel|CT_LABEL_DIAL"
 msgid "ABCD"
 msgstr "ABCD"
 
-#: dlg_DataLabel.ui:319
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:319
 msgctxt "dlg_DataLabel|FT_TEXT_SEPARATOR"
 msgid "_Separator"
 msgstr "_Ymwahanydd"
 
-#: dlg_DataLabel.ui:359
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:359
 msgctxt "dlg_DataLabel|FT_LABEL_PLACEMENT"
 msgid "Place_ment"
 msgstr "_Lleoli"
 
-#: dlg_DataLabel.ui:392
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:392
 msgctxt "dlg_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE"
 msgid "Number Format for Percentage Value"
 msgstr "Fformat Rhif Gwerth Canran"
 
-#: dlg_DataLabel.ui:408
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:408
 msgctxt "dlg_DataLabel|label1"
 msgid "Text Attributes"
 msgstr "Priodoleddau Testun"
 
-#: dlg_DataLabel.ui:474
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:473
 msgctxt "dlg_DataLabel|FT_LABEL_DEGREES"
 msgid "_Degrees"
 msgstr "_Graddau"
 
-#: dlg_DataLabel.ui:499
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:498
 msgctxt "dlg_DataLabel|FT_LABEL_TEXTDIR"
 msgid "Te_xt direction"
 msgstr "C_yfeiriad testun"
 
-#: dlg_DataLabel.ui:536
+#: chart2/uiconfig/ui/dlg_DataLabel.ui:535
 msgctxt "dlg_DataLabel|label2"
 msgid "Rotate Text"
 msgstr "Cylchdroi Testun"
 
-#: dlg_InsertErrorBars.ui:29
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:29
 msgctxt "dlg_InsertErrorBars|liststoreFUNCTION"
 msgid "Standard Error"
 msgstr "Gwall Safonol"
 
-#: dlg_InsertErrorBars.ui:33
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:33
 msgctxt "dlg_InsertErrorBars|liststoreFUNCTION"
 msgid "Standard Deviation"
 msgstr "Gwyriad Safonol"
 
-#: dlg_InsertErrorBars.ui:37
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:37
 msgctxt "dlg_InsertErrorBars|liststoreFUNCTION"
 msgid "Variance"
 msgstr "Amrywiant"
 
-#: dlg_InsertErrorBars.ui:41
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:41
 msgctxt "dlg_InsertErrorBars|liststoreFUNCTION"
 msgid "Error Margin"
 msgstr "Maint y Gwall"
 
-#: dlg_InsertErrorBars.ui:49
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:49
 msgctxt "dlg_InsertErrorBars|dlg_InsertErrorBars"
 msgid "Legend"
 msgstr "Mynegai"
 
-#: dlg_InsertErrorBars.ui:146
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:146
 msgctxt "dlg_InsertErrorBars|RB_NONE"
 msgid "_None"
 msgstr "_Dim"
 
-#: dlg_InsertErrorBars.ui:163
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:163
 msgctxt "dlg_InsertErrorBars|RB_CONST"
 msgid "_Constant Value"
 msgstr "_Gwerth Cyson"
 
-#: dlg_InsertErrorBars.ui:180
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:180
 msgctxt "dlg_InsertErrorBars|RB_PERCENT"
 msgid "_Percentage"
 msgstr "_Canran"
 
-#: dlg_InsertErrorBars.ui:236
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:237
 msgctxt "dlg_InsertErrorBars|RB_RANGE"
 msgid "Cell _Range"
 msgstr "Ystod _Celloedd"
 
-#: dlg_InsertErrorBars.ui:259
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:260
 msgctxt "dlg_InsertErrorBars|label1"
 msgid "Error Category"
 msgstr "Categori'r Gwall"
 
-#: dlg_InsertErrorBars.ui:292
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:293
 msgctxt "dlg_InsertErrorBars|RB_BOTH"
 msgid "Positive _and Negative"
 msgstr "Positif _a Negyddol"
 
-#: dlg_InsertErrorBars.ui:308
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:309
 msgctxt "dlg_InsertErrorBars|RB_POSITIVE"
 msgid "Pos_itive"
 msgstr "_Positif"
 
-#: dlg_InsertErrorBars.ui:324
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:325
 msgctxt "dlg_InsertErrorBars|RB_NEGATIVE"
 msgid "Ne_gative"
 msgstr "_Negyddol"
 
-#: dlg_InsertErrorBars.ui:380
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:381
 msgctxt "dlg_InsertErrorBars|label2"
 msgid "Error Indicator"
 msgstr "Dangosydd Gwall"
 
-#: dlg_InsertErrorBars.ui:427
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:428
 msgctxt "dlg_InsertErrorBars|FT_POSITIVE"
 msgid "P_ositive (+)"
 msgstr "_Positif (+)"
 
-#: dlg_InsertErrorBars.ui:468
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:467
 msgctxt "dlg_InsertErrorBars|IB_RANGE_POSITIVE|tooltip_text"
 msgid "Select data range"
 msgstr "Dewis ystod data"
 
-#: dlg_InsertErrorBars.ui:493
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:492
 msgctxt "dlg_InsertErrorBars|FT_NEGATIVE"
 msgid "_Negative (-)"
 msgstr "_Negyddol (-)"
 
-#: dlg_InsertErrorBars.ui:535
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:532
 msgctxt "dlg_InsertErrorBars|IB_RANGE_NEGATIVE|tooltip_text"
 msgid "Select data range"
 msgstr "Dewis ystod data"
 
-#: dlg_InsertErrorBars.ui:553
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:550
 msgctxt "dlg_InsertErrorBars|CB_SYN_POS_NEG"
 msgid "Same value for both"
 msgstr "Yr un gwerth i'r ddau"
 
-#: dlg_InsertErrorBars.ui:575
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:573
 msgctxt "dlg_InsertErrorBars|label3"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: dlg_InsertErrorBars.ui:591
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:589
 msgctxt "dlg_InsertErrorBars|STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS"
 msgid "Select Range for Positive Error Bars"
 msgstr "Dewis Ystod ar gyfer Barrau Gwall Posidol"
 
-#: dlg_InsertErrorBars.ui:602
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:600
 msgctxt "dlg_InsertErrorBars|STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS"
 msgid "Select Range for Negative Error Bars"
 msgstr "Dewis Ystod ar gyfer Barrau Gwall Negyddol"
 
-#: dlg_InsertErrorBars.ui:613
+#: chart2/uiconfig/ui/dlg_InsertErrorBars.ui:611
 msgctxt "dlg_InsertErrorBars|STR_CONTROLTEXT_ERROR_BARS_FROM_DATA"
 msgid "From Data Table"
 msgstr "O'r Tabl Data"
 
-#: dlg_InsertLegend.ui:8
+#: chart2/uiconfig/ui/dlg_InsertLegend.ui:8
 msgctxt "dlg_InsertLegend|dlg_InsertLegend"
 msgid "Legend"
 msgstr "Mynegai"
 
-#: dlg_InsertLegend.ui:100
+#: chart2/uiconfig/ui/dlg_InsertLegend.ui:100
 msgctxt "dlg_InsertLegend|show"
 msgid "_Display legend"
 msgstr "_Dangos mynegai"
 
-#: dlg_InsertLegend.ui:122
+#: chart2/uiconfig/ui/dlg_InsertLegend.ui:122
 msgctxt "dlg_InsertLegend|left"
 msgid "_Left"
 msgstr "_Chwith"
 
-#: dlg_InsertLegend.ui:138
+#: chart2/uiconfig/ui/dlg_InsertLegend.ui:138
 msgctxt "dlg_InsertLegend|right"
 msgid "_Right"
 msgstr "_De"
 
-#: dlg_InsertLegend.ui:154
+#: chart2/uiconfig/ui/dlg_InsertLegend.ui:154
 msgctxt "dlg_InsertLegend|top"
 msgid "_Top"
 msgstr "_Brig"
 
-#: dlg_InsertLegend.ui:170
+#: chart2/uiconfig/ui/dlg_InsertLegend.ui:170
 msgctxt "dlg_InsertLegend|bottom"
 msgid "_Bottom"
 msgstr "_Gwaelod"
 
-#: dlg_InsertLegend.ui:200
+#: chart2/uiconfig/ui/dlg_InsertLegend.ui:200
 msgctxt "dlg_InsertLegend|TXT_POSITION"
 msgid "Position"
 msgstr "Safle"
 
-#: insertaxisdlg.ui:8
+#: chart2/uiconfig/ui/insertaxisdlg.ui:8
 msgctxt "insertaxisdlg|InsertAxisDialog"
 msgid "Axes"
 msgstr "Echelinau"
 
-#: insertaxisdlg.ui:104
+#: chart2/uiconfig/ui/insertaxisdlg.ui:104
 msgctxt "insertaxisdlg|primaryX"
 msgid "_X axis"
 msgstr "Echelin _X"
 
-#: insertaxisdlg.ui:120
+#: chart2/uiconfig/ui/insertaxisdlg.ui:120
 msgctxt "insertaxisdlg|primaryY"
 msgid "_Y axis"
 msgstr "Echelin _­Y"
 
-#: insertaxisdlg.ui:136
+#: chart2/uiconfig/ui/insertaxisdlg.ui:136
 msgctxt "insertaxisdlg|primaryZ"
 msgid "_Z axis"
 msgstr "Echelin _Z"
 
-#: insertaxisdlg.ui:159
+#: chart2/uiconfig/ui/insertaxisdlg.ui:159
 msgctxt "insertaxisdlg|label1"
 msgid "Axes"
 msgstr "Echelinau"
 
-#: insertaxisdlg.ui:194
+#: chart2/uiconfig/ui/insertaxisdlg.ui:194
 msgctxt "insertaxisdlg|secondaryX"
 msgid "X _axis"
 msgstr "_Echelin X"
 
-#: insertaxisdlg.ui:210
+#: chart2/uiconfig/ui/insertaxisdlg.ui:210
 msgctxt "insertaxisdlg|secondaryY"
 msgid "Y ax_is"
 msgstr "E­_chel Y"
 
-#: insertaxisdlg.ui:226
+#: chart2/uiconfig/ui/insertaxisdlg.ui:226
 msgctxt "insertaxisdlg|secondaryZ"
 msgid "Z axi_s"
 msgstr "Ec­_hel Z"
 
-#: insertaxisdlg.ui:249
+#: chart2/uiconfig/ui/insertaxisdlg.ui:249
 msgctxt "insertaxisdlg|label2"
 msgid "Secondary Axes"
 msgstr "Echelin Eilradd"
 
-#: insertgriddlg.ui:8
+#: chart2/uiconfig/ui/insertgriddlg.ui:8
 msgctxt "insertgriddlg|InsertGridDialog"
 msgid "Grids"
 msgstr "Gridiau"
 
-#: insertgriddlg.ui:104
+#: chart2/uiconfig/ui/insertgriddlg.ui:104
 msgctxt "insertgriddlg|primaryX"
 msgid "_X axis"
 msgstr "Echelin _X"
 
-#: insertgriddlg.ui:120
+#: chart2/uiconfig/ui/insertgriddlg.ui:120
 msgctxt "insertgriddlg|primaryY"
 msgid "_Y axis"
 msgstr "Echelin _Y"
 
-#: insertgriddlg.ui:136
+#: chart2/uiconfig/ui/insertgriddlg.ui:136
 msgctxt "insertgriddlg|primaryZ"
 msgid "_Z axis"
 msgstr "Echel _Z"
 
-#: insertgriddlg.ui:159
+#: chart2/uiconfig/ui/insertgriddlg.ui:159
 msgctxt "insertgriddlg|label1"
 msgid "Major Grids"
 msgstr "Prif Gridiau"
 
-#: insertgriddlg.ui:194
+#: chart2/uiconfig/ui/insertgriddlg.ui:194
 msgctxt "insertgriddlg|secondaryX"
 msgid "X _axis"
 msgstr "Echelin _Z"
 
-#: insertgriddlg.ui:210
+#: chart2/uiconfig/ui/insertgriddlg.ui:210
 msgctxt "insertgriddlg|secondaryY"
 msgid "Y ax_is"
 msgstr "Ech_elin Y"
 
-#: insertgriddlg.ui:226
+#: chart2/uiconfig/ui/insertgriddlg.ui:226
 msgctxt "insertgriddlg|secondaryZ"
 msgid "Z axi_s"
 msgstr "Eche_­l Z"
 
-#: insertgriddlg.ui:249
+#: chart2/uiconfig/ui/insertgriddlg.ui:249
 msgctxt "insertgriddlg|label2"
 msgid "Minor Grids"
 msgstr "Gridiau Lleiaf"
 
-#: inserttitledlg.ui:8
+#: chart2/uiconfig/ui/inserttitledlg.ui:8
 msgctxt "inserttitledlg|InsertTitleDialog"
 msgid "Titles"
 msgstr "Teitlau"
 
-#: inserttitledlg.ui:89
+#: chart2/uiconfig/ui/inserttitledlg.ui:89
 msgctxt "inserttitledlg|labelMainTitle"
 msgid "_Title"
 msgstr "_Teitl"
 
-#: inserttitledlg.ui:103
+#: chart2/uiconfig/ui/inserttitledlg.ui:103
 msgctxt "inserttitledlg|labelSubTitle"
 msgid "_Subtitle"
 msgstr "_Is deitl"
 
-#: inserttitledlg.ui:166
+#: chart2/uiconfig/ui/inserttitledlg.ui:164
 msgctxt "inserttitledlg|labelPrimaryXaxis"
 msgid "_X axis"
 msgstr "Echelin _X"
 
-#: inserttitledlg.ui:180
+#: chart2/uiconfig/ui/inserttitledlg.ui:178
 msgctxt "inserttitledlg|labelPrimaryYaxis"
 msgid "_Y axis"
 msgstr "Echelin _­Y"
 
-#: inserttitledlg.ui:194
+#: chart2/uiconfig/ui/inserttitledlg.ui:192
 msgctxt "inserttitledlg|labelPrimaryZaxis"
 msgid "_Z axis"
 msgstr "Echelin _Z"
 
-#: inserttitledlg.ui:247
+#: chart2/uiconfig/ui/inserttitledlg.ui:242
 msgctxt "inserttitledlg|Axe"
 msgid "Axes"
 msgstr "Echelinau"
 
-#: inserttitledlg.ui:283
+#: chart2/uiconfig/ui/inserttitledlg.ui:278
 msgctxt "inserttitledlg|labelSecondaryXAxis"
 msgid "X _axis"
 msgstr "_Echelin X"
 
-#: inserttitledlg.ui:297
+#: chart2/uiconfig/ui/inserttitledlg.ui:292
 msgctxt "inserttitledlg|labelSecondaryYAxis"
 msgid "Y ax_is"
 msgstr "E­_chelin Y"
 
-#: inserttitledlg.ui:338
+#: chart2/uiconfig/ui/inserttitledlg.ui:331
 msgctxt "inserttitledlg|label2"
 msgid "Secondary Axes"
 msgstr "Echelin Eilradd"
 
-#: paradialog.ui:8
+#: chart2/uiconfig/ui/paradialog.ui:8
 msgctxt "paradialog|ParagraphDialog"
 msgid "Paragraph"
 msgstr "Paragraff"
 
-#: paradialog.ui:105
+#: chart2/uiconfig/ui/paradialog.ui:105
 msgctxt "paradialog|labelTP_PARA_STD"
 msgid "Indents & Spacing"
 msgstr "Mewnoliad a Bylchu"
 
-#: paradialog.ui:127
+#: chart2/uiconfig/ui/paradialog.ui:127
 msgctxt "paradialog|labelTP_PARA_ALIGN"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: paradialog.ui:151
+#: chart2/uiconfig/ui/paradialog.ui:151
 msgctxt "paradialog|labelTP_PARA_ASIAN"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: paradialog.ui:174
+#: chart2/uiconfig/ui/paradialog.ui:174
 msgctxt "paradialog|labelTP_TABULATOR"
 msgid "Tabs"
 msgstr "Tabiau"
 
-#: sidebaraxis.ui:18
+#: chart2/uiconfig/ui/sidebaraxis.ui:18
 msgctxt "sidebaraxis|checkbutton_show_label"
 msgid "Show labels"
 msgstr "Dangos labeli"
 
-#: sidebaraxis.ui:32
+#: chart2/uiconfig/ui/sidebaraxis.ui:33
 msgctxt "sidebaraxis|checkbutton_reverse"
 msgid "Reverse direction"
 msgstr "Gwrthdroi cyfeiriad"
 
-#: sidebaraxis.ui:56
+#: chart2/uiconfig/ui/sidebaraxis.ui:58
 msgctxt "sidebaraxis|label1"
 msgid "_Label position:"
 msgstr "Safle _label:"
 
-#: sidebaraxis.ui:70
+#: chart2/uiconfig/ui/sidebaraxis.ui:72
 msgctxt "sidebaraxis|comboboxtext_label_position"
 msgid "Near Axis"
 msgstr "Echelin Agos"
 
-#: sidebaraxis.ui:71
+#: chart2/uiconfig/ui/sidebaraxis.ui:73
 msgctxt "sidebaraxis|comboboxtext_label_position"
 msgid "Near Axis (other side)"
 msgstr "Echelin Agos (ochr arall)"
 
-#: sidebaraxis.ui:72
+#: chart2/uiconfig/ui/sidebaraxis.ui:74
 msgctxt "sidebaraxis|comboboxtext_label_position"
 msgid "Outside start"
 msgstr "Cychwyn allanol"
 
-#: sidebaraxis.ui:73
+#: chart2/uiconfig/ui/sidebaraxis.ui:75
 msgctxt "sidebaraxis|comboboxtext_label_position"
 msgid "Outside end"
 msgstr "Gorffen allanol"
 
-#: sidebaraxis.ui:87
+#: chart2/uiconfig/ui/sidebaraxis.ui:89
 msgctxt "sidebaraxis|label2"
 msgid "_Text orientation:"
 msgstr "Cyfeiriad _testun:"
 
-#: sidebarelements.ui:35
+#: chart2/uiconfig/ui/sidebarelements.ui:35
 msgctxt "sidebarelements|checkbutton_subtitle"
 msgid "Subtitle"
 msgstr "Is deitl"
 
-#: sidebarelements.ui:49
+#: chart2/uiconfig/ui/sidebarelements.ui:50
 msgctxt "sidebarelements|checkbutton_title"
 msgid "Title"
 msgstr "Teitlau"
 
-#: sidebarelements.ui:69
+#: chart2/uiconfig/ui/sidebarelements.ui:71
 msgctxt "sidebarelements|l"
 msgid "Titles"
 msgstr "Teitlau"
 
-#: sidebarelements.ui:100
+#: chart2/uiconfig/ui/sidebarelements.ui:102
 msgctxt "sidebarelements|checkbutton_legend|tooltip_text"
 msgid "Show Legend"
 msgstr "Dangos yr Allwedd"
 
-#: sidebarelements.ui:123
+#: chart2/uiconfig/ui/sidebarelements.ui:126
 msgctxt "sidebarelements|placement_label"
 msgid "_Placement:"
 msgstr "_Gosodiad:"
 
-#: sidebarelements.ui:139
+#: chart2/uiconfig/ui/sidebarelements.ui:142
 msgctxt "sidebarelements|comboboxtext_legend"
 msgid "Right"
 msgstr "De"
 
-#: sidebarelements.ui:140
+#: chart2/uiconfig/ui/sidebarelements.ui:143
 msgctxt "sidebarelements|comboboxtext_legend"
 msgid "Top"
 msgstr "Brig"
 
-#: sidebarelements.ui:141
+#: chart2/uiconfig/ui/sidebarelements.ui:144
 msgctxt "sidebarelements|comboboxtext_legend"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: sidebarelements.ui:142
+#: chart2/uiconfig/ui/sidebarelements.ui:145
 msgctxt "sidebarelements|comboboxtext_legend"
 msgid "Left"
 msgstr "Chwith"
 
-#: sidebarelements.ui:143
+#: chart2/uiconfig/ui/sidebarelements.ui:146
 msgctxt "sidebarelements|comboboxtext_legend"
 msgid "Manual"
 msgstr "Gyda Llaw"
 
-#: sidebarelements.ui:166
+#: chart2/uiconfig/ui/sidebarelements.ui:169
 msgctxt "sidebarelements|label_legen"
 msgid "Legend"
 msgstr "Mynegai"
 
-#: sidebarelements.ui:199
+#: chart2/uiconfig/ui/sidebarelements.ui:202
 msgctxt "sidebarelements|checkbutton_x_axis"
 msgid "X axis"
 msgstr "Echelin X"
 
-#: sidebarelements.ui:213
+#: chart2/uiconfig/ui/sidebarelements.ui:217
 msgctxt "sidebarelements|checkbutton_x_axis_title"
 msgid "X axis title"
 msgstr "Teitl echel X"
 
-#: sidebarelements.ui:227
+#: chart2/uiconfig/ui/sidebarelements.ui:232
 msgctxt "sidebarelements|checkbutton_y_axis"
 msgid "Y axis"
 msgstr "Echelin Y"
 
-#: sidebarelements.ui:241
+#: chart2/uiconfig/ui/sidebarelements.ui:247
 msgctxt "sidebarelements|checkbutton_y_axis_title"
 msgid "Y axis title"
 msgstr "Teitl echel Y"
 
-#: sidebarelements.ui:255
+#: chart2/uiconfig/ui/sidebarelements.ui:262
 msgctxt "sidebarelements|checkbutton_z_axis"
 msgid "Z axis"
 msgstr "Echelin ­­Z"
 
-#: sidebarelements.ui:269
+#: chart2/uiconfig/ui/sidebarelements.ui:277
 msgctxt "sidebarelements|checkbutton_z_axis_title"
 msgid "Z axis title"
 msgstr "Teitl echel Z"
 
-#: sidebarelements.ui:283
+#: chart2/uiconfig/ui/sidebarelements.ui:292
 msgctxt "sidebarelements|checkbutton_2nd_x_axis"
 msgid "2nd X axis"
 msgstr "Ail echel X"
 
-#: sidebarelements.ui:296
+#: chart2/uiconfig/ui/sidebarelements.ui:306
 msgctxt "sidebarelements|checkbutton_2nd_x_axis_title"
 msgid "2nd X axis title"
 msgstr "Teitl ail echel X"
 
-#: sidebarelements.ui:309
+#: chart2/uiconfig/ui/sidebarelements.ui:320
 msgctxt "sidebarelements|checkbutton_2nd_y_axis"
 msgid "2nd Y axis"
 msgstr "Ail echel Y"
 
-#: sidebarelements.ui:322
+#: chart2/uiconfig/ui/sidebarelements.ui:334
 msgctxt "sidebarelements|checkbutton_2nd_y_axis_title"
 msgid "2nd Y axis title"
 msgstr "Teitl ail echel Y"
 
-#: sidebarelements.ui:341
+#: chart2/uiconfig/ui/sidebarelements.ui:354
 msgctxt "sidebarelements|label_axes"
 msgid "Axes"
 msgstr "Echelinau"
 
-#: sidebarelements.ui:374
+#: chart2/uiconfig/ui/sidebarelements.ui:387
 msgctxt "sidebarelements|checkbutton_gridline_horizontal_major"
 msgid "Horizontal major"
 msgstr "Mawr llorweddol"
 
-#: sidebarelements.ui:388
+#: chart2/uiconfig/ui/sidebarelements.ui:402
 msgctxt "sidebarelements|checkbutton_gridline_vertical_major"
 msgid "Vertical major"
 msgstr "Mawr fertigol"
 
-#: sidebarelements.ui:402
+#: chart2/uiconfig/ui/sidebarelements.ui:417
 msgctxt "sidebarelements|checkbutton_gridline_horizontal_minor"
 msgid "Horizontal minor"
 msgstr "Llorweddol bach"
 
-#: sidebarelements.ui:416
+#: chart2/uiconfig/ui/sidebarelements.ui:432
 msgctxt "sidebarelements|checkbutton_gridline_vertical_minor"
 msgid "Vertical minor"
 msgstr "Fertigol bach"
 
-#: sidebarelements.ui:436
+#: chart2/uiconfig/ui/sidebarelements.ui:453
 msgctxt "sidebarelements|label_gri"
 msgid "Gridlines"
 msgstr "Llinellau grid"
 
-#: sidebarelements.ui:455
+#: chart2/uiconfig/ui/sidebarelements.ui:472
 msgctxt "sidebarelements|text_title"
 msgid "Title"
 msgstr "Teitlau"
 
-#: sidebarelements.ui:465
+#: chart2/uiconfig/ui/sidebarelements.ui:482
 msgctxt "sidebarelements|text_subtitle"
 msgid "Subtitle"
 msgstr "Is deitl"
 
-#: sidebarerrorbar.ui:48
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:48
 msgctxt "sidebarerrorbar|label2"
 msgid "Category:"
 msgstr "Categori:"
 
-#: sidebarerrorbar.ui:64
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:64
 msgctxt "sidebarerrorbar|comboboxtext_type"
 msgid "Constant"
 msgstr "Cysonyn"
 
-#: sidebarerrorbar.ui:65
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:65
 msgctxt "sidebarerrorbar|comboboxtext_type"
 msgid "Percentage"
 msgstr "Canran"
 
-#: sidebarerrorbar.ui:66
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:66
 msgctxt "sidebarerrorbar|comboboxtext_type"
 msgid "Cell Range or Data Table"
 msgstr "Ystod Cell neu Dabl Data"
 
-#: sidebarerrorbar.ui:67
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:67
 msgctxt "sidebarerrorbar|comboboxtext_type"
 msgid "Standard deviation"
 msgstr "Gwyriad safonol"
 
-#: sidebarerrorbar.ui:68
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:68
 msgctxt "sidebarerrorbar|comboboxtext_type"
 msgid "Standard error"
 msgstr "Gwall safonol"
 
-#: sidebarerrorbar.ui:69
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:69
 msgctxt "sidebarerrorbar|comboboxtext_type"
 msgid "Variance"
 msgstr "Amrywiant"
 
-#: sidebarerrorbar.ui:70
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:70
 msgctxt "sidebarerrorbar|comboboxtext_type"
 msgid "Error margin"
 msgstr "Maint y gwall"
 
-#: sidebarerrorbar.ui:85
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:85
 msgctxt "sidebarerrorbar|label3"
 msgid "Positive (+):"
 msgstr "Positif (+):"
 
-#: sidebarerrorbar.ui:99
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:99
 msgctxt "sidebarerrorbar|label4"
 msgid "Negative (-):"
 msgstr "Negyddol (-):"
 
-#: sidebarerrorbar.ui:113
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:113
 msgctxt "sidebarerrorbar|spinbutton_pos"
 msgid "0.00"
 msgstr "0.00"
 
-#: sidebarerrorbar.ui:129
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:129
 msgctxt "sidebarerrorbar|spinbutton_neg"
 msgid "0.00"
 msgstr "0.00"
 
-#: sidebarerrorbar.ui:151
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:152
 msgctxt "sidebarerrorbar|radiobutton_positive_negative|tooltip_text"
 msgid "Positive and Negative"
 msgstr "Positif a Negyddol"
 
-#: sidebarerrorbar.ui:167
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:169
 msgctxt "sidebarerrorbar|radiobutton_positive|tooltip_text"
 msgid "Positive"
 msgstr "Positif"
 
-#: sidebarerrorbar.ui:183
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:186
 msgctxt "sidebarerrorbar|radiobutton_negative|tooltip_text"
 msgid "Negative"
 msgstr "Negyddol"
 
-#: sidebarerrorbar.ui:205
+#: chart2/uiconfig/ui/sidebarerrorbar.ui:208
 msgctxt "sidebarerrorbar|label5"
 msgid "Indicator"
 msgstr "Dangosydd"
 
-#: sidebarseries.ui:44
+#: chart2/uiconfig/ui/sidebarseries.ui:44
 msgctxt "sidebarseries|checkbutton_label"
 msgid "Show data labels"
 msgstr "Dangos labeli data"
 
-#: sidebarseries.ui:67
+#: chart2/uiconfig/ui/sidebarseries.ui:68
 msgctxt "sidebarseries|label_box"
 msgid "P_lacement:"
 msgstr "G_osodiad:"
 
-#: sidebarseries.ui:82
+#: chart2/uiconfig/ui/sidebarseries.ui:83
 msgctxt "sidebarseries|comboboxtext_label"
 msgid "Above"
 msgstr "Uwchlaw"
 
-#: sidebarseries.ui:83
+#: chart2/uiconfig/ui/sidebarseries.ui:84
 msgctxt "sidebarseries|comboboxtext_label"
 msgid "Below"
 msgstr "Islaw"
 
-#: sidebarseries.ui:84
+#: chart2/uiconfig/ui/sidebarseries.ui:85
 msgctxt "sidebarseries|comboboxtext_label"
 msgid "Center"
 msgstr "Canoli"
 
-#: sidebarseries.ui:85
+#: chart2/uiconfig/ui/sidebarseries.ui:86
 msgctxt "sidebarseries|comboboxtext_label"
 msgid "Outside"
 msgstr "Tu allan"
 
-#: sidebarseries.ui:86
+#: chart2/uiconfig/ui/sidebarseries.ui:87
 msgctxt "sidebarseries|comboboxtext_label"
 msgid "Inside"
 msgstr "Tu fewn"
 
-#: sidebarseries.ui:87
+#: chart2/uiconfig/ui/sidebarseries.ui:88
 msgctxt "sidebarseries|comboboxtext_label"
 msgid "Near origin"
 msgstr "Ger y ffynhonell"
 
-#: sidebarseries.ui:112
+#: chart2/uiconfig/ui/sidebarseries.ui:113
 msgctxt "sidebarseries|checkbutton_trendline"
 msgid "Show trendline"
 msgstr "Dangos llinell tuedd"
 
-#: sidebarseries.ui:147
+#: chart2/uiconfig/ui/sidebarseries.ui:149
 msgctxt "sidebarseries|checkbutton_y_error"
 msgid "Y error bars"
 msgstr "Barrau gwall Y"
 
-#: sidebarseries.ui:162
+#: chart2/uiconfig/ui/sidebarseries.ui:165
 msgctxt "sidebarseries|checkbutton_x_error"
 msgid "X error bars"
 msgstr "Barrau gwall X"
 
-#: sidebarseries.ui:183
+#: chart2/uiconfig/ui/sidebarseries.ui:187
 msgctxt "sidebarseries|label1"
 msgid "Error Bars"
 msgstr "Barrau Gwall"
 
-#: sidebarseries.ui:216
+#: chart2/uiconfig/ui/sidebarseries.ui:220
 msgctxt "sidebarseries|radiobutton_primary_axis"
 msgid "Primary Y axis"
 msgstr "Echelin Y cynradd"
 
-#: sidebarseries.ui:232
+#: chart2/uiconfig/ui/sidebarseries.ui:237
 msgctxt "sidebarseries|radiobutton_secondary_axis"
 msgid "Secondary Y axis"
 msgstr "Ail Echelin Y"
 
-#: sidebarseries.ui:254
+#: chart2/uiconfig/ui/sidebarseries.ui:260
 msgctxt "sidebarseries|axis_label"
 msgid "Align Series to Axis"
 msgstr "Alinio Cyfres i'r Echelin"
 
-#: sidebarseries.ui:270
+#: chart2/uiconfig/ui/sidebarseries.ui:276
 msgctxt "sidebarseries|label_series_tmpl"
 msgid "Data series '%1'"
 msgstr "Cyfres data '%1'"
 
-#: smoothlinesdlg.ui:22
+#: chart2/uiconfig/ui/smoothlinesdlg.ui:22
 msgctxt "smoothlinesdlg|SmoothLinesDialog"
 msgid "Smooth Lines"
 msgstr "Llinellau Llyfn"
 
-#: smoothlinesdlg.ui:104
+#: chart2/uiconfig/ui/smoothlinesdlg.ui:104
 msgctxt "smoothlinesdlg|TypeLabel"
 msgid "Line _Type:"
 msgstr "_Math o Linell:"
 
-#: smoothlinesdlg.ui:119
+#: chart2/uiconfig/ui/smoothlinesdlg.ui:119
 msgctxt "smoothlinesdlg|SplineTypeComboBox"
 msgid "Cubic spline"
 msgstr "Sblein ciwbig"
 
-#: smoothlinesdlg.ui:120
+#: chart2/uiconfig/ui/smoothlinesdlg.ui:120
 msgctxt "smoothlinesdlg|SplineTypeComboBox"
 msgid "B-spline"
 msgstr "Sblein-B"
 
-#: smoothlinesdlg.ui:153
+#: chart2/uiconfig/ui/smoothlinesdlg.ui:153
 msgctxt "smoothlinesdlg|ResolutionLabel"
 msgid "_Resolution:"
 msgstr "C_ydraniad:"
 
-#: smoothlinesdlg.ui:167
+#: chart2/uiconfig/ui/smoothlinesdlg.ui:167
 msgctxt "smoothlinesdlg|PolynomialsLabel"
 msgid "_Degree of polynomials:"
 msgstr "_Gradd o bolynomialau:"
 
-#: smoothlinesdlg.ui:235
+#: chart2/uiconfig/ui/smoothlinesdlg.ui:233
 msgctxt "smoothlinesdlg|SplineTypeModel"
 msgid "Cubic Spline"
 msgstr "Sblein Ciwbig"
 
-#: smoothlinesdlg.ui:239
+#: chart2/uiconfig/ui/smoothlinesdlg.ui:237
 msgctxt "smoothlinesdlg|SplineTypeModel"
 msgid "B-Spline"
 msgstr "Sblein-B"
 
-#: steppedlinesdlg.ui:125
+#: chart2/uiconfig/ui/steppedlinesdlg.ui:125
 msgctxt "steppedlinesdlg|step_start_rb"
 msgid "_Start with horizontal line"
 msgstr "_Cychwyn gyda llinell lorweddol"
 
-#: steppedlinesdlg.ui:142
+#: chart2/uiconfig/ui/steppedlinesdlg.ui:142
 msgctxt "steppedlinesdlg|step_center_x_rb"
 msgid "Step at the _horizontal mean"
 msgstr "Step ar y cymedrig _llorweddol"
 
-#: steppedlinesdlg.ui:159
+#: chart2/uiconfig/ui/steppedlinesdlg.ui:159
 msgctxt "steppedlinesdlg|step_end_rb"
 msgid "_End with horizontal line"
 msgstr "_Gorffen gyda llinell llorweddol"
 
-#: steppedlinesdlg.ui:176
+#: chart2/uiconfig/ui/steppedlinesdlg.ui:176
 msgctxt "steppedlinesdlg|step_center_y_rb"
 msgid "Step to the _vertical mean"
 msgstr "Step i'r cymedrig _fertigol"
 
-#: steppedlinesdlg.ui:210
+#: chart2/uiconfig/ui/steppedlinesdlg.ui:210
 msgctxt "steppedlinesdlg|label2"
 msgid "Type of Stepping"
 msgstr "Math o Stepio"
 
-#: titlerotationtabpage.ui:58
+#: chart2/uiconfig/ui/titlerotationtabpage.ui:56
 msgctxt "titlerotationtabpage|degreeL"
 msgid "_Degrees"
 msgstr "_Graddau"
 
-#: titlerotationtabpage.ui:111
+#: chart2/uiconfig/ui/titlerotationtabpage.ui:109
 msgctxt "titlerotationtabpage|stackedCB"
 msgid "Ve_rtically stacked"
 msgstr "_Staciwyd yn fertigol"
 
-#: titlerotationtabpage.ui:130
+#: chart2/uiconfig/ui/titlerotationtabpage.ui:128
 msgctxt "titlerotationtabpage|labelABCD"
 msgid "ABCD"
 msgstr "ABCD"
 
-#: titlerotationtabpage.ui:151
+#: chart2/uiconfig/ui/titlerotationtabpage.ui:149
 msgctxt "titlerotationtabpage|textdirL"
 msgid "Te_xt direction:"
 msgstr "C_yfeiriad testun:"
 
-#: titlerotationtabpage.ui:181
+#: chart2/uiconfig/ui/titlerotationtabpage.ui:179
 msgctxt "titlerotationtabpage|labelTextOrient"
 msgid "Text Orientation"
 msgstr "Cyfeiriad Testun"
 
-#: tp_3D_SceneAppearance.ui:13
+#: chart2/uiconfig/ui/tp_3D_SceneAppearance.ui:13
 msgctxt "tp_3D_SceneAppearance|liststoreSCHEME"
 msgid "Simple"
 msgstr "Simple"
 
-#: tp_3D_SceneAppearance.ui:17
+#: chart2/uiconfig/ui/tp_3D_SceneAppearance.ui:17
 msgctxt "tp_3D_SceneAppearance|liststoreSCHEME"
 msgid "Realistic"
 msgstr "Realistig"
 
-#: tp_3D_SceneAppearance.ui:21
+#: chart2/uiconfig/ui/tp_3D_SceneAppearance.ui:21
 msgctxt "tp_3D_SceneAppearance|liststoreSCHEME"
 msgid "Custom"
 msgstr "Cyfaddasu"
 
-#: tp_3D_SceneAppearance.ui:42
+#: chart2/uiconfig/ui/tp_3D_SceneAppearance.ui:42
 msgctxt "tp_3D_SceneAppearance|FT_SCHEME"
 msgid "Sche_me"
 msgstr "_Cynllun"
 
-#: tp_3D_SceneAppearance.ui:90
+#: chart2/uiconfig/ui/tp_3D_SceneAppearance.ui:90
 msgctxt "tp_3D_SceneAppearance|CB_SHADING"
 msgid "_Shading"
 msgstr "_Cysgodi"
 
-#: tp_3D_SceneAppearance.ui:106
+#: chart2/uiconfig/ui/tp_3D_SceneAppearance.ui:106
 msgctxt "tp_3D_SceneAppearance|CB_OBJECTLINES"
 msgid "_Object borders"
 msgstr "­Borderi _gwrthrychau"
 
-#: tp_3D_SceneAppearance.ui:122
+#: chart2/uiconfig/ui/tp_3D_SceneAppearance.ui:122
 msgctxt "tp_3D_SceneAppearance|CB_ROUNDEDEDGE"
 msgid "_Rounded edges"
 msgstr "­_Ymylon crwn"
 
-#: tp_3D_SceneGeometry.ui:24
+#: chart2/uiconfig/ui/tp_3D_SceneGeometry.ui:24
 msgctxt "tp_3D_SceneGeometry|CBX_RIGHT_ANGLED_AXES"
 msgid "_Right-angled axes"
 msgstr "_Echelinau ongl dde"
 
-#: tp_3D_SceneGeometry.ui:42
+#: chart2/uiconfig/ui/tp_3D_SceneGeometry.ui:42
 msgctxt "tp_3D_SceneGeometry|FT_X_ROTATION"
 msgid "_X rotation"
 msgstr "Cylchdro _­X"
 
-#: tp_3D_SceneGeometry.ui:56
+#: chart2/uiconfig/ui/tp_3D_SceneGeometry.ui:56
 msgctxt "tp_3D_SceneGeometry|FT_Y_ROTATION"
 msgid "_Y rotation"
 msgstr "Cylchdro ­_Y"
 
-#: tp_3D_SceneGeometry.ui:70
+#: chart2/uiconfig/ui/tp_3D_SceneGeometry.ui:70
 msgctxt "tp_3D_SceneGeometry|FT_Z_ROTATION"
 msgid "_Z rotation"
 msgstr "Cylchdro ­_Z"
 
-#: tp_3D_SceneGeometry.ui:82
+#: chart2/uiconfig/ui/tp_3D_SceneGeometry.ui:82
 msgctxt "tp_3D_SceneGeometry|CBX_PERSPECTIVE"
 msgid "_Perspective"
 msgstr "­_Persbectif"
 
-#: tp_3D_SceneGeometry.ui:109
+#: chart2/uiconfig/ui/tp_3D_SceneGeometry.ui:108
 msgctxt "tp_3D_SceneGeometry|MTR_FLD_PERSPECTIVE-atkobject"
 msgid "Perspective"
 msgstr "Persbectif"
 
-#: tp_3D_SceneIllumination.ui:104
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:104
 msgctxt "tp_3D_SceneIllumination|BTN_LIGHT_1|tooltip_text"
 msgid "Light source 1"
 msgstr "Ffynhonnell golau 1"
 
-#: tp_3D_SceneIllumination.ui:120
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:120
 msgctxt "tp_3D_SceneIllumination|BTN_LIGHT_2|tooltip_text"
 msgid "Light source 2"
 msgstr "Ffynhonnell golau 2"
 
-#: tp_3D_SceneIllumination.ui:136
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:136
 msgctxt "tp_3D_SceneIllumination|BTN_LIGHT_3|tooltip_text"
 msgid "Light source 3"
 msgstr "Ffynhonnell golau 3"
 
-#: tp_3D_SceneIllumination.ui:152
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:152
 msgctxt "tp_3D_SceneIllumination|BTN_LIGHT_4|tooltip_text"
 msgid "Light source 4"
 msgstr "Ffynhonnell golau 4"
 
-#: tp_3D_SceneIllumination.ui:168
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:168
 msgctxt "tp_3D_SceneIllumination|BTN_LIGHT_5|tooltip_text"
 msgid "Light source 5"
 msgstr "Ffynhonnell golau 5"
 
-#: tp_3D_SceneIllumination.ui:184
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:184
 msgctxt "tp_3D_SceneIllumination|BTN_LIGHT_6|tooltip_text"
 msgid "Light source 6"
 msgstr "Ffynhonnell golau 6"
 
-#: tp_3D_SceneIllumination.ui:200
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:200
 msgctxt "tp_3D_SceneIllumination|BTN_LIGHT_7|tooltip_text"
 msgid "Light source 7"
 msgstr "Ffynhonnell golau 7"
 
-#: tp_3D_SceneIllumination.ui:216
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:216
 msgctxt "tp_3D_SceneIllumination|BTN_LIGHT_8|tooltip_text"
 msgid "Light source 8"
 msgstr "Ffynhonnell golau 8"
 
-#: tp_3D_SceneIllumination.ui:255
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:255
 msgctxt "tp_3D_SceneIllumination|BTN_LIGHTSOURCE_COLOR|tooltip_text"
 msgid "Select a color using the color dialog"
 msgstr "Dewiswch liw gan ddefnyddio'r deialog lliw"
 
-#: tp_3D_SceneIllumination.ui:280
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:280
 msgctxt "tp_3D_SceneIllumination|FT_LIGHTSOURCE"
 msgid "_Light source"
 msgstr "_Ffynhonnell golau"
 
-#: tp_3D_SceneIllumination.ui:329
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:329
 msgctxt "tp_3D_SceneIllumination|BTN_AMBIENT_COLOR|tooltip_text"
 msgid "Select a color using the color dialog"
 msgstr "Dewiswch liw gan ddefnyddio'r deialog lliw"
 
-#: tp_3D_SceneIllumination.ui:347
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:347
 msgctxt "tp_3D_SceneIllumination|FT_AMBIENTLIGHT"
 msgid "_Ambient light"
 msgstr "_Golau naturiol"
 
-#: tp_3D_SceneIllumination.ui:373
+#: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:373
 msgctxt "tp_3D_SceneIllumination|CTL_LIGHT_PREVIEW|tooltip_text"
 msgid "Light Preview"
 msgstr "Rhagolwg Ysgafn"
 
-#: tp_AxisPositions.ui:39
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:39
 msgctxt "tp_AxisPositions|FT_CROSSES_OTHER_AXIS_AT"
 msgid "_Cross other axis at"
 msgstr "C­­_roesi echel arall yn"
 
-#: tp_AxisPositions.ui:57
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:57
 msgctxt "tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: tp_AxisPositions.ui:58
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:58
 msgctxt "tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT"
 msgid "End"
 msgstr "Diwedd"
 
-#: tp_AxisPositions.ui:59
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:59
 msgctxt "tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT"
 msgid "Value"
 msgstr "Gwerth"
 
-#: tp_AxisPositions.ui:60
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:60
 msgctxt "tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT"
 msgid "Category"
 msgstr "Categori"
 
-#: tp_AxisPositions.ui:107
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:106
 msgctxt "tp_AxisPositions|CB_AXIS_BETWEEN_CATEGORIES"
 msgid "Axis _between categories"
 msgstr "Echelinau _rhwng categorïau"
 
-#: tp_AxisPositions.ui:129
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:128
 msgctxt "tp_AxisPositions|TXT_AXIS_LINE"
 msgid "Axis Line"
 msgstr "Llinell Echelin"
 
-#: tp_AxisPositions.ui:170
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:169
 msgctxt "tp_AxisPositions|FT_PLACE_LABELS"
 msgid "_Place labels"
 msgstr "_Label gosodiadau"
 
-#: tp_AxisPositions.ui:187
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:186
 msgctxt "tp_AxisPositions|LB_PLACE_LABELS"
 msgid "Near axis"
 msgstr "Echelin agos"
 
-#: tp_AxisPositions.ui:188
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:187
 msgctxt "tp_AxisPositions|LB_PLACE_LABELS"
 msgid "Near axis (other side)"
 msgstr "Echelin agos (ochr arall)"
 
-#: tp_AxisPositions.ui:189
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:188
 msgctxt "tp_AxisPositions|LB_PLACE_LABELS"
 msgid "Outside start"
 msgstr "Cychwyn allanol"
 
-#: tp_AxisPositions.ui:190
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:189
 msgctxt "tp_AxisPositions|LB_PLACE_LABELS"
 msgid "Outside end"
 msgstr "Gorffen allanol"
 
-#: tp_AxisPositions.ui:215
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:214
 msgctxt "tp_AxisPositions|FT_AXIS_LABEL_DISTANCE"
 msgid "_Distance"
 msgstr "_Pellter"
 
-#: tp_AxisPositions.ui:252
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:250
 msgctxt "tp_AxisPositions|TXT_FL_LABELS"
 msgid "Labels"
 msgstr "Labeli"
 
-#: tp_AxisPositions.ui:294
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:292
 msgctxt "tp_AxisPositions|FT_MAJOR"
 msgid "Major:"
 msgstr "Mwyaf:"
 
-#: tp_AxisPositions.ui:312
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:310
 msgctxt "tp_AxisPositions|FT_MINOR"
 msgid "Minor:"
 msgstr "Lleiaf:"
 
-#: tp_AxisPositions.ui:327
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:325
 msgctxt "tp_AxisPositions|CB_TICKS_INNER"
 msgid "_Inner"
 msgstr "_Mewnol"
 
-#: tp_AxisPositions.ui:347
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:345
 msgctxt "tp_AxisPositions|CB_TICKS_OUTER"
 msgid "_Outer"
 msgstr "_Allanol"
 
-#: tp_AxisPositions.ui:367
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:365
 msgctxt "tp_AxisPositions|CB_MINOR_INNER"
 msgid "I_nner"
 msgstr "M_ewnol"
 
-#: tp_AxisPositions.ui:387
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:385
 msgctxt "tp_AxisPositions|CB_MINOR_OUTER"
 msgid "O_uter"
 msgstr "A_llanol"
 
-#: tp_AxisPositions.ui:422
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:420
 msgctxt "tp_AxisPositions|FT_PLACE_TICKS"
 msgid "Place _marks"
 msgstr "Marciau _lleoliad"
 
-#: tp_AxisPositions.ui:439
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:437
 msgctxt "tp_AxisPositions|LB_PLACE_TICKS"
 msgid "At labels"
 msgstr "Wrth y labeli"
 
-#: tp_AxisPositions.ui:440
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:438
 msgctxt "tp_AxisPositions|LB_PLACE_TICKS"
 msgid "At axis"
 msgstr "Wrth yr echelinau"
 
-#: tp_AxisPositions.ui:441
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:439
 msgctxt "tp_AxisPositions|LB_PLACE_TICKS"
 msgid "At axis and labels"
 msgstr "Wrth yr echel a'r labeli"
 
-#: tp_AxisPositions.ui:466
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:464
 msgctxt "tp_AxisPositions|TXT_FL_TICKS"
 msgid "Interval Marks"
 msgstr "Marciau Cyfwng"
 
-#: tp_AxisPositions.ui:498
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:496
 msgctxt "tp_AxisPositions|CB_MAJOR_GRID"
 msgid "Show major _grid"
 msgstr "Dangos y _grid mwyaf"
 
-#: tp_AxisPositions.ui:516
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:514
 msgctxt "tp_AxisPositions|CB_MINOR_GRID"
 msgid "_Show minor grid"
 msgstr "Dangos y _grid lleiaf"
 
-#: tp_AxisPositions.ui:533
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:531
 msgctxt "tp_AxisPositions|PB_MAJOR_GRID"
 msgid "Mo_re..."
 msgstr "M_wy..."
 
-#: tp_AxisPositions.ui:548
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:546
 msgctxt "tp_AxisPositions|PB_MINOR_GRID"
 msgid "Mor_e..."
 msgstr "Mw_y..."
 
-#: tp_AxisPositions.ui:571
+#: chart2/uiconfig/ui/tp_AxisPositions.ui:569
 msgctxt "tp_AxisPositions|label2"
 msgid "Grids"
 msgstr "Gridiau"
 
-#: tp_ChartType.ui:20
+#: chart2/uiconfig/ui/tp_ChartType.ui:20
 msgctxt "tp_ChartType|liststore1"
 msgid "Bar"
 msgstr "Bar"
 
-#: tp_ChartType.ui:23
+#: chart2/uiconfig/ui/tp_ChartType.ui:23
 msgctxt "tp_ChartType|liststore1"
 msgid "Cylinder"
 msgstr "Silindr"
 
-#: tp_ChartType.ui:26
+#: chart2/uiconfig/ui/tp_ChartType.ui:26
 msgctxt "tp_ChartType|liststore1"
 msgid "Cone"
 msgstr "Con"
 
-#: tp_ChartType.ui:29
+#: chart2/uiconfig/ui/tp_ChartType.ui:29
 msgctxt "tp_ChartType|liststore1"
 msgid "Pyramid"
 msgstr "Pyramid"
 
-#: tp_ChartType.ui:53
+#: chart2/uiconfig/ui/tp_ChartType.ui:53
 msgctxt "tp_ChartType|FT_CAPTION_FOR_WIZARD"
 msgid "Choose a Chart Type"
 msgstr "Dewiswch y Math o Siart"
 
-#: tp_ChartType.ui:102
+#: chart2/uiconfig/ui/tp_ChartType.ui:102
 msgctxt "tp_ChartType|3dlook"
 msgid "_3D Look"
 msgstr "Golwg _3D"
 
-#: tp_ChartType.ui:125
+#: chart2/uiconfig/ui/tp_ChartType.ui:125
 msgctxt "tp_ChartType|3dscheme"
 msgid "Simple"
 msgstr "Syml"
 
-#: tp_ChartType.ui:126
+#: chart2/uiconfig/ui/tp_ChartType.ui:126
 msgctxt "tp_ChartType|3dscheme"
 msgid "Realistic"
 msgstr "Realistig"
 
-#: tp_ChartType.ui:152
+#: chart2/uiconfig/ui/tp_ChartType.ui:152
 msgctxt "tp_ChartType|shapeft"
 msgid "Sh_ape"
 msgstr "S_iâp"
 
-#: tp_ChartType.ui:195
+#: chart2/uiconfig/ui/tp_ChartType.ui:195
 msgctxt "tp_ChartType|stack"
 msgid "_Stack series"
 msgstr "Pentyrru _cyfres"
 
-#: tp_ChartType.ui:222
+#: chart2/uiconfig/ui/tp_ChartType.ui:222
 msgctxt "tp_ChartType|ontop"
 msgid "On top"
 msgstr "Ar y brig"
 
-#: tp_ChartType.ui:241
+#: chart2/uiconfig/ui/tp_ChartType.ui:241
 msgctxt "tp_ChartType|percent"
 msgid "Percent"
 msgstr "Canran"
 
-#: tp_ChartType.ui:259
+#: chart2/uiconfig/ui/tp_ChartType.ui:259
 msgctxt "tp_ChartType|deep"
 msgid "Deep"
 msgstr "Dwfn"
 
-#: tp_ChartType.ui:295
+#: chart2/uiconfig/ui/tp_ChartType.ui:295
 msgctxt "tp_ChartType|linetypeft"
 msgid "_Line type"
 msgstr "Math o _linell"
 
-#: tp_ChartType.ui:312
+#: chart2/uiconfig/ui/tp_ChartType.ui:312
 msgctxt "tp_ChartType|linetype"
 msgid "Straight"
 msgstr "Syth"
 
-#: tp_ChartType.ui:313
+#: chart2/uiconfig/ui/tp_ChartType.ui:313
 msgctxt "tp_ChartType|linetype"
 msgid "Smooth"
 msgstr "Llyfn"
 
-#: tp_ChartType.ui:314
+#: chart2/uiconfig/ui/tp_ChartType.ui:314
 msgctxt "tp_ChartType|linetype"
 msgid "Stepped"
 msgstr "Stepiog"
 
-#: tp_ChartType.ui:326
+#: chart2/uiconfig/ui/tp_ChartType.ui:326
 msgctxt "tp_ChartType|properties"
 msgid "Properties..."
 msgstr "Priodweddau..."
 
-#: tp_ChartType.ui:349
+#: chart2/uiconfig/ui/tp_ChartType.ui:349
 msgctxt "tp_ChartType|sort"
 msgid "_Sort by X values"
 msgstr "_Trefnu yn ôl gwerthoedd X"
 
-#: tp_ChartType.ui:374
+#: chart2/uiconfig/ui/tp_ChartType.ui:374
 msgctxt "tp_ChartType|nolinesft"
 msgid "_Number of lines"
 msgstr "­_Nifer o linellau"
 
-#: tp_ChartType.ui:421
+#: chart2/uiconfig/ui/tp_ChartType.ui:421
 msgctxt "tp_ChartType|rounded-edge"
 msgid "Rounded edge"
 msgstr "Ymyl crwn"
 
-#: tp_DataLabel.ui:20
+#: chart2/uiconfig/ui/tp_DataLabel.ui:20
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Best fit"
 msgstr "Ffit orau"
 
-#: tp_DataLabel.ui:24
+#: chart2/uiconfig/ui/tp_DataLabel.ui:24
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Center"
 msgstr "Canoli"
 
-#: tp_DataLabel.ui:28
+#: chart2/uiconfig/ui/tp_DataLabel.ui:28
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Above"
 msgstr "Uwchlaw"
 
-#: tp_DataLabel.ui:32
+#: chart2/uiconfig/ui/tp_DataLabel.ui:32
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Top left"
 msgstr "Brig chwith"
 
-#: tp_DataLabel.ui:36
+#: chart2/uiconfig/ui/tp_DataLabel.ui:36
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Left"
 msgstr "Chwith"
 
-#: tp_DataLabel.ui:40
+#: chart2/uiconfig/ui/tp_DataLabel.ui:40
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Bottom left"
 msgstr "Gwaelod chwith"
 
-#: tp_DataLabel.ui:44
+#: chart2/uiconfig/ui/tp_DataLabel.ui:44
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Below"
 msgstr "Islaw"
 
-#: tp_DataLabel.ui:48
+#: chart2/uiconfig/ui/tp_DataLabel.ui:48
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Bottom right"
 msgstr "Gwaelod de"
 
-#: tp_DataLabel.ui:52
+#: chart2/uiconfig/ui/tp_DataLabel.ui:52
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Right"
 msgstr "De"
 
-#: tp_DataLabel.ui:56
+#: chart2/uiconfig/ui/tp_DataLabel.ui:56
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Top right"
 msgstr "Brig de"
 
-#: tp_DataLabel.ui:60
+#: chart2/uiconfig/ui/tp_DataLabel.ui:60
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Inside"
 msgstr "Tu fewn"
 
-#: tp_DataLabel.ui:64
+#: chart2/uiconfig/ui/tp_DataLabel.ui:64
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Outside"
 msgstr "Tu allan"
 
-#: tp_DataLabel.ui:68
+#: chart2/uiconfig/ui/tp_DataLabel.ui:68
 msgctxt "tp_DataLabel|liststorePLACEMENT"
 msgid "Near origin"
 msgstr "Ger y ffynhonell"
 
-#: tp_DataLabel.ui:82
+#: chart2/uiconfig/ui/tp_DataLabel.ui:82
 msgctxt "tp_DataLabel|liststoreSEPARATOR"
 msgid "Space"
 msgstr "Gofod"
 
-#: tp_DataLabel.ui:86
+#: chart2/uiconfig/ui/tp_DataLabel.ui:86
 msgctxt "tp_DataLabel|liststoreSEPARATOR"
 msgid "Comma"
 msgstr "Collnod"
 
-#: tp_DataLabel.ui:90
+#: chart2/uiconfig/ui/tp_DataLabel.ui:90
 msgctxt "tp_DataLabel|liststoreSEPARATOR"
 msgid "Semicolon"
 msgstr "Hanner colon"
 
-#: tp_DataLabel.ui:94
+#: chart2/uiconfig/ui/tp_DataLabel.ui:94
 msgctxt "tp_DataLabel|liststoreSEPARATOR"
 msgid "New line"
 msgstr "Llinell Newydd"
 
-#: tp_DataLabel.ui:126
+#: chart2/uiconfig/ui/tp_DataLabel.ui:126
 msgctxt "tp_DataLabel|CB_VALUE_AS_NUMBER"
 msgid "Show value as _number"
 msgstr "Dangos gwerth fel _rhif"
 
-#: tp_DataLabel.ui:143
+#: chart2/uiconfig/ui/tp_DataLabel.ui:143
 msgctxt "tp_DataLabel|CB_VALUE_AS_PERCENTAGE"
 msgid "Show value as _percentage"
 msgstr "Dangos gwerth fel ­_canran"
 
-#: tp_DataLabel.ui:160
+#: chart2/uiconfig/ui/tp_DataLabel.ui:160
 msgctxt "tp_DataLabel|CB_CATEGORY"
 msgid "Show _category"
 msgstr "Dangos _­categori"
 
-#: tp_DataLabel.ui:177
+#: chart2/uiconfig/ui/tp_DataLabel.ui:177
 msgctxt "tp_DataLabel|CB_SYMBOL"
 msgid "Show _legend key"
 msgstr "Dangos allwedd _mynegai"
 
-#: tp_DataLabel.ui:194
+#: chart2/uiconfig/ui/tp_DataLabel.ui:194
 msgctxt "tp_DataLabel|CB_WRAP_TEXT"
 msgid "Auto text _wrap"
 msgstr "Awto _amlapio testun"
 
-#: tp_DataLabel.ui:211
+#: chart2/uiconfig/ui/tp_DataLabel.ui:211
 msgctxt "tp_DataLabel|PB_NUMBERFORMAT"
 msgid "Number _format..."
 msgstr "Fformat _rhif..."
 
-#: tp_DataLabel.ui:227
+#: chart2/uiconfig/ui/tp_DataLabel.ui:227
 msgctxt "tp_DataLabel|PB_PERCENT_NUMBERFORMAT"
 msgid "Percentage f_ormat..."
 msgstr "Ff_ormat canran..."
 
-#: tp_DataLabel.ui:245
+#: chart2/uiconfig/ui/tp_DataLabel.ui:245
 msgctxt "tp_DataLabel|CT_LABEL_DIAL"
 msgid "ABCD"
 msgstr "ABCD"
 
-#: tp_DataLabel.ui:267
+#: chart2/uiconfig/ui/tp_DataLabel.ui:267
 msgctxt "tp_DataLabel|FT_TEXT_SEPARATOR"
 msgid "_Separator"
 msgstr "_Ymwahanydd"
 
-#: tp_DataLabel.ui:308
+#: chart2/uiconfig/ui/tp_DataLabel.ui:308
 msgctxt "tp_DataLabel|FT_LABEL_PLACEMENT"
 msgid "Place_ment"
 msgstr "_Lleoli"
 
-#: tp_DataLabel.ui:342
+#: chart2/uiconfig/ui/tp_DataLabel.ui:342
 msgctxt "tp_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE"
 msgid "Number Format for Percentage Value"
 msgstr "Fformat Rhif Gwerth Canran"
 
-#: tp_DataLabel.ui:360
+#: chart2/uiconfig/ui/tp_DataLabel.ui:360
 msgctxt "tp_DataLabel|label1"
 msgid "Text Attributes"
 msgstr "Priodoleddau Testun"
 
-#: tp_DataLabel.ui:426
+#: chart2/uiconfig/ui/tp_DataLabel.ui:425
 msgctxt "tp_DataLabel|FT_LABEL_DEGREES"
 msgid "_Degrees"
 msgstr "_Gradd"
 
-#: tp_DataLabel.ui:451
+#: chart2/uiconfig/ui/tp_DataLabel.ui:450
 msgctxt "tp_DataLabel|FT_LABEL_TEXTDIR"
 msgid "Te_xt direction"
 msgstr "C_yfeiriad testun"
 
-#: tp_DataLabel.ui:488
+#: chart2/uiconfig/ui/tp_DataLabel.ui:487
 msgctxt "tp_DataLabel|label2"
 msgid "Rotate Text"
 msgstr "Cylchdroi Testun"
 
-#: tp_DataSource.ui:9
+#: chart2/uiconfig/ui/tp_DataSource.ui:9
 msgctxt "tp_DataSource|imageIMB_RANGE_CAT|tooltip_text"
 msgid "Select data range"
 msgstr "Dewis ystod data"
 
-#: tp_DataSource.ui:15
+#: chart2/uiconfig/ui/tp_DataSource.ui:15
 msgctxt "tp_DataSource|imageIMB_RANGE_MAIN|tooltip_text"
 msgid "Select data range"
 msgstr "Dewis ystod data"
 
-#: tp_DataSource.ui:28
+#: chart2/uiconfig/ui/tp_DataSource.ui:28
 msgctxt "tp_DataSource|FT_CAPTION_FOR_WIZARD"
 msgid "Customize Data Ranges for Individual Data Series"
 msgstr "Cyfaddasu Ystodau Data ar gyfer Cyfresi Data Unigol"
 
-#: tp_DataSource.ui:58
+#: chart2/uiconfig/ui/tp_DataSource.ui:58
 msgctxt "tp_DataSource|FT_SERIES"
 msgid "Data _series:"
 msgstr "_Cyfres data:"
 
-#: tp_DataSource.ui:95
+#: chart2/uiconfig/ui/tp_DataSource.ui:95
 msgctxt "tp_DataSource|BTN_ADD"
 msgid "_Add"
 msgstr "_Ychwanegu"
 
-#: tp_DataSource.ui:116
+#: chart2/uiconfig/ui/tp_DataSource.ui:116
 msgctxt "tp_DataSource|BTN_UP-atkobject"
 msgid "Up"
 msgstr "I Fyny"
 
-#: tp_DataSource.ui:127
+#: chart2/uiconfig/ui/tp_DataSource.ui:127
 msgctxt "tp_DataSource|BTN_REMOVE"
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: tp_DataSource.ui:148
+#: chart2/uiconfig/ui/tp_DataSource.ui:148
 msgctxt "tp_DataSource|BTN_DOWN-atkobject"
 msgid "Down"
 msgstr "I Lawr"
 
-#: tp_DataSource.ui:183
+#: chart2/uiconfig/ui/tp_DataSource.ui:183
 msgctxt "tp_DataSource|FT_ROLE"
 msgid "_Data ranges:"
 msgstr "_Ystodau data:"
 
-#: tp_DataSource.ui:214
+#: chart2/uiconfig/ui/tp_DataSource.ui:214
 msgctxt "tp_DataSource|FT_RANGE"
 msgid "Ran_ge for %VALUETYPE"
 msgstr "Y_stod %VALUETYPE"
 
-#: tp_DataSource.ui:272
+#: chart2/uiconfig/ui/tp_DataSource.ui:271
 msgctxt "tp_DataSource|FT_CATEGORIES"
 msgid "_Categories"
 msgstr "_Categorïau"
 
-#: tp_DataSource.ui:287
+#: chart2/uiconfig/ui/tp_DataSource.ui:286
 msgctxt "tp_DataSource|FT_DATALABELS"
 msgid "Data _labels"
 msgstr "Labeli _data"
 
-#: tp_ErrorBars.ui:28
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:28
 msgctxt "tp_ErrorBars|liststoreFUNCTION"
 msgid "Standard Error"
 msgstr "Gwall Safonol"
 
-#: tp_ErrorBars.ui:32
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:32
 msgctxt "tp_ErrorBars|liststoreFUNCTION"
 msgid "Standard Deviation"
 msgstr "Gwyriad Safonol"
 
-#: tp_ErrorBars.ui:36
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:36
 msgctxt "tp_ErrorBars|liststoreFUNCTION"
 msgid "Variance"
 msgstr "Amrywiant"
 
-#: tp_ErrorBars.ui:40
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:40
 msgctxt "tp_ErrorBars|liststoreFUNCTION"
 msgid "Error Margin"
 msgstr "Maint y Gwall"
 
-#: tp_ErrorBars.ui:77
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:77
 msgctxt "tp_ErrorBars|RB_NONE"
 msgid "_None"
 msgstr "_Dim"
 
-#: tp_ErrorBars.ui:95
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:95
 msgctxt "tp_ErrorBars|RB_CONST"
 msgid "_Constant Value"
 msgstr "_Gwerth Cyson"
 
-#: tp_ErrorBars.ui:113
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:113
 msgctxt "tp_ErrorBars|RB_PERCENT"
 msgid "_Percentage"
 msgstr "_Canran"
 
-#: tp_ErrorBars.ui:171
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:172
 msgctxt "tp_ErrorBars|RB_RANGE"
 msgid "Cell _Range"
 msgstr "Ystod _Celloedd"
 
-#: tp_ErrorBars.ui:195
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:196
 msgctxt "tp_ErrorBars|label1"
 msgid "Error Category"
 msgstr "Categori'r Gwall"
 
-#: tp_ErrorBars.ui:228
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:229
 msgctxt "tp_ErrorBars|RB_BOTH"
 msgid "Positive _and Negative"
 msgstr "Positif _a Negyddol"
 
-#: tp_ErrorBars.ui:247
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:248
 msgctxt "tp_ErrorBars|RB_POSITIVE"
 msgid "Pos_itive"
 msgstr "_Positif"
 
-#: tp_ErrorBars.ui:266
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:267
 msgctxt "tp_ErrorBars|RB_NEGATIVE"
 msgid "Ne_gative"
 msgstr "_Negyddol"
 
-#: tp_ErrorBars.ui:331
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:332
 msgctxt "tp_ErrorBars|label2"
 msgid "Error Indicator"
 msgstr "Dangosydd Gwall"
 
-#: tp_ErrorBars.ui:378
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:379
 msgctxt "tp_ErrorBars|FT_POSITIVE"
 msgid "P_ositive (+)"
 msgstr "_Positif (+)"
 
-#: tp_ErrorBars.ui:419
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:418
 msgctxt "tp_ErrorBars|IB_RANGE_POSITIVE|tooltip_text"
 msgid "Select data range"
 msgstr "Dewis ystod data"
 
-#: tp_ErrorBars.ui:444
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:443
 msgctxt "tp_ErrorBars|FT_NEGATIVE"
 msgid "_Negative (-)"
 msgstr "_Negyddol (-)"
 
-#: tp_ErrorBars.ui:485
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:482
 msgctxt "tp_ErrorBars|IB_RANGE_NEGATIVE|tooltip_text"
 msgid "Select data range"
 msgstr "Dewis ystod data"
 
-#: tp_ErrorBars.ui:503
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:500
 msgctxt "tp_ErrorBars|CB_SYN_POS_NEG"
 msgid "Same value for both"
 msgstr "Yr un gwerth i'r ddau"
 
-#: tp_ErrorBars.ui:525
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:523
 msgctxt "tp_ErrorBars|label3"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: tp_ErrorBars.ui:541
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:539
 msgctxt "tp_ErrorBars|STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS"
 msgid "Select Range for Positive Error Bars"
 msgstr "Dewis Ystod ar gyfer Barrau Gwall Posidol"
 
-#: tp_ErrorBars.ui:552
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:550
 msgctxt "tp_ErrorBars|STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS"
 msgid "Select Range for Negative Error Bars"
 msgstr "Dewis Ystod ar gyfer Barrau Gwall Negyddol"
 
-#: tp_ErrorBars.ui:563
+#: chart2/uiconfig/ui/tp_ErrorBars.ui:561
 msgctxt "tp_ErrorBars|STR_CONTROLTEXT_ERROR_BARS_FROM_DATA"
 msgid "From Data Table"
 msgstr "O'r Tabl Data"
 
-#: tp_LegendPosition.ui:30
+#: chart2/uiconfig/ui/tp_LegendPosition.ui:30
 msgctxt "tp_LegendPosition|left"
 msgid "_Left"
 msgstr "C_hwith"
 
-#: tp_LegendPosition.ui:48
+#: chart2/uiconfig/ui/tp_LegendPosition.ui:48
 msgctxt "tp_LegendPosition|right"
 msgid "_Right"
 msgstr "_De"
 
-#: tp_LegendPosition.ui:66
+#: chart2/uiconfig/ui/tp_LegendPosition.ui:66
 msgctxt "tp_LegendPosition|top"
 msgid "_Top"
 msgstr "_Brig"
 
-#: tp_LegendPosition.ui:84
+#: chart2/uiconfig/ui/tp_LegendPosition.ui:84
 msgctxt "tp_LegendPosition|bottom"
 msgid "_Bottom"
 msgstr "_Gwaelod"
 
-#: tp_LegendPosition.ui:109
+#: chart2/uiconfig/ui/tp_LegendPosition.ui:109
 msgctxt "tp_LegendPosition|TXT_POSITION"
 msgid "Position"
 msgstr "Safle"
 
-#: tp_LegendPosition.ui:144
+#: chart2/uiconfig/ui/tp_LegendPosition.ui:144
 msgctxt "tp_LegendPosition|FT_LEGEND_TEXTDIR"
 msgid "Te_xt direction"
 msgstr "C_yfeiriad testun"
 
-#: tp_LegendPosition.ui:173
+#: chart2/uiconfig/ui/tp_LegendPosition.ui:173
 msgctxt "tp_LegendPosition|TXT_ORIENTATION"
 msgid "Text Orientation"
 msgstr "Cyfeiriad Testun"
 
-#: tp_PolarOptions.ui:31
+#: chart2/uiconfig/ui/tp_PolarOptions.ui:31
 msgctxt "tp_PolarOptions|CB_CLOCKWISE"
 msgid "_Clockwise direction"
 msgstr "_Cyfeiriad clocwedd"
 
-#: tp_PolarOptions.ui:47
+#: chart2/uiconfig/ui/tp_PolarOptions.ui:47
 msgctxt "tp_PolarOptions|label1"
 msgid "Orientation"
 msgstr "Cyfeiriadedd"
 
-#: tp_PolarOptions.ui:108
+#: chart2/uiconfig/ui/tp_PolarOptions.ui:107
 msgctxt "tp_PolarOptions|FT_ROTATION_DEGREES"
 msgid "_Degrees"
 msgstr "_Gradd"
 
-#: tp_PolarOptions.ui:127
+#: chart2/uiconfig/ui/tp_PolarOptions.ui:126
 msgctxt "tp_PolarOptions|label2"
 msgid "Starting Angle"
 msgstr "Ongl Cychwyn"
 
-#: tp_PolarOptions.ui:154
+#: chart2/uiconfig/ui/tp_PolarOptions.ui:153
 msgctxt "tp_PolarOptions|CB_INCLUDE_HIDDEN_CELLS_POLAR"
 msgid "Include _values from hidden cells"
 msgstr "Cynnwys _gwerthoedd o gelloedd cudd"
 
-#: tp_PolarOptions.ui:170
+#: chart2/uiconfig/ui/tp_PolarOptions.ui:169
 msgctxt "tp_PolarOptions|label3"
 msgid "Plot Options"
 msgstr "Dewisiadau Plotio"
 
-#: tp_RangeChooser.ui:8
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:8
 msgctxt "tp_RangeChooser|imageIB_RANGE|tooltip_text"
 msgid "Select data range"
 msgstr "Dewis ystod data"
 
-#: tp_RangeChooser.ui:28
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:28
 msgctxt "tp_RangeChooser|FT_CAPTION_FOR_WIZARD"
 msgid "Choose a Data Range"
 msgstr "Dewis Ystod Data"
 
-#: tp_RangeChooser.ui:50
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:50
 msgctxt "tp_RangeChooser|FT_RANGE"
 msgid "_Data range:"
 msgstr "_Ystod data:"
 
-#: tp_RangeChooser.ui:79
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:78
 msgctxt "tp_RangeChooser|IB_RANGE|tooltip_text"
 msgid "Select data range"
 msgstr "Dewis ystod data"
 
-#: tp_RangeChooser.ui:97
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:96
 msgctxt "tp_RangeChooser|RB_DATAROWS"
 msgid "Data series in _rows"
 msgstr "Cyfres data mewn _rhesi"
 
-#: tp_RangeChooser.ui:116
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:115
 msgctxt "tp_RangeChooser|RB_DATACOLS"
 msgid "Data series in _columns"
 msgstr "Ystod data mewn _colofnau"
 
-#: tp_RangeChooser.ui:135
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:134
 msgctxt "tp_RangeChooser|CB_FIRST_ROW_ASLABELS"
 msgid "_First row as label"
 msgstr "_Rhes gyntaf fel label"
 
-#: tp_RangeChooser.ui:152
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:151
 msgctxt "tp_RangeChooser|CB_FIRST_COLUMN_ASLABELS"
 msgid "F_irst column as label"
 msgstr "_Colofn gyntaf fel label"
 
-#: tp_RangeChooser.ui:180
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:179
 msgctxt "tp_RangeChooser|CB_TIME_BASED"
 msgid "Time based charting"
 msgstr "Siartio'n seiliedig ar amser"
 
-#: tp_RangeChooser.ui:235
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:233
 msgctxt "tp_RangeChooser|label1"
 msgid "Start Table Index"
 msgstr "Mynegai Cychwyn Tabl"
 
-#: tp_RangeChooser.ui:251
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:249
 msgctxt "tp_RangeChooser|label2"
 msgid "End Table Index"
 msgstr "Mynegai Diwedd Tabl"
 
-#: tp_RangeChooser.ui:272
+#: chart2/uiconfig/ui/tp_RangeChooser.ui:270
 msgctxt "tp_RangeChooser|STR_PAGE_DATA_RANGE"
 msgid "Data Range"
 msgstr "Ystod Data"
 
-#: tp_Scale.ui:20
+#: chart2/uiconfig/ui/tp_Scale.ui:20
 msgctxt "tp_Scale|liststoreDATE"
 msgid "Days"
 msgstr "Diwrnodau"
 
-#: tp_Scale.ui:24
+#: chart2/uiconfig/ui/tp_Scale.ui:24
 msgctxt "tp_Scale|liststoreDATE"
 msgid "Months"
 msgstr "Misoedd"
 
-#: tp_Scale.ui:28
+#: chart2/uiconfig/ui/tp_Scale.ui:28
 msgctxt "tp_Scale|liststoreDATE"
 msgid "Years"
 msgstr "Blynyddoedd"
 
-#: tp_Scale.ui:59
+#: chart2/uiconfig/ui/tp_Scale.ui:59
 msgctxt "tp_Scale|CBX_REVERSE"
 msgid "_Reverse direction"
 msgstr "_Gwrthdroi cyfeiriad"
 
-#: tp_Scale.ui:75
+#: chart2/uiconfig/ui/tp_Scale.ui:75
 msgctxt "tp_Scale|CBX_LOGARITHM"
 msgid "_Logarithmic scale"
 msgstr "_Graddfa logarithmig"
 
-#: tp_Scale.ui:99
+#: chart2/uiconfig/ui/tp_Scale.ui:99
 msgctxt "tp_Scale|TXT_AXIS_TYPE"
 msgid "T_ype"
 msgstr "M_ath"
 
-#: tp_Scale.ui:116
+#: chart2/uiconfig/ui/tp_Scale.ui:116
 msgctxt "tp_Scale|LB_AXIS_TYPE"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: tp_Scale.ui:117
+#: chart2/uiconfig/ui/tp_Scale.ui:117
 msgctxt "tp_Scale|LB_AXIS_TYPE"
 msgid "Text"
 msgstr "Testun"
 
-#: tp_Scale.ui:118
+#: chart2/uiconfig/ui/tp_Scale.ui:118
 msgctxt "tp_Scale|LB_AXIS_TYPE"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: tp_Scale.ui:152
+#: chart2/uiconfig/ui/tp_Scale.ui:152
 msgctxt "tp_Scale|TXT_MIN"
 msgid "_Minimum"
 msgstr "_Lleiafswm"
 
-#: tp_Scale.ui:168
+#: chart2/uiconfig/ui/tp_Scale.ui:168
 msgctxt "tp_Scale|TXT_MAX"
 msgid "Ma_ximum"
 msgstr "_Uchafswm"
 
-#: tp_Scale.ui:181
+#: chart2/uiconfig/ui/tp_Scale.ui:181
 msgctxt "tp_Scale|CBX_AUTO_MIN"
 msgid "_Automatic"
 msgstr "_Awtomatig"
 
-#: tp_Scale.ui:198
+#: chart2/uiconfig/ui/tp_Scale.ui:198
 msgctxt "tp_Scale|CBX_AUTO_MAX"
 msgid "A_utomatic"
 msgstr "A_wtomatig"
 
-#: tp_Scale.ui:256
+#: chart2/uiconfig/ui/tp_Scale.ui:254
 msgctxt "tp_Scale|TXT_TIME_RESOLUTION"
 msgid "R_esolution"
 msgstr "C­_ydraniad"
 
-#: tp_Scale.ui:280
+#: chart2/uiconfig/ui/tp_Scale.ui:278
 msgctxt "tp_Scale|CBX_AUTO_TIME_RESOLUTION"
 msgid "Automat_ic"
 msgstr "Awtomat_ig"
 
-#: tp_Scale.ui:311
+#: chart2/uiconfig/ui/tp_Scale.ui:309
 msgctxt "tp_Scale|TXT_STEP_MAIN"
 msgid "Ma_jor interval"
 msgstr "Cyfnodau m_awr"
 
-#: tp_Scale.ui:383
+#: chart2/uiconfig/ui/tp_Scale.ui:379
 msgctxt "tp_Scale|CBX_AUTO_STEP_MAIN"
 msgid "Au_tomatic"
 msgstr "A_wtomatig"
 
-#: tp_Scale.ui:419
+#: chart2/uiconfig/ui/tp_Scale.ui:415
 msgctxt "tp_Scale|TXT_STEP_HELP"
 msgid "Minor inter_val"
 msgstr "C_yfnodau bach"
 
-#: tp_Scale.ui:433
+#: chart2/uiconfig/ui/tp_Scale.ui:429
 msgctxt "tp_Scale|TXT_STEP_HELP_COUNT"
 msgid "Minor inter_val count"
 msgstr "Cyfrif c_yfnodau bach"
 
-#: tp_Scale.ui:477
+#: chart2/uiconfig/ui/tp_Scale.ui:471
 msgctxt "tp_Scale|CBX_AUTO_STEP_HELP"
 msgid "Aut_omatic"
 msgstr "A­_wtomatig"
 
-#: tp_Scale.ui:508
+#: chart2/uiconfig/ui/tp_Scale.ui:502
 msgctxt "tp_Scale|TXT_ORIGIN"
 msgid "Re_ference value"
 msgstr "Gwerth c_yfeirio"
 
-#: tp_Scale.ui:531
+#: chart2/uiconfig/ui/tp_Scale.ui:524
 msgctxt "tp_Scale|CBX_AUTO_ORIGIN"
 msgid "Automat_ic"
 msgstr "Awtomat_ig"
 
-#: tp_Scale.ui:561
+#: chart2/uiconfig/ui/tp_Scale.ui:554
 msgctxt "tp_Scale|FL_SCALE"
 msgid "Scale"
 msgstr "Graddfa"
 
-#: tp_SeriesToAxis.ui:41
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:41
 msgctxt "tp_SeriesToAxis|RBT_OPT_AXIS_1"
 msgid "Primary Y axis"
 msgstr "Echelin Y cynradd"
 
-#: tp_SeriesToAxis.ui:58
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:59
 msgctxt "tp_SeriesToAxis|RBT_OPT_AXIS_2"
 msgid "Secondary Y axis"
 msgstr "Ail Echelin Y"
 
-#: tp_SeriesToAxis.ui:82
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:84
 msgctxt "tp_SeriesToAxis|label1"
 msgid "Align Data Series to"
 msgstr "Alinio Cyfres Data i"
 
-#: tp_SeriesToAxis.ui:123
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:125
 msgctxt "tp_SeriesToAxis|FT_GAP"
 msgid "_Spacing"
 msgstr "_Bylchu"
 
-#: tp_SeriesToAxis.ui:138
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:140
 msgctxt "tp_SeriesToAxis|FT_OVERLAP"
 msgid "_Overlap"
 msgstr "_Gorgyffyrddiad"
 
-#: tp_SeriesToAxis.ui:186
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:186
 msgctxt "tp_SeriesToAxis|CB_BARS_SIDE_BY_SIDE"
 msgid "Show _bars side by side"
 msgstr "Dangos _barrau ochr yn ochr"
 
-#: tp_SeriesToAxis.ui:202
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:202
 msgctxt "tp_SeriesToAxis|CB_CONNECTOR"
 msgid "Connection lines"
 msgstr "Llinellau cysylltiad"
 
-#: tp_SeriesToAxis.ui:224
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:224
 msgctxt "tp_SeriesToAxis|label2"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: tp_SeriesToAxis.ui:266
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:266
 msgctxt "tp_SeriesToAxis|FT_MISSING_VALUES"
 msgid "Plot missing values"
 msgstr "Plotio gwerthoedd coll"
 
-#: tp_SeriesToAxis.ui:277
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:277
 msgctxt "tp_SeriesToAxis|RB_DONT_PAINT"
 msgid "_Leave gap"
 msgstr "_Gadael bwlch"
 
-#: tp_SeriesToAxis.ui:296
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:296
 msgctxt "tp_SeriesToAxis|RB_ASSUME_ZERO"
 msgid "_Assume zero"
 msgstr "_Tybio sero"
 
-#: tp_SeriesToAxis.ui:315
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:315
 msgctxt "tp_SeriesToAxis|RB_CONTINUE_LINE"
 msgid "_Continue line"
 msgstr "_Parhau'r llinell"
 
-#: tp_SeriesToAxis.ui:347
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:347
 msgctxt "tp_SeriesToAxis|CB_INCLUDE_HIDDEN_CELLS"
 msgid "Include _values from hidden cells"
 msgstr "Cynnwys _gwerthoedd o gelloedd cudd"
 
-#: tp_SeriesToAxis.ui:370
+#: chart2/uiconfig/ui/tp_SeriesToAxis.ui:370
 msgctxt "tp_SeriesToAxis|label3"
 msgid "Plot Options"
 msgstr "Dewisiadau Plotio"
 
-#: tp_Trendline.ui:52
+#: chart2/uiconfig/ui/tp_Trendline.ui:52
 msgctxt "tp_Trendline|linear"
 msgid "_Linear"
 msgstr "_Llinol"
 
-#: tp_Trendline.ui:71
+#: chart2/uiconfig/ui/tp_Trendline.ui:71
 msgctxt "tp_Trendline|logarithmic"
 msgid "L_ogarithmic"
 msgstr "L_ogarithmig"
 
-#: tp_Trendline.ui:90
+#: chart2/uiconfig/ui/tp_Trendline.ui:90
 msgctxt "tp_Trendline|exponential"
 msgid "_Exponential"
 msgstr "E_sbonyddol"
 
-#: tp_Trendline.ui:109
+#: chart2/uiconfig/ui/tp_Trendline.ui:109
 msgctxt "tp_Trendline|power"
 msgid "Po_wer"
 msgstr "P_ŵer"
 
-#: tp_Trendline.ui:128
+#: chart2/uiconfig/ui/tp_Trendline.ui:128
 msgctxt "tp_Trendline|polynomial"
 msgid "_Polynomial"
 msgstr "_Polynomaidd"
 
-#: tp_Trendline.ui:147
+#: chart2/uiconfig/ui/tp_Trendline.ui:147
 msgctxt "tp_Trendline|movingAverage"
 msgid "_Moving Average"
 msgstr "_Cyfartaledd Newidiol"
 
-#: tp_Trendline.ui:173
+#: chart2/uiconfig/ui/tp_Trendline.ui:173
 msgctxt "tp_Trendline|label3"
 msgid "Degree"
 msgstr "Gradd"
 
-#: tp_Trendline.ui:213
+#: chart2/uiconfig/ui/tp_Trendline.ui:212
 msgctxt "tp_Trendline|label4"
 msgid "Period"
 msgstr "Cyfnod"
 
-#: tp_Trendline.ui:336
+#: chart2/uiconfig/ui/tp_Trendline.ui:334
 msgctxt "tp_Trendline|label1"
 msgid "Regression Type"
 msgstr "Math o Atchweliad"
 
-#: tp_Trendline.ui:373
+#: chart2/uiconfig/ui/tp_Trendline.ui:371
 msgctxt "tp_Trendline|label7"
 msgid "Extrapolate Forward"
 msgstr "Allosod Ymlaen"
 
-#: tp_Trendline.ui:389
+#: chart2/uiconfig/ui/tp_Trendline.ui:387
 msgctxt "tp_Trendline|label8"
 msgid "Extrapolate Backward"
 msgstr "Allosod Nôl"
 
-#: tp_Trendline.ui:430
+#: chart2/uiconfig/ui/tp_Trendline.ui:426
 msgctxt "tp_Trendline|setIntercept"
 msgid "Force _Intercept"
 msgstr "Gorfodi _Rhyngdoriad"
 
-#: tp_Trendline.ui:447
+#: chart2/uiconfig/ui/tp_Trendline.ui:443
 msgctxt "tp_Trendline|showEquation"
 msgid "Show E_quation"
 msgstr "Dangos _Hafaliad"
 
-#: tp_Trendline.ui:464
+#: chart2/uiconfig/ui/tp_Trendline.ui:460
 msgctxt "tp_Trendline|showCorrelationCoefficient"
 msgid "Show _Coefficient of Determination (R²)"
 msgstr "Dangos _Cyfeirnod y Mesuriad (R²)"
 
-#: tp_Trendline.ui:484
+#: chart2/uiconfig/ui/tp_Trendline.ui:480
 msgctxt "tp_Trendline|label5"
 msgid "Trendline _Name"
 msgstr "Enw Llinell Duedd"
 
-#: tp_Trendline.ui:529
+#: chart2/uiconfig/ui/tp_Trendline.ui:523
 msgctxt "tp_Trendline|label6"
 msgid "_X Variable Name"
 msgstr "Enw Amrywiolyn _X"
 
-#: tp_Trendline.ui:558
+#: chart2/uiconfig/ui/tp_Trendline.ui:551
 msgctxt "tp_Trendline|label9"
 msgid "_Y Variable Name"
 msgstr "Enw Amrywiolyn _Y"
 
-#: tp_Trendline.ui:590
+#: chart2/uiconfig/ui/tp_Trendline.ui:582
 msgctxt "tp_Trendline|label2"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: tp_axisLabel.ui:20
+#: chart2/uiconfig/ui/tp_axisLabel.ui:20
 msgctxt "tp_axisLabel|showlabelsCB"
 msgid "Sho_w labels"
 msgstr "_Dangos labeli"
 
-#: tp_axisLabel.ui:63
+#: chart2/uiconfig/ui/tp_axisLabel.ui:63
 msgctxt "tp_axisLabel|tile"
 msgid "_Tile"
 msgstr "_Teilio"
 
-#: tp_axisLabel.ui:81
+#: chart2/uiconfig/ui/tp_axisLabel.ui:81
 msgctxt "tp_axisLabel|odd"
 msgid "St_agger odd"
 msgstr "Darwahanu _odrif"
 
-#: tp_axisLabel.ui:98
+#: chart2/uiconfig/ui/tp_axisLabel.ui:98
 msgctxt "tp_axisLabel|even"
 msgid "Stagger _even"
 msgstr "Darwahanu _eilrif"
 
-#: tp_axisLabel.ui:115
+#: chart2/uiconfig/ui/tp_axisLabel.ui:115
 msgctxt "tp_axisLabel|auto"
 msgid "A_utomatic"
 msgstr "_Awtomatig"
 
-#: tp_axisLabel.ui:138
+#: chart2/uiconfig/ui/tp_axisLabel.ui:138
 msgctxt "tp_axisLabel|orderL"
 msgid "Order"
 msgstr "Trefn"
 
-#: tp_axisLabel.ui:173
+#: chart2/uiconfig/ui/tp_axisLabel.ui:173
 msgctxt "tp_axisLabel|overlapCB"
 msgid "O_verlap"
 msgstr "_Gorgyffyrddiad"
 
-#: tp_axisLabel.ui:189
+#: chart2/uiconfig/ui/tp_axisLabel.ui:189
 msgctxt "tp_axisLabel|breakCB"
 msgid "_Break"
 msgstr "_Toriad"
 
-#: tp_axisLabel.ui:211
+#: chart2/uiconfig/ui/tp_axisLabel.ui:211
 msgctxt "tp_axisLabel|textflowL"
 msgid "Text Flow"
 msgstr "Llif Testun"
 
-#: tp_axisLabel.ui:280
+#: chart2/uiconfig/ui/tp_axisLabel.ui:279
 msgctxt "tp_axisLabel|degreeL"
 msgid "_Degrees"
 msgstr "_Graddau"
 
-#: tp_axisLabel.ui:333
+#: chart2/uiconfig/ui/tp_axisLabel.ui:332
 msgctxt "tp_axisLabel|stackedCB"
 msgid "Ve_rtically stacked"
 msgstr "_Staciwyd yn fertigol"
 
-#: tp_axisLabel.ui:352
+#: chart2/uiconfig/ui/tp_axisLabel.ui:351
 msgctxt "tp_axisLabel|labelABCD"
 msgid "ABCD"
 msgstr "ABCD"
 
-#: tp_axisLabel.ui:373
+#: chart2/uiconfig/ui/tp_axisLabel.ui:372
 msgctxt "tp_axisLabel|textdirL"
 msgid "Te_xt direction:"
 msgstr "C_yfeiriad testun:"
 
-#: tp_axisLabel.ui:403
+#: chart2/uiconfig/ui/tp_axisLabel.ui:402
 msgctxt "tp_axisLabel|labelTextOrient"
 msgid "Text Orientation"
 msgstr "Cyfeiriad Testun"
 
-#: wizelementspage.ui:39
+#: chart2/uiconfig/ui/wizelementspage.ui:39
 msgctxt "wizelementspage|labelPrimaryXaxis"
 msgid "_X axis"
 msgstr "Echelin _X"
 
-#: wizelementspage.ui:55
+#: chart2/uiconfig/ui/wizelementspage.ui:55
 msgctxt "wizelementspage|labelPrimaryYaxis"
 msgid "_Y axis"
 msgstr "Echelin _­Y"
 
-#: wizelementspage.ui:71
+#: chart2/uiconfig/ui/wizelementspage.ui:71
 msgctxt "wizelementspage|labelPrimaryZaxis"
 msgid "_Z axis"
 msgstr "Echelin _Z"
 
-#: wizelementspage.ui:132
+#: chart2/uiconfig/ui/wizelementspage.ui:126
 msgctxt "wizelementspage|labelMainTitle"
 msgid "_Title"
 msgstr "_Teitl"
 
-#: wizelementspage.ui:148
+#: chart2/uiconfig/ui/wizelementspage.ui:142
 msgctxt "wizelementspage|labelSubTitle"
 msgid "_Subtitle"
 msgstr "_Is deitl"
 
-#: wizelementspage.ui:194
+#: chart2/uiconfig/ui/wizelementspage.ui:184
 msgctxt "wizelementspage|labelSecondaryXAxis"
 msgid "X _axis"
 msgstr "Echelin _X"
 
-#: wizelementspage.ui:210
+#: chart2/uiconfig/ui/wizelementspage.ui:200
 msgctxt "wizelementspage|labelSecondaryYAxis"
 msgid "Y ax_is"
 msgstr "Echelin _Y"
 
-#: wizelementspage.ui:266
+#: chart2/uiconfig/ui/wizelementspage.ui:252
 msgctxt "wizelementspage|show"
 msgid "_Display legend"
 msgstr "_Dangos mynegai"
 
-#: wizelementspage.ui:293
+#: chart2/uiconfig/ui/wizelementspage.ui:279
 msgctxt "wizelementspage|left"
 msgid "_Left"
 msgstr "C_hwith"
 
-#: wizelementspage.ui:311
+#: chart2/uiconfig/ui/wizelementspage.ui:297
 msgctxt "wizelementspage|right"
 msgid "_Right"
 msgstr "_De"
 
-#: wizelementspage.ui:329
+#: chart2/uiconfig/ui/wizelementspage.ui:315
 msgctxt "wizelementspage|top"
 msgid "_Top"
 msgstr "_Brig"
 
-#: wizelementspage.ui:347
+#: chart2/uiconfig/ui/wizelementspage.ui:333
 msgctxt "wizelementspage|bottom"
 msgid "_Bottom"
 msgstr "_Gwaelod"
 
-#: wizelementspage.ui:389
+#: chart2/uiconfig/ui/wizelementspage.ui:375
 msgctxt "wizelementspage|Axe"
 msgid "Choose Titles, Legend, and Grid Settings"
 msgstr "Dewiswch Deitlau, Mynegai a Gosodiadau Grid"
 
-#: wizelementspage.ui:422
+#: chart2/uiconfig/ui/wizelementspage.ui:408
 msgctxt "wizelementspage|x"
 msgid "X axis"
 msgstr "Echelin ­X"
 
-#: wizelementspage.ui:439
+#: chart2/uiconfig/ui/wizelementspage.ui:425
 msgctxt "wizelementspage|y"
 msgid "Y ax_is"
 msgstr "E­_chelin Y"
 
-#: wizelementspage.ui:456
+#: chart2/uiconfig/ui/wizelementspage.ui:442
 msgctxt "wizelementspage|z"
 msgid "Z axi_s"
 msgstr "Ec­_hel Z"
 
-#: wizelementspage.ui:479
+#: chart2/uiconfig/ui/wizelementspage.ui:465
 msgctxt "wizelementspage|label2"
 msgid "Display Grids"
 msgstr "Dangos Gridiau"
diff --git a/source/cy/connectivity/messages.po b/source/cy/connectivity/messages.po
index 1a94e5b1fa1..29fa8410d38 100644
--- a/source/cy/connectivity/messages.po
+++ b/source/cy/connectivity/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
+"POT-Creation-Date: 2018-02-27 13:56+0100\n"
 "PO-Revision-Date: 2017-10-06 10:19+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,192 +13,192 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1507285159.000000\n"
 
 #. = the mozab driver's resource strings
-#: strings.hrc:26
+#: connectivity/inc/strings.hrc:26
 msgctxt "STR_ERR_EXECUTING_QUERY"
 msgid "An error occurred while executing the query."
 msgstr "Digwyddodd gwall wrth weithredu ymholiad."
 
-#: strings.hrc:27
+#: connectivity/inc/strings.hrc:27
 msgctxt "STR_QUERY_AT_LEAST_ONE_TABLES"
 msgid "The query can not be executed. It needs at least one table."
 msgstr "Nid oes modd gweithredu’r ymholiad. Mae angen o leiaf un tabl."
 
-#: strings.hrc:28
+#: connectivity/inc/strings.hrc:28
 msgctxt "STR_NO_COUNT_SUPPORT"
 msgid "The driver does not support the 'COUNT' function."
 msgstr "Nid yw'r gyrrwr yn cynnal y swyddogaeth 'COUNT'."
 
-#: strings.hrc:29
+#: connectivity/inc/strings.hrc:29
 msgctxt "STR_STMT_TYPE_NOT_SUPPORTED"
 msgid "This statement type not supported by this database driver."
 msgstr "Nid yw'r math yma o ddatganiad yn cael ei gynnal gan yrrwr y gronfa ddata hon."
 
-#: strings.hrc:30
+#: connectivity/inc/strings.hrc:30
 msgctxt "STR_UNSPECIFIED_ERROR"
 msgid "An unknown error occurred."
 msgstr "Digwyddodd gwall anhysbys."
 
-#: strings.hrc:31
+#: connectivity/inc/strings.hrc:31
 msgctxt "STR_ERROR_REFRESH_ROW"
 msgid "An error occurred while refreshing the current row."
 msgstr "Ddigwyddodd gwall wrth adnewyddu'r rhes gyfredol."
 
-#: strings.hrc:32
+#: connectivity/inc/strings.hrc:32
 msgctxt "STR_ERROR_GET_ROW"
 msgid "An error occurred while getting the current row."
 msgstr "Ddigwyddodd gwall wrth estyn y rhes gyfredol."
 
-#: strings.hrc:33
+#: connectivity/inc/strings.hrc:33
 msgctxt "STR_QUERY_INVALID_IS_NULL_COLUMN"
 msgid "The query can not be executed. The 'IS NULL' can only be used with a column name."
 msgstr "Nid oes modd gweithredu'r ymholiad. Dim ond gydag enw colofn mae modd defnyddio 'IS NULL'."
 
-#: strings.hrc:34
+#: connectivity/inc/strings.hrc:34
 msgctxt "STR_ILLEGAL_MOVEMENT"
 msgid "Illegal cursor movement occurred."
 msgstr "Digwyddodd symudiad cyrchwr anghyfreithlon."
 
-#: strings.hrc:35
+#: connectivity/inc/strings.hrc:35
 msgctxt "STR_COMMIT_ROW"
 msgid "Please commit row '$position$' before update rows or insert new rows."
 msgstr "Cyflwynwch res '$position$' cyn diweddaru rhesi neu fewnosod rhesi newydd."
 
 #. = common strings
-#: strings.hrc:37
+#: connectivity/inc/strings.hrc:37
 msgctxt "STR_NO_CONNECTION_GIVEN"
 msgid "It doesn't exist a connection to the database."
 msgstr "Nid yw'n bodoli fel cysylltiad yn y gronfa ddata."
 
-#: strings.hrc:38
+#: connectivity/inc/strings.hrc:38
 msgctxt "STR_WRONG_PARAM_INDEX"
 msgid "You tried to set a parameter at position '$pos$' but there is/are only '$count$' parameter(s) allowed. One reason may be that the property \"ParameterNameSubstitution\" is not set to TRUE in the data source."
 msgstr "Rydych wedi ceisio gosod paramedr ar safle '$pos$' ond dim ond caniatâd i '$count$' paramedr(au) sydd. Un rheswm gall fod yw nad yw priodwedd \"ParameterNameSubstitution\" wedi ei osod i TRUE yn ffynhonnell y data."
 
-#: strings.hrc:39
+#: connectivity/inc/strings.hrc:39
 msgctxt "STR_NO_INPUTSTREAM"
 msgid "The input stream was not set."
 msgstr "Nid yw'r llif i mewn wedi ei osod."
 
-#: strings.hrc:40
+#: connectivity/inc/strings.hrc:40
 msgctxt "STR_NO_ELEMENT_NAME"
 msgid "There is no element named '$name$'."
 msgstr "Nid oes elfen o'r enw '$name$'."
 
-#: strings.hrc:41
+#: connectivity/inc/strings.hrc:41
 msgctxt "STR_INVALID_BOOKMARK"
 msgid "Invalid bookmark value"
 msgstr "Gwerth nod tudalen annilys"
 
-#: strings.hrc:42
+#: connectivity/inc/strings.hrc:42
 msgctxt "STR_PRIVILEGE_NOT_GRANTED"
 msgid "Privilege not granted: Only table privileges can be granted."
 msgstr "Heb roi'r fraint: Dim ond breintiau tabl mae modd eu rhoi."
 
-#: strings.hrc:43
+#: connectivity/inc/strings.hrc:43
 msgctxt "STR_PRIVILEGE_NOT_REVOKED"
 msgid "Privilege not revoked: Only table privileges can be revoked."
 msgstr "Heb atal y fraint: Dim ond breintiau tabl y mae modd eu hatal."
 
-#: strings.hrc:44
+#: connectivity/inc/strings.hrc:44
 msgctxt "STR_ERRORMSG_SEQUENCE"
 msgid "Function sequence error."
 msgstr "Gwall dilyniant swyddogaeth."
 
-#: strings.hrc:45
+#: connectivity/inc/strings.hrc:45
 msgctxt "STR_INVALID_INDEX"
 msgid "Invalid descriptor index."
 msgstr "Mynegai disgrifydd annilys."
 
-#: strings.hrc:46
+#: connectivity/inc/strings.hrc:46
 msgctxt "STR_UNSUPPORTED_FUNCTION"
 msgid "The driver does not support the function '$functionname$'."
 msgstr "Nid yw'r gyrrwr yn cynnal y swyddogaeth '$functionname$'."
 
-#: strings.hrc:47
+#: connectivity/inc/strings.hrc:47
 msgctxt "STR_UNSUPPORTED_FEATURE"
 msgid "The driver does not support the functionality for '$featurename$'. It is not implemented."
 msgstr "Nid yw'r gyrrwr yn cynnal y swyddogaeth '$featurename$'. Nid yw wedi ei wireddu eto."
 
-#: strings.hrc:48
+#: connectivity/inc/strings.hrc:48
 msgctxt "STR_FORMULA_WRONG"
 msgid "The formula for TypeInfoSettings is wrong!"
 msgstr "Mae'r fformiwla ar gyfer TypeInfoSettings yn anghywir!"
 
-#: strings.hrc:49
+#: connectivity/inc/strings.hrc:49
 msgctxt "STR_STRING_LENGTH_EXCEEDED"
 msgid "The string '$string$' exceeds the maximum length of $maxlen$ characters when converted to the target character set '$charset$'."
 msgstr "Mae'r llinyn '$string$' yn fwy na hyd mwyaf nodau $maxlen$ pan cant eu trosi i'r set nod targed '$charset$'."
 
-#: strings.hrc:50
+#: connectivity/inc/strings.hrc:50
 msgctxt "STR_CANNOT_CONVERT_STRING"
 msgid "The string '$string$' cannot be converted using the encoding '$charset$'."
 msgstr "Nid oes modd trosi llinyn '$string$' gan ddefnyddio amgodiad '$charset$'."
 
-#: strings.hrc:51
+#: connectivity/inc/strings.hrc:51
 msgctxt "STR_URI_SYNTAX_ERROR"
 msgid "The connection URL is invalid."
 msgstr "Mae cysylltiad yr URL yn annilys."
 
-#: strings.hrc:52
+#: connectivity/inc/strings.hrc:52
 msgctxt "STR_QUERY_TOO_COMPLEX"
 msgid "The query can not be executed. It is too complex."
 msgstr "Nid oes modd gweithredu'r ymholiad. Mae'n rhy gymhleth."
 
-#: strings.hrc:53
+#: connectivity/inc/strings.hrc:53
 msgctxt "STR_OPERATOR_TOO_COMPLEX"
 msgid "The query can not be executed. The operator is too complex."
 msgstr "Nid oes modd gweithredu'r ymholiad. Mae'r gweithredydd yn rhy gymhleth."
 
-#: strings.hrc:54
+#: connectivity/inc/strings.hrc:54
 msgctxt "STR_QUERY_INVALID_LIKE_COLUMN"
 msgid "The query can not be executed. You cannot use 'LIKE' with columns of this type."
 msgstr "Nid owes modd gweithredu'r ymholiad. Nid oes modd defnyddio 'LIKE' gyda cholofnau o'r math yma."
 
-#: strings.hrc:55
+#: connectivity/inc/strings.hrc:55
 msgctxt "STR_QUERY_INVALID_LIKE_STRING"
 msgid "The query can not be executed. 'LIKE' can be used with a string argument only."
 msgstr "Nid oes modd gweithredu'r ymholiad. Dim ond gydag ymresymiad llinyn y mae modd defnyddio 'LIKE'."
 
-#: strings.hrc:56
+#: connectivity/inc/strings.hrc:56
 msgctxt "STR_QUERY_NOT_LIKE_TOO_COMPLEX"
 msgid "The query can not be executed. The 'NOT LIKE' condition is too complex."
 msgstr "Nid oes modd gweithredu'r ymholiad. Mae'r cyflwr 'NOT LIKE' yn rhy gymhleth."
 
-#: strings.hrc:57
+#: connectivity/inc/strings.hrc:57
 msgctxt "STR_QUERY_LIKE_WILDCARD"
 msgid "The query can not be executed. The 'LIKE' condition contains wildcard in the middle."
 msgstr "Nid oes modd gweithredu'r ymholiad. Mae'r cyflwr 'NOT LIKE' yn cynnwys nod chwiliwr yn y canol."
 
-#: strings.hrc:58
+#: connectivity/inc/strings.hrc:58
 msgctxt "STR_QUERY_LIKE_WILDCARD_MANY"
 msgid "The query can not be executed. The 'LIKE' condition contains too many wildcards."
 msgstr "Nid oes modd gweithredu'r ymholiad. Mae'r cyflwr 'NOT LIKE' yn cynnwys gormod o nod chwilwyr."
 
-#: strings.hrc:59
+#: connectivity/inc/strings.hrc:59
 msgctxt "STR_INVALID_COLUMNNAME"
 msgid "The column name '$columnname$' is not valid."
 msgstr "Nid yw'r enw colofn '$columnname$' yn ddilys."
 
-#: strings.hrc:60
+#: connectivity/inc/strings.hrc:60
 msgctxt "STR_INVALID_COLUMN_SELECTION"
 msgid "The statement contains an invalid selection of columns."
 msgstr "Mae'r gosodiad yn cynnwys dewis annilys o golofnau."
 
-#: strings.hrc:61
+#: connectivity/inc/strings.hrc:61
 msgctxt "STR_COLUMN_NOT_UPDATEABLE"
 msgid "The column at position '$position$' could not be updated."
 msgstr "Nid oes modd diweddaru'r golofn ar safle '$position$'."
 
-#: strings.hrc:62
+#: connectivity/inc/strings.hrc:62
 msgctxt "STR_COULD_NOT_LOAD_FILE"
 msgid "The file $filename$ could not be loaded."
 msgstr "Nid oedd modd llwytho'r ffeil $filename$."
 
-#: strings.hrc:63
+#: connectivity/inc/strings.hrc:63
 msgctxt "STR_LOAD_FILE_ERROR_MESSAGE"
 msgid ""
 "The attempt to load the file resulted in the following error message ($exception_type$):\n"
@@ -210,122 +210,122 @@ msgstr ""
 "$error_message$"
 
 #. = the ado driver's resource strings
-#: strings.hrc:65
+#: connectivity/inc/strings.hrc:65
 msgctxt "STR_TYPE_NOT_CONVERT"
 msgid "The type could not be converted."
 msgstr "Nid oedd modd trosi'r math hwn."
 
-#: strings.hrc:66
+#: connectivity/inc/strings.hrc:66
 msgctxt "STR_INVALID_COLUMN_DESCRIPTOR_ERROR"
 msgid "Could not append column: invalid column descriptor."
 msgstr "Methu atodi'r golofn: disgrifydd colofn annilys."
 
-#: strings.hrc:67
+#: connectivity/inc/strings.hrc:67
 msgctxt "STR_INVALID_GROUP_DESCRIPTOR_ERROR"
 msgid "Could not create group: invalid object descriptor."
 msgstr "Methu creu grŵp: disgrifydd gwrthrych annilys."
 
-#: strings.hrc:68
+#: connectivity/inc/strings.hrc:68
 msgctxt "STR_INVALID_INDEX_DESCRIPTOR_ERROR"
 msgid "Could not create index: invalid object descriptor."
 msgstr "Methu creu mynegai: disgrifydd gwrthrych annilys."
 
-#: strings.hrc:69
+#: connectivity/inc/strings.hrc:69
 msgctxt "STR_INVALID_KEY_DESCRIPTOR_ERROR"
 msgid "Could not create key: invalid object descriptor."
 msgstr "Methu creu allwedd: disgrifydd gwrthrych annilys."
 
-#: strings.hrc:70
+#: connectivity/inc/strings.hrc:70
 msgctxt "STR_INVALID_TABLE_DESCRIPTOR_ERROR"
 msgid "Could not create table: invalid object descriptor."
 msgstr "Methu creu tabl: disgrifydd gwrthrych annilys."
 
-#: strings.hrc:71
+#: connectivity/inc/strings.hrc:71
 msgctxt "STR_INVALID_USER_DESCRIPTOR_ERROR"
 msgid "Could not create user: invalid object descriptor."
 msgstr "Methu creu defnyddiwr: disgrifydd gwrthrych annilys."
 
-#: strings.hrc:72
+#: connectivity/inc/strings.hrc:72
 msgctxt "STR_INVALID_VIEW_DESCRIPTOR_ERROR"
 msgid "Could not create view: invalid object descriptor."
 msgstr "Methu creu golwg: disgrifydd gwrthrych annilys."
 
-#: strings.hrc:73
+#: connectivity/inc/strings.hrc:73
 msgctxt "STR_VIEW_NO_COMMAND_ERROR"
 msgid "Could not create view: no command object."
 msgstr "Methu creu golwg: gwrthrych heb orchymyn."
 
-#: strings.hrc:74
+#: connectivity/inc/strings.hrc:74
 msgctxt "STR_NO_CONNECTION"
 msgid "The connection could not be created. May be the necessary data provider is not installed."
 msgstr "Nid oedd modd creu'r cysylltiad. Efallai nad yw'r darparwr data angenrheidiol wedi ei osod."
 
-#: strings.hrc:76
+#: connectivity/inc/strings.hrc:76
 msgctxt "STR_COULD_NOT_DELETE_INDEX"
 msgid "The index could not be deleted. An unknown error while accessing the file system occurred."
 msgstr "Nid oedd modd dileu'r mynegai. Digwyddodd gwall anhysbys wrth gael mynediad i'r ffeil system."
 
-#: strings.hrc:77
+#: connectivity/inc/strings.hrc:77
 msgctxt "STR_ONL_ONE_COLUMN_PER_INDEX"
 msgid "The index could not be created. Only one column per index is allowed."
 msgstr "Nid oedd modd creu'r mynegai. Dim ond caniatâd ar gyfer un golofn y mynegai."
 
-#: strings.hrc:78
+#: connectivity/inc/strings.hrc:78
 msgctxt "STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE"
 msgid "The index could not be created. The values are not unique."
 msgstr "Nid oedd modd creu mynegai. Nid yw'r gwerthoedd yn unigryw."
 
-#: strings.hrc:79
+#: connectivity/inc/strings.hrc:79
 msgctxt "STR_COULD_NOT_CREATE_INDEX"
 msgid "The index could not be created. An unknown error appeared."
 msgstr "Nid oedd modd creu mynegai. Digwyddodd gwall anhysbys."
 
-#: strings.hrc:80
+#: connectivity/inc/strings.hrc:80
 msgctxt "STR_COULD_NOT_CREATE_INDEX_NAME"
 msgid "The index could not be created. The file '$filename$' is used by an other index."
 msgstr "Nid oedd modd creu mynegai. Mae'r ffeil '$filename$' yn cael ei ddefnyddio gan fynegai arall."
 
-#: strings.hrc:81
+#: connectivity/inc/strings.hrc:81
 msgctxt "STR_COULD_NOT_CREATE_INDEX_KEYSIZE"
 msgid "The index could not be created. The size of the chosen column is too big."
 msgstr "Nid oedd modd creu'r mynegai. Mae maint y golofn hon yn rhy fawr."
 
-#: strings.hrc:82
+#: connectivity/inc/strings.hrc:82
 msgctxt "STR_SQL_NAME_ERROR"
 msgid "The name '$name$' doesn't match SQL naming constraints."
 msgstr "Nid yw'r enw '$name$' yn cytuno â chyfyngiadau enwi SQL."
 
-#: strings.hrc:83
+#: connectivity/inc/strings.hrc:83
 msgctxt "STR_COULD_NOT_DELETE_FILE"
 msgid "The file $filename$ could not be deleted."
 msgstr "Nid oes modd dileu'r ffeil $filename$."
 
-#: strings.hrc:84
+#: connectivity/inc/strings.hrc:84
 msgctxt "STR_INVALID_COLUMN_TYPE"
 msgid "Invalid column type for column '$columnname$'."
 msgstr "Math o golofn annilys ar gyfer colofn '$columnname$'."
 
-#: strings.hrc:85
+#: connectivity/inc/strings.hrc:85
 msgctxt "STR_INVALID_COLUMN_PRECISION"
 msgid "Invalid precision for column '$columnname$'."
 msgstr "Manylder annilys ar gyfer colofn '$columnname$'."
 
-#: strings.hrc:86
+#: connectivity/inc/strings.hrc:86
 msgctxt "STR_INVALID_PRECISION_SCALE"
 msgid "Precision is less than scale for column '$columnname$'."
 msgstr "Mae manylder yn llai na graddio ar gyfer colofn '$columnname$'."
 
-#: strings.hrc:87
+#: connectivity/inc/strings.hrc:87
 msgctxt "STR_INVALID_COLUMN_NAME_LENGTH"
 msgid "Invalid column name length for column '$columnname$'."
 msgstr "Hyd enw colofn annilys ar gyfer colofn '$columnname$'."
 
-#: strings.hrc:88
+#: connectivity/inc/strings.hrc:88
 msgctxt "STR_DUPLICATE_VALUE_IN_COLUMN"
 msgid "Duplicate value found in column '$columnname$'."
 msgstr "Gwerth dyblyg wedi ei ganfod yn '$columnname$'."
 
-#: strings.hrc:89
+#: connectivity/inc/strings.hrc:89
 msgctxt "STR_INVALID_COLUMN_DECIMAL_VALUE"
 msgid ""
 "The '$columnname$' column has been defined as a \"Decimal\" type, the max. length is $precision$ characters (with $scale$ decimal places).\n"
@@ -336,240 +336,230 @@ msgstr ""
 "\n"
 "Mae'r gwerth yma \"$value$ yn hirach na'r nifer o nodau sy'n cael eu caniatáu."
 
-#: strings.hrc:90
+#: connectivity/inc/strings.hrc:90
 msgctxt "STR_COLUMN_NOT_ALTERABLE"
 msgid "The column '$columnname$' could not be altered. May be the file system is write protected."
 msgstr "Nid oedd modd newid colofn '$columnname$'. Efallai fod y system ffeil wedi ei ddiogelu rhag ysgrifennu."
 
-#: strings.hrc:91
+#: connectivity/inc/strings.hrc:91
 msgctxt "STR_INVALID_COLUMN_VALUE"
 msgid "The column '$columnname$' could not be updated. The value is invalid for that column."
 msgstr "Nid oedd modd diweddaru colofn '$columnname$'. Mae'r gwerth yn annilys ar gyfer y golofn honno."
 
-#: strings.hrc:92
+#: connectivity/inc/strings.hrc:92
 msgctxt "STR_COLUMN_NOT_ADDABLE"
 msgid "The column '$columnname$' could not be added. May be the file system is write protected."
 msgstr "Nid oedd modd ychwanegu colofn '$columnname$'. Efallai fod y system ffeil wedi ei ddiogelu rhag ysgrifennu."
 
-#: strings.hrc:93
+#: connectivity/inc/strings.hrc:93
 msgctxt "STR_COLUMN_NOT_DROP"
 msgid "The column at position '$position$' could not be dropped. May be the file system is write protected."
 msgstr "Nid oedd modd gollwng colofn ar safle '$position$'. Efallai fod y system ffeil wedi ei ddiogelu rhag ysgrifennu."
 
-#: strings.hrc:94
+#: connectivity/inc/strings.hrc:94
 msgctxt "STR_TABLE_NOT_DROP"
 msgid "The table '$tablename$' could not be dropped. May be the file system is write protected."
 msgstr "Nid oedd modd gollwng tabl '$tablename$'. Efallai fod y system ffeil wedi ei ddiogelu rhag ysgrifennu."
 
-#: strings.hrc:95
+#: connectivity/inc/strings.hrc:95
 msgctxt "STR_COULD_NOT_ALTER_TABLE"
 msgid "The table could not be altered."
 msgstr "Nid oedd modd newid y tabl."
 
-#: strings.hrc:96
+#: connectivity/inc/strings.hrc:96
 msgctxt "STR_INVALID_DBASE_FILE"
 msgid "The file '$filename$' is an invalid (or unrecognized) dBase file."
 msgstr "Mae'r ffeil '$filename$' yn ffeil annilys dBase (neu anhysbys)."
 
 #. Evoab2
-#: strings.hrc:98
+#: connectivity/inc/strings.hrc:98
 msgctxt "STR_CANNOT_OPEN_BOOK"
 msgid "Cannot open Evolution address book."
 msgstr "Methu agor llyfr cyfeiriadau Evolution."
 
-#: strings.hrc:99
+#: connectivity/inc/strings.hrc:99
 msgctxt "STR_SORT_BY_COL_ONLY"
 msgid "Can only sort by table columns."
 msgstr "Didoli yn ôl colofnau tabl yn unig."
 
-#: strings.hrc:101
+#: connectivity/inc/strings.hrc:101
 msgctxt "STR_QUERY_COMPLEX_COUNT"
 msgid "The query can not be executed. It is too complex. Only \"COUNT(*)\" is supported."
 msgstr "Nid oes modd gweithredu'r ymholiad. Mae'n rhy gymhleth. Dim ond \"COUNT(*)\" sy'n cael ei gynnal."
 
-#: strings.hrc:102
+#: connectivity/inc/strings.hrc:102
 msgctxt "STR_QUERY_INVALID_BETWEEN"
 msgid "The query can not be executed. The 'BETWEEN' arguments are not correct."
 msgstr "Nid oes modd gweithredu'r ymholiad. Nid yw'r ymresymiad 'BETWEEN' yn gywir."
 
-#: strings.hrc:103
+#: connectivity/inc/strings.hrc:103
 msgctxt "STR_QUERY_FUNCTION_NOT_SUPPORTED"
 msgid "The query can not be executed. The function is not supported."
 msgstr "Nid oes modd gweithredu'r ymholiad. Nid yw'r swyddogaeth yn cael ei gynnal."
 
-#: strings.hrc:104
+#: connectivity/inc/strings.hrc:104
 msgctxt "STR_TABLE_READONLY"
 msgid "The table can not be changed. It is read only."
 msgstr "Nid oes modd newid y tabl. Darllen yn unig."
 
-#: strings.hrc:105
+#: connectivity/inc/strings.hrc:105
 msgctxt "STR_DELETE_ROW"
 msgid "The row could not be deleted. The option \"Display inactive records\" is set."
 msgstr "Nid oes modd dileu'r rhes. Mae'r dewis \"Dangos cofnodion anactif\" wedi ei osod."
 
-#: strings.hrc:106
+#: connectivity/inc/strings.hrc:106
 msgctxt "STR_ROW_ALREADY_DELETED"
 msgid "The row could not be deleted. It is already deleted."
 msgstr "Nid oedd modd dileu'r rhes. Mae wedi ei dileu'n barod."
 
-#: strings.hrc:107
+#: connectivity/inc/strings.hrc:107
 msgctxt "STR_QUERY_MORE_TABLES"
 msgid "The query can not be executed. It contains more than one table."
 msgstr "Nid oes modd gweithredu’r ymholiad. Mae'n cynnwys mwy nag un tabl."
 
-#: strings.hrc:108
+#: connectivity/inc/strings.hrc:108
 msgctxt "STR_QUERY_NO_TABLE"
 msgid "The query can not be executed. It contains no valid table."
 msgstr "Nid oes modd gweithredu'r ymholiad. Nid yw'n cynnwys tabl dilys."
 
-#: strings.hrc:109
+#: connectivity/inc/strings.hrc:109
 msgctxt "STR_QUERY_NO_COLUMN"
 msgid "The query can not be executed. It contains no valid columns."
 msgstr "Nid oes modd gweithredu'r ymholiad. Nid yw'n cynnwys colofnau dilys."
 
-#: strings.hrc:110
+#: connectivity/inc/strings.hrc:110
 msgctxt "STR_INVALID_PARA_COUNT"
 msgid "The count of the given parameter values doesn't match the parameters."
 msgstr "Nid yw cyfrif y paramedr penodol yn cydweddu â'r paramedrau."
 
-#: strings.hrc:111
+#: connectivity/inc/strings.hrc:111
 msgctxt "STR_NO_VALID_FILE_URL"
 msgid "The URL '$URL$' is not valid. A connection can not be created."
 msgstr "Nid yw'r URL '$URL$' yn ddilys. Nid oes modd creu cysylltiad."
 
-#: strings.hrc:112
+#: connectivity/inc/strings.hrc:112
 msgctxt "STR_NO_CLASSNAME"
 msgid "The driver class '$classname$' could not be loaded."
 msgstr "Nid oedd modd llwytho dosbarth gyrrwr '$classname$'."
 
-#: strings.hrc:113
+#: connectivity/inc/strings.hrc:113
 msgctxt "STR_NO_JAVA"
 msgid "No Java installation could be found. Please check your installation."
 msgstr "Nid oedd modd canfod gosodiad Java. Gwiriwch eich gosodiad."
 
-#: strings.hrc:114
+#: connectivity/inc/strings.hrc:114
 msgctxt "STR_NO_RESULTSET"
 msgid "The execution of the query doesn't return a valid result set."
 msgstr "Nid yw gweithredu'r ymholiad yn dychwelyd set canlyniad dilys."
 
-#: strings.hrc:115
+#: connectivity/inc/strings.hrc:115
 msgctxt "STR_NO_ROWCOUNT"
 msgid "The execution of the update statement doesn't effect any rows."
 msgstr "Nid yw gweithredu'r datganiad diweddaru'n effeithio ar resi."
 
-#: strings.hrc:116
+#: connectivity/inc/strings.hrc:116
 msgctxt "STR_NO_CLASSNAME_PATH"
 msgid "The additional driver class path is '$classpath$'."
 msgstr "'$classpath$' yw llwybr y dosbarth gyrrwr ychwanegol."
 
-#: strings.hrc:117
+#: connectivity/inc/strings.hrc:117
 msgctxt "STR_UNKNOWN_PARA_TYPE"
 msgid "The type of parameter at position '$position$' is unknown."
 msgstr "Mae'r math o baramedr ar safle '$position$' yn anhysbys."
 
-#: strings.hrc:118
+#: connectivity/inc/strings.hrc:118
 msgctxt "STR_UNKNOWN_COLUMN_TYPE"
 msgid "The type of column at position '$position$' is unknown."
 msgstr "Mae'r math o golofn ar safle '$position$' yn anhysbys."
 
 #. KAB
-#: strings.hrc:120
-msgctxt "STR_NO_KDE_INST"
-msgid "No suitable KDE installation was found."
-msgstr "Nid oes gosodiad KDE addas ar gael."
-
-#: strings.hrc:121
-msgctxt "STR_KDE_VERSION_TOO_OLD"
-msgid "KDE version $major$.$minor$ or higher is required to access the KDE Address Book."
-msgstr "Mae angen fersiwn KDE $major$.$minor$ neu uwch ar gyfer mynediad at Lyfr Cyfeiriad KDE."
-
-#: strings.hrc:122
+#: connectivity/inc/strings.hrc:120
 msgctxt "STR_PARA_ONLY_PREPARED"
 msgid "Parameters can appear only in prepared statements."
 msgstr "Gall paramedrau ymddangos mewn datganiadau parod yn unig."
 
-#: strings.hrc:124
+#: connectivity/inc/strings.hrc:122
 msgctxt "STR_NO_TABLE"
 msgid "No such table!"
 msgstr "Dim tabl o'r fath!"
 
-#: strings.hrc:125
+#: connectivity/inc/strings.hrc:123
 msgctxt "STR_NO_MAC_OS_FOUND"
 msgid "No suitable Mac OS installation was found."
 msgstr "Heb ganfod gosodiad Mac OS addas."
 
 #. hsqldb
-#: strings.hrc:127
+#: connectivity/inc/strings.hrc:125
 msgctxt "STR_NO_STORAGE"
 msgid "The connection can not be established. No storage or URL was given."
 msgstr "Nid oedd modd creu'r cysylltiad. Ni roddwyd storfa na URL."
 
-#: strings.hrc:128
+#: connectivity/inc/strings.hrc:126
 msgctxt "STR_INVALID_FILE_URL"
 msgid "The given URL contains no valid local file system path. Please check the location of your database file."
 msgstr "Nid yw'r URL yma'n cynnwys llwybr system ffeil lleol. Gwiriwch leoliad eich ffeil cronfa ddata."
 
-#: strings.hrc:129
+#: connectivity/inc/strings.hrc:127
 msgctxt "STR_NO_TABLE_CONTAINER"
 msgid "An error occurred while obtaining the connection's table container."
 msgstr "Ddigwyddodd gwall wrth dderbyn cynhwysydd tabl y cysylltiad."
 
-#: strings.hrc:130
+#: connectivity/inc/strings.hrc:128
 msgctxt "STR_NO_TABLENAME"
 msgid "There is no table named '$tablename$'."
 msgstr "Nid oes tabl o'r enw '$tablename$'."
 
-#: strings.hrc:131
+#: connectivity/inc/strings.hrc:129
 msgctxt "STR_NO_DOCUMENTUI"
 msgid "The provided DocumentUI is not allowed to be NULL."
 msgstr "Nid oes caniatâd i'r DocumentUI fod yn NULL."
 
-#: strings.hrc:132
+#: connectivity/inc/strings.hrc:130
 msgctxt "STR_ERROR_NEW_VERSION"
 msgid "The connection could not be established. The database was created by a newer version of %PRODUCTNAME."
 msgstr "Nid oedd modd sefydlu cysylltiad. Crëwyd y gronfa ddata gan fersiwn mwy diweddar o %PRODUCTNAME."
 
-#: strings.hrc:134
+#: connectivity/inc/strings.hrc:132
 msgctxt "STR_ROW_SET_OPERATION_VETOED"
 msgid "The record operation has been vetoed."
 msgstr "Mae'r weithred recordio wedi ei hatal."
 
-#: strings.hrc:135
+#: connectivity/inc/strings.hrc:133
 msgctxt "STR_PARSER_CYCLIC_SUB_QUERIES"
 msgid "The statement contains a cyclic reference to one or more sub queries."
 msgstr "Mae'r gosodiad yn cynnwys cyfeirnod cylchol i un neu fwy o is ymholiadau."
 
-#: strings.hrc:136
+#: connectivity/inc/strings.hrc:134
 msgctxt "STR_DB_OBJECT_NAME_WITH_SLASHES"
 msgid "The name must not contain any slashes ('/')."
 msgstr "Rhaid i'r enw beidio cynnwys slaes ('/')."
 
-#: strings.hrc:137
+#: connectivity/inc/strings.hrc:135
 msgctxt "STR_DB_INVALID_SQL_NAME"
 msgid "$1$ is no SQL conform identifier."
 msgstr "Nid yw $1$ yn ddynodydd cydymffurfio SQL."
 
-#: strings.hrc:138
+#: connectivity/inc/strings.hrc:136
 msgctxt "STR_DB_QUERY_NAME_WITH_QUOTES"
 msgid "Query names must not contain quote characters."
 msgstr "Ni ddylai enw ymholiad gynnwys dyfynodau."
 
-#: strings.hrc:139
+#: connectivity/inc/strings.hrc:137
 msgctxt "STR_DB_OBJECT_NAME_IS_USED"
 msgid "The name '$1$' is already in use in the database."
 msgstr "Mae'r enw '$1$' eisoes yn cael ei ddefnyddio yn y gronfa ddata."
 
-#: strings.hrc:140
+#: connectivity/inc/strings.hrc:138
 msgctxt "STR_DB_NOT_CONNECTED"
 msgid "No connection to the database exists."
 msgstr "Does dim cysylltiad i'r gronfa ddata'n bodoli."
 
-#: strings.hrc:141
+#: connectivity/inc/strings.hrc:139
 msgctxt "STR_AB_ADDRESSBOOK_NOT_FOUND"
 msgid "No $1$ exists."
 msgstr "Dim $1$ yn bodoli."
 
-#: strings.hrc:142
+#: connectivity/inc/strings.hrc:140
 msgctxt "STR_DATA_CANNOT_SELECT_UNFILTERED"
 msgid "Unable to display the complete table content. Please apply a filter."
 msgstr "Methu dangos cynnwys y tabl llawn. Mae angen gosod hidl."
diff --git a/source/cy/connectivity/registry/mork/org/openoffice/Office/DataAccess.po b/source/cy/connectivity/registry/mork/org/openoffice/Office/DataAccess.po
index 635878eaebc..21b80a749ac 100644
--- a/source/cy/connectivity/registry/mork/org/openoffice/Office/DataAccess.po
+++ b/source/cy/connectivity/registry/mork/org/openoffice/Office/DataAccess.po
@@ -3,17 +3,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2013-11-20 13:01+0100\n"
-"PO-Revision-Date: 2011-04-12 20:54+0200\n"
-"Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
+"POT-Creation-Date: 2018-04-23 18:10+0200\n"
+"PO-Revision-Date: 2013-05-24 07:06+0000\n"
+"Last-Translator: Aled Powell <aled@aledpowell.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1369379172.000000\n"
 
 #: Drivers.xcu
 msgctxt ""
@@ -21,5 +22,5 @@ msgctxt ""
 ".Drivers.Installed.sdbc:address:thunderbird:\n"
 "DriverTypeDisplayName\n"
 "value.text"
-msgid "Thunderbird/Icedove Address Book"
-msgstr "Llyfr Cyfeiriadau Thunderbird/Icedove"
+msgid "Thunderbird Address Book"
+msgstr ""
diff --git a/source/cy/cui/messages.po b/source/cy/cui/messages.po
index 47c99573f53..bb6adf616ab 100644
--- a/source/cy/cui/messages.po
+++ b/source/cy/cui/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: 2017-12-20 08:16+0100\n"
-"PO-Revision-Date: 2017-12-29 14:57+0000\n"
+"POT-Creation-Date: 2018-04-23 18:10+0200\n"
+"PO-Revision-Date: 2018-04-18 08:32+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,189 +13,189 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1514559421.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1524040340.000000\n"
 
-#: personalization.hrc:31
+#: cui/inc/personalization.hrc:31
 msgctxt "RID_SVXSTR_PERSONA_CATEGORIES"
 msgid "LibreOffice"
 msgstr "LibreOffice"
 
-#: personalization.hrc:32
+#: cui/inc/personalization.hrc:32
 msgctxt "RID_SVXSTR_PERSONA_CATEGORIES"
 msgid "Abstract"
 msgstr "Crynodeb"
 
-#: personalization.hrc:33
+#: cui/inc/personalization.hrc:33
 msgctxt "RID_SVXSTR_PERSONA_CATEGORIES"
 msgid "Color"
 msgstr "Lliw"
 
-#: personalization.hrc:34
+#: cui/inc/personalization.hrc:34
 msgctxt "RID_SVXSTR_PERSONA_CATEGORIES"
 msgid "Music"
 msgstr "Cerddoriaeth"
 
-#: personalization.hrc:35
+#: cui/inc/personalization.hrc:35
 msgctxt "RID_SVXSTR_PERSONA_CATEGORIES"
 msgid "Nature"
 msgstr "Natur"
 
-#: personalization.hrc:36
+#: cui/inc/personalization.hrc:36
 msgctxt "RID_SVXSTR_PERSONA_CATEGORIES"
 msgid "Solid"
 msgstr "Solet"
 
-#: strings.hrc:24
+#: cui/inc/strings.hrc:24
 msgctxt "RID_SVXSTR_KEY_CONFIG_DIR"
 msgid "Configuration"
 msgstr "Ffurfweddiad"
 
-#: strings.hrc:25
+#: cui/inc/strings.hrc:25
 msgctxt "RID_SVXSTR_KEY_WORK_PATH"
 msgid "My Documents"
 msgstr "Dogfennau Personol"
 
-#: strings.hrc:26
+#: cui/inc/strings.hrc:26
 msgctxt "RID_SVXSTR_KEY_GRAPHICS_PATH"
 msgid "Images"
 msgstr "Delweddau"
 
-#: strings.hrc:27
+#: cui/inc/strings.hrc:27
 msgctxt "RID_SVXSTR_KEY_BITMAP_PATH"
 msgid "Icons"
 msgstr "Eiconau"
 
-#: strings.hrc:28
+#: cui/inc/strings.hrc:28
 msgctxt "RID_SVXSTR_KEY_PALETTE_PATH"
 msgid "Palettes"
 msgstr "Paletau"
 
-#: strings.hrc:29
+#: cui/inc/strings.hrc:29
 msgctxt "RID_SVXSTR_KEY_BACKUP_PATH"
 msgid "Backups"
 msgstr "Wrth gefn"
 
-#: strings.hrc:30
+#: cui/inc/strings.hrc:30
 msgctxt "RID_SVXSTR_KEY_MODULES_PATH"
 msgid "Modules"
 msgstr "Modiwlau"
 
-#: strings.hrc:31
+#: cui/inc/strings.hrc:31
 msgctxt "RID_SVXSTR_KEY_TEMPLATE_PATH"
 msgid "Templates"
 msgstr "Templedi"
 
-#: strings.hrc:32
+#: cui/inc/strings.hrc:32
 msgctxt "RID_SVXSTR_KEY_GLOSSARY_PATH"
 msgid "AutoText"
 msgstr "AwtoDestun"
 
-#: strings.hrc:33
+#: cui/inc/strings.hrc:33
 msgctxt "RID_SVXSTR_KEY_DICTIONARY_PATH"
 msgid "Dictionaries"
 msgstr "Geiriaduron"
 
-#: strings.hrc:34
+#: cui/inc/strings.hrc:34
 msgctxt "RID_SVXSTR_KEY_HELP_DIR"
 msgid "Help"
 msgstr "Cymorth"
 
-#: strings.hrc:35
+#: cui/inc/strings.hrc:35
 msgctxt "RID_SVXSTR_KEY_GALLERY_DIR"
 msgid "Gallery"
 msgstr "Oriel"
 
-#: strings.hrc:36
+#: cui/inc/strings.hrc:36
 msgctxt "RID_SVXSTR_KEY_STORAGE_DIR"
 msgid "Message Storage"
 msgstr "Storfa Cof"
 
-#: strings.hrc:37
+#: cui/inc/strings.hrc:37
 msgctxt "RID_SVXSTR_KEY_TEMP_PATH"
 msgid "Temporary files"
 msgstr "Ffeiliau dros dro"
 
-#: strings.hrc:38
+#: cui/inc/strings.hrc:38
 msgctxt "RID_SVXSTR_KEY_PLUGINS_PATH"
 msgid "Plug-ins"
 msgstr "Ategynnau"
 
-#: strings.hrc:39
+#: cui/inc/strings.hrc:39
 msgctxt "RID_SVXSTR_KEY_FAVORITES_DIR"
 msgid "Folder Bookmarks"
 msgstr "Nod Tudalen Ffolderi"
 
-#: strings.hrc:40
+#: cui/inc/strings.hrc:40
 msgctxt "RID_SVXSTR_KEY_FILTER_PATH"
 msgid "Filters"
 msgstr "Hidlau"
 
-#: strings.hrc:41
+#: cui/inc/strings.hrc:41
 msgctxt "RID_SVXSTR_KEY_ADDINS_PATH"
 msgid "Add-ins"
 msgstr "Ychwanegiadau"
 
-#: strings.hrc:42
+#: cui/inc/strings.hrc:42
 msgctxt "RID_SVXSTR_KEY_USERCONFIG_PATH"
 msgid "User Configuration"
 msgstr "Ffurfweddiad Defnyddiwr"
 
-#: strings.hrc:43
+#: cui/inc/strings.hrc:43
 msgctxt "RID_SVXSTR_KEY_USERDICTIONARY_DIR"
 msgid "User-defined dictionaries"
 msgstr "Geiriaduron defnyddiwr diffiniedig"
 
-#: strings.hrc:44
+#: cui/inc/strings.hrc:44
 msgctxt "RID_SVXSTR_KEY_CLASSIFICATION_PATH"
 msgid "Classification"
 msgstr "Dosbarthiad"
 
-#: strings.hrc:45
+#: cui/inc/strings.hrc:45
 msgctxt "RID_SVXSTR_KEY_AUTOCORRECT_DIR"
 msgid "AutoCorrect"
 msgstr "AwtoGywiro"
 
-#: strings.hrc:46
+#: cui/inc/strings.hrc:46
 msgctxt "RID_SVXSTR_KEY_LINGUISTIC_DIR"
 msgid "Writing aids"
 msgstr "Cymhorthion ysgrifnnu"
 
 #. %n will be replaced at runtime by a number starting with 1 and increasing as necessary
-#: strings.hrc:48
+#: cui/inc/strings.hrc:48
 #, c-format
 msgctxt "RID_SVXSTR_NEW_MENU"
 msgid "New Menu %n"
 msgstr "Dewislen Newydd %n"
 
 #. %n will be replaced at runtime by a number starting with 1 and increasing as necessary
-#: strings.hrc:50
+#: cui/inc/strings.hrc:50
 #, c-format
 msgctxt "RID_SVXSTR_NEW_TOOLBAR"
 msgid "New Toolbar %n"
 msgstr "Bar Offer Newydd %n"
 
-#: strings.hrc:51
+#: cui/inc/strings.hrc:51
 msgctxt "RID_SVXSTR_MOVE_MENU"
 msgid "Move Menu"
 msgstr "Symud Dewislen"
 
-#: strings.hrc:52
+#: cui/inc/strings.hrc:52
 msgctxt "RID_SVXSTR_ADD_SUBMENU"
 msgid "Add Submenu"
 msgstr "Ychwanegu Is Ddewislen"
 
-#: strings.hrc:53
+#: cui/inc/strings.hrc:53
 msgctxt "RID_SVXSTR_SUBMENU_NAME"
 msgid "Submenu name"
 msgstr "Enw Is-ddewislen"
 
-#: strings.hrc:54
+#: cui/inc/strings.hrc:54
 msgctxt "RID_SVXSTR_DELETE_ICON_CONFIRM"
 msgid "Are you sure to delete the image?"
 msgstr "Ydych chi wir eisiau dileu'r ddelwedd?"
 
-#: strings.hrc:55
+#: cui/inc/strings.hrc:55
 msgctxt "RID_SVXSTR_REPLACE_ICON_WARNING"
 msgid ""
 "The icon %ICONNAME is already contained in the image list.\n"
@@ -204,17 +204,17 @@ msgstr ""
 "Mae'r eicon %ICONNAME eisoes wedi'i gynnwys yn y rhestr delwedd.\n"
 "Hoffech chi newid yr eicon presennol?"
 
-#: strings.hrc:56
+#: cui/inc/strings.hrc:56
 msgctxt "RID_SVXSTR_REPLACE_ICON_CONFIRM"
 msgid "Confirm Icon Replacement"
 msgstr "Cadarnhau Newid Eicon"
 
-#: strings.hrc:57
+#: cui/inc/strings.hrc:57
 msgctxt "RID_SVXSTR_YESTOALL"
 msgid "Yes to All"
 msgstr "Iawn i Bopeth"
 
-#: strings.hrc:58
+#: cui/inc/strings.hrc:58
 msgctxt "RID_SXVSTR_CONFIRM_DELETE_TOOLBAR"
 msgid "There are no more commands on the toolbar. Do you want to delete the toolbar?"
 msgstr "Nid oes rhagor o orchmynion ar y bar offer. Hoffech chi ddileu'r bar offer?"
@@ -222,799 +222,799 @@ msgstr "Nid oes rhagor o orchmynion ar y bar offer. Hoffech chi ddileu'r bar off
 #. Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
 #. and will be replaced at runtime by the name of the selected application
 #. or document.
-#: strings.hrc:63
+#: cui/inc/strings.hrc:63
 msgctxt "RID_SVXSTR_CONFIRM_MENU_RESET"
 msgid "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?"
 msgstr "Bydd ffurfweddiad y ddewislen ar gyfer %SAVE IN SELECTION% yn cael ei ail-osod y gosodiadau ffatri. Ydych chi am barhau?"
 
-#: strings.hrc:64
+#: cui/inc/strings.hrc:64
 msgctxt "RID_SVXSTR_CONFIRM_TOOLBAR_RESET"
 msgid "The toolbar configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?"
 msgstr "Bydd ffurfweddiad y bar offer ar gyfer %SAVE IN SELECTION% yn cael ei ail-osod y gosodiadau ffatri. Ydych chi am barhau?"
 
-#: strings.hrc:65
+#: cui/inc/strings.hrc:65
 msgctxt "RID_SVXSTR_CONFIRM_RESTORE_DEFAULT"
 msgid "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?"
 msgstr "Bydd hyn yn dileu pob newid wnaed i'r bar offer. Ydych chi am ailosod y bar offer?"
 
-#: strings.hrc:66
+#: cui/inc/strings.hrc:66
 msgctxt "RID_SVXSTR_CONFIRM_RESTORE_DEFAULT_MENU"
 msgid "This will delete all changes previously made to this context menu. Do you really want to reset?"
 msgstr "Bydd hyn yn dileu pob newid wnaed i'r ddewislen cyd-destun. Ydych chi am ei ailosod?"
 
-#: strings.hrc:67
+#: cui/inc/strings.hrc:67
 msgctxt "RID_SVXSTR_MNUCFG_ALREADY_INCLUDED"
 msgid "Function is already included in this popup."
 msgstr "Mae swyddogaeth wedi ei gynnwys yn y llamlen yn barod."
 
-#: strings.hrc:68
+#: cui/inc/strings.hrc:68
 msgctxt "RID_SVXSTR_LABEL_NEW_NAME"
 msgid "~New name"
 msgstr "~Enw newydd"
 
-#: strings.hrc:69
+#: cui/inc/strings.hrc:69
 msgctxt "RID_SVXSTR_RENAME_MENU"
 msgid "Rename Menu"
 msgstr "Ailenwi Dewislen"
 
-#: strings.hrc:70
+#: cui/inc/strings.hrc:70
 msgctxt "RID_SVXSTR_RENAME_TOOLBAR"
 msgid "Rename Toolbar"
 msgstr "Alenwi Bar Offer"
 
-#: strings.hrc:72
+#: cui/inc/strings.hrc:72
 msgctxt "RID_SVXSTR_HYPDLG_CLOSEBUT"
 msgid "Close"
 msgstr "Cau"
 
-#: strings.hrc:73
+#: cui/inc/strings.hrc:73
 msgctxt "RID_SVXSTR_HYPDLG_MACROACT1"
 msgid "Mouse over object"
 msgstr "Llygoden dros wrthrych"
 
-#: strings.hrc:74
+#: cui/inc/strings.hrc:74
 msgctxt "RID_SVXSTR_HYPDLG_MACROACT2"
 msgid "Trigger hyperlink"
 msgstr "Cychwyn dolen"
 
-#: strings.hrc:75
+#: cui/inc/strings.hrc:75
 msgctxt "RID_SVXSTR_HYPDLG_MACROACT3"
 msgid "Mouse leaves object"
 msgstr "Llygoden yn gadael gwrthrych"
 
-#: strings.hrc:76
+#: cui/inc/strings.hrc:76
 msgctxt "RID_SVXSTR_HYPDLG_NOVALIDFILENAME"
 msgid "Please type in a valid file name."
 msgstr "Rhowch enw ffeil ddilys."
 
-#: strings.hrc:77
+#: cui/inc/strings.hrc:77
 msgctxt "RID_SVXSTR_HYPERDLG_HLINETTP"
 msgid "Internet"
 msgstr "Rhyngrwyd"
 
-#: strings.hrc:78
+#: cui/inc/strings.hrc:78
 msgctxt "RID_SVXSTR_HYPERDLG_HLINETTP_HELP"
 msgid "This is where you create a hyperlink to a Web page or FTP server connection."
 msgstr "Dyma lle rydych yn creu cyswllt i dudalen Gwe neu gysylltiad gweinydd FTP."
 
-#: strings.hrc:79
+#: cui/inc/strings.hrc:79
 msgctxt "RID_SVXSTR_HYPERDLG_HLMAILTP"
 msgid "Mail"
 msgstr "E-bost"
 
-#: strings.hrc:80
+#: cui/inc/strings.hrc:80
 msgctxt "RID_SVXSTR_HYPERDLG_HLMAILTP_HELP"
 msgid "This is where you create a hyperlink to an e-mail address."
 msgstr "Dyma lle rydych yn creu hypergyswllt i gyfeiriad e-bost."
 
-#: strings.hrc:81
+#: cui/inc/strings.hrc:81
 msgctxt "RID_SVXSTR_HYPERDLG_HLDOCTP"
 msgid "Document"
 msgstr "Dogfen"
 
-#: strings.hrc:82
+#: cui/inc/strings.hrc:82
 msgctxt "RID_SVXSTR_HYPERDLG_HLDOCTP_HELP"
 msgid "This is where you create a hyperlink to an existing document or a target within a document."
 msgstr "Dyma lle rydych yn creu cyswllt â dogfen benodol neu darged o fewn dogfen."
 
-#: strings.hrc:83
+#: cui/inc/strings.hrc:83
 msgctxt "RID_SVXSTR_HYPERDLG_HLDOCNTP"
 msgid "New Document"
 msgstr "Dogfen Newydd"
 
-#: strings.hrc:84
+#: cui/inc/strings.hrc:84
 msgctxt "RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP"
 msgid "This is where you create a new document to which the new link points."
 msgstr "Dyma lle rydych yn creu dogfen newydd i'r hyn mae'r cysylltiad newydd yn cyfeirio."
 
-#: strings.hrc:85
+#: cui/inc/strings.hrc:85
 msgctxt "RID_SVXSTR_HYPERDLG_FORM_BUTTON"
 msgid "Button"
 msgstr "Botwm"
 
-#: strings.hrc:86
+#: cui/inc/strings.hrc:86
 msgctxt "RID_SVXSTR_HYPERDLG_FROM_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:87
+#: cui/inc/strings.hrc:87
 msgctxt "RID_SVXSTR_HYPERDLG_QUERYOVERWRITE"
 msgid "The file already exists. Overwrite?"
 msgstr "Mae'r ffeil yn bodoli eisoes. Trosysgrifo?"
 
-#: strings.hrc:89
+#: cui/inc/strings.hrc:89
 msgctxt "RID_SVXSTR_ERR_TEXTNOTFOUND"
 msgid "No alternatives found."
 msgstr "Heb ganfod eraill."
 
-#: strings.hrc:90
+#: cui/inc/strings.hrc:90
 msgctxt "RID_SVXSTR_SELECT_FILE_IFRAME"
 msgid "Select File for Floating Frame"
 msgstr "Dewiswch ffeil ar gyfer Ffrâm Arnofio"
 
-#: strings.hrc:91
+#: cui/inc/strings.hrc:91
 msgctxt "RID_SVXSTR_ALLFUNCTIONS"
 msgid "All commands"
 msgstr "Pob Gorchmyn"
 
-#: strings.hrc:92
+#: cui/inc/strings.hrc:92
 msgctxt "RID_SVXSTR_MACROS"
 msgid "Macros"
 msgstr "Macros"
 
-#: strings.hrc:93
+#: cui/inc/strings.hrc:93
 msgctxt "RID_SVXSTR_MYMACROS"
 msgid "My Macros"
 msgstr "Golygu Macro"
 
-#: strings.hrc:94
+#: cui/inc/strings.hrc:94
 msgctxt "RID_SVXSTR_PRODMACROS"
 msgid "%PRODUCTNAME Macros"
 msgstr "Macros %PRODUCTNAME"
 
-#: strings.hrc:95
+#: cui/inc/strings.hrc:95
 msgctxt "RID_SVXSTR_NOMACRODESC"
 msgid "There is no description available for this macro."
 msgstr "Nid oes disgrifiad ar gael ar gyfer y macro hwn."
 
-#: strings.hrc:96
+#: cui/inc/strings.hrc:96
 msgctxt "RID_SVXSTR_SELECTOR_ADD_COMMANDS"
 msgid "Add Commands"
 msgstr "Ychwanegu Gorchmynion"
 
-#: strings.hrc:97
+#: cui/inc/strings.hrc:97
 msgctxt "RID_SVXSTR_SELECTOR_RUN"
 msgid "Run"
 msgstr "Rhedeg"
 
-#: strings.hrc:98
+#: cui/inc/strings.hrc:98
 msgctxt "RID_SVXSTR_ROW"
 msgid "Insert Rows"
 msgstr "Mewnosod Rhesi"
 
-#: strings.hrc:99
+#: cui/inc/strings.hrc:99
 msgctxt "RID_SVXSTR_REMOVE_FAVORITES"
 msgid "Remove from Favorites"
 msgstr "Tynnu o'r Ffefrynnau"
 
-#: strings.hrc:100
+#: cui/inc/strings.hrc:100
 msgctxt "RID_SVXSTR_ADD_FAVORITES"
 msgid "Add to Favorites"
 msgstr "Ychwanegu i'r Ffefrynnau"
 
 #. PPI is pixel per inch, %1 is a number
-#: strings.hrc:102
+#: cui/inc/strings.hrc:102
 msgctxt "RID_SVXSTR_PPI"
 msgid "(%1 PPI)"
 msgstr "(%1 PPI)"
 
-#: strings.hrc:103
+#: cui/inc/strings.hrc:103
 msgctxt "RID_SVXSTR_COL"
 msgid "Insert Columns"
 msgstr "Mewnosod Colofnau"
 
-#: strings.hrc:104
+#: cui/inc/strings.hrc:104
 msgctxt "RID_SVXSTR_AUTO_ENTRY"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: strings.hrc:105
+#: cui/inc/strings.hrc:105
 msgctxt "RID_SVXSTR_EDIT_GRAPHIC"
 msgid "Link"
 msgstr "Cysylltiad"
 
-#: strings.hrc:106
+#: cui/inc/strings.hrc:106
 msgctxt "RID_SVXSTR_LOADACCELCONFIG"
 msgid "Load Keyboard Configuration"
 msgstr "Llwytho Ffurfweddiad Bysellfwrdd"
 
-#: strings.hrc:107
+#: cui/inc/strings.hrc:107
 msgctxt "RID_SVXSTR_SAVEACCELCONFIG"
 msgid "Save Keyboard Configuration"
 msgstr "Cadw Ffurfweddiad Bysellfwrdd"
 
-#: strings.hrc:108
+#: cui/inc/strings.hrc:108
 msgctxt "RID_SVXSTR_FILTERNAME_CFG"
 msgid "Configuration (*.cfg)"
 msgstr "Ffurfweddu (*.cfg)"
 
-#: strings.hrc:109
+#: cui/inc/strings.hrc:109
 msgctxt "RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES"
 msgid "Targets do not exist in the document."
 msgstr "Nid yw targedau'n bodoli yn y ddogfen."
 
-#: strings.hrc:110
+#: cui/inc/strings.hrc:110
 msgctxt "RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN"
 msgid "Couldn't open the document."
 msgstr "Methu agor y ddogfen."
 
-#: strings.hrc:111
+#: cui/inc/strings.hrc:111
 msgctxt "RID_SVXSTR_EDITHINT"
 msgid "[Enter text here]"
 msgstr "[Rhowch destun yma]"
 
-#: strings.hrc:112
+#: cui/inc/strings.hrc:112
 msgctxt "RID_SVXSTR_HANGUL"
 msgid "Hangul"
 msgstr "Hangul"
 
-#: strings.hrc:113
+#: cui/inc/strings.hrc:113
 msgctxt "RID_SVXSTR_HANJA"
 msgid "Hanja"
 msgstr "Hanja"
 
-#: strings.hrc:114
+#: cui/inc/strings.hrc:114
 msgctxt "RID_SVXSTR_BASICMACROS"
 msgid "BASIC Macros"
 msgstr "Macros BASIC"
 
-#: strings.hrc:115
+#: cui/inc/strings.hrc:115
 msgctxt "RID_SVXSTR_GROUP_STYLES"
 msgid "Styles"
 msgstr "Arddulliau"
 
-#: strings.hrc:117
+#: cui/inc/strings.hrc:117
 msgctxt "RID_SVXSTR_EVENT_STARTAPP"
 msgid "Start Application"
 msgstr "Cychwyn Rhaglen"
 
-#: strings.hrc:118
+#: cui/inc/strings.hrc:118
 msgctxt "RID_SVXSTR_EVENT_CLOSEAPP"
 msgid "Close Application"
 msgstr "Cau Rhaglen"
 
-#: strings.hrc:119
+#: cui/inc/strings.hrc:119
 msgctxt "RID_SVXSTR_EVENT_NEWDOC"
 msgid "New Document"
 msgstr "Dogfen Newydd"
 
-#: strings.hrc:120
+#: cui/inc/strings.hrc:120
 msgctxt "RID_SVXSTR_EVENT_CLOSEDOC"
 msgid "Document closed"
 msgstr "Dogfen wedi ei chau"
 
-#: strings.hrc:121
+#: cui/inc/strings.hrc:121
 msgctxt "RID_SVXSTR_EVENT_PREPARECLOSEDOC"
 msgid "Document is going to be closed"
 msgstr "Bydd y ddogfen yn cael ei chau"
 
-#: strings.hrc:122
+#: cui/inc/strings.hrc:122
 msgctxt "RID_SVXSTR_EVENT_OPENDOC"
 msgid "Open Document"
 msgstr "Agor Dogfen"
 
-#: strings.hrc:123
+#: cui/inc/strings.hrc:123
 msgctxt "RID_SVXSTR_EVENT_SAVEDOC"
 msgid "Save Document"
 msgstr "Cadw Dogfen"
 
-#: strings.hrc:124
+#: cui/inc/strings.hrc:124
 msgctxt "RID_SVXSTR_EVENT_SAVEASDOC"
 msgid "Save Document As"
 msgstr "Cadw Dogfen Fel"
 
-#: strings.hrc:125
+#: cui/inc/strings.hrc:125
 msgctxt "RID_SVXSTR_EVENT_SAVEDOCDONE"
 msgid "Document has been saved"
 msgstr "Mae'r ddogfen wedi ei chadw"
 
-#: strings.hrc:126
+#: cui/inc/strings.hrc:126
 msgctxt "RID_SVXSTR_EVENT_SAVEASDOCDONE"
 msgid "Document has been saved as"
 msgstr "Mae'r ddogfen wedi ei chadw fel"
 
-#: strings.hrc:127
+#: cui/inc/strings.hrc:127
 msgctxt "RID_SVXSTR_EVENT_ACTIVATEDOC"
 msgid "Activate Document"
 msgstr "Cychwyn Dogfen"
 
-#: strings.hrc:128
+#: cui/inc/strings.hrc:128
 msgctxt "RID_SVXSTR_EVENT_DEACTIVATEDOC"
 msgid "Deactivate Document"
 msgstr "Dadysgogi Dogfen"
 
-#: strings.hrc:129
+#: cui/inc/strings.hrc:129
 msgctxt "RID_SVXSTR_EVENT_PRINTDOC"
 msgid "Print Document"
 msgstr "Argraffu Dogfen"
 
-#: strings.hrc:130
+#: cui/inc/strings.hrc:130
 msgctxt "RID_SVXSTR_EVENT_MODIFYCHANGED"
 msgid "'Modified' status was changed"
 msgstr "Statws 'Newidiwyd' wedi newid"
 
-#: strings.hrc:131
+#: cui/inc/strings.hrc:131
 msgctxt "RID_SVXSTR_EVENT_MAILMERGE"
 msgid "Printing of form letters started"
 msgstr "Mae argraffu llythyron ffurf wedi cychwyn"
 
-#: strings.hrc:132
+#: cui/inc/strings.hrc:132
 msgctxt "RID_SVXSTR_EVENT_MAILMERGE_END"
 msgid "Printing of form letters finished"
 msgstr "Mae argraffu llythyron ffurf wedi i gwblhau"
 
-#: strings.hrc:133
+#: cui/inc/strings.hrc:133
 msgctxt "RID_SVXSTR_EVENT_FIELDMERGE"
 msgid "Merging of form fields started"
 msgstr "Mae cyfuno llythyron ffurf wedi cychwyn"
 
-#: strings.hrc:134
+#: cui/inc/strings.hrc:134
 msgctxt "RID_SVXSTR_EVENT_FIELDMERGE_FINISHED"
 msgid "Merging of form fields finished"
 msgstr "Mae cyfuno llythyron ffurf wedi ei gwblhau"
 
-#: strings.hrc:135
+#: cui/inc/strings.hrc:135
 msgctxt "RID_SVXSTR_EVENT_PAGECOUNTCHANGE"
 msgid "Changing the page count"
 msgstr "Newid y cyfrif tudalen"
 
-#: strings.hrc:136
+#: cui/inc/strings.hrc:136
 msgctxt "RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED"
 msgid "Loaded a sub component"
 msgstr "Wedi llwytho is gydran"
 
-#: strings.hrc:137
+#: cui/inc/strings.hrc:137
 msgctxt "RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED"
 msgid "Closed a sub component"
 msgstr "Wedi cau is gydran"
 
-#: strings.hrc:138
+#: cui/inc/strings.hrc:138
 msgctxt "RID_SVXSTR_EVENT_APPROVEPARAMETER"
 msgid "Fill parameters"
 msgstr "Paramedrau llanw"
 
-#: strings.hrc:139
+#: cui/inc/strings.hrc:139
 msgctxt "RID_SVXSTR_EVENT_ACTIONPERFORMED"
 msgid "Execute action"
 msgstr "Wrth gychwyn"
 
-#: strings.hrc:140
+#: cui/inc/strings.hrc:140
 msgctxt "RID_SVXSTR_EVENT_AFTERUPDATE"
 msgid "After updating"
 msgstr "Wedi diweddaru"
 
-#: strings.hrc:141
+#: cui/inc/strings.hrc:141
 msgctxt "RID_SVXSTR_EVENT_BEFOREUPDATE"
 msgid "Before updating"
 msgstr "Cyn diweddaru"
 
-#: strings.hrc:142
+#: cui/inc/strings.hrc:142
 msgctxt "RID_SVXSTR_EVENT_APPROVEROWCHANGE"
 msgid "Before record action"
 msgstr "Cyn gweithred cofnodi"
 
-#: strings.hrc:143
+#: cui/inc/strings.hrc:143
 msgctxt "RID_SVXSTR_EVENT_ROWCHANGE"
 msgid "After record action"
 msgstr "Wedi'r weithred gofnodi"
 
-#: strings.hrc:144
+#: cui/inc/strings.hrc:144
 msgctxt "RID_SVXSTR_EVENT_CONFIRMDELETE"
 msgid "Confirm deletion"
 msgstr "Cadarnhau dileu"
 
-#: strings.hrc:145
+#: cui/inc/strings.hrc:145
 msgctxt "RID_SVXSTR_EVENT_ERROROCCURRED"
 msgid "Error occurred"
 msgstr "Digwyddodd gwall"
 
-#: strings.hrc:146
+#: cui/inc/strings.hrc:146
 msgctxt "RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED"
 msgid "While adjusting"
 msgstr "Wrth newid"
 
-#: strings.hrc:147
+#: cui/inc/strings.hrc:147
 msgctxt "RID_SVXSTR_EVENT_FOCUSGAINED"
 msgid "When receiving focus"
 msgstr "Wrth dderbyn canolbwynt"
 
-#: strings.hrc:148
+#: cui/inc/strings.hrc:148
 msgctxt "RID_SVXSTR_EVENT_FOCUSLOST"
 msgid "When losing focus"
 msgstr "Wrth golli canolbwynt"
 
-#: strings.hrc:149
+#: cui/inc/strings.hrc:149
 msgctxt "RID_SVXSTR_EVENT_ITEMSTATECHANGED"
 msgid "Item status changed"
 msgstr "Newidiwyd statws eitem"
 
-#: strings.hrc:150
+#: cui/inc/strings.hrc:150
 msgctxt "RID_SVXSTR_EVENT_KEYTYPED"
 msgid "Key pressed"
 msgstr "Bysellau pwyswyd"
 
-#: strings.hrc:151
+#: cui/inc/strings.hrc:151
 msgctxt "RID_SVXSTR_EVENT_KEYUP"
 msgid "Key released"
 msgstr "Bysellau ryddhawyd"
 
-#: strings.hrc:152
+#: cui/inc/strings.hrc:152
 msgctxt "RID_SVXSTR_EVENT_LOADED"
 msgid "When loading"
 msgstr "Wrth lwytho"
 
-#: strings.hrc:153
+#: cui/inc/strings.hrc:153
 msgctxt "RID_SVXSTR_EVENT_RELOADING"
 msgid "Before reloading"
 msgstr "Cyn ail-lwytho"
 
-#: strings.hrc:154
+#: cui/inc/strings.hrc:154
 msgctxt "RID_SVXSTR_EVENT_RELOADED"
 msgid "When reloading"
 msgstr "Wrth ail-lwytho"
 
-#: strings.hrc:155
+#: cui/inc/strings.hrc:155
 msgctxt "RID_SVXSTR_EVENT_MOUSEDRAGGED"
 msgid "Mouse moved while key pressed"
 msgstr "Symud llygoden wrth bwyso bysell"
 
-#: strings.hrc:156
+#: cui/inc/strings.hrc:156
 msgctxt "RID_SVXSTR_EVENT_MOUSEENTERED"
 msgid "Mouse inside"
 msgstr "Llygoden o fewn"
 
-#: strings.hrc:157
+#: cui/inc/strings.hrc:157
 msgctxt "RID_SVXSTR_EVENT_MOUSEEXITED"
 msgid "Mouse outside"
 msgstr "Llygoden tu allan"
 
-#: strings.hrc:158
+#: cui/inc/strings.hrc:158
 msgctxt "RID_SVXSTR_EVENT_MOUSEMOVED"
 msgid "Mouse moved"
 msgstr "Symud llygoden"
 
-#: strings.hrc:159
+#: cui/inc/strings.hrc:159
 msgctxt "RID_SVXSTR_EVENT_MOUSEPRESSED"
 msgid "Mouse button pressed"
 msgstr "Pwyso botwm llygoden"
 
-#: strings.hrc:160
+#: cui/inc/strings.hrc:160
 msgctxt "RID_SVXSTR_EVENT_MOUSERELEASED"
 msgid "Mouse button released"
 msgstr "Rhyddhau botwm llygoden"
 
-#: strings.hrc:161
+#: cui/inc/strings.hrc:161
 msgctxt "RID_SVXSTR_EVENT_POSITIONING"
 msgid "Before record change"
 msgstr "Cyn newid cofnod"
 
-#: strings.hrc:162
+#: cui/inc/strings.hrc:162
 msgctxt "RID_SVXSTR_EVENT_POSITIONED"
 msgid "After record change"
 msgstr "Wedi newid cofnod"
 
-#: strings.hrc:163
+#: cui/inc/strings.hrc:163
 msgctxt "RID_SVXSTR_EVENT_RESETTED"
 msgid "After resetting"
 msgstr "Wedi ailosod"
 
-#: strings.hrc:164
+#: cui/inc/strings.hrc:164
 msgctxt "RID_SVXSTR_EVENT_APPROVERESETTED"
 msgid "Prior to reset"
 msgstr "Cyn ailosod"
 
-#: strings.hrc:165
+#: cui/inc/strings.hrc:165
 msgctxt "RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED"
 msgid "Approve action"
 msgstr "Cyn cychwyn"
 
-#: strings.hrc:166
+#: cui/inc/strings.hrc:166
 msgctxt "RID_SVXSTR_EVENT_SUBMITTED"
 msgid "Before submitting"
 msgstr "Cyn cyflwyno"
 
-#: strings.hrc:167
+#: cui/inc/strings.hrc:167
 msgctxt "RID_SVXSTR_EVENT_TEXTCHANGED"
 msgid "Text modified"
 msgstr "Newid testun"
 
-#: strings.hrc:168
+#: cui/inc/strings.hrc:168
 msgctxt "RID_SVXSTR_EVENT_UNLOADING"
 msgid "Before unloading"
 msgstr "Cyn dadlwytho"
 
-#: strings.hrc:169
+#: cui/inc/strings.hrc:169
 msgctxt "RID_SVXSTR_EVENT_UNLOADED"
 msgid "When unloading"
 msgstr "Wrth ddadlwytho"
 
-#: strings.hrc:170
+#: cui/inc/strings.hrc:170
 msgctxt "RID_SVXSTR_EVENT_CHANGED"
 msgid "Changed"
 msgstr "Wedi newid"
 
-#: strings.hrc:171
+#: cui/inc/strings.hrc:171
 msgctxt "RID_SVXSTR_EVENT_CREATEDOC"
 msgid "Document created"
 msgstr "Dogfen wedi ei chreu"
 
-#: strings.hrc:172
+#: cui/inc/strings.hrc:172
 msgctxt "RID_SVXSTR_EVENT_LOADDOCFINISHED"
 msgid "Document loading finished"
 msgstr "Wedi cwblhau llwytho dogfen"
 
-#: strings.hrc:173
+#: cui/inc/strings.hrc:173
 msgctxt "RID_SVXSTR_EVENT_SAVEDOCFAILED"
 msgid "Saving of document failed"
 msgstr "Methodd llwytho dogfen"
 
-#: strings.hrc:174
+#: cui/inc/strings.hrc:174
 msgctxt "RID_SVXSTR_EVENT_SAVEASDOCFAILED"
 msgid "'Save as' has failed"
 msgstr "'Cadw fel' wedi methu"
 
-#: strings.hrc:175
+#: cui/inc/strings.hrc:175
 msgctxt "RID_SVXSTR_EVENT_COPYTODOC"
 msgid "Storing or exporting copy of document"
 msgstr "Storio neu allforio copi o ddogfen"
 
-#: strings.hrc:176
+#: cui/inc/strings.hrc:176
 msgctxt "RID_SVXSTR_EVENT_COPYTODOCDONE"
 msgid "Document copy has been created"
 msgstr "Mae copi o ddogfen wedi ei greu"
 
-#: strings.hrc:177
+#: cui/inc/strings.hrc:177
 msgctxt "RID_SVXSTR_EVENT_COPYTODOCFAILED"
 msgid "Creating of document copy failed"
 msgstr "Methodd creu copi o ddogfen"
 
-#: strings.hrc:178
+#: cui/inc/strings.hrc:178
 msgctxt "RID_SVXSTR_EVENT_VIEWCREATED"
 msgid "View created"
 msgstr "Creu Golwg"
 
-#: strings.hrc:179
+#: cui/inc/strings.hrc:179
 msgctxt "RID_SVXSTR_EVENT_PREPARECLOSEVIEW"
 msgid "View is going to be closed"
 msgstr "Bydd Golwg yn cael ei gau"
 
-#: strings.hrc:180
+#: cui/inc/strings.hrc:180
 msgctxt "RID_SVXSTR_EVENT_CLOSEVIEW"
 msgid "View closed"
 msgstr "Golwg wedi cau"
 
-#: strings.hrc:181
+#: cui/inc/strings.hrc:181
 msgctxt "RID_SVXSTR_EVENT_TITLECHANGED"
 msgid "Document title changed"
 msgstr "Teitl dogfen wedi newid"
 
-#: strings.hrc:182
+#: cui/inc/strings.hrc:182
 msgctxt "RID_SVXSTR_EVENT_SELECTIONCHANGED"
 msgid "Selection changed"
 msgstr "Newid y dewis"
 
-#: strings.hrc:183
+#: cui/inc/strings.hrc:183
 msgctxt "RID_SVXSTR_EVENT_DOUBLECLICK"
 msgid "Double click"
 msgstr "Clic dwbl"
 
-#: strings.hrc:184
+#: cui/inc/strings.hrc:184
 msgctxt "RID_SVXSTR_EVENT_RIGHTCLICK"
 msgid "Right click"
 msgstr "Clic de"
 
-#: strings.hrc:185
+#: cui/inc/strings.hrc:185
 msgctxt "RID_SVXSTR_EVENT_CALCULATE"
 msgid "Formulas calculated"
 msgstr "Fformiwlâu wedi eu cyfrifo"
 
-#: strings.hrc:186
+#: cui/inc/strings.hrc:186
 msgctxt "RID_SVXSTR_EVENT_CONTENTCHANGED"
 msgid "Content changed"
 msgstr "Newidwyd y cynnwys"
 
-#: strings.hrc:188
+#: cui/inc/strings.hrc:188
 msgctxt "RID_STR_SEARCH_ANYWHERE"
 msgid "anywhere in the field"
 msgstr "unrhyw le yn y maes"
 
-#: strings.hrc:189
+#: cui/inc/strings.hrc:189
 msgctxt "RID_STR_SEARCH_BEGINNING"
 msgid "beginning of field"
 msgstr "dechrau'r maes"
 
-#: strings.hrc:190
+#: cui/inc/strings.hrc:190
 msgctxt "RID_STR_SEARCH_END"
 msgid "end of field"
 msgstr "diwedd maes"
 
-#: strings.hrc:191
+#: cui/inc/strings.hrc:191
 msgctxt "RID_STR_SEARCH_WHOLE"
 msgid "entire field"
 msgstr "maes cyfan"
 
-#: strings.hrc:192
+#: cui/inc/strings.hrc:192
 msgctxt "RID_STR_FROM_TOP"
 msgid "From top"
 msgstr "O'r brig"
 
-#: strings.hrc:193
+#: cui/inc/strings.hrc:193
 msgctxt "RID_STR_FROM_BOTTOM"
 msgid "From bottom"
 msgstr "O'r gwaelod"
 
-#: strings.hrc:194
+#: cui/inc/strings.hrc:194
 msgctxt "RID_STR_SEARCH_NORECORD"
 msgid "No records corresponding to your data found."
 msgstr "Heb ganfod cofnodion yn cyfateb i'ch data."
 
-#: strings.hrc:195
+#: cui/inc/strings.hrc:195
 msgctxt "RID_STR_SEARCH_GENERAL_ERROR"
 msgid "An unknown error occurred. The search could not be finished."
 msgstr "Digwyddodd gwall anhysbys. Methu gorffen y chwilio."
 
-#: strings.hrc:196
+#: cui/inc/strings.hrc:196
 msgctxt "RID_STR_OVERFLOW_FORWARD"
 msgid "Overflow, search continued at the beginning"
 msgstr "Gorlif, chwilio wedi parhau ar y dechrau"
 
-#: strings.hrc:197
+#: cui/inc/strings.hrc:197
 msgctxt "RID_STR_OVERFLOW_BACKWARD"
 msgid "Overflow, search continued at the end"
 msgstr "Gorlif, chwilio wedi parhau ar y diwedd"
 
-#: strings.hrc:198
+#: cui/inc/strings.hrc:198
 msgctxt "RID_STR_SEARCH_COUNTING"
 msgid "counting records"
 msgstr "cyfrif cofnodion"
 
-#: strings.hrc:200
+#: cui/inc/strings.hrc:200
 msgctxt "RID_SVXSTR_GALLERY_NOFILES"
 msgid "<No Files>"
 msgstr "<Dim Ffeiliau>"
 
-#: strings.hrc:201
+#: cui/inc/strings.hrc:201
 msgctxt "RID_SVXSTR_GALLERYPROPS_OBJECT"
 msgid "Object;Objects"
 msgstr "Gwrthrych;Gwrthrych"
 
-#: strings.hrc:202
+#: cui/inc/strings.hrc:202
 msgctxt "RID_SVXSTR_GALLERY_READONLY"
 msgid "(read-only)"
 msgstr "(darllen yn unig)"
 
-#: strings.hrc:203
+#: cui/inc/strings.hrc:203
 msgctxt "RID_SVXSTR_GALLERY_ALLFILES"
 msgid "<All Files>"
 msgstr "<Pob Ffeil>"
 
-#: strings.hrc:204
+#: cui/inc/strings.hrc:204
 msgctxt "RID_SVXSTR_GALLERY_ID_EXISTS"
 msgid "This ID already exists..."
 msgstr "Enw yma'n bod eisoes..."
 
-#: strings.hrc:206
+#: cui/inc/strings.hrc:206
 msgctxt "RID_MULTIPATH_DBL_ERR"
 msgid "The path %1 already exists."
 msgstr "Mae llwybr %1 yn bodoli eisoes."
 
-#: strings.hrc:207
+#: cui/inc/strings.hrc:207
 msgctxt "RID_SVXSTR_ARCHIVE_TITLE"
 msgid "Select Archives"
 msgstr "Dewis Archifau"
 
-#: strings.hrc:208
+#: cui/inc/strings.hrc:208
 msgctxt "RID_SVXSTR_ARCHIVE_HEADLINE"
 msgid "Archives"
 msgstr "Archifau"
 
-#: strings.hrc:209
+#: cui/inc/strings.hrc:209
 msgctxt "RID_SVXSTR_MULTIFILE_DBL_ERR"
 msgid "The file %1 already exists."
 msgstr "Mae ffeil %1 yn bodoli eisoes."
 
-#: strings.hrc:210
+#: cui/inc/strings.hrc:210
 msgctxt "RID_SVXSTR_ADD_IMAGE"
 msgid "Add Image"
 msgstr "Ychwanegu Delwedd"
 
-#: strings.hrc:212
+#: cui/inc/strings.hrc:212
 msgctxt "RID_SVXSTR_ONE_PASSWORD_MISMATCH"
 msgid "The confirmation password did not match the password. Set the password again by entering the same password in both boxes."
 msgstr "Nid yw'r cyfrinair cadarnhad yn cydweddu a'r cyfrinair. Rhowch y cyfrinair eto drwy rhoi'r un cyfrinair yn y ddau flwch."
 
-#: strings.hrc:213
+#: cui/inc/strings.hrc:213
 msgctxt "RID_SVXSTR_TWO_PASSWORDS_MISMATCH"
 msgid "The confirmation passwords did not match the original passwords. Set the passwords again."
 msgstr "Nid yw'r cyfrinair cadarnhad yn cydweddu â'r cyfrinair. Gosodwch y cyfrinair eto."
 
-#: strings.hrc:214
+#: cui/inc/strings.hrc:214
 msgctxt "RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON"
 msgid "Please enter a password to open or to modify, or check the open read-only option to continue."
 msgstr "Rhowch gyfrinair i agor neu newid, neu dicio'r dewis darllen yn unig i barhau."
 
-#: strings.hrc:215
+#: cui/inc/strings.hrc:215
 msgctxt "RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2"
 msgid "Set the password by entering the same password in both boxes."
 msgstr "Rhowch y cyfrinair eto drwy rhoi'r un cyfrinair yn y ddau flwch."
 
-#: strings.hrc:217
+#: cui/inc/strings.hrc:217
 msgctxt "STR_AUTOLINK"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: strings.hrc:218
+#: cui/inc/strings.hrc:218
 msgctxt "STR_MANUALLINK"
 msgid "Manual"
 msgstr "Gyda llaw"
 
-#: strings.hrc:219
+#: cui/inc/strings.hrc:219
 msgctxt "STR_BROKENLINK"
 msgid "Not available"
 msgstr "Ddim ar gael"
 
-#: strings.hrc:220
+#: cui/inc/strings.hrc:220
 msgctxt "STR_CLOSELINKMSG"
 msgid "Are you sure you want to remove the selected link?"
 msgstr "Ydych yn siŵr eich bod am dynnu'r cysylltiad yma?"
 
-#: strings.hrc:221
+#: cui/inc/strings.hrc:221
 msgctxt "STR_CLOSELINKMSG_MULTI"
 msgid "Are you sure you want to remove the selected link?"
 msgstr "Ydych yn siŵr eich bod am dynnu'r cysylltiad yma?"
 
-#: strings.hrc:222
+#: cui/inc/strings.hrc:222
 msgctxt "STR_WAITINGLINK"
 msgid "Waiting"
 msgstr "Disgwyl"
 
-#: strings.hrc:224
+#: cui/inc/strings.hrc:224
 msgctxt "RID_SVXSTR_SAVE_SCREENSHOT_AS"
 msgid "Save Screenshot As..."
 msgstr "Cadw Llun Sgrin fel..."
 
 #. $(ROW) can be a number or the caption of the row in quotes
-#: strings.hrc:227
+#: cui/inc/strings.hrc:227
 msgctxt "RID_SVXSTR_DIAGRAM_ROW"
 msgid "Data Series $(ROW)"
 msgstr "Cyfres Data $(ROW)"
 
-#: strings.hrc:229
+#: cui/inc/strings.hrc:229
 msgctxt "RID_SVXSTR_DRIVER_NAME"
 msgid "Driver name"
 msgstr "Enw'r gyrrwr"
 
-#: strings.hrc:230
+#: cui/inc/strings.hrc:230
 msgctxt "RID_SVXSTR_POOLED_FLAG"
 msgid "Pool"
 msgstr "Crynhoad"
 
-#: strings.hrc:231
+#: cui/inc/strings.hrc:231
 msgctxt "RID_SVXSTR_POOL_TIMEOUT"
 msgid "Timeout"
 msgstr "Terfyn amser"
 
-#: strings.hrc:232
+#: cui/inc/strings.hrc:232
 msgctxt "RID_SVXSTR_YES"
 msgid "Yes"
 msgstr "Iawn"
 
-#: strings.hrc:233
+#: cui/inc/strings.hrc:233
 msgctxt "RID_SVXSTR_NO"
 msgid "No"
 msgstr "Na"
 
-#: strings.hrc:235
+#: cui/inc/strings.hrc:235
 msgctxt "STR_LINKEDDOC_DOESNOTEXIST"
 msgid ""
 "The file\n"
@@ -1025,7 +1025,7 @@ msgstr ""
 "$file$\n"
 "yn bodoli."
 
-#: strings.hrc:236
+#: cui/inc/strings.hrc:236
 msgctxt "STR_LINKEDDOC_NO_SYSTEM_FILE"
 msgid ""
 "The file\n"
@@ -1036,7 +1036,7 @@ msgstr ""
 "$file$\n"
 "yn bodoli yn y system ffeiliau lleol."
 
-#: strings.hrc:237
+#: cui/inc/strings.hrc:237
 msgctxt "STR_NAME_CONFLICT"
 msgid ""
 "The name '$file$' is already used for another database.\n"
@@ -1045,153 +1045,153 @@ msgstr ""
 "Mae'r enw '$file$' yn cael ei ddefnyddio eisoes ar gyfer cronfa ddata arall.\n"
 " Dewiswch enw gwahanol."
 
-#: strings.hrc:238
+#: cui/inc/strings.hrc:238
 msgctxt "RID_SVXSTR_QUERY_DELETE_CONFIRM"
 msgid "Do you want to delete the entry?"
 msgstr "Hoffech chi ddileu'r cofnod?"
 
-#: strings.hrc:240
+#: cui/inc/strings.hrc:240
 msgctxt "RID_SVXSTR_DELQUERY"
 msgid "Do you want to delete the following object?"
 msgstr "Hoffech chi ddileu'r gwrthrych canlynol?"
 
-#: strings.hrc:241
+#: cui/inc/strings.hrc:241
 msgctxt "RID_SVXSTR_DELQUERY_TITLE"
 msgid "Confirm Deletion"
 msgstr "Cadarnhau Dileu"
 
-#: strings.hrc:242
+#: cui/inc/strings.hrc:242
 msgctxt "RID_SVXSTR_DELFAILED"
 msgid "The selected object could not be deleted."
 msgstr "Nid oedd modd dileu'r gwrthrych yma."
 
-#: strings.hrc:243
+#: cui/inc/strings.hrc:243
 msgctxt "RID_SVXSTR_DELFAILED_TITLE"
 msgid "Error Deleting Object"
 msgstr "Gwall wrth Ddileu gwrthrych"
 
-#: strings.hrc:244
+#: cui/inc/strings.hrc:244
 msgctxt "RID_SVXSTR_CREATEFAILED"
 msgid "The object could not be created."
 msgstr "Nid oedd modd creu’r gwrthrych."
 
-#: strings.hrc:245
+#: cui/inc/strings.hrc:245
 msgctxt "RID_SVXSTR_CREATEFAILEDDUP"
 msgid " Object with the same name already exists."
 msgstr " Mae gwrthrych gyda'r un enw'n bodoli eisoes."
 
-#: strings.hrc:246
+#: cui/inc/strings.hrc:246
 msgctxt "RID_SVXSTR_CREATEFAILED_TITLE"
 msgid "Error Creating Object"
 msgstr "Gwall Creu Gwrthrych"
 
-#: strings.hrc:247
+#: cui/inc/strings.hrc:247
 msgctxt "RID_SVXSTR_RENAMEFAILED"
 msgid "The object could not be renamed."
 msgstr "Nid oedd modd ail enwi’r gwrthrych."
 
-#: strings.hrc:248
+#: cui/inc/strings.hrc:248
 msgctxt "RID_SVXSTR_RENAMEFAILED_TITLE"
 msgid "Error Renaming Object"
 msgstr "Gwall Ail Enwi Gwrthrych"
 
-#: strings.hrc:249
+#: cui/inc/strings.hrc:249
 msgctxt "RID_SVXSTR_ERROR_TITLE"
 msgid "%PRODUCTNAME Error"
 msgstr "Gwall %PRODUCTNAME"
 
-#: strings.hrc:250
+#: cui/inc/strings.hrc:250
 #, c-format
 msgctxt "RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED"
 msgid "The scripting language %LANGUAGENAME is not supported."
 msgstr "Nid yw'r iaith sgriptio %LANGUAGENAME yn cael ei chynnal."
 
-#: strings.hrc:251
+#: cui/inc/strings.hrc:251
 #, c-format
 msgctxt "RID_SVXSTR_ERROR_RUNNING"
 msgid "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME."
 msgstr "Digwyddodd gwall wrth redeg sgript %LANGUAGENAME %SCRIPTNAME."
 
-#: strings.hrc:252
+#: cui/inc/strings.hrc:252
 #, c-format
 msgctxt "RID_SVXSTR_EXCEPTION_RUNNING"
 msgid "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME."
 msgstr "Digwyddodd gwall wrth redeg sgript %LANGUAGENAME %SCRIPTNAME."
 
-#: strings.hrc:253
+#: cui/inc/strings.hrc:253
 msgctxt "RID_SVXSTR_ERROR_AT_LINE"
 msgid "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER."
 msgstr "Digwyddodd gwall wrth redeg sgript %LANGUAGENAME %SCRIPTNAME ar linell %LINENUMBER."
 
-#: strings.hrc:254
+#: cui/inc/strings.hrc:254
 msgctxt "RID_SVXSTR_EXCEPTION_AT_LINE"
 msgid "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER."
 msgstr "Digwyddodd gwall wrth redeg sgript %LANGUAGENAME %SCRIPTNAME ar linell %LINENUMBER."
 
-#: strings.hrc:255
+#: cui/inc/strings.hrc:255
 #, c-format
 msgctxt "RID_SVXSTR_FRAMEWORK_ERROR_RUNNING"
 msgid "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME."
 msgstr "Mae gwall Fframwaith Scripting wedi digwydd wrth redeg sgript %LANGUAGENAME %SCRIPTNAME."
 
-#: strings.hrc:256
+#: cui/inc/strings.hrc:256
 msgctxt "RID_SVXSTR_ERROR_TYPE_LABEL"
 msgid "Type:"
 msgstr "Math:"
 
-#: strings.hrc:257
+#: cui/inc/strings.hrc:257
 msgctxt "RID_SVXSTR_ERROR_MESSAGE_LABEL"
 msgid "Message:"
 msgstr "Neges:"
 
-#: strings.hrc:259
+#: cui/inc/strings.hrc:259
 msgctxt "RID_SVXSTR_TYPE"
 msgid "Registered name"
 msgstr "Enw cofrestredig"
 
-#: strings.hrc:260
+#: cui/inc/strings.hrc:260
 msgctxt "RID_SVXSTR_PATH"
 msgid "Database file"
 msgstr "Ffeil cronfa ddata"
 
 #. abbreviation for "[Load]"
-#: strings.hrc:263
+#: cui/inc/strings.hrc:263
 msgctxt "RID_SVXSTR_HEADER1"
 msgid "[L]"
 msgstr "[L]"
 
 #. abbreviation for "[Save]"
-#: strings.hrc:265
+#: cui/inc/strings.hrc:265
 msgctxt "RID_SVXSTR_HEADER2"
 msgid "[S]"
 msgstr "[S]"
 
-#: strings.hrc:266
+#: cui/inc/strings.hrc:266
 msgctxt "RID_SVXSTR_CHG_MATH"
 msgid "MathType to %PRODUCTNAME Math or reverse"
 msgstr "MathType i %PRODUCTNAME Math neu'r gwrthwyneb"
 
-#: strings.hrc:267
+#: cui/inc/strings.hrc:267
 msgctxt "RID_SVXSTR_CHG_WRITER"
 msgid "WinWord to %PRODUCTNAME Writer or reverse"
 msgstr "WinWord i %PRODUCTNAME Writer neu'r gwrthwyneb"
 
-#: strings.hrc:268
+#: cui/inc/strings.hrc:268
 msgctxt "RID_SVXSTR_CHG_CALC"
 msgid "Excel to %PRODUCTNAME Calc or reverse"
 msgstr "Excel i %PRODUCTNAME Calc neu'r gwrthwyneb"
 
-#: strings.hrc:269
+#: cui/inc/strings.hrc:269
 msgctxt "RID_SVXSTR_CHG_IMPRESS"
 msgid "PowerPoint to %PRODUCTNAME Impress or reverse"
 msgstr "PowerPoint i %PRODUCTNAME Impress neu'r gwrthwyneb"
 
-#: strings.hrc:270
+#: cui/inc/strings.hrc:270
 msgctxt "RID_SVXSTR_CHG_SMARTART"
 msgid "SmartArt to %PRODUCTNAME shapes or reverse"
 msgstr "SmartArt i %PRODUCTNAME siapiau neu'r gwrthwyneb"
 
-#: strings.hrc:272
+#: cui/inc/strings.hrc:272
 msgctxt "RID_SVXSTR_OPT_DOUBLE_DICTS"
 msgid ""
 "The specified name already exists.\n"
@@ -1210,114 +1210,114 @@ msgstr ""
 #. contains an optional model word associated to the new user word,
 #. allowing its affixation or compounding during spell checking.
 #. For example, adding "Grammar By" word "fund" to the new user
-#. word "crowdfund", the spell checker will recogize "crowdfund"
+#. word "crowdfund", the spell checker will recognize "crowdfund"
 #. with suffixes of "fund": "crowdfunding", "crowdfund's" etc.
-#: strings.hrc:287
+#: cui/inc/strings.hrc:287
 msgctxt "RID_SVXSTR_OPT_GRAMMAR_BY"
 msgid "~Grammar By"
 msgstr "~Gramadeg gan"
 
-#: strings.hrc:288
+#: cui/inc/strings.hrc:288
 msgctxt "STR_MODIFY"
 msgid "~Replace"
 msgstr "~Newid"
 
-#: strings.hrc:289
+#: cui/inc/strings.hrc:289
 msgctxt "RID_SVXSTR_CONFIRM_SET_LANGUAGE"
 msgid "Do you want to change the '%1' dictionary language?"
 msgstr "Hoffech chi newid geiriadur iaith '%1'?"
 
-#: strings.hrc:291
+#: cui/inc/strings.hrc:291
 msgctxt "RID_SVXSTR_COLOR_CONFIG_DELETE"
 msgid "Do you really want to delete the color scheme?"
 msgstr "Ydych chi wir am ddileu'r cynllun lliw?"
 
-#: strings.hrc:292
+#: cui/inc/strings.hrc:292
 msgctxt "RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE"
 msgid "Color Scheme Deletion"
 msgstr "Dileu'r Cynllun Lliw"
 
-#: strings.hrc:293
+#: cui/inc/strings.hrc:293
 msgctxt "RID_SVXSTR_COLOR_CONFIG_SAVE1"
 msgid "Save scheme"
 msgstr "Cadw'r cynllun"
 
-#: strings.hrc:294
+#: cui/inc/strings.hrc:294
 msgctxt "RID_SVXSTR_COLOR_CONFIG_SAVE2"
 msgid "Name of color scheme"
 msgstr "Enw'r cynllun lliw"
 
-#: strings.hrc:296
+#: cui/inc/strings.hrc:296
 msgctxt "RID_SVXSTR_SPELL"
 msgid "Spelling"
 msgstr "Sillafu"
 
-#: strings.hrc:297
+#: cui/inc/strings.hrc:297
 msgctxt "RID_SVXSTR_HYPH"
 msgid "Hyphenation"
 msgstr "Cysylltnodi"
 
-#: strings.hrc:298
+#: cui/inc/strings.hrc:298
 msgctxt "RID_SVXSTR_THES"
 msgid "Thesaurus"
 msgstr "Thesawrws"
 
-#: strings.hrc:299
+#: cui/inc/strings.hrc:299
 msgctxt "RID_SVXSTR_GRAMMAR"
 msgid "Grammar"
 msgstr "Gramadeg"
 
-#: strings.hrc:300
+#: cui/inc/strings.hrc:300
 msgctxt "RID_SVXSTR_CAPITAL_WORDS"
 msgid "Check uppercase words"
 msgstr "Gwirio geiriau priflythrennau"
 
-#: strings.hrc:301
+#: cui/inc/strings.hrc:301
 msgctxt "RID_SVXSTR_WORDS_WITH_DIGITS"
 msgid "Check words with numbers "
 msgstr "Gwirio geiriau gyda rhifau "
 
-#: strings.hrc:302
+#: cui/inc/strings.hrc:302
 msgctxt "RID_SVXSTR_SPELL_SPECIAL"
 msgid "Check special regions"
 msgstr "Gwirio ardaloedd arbennig"
 
-#: strings.hrc:303
+#: cui/inc/strings.hrc:303
 msgctxt "RID_SVXSTR_SPELL_AUTO"
 msgid "Check spelling as you type"
 msgstr "Gwirio sillafu wrth i chi deipio"
 
-#: strings.hrc:304
+#: cui/inc/strings.hrc:304
 msgctxt "RID_SVXSTR_GRAMMAR_AUTO"
 msgid "Check grammar as you type"
 msgstr "Gwirio gramadeg wrth i chi deipio"
 
-#: strings.hrc:305
+#: cui/inc/strings.hrc:305
 msgctxt "RID_SVXSTR_NUM_MIN_WORDLEN"
 msgid "Minimal number of characters for hyphenation: "
 msgstr "Lleiafswm nifer o nodau ar gyfer cyplysnodi: "
 
-#: strings.hrc:306
+#: cui/inc/strings.hrc:306
 msgctxt "RID_SVXSTR_NUM_PRE_BREAK"
 msgid "Characters before line break: "
 msgstr "Nodau cyn toriad llinell: "
 
-#: strings.hrc:307
+#: cui/inc/strings.hrc:307
 msgctxt "RID_SVXSTR_NUM_POST_BREAK"
 msgid "Characters after line break: "
 msgstr "Nodau wedi toriad llinell: "
 
-#: strings.hrc:308
+#: cui/inc/strings.hrc:308
 msgctxt "RID_SVXSTR_HYPH_AUTO"
 msgid "Hyphenate without inquiry"
 msgstr "Cysylltnodi heb ofyn"
 
-#: strings.hrc:309
+#: cui/inc/strings.hrc:309
 msgctxt "RID_SVXSTR_HYPH_SPECIAL"
 msgid "Hyphenate special regions"
 msgstr "Cysylltnodi ardaloedd arbennig"
 
-#: strings.hrc:311
+#: cui/inc/strings.hrc:311
 msgctxt "RID_SVXSTR_JRE_NOT_RECOGNIZED"
 msgid ""
 "The folder you selected does not contain a Java runtime environment.\n"
@@ -1326,7 +1326,7 @@ msgstr ""
 "Nid yw'r ffolder rydych wedi ei ddewis yn cynnwys amgylchedd runtime Java.\n"
 "Dewiswch ffolder gwahanol."
 
-#: strings.hrc:312
+#: cui/inc/strings.hrc:312
 msgctxt "RID_SVXSTR_JRE_FAILED_VERSION"
 msgid ""
 "The Java runtime environment you selected is not the required version.\n"
@@ -1335,17 +1335,17 @@ msgstr ""
 "Nid yw'r Java runtime environment rydych wedi ei ddewis yr un angenrheidiol.\n"
 "Dewiswch ffolder arall."
 
-#: strings.hrc:313
+#: cui/inc/strings.hrc:313
 msgctxt "RID_SVXSTR_OPTIONS_RESTART"
 msgid "Please restart %PRODUCTNAME now so the new or modified values can take effect."
 msgstr "Ailgychwynnwch %PRODUCTNAME fel bod y gwerthoedd newydd neu y rhai newidiwyd yn gallu dod i rym."
 
-#: strings.hrc:314
+#: cui/inc/strings.hrc:314
 msgctxt "RID_SVXSTR_JAVA_START_PARAM"
 msgid "Edit Parameter"
 msgstr "Golygu Paramedr"
 
-#: strings.hrc:316
+#: cui/inc/strings.hrc:316
 msgctxt "RID_SVXSTR_OPT_PROXYPORTS"
 msgid ""
 "Invalid value!\n"
@@ -1356,68 +1356,32 @@ msgstr ""
 "\n"
 "Uchafswm gwerth rhif porth yw 65535."
 
-#: strings.hrc:318
-msgctxt "RID_SVXSTR_FRAMEDIR_LTR"
-msgid "Left-to-right (LTR)"
-msgstr "Chwith i'r dde (LTR)"
-
-#: strings.hrc:319
-msgctxt "RID_SVXSTR_FRAMEDIR_RTL"
-msgid "Right-to-left (RTL)"
-msgstr "De i'r chwith (RTL)"
-
-#: strings.hrc:320
-msgctxt "RID_SVXSTR_FRAMEDIR_SUPER"
-msgid "Use superordinate object settings"
-msgstr "Defnyddio gosodiadau gwrthrych uwcholyn"
-
-#. page direction
-#: strings.hrc:322
-msgctxt "RID_SVXSTR_PAGEDIR_LTR_HORI"
-msgid "Left-to-right (horizontal)"
-msgstr "Chwith i dde (llorweddol)"
-
-#: strings.hrc:323
-msgctxt "RID_SVXSTR_PAGEDIR_RTL_HORI"
-msgid "Right-to-left (horizontal)"
-msgstr "De i chwith (llorweddol)"
-
-#: strings.hrc:324
-msgctxt "RID_SVXSTR_PAGEDIR_RTL_VERT"
-msgid "Right-to-left (vertical)"
-msgstr "De i chwith (fertigol)"
-
-#: strings.hrc:325
-msgctxt "RID_SVXSTR_PAGEDIR_LTR_VERT"
-msgid "Left-to-right (vertical)"
-msgstr "Chwith i dde (fertigol)"
-
-#: strings.hrc:327
+#: cui/inc/strings.hrc:318
 msgctxt "RID_SVXSTR_DESC_GRADIENT"
 msgid "Please enter a name for the gradient:"
 msgstr "Rhowch enw i'r graddiant:"
 
-#: strings.hrc:328
+#: cui/inc/strings.hrc:319
 msgctxt "RID_SVXSTR_DESC_NEW_BITMAP"
 msgid "Please enter a name for the bitmap:"
 msgstr "Rhowch enw i'r didfap:"
 
-#: strings.hrc:329
+#: cui/inc/strings.hrc:320
 msgctxt "RID_SVXSTR_DESC_EXT_BITMAP"
 msgid "Please enter a name for the external bitmap:"
 msgstr "Rhowch enw i'r didfap allanol:"
 
-#: strings.hrc:330
+#: cui/inc/strings.hrc:321
 msgctxt "RID_SVXSTR_DESC_NEW_PATTERN"
 msgid "Please enter a name for the pattern:"
 msgstr "Rhowch enw i'r patrwm:"
 
-#: strings.hrc:331
+#: cui/inc/strings.hrc:322
 msgctxt "RID_SVXSTR_DESC_LINESTYLE"
 msgid "Please enter a name for the line style:"
 msgstr "Rhowch enw i'r arddull llinell:"
 
-#: strings.hrc:332
+#: cui/inc/strings.hrc:323
 msgctxt "RID_SVXSTR_ASK_CHANGE_LINESTYLE"
 msgid ""
 "The line style was modified without saving. \n"
@@ -1426,4482 +1390,4502 @@ msgstr ""
 "Cafodd newydd yr arddull llinell ei newid heb ei gadw. \n"
 "Newid yr arddull llinell hwn neu ychwanegu arddull llinell newydd."
 
-#: strings.hrc:333
+#: cui/inc/strings.hrc:324
 msgctxt "RID_SVXSTR_DESC_HATCH"
 msgid "Please enter a name for the hatching:"
 msgstr "Rhowch enw i'r lliniogi:"
 
-#: strings.hrc:334
+#: cui/inc/strings.hrc:325
 msgctxt "RID_SVXSTR_CHANGE"
 msgid "Modify"
 msgstr "Newid"
 
-#: strings.hrc:335
+#: cui/inc/strings.hrc:326
 msgctxt "RID_SVXSTR_ADD"
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: strings.hrc:336
+#: cui/inc/strings.hrc:327
 msgctxt "RID_SVXSTR_DESC_COLOR"
 msgid "Please enter a name for the new color:"
 msgstr "Rhowch enw i'r lliw newydd:"
 
-#: strings.hrc:337
+#: cui/inc/strings.hrc:328
 msgctxt "RID_SVXSTR_TABLE"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:338
+#: cui/inc/strings.hrc:329
 msgctxt "RID_SVXSTR_DESC_LINEEND"
 msgid "Please enter a name for the new arrowhead:"
 msgstr "Rhowch enw i'r pen saeth newydd:"
 
-#: strings.hrc:339
+#: cui/inc/strings.hrc:330
 msgctxt "RID_SVXSTR_CHARNAME_NOSTYLE"
 msgid "No %1"
 msgstr "Na %1"
 
-#: strings.hrc:340
+#: cui/inc/strings.hrc:331
 msgctxt "RID_SVXSTR_CHARNAME_FAMILY"
 msgid "Family:"
 msgstr "Teulu:"
 
-#: strings.hrc:341
+#: cui/inc/strings.hrc:332
 msgctxt "RID_SVXSTR_CHARNAME_FONT"
 msgid "Font:"
 msgstr "Ffont:"
 
-#: strings.hrc:342
+#: cui/inc/strings.hrc:333
 msgctxt "RID_SVXSTR_CHARNAME_STYLE"
 msgid "Style:"
 msgstr "Arddull:"
 
-#: strings.hrc:343
+#: cui/inc/strings.hrc:334
 msgctxt "RID_SVXSTR_CHARNAME_TYPEFACE"
 msgid "Typeface:"
 msgstr "Ffurf-deip:"
 
-#: strings.hrc:344
+#: cui/inc/strings.hrc:335
 msgctxt "RID_SVXSTR_CHARNAME_HIGHLIGHTING"
 msgid "Highlight Color"
 msgstr "Lliw Amlygu"
 
-#: strings.hrc:345
+#: cui/inc/strings.hrc:336
 msgctxt "RID_SVXSTR_USE_REPLACE"
 msgid "Use replacement table"
 msgstr "Defnyddio tabl ailosod"
 
-#: strings.hrc:346
+#: cui/inc/strings.hrc:337
 msgctxt "RID_SVXSTR_CPTL_STT_WORD"
 msgid "Correct TWo INitial CApitals"
 msgstr "Cywiro DWy BRif LYthyren"
 
-#: strings.hrc:347
+#: cui/inc/strings.hrc:338
 msgctxt "RID_SVXSTR_CPTL_STT_SENT"
 msgid "Capitalize first letter of every sentence"
 msgstr "Llythyren fawr i bob llythyren gyntaf brawddeg"
 
-#: strings.hrc:348
+#: cui/inc/strings.hrc:339
 msgctxt "RID_SVXSTR_BOLD_UNDER"
 msgid "Automatic *bold*, /italic/, -strikeout- and _underline_"
 msgstr "*trwm*, /italig/, -bwrw allan- a _thanlinellu_ awtomatig"
 
-#: strings.hrc:349
+#: cui/inc/strings.hrc:340
 msgctxt "RID_SVXSTR_NO_DBL_SPACES"
 msgid "Ignore double spaces"
 msgstr "Anwybyddu bylchu dwbl"
 
-#: strings.hrc:350
+#: cui/inc/strings.hrc:341
 msgctxt "RID_SVXSTR_DETECT_URL"
 msgid "URL Recognition"
 msgstr "Adnabod URLau"
 
-#: strings.hrc:351
+#: cui/inc/strings.hrc:342
 msgctxt "RID_SVXSTR_DASH"
 msgid "Replace dashes"
 msgstr "Newid llinellau toriad"
 
-#: strings.hrc:352
+#: cui/inc/strings.hrc:343
 msgctxt "RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK"
 msgid "Correct accidental use of cAPS LOCK key"
 msgstr "Cywiro'r defnydd damweiniol o fysell cAPS LOCK"
 
-#: strings.hrc:353
+#: cui/inc/strings.hrc:344
 msgctxt "RID_SVXSTR_NON_BREAK_SPACE"
 msgid "Add non-breaking space before specific punctuation marks in French text"
 msgstr "Ychwanegu bwlch dim toriad o flaen marciau atalnodi mewn testun Ffrangeg"
 
-#: strings.hrc:354
+#: cui/inc/strings.hrc:345
 msgctxt "RID_SVXSTR_ORDINAL"
 msgid "Format ordinal numbers suffixes (1st -> 1^st)"
 msgstr "Fformatio olddodiad trefnolion (1af -> 1^af)"
 
-#: strings.hrc:355
+#: cui/inc/strings.hrc:346
 msgctxt "RID_SVXSTR_DEL_EMPTY_PARA"
 msgid "Remove blank paragraphs"
 msgstr "Tynnu paragraffau gwag"
 
-#: strings.hrc:356
+#: cui/inc/strings.hrc:347
 msgctxt "RID_SVXSTR_USER_STYLE"
 msgid "Replace Custom Styles"
 msgstr "Newid Arddulliau Cyfaddas"
 
-#: strings.hrc:357
+#: cui/inc/strings.hrc:348
 msgctxt "RID_SVXSTR_BULLET"
 msgid "Replace bullets with: "
 msgstr "Newid bwledi gyda: "
 
-#: strings.hrc:358
+#: cui/inc/strings.hrc:349
 msgctxt "RID_SVXSTR_RIGHT_MARGIN"
 msgid "Combine single line paragraphs if length greater than"
 msgstr "Cyfuno paragraffau llinell sengl os yw'r hyd yn fwy na"
 
-#: strings.hrc:359
+#: cui/inc/strings.hrc:350
 msgctxt "RID_SVXSTR_NUM"
 msgid "Bulleted and numbered lists. Bullet symbol: "
 msgstr "Rhestrau bwled a rhifau. Symbol bwled: "
 
-#: strings.hrc:360
+#: cui/inc/strings.hrc:351
 msgctxt "RID_SVXSTR_BORDER"
 msgid "Apply border"
 msgstr "Gosod border"
 
-#: strings.hrc:361
+#: cui/inc/strings.hrc:352
 msgctxt "RID_SVXSTR_CREATE_TABLE"
 msgid "Create table"
 msgstr "Creu tabl"
 
-#: strings.hrc:362
+#: cui/inc/strings.hrc:353
 msgctxt "RID_SVXSTR_REPLACE_TEMPLATES"
 msgid "Apply Styles"
 msgstr "Gosod Arddulliau"
 
-#: strings.hrc:363
+#: cui/inc/strings.hrc:354
 msgctxt "RID_SVXSTR_DEL_SPACES_AT_STT_END"
 msgid "Delete spaces and tabs at beginning and end of paragraph"
 msgstr "Dileu bylchu a thabiau ar ddechrau a diwedd paragraff"
 
-#: strings.hrc:364
+#: cui/inc/strings.hrc:355
 msgctxt "RID_SVXSTR_DEL_SPACES_BETWEEN_LINES"
 msgid "Delete spaces and tabs at end and start of line"
 msgstr "Dileu bylchau a thabiau ar ddiwedd a dechrau paragraff"
 
-#: strings.hrc:365
+#: cui/inc/strings.hrc:356
 msgctxt "RID_SVXSTR_CONNECTOR"
 msgid "Connector"
 msgstr "Cysylltydd"
 
-#: strings.hrc:366
+#: cui/inc/strings.hrc:357
 msgctxt "RID_SVXSTR_DIMENSION_LINE"
 msgid "Dimension line"
 msgstr "Llinell Dimensiwn"
 
-#: strings.hrc:367
+#: cui/inc/strings.hrc:358
 msgctxt "RID_SVXSTR_LOAD_ERROR"
 msgid "The selected module could not be loaded."
 msgstr "Nid oedd modd llwytho'r modiwl yma."
 
-#: strings.hrc:368
+#: cui/inc/strings.hrc:359
 msgctxt "RID_SVXSTR_STARTQUOTE"
 msgid "Start Quote"
 msgstr "Cychwyn Dyfyniad"
 
-#: strings.hrc:369
+#: cui/inc/strings.hrc:360
 msgctxt "RID_SVXSTR_ENDQUOTE"
 msgid "End Quote"
 msgstr "Diwedd Dyfyniad"
 
-#: strings.hrc:371
+#: cui/inc/strings.hrc:362
 msgctxt "RID_SVXSTR_SELECTEDPERSONA"
 msgid "Selected Theme: "
 msgstr "Thema Dewiswyd: "
 
-#: strings.hrc:372
+#: cui/inc/strings.hrc:363
 msgctxt "RID_SVXSTR_SEARCHING"
 msgid "Searching, please wait..."
 msgstr "Chwilio, arhoswch os gwelwch yn dda..."
 
-#: strings.hrc:373
+#: cui/inc/strings.hrc:364
 msgctxt "RID_SVXSTR_SEARCHERROR"
 msgid "Cannot open %1, please try again later."
 msgstr "Methu agor %1, ceisiwch eto'n hwyrach."
 
-#: strings.hrc:374
+#: cui/inc/strings.hrc:365
 msgctxt "RID_SVXSTR_NORESULTS"
 msgid "No results found."
 msgstr "Heb ganfod canlyniadau."
 
-#: strings.hrc:375
+#: cui/inc/strings.hrc:366
 msgctxt "RID_SVXSTR_APPLYPERSONA"
 msgid "Applying Theme..."
 msgstr "Gosod Thema..."
 
-#: strings.hrc:377
+#: cui/inc/strings.hrc:368
 msgctxt "RID_SVXSTR_TABLE_PRESET_NONE"
 msgid "Set No Borders"
 msgstr "Peidio Gosod Borderi"
 
-#: strings.hrc:378
+#: cui/inc/strings.hrc:369
 msgctxt "RID_SVXSTR_TABLE_PRESET_ONLYOUTER"
 msgid "Set Outer Border Only"
 msgstr "Gosod Border Allanol yn Unig"
 
-#: strings.hrc:379
+#: cui/inc/strings.hrc:370
 msgctxt "RID_SVXSTR_TABLE_PRESET_OUTERHORI"
 msgid "Set Outer Border and Horizontal Lines"
 msgstr "Gosod Border Allanol a Llinellau Llorweddol"
 
-#: strings.hrc:380
+#: cui/inc/strings.hrc:371
 msgctxt "RID_SVXSTR_TABLE_PRESET_OUTERALL"
 msgid "Set Outer Border and All Inner Lines"
 msgstr "Gosod Border Allanol a Phob Llinell Fewnol"
 
-#: strings.hrc:381
+#: cui/inc/strings.hrc:372
 msgctxt "RID_SVXSTR_TABLE_PRESET_OUTERINNER"
 msgid "Set Outer Border Without Changing Inner Lines"
 msgstr "Gosod Border Allanol Heb Newid Llinellau Mewnol"
 
-#: strings.hrc:382
+#: cui/inc/strings.hrc:373
 msgctxt "RID_SVXSTR_PARA_PRESET_DIAGONAL"
 msgid "Set Diagonal Lines Only"
 msgstr "Gosod Llinellau Croeslin yn Unig"
 
-#: strings.hrc:383
+#: cui/inc/strings.hrc:374
 msgctxt "RID_SVXSTR_PARA_PRESET_ALL"
 msgid "Set All Four Borders"
 msgstr "Gosod y Pedwar Border"
 
-#: strings.hrc:384
+#: cui/inc/strings.hrc:375
 msgctxt "RID_SVXSTR_PARA_PRESET_LEFTRIGHT"
 msgid "Set Left and Right Borders Only"
 msgstr "Gosod Border Chwith a De yn Unig"
 
-#: strings.hrc:385
+#: cui/inc/strings.hrc:376
 msgctxt "RID_SVXSTR_PARA_PRESET_TOPBOTTOM"
 msgid "Set Top and Bottom Borders Only"
 msgstr "Gosod Borderi Brig a Gwaelod yn Unig"
 
-#: strings.hrc:386
+#: cui/inc/strings.hrc:377
 msgctxt "RID_SVXSTR_PARA_PRESET_ONLYLEFT"
 msgid "Set Left Border Only"
 msgstr "Gosod Border Chwith Yn Unig"
 
-#: strings.hrc:387
+#: cui/inc/strings.hrc:378
 msgctxt "RID_SVXSTR_HOR_PRESET_ONLYHOR"
 msgid "Set Top and Bottom Borders, and All Inner Lines"
 msgstr "Gosod Brig a Gwaelod Borderi a Phob Llinell Fewnol"
 
-#: strings.hrc:388
+#: cui/inc/strings.hrc:379
 msgctxt "RID_SVXSTR_VER_PRESET_ONLYVER"
 msgid "Set Left and Right Borders, and All Inner Lines"
 msgstr "Gosod Brig a Gwaelod Borderi a Phob Llinell Fewnol"
 
-#: strings.hrc:389
+#: cui/inc/strings.hrc:380
 msgctxt "RID_SVXSTR_SHADOW_STYLE_NONE"
 msgid "No Shadow"
 msgstr "Dim Cysgod"
 
-#: strings.hrc:390
+#: cui/inc/strings.hrc:381
 msgctxt "RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT"
 msgid "Cast Shadow to Bottom Right"
 msgstr "Taflu Cysgod i'r Gwaelod De"
 
-#: strings.hrc:391
+#: cui/inc/strings.hrc:382
 msgctxt "RID_SVXSTR_SHADOW_STYLE_TOPRIGHT"
 msgid "Cast Shadow to Top Right"
 msgstr "Taflu Cysgod i'r Brig De"
 
-#: strings.hrc:392
+#: cui/inc/strings.hrc:383
 msgctxt "RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT"
 msgid "Cast Shadow to Bottom Left"
 msgstr "Taflu Cysgod i'r Gwaelod Chwith"
 
-#: strings.hrc:393
+#: cui/inc/strings.hrc:384
 msgctxt "RID_SVXSTR_SHADOW_STYLE_TOPLEFT"
 msgid "Cast Shadow to Top Left"
 msgstr "Taflu Cysgod i'r Brig Chwith"
 
-#: treeopt.hrc:30
+#: cui/inc/strings.hrc:385
+msgctxt "RID_SVXSTR_SIGNATURELINE_SIGNED_BY"
+msgid "Signed by: %1"
+msgstr "Llofnodwyd gan: %1"
+
+#: cui/inc/treeopt.hrc:30
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "%PRODUCTNAME"
 msgstr "%PRODUCTNAME"
 
-#: treeopt.hrc:31
+#: cui/inc/treeopt.hrc:31
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "User Data"
 msgstr "Data Defnyddiwr"
 
-#: treeopt.hrc:32
+#: cui/inc/treeopt.hrc:32
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: treeopt.hrc:33
+#: cui/inc/treeopt.hrc:33
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "View"
 msgstr "Golwg"
 
-#: treeopt.hrc:34
+#: cui/inc/treeopt.hrc:34
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "Print"
 msgstr "Argraffu"
 
-#: treeopt.hrc:35
+#: cui/inc/treeopt.hrc:35
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "Paths"
 msgstr "Llwybrau"
 
-#: treeopt.hrc:36
+#: cui/inc/treeopt.hrc:36
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "Fonts"
 msgstr "Ffontiau"
 
-#: treeopt.hrc:37
+#: cui/inc/treeopt.hrc:37
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "Security"
 msgstr "Diogelwch"
 
-#: treeopt.hrc:38
+#: cui/inc/treeopt.hrc:38
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "Personalization"
 msgstr "Personoli"
 
-#: treeopt.hrc:39
+#: cui/inc/treeopt.hrc:39
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "Application Colors"
 msgstr "Lliwiau Rhaglenni"
 
-#: treeopt.hrc:40
+#: cui/inc/treeopt.hrc:40
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "Accessibility"
 msgstr "Hygyrchedd"
 
-#: treeopt.hrc:41
+#: cui/inc/treeopt.hrc:41
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "Advanced"
 msgstr "Uwch"
 
-#: treeopt.hrc:42
+#: cui/inc/treeopt.hrc:42
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "Basic IDE"
 msgstr "IDE Basic"
 
-#: treeopt.hrc:43
+#: cui/inc/treeopt.hrc:43
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "Online Update"
 msgstr "Diweddariad Ar-lein"
 
-#: treeopt.hrc:44
+#: cui/inc/treeopt.hrc:44
 msgctxt "SID_GENERAL_OPTIONS_RES"
 msgid "OpenCL"
 msgstr "OpenCL"
 
-#: treeopt.hrc:49
+#: cui/inc/treeopt.hrc:49
 msgctxt "SID_LANGUAGE_OPTIONS_RES"
 msgid "Language Settings"
 msgstr "Gosodiadau Iaith"
 
-#: treeopt.hrc:50
+#: cui/inc/treeopt.hrc:50
 msgctxt "SID_LANGUAGE_OPTIONS_RES"
 msgid "Languages"
 msgstr "Ieithoedd"
 
-#: treeopt.hrc:51
+#: cui/inc/treeopt.hrc:51
 msgctxt "SID_LANGUAGE_OPTIONS_RES"
 msgid "Writing Aids"
 msgstr "Cymhorthion Ysgrifennu"
 
-#: treeopt.hrc:52
+#: cui/inc/treeopt.hrc:52
 msgctxt "SID_LANGUAGE_OPTIONS_RES"
 msgid "Searching in Japanese"
 msgstr "Chwilio mewn Japanëeg"
 
-#: treeopt.hrc:53
+#: cui/inc/treeopt.hrc:53
 msgctxt "SID_LANGUAGE_OPTIONS_RES"
 msgid "Asian Layout"
 msgstr "Cynllun Asiaidd"
 
-#: treeopt.hrc:54
+#: cui/inc/treeopt.hrc:54
 msgctxt "SID_LANGUAGE_OPTIONS_RES"
 msgid "Complex Text Layout"
 msgstr "Cynllun Testun Cymhleth"
 
-#: treeopt.hrc:59
+#: cui/inc/treeopt.hrc:59
 msgctxt "SID_INET_DLG_RES"
 msgid "Internet"
 msgstr "Rhyngrwyd"
 
-#: treeopt.hrc:60
+#: cui/inc/treeopt.hrc:60
 msgctxt "SID_INET_DLG_RES"
 msgid "Proxy"
 msgstr "Dirprwy"
 
-#: treeopt.hrc:61
+#: cui/inc/treeopt.hrc:61
 msgctxt "SID_INET_DLG_RES"
 msgid "E-mail"
 msgstr "E-bost"
 
-#: treeopt.hrc:66
+#: cui/inc/treeopt.hrc:66
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "%PRODUCTNAME Writer"
 msgstr "Writer %PRODUCTNAME"
 
-#: treeopt.hrc:67
+#: cui/inc/treeopt.hrc:67
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: treeopt.hrc:68
+#: cui/inc/treeopt.hrc:68
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "View"
 msgstr "Golwg"
 
-#: treeopt.hrc:69
+#: cui/inc/treeopt.hrc:69
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Formatting Aids"
 msgstr "Cymhorthion Fformatio"
 
-#: treeopt.hrc:70
+#: cui/inc/treeopt.hrc:70
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Grid"
 msgstr "Grid"
 
-#: treeopt.hrc:71
+#: cui/inc/treeopt.hrc:71
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Basic Fonts (Western)"
 msgstr "Ffontiau Sylfaenol (Gorllewinol)"
 
-#: treeopt.hrc:72
+#: cui/inc/treeopt.hrc:72
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Basic Fonts (Asian)"
 msgstr "Ffontiau Sylfaenol (Asiaidd)"
 
-#: treeopt.hrc:73
+#: cui/inc/treeopt.hrc:73
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Basic Fonts (CTL)"
 msgstr "Ffontiau Sylfaenol (CTL)"
 
-#: treeopt.hrc:74
+#: cui/inc/treeopt.hrc:74
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Print"
 msgstr "Argraffu"
 
-#: treeopt.hrc:75
+#: cui/inc/treeopt.hrc:75
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Table"
 msgstr "Tabl"
 
-#: treeopt.hrc:76
+#: cui/inc/treeopt.hrc:76
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Changes"
 msgstr "Newidiadau"
 
-#: treeopt.hrc:77
+#: cui/inc/treeopt.hrc:77
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Comparison"
 msgstr "Cymhariaeth"
 
-#: treeopt.hrc:78
+#: cui/inc/treeopt.hrc:78
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Compatibility"
 msgstr "Cydweddiad"
 
-#: treeopt.hrc:79
+#: cui/inc/treeopt.hrc:79
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "AutoCaption"
 msgstr "AwtoBennawd"
 
-#: treeopt.hrc:80
+#: cui/inc/treeopt.hrc:80
 msgctxt "SID_SW_EDITOPTIONS_RES"
 msgid "Mail Merge E-mail"
 msgstr "Post Cyfuno E-bost"
 
-#: treeopt.hrc:85
+#: cui/inc/treeopt.hrc:85
 msgctxt "SID_SW_ONLINEOPTIONS_RES"
 msgid "%PRODUCTNAME Writer/Web"
 msgstr "Writer/Web %PRODUCTNAME"
 
-#: treeopt.hrc:86
+#: cui/inc/treeopt.hrc:86
 msgctxt "SID_SW_ONLINEOPTIONS_RES"
 msgid "View"
 msgstr "Golwg"
 
-#: treeopt.hrc:87
+#: cui/inc/treeopt.hrc:87
 msgctxt "SID_SW_ONLINEOPTIONS_RES"
 msgid "Formatting Aids"
 msgstr "Cymhorthion Fformatio"
 
-#: treeopt.hrc:88
+#: cui/inc/treeopt.hrc:88
 msgctxt "SID_SW_ONLINEOPTIONS_RES"
 msgid "Grid"
 msgstr "Grid"
 
-#: treeopt.hrc:89
+#: cui/inc/treeopt.hrc:89
 msgctxt "SID_SW_ONLINEOPTIONS_RES"
 msgid "Print"
 msgstr "Argraffu"
 
-#: treeopt.hrc:90
+#: cui/inc/treeopt.hrc:90
 msgctxt "SID_SW_ONLINEOPTIONS_RES"
 msgid "Table"
 msgstr "Tabl"
 
-#: treeopt.hrc:91
+#: cui/inc/treeopt.hrc:91
 msgctxt "SID_SW_ONLINEOPTIONS_RES"
 msgid "Background"
 msgstr "Cefndir"
 
-#: treeopt.hrc:96
+#: cui/inc/treeopt.hrc:96
 msgctxt "SID_SM_EDITOPTIONS_RES"
 msgid "%PRODUCTNAME Math"
 msgstr "Math %PRODUCTNAME"
 
-#: treeopt.hrc:97
+#: cui/inc/treeopt.hrc:97
 msgctxt "SID_SM_EDITOPTIONS_RES"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: treeopt.hrc:102
+#: cui/inc/treeopt.hrc:102
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "%PRODUCTNAME Calc"
 msgstr "%PRODUCTNAME Calc"
 
-#: treeopt.hrc:103
+#: cui/inc/treeopt.hrc:103
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: treeopt.hrc:104
+#: cui/inc/treeopt.hrc:104
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "Defaults"
 msgstr "Rhagosodiadau"
 
-#: treeopt.hrc:105
+#: cui/inc/treeopt.hrc:105
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "View"
 msgstr "Golwg"
 
-#: treeopt.hrc:106
+#: cui/inc/treeopt.hrc:106
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "Calculate"
 msgstr "Cyfrifo"
 
-#: treeopt.hrc:107
+#: cui/inc/treeopt.hrc:107
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: treeopt.hrc:108
+#: cui/inc/treeopt.hrc:108
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "Sort Lists"
 msgstr "Rhestrau Trefnu"
 
-#: treeopt.hrc:109
+#: cui/inc/treeopt.hrc:109
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "Changes"
 msgstr "Newidiadau"
 
-#: treeopt.hrc:110
+#: cui/inc/treeopt.hrc:110
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "Compatibility"
 msgstr "Cytunedd"
 
-#: treeopt.hrc:111
+#: cui/inc/treeopt.hrc:111
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "Grid"
 msgstr "Grid"
 
-#: treeopt.hrc:112
+#: cui/inc/treeopt.hrc:112
 msgctxt "SID_SC_EDITOPTIONS_RES"
 msgid "Print"
 msgstr "Argraffu"
 
-#: treeopt.hrc:117
+#: cui/inc/treeopt.hrc:117
 msgctxt "SID_SD_EDITOPTIONS_RES"
 msgid "%PRODUCTNAME Impress"
 msgstr "Impress %PRODUCTNAME"
 
-#: treeopt.hrc:118
+#: cui/inc/treeopt.hrc:118
 msgctxt "SID_SD_EDITOPTIONS_RES"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: treeopt.hrc:119
+#: cui/inc/treeopt.hrc:119
 msgctxt "SID_SD_EDITOPTIONS_RES"
 msgid "View"
 msgstr "Golwg"
 
-#: treeopt.hrc:120
+#: cui/inc/treeopt.hrc:120
 msgctxt "SID_SD_EDITOPTIONS_RES"
 msgid "Grid"
 msgstr "Grid"
 
-#: treeopt.hrc:121
+#: cui/inc/treeopt.hrc:121
 msgctxt "SID_SD_EDITOPTIONS_RES"
 msgid "Print"
 msgstr "Argraffu"
 
-#: treeopt.hrc:126
+#: cui/inc/treeopt.hrc:126
 msgctxt "SID_SD_GRAPHIC_OPTIONS_RES"
 msgid "%PRODUCTNAME Draw"
 msgstr "Draw %PRODUCTNAME"
 
-#: treeopt.hrc:127
+#: cui/inc/treeopt.hrc:127
 msgctxt "SID_SD_GRAPHIC_OPTIONS_RES"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: treeopt.hrc:128
+#: cui/inc/treeopt.hrc:128
 msgctxt "SID_SD_GRAPHIC_OPTIONS_RES"
 msgid "View"
 msgstr "Golwg"
 
-#: treeopt.hrc:129
+#: cui/inc/treeopt.hrc:129
 msgctxt "SID_SD_GRAPHIC_OPTIONS_RES"
 msgid "Grid"
 msgstr "Grid"
 
-#: treeopt.hrc:130
+#: cui/inc/treeopt.hrc:130
 msgctxt "SID_SD_GRAPHIC_OPTIONS_RES"
 msgid "Print"
 msgstr "Argraffu"
 
-#: treeopt.hrc:135
+#: cui/inc/treeopt.hrc:135
 msgctxt "SID_SCH_EDITOPTIONS_RES"
 msgid "Charts"
 msgstr "Siartiau"
 
-#: treeopt.hrc:136
+#: cui/inc/treeopt.hrc:136
 msgctxt "SID_SCH_EDITOPTIONS_RES"
 msgid "Default Colors"
 msgstr "Lliwiau Rhagosodedig"
 
-#: treeopt.hrc:141
+#: cui/inc/treeopt.hrc:141
 msgctxt "SID_FILTER_DLG_RES"
 msgid "Load/Save"
 msgstr "Llwytho/Cadw"
 
-#: treeopt.hrc:142
+#: cui/inc/treeopt.hrc:142
 msgctxt "SID_FILTER_DLG_RES"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: treeopt.hrc:143
+#: cui/inc/treeopt.hrc:143
 msgctxt "SID_FILTER_DLG_RES"
 msgid "VBA Properties"
 msgstr "Priodweddau VBA"
 
-#: treeopt.hrc:144
+#: cui/inc/treeopt.hrc:144
 msgctxt "SID_FILTER_DLG_RES"
 msgid "Microsoft Office"
 msgstr "Microsoft Office"
 
-#: treeopt.hrc:145
+#: cui/inc/treeopt.hrc:145
 msgctxt "SID_FILTER_DLG_RES"
 msgid "HTML Compatibility"
 msgstr "Cydweddiad HTML"
 
-#: treeopt.hrc:150
+#: cui/inc/treeopt.hrc:150
 msgctxt "SID_SB_STARBASEOPTIONS_RES"
 msgid "%PRODUCTNAME Base"
 msgstr "Base %PRODUCTNAME"
 
-#: treeopt.hrc:151
+#: cui/inc/treeopt.hrc:151
 msgctxt "SID_SB_STARBASEOPTIONS_RES"
 msgid "Connections"
 msgstr "Cysylltiadau"
 
-#: treeopt.hrc:152
+#: cui/inc/treeopt.hrc:152
 msgctxt "SID_SB_STARBASEOPTIONS_RES"
 msgid "Databases"
 msgstr "Cronfeydd Data"
 
-#: aboutconfigdialog.ui:9
+#: cui/uiconfig/ui/aboutconfigdialog.ui:9
 msgctxt "aboutconfigdialog|AboutConfig"
 msgid "Expert Configuration"
 msgstr "Ffurfweddiad Arbenigwr"
 
-#: aboutconfigdialog.ui:48
+#: cui/uiconfig/ui/aboutconfigdialog.ui:48
 msgctxt "aboutconfigdialog|searchButton"
 msgid "_Search"
 msgstr "_Chwilio"
 
-#: aboutconfigdialog.ui:81
+#: cui/uiconfig/ui/aboutconfigdialog.ui:81
 msgctxt "aboutconfigdialog|preference"
 msgid "Preference Name"
 msgstr "Enw Dewis"
 
-#: aboutconfigdialog.ui:96
+#: cui/uiconfig/ui/aboutconfigdialog.ui:96
 msgctxt "aboutconfigdialog|property"
 msgid "Property"
 msgstr "Priodwedd"
 
-#: aboutconfigdialog.ui:109
+#: cui/uiconfig/ui/aboutconfigdialog.ui:109
 msgctxt "aboutconfigdialog|type"
 msgid "Type"
 msgstr "Math"
 
-#: aboutconfigdialog.ui:122
+#: cui/uiconfig/ui/aboutconfigdialog.ui:122
 msgctxt "aboutconfigdialog|value"
 msgid "Value"
 msgstr "Gwerth"
 
-#: aboutconfigdialog.ui:169
+#: cui/uiconfig/ui/aboutconfigdialog.ui:169
 msgctxt "aboutconfigdialog|edit"
 msgid "Edit"
 msgstr "Golygu"
 
-#: aboutconfigdialog.ui:182
+#: cui/uiconfig/ui/aboutconfigdialog.ui:182
 msgctxt "aboutconfigdialog|reset"
 msgid "Reset"
 msgstr "Ailosod"
 
-#: aboutconfigvaluedialog.ui:9
+#: cui/uiconfig/ui/aboutconfigvaluedialog.ui:9
 msgctxt "aboutconfigvaluedialog|AboutConfigValueDialog"
 msgid "Name"
 msgstr "Enw"
 
-#: aboutconfigvaluedialog.ui:87
+#: cui/uiconfig/ui/aboutconfigvaluedialog.ui:87
 msgctxt "aboutconfigvaluedialog|label1"
 msgid "Value:"
 msgstr "Gwerth:"
 
-#: aboutdialog.ui:6
+#: cui/uiconfig/ui/aboutdialog.ui:6
 msgctxt "aboutdialog|textbuffer1"
 msgid "Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX"
 msgstr "Fersiwn: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX"
 
-#: aboutdialog.ui:11
+#: cui/uiconfig/ui/aboutdialog.ui:11
 msgctxt "aboutdialog|AboutDialog"
 msgid "About %PRODUCTNAME"
 msgstr "Ynghylch %PRODUCTNAME"
 
-#: aboutdialog.ui:25
+#: cui/uiconfig/ui/aboutdialog.ui:25
 msgctxt "aboutdialog|credits"
 msgid "Cre_dits"
 msgstr "_Diolchiadau"
 
-#: aboutdialog.ui:40
+#: cui/uiconfig/ui/aboutdialog.ui:40
 msgctxt "aboutdialog|website"
 msgid "_Website"
 msgstr "_Gwefan"
 
-#: aboutdialog.ui:109
+#: cui/uiconfig/ui/aboutdialog.ui:109
 msgctxt "aboutdialog|logoreplacement"
 msgid "%PRODUCTNAME"
 msgstr "Cymorth %PRODUCTNAME"
 
-#: aboutdialog.ui:128
+#: cui/uiconfig/ui/aboutdialog.ui:128
 msgctxt "aboutdialog|buildid"
 msgid "Build ID: $BUILDID"
 msgstr "Adeiladedd: $BUILDID"
 
-#: aboutdialog.ui:141
+#: cui/uiconfig/ui/aboutdialog.ui:141
 msgctxt "aboutdialog|locale"
 msgid "Locale: $LOCALE"
 msgstr "Locale: $LOCALE"
 
-#: aboutdialog.ui:174
+#: cui/uiconfig/ui/aboutdialog.ui:174
 msgctxt "aboutdialog|buildIdLink"
 msgid "See Log: $GITHASH"
 msgstr "Gweld cofnod: $GITHASH"
 
-#: aboutdialog.ui:191
+#: cui/uiconfig/ui/aboutdialog.ui:191
 msgctxt "aboutdialog|description"
 msgid "%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more."
 msgstr "Mae %PRODUCTNAME yn gasgliad cynhyrchu cod agored modern, hawdd ei ddefnyddio ar gyfer prosesu geiriau, taenlenni, cyflwyniadau a rhagor."
 
-#: aboutdialog.ui:214
+#: cui/uiconfig/ui/aboutdialog.ui:214
 msgctxt "aboutdialog|copyright"
-msgid "Copyright © 2000–2017 LibreOffice contributors."
-msgstr "Hawlfraint © 2000 - 2017 cyfranwyr LibreOffice."
+msgid "Copyright © 2000–2018 LibreOffice contributors."
+msgstr "Hawlfraint © 2000 - 2018 cyfranwyr LibreOffice."
 
-#: aboutdialog.ui:228
+#: cui/uiconfig/ui/aboutdialog.ui:228
 msgctxt "aboutdialog|libreoffice"
 msgid "LibreOffice was based on OpenOffice.org."
 msgstr "Mae LibreOffice yn seiliedig ar OpenOffice.org."
 
-#: aboutdialog.ui:242
+#: cui/uiconfig/ui/aboutdialog.ui:242
 msgctxt "aboutdialog|derived"
 msgid "%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org."
 msgstr "Mae %PRODUCTNAME yn deillio o LibreOffice sy'n seiliedig ar OpenOffice.org."
 
-#: aboutdialog.ui:256
+#: cui/uiconfig/ui/aboutdialog.ui:256
 msgctxt "aboutdialog|vendor"
 msgid "This release was supplied by %OOOVENDOR."
 msgstr "Darparwyd y fersiwn yma gan %OOOVENDOR."
 
-#: aboutdialog.ui:276
+#: cui/uiconfig/ui/aboutdialog.ui:276
 msgctxt "aboutdialog|link"
 msgid "https://www.libreoffice.org/about-us/credits/"
 msgstr "https://www.libreoffice.org/about-us/credits/"
 
-#: accelconfigpage.ui:54
+#: cui/uiconfig/ui/accelconfigpage.ui:54
 msgctxt "accelconfigpage|label21"
 msgid "Shortcu_t Keys"
 msgstr "_Bysellau Llwybr Byr"
 
-#: accelconfigpage.ui:80
+#: cui/uiconfig/ui/accelconfigpage.ui:80
 msgctxt "accelconfigpage|office"
 msgid "%PRODUCTNAME"
 msgstr "%PRODUCTNAME"
 
-#: accelconfigpage.ui:97
+#: cui/uiconfig/ui/accelconfigpage.ui:97
 msgctxt "accelconfigpage|module"
 msgid "$(MODULE)"
 msgstr "$(MODULE)"
 
-#: accelconfigpage.ui:129
+#: cui/uiconfig/ui/accelconfigpage.ui:129
 msgctxt "accelconfigpage|change"
 msgid "_Modify"
 msgstr "_Newid"
 
-#: accelconfigpage.ui:157
+#: cui/uiconfig/ui/accelconfigpage.ui:157
 msgctxt "accelconfigpage|load"
 msgid "_Load..."
 msgstr "_Llwytho..."
 
-#: accelconfigpage.ui:172
+#: cui/uiconfig/ui/accelconfigpage.ui:172
 msgctxt "accelconfigpage|save"
 msgid "_Save..."
 msgstr "_Cadw..."
 
-#: accelconfigpage.ui:247
+#: cui/uiconfig/ui/accelconfigpage.ui:247
 msgctxt "accelconfigpage|searchEntry"
 msgid "Type to search"
 msgstr "Teipiwch i chwilio"
 
-#: accelconfigpage.ui:267
+#: cui/uiconfig/ui/accelconfigpage.ui:267
 msgctxt "accelconfigpage|label23"
 msgid "_Category"
 msgstr "_Categori"
 
-#: accelconfigpage.ui:281
+#: cui/uiconfig/ui/accelconfigpage.ui:281
 msgctxt "accelconfigpage|label24"
 msgid "_Function"
 msgstr "_Swyddogaeth"
 
-#: accelconfigpage.ui:295
+#: cui/uiconfig/ui/accelconfigpage.ui:295
 msgctxt "accelconfigpage|label25"
 msgid "_Keys"
 msgstr "_Bysellau"
 
-#: accelconfigpage.ui:365
+#: cui/uiconfig/ui/accelconfigpage.ui:365
 msgctxt "accelconfigpage|label22"
 msgid "F_unctions"
 msgstr "_Swyddogaethau"
 
-#: acorexceptpage.ui:50
+#: cui/uiconfig/ui/acorexceptpage.ui:50
 msgctxt "acorexceptpage|autoabbrev"
 msgid "_AutoInclude"
 msgstr "_AwtoGynnwys"
 
-#: acorexceptpage.ui:83
+#: cui/uiconfig/ui/acorexceptpage.ui:83
 msgctxt "acorexceptpage|newabbrev-atkobject"
 msgid "New abbreviations"
 msgstr "Talfyriadau newydd"
 
-#: acorexceptpage.ui:95
+#: cui/uiconfig/ui/acorexceptpage.ui:95
 msgctxt "acorexceptpage|replace"
 msgid "_Replace"
 msgstr "_Newid"
 
-#: acorexceptpage.ui:119
+#: cui/uiconfig/ui/acorexceptpage.ui:119
 msgctxt "acorexceptpage|delabbrev-atkobject"
 msgid "Delete abbreviations"
 msgstr "Dileu talfyriadau"
 
-#: acorexceptpage.ui:167
+#: cui/uiconfig/ui/acorexceptpage.ui:167
 msgctxt "acorexceptpage|label1"
 msgid "Abbreviations (no Subsequent Capital)"
 msgstr "Byrfoddau (dim Prif Lythrennau Dilynol)"
 
-#: acorexceptpage.ui:220
+#: cui/uiconfig/ui/acorexceptpage.ui:220
 msgctxt "acorexceptpage|autodouble"
 msgid "A_utoInclude"
 msgstr "_AwtoGynnwys"
 
-#: acorexceptpage.ui:253
+#: cui/uiconfig/ui/acorexceptpage.ui:253
 msgctxt "acorexceptpage|newdouble-atkobject"
 msgid "New words with two initial capitals"
 msgstr "Geiriau newydd gyda dwy brif lythyren cyntaf"
 
-#: acorexceptpage.ui:265
+#: cui/uiconfig/ui/acorexceptpage.ui:265
 msgctxt "acorexceptpage|replace1"
 msgid "_Replace"
 msgstr "_Newid"
 
-#: acorexceptpage.ui:289
+#: cui/uiconfig/ui/acorexceptpage.ui:289
 msgctxt "acorexceptpage|deldouble-atkobject"
 msgid "Delete words with two initial capitals"
 msgstr "Dileu geiriau gyda dwy briflythyren cyntaf"
 
-#: acorexceptpage.ui:337
+#: cui/uiconfig/ui/acorexceptpage.ui:337
 msgctxt "acorexceptpage|label2"
 msgid "Words With TWo INitial CApitals"
 msgstr "Geiriau gyda DWy BRif LYthyren CYchwynnol"
 
-#: acorreplacepage.ui:38
+#: cui/uiconfig/ui/acorreplacepage.ui:38
 msgctxt "acorreplacepage|replace"
 msgid "_Replace"
 msgstr "_Newid"
 
-#: acorreplacepage.ui:121
+#: cui/uiconfig/ui/acorreplacepage.ui:121
 msgctxt "acorreplacepage|label1"
 msgid "Repla_ce"
 msgstr "A_mnewid"
 
-#: acorreplacepage.ui:141
+#: cui/uiconfig/ui/acorreplacepage.ui:141
 msgctxt "acorreplacepage|label2"
 msgid "_With:"
 msgstr "_Gyda:"
 
-#: acorreplacepage.ui:154
+#: cui/uiconfig/ui/acorreplacepage.ui:154
 msgctxt "acorreplacepage|textonly"
 msgid "_Text only"
 msgstr "_Testun yn unig"
 
-#: agingdialog.ui:16
+#: cui/uiconfig/ui/agingdialog.ui:16
 msgctxt "agingdialog|AgingDialog"
 msgid "Aging"
 msgstr "Heneiddio"
 
-#: agingdialog.ui:137
+#: cui/uiconfig/ui/agingdialog.ui:137
 msgctxt "agingdialog|label2"
 msgid "Aging degree:"
 msgstr "Gradd o heneiddio:"
 
-#: agingdialog.ui:160
+#: cui/uiconfig/ui/agingdialog.ui:160
 msgctxt "agingdialog|label1"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: applyautofmtpage.ui:27
+#: cui/uiconfig/ui/applyautofmtpage.ui:27
 msgctxt "applyautofmtpage|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: applyautofmtpage.ui:46
+#: cui/uiconfig/ui/applyautofmtpage.ui:46
 msgctxt "applyautofmtpage|label1"
 msgid "[M]: Replace while modifying existing text"
 msgstr "[M]: Newid wrth newid y testun presennol"
 
-#: applyautofmtpage.ui:60
+#: cui/uiconfig/ui/applyautofmtpage.ui:60
 msgctxt "applyautofmtpage|label2"
 msgid "[T]: AutoCorrect while typing"
 msgstr "[T]: AwtoGywiro wrth deipio"
 
-#: applyautofmtpage.ui:88
+#: cui/uiconfig/ui/applyautofmtpage.ui:88
 msgctxt "applyautofmtpage|m"
 msgid "[M]"
 msgstr "[M]"
 
-#: applyautofmtpage.ui:101
+#: cui/uiconfig/ui/applyautofmtpage.ui:101
 msgctxt "applyautofmtpage|t"
 msgid "[T]"
 msgstr "[T]"
 
-#: applylocalizedpage.ui:30
+#: cui/uiconfig/ui/applylocalizedpage.ui:30
 msgctxt "applylocalizedpage|m"
 msgid "[M]"
 msgstr "[M]"
 
-#: applylocalizedpage.ui:43
+#: cui/uiconfig/ui/applylocalizedpage.ui:43
 msgctxt "applylocalizedpage|t"
 msgid "[T]"
 msgstr "[T]"
 
-#: applylocalizedpage.ui:118
+#: cui/uiconfig/ui/applylocalizedpage.ui:118
 msgctxt "applylocalizedpage|singlereplace"
 msgid "Repla_ce"
 msgstr "A_mnewid"
 
-#: applylocalizedpage.ui:138
+#: cui/uiconfig/ui/applylocalizedpage.ui:138
 msgctxt "applylocalizedpage|startquoteft"
 msgid "_Start quote:"
 msgstr "_Cychwyn dyfyniad:"
 
-#: applylocalizedpage.ui:162
+#: cui/uiconfig/ui/applylocalizedpage.ui:162
 msgctxt "applylocalizedpage|startsingle-atkobject"
 msgid "Start quote of single quotes"
 msgstr "Cychwyn dyfyniad gyda dyfnynodau sengl"
 
-#: applylocalizedpage.ui:178
+#: cui/uiconfig/ui/applylocalizedpage.ui:178
 msgctxt "applylocalizedpage|singlestartex"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: applylocalizedpage.ui:197
+#: cui/uiconfig/ui/applylocalizedpage.ui:197
 msgctxt "applylocalizedpage|defaultsingle"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: applylocalizedpage.ui:205
+#: cui/uiconfig/ui/applylocalizedpage.ui:205
 msgctxt "applylocalizedpage|defaultsingle-atkobject"
 msgid "Single quotes default"
 msgstr "Dyfynodau sengl rhagosodedig"
 
-#: applylocalizedpage.ui:221
+#: cui/uiconfig/ui/applylocalizedpage.ui:221
 msgctxt "applylocalizedpage|endquoteft"
 msgid "_End quote:"
 msgstr "­_Dyfyniad olaf:"
 
-#: applylocalizedpage.ui:245
+#: cui/uiconfig/ui/applylocalizedpage.ui:245
 msgctxt "applylocalizedpage|endsingle-atkobject"
 msgid "End quote of single quotes"
 msgstr "Gorffen dyfyniad gyda dyfynodau sengl"
 
-#: applylocalizedpage.ui:261
+#: cui/uiconfig/ui/applylocalizedpage.ui:261
 msgctxt "applylocalizedpage|singleendex"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: applylocalizedpage.ui:286
+#: cui/uiconfig/ui/applylocalizedpage.ui:286
 msgctxt "applylocalizedpage|label1"
 msgid "Single Quotes"
 msgstr "Dyfynodau Sengl"
 
-#: applylocalizedpage.ui:318
+#: cui/uiconfig/ui/applylocalizedpage.ui:318
 msgctxt "applylocalizedpage|doublereplace"
 msgid "Repla_ce"
 msgstr "A_mnewid"
 
-#: applylocalizedpage.ui:338
+#: cui/uiconfig/ui/applylocalizedpage.ui:338
 msgctxt "applylocalizedpage|label6"
 msgid "_Start quote:"
 msgstr "_Cychwyn dyfyniad:"
 
-#: applylocalizedpage.ui:362
+#: cui/uiconfig/ui/applylocalizedpage.ui:362
 msgctxt "applylocalizedpage|startdouble-atkobject"
 msgid "Start quote of double quotes"
 msgstr "Cychwyn dyfyniad gyda dyfynodau dwbl"
 
-#: applylocalizedpage.ui:378
+#: cui/uiconfig/ui/applylocalizedpage.ui:378
 msgctxt "applylocalizedpage|doublestartex"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: applylocalizedpage.ui:397
+#: cui/uiconfig/ui/applylocalizedpage.ui:397
 msgctxt "applylocalizedpage|defaultdouble"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: applylocalizedpage.ui:405
+#: cui/uiconfig/ui/applylocalizedpage.ui:405
 msgctxt "applylocalizedpage|defaultdouble-atkobject"
 msgid "Double quotes default"
 msgstr "Dyfynodau dwbl rhagosodedig"
 
-#: applylocalizedpage.ui:421
+#: cui/uiconfig/ui/applylocalizedpage.ui:421
 msgctxt "applylocalizedpage|label8"
 msgid "_End quote:"
 msgstr "_Dyfyniad olaf:"
 
-#: applylocalizedpage.ui:445
+#: cui/uiconfig/ui/applylocalizedpage.ui:445
 msgctxt "applylocalizedpage|enddouble-atkobject"
 msgid "End quote of double quotes"
 msgstr "Gorffen dyfyniad gyda dyfynodau dwbl"
 
-#: applylocalizedpage.ui:461
+#: cui/uiconfig/ui/applylocalizedpage.ui:461
 msgctxt "applylocalizedpage|doubleendex"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: applylocalizedpage.ui:486
+#: cui/uiconfig/ui/applylocalizedpage.ui:486
 msgctxt "applylocalizedpage|label10"
 msgid "Double Quotes"
 msgstr "Dyfyniad Dwbl"
 
-#: areadialog.ui:8
+#: cui/uiconfig/ui/areadialog.ui:8
 msgctxt "areadialog|AreaDialog"
 msgid "Area"
 msgstr "Ardal"
 
-#: areadialog.ui:106
+#: cui/uiconfig/ui/areadialog.ui:106
 msgctxt "areadialog|RID_SVXPAGE_AREA"
 msgid "Area"
 msgstr "Ardal"
 
-#: areadialog.ui:128
+#: cui/uiconfig/ui/areadialog.ui:128
 msgctxt "areadialog|RID_SVXPAGE_SHADOW"
 msgid "Shadow"
 msgstr "Cysgod"
 
-#: areadialog.ui:151
+#: cui/uiconfig/ui/areadialog.ui:151
 msgctxt "areadialog|RID_SVXPAGE_TRANSPARENCE"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: areatabpage.ui:29
+#: cui/uiconfig/ui/areatabpage.ui:32
+msgctxt "areatabpage|tablelb"
+msgid "Cell"
+msgstr "Cell"
+
+#: cui/uiconfig/ui/areatabpage.ui:33
+msgctxt "areatabpage|tablelb"
+msgid "Row"
+msgstr "Rhes"
+
+#: cui/uiconfig/ui/areatabpage.ui:34
+msgctxt "areatabpage|tablelb"
+msgid "Table"
+msgstr "Tabl"
+
+#: cui/uiconfig/ui/areatabpage.ui:45
 msgctxt "areatabpage|btnnone"
 msgid "None"
 msgstr "Dim"
 
-#: areatabpage.ui:42
+#: cui/uiconfig/ui/areatabpage.ui:58
 msgctxt "areatabpage|btncolor"
 msgid "Color"
 msgstr "Lliw"
 
-#: areatabpage.ui:55
+#: cui/uiconfig/ui/areatabpage.ui:71
 msgctxt "areatabpage|btngradient"
 msgid "Gradient"
 msgstr "Graddiant"
 
-#: areatabpage.ui:68
-msgctxt "areatabpage|btnhatch"
-msgid "Hatch"
-msgstr "Llinelli"
-
-#: areatabpage.ui:81
+#: cui/uiconfig/ui/areatabpage.ui:84
 msgctxt "areatabpage|btnbitmap"
 msgid "Bitmap"
 msgstr "Didfap"
 
-#: areatabpage.ui:94
+#: cui/uiconfig/ui/areatabpage.ui:97
 msgctxt "areatabpage|btnpattern"
 msgid "Pattern"
 msgstr "Patrwm"
 
-#: asiantypography.ui:25
+#: cui/uiconfig/ui/areatabpage.ui:110
+msgctxt "areatabpage|btnhatch"
+msgid "Hatch"
+msgstr "Llinelli"
+
+#: cui/uiconfig/ui/asiantypography.ui:25
 msgctxt "asiantypography|checkForbidList"
 msgid "Apply list of forbidden characters to the beginning and end of lines"
 msgstr "Gosod rhestr o nodau gwaharddedig ar ddechrau a diwedd llinellau"
 
-#: asiantypography.ui:41
+#: cui/uiconfig/ui/asiantypography.ui:42
 msgctxt "asiantypography|checkHangPunct"
 msgid "Allow hanging punctuation"
 msgstr "Caniatáu atalnodi crog"
 
-#: asiantypography.ui:57
+#: cui/uiconfig/ui/asiantypography.ui:59
 msgctxt "asiantypography|checkApplySpacing"
-msgid "Apply spacing between Asian, Latin and complex text"
-msgstr "Gosod bylchu rhwng testun cymhleth, Asiaidd a Lladin"
+msgid "Apply spacing between Asian and non-Asian text"
+msgstr "Gosod bylchu rhwng testun Asiaidd a rhai eraill"
 
-#: asiantypography.ui:79
+#: cui/uiconfig/ui/asiantypography.ui:82
 msgctxt "asiantypography|labelLineChange"
 msgid "Line Change"
 msgstr "Newid Llinell"
 
-#: assigncomponentdialog.ui:10
+#: cui/uiconfig/ui/assigncomponentdialog.ui:10
 msgctxt "assigncomponentdialog|AssignComponent"
 msgid "Assign Component"
 msgstr "Neilltuo Cydran"
 
-#: assigncomponentdialog.ui:91
+#: cui/uiconfig/ui/assigncomponentdialog.ui:91
 msgctxt "assigncomponentdialog|label1"
 msgid "Component method name:"
 msgstr "Enw dull cydran:"
 
-#: autocorrectdialog.ui:9
+#: cui/uiconfig/ui/autocorrectdialog.ui:9
 msgctxt "autocorrectdialog|AutoCorrectDialog"
 msgid "AutoCorrect"
 msgstr "AwtoGywiro"
 
-#: autocorrectdialog.ui:103
+#: cui/uiconfig/ui/autocorrectdialog.ui:103
 msgctxt "autocorrectdialog|label1"
 msgid "Replacements and exceptions for language:"
 msgstr "Newidiadau ac eithriadau ar gyfer iaith:"
 
-#: autocorrectdialog.ui:149
+#: cui/uiconfig/ui/autocorrectdialog.ui:149
 msgctxt "autocorrectdialog|replace"
 msgid "Replace"
 msgstr "Newid"
 
-#: autocorrectdialog.ui:171
+#: cui/uiconfig/ui/autocorrectdialog.ui:171
 msgctxt "autocorrectdialog|exceptions"
 msgid "Exceptions"
 msgstr "Eithriadau"
 
-#: autocorrectdialog.ui:194
+#: cui/uiconfig/ui/autocorrectdialog.ui:194
 msgctxt "autocorrectdialog|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: autocorrectdialog.ui:217
+#: cui/uiconfig/ui/autocorrectdialog.ui:217
 msgctxt "autocorrectdialog|apply"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: autocorrectdialog.ui:240
+#: cui/uiconfig/ui/autocorrectdialog.ui:240
 msgctxt "autocorrectdialog|localized"
 msgid "Localized Options"
 msgstr "Dewisiadau Lleol"
 
-#: autocorrectdialog.ui:263
+#: cui/uiconfig/ui/autocorrectdialog.ui:263
 msgctxt "autocorrectdialog|wordcompletion"
 msgid "Word Completion"
 msgstr "Cwblhad Geiriau"
 
-#: autocorrectdialog.ui:286
+#: cui/uiconfig/ui/autocorrectdialog.ui:286
 msgctxt "autocorrectdialog|smarttags"
 msgid "Smart Tags"
 msgstr "Tagiau Clyfar"
 
-#: backgroundpage.ui:20
+#: cui/uiconfig/ui/backgroundpage.ui:20
 msgctxt "backgroundpage|liststore1"
 msgid "Color"
 msgstr "Lliw"
 
-#: backgroundpage.ui:24
+#: cui/uiconfig/ui/backgroundpage.ui:24
 msgctxt "backgroundpage|liststore1"
 msgid "Image"
 msgstr "Delwedd"
 
-#: backgroundpage.ui:45
+#: cui/uiconfig/ui/backgroundpage.ui:45
 msgctxt "backgroundpage|asft"
 msgid "A_s:"
 msgstr "_Fel:"
 
-#: backgroundpage.ui:71
+#: cui/uiconfig/ui/backgroundpage.ui:71
 msgctxt "backgroundpage|forft"
 msgid "F_or:"
 msgstr "_Ar gyfer:"
 
-#: backgroundpage.ui:91
+#: cui/uiconfig/ui/backgroundpage.ui:91
 msgctxt "backgroundpage|tablelb"
 msgid "Cell"
 msgstr "Cell"
 
-#: backgroundpage.ui:92
+#: cui/uiconfig/ui/backgroundpage.ui:92
 msgctxt "backgroundpage|tablelb"
 msgid "Row"
 msgstr "Rhes"
 
-#: backgroundpage.ui:93
+#: cui/uiconfig/ui/backgroundpage.ui:93
 msgctxt "backgroundpage|tablelb"
 msgid "Table"
 msgstr "Tabl"
 
-#: backgroundpage.ui:214
+#: cui/uiconfig/ui/backgroundpage.ui:214
 msgctxt "backgroundpage|background_label"
 msgid "Background Color"
 msgstr "Lliw Cefndir"
 
-#: backgroundpage.ui:276
+#: cui/uiconfig/ui/backgroundpage.ui:276
 msgctxt "backgroundpage|unlinkedft"
 msgid "Unlinked image"
 msgstr "Delwedd heb gysylltiad"
 
-#: backgroundpage.ui:288
+#: cui/uiconfig/ui/backgroundpage.ui:288
 msgctxt "backgroundpage|findgraphicsft"
 msgid "Find images"
 msgstr "Canfod delweddau"
 
-#: backgroundpage.ui:304
+#: cui/uiconfig/ui/backgroundpage.ui:304
 msgctxt "backgroundpage|browse"
 msgid "_Browse..."
 msgstr "_Pori..."
 
-#: backgroundpage.ui:317
+#: cui/uiconfig/ui/backgroundpage.ui:317
 msgctxt "backgroundpage|link"
 msgid "_Link"
 msgstr "_Cysylltu"
 
-#: backgroundpage.ui:345
+#: cui/uiconfig/ui/backgroundpage.ui:345
 msgctxt "backgroundpage|label2"
 msgid "File"
 msgstr "Ffeil"
 
-#: backgroundpage.ui:403
+#: cui/uiconfig/ui/backgroundpage.ui:403
 msgctxt "backgroundpage|positionrb"
 msgid "_Position"
 msgstr "_Safle"
 
-#: backgroundpage.ui:423
+#: cui/uiconfig/ui/backgroundpage.ui:423
 msgctxt "backgroundpage|arearb"
 msgid "Ar_ea"
 msgstr "_Ardal"
 
-#: backgroundpage.ui:439
+#: cui/uiconfig/ui/backgroundpage.ui:439
 msgctxt "backgroundpage|tilerb"
 msgid "_Tile"
 msgstr "_Teilio"
 
-#: backgroundpage.ui:467
+#: cui/uiconfig/ui/backgroundpage.ui:467
 msgctxt "backgroundpage|label8"
 msgid "Type"
 msgstr "Math"
 
-#: backgroundpage.ui:506
+#: cui/uiconfig/ui/backgroundpage.ui:506
 msgctxt "backgroundpage|showpreview"
 msgid "Pre_view"
 msgstr "_Rhagolwg"
 
-#: baselinksdialog.ui:9
+#: cui/uiconfig/ui/baselinksdialog.ui:9
 msgctxt "baselinksdialog|BaseLinksDialog"
 msgid "Edit Links"
 msgstr "Golygu Cysylltiadau"
 
-#: baselinksdialog.ui:54
+#: cui/uiconfig/ui/baselinksdialog.ui:54
 msgctxt "baselinksdialog|UPDATE_NOW"
 msgid "_Update"
 msgstr "_Diweddaru"
 
-#: baselinksdialog.ui:69
+#: cui/uiconfig/ui/baselinksdialog.ui:69
 msgctxt "baselinksdialog|CHANGE_SOURCE"
 msgid "_Modify..."
 msgstr "_Addasu..."
 
-#: baselinksdialog.ui:84
+#: cui/uiconfig/ui/baselinksdialog.ui:84
 msgctxt "baselinksdialog|BREAK_LINK"
 msgid "_Break Link"
 msgstr "_Datgysylltu"
 
-#: baselinksdialog.ui:132
+#: cui/uiconfig/ui/baselinksdialog.ui:132
 msgctxt "baselinksdialog|FILES"
 msgid "Source file"
 msgstr "Ffeil ffynhonnell"
 
-#: baselinksdialog.ui:146
+#: cui/uiconfig/ui/baselinksdialog.ui:146
 msgctxt "baselinksdialog|LINKS"
 msgid "Element:"
 msgstr "Elfen:"
 
-#: baselinksdialog.ui:160
+#: cui/uiconfig/ui/baselinksdialog.ui:160
 msgctxt "baselinksdialog|TYPE"
 msgid "Type"
 msgstr "Math"
 
-#: baselinksdialog.ui:175
+#: cui/uiconfig/ui/baselinksdialog.ui:175
 msgctxt "baselinksdialog|STATUS"
 msgid "Status"
 msgstr "Statws"
 
-#: baselinksdialog.ui:202
+#: cui/uiconfig/ui/baselinksdialog.ui:202
 msgctxt "baselinksdialog|TB_LINKS-atkobject"
 msgid "Edit Links"
 msgstr "Golygu Cysylltiadau"
 
-#: baselinksdialog.ui:231
+#: cui/uiconfig/ui/baselinksdialog.ui:231
 msgctxt "baselinksdialog|FILES2"
 msgid "Source file"
 msgstr "Ffeil ffynhonnell"
 
-#: baselinksdialog.ui:247
+#: cui/uiconfig/ui/baselinksdialog.ui:247
 msgctxt "baselinksdialog|SOURCE2"
 msgid "Element:"
 msgstr "Elfen:"
 
-#: baselinksdialog.ui:261
+#: cui/uiconfig/ui/baselinksdialog.ui:261
 msgctxt "baselinksdialog|TYPE2"
 msgid "Type:"
 msgstr "Math:"
 
-#: baselinksdialog.ui:275
+#: cui/uiconfig/ui/baselinksdialog.ui:275
 msgctxt "baselinksdialog|UPDATE"
 msgid "Update:"
 msgstr "Diweddaru:"
 
-#: baselinksdialog.ui:352
+#: cui/uiconfig/ui/baselinksdialog.ui:352
 msgctxt "baselinksdialog|AUTOMATIC"
 msgid "_Automatic"
 msgstr "_Awtomatig"
 
-#: baselinksdialog.ui:372
+#: cui/uiconfig/ui/baselinksdialog.ui:372
 msgctxt "baselinksdialog|MANUAL"
 msgid "Ma_nual"
 msgstr "_Gyda llaw"
 
-#: bitmaptabpage.ui:46
+#: cui/uiconfig/ui/bitmaptabpage.ui:46
 msgctxt "bitmaptabpage|BTN_IMPORT"
 msgid "Add / Import"
 msgstr "Ychwanegu / Mewnforio"
 
-#: bitmaptabpage.ui:65
+#: cui/uiconfig/ui/bitmaptabpage.ui:65
 msgctxt "bitmaptabpage|label1"
 msgid "Bitmap"
 msgstr "Didfap"
 
-#: bitmaptabpage.ui:110
+#: cui/uiconfig/ui/bitmaptabpage.ui:110
 msgctxt "bitmaptabpage|label3"
 msgid "Style:"
 msgstr "Arddull:"
 
-#: bitmaptabpage.ui:126
+#: cui/uiconfig/ui/bitmaptabpage.ui:126
 msgctxt "bitmaptabpage|bitmapstyle"
-msgid "Original"
-msgstr "Gwreiddiol"
+msgid "Custom position/size"
+msgstr "Safle/maint cyfaddas"
 
-#: bitmaptabpage.ui:127
+#: cui/uiconfig/ui/bitmaptabpage.ui:127
 msgctxt "bitmaptabpage|bitmapstyle"
-msgid "Filled"
-msgstr "Llanwyd"
+msgid "Tiled"
+msgstr "Teilsio"
 
-#: bitmaptabpage.ui:128
+#: cui/uiconfig/ui/bitmaptabpage.ui:128
 msgctxt "bitmaptabpage|bitmapstyle"
 msgid "Stretched"
 msgstr "Estynedig"
 
-#: bitmaptabpage.ui:129
-msgctxt "bitmaptabpage|bitmapstyle"
-msgid "Zoomed"
-msgstr "Chwyddwyd"
-
-#: bitmaptabpage.ui:130
-msgctxt "bitmaptabpage|bitmapstyle"
-msgid "Custom"
-msgstr "Cyfaddas"
-
-#: bitmaptabpage.ui:131
-msgctxt "bitmaptabpage|bitmapstyle"
-msgid "Tiled"
-msgstr "Teilsio"
-
-#: bitmaptabpage.ui:157
+#: cui/uiconfig/ui/bitmaptabpage.ui:154
 msgctxt "bitmaptabpage|label4"
 msgid "Size:"
 msgstr "Maint:"
 
-#: bitmaptabpage.ui:175
+#: cui/uiconfig/ui/bitmaptabpage.ui:172
 msgctxt "bitmaptabpage|label5"
 msgid "Width:"
 msgstr "Lled:"
 
-#: bitmaptabpage.ui:201
+#: cui/uiconfig/ui/bitmaptabpage.ui:198
 msgctxt "bitmaptabpage|label6"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: bitmaptabpage.ui:232
+#: cui/uiconfig/ui/bitmaptabpage.ui:229
 msgctxt "bitmaptabpage|scaletsb"
 msgid "Scale"
 msgstr "Graddfa"
 
-#: bitmaptabpage.ui:262
+#: cui/uiconfig/ui/bitmaptabpage.ui:260
 msgctxt "bitmaptabpage|label7"
 msgid "Position:"
 msgstr "Lleoliad:"
 
-#: bitmaptabpage.ui:278
+#: cui/uiconfig/ui/bitmaptabpage.ui:276
 msgctxt "bitmaptabpage|positionlb"
 msgid "Top Left"
 msgstr "Chwith Uchaf"
 
-#: bitmaptabpage.ui:279
+#: cui/uiconfig/ui/bitmaptabpage.ui:277
 msgctxt "bitmaptabpage|positionlb"
 msgid "Top Center"
 msgstr "Canol Uchaf"
 
-#: bitmaptabpage.ui:280
+#: cui/uiconfig/ui/bitmaptabpage.ui:278
 msgctxt "bitmaptabpage|positionlb"
 msgid "Top Right"
 msgstr "De Uchaf"
 
-#: bitmaptabpage.ui:281
+#: cui/uiconfig/ui/bitmaptabpage.ui:279
 msgctxt "bitmaptabpage|positionlb"
 msgid "Center Left"
 msgstr "Canol Chwith"
 
-#: bitmaptabpage.ui:282
+#: cui/uiconfig/ui/bitmaptabpage.ui:280
 msgctxt "bitmaptabpage|positionlb"
 msgid "Center"
 msgstr "Canol"
 
-#: bitmaptabpage.ui:283
+#: cui/uiconfig/ui/bitmaptabpage.ui:281
 msgctxt "bitmaptabpage|positionlb"
 msgid "Center Right"
 msgstr "Canol De"
 
-#: bitmaptabpage.ui:284
+#: cui/uiconfig/ui/bitmaptabpage.ui:282
 msgctxt "bitmaptabpage|positionlb"
 msgid "Bottom Left"
 msgstr "Gwaelod Chwith"
 
-#: bitmaptabpage.ui:285
+#: cui/uiconfig/ui/bitmaptabpage.ui:283
 msgctxt "bitmaptabpage|positionlb"
 msgid "Bottom Center"
 msgstr "Gwaelod Chwith"
 
-#: bitmaptabpage.ui:286
+#: cui/uiconfig/ui/bitmaptabpage.ui:284
 msgctxt "bitmaptabpage|positionlb"
 msgid "Bottom Right"
 msgstr "Gwaelod De"
 
-#: bitmaptabpage.ui:312
+#: cui/uiconfig/ui/bitmaptabpage.ui:310
 msgctxt "bitmaptabpage|label9"
 msgid "Tiling Position:"
 msgstr "Lleoliad Teilsio:"
 
-#: bitmaptabpage.ui:331
+#: cui/uiconfig/ui/bitmaptabpage.ui:329
 msgctxt "bitmaptabpage|label10"
 msgid "X-Offset:"
 msgstr "Atred X:"
 
-#: bitmaptabpage.ui:356
+#: cui/uiconfig/ui/bitmaptabpage.ui:354
 msgctxt "bitmaptabpage|label11"
 msgid "Y-Offset:"
 msgstr "Atred Y:"
 
-#: bitmaptabpage.ui:401
+#: cui/uiconfig/ui/bitmaptabpage.ui:399
 msgctxt "bitmaptabpage|label15"
 msgid "Tiling Offset:"
 msgstr "Atred Teilsio:"
 
-#: bitmaptabpage.ui:423
+#: cui/uiconfig/ui/bitmaptabpage.ui:421
 msgctxt "bitmaptabpage|tileofflb"
 msgid "Row"
 msgstr "Rhes"
 
-#: bitmaptabpage.ui:424
+#: cui/uiconfig/ui/bitmaptabpage.ui:422
 msgctxt "bitmaptabpage|tileofflb"
 msgid "Column"
 msgstr "Colofn"
 
-#: bitmaptabpage.ui:467
+#: cui/uiconfig/ui/bitmaptabpage.ui:465
 msgctxt "bitmaptabpage|label2"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: bitmaptabpage.ui:510
+#: cui/uiconfig/ui/bitmaptabpage.ui:508
 msgctxt "bitmaptabpage|CTL_BITMAP_PREVIEW-atkobject"
 msgid "Example"
 msgstr "Esiampl"
 
-#: bitmaptabpage.ui:528
+#: cui/uiconfig/ui/bitmaptabpage.ui:526
 msgctxt "bitmaptabpage|label8"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: blackorwhitelistentrydialog.ui:14
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:14
 msgctxt "blackorwhitelistentrydialog|os-liststore"
 msgid "Any"
 msgstr "Unrhyw un"
 
-#: blackorwhitelistentrydialog.ui:188
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:188
 msgctxt "blackorwhitelistentrydialog|label4"
 msgid "Operating system:"
 msgstr "System weithredu:"
 
-#: blackorwhitelistentrydialog.ui:201
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:201
 msgctxt "blackorwhitelistentrydialog|label5"
 msgid "Version:"
 msgstr "Fersiwn:"
 
-#: blackorwhitelistentrydialog.ui:214
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:214
 msgctxt "blackorwhitelistentrydialog|label6"
 msgid "OpenCL vendor:"
 msgstr "Gwerthwr OpenCL:"
 
-#: blackorwhitelistentrydialog.ui:227
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:227
 msgctxt "blackorwhitelistentrydialog|label7"
 msgid "Device:"
 msgstr "Dyfais:"
 
-#: blackorwhitelistentrydialog.ui:240
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:240
 msgctxt "blackorwhitelistentrydialog|label8"
 msgid "Driver version:"
 msgstr "Fersiwn Gyrrwr:"
 
-#: blackorwhitelistentrydialog.ui:258
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:258
 msgctxt "blackorwhitelistentrydialog|bledittitle"
 msgid "Edit OpenCL Blacklist Entry"
 msgstr "Golygu rhestr ddu OpenCL"
 
-#: blackorwhitelistentrydialog.ui:269
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:269
 msgctxt "blackorwhitelistentrydialog|bladdtitle"
 msgid "Create OpenCL Blacklist Entry"
 msgstr "Creu Cofnod Rhestr Ddu OpenCL"
 
-#: blackorwhitelistentrydialog.ui:280
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:280
 msgctxt "blackorwhitelistentrydialog|wledittitle"
 msgid "Edit OpenCL Whitelist Entry"
 msgstr "Golygu Cofnod Rhestr Wen OpenCL"
 
-#: blackorwhitelistentrydialog.ui:291
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:291
 msgctxt "blackorwhitelistentrydialog|wladdtitle"
 msgid "Create OpenCL Whitelist Entry"
 msgstr "Creu Cofnod Rhestr Wen OpenCL"
 
-#: blackorwhitelistentrydialog.ui:306
+#: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:306
 msgctxt "blackorwhitelistentrydialog|label1"
 msgid "OpenCL Information"
 msgstr "Manylion OpenCL"
 
-#: borderareatransparencydialog.ui:8
+#: cui/uiconfig/ui/borderareatransparencydialog.ui:8
 msgctxt "borderareatransparencydialog|BorderAreaTransparencyDialog"
 msgid "Border / Background"
 msgstr "Border / Cefndir"
 
-#: borderareatransparencydialog.ui:106
+#: cui/uiconfig/ui/borderareatransparencydialog.ui:106
 msgctxt "borderareatransparencydialog|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: borderareatransparencydialog.ui:128
+#: cui/uiconfig/ui/borderareatransparencydialog.ui:128
 msgctxt "borderareatransparencydialog|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: borderareatransparencydialog.ui:151
+#: cui/uiconfig/ui/borderareatransparencydialog.ui:151
 msgctxt "borderareatransparencydialog|transparence"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: borderbackgrounddialog.ui:8
+#: cui/uiconfig/ui/borderbackgrounddialog.ui:8
 msgctxt "borderbackgrounddialog|BorderBackgroundDialog"
 msgid "Border / Background"
 msgstr "Border / Cefndir"
 
-#: borderbackgrounddialog.ui:106
+#: cui/uiconfig/ui/borderbackgrounddialog.ui:106
 msgctxt "borderbackgrounddialog|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: borderbackgrounddialog.ui:128
+#: cui/uiconfig/ui/borderbackgrounddialog.ui:128
 msgctxt "borderbackgrounddialog|background"
 msgid "Background"
 msgstr "Cefndir"
 
-#: borderpage.ui:71
+#: cui/uiconfig/ui/borderpage.ui:71
 msgctxt "borderpage|userdefft"
 msgid "_User-defined:"
 msgstr "_Defnyddiwr diffiniedig:"
 
-#: borderpage.ui:85
+#: cui/uiconfig/ui/borderpage.ui:85
 msgctxt "borderpage|label14"
 msgid "Pr_esets:"
 msgstr "R_hagosodiadau:"
 
-#: borderpage.ui:110
+#: cui/uiconfig/ui/borderpage.ui:110
 msgctxt "borderpage|rmadjcellbordersft"
 msgid "_Adjacent Cells:"
 msgstr "Ce_lloedd Cyfagos:"
 
-#: borderpage.ui:121
+#: cui/uiconfig/ui/borderpage.ui:121
 msgctxt "borderpage|rmadjcellborders"
 msgid "Remove border"
 msgstr "Tynnu'r ymyl"
 
-#: borderpage.ui:141
+#: cui/uiconfig/ui/borderpage.ui:142
 msgctxt "borderpage|label8"
 msgid "Line Arrangement"
 msgstr "Trefn Llinellau"
 
-#: borderpage.ui:175
+#: cui/uiconfig/ui/borderpage.ui:176
 msgctxt "borderpage|label15"
 msgid "St_yle:"
 msgstr "Ar_ddull:"
 
-#: borderpage.ui:189
+#: cui/uiconfig/ui/borderpage.ui:190
 msgctxt "borderpage|label16"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: borderpage.ui:203
+#: cui/uiconfig/ui/borderpage.ui:204
 msgctxt "borderpage|label17"
 msgid "_Color:"
 msgstr "_Lliw:"
 
-#: borderpage.ui:253
+#: cui/uiconfig/ui/borderpage.ui:253
 msgctxt "borderpage|label9"
 msgid "Line"
 msgstr "Llinell"
 
-#: borderpage.ui:340
+#: cui/uiconfig/ui/borderpage.ui:336
 msgctxt "borderpage|leftft"
 msgid "_Left:"
 msgstr "_Chwith:"
 
-#: borderpage.ui:354
+#: cui/uiconfig/ui/borderpage.ui:350
 msgctxt "borderpage|rightft"
 msgid "Right:"
 msgstr "De:"
 
-#: borderpage.ui:368
+#: cui/uiconfig/ui/borderpage.ui:364
 msgctxt "borderpage|topft"
 msgid "_Top:"
 msgstr "_Brig:"
 
-#: borderpage.ui:382
+#: cui/uiconfig/ui/borderpage.ui:378
 msgctxt "borderpage|bottomft"
 msgid "_Bottom:"
 msgstr "_Gwaelod:"
 
-#: borderpage.ui:393
+#: cui/uiconfig/ui/borderpage.ui:389
 msgctxt "borderpage|sync"
 msgid "Synchronize"
 msgstr "Cydweddu"
 
-#: borderpage.ui:414
+#: cui/uiconfig/ui/borderpage.ui:411
 msgctxt "borderpage|label10"
 msgid "Padding"
 msgstr "Padio"
 
-#: borderpage.ui:457
+#: cui/uiconfig/ui/borderpage.ui:454
 msgctxt "borderpage|label22"
 msgid "_Position:"
 msgstr "_Safle:"
 
-#: borderpage.ui:471
+#: cui/uiconfig/ui/borderpage.ui:468
 msgctxt "borderpage|distanceft"
 msgid "Distan_ce:"
 msgstr "_Pellter:"
 
-#: borderpage.ui:485
+#: cui/uiconfig/ui/borderpage.ui:482
 msgctxt "borderpage|shadowcolorft"
 msgid "C_olor:"
 msgstr "_Lliw:"
 
-#: borderpage.ui:537
+#: cui/uiconfig/ui/borderpage.ui:533
 msgctxt "borderpage|label11"
 msgid "Shadow Style"
 msgstr "Arddull Cysgod"
 
-#: borderpage.ui:570
+#: cui/uiconfig/ui/borderpage.ui:566
 msgctxt "borderpage|mergewithnext"
 msgid "_Merge with next paragraph"
 msgstr "C_yfuno gyda'r paragraff nesaf"
 
-#: borderpage.ui:585
+#: cui/uiconfig/ui/borderpage.ui:581
 msgctxt "borderpage|mergeadjacent"
 msgid "_Merge adjacent line styles"
 msgstr "_Cyfuno arddulliau llinellau cyfagos"
 
-#: borderpage.ui:606
+#: cui/uiconfig/ui/borderpage.ui:602
 msgctxt "borderpage|label12"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: breaknumberoption.ui:15
+#: cui/uiconfig/ui/breaknumberoption.ui:15
 msgctxt "breaknumberoption|BreakNumberOption"
 msgid "Hyphenation"
 msgstr "Cysylltnodi"
 
-#: breaknumberoption.ui:97
+#: cui/uiconfig/ui/breaknumberoption.ui:99
 msgctxt "breaknumberoption|beforelabel"
 msgid "Characters Before Break"
 msgstr "Nodau cyn Toriad"
 
-#: breaknumberoption.ui:136
+#: cui/uiconfig/ui/breaknumberoption.ui:138
 msgctxt "breaknumberoption|afterlabel"
 msgid "Characters After Break"
 msgstr "Nodau wedi Toriad"
 
-#: breaknumberoption.ui:175
+#: cui/uiconfig/ui/breaknumberoption.ui:177
 msgctxt "breaknumberoption|minimallabel"
 msgid "Minimal Word Length"
 msgstr "Hyd Leiaf Gair"
 
-#: calloutdialog.ui:8
+#: cui/uiconfig/ui/calloutdialog.ui:8
 msgctxt "calloutdialog|CalloutDialog"
 msgid "Position and Size"
 msgstr "Safle a maint"
 
-#: calloutdialog.ui:106
+#: cui/uiconfig/ui/calloutdialog.ui:106
 msgctxt "calloutdialog|RID_SVXPAGE_POSITION_SIZE"
 msgid "Position and Size"
 msgstr "Safle a maint"
 
-#: calloutdialog.ui:128
+#: cui/uiconfig/ui/calloutdialog.ui:128
 msgctxt "calloutdialog|RID_SVXPAGE_SWPOSSIZE"
 msgid "Position and Size"
 msgstr "Safle a maint"
 
-#: calloutdialog.ui:151
+#: cui/uiconfig/ui/calloutdialog.ui:151
 msgctxt "calloutdialog|RID_SVXPAGE_CAPTION"
 msgid "Callout"
 msgstr "Galwr"
 
-#: calloutpage.ui:20
+#: cui/uiconfig/ui/calloutpage.ui:20
 msgctxt "calloutpage|liststore1"
 msgid "Optimal"
 msgstr "Gorau"
 
-#: calloutpage.ui:24
+#: cui/uiconfig/ui/calloutpage.ui:24
 msgctxt "calloutpage|liststore1"
 msgid "From top"
 msgstr "O'r brig"
 
-#: calloutpage.ui:28
+#: cui/uiconfig/ui/calloutpage.ui:28
 msgctxt "calloutpage|liststore1"
 msgid "From left"
 msgstr "O'r chwith"
 
-#: calloutpage.ui:32
+#: cui/uiconfig/ui/calloutpage.ui:32
 msgctxt "calloutpage|liststore1"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: calloutpage.ui:36
+#: cui/uiconfig/ui/calloutpage.ui:36
 msgctxt "calloutpage|liststore1"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: calloutpage.ui:74
+#: cui/uiconfig/ui/calloutpage.ui:74
 msgctxt "calloutpage|label2"
 msgid "_Extension:"
 msgstr "_Estyniad:"
 
-#: calloutpage.ui:123
+#: cui/uiconfig/ui/calloutpage.ui:123
 msgctxt "calloutpage|lengthft"
 msgid "_Length:"
 msgstr "_Hyd:"
 
-#: calloutpage.ui:140
+#: cui/uiconfig/ui/calloutpage.ui:140
 msgctxt "calloutpage|optimal"
 msgid "_Optimal"
 msgstr "_Optimal"
 
-#: calloutpage.ui:164
+#: cui/uiconfig/ui/calloutpage.ui:164
 msgctxt "calloutpage|positionft"
 msgid "_Position:"
 msgstr "_Safle:"
 
-#: calloutpage.ui:178
+#: cui/uiconfig/ui/calloutpage.ui:178
 msgctxt "calloutpage|byft"
 msgid "_By:"
 msgstr "_Gan:"
 
-#: calloutpage.ui:192
+#: cui/uiconfig/ui/calloutpage.ui:192
 msgctxt "calloutpage|position"
 msgid "Top"
 msgstr "Brig"
 
-#: calloutpage.ui:193
+#: cui/uiconfig/ui/calloutpage.ui:193
 msgctxt "calloutpage|position"
 msgid "Middle"
 msgstr "Canol"
 
-#: calloutpage.ui:194
+#: cui/uiconfig/ui/calloutpage.ui:194
 msgctxt "calloutpage|position"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: calloutpage.ui:195
+#: cui/uiconfig/ui/calloutpage.ui:195
 msgctxt "calloutpage|position"
 msgid "Left"
 msgstr "Chwith"
 
-#: calloutpage.ui:196
+#: cui/uiconfig/ui/calloutpage.ui:196
 msgctxt "calloutpage|position"
 msgid "Center"
 msgstr "Canol"
 
-#: calloutpage.ui:197
+#: cui/uiconfig/ui/calloutpage.ui:197
 msgctxt "calloutpage|position"
 msgid "Right"
 msgstr "De"
 
-#: calloutpage.ui:234
+#: cui/uiconfig/ui/calloutpage.ui:234
 msgctxt "calloutpage|label1"
 msgid "_Spacing:"
 msgstr "_Bylchu:"
 
-#: calloutpage.ui:312
+#: cui/uiconfig/ui/calloutpage.ui:312
 msgctxt "calloutpage|linetypes"
 msgid "Straight Line"
 msgstr "Llinell Syth"
 
-#: calloutpage.ui:313
+#: cui/uiconfig/ui/calloutpage.ui:313
 msgctxt "calloutpage|linetypes"
 msgid "Angled Line"
 msgstr "Llinell Onglog"
 
-#: calloutpage.ui:314
+#: cui/uiconfig/ui/calloutpage.ui:314
 msgctxt "calloutpage|linetypes"
 msgid "Angled Connector Line"
 msgstr "Llinell Cysylltydd Onglog"
 
-#: cellalignment.ui:24
+#: cui/uiconfig/ui/cellalignment.ui:24
 msgctxt "cellalignment|liststoreHorzAlign"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: cellalignment.ui:28
+#: cui/uiconfig/ui/cellalignment.ui:28
 msgctxt "cellalignment|liststoreHorzAlign"
 msgid "Left"
 msgstr "Chwith"
 
-#: cellalignment.ui:32
+#: cui/uiconfig/ui/cellalignment.ui:32
 msgctxt "cellalignment|liststoreHorzAlign"
 msgid "Center"
 msgstr "Canol"
 
-#: cellalignment.ui:36
+#: cui/uiconfig/ui/cellalignment.ui:36
 msgctxt "cellalignment|liststoreHorzAlign"
 msgid "Right"
 msgstr "De"
 
-#: cellalignment.ui:40
+#: cui/uiconfig/ui/cellalignment.ui:40
 msgctxt "cellalignment|liststoreHorzAlign"
 msgid "Justified"
 msgstr "Unioni"
 
-#: cellalignment.ui:44
+#: cui/uiconfig/ui/cellalignment.ui:44
 msgctxt "cellalignment|liststoreHorzAlign"
 msgid "Filled"
 msgstr "Llanwyd"
 
-#: cellalignment.ui:48
+#: cui/uiconfig/ui/cellalignment.ui:48
 msgctxt "cellalignment|liststoreHorzAlign"
 msgid "Distributed"
 msgstr "Dosbarthiad"
 
-#: cellalignment.ui:62
+#: cui/uiconfig/ui/cellalignment.ui:62
 msgctxt "cellalignment|liststoreVertAlign"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: cellalignment.ui:66
+#: cui/uiconfig/ui/cellalignment.ui:66
 msgctxt "cellalignment|liststoreVertAlign"
 msgid "Top"
 msgstr "Brig"
 
-#: cellalignment.ui:70
+#: cui/uiconfig/ui/cellalignment.ui:70
 msgctxt "cellalignment|liststoreVertAlign"
 msgid "Middle"
 msgstr "Canol"
 
-#: cellalignment.ui:74
+#: cui/uiconfig/ui/cellalignment.ui:74
 msgctxt "cellalignment|liststoreVertAlign"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: cellalignment.ui:78
+#: cui/uiconfig/ui/cellalignment.ui:78
 msgctxt "cellalignment|liststoreVertAlign"
 msgid "Justified"
 msgstr "Unioni"
 
-#: cellalignment.ui:82
+#: cui/uiconfig/ui/cellalignment.ui:82
 msgctxt "cellalignment|liststoreVertAlign"
 msgid "Distributed"
 msgstr "Dosbarthiad"
 
-#: cellalignment.ui:123
+#: cui/uiconfig/ui/cellalignment.ui:123
 msgctxt "cellalignment|labelDegrees"
 msgid "_Degrees:"
 msgstr "_Graddau:"
 
-#: cellalignment.ui:136
+#: cui/uiconfig/ui/cellalignment.ui:137
 msgctxt "cellalignment|labelRefEdge"
 msgid "_Reference edge:"
 msgstr "_Ymyl cyfeirio:"
 
-#: cellalignment.ui:196
+#: cui/uiconfig/ui/cellalignment.ui:196
 msgctxt "cellalignment|checkVertStack"
 msgid "Vertically s_tacked"
 msgstr "_Stacio llorweddol"
 
-#: cellalignment.ui:212
+#: cui/uiconfig/ui/cellalignment.ui:212
 msgctxt "cellalignment|checkAsianMode"
 msgid "Asian layout _mode"
 msgstr "Cynllun _modd Asiaidd"
 
-#: cellalignment.ui:241
+#: cui/uiconfig/ui/cellalignment.ui:241
 msgctxt "cellalignment|labelTextOrient"
 msgid "Text Orientation"
 msgstr "Cyfeiriad Testun"
 
-#: cellalignment.ui:275
+#: cui/uiconfig/ui/cellalignment.ui:275
 msgctxt "cellalignment|checkWrapTextAuto"
 msgid "_Wrap text automatically"
 msgstr "_Amlapio testun yn awtomatig"
 
-#: cellalignment.ui:292
+#: cui/uiconfig/ui/cellalignment.ui:292
 msgctxt "cellalignment|checkShrinkFitCellSize"
 msgid "_Shrink to fit cell size"
 msgstr "_Lleihau i ffitio maint cell"
 
-#: cellalignment.ui:308
+#: cui/uiconfig/ui/cellalignment.ui:308
 msgctxt "cellalignment|checkHyphActive"
 msgid "Hyphenation _active"
 msgstr "Cysylltnodi _gweithredol"
 
-#: cellalignment.ui:334
+#: cui/uiconfig/ui/cellalignment.ui:334
 msgctxt "cellalignment|LabelTxtDir"
 msgid "Te_xt direction:"
 msgstr "C_yfeiriad testun:"
 
-#: cellalignment.ui:369
+#: cui/uiconfig/ui/cellalignment.ui:369
 msgctxt "cellalignment|labelProperties"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: cellalignment.ui:418
+#: cui/uiconfig/ui/cellalignment.ui:417
 msgctxt "cellalignment|labelHorzAlign"
 msgid "Hori_zontal"
 msgstr "Llo_rweddol"
 
-#: cellalignment.ui:432
+#: cui/uiconfig/ui/cellalignment.ui:431
 msgctxt "cellalignment|labelVertAlign"
 msgid "_Vertical"
 msgstr "_Fertigol"
 
-#: cellalignment.ui:446
+#: cui/uiconfig/ui/cellalignment.ui:445
 msgctxt "cellalignment|labelIndent"
 msgid "I_ndent"
 msgstr "_Mewnoliad"
 
-#: cellalignment.ui:487
+#: cui/uiconfig/ui/cellalignment.ui:486
 msgctxt "cellalignment|LabelTextAlig"
 msgid "Text Alignment"
 msgstr "Aliniad Testun"
 
-#: cellalignment.ui:507
+#: cui/uiconfig/ui/cellalignment.ui:506
 msgctxt "cellalignment|labelSTR_BOTTOMLOCK"
 msgid "Text Extension From Lower Cell Border"
 msgstr "Estyniad Testun o Ymyl Isaf Cell"
 
-#: cellalignment.ui:518
+#: cui/uiconfig/ui/cellalignment.ui:517
 msgctxt "cellalignment|labelSTR_TOPLOCK"
 msgid "Text Extension From Upper Cell Border"
 msgstr "Estyniad Testun o Ymyl Uchaf Cell"
 
-#: cellalignment.ui:529
+#: cui/uiconfig/ui/cellalignment.ui:528
 msgctxt "cellalignment|labelSTR_CELLLOCK"
 msgid "Text Extension Inside Cell"
 msgstr "Estyniad Testun o Fewn Cell"
 
-#: cellalignment.ui:540
+#: cui/uiconfig/ui/cellalignment.ui:539
 msgctxt "cellalignment|labelABCD"
 msgid "ABCD"
 msgstr "ABCD"
 
-#: certdialog.ui:9
+#: cui/uiconfig/ui/certdialog.ui:9
 msgctxt "certdialog|CertDialog"
 msgid "Certificate Path"
 msgstr "Llwybr Tystysgrif"
 
-#: certdialog.ui:78
+#: cui/uiconfig/ui/certdialog.ui:78
 msgctxt "certdialog|add"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: certdialog.ui:129
+#: cui/uiconfig/ui/certdialog.ui:129
 msgctxt "certdialog|label2"
 msgid "Select or add the correct Network Security Services Certificate directory to use for digital signatures:"
 msgstr "Dewiswch neu ychwanegwch gyfeiriadur Tystysgrif Gwasanaethau Diogelwch Rhwydwaith i'w ddefnyddio ar gyfer tystysgrifau digidol:"
 
-#: certdialog.ui:151
+#: cui/uiconfig/ui/certdialog.ui:151
 msgctxt "certdialog|manual"
 msgid "manual"
 msgstr "llaw"
 
-#: certdialog.ui:165
+#: cui/uiconfig/ui/certdialog.ui:165
 msgctxt "certdialog|profile"
 msgid "Profile"
 msgstr "Proffil"
 
-#: certdialog.ui:179
+#: cui/uiconfig/ui/certdialog.ui:179
 msgctxt "certdialog|dir"
 msgid "Directory"
 msgstr "Cyfeiriadur"
 
-#: certdialog.ui:192
+#: cui/uiconfig/ui/certdialog.ui:192
 msgctxt "certdialog|certdir"
 msgid "Select a Certificate directory"
 msgstr "Dewiswch gyfeiriadur Tystysgrif"
 
-#: certdialog.ui:235
+#: cui/uiconfig/ui/certdialog.ui:235
 msgctxt "certdialog|label1"
 msgid "Certificate Path"
 msgstr "Llwybr Tystysgrif"
 
-#: charnamepage.ui:46
+#: cui/uiconfig/ui/charnamepage.ui:46
 msgctxt "charnamepage|westlangft-nocjk"
 msgid "Language:"
 msgstr "Iaith:"
 
-#: charnamepage.ui:185
+#: cui/uiconfig/ui/charnamepage.ui:185
 msgctxt "charnamepage|westsizeft-nocjk"
 msgid "Size:"
 msgstr "Maint:"
 
-#: charnamepage.ui:257
+#: cui/uiconfig/ui/charnamepage.ui:257
 msgctxt "charnamepage|westsizeft-cjk"
 msgid "Size:"
 msgstr "Maint:"
 
-#: charnamepage.ui:272
+#: cui/uiconfig/ui/charnamepage.ui:272
 msgctxt "charnamepage|westlangft-cjk"
 msgid "Language:"
 msgstr "Iaith:"
 
-#: charnamepage.ui:346
+#: cui/uiconfig/ui/charnamepage.ui:346
 msgctxt "charnamepage|label4"
 msgid "Western Text Font"
 msgstr "Ffont Testun Gorllewinol"
 
-#: charnamepage.ui:415
+#: cui/uiconfig/ui/charnamepage.ui:415
 msgctxt "charnamepage|eastsizeft"
 msgid "Size:"
 msgstr "Maint:"
 
-#: charnamepage.ui:430
+#: cui/uiconfig/ui/charnamepage.ui:430
 msgctxt "charnamepage|eastlangft"
 msgid "Language:"
 msgstr "Iaith:"
 
-#: charnamepage.ui:503
+#: cui/uiconfig/ui/charnamepage.ui:503
 msgctxt "charnamepage|label5"
 msgid "Asian Text Font"
 msgstr "Ffont Testun Asiaidd"
 
-#: charnamepage.ui:572
+#: cui/uiconfig/ui/charnamepage.ui:572
 msgctxt "charnamepage|ctlsizeft"
 msgid "Size:"
 msgstr "Maint:"
 
-#: charnamepage.ui:587
+#: cui/uiconfig/ui/charnamepage.ui:587
 msgctxt "charnamepage|ctllangft"
 msgid "Language:"
 msgstr "Iaith:"
 
-#: charnamepage.ui:661
+#: cui/uiconfig/ui/charnamepage.ui:661
 msgctxt "charnamepage|label6"
 msgid "CTL Font"
 msgstr "Ffont CTL"
 
-#: charnamepage.ui:688
+#: cui/uiconfig/ui/charnamepage.ui:688
 msgctxt "charnamepage|preview-atkobject"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: colorconfigwin.ui:14
+#: cui/uiconfig/ui/colorconfigwin.ui:14
 msgctxt "colorconfigwin|docboundaries"
 msgid "Text boundaries"
 msgstr "Ffiniau testun"
 
-#: colorconfigwin.ui:33
+#: cui/uiconfig/ui/colorconfigwin.ui:34
 msgctxt "colorconfigwin|doccolor"
 msgid "Document background"
 msgstr "Cefndir dogfen"
 
-#: colorconfigwin.ui:65
+#: cui/uiconfig/ui/colorconfigwin.ui:66
 msgctxt "colorconfigwin|general"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: colorconfigwin.ui:92
+#: cui/uiconfig/ui/colorconfigwin.ui:93
 msgctxt "colorconfigwin|appback"
 msgid "Application background"
 msgstr "Cefndir rhaglen"
 
-#: colorconfigwin.ui:101
+#: cui/uiconfig/ui/colorconfigwin.ui:102
 msgctxt "colorconfigwin|objboundaries"
 msgid "Object boundaries"
 msgstr "Ffiniau gwrthrych"
 
-#: colorconfigwin.ui:126
+#: cui/uiconfig/ui/colorconfigwin.ui:128
 msgctxt "colorconfigwin|tblboundaries"
 msgid "Table boundaries"
 msgstr "Ffiniau tabl"
 
-#: colorconfigwin.ui:155
+#: cui/uiconfig/ui/colorconfigwin.ui:158
 msgctxt "colorconfigwin|font"
 msgid "Font color"
 msgstr "Lliw ffont"
 
-#: colorconfigwin.ui:174
+#: cui/uiconfig/ui/colorconfigwin.ui:177
 msgctxt "colorconfigwin|unvisitedlinks"
 msgid "Unvisited links"
 msgstr "Cysylltiad heb ymweliad"
 
-#: colorconfigwin.ui:199
+#: cui/uiconfig/ui/colorconfigwin.ui:203
 msgctxt "colorconfigwin|visitedlinks"
 msgid "Visited links"
 msgstr "Cysylltiadau ymwelwyd â nhw"
 
-#: colorconfigwin.ui:228
+#: cui/uiconfig/ui/colorconfigwin.ui:233
 msgctxt "colorconfigwin|autospellcheck"
 msgid "AutoSpellcheck"
 msgstr "AwtoGwirio Sillafu"
 
-#: colorconfigwin.ui:241
+#: cui/uiconfig/ui/colorconfigwin.ui:246
 msgctxt "colorconfigwin|smarttags"
 msgid "Smart Tags"
 msgstr "Tagiau Clyfar"
 
-#: colorconfigwin.ui:283
+#: cui/uiconfig/ui/colorconfigwin.ui:288
 msgctxt "colorconfigwin|writer"
 msgid "Text Document"
 msgstr "Dogfen Testun"
 
-#: colorconfigwin.ui:310
+#: cui/uiconfig/ui/colorconfigwin.ui:315
 msgctxt "colorconfigwin|writergrid"
 msgid "Grid"
 msgstr "Grid"
 
-#: colorconfigwin.ui:353
+#: cui/uiconfig/ui/colorconfigwin.ui:358
 msgctxt "colorconfigwin|script"
 msgid "Script Indicator"
 msgstr "Dangosydd Sgript"
 
-#: colorconfigwin.ui:362
+#: cui/uiconfig/ui/colorconfigwin.ui:367
 msgctxt "colorconfigwin|field"
 msgid "Field shadings"
 msgstr "Cysgodi maes"
 
-#: colorconfigwin.ui:377
+#: cui/uiconfig/ui/colorconfigwin.ui:383
 msgctxt "colorconfigwin|index"
 msgid "Index and table shadings"
 msgstr "Mynegai a chysgodi tabl"
 
-#: colorconfigwin.ui:392
+#: cui/uiconfig/ui/colorconfigwin.ui:399
 msgctxt "colorconfigwin|section"
 msgid "Section boundaries"
 msgstr "Ffiniau adran"
 
-#: colorconfigwin.ui:431
+#: cui/uiconfig/ui/colorconfigwin.ui:439
 msgctxt "colorconfigwin|hdft"
 msgid "Headers and Footer delimiter"
 msgstr "Amffinydd Pennyn a Throedyn"
 
-#: colorconfigwin.ui:454
+#: cui/uiconfig/ui/colorconfigwin.ui:462
 msgctxt "colorconfigwin|pagebreak"
 msgid "Page and column breaks"
 msgstr "Toriad tudalen a cholofn"
 
-#: colorconfigwin.ui:477
+#: cui/uiconfig/ui/colorconfigwin.ui:485
 msgctxt "colorconfigwin|direct"
 msgid "Direct Cursor"
 msgstr "Cyrchwr Uniongyrchol"
 
-#: colorconfigwin.ui:489
+#: cui/uiconfig/ui/colorconfigwin.ui:497
 msgctxt "colorconfigwin|html"
 msgid "HTML Document"
 msgstr "Dogfen HTML"
 
-#: colorconfigwin.ui:516
+#: cui/uiconfig/ui/colorconfigwin.ui:524
 msgctxt "colorconfigwin|sgml"
 msgid "SGML syntax highlighting"
 msgstr "Amlygu cystrawen SGML"
 
-#: colorconfigwin.ui:539
+#: cui/uiconfig/ui/colorconfigwin.ui:547
 msgctxt "colorconfigwin|htmlcomment"
 msgid "Comment highlighting"
 msgstr "Amlygu sylw"
 
-#: colorconfigwin.ui:562
+#: cui/uiconfig/ui/colorconfigwin.ui:570
 msgctxt "colorconfigwin|htmlkeyword"
 msgid "Keyword highlighting"
 msgstr "Amlygu allweddeiriau"
 
-#: colorconfigwin.ui:585
+#: cui/uiconfig/ui/colorconfigwin.ui:593
 msgctxt "colorconfigwin|unknown"
 msgid "Text"
 msgstr "Testun"
 
-#: colorconfigwin.ui:597
+#: cui/uiconfig/ui/colorconfigwin.ui:605
 msgctxt "colorconfigwin|calc"
 msgid "Spreadsheet"
 msgstr "Taenlen"
 
-#: colorconfigwin.ui:624
+#: cui/uiconfig/ui/colorconfigwin.ui:632
 msgctxt "colorconfigwin|calcgrid"
 msgid "Grid lines"
 msgstr "Llinellau grid"
 
-#: colorconfigwin.ui:647
+#: cui/uiconfig/ui/colorconfigwin.ui:655
 msgctxt "colorconfigwin|brk"
 msgid "Page breaks"
 msgstr "Toriad tudalen"
 
-#: colorconfigwin.ui:670
+#: cui/uiconfig/ui/colorconfigwin.ui:678
 msgctxt "colorconfigwin|brkmanual"
 msgid "Manual page breaks"
 msgstr "Toriad tudalen llaw"
 
-#: colorconfigwin.ui:693
+#: cui/uiconfig/ui/colorconfigwin.ui:701
 msgctxt "colorconfigwin|brkauto"
 msgid "Automatic page breaks"
 msgstr "Toriad tudalen awtomatig"
 
-#: colorconfigwin.ui:716
+#: cui/uiconfig/ui/colorconfigwin.ui:724
 msgctxt "colorconfigwin|det"
 msgid "Detective"
 msgstr "Ditectif"
 
-#: colorconfigwin.ui:739
+#: cui/uiconfig/ui/colorconfigwin.ui:747
 msgctxt "colorconfigwin|deterror"
 msgid "Detective error"
 msgstr "Gwall canfyddwr"
 
-#: colorconfigwin.ui:762
+#: cui/uiconfig/ui/colorconfigwin.ui:770
 msgctxt "colorconfigwin|ref"
 msgid "References"
 msgstr "Cyfeirnodau"
 
-#: colorconfigwin.ui:785
+#: cui/uiconfig/ui/colorconfigwin.ui:793
 msgctxt "colorconfigwin|notes"
 msgid "Notes background"
 msgstr "Cefndir nodiadau"
 
-#: colorconfigwin.ui:797
+#: cui/uiconfig/ui/colorconfigwin.ui:816
+msgctxt "colorconfigwin|values"
+msgid "Values"
+msgstr "Gwerthoedd"
+
+#: cui/uiconfig/ui/colorconfigwin.ui:839
+msgctxt "colorconfigwin|formulas"
+msgid "Formulas"
+msgstr "Fformiwlâu"
+
+#: cui/uiconfig/ui/colorconfigwin.ui:862
+msgctxt "colorconfigwin|text"
+msgid "Text"
+msgstr "Testun"
+
+#: cui/uiconfig/ui/colorconfigwin.ui:885
+msgctxt "colorconfigwin|protectedcells"
+msgid "Protected cells background"
+msgstr "Cefndir celloedd wedi eu hamddiffyn"
+
+#: cui/uiconfig/ui/colorconfigwin.ui:897
 msgctxt "colorconfigwin|draw"
 msgid "Drawing / Presentation"
 msgstr "Lluniadu / Cyflwyniad"
 
-#: colorconfigwin.ui:824
+#: cui/uiconfig/ui/colorconfigwin.ui:924
 msgctxt "colorconfigwin|drawgrid"
 msgid "Grid"
 msgstr "Grid"
 
-#: colorconfigwin.ui:836
+#: cui/uiconfig/ui/colorconfigwin.ui:936
 msgctxt "colorconfigwin|basic"
 msgid "Basic Syntax Highlighting"
 msgstr "Amlygu Cystrawen Elfennol"
 
-#: colorconfigwin.ui:863
+#: cui/uiconfig/ui/colorconfigwin.ui:963
 msgctxt "colorconfigwin|basicid"
 msgid "Identifier"
 msgstr "Enw"
 
-#: colorconfigwin.ui:886
+#: cui/uiconfig/ui/colorconfigwin.ui:986
 msgctxt "colorconfigwin|basiccomment"
 msgid "Comment"
 msgstr "Nodyn"
 
-#: colorconfigwin.ui:909
+#: cui/uiconfig/ui/colorconfigwin.ui:1009
 msgctxt "colorconfigwin|basicnumber"
 msgid "Number"
 msgstr "Rhif"
 
-#: colorconfigwin.ui:932
+#: cui/uiconfig/ui/colorconfigwin.ui:1032
 msgctxt "colorconfigwin|basicstring"
 msgid "String"
 msgstr "Llinyn"
 
-#: colorconfigwin.ui:955
+#: cui/uiconfig/ui/colorconfigwin.ui:1055
 msgctxt "colorconfigwin|basicop"
 msgid "Operator"
 msgstr "Gweithredydd"
 
-#: colorconfigwin.ui:978
+#: cui/uiconfig/ui/colorconfigwin.ui:1078
 msgctxt "colorconfigwin|basickeyword"
 msgid "Reserved expression"
 msgstr "Mynegiad cadw"
 
-#: colorconfigwin.ui:1001
+#: cui/uiconfig/ui/colorconfigwin.ui:1101
 msgctxt "colorconfigwin|error"
 msgid "Error"
 msgstr "Gwall"
 
-#: colorconfigwin.ui:1013
+#: cui/uiconfig/ui/colorconfigwin.ui:1113
 msgctxt "colorconfigwin|sql"
 msgid "SQL Syntax Highlighting"
 msgstr "Amlygu cystrawen SQL"
 
-#: colorconfigwin.ui:1040
+#: cui/uiconfig/ui/colorconfigwin.ui:1140
 msgctxt "colorconfigwin|sqlid"
 msgid "Identifier"
 msgstr "Enw"
 
-#: colorconfigwin.ui:1063
+#: cui/uiconfig/ui/colorconfigwin.ui:1163
 msgctxt "colorconfigwin|sqlnumber"
 msgid "Number"
 msgstr "Rhif"
 
-#: colorconfigwin.ui:1086
+#: cui/uiconfig/ui/colorconfigwin.ui:1186
 msgctxt "colorconfigwin|sqlstring"
 msgid "String"
 msgstr "Llinyn"
 
-#: colorconfigwin.ui:1109
+#: cui/uiconfig/ui/colorconfigwin.ui:1209
 msgctxt "colorconfigwin|sqlop"
 msgid "Operator"
 msgstr "Gweithredydd"
 
-#: colorconfigwin.ui:1132
+#: cui/uiconfig/ui/colorconfigwin.ui:1232
 msgctxt "colorconfigwin|sqlkeyword"
 msgid "Keyword"
 msgstr "Allweddair"
 
-#: colorconfigwin.ui:1155
+#: cui/uiconfig/ui/colorconfigwin.ui:1255
 msgctxt "colorconfigwin|sqlparam"
 msgid "Parameter"
 msgstr "Paramedr"
 
-#: colorconfigwin.ui:1178
+#: cui/uiconfig/ui/colorconfigwin.ui:1278
 msgctxt "colorconfigwin|sqlcomment"
 msgid "Comment"
 msgstr "Nodyn"
 
-#: colorconfigwin.ui:1187
+#: cui/uiconfig/ui/colorconfigwin.ui:1287
 msgctxt "colorconfigwin|shadows"
 msgid "Shadows"
 msgstr "Cysgod"
 
-#: colorpage.ui:60
+#: cui/uiconfig/ui/colorpage.ui:60
 msgctxt "colorpage|label21"
 msgid "Palette:"
 msgstr "Palet:"
 
-#: colorpage.ui:101
+#: cui/uiconfig/ui/colorpage.ui:101
 msgctxt "colorpage|label20"
 msgid "Recent Colors"
 msgstr "Lliwiau Diweddar"
 
-#: colorpage.ui:156
+#: cui/uiconfig/ui/colorpage.ui:156
 msgctxt "colorpage|RGB"
 msgid "RGB"
 msgstr "RGB"
 
-#: colorpage.ui:172
+#: cui/uiconfig/ui/colorpage.ui:173
 msgctxt "colorpage|CMYK"
 msgid "CMYK"
 msgstr "CMYK"
 
-#: colorpage.ui:188
+#: cui/uiconfig/ui/colorpage.ui:190
 msgctxt "colorpage|delete"
 msgid "Delete"
 msgstr "Dileu"
 
-#: colorpage.ui:206
+#: cui/uiconfig/ui/colorpage.ui:208
 msgctxt "colorpage|label22"
 msgid "Custom Palette"
 msgstr "Palet Cyfaddas"
 
-#: colorpage.ui:258
+#: cui/uiconfig/ui/colorpage.ui:260
 msgctxt "colorpage|label1"
 msgid "Colors"
 msgstr "Lliwiau"
 
-#: colorpage.ui:303
+#: cui/uiconfig/ui/colorpage.ui:305
 msgctxt "colorpage|oldpreview-atkobject"
 msgid "Old Color"
 msgstr "Hen Liw"
 
-#: colorpage.ui:333
+#: cui/uiconfig/ui/colorpage.ui:335
 msgctxt "colorpage|label7"
 msgid "B"
 msgstr "B"
 
-#: colorpage.ui:348
+#: cui/uiconfig/ui/colorpage.ui:350
 msgctxt "colorpage|label8"
 msgid "G"
 msgstr "G"
 
-#: colorpage.ui:363
+#: cui/uiconfig/ui/colorpage.ui:365
 msgctxt "colorpage|label9"
 msgid "R"
 msgstr "R"
 
-#: colorpage.ui:378
+#: cui/uiconfig/ui/colorpage.ui:380
 msgctxt "colorpage|label18"
 msgid "Hex"
 msgstr "Hecs"
 
-#: colorpage.ui:458
+#: cui/uiconfig/ui/colorpage.ui:460
 msgctxt "colorpage|label10"
 msgid "_C"
 msgstr "_C"
 
-#: colorpage.ui:473
+#: cui/uiconfig/ui/colorpage.ui:475
 msgctxt "colorpage|label16"
 msgid "_K"
 msgstr "_K"
 
-#: colorpage.ui:488
+#: cui/uiconfig/ui/colorpage.ui:490
 msgctxt "colorpage|label17"
 msgid "_Y"
 msgstr "_Y"
 
-#: colorpage.ui:554
+#: cui/uiconfig/ui/colorpage.ui:556
 msgctxt "colorpage|label15"
 msgid "_M"
 msgstr "_M"
 
-#: colorpage.ui:579
+#: cui/uiconfig/ui/colorpage.ui:581
 msgctxt "colorpage|label5"
 msgid "Active"
 msgstr "Gweithredol"
 
-#: colorpage.ui:625
+#: cui/uiconfig/ui/colorpage.ui:627
 msgctxt "colorpage|newpreview-atkobject"
 msgid "New Color"
 msgstr "Lliw Newydd"
 
-#: colorpage.ui:656
+#: cui/uiconfig/ui/colorpage.ui:657
 msgctxt "colorpage|B_custom"
 msgid "Blue"
 msgstr "Glas"
 
-#: colorpage.ui:671
+#: cui/uiconfig/ui/colorpage.ui:671
 msgctxt "colorpage|R_custom"
 msgid "Red"
 msgstr "Coch"
 
-#: colorpage.ui:685
+#: cui/uiconfig/ui/colorpage.ui:685
 msgctxt "colorpage|label4"
 msgid "_B"
 msgstr "_B"
 
-#: colorpage.ui:699
+#: cui/uiconfig/ui/colorpage.ui:699
 msgctxt "colorpage|label3"
 msgid "_G"
 msgstr "_G"
 
-#: colorpage.ui:713
+#: cui/uiconfig/ui/colorpage.ui:713
 msgctxt "colorpage|label2"
 msgid "_R"
 msgstr "_R"
 
-#: colorpage.ui:728
+#: cui/uiconfig/ui/colorpage.ui:727
 msgctxt "colorpage|G_custom"
 msgid "Green"
 msgstr "Gwyrdd"
 
-#: colorpage.ui:742
+#: cui/uiconfig/ui/colorpage.ui:741
 msgctxt "colorpage|label19"
 msgid "_Hex"
 msgstr "_Hecs"
 
-#: colorpage.ui:786
+#: cui/uiconfig/ui/colorpage.ui:785
 msgctxt "colorpage|label11"
 msgid "_C"
 msgstr "_C"
 
-#: colorpage.ui:801
+#: cui/uiconfig/ui/colorpage.ui:800
 msgctxt "colorpage|label12"
 msgid "_M"
 msgstr "_M"
 
-#: colorpage.ui:815
+#: cui/uiconfig/ui/colorpage.ui:814
 msgctxt "colorpage|label13"
 msgid "_K"
 msgstr "_K"
 
-#: colorpage.ui:858
+#: cui/uiconfig/ui/colorpage.ui:855
 msgctxt "colorpage|label14"
 msgid "_Y"
 msgstr "_Y"
 
-#: colorpage.ui:905
+#: cui/uiconfig/ui/colorpage.ui:900
 msgctxt "colorpage|edit"
 msgid "Pick"
 msgstr "Pigo"
 
-#: colorpage.ui:927
+#: cui/uiconfig/ui/colorpage.ui:922
 msgctxt "colorpage|label6"
 msgid "New"
 msgstr "Newydd"
 
-#: colorpickerdialog.ui:26
+#: cui/uiconfig/ui/colorpickerdialog.ui:60
 msgctxt "colorpickerdialog|ColorPicker"
 msgid "Pick a Color"
 msgstr "Dewis Lliw"
 
-#: colorpickerdialog.ui:244
+#: cui/uiconfig/ui/colorpickerdialog.ui:281
 msgctxt "colorpickerdialog|redRadiobutton"
 msgid "_Red:"
 msgstr "_Coch:"
 
-#: colorpickerdialog.ui:262
+#: cui/uiconfig/ui/colorpickerdialog.ui:298
 msgctxt "colorpickerdialog|greenRadiobutton"
 msgid "_Green:"
 msgstr "G_wyrdd:"
 
-#: colorpickerdialog.ui:279
+#: cui/uiconfig/ui/colorpickerdialog.ui:315
 msgctxt "colorpickerdialog|blueRadiobutton"
 msgid "_Blue:"
 msgstr "G_las:"
 
-#: colorpickerdialog.ui:335
+#: cui/uiconfig/ui/colorpickerdialog.ui:370
 msgctxt "colorpickerdialog|label2"
 msgid "Hex _#:"
 msgstr "Hex _#:"
 
-#: colorpickerdialog.ui:363
+#: cui/uiconfig/ui/colorpickerdialog.ui:399
 msgctxt "colorpickerdialog|label1"
 msgid "RGB"
 msgstr "RGB"
 
-#: colorpickerdialog.ui:402
+#: cui/uiconfig/ui/colorpickerdialog.ui:438
 msgctxt "colorpickerdialog|hueRadiobutton"
 msgid "H_ue:"
 msgstr "_Arlliw:"
 
-#: colorpickerdialog.ui:420
+#: cui/uiconfig/ui/colorpickerdialog.ui:455
 msgctxt "colorpickerdialog|satRadiobutton"
 msgid "_Saturation:"
 msgstr "_Dirlawnder:"
 
-#: colorpickerdialog.ui:437
+#: cui/uiconfig/ui/colorpickerdialog.ui:472
 msgctxt "colorpickerdialog|brightRadiobutton"
 msgid "Bright_ness:"
 msgstr "_Disgleirdeb:"
 
-#: colorpickerdialog.ui:496
+#: cui/uiconfig/ui/colorpickerdialog.ui:531
 msgctxt "colorpickerdialog|label3"
 msgid "HSB"
 msgstr "HSB"
 
-#: colorpickerdialog.ui:537
+#: cui/uiconfig/ui/colorpickerdialog.ui:571
 msgctxt "colorpickerdialog|label5"
 msgid "_Cyan:"
 msgstr "_Gwyrddlas:"
 
-#: colorpickerdialog.ui:552
+#: cui/uiconfig/ui/colorpickerdialog.ui:586
 msgctxt "colorpickerdialog|label6"
 msgid "_Magenta:"
 msgstr "_Majenta:"
 
-#: colorpickerdialog.ui:567
+#: cui/uiconfig/ui/colorpickerdialog.ui:601
 msgctxt "colorpickerdialog|label7"
 msgid "_Yellow:"
 msgstr "_Melyn:"
 
-#: colorpickerdialog.ui:582
+#: cui/uiconfig/ui/colorpickerdialog.ui:616
 msgctxt "colorpickerdialog|label8"
 msgid "_Key:"
 msgstr "_Bysell:"
 
-#: colorpickerdialog.ui:647
+#: cui/uiconfig/ui/colorpickerdialog.ui:682
 msgctxt "colorpickerdialog|label4"
 msgid "CMYK"
 msgstr "CMYK"
 
-#: comment.ui:7
+#: cui/uiconfig/ui/comment.ui:18
 msgctxt "comment|CommentDialog"
 msgid "Insert Comment"
 msgstr "Mewnosod Sylw"
 
-#: comment.ui:153
+#: cui/uiconfig/ui/comment.ui:163
 msgctxt "comment|label2"
 msgid "Author"
 msgstr "Awdur"
 
-#: comment.ui:185
+#: cui/uiconfig/ui/comment.ui:195
 msgctxt "comment|label4"
 msgid "_Text"
 msgstr "_Testun"
 
-#: comment.ui:228
+#: cui/uiconfig/ui/comment.ui:238
 msgctxt "comment|label5"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: comment.ui:241
+#: cui/uiconfig/ui/comment.ui:250
 msgctxt "comment|author"
 msgid "Author"
 msgstr "Awdur"
 
-#: comment.ui:264
+#: cui/uiconfig/ui/comment.ui:271
 msgctxt "comment|alttitle"
 msgid "Edit Comment"
 msgstr "Golygu Nodyn"
 
-#: comment.ui:280
+#: cui/uiconfig/ui/comment.ui:287
 msgctxt "comment|label1"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: connectortabpage.ui:34
+#: cui/uiconfig/ui/connectortabpage.ui:34
 msgctxt "connectortabpage|FT_TYPE"
 msgid "_Type:"
 msgstr "_Math:"
 
-#: connectortabpage.ui:85
+#: cui/uiconfig/ui/connectortabpage.ui:85
 msgctxt "connectortabpage|FT_LINE_1"
 msgid "Line _1:"
 msgstr "Llinell _1:"
 
-#: connectortabpage.ui:99
+#: cui/uiconfig/ui/connectortabpage.ui:99
 msgctxt "connectortabpage|FT_LINE_2"
 msgid "Line _2:"
 msgstr "Llinell _2:"
 
-#: connectortabpage.ui:113
+#: cui/uiconfig/ui/connectortabpage.ui:113
 msgctxt "connectortabpage|FT_LINE_3"
 msgid "Line _3:"
 msgstr "Llinell _3:"
 
-#: connectortabpage.ui:170
+#: cui/uiconfig/ui/connectortabpage.ui:167
 msgctxt "connectortabpage|label2"
 msgid "Line Skew"
 msgstr "Gogwydd Llinell"
 
-#: connectortabpage.ui:206
+#: cui/uiconfig/ui/connectortabpage.ui:203
 msgctxt "connectortabpage|FT_HORZ_1"
 msgid "_Begin horizontal:"
 msgstr "_Cychwyn Llorweddol:"
 
-#: connectortabpage.ui:220
+#: cui/uiconfig/ui/connectortabpage.ui:217
 msgctxt "connectortabpage|FT_HORZ_2"
 msgid "End _horizontal:"
 msgstr "_Diwedd llorweddol:"
 
-#: connectortabpage.ui:234
+#: cui/uiconfig/ui/connectortabpage.ui:231
 msgctxt "connectortabpage|FT_VERT_1"
 msgid "Begin _vertical:"
 msgstr "_Cychwyn fertigol:"
 
-#: connectortabpage.ui:248
+#: cui/uiconfig/ui/connectortabpage.ui:245
 msgctxt "connectortabpage|FT_VERT_2"
 msgid "_End vertical:"
 msgstr "_Fertigol diwedd:"
 
-#: connectortabpage.ui:318
+#: cui/uiconfig/ui/connectortabpage.ui:311
 msgctxt "connectortabpage|label3"
 msgid "Line Spacing"
 msgstr "Bylchu Llinell"
 
-#: connectortabpage.ui:342
+#: cui/uiconfig/ui/connectortabpage.ui:335
 msgctxt "connectortabpage|CTL_PREVIEW|tooltip_text"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: connectortabpage.ui:347
+#: cui/uiconfig/ui/connectortabpage.ui:340
 msgctxt "connectortabpage|CTL_PREVIEW-atkobject"
 msgid "Example"
 msgstr "Enghraifft"
 
-#: connpooloptions.ui:39
+#: cui/uiconfig/ui/connpooloptions.ui:39
 msgctxt "connpooloptions|connectionpooling"
 msgid "Connection pooling enabled"
 msgstr "Galluogi cysylltiad crynhoi"
 
-#: connpooloptions.ui:68
+#: cui/uiconfig/ui/connpooloptions.ui:68
 msgctxt "connpooloptions|driverslabel"
 msgid "Drivers known in %PRODUCTNAME"
 msgstr "Gyrwyr hysbys i %PRODUCTNAME"
 
-#: connpooloptions.ui:102
+#: cui/uiconfig/ui/connpooloptions.ui:102
 msgctxt "connpooloptions|driverlabel"
 msgid "Current driver:"
 msgstr "Gyrrwr cyfredol:"
 
-#: connpooloptions.ui:133
+#: cui/uiconfig/ui/connpooloptions.ui:133
 msgctxt "connpooloptions|enablepooling"
 msgid "Enable pooling for this driver"
 msgstr "Galluogi crynhoi ar gyfer y gyrrwr"
 
-#: connpooloptions.ui:159
+#: cui/uiconfig/ui/connpooloptions.ui:160
 msgctxt "connpooloptions|timeoutlabel"
 msgid "_Timeout (seconds)"
 msgstr "_Terfyn amser (eiliad)"
 
-#: connpooloptions.ui:208
+#: cui/uiconfig/ui/connpooloptions.ui:208
 msgctxt "connpooloptions|label1"
 msgid "Connection Pool"
 msgstr "Pwll Cysylltu"
 
-#: croppage.ui:53
+#: cui/uiconfig/ui/croppage.ui:53
 msgctxt "croppage|keepscale"
 msgid "Keep _scale"
 msgstr "Cadw _graddfa"
 
-#: croppage.ui:71
+#: cui/uiconfig/ui/croppage.ui:71
 msgctxt "croppage|keepsize"
 msgid "Keep image si_ze"
 msgstr "Cadw _maint delwedd"
 
-#: croppage.ui:97
+#: cui/uiconfig/ui/croppage.ui:97
 msgctxt "croppage|label2"
 msgid "_Left:"
 msgstr "_Chwith:"
 
-#: croppage.ui:124
+#: cui/uiconfig/ui/croppage.ui:123
 msgctxt "croppage|label3"
 msgid "_Right:"
 msgstr "_De:"
 
-#: croppage.ui:163
+#: cui/uiconfig/ui/croppage.ui:161
 msgctxt "croppage|label4"
 msgid "_Top:"
 msgstr "_Brig:"
 
-#: croppage.ui:177
+#: cui/uiconfig/ui/croppage.ui:175
 msgctxt "croppage|label5"
 msgid "_Bottom:"
 msgstr "_Gwaelod:"
 
-#: croppage.ui:226
+#: cui/uiconfig/ui/croppage.ui:222
 msgctxt "croppage|label1"
 msgid "Crop"
 msgstr "Tocio"
 
-#: croppage.ui:261
+#: cui/uiconfig/ui/croppage.ui:257
 msgctxt "croppage|label6"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: croppage.ui:287
+#: cui/uiconfig/ui/croppage.ui:282
 msgctxt "croppage|label7"
 msgid "_Height:"
 msgstr "_Uchder:"
 
-#: croppage.ui:316
+#: cui/uiconfig/ui/croppage.ui:310
 msgctxt "croppage|label10"
 msgid "Scale"
 msgstr "Graddfa"
 
-#: croppage.ui:351
+#: cui/uiconfig/ui/croppage.ui:345
 msgctxt "croppage|label8"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: croppage.ui:378
+#: cui/uiconfig/ui/croppage.ui:371
 msgctxt "croppage|label9"
 msgid "_Height:"
 msgstr "_Uchder:"
 
-#: croppage.ui:408
+#: cui/uiconfig/ui/croppage.ui:400
 msgctxt "croppage|label11"
 msgid "Image Size"
 msgstr "Maint Delwedd"
 
-#: croppage.ui:460
+#: cui/uiconfig/ui/croppage.ui:452
 msgctxt "croppage|origsize"
 msgid "_Original Size"
 msgstr "_Maint Gwreiddiol"
 
-#: cuiimapdlg.ui:8
+#: cui/uiconfig/ui/cuiimapdlg.ui:8
 msgctxt "cuiimapdlg|IMapDialog"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: cuiimapdlg.ui:96
+#: cui/uiconfig/ui/cuiimapdlg.ui:96
 msgctxt "cuiimapdlg|label1"
 msgid "_URL:"
 msgstr "_URL:"
 
-#: cuiimapdlg.ui:138
+#: cui/uiconfig/ui/cuiimapdlg.ui:137
 msgctxt "cuiimapdlg|label2"
 msgid "F_rame:"
 msgstr "_Ffrâm:"
 
-#: cuiimapdlg.ui:186
+#: cui/uiconfig/ui/cuiimapdlg.ui:184
 msgctxt "cuiimapdlg|label3"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: cuiimapdlg.ui:228
+#: cui/uiconfig/ui/cuiimapdlg.ui:225
 msgctxt "cuiimapdlg|label4"
 msgid "Alternative _text:"
 msgstr "_Testun arall:"
 
-#: cuiimapdlg.ui:270
+#: cui/uiconfig/ui/cuiimapdlg.ui:266
 msgctxt "cuiimapdlg|label5"
 msgid "_Description:"
 msgstr "_Disgrifiad:"
 
-#: customizedialog.ui:8
+#: cui/uiconfig/ui/customizedialog.ui:8
 msgctxt "customizedialog|CustomizeDialog"
 msgid "Customize"
 msgstr "Cyfaddasu"
 
-#: customizedialog.ui:105
+#: cui/uiconfig/ui/customizedialog.ui:105
 msgctxt "customizedialog|menus"
 msgid "Menus"
 msgstr "Dewislenni"
 
-#: customizedialog.ui:127
+#: cui/uiconfig/ui/customizedialog.ui:127
 msgctxt "customizedialog|toolbars"
 msgid "Toolbars"
 msgstr "Barrau Offer"
 
-#: customizedialog.ui:150
+#: cui/uiconfig/ui/customizedialog.ui:150
 msgctxt "customizedialog|contextmenus"
 msgid "Context Menus"
 msgstr "Dewislenni Cyd-destun"
 
-#: customizedialog.ui:173
+#: cui/uiconfig/ui/customizedialog.ui:173
 msgctxt "customizedialog|keyboard"
 msgid "Keyboard"
 msgstr "Bysellfwrdd"
 
-#: customizedialog.ui:196
+#: cui/uiconfig/ui/customizedialog.ui:196
 msgctxt "customizedialog|events"
 msgid "Events"
 msgstr "Digwyddiadau"
 
-#: databaselinkdialog.ui:9
+#: cui/uiconfig/ui/databaselinkdialog.ui:9
 msgctxt "databaselinkdialog|DatabaseLinkDialog"
 msgid "Create Database Link"
 msgstr "Creu Cysylltiad Cronfa Ddata"
 
-#: databaselinkdialog.ui:88
+#: cui/uiconfig/ui/databaselinkdialog.ui:88
 msgctxt "databaselinkdialog|browse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: databaselinkdialog.ui:104
+#: cui/uiconfig/ui/databaselinkdialog.ui:104
 msgctxt "databaselinkdialog|label1"
 msgid "_Database file:"
 msgstr "Ffeil ­_cronfa ddata:"
 
-#: databaselinkdialog.ui:148
+#: cui/uiconfig/ui/databaselinkdialog.ui:148
 msgctxt "databaselinkdialog|label4"
 msgid "Registered _name:"
 msgstr "Enw c­_ofrestredig:"
 
-#: databaselinkdialog.ui:179
+#: cui/uiconfig/ui/databaselinkdialog.ui:179
 msgctxt "databaselinkdialog|alttitle"
 msgid "Edit Database Link"
 msgstr "Golygu Cysylltiad Cronfa Ddata"
 
-#: dbregisterpage.ui:62
+#: cui/uiconfig/ui/dbregisterpage.ui:62
 msgctxt "dbregisterpage|new"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: dbregisterpage.ui:76
+#: cui/uiconfig/ui/dbregisterpage.ui:76
 msgctxt "dbregisterpage|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: dbregisterpage.ui:90
+#: cui/uiconfig/ui/dbregisterpage.ui:90
 msgctxt "dbregisterpage|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: dbregisterpage.ui:117
+#: cui/uiconfig/ui/dbregisterpage.ui:117
 msgctxt "dbregisterpage|label1"
 msgid "Registered Databases"
 msgstr "Cronfeydd Data Cofrestredig"
 
-#: dimensionlinestabpage.ui:53
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:53
 msgctxt "dimensionlinestabpage|FT_LINE_DIST"
 msgid "Line _distance:"
 msgstr "_Pellter llinell:"
 
-#: dimensionlinestabpage.ui:67
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:67
 msgctxt "dimensionlinestabpage|FT_HELPLINE_OVERHANG"
 msgid "Guide _overhang:"
 msgstr "Bargod y _canllaw:"
 
-#: dimensionlinestabpage.ui:81
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:81
 msgctxt "dimensionlinestabpage|FT_HELPLINE_DIST"
 msgid "_Guide distance:"
 msgstr "_Pellter y canllaw:"
 
-#: dimensionlinestabpage.ui:95
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:95
 msgctxt "dimensionlinestabpage|FT_HELPLINE1_LEN"
 msgid "_Left guide:"
 msgstr "Canllaw _chwith:"
 
-#: dimensionlinestabpage.ui:109
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:109
 msgctxt "dimensionlinestabpage|FT_HELPLINE2_LEN"
 msgid "_Right guide:"
 msgstr "Canllaw _de:"
 
-#: dimensionlinestabpage.ui:123
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:123
 msgctxt "dimensionlinestabpage|FT_DECIMALPLACES"
 msgid "Decimal _places:"
 msgstr "_Llefydd degol:"
 
-#: dimensionlinestabpage.ui:134
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:134
 msgctxt "dimensionlinestabpage|TSB_BELOW_REF_EDGE"
 msgid "Measure _below object"
 msgstr "Mesur _islaw gwrthrych"
 
-#: dimensionlinestabpage.ui:236
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:230
 msgctxt "dimensionlinestabpage|label1"
 msgid "Line"
 msgstr "Llinell"
 
-#: dimensionlinestabpage.ui:272
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:266
 msgctxt "dimensionlinestabpage|FT_POSITION"
 msgid "_Text position"
 msgstr "Safle _testun"
 
-#: dimensionlinestabpage.ui:307
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:301
 msgctxt "dimensionlinestabpage|TSB_AUTOPOSV"
 msgid "_AutoVertical"
 msgstr "Awto_Fertigol"
 
-#: dimensionlinestabpage.ui:324
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:318
 msgctxt "dimensionlinestabpage|TSB_AUTOPOSH"
 msgid "A_utoHorizontal"
 msgstr "Awto_Llorweddol"
 
-#: dimensionlinestabpage.ui:350
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:344
 msgctxt "dimensionlinestabpage|TSB_PARALLEL"
 msgid "_Parallel to line"
 msgstr "Cyfochrog â _llinell"
 
-#: dimensionlinestabpage.ui:367
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:361
 msgctxt "dimensionlinestabpage|TSB_SHOW_UNIT"
 msgid "Show _measurement units"
 msgstr "Dangos unedau _mesur"
 
-#: dimensionlinestabpage.ui:404
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:398
 msgctxt "dimensionlinestabpage|label2"
 msgid "Legend"
 msgstr "Mynegai"
 
-#: dimensionlinestabpage.ui:427
+#: cui/uiconfig/ui/dimensionlinestabpage.ui:421
 msgctxt "dimensionlinestabpage|STR_MEASURE_AUTOMATIC"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: distributiondialog.ui:8
+#: cui/uiconfig/ui/distributiondialog.ui:8
 msgctxt "distributiondialog|DistributionDialog"
 msgid "Distribution"
 msgstr "Dosbarthu"
 
-#: distributionpage.ui:36
+#: cui/uiconfig/ui/distributionpage.ui:36
 msgctxt "distributionpage|hornone"
 msgid "_None"
 msgstr "_Dim"
 
-#: distributionpage.ui:53
+#: cui/uiconfig/ui/distributionpage.ui:53
 msgctxt "distributionpage|horleft"
 msgid "_Left"
 msgstr "_Chwith"
 
-#: distributionpage.ui:69
+#: cui/uiconfig/ui/distributionpage.ui:69
 msgctxt "distributionpage|horcenter"
 msgid "_Center"
 msgstr "_Canol"
 
-#: distributionpage.ui:85
+#: cui/uiconfig/ui/distributionpage.ui:85
 msgctxt "distributionpage|horright"
 msgid "_Right"
 msgstr "_De"
 
-#: distributionpage.ui:127
+#: cui/uiconfig/ui/distributionpage.ui:127
 msgctxt "distributionpage|hordistance"
 msgid "_Spacing"
 msgstr "_Bylchu"
 
-#: distributionpage.ui:178
+#: cui/uiconfig/ui/distributionpage.ui:178
 msgctxt "distributionpage|label"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: distributionpage.ui:211
+#: cui/uiconfig/ui/distributionpage.ui:211
 msgctxt "distributionpage|vernone"
 msgid "N_one"
 msgstr "_Dim"
 
-#: distributionpage.ui:227
+#: cui/uiconfig/ui/distributionpage.ui:227
 msgctxt "distributionpage|vertop"
 msgid "_Top"
 msgstr "_Brig"
 
-#: distributionpage.ui:243
+#: cui/uiconfig/ui/distributionpage.ui:243
 msgctxt "distributionpage|vercenter"
 msgid "C_enter"
 msgstr "C_anoli"
 
-#: distributionpage.ui:260
+#: cui/uiconfig/ui/distributionpage.ui:260
 msgctxt "distributionpage|verdistance"
 msgid "S_pacing"
 msgstr "_Bylchu"
 
-#: distributionpage.ui:276
+#: cui/uiconfig/ui/distributionpage.ui:276
 msgctxt "distributionpage|verbottom"
 msgid "_Bottom"
 msgstr "_Gwaelod"
 
-#: distributionpage.ui:353
+#: cui/uiconfig/ui/distributionpage.ui:353
 msgctxt "distributionpage|label1"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: editdictionarydialog.ui:8
+#: cui/uiconfig/ui/editdictionarydialog.ui:8
 msgctxt "editdictionarydialog|EditDictionaryDialog"
 msgid "Edit Custom Dictionary"
 msgstr "Golygu Geiriadur Cyfaddas"
 
-#: editdictionarydialog.ui:95
+#: cui/uiconfig/ui/editdictionarydialog.ui:95
 msgctxt "editdictionarydialog|book_label"
 msgid "_Book:"
 msgstr "_Llyfr:"
 
-#: editdictionarydialog.ui:110
+#: cui/uiconfig/ui/editdictionarydialog.ui:110
 msgctxt "editdictionarydialog|lang_label"
 msgid "_Language:"
 msgstr "_Iaith:"
 
-#: editdictionarydialog.ui:182
+#: cui/uiconfig/ui/editdictionarydialog.ui:180
 msgctxt "editdictionarydialog|word_label"
 msgid "_Word"
 msgstr "_Geiriau"
 
-#: editdictionarydialog.ui:198
+#: cui/uiconfig/ui/editdictionarydialog.ui:196
 msgctxt "editdictionarydialog|replace_label"
 msgid "_Replace By"
 msgstr "Newid _Gyda"
 
-#: editdictionarydialog.ui:251
+#: cui/uiconfig/ui/editdictionarydialog.ui:249
 msgctxt "editdictionarydialog|newreplace"
 msgid "_New"
 msgstr "_Newydd"
 
-#: editdictionarydialog.ui:265
+#: cui/uiconfig/ui/editdictionarydialog.ui:263
 msgctxt "editdictionarydialog|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: editmodulesdialog.ui:9
+#: cui/uiconfig/ui/editmodulesdialog.ui:9
 msgctxt "editmodulesdialog|EditModulesDialog"
 msgid "Edit Modules"
 msgstr "Golygu Modiwlau"
 
-#: editmodulesdialog.ui:84
+#: cui/uiconfig/ui/editmodulesdialog.ui:84
 msgctxt "editmodulesdialog|moredictslink"
 msgid "Get more dictionaries online..."
 msgstr "Estyn rhagor o eiriaduron ar-lein..."
 
-#: editmodulesdialog.ui:108
+#: cui/uiconfig/ui/editmodulesdialog.ui:108
 msgctxt "editmodulesdialog|label2"
 msgid "Language:"
 msgstr "Iaith:"
 
-#: editmodulesdialog.ui:153
+#: cui/uiconfig/ui/editmodulesdialog.ui:153
 msgctxt "editmodulesdialog|up"
 msgid "Move Up"
 msgstr "Symud Fyny"
 
-#: editmodulesdialog.ui:167
+#: cui/uiconfig/ui/editmodulesdialog.ui:167
 msgctxt "editmodulesdialog|down"
 msgid "Move Down"
 msgstr "Symud Lawr"
 
-#: editmodulesdialog.ui:181
+#: cui/uiconfig/ui/editmodulesdialog.ui:181
 msgctxt "editmodulesdialog|back"
 msgid "_Back"
 msgstr "_Nôl"
 
-#: editmodulesdialog.ui:228
+#: cui/uiconfig/ui/editmodulesdialog.ui:228
 msgctxt "editmodulesdialog|label1"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: effectspage.ui:13
+#: cui/uiconfig/ui/effectspage.ui:13
 msgctxt "effectspage|liststore1"
 msgid "(Without)"
 msgstr "(Heb)"
 
-#: effectspage.ui:16
+#: cui/uiconfig/ui/effectspage.ui:16
 msgctxt "effectspage|liststore1"
 msgid "Capitals"
 msgstr "Prif Lythrennau"
 
-#: effectspage.ui:19
+#: cui/uiconfig/ui/effectspage.ui:19
 msgctxt "effectspage|liststore1"
 msgid "Lowercase"
 msgstr "Llythyren is"
 
-#: effectspage.ui:22
+#: cui/uiconfig/ui/effectspage.ui:22
 msgctxt "effectspage|liststore1"
 msgid "Title"
 msgstr "Teitl"
 
-#: effectspage.ui:25
+#: cui/uiconfig/ui/effectspage.ui:25
 msgctxt "effectspage|liststore1"
 msgid "Small capitals"
 msgstr "Priflythrennau bach"
 
-#: effectspage.ui:36
+#: cui/uiconfig/ui/effectspage.ui:36
 msgctxt "effectspage|liststore2"
 msgid "(Without)"
 msgstr "(Heb)"
 
-#: effectspage.ui:39
+#: cui/uiconfig/ui/effectspage.ui:39
 msgctxt "effectspage|liststore2"
 msgid "Embossed"
 msgstr "Boglynnog"
 
-#: effectspage.ui:42
+#: cui/uiconfig/ui/effectspage.ui:42
 msgctxt "effectspage|liststore2"
 msgid "Engraved"
 msgstr "Ysgythru"
 
-#: effectspage.ui:53
+#: cui/uiconfig/ui/effectspage.ui:53
 msgctxt "effectspage|liststore3"
 msgid "(Without)"
 msgstr "(Heb)"
 
-#: effectspage.ui:56
+#: cui/uiconfig/ui/effectspage.ui:56
 msgctxt "effectspage|liststore3"
 msgid "Dot"
 msgstr "Dot"
 
-#: effectspage.ui:59
+#: cui/uiconfig/ui/effectspage.ui:59
 msgctxt "effectspage|liststore3"
 msgid "Circle"
 msgstr "Cylch"
 
-#: effectspage.ui:62
+#: cui/uiconfig/ui/effectspage.ui:62
 msgctxt "effectspage|liststore3"
 msgid "Disc"
 msgstr "Disg"
 
-#: effectspage.ui:65
+#: cui/uiconfig/ui/effectspage.ui:65
 msgctxt "effectspage|liststore3"
 msgid "Accent"
 msgstr "Acen"
 
-#: effectspage.ui:78
+#: cui/uiconfig/ui/effectspage.ui:78
 msgctxt "effectspage|liststore4"
 msgid "Above text"
 msgstr "Uwchlaw'r testun"
 
-#: effectspage.ui:82
+#: cui/uiconfig/ui/effectspage.ui:82
 msgctxt "effectspage|liststore4"
 msgid "Below text"
 msgstr "Islaw'r testun"
 
-#: effectspage.ui:96
+#: cui/uiconfig/ui/effectspage.ui:96
 msgctxt "effectspage|liststore5"
 msgid "(Without)"
 msgstr "(Heb)"
 
-#: effectspage.ui:100
+#: cui/uiconfig/ui/effectspage.ui:100
 msgctxt "effectspage|liststore5"
 msgid "Single"
 msgstr "Sengl"
 
-#: effectspage.ui:104
+#: cui/uiconfig/ui/effectspage.ui:104
 msgctxt "effectspage|liststore5"
 msgid "Double"
 msgstr "Dwbl"
 
-#: effectspage.ui:108
+#: cui/uiconfig/ui/effectspage.ui:108
 msgctxt "effectspage|liststore5"
 msgid "Bold"
 msgstr "Trwm"
 
-#: effectspage.ui:112
+#: cui/uiconfig/ui/effectspage.ui:112
 msgctxt "effectspage|liststore5"
 msgid "With /"
 msgstr "Gyda/"
 
-#: effectspage.ui:116
+#: cui/uiconfig/ui/effectspage.ui:116
 msgctxt "effectspage|liststore5"
 msgid "With X"
 msgstr "Gyda X"
 
-#: effectspage.ui:130
+#: cui/uiconfig/ui/effectspage.ui:130
 msgctxt "effectspage|liststore6"
 msgid "(Without)"
 msgstr "(Heb)"
 
-#: effectspage.ui:134
+#: cui/uiconfig/ui/effectspage.ui:134
 msgctxt "effectspage|liststore6"
 msgid "Single"
 msgstr "Sengl"
 
-#: effectspage.ui:138
+#: cui/uiconfig/ui/effectspage.ui:138
 msgctxt "effectspage|liststore6"
 msgid "Double"
 msgstr "Dwbl"
 
-#: effectspage.ui:142
+#: cui/uiconfig/ui/effectspage.ui:142
 msgctxt "effectspage|liststore6"
 msgid "Bold"
 msgstr "Trwm"
 
-#: effectspage.ui:146
+#: cui/uiconfig/ui/effectspage.ui:146
 msgctxt "effectspage|liststore6"
 msgid "Dotted"
 msgstr "Dotiog"
 
-#: effectspage.ui:150
+#: cui/uiconfig/ui/effectspage.ui:150
 msgctxt "effectspage|liststore6"
 msgid "Dotted (Bold)"
 msgstr "Dotiog (Trwm)"
 
-#: effectspage.ui:154
+#: cui/uiconfig/ui/effectspage.ui:154
 msgctxt "effectspage|liststore6"
 msgid "Dash"
 msgstr "Llinell Doriad"
 
-#: effectspage.ui:158
+#: cui/uiconfig/ui/effectspage.ui:158
 msgctxt "effectspage|liststore6"
 msgid "Dash (Bold)"
 msgstr "Llinell Doriad (Trwm)"
 
-#: effectspage.ui:162
+#: cui/uiconfig/ui/effectspage.ui:162
 msgctxt "effectspage|liststore6"
 msgid "Long Dash"
 msgstr "Llinell Doriad Hir"
 
-#: effectspage.ui:166
+#: cui/uiconfig/ui/effectspage.ui:166
 msgctxt "effectspage|liststore6"
 msgid "Long Dash (Bold)"
 msgstr "Llinell Doriad Hir (Trwm)"
 
-#: effectspage.ui:170
+#: cui/uiconfig/ui/effectspage.ui:170
 msgctxt "effectspage|liststore6"
 msgid "Dot Dash"
 msgstr "Dot Llinell Doriad"
 
-#: effectspage.ui:174
+#: cui/uiconfig/ui/effectspage.ui:174
 msgctxt "effectspage|liststore6"
 msgid "Dot Dash (Bold)"
 msgstr "Dot Llinell Doriad Hir (Trwm)"
 
-#: effectspage.ui:178
+#: cui/uiconfig/ui/effectspage.ui:178
 msgctxt "effectspage|liststore6"
 msgid "Dot Dot Dash"
 msgstr "Dot Dot Llinell Doriad"
 
-#: effectspage.ui:182
+#: cui/uiconfig/ui/effectspage.ui:182
 msgctxt "effectspage|liststore6"
 msgid "Dot Dot Dash (Bold)"
 msgstr "Dot Dot Llinell Doriad (Trwm)"
 
-#: effectspage.ui:186
+#: cui/uiconfig/ui/effectspage.ui:186
 msgctxt "effectspage|liststore6"
 msgid "Wave"
 msgstr "Ton"
 
-#: effectspage.ui:190
+#: cui/uiconfig/ui/effectspage.ui:190
 msgctxt "effectspage|liststore6"
 msgid "Wave (Bold)"
 msgstr "Ton (Trwm)"
 
-#: effectspage.ui:194
+#: cui/uiconfig/ui/effectspage.ui:194
 msgctxt "effectspage|liststore6"
 msgid "Double Wave"
 msgstr "Ton Ddwbl"
 
-#: effectspage.ui:218
+#: cui/uiconfig/ui/effectspage.ui:218
 msgctxt "effectspage|fontcolorft"
 msgid "Font color:"
 msgstr "Lliw:"
 
-#: effectspage.ui:232
+#: cui/uiconfig/ui/effectspage.ui:232
 msgctxt "effectspage|effectsft"
 msgid "Effects:"
 msgstr "Effeithiau:"
 
-#: effectspage.ui:246
+#: cui/uiconfig/ui/effectspage.ui:246
 msgctxt "effectspage|reliefft"
 msgid "Relief:"
 msgstr "Cerfweddol:"
 
-#: effectspage.ui:260
+#: cui/uiconfig/ui/effectspage.ui:260
 msgctxt "effectspage|label46"
 msgid "Overlining:"
 msgstr "Troslinellu:"
 
-#: effectspage.ui:274
+#: cui/uiconfig/ui/effectspage.ui:274
 msgctxt "effectspage|label47"
 msgid "Strikethrough:"
 msgstr "Taro drwodd:"
 
-#: effectspage.ui:288
+#: cui/uiconfig/ui/effectspage.ui:288
 msgctxt "effectspage|label48"
 msgid "Underlining:"
 msgstr "Tanlinellu:"
 
-#: effectspage.ui:302
+#: cui/uiconfig/ui/effectspage.ui:302
 msgctxt "effectspage|overlinecolorft"
 msgid "Overline color:"
 msgstr "Lliw troslinell:"
 
-#: effectspage.ui:316
+#: cui/uiconfig/ui/effectspage.ui:316
 msgctxt "effectspage|underlinecolorft"
 msgid "Underline color:"
 msgstr "Lliw tanlinellu:"
 
-#: effectspage.ui:413
+#: cui/uiconfig/ui/effectspage.ui:413
 msgctxt "effectspage|outlinecb"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: effectspage.ui:428
+#: cui/uiconfig/ui/effectspage.ui:429
 msgctxt "effectspage|blinkingcb"
 msgid "Blinking"
 msgstr "Blincio"
 
-#: effectspage.ui:443
+#: cui/uiconfig/ui/effectspage.ui:445
 msgctxt "effectspage|hiddencb"
 msgid "Hidden"
 msgstr "Cudd"
 
-#: effectspage.ui:458
+#: cui/uiconfig/ui/effectspage.ui:461
 msgctxt "effectspage|individualwordscb"
 msgid "Individual words"
 msgstr "Geiriau unigol"
 
-#: effectspage.ui:496
+#: cui/uiconfig/ui/effectspage.ui:500
 msgctxt "effectspage|positionft"
 msgid "Position:"
 msgstr "Safle:"
 
-#: effectspage.ui:510
+#: cui/uiconfig/ui/effectspage.ui:514
 msgctxt "effectspage|emphasisft"
 msgid "Emphasis mark:"
 msgstr "Marc pwyslais:"
 
-#: effectspage.ui:522
+#: cui/uiconfig/ui/effectspage.ui:526
 msgctxt "effectspage|shadowcb"
 msgid "Shadow"
 msgstr "Cysgod"
 
-#: effectspage.ui:562
+#: cui/uiconfig/ui/effectspage.ui:567
 msgctxt "effectspage|a11ywarning"
 msgid "Accessibility option \"Use automatic font color for screen display\" is active. Font color attributes are not currently used to display text."
 msgstr "Mae dewis hygyrchedd \"Defnyddiwch y lliw ffont awtomatig ar gyfer dangos ar y sgrin\" yn weithredol. Nid yw priodoleddau lliw ffont yn cael eu defnyddio i arddangos testun."
 
-#: effectspage.ui:611
+#: cui/uiconfig/ui/effectspage.ui:616
 msgctxt "effectspage|preview-atkobject"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: embossdialog.ui:9
+#: cui/uiconfig/ui/embossdialog.ui:9
 msgctxt "embossdialog|EmbossDialog"
 msgid "Emboss"
 msgstr "Boglynnu"
 
-#: embossdialog.ui:120
+#: cui/uiconfig/ui/embossdialog.ui:120
 msgctxt "embossdialog|label2"
 msgid "_Light source:"
 msgstr "_Ffynhonnell golau:"
 
-#: embossdialog.ui:155
+#: cui/uiconfig/ui/embossdialog.ui:155
 msgctxt "embossdialog|label1"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: eventassigndialog.ui:8
+#: cui/uiconfig/ui/eventassigndialog.ui:8
 msgctxt "eventassigndialog|EventAssignDialog"
 msgid "Assign Macro"
 msgstr "Neilltuo Macro"
 
-#: eventassignpage.ui:47
+#: cui/uiconfig/ui/eventassignpage.ui:47
 msgctxt "eventassignpage|existingmacrosft"
 msgid "Existing Macros"
 msgstr "Macros Presennol"
 
-#: eventassignpage.ui:97
+#: cui/uiconfig/ui/eventassignpage.ui:97
 msgctxt "eventassignpage|macrotoft"
 msgid "Macro From"
 msgstr "Macro o"
 
-#: eventassignpage.ui:159
+#: cui/uiconfig/ui/eventassignpage.ui:159
 msgctxt "eventassignpage|eventft"
 msgid "Event"
 msgstr "Digwyddiad"
 
-#: eventassignpage.ui:172
+#: cui/uiconfig/ui/eventassignpage.ui:172
 msgctxt "eventassignpage|assignft"
 msgid "Assigned Action"
 msgstr "Gweithred Neulltiwyd"
 
-#: eventassignpage.ui:197
+#: cui/uiconfig/ui/eventassignpage.ui:197
 msgctxt "eventassignpage|libraryft1"
 msgid "Assignments"
 msgstr "Aseiniad"
 
-#: eventassignpage.ui:220
+#: cui/uiconfig/ui/eventassignpage.ui:220
 msgctxt "eventassignpage|assign"
 msgid "Assign"
 msgstr "Neulltio"
 
-#: eventassignpage.ui:234
+#: cui/uiconfig/ui/eventassignpage.ui:234
 msgctxt "eventassignpage|delete"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: eventsconfigpage.ui:31
+#: cui/uiconfig/ui/eventsconfigpage.ui:31
 msgctxt "eventsconfigpage|label1"
 msgid "Assign:"
 msgstr "Neilltuo:"
 
-#: eventsconfigpage.ui:49
+#: cui/uiconfig/ui/eventsconfigpage.ui:49
 msgctxt "eventsconfigpage|macro"
 msgid "M_acro..."
 msgstr "_Macro..."
 
-#: eventsconfigpage.ui:63
+#: cui/uiconfig/ui/eventsconfigpage.ui:63
 msgctxt "eventsconfigpage|delete"
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: eventsconfigpage.ui:105
+#: cui/uiconfig/ui/eventsconfigpage.ui:105
 msgctxt "eventsconfigpage|label2"
 msgid "Save in:"
 msgstr "Cadw yn:"
 
-#: eventsconfigpage.ui:156
+#: cui/uiconfig/ui/eventsconfigpage.ui:156
 msgctxt "eventsconfigpage|eventft"
 msgid "Event"
 msgstr "Digwyddiad"
 
-#: eventsconfigpage.ui:168
+#: cui/uiconfig/ui/eventsconfigpage.ui:168
 msgctxt "eventsconfigpage|actionft"
 msgid "Assigned Action"
 msgstr "Gweithred Neulltiwyd"
 
-#: fmsearchdialog.ui:8
+#: cui/uiconfig/ui/fmsearchdialog.ui:8
 msgctxt "fmsearchdialog|RecordSearchDialog"
 msgid "Record Search"
 msgstr "Chwilio Cofnod"
 
-#: fmsearchdialog.ui:21
+#: cui/uiconfig/ui/fmsearchdialog.ui:21
 msgctxt "fmsearchdialog|pbSearchAgain"
 msgid "S_earch"
 msgstr "C_hwilio"
 
-#: fmsearchdialog.ui:142
+#: cui/uiconfig/ui/fmsearchdialog.ui:142
 msgctxt "fmsearchdialog|rbSearchForText"
 msgid "_Text:"
 msgstr "_Testun:"
 
-#: fmsearchdialog.ui:166
+#: cui/uiconfig/ui/fmsearchdialog.ui:166
 msgctxt "fmsearchdialog|rbSearchForNull"
 msgid "Field content is _NULL"
 msgstr "Cynnwys maes yn ­_NULL"
 
-#: fmsearchdialog.ui:185
+#: cui/uiconfig/ui/fmsearchdialog.ui:185
 msgctxt "fmsearchdialog|rbSearchForNotNull"
 msgid "Field content is not NU_LL"
 msgstr "Nid yw cynnwys y maes yn NU_LL"
 
-#: fmsearchdialog.ui:216
+#: cui/uiconfig/ui/fmsearchdialog.ui:216
 msgctxt "fmsearchdialog|flSearchFor"
 msgid "_Search for"
 msgstr "_Chwilio am"
 
-#: fmsearchdialog.ui:272
+#: cui/uiconfig/ui/fmsearchdialog.ui:272
 msgctxt "fmsearchdialog|rbSingleField"
 msgid "_Single field:"
 msgstr "­_Maes unigol:"
 
-#: fmsearchdialog.ui:309
+#: cui/uiconfig/ui/fmsearchdialog.ui:309
 msgctxt "fmsearchdialog|rbAllFields"
 msgid "_All fields"
 msgstr "_Pob Maes"
 
-#: fmsearchdialog.ui:335
+#: cui/uiconfig/ui/fmsearchdialog.ui:335
 msgctxt "fmsearchdialog|ftForm"
 msgid "Form:"
 msgstr "Ffurflen:"
 
-#: fmsearchdialog.ui:409
+#: cui/uiconfig/ui/fmsearchdialog.ui:409
 msgctxt "fmsearchdialog|label2"
 msgid "Where to Search"
 msgstr "Ble i Chwilio"
 
-#: fmsearchdialog.ui:460
+#: cui/uiconfig/ui/fmsearchdialog.ui:460
 msgctxt "fmsearchdialog|ftPosition"
 msgid "_Position:"
 msgstr "_Safle:"
 
-#: fmsearchdialog.ui:496
+#: cui/uiconfig/ui/fmsearchdialog.ui:496
 msgctxt "fmsearchdialog|HalfFullFormsCJK"
 msgid "Match character wi_dth"
 msgstr "Cydweddu _led nod"
 
-#: fmsearchdialog.ui:517
+#: cui/uiconfig/ui/fmsearchdialog.ui:517
 msgctxt "fmsearchdialog|SoundsLikeCJK"
 msgid "Sounds like (_Japanese)"
 msgstr "I'w glywed fel (_Japanëeg)"
 
-#: fmsearchdialog.ui:533
+#: cui/uiconfig/ui/fmsearchdialog.ui:533
 msgctxt "fmsearchdialog|SoundsLikeCJKSettings"
 msgid "Similarities..."
 msgstr "Nodweddion tebyg..."
 
-#: fmsearchdialog.ui:558
+#: cui/uiconfig/ui/fmsearchdialog.ui:558
 msgctxt "fmsearchdialog|cbApprox"
 msgid "S_imilarity search"
 msgstr "Chwilio _tebygrwydd"
 
-#: fmsearchdialog.ui:574
+#: cui/uiconfig/ui/fmsearchdialog.ui:574
 msgctxt "fmsearchdialog|pbApproxSettings"
 msgid "Similarities..."
 msgstr "Nodweddion tebyg..."
 
-#: fmsearchdialog.ui:595
+#: cui/uiconfig/ui/fmsearchdialog.ui:595
 msgctxt "fmsearchdialog|cbCase"
 msgid "_Match case"
 msgstr "_Cydweddu maint"
 
-#: fmsearchdialog.ui:611
+#: cui/uiconfig/ui/fmsearchdialog.ui:611
 msgctxt "fmsearchdialog|cbStartOver"
 msgid "Fr_om top"
 msgstr "O'r _brig"
 
-#: fmsearchdialog.ui:627
+#: cui/uiconfig/ui/fmsearchdialog.ui:627
 msgctxt "fmsearchdialog|cbRegular"
 msgid "_Regular expression"
 msgstr "_Mynegiad arferol"
 
-#: fmsearchdialog.ui:643
+#: cui/uiconfig/ui/fmsearchdialog.ui:643
 msgctxt "fmsearchdialog|cbUseFormat"
 msgid "Appl_y field format"
 msgstr "_Gosod fformat maes"
 
-#: fmsearchdialog.ui:659
+#: cui/uiconfig/ui/fmsearchdialog.ui:659
 msgctxt "fmsearchdialog|cbBackwards"
 msgid "Search _backwards"
 msgstr "Chwilio _nôl"
 
-#: fmsearchdialog.ui:675
+#: cui/uiconfig/ui/fmsearchdialog.ui:675
 msgctxt "fmsearchdialog|cbWildCard"
 msgid "_Wildcard expression"
 msgstr "_Mynegiad cerdyn gwyllt"
 
-#: fmsearchdialog.ui:704
+#: cui/uiconfig/ui/fmsearchdialog.ui:704
 msgctxt "fmsearchdialog|flOptions"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: fmsearchdialog.ui:740
+#: cui/uiconfig/ui/fmsearchdialog.ui:740
 msgctxt "fmsearchdialog|ftRecordLabel"
 msgid "Record:"
 msgstr "Cofnod:"
 
-#: fmsearchdialog.ui:751
+#: cui/uiconfig/ui/fmsearchdialog.ui:751
 msgctxt "fmsearchdialog|ftRecord"
 msgid "record count"
 msgstr "cyfrif cofnod"
 
-#: fmsearchdialog.ui:777
+#: cui/uiconfig/ui/fmsearchdialog.ui:777
 msgctxt "fmsearchdialog|flState"
 msgid "State"
 msgstr "Cyflwr"
 
-#: formatcellsdialog.ui:8
+#: cui/uiconfig/ui/formatcellsdialog.ui:8
 msgctxt "formatcellsdialog|FormatCellsDialog"
 msgid "Table Properties"
 msgstr "Priodweddau Tabl"
 
-#: formatcellsdialog.ui:106
+#: cui/uiconfig/ui/formatcellsdialog.ui:106
 msgctxt "formatcellsdialog|name"
 msgid "Font"
 msgstr "Ffont"
 
-#: formatcellsdialog.ui:128
+#: cui/uiconfig/ui/formatcellsdialog.ui:128
 msgctxt "formatcellsdialog|effects"
 msgid "Font Effects"
 msgstr "Effeithiau ffont"
 
-#: formatcellsdialog.ui:151
+#: cui/uiconfig/ui/formatcellsdialog.ui:151
 msgctxt "formatcellsdialog|border"
 msgid "Borders"
 msgstr "Borderi"
 
-#: formatcellsdialog.ui:174
+#: cui/uiconfig/ui/formatcellsdialog.ui:174
 msgctxt "formatcellsdialog|area"
 msgid "Background"
 msgstr "Cefndir"
 
-#: formatnumberdialog.ui:8
+#: cui/uiconfig/ui/formatnumberdialog.ui:8
 msgctxt "formatnumberdialog|FormatNumberDialog"
 msgid "Format Number"
 msgstr "Fformat Rhif"
 
-#: galleryapplyprogress.ui:8
+#: cui/uiconfig/ui/galleryapplyprogress.ui:8
 msgctxt "galleryapplyprogress|GalleryApplyProgress"
 msgid "Apply"
 msgstr "Gosod"
 
-#: galleryapplyprogress.ui:73
+#: cui/uiconfig/ui/galleryapplyprogress.ui:73
 msgctxt "galleryapplyprogress|label2"
 msgid "File"
 msgstr "Ffeil"
 
-#: galleryfilespage.ui:30
+#: cui/uiconfig/ui/galleryfilespage.ui:30
 msgctxt "galleryfilespage|label1"
 msgid "_File type:"
 msgstr "_Math o ffeil:"
 
-#: galleryfilespage.ui:77
+#: cui/uiconfig/ui/galleryfilespage.ui:77
 msgctxt "galleryfilespage|files-atkobject"
 msgid "Files Found"
 msgstr "Ffeiliau wedi eu Canfod"
 
-#: galleryfilespage.ui:104
+#: cui/uiconfig/ui/galleryfilespage.ui:104
 msgctxt "galleryfilespage|preview"
 msgid "Pr_eview"
 msgstr "_Rhagolwg"
 
-#: galleryfilespage.ui:125
+#: cui/uiconfig/ui/galleryfilespage.ui:125
 msgctxt "galleryfilespage|image-atkobject"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: galleryfilespage.ui:149
+#: cui/uiconfig/ui/galleryfilespage.ui:149
 msgctxt "galleryfilespage|findfiles"
 msgid "_Find Files..."
 msgstr "_Canfod Ffeiliau..."
 
-#: galleryfilespage.ui:177
+#: cui/uiconfig/ui/galleryfilespage.ui:177
 msgctxt "galleryfilespage|addall"
 msgid "A_dd All"
 msgstr "Ychwanegu _Popeth"
 
-#: gallerygeneralpage.ui:22
+#: cui/uiconfig/ui/gallerygeneralpage.ui:22
 msgctxt "gallerygeneralpage|label1"
 msgid "Modified:"
 msgstr "Newidwyd:"
 
-#: gallerygeneralpage.ui:63
+#: cui/uiconfig/ui/gallerygeneralpage.ui:63
 msgctxt "gallerygeneralpage|label2"
 msgid "Type:"
 msgstr "Math:"
 
-#: gallerygeneralpage.ui:90
+#: cui/uiconfig/ui/gallerygeneralpage.ui:90
 msgctxt "gallerygeneralpage|label3"
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: gallerygeneralpage.ui:104
+#: cui/uiconfig/ui/gallerygeneralpage.ui:104
 msgctxt "gallerygeneralpage|label4"
 msgid "Contents:"
 msgstr "Cynnwys:"
 
-#: gallerygeneralpage.ui:162
+#: cui/uiconfig/ui/gallerygeneralpage.ui:162
 msgctxt "gallerygeneralpage|image-atkobject"
 msgid "Theme Name"
 msgstr "Enw Thema"
 
-#: gallerysearchprogress.ui:8
+#: cui/uiconfig/ui/gallerysearchprogress.ui:8
 msgctxt "gallerysearchprogress|GallerySearchProgress"
 msgid "Find"
 msgstr "Canfod"
 
-#: gallerysearchprogress.ui:78
+#: cui/uiconfig/ui/gallerysearchprogress.ui:78
 msgctxt "gallerysearchprogress|label1"
 msgid "File Type"
 msgstr "Math o Ffeil"
 
-#: gallerysearchprogress.ui:115
+#: cui/uiconfig/ui/gallerysearchprogress.ui:115
 msgctxt "gallerysearchprogress|label2"
 msgid "Directory"
 msgstr "Cyfeiriadur"
 
-#: gallerythemedialog.ui:8
+#: cui/uiconfig/ui/gallerythemedialog.ui:8
 msgctxt "gallerythemedialog|GalleryThemeDialog"
 msgid "Properties of "
 msgstr "Priodweddau "
 
-#: gallerythemedialog.ui:106
+#: cui/uiconfig/ui/gallerythemedialog.ui:106
 msgctxt "gallerythemedialog|general"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: gallerythemedialog.ui:128
+#: cui/uiconfig/ui/gallerythemedialog.ui:128
 msgctxt "gallerythemedialog|files"
 msgid "Files"
 msgstr "Ffeiliau"
 
-#: gallerythemeiddialog.ui:8
+#: cui/uiconfig/ui/gallerythemeiddialog.ui:8
 msgctxt "gallerythemeiddialog|GalleryThemeIDDialog"
 msgid "Theme ID"
 msgstr "Enw Thema"
 
-#: gallerythemeiddialog.ui:27
+#: cui/uiconfig/ui/gallerythemeiddialog.ui:27
 msgctxt "gallerythemeiddialog|label2"
 msgid "ID:"
 msgstr "Enw:"
 
-#: gallerytitledialog.ui:8
+#: cui/uiconfig/ui/gallerytitledialog.ui:8
 msgctxt "gallerytitledialog|GalleryTitleDialog"
 msgid "Enter Title"
 msgstr "Rhowch Deitl"
 
-#: gallerytitledialog.ui:26
+#: cui/uiconfig/ui/gallerytitledialog.ui:26
 msgctxt "gallerytitledialog|label2"
 msgid "Title:"
 msgstr "Teitl:"
 
-#: galleryupdateprogress.ui:8
+#: cui/uiconfig/ui/galleryupdateprogress.ui:8
 msgctxt "galleryupdateprogress|GalleryUpdateProgress"
 msgid "Update"
 msgstr "Diweddaru"
 
-#: galleryupdateprogress.ui:74
+#: cui/uiconfig/ui/galleryupdateprogress.ui:74
 msgctxt "galleryupdateprogress|label2"
 msgid "File"
 msgstr "Ffeil"
 
-#: gradientpage.ui:79
+#: cui/uiconfig/ui/gradientpage.ui:79
 msgctxt "gradientpage|modify"
 msgid "_Modify"
 msgstr "_Newid"
 
-#: gradientpage.ui:106
+#: cui/uiconfig/ui/gradientpage.ui:106
 msgctxt "gradientpage|label1"
 msgid "Gradient"
 msgstr "Graddfa"
 
-#: gradientpage.ui:149
+#: cui/uiconfig/ui/gradientpage.ui:149
 msgctxt "gradientpage|typeft"
 msgid "_Type:"
 msgstr "_Math:"
 
-#: gradientpage.ui:165
+#: cui/uiconfig/ui/gradientpage.ui:165
 msgctxt "gradientpage|gradienttypelb"
 msgid "Linear"
 msgstr "Llinellog"
 
-#: gradientpage.ui:166
+#: cui/uiconfig/ui/gradientpage.ui:166
 msgctxt "gradientpage|gradienttypelb"
 msgid "Axial"
 msgstr "Echelinol"
 
-#: gradientpage.ui:167
+#: cui/uiconfig/ui/gradientpage.ui:167
 msgctxt "gradientpage|gradienttypelb"
 msgid "Radial"
 msgstr "Rheiddiol"
 
-#: gradientpage.ui:168
+#: cui/uiconfig/ui/gradientpage.ui:168
 msgctxt "gradientpage|gradienttypelb"
 msgid "Ellipsoid"
 msgstr "Elipsoid"
 
-#: gradientpage.ui:169
+#: cui/uiconfig/ui/gradientpage.ui:169
 msgctxt "gradientpage|gradienttypelb"
 msgid "Quadratic"
 msgstr "Cwadratig"
 
-#: gradientpage.ui:170
+#: cui/uiconfig/ui/gradientpage.ui:170
 msgctxt "gradientpage|gradienttypelb"
 msgid "Square"
 msgstr "Sgwâr"
 
-#: gradientpage.ui:197
+#: cui/uiconfig/ui/gradientpage.ui:197
 msgctxt "gradientpage|incrementft"
 msgid "Increment:"
 msgstr "Cynyddiad:"
 
-#: gradientpage.ui:235
+#: cui/uiconfig/ui/gradientpage.ui:235
 msgctxt "gradientpage|autoincrement"
 msgid "A_utomatic"
 msgstr "_Awtomatig"
 
-#: gradientpage.ui:272
+#: cui/uiconfig/ui/gradientpage.ui:272
 msgctxt "gradientpage|angleft"
 msgid "A_ngle:"
 msgstr "_Ongl:"
 
-#: gradientpage.ui:299
+#: cui/uiconfig/ui/gradientpage.ui:298
 msgctxt "gradientpage|centerft"
 msgid "Center ( X / Y ):"
 msgstr "Canoli ( X / Y ):"
 
-#: gradientpage.ui:367
+#: cui/uiconfig/ui/gradientpage.ui:364
 msgctxt "gradientpage|borderft"
 msgid "_Border:"
 msgstr "_Border:"
 
-#: gradientpage.ui:425
+#: cui/uiconfig/ui/gradientpage.ui:421
 msgctxt "gradientpage|colorfromft"
 msgid "_From Color:"
 msgstr "_O Liw:"
 
-#: gradientpage.ui:506
+#: cui/uiconfig/ui/gradientpage.ui:500
 msgctxt "gradientpage|colortoft"
 msgid "_To Color:"
 msgstr "_I Liw:"
 
-#: gradientpage.ui:533
+#: cui/uiconfig/ui/gradientpage.ui:527
 msgctxt "gradientpage|a11y_center_x"
 msgid "Center X"
 msgstr "Canol X"
 
-#: gradientpage.ui:547
+#: cui/uiconfig/ui/gradientpage.ui:541
 msgctxt "gradientpage|a11y_center_y"
 msgid "Center Y"
 msgstr "Canol Y"
 
-#: gradientpage.ui:561
+#: cui/uiconfig/ui/gradientpage.ui:555
 msgctxt "gradientpage|a11y_percentage_from"
 msgid "From color percentage"
 msgstr "O'r canran lliw"
 
-#: gradientpage.ui:575
+#: cui/uiconfig/ui/gradientpage.ui:569
 msgctxt "gradientpage|a11y_percentage_to"
 msgid "To color percentage"
 msgstr "I'r canran lliw"
 
-#: gradientpage.ui:600
+#: cui/uiconfig/ui/gradientpage.ui:594
 msgctxt "gradientpage|propfl"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: gradientpage.ui:644
+#: cui/uiconfig/ui/gradientpage.ui:638
 msgctxt "gradientpage|previewctl-atkobject"
 msgid "Example"
 msgstr "Esiampl"
 
-#: gradientpage.ui:662
+#: cui/uiconfig/ui/gradientpage.ui:656
 msgctxt "gradientpage|label2"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: hangulhanjaadddialog.ui:8
+#: cui/uiconfig/ui/hangulhanjaadddialog.ui:8
 msgctxt "hangulhanjaadddialog|HangulHanjaAddDialog"
 msgid "New Dictionary"
 msgstr "Geiriadur Newydd"
 
-#: hangulhanjaadddialog.ui:97
+#: cui/uiconfig/ui/hangulhanjaadddialog.ui:100
 msgctxt "hangulhanjaadddialog|label2"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: hangulhanjaadddialog.ui:129
+#: cui/uiconfig/ui/hangulhanjaadddialog.ui:131
 msgctxt "hangulhanjaadddialog|label1"
 msgid "Dictionary"
 msgstr "Geiriadur"
 
-#: hangulhanjaconversiondialog.ui:7
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:7
 msgctxt "hangulhanjaconversiondialog|HangulHanjaConversionDialog"
 msgid "Hangul/Hanja Conversion"
 msgstr "Trosi Hangul/Hanja"
 
-#: hangulhanjaconversiondialog.ui:96
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:96
 msgctxt "hangulhanjaconversiondialog|label1"
 msgid "Original"
 msgstr "Gwreiddiol"
 
-#: hangulhanjaconversiondialog.ui:132
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:132
 msgctxt "hangulhanjaconversiondialog|label3"
 msgid "Word"
 msgstr "Geiriau"
 
-#: hangulhanjaconversiondialog.ui:153
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:153
 msgctxt "hangulhanjaconversiondialog|find"
 msgid "_Find"
 msgstr "_Canfod"
 
-#: hangulhanjaconversiondialog.ui:181
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:181
 msgctxt "hangulhanjaconversiondialog|label4"
 msgid "Suggestions"
 msgstr "Awgrymiadau"
 
-#: hangulhanjaconversiondialog.ui:219
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:219
 msgctxt "hangulhanjaconversiondialog|label5"
 msgid "Format"
 msgstr "Fformat"
 
-#: hangulhanjaconversiondialog.ui:229
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:229
 msgctxt "hangulhanjaconversiondialog|simpleconversion"
 msgid "_Hangul/Hanja"
 msgstr "_Hangul/Hanja"
 
-#: hangulhanjaconversiondialog.ui:247
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:247
 msgctxt "hangulhanjaconversiondialog|hangulbracket"
 msgid "Hanja (Han_gul)"
 msgstr "Hanja (Han_gul)"
 
-#: hangulhanjaconversiondialog.ui:264
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:264
 msgctxt "hangulhanjaconversiondialog|hanjabracket"
 msgid "Hang_ul (Hanja)"
 msgstr "Hang_ul (Hanja)"
 
-#: hangulhanjaconversiondialog.ui:295
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:295
 msgctxt "hangulhanjaconversiondialog|hanja_above"
 msgid "Hanja"
 msgstr "Hanja"
 
-#: hangulhanjaconversiondialog.ui:312
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:312
 msgctxt "hangulhanjaconversiondialog|hanja_below"
 msgid "Hanja"
 msgstr "Hanja"
 
-#: hangulhanjaconversiondialog.ui:328
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:328
 msgctxt "hangulhanjaconversiondialog|hangul_above"
 msgid "Hangul"
 msgstr "Hangul"
 
-#: hangulhanjaconversiondialog.ui:344
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:344
 msgctxt "hangulhanjaconversiondialog|hangul_below"
 msgid "Hangul"
 msgstr "Hangul"
 
-#: hangulhanjaconversiondialog.ui:375
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:375
 msgctxt "hangulhanjaconversiondialog|label6"
 msgid "Conversion"
 msgstr "Trosiad"
 
-#: hangulhanjaconversiondialog.ui:385
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:385
 msgctxt "hangulhanjaconversiondialog|hangulonly"
 msgid "Hangul _only"
 msgstr "Hangul yn _unig"
 
-#: hangulhanjaconversiondialog.ui:402
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:402
 msgctxt "hangulhanjaconversiondialog|hanjaonly"
 msgid "Hanja onl_y"
 msgstr "Hanja yn u_nig"
 
-#: hangulhanjaconversiondialog.ui:440
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:440
 msgctxt "hangulhanjaconversiondialog|ignore"
 msgid "_Ignore"
 msgstr "_Anwybyddu"
 
-#: hangulhanjaconversiondialog.ui:456
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:456
 msgctxt "hangulhanjaconversiondialog|ignoreall"
 msgid "Always I_gnore"
 msgstr "_Anwybyddu Bob Tro"
 
-#: hangulhanjaconversiondialog.ui:470
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:470
 msgctxt "hangulhanjaconversiondialog|replace"
 msgid "_Replace"
 msgstr "_Newid"
 
-#: hangulhanjaconversiondialog.ui:484
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:484
 msgctxt "hangulhanjaconversiondialog|replaceall"
 msgid "Always R_eplace"
 msgstr "_Newid Bob Tro"
 
-#: hangulhanjaconversiondialog.ui:501
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:501
 msgctxt "hangulhanjaconversiondialog|replacebychar"
 msgid "Replace b_y character"
 msgstr "Newid yn ôl _nod"
 
-#: hangulhanjaconversiondialog.ui:517
+#: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:517
 msgctxt "hangulhanjaconversiondialog|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: hangulhanjaeditdictdialog.ui:9
+#: cui/uiconfig/ui/hangulhanjaeditdictdialog.ui:9
 msgctxt "hangulhanjaeditdictdialog|HangulHanjaEditDictDialog"
 msgid "Edit Custom Dictionary"
 msgstr "Golygu Geiriadur Cyfaddas"
 
-#: hangulhanjaeditdictdialog.ui:107
+#: cui/uiconfig/ui/hangulhanjaeditdictdialog.ui:107
 msgctxt "hangulhanjaeditdictdialog|label4"
 msgid "Book"
 msgstr "Llyfr"
 
-#: hangulhanjaeditdictdialog.ui:213
+#: cui/uiconfig/ui/hangulhanjaeditdictdialog.ui:213
 msgctxt "hangulhanjaeditdictdialog|label2"
 msgid "Original"
 msgstr "Gwreiddiol"
 
-#: hangulhanjaeditdictdialog.ui:326
+#: cui/uiconfig/ui/hangulhanjaeditdictdialog.ui:326
 msgctxt "hangulhanjaeditdictdialog|label3"
 msgid "Suggestions"
 msgstr "Awgrymiadau"
 
-#: hangulhanjaoptdialog.ui:8
+#: cui/uiconfig/ui/hangulhanjaoptdialog.ui:8
 msgctxt "hangulhanjaoptdialog|HangulHanjaOptDialog"
 msgid "Hangul/Hanja Options"
 msgstr "Dewisiadau Hangul/Hanja"
 
-#: hangulhanjaoptdialog.ui:107
+#: cui/uiconfig/ui/hangulhanjaoptdialog.ui:107
 msgctxt "hangulhanjaoptdialog|new"
 msgid "New..."
 msgstr "Newydd..."
 
-#: hangulhanjaoptdialog.ui:121
+#: cui/uiconfig/ui/hangulhanjaoptdialog.ui:121
 msgctxt "hangulhanjaoptdialog|edit"
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: hangulhanjaoptdialog.ui:172
+#: cui/uiconfig/ui/hangulhanjaoptdialog.ui:172
 msgctxt "hangulhanjaoptdialog|label1"
 msgid "User-defined Dictionaries"
 msgstr "Geiriaduron defnyddiwr diffiniedig"
 
-#: hangulhanjaoptdialog.ui:203
+#: cui/uiconfig/ui/hangulhanjaoptdialog.ui:203
 msgctxt "hangulhanjaoptdialog|ignorepost"
 msgid "Ignore post-positional word"
 msgstr "Anwybyddwch y gair ôl lleoli"
 
-#: hangulhanjaoptdialog.ui:218
+#: cui/uiconfig/ui/hangulhanjaoptdialog.ui:218
 msgctxt "hangulhanjaoptdialog|showrecentfirst"
 msgid "Show recently used entries first"
 msgstr "Dangos cofnodion defnyddiwyd yn ddiweddar yn gyntaf"
 
-#: hangulhanjaoptdialog.ui:232
+#: cui/uiconfig/ui/hangulhanjaoptdialog.ui:233
 msgctxt "hangulhanjaoptdialog|autoreplaceunique"
 msgid "Replace all unique entries automatically"
 msgstr "Newid pob cofnod unigryw yn awtomatig"
 
-#: hangulhanjaoptdialog.ui:252
+#: cui/uiconfig/ui/hangulhanjaoptdialog.ui:254
 msgctxt "hangulhanjaoptdialog|label2"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: hatchpage.ui:81
+#: cui/uiconfig/ui/hatchpage.ui:81
 msgctxt "hatchpage|modify"
 msgid "_Modify"
 msgstr "_Newid"
 
-#: hatchpage.ui:108
+#: cui/uiconfig/ui/hatchpage.ui:108
 msgctxt "hatchpage|label2"
 msgid "Hatch"
 msgstr "Llinelli"
 
-#: hatchpage.ui:148
+#: cui/uiconfig/ui/hatchpage.ui:148
 msgctxt "hatchpage|distanceft"
 msgid "_Spacing:"
 msgstr "_Bylchu:"
 
-#: hatchpage.ui:175
+#: cui/uiconfig/ui/hatchpage.ui:174
 msgctxt "hatchpage|angleft"
 msgid "A_ngle:"
 msgstr "_Ongl:"
 
-#: hatchpage.ui:229
+#: cui/uiconfig/ui/hatchpage.ui:227
 msgctxt "hatchpage|linetypeft"
 msgid "_Line type:"
 msgstr "_Math o linell:"
 
-#: hatchpage.ui:243
+#: cui/uiconfig/ui/hatchpage.ui:241
 msgctxt "hatchpage|linetypelb"
 msgid "Single"
 msgstr "Sengl"
 
-#: hatchpage.ui:244
+#: cui/uiconfig/ui/hatchpage.ui:242
 msgctxt "hatchpage|linetypelb"
 msgid "Crossed"
 msgstr "Croesi"
 
-#: hatchpage.ui:245
+#: cui/uiconfig/ui/hatchpage.ui:243
 msgctxt "hatchpage|linetypelb"
 msgid "Triple"
 msgstr "Triphlyg"
 
-#: hatchpage.ui:259
+#: cui/uiconfig/ui/hatchpage.ui:257
 msgctxt "hatchpage|linecolorft"
 msgid "Line _color:"
 msgstr "Lliw _llinell:"
 
-#: hatchpage.ui:281
+#: cui/uiconfig/ui/hatchpage.ui:279
 msgctxt "hatchpage|backgroundcolor"
 msgid "Background Color"
 msgstr "Lliw Cefndir"
 
-#: hatchpage.ui:313
+#: cui/uiconfig/ui/hatchpage.ui:312
 msgctxt "hatchpage|propfl"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: hatchpage.ui:357
+#: cui/uiconfig/ui/hatchpage.ui:356
 msgctxt "hatchpage|previewctl-atkobject"
 msgid "Example"
 msgstr "Esiampl"
 
-#: hatchpage.ui:375
+#: cui/uiconfig/ui/hatchpage.ui:374
 msgctxt "hatchpage|label1"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: hyperlinkdialog.ui:11
+#: cui/uiconfig/ui/hyperlinkdialog.ui:11
 msgctxt "hyperlinkdialog|HyperlinkDialog"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: hyperlinkdialog.ui:42
+#: cui/uiconfig/ui/hyperlinkdialog.ui:42
 msgctxt "hyperlinkdialog|apply"
 msgid "Apply"
 msgstr "Gosod"
 
-#: hyperlinkdialog.ui:84
+#: cui/uiconfig/ui/hyperlinkdialog.ui:84
 msgctxt "hyperlinkdialog|reset"
 msgid "Reset"
 msgstr "Ailosod"
 
-#: hyperlinkdocpage.ui:39
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:39
 msgctxt "hyperlinkdocpage|path_label"
 msgid "_Path:"
 msgstr "_Llwybr:"
 
-#: hyperlinkdocpage.ui:62
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:61
 msgctxt "hyperlinkdocpage|fileopen"
 msgid "Open File"
 msgstr "Agor Ffeil"
 
-#: hyperlinkdocpage.ui:67
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:66
 msgctxt "hyperlinkdocpage|fileopen|tooltip_text"
 msgid "Open File"
 msgstr "Agor Ffeil"
 
-#: hyperlinkdocpage.ui:82
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:81
 msgctxt "hyperlinkdocpage|label2"
 msgid "Document"
 msgstr "Dogfen"
 
-#: hyperlinkdocpage.ui:119
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:118
 msgctxt "hyperlinkdocpage|target_label"
 msgid "Targ_et:"
 msgstr "_Targed:"
 
-#: hyperlinkdocpage.ui:134
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:133
 msgctxt "hyperlinkdocpage|url_label"
 msgid "URL:"
 msgstr "URL:"
 
-#: hyperlinkdocpage.ui:144
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:143
 msgctxt "hyperlinkdocpage|browse"
 msgid "Target in Document"
 msgstr "Targed mewn Dogfen"
 
-#: hyperlinkdocpage.ui:149
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:148
 msgctxt "hyperlinkdocpage|browse|tooltip_text"
 msgid "Target in Document"
 msgstr "Targed mewn Dogfen"
 
-#: hyperlinkdocpage.ui:173
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:171
 msgctxt "hyperlinkdocpage|url"
 msgid "Test text"
 msgstr "Testun prawf"
 
-#: hyperlinkdocpage.ui:191
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:189
 msgctxt "hyperlinkdocpage|label3"
 msgid "Target in Document"
 msgstr "Targed mewn Dogfen"
 
-#: hyperlinkdocpage.ui:230
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:228
 msgctxt "hyperlinkdocpage|frame_label"
 msgid "F_rame:"
 msgstr "_Ffrâm:"
 
-#: hyperlinkdocpage.ui:245
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:243
 msgctxt "hyperlinkdocpage|indication_label"
 msgid "Te_xt:"
 msgstr "_Testun:"
 
-#: hyperlinkdocpage.ui:260
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:258
 msgctxt "hyperlinkdocpage|name_label"
 msgid "N_ame:"
 msgstr "_Enw:"
 
-#: hyperlinkdocpage.ui:303
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:299
 msgctxt "hyperlinkdocpage|form_label"
 msgid "F_orm:"
 msgstr "_Ffurflen:"
 
-#: hyperlinkdocpage.ui:329
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:325
 msgctxt "hyperlinkdocpage|script|tooltip_text"
 msgid "Events"
 msgstr "Digwyddiadau"
 
-#: hyperlinkdocpage.ui:367
+#: cui/uiconfig/ui/hyperlinkdocpage.ui:363
 msgctxt "hyperlinkdocpage|label1"
 msgid "Further Settings"
 msgstr "Gosodiadau Pellach"
 
-#: hyperlinkinternetpage.ui:42
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:42
 msgctxt "hyperlinkinternetpage|linktyp_internet"
 msgid "_Web"
 msgstr "_Gwe"
 
-#: hyperlinkinternetpage.ui:59
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:59
 msgctxt "hyperlinkinternetpage|linktyp_ftp"
 msgid "_FTP"
 msgstr "_FTP"
 
-#: hyperlinkinternetpage.ui:86
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:86
 msgctxt "hyperlinkinternetpage|target_label"
 msgid "_URL:"
 msgstr "_URL:"
 
-#: hyperlinkinternetpage.ui:113
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:112
 msgctxt "hyperlinkinternetpage|login_label"
 msgid "_Login name:"
 msgstr "Enw _mewngofnodi:"
 
-#: hyperlinkinternetpage.ui:128
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:127
 msgctxt "hyperlinkinternetpage|password_label"
 msgid "_Password:"
 msgstr "_Cyfrinair:"
 
-#: hyperlinkinternetpage.ui:164
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:161
 msgctxt "hyperlinkinternetpage|anonymous"
 msgid "Anonymous _user"
 msgstr "_Defnyddiwr anhysbys"
 
-#: hyperlinkinternetpage.ui:192
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:189
 msgctxt "hyperlinkinternetpage|label2"
 msgid "Hyperlink Type"
 msgstr "Math o Ddolen"
 
-#: hyperlinkinternetpage.ui:230
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:227
 msgctxt "hyperlinkinternetpage|frame_label"
 msgid "F_rame:"
 msgstr "_Ffrâm:"
 
-#: hyperlinkinternetpage.ui:245
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:242
 msgctxt "hyperlinkinternetpage|indication_label"
 msgid "Te_xt:"
 msgstr "_Testun:"
 
-#: hyperlinkinternetpage.ui:260
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:257
 msgctxt "hyperlinkinternetpage|name_label"
 msgid "Na_me:"
 msgstr "_Enw:"
 
-#: hyperlinkinternetpage.ui:303
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:298
 msgctxt "hyperlinkinternetpage|form_label"
 msgid "F_orm:"
 msgstr "_Ffurflen:"
 
-#: hyperlinkinternetpage.ui:330
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:325
 msgctxt "hyperlinkinternetpage|script|tooltip_text"
 msgid "Events"
 msgstr "Digwyddiadau"
 
-#: hyperlinkinternetpage.ui:368
+#: cui/uiconfig/ui/hyperlinkinternetpage.ui:363
 msgctxt "hyperlinkinternetpage|label1"
 msgid "Further Settings"
 msgstr "Gosodiadau Pellach"
 
-#: hyperlinkmailpage.ui:39
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:39
 msgctxt "hyperlinkmailpage|receiver_label"
 msgid "Re_cipient:"
 msgstr "_Derbyniwr:"
 
-#: hyperlinkmailpage.ui:62
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:61
 msgctxt "hyperlinkmailpage|adressbook"
 msgid "Data Sources…"
 msgstr "Ffynhonnell Data…"
 
-#: hyperlinkmailpage.ui:67
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:66
 msgctxt "hyperlinkmailpage|adressbook|tooltip_text"
 msgid "Data Sources..."
 msgstr "Ffynonellau Data..."
 
-#: hyperlinkmailpage.ui:81
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:80
 msgctxt "hyperlinkmailpage|subject_label"
 msgid "_Subject:"
 msgstr "_Pwnc:"
 
-#: hyperlinkmailpage.ui:119
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:117
 msgctxt "hyperlinkmailpage|label2"
 msgid "Mail"
 msgstr "E-bost"
 
-#: hyperlinkmailpage.ui:158
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:156
 msgctxt "hyperlinkmailpage|frame_label"
 msgid "F_rame:"
 msgstr "_Ffrâm:"
 
-#: hyperlinkmailpage.ui:173
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:171
 msgctxt "hyperlinkmailpage|indication_label"
 msgid "Te_xt:"
 msgstr "_Testun:"
 
-#: hyperlinkmailpage.ui:188
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:186
 msgctxt "hyperlinkmailpage|name_label"
 msgid "N_ame:"
 msgstr "_Enw:"
 
-#: hyperlinkmailpage.ui:231
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:227
 msgctxt "hyperlinkmailpage|form_label"
 msgid "F_orm:"
 msgstr "_Ffurflen:"
 
-#: hyperlinkmailpage.ui:257
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:253
 msgctxt "hyperlinkmailpage|script|tooltip_text"
 msgid "Events"
 msgstr "Digwyddiadau"
 
-#: hyperlinkmailpage.ui:295
+#: cui/uiconfig/ui/hyperlinkmailpage.ui:291
 msgctxt "hyperlinkmailpage|label1"
 msgid "Further Settings"
 msgstr "Gosodiadau Pellach"
 
-#: hyperlinkmarkdialog.ui:9
+#: cui/uiconfig/ui/hyperlinkmarkdialog.ui:9
 msgctxt "hyperlinkmarkdialog|HyperlinkMark"
 msgid "Target in Document"
 msgstr "Targed mewn Dogfen"
 
-#: hyperlinkmarkdialog.ui:22
+#: cui/uiconfig/ui/hyperlinkmarkdialog.ui:22
 msgctxt "hyperlinkmarkdialog|apply"
 msgid "_Apply"
 msgstr "_Gosod"
 
-#: hyperlinkmarkdialog.ui:39
+#: cui/uiconfig/ui/hyperlinkmarkdialog.ui:39
 msgctxt "hyperlinkmarkdialog|close"
 msgid "_Close"
 msgstr "_Cau"
 
-#: hyperlinkmarkdialog.ui:72
+#: cui/uiconfig/ui/hyperlinkmarkdialog.ui:72
 msgctxt "hyperlinkmarkdialog|TreeListBox-atkobject"
 msgid "Mark Tree"
 msgstr "Nodi'r Goeden"
 
-#: hyperlinknewdocpage.ui:44
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:44
 msgctxt "hyperlinknewdocpage|editnow"
 msgid "Edit _now"
 msgstr "Golygu _nawr"
 
-#: hyperlinknewdocpage.ui:61
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:61
 msgctxt "hyperlinknewdocpage|editlater"
 msgid "Edit _later"
 msgstr "Golygu _eto"
 
-#: hyperlinknewdocpage.ui:89
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:89
 msgctxt "hyperlinknewdocpage|file_label"
 msgid "_File:"
 msgstr "_Ffeil:"
 
-#: hyperlinknewdocpage.ui:112
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:111
 msgctxt "hyperlinknewdocpage|create"
 msgid "Select Path"
 msgstr "Dewis Llwybr"
 
-#: hyperlinknewdocpage.ui:117
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:116
 msgctxt "hyperlinknewdocpage|create|tooltip_text"
 msgid "Select Path"
 msgstr "Dewis Llwybr"
 
-#: hyperlinknewdocpage.ui:132
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:131
 msgctxt "hyperlinknewdocpage|types_label"
 msgid "File _type:"
 msgstr "_Math o ffeil:"
 
-#: hyperlinknewdocpage.ui:172
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:171
 msgctxt "hyperlinknewdocpage|label2"
 msgid "New Document"
 msgstr "Dogfen Newydd"
 
-#: hyperlinknewdocpage.ui:211
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:210
 msgctxt "hyperlinknewdocpage|frame_label"
 msgid "F_rame:"
 msgstr "_Ffrâm:"
 
-#: hyperlinknewdocpage.ui:226
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:225
 msgctxt "hyperlinknewdocpage|indication_label"
 msgid "Te_xt:"
 msgstr "_Testun:"
 
-#: hyperlinknewdocpage.ui:241
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:240
 msgctxt "hyperlinknewdocpage|name_label"
 msgid "N_ame:"
 msgstr "_Enw:"
 
-#: hyperlinknewdocpage.ui:283
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:280
 msgctxt "hyperlinknewdocpage|form_label"
 msgid "F_orm:"
 msgstr "_Fformiwla:"
 
-#: hyperlinknewdocpage.ui:309
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:306
 msgctxt "hyperlinknewdocpage|script|tooltip_text"
 msgid "Events"
 msgstr "Digwyddiadau"
 
-#: hyperlinknewdocpage.ui:347
+#: cui/uiconfig/ui/hyperlinknewdocpage.ui:344
 msgctxt "hyperlinknewdocpage|label1"
 msgid "Further Settings"
 msgstr "Gosodiadau Pellach"
 
-#: hyphenate.ui:19
+#: cui/uiconfig/ui/hyphenate.ui:19
 msgctxt "hyphenate|HyphenateDialog"
 msgid "Hyphenation"
 msgstr "Cysylltnodi"
 
-#: hyphenate.ui:48
+#: cui/uiconfig/ui/hyphenate.ui:48
 msgctxt "hyphenate|hyphall"
 msgid "Hyphenate All"
 msgstr "Cysylltnodi Popeth"
 
-#: hyphenate.ui:98
+#: cui/uiconfig/ui/hyphenate.ui:98
 msgctxt "hyphenate|ok"
 msgid "Hyphenate"
 msgstr "Cysylltnod"
 
-#: hyphenate.ui:112
+#: cui/uiconfig/ui/hyphenate.ui:112
 msgctxt "hyphenate|continue"
 msgid "Skip"
 msgstr "Hepgor"
 
-#: hyphenate.ui:148
+#: cui/uiconfig/ui/hyphenate.ui:148
 msgctxt "hyphenate|label1"
 msgid "Word:"
 msgstr "Gair:"
 
-#: iconchangedialog.ui:10
-msgctxt "iconchangedialog|IconChange"
-msgid "%PRODUCTNAME %PRODUCTVERSION"
-msgstr "%PRODUCTNAME %PRODUCTVERSION"
-
-#: iconchangedialog.ui:75
+#: cui/uiconfig/ui/iconchangedialog.ui:61
 msgctxt "iconchangedialog|label1"
 msgid ""
 "The files listed below could not be imported.\n"
@@ -5910,27 +5894,27 @@ msgstr ""
 "Nid oedd modd mewnforio'r ffeiliau a restrir isod.\n"
 "Nid oedd modd dehongli fformat y ffeil."
 
-#: iconselectordialog.ui:10
+#: cui/uiconfig/ui/iconselectordialog.ui:10
 msgctxt "iconselectordialog|IconSelector"
 msgid "Change Icon"
 msgstr "Newid Eicon"
 
-#: iconselectordialog.ui:125
+#: cui/uiconfig/ui/iconselectordialog.ui:125
 msgctxt "iconselectordialog|label1"
 msgid "_Icons"
 msgstr "_Eiconau"
 
-#: iconselectordialog.ui:148
+#: cui/uiconfig/ui/iconselectordialog.ui:148
 msgctxt "iconselectordialog|importButton"
 msgid "I_mport..."
 msgstr "_Mewnforio..."
 
-#: iconselectordialog.ui:163
+#: cui/uiconfig/ui/iconselectordialog.ui:163
 msgctxt "iconselectordialog|deleteButton"
 msgid "_Delete..."
 msgstr "_Dileu..."
 
-#: iconselectordialog.ui:197
+#: cui/uiconfig/ui/iconselectordialog.ui:197
 msgctxt "iconselectordialog|noteLabel"
 msgid ""
 "Note:\n"
@@ -5941,1197 +5925,1277 @@ msgstr ""
 "Dylai maint y eicon fod yn 16x16 picsel i sicrhau'r ansawdd gorau.\n"
 "Bydd eiconau o wahanol faint yn cael ei graddio'n awtomatig."
 
-#: insertfloatingframe.ui:13
+#: cui/uiconfig/ui/insertfloatingframe.ui:18
 msgctxt "insertfloatingframe|InsertFloatingFrameDialog"
 msgid "Floating Frame Properties"
 msgstr "Priodweddau Ffrâm Arnofio"
 
-#: insertfloatingframe.ui:65
+#: cui/uiconfig/ui/insertfloatingframe.ui:128
 msgctxt "insertfloatingframe|label6"
 msgid "Name:"
 msgstr "Enw:"
 
-#: insertfloatingframe.ui:78
+#: cui/uiconfig/ui/insertfloatingframe.ui:141
 msgctxt "insertfloatingframe|label7"
 msgid "Contents:"
 msgstr "Cynnwys:"
 
-#: insertfloatingframe.ui:87
+#: cui/uiconfig/ui/insertfloatingframe.ui:150
 msgctxt "insertfloatingframe|buttonbrowse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: insertfloatingframe.ui:130
+#: cui/uiconfig/ui/insertfloatingframe.ui:193
 msgctxt "insertfloatingframe|scrollbaron"
 msgid "On"
 msgstr "Ymlaen"
 
-#: insertfloatingframe.ui:147
+#: cui/uiconfig/ui/insertfloatingframe.ui:210
 msgctxt "insertfloatingframe|scrollbaroff"
 msgid "Off"
 msgstr "Diffodd"
 
-#: insertfloatingframe.ui:163
+#: cui/uiconfig/ui/insertfloatingframe.ui:227
 msgctxt "insertfloatingframe|scrollbarauto"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: insertfloatingframe.ui:185
+#: cui/uiconfig/ui/insertfloatingframe.ui:250
 msgctxt "insertfloatingframe|label1"
 msgid "Scroll Bar"
 msgstr "Bar Sgrolio"
 
-#: insertfloatingframe.ui:218
+#: cui/uiconfig/ui/insertfloatingframe.ui:283
 msgctxt "insertfloatingframe|borderon"
 msgid "On"
 msgstr "Ymlaen"
 
-#: insertfloatingframe.ui:235
+#: cui/uiconfig/ui/insertfloatingframe.ui:300
 msgctxt "insertfloatingframe|borderoff"
 msgid "Off"
 msgstr "Diffodd"
 
-#: insertfloatingframe.ui:260
+#: cui/uiconfig/ui/insertfloatingframe.ui:326
 msgctxt "insertfloatingframe|label2"
 msgid "Border"
 msgstr "Border"
 
-#: insertfloatingframe.ui:297
+#: cui/uiconfig/ui/insertfloatingframe.ui:362
 msgctxt "insertfloatingframe|widthlabel"
 msgid "Width:"
 msgstr "Lled:"
 
-#: insertfloatingframe.ui:310
+#: cui/uiconfig/ui/insertfloatingframe.ui:375
 msgctxt "insertfloatingframe|heightlabel"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: insertfloatingframe.ui:345
+#: cui/uiconfig/ui/insertfloatingframe.ui:409
 msgctxt "insertfloatingframe|defaultwidth"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: insertfloatingframe.ui:359
+#: cui/uiconfig/ui/insertfloatingframe.ui:424
 msgctxt "insertfloatingframe|defaultheight"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: insertfloatingframe.ui:379
+#: cui/uiconfig/ui/insertfloatingframe.ui:445
 msgctxt "insertfloatingframe|label3"
 msgid "Padding"
 msgstr "Padio"
 
-#: insertoleobject.ui:8
+#: cui/uiconfig/ui/insertoleobject.ui:16
 msgctxt "insertoleobject|InsertOLEObjectDialog"
 msgid "Insert OLE Object"
 msgstr "Mewnosod Gwrthrych OLE"
 
-#: insertoleobject.ui:86
+#: cui/uiconfig/ui/insertoleobject.ui:100
 msgctxt "insertoleobject|createnew"
 msgid "Create new"
 msgstr "Creu newydd"
 
-#: insertoleobject.ui:102
+#: cui/uiconfig/ui/insertoleobject.ui:117
 msgctxt "insertoleobject|createfromfile"
 msgid "Create from file"
 msgstr "Creu o ffeil"
 
-#: insertoleobject.ui:151
+#: cui/uiconfig/ui/insertoleobject.ui:197
 msgctxt "insertoleobject|label1"
 msgid "Object Type"
 msgstr "Math o Wrthrych"
 
-#: insertoleobject.ui:197
+#: cui/uiconfig/ui/insertoleobject.ui:242
 msgctxt "insertoleobject|urlbtn"
 msgid "Search…"
 msgstr "Chwilio…"
 
-#: insertoleobject.ui:210
+#: cui/uiconfig/ui/insertoleobject.ui:255
 msgctxt "insertoleobject|linktofile"
 msgid "Link to file"
 msgstr "Cysylltu â ffeil"
 
-#: insertoleobject.ui:224
+#: cui/uiconfig/ui/insertoleobject.ui:270
 msgctxt "insertoleobject|asicon"
 msgid "Display as icon"
 msgstr "Dangos fel eicon"
 
-#: insertoleobject.ui:245
+#: cui/uiconfig/ui/insertoleobject.ui:292
 msgctxt "insertoleobject|label2"
 msgid "File"
 msgstr "Ffeil"
 
-#: insertrowcolumn.ui:15
+#: cui/uiconfig/ui/insertrowcolumn.ui:15
 msgctxt "insertrowcolumn|InsertRowColumnDialog"
 msgid "Insert Row"
 msgstr "Mewnosod Rhes"
 
-#: insertrowcolumn.ui:106
+#: cui/uiconfig/ui/insertrowcolumn.ui:109
 msgctxt "insertrowcolumn|label3"
 msgid "_Number:"
 msgstr "_Rhif:"
 
-#: insertrowcolumn.ui:138
+#: cui/uiconfig/ui/insertrowcolumn.ui:140
 msgctxt "insertrowcolumn|label1"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: insertrowcolumn.ui:169
+#: cui/uiconfig/ui/insertrowcolumn.ui:171
 msgctxt "insertrowcolumn|insert_before"
 msgid "_Before"
 msgstr "_Cynt"
 
-#: insertrowcolumn.ui:187
+#: cui/uiconfig/ui/insertrowcolumn.ui:188
 msgctxt "insertrowcolumn|insert_after"
 msgid "A_fter"
 msgstr "_Wedi"
 
-#: insertrowcolumn.ui:210
+#: cui/uiconfig/ui/insertrowcolumn.ui:211
 msgctxt "insertrowcolumn|label2"
 msgid "Position"
 msgstr "Safle"
 
-#: javaclasspathdialog.ui:8
+#: cui/uiconfig/ui/javaclasspathdialog.ui:8
 msgctxt "javaclasspathdialog|JavaClassPath"
 msgid "Class Path"
 msgstr "Llwybr Dosbarth"
 
-#: javaclasspathdialog.ui:93
+#: cui/uiconfig/ui/javaclasspathdialog.ui:93
 msgctxt "javaclasspathdialog|label1"
 msgid "A_ssigned folders and archives"
 msgstr "_Ffolderi ac archifau neilltuwyd"
 
-#: javaclasspathdialog.ui:144
+#: cui/uiconfig/ui/javaclasspathdialog.ui:144
 msgctxt "javaclasspathdialog|archive"
 msgid "_Add Archive..."
 msgstr "_Ychwanegu Archif..."
 
-#: javaclasspathdialog.ui:158
+#: cui/uiconfig/ui/javaclasspathdialog.ui:158
 msgctxt "javaclasspathdialog|folder"
 msgid "Add _Folder"
 msgstr "Ychwanegu _Folder"
 
-#: javaclasspathdialog.ui:172
+#: cui/uiconfig/ui/javaclasspathdialog.ui:172
 msgctxt "javaclasspathdialog|remove"
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: javastartparametersdialog.ui:8
+#: cui/uiconfig/ui/javastartparametersdialog.ui:8
 msgctxt "javastartparametersdialog|JavaStartParameters"
 msgid "Java Start Parameters"
 msgstr "Paramedrau Cychwyn Java"
 
-#: javastartparametersdialog.ui:94
+#: cui/uiconfig/ui/javastartparametersdialog.ui:94
 msgctxt "javastartparametersdialog|label4"
 msgid "Java start _parameter"
 msgstr "_Paramedrau cychwyn Java"
 
-#: javastartparametersdialog.ui:120
+#: cui/uiconfig/ui/javastartparametersdialog.ui:119
 msgctxt "javastartparametersdialog|label5"
 msgid "Assig_ned start parameters"
 msgstr "Paramedrau _neilltuwyd ar gyfer cychwyn"
 
-#: javastartparametersdialog.ui:159
+#: cui/uiconfig/ui/javastartparametersdialog.ui:158
 msgctxt "javastartparametersdialog|label6"
 msgid "For example: -Dmyprop=c:\\\\program files\\\\java"
 msgstr "Er enghraifft: -Dmyprop=c:\\\\program files\\\\java"
 
-#: javastartparametersdialog.ui:168
+#: cui/uiconfig/ui/javastartparametersdialog.ui:167
 msgctxt "javastartparametersdialog|assignbtn"
 msgid "_Add"
 msgstr "_Ychwanegu"
 
-#: javastartparametersdialog.ui:188
+#: cui/uiconfig/ui/javastartparametersdialog.ui:187
 msgctxt "javastartparametersdialog|editbtn"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: javastartparametersdialog.ui:203
+#: cui/uiconfig/ui/javastartparametersdialog.ui:202
 msgctxt "javastartparametersdialog|removebtn"
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: linedialog.ui:8
+#: cui/uiconfig/ui/linedialog.ui:8
 msgctxt "linedialog|LineDialog"
 msgid "Line"
 msgstr "Llinell"
 
-#: linedialog.ui:106
+#: cui/uiconfig/ui/linedialog.ui:106
 msgctxt "linedialog|RID_SVXPAGE_LINE"
 msgid "Line"
 msgstr "Llinell"
 
-#: linedialog.ui:128
+#: cui/uiconfig/ui/linedialog.ui:128
 msgctxt "linedialog|RID_SVXPAGE_SHADOW"
 msgid "Shadow"
 msgstr "Cysgod"
 
-#: linedialog.ui:151
+#: cui/uiconfig/ui/linedialog.ui:151
 msgctxt "linedialog|RID_SVXPAGE_LINE_DEF"
 msgid "Line Styles"
 msgstr "Arddulliau Llinell"
 
-#: linedialog.ui:174
+#: cui/uiconfig/ui/linedialog.ui:174
 msgctxt "linedialog|RID_SVXPAGE_LINEEND_DEF"
 msgid "Arrow Styles"
 msgstr "Arddull Saeth"
 
-#: lineendstabpage.ui:49
+#: cui/uiconfig/ui/lineendstabpage.ui:49
 msgctxt "lineendstabpage|FT_TITLE"
 msgid "_Title:"
 msgstr "_Teitl:"
 
-#: lineendstabpage.ui:65
+#: cui/uiconfig/ui/lineendstabpage.ui:65
 msgctxt "lineendstabpage|FT_LINE_END_STYLE"
 msgid "Arrow _style:"
 msgstr "Arddull _saeth:"
 
-#: lineendstabpage.ui:111
+#: cui/uiconfig/ui/lineendstabpage.ui:110
 msgctxt "lineendstabpage|FI_TIP"
 msgid "Add a selected object to create new arrow styles."
 msgstr "Ychwanegu gwrthrych er mwyn creu arddull saeth newydd."
 
-#: lineendstabpage.ui:152
+#: cui/uiconfig/ui/lineendstabpage.ui:151
 msgctxt "lineendstabpage|BTN_MODIFY"
 msgid "_Modify"
 msgstr "_Newid"
 
-#: lineendstabpage.ui:190
+#: cui/uiconfig/ui/lineendstabpage.ui:189
 msgctxt "lineendstabpage|BTN_LOAD|tooltip_text"
 msgid "Load arrow styles"
 msgstr "Llwytho arddulliau saeth"
 
-#: lineendstabpage.ui:208
+#: cui/uiconfig/ui/lineendstabpage.ui:207
 msgctxt "lineendstabpage|BTN_SAVE|tooltip_text"
 msgid "Save arrow styles"
 msgstr "Cadw arddulliau saeth"
 
-#: lineendstabpage.ui:276
+#: cui/uiconfig/ui/lineendstabpage.ui:275
 msgctxt "lineendstabpage|label1"
 msgid "Organize Arrow Styles"
 msgstr "Trefnu Arddulliau Saeth"
 
-#: linestyletabpage.ui:34
+#: cui/uiconfig/ui/linestyletabpage.ui:34
 msgctxt "linestyletabpage|liststoreTYPE"
 msgid "Dots"
 msgstr "Dotiau"
 
-#: linestyletabpage.ui:38
+#: cui/uiconfig/ui/linestyletabpage.ui:38
 msgctxt "linestyletabpage|liststoreTYPE"
 msgid "Dash"
 msgstr "Torredig"
 
-#: linestyletabpage.ui:92
+#: cui/uiconfig/ui/linestyletabpage.ui:92
 msgctxt "linestyletabpage|FT_LINESTYLE"
 msgid "Line _style:"
 msgstr "Arddull _llinell:"
 
-#: linestyletabpage.ui:130
+#: cui/uiconfig/ui/linestyletabpage.ui:130
 msgctxt "linestyletabpage|FT_TYPE"
 msgid "_Type:"
 msgstr "_Math:"
 
-#: linestyletabpage.ui:146
+#: cui/uiconfig/ui/linestyletabpage.ui:146
 msgctxt "linestyletabpage|FT_NUMBER"
 msgid "_Number:"
 msgstr "_Rhif:"
 
-#: linestyletabpage.ui:162
+#: cui/uiconfig/ui/linestyletabpage.ui:162
 msgctxt "linestyletabpage|FT_LENGTH"
 msgid "_Length:"
 msgstr "_Hyd:"
 
-#: linestyletabpage.ui:178
+#: cui/uiconfig/ui/linestyletabpage.ui:178
 msgctxt "linestyletabpage|FT_DISTANCE"
 msgid "_Spacing:"
 msgstr "_Bylchu:"
 
-#: linestyletabpage.ui:191
+#: cui/uiconfig/ui/linestyletabpage.ui:191
 msgctxt "linestyletabpage|CBX_SYNCHRONIZE"
 msgid "_Fit to line width"
 msgstr "_Ffit i led llinell"
 
-#: linestyletabpage.ui:354
+#: cui/uiconfig/ui/linestyletabpage.ui:349
 msgctxt "linestyletabpage|BTN_MODIFY"
 msgid "_Modify"
 msgstr "_Newid"
 
-#: linestyletabpage.ui:392
+#: cui/uiconfig/ui/linestyletabpage.ui:387
 msgctxt "linestyletabpage|BTN_LOAD|tooltip_text"
 msgid "Load Line Styles"
 msgstr "Llwytho Arddulliau Llinell"
 
-#: linestyletabpage.ui:410
+#: cui/uiconfig/ui/linestyletabpage.ui:405
 msgctxt "linestyletabpage|BTN_SAVE|tooltip_text"
 msgid "Save Line Styles"
 msgstr "Cadw Arddulliau Llinell"
 
-#: linestyletabpage.ui:465
+#: cui/uiconfig/ui/linestyletabpage.ui:460
 msgctxt "linestyletabpage|label1"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: linetabpage.ui:30
+#: cui/uiconfig/ui/linetabpage.ui:30
 msgctxt "linetabpage|liststoreCAP_STYLE"
 msgid "Flat"
 msgstr "Gwastad"
 
-#: linetabpage.ui:34
+#: cui/uiconfig/ui/linetabpage.ui:34
 msgctxt "linetabpage|liststoreCAP_STYLE"
 msgid "Round"
 msgstr "Crwn"
 
-#: linetabpage.ui:38
+#: cui/uiconfig/ui/linetabpage.ui:38
 msgctxt "linetabpage|liststoreCAP_STYLE"
 msgid "Square"
 msgstr "Sgwâr"
 
-#: linetabpage.ui:52
+#: cui/uiconfig/ui/linetabpage.ui:52
 msgctxt "linetabpage|liststoreEDGE_STYLE"
 msgid "Rounded"
 msgstr "Crwn"
 
-#: linetabpage.ui:56
+#: cui/uiconfig/ui/linetabpage.ui:56
 msgctxt "linetabpage|liststoreEDGE_STYLE"
 msgid "- none -"
 msgstr "- dim -"
 
-#: linetabpage.ui:60
+#: cui/uiconfig/ui/linetabpage.ui:60
 msgctxt "linetabpage|liststoreEDGE_STYLE"
 msgid "Mitered"
 msgstr "Meitro"
 
-#: linetabpage.ui:64
+#: cui/uiconfig/ui/linetabpage.ui:64
 msgctxt "linetabpage|liststoreEDGE_STYLE"
 msgid "Beveled"
 msgstr "Beflog"
 
-#: linetabpage.ui:109
+#: cui/uiconfig/ui/linetabpage.ui:109
 msgctxt "linetabpage|FT_LINE_STYLE"
 msgid "_Style:"
 msgstr "_Arddull:"
 
-#: linetabpage.ui:148
+#: cui/uiconfig/ui/linetabpage.ui:148
 msgctxt "linetabpage|FT_COLOR"
 msgid "Colo_r:"
 msgstr "_Lliw:"
 
-#: linetabpage.ui:186
+#: cui/uiconfig/ui/linetabpage.ui:186
 msgctxt "linetabpage|FT_LINE_WIDTH"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: linetabpage.ui:228
+#: cui/uiconfig/ui/linetabpage.ui:227
 msgctxt "linetabpage|FT_TRANSPARENT"
 msgid "_Transparency:"
 msgstr "_Tryloywder:"
 
-#: linetabpage.ui:267
+#: cui/uiconfig/ui/linetabpage.ui:265
 msgctxt "linetabpage|label1"
 msgid "Line Properties"
 msgstr "Priodweddau Llinell"
 
-#: linetabpage.ui:315
+#: cui/uiconfig/ui/linetabpage.ui:313
 msgctxt "linetabpage|FT_LINE_ENDS_STYLE"
 msgid "Start st_yle:"
 msgstr "Ar_ddull cychwyn:"
 
-#: linetabpage.ui:355
+#: cui/uiconfig/ui/linetabpage.ui:353
 msgctxt "linetabpage|label5"
 msgid "End sty_le:"
 msgstr "_Arddull diwedd:"
 
-#: linetabpage.ui:377
+#: cui/uiconfig/ui/linetabpage.ui:375
 msgctxt "linetabpage|FT_LINE_START_WIDTH"
 msgid "Wi_dth:"
 msgstr "_Lled:"
 
-#: linetabpage.ui:404
+#: cui/uiconfig/ui/linetabpage.ui:401
 msgctxt "linetabpage|TSB_CENTER_START"
 msgid "Ce_nter"
 msgstr "_Canol"
 
-#: linetabpage.ui:438
+#: cui/uiconfig/ui/linetabpage.ui:435
 msgctxt "linetabpage|FT_LINE_END_WIDTH"
 msgid "W_idth:"
 msgstr "_Lled:"
 
-#: linetabpage.ui:465
+#: cui/uiconfig/ui/linetabpage.ui:461
 msgctxt "linetabpage|TSB_CENTER_END"
 msgid "C_enter"
 msgstr "C_anoli"
 
-#: linetabpage.ui:497
+#: cui/uiconfig/ui/linetabpage.ui:493
 msgctxt "linetabpage|CBX_SYNCHRONIZE"
 msgid "Synchroni_ze ends"
 msgstr "C_ydweddu diwedd"
 
-#: linetabpage.ui:519
+#: cui/uiconfig/ui/linetabpage.ui:515
 msgctxt "linetabpage|label2"
 msgid "Arrow Styles"
 msgstr "Arddull Saeth"
 
-#: linetabpage.ui:555
+#: cui/uiconfig/ui/linetabpage.ui:551
 msgctxt "linetabpage|FT_EDGE_STYLE"
 msgid "_Corner style:"
 msgstr "_Arddull cornel:"
 
-#: linetabpage.ui:571
+#: cui/uiconfig/ui/linetabpage.ui:567
 msgctxt "linetabpage|FT_CAP_STYLE"
 msgid "Ca_p style:"
 msgstr "A_rddull cap:"
 
-#: linetabpage.ui:616
+#: cui/uiconfig/ui/linetabpage.ui:612
 msgctxt "linetabpage|label3"
 msgid "Corner and Cap Styles"
 msgstr "Arddulliau Cornel a Chap"
 
-#: linetabpage.ui:649
+#: cui/uiconfig/ui/linetabpage.ui:645
 msgctxt "linetabpage|MB_SYMBOL_BITMAP"
 msgid "Select..."
 msgstr "Dewis..."
 
-#: linetabpage.ui:671
+#: cui/uiconfig/ui/linetabpage.ui:667
 msgctxt "linetabpage|FT_SYMBOL_WIDTH"
 msgid "Widt_h:"
 msgstr "_Lled:"
 
-#: linetabpage.ui:699
+#: cui/uiconfig/ui/linetabpage.ui:694
 msgctxt "linetabpage|CB_SYMBOL_RATIO"
 msgid "_Keep ratio"
 msgstr "_Cadw graddfa"
 
-#: linetabpage.ui:719
+#: cui/uiconfig/ui/linetabpage.ui:714
 msgctxt "linetabpage|FT_SYMBOL_HEIGHT"
 msgid "Hei_ght:"
 msgstr "_Uchder:"
 
-#: linetabpage.ui:759
+#: cui/uiconfig/ui/linetabpage.ui:753
 msgctxt "linetabpage|label4"
 msgid "Icon"
 msgstr "Eicon"
 
-#: linetabpage.ui:798
+#: cui/uiconfig/ui/linetabpage.ui:792
 msgctxt "linetabpage|CTL_PREVIEW-atkobject"
 msgid "Example"
 msgstr "Enghraifft"
 
-#: linetabpage.ui:824
+#: cui/uiconfig/ui/linetabpage.ui:818
 msgctxt "linetabpage|menuitem1"
 msgid "_No Symbol"
 msgstr "_Dim Symbol"
 
-#: linetabpage.ui:832
+#: cui/uiconfig/ui/linetabpage.ui:826
 msgctxt "linetabpage|menuitem2"
 msgid "_Automatic"
 msgstr "_Awtomatig"
 
-#: linetabpage.ui:840
+#: cui/uiconfig/ui/linetabpage.ui:834
 msgctxt "linetabpage|menuitem3"
 msgid "_From file..."
 msgstr "_O ffeil..."
 
-#: linetabpage.ui:848
+#: cui/uiconfig/ui/linetabpage.ui:842
 msgctxt "linetabpage|menuitem4"
 msgid "_Gallery"
 msgstr "_Oriel"
 
-#: linetabpage.ui:856
+#: cui/uiconfig/ui/linetabpage.ui:850
 msgctxt "linetabpage|menuitem5"
 msgid "_Symbols"
 msgstr "_Symbolau"
 
-#: macroassigndialog.ui:8
+#: cui/uiconfig/ui/macroassigndialog.ui:8
 msgctxt "macroassigndialog|MacroAssignDialog"
 msgid "Assign Action"
 msgstr "Neilltuo Gweithred"
 
-#: macroassignpage.ui:57
+#: cui/uiconfig/ui/macroassignpage.ui:57
 msgctxt "macroassignpage|eventft"
 msgid "Event"
 msgstr "Digwyddiad"
 
-#: macroassignpage.ui:70
+#: cui/uiconfig/ui/macroassignpage.ui:70
 msgctxt "macroassignpage|assignft"
 msgid "Assigned Action"
 msgstr "Gweithred Neulltiwyd"
 
-#: macroassignpage.ui:95
+#: cui/uiconfig/ui/macroassignpage.ui:95
 msgctxt "macroassignpage|libraryft1"
 msgid "Assignments"
 msgstr "Aseiniadau"
 
-#: macroassignpage.ui:130
+#: cui/uiconfig/ui/macroassignpage.ui:130
 msgctxt "macroassignpage|assign"
 msgid "M_acro..."
 msgstr "_Macro..."
 
-#: macroassignpage.ui:144
+#: cui/uiconfig/ui/macroassignpage.ui:144
 msgctxt "macroassignpage|component"
 msgid "Com_ponent..."
 msgstr "­C_ydran..."
 
-#: macroassignpage.ui:158
+#: cui/uiconfig/ui/macroassignpage.ui:158
 msgctxt "macroassignpage|delete"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: macroassignpage.ui:216
+#: cui/uiconfig/ui/macroassignpage.ui:216
 msgctxt "macroassignpage|label1"
 msgid "Assign"
 msgstr "Neulltio"
 
-#: macroselectordialog.ui:8
+#: cui/uiconfig/ui/macroselectordialog.ui:8
 msgctxt "macroselectordialog|MacroSelectorDialog"
 msgid "Macro Selector"
 msgstr "Dewisydd Macro"
 
-#: macroselectordialog.ui:37
+#: cui/uiconfig/ui/macroselectordialog.ui:37
 msgctxt "macroselectordialog|add"
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: macroselectordialog.ui:114
+#: cui/uiconfig/ui/macroselectordialog.ui:114
 msgctxt "macroselectordialog|helpmacro"
 msgid "Select the library that contains the macro you want. Then select the macro under 'Macro name'."
 msgstr "Dewiswch y llyfrgell sy'n cynnwys y macro rydych ei eisiau. Yna dewiswch y macro o dan 'Enw macro'."
 
-#: macroselectordialog.ui:130
+#: cui/uiconfig/ui/macroselectordialog.ui:130
 msgctxt "macroselectordialog|helptoolbar"
 msgid "To add a command to a toolbar, select the category and then the command. Then drag the command to the Commands list of the Toolbars tab page in the Customize dialog."
 msgstr "I ychwanegu gorchymyn i far offer, dewiswch y categori ac yna'r gorchymyn. Gallwch hefyd llusgo'r gorchymyn at y rhestr Gorchmynion y dudalen tab Bar Offer yn y ddeialog Cyfaddasu."
 
-#: macroselectordialog.ui:184
+#: cui/uiconfig/ui/macroselectordialog.ui:184
 msgctxt "macroselectordialog|libraryft"
 msgid "Library"
 msgstr "Llyfrgell"
 
-#: macroselectordialog.ui:199
+#: cui/uiconfig/ui/macroselectordialog.ui:199
 msgctxt "macroselectordialog|categoryft"
 msgid "Category"
 msgstr "Categori"
 
-#: macroselectordialog.ui:256
+#: cui/uiconfig/ui/macroselectordialog.ui:256
 msgctxt "macroselectordialog|macronameft"
 msgid "Macro Name"
 msgstr "Enw Macro"
 
-#: macroselectordialog.ui:272
+#: cui/uiconfig/ui/macroselectordialog.ui:272
 msgctxt "macroselectordialog|commandsft"
 msgid "Commands"
 msgstr "Gorchmynion"
 
-#: macroselectordialog.ui:341
+#: cui/uiconfig/ui/macroselectordialog.ui:341
 msgctxt "macroselectordialog|label1"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: menuassignpage.ui:59
+#: cui/uiconfig/ui/menuassignpage.ui:13
+msgctxt "menuassignpage|gear_add"
+msgid "_Add..."
+msgstr "_Ychwanegu..."
+
+#: cui/uiconfig/ui/menuassignpage.ui:21
+msgctxt "menuassignpage|gear_delete"
+msgid "_Delete"
+msgstr "_Dileu"
+
+#: cui/uiconfig/ui/menuassignpage.ui:29
+msgctxt "menuassignpage|gear_rename"
+msgid "_Rename..."
+msgstr "_Ailenwi..."
+
+#: cui/uiconfig/ui/menuassignpage.ui:37
+msgctxt "menuassignpage|gear_move"
+msgid "_Move..."
+msgstr "_Symud..."
+
+#: cui/uiconfig/ui/menuassignpage.ui:51
+msgctxt "menuassignpage|gear_iconAndText"
+msgid "_Icon and text"
+msgstr "_Eicon a thestun"
+
+#: cui/uiconfig/ui/menuassignpage.ui:59
+msgctxt "menuassignpage|gear_iconOnly"
+msgid "Icon _only"
+msgstr "Eicon yn _unig"
+
+#: cui/uiconfig/ui/menuassignpage.ui:67
+msgctxt "menuassignpage|gear_textOnly"
+msgid "_Text only"
+msgstr "_Testun yn unig"
+
+#: cui/uiconfig/ui/menuassignpage.ui:119
 msgctxt "menuassignpage|contentslabel"
 msgid "_Search"
 msgstr "_Chwilio"
 
-#: menuassignpage.ui:75
-msgctxt "menuassignpage|contentslabel"
-msgid "Categor_y"
-msgstr "_Categori"
+#: cui/uiconfig/ui/menuassignpage.ui:136
+msgctxt "menuassignpage|desc"
+msgid "Local help is not installed."
+msgstr "Nid yw cymorth lleol wedi ei osod."
 
-#: menuassignpage.ui:90
+#: cui/uiconfig/ui/menuassignpage.ui:157
+msgctxt "menuassignpage|label33"
+msgid "D_escription"
+msgstr "_Disgrifiad"
+
+#: cui/uiconfig/ui/menuassignpage.ui:191
 msgctxt "menuassignpage|contentslabel"
 msgid "_Function"
 msgstr "­_Swyddogaeth"
 
-#: menuassignpage.ui:105
-msgctxt "menuassignpage|label33"
-msgid "Description"
-msgstr "Disgrifiad"
+#: cui/uiconfig/ui/menuassignpage.ui:217
+msgctxt "menuassignpage|contentslabel"
+msgid "Categor_y"
+msgstr "_Categori"
 
-#: menuassignpage.ui:117
+#: cui/uiconfig/ui/menuassignpage.ui:230
 msgctxt "menuassignpage|searchEntry"
 msgid "Type to search"
 msgstr "Teipio i Chwilio"
 
-#: menuassignpage.ui:160
-msgctxt "menuassignpage|desc"
-msgid "Local help is not installed."
-msgstr "Nid yw cymorth lleol wedi ei osod."
-
-#: menuassignpage.ui:190
-msgctxt "menuassignpage|add"
-msgid "Add item"
-msgstr "Ychwanegu eitem"
-
-#: menuassignpage.ui:220
-msgctxt "menuassignpage|remove"
-msgid "Remove item"
-msgstr "Tynnu eitem"
-
-#: menuassignpage.ui:267
+#: cui/uiconfig/ui/menuassignpage.ui:257
 msgctxt "menuassignpage|functionbtn"
 msgid "_Function"
 msgstr "­_Swyddogaeth"
 
-#: menuassignpage.ui:387
+#: cui/uiconfig/ui/menuassignpage.ui:302
+msgctxt "menuassignpage|gearbtn"
+msgid "Gear Menu"
+msgstr "Dewislen Gear"
+
+#: cui/uiconfig/ui/menuassignpage.ui:303
+msgctxt "menuassignpage|gearbtn"
+msgid "Contains commands to modify or delete the selected toolbar or the top level menu, and the command to add new toolbars or top level menus."
+msgstr "Yn cynnwys gorchmynion i newid neu ddileu'r bar offer penodol neu'r ddewislen lefel uchaf a'r gorchymyn i ychwanegu barau offer neu ddewislenni lefel uchaf."
+
+#: cui/uiconfig/ui/menuassignpage.ui:370
 msgctxt "menuassignpage|insert"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: menuassignpage.ui:405
+#: cui/uiconfig/ui/menuassignpage.ui:388
 msgctxt "menuassignpage|modify"
 msgid "_Modify"
 msgstr "_Newid"
 
-#: menuassignpage.ui:423
+#: cui/uiconfig/ui/menuassignpage.ui:406
 msgctxt "menuassignpage|defaultsbtn"
 msgid "_Defaults"
 msgstr "_Rhagosodiadau"
 
-#: menuassignpage.ui:434
-msgctxt "menuassignpage|defaultsbtn-atkobject"
+#: cui/uiconfig/ui/menuassignpage.ui:417
+msgctxt "menuassignpage|defaultsbtn"
 msgid "Resets the selected toolbar, menu, or context menu to its default state."
 msgstr "Yn ailosod y bar offer, dewislen neu ddewislen cyd-destun i'w gyflwr ragosodedig."
 
-#: menuassignpage.ui:537
+#: cui/uiconfig/ui/menuassignpage.ui:451
+msgctxt "menuassignpage|add"
+msgid "Add item"
+msgstr "Ychwanegu eitem"
+
+#: cui/uiconfig/ui/menuassignpage.ui:481
+msgctxt "menuassignpage|remove"
+msgid "Remove item"
+msgstr "Tynnu eitem"
+
+#: cui/uiconfig/ui/menuassignpage.ui:518
+msgctxt "menuassignpage|moveupbtn"
+msgid "Move up"
+msgstr "Symud i fyny"
+
+#: cui/uiconfig/ui/menuassignpage.ui:531
+msgctxt "menuassignpage|movedownbtn"
+msgid "Move down"
+msgstr "Symud i lawr"
+
+#: cui/uiconfig/ui/menuassignpage.ui:550
+msgctxt "menuassignpage|scopelabel"
+msgid "S_cope"
+msgstr "C_wmpas"
+
+#: cui/uiconfig/ui/menuassignpage.ui:563
+msgctxt "menuassignpage|targetlabel"
+msgid "_Target"
+msgstr "_Targed"
+
+#: cui/uiconfig/ui/menuassignpage.ui:576
+msgctxt "menuassignpage|functionlabel"
+msgid "F_unction"
+msgstr "_Swyddogaeth"
+
+#: cui/uiconfig/ui/menuassignpage.ui:589
+msgctxt "menuassignpage|customizelabel"
+msgid "_Customize"
+msgstr "_Cyfaddasu"
+
+#: cui/uiconfig/ui/menuassignpage.ui:671
 msgctxt "menuassignpage|insertseparator"
 msgid "Insert Separator"
 msgstr "Mewnosod Ymwahanydd"
 
-#: menuassignpage.ui:545
+#: cui/uiconfig/ui/menuassignpage.ui:679
 msgctxt "menuassignpage|insertsubmenu"
 msgid "Insert Submenu"
 msgstr "Mewnosod Is Ddewislen"
 
-#: menuassignpage.ui:557
+#: cui/uiconfig/ui/menuassignpage.ui:691
 msgctxt "menuassignpage|renameItem"
 msgid "Rename..."
 msgstr "Ailenwi..."
 
-#: menuassignpage.ui:565
+#: cui/uiconfig/ui/menuassignpage.ui:699
 msgctxt "menuassignpage|changeIcon"
 msgid "Change Icon..."
 msgstr "Newid Eicon..."
 
-#: menuassignpage.ui:573
+#: cui/uiconfig/ui/menuassignpage.ui:707
 msgctxt "menuassignpage|resetIcon"
 msgid "Reset Icon"
 msgstr "Ailosod Eicon"
 
-#: menuassignpage.ui:581
+#: cui/uiconfig/ui/menuassignpage.ui:715
 msgctxt "menuassignpage|restoreItem"
 msgid "Restore Default Command"
 msgstr "Adfer y Gorchymyn Rhagosodedig"
 
-#: mosaicdialog.ui:16
+#: cui/uiconfig/ui/mosaicdialog.ui:16
 msgctxt "mosaicdialog|MosaicDialog"
 msgid "Mosaic"
 msgstr "Mosäig"
 
-#: mosaicdialog.ui:144
+#: cui/uiconfig/ui/mosaicdialog.ui:144
 msgctxt "mosaicdialog|label2"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: mosaicdialog.ui:168
+#: cui/uiconfig/ui/mosaicdialog.ui:168
 msgctxt "mosaicdialog|height"
 msgid "2"
 msgstr "2"
 
-#: mosaicdialog.ui:182
+#: cui/uiconfig/ui/mosaicdialog.ui:182
 msgctxt "mosaicdialog|label3"
 msgid "_Height:"
 msgstr "_Uchder:"
 
-#: mosaicdialog.ui:199
+#: cui/uiconfig/ui/mosaicdialog.ui:199
 msgctxt "mosaicdialog|edges"
 msgid "E_nhance edges"
 msgstr "_Gwella ymylon"
 
-#: mosaicdialog.ui:226
+#: cui/uiconfig/ui/mosaicdialog.ui:226
 msgctxt "mosaicdialog|label1"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: movemenu.ui:19
+#: cui/uiconfig/ui/movemenu.ui:19
 msgctxt "movemenu|MoveMenuDialog"
 msgid "New Menu"
 msgstr "Dewislen Newydd"
 
-#: movemenu.ui:103
+#: cui/uiconfig/ui/movemenu.ui:103
 msgctxt "movemenu|menunameft"
 msgid "Menu name:"
 msgstr "Enw dewislen:"
 
-#: movemenu.ui:197
+#: cui/uiconfig/ui/movemenu.ui:196
 msgctxt "movemenu|label1"
 msgid "Menu _position:"
 msgstr "_Safle dewislen:"
 
-#: movemenu.ui:244
+#: cui/uiconfig/ui/movemenu.ui:243
 msgctxt "movemenu|up-atkobject"
 msgid "Up"
 msgstr "I fyny"
 
-#: movemenu.ui:262
+#: cui/uiconfig/ui/movemenu.ui:261
 msgctxt "movemenu|down-atkobject"
 msgid "Down"
 msgstr "I lawr"
 
-#: multipathdialog.ui:9
+#: cui/uiconfig/ui/multipathdialog.ui:9
 msgctxt "multipathdialog|MultiPathDialog"
 msgid "Select Paths"
 msgstr "Dewis Llwybrau"
 
-#: multipathdialog.ui:107
+#: cui/uiconfig/ui/multipathdialog.ui:107
 msgctxt "multipathdialog|add"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: multipathdialog.ui:164
+#: cui/uiconfig/ui/multipathdialog.ui:164
 msgctxt "multipathdialog|pathlist"
 msgid "Path list:"
 msgstr "Rhestr llwybr:"
 
-#: multipathdialog.ui:185
+#: cui/uiconfig/ui/multipathdialog.ui:185
 msgctxt "multipathdialog|label1"
 msgid "Mark the Default Path for New Files"
 msgstr "Nodwch y Llwybr Rhagosodedig ar gyfer Ffeiliau Newydd"
 
-#: namedialog.ui:8
+#: cui/uiconfig/ui/namedialog.ui:8
 msgctxt "namedialog|NameDialog"
 msgid "Name"
 msgstr "Enw"
 
-#: newlibdialog.ui:8
+#: cui/uiconfig/ui/newlibdialog.ui:8
 msgctxt "newlibdialog|NewLibDialog"
 msgid "Create Library"
 msgstr "Creu Llyfrgell"
 
-#: newlibdialog.ui:28
+#: cui/uiconfig/ui/newlibdialog.ui:71
 msgctxt "newlibdialog|newlibft"
 msgid "Enter the name for the new library."
 msgstr "Rhowch enw ar gyfer y llyfrgell newydd."
 
-#: newlibdialog.ui:57
+#: cui/uiconfig/ui/newlibdialog.ui:97
 msgctxt "newlibdialog|newmacroft"
 msgid "Enter the name for the new macro."
 msgstr "Rhowch enw ar y macro newydd."
 
-#: newlibdialog.ui:73
+#: cui/uiconfig/ui/newlibdialog.ui:111
 msgctxt "newlibdialog|renameft"
 msgid "Enter the new name for the selected object."
 msgstr "Rhowch enw newydd i'r gwrthrych yma."
 
-#: newlibdialog.ui:88
+#: cui/uiconfig/ui/newlibdialog.ui:125
 msgctxt "newlibdialog|altmacrotitle"
 msgid "Create Macro"
 msgstr "Creu Macro"
 
-#: newlibdialog.ui:102
+#: cui/uiconfig/ui/newlibdialog.ui:137
 msgctxt "newlibdialog|altrenametitle"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: newtabledialog.ui:22
+#: cui/uiconfig/ui/newtabledialog.ui:22
 msgctxt "newtabledialog|NewTableDialog"
 msgid "Insert Table"
 msgstr "Mewnosod Tab"
 
-#: newtabledialog.ui:99
+#: cui/uiconfig/ui/newtabledialog.ui:99
 msgctxt "newtabledialog|columns_label"
 msgid "_Number of columns:"
 msgstr "_Nifer o golofnau:"
 
-#: newtabledialog.ui:116
+#: cui/uiconfig/ui/newtabledialog.ui:116
 msgctxt "newtabledialog|rows_label"
 msgid "_Number of rows:"
 msgstr "_Nifer o resi:"
 
-#: newtoolbardialog.ui:8
+#: cui/uiconfig/ui/newtoolbardialog.ui:8
 msgctxt "newtoolbardialog|NewToolbarDialog"
 msgid "Name"
 msgstr "Enw"
 
-#: newtoolbardialog.ui:93
+#: cui/uiconfig/ui/newtoolbardialog.ui:93
 msgctxt "newtoolbardialog|label1"
 msgid "_Toolbar name:"
 msgstr "Enw _bar offer:"
 
-#: newtoolbardialog.ui:134
+#: cui/uiconfig/ui/newtoolbardialog.ui:133
 msgctxt "newtoolbardialog|label2"
 msgid "_Save in:"
 msgstr "Cadw _yn:"
 
-#: numberingformatpage.ui:38
+#: cui/uiconfig/ui/numberingformatpage.ui:38
 msgctxt "numberingformatpage|liststore1"
 msgid "All"
 msgstr "Popeth"
 
-#: numberingformatpage.ui:41
+#: cui/uiconfig/ui/numberingformatpage.ui:41
 msgctxt "numberingformatpage|liststore1"
 msgid "User-defined"
 msgstr "Defnyddiwr diffiniedig"
 
-#: numberingformatpage.ui:44
+#: cui/uiconfig/ui/numberingformatpage.ui:44
 msgctxt "numberingformatpage|liststore1"
 msgid "Number"
 msgstr "Rhif"
 
-#: numberingformatpage.ui:47
+#: cui/uiconfig/ui/numberingformatpage.ui:47
 msgctxt "numberingformatpage|liststore1"
 msgid "Percent"
 msgstr "Canran"
 
-#: numberingformatpage.ui:50
+#: cui/uiconfig/ui/numberingformatpage.ui:50
 msgctxt "numberingformatpage|liststore1"
 msgid "Currency"
 msgstr "Arian"
 
-#: numberingformatpage.ui:53
+#: cui/uiconfig/ui/numberingformatpage.ui:53
 msgctxt "numberingformatpage|liststore1"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: numberingformatpage.ui:56
+#: cui/uiconfig/ui/numberingformatpage.ui:56
 msgctxt "numberingformatpage|liststore1"
 msgid "Time"
 msgstr "Amser"
 
-#: numberingformatpage.ui:59
+#: cui/uiconfig/ui/numberingformatpage.ui:59
 msgctxt "numberingformatpage|liststore1"
 msgid "Scientific"
 msgstr "Gwyddonol"
 
-#: numberingformatpage.ui:62
+#: cui/uiconfig/ui/numberingformatpage.ui:62
 msgctxt "numberingformatpage|liststore1"
 msgid "Fraction"
 msgstr "Ffracsiwn"
 
-#: numberingformatpage.ui:65
+#: cui/uiconfig/ui/numberingformatpage.ui:65
 msgctxt "numberingformatpage|liststore1"
 msgid "Boolean Value"
 msgstr "Gwerth Boole"
 
-#: numberingformatpage.ui:68
+#: cui/uiconfig/ui/numberingformatpage.ui:68
 msgctxt "numberingformatpage|liststore1"
 msgid "Text"
 msgstr "Testun"
 
-#: numberingformatpage.ui:79
+#: cui/uiconfig/ui/numberingformatpage.ui:79
 msgctxt "numberingformatpage|liststore2"
 msgid "Automatically"
 msgstr "Awtomatig"
 
-#: numberingformatpage.ui:126
+#: cui/uiconfig/ui/numberingformatpage.ui:125
 msgctxt "numberingformatpage|add|tooltip_text"
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: numberingformatpage.ui:141
+#: cui/uiconfig/ui/numberingformatpage.ui:140
 msgctxt "numberingformatpage|edit|tooltip_text"
 msgid "Edit Comment"
 msgstr "Golygu Nodyn"
 
-#: numberingformatpage.ui:156
+#: cui/uiconfig/ui/numberingformatpage.ui:155
 msgctxt "numberingformatpage|delete|tooltip_text"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: numberingformatpage.ui:197
+#: cui/uiconfig/ui/numberingformatpage.ui:180
+msgctxt "numberingformatpage|commented|tooltip_text"
+msgid "Comment"
+msgstr "Sylw"
+
+#: cui/uiconfig/ui/numberingformatpage.ui:196
 msgctxt "numberingformatpage|formatf"
 msgid "_Format code"
 msgstr "Cod _Fformatio"
 
-#: numberingformatpage.ui:293
+#: cui/uiconfig/ui/numberingformatpage.ui:289
 msgctxt "numberingformatpage|decimalsft"
 msgid "_Decimal places:"
 msgstr "_Safleoedd degol:"
 
-#: numberingformatpage.ui:308
+#: cui/uiconfig/ui/numberingformatpage.ui:304
 msgctxt "numberingformatpage|denominatorft"
 msgid "Den_ominator places:"
 msgstr "Mannau e_enwadur:"
 
-#: numberingformatpage.ui:329
+#: cui/uiconfig/ui/numberingformatpage.ui:325
 msgctxt "numberingformatpage|leadzerosft"
 msgid "Leading _zeroes:"
 msgstr "_Sero arweiniol:"
 
-#: numberingformatpage.ui:340
+#: cui/uiconfig/ui/numberingformatpage.ui:336
 msgctxt "numberingformatpage|negnumred"
 msgid "_Negative numbers red"
 msgstr "_Rhifau negyddol coch"
 
-#: numberingformatpage.ui:362
+#: cui/uiconfig/ui/numberingformatpage.ui:358
 msgctxt "numberingformatpage|thousands"
 msgid "_Thousands separator"
 msgstr "Ymwahanydd _miloedd"
 
-#: numberingformatpage.ui:378
+#: cui/uiconfig/ui/numberingformatpage.ui:374
 msgctxt "numberingformatpage|engineering"
 msgid "_Engineering notation"
 msgstr "_Nodiant peirianneg"
 
-#: numberingformatpage.ui:406
+#: cui/uiconfig/ui/numberingformatpage.ui:402
 msgctxt "numberingformatpage|optionsft"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: numberingformatpage.ui:463
+#: cui/uiconfig/ui/numberingformatpage.ui:459
 msgctxt "numberingformatpage|categoryft"
 msgid "C_ategory"
 msgstr "C_ategori"
 
-#: numberingformatpage.ui:536
+#: cui/uiconfig/ui/numberingformatpage.ui:532
 msgctxt "numberingformatpage|formatft"
 msgid "Fo_rmat"
 msgstr "Ff_ormat"
 
-#: numberingformatpage.ui:596
+#: cui/uiconfig/ui/numberingformatpage.ui:592
 msgctxt "numberingformatpage|sourceformat"
 msgid "So_urce format"
 msgstr "_Fformat ffynhonnell"
 
-#: numberingformatpage.ui:617
+#: cui/uiconfig/ui/numberingformatpage.ui:613
 msgctxt "numberingformatpage|languageft"
 msgid "_Language"
 msgstr "_Iaith"
 
-#: numberingoptionspage.ui:64
+#: cui/uiconfig/ui/numberingoptionspage.ui:64
 msgctxt "numberingoptionspage|label1"
 msgid "Level"
 msgstr "Lefel"
 
-#: numberingoptionspage.ui:110
+#: cui/uiconfig/ui/numberingoptionspage.ui:110
 msgctxt "numberingoptionspage|label4"
 msgid "Number:"
 msgstr "Rhif:"
 
-#: numberingoptionspage.ui:159
+#: cui/uiconfig/ui/numberingoptionspage.ui:157
 msgctxt "numberingoptionspage|startatft"
 msgid "Start at:"
 msgstr "Cychwyn yn:"
 
-#: numberingoptionspage.ui:183
+#: cui/uiconfig/ui/numberingoptionspage.ui:181
 msgctxt "numberingoptionspage|bitmapft"
 msgid "Graphics:"
 msgstr "Graffigau:"
 
-#: numberingoptionspage.ui:197
+#: cui/uiconfig/ui/numberingoptionspage.ui:195
 msgctxt "numberingoptionspage|widthft"
 msgid "Width:"
 msgstr "Lled:"
 
-#: numberingoptionspage.ui:224
+#: cui/uiconfig/ui/numberingoptionspage.ui:221
 msgctxt "numberingoptionspage|heightft"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: numberingoptionspage.ui:250
+#: cui/uiconfig/ui/numberingoptionspage.ui:246
 msgctxt "numberingoptionspage|keepratio"
 msgid "Keep ratio"
 msgstr "Cadw graddfa"
 
-#: numberingoptionspage.ui:266
+#: cui/uiconfig/ui/numberingoptionspage.ui:263
 msgctxt "numberingoptionspage|orientft"
 msgid "Alignment:"
 msgstr "Aliniad:"
 
-#: numberingoptionspage.ui:281
+#: cui/uiconfig/ui/numberingoptionspage.ui:278
 msgctxt "numberingoptionspage|orientlb"
 msgid "Top of baseline"
 msgstr "Brig y gwaelodlin"
 
-#: numberingoptionspage.ui:282
+#: cui/uiconfig/ui/numberingoptionspage.ui:279
 msgctxt "numberingoptionspage|orientlb"
 msgid "Center of baseline"
 msgstr "Canol y gwaelodlin"
 
-#: numberingoptionspage.ui:283
+#: cui/uiconfig/ui/numberingoptionspage.ui:280
 msgctxt "numberingoptionspage|orientlb"
 msgid "Bottom of baseline"
 msgstr "Gwaelod y gwaelodlin"
 
-#: numberingoptionspage.ui:284
+#: cui/uiconfig/ui/numberingoptionspage.ui:281
 msgctxt "numberingoptionspage|orientlb"
 msgid "Top of character"
 msgstr "Brig y nod"
 
-#: numberingoptionspage.ui:285
+#: cui/uiconfig/ui/numberingoptionspage.ui:282
 msgctxt "numberingoptionspage|orientlb"
 msgid "Center of character"
 msgstr "Canol y nod"
 
-#: numberingoptionspage.ui:286
+#: cui/uiconfig/ui/numberingoptionspage.ui:283
 msgctxt "numberingoptionspage|orientlb"
 msgid "Bottom of character"
 msgstr "Gwaelod y nod"
 
-#: numberingoptionspage.ui:287
+#: cui/uiconfig/ui/numberingoptionspage.ui:284
 msgctxt "numberingoptionspage|orientlb"
 msgid "Top of line"
 msgstr "Brig y llinell"
 
-#: numberingoptionspage.ui:288
+#: cui/uiconfig/ui/numberingoptionspage.ui:285
 msgctxt "numberingoptionspage|orientlb"
 msgid "Center of line"
 msgstr "Canol y llinell"
 
-#: numberingoptionspage.ui:289
+#: cui/uiconfig/ui/numberingoptionspage.ui:286
 msgctxt "numberingoptionspage|orientlb"
 msgid "Bottom of line"
 msgstr "Gwaelod y llinell"
 
-#: numberingoptionspage.ui:299
+#: cui/uiconfig/ui/numberingoptionspage.ui:296
 msgctxt "numberingoptionspage|bitmap"
 msgid "Select..."
 msgstr "Dewis..."
 
-#: numberingoptionspage.ui:333
+#: cui/uiconfig/ui/numberingoptionspage.ui:329
 msgctxt "numberingoptionspage|bullet"
 msgid "Select..."
 msgstr "Dewis..."
 
-#: numberingoptionspage.ui:352
+#: cui/uiconfig/ui/numberingoptionspage.ui:348
 msgctxt "numberingoptionspage|prefixft"
 msgid "Before:"
 msgstr "Cyn:"
 
-#: numberingoptionspage.ui:373
+#: cui/uiconfig/ui/numberingoptionspage.ui:369
 msgctxt "numberingoptionspage|separator"
 msgid "Separator"
 msgstr "Ymwahanydd"
 
-#: numberingoptionspage.ui:409
+#: cui/uiconfig/ui/numberingoptionspage.ui:403
 msgctxt "numberingoptionspage|suffixft"
 msgid "After:"
 msgstr "Wedi:"
 
-#: numberingoptionspage.ui:423
+#: cui/uiconfig/ui/numberingoptionspage.ui:417
 msgctxt "numberingoptionspage|sublevelsft"
 msgid "Show sublevels:"
 msgstr "Dangos islefelau:"
 
-#: numberingoptionspage.ui:438
+#: cui/uiconfig/ui/numberingoptionspage.ui:432
 msgctxt "numberingoptionspage|bulletft"
 msgid "Character:"
 msgstr "Nod:"
 
-#: numberingoptionspage.ui:452
+#: cui/uiconfig/ui/numberingoptionspage.ui:446
 msgctxt "numberingoptionspage|relsizeft"
 msgid "_Relative size:"
 msgstr "Maint _perthynol:"
 
-#: numberingoptionspage.ui:466
+#: cui/uiconfig/ui/numberingoptionspage.ui:460
 msgctxt "numberingoptionspage|colorft"
 msgid "Color:"
 msgstr "Lliw:"
 
-#: numberingoptionspage.ui:480
+#: cui/uiconfig/ui/numberingoptionspage.ui:474
 msgctxt "numberingoptionspage|charstyleft"
 msgid "Character style:"
 msgstr "Arddull nod:"
 
-#: numberingoptionspage.ui:524
+#: cui/uiconfig/ui/numberingoptionspage.ui:518
 msgctxt "numberingoptionspage|label2"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: numberingoptionspage.ui:551
+#: cui/uiconfig/ui/numberingoptionspage.ui:545
 msgctxt "numberingoptionspage|allsame"
 msgid "_Consecutive numbering"
 msgstr "_Rhifo olynol"
 
-#: numberingoptionspage.ui:567
+#: cui/uiconfig/ui/numberingoptionspage.ui:561
 msgctxt "numberingoptionspage|label3"
 msgid "All Levels"
 msgstr "Pob Lefel"
 
-#: numberingoptionspage.ui:595
+#: cui/uiconfig/ui/numberingoptionspage.ui:589
 msgctxt "numberingoptionspage|fromfile"
 msgid "From file..."
 msgstr "O ffeil..."
 
-#: numberingoptionspage.ui:603
+#: cui/uiconfig/ui/numberingoptionspage.ui:597
 msgctxt "numberingoptionspage|gallery"
 msgid "Gallery"
 msgstr "Oriel"
 
-#: numberingpositionpage.ui:23
+#: cui/uiconfig/ui/numberingpositionpage.ui:23
 msgctxt "numberingpositionpage|liststore1"
 msgid "Left"
 msgstr "Chwith"
 
-#: numberingpositionpage.ui:26
+#: cui/uiconfig/ui/numberingpositionpage.ui:26
 msgctxt "numberingpositionpage|liststore1"
 msgid "Centered"
 msgstr "Canoli"
 
-#: numberingpositionpage.ui:29
+#: cui/uiconfig/ui/numberingpositionpage.ui:29
 msgctxt "numberingpositionpage|liststore1"
 msgid "Right"
 msgstr "De"
 
-#: numberingpositionpage.ui:40
+#: cui/uiconfig/ui/numberingpositionpage.ui:40
 msgctxt "numberingpositionpage|liststore2"
 msgid "Tab stop"
 msgstr "Stop tab"
 
-#: numberingpositionpage.ui:43
+#: cui/uiconfig/ui/numberingpositionpage.ui:43
 msgctxt "numberingpositionpage|liststore2"
 msgid "Space"
 msgstr "Bwlch"
 
-#: numberingpositionpage.ui:46
+#: cui/uiconfig/ui/numberingpositionpage.ui:46
 msgctxt "numberingpositionpage|liststore2"
 msgid "Nothing"
 msgstr "Dim"
 
-#: numberingpositionpage.ui:88
+#: cui/uiconfig/ui/numberingpositionpage.ui:88
 msgctxt "numberingpositionpage|1"
 msgid "Level"
 msgstr "Lefel"
 
-#: numberingpositionpage.ui:139
+#: cui/uiconfig/ui/numberingpositionpage.ui:139
 msgctxt "numberingpositionpage|numfollowedby"
 msgid "Numbering followed by:"
 msgstr "Rhifo'n cael ei ddilyn gan:"
 
-#: numberingpositionpage.ui:153
+#: cui/uiconfig/ui/numberingpositionpage.ui:153
 msgctxt "numberingpositionpage|num2align"
 msgid "N_umbering alignment:"
 msgstr "Aliniad _rhifo:"
 
-#: numberingpositionpage.ui:167
+#: cui/uiconfig/ui/numberingpositionpage.ui:167
 msgctxt "numberingpositionpage|alignedat"
 msgid "Aligned at:"
 msgstr "Aliniwyd at:"
 
-#: numberingpositionpage.ui:181
+#: cui/uiconfig/ui/numberingpositionpage.ui:181
 msgctxt "numberingpositionpage|indentat"
 msgid "Indent at:"
 msgstr "Mewnoliad at:"
 
-#: numberingpositionpage.ui:217
+#: cui/uiconfig/ui/numberingpositionpage.ui:216
 msgctxt "numberingpositionpage|at"
 msgid "Tab stop at:"
 msgstr "Stop tab yn:"
 
-#: numberingpositionpage.ui:266
+#: cui/uiconfig/ui/numberingpositionpage.ui:263
 msgctxt "numberingpositionpage|indent"
 msgid "Indent:"
 msgstr "Mewnoliad:"
 
-#: numberingpositionpage.ui:290
+#: cui/uiconfig/ui/numberingpositionpage.ui:286
 msgctxt "numberingpositionpage|relative"
 msgid "Relati_ve"
 msgstr "_Perthynol"
 
-#: numberingpositionpage.ui:310
+#: cui/uiconfig/ui/numberingpositionpage.ui:306
 msgctxt "numberingpositionpage|numberingwidth"
 msgid "Width of numbering:"
 msgstr "Lled rhifo:"
 
-#: numberingpositionpage.ui:350
+#: cui/uiconfig/ui/numberingpositionpage.ui:344
 msgctxt "numberingpositionpage|numdist"
 msgid ""
 "Minimum space between\n"
@@ -7140,1413 +7204,1413 @@ msgstr ""
 "Lleiafswm bwlch rhwng\n"
 "rhifo a thestun:"
 
-#: numberingpositionpage.ui:366
+#: cui/uiconfig/ui/numberingpositionpage.ui:360
 msgctxt "numberingpositionpage|numalign"
 msgid "N_umbering alignment:"
 msgstr "Aliniad _rhifo:"
 
-#: numberingpositionpage.ui:394
+#: cui/uiconfig/ui/numberingpositionpage.ui:388
 msgctxt "numberingpositionpage|label10"
 msgid "Position and Spacing"
 msgstr "Lleoli a Bylchu"
 
-#: numberingpositionpage.ui:416
+#: cui/uiconfig/ui/numberingpositionpage.ui:410
 msgctxt "numberingpositionpage|standard"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: objectnamedialog.ui:8
+#: cui/uiconfig/ui/objectnamedialog.ui:8
 msgctxt "objectnamedialog|ObjectNameDialog"
 msgid "Name"
 msgstr "Enw"
 
-#: objectnamedialog.ui:83
+#: cui/uiconfig/ui/objectnamedialog.ui:85
 msgctxt "objectnamedialog|object_name_label"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: objecttitledescdialog.ui:15
+#: cui/uiconfig/ui/objecttitledescdialog.ui:15
 msgctxt "objecttitledescdialog|ObjectTitleDescDialog"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: objecttitledescdialog.ui:90
+#: cui/uiconfig/ui/objecttitledescdialog.ui:92
 msgctxt "objecttitledescdialog|object_title_label"
 msgid "_Title:"
 msgstr "_Teitl:"
 
-#: objecttitledescdialog.ui:118
+#: cui/uiconfig/ui/objecttitledescdialog.ui:120
 msgctxt "objecttitledescdialog|desc_label"
 msgid "_Description:"
 msgstr "_Disgrifiad:"
 
-#: optaccessibilitypage.ui:31
+#: cui/uiconfig/ui/optaccessibilitypage.ui:31
 msgctxt "optaccessibilitypage|acctool"
 msgid "Support _assistive technology tools (program restart required)"
 msgstr "_Offer technoleg cynorthwyo cefnogaeth (angen ailgychwyn y rhaglen)"
 
-#: optaccessibilitypage.ui:47
+#: cui/uiconfig/ui/optaccessibilitypage.ui:47
 msgctxt "optaccessibilitypage|textselinreadonly"
 msgid "Use te_xt selection cursor in read-only text documents"
 msgstr "_Defnyddio cyrchwr dewis testun mewn dogfennau darllen yn unig"
 
-#: optaccessibilitypage.ui:63
+#: cui/uiconfig/ui/optaccessibilitypage.ui:63
 msgctxt "optaccessibilitypage|animatedgraphics"
 msgid "Allow animated _images"
 msgstr "Caniatáu animeiddio _delweddau"
 
-#: optaccessibilitypage.ui:79
+#: cui/uiconfig/ui/optaccessibilitypage.ui:79
 msgctxt "optaccessibilitypage|animatedtext"
 msgid "Allow animated _text"
 msgstr "Caniatáu animeiddio _testun"
 
-#: optaccessibilitypage.ui:101
+#: cui/uiconfig/ui/optaccessibilitypage.ui:101
 msgctxt "optaccessibilitypage|label1"
 msgid "Miscellaneous Options"
 msgstr "Dewisiadau Amrywiol"
 
-#: optaccessibilitypage.ui:134
+#: cui/uiconfig/ui/optaccessibilitypage.ui:134
 msgctxt "optaccessibilitypage|autodetecthc"
 msgid "Automatically _detect high contrast mode of operating system"
 msgstr "_Canfod modd cyferbyniad uchel system weithredu yn awtomatig"
 
-#: optaccessibilitypage.ui:150
+#: cui/uiconfig/ui/optaccessibilitypage.ui:150
 msgctxt "optaccessibilitypage|autofontcolor"
 msgid "Use automatic font _color for screen display"
 msgstr "Ffont _lliw awtomatig ar gyfer dangosydd sgrin"
 
-#: optaccessibilitypage.ui:166
+#: cui/uiconfig/ui/optaccessibilitypage.ui:166
 msgctxt "optaccessibilitypage|systempagepreviewcolor"
 msgid "_Use system colors for page previews"
 msgstr "_Lliwiau'r system ar gyfer rhagolwg tudalen"
 
-#: optaccessibilitypage.ui:188
+#: cui/uiconfig/ui/optaccessibilitypage.ui:188
 msgctxt "optaccessibilitypage|label2"
 msgid "Options for High Contrast Appearance"
 msgstr "Dewisiadau ar gyfer Ymddangosiad Cydraniad Uchel"
 
-#: optadvancedpage.ui:38
+#: cui/uiconfig/ui/optadvancedpage.ui:38
 msgctxt "optadvancedpage|javaenabled"
 msgid "_Use a Java runtime environment"
 msgstr "_Defnyddiwch Java"
 
-#: optadvancedpage.ui:72
+#: cui/uiconfig/ui/optadvancedpage.ui:72
 msgctxt "optadvancedpage|label2"
 msgid "_Java runtime environments (JRE) already installed:"
 msgstr "Mae _Java runtime environments (JRE) eisoes wedi ei osod:"
 
-#: optadvancedpage.ui:98
+#: cui/uiconfig/ui/optadvancedpage.ui:98
 msgctxt "optadvancedpage|add"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: optadvancedpage.ui:112
+#: cui/uiconfig/ui/optadvancedpage.ui:112
 msgctxt "optadvancedpage|parameters"
 msgid "_Parameters..."
 msgstr "_Paramedrau..."
 
-#: optadvancedpage.ui:126
+#: cui/uiconfig/ui/optadvancedpage.ui:126
 msgctxt "optadvancedpage|classpath"
 msgid "_Class Path..."
 msgstr "_Llwybr Dosbarth..."
 
-#: optadvancedpage.ui:159
+#: cui/uiconfig/ui/optadvancedpage.ui:159
 msgctxt "optadvancedpage|vendor"
 msgid "Vendor"
 msgstr "Gwerthwr"
 
-#: optadvancedpage.ui:171
+#: cui/uiconfig/ui/optadvancedpage.ui:171
 msgctxt "optadvancedpage|version"
 msgid "Version"
 msgstr "Fersiwn"
 
-#: optadvancedpage.ui:183
+#: cui/uiconfig/ui/optadvancedpage.ui:183
 msgctxt "optadvancedpage|features"
 msgid "Features"
 msgstr "Nodweddion"
 
-#: optadvancedpage.ui:195
+#: cui/uiconfig/ui/optadvancedpage.ui:195
 msgctxt "optadvancedpage|a11y"
 msgid "with accessibility support"
 msgstr "gyda chefnogaeth hygyrchedd"
 
-#: optadvancedpage.ui:206
+#: cui/uiconfig/ui/optadvancedpage.ui:206
 msgctxt "optadvancedpage|selectruntime"
 msgid "Select a Java Runtime Environment"
 msgstr "Dewis Java Runtime Environment"
 
-#: optadvancedpage.ui:254
+#: cui/uiconfig/ui/optadvancedpage.ui:254
 msgctxt "optadvancedpage|javapath"
 msgid "Location: "
 msgstr "Lleoliad: "
 
-#: optadvancedpage.ui:280
+#: cui/uiconfig/ui/optadvancedpage.ui:280
 msgctxt "optadvancedpage|label1"
 msgid "Java Options"
 msgstr "Dewisiadau Java"
 
-#: optadvancedpage.ui:315
+#: cui/uiconfig/ui/optadvancedpage.ui:315
 msgctxt "optadvancedpage|experimental"
 msgid "Enable experimental features (may be unstable)"
 msgstr "Galluogi nodweddion arbrofol (gallant fod yn ansad)"
 
-#: optadvancedpage.ui:330
+#: cui/uiconfig/ui/optadvancedpage.ui:330
 msgctxt "optadvancedpage|macrorecording"
 msgid "Enable macro recording (may be limited)"
 msgstr "Galluogi recordio macro (gallant fod yn gyfyngedig)"
 
-#: optadvancedpage.ui:344
+#: cui/uiconfig/ui/optadvancedpage.ui:345
 msgctxt "optadvancedpage|expertconfig"
 msgid "Open Expert Configuration"
 msgstr "Agor Ffurfweddiad Arbenigwr"
 
-#: optadvancedpage.ui:364
+#: cui/uiconfig/ui/optadvancedpage.ui:365
 msgctxt "optadvancedpage|label12"
 msgid "Optional Features"
 msgstr "Nodweddion Dewisol"
 
-#: optappearancepage.ui:35
+#: cui/uiconfig/ui/optappearancepage.ui:35
 msgctxt "optappearancepage|label3"
 msgid "_Scheme:"
 msgstr "_Cynllun:"
 
-#: optappearancepage.ui:88
+#: cui/uiconfig/ui/optappearancepage.ui:89
 msgctxt "optappearancepage|label1"
 msgid "Color Scheme"
 msgstr "Cynllun Lliw"
 
-#: optappearancepage.ui:133
+#: cui/uiconfig/ui/optappearancepage.ui:134
 msgctxt "optappearancepage|uielements"
 msgid "User interface elements"
 msgstr "Elfennau rhyngwyneb defnyddiwr"
 
-#: optappearancepage.ui:145
+#: cui/uiconfig/ui/optappearancepage.ui:146
 msgctxt "optappearancepage|colorsetting"
 msgid "Color setting"
 msgstr "Lliw"
 
-#: optappearancepage.ui:156
+#: cui/uiconfig/ui/optappearancepage.ui:157
 msgctxt "optappearancepage|on"
 msgid "On"
 msgstr "Ymlaen"
 
-#: optappearancepage.ui:189
+#: cui/uiconfig/ui/optappearancepage.ui:190
 msgctxt "optappearancepage|label2"
 msgid "Custom Colors"
 msgstr "Lliwiau Cyfaddas"
 
-#: optasianpage.ui:31
+#: cui/uiconfig/ui/optasianpage.ui:31
 msgctxt "optasianpage|charkerning"
 msgid "_Western text only"
 msgstr "_Testun gorllewinol yn unig"
 
-#: optasianpage.ui:49
+#: cui/uiconfig/ui/optasianpage.ui:49
 msgctxt "optasianpage|charpunctkerning"
 msgid "Western _text and Asian punctuation"
 msgstr "_Testun Gorllewinol ac atalnodi Asiaidd"
 
-#: optasianpage.ui:73
+#: cui/uiconfig/ui/optasianpage.ui:73
 msgctxt "optasianpage|label1"
 msgid "Kerning"
 msgstr "Gorgyffwrdd"
 
-#: optasianpage.ui:105
+#: cui/uiconfig/ui/optasianpage.ui:105
 msgctxt "optasianpage|nocompression"
 msgid "_No compression"
 msgstr "_Dim cywasgiad"
 
-#: optasianpage.ui:123
+#: cui/uiconfig/ui/optasianpage.ui:123
 msgctxt "optasianpage|punctcompression"
 msgid "_Compress punctuation only"
 msgstr "­_Cywasgu atalnodi'n unig"
 
-#: optasianpage.ui:141
+#: cui/uiconfig/ui/optasianpage.ui:141
 msgctxt "optasianpage|punctkanacompression"
 msgid "Compress punctuation and Japanese Kana"
 msgstr "Cywasgu atalnodi a Kana Japanaëeg"
 
-#: optasianpage.ui:165
+#: cui/uiconfig/ui/optasianpage.ui:165
 msgctxt "optasianpage|label2"
 msgid "Character Spacing"
 msgstr "Bylchu Nodau"
 
-#: optasianpage.ui:226
+#: cui/uiconfig/ui/optasianpage.ui:226
 msgctxt "optasianpage|standard"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: optasianpage.ui:251
+#: cui/uiconfig/ui/optasianpage.ui:251
 msgctxt "optasianpage|languageft"
 msgid "_Language:"
 msgstr "_Iaith:"
 
-#: optasianpage.ui:265
+#: cui/uiconfig/ui/optasianpage.ui:265
 msgctxt "optasianpage|startft"
 msgid "Not _at start of line:"
 msgstr "Nid ar _ddechrau llinell:"
 
-#: optasianpage.ui:279
+#: cui/uiconfig/ui/optasianpage.ui:279
 msgctxt "optasianpage|endft"
 msgid "Not at _end of line:"
 msgstr "Nid ar _ddiwedd llinell:"
 
-#: optasianpage.ui:324
+#: cui/uiconfig/ui/optasianpage.ui:322
 msgctxt "optasianpage|hintft"
 msgid "Without user-defined line break symbols"
 msgstr "Heb symbolau toriad defnyddiwr diffiniedig"
 
-#: optasianpage.ui:340
+#: cui/uiconfig/ui/optasianpage.ui:338
 msgctxt "optasianpage|label3"
 msgid "First and Last Characters"
 msgstr "Nodau Cyntaf ac Olaf"
 
-#: optbasicidepage.ui:29
+#: cui/uiconfig/ui/optbasicidepage.ui:29
 msgctxt "optbasicidepage|codecomplete_enable"
 msgid "Enable code completion"
 msgstr "Galluogi cwblhau gair"
 
-#: optbasicidepage.ui:49
+#: cui/uiconfig/ui/optbasicidepage.ui:50
 msgctxt "optbasicidepage|label1"
 msgid "Code Completion"
 msgstr "Cwblhad Geiriau"
 
-#: optbasicidepage.ui:81
+#: cui/uiconfig/ui/optbasicidepage.ui:82
 msgctxt "optbasicidepage|autoclose_proc"
 msgid "Autoclose procedures"
 msgstr "Trefn awtogau"
 
-#: optbasicidepage.ui:95
+#: cui/uiconfig/ui/optbasicidepage.ui:97
 msgctxt "optbasicidepage|autoclose_paren"
 msgid "Autoclose parenthesis"
 msgstr "Parenthesisau awtogau"
 
-#: optbasicidepage.ui:109
+#: cui/uiconfig/ui/optbasicidepage.ui:112
 msgctxt "optbasicidepage|autoclose_quotes"
 msgid "Autoclose quotes"
 msgstr "Dyfyniadau awtogau"
 
-#: optbasicidepage.ui:123
+#: cui/uiconfig/ui/optbasicidepage.ui:127
 msgctxt "optbasicidepage|autocorrect"
 msgid "Autocorrection"
 msgstr "Awtogywiro"
 
-#: optbasicidepage.ui:144
+#: cui/uiconfig/ui/optbasicidepage.ui:149
 msgctxt "optbasicidepage|label2"
 msgid "Code Suggestion"
 msgstr "Awgrymiadau Cod"
 
-#: optbasicidepage.ui:176
+#: cui/uiconfig/ui/optbasicidepage.ui:181
 msgctxt "optbasicidepage|extendedtypes_enable"
 msgid "Use extended types"
 msgstr "Defnyddio'r mathau estynedig"
 
-#: optbasicidepage.ui:196
+#: cui/uiconfig/ui/optbasicidepage.ui:202
 msgctxt "optbasicidepage|label3"
 msgid "Language Features"
 msgstr "Nodweddion Iaith"
 
-#: optchartcolorspage.ui:42
+#: cui/uiconfig/ui/optchartcolorspage.ui:42
 msgctxt "optchartcolorspage|label20"
 msgid "Chart Colors"
 msgstr "Siartiau Lliw"
 
-#: optchartcolorspage.ui:128
+#: cui/uiconfig/ui/optchartcolorspage.ui:128
 msgctxt "optchartcolorspage|default"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: optchartcolorspage.ui:156
+#: cui/uiconfig/ui/optchartcolorspage.ui:156
 msgctxt "optchartcolorspage|label1"
 msgid "Color Table"
 msgstr "Tabl Lliw"
 
-#: optctlpage.ui:31
+#: cui/uiconfig/ui/optctlpage.ui:31
 msgctxt "optctlpage|sequencechecking"
 msgid "Use se_quence checking"
 msgstr "Defnyddio _gwirio dilyniant"
 
-#: optctlpage.ui:56
+#: cui/uiconfig/ui/optctlpage.ui:56
 msgctxt "optctlpage|restricted"
 msgid "Restricted"
 msgstr "Cyfyngedig"
 
-#: optctlpage.ui:70
+#: cui/uiconfig/ui/optctlpage.ui:71
 msgctxt "optctlpage|typeandreplace"
 msgid "_Type and replace"
 msgstr "_Teipio ac newid"
 
-#: optctlpage.ui:99
+#: cui/uiconfig/ui/optctlpage.ui:100
 msgctxt "optctlpage|label1"
 msgid "Sequence Checking"
 msgstr "Gwirio Dilyniant"
 
-#: optctlpage.ui:134
+#: cui/uiconfig/ui/optctlpage.ui:135
 msgctxt "optctlpage|label3"
 msgid "Movement:"
 msgstr "Symudiad:"
 
-#: optctlpage.ui:144
+#: cui/uiconfig/ui/optctlpage.ui:145
 msgctxt "optctlpage|movementlogical"
 msgid "Lo_gical"
 msgstr "_Rhesymegol"
 
-#: optctlpage.ui:161
+#: cui/uiconfig/ui/optctlpage.ui:162
 msgctxt "optctlpage|movementvisual"
 msgid "_Visual"
 msgstr "­_Gweledol"
 
-#: optctlpage.ui:186
+#: cui/uiconfig/ui/optctlpage.ui:187
 msgctxt "optctlpage|label2"
 msgid "Cursor Control"
 msgstr "Rheoli'r Cyrchwr"
 
-#: optctlpage.ui:220
+#: cui/uiconfig/ui/optctlpage.ui:221
 msgctxt "optctlpage|label5"
 msgid "_Numerals:"
 msgstr "­­_Rhifolion:"
 
-#: optctlpage.ui:235
+#: cui/uiconfig/ui/optctlpage.ui:236
 msgctxt "optctlpage|numerals"
 msgid "Arabic (1, 2, 3…)"
 msgstr "Arabeg (1, 2, 3…)"
 
-#: optctlpage.ui:236
+#: cui/uiconfig/ui/optctlpage.ui:237
 msgctxt "optctlpage|numerals"
 msgid "Eastern Arabic (٣ ,٢ ,١…)"
 msgstr "Arabeg Dwyreiniol (٣ ,٢ ,١…)"
 
-#: optctlpage.ui:237
+#: cui/uiconfig/ui/optctlpage.ui:238
 msgctxt "optctlpage|numerals"
 msgid "System"
 msgstr "System"
 
-#: optctlpage.ui:238
+#: cui/uiconfig/ui/optctlpage.ui:239
 msgctxt "optctlpage|numerals"
 msgid "Context"
 msgstr "Cyd-destun"
 
-#: optctlpage.ui:254
+#: cui/uiconfig/ui/optctlpage.ui:255
 msgctxt "optctlpage|label4"
 msgid "General Options"
 msgstr "Dewisiadau Cyffredinol"
 
-#: optemailpage.ui:26
+#: cui/uiconfig/ui/optemailpage.ui:26
 msgctxt "optemailpage|label2"
 msgid "_E-mail program:"
 msgstr "_Rhaglen e-bost:"
 
-#: optemailpage.ui:55
+#: cui/uiconfig/ui/optemailpage.ui:54
 msgctxt "optemailpage|browse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: optemailpage.ui:89
+#: cui/uiconfig/ui/optemailpage.ui:88
 msgctxt "optemailpage|browsetitle"
 msgid "All files"
 msgstr "Pob ffeil"
 
-#: optemailpage.ui:116
+#: cui/uiconfig/ui/optemailpage.ui:115
 msgctxt "optemailpage|suppress"
 msgid "Suppress hidden elements of documents"
 msgstr "Ffrwyno elfennau cudd dogfennau"
 
-#: optemailpage.ui:171
+#: cui/uiconfig/ui/optemailpage.ui:171
 msgctxt "optemailpage|label1"
 msgid "Sending Documents as E-mail Attachments"
 msgstr "Anfon dogfennau fel Atodiadau E-bost"
 
-#: optfltrembedpage.ui:52
+#: cui/uiconfig/ui/optfltrembedpage.ui:52
 msgctxt "optfltrembedpage|label2"
 msgid "[L]: Load and convert the object"
 msgstr "[L]: Llwytho a chadw'r gwrthrych"
 
-#: optfltrembedpage.ui:65
+#: cui/uiconfig/ui/optfltrembedpage.ui:65
 msgctxt "optfltrembedpage|label3"
 msgid "[S]: Convert and save the object"
 msgstr "[S]: Trosi a chadw'r gwrthrych"
 
-#: optfltrembedpage.ui:81
+#: cui/uiconfig/ui/optfltrembedpage.ui:81
 msgctxt "optfltrembedpage|label1"
 msgid "Embedded Objects"
 msgstr "Gwrthrychau Mewnosodedig"
 
-#: optfltrembedpage.ui:116
+#: cui/uiconfig/ui/optfltrembedpage.ui:116
 msgctxt "optfltrembedpage|label5"
 msgid "Export as:"
 msgstr "Allforio fel:"
 
-#: optfltrembedpage.ui:131
+#: cui/uiconfig/ui/optfltrembedpage.ui:131
 msgctxt "optfltrembedpage|highlighting"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: optfltrembedpage.ui:147
+#: cui/uiconfig/ui/optfltrembedpage.ui:148
 msgctxt "optfltrembedpage|shading"
 msgid "Shading"
 msgstr "Cysgodi"
 
-#: optfltrembedpage.ui:175
+#: cui/uiconfig/ui/optfltrembedpage.ui:177
 msgctxt "optfltrembedpage|label4"
 msgid "Character Highlighting"
 msgstr "Amlygu Nodau"
 
-#: optfltrpage.ui:29
+#: cui/uiconfig/ui/optfltrpage.ui:29
 msgctxt "optfltrpage|wo_basic"
 msgid "Load Basic _code"
 msgstr "Llwytho cod _Basic"
 
-#: optfltrpage.ui:46
+#: cui/uiconfig/ui/optfltrpage.ui:46
 msgctxt "optfltrpage|wo_exec"
 msgid "E_xecutable code"
 msgstr "_Cod gweithredol"
 
-#: optfltrpage.ui:64
+#: cui/uiconfig/ui/optfltrpage.ui:64
 msgctxt "optfltrpage|wo_saveorig"
 msgid "Save _original Basic code"
 msgstr "Cadw'r cod Basic _gwreiddiol"
 
-#: optfltrpage.ui:87
+#: cui/uiconfig/ui/optfltrpage.ui:87
 msgctxt "optfltrpage|label1"
 msgid "Microsoft Word 97/2000/XP"
 msgstr "Microsoft Word 97/2000/XP"
 
-#: optfltrpage.ui:119
+#: cui/uiconfig/ui/optfltrpage.ui:119
 msgctxt "optfltrpage|ex_basic"
 msgid "Lo_ad Basic code"
 msgstr "_Llwytho cod Basic"
 
-#: optfltrpage.ui:136
+#: cui/uiconfig/ui/optfltrpage.ui:136
 msgctxt "optfltrpage|ex_exec"
 msgid "E_xecutable code"
 msgstr "_Cod gweithredol"
 
-#: optfltrpage.ui:154
+#: cui/uiconfig/ui/optfltrpage.ui:154
 msgctxt "optfltrpage|ex_saveorig"
 msgid "Sa_ve original Basic code"
 msgstr "C_adw'r cod Basic gwreiddiol"
 
-#: optfltrpage.ui:177
+#: cui/uiconfig/ui/optfltrpage.ui:177
 msgctxt "optfltrpage|label2"
 msgid "Microsoft Excel 97/2000/XP"
 msgstr "Microsoft Excel 97/2000/XP"
 
-#: optfltrpage.ui:209
+#: cui/uiconfig/ui/optfltrpage.ui:209
 msgctxt "optfltrpage|pp_basic"
 msgid "Load Ba_sic code"
 msgstr "Llwytho cod Ba_sic"
 
-#: optfltrpage.ui:226
+#: cui/uiconfig/ui/optfltrpage.ui:226
 msgctxt "optfltrpage|pp_saveorig"
 msgid "Sav_e original Basic code"
 msgstr "Ca_dw'r cod Basic gwreiddiol"
 
-#: optfltrpage.ui:249
+#: cui/uiconfig/ui/optfltrpage.ui:249
 msgctxt "optfltrpage|label3"
 msgid "Microsoft PowerPoint 97/2000/XP"
 msgstr "Microsoft PowerPoint 97/2000/XP"
 
-#: optfontspage.ui:59
+#: cui/uiconfig/ui/optfontspage.ui:59
 msgctxt "optfontspage|label2"
 msgid "_Font:"
 msgstr "_Ffont:"
 
-#: optfontspage.ui:73
+#: cui/uiconfig/ui/optfontspage.ui:73
 msgctxt "optfontspage|label3"
 msgid "Re_place with:"
 msgstr "_Newid gyda:"
 
-#: optfontspage.ui:110
+#: cui/uiconfig/ui/optfontspage.ui:110
 msgctxt "optfontspage|always"
 msgid "Always"
 msgstr "Bob tro"
 
-#: optfontspage.ui:121
+#: cui/uiconfig/ui/optfontspage.ui:121
 msgctxt "optfontspage|screenonly"
 msgid "Screen only"
 msgstr "Sgrin yn unig"
 
-#: optfontspage.ui:132
+#: cui/uiconfig/ui/optfontspage.ui:132
 msgctxt "optfontspage|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: optfontspage.ui:143
+#: cui/uiconfig/ui/optfontspage.ui:143
 msgctxt "optfontspage|replacewith"
 msgid "Replace with"
 msgstr "Newid gyda"
 
-#: optfontspage.ui:205
+#: cui/uiconfig/ui/optfontspage.ui:205
 msgctxt "optfontspage|usetable"
 msgid "_Apply replacement table"
 msgstr "_Gosod y tabl newydd"
 
-#: optfontspage.ui:227
+#: cui/uiconfig/ui/optfontspage.ui:227
 msgctxt "optfontspage|label4"
 msgid "Replacement Table"
 msgstr "Tabl Ailosod"
 
-#: optfontspage.ui:266
+#: cui/uiconfig/ui/optfontspage.ui:266
 msgctxt "optfontspage|label8"
 msgid "Fon_ts:"
 msgstr "_Ffontiau:"
 
-#: optfontspage.ui:281
+#: cui/uiconfig/ui/optfontspage.ui:281
 msgctxt "optfontspage|label9"
 msgid "_Size:"
 msgstr "_Maint:"
 
-#: optfontspage.ui:295
+#: cui/uiconfig/ui/optfontspage.ui:295
 msgctxt "optfontspage|fontname"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: optfontspage.ui:305
+#: cui/uiconfig/ui/optfontspage.ui:305
 msgctxt "optfontspage|nonpropfontonly"
 msgid "_Non-proportional fonts only"
 msgstr "Ff_ontiau anghyfraneddol yn unig"
 
-#: optfontspage.ui:341
+#: cui/uiconfig/ui/optfontspage.ui:341
 msgctxt "optfontspage|label1"
 msgid "Font Settings for HTML, Basic and SQL Sources"
 msgstr "Gosodiadau Ffont ar gyfer Ffynonellau HTML, Basic a SQL"
 
-#: optgeneralpage.ui:31
+#: cui/uiconfig/ui/optgeneralpage.ui:31
 msgctxt "optgeneralpage|exthelp"
 msgid "_Extended tips"
 msgstr "_Cyngor estynedig"
 
-#: optgeneralpage.ui:46
+#: cui/uiconfig/ui/optgeneralpage.ui:46
 msgctxt "optgeneralpage|label1"
 msgid "Help"
 msgstr "Cymorth"
 
-#: optgeneralpage.ui:76
+#: cui/uiconfig/ui/optgeneralpage.ui:76
 msgctxt "optgeneralpage|filedlg"
 msgid "_Use %PRODUCTNAME dialogs"
 msgstr "_Defnyddio deialogau %PRODUCTNAME"
 
-#: optgeneralpage.ui:110
+#: cui/uiconfig/ui/optgeneralpage.ui:110
 msgctxt "optgeneralpage|label2"
 msgid "Open/Save Dialogs"
 msgstr "Deialogau Agor/Cadw"
 
-#: optgeneralpage.ui:136
+#: cui/uiconfig/ui/optgeneralpage.ui:136
 msgctxt "optgeneralpage|printdlg"
 msgid "Use %PRODUCTNAME _dialogs"
 msgstr "Defnyddio d_eialogau %PRODUCTNAME"
 
-#: optgeneralpage.ui:151
+#: cui/uiconfig/ui/optgeneralpage.ui:151
 msgctxt "optgeneralpage|label3"
 msgid "Print Dialogs"
 msgstr "Deialogau Argraffu"
 
-#: optgeneralpage.ui:177
+#: cui/uiconfig/ui/optgeneralpage.ui:177
 msgctxt "optgeneralpage|docstatus"
 msgid "_Printing sets \"document modified\" status"
 msgstr "_Argraffu yn gosod statws \"dogfen wedi newid\""
 
-#: optgeneralpage.ui:192
+#: cui/uiconfig/ui/optgeneralpage.ui:192
 msgctxt "optgeneralpage|label4"
 msgid "Document Status"
 msgstr "Statws Dogfen"
 
-#: optgeneralpage.ui:225
+#: cui/uiconfig/ui/optgeneralpage.ui:225
 msgctxt "optgeneralpage|label6"
 msgid "_Interpret as years between "
 msgstr "_Dehongli fel blynyddoedd rhwng "
 
-#: optgeneralpage.ui:251
+#: cui/uiconfig/ui/optgeneralpage.ui:250
 msgctxt "optgeneralpage|toyear"
 msgid "and "
 msgstr "a "
 
-#: optgeneralpage.ui:266
+#: cui/uiconfig/ui/optgeneralpage.ui:265
 msgctxt "optgeneralpage|label5"
 msgid "Year (Two Digits)"
 msgstr "Blwyddyn (Dau Ddigid)"
 
-#: optgeneralpage.ui:292
+#: cui/uiconfig/ui/optgeneralpage.ui:291
 msgctxt "optgeneralpage|collectusageinfo"
 msgid "Collect usage data and send it to The Document Foundation"
 msgstr "Casglu data defnydd a'i anfon at y Document Foundation"
 
-#: optgeneralpage.ui:307
+#: cui/uiconfig/ui/optgeneralpage.ui:306
 msgctxt "optgeneralpage|label7"
 msgid "Help Improve %PRODUCTNAME"
 msgstr "Helpwch wella %PRODUCTNAME"
 
-#: optgeneralpage.ui:338
+#: cui/uiconfig/ui/optgeneralpage.ui:337
 msgctxt "optgeneralpage|quicklaunch"
 msgid "Load %PRODUCTNAME during system start-up"
 msgstr "Llwytho %PRODUCTNAME wrth gychwyn y system"
 
-#: optgeneralpage.ui:352
+#: cui/uiconfig/ui/optgeneralpage.ui:352
 msgctxt "optgeneralpage|systray"
 msgid "Enable systray Quickstarter"
 msgstr "Galluogi Cychwyn Cyflym"
 
-#: optgeneralpage.ui:372
+#: cui/uiconfig/ui/optgeneralpage.ui:373
 msgctxt "optgeneralpage|label8"
 msgid "%PRODUCTNAME Quickstarter"
 msgstr "Cychwyn Cyflym %PRODUCTNAME"
 
-#: opthtmlpage.ui:90
+#: cui/uiconfig/ui/opthtmlpage.ui:90
 msgctxt "opthtmlpage|size7FT"
 msgid "Size _7:"
 msgstr "Maint _7:"
 
-#: opthtmlpage.ui:119
+#: cui/uiconfig/ui/opthtmlpage.ui:118
 msgctxt "opthtmlpage|size6FT"
 msgid "Size _6:"
 msgstr "Maint _6:"
 
-#: opthtmlpage.ui:148
+#: cui/uiconfig/ui/opthtmlpage.ui:146
 msgctxt "opthtmlpage|size5FT"
 msgid "Size _5:"
 msgstr "Maint _5:"
 
-#: opthtmlpage.ui:177
+#: cui/uiconfig/ui/opthtmlpage.ui:174
 msgctxt "opthtmlpage|size4FT"
 msgid "Size _4:"
 msgstr "Maint _4:"
 
-#: opthtmlpage.ui:206
+#: cui/uiconfig/ui/opthtmlpage.ui:202
 msgctxt "opthtmlpage|size3FT"
 msgid "Size _3:"
 msgstr "Maint _3:"
 
-#: opthtmlpage.ui:235
+#: cui/uiconfig/ui/opthtmlpage.ui:230
 msgctxt "opthtmlpage|size2FT"
 msgid "Size _2:"
 msgstr "Maint _2:"
 
-#: opthtmlpage.ui:264
+#: cui/uiconfig/ui/opthtmlpage.ui:258
 msgctxt "opthtmlpage|size1FT"
 msgid "Size _1:"
 msgstr "Maint _1:"
 
-#: opthtmlpage.ui:297
+#: cui/uiconfig/ui/opthtmlpage.ui:290
 msgctxt "opthtmlpage|label1"
 msgid "Font Sizes"
 msgstr "Maint Ffontiau"
 
-#: opthtmlpage.ui:347
+#: cui/uiconfig/ui/opthtmlpage.ui:340
 msgctxt "opthtmlpage|ignorefontnames"
 msgid "Ignore _font settings"
 msgstr "Anwybyddu _gosodiadau ffont"
 
-#: opthtmlpage.ui:365
+#: cui/uiconfig/ui/opthtmlpage.ui:358
 msgctxt "opthtmlpage|unknowntag"
 msgid "_Import unknown HTML tags as fields"
 msgstr "_Mewnforio tagiau HTML anhysbys fel meysydd"
 
-#: opthtmlpage.ui:383
+#: cui/uiconfig/ui/opthtmlpage.ui:376
 msgctxt "opthtmlpage|numbersenglishus"
 msgid "_Use '%ENGLISHUSLOCALE' locale for numbers"
 msgstr "_Defnyddio locale '%ENGLISHUSLOCALE' am rifau"
 
-#: opthtmlpage.ui:407
+#: cui/uiconfig/ui/opthtmlpage.ui:400
 msgctxt "opthtmlpage|label2"
 msgid "Import"
 msgstr "Mewnforio"
 
-#: opthtmlpage.ui:454
+#: cui/uiconfig/ui/opthtmlpage.ui:447
 msgctxt "opthtmlpage|charsetFT"
 msgid "Character _set:"
 msgstr "Set _nod:"
 
-#: opthtmlpage.ui:489
+#: cui/uiconfig/ui/opthtmlpage.ui:482
 msgctxt "opthtmlpage|savegrflocal"
 msgid "_Copy local images to Internet"
 msgstr "­_Copïo delweddau lleol i'r Rhyngrwyd"
 
-#: opthtmlpage.ui:507
+#: cui/uiconfig/ui/opthtmlpage.ui:500
 msgctxt "opthtmlpage|printextension"
 msgid "_Print layout"
 msgstr "Cynllun _argraffu"
 
-#: opthtmlpage.ui:525
+#: cui/uiconfig/ui/opthtmlpage.ui:518
 msgctxt "opthtmlpage|starbasicwarning"
 msgid "Display _warning"
 msgstr "Dangos _rhybudd"
 
-#: opthtmlpage.ui:544
+#: cui/uiconfig/ui/opthtmlpage.ui:537
 msgctxt "opthtmlpage|starbasic"
 msgid "LibreOffice _Basic"
 msgstr "_Basic LibreOffice"
 
-#: opthtmlpage.ui:568
+#: cui/uiconfig/ui/opthtmlpage.ui:561
 msgctxt "opthtmlpage|label3"
 msgid "Export"
 msgstr "Allforio"
 
-#: optionsdialog.ui:11
+#: cui/uiconfig/ui/optionsdialog.ui:11
 msgctxt "optionsdialog|OptionsDialog"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: optjsearchpage.ui:33
+#: cui/uiconfig/ui/optjsearchpage.ui:33
 msgctxt "optjsearchpage|matchcase"
 msgid "_uppercase/lowercase"
 msgstr "llythyren _mawr/bach"
 
-#: optjsearchpage.ui:50
+#: cui/uiconfig/ui/optjsearchpage.ui:50
 msgctxt "optjsearchpage|matchfullhalfwidth"
 msgid "_full-width/half-width forms"
 msgstr "ffurfiau _lled llawn/hanner lled"
 
-#: optjsearchpage.ui:67
+#: cui/uiconfig/ui/optjsearchpage.ui:67
 msgctxt "optjsearchpage|matchhiraganakatakana"
 msgid "_hiragana/katakana"
 msgstr "_hiragana/katakana"
 
-#: optjsearchpage.ui:84
+#: cui/uiconfig/ui/optjsearchpage.ui:84
 msgctxt "optjsearchpage|matchcontractions"
 msgid "_contractions (yo-on, sokuon)"
 msgstr "_cyfyngiadau (yo-on, sokuon)"
 
-#: optjsearchpage.ui:101
+#: cui/uiconfig/ui/optjsearchpage.ui:101
 msgctxt "optjsearchpage|matchminusdashchoon"
 msgid "_minus/dash/cho-on"
 msgstr "m_inws/dash/cho-on"
 
-#: optjsearchpage.ui:118
+#: cui/uiconfig/ui/optjsearchpage.ui:118
 msgctxt "optjsearchpage|matchrepeatcharmarks"
 msgid "'re_peat character' marks"
 msgstr "_marciau 'ail adrodd nod'"
 
-#: optjsearchpage.ui:135
+#: cui/uiconfig/ui/optjsearchpage.ui:135
 msgctxt "optjsearchpage|matchvariantformkanji"
 msgid "_variant-form kanji (itaiji)"
 msgstr "_ffurf amrywiol kanji (itaiji)"
 
-#: optjsearchpage.ui:152
+#: cui/uiconfig/ui/optjsearchpage.ui:152
 msgctxt "optjsearchpage|matcholdkanaforms"
 msgid "_old Kana forms"
 msgstr "_hen ffurf Kana"
 
-#: optjsearchpage.ui:169
+#: cui/uiconfig/ui/optjsearchpage.ui:169
 msgctxt "optjsearchpage|matchdiziduzu"
 msgid "_di/zi, du/zu"
 msgstr "_di/zi, du/zu"
 
-#: optjsearchpage.ui:186
+#: cui/uiconfig/ui/optjsearchpage.ui:186
 msgctxt "optjsearchpage|matchbavahafa"
 msgid "_ba/va, ha/fa"
 msgstr "_ba/va, ha/fa"
 
-#: optjsearchpage.ui:203
+#: cui/uiconfig/ui/optjsearchpage.ui:203
 msgctxt "optjsearchpage|matchtsithichidhizi"
 msgid "_tsi/thi/chi, dhi/zi"
 msgstr "_tsi/thi/chi, dhi/zi"
 
-#: optjsearchpage.ui:220
+#: cui/uiconfig/ui/optjsearchpage.ui:220
 msgctxt "optjsearchpage|matchhyuiyubyuvyu"
 msgid "h_yu/fyu, byu/vyu"
 msgstr "h_yu/fyu, byu/vyu"
 
-#: optjsearchpage.ui:237
+#: cui/uiconfig/ui/optjsearchpage.ui:237
 msgctxt "optjsearchpage|matchseshezeje"
 msgid "_se/she, ze/je"
 msgstr "_se/she, ze/je"
 
-#: optjsearchpage.ui:254
+#: cui/uiconfig/ui/optjsearchpage.ui:254
 msgctxt "optjsearchpage|matchiaiya"
 msgid "_ia/iya (piano/piyano)"
 msgstr "_ia/iya (piano/piyano)"
 
-#: optjsearchpage.ui:271
+#: cui/uiconfig/ui/optjsearchpage.ui:271
 msgctxt "optjsearchpage|matchkiku"
 msgid "_ki/ku (tekisuto/tekusuto)"
 msgstr "_ki/ku (tekisuto/tekusuto)"
 
-#: optjsearchpage.ui:288
+#: cui/uiconfig/ui/optjsearchpage.ui:288
 msgctxt "optjsearchpage|matchprolongedsoundmark"
 msgid "Prolon_ged vowels (ka-/kaa)"
 msgstr "_Llafariaid hit (ka-/kaa)"
 
-#: optjsearchpage.ui:311
+#: cui/uiconfig/ui/optjsearchpage.ui:311
 msgctxt "optjsearchpage|label1"
 msgid "Treat as Equal"
 msgstr "Trin fel Cyfartal"
 
-#: optjsearchpage.ui:345
+#: cui/uiconfig/ui/optjsearchpage.ui:345
 msgctxt "optjsearchpage|ignorepunctuation"
 msgid "Pu_nctuation characters"
 msgstr "_Nodau atalnodi"
 
-#: optjsearchpage.ui:362
+#: cui/uiconfig/ui/optjsearchpage.ui:362
 msgctxt "optjsearchpage|ignorewhitespace"
 msgid "_Whitespace characters"
 msgstr "Nodau bwlch _gwyn"
 
-#: optjsearchpage.ui:379
+#: cui/uiconfig/ui/optjsearchpage.ui:379
 msgctxt "optjsearchpage|ignoremiddledot"
 msgid "Midd_le dots"
 msgstr "_Dotiau canol"
 
-#: optjsearchpage.ui:405
+#: cui/uiconfig/ui/optjsearchpage.ui:405
 msgctxt "optjsearchpage|label2"
 msgid "Ignore"
 msgstr "Anwybyddu"
 
-#: optlanguagespage.ui:37
+#: cui/uiconfig/ui/optlanguagespage.ui:37
 msgctxt "optlanguagespage|label4"
 msgid "_User interface:"
 msgstr "_Rhyngwyneb defnyddiwr:"
 
-#: optlanguagespage.ui:51
+#: cui/uiconfig/ui/optlanguagespage.ui:51
 msgctxt "optlanguagespage|localesettingFT"
 msgid "Locale setting:"
 msgstr "Gosodiadau'r locale:"
 
-#: optlanguagespage.ui:65
+#: cui/uiconfig/ui/optlanguagespage.ui:65
 msgctxt "optlanguagespage|label6"
 msgid "Decimal separator key:"
 msgstr "Bysell gwahanydd degol:"
 
-#: optlanguagespage.ui:79
+#: cui/uiconfig/ui/optlanguagespage.ui:79
 msgctxt "optlanguagespage|defaultcurrency"
 msgid "_Default currency:"
 msgstr "_Arian rhagosodedig:"
 
-#: optlanguagespage.ui:93
+#: cui/uiconfig/ui/optlanguagespage.ui:93
 msgctxt "optlanguagespage|dataaccpatterns"
 msgid "Date acceptance _patterns:"
 msgstr "_Patrymau derbyn dyddiad:"
 
-#: optlanguagespage.ui:154
+#: cui/uiconfig/ui/optlanguagespage.ui:153
 msgctxt "optlanguagespage|decimalseparator"
 msgid "_Same as locale setting ( %1 )"
 msgstr "_Fel gosodiadau’r locale ( %1 )"
 
-#: optlanguagespage.ui:175
+#: cui/uiconfig/ui/optlanguagespage.ui:174
 msgctxt "optlanguagespage|label1"
 msgid "Language Of"
 msgstr "Iaith"
 
-#: optlanguagespage.ui:246
+#: cui/uiconfig/ui/optlanguagespage.ui:245
 msgctxt "optlanguagespage|currentdoc"
 msgid "For the current document only"
 msgstr "Dogfen gyfredol yn unig"
 
-#: optlanguagespage.ui:261
+#: cui/uiconfig/ui/optlanguagespage.ui:261
 msgctxt "optlanguagespage|ctlsupport"
 msgid "Complex _text layout:"
 msgstr "Cynllun _testun cymhleth:"
 
-#: optlanguagespage.ui:276
+#: cui/uiconfig/ui/optlanguagespage.ui:276
 msgctxt "optlanguagespage|asiansupport"
 msgid "Asian:"
 msgstr "Asiaidd:"
 
-#: optlanguagespage.ui:294
+#: cui/uiconfig/ui/optlanguagespage.ui:294
 msgctxt "optlanguagespage|western"
 msgid "Western:"
 msgstr "Gorllewinol:"
 
-#: optlanguagespage.ui:311
+#: cui/uiconfig/ui/optlanguagespage.ui:311
 msgctxt "optlanguagespage|label2"
 msgid "Default Languages for Documents"
 msgstr "Ieithoedd Rhagosodedig Dogfennau"
 
-#: optlanguagespage.ui:342
+#: cui/uiconfig/ui/optlanguagespage.ui:342
 msgctxt "optlanguagespage|ignorelanguagechange"
 msgid "Ignore s_ystem input language"
 msgstr "Anwybyddu _iaith mewnbwn y system"
 
-#: optlanguagespage.ui:363
+#: cui/uiconfig/ui/optlanguagespage.ui:363
 msgctxt "optlanguagespage|label3"
 msgid "Enhanced Language Support"
 msgstr "Cefnogaeth Iaith Uwch"
 
-#: optlingupage.ui:47
+#: cui/uiconfig/ui/optlingupage.ui:47
 msgctxt "optlingupage|lingumodulesft"
 msgid "_Available language modules:"
 msgstr "Modiwlau _iaith sydd ar gael:"
 
-#: optlingupage.ui:74
+#: cui/uiconfig/ui/optlingupage.ui:74
 msgctxt "optlingupage|lingumodulesedit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: optlingupage.ui:82
+#: cui/uiconfig/ui/optlingupage.ui:82
 msgctxt "optlingupage|lingumodulesedit-atkobject"
 msgid "Edit Available language modules"
 msgstr "Golygu modiwlau'r ieithoedd sydd ar gael"
 
-#: optlingupage.ui:112
+#: cui/uiconfig/ui/optlingupage.ui:112
 msgctxt "optlingupage|lingudictsft"
 msgid "_User-defined dictionaries:"
 msgstr "Geiriaduron defnyddiwr _diffiniedig:"
 
-#: optlingupage.ui:146
+#: cui/uiconfig/ui/optlingupage.ui:146
 msgctxt "optlingupage|lingudictsnew"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: optlingupage.ui:160
+#: cui/uiconfig/ui/optlingupage.ui:160
 msgctxt "optlingupage|lingudictsedit"
 msgid "Ed_it..."
 msgstr "_Golygu..."
 
-#: optlingupage.ui:167
+#: cui/uiconfig/ui/optlingupage.ui:167
 msgctxt "optlingupage|lingudictsedit-atkobject"
 msgid "Edit User-defined dictionaries"
 msgstr "Golygu geiriaduron defnyddiwr diffiniedig"
 
-#: optlingupage.ui:179
+#: cui/uiconfig/ui/optlingupage.ui:179
 msgctxt "optlingupage|lingudictsdelete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: optlingupage.ui:218
+#: cui/uiconfig/ui/optlingupage.ui:218
 msgctxt "optlingupage|label4"
 msgid "_Options:"
 msgstr "_Dewisiadau:"
 
-#: optlingupage.ui:230
+#: cui/uiconfig/ui/optlingupage.ui:230
 msgctxt "optlingupage|moredictslink"
 msgid "Get more dictionaries online..."
 msgstr "Estyn rhagor o eiriaduron ar-lein..."
 
-#: optlingupage.ui:262
+#: cui/uiconfig/ui/optlingupage.ui:262
 msgctxt "optlingupage|linguoptionsedit"
 msgid "Edi_t..."
 msgstr "G_olygu..."
 
-#: optlingupage.ui:270
+#: cui/uiconfig/ui/optlingupage.ui:270
 msgctxt "optlingupage|linguoptionsedit-atkobject"
 msgid "Edit Options"
 msgstr "Dewisiadau Golygu"
 
-#: optlingupage.ui:296
+#: cui/uiconfig/ui/optlingupage.ui:296
 msgctxt "optlingupage|label1"
 msgid "Writing Aids"
 msgstr "Cymhorthion Ysgrifennu"
 
-#: optnewdictionarydialog.ui:9
+#: cui/uiconfig/ui/optnewdictionarydialog.ui:8
 msgctxt "optnewdictionarydialog|OptNewDictionaryDialog"
 msgid "New Dictionary"
 msgstr "Geiriadur Newydd"
 
-#: optnewdictionarydialog.ui:121
+#: cui/uiconfig/ui/optnewdictionarydialog.ui:112
 msgctxt "optnewdictionarydialog|name_label"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: optnewdictionarydialog.ui:135
+#: cui/uiconfig/ui/optnewdictionarydialog.ui:126
 msgctxt "optnewdictionarydialog|language_label"
 msgid "_Language:"
 msgstr "_Iaith:"
 
-#: optnewdictionarydialog.ui:146
+#: cui/uiconfig/ui/optnewdictionarydialog.ui:138
 msgctxt "optnewdictionarydialog|except"
 msgid "_Exception (-)"
 msgstr "E_ithriad (-)"
 
-#: optnewdictionarydialog.ui:168
+#: cui/uiconfig/ui/optnewdictionarydialog.ui:177
 msgctxt "optnewdictionarydialog|label1"
 msgid "Dictionary"
 msgstr "Geiriadur"
 
-#: optonlineupdatepage.ui:28
+#: cui/uiconfig/ui/optonlineupdatepage.ui:28
 msgctxt "optonlineupdatepage|autocheck"
 msgid "_Check for updates automatically"
 msgstr "_Gwirio am ddiweddariadau yn awtomatig"
 
-#: optonlineupdatepage.ui:54
+#: cui/uiconfig/ui/optonlineupdatepage.ui:54
 msgctxt "optonlineupdatepage|everyday"
 msgid "Every da_y"
 msgstr "Pob _dydd"
 
-#: optonlineupdatepage.ui:71
+#: cui/uiconfig/ui/optonlineupdatepage.ui:71
 msgctxt "optonlineupdatepage|everyweek"
 msgid "Every _week"
 msgstr "Pob _wythnos"
 
-#: optonlineupdatepage.ui:87
+#: cui/uiconfig/ui/optonlineupdatepage.ui:87
 msgctxt "optonlineupdatepage|everymonth"
 msgid "Every _month"
 msgstr "Pob _mis"
 
-#: optonlineupdatepage.ui:114
+#: cui/uiconfig/ui/optonlineupdatepage.ui:114
 msgctxt "optonlineupdatepage|lastchecked"
 msgid "Last checked: %DATE%, %TIME%"
 msgstr "Gwiriwyd diwethaf: %DATE%, %TIME%"
 
-#: optonlineupdatepage.ui:125
+#: cui/uiconfig/ui/optonlineupdatepage.ui:125
 msgctxt "optonlineupdatepage|checknow"
 msgid "Check _Now"
 msgstr "Gwirio _Nawr"
 
-#: optonlineupdatepage.ui:140
+#: cui/uiconfig/ui/optonlineupdatepage.ui:140
 msgctxt "optonlineupdatepage|autodownload"
 msgid "_Download updates automatically"
 msgstr "_Llwytho ddiweddariadau i lawr yn awtomatig"
 
-#: optonlineupdatepage.ui:172
+#: cui/uiconfig/ui/optonlineupdatepage.ui:172
 msgctxt "optonlineupdatepage|destpathlabel"
 msgid "Download destination:"
 msgstr "Cyrchfan llwytho i lawr:"
 
-#: optonlineupdatepage.ui:182
+#: cui/uiconfig/ui/optonlineupdatepage.ui:182
 msgctxt "optonlineupdatepage|changepath"
 msgid "Ch_ange..."
 msgstr "_Newid..."
 
-#: optonlineupdatepage.ui:220
+#: cui/uiconfig/ui/optonlineupdatepage.ui:220
 msgctxt "optonlineupdatepage|extrabits"
 msgid "_Send OS version and basic hardware information"
 msgstr "_Anfon fersiwn y System Weithredu a manylion y prif galedwedd"
 
-#: optonlineupdatepage.ui:224
+#: cui/uiconfig/ui/optonlineupdatepage.ui:224
 msgctxt "optonlineupdatepage|extrabits|tooltip_text"
 msgid "This information lets us make optimizations for your hardware and operating system."
 msgstr "Mae'r manylion yn caniatáu i ni fireinio ar gyfer eich caledwedd a system weithredu."
 
-#: optonlineupdatepage.ui:244
+#: cui/uiconfig/ui/optonlineupdatepage.ui:244
 msgctxt "optonlineupdatepage|useragent_label"
 msgid "User Agent:"
 msgstr "Asiant Defnyddiwr:"
 
-#: optonlineupdatepage.ui:256
+#: cui/uiconfig/ui/optonlineupdatepage.ui:256
 msgctxt "optonlineupdatepage|useragent_changed"
 msgid "Hit apply to update"
 msgstr "Pwyswych Gosod i ddiweddaru"
 
-#: optonlineupdatepage.ui:288
+#: cui/uiconfig/ui/optonlineupdatepage.ui:288
 msgctxt "optonlineupdatepage|neverchecked"
 msgid "Last checked: Not yet"
 msgstr "Gwiriwyd diwethaf: Dim eto"
 
-#: optonlineupdatepage.ui:305
+#: cui/uiconfig/ui/optonlineupdatepage.ui:305
 msgctxt "optonlineupdatepage|label1"
 msgid "Online Update Options"
 msgstr "Dewisiadau Diweddaru Ar-lein"
 
-#: optopenclpage.ui:30
+#: cui/uiconfig/ui/optopenclpage.ui:30
 msgctxt "optopenclpage|useswinterpreter"
 msgid "Allow use of Software Interpreter (even when OpenCL is not available)"
 msgstr "Caniatau'r defnydd o Ddehonglwr Meddalwedd (hyd yn oed pan nad yw Open CL ar gael)"
 
-#: optopenclpage.ui:46
+#: cui/uiconfig/ui/optopenclpage.ui:46
 msgctxt "optopenclpage|useopencl"
 msgid "Allow use of OpenCL"
 msgstr "Caniatáu'r defnydd o OpenCL"
 
-#: optopenclpage.ui:64
+#: cui/uiconfig/ui/optopenclpage.ui:64
 msgctxt "optopenclpage|openclused"
 msgid "OpenCL is available for use."
 msgstr "Mae OpenCL ar gael i'w ddefnyddio."
 
-#: optopenclpage.ui:76
+#: cui/uiconfig/ui/optopenclpage.ui:76
 msgctxt "optopenclpage|openclnotused"
 msgid "OpenCL is not used."
 msgstr "Nid yw OpenCL yn cael ei ddefnyddio."
 
-#: optopenclpage.ui:92
+#: cui/uiconfig/ui/optopenclpage.ui:92
 msgctxt "optopenclpage|label1"
 msgid "OpenCL Options"
 msgstr "Dewisiadau OpenCL"
 
-#: optpathspage.ui:40
+#: cui/uiconfig/ui/optpathspage.ui:40
 msgctxt "optpathspage|type"
 msgid "Type"
 msgstr "Math"
 
-#: optpathspage.ui:53
+#: cui/uiconfig/ui/optpathspage.ui:53
 msgctxt "optpathspage|path"
 msgid "Path"
 msgstr "Llwybr"
 
-#: optpathspage.ui:66
+#: cui/uiconfig/ui/optpathspage.ui:66
 msgctxt "optpathspage|editpaths"
 msgid "Edit Paths: %1"
 msgstr "Golygu Llwybrau: %1"
 
-#: optpathspage.ui:116
+#: cui/uiconfig/ui/optpathspage.ui:116
 msgctxt "optpathspage|label1"
 msgid "Paths used by %PRODUCTNAME"
 msgstr "Llwybrau sy'n cael eu defnyddio gan %PRODUCTNAME"
 
-#: optpathspage.ui:137
+#: cui/uiconfig/ui/optpathspage.ui:137
 msgctxt "optpathspage|default"
 msgid "_Default"
 msgstr "_Rhagosodedig"
 
-#: optpathspage.ui:151
+#: cui/uiconfig/ui/optpathspage.ui:151
 msgctxt "optpathspage|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: optproxypage.ui:32
+#: cui/uiconfig/ui/optproxypage.ui:32
 msgctxt "optproxypage|label2"
 msgid "Proxy s_erver:"
 msgstr "_Gweinydd dirprwyol:"
 
-#: optproxypage.ui:138
+#: cui/uiconfig/ui/optproxypage.ui:137
 msgctxt "optproxypage|proxymode"
 msgid "None"
 msgstr "Dim"
 
-#: optproxypage.ui:139
+#: cui/uiconfig/ui/optproxypage.ui:138
 msgctxt "optproxypage|proxymode"
 msgid "System"
 msgstr "System"
 
-#: optproxypage.ui:140
+#: cui/uiconfig/ui/optproxypage.ui:139
 msgctxt "optproxypage|proxymode"
 msgid "Manual"
 msgstr "Gyda llaw"
 
-#: optproxypage.ui:153
+#: cui/uiconfig/ui/optproxypage.ui:152
 msgctxt "optproxypage|httpft"
 msgid "HT_TP proxy:"
 msgstr "Dirprwy HT_TP:"
 
-#: optproxypage.ui:166
+#: cui/uiconfig/ui/optproxypage.ui:165
 msgctxt "optproxypage|httpportft"
 msgid "_Port:"
 msgstr "_Porth:"
 
-#: optproxypage.ui:180
+#: cui/uiconfig/ui/optproxypage.ui:179
 msgctxt "optproxypage|httpsft"
 msgid "HTTP_S proxy:"
 msgstr "Defnyddiwch HTTP_S:"
 
-#: optproxypage.ui:194
+#: cui/uiconfig/ui/optproxypage.ui:193
 msgctxt "optproxypage|ftpft"
 msgid "_FTP proxy:"
 msgstr "Dirprwy _FTP:"
 
-#: optproxypage.ui:208
+#: cui/uiconfig/ui/optproxypage.ui:207
 msgctxt "optproxypage|noproxyft"
 msgid "_No proxy for:"
 msgstr "_Dim dirprwy ar gyfer:"
 
-#: optproxypage.ui:221
+#: cui/uiconfig/ui/optproxypage.ui:220
 msgctxt "optproxypage|httpsportft"
 msgid "P_ort:"
 msgstr "P_orth:"
 
-#: optproxypage.ui:234
+#: cui/uiconfig/ui/optproxypage.ui:233
 msgctxt "optproxypage|ftpportft"
 msgid "P_ort:"
 msgstr "P_orth:"
 
-#: optproxypage.ui:248
+#: cui/uiconfig/ui/optproxypage.ui:247
 msgctxt "optproxypage|noproxydesc"
 msgid "Separator ;"
 msgstr "Ymwahanydd ;"
 
-#: optproxypage.ui:270
+#: cui/uiconfig/ui/optproxypage.ui:269
 msgctxt "optproxypage|label1"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: optsavepage.ui:36
+#: cui/uiconfig/ui/optsavepage.ui:36
 msgctxt "optsavepage|load_docprinter"
 msgid "Load printer settings with the document"
 msgstr "Llwytho gosodiadau'r argraffydd gyda'r ddogfen"
 
-#: optsavepage.ui:52
+#: cui/uiconfig/ui/optsavepage.ui:52
 msgctxt "optsavepage|load_settings"
 msgid "Load user-specific settings with the document"
 msgstr "Llwytho gosodiadau penodol i'r defnyddiwr gyda'r ddogfen"
 
-#: optsavepage.ui:74
+#: cui/uiconfig/ui/optsavepage.ui:74
 msgctxt "optsavepage|label1"
 msgid "Load"
 msgstr "Llwytho"
 
-#: optsavepage.ui:111
+#: cui/uiconfig/ui/optsavepage.ui:111
 msgctxt "optsavepage|autosave"
 msgid "Save _AutoRecovery information every:"
 msgstr "Cadw manylion _AwtoAdfer pob:"
 
-#: optsavepage.ui:140
+#: cui/uiconfig/ui/optsavepage.ui:139
 msgctxt "optsavepage|autosave_mins"
 msgid "minutes"
 msgstr "munud"
 
-#: optsavepage.ui:155
+#: cui/uiconfig/ui/optsavepage.ui:154
 msgctxt "optsavepage|userautosave"
 msgid "Automatically save the document too"
 msgstr "Cadw'r ddogfen yn awtomatig"
 
-#: optsavepage.ui:171
+#: cui/uiconfig/ui/optsavepage.ui:170
 msgctxt "optsavepage|relative_fsys"
 msgid "Save URLs relative to file system"
 msgstr "Cadw'r URLau perthynol i'r system ffeil"
 
-#: optsavepage.ui:186
+#: cui/uiconfig/ui/optsavepage.ui:185
 msgctxt "optsavepage|docinfo"
 msgid "_Edit document properties before saving"
 msgstr "_Golygu priodweddau dogfen cyn cadw"
 
-#: optsavepage.ui:201
+#: cui/uiconfig/ui/optsavepage.ui:200
 msgctxt "optsavepage|relative_inet"
 msgid "Save URLs relative to internet"
 msgstr "Cadw URLau perthynol i'r rhyngrwyd"
 
-#: optsavepage.ui:216
+#: cui/uiconfig/ui/optsavepage.ui:215
 msgctxt "optsavepage|backup"
 msgid "Al_ways create backup copy"
 msgstr "_Creu copi wrth gefn bob tro"
 
-#: optsavepage.ui:237
+#: cui/uiconfig/ui/optsavepage.ui:236
 msgctxt "optsavepage|label2"
 msgid "Save"
 msgstr "Cadw"
 
-#: optsavepage.ui:269
+#: cui/uiconfig/ui/optsavepage.ui:268
 msgctxt "optsavepage|warnalienformat"
 msgid "Warn when not saving in ODF or default format"
 msgstr "Rhybuddio pan nad yn cadw yn fformat ODF na'r rhagosodedig"
 
 #. EN-US, the term 'extended' must not be translated.
-#: optsavepage.ui:293
+#: cui/uiconfig/ui/optsavepage.ui:292
 msgctxt "optsavepage|odfwarning_label"
 msgid "Not using ODF 1.2 Extended may cause information to be lost."
 msgstr "Gall peidio defnyddio ODF 1.2 Estynedig arwain at golli gwybodaeth."
 
-#: optsavepage.ui:323
+#: cui/uiconfig/ui/optsavepage.ui:322
 msgctxt "optsavepage|odfversion"
 msgid "1.0/1.1"
 msgstr "1.0/1.1"
 
-#: optsavepage.ui:324
+#: cui/uiconfig/ui/optsavepage.ui:323
 msgctxt "optsavepage|odfversion"
 msgid "1.2"
 msgstr "1.2"
 
-#: optsavepage.ui:325
+#: cui/uiconfig/ui/optsavepage.ui:324
 msgctxt "optsavepage|odfversion"
 msgid "1.2 Extended (compatibility mode)"
 msgstr "1.2 Estynedig (modd cydnaws)"
 
-#: optsavepage.ui:326
+#: cui/uiconfig/ui/optsavepage.ui:325
 msgctxt "optsavepage|odfversion"
 msgid "1.2 Extended (recommended)"
 msgstr "1.2 Estynedig (argymell)"
 
-#: optsavepage.ui:339
+#: cui/uiconfig/ui/optsavepage.ui:338
 msgctxt "optsavepage|label5"
 msgid "ODF format version:"
 msgstr "Ffomat ODF fersiwn:"
 
-#: optsavepage.ui:353
+#: cui/uiconfig/ui/optsavepage.ui:352
 msgctxt "optsavepage|saveas_label"
 msgid "Always sa_ve as:"
 msgstr "_Cadw bob tro fel:"
 
-#: optsavepage.ui:367
+#: cui/uiconfig/ui/optsavepage.ui:366
 msgctxt "optsavepage|doctype"
 msgid "Text document"
 msgstr "Dogfen testun"
 
-#: optsavepage.ui:368
+#: cui/uiconfig/ui/optsavepage.ui:367
 msgctxt "optsavepage|doctype"
 msgid "HTML document"
 msgstr "Dogfen HTML"
 
-#: optsavepage.ui:369
+#: cui/uiconfig/ui/optsavepage.ui:368
 msgctxt "optsavepage|doctype"
 msgid "Master document"
 msgstr "Prif ddogfen"
 
-#: optsavepage.ui:370
+#: cui/uiconfig/ui/optsavepage.ui:369
 msgctxt "optsavepage|doctype"
 msgid "Spreadsheet"
 msgstr "Taenlen"
 
-#: optsavepage.ui:371
+#: cui/uiconfig/ui/optsavepage.ui:370
 msgctxt "optsavepage|doctype"
 msgid "Presentation"
 msgstr "Cyflwyniad"
 
-#: optsavepage.ui:372
+#: cui/uiconfig/ui/optsavepage.ui:371
 msgctxt "optsavepage|doctype"
 msgid "Drawing"
 msgstr "Lluniadu"
 
-#: optsavepage.ui:373
+#: cui/uiconfig/ui/optsavepage.ui:372
 msgctxt "optsavepage|doctype"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: optsavepage.ui:396
+#: cui/uiconfig/ui/optsavepage.ui:395
 msgctxt "optsavepage|label6"
 msgid "D_ocument type:"
 msgstr "_Math dogfen:"
 
-#: optsavepage.ui:413
+#: cui/uiconfig/ui/optsavepage.ui:412
 msgctxt "optsavepage|label3"
 msgid "Default File Format and ODF Settings"
 msgstr "Fformat Ffeil Rhagosodedig a Gosodiadau ODF"
 
-#: optsecuritypage.ui:36
+#: cui/uiconfig/ui/optsecuritypage.ui:36
 msgctxt "optsecuritypage|label9"
 msgid "Maintain a list of Time Stamping Authority (TSA) URLs to be used for digital signatures in PDF export."
 msgstr "Cynnal rhestr o URLau Awdurdodau Stamp Amser (TSA) i'w defnyddio ar gyfer llofnod digidol allforio PDF."
 
-#: optsecuritypage.ui:49
+#: cui/uiconfig/ui/optsecuritypage.ui:49
 msgctxt "optsecuritypage|tsas"
 msgid "_TSAs..."
 msgstr "_TSAau..."
 
-#: optsecuritypage.ui:71
+#: cui/uiconfig/ui/optsecuritypage.ui:71
 msgctxt "optsecuritypage|label10"
 msgid "TSAs"
 msgstr "TSAs"
 
-#: optsecuritypage.ui:111
+#: cui/uiconfig/ui/optsecuritypage.ui:111
 msgctxt "optsecuritypage|label7"
 msgid "Select the Network Security Services certificate directory to use for digital signatures."
 msgstr "Dewiswch gyfeiriadur tystysgrif Gwasanaethau Diogelwch Rhwydwaith i'w ddefnyddio ar gyfer llofnodion digidol."
 
-#: optsecuritypage.ui:124
+#: cui/uiconfig/ui/optsecuritypage.ui:124
 msgctxt "optsecuritypage|cert"
 msgid "_Certificate..."
 msgstr "_Tystysgrif..."
 
-#: optsecuritypage.ui:146
+#: cui/uiconfig/ui/optsecuritypage.ui:146
 msgctxt "optsecuritypage|label8"
 msgid "Certificate Path"
 msgstr "Llwybr Tystysgrif"
 
-#: optsecuritypage.ui:186
+#: cui/uiconfig/ui/optsecuritypage.ui:186
 msgctxt "optsecuritypage|label5"
 msgid "Adjust the security level for executing macros and specify trusted macro developers."
 msgstr "Newid lefel diogelwch ar gyfer gweithredu macros ac enwi datblygwyr dibynadwy."
 
-#: optsecuritypage.ui:199
+#: cui/uiconfig/ui/optsecuritypage.ui:199
 msgctxt "optsecuritypage|macro"
 msgid "Macro Securit_y..."
 msgstr "Diogelwch _Macros..."
 
-#: optsecuritypage.ui:221
+#: cui/uiconfig/ui/optsecuritypage.ui:221
 msgctxt "optsecuritypage|label3"
 msgid "Macro Security"
 msgstr "Diogelwch Macros"
 
-#: optsecuritypage.ui:263
+#: cui/uiconfig/ui/optsecuritypage.ui:263
 msgctxt "optsecuritypage|savepassword"
 msgid "Persistently _save passwords for web connections"
 msgstr "Cadw cyfrineiriau'n _barhaol ar gyfer cysylltiadau gwe"
 
-#: optsecuritypage.ui:292
+#: cui/uiconfig/ui/optsecuritypage.ui:292
 msgctxt "optsecuritypage|usemasterpassword"
 msgid "Protected _by a master password (recommended)"
 msgstr "Diogelwyd gan _brif gyfrinair (argymhellir)"
 
-#: optsecuritypage.ui:313
+#: cui/uiconfig/ui/optsecuritypage.ui:313
 msgctxt "optsecuritypage|masterpasswordtext"
 msgid "Passwords are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list."
 msgstr "Mae cyfrineiriau wedi eu diogelu gan brif gyfrinair. Bydd gofyn i chi ei roi unwaith y sesiwn, os bydd %PRODUCTNAME yn adfer cyfrinair o'r rhestr cyfrineiriau diogelwyd."
 
-#: optsecuritypage.ui:330
+#: cui/uiconfig/ui/optsecuritypage.ui:330
 msgctxt "optsecuritypage|nopasswordsave"
 msgid ""
 "Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password.\n"
@@ -8557,677 +8621,667 @@ msgstr ""
 "\n"
 "Ydych chi am ddileu'r rhestr o gyfrineiriau ac ailosod y prif gyfrinair?"
 
-#: optsecuritypage.ui:367
+#: cui/uiconfig/ui/optsecuritypage.ui:367
 msgctxt "optsecuritypage|connections"
 msgid "Connect_ions..."
 msgstr "C_ysylltiadau..."
 
-#: optsecuritypage.ui:384
+#: cui/uiconfig/ui/optsecuritypage.ui:384
 msgctxt "optsecuritypage|masterpassword"
 msgid "_Master Password..."
 msgstr "_Prif Gyfrinair..."
 
-#: optsecuritypage.ui:415
+#: cui/uiconfig/ui/optsecuritypage.ui:415
 msgctxt "optsecuritypage|label2"
 msgid "Passwords for Web Connections"
 msgstr "Cyfrineiriau ar gyfer Cysylltiadau Gwe"
 
-#: optsecuritypage.ui:455
+#: cui/uiconfig/ui/optsecuritypage.ui:455
 msgctxt "optsecuritypage|label4"
 msgid "Adjust security related options and define warnings for hidden information in documents.  "
 msgstr "Newid dewisiadau diogelwch a diffinio rhybuddion am wybodaeth gudd mewn dogfennau.  "
 
-#: optsecuritypage.ui:468
+#: cui/uiconfig/ui/optsecuritypage.ui:468
 msgctxt "optsecuritypage|options"
 msgid "O_ptions..."
 msgstr "_Dewisiadau..."
 
-#: optsecuritypage.ui:490
+#: cui/uiconfig/ui/optsecuritypage.ui:490
 msgctxt "optsecuritypage|label1"
 msgid "Security Options and Warnings"
 msgstr "Dewisiadau Diogelwch a Rhybuddion"
 
-#: optuserpage.ui:12
+#: cui/uiconfig/ui/optuserpage.ui:12
 msgctxt "optuserpage|liststore1"
 msgid "No key"
 msgstr "Dim allwedd"
 
-#: optuserpage.ui:45
+#: cui/uiconfig/ui/optuserpage.ui:45
 msgctxt "optuserpage|companyft"
 msgid "_Company:"
 msgstr "_Cwmni:"
 
-#: optuserpage.ui:59
+#: cui/uiconfig/ui/optuserpage.ui:59
 msgctxt "optuserpage|nameft"
 msgid "First/last _name/initials:"
 msgstr "_Enw cyntaf/olaf/llythrennau:"
 
-#: optuserpage.ui:73
+#: cui/uiconfig/ui/optuserpage.ui:73
 msgctxt "optuserpage|streetft"
 msgid "_Street:"
 msgstr "_Stryd:"
 
-#: optuserpage.ui:87
+#: cui/uiconfig/ui/optuserpage.ui:87
 msgctxt "optuserpage|cityft"
 msgid "City/state/_zip:"
 msgstr "Tref/sir/_cod post:"
 
-#: optuserpage.ui:101
+#: cui/uiconfig/ui/optuserpage.ui:101
 msgctxt "optuserpage|countryft"
 msgid "Country/re_gion:"
 msgstr "Gwlad/_ardal:"
 
-#: optuserpage.ui:115
+#: cui/uiconfig/ui/optuserpage.ui:115
 msgctxt "optuserpage|titleft"
 msgid "_Title/position:"
 msgstr "_Teitl/swydd:"
 
-#: optuserpage.ui:129
+#: cui/uiconfig/ui/optuserpage.ui:129
 msgctxt "optuserpage|phoneft"
 msgid "Telephone (home/_work):"
 msgstr "Ffôn (cartref/_gwaith):"
 
-#: optuserpage.ui:134
+#: cui/uiconfig/ui/optuserpage.ui:134
 msgctxt "phoneft-atkobject"
 msgid "Home telephone number"
 msgstr "Rhif ffôn cartref"
 
-#: optuserpage.ui:148
+#: cui/uiconfig/ui/optuserpage.ui:148
 msgctxt "optuserpage|faxft"
 msgid "Fa_x/e-mail:"
 msgstr "_Ffacs/e-bost:"
 
-#: optuserpage.ui:171
+#: cui/uiconfig/ui/optuserpage.ui:170
 msgctxt "optuserpage|firstname-atkobject"
 msgid "First name"
 msgstr "Enw cyntaf"
 
-#: optuserpage.ui:189
+#: cui/uiconfig/ui/optuserpage.ui:187
 msgctxt "lastname-atkobject"
 msgid "Last name"
 msgstr "Enw olaf"
 
-#: optuserpage.ui:207
+#: cui/uiconfig/ui/optuserpage.ui:204
 msgctxt "shortname-atkobject"
 msgid "Initials"
 msgstr "Llythrennau Blaen"
 
-#: optuserpage.ui:236
+#: cui/uiconfig/ui/optuserpage.ui:232
 msgctxt "city-atkobject"
 msgid "City"
 msgstr "Dinas"
 
-#: optuserpage.ui:254
+#: cui/uiconfig/ui/optuserpage.ui:249
 msgctxt "state-atkobject"
 msgid "State"
 msgstr "Talaith"
 
-#: optuserpage.ui:272
+#: cui/uiconfig/ui/optuserpage.ui:266
 msgctxt "zip-atkobject"
 msgid "Zip code"
 msgstr "Cod ZIP"
 
-#: optuserpage.ui:302
+#: cui/uiconfig/ui/optuserpage.ui:295
 msgctxt "title-atkobject"
 msgid "Title"
 msgstr "Teitl"
 
-#: optuserpage.ui:320
+#: cui/uiconfig/ui/optuserpage.ui:312
 msgctxt "position-atkobject"
 msgid "Position"
 msgstr "Safle"
 
-#: optuserpage.ui:349
+#: cui/uiconfig/ui/optuserpage.ui:340
 msgctxt "home-atkobject"
 msgid "Home telephone number"
 msgstr "Rhif ffôn cartref"
 
-#: optuserpage.ui:367
+#: cui/uiconfig/ui/optuserpage.ui:357
 msgctxt "work-atkobject"
 msgid "Work telephone number"
 msgstr "Rhif ffôn gwaith"
 
-#: optuserpage.ui:397
+#: cui/uiconfig/ui/optuserpage.ui:386
 msgctxt "fax-atkobject"
 msgid "FAX number"
 msgstr "Rhif Ffacs"
 
-#: optuserpage.ui:415
+#: cui/uiconfig/ui/optuserpage.ui:403
 msgctxt "email-atkobject"
 msgid "email address"
 msgstr "cyfeiriad e-bost"
 
-#: optuserpage.ui:432
+#: cui/uiconfig/ui/optuserpage.ui:420
 msgctxt "optuserpage|usefordocprop"
 msgid "Use data for document properties"
 msgstr "Defnyddio data ar gyfer priodweddau dogfen"
 
-#: optuserpage.ui:449
+#: cui/uiconfig/ui/optuserpage.ui:438
 msgctxt "optuserpage|rusnameft"
 msgid "Last name/first _name/father’s name/initials:"
 msgstr "Enw Olaf/enw _cyntaf/enw tad/llythrennau blaen:"
 
-#: optuserpage.ui:472
+#: cui/uiconfig/ui/optuserpage.ui:460
 msgctxt "ruslastname-atkobject"
 msgid "Last name"
 msgstr "Enw olaf"
 
-#: optuserpage.ui:490
+#: cui/uiconfig/ui/optuserpage.ui:477
 msgctxt "rusfathersname-atkobject"
 msgid "Father's name"
 msgstr "Enw tad"
 
-#: optuserpage.ui:508
+#: cui/uiconfig/ui/optuserpage.ui:494
 msgctxt "russhortname-atkobject"
 msgid "Initials"
 msgstr "Llythrennau Blaen"
 
-#: optuserpage.ui:526
+#: cui/uiconfig/ui/optuserpage.ui:511
 msgctxt "rusfirstname-atkobject"
 msgid "First name"
 msgstr "Enw cyntaf"
 
-#: optuserpage.ui:546
+#: cui/uiconfig/ui/optuserpage.ui:531
 msgctxt "optuserpage|eastnameft"
 msgid "Last/first _name/initials:"
 msgstr "Olaf/enw _cyntaf/llythrennau:"
 
-#: optuserpage.ui:569
+#: cui/uiconfig/ui/optuserpage.ui:553
 msgctxt "eastlastname-atkobject"
 msgid "Last name"
 msgstr "Enw olaf"
 
-#: optuserpage.ui:587
+#: cui/uiconfig/ui/optuserpage.ui:570
 msgctxt "eastfirstname-atkobject"
 msgid "First name"
 msgstr "Enw cyntaf"
 
-#: optuserpage.ui:605
+#: cui/uiconfig/ui/optuserpage.ui:587
 msgctxt "eastshortname-atkobject"
 msgid "Initials"
 msgstr "Llythrennau Blaen"
 
-#: optuserpage.ui:625
+#: cui/uiconfig/ui/optuserpage.ui:607
 msgctxt "optuserpage|russtreetft"
 msgid "_Street/apartment number:"
 msgstr "_Stryd/rhif fflat:"
 
-#: optuserpage.ui:648
+#: cui/uiconfig/ui/optuserpage.ui:629
 msgctxt "russtreet-atkobject"
 msgid "Street"
 msgstr "Stryd"
 
-#: optuserpage.ui:666
+#: cui/uiconfig/ui/optuserpage.ui:646
 msgctxt "ruslastname-atkobject"
 msgid "Apartment number"
 msgstr "Rhif fflat"
 
-#: optuserpage.ui:686
+#: cui/uiconfig/ui/optuserpage.ui:666
 msgctxt "optuserpage|icityft"
 msgid "_Zip/city:"
 msgstr "_Cod post/tref:"
 
-#: optuserpage.ui:709
+#: cui/uiconfig/ui/optuserpage.ui:688
 msgctxt "icity-atkobject"
 msgid "City"
 msgstr "Dinas"
 
-#: optuserpage.ui:727
+#: cui/uiconfig/ui/optuserpage.ui:705
 msgctxt "izip-atkobject"
 msgid "Zip code"
 msgstr "Cod ZIP"
 
-#: optuserpage.ui:825
+#: cui/uiconfig/ui/optuserpage.ui:800
 msgctxt "optuserpage|label1"
 msgid "Address"
 msgstr "Cyfeiriad"
 
-#: optuserpage.ui:861
+#: cui/uiconfig/ui/optuserpage.ui:836
 msgctxt "optuserpage|signingkeylabel"
 msgid "OpenPGP signing key:"
 msgstr "Allwedd llofnod OpenPGP:"
 
-#: optuserpage.ui:875
+#: cui/uiconfig/ui/optuserpage.ui:850
 msgctxt "optuserpage|encryptionkeylabel"
 msgid "OpenPGP encryption key:"
 msgstr "Allwedd amgryptio OpenPGP:"
 
-#: optuserpage.ui:908
+#: cui/uiconfig/ui/optuserpage.ui:885
 msgctxt "optuserpage|encrypttoself"
 msgid "When encrypting documents, always encrypt to self"
 msgstr "Wrth amgryptio dogfennau, amgryptio i chi eich hun"
 
-#: optuserpage.ui:930
+#: cui/uiconfig/ui/optuserpage.ui:909
 msgctxt "optuserpage|cryptographylabel"
 msgid "Cryptography"
 msgstr "Cryptograffeg"
 
-#: optviewpage.ui:47
+#: cui/uiconfig/ui/optviewpage.ui:47
 msgctxt "optviewpage|grid3|tooltip_text"
 msgid "Requires restart"
 msgstr "Mae angen ailgychwyn"
 
-#: optviewpage.ui:51
+#: cui/uiconfig/ui/optviewpage.ui:51
 msgctxt "optviewpage|useaccel"
 msgid "Use hard_ware acceleration"
 msgstr "Defnyddio cyflymu c_aledwedd"
 
-#: optviewpage.ui:66
+#: cui/uiconfig/ui/optviewpage.ui:66
 msgctxt "optviewpage|useaa"
 msgid "Use anti-a_liasing"
 msgstr "Defnyddio _llyfnhau"
 
-#: optviewpage.ui:81
+#: cui/uiconfig/ui/optviewpage.ui:81
 msgctxt "optviewpage|useopengl"
 msgid "Use OpenGL for all rendering"
 msgstr "Defnyddiwch OpenGL ar gyfer rendro"
 
-#: optviewpage.ui:95
+#: cui/uiconfig/ui/optviewpage.ui:96
 msgctxt "optviewpage|forceopengl"
 msgid "Ignore OpenGL blacklist"
 msgstr "Anwybyddu rhestr ddu OpenGL"
 
-#: optviewpage.ui:99
+#: cui/uiconfig/ui/optviewpage.ui:101
 msgctxt "optviewpage|forceopengl|tooltip_text"
 msgid "Requires restart. Enabling this may expose driver bugs"
 msgstr "Mae angen ailgychwyn. Mae galluogi hyn yn gallu amlygu gwallau"
 
-#: optviewpage.ui:113
+#: cui/uiconfig/ui/optviewpage.ui:115
 msgctxt "optviewpage|openglenabled"
 msgid "GL is currently enabled."
 msgstr "Mae GL yn weithredol ar hyn o bryd."
 
-#: optviewpage.ui:125
+#: cui/uiconfig/ui/optviewpage.ui:127
 msgctxt "optviewpage|opengldisabled"
 msgid "GL is currently disabled."
 msgstr "Mae GL yn anweithredol ar hyn o bryd."
 
-#: optviewpage.ui:141
+#: cui/uiconfig/ui/optviewpage.ui:143
 msgctxt "optviewpage|label2"
 msgid "Graphics Output"
 msgstr "Allbwn Graffigau"
 
-#: optviewpage.ui:175
+#: cui/uiconfig/ui/optviewpage.ui:177
 msgctxt "optviewpage|label13"
 msgid "Icons in men_us:"
 msgstr "_Eiconau mewn dewislenni:"
 
-#: optviewpage.ui:189
+#: cui/uiconfig/ui/optviewpage.ui:191
 msgctxt "optviewpage|contextmenushortcuts"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: optviewpage.ui:190
+#: cui/uiconfig/ui/optviewpage.ui:192
 msgctxt "optviewpage|contextmenushortcuts"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: optviewpage.ui:191
+#: cui/uiconfig/ui/optviewpage.ui:193
 msgctxt "optviewpage|contextmenushortcuts"
 msgid "Show"
 msgstr "Dangos"
 
-#: optviewpage.ui:204
+#: cui/uiconfig/ui/optviewpage.ui:206
 msgctxt "optviewpage|label10"
 msgid "Shortcuts in context menus:"
 msgstr "Llwybrau byr mewn dewislenni cyd-destun:"
 
-#: optviewpage.ui:218
+#: cui/uiconfig/ui/optviewpage.ui:220
 msgctxt "optviewpage|menuicons"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: optviewpage.ui:219
+#: cui/uiconfig/ui/optviewpage.ui:221
 msgctxt "optviewpage|menuicons"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: optviewpage.ui:220
+#: cui/uiconfig/ui/optviewpage.ui:222
 msgctxt "optviewpage|menuicons"
 msgid "Show"
 msgstr "Dangos"
 
-#: optviewpage.ui:236
+#: cui/uiconfig/ui/optviewpage.ui:238
 msgctxt "optviewpage|label3"
 msgid "Menu"
 msgstr "Dewislen"
 
-#: optviewpage.ui:267
+#: cui/uiconfig/ui/optviewpage.ui:269
 msgctxt "optviewpage|showfontpreview"
 msgid "Show p_review of fonts"
 msgstr "Dangos _rhagolwg ffontiau"
 
-#: optviewpage.ui:288
+#: cui/uiconfig/ui/optviewpage.ui:290
 msgctxt "optviewpage|label5"
 msgid "Font Lists"
 msgstr "Rhestrau Font"
 
-#: optviewpage.ui:343
+#: cui/uiconfig/ui/optviewpage.ui:345
 msgctxt "optviewpage|label8"
 msgid "Toolbar icon _size:"
 msgstr "M_aint eicon y bar offer:"
 
-#: optviewpage.ui:358
+#: cui/uiconfig/ui/optviewpage.ui:360
 msgctxt "optviewpage|iconstyle"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: optviewpage.ui:359
+#: cui/uiconfig/ui/optviewpage.ui:361
 msgctxt "optviewpage|iconstyle"
 msgid "Galaxy"
 msgstr "Galaxy"
 
-#: optviewpage.ui:360
+#: cui/uiconfig/ui/optviewpage.ui:362
 msgctxt "optviewpage|iconstyle"
 msgid "High Contrast"
 msgstr "Cyferbynnedd Uchel"
 
-#: optviewpage.ui:361
-msgctxt "optviewpage|iconstyle"
-msgid "Crystal"
-msgstr "Crisial"
-
-#: optviewpage.ui:362
+#: cui/uiconfig/ui/optviewpage.ui:363
 msgctxt "optviewpage|iconstyle"
 msgid "Tango"
 msgstr "Tango"
 
-#: optviewpage.ui:363
+#: cui/uiconfig/ui/optviewpage.ui:364
 msgctxt "optviewpage|iconstyle"
 msgid "Oxygen"
 msgstr "Ocsigen"
 
-#: optviewpage.ui:364
+#: cui/uiconfig/ui/optviewpage.ui:365
 msgctxt "optviewpage|iconstyle"
 msgid "Classic"
 msgstr "Clasurol"
 
-#: optviewpage.ui:365
+#: cui/uiconfig/ui/optviewpage.ui:366
 msgctxt "optviewpage|iconstyle"
 msgid "Sifr"
 msgstr "Seifr"
 
-#: optviewpage.ui:366
+#: cui/uiconfig/ui/optviewpage.ui:367
 msgctxt "optviewpage|iconstyle"
 msgid "Breeze"
 msgstr "Awel"
 
-#: optviewpage.ui:367
-msgctxt "optviewpage|iconstyle"
-msgid "Tango Testing"
-msgstr "Profi Tango"
-
-#: optviewpage.ui:380
+#: cui/uiconfig/ui/optviewpage.ui:380
 msgctxt "optviewpage|iconsize"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: optviewpage.ui:381
+#: cui/uiconfig/ui/optviewpage.ui:381
 msgctxt "optviewpage|iconsize"
 msgid "Small"
 msgstr "Bach"
 
-#: optviewpage.ui:382
+#: cui/uiconfig/ui/optviewpage.ui:382
 msgctxt "optviewpage|iconsize"
 msgid "Large"
 msgstr "Mawr"
 
-#: optviewpage.ui:383
+#: cui/uiconfig/ui/optviewpage.ui:383
 msgctxt "optviewpage|iconsize"
 msgid "Extra Large"
 msgstr "Mawr Iawn"
 
-#: optviewpage.ui:396
+#: cui/uiconfig/ui/optviewpage.ui:396
 msgctxt "optviewpage|label6"
 msgid "Icon s_tyle:"
 msgstr "_Arddull eicon:"
 
-#: optviewpage.ui:407
+#: cui/uiconfig/ui/optviewpage.ui:407
 msgctxt "optviewpage|aafont"
 msgid "Screen font antialiasin_g"
 msgstr "_Llyfnhau ffont sgrin"
 
-#: optviewpage.ui:425
+#: cui/uiconfig/ui/optviewpage.ui:425
 msgctxt "optviewpage|label9"
 msgid "Sidebar _icon size:"
 msgstr "Maont e-con bar _ochr:"
 
-#: optviewpage.ui:439
+#: cui/uiconfig/ui/optviewpage.ui:439
 msgctxt "optviewpage|sidebariconsize"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: optviewpage.ui:440
+#: cui/uiconfig/ui/optviewpage.ui:440
 msgctxt "optviewpage|sidebariconsize"
 msgid "Small"
 msgstr "Bach"
 
-#: optviewpage.ui:441
+#: cui/uiconfig/ui/optviewpage.ui:441
 msgctxt "optviewpage|sidebariconsize"
 msgid "Large"
 msgstr "Mawr"
 
-#: optviewpage.ui:454
+#: cui/uiconfig/ui/optviewpage.ui:454
 msgctxt "optviewpage|label7"
 msgid "_Notebookbar icon size:"
 msgstr "Maint eicon bar l_lyfr nodiadau:"
 
-#: optviewpage.ui:468
+#: cui/uiconfig/ui/optviewpage.ui:468
 msgctxt "optviewpage|notebookbariconsize"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: optviewpage.ui:469
+#: cui/uiconfig/ui/optviewpage.ui:469
 msgctxt "optviewpage|notebookbariconsize"
 msgid "Small"
 msgstr "Bach"
 
-#: optviewpage.ui:470
+#: cui/uiconfig/ui/optviewpage.ui:470
 msgctxt "optviewpage|notebookbariconsize"
 msgid "Large"
 msgstr "Mawr"
 
-#: optviewpage.ui:489
+#: cui/uiconfig/ui/optviewpage.ui:489
 msgctxt "optviewpage|aafrom"
 msgid "fro_m:"
 msgstr "_oddi wrth:"
 
-#: optviewpage.ui:530
+#: cui/uiconfig/ui/optviewpage.ui:529
 msgctxt "optviewpage|label1"
 msgid "User Interface"
 msgstr "Rhyngwyneb Defnyddiwr"
 
-#: optviewpage.ui:567
+#: cui/uiconfig/ui/optviewpage.ui:566
 msgctxt "optviewpage|label11"
 msgid "Mouse _positioning:"
 msgstr "_Lleoli llygoden:"
 
-#: optviewpage.ui:581
+#: cui/uiconfig/ui/optviewpage.ui:580
 msgctxt "optviewpage|label12"
 msgid "Middle mouse _button:"
 msgstr "_Botwm canol llygoden:"
 
-#: optviewpage.ui:597
+#: cui/uiconfig/ui/optviewpage.ui:596
 msgctxt "optviewpage|mousepos"
 msgid "Default button"
 msgstr "Botwm rhagosodedig"
 
-#: optviewpage.ui:598
+#: cui/uiconfig/ui/optviewpage.ui:597
 msgctxt "optviewpage|mousepos"
 msgid "Dialog center"
 msgstr "Canol deialog"
 
-#: optviewpage.ui:599
+#: cui/uiconfig/ui/optviewpage.ui:598
 msgctxt "optviewpage|mousepos"
 msgid "No automatic positioning"
 msgstr "Dim lleoli awtomatig"
 
-#: optviewpage.ui:614
+#: cui/uiconfig/ui/optviewpage.ui:613
 msgctxt "optviewpage|mousemiddle"
 msgid "No function"
 msgstr "Dim swyddogaeth"
 
-#: optviewpage.ui:615
+#: cui/uiconfig/ui/optviewpage.ui:614
 msgctxt "optviewpage|mousemiddle"
 msgid "Automatic scrolling"
 msgstr "Sgrolio awtomatig"
 
-#: optviewpage.ui:616
+#: cui/uiconfig/ui/optviewpage.ui:615
 msgctxt "optviewpage|mousemiddle"
 msgid "Paste clipboard"
 msgstr "Gludo i'r clipfwrdd"
 
-#: optviewpage.ui:632
+#: cui/uiconfig/ui/optviewpage.ui:631
 msgctxt "optviewpage|label4"
 msgid "Mouse"
 msgstr "Llygoden"
 
-#: pageformatpage.ui:15
+#: cui/uiconfig/ui/pageformatpage.ui:15
 msgctxt "pageformatpage|liststorePageLayout"
 msgid "Right and left"
 msgstr "De a chwith"
 
-#: pageformatpage.ui:19
+#: cui/uiconfig/ui/pageformatpage.ui:19
 msgctxt "pageformatpage|liststorePageLayout"
 msgid "Mirrored"
 msgstr "Drychu"
 
-#: pageformatpage.ui:23
+#: cui/uiconfig/ui/pageformatpage.ui:23
 msgctxt "pageformatpage|liststorePageLayout"
 msgid "Only right"
 msgstr "De yn unig"
 
-#: pageformatpage.ui:27
+#: cui/uiconfig/ui/pageformatpage.ui:27
 msgctxt "pageformatpage|liststorePageLayout"
 msgid "Only left"
 msgstr "Chwith yn unig"
 
-#: pageformatpage.ui:72
+#: cui/uiconfig/ui/pageformatpage.ui:72
 msgctxt "pageformatpage|labelFormat"
 msgid "_Format:"
 msgstr "_Fformat:"
 
-#: pageformatpage.ui:96
+#: cui/uiconfig/ui/pageformatpage.ui:96
 msgctxt "pageformatpage|labelWidth"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: pageformatpage.ui:123
+#: cui/uiconfig/ui/pageformatpage.ui:122
 msgctxt "pageformatpage|labelHeight"
 msgid "_Height:"
 msgstr "_Uchder:"
 
-#: pageformatpage.ui:149
+#: cui/uiconfig/ui/pageformatpage.ui:147
 msgctxt "pageformatpage|labelOrientation"
 msgid "_Orientation:"
 msgstr "_Cyfeiriadedd:"
 
-#: pageformatpage.ui:161
+#: cui/uiconfig/ui/pageformatpage.ui:159
 msgctxt "pageformatpage|radiobuttonPortrait"
 msgid "_Portrait"
 msgstr "_Portread"
 
-#: pageformatpage.ui:182
+#: cui/uiconfig/ui/pageformatpage.ui:180
 msgctxt "pageformatpage|radiobuttonLandscape"
 msgid "L_andscape"
 msgstr "_Tirlun"
 
-#: pageformatpage.ui:205
+#: cui/uiconfig/ui/pageformatpage.ui:203
 msgctxt "pageformatpage|labelTextFlow"
 msgid "_Text direction:"
 msgstr "Cy_feiriad testun:"
 
-#: pageformatpage.ui:266
+#: cui/uiconfig/ui/pageformatpage.ui:264
 msgctxt "pageformatpage|labelPaperTray"
 msgid "Paper _tray:"
 msgstr "_Dror papur:"
 
-#: pageformatpage.ui:302
+#: cui/uiconfig/ui/pageformatpage.ui:300
 msgctxt "pageformatpage|labelPaperFormat"
 msgid "Paper Format"
 msgstr "Fformat Papur"
 
-#: pageformatpage.ui:346
+#: cui/uiconfig/ui/pageformatpage.ui:344
 msgctxt "pageformatpage|labelTopMargin"
 msgid "Top:"
 msgstr "Brig:"
 
-#: pageformatpage.ui:360
+#: cui/uiconfig/ui/pageformatpage.ui:358
 msgctxt "pageformatpage|labelBottomMargin"
 msgid "Bottom:"
 msgstr "Gwaelod:"
 
-#: pageformatpage.ui:423
+#: cui/uiconfig/ui/pageformatpage.ui:417
 msgctxt "pageformatpage|labelRightMargin"
 msgid "Right:"
 msgstr "De:"
 
-#: pageformatpage.ui:437
+#: cui/uiconfig/ui/pageformatpage.ui:431
 msgctxt "pageformatpage|labelOuter"
 msgid "O_uter:"
 msgstr "_Allanol:"
 
-#: pageformatpage.ui:463
+#: cui/uiconfig/ui/pageformatpage.ui:457
 msgctxt "pageformatpage|labelLeftMargin"
 msgid "Left:"
 msgstr "Chwith:"
 
-#: pageformatpage.ui:477
+#: cui/uiconfig/ui/pageformatpage.ui:471
 msgctxt "pageformatpage|labelInner"
 msgid "I_nner:"
 msgstr "_Mewnol:"
 
-#: pageformatpage.ui:502
+#: cui/uiconfig/ui/pageformatpage.ui:496
 msgctxt "pageformatpage|labelMargins"
 msgid "Margins"
 msgstr "Ymylon"
 
-#: pageformatpage.ui:539
+#: cui/uiconfig/ui/pageformatpage.ui:533
 msgctxt "pageformatpage|labelPageLayout"
 msgid "_Page layout:"
 msgstr "Cynllun _tudalen:"
 
-#: pageformatpage.ui:554
+#: cui/uiconfig/ui/pageformatpage.ui:548
 msgctxt "pageformatpage|label4"
 msgid "Page numbers:"
 msgstr "Rhif tudalen:"
 
-#: pageformatpage.ui:566
+#: cui/uiconfig/ui/pageformatpage.ui:560
 msgctxt "pageformatpage|checkRegisterTrue"
 msgid "Register-tr_ue"
 msgstr "Register-tr_ue"
 
-#: pageformatpage.ui:606
+#: cui/uiconfig/ui/pageformatpage.ui:600
 msgctxt "pageformatpage|labelTblAlign"
 msgid "Table alignment:"
 msgstr "Aliniad tabl:"
 
-#: pageformatpage.ui:618
+#: cui/uiconfig/ui/pageformatpage.ui:612
 msgctxt "pageformatpage|checkbuttonHorz"
 msgid "Hori_zontal"
 msgstr "Llo_rweddol"
 
-#: pageformatpage.ui:633
+#: cui/uiconfig/ui/pageformatpage.ui:627
 msgctxt "pageformatpage|checkbuttonVert"
 msgid "_Vertical"
 msgstr "_Fertigol"
 
-#: pageformatpage.ui:648
+#: cui/uiconfig/ui/pageformatpage.ui:642
 msgctxt "pageformatpage|checkAdaptBox"
 msgid "_Fit object to paper format"
 msgstr "_Ffitio'r gwrthrych i fformat papur"
 
-#: pageformatpage.ui:679
+#: cui/uiconfig/ui/pageformatpage.ui:673
 msgctxt "pageformatpage|labelRegisterStyle"
 msgid "Reference _Style:"
 msgstr "Arddull _Cyfeirio:"
 
-#: pageformatpage.ui:721
+#: cui/uiconfig/ui/pageformatpage.ui:715
 msgctxt "pageformatpage|label5"
 msgid "Layout Settings"
 msgstr "Gosodiadau Cynllun"
 
-#: pageformatpage.ui:742
+#: cui/uiconfig/ui/pageformatpage.ui:736
 msgctxt "pageformatpage|labelMsg"
 msgid ""
 "The margin settings are out of print range.\n"
@@ -9238,2293 +9292,2402 @@ msgstr ""
 "\n"
 "Ydych chi am osod y gosodiadau hyn ohyd?"
 
-#: paragalignpage.ui:15
-#: /home/cl/vc/git/libo-core/cui/uiconfig/ui/paragalignpage.ui:19
+#: cui/uiconfig/ui/paragalignpage.ui:15 cui/uiconfig/ui/paragalignpage.ui:19
 msgctxt "paragalignpage|liststoreLB_LASTLINE"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: paragalignpage.ui:23
+#: cui/uiconfig/ui/paragalignpage.ui:23
 msgctxt "paragalignpage|liststoreLB_LASTLINE"
 msgid "Centered"
 msgstr "Canolwyd"
 
-#: paragalignpage.ui:27
+#: cui/uiconfig/ui/paragalignpage.ui:27
 msgctxt "paragalignpage|liststoreLB_LASTLINE"
 msgid "Justified"
 msgstr "Unioni"
 
-#: paragalignpage.ui:41
+#: cui/uiconfig/ui/paragalignpage.ui:41
 msgctxt "paragalignpage|liststoreLB_VERTALIGN"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: paragalignpage.ui:45
+#: cui/uiconfig/ui/paragalignpage.ui:45
 msgctxt "paragalignpage|liststoreLB_VERTALIGN"
 msgid "Base line"
 msgstr "Llinell sail"
 
-#: paragalignpage.ui:49
+#: cui/uiconfig/ui/paragalignpage.ui:49
 msgctxt "paragalignpage|liststoreLB_VERTALIGN"
 msgid "Top"
 msgstr "Brig"
 
-#: paragalignpage.ui:53
+#: cui/uiconfig/ui/paragalignpage.ui:53
 msgctxt "paragalignpage|liststoreLB_VERTALIGN"
 msgid "Middle"
 msgstr "Canol"
 
-#: paragalignpage.ui:57
+#: cui/uiconfig/ui/paragalignpage.ui:57
 msgctxt "paragalignpage|liststoreLB_VERTALIGN"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: paragalignpage.ui:85
+#: cui/uiconfig/ui/paragalignpage.ui:85
 msgctxt "paragalignpage|drawingareaWN_EXAMPLE-atkobject"
 msgid "Example"
 msgstr "Esiampl"
 
-#: paragalignpage.ui:120
+#: cui/uiconfig/ui/paragalignpage.ui:120
 msgctxt "paragalignpage|radioBTN_LEFTALIGN"
 msgid "_Left"
 msgstr "_Chwith"
 
-#: paragalignpage.ui:136
+#: cui/uiconfig/ui/paragalignpage.ui:136
 msgctxt "paragalignpage|radioBTN_RIGHTALIGN"
 msgid "_Right"
 msgstr "_De"
 
-#: paragalignpage.ui:152
+#: cui/uiconfig/ui/paragalignpage.ui:152
 msgctxt "paragalignpage|radioBTN_CENTERALIGN"
 msgid "_Center"
 msgstr "_Canol"
 
-#: paragalignpage.ui:169
+#: cui/uiconfig/ui/paragalignpage.ui:169
 msgctxt "paragalignpage|radioBTN_JUSTIFYALIGN"
 msgid "_Justified"
 msgstr "_Unioni"
 
-#: paragalignpage.ui:185
+#: cui/uiconfig/ui/paragalignpage.ui:185
 msgctxt "paragalignpage|checkCB_EXPAND"
 msgid "_Expand single word"
 msgstr "_Ehangu gair unigol"
 
-#: paragalignpage.ui:202
+#: cui/uiconfig/ui/paragalignpage.ui:202
 msgctxt "paragalignpage|checkCB_SNAP"
 msgid "_Snap to text grid (if active)"
 msgstr "_Snapio i'r grid testun (os yn weithredol)"
 
-#: paragalignpage.ui:233
+#: cui/uiconfig/ui/paragalignpage.ui:233
 msgctxt "paragalignpage|labelLB_LASTLINE"
 msgid "_Last line:"
 msgstr "Llinell _olaf:"
 
-#: paragalignpage.ui:277
+#: cui/uiconfig/ui/paragalignpage.ui:277
 msgctxt "paragalignpage|labelST_RIGHTALIGN_ASIAN"
 msgid "Righ_t/Bottom"
 msgstr "_De/Gwaelod"
 
-#: paragalignpage.ui:290
+#: cui/uiconfig/ui/paragalignpage.ui:290
 msgctxt "paragalignpage|labelST_LEFTALIGN_ASIAN"
 msgid "_Left/Top"
 msgstr "_Chwith/Brig"
 
-#: paragalignpage.ui:313
+#: cui/uiconfig/ui/paragalignpage.ui:313
 msgctxt "paragalignpage|label1"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: paragalignpage.ui:347
+#: cui/uiconfig/ui/paragalignpage.ui:347
 msgctxt "paragalignpage|labelFT_VERTALIGN"
 msgid "_Alignment:"
 msgstr "A_liniad:"
 
-#: paragalignpage.ui:378
+#: cui/uiconfig/ui/paragalignpage.ui:378
 msgctxt "paragalignpage|labelFL_VERTALIGN"
 msgid "Text-to-text"
 msgstr "Testun i destun"
 
-#: paragalignpage.ui:412
+#: cui/uiconfig/ui/paragalignpage.ui:412
 msgctxt "paragalignpage|label2"
 msgid "_Text direction:"
 msgstr "_Cyfeiriad testun:"
 
-#: paragalignpage.ui:444
+#: cui/uiconfig/ui/paragalignpage.ui:444
 msgctxt "paragalignpage|labelFL_PROPERTIES"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: paraindentspacing.ui:37
+#: cui/uiconfig/ui/paraindentspacing.ui:37
 msgctxt "paraindentspacing|liststoreLB_LINEDIST"
 msgid "Single"
 msgstr "Sengl"
 
-#: paraindentspacing.ui:41
+#: cui/uiconfig/ui/paraindentspacing.ui:41
 msgctxt "paraindentspacing|liststoreLB_LINEDIST"
 msgid "1.15 Lines"
 msgstr "1.15 Llinell"
 
-#: paraindentspacing.ui:45
+#: cui/uiconfig/ui/paraindentspacing.ui:45
 msgctxt "paraindentspacing|liststoreLB_LINEDIST"
 msgid "1.5 Lines"
 msgstr "1.5 Llinell"
 
-#: paraindentspacing.ui:49
+#: cui/uiconfig/ui/paraindentspacing.ui:49
 msgctxt "paraindentspacing|liststoreLB_LINEDIST"
 msgid "Double"
 msgstr "Dwbl"
 
-#: paraindentspacing.ui:53
+#: cui/uiconfig/ui/paraindentspacing.ui:53
 msgctxt "paraindentspacing|liststoreLB_LINEDIST"
 msgid "Proportional"
 msgstr "Cymesur"
 
-#: paraindentspacing.ui:57
+#: cui/uiconfig/ui/paraindentspacing.ui:57
 msgctxt "paraindentspacing|liststoreLB_LINEDIST"
 msgid "At least"
 msgstr "O leiaf"
 
-#: paraindentspacing.ui:61
+#: cui/uiconfig/ui/paraindentspacing.ui:61
 msgctxt "paraindentspacing|liststoreLB_LINEDIST"
 msgid "Leading"
 msgstr "Arwain"
 
-#: paraindentspacing.ui:91
+#: cui/uiconfig/ui/paraindentspacing.ui:91
 msgctxt "paraindentspacing|drawingareaWN_EXAMPLE-atkobject"
 msgid "Example"
 msgstr "Esiampl"
 
-#: paraindentspacing.ui:129
+#: cui/uiconfig/ui/paraindentspacing.ui:129
 msgctxt "paraindentspacing|labelFT_LEFTINDENT"
 msgid "_Before text:"
 msgstr "_Cyn y testun:"
 
-#: paraindentspacing.ui:143
+#: cui/uiconfig/ui/paraindentspacing.ui:143
 msgctxt "paraindentspacing|labelFT_RIGHTINDENT"
 msgid "After _text:"
 msgstr "Ar ôl y _testun:"
 
-#: paraindentspacing.ui:157
+#: cui/uiconfig/ui/paraindentspacing.ui:157
 msgctxt "paraindentspacing|labelFT_FLINEINDENT"
 msgid "_First line:"
 msgstr "Llinell _gyntaf:"
 
-#: paraindentspacing.ui:169
+#: cui/uiconfig/ui/paraindentspacing.ui:169
 msgctxt "paraindentspacing|checkCB_AUTO"
 msgid "_Automatic"
 msgstr "_Awtomatig"
 
-#: paraindentspacing.ui:221
+#: cui/uiconfig/ui/paraindentspacing.ui:218
 msgctxt "paraindentspacing|labelST_LINEDIST_ABS"
 msgid "Fixed"
 msgstr "Gosodedig"
 
-#: paraindentspacing.ui:236
+#: cui/uiconfig/ui/paraindentspacing.ui:233
 msgctxt "paraindentspacing|label1"
 msgid "Indent"
 msgstr "Mewnoliad"
 
-#: paraindentspacing.ui:276
+#: cui/uiconfig/ui/paraindentspacing.ui:273
 msgctxt "paraindentspacing|labelFT_TOPDIST"
 msgid "Ab_ove paragraph:"
 msgstr "_Uwchlaw'r paragraff:"
 
-#: paraindentspacing.ui:290
+#: cui/uiconfig/ui/paraindentspacing.ui:287
 msgctxt "paraindentspacing|labelFT_BOTTOMDIST"
 msgid "Below _paragraph:"
 msgstr "_Islaw'r paragraff:"
 
-#: paraindentspacing.ui:333
+#: cui/uiconfig/ui/paraindentspacing.ui:328
 msgctxt "paraindentspacing|checkCB_CONTEXTUALSPACING"
 msgid "Don't add space between paragraphs of the same style"
 msgstr "Peidio ychwanegu bwlch rhwng paragraffau o'r un arddull"
 
-#: paraindentspacing.ui:354
+#: cui/uiconfig/ui/paraindentspacing.ui:350
 msgctxt "paraindentspacing|labelFL_VERTALIGN"
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: paraindentspacing.ui:404
+#: cui/uiconfig/ui/paraindentspacing.ui:400
 msgctxt "paraindentspacing|labelFT_LINEDIST"
 msgid "of"
 msgstr "o"
 
-#: paraindentspacing.ui:464
+#: cui/uiconfig/ui/paraindentspacing.ui:458
 msgctxt "paraindentspacing|labelFL_PROPERTIES"
 msgid "Line Spacing"
 msgstr "Bylchu Llinell"
 
-#: paraindentspacing.ui:489
+#: cui/uiconfig/ui/paraindentspacing.ui:483
 msgctxt "paraindentspacing|checkCB_REGISTER"
 msgid "A_ctivate"
 msgstr "C_ychwyn"
 
-#: paraindentspacing.ui:503
+#: cui/uiconfig/ui/paraindentspacing.ui:497
 msgctxt "paraindentspacing|label3"
 msgid "Register-true"
 msgstr "Cofrestr cywir"
 
-#: paratabspage.ui:49
+#: cui/uiconfig/ui/paratabspage.ui:49
 msgctxt "paratabspage|label1"
 msgid "Position"
 msgstr "Safle"
 
-#: paratabspage.ui:84
+#: cui/uiconfig/ui/paratabspage.ui:84
 msgctxt "paratabspage|radiobuttonBTN_TABTYPE_DECIMAL"
 msgid "Deci_mal"
 msgstr "_Degol"
 
-#: paratabspage.ui:157
+#: cui/uiconfig/ui/paratabspage.ui:156
 msgctxt "paratabspage|radiobuttonBTN_TABTYPE_LEFT"
 msgid "_Left"
 msgstr "_Chwith"
 
-#: paratabspage.ui:174
+#: cui/uiconfig/ui/paratabspage.ui:173
 msgctxt "paratabspage|radiobuttonST_LEFTTAB_ASIAN"
 msgid "_Left/Top"
 msgstr "_Chwith/Brig"
 
-#: paratabspage.ui:201
+#: cui/uiconfig/ui/paratabspage.ui:200
 msgctxt "paratabspage|radiobuttonBTN_TABTYPE_RIGHT"
 msgid "Righ_t"
 msgstr "_De"
 
-#: paratabspage.ui:217
+#: cui/uiconfig/ui/paratabspage.ui:216
 msgctxt "paratabspage|radiobuttonST_RIGHTTAB_ASIAN"
 msgid "Righ_t/Bottom"
 msgstr "_De/Gwaelod"
 
-#: paratabspage.ui:239
+#: cui/uiconfig/ui/paratabspage.ui:238
 msgctxt "paratabspage|radiobuttonBTN_TABTYPE_CENTER"
 msgid "C_entered"
 msgstr "C­_anoli"
 
-#: paratabspage.ui:263
+#: cui/uiconfig/ui/paratabspage.ui:262
 msgctxt "paratabspage|labelFT_TABTYPE_DECCHAR"
 msgid "_Character"
 msgstr "_Nod"
 
-#: paratabspage.ui:283
+#: cui/uiconfig/ui/paratabspage.ui:282
 msgctxt "paratabspage|label2"
 msgid "Type"
 msgstr "Math"
 
-#: paratabspage.ui:317
+#: cui/uiconfig/ui/paratabspage.ui:316
 msgctxt "paratabspage|radiobuttonBTN_FILLCHAR_NO"
 msgid "N_one"
 msgstr "_Dim"
 
-#: paratabspage.ui:385
+#: cui/uiconfig/ui/paratabspage.ui:384
 msgctxt "paratabspage|radiobuttonBTN_FILLCHAR_OTHER"
 msgid "C_haracter"
 msgstr "_Nod"
 
-#: paratabspage.ui:425
+#: cui/uiconfig/ui/paratabspage.ui:423
 msgctxt "paratabspage|label3"
 msgid "Fill Character"
 msgstr "Nod Llanw"
 
-#: paratabspage.ui:463
+#: cui/uiconfig/ui/paratabspage.ui:461
 msgctxt "paratabspage|buttonBTN_DELALL"
 msgid "Delete _all"
 msgstr "Dileu _popeth"
 
-#: paratabspage.ui:492
+#: cui/uiconfig/ui/paratabspage.ui:490
 msgctxt "paratabspage|label4"
 msgid "points"
 msgstr "pwyntiau"
 
-#: paratabspage.ui:505
+#: cui/uiconfig/ui/paratabspage.ui:503
 msgctxt "paratabspage|label5"
 msgid "dashes"
 msgstr "toriad"
 
-#: paratabspage.ui:518
+#: cui/uiconfig/ui/paratabspage.ui:516
 msgctxt "paratabspage|label6"
 msgid "underscores"
 msgstr "tanlinellau"
 
-#: password.ui:8
+#: cui/uiconfig/ui/password.ui:8
 msgctxt "password|PasswordDialog"
 msgid "Set Password"
 msgstr "Gosod Cyfrinair"
 
-#: password.ui:90
+#: cui/uiconfig/ui/password.ui:92
 msgctxt "password|label5"
 msgid "Confirm password"
 msgstr "Cadarnhau'r cyfrinair"
 
-#: password.ui:106
+#: cui/uiconfig/ui/password.ui:106
 msgctxt "password|label4"
 msgid "_Enter password to open"
 msgstr "_Rhowch gyfrinair i'w hagor"
 
-#: password.ui:150
+#: cui/uiconfig/ui/password.ui:149
 msgctxt "password|label1"
 msgid "Note: After a password has been set, the document will only open with the password. Should you lose the password, there will be no way to recover the document. Please also note that this password is case-sensitive."
 msgstr "Nodyn: Ar ôl i gyfrinair gael e osod, dim ond gyda chyfrinair y bydd modd agor y ddogfen. Os fyddwch yn colli'r cyfrinair ni bydd modd adfer y ddogfen. Cofiwch fod y cyfrinair yn ymwybodol o faint nodau."
 
-#: password.ui:185
+#: cui/uiconfig/ui/password.ui:183
 msgctxt "password|readonly"
 msgid "Open file read-only"
 msgstr "Ffeil agored yn un darllen yn unig"
 
-#: password.ui:204
+#: cui/uiconfig/ui/password.ui:200
 msgctxt "password|label7"
 msgid "Enter password to allow editing"
 msgstr "Rhowch gyfrinair i ganiatáu golygu"
 
-#: password.ui:234
+#: cui/uiconfig/ui/password.ui:228
 msgctxt "password|label8"
 msgid "Confirm password"
 msgstr "Cadarnhau'r cyfrinair"
 
-#: password.ui:267
+#: cui/uiconfig/ui/password.ui:260
 msgctxt "password|label6"
 msgid "File Sharing Password"
 msgstr "Cyfrinair Rhannu Ffeiliau"
 
-#: password.ui:279
+#: cui/uiconfig/ui/password.ui:272
 msgctxt "password|label3"
 msgid "_Options"
 msgstr "_Dewisiadau"
 
-#: password.ui:299
+#: cui/uiconfig/ui/password.ui:290
 msgctxt "password|label2"
 msgid "File Encryption Password"
 msgstr "Cyfrinair Amgryptio Ffeiliau"
 
-#: pastespecial.ui:7
+#: cui/uiconfig/ui/pastespecial.ui:16
 msgctxt "pastespecial|PasteSpecialDialog"
 msgid "Paste Special"
 msgstr "Gludo Arbennig"
 
-#: pastespecial.ui:87
+#: cui/uiconfig/ui/pastespecial.ui:100
 msgctxt "pastespecial|label2"
 msgid "Source:"
 msgstr "Ffynhonnell:"
 
-#: pastespecial.ui:157
+#: cui/uiconfig/ui/pastespecial.ui:184
 msgctxt "pastespecial|label1"
 msgid "Selection"
 msgstr "Dewis"
 
-#: patterntabpage.ui:65
+#: cui/uiconfig/ui/patterntabpage.ui:65
 msgctxt "patterntabpage|BTN_MODIFY"
 msgid "_Modify"
 msgstr "_Newid"
 
-#: patterntabpage.ui:92
+#: cui/uiconfig/ui/patterntabpage.ui:92
 msgctxt "patterntabpage|label3"
 msgid "Pattern"
 msgstr "Patrwm"
 
-#: patterntabpage.ui:135
+#: cui/uiconfig/ui/patterntabpage.ui:135
 msgctxt "patterntabpage|label4"
 msgid "Pattern Editor:"
 msgstr "Golygydd Patrwm:"
 
-#: patterntabpage.ui:151
+#: cui/uiconfig/ui/patterntabpage.ui:151
 msgctxt "patterntabpage|CTL_PIXEL-atkobject"
 msgid "Pattern Editor"
 msgstr "Golygydd Patrwm"
 
-#: patterntabpage.ui:179
+#: cui/uiconfig/ui/patterntabpage.ui:179
 msgctxt "patterntabpage|label5"
 msgid "Foreground Color:"
 msgstr "Lliw Blaendir:"
 
-#: patterntabpage.ui:217
+#: cui/uiconfig/ui/patterntabpage.ui:217
 msgctxt "patterntabpage|label6"
 msgid "Background Color:"
 msgstr "Lliw Cefndir:"
 
-#: patterntabpage.ui:252
+#: cui/uiconfig/ui/patterntabpage.ui:252
 msgctxt "patterntabpage|label1"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: patterntabpage.ui:295
+#: cui/uiconfig/ui/patterntabpage.ui:295
 msgctxt "patterntabpage|CTL_PREVIEW-atkobject"
 msgid "Example"
 msgstr "Enghraifft"
 
-#: patterntabpage.ui:313
+#: cui/uiconfig/ui/patterntabpage.ui:313
 msgctxt "patterntabpage|label2"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: percentdialog.ui:13
+#: cui/uiconfig/ui/percentdialog.ui:14
 msgctxt "percentdialog|PercentDialog"
 msgid "Combine"
 msgstr "Cyfuno"
 
-#: percentdialog.ui:94
+#: cui/uiconfig/ui/percentdialog.ui:98
 msgctxt "percentdialog|label1"
 msgid "Minimum Size"
 msgstr "Maint Lleiaf"
 
-#: personalization_tab.ui:31
+#: cui/uiconfig/ui/personalization_tab.ui:31
 msgctxt "personalization_tab|no_persona"
 msgid "Default look, do not use Themes"
 msgstr "Golwg plaen, peidio defnyddio Thema"
 
-#: personalization_tab.ui:47
+#: cui/uiconfig/ui/personalization_tab.ui:48
 msgctxt "personalization_tab|default_persona"
 msgid "Pre-installed Theme (if available)"
 msgstr "Thema Rhagosodwyd (os ar gael)"
 
-#: personalization_tab.ui:119
+#: cui/uiconfig/ui/personalization_tab.ui:121
 msgctxt "personalization_tab|own_persona"
 msgid "Own Theme"
 msgstr "Thema Bersonol"
 
-#: personalization_tab.ui:146
+#: cui/uiconfig/ui/personalization_tab.ui:149
 msgctxt "personalization_tab|select_persona"
 msgid "Select Theme"
 msgstr "Dewis Thema"
 
-#: personalization_tab.ui:168
+#: cui/uiconfig/ui/personalization_tab.ui:171
 msgctxt "personalization_tab|extensions_label"
 msgid "Or, select from the Themes installed via extensions:"
 msgstr "Neu dewis o'r Themâu sydd wedi eu gosod drwy estyniadau:"
 
-#: personalization_tab.ui:220
+#: cui/uiconfig/ui/personalization_tab.ui:223
 msgctxt "personalization_tab|personas_label"
 msgid "Firefox Themes"
 msgstr "Thema Firefox"
 
-#: pickbulletpage.ui:34
+#: cui/uiconfig/ui/pickbulletpage.ui:34
 msgctxt "pickbulletpage|label25"
 msgid "Selection"
 msgstr "Dewis"
 
-#: pickgraphicpage.ui:45
+#: cui/uiconfig/ui/pickgraphicpage.ui:45
 msgctxt "pickgraphicpage|errorft"
 msgid "The Gallery theme 'Bullets' is empty (no images)."
 msgstr "Mae'r thema Oriel 'Bwledi' yn wag (dim graffeg)."
 
-#: pickgraphicpage.ui:57
+#: cui/uiconfig/ui/pickgraphicpage.ui:57
 msgctxt "pickgraphicpage|browseBtn"
 msgid "Add and Resize"
 msgstr "Ychwanegu a Newid Maint"
 
-#: pickgraphicpage.ui:75
+#: cui/uiconfig/ui/pickgraphicpage.ui:75
 msgctxt "pickgraphicpage|label25"
 msgid "Selection"
 msgstr "Dewis"
 
-#: picknumberingpage.ui:34
+#: cui/uiconfig/ui/picknumberingpage.ui:34
 msgctxt "picknumberingpage|label25"
 msgid "Selection"
 msgstr "Dewis"
 
-#: pickoutlinepage.ui:34
+#: cui/uiconfig/ui/pickoutlinepage.ui:34
 msgctxt "pickoutlinepage|label25"
 msgid "Selection"
 msgstr "Dewis"
 
-#: positionpage.ui:57
+#: cui/uiconfig/ui/positionpage.ui:57
 msgctxt "positionpage|superscript"
 msgid "Superscript"
 msgstr "Uwchysgrif"
 
-#: positionpage.ui:73
+#: cui/uiconfig/ui/positionpage.ui:74
 msgctxt "positionpage|normal"
 msgid "Normal"
 msgstr "Normal"
 
-#: positionpage.ui:89
+#: cui/uiconfig/ui/positionpage.ui:91
 msgctxt "positionpage|subscript"
 msgid "Subscript"
 msgstr "Isysgrif"
 
-#: positionpage.ui:121
+#: cui/uiconfig/ui/positionpage.ui:124
 msgctxt "positionpage|raiselower"
 msgid "Raise/lower by"
 msgstr "Codi/gostwng yn ôl"
 
-#: positionpage.ui:157
+#: cui/uiconfig/ui/positionpage.ui:158
 msgctxt "positionpage|automatic"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: positionpage.ui:173
+#: cui/uiconfig/ui/positionpage.ui:175
 msgctxt "positionpage|relativefontsize"
 msgid "Relative font size"
 msgstr "Maint ffont perthynol"
 
-#: positionpage.ui:201
+#: cui/uiconfig/ui/positionpage.ui:203
 msgctxt "positionpage|label20"
 msgid "Position"
 msgstr "Safle"
 
-#: positionpage.ui:239
+#: cui/uiconfig/ui/positionpage.ui:241
 msgctxt "positionpage|0deg"
 msgid "0 degrees"
 msgstr "0 gradd"
 
-#: positionpage.ui:255
+#: cui/uiconfig/ui/positionpage.ui:258
 msgctxt "positionpage|90deg"
 msgid "90 degrees"
 msgstr "90 gradd"
 
-#: positionpage.ui:271
+#: cui/uiconfig/ui/positionpage.ui:275
 msgctxt "positionpage|270deg"
 msgid "270 degrees"
 msgstr "270 gradd"
 
-#: positionpage.ui:287
+#: cui/uiconfig/ui/positionpage.ui:292
 msgctxt "positionpage|fittoline"
 msgid "Fit to line"
 msgstr "Ffitio i'r linell"
 
-#: positionpage.ui:316
+#: cui/uiconfig/ui/positionpage.ui:322
 msgctxt "positionpage|label24"
 msgid "Scale width"
 msgstr "Graddio lled"
 
-#: positionpage.ui:359
+#: cui/uiconfig/ui/positionpage.ui:364
 msgctxt "positionpage|rotateandscale"
 msgid "Rotation / Scaling"
 msgstr "Troi / Graddio"
 
-#: positionpage.ui:375
+#: cui/uiconfig/ui/positionpage.ui:380
 msgctxt "positionpage|scale"
 msgid "Scaling"
 msgstr "Graddio"
 
-#: positionpage.ui:428
+#: cui/uiconfig/ui/positionpage.ui:432
 msgctxt "positionpage|pairkerning"
 msgid "Pair kerning"
 msgstr "Gorgyffwrdd par"
 
-#: positionpage.ui:449
+#: cui/uiconfig/ui/positionpage.ui:454
 msgctxt "positionpage|label22"
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: positionpage.ui:478
+#: cui/uiconfig/ui/positionpage.ui:483
 msgctxt "positionpage|preview-atkobject"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: positionsizedialog.ui:8
+#: cui/uiconfig/ui/positionsizedialog.ui:8
 msgctxt "positionsizedialog|PositionAndSizeDialog"
 msgid "Position and Size"
 msgstr "Safle a maint"
 
-#: positionsizedialog.ui:107
+#: cui/uiconfig/ui/positionsizedialog.ui:107
 msgctxt "positionsizedialog|RID_SVXPAGE_POSITION_SIZE"
 msgid "Position and Size"
 msgstr "Safle a maint"
 
-#: positionsizedialog.ui:129
+#: cui/uiconfig/ui/positionsizedialog.ui:129
 msgctxt "positionsizedialog|RID_SVXPAGE_SWPOSSIZE"
 msgid "Position and Size"
 msgstr "Safle a Maint"
 
-#: positionsizedialog.ui:152
+#: cui/uiconfig/ui/positionsizedialog.ui:152
 msgctxt "positionsizedialog|RID_SVXPAGE_ANGLE"
 msgid "Rotation"
 msgstr "Cylchdro"
 
-#: positionsizedialog.ui:175
+#: cui/uiconfig/ui/positionsizedialog.ui:175
 msgctxt "positionsizedialog|RID_SVXPAGE_SLANT"
 msgid "Slant & Corner Radius"
 msgstr "Radiws Goleddf a Chornel"
 
-#: possizetabpage.ui:40
+#: cui/uiconfig/ui/possizetabpage.ui:40
 msgctxt "possizetabpage|FT_POS_X"
 msgid "Position _X:"
 msgstr "Safle _X:"
 
-#: possizetabpage.ui:56
+#: cui/uiconfig/ui/possizetabpage.ui:56
 msgctxt "possizetabpage|FT_POS_Y"
 msgid "Position _Y:"
 msgstr "Safle _Y:"
 
-#: possizetabpage.ui:112
+#: cui/uiconfig/ui/possizetabpage.ui:110
 msgctxt "possizetabpage|FT_POSREFERENCE"
 msgid "_Base point:"
 msgstr "Pwynt _sail:"
 
-#: possizetabpage.ui:150
+#: cui/uiconfig/ui/possizetabpage.ui:148
 msgctxt "possizetabpage|label1"
 msgid "Position"
 msgstr "Safle"
 
-#: possizetabpage.ui:192
+#: cui/uiconfig/ui/possizetabpage.ui:190
 msgctxt "possizetabpage|FT_WIDTH"
 msgid "Wi_dth:"
 msgstr "_Lled:"
 
-#: possizetabpage.ui:208
+#: cui/uiconfig/ui/possizetabpage.ui:206
 msgctxt "possizetabpage|FT_HEIGHT"
 msgid "H_eight:"
 msgstr "_Uchder:"
 
-#: possizetabpage.ui:251
+#: cui/uiconfig/ui/possizetabpage.ui:247
 msgctxt "possizetabpage|CBX_SCALE"
 msgid "_Keep ratio"
 msgstr "_Cadw graddfa"
 
-#: possizetabpage.ui:283
+#: cui/uiconfig/ui/possizetabpage.ui:279
 msgctxt "possizetabpage|FT_SIZEREFERENCE"
 msgid "Base _point:"
 msgstr "Pwynt _sail:"
 
-#: possizetabpage.ui:321
+#: cui/uiconfig/ui/possizetabpage.ui:317
 msgctxt "possizetabpage|label2"
 msgid "Size"
 msgstr "Maint"
 
-#: possizetabpage.ui:360
+#: cui/uiconfig/ui/possizetabpage.ui:356
 msgctxt "possizetabpage|TSB_POSPROTECT"
 msgid "Positio_n"
 msgstr "S_afle"
 
-#: possizetabpage.ui:377
+#: cui/uiconfig/ui/possizetabpage.ui:373
 msgctxt "possizetabpage|TSB_SIZEPROTECT"
 msgid "_Size"
 msgstr "_Maint"
 
-#: possizetabpage.ui:401
+#: cui/uiconfig/ui/possizetabpage.ui:397
 msgctxt "possizetabpage|label3"
 msgid "Protect"
 msgstr "Digelu"
 
-#: possizetabpage.ui:434
+#: cui/uiconfig/ui/possizetabpage.ui:430
 msgctxt "possizetabpage|TSB_AUTOGROW_WIDTH"
 msgid "_Fit width to text"
 msgstr "Ffitio'r _led i'r testun"
 
-#: possizetabpage.ui:451
+#: cui/uiconfig/ui/possizetabpage.ui:447
 msgctxt "possizetabpage|TSB_AUTOGROW_HEIGHT"
 msgid "Fit _height to text"
 msgstr "Ffitio'r _uchder i'r testun"
 
-#: possizetabpage.ui:475
+#: cui/uiconfig/ui/possizetabpage.ui:471
 msgctxt "possizetabpage|label4"
 msgid "Adapt"
 msgstr "Addasu"
 
-#: posterdialog.ui:16
+#: cui/uiconfig/ui/posterdialog.ui:16
 msgctxt "posterdialog|PosterDialog"
 msgid "Posterize"
 msgstr "UPostereiddio"
 
-#: posterdialog.ui:136
+#: cui/uiconfig/ui/posterdialog.ui:136
 msgctxt "posterdialog|label2"
 msgid "Poster colors:"
 msgstr "Lliwiau poster:"
 
-#: posterdialog.ui:159
+#: cui/uiconfig/ui/posterdialog.ui:159
 msgctxt "posterdialog|label1"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: querychangelineenddialog.ui:8
+#: cui/uiconfig/ui/querychangelineenddialog.ui:7
 msgctxt "querychangelineenddialog|AskChangeLineEndDialog"
 msgid "Save Arrowhead?"
 msgstr "Cadw'r Pen Saeth?"
 
-#: querychangelineenddialog.ui:14
+#: cui/uiconfig/ui/querychangelineenddialog.ui:14
 msgctxt "querychangelineenddialog|AskChangeLineEndDialog"
 msgid "The arrowhead was modified without saving."
 msgstr "Cafodd y pen saeth ei newid heb ei gadw."
 
-#: querychangelineenddialog.ui:15
+#: cui/uiconfig/ui/querychangelineenddialog.ui:15
 msgctxt "querychangelineenddialog|AskChangeLineEndDialog"
 msgid "Would you like to save the arrowhead now?"
 msgstr "Hoffech chi gadw'r pen saeth?"
 
-#: querydeletebitmapdialog.ui:8
+#: cui/uiconfig/ui/querydeletebitmapdialog.ui:7
 msgctxt "querydeletebitmapdialog|AskDelBitmapDialog"
 msgid "Delete Bitmap?"
 msgstr "Dileu'r Didfap?"
 
-#: querydeletebitmapdialog.ui:14
+#: cui/uiconfig/ui/querydeletebitmapdialog.ui:14
 msgctxt "querydeletebitmapdialog|AskDelBitmapDialog"
 msgid "Are you sure you want to delete the bitmap?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r didfap?"
 
-#: querydeletechartcolordialog.ui:8
+#: cui/uiconfig/ui/querydeletechartcolordialog.ui:7
 msgctxt "querydeletechartcolordialog|QueryDeleteChartColorDialog"
 msgid "Delete Color?"
 msgstr "Dileu'r Lliw?"
 
-#: querydeletechartcolordialog.ui:14
+#: cui/uiconfig/ui/querydeletechartcolordialog.ui:14
 msgctxt "querydeletechartcolordialog|QueryDeleteChartColorDialog"
 msgid "Do you really want to delete the chart color?"
 msgstr "Ydych chi wir eisiau dileu'r siart lliw?"
 
-#: querydeletechartcolordialog.ui:15
+#: cui/uiconfig/ui/querydeletechartcolordialog.ui:15
 msgctxt "querydeletechartcolordialog|QueryDeleteChartColorDialog"
 msgid "This action cannot be undone."
 msgstr "Nid oes modd dadwneud y weithred hon."
 
-#: querydeletecolordialog.ui:7
+#: cui/uiconfig/ui/querydeletecolordialog.ui:6
 msgctxt "querydeletecolordialog|AskDelColorDialog"
 msgid "Delete color?"
 msgstr "Dileu'r lliw?"
 
-#: querydeletecolordialog.ui:13
+#: cui/uiconfig/ui/querydeletecolordialog.ui:13
 msgctxt "querydeletecolordialog|AskDelColorDialog"
 msgid "Do you want to delete the color?"
 msgstr "Dileu'r lliw?"
 
-#: querydeletedictionarydialog.ui:8
+#: cui/uiconfig/ui/querydeletedictionarydialog.ui:7
 msgctxt "querydeletedictionarydialog|QueryDeleteDictionaryDialog"
 msgid "Delete Dictionary?"
 msgstr "Dileu'r Geiriadur?"
 
-#: querydeletedictionarydialog.ui:14
+#: cui/uiconfig/ui/querydeletedictionarydialog.ui:14
 msgctxt "querydeletedictionarydialog|QueryDeleteDictionaryDialog"
 msgid "Do you really want to delete the dictionary?"
 msgstr "Hoffech chi ddileu'r geiriadur?"
 
-#: querydeletedictionarydialog.ui:15
+#: cui/uiconfig/ui/querydeletedictionarydialog.ui:15
 msgctxt "querydeletedictionarydialog|QueryDeleteDictionaryDialog"
 msgid "This action cannot be undone."
 msgstr "Nid oes modd dadwneud y weithred hon."
 
-#: querydeletegradientdialog.ui:8
+#: cui/uiconfig/ui/querydeletegradientdialog.ui:7
 msgctxt "querydeletegradientdialog|AskDelGradientDialog"
 msgid "Delete gradient?"
 msgstr "Dileu'r graddiant?"
 
-#: querydeletegradientdialog.ui:14
+#: cui/uiconfig/ui/querydeletegradientdialog.ui:14
 msgctxt "querydeletegradientdialog|AskDelGradientDialog"
 msgid "Do you want to delete the gradient?"
 msgstr "Dileu'r graddiant?"
 
-#: querydeletehatchdialog.ui:8
+#: cui/uiconfig/ui/querydeletehatchdialog.ui:7
 msgctxt "querydeletehatchdialog|AskDelHatchDialog"
 msgid "Delete Hatching?"
 msgstr "Dileu'r Lliniogi?"
 
-#: querydeletehatchdialog.ui:14
+#: cui/uiconfig/ui/querydeletehatchdialog.ui:14
 msgctxt "querydeletehatchdialog|AskDelHatchDialog"
 msgid "Do you want to delete the hatching?"
 msgstr "Dileu'r lliniogi?"
 
-#: querydeletelineenddialog.ui:8
+#: cui/uiconfig/ui/querydeletelineenddialog.ui:7
 msgctxt "querydeletelineenddialog|AskDelLineEndDialog"
 msgid "Delete Arrowhead?"
 msgstr "Dileu'r Pen Saeth?"
 
-#: querydeletelineenddialog.ui:14
+#: cui/uiconfig/ui/querydeletelineenddialog.ui:14
 msgctxt "querydeletelineenddialog|AskDelLineEndDialog"
 msgid "Do you really want to delete the arrowhead?"
 msgstr "Ydych chi wir eisiau dileu'r pen saeth?"
 
-#: querydeletelineenddialog.ui:15
+#: cui/uiconfig/ui/querydeletelineenddialog.ui:15
 msgctxt "querydeletelineenddialog|AskDelLineEndDialog"
 msgid "This action cannot be undone."
 msgstr "Nid oes modd dadwneud y weithred hon."
 
-#: querydeletelinestyledialog.ui:8
+#: cui/uiconfig/ui/querydeletelinestyledialog.ui:7
 msgctxt "querydeletelinestyledialog|AskDelLineStyleDialog"
 msgid "Delete Line Style?"
 msgstr "Dileu'r Arddull Llinell?"
 
-#: querydeletelinestyledialog.ui:14
+#: cui/uiconfig/ui/querydeletelinestyledialog.ui:14
 msgctxt "querydeletelinestyledialog|AskDelLineStyleDialog"
 msgid "Do you want to delete the line style?"
 msgstr "Dileu'r arddull llinell?"
 
-#: queryduplicatedialog.ui:8
+#: cui/uiconfig/ui/queryduplicatedialog.ui:7
 msgctxt "queryduplicatedialog|DuplicateNameDialog"
 msgid "Duplicate Name"
 msgstr "Enw Dewis Dyblyg"
 
-#: queryduplicatedialog.ui:14
+#: cui/uiconfig/ui/queryduplicatedialog.ui:14
 msgctxt "queryduplicatedialog|DuplicateNameDialog"
 msgid "The name you have entered already exists."
 msgstr "Mae'r enw hwn yn bodoli eisoes."
 
-#: queryduplicatedialog.ui:15
+#: cui/uiconfig/ui/queryduplicatedialog.ui:15
 msgctxt "queryduplicatedialog|DuplicateNameDialog"
 msgid "Please choose another name."
 msgstr "Dewiswch enw arall."
 
-#: querynoloadedfiledialog.ui:8
+#: cui/uiconfig/ui/querynoloadedfiledialog.ui:7
 msgctxt "querynoloadedfiledialog|NoLoadedFileDialog"
 msgid "No Loaded File"
 msgstr "Dim Ffeil wedi ei Llwytho"
 
-#: querynoloadedfiledialog.ui:14
+#: cui/uiconfig/ui/querynoloadedfiledialog.ui:14
 msgctxt "querynoloadedfiledialog|NoLoadedFileDialog"
 msgid "The file could not be loaded!"
 msgstr "Methu llwytho'r ffeil!"
 
-#: querynosavefiledialog.ui:8
+#: cui/uiconfig/ui/querynosavefiledialog.ui:7
 msgctxt "querynosavefiledialog|NoSaveFileDialog"
 msgid "No Saved File"
 msgstr "Dim Ffeil wedi ei Chadw"
 
-#: querynosavefiledialog.ui:14
+#: cui/uiconfig/ui/querynosavefiledialog.ui:14
 msgctxt "querynosavefiledialog|NoSaveFileDialog"
 msgid "The file could not be saved!"
 msgstr "Methu cadw'r ffeil!"
 
-#: querysavelistdialog.ui:8
+#: cui/uiconfig/ui/querysavelistdialog.ui:7
 msgctxt "querysavelistdialog|AskSaveList"
 msgid "Save List?"
 msgstr "Cadw Rhestr?"
 
-#: querysavelistdialog.ui:14
+#: cui/uiconfig/ui/querysavelistdialog.ui:14
 msgctxt "querysavelistdialog|AskSaveList"
 msgid "The list was modified without saving."
 msgstr "Cafodd y rhestr ei newid heb ei gadw."
 
-#: querysavelistdialog.ui:15
+#: cui/uiconfig/ui/querysavelistdialog.ui:15
 msgctxt "querysavelistdialog|AskSaveList"
 msgid "Would you like to save the list now?"
 msgstr "Hoffech chi gadw'r rhestr?"
 
-#: queryupdategalleryfilelistdialog.ui:8
+#: cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui:7
 msgctxt "queryupdategalleryfilelistdialog|QueryUpdateFileListDialog"
 msgid "Update File List?"
 msgstr "Diweddaru'r Rhestr Ffeiliau?"
 
-#: queryupdategalleryfilelistdialog.ui:14
+#: cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui:14
 msgctxt "queryupdategalleryfilelistdialog|QueryUpdateFileListDialog"
 msgid "Do you want to update the file list?"
 msgstr "Hoffech chi ddiweddaru'r rhestr ffeiliau?"
 
-#: recordnumberdialog.ui:7
+#: cui/uiconfig/ui/recordnumberdialog.ui:7
 msgctxt "recordnumberdialog|RecordNumberDialog"
 msgid "Record Number"
 msgstr "Rhif Cofnod"
 
-#: recordnumberdialog.ui:25
+#: cui/uiconfig/ui/recordnumberdialog.ui:25
 msgctxt "recordnumberdialog|label2"
 msgid "go to record"
 msgstr "mynd i gofnod"
 
-#: rotationtabpage.ui:52
+#: cui/uiconfig/ui/rotationtabpage.ui:52
 msgctxt "rotationtabpage|FT_POS_X"
 msgid "Position _X:"
 msgstr "Safle _X:"
 
-#: rotationtabpage.ui:66
+#: cui/uiconfig/ui/rotationtabpage.ui:66
 msgctxt "rotationtabpage|FT_POS_Y"
 msgid "Position _Y:"
 msgstr "Safle _Y:"
 
-#: rotationtabpage.ui:118
+#: cui/uiconfig/ui/rotationtabpage.ui:116
 msgctxt "rotationtabpage|FT_POSPRESETS"
 msgid "_Default settings:"
 msgstr "_Gosodiadau Rhagosodedig:"
 
-#: rotationtabpage.ui:132
+#: cui/uiconfig/ui/rotationtabpage.ui:130
 msgctxt "rotationtabpage|CTL_RECT|tooltip_text"
 msgid "Rotation point"
 msgstr "Pwynt cylchdro"
 
-#: rotationtabpage.ui:157
+#: cui/uiconfig/ui/rotationtabpage.ui:155
 msgctxt "rotationtabpage|label1"
 msgid "Pivot Point"
 msgstr "Pwynt Troi"
 
-#: rotationtabpage.ui:199
+#: cui/uiconfig/ui/rotationtabpage.ui:197
 msgctxt "rotationtabpage|FT_ANGLE"
 msgid "_Angle:"
 msgstr "_Ongl:"
 
-#: rotationtabpage.ui:241
+#: cui/uiconfig/ui/rotationtabpage.ui:238
 msgctxt "rotationtabpage|FT_ANGLEPRESETS"
 msgid "Default _settings:"
 msgstr "Gosodiadau _rhagosodedig:"
 
-#: rotationtabpage.ui:255
+#: cui/uiconfig/ui/rotationtabpage.ui:252
 msgctxt "rotationtabpage|CTL_ANGLE|tooltip_text"
 msgid "Rotation Angle"
 msgstr "Ongl Cylchdro"
 
-#: rotationtabpage.ui:280
+#: cui/uiconfig/ui/rotationtabpage.ui:277
 msgctxt "rotationtabpage|label2"
 msgid "Rotation Angle"
 msgstr "Ongl Cylchdro"
 
-#: screenshotannotationdialog.ui:8
+#: cui/uiconfig/ui/screenshotannotationdialog.ui:8
 msgctxt "screenshotannotationdialog|ScreenshotAnnotationDialog"
 msgid "Interactive Screenshot Annotation"
 msgstr "Anodiad Llun Sgrin Rhyngweithiol"
 
-#: screenshotannotationdialog.ui:39
+#: cui/uiconfig/ui/screenshotannotationdialog.ui:39
 msgctxt "screenshotannotationdialog|save"
 msgid "Save Screenshot..."
 msgstr "Cadw Llun Sgrin..."
 
-#: screenshotannotationdialog.ui:67
+#: cui/uiconfig/ui/screenshotannotationdialog.ui:67
 msgctxt "screenshotannotationdialog|label2"
 msgid "Click the widgets to add annotation:"
 msgstr "Cliciwch y teclyn i ychwanegu anodiad:"
 
-#: screenshotannotationdialog.ui:93
+#: cui/uiconfig/ui/screenshotannotationdialog.ui:93
 msgctxt "screenshotannotationdialog|label1"
 msgid "Paste the following markup into the help file:"
 msgstr "Gludwch y nodiad canlynol i'r ffeil cymorth:"
 
-#: scriptorganizer.ui:7
+#: cui/uiconfig/ui/scriptorganizer.ui:7
 msgctxt "scriptorganizer|ScriptOrganizerDialog"
 msgid "%MACROLANG Macros"
 msgstr "Macros %MACROLANG"
 
-#: scriptorganizer.ui:20
+#: cui/uiconfig/ui/scriptorganizer.ui:20
 msgctxt "scriptorganizer|run"
 msgid "Run"
 msgstr "Rhedeg"
 
-#: scriptorganizer.ui:49
+#: cui/uiconfig/ui/scriptorganizer.ui:49
 msgctxt "scriptorganizer|create"
 msgid "Create..."
 msgstr "Creu..."
 
-#: scriptorganizer.ui:79
+#: cui/uiconfig/ui/scriptorganizer.ui:79
 msgctxt "scriptorganizer|rename"
 msgid "Rename..."
 msgstr "Ailenwi..."
 
-#: scriptorganizer.ui:93
+#: cui/uiconfig/ui/scriptorganizer.ui:93
 msgctxt "scriptorganizer|delete"
 msgid "Delete..."
 msgstr "Dileu..."
 
-#: scriptorganizer.ui:160
+#: cui/uiconfig/ui/scriptorganizer.ui:160
 msgctxt "scriptorganizer|macrosft"
 msgid "Macros"
 msgstr "Macros"
 
-#: searchattrdialog.ui:9
+#: cui/uiconfig/ui/searchattrdialog.ui:9
 msgctxt "searchattrdialog|SearchAttrDialog"
 msgid "Attributes"
 msgstr "Priodoleddau"
 
-#: searchformatdialog.ui:8
+#: cui/uiconfig/ui/searchformatdialog.ui:8
 msgctxt "searchformatdialog|SearchFormatDialog"
 msgid "Text Format "
 msgstr "Fformat y Testun "
 
-#: searchformatdialog.ui:106
+#: cui/uiconfig/ui/searchformatdialog.ui:106
 msgctxt "searchformatdialog|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: searchformatdialog.ui:128
+#: cui/uiconfig/ui/searchformatdialog.ui:128
 msgctxt "searchformatdialog|fonteffects"
 msgid "Font Effects"
 msgstr "Effeithiau'r Ffont"
 
-#: searchformatdialog.ui:151
+#: cui/uiconfig/ui/searchformatdialog.ui:151
 msgctxt "searchformatdialog|position"
 msgid "Position"
 msgstr "Safle"
 
-#: searchformatdialog.ui:174
+#: cui/uiconfig/ui/searchformatdialog.ui:174
 msgctxt "searchformatdialog|asianlayout"
 msgid "Asian Layout"
 msgstr "Cynllun Asiaidd"
 
-#: searchformatdialog.ui:197
+#: cui/uiconfig/ui/searchformatdialog.ui:197
 msgctxt "searchformatdialog|labelTP_PARA_STD"
 msgid "Indents & Spacing"
 msgstr "Mewnoliad a Bylchu"
 
-#: searchformatdialog.ui:220
+#: cui/uiconfig/ui/searchformatdialog.ui:220
 msgctxt "searchformatdialog|labelTP_PARA_ALIGN"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: searchformatdialog.ui:244
+#: cui/uiconfig/ui/searchformatdialog.ui:244
 msgctxt "searchformatdialog|labelTP_PARA_EXT"
 msgid "Text Flow"
 msgstr "Llif Testun"
 
-#: searchformatdialog.ui:268
+#: cui/uiconfig/ui/searchformatdialog.ui:268
 msgctxt "searchformatdialog|labelTP_PARA_ASIAN"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: searchformatdialog.ui:291
+#: cui/uiconfig/ui/searchformatdialog.ui:291
 msgctxt "searchformatdialog|background"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: securityoptionsdialog.ui:8
+#: cui/uiconfig/ui/securityoptionsdialog.ui:8
 msgctxt "securityoptionsdialog|SecurityOptionsDialog"
 msgid "Security Options and Warnings"
 msgstr "Dewisiadau Diogelwch a Rhybuddion"
 
-#: securityoptionsdialog.ui:105
+#: cui/uiconfig/ui/securityoptionsdialog.ui:108
 msgctxt "securityoptionsdialog|savesenddocs"
 msgid "_When saving or sending"
 msgstr "_Wrth gadw neu anfon"
 
-#: securityoptionsdialog.ui:120
+#: cui/uiconfig/ui/securityoptionsdialog.ui:123
 msgctxt "securityoptionsdialog|whensigning"
 msgid "When _signing"
 msgstr "Wrth _lofnodi"
 
-#: securityoptionsdialog.ui:135
+#: cui/uiconfig/ui/securityoptionsdialog.ui:138
 msgctxt "securityoptionsdialog|whenprinting"
 msgid "When _printing"
 msgstr "Wrth _argraffu"
 
-#: securityoptionsdialog.ui:150
+#: cui/uiconfig/ui/securityoptionsdialog.ui:153
 msgctxt "securityoptionsdialog|whenpdf"
 msgid "When creating PDF _files"
 msgstr "Wrth greu _ffeiliau PDF"
 
-#: securityoptionsdialog.ui:227
+#: cui/uiconfig/ui/securityoptionsdialog.ui:229
 msgctxt "securityoptionsdialog|label3"
 msgid "Warn if document contains recorded changes, versions, hidden information or notes:"
 msgstr "Rhybuddio os yw dogfen yn cynnwys newidiadau wedi eu cofnodi, fersiynau, gwybodaeth gudd neu nodiadau:"
 
-#: securityoptionsdialog.ui:242
+#: cui/uiconfig/ui/securityoptionsdialog.ui:245
 msgctxt "securityoptionsdialog|label1"
 msgid "Security Warnings"
 msgstr "Rhybuddion Diogelwch"
 
-#: securityoptionsdialog.ui:276
+#: cui/uiconfig/ui/securityoptionsdialog.ui:279
 msgctxt "securityoptionsdialog|removepersonal"
 msgid "_Remove personal information on saving"
 msgstr "_Tynnu manylion personol wrth gadw"
 
-#: securityoptionsdialog.ui:292
+#: cui/uiconfig/ui/securityoptionsdialog.ui:295
 msgctxt "securityoptionsdialog|password"
 msgid "Recommend password protection on sa_ving"
 msgstr "Argymell diogelu cyfrinair wrth _gadw"
 
-#: securityoptionsdialog.ui:308
+#: cui/uiconfig/ui/securityoptionsdialog.ui:311
 msgctxt "securityoptionsdialog|ctrlclick"
 msgid "Ctrl-click required _to follow hyperlinks"
 msgstr "Mae _angen Ctrl-clic i ddilyn doleni"
 
-#: securityoptionsdialog.ui:324
+#: cui/uiconfig/ui/securityoptionsdialog.ui:327
 msgctxt "securityoptionsdialog|blockuntrusted"
 msgid "Block any links from documents not among the trusted locations (see Macro Security)"
 msgstr "Rhwystro unrhyw gyswllt o ddogfennau nad ydynt o blith lleoliad dibynadwy (gw. Diogelwch Macro)"
 
-#: securityoptionsdialog.ui:395
+#: cui/uiconfig/ui/securityoptionsdialog.ui:398
 msgctxt "securityoptionsdialog|label2"
 msgid "Security Options"
 msgstr "Dewisiadau Diogelwch"
 
-#: select_persona_dialog.ui:8
+#: cui/uiconfig/ui/select_persona_dialog.ui:8
 msgctxt "select_persona_dialog|SelectPersonaDialog"
 msgid "Select Firefox Theme"
 msgstr "Dewis Thema Firefox"
 
-#: select_persona_dialog.ui:56
+#: cui/uiconfig/ui/select_persona_dialog.ui:55
 msgctxt "select_persona_dialog|search_personas"
 msgid "_Go"
 msgstr "_Mynd"
 
-#: select_persona_dialog.ui:86
+#: cui/uiconfig/ui/select_persona_dialog.ui:85
 msgctxt "select_persona_dialog|label1"
 msgid "Search Term or Firefox Theme URL"
 msgstr "Chwilio am Derm neu URL Thema Firefox"
 
-#: select_persona_dialog.ui:228
+#: cui/uiconfig/ui/select_persona_dialog.ui:227
 msgctxt "select_persona_dialog|label6"
 msgid "Categories"
 msgstr "Categorïau"
 
-#: selectpathdialog.ui:8
+#: cui/uiconfig/ui/selectpathdialog.ui:16
 msgctxt "selectpathdialog|SelectPathDialog"
 msgid "Select Paths"
 msgstr "Dewis Llwybrau"
 
-#: selectpathdialog.ui:106
+#: cui/uiconfig/ui/selectpathdialog.ui:117
 msgctxt "selectpathdialog|add"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: selectpathdialog.ui:168
+#: cui/uiconfig/ui/selectpathdialog.ui:195
 msgctxt "selectpathdialog|label1"
 msgid "Paths"
 msgstr "Llwybrau"
 
-#: shadowtabpage.ui:45
+#: cui/uiconfig/ui/shadowtabpage.ui:45
 msgctxt "shadowtabpage|TSB_SHOW_SHADOW"
 msgid "_Use shadow"
 msgstr "_Defnyddio cysgod"
 
-#: shadowtabpage.ui:122
+#: cui/uiconfig/ui/shadowtabpage.ui:120
 msgctxt "shadowtabpage|FT_DISTANCE"
 msgid "_Distance:"
 msgstr "_Pellter:"
 
-#: shadowtabpage.ui:142
+#: cui/uiconfig/ui/shadowtabpage.ui:140
 msgctxt "shadowtabpage|FT_TRANSPARENT"
 msgid "_Transparency:"
 msgstr "_Tryloywder:"
 
-#: shadowtabpage.ui:162
+#: cui/uiconfig/ui/shadowtabpage.ui:160
 msgctxt "shadowtabpage|FT_SHADOW_COLOR"
 msgid "_Color:"
 msgstr "_Lliw:"
 
-#: shadowtabpage.ui:205
+#: cui/uiconfig/ui/shadowtabpage.ui:203
 msgctxt "shadowtabpage|CTL_COLOR_PREVIEW-atkobject"
 msgid "Example"
 msgstr "Esiampl"
 
-#: shadowtabpage.ui:230
+#: cui/uiconfig/ui/shadowtabpage.ui:228
 msgctxt "shadowtabpage|label"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: showcoldialog.ui:8
+#: cui/uiconfig/ui/showcoldialog.ui:8
 msgctxt "showcoldialog|ShowColDialog"
 msgid "Show Columns"
 msgstr "Dangos Colofnau"
 
-#: showcoldialog.ui:70
+#: cui/uiconfig/ui/showcoldialog.ui:70
 msgctxt "showcoldialog|label1"
 msgid "The following columns are currently hidden. Please mark the fields you want to show and choose OK."
 msgstr "Mae'r colofnau canlynol wedi eu cuddio. Marciwch y meysydd rydych am eu dangos a dewis Iawn."
 
-#: similaritysearchdialog.ui:14
+#: cui/uiconfig/ui/signatureline.ui:8
+msgctxt "signatureline|SignatureLineDialog"
+msgid "Signature Line"
+msgstr "Llinell Llofnod"
+
+#: cui/uiconfig/ui/signatureline.ui:111
+msgctxt "signatureline|edit_name"
+msgid "John Doe"
+msgstr "John Doe"
+
+#: cui/uiconfig/ui/signatureline.ui:124
+msgctxt "signatureline|edit_title"
+msgid "Director"
+msgstr "Cyfarwyddwr"
+
+#: cui/uiconfig/ui/signatureline.ui:137
+msgctxt "signatureline|edit_email"
+msgid "john.doe@example.org"
+msgstr "john.doe@example.org"
+
+#. Suggested Signer Name
+#: cui/uiconfig/ui/signatureline.ui:149
+msgctxt "signatureline|label_name"
+msgid "Name:"
+msgstr "Enw:"
+
+#. Suggested Signer Title
+#: cui/uiconfig/ui/signatureline.ui:163
+msgctxt "signatureline|label_title"
+msgid "Title:"
+msgstr "Teitl:"
+
+#. Suggested Signer email
+#: cui/uiconfig/ui/signatureline.ui:177
+msgctxt "signatureline|label_email"
+msgid "Email:"
+msgstr "E-bost:"
+
+#: cui/uiconfig/ui/signatureline.ui:194
+msgctxt "signatureline|label_suggestedsigner"
+msgid "Suggested Signer"
+msgstr "Llofnod Awgrymedig"
+
+#: cui/uiconfig/ui/signatureline.ui:228
+msgctxt "signatureline|checkbox_can_add_comments"
+msgid "Signer can add comments"
+msgstr "Gall y llofnodwr ychwanegu sylwadau"
+
+#: cui/uiconfig/ui/signatureline.ui:243
+msgctxt "signatureline|checkbox_show_sign_date"
+msgid "Show sign date in signature line"
+msgstr "Dangos arwydd dyddiad yn y llinell llofnod"
+
+#: cui/uiconfig/ui/signatureline.ui:261
+msgctxt "signatureline|label_instructions"
+msgid "Instructions to the signer:"
+msgstr "Cyfarwyddiadau i'r llofnodwr:"
+
+#: cui/uiconfig/ui/signatureline.ui:300
+msgctxt "signatureline|label_more"
+msgid "More"
+msgstr "Rhagor"
+
+#: cui/uiconfig/ui/signsignatureline.ui:8
+msgctxt "signsignatureline|SignSignatureLineDialog"
+msgid "Sign Signature Line"
+msgstr "Llinell Llofnodi Llofnod"
+
+#: cui/uiconfig/ui/signsignatureline.ui:109
+msgctxt "signsignatureline|edit_name"
+msgid "Type your name here"
+msgstr "Teipiwch eich enw yma"
+
+#. Name of the signer
+#: cui/uiconfig/ui/signsignatureline.ui:121
+msgctxt "signsignatureline|label_name"
+msgid "Your Name:"
+msgstr "Eich Enw:"
+
+#. Certificate to be used for signing
+#: cui/uiconfig/ui/signsignatureline.ui:135
+msgctxt "signsignatureline|label_certificate"
+msgid "Certificate:"
+msgstr "Tystysgrif:"
+
+#: cui/uiconfig/ui/signsignatureline.ui:146
+msgctxt "signsignatureline|btn_select_certificate"
+msgid "Select Certificate"
+msgstr "Dewis Tystysgrif"
+
+#: cui/uiconfig/ui/signsignatureline.ui:164
+msgctxt "signsignatureline|label_sign"
+msgid "Sign"
+msgstr "Llofnodi"
+
+#: cui/uiconfig/ui/signsignatureline.ui:201
+msgctxt "signsignatureline|label_add_comment"
+msgid "Add comment:"
+msgstr "Ychwanegu Sylw:"
+
+#: cui/uiconfig/ui/signsignatureline.ui:237
+msgctxt "signsignatureline|label_hint"
+msgid "Instructions from the document creator:"
+msgstr "Cyfarwyddiadau gan awdur y ddogfen:"
+
+#: cui/uiconfig/ui/signsignatureline.ui:270
+msgctxt "signsignatureline|label_more"
+msgid "More"
+msgstr "Rhagor"
+
+#: cui/uiconfig/ui/similaritysearchdialog.ui:26
 msgctxt "similaritysearchdialog|SimilaritySearchDialog"
 msgid "Similarity Search"
 msgstr "Chwilio am Debygrwydd"
 
-#: similaritysearchdialog.ui:95
+#: cui/uiconfig/ui/similaritysearchdialog.ui:109
 msgctxt "similaritysearchdialog|label2"
 msgid "_Exchange characters:"
 msgstr "C_yfnewid nodau:"
 
-#: similaritysearchdialog.ui:109
+#: cui/uiconfig/ui/similaritysearchdialog.ui:123
 msgctxt "similaritysearchdialog|label3"
 msgid "_Add characters:"
 msgstr "­_Ychwanegu nodau:"
 
-#: similaritysearchdialog.ui:123
+#: cui/uiconfig/ui/similaritysearchdialog.ui:137
 msgctxt "similaritysearchdialog|label4"
 msgid "_Remove characters:"
 msgstr "_Tynnu nodau:"
 
-#: similaritysearchdialog.ui:134
+#: cui/uiconfig/ui/similaritysearchdialog.ui:149
 msgctxt "similaritysearchdialog|relaxbox"
 msgid "_Combine"
 msgstr "_Cyfuno"
 
-#: slantcornertabpage.ui:50
+#: cui/uiconfig/ui/slantcornertabpage.ui:50
 msgctxt "slantcornertabpage|label5"
 msgid "_X:"
 msgstr "_X:"
 
-#: slantcornertabpage.ui:89
+#: cui/uiconfig/ui/slantcornertabpage.ui:88
 msgctxt "slantcornertabpage|label6"
 msgid "_Y:"
 msgstr "_Y:"
 
-#: slantcornertabpage.ui:127
+#: cui/uiconfig/ui/slantcornertabpage.ui:125
 msgctxt "slantcornertabpage|label3"
 msgid "Control Point 1"
 msgstr "Pwynt Rheoli 1"
 
-#: slantcornertabpage.ui:161
+#: cui/uiconfig/ui/slantcornertabpage.ui:159
 msgctxt "slantcornertabpage|FT_RADIUS"
 msgid "_Radius:"
 msgstr "_Radiws:"
 
-#: slantcornertabpage.ui:192
+#: cui/uiconfig/ui/slantcornertabpage.ui:189
 msgctxt "slantcornertabpage|label1"
 msgid "Corner Radius"
 msgstr "Radiws Cornel"
 
-#: slantcornertabpage.ui:226
+#: cui/uiconfig/ui/slantcornertabpage.ui:223
 msgctxt "slantcornertabpage|FT_ANGLE"
 msgid "_Angle:"
 msgstr "_Ongl:"
 
-#: slantcornertabpage.ui:257
+#: cui/uiconfig/ui/slantcornertabpage.ui:253
 msgctxt "slantcornertabpage|label2"
 msgid "Slant"
 msgstr "Goleddf"
 
-#: slantcornertabpage.ui:298
+#: cui/uiconfig/ui/slantcornertabpage.ui:294
 msgctxt "slantcornertabpage|label4"
 msgid "_X:"
 msgstr "_X:"
 
-#: slantcornertabpage.ui:337
+#: cui/uiconfig/ui/slantcornertabpage.ui:332
 msgctxt "slantcornertabpage|label7"
 msgid "_Y:"
 msgstr "_Y:"
 
-#: slantcornertabpage.ui:375
+#: cui/uiconfig/ui/slantcornertabpage.ui:369
 msgctxt "slantcornertabpage|label8"
 msgid "Control Point 2"
 msgstr "Pwynt Rheoli 2"
 
-#: smarttagoptionspage.ui:21
+#: cui/uiconfig/ui/smarttagoptionspage.ui:21
 msgctxt "smarttagoptionspage|main"
 msgid "Label text with smart tags"
 msgstr "Labelu testun gyda thabiau clyfar"
 
-#: smarttagoptionspage.ui:61
+#: cui/uiconfig/ui/smarttagoptionspage.ui:61
 msgctxt "smarttagoptionspage|properties"
 msgid "Properties..."
 msgstr "Priodweddau..."
 
-#: smarttagoptionspage.ui:100
+#: cui/uiconfig/ui/smarttagoptionspage.ui:100
 msgctxt "smarttagoptionspage|label1"
 msgid "Currently Installed Smart Tags"
 msgstr "Tagiau Clyfar wedi eu gosod"
 
-#: smoothdialog.ui:16
+#: cui/uiconfig/ui/smoothdialog.ui:16
 msgctxt "smoothdialog|SmoothDialog"
 msgid "Smooth"
 msgstr "Llyfn"
 
-#: smoothdialog.ui:138
+#: cui/uiconfig/ui/smoothdialog.ui:138
 msgctxt "smoothdialog|label2"
 msgid "_Smooth radius:"
 msgstr "Radiws _llyfn:"
 
-#: smoothdialog.ui:161
+#: cui/uiconfig/ui/smoothdialog.ui:161
 msgctxt "smoothdialog|label1"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: solarizedialog.ui:14
+#: cui/uiconfig/ui/solarizedialog.ui:14
 msgctxt "solarizedialog|SolarizeDialog"
 msgid "Solarization"
 msgstr "Solareiddio"
 
-#: solarizedialog.ui:135
+#: cui/uiconfig/ui/solarizedialog.ui:135
 msgctxt "solarizedialog|label2"
 msgid "Threshold _value:"
 msgstr "_Gwerth y trothwy:"
 
-#: solarizedialog.ui:146
+#: cui/uiconfig/ui/solarizedialog.ui:146
 msgctxt "solarizedialog|invert"
 msgid "_Invert"
 msgstr "_Gwrthdroi"
 
-#: solarizedialog.ui:173
+#: cui/uiconfig/ui/solarizedialog.ui:173
 msgctxt "solarizedialog|label1"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: specialcharacters.ui:10
+#: cui/uiconfig/ui/specialcharacters.ui:8
 msgctxt "specialcharacters|SpecialCharactersDialog"
 msgid "Special Characters"
 msgstr "Nodau Arbennig"
 
-#: specialcharacters.ui:24
+#: cui/uiconfig/ui/specialcharacters.ui:39
 msgctxt "specialcharacters|insert"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: specialcharacters.ui:110
+#: cui/uiconfig/ui/specialcharacters.ui:107
 msgctxt "specialcharacters|subsetft"
 msgid "Subset:"
 msgstr "Is Set:"
 
-#: specialcharacters.ui:134
+#: cui/uiconfig/ui/specialcharacters.ui:121
 msgctxt "specialcharacters|fontft"
 msgid "Font:"
 msgstr "Ffont:"
 
-#: specialcharacters.ui:158
+#: cui/uiconfig/ui/specialcharacters.ui:135
 msgctxt "specialcharacters|srchft"
 msgid "Search:"
 msgstr "Chwilio:"
 
-#: specialcharacters.ui:218
+#: cui/uiconfig/ui/specialcharacters.ui:221
 msgctxt "specialcharacters|hexlabel"
 msgid "Hexadecimal:"
 msgstr "Hecsadegol:"
 
-#: specialcharacters.ui:269
+#: cui/uiconfig/ui/specialcharacters.ui:274
 msgctxt "specialcharacters|decimallabel"
 msgid "Decimal:"
 msgstr "Degol:"
 
-#: specialcharacters.ui:290
+#: cui/uiconfig/ui/specialcharacters.ui:298
 msgctxt "specialcharacters|favbtn"
 msgid "Add to Favorites"
 msgstr "Ychwanegu i'r Ffefrynnau"
 
-#: specialcharacters.ui:294
+#: cui/uiconfig/ui/specialcharacters.ui:302
 msgctxt "specialcharacters|favbtn|tooltip_text"
 msgid "Maximum Limit: 16 Characters"
 msgstr "Uchafswm: 16 Nod"
 
-#: specialcharacters.ui:341
+#: cui/uiconfig/ui/specialcharacters.ui:349
 msgctxt "specialcharacters|symboltext1"
 msgid "Recent Characters:"
 msgstr "Nodau Diweddar:"
 
-#: specialcharacters.ui:572
+#: cui/uiconfig/ui/specialcharacters.ui:583
 msgctxt "specialcharacters|favbtn|symboltext2"
 msgid "Favorite Characters:"
 msgstr "Hoff Nodau:"
 
-#: spellingdialog.ui:9
+#: cui/uiconfig/ui/spellingdialog.ui:9
 msgctxt "spellingdialog|SpellingDialog"
 msgid "Spelling: $LANGUAGE ($LOCATION)"
 msgstr "Sillafu: $LANGUAGE ($LOCATION)"
 
-#: spellingdialog.ui:38
+#: cui/uiconfig/ui/spellingdialog.ui:38
 msgctxt "spellingdialog|options"
 msgid "_Options..."
 msgstr "_Dewisiadau..."
 
-#: spellingdialog.ui:110
+#: cui/uiconfig/ui/spellingdialog.ui:110
 msgctxt "spellingdialog|ignore"
 msgid "_Ignore Once"
 msgstr "_Anwybyddu Unwaith"
 
-#: spellingdialog.ui:138
+#: cui/uiconfig/ui/spellingdialog.ui:138
 msgctxt "spellingdialog|change"
 msgid "Co_rrect"
 msgstr "C_ywiro"
 
-#: spellingdialog.ui:152
+#: cui/uiconfig/ui/spellingdialog.ui:152
 msgctxt "spellingdialog|changeall"
 msgid "Correct A_ll"
 msgstr "Cywiro _Popeth"
 
-#: spellingdialog.ui:166
+#: cui/uiconfig/ui/spellingdialog.ui:166
 msgctxt "spellingdialog|autocorrect"
 msgid "Alwa_ys Correct"
 msgstr "Cywiro _Bob Tro"
 
-#: spellingdialog.ui:180
+#: cui/uiconfig/ui/spellingdialog.ui:180
 msgctxt "spellingdialog|checkgrammar"
 msgid "Chec_k grammar"
 msgstr "Gwirio _gramadeg"
 
-#: spellingdialog.ui:196
+#: cui/uiconfig/ui/spellingdialog.ui:196
 msgctxt "spellingdialog|ignoreall"
 msgid "I_gnore All"
 msgstr "Anwybyddu _Popeth"
 
-#: spellingdialog.ui:210
+#: cui/uiconfig/ui/spellingdialog.ui:210
 msgctxt "spellingdialog|ignorerule"
 msgid "I_gnore Rule"
 msgstr "Anwybyddu _Rheol"
 
-#: spellingdialog.ui:226
+#: cui/uiconfig/ui/spellingdialog.ui:226
 msgctxt "spellingdialog|languageft"
 msgid "Text languag_e:"
 msgstr "Iaith _testun:"
 
-#: spellingdialog.ui:252
+#: cui/uiconfig/ui/spellingdialog.ui:252
 msgctxt "spellingdialog|explainlink"
 msgid "More..."
 msgstr "Rhagor..."
 
-#: spellingdialog.ui:268
+#: cui/uiconfig/ui/spellingdialog.ui:268
 msgctxt "spellingdialog|resumeft"
 msgid "Res_ume"
 msgstr "_Ailgychwyn"
 
-#: spellingdialog.ui:280
+#: cui/uiconfig/ui/spellingdialog.ui:280
 msgctxt "spellingdialog|nosuggestionsft"
 msgid "(no suggestions)"
 msgstr "(dim awgrymiadau)"
 
-#: spellingdialog.ui:292
+#: cui/uiconfig/ui/spellingdialog.ui:292
 msgctxt "spellingdialog|alttitleft"
 msgid "Spelling: $LANGUAGE ($LOCATION)"
 msgstr "Sillafu: $LANGUAGE ($LOCATION)"
 
-#: spellingdialog.ui:319
+#: cui/uiconfig/ui/spellingdialog.ui:319
 msgctxt "spellingdialog|add"
 msgid "_Add to Dictionary"
 msgstr "_Ychwanegu at y Geiriadur"
 
-#: spellingdialog.ui:333
+#: cui/uiconfig/ui/spellingdialog.ui:333
 msgctxt "spellingdialog|addmb"
 msgid "_Add to Dictionary"
 msgstr "_Ychwanegu at y Geiriadur"
 
-#: spellingdialog.ui:349
+#: cui/uiconfig/ui/spellingdialog.ui:349
 msgctxt "spellingdialog|suggestionsft"
 msgid "_Suggestions"
 msgstr "_Awgrymiadau"
 
-#: spellingdialog.ui:365
+#: cui/uiconfig/ui/spellingdialog.ui:365
 msgctxt "spellingdialog|notindictft"
 msgid "_Not in dictionary"
 msgstr "_Ddim mewn geiriadur"
 
-#: spellingdialog.ui:386
+#: cui/uiconfig/ui/spellingdialog.ui:386
 msgctxt "spellingdialog|paste"
 msgid "Paste"
 msgstr "Gludo"
 
-#: spellingdialog.ui:400
+#: cui/uiconfig/ui/spellingdialog.ui:400
 msgctxt "spellingdialog|insert"
 msgid "Special Character"
 msgstr "Nod Arbennig"
 
-#: spelloptionsdialog.ui:8
+#: cui/uiconfig/ui/spelloptionsdialog.ui:8
 msgctxt "spelloptionsdialog|SpellOptionsDialog"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: splitcellsdialog.ui:25
+#: cui/uiconfig/ui/splitcellsdialog.ui:25
 msgctxt "splitcellsdialog|SplitCellsDialog"
 msgid "Split Cells"
 msgstr "Hollti Celloedd"
 
-#: splitcellsdialog.ui:117
+#: cui/uiconfig/ui/splitcellsdialog.ui:120
 msgctxt "splitcellsdialog|label3"
 msgid "_Split cell into:"
 msgstr "_Hollti cell i:"
 
-#: splitcellsdialog.ui:146
+#: cui/uiconfig/ui/splitcellsdialog.ui:149
 msgctxt "splitcellsdialog|label1"
 msgid "Split"
 msgstr "Hollti"
 
-#: splitcellsdialog.ui:178
+#: cui/uiconfig/ui/splitcellsdialog.ui:181
 msgctxt "splitcellsdialog|hori"
 msgid "H_orizontally"
 msgstr "_Llorweddol"
 
-#: splitcellsdialog.ui:196
+#: cui/uiconfig/ui/splitcellsdialog.ui:200
 msgctxt "splitcellsdialog|vert"
 msgid "_Vertically"
 msgstr "_Fertigol"
 
-#: splitcellsdialog.ui:218
+#: cui/uiconfig/ui/splitcellsdialog.ui:223
 msgctxt "splitcellsdialog|prop"
 msgid "_Into equal proportions"
 msgstr "_Rhannu’n gymesur"
 
-#: splitcellsdialog.ui:241
+#: cui/uiconfig/ui/splitcellsdialog.ui:246
 msgctxt "splitcellsdialog|label2"
 msgid "Direction"
 msgstr "Cyfeiriad"
 
-#: storedwebconnectiondialog.ui:9
+#: cui/uiconfig/ui/storedwebconnectiondialog.ui:9
 msgctxt "storedwebconnectiondialog|StoredWebConnectionDialog"
 msgid "Stored Web Connection Information"
 msgstr "Gwybodaeth Cysylltiad Gwe wedi ei Gadw"
 
-#: storedwebconnectiondialog.ui:70
+#: cui/uiconfig/ui/storedwebconnectiondialog.ui:70
 msgctxt "storedwebconnectiondialog|label1"
 msgid "Web login information (passwords are never shown)"
 msgstr "Manylion mewngofnodi gwe (cyfrineiriau byth yn cael eu dangos)"
 
-#: storedwebconnectiondialog.ui:87
+#: cui/uiconfig/ui/storedwebconnectiondialog.ui:87
 msgctxt "storedwebconnectiondialog|website"
 msgid "Website"
 msgstr "Gwefan"
 
-#: storedwebconnectiondialog.ui:98
+#: cui/uiconfig/ui/storedwebconnectiondialog.ui:98
 msgctxt "storedwebconnectiondialog|username"
 msgid "User name"
 msgstr "Enw defnyddiwr"
 
-#: storedwebconnectiondialog.ui:148
+#: cui/uiconfig/ui/storedwebconnectiondialog.ui:148
 msgctxt "storedwebconnectiondialog|removeall"
 msgid "Remove _All"
 msgstr "Tynnu _Popeth"
 
-#: storedwebconnectiondialog.ui:162
+#: cui/uiconfig/ui/storedwebconnectiondialog.ui:162
 msgctxt "storedwebconnectiondialog|change"
 msgid "_Change Password..."
 msgstr "_Newid Cyfrinair..."
 
-#: swpossizepage.ui:75
+#: cui/uiconfig/ui/swpossizepage.ui:74
 msgctxt "swpossizepage|widthft"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: swpossizepage.ui:113
+#: cui/uiconfig/ui/swpossizepage.ui:111
 msgctxt "swpossizepage|heightft"
 msgid "H_eight:"
 msgstr "_Uchder:"
 
-#: swpossizepage.ui:130
+#: cui/uiconfig/ui/swpossizepage.ui:128
 msgctxt "swpossizepage|ratio"
 msgid "_Keep ratio"
 msgstr "­_Cadw graddfa"
 
-#: swpossizepage.ui:151
+#: cui/uiconfig/ui/swpossizepage.ui:149
 msgctxt "swpossizepage|label2"
 msgid "Size"
 msgstr "Maint"
 
-#: swpossizepage.ui:207
+#: cui/uiconfig/ui/swpossizepage.ui:205
 msgctxt "swpossizepage|topage"
 msgid "To _page"
 msgstr "I _dudalen"
 
-#: swpossizepage.ui:224
+#: cui/uiconfig/ui/swpossizepage.ui:222
 msgctxt "swpossizepage|topara"
 msgid "To paragrap_h"
 msgstr "I _baragraff"
 
-#: swpossizepage.ui:240
+#: cui/uiconfig/ui/swpossizepage.ui:238
 msgctxt "swpossizepage|tochar"
 msgid "To cha_racter"
 msgstr "I _nod"
 
-#: swpossizepage.ui:256
+#: cui/uiconfig/ui/swpossizepage.ui:254
 msgctxt "swpossizepage|aschar"
 msgid "_As character"
 msgstr "_Fel nod"
 
-#: swpossizepage.ui:272
+#: cui/uiconfig/ui/swpossizepage.ui:270
 msgctxt "swpossizepage|toframe"
 msgid "To _frame"
 msgstr "I _fframio"
 
-#: swpossizepage.ui:294
+#: cui/uiconfig/ui/swpossizepage.ui:292
 msgctxt "swpossizepage|label1"
 msgid "Anchor"
 msgstr "Angor"
 
-#: swpossizepage.ui:335
+#: cui/uiconfig/ui/swpossizepage.ui:333
 msgctxt "swpossizepage|horiposft"
 msgid "Hori_zontal:"
 msgstr "Llo_rweddol:"
 
-#: swpossizepage.ui:349
+#: cui/uiconfig/ui/swpossizepage.ui:347
 msgctxt "swpossizepage|horibyft"
 msgid "b_y:"
 msgstr "_gan:"
 
-#: swpossizepage.ui:363
+#: cui/uiconfig/ui/swpossizepage.ui:361
 msgctxt "swpossizepage|vertbyft"
 msgid "_by:"
 msgstr "g_an:"
 
-#: swpossizepage.ui:377
+#: cui/uiconfig/ui/swpossizepage.ui:375
 msgctxt "swpossizepage|horitoft"
 msgid "_to:"
 msgstr "_i:"
 
-#: swpossizepage.ui:424
+#: cui/uiconfig/ui/swpossizepage.ui:421
 msgctxt "swpossizepage|vertposft"
 msgid "_Vertical:"
 msgstr "_Fertigol:"
 
-#: swpossizepage.ui:461
+#: cui/uiconfig/ui/swpossizepage.ui:457
 msgctxt "swpossizepage|verttoft"
 msgid "t_o:"
 msgstr "_at:"
 
-#: swpossizepage.ui:482
+#: cui/uiconfig/ui/swpossizepage.ui:478
 msgctxt "swpossizepage|mirror"
 msgid "_Mirror on even pages"
 msgstr "_Adlewyrchu ar dudalennau eilrif"
 
-#: swpossizepage.ui:499
+#: cui/uiconfig/ui/swpossizepage.ui:495
 msgctxt "swpossizepage|followtextflow"
 msgid "Follow te_xt flow"
 msgstr "Dilyn _llif testun"
 
-#: swpossizepage.ui:522
+#: cui/uiconfig/ui/swpossizepage.ui:518
 msgctxt "swpossizepage|label11"
 msgid "Position"
 msgstr "Safle"
 
-#: swpossizepage.ui:553
+#: cui/uiconfig/ui/swpossizepage.ui:549
 msgctxt "swpossizepage|pos"
 msgid "Positio_n"
 msgstr "S_afle"
 
-#: swpossizepage.ui:569
+#: cui/uiconfig/ui/swpossizepage.ui:565
 msgctxt "swpossizepage|size"
 msgid "_Size"
 msgstr "_Maint"
 
-#: swpossizepage.ui:591
+#: cui/uiconfig/ui/swpossizepage.ui:587
 msgctxt "swpossizepage|label3"
 msgid "Protect"
 msgstr "Diogelu"
 
-#: textanimtabpage.ui:49
+#: cui/uiconfig/ui/textanimtabpage.ui:49
 msgctxt "textanimtabpage|liststoreEFFECT"
 msgid "No Effect"
 msgstr "Dim Effaith"
 
-#: textanimtabpage.ui:53
+#: cui/uiconfig/ui/textanimtabpage.ui:53
 msgctxt "textanimtabpage|liststoreEFFECT"
 msgid "Blink"
 msgstr "Blincio"
 
-#: textanimtabpage.ui:57
+#: cui/uiconfig/ui/textanimtabpage.ui:57
 msgctxt "textanimtabpage|liststoreEFFECT"
 msgid "Scroll Through"
 msgstr "Sgrolio Drwodd"
 
-#: textanimtabpage.ui:61
+#: cui/uiconfig/ui/textanimtabpage.ui:61
 msgctxt "textanimtabpage|liststoreEFFECT"
 msgid "Scroll Back and Forth"
 msgstr "Sgrolio Nôl a Blaen"
 
-#: textanimtabpage.ui:65
+#: cui/uiconfig/ui/textanimtabpage.ui:65
 msgctxt "textanimtabpage|liststoreEFFECT"
 msgid "Scroll In"
 msgstr "Sgrolio i Mewn"
 
-#: textanimtabpage.ui:94
+#: cui/uiconfig/ui/textanimtabpage.ui:94
 msgctxt "textanimtabpage|FT_EFFECTS"
 msgid "E_ffect:"
 msgstr "_Effeithiau:"
 
-#: textanimtabpage.ui:135
+#: cui/uiconfig/ui/textanimtabpage.ui:135
 msgctxt "textanimtabpage|FT_DIRECTION"
 msgid "Direction:"
 msgstr "Cyfeiriad:"
 
-#: textanimtabpage.ui:155
+#: cui/uiconfig/ui/textanimtabpage.ui:155
 msgctxt "textanimtabpage|BTN_UP|tooltip_text"
 msgid "To top"
 msgstr "I'r brig"
 
-#: textanimtabpage.ui:161
+#: cui/uiconfig/ui/textanimtabpage.ui:161
 msgctxt "textanimtabpage|BTN_UP-atkobject"
 msgid "Up"
 msgstr "I fyny"
 
-#: textanimtabpage.ui:176
+#: cui/uiconfig/ui/textanimtabpage.ui:176
 msgctxt "textanimtabpage|BTN_RIGHT|tooltip_text"
 msgid "To right"
 msgstr "I'r dde"
 
-#: textanimtabpage.ui:182
+#: cui/uiconfig/ui/textanimtabpage.ui:182
 msgctxt "textanimtabpage|BTN_RIGHT-atkobject"
 msgid "Right"
 msgstr "De"
 
-#: textanimtabpage.ui:197
+#: cui/uiconfig/ui/textanimtabpage.ui:197
 msgctxt "textanimtabpage|BTN_LEFT|tooltip_text"
 msgid "To left"
 msgstr "I'r chwith"
 
-#: textanimtabpage.ui:203
+#: cui/uiconfig/ui/textanimtabpage.ui:203
 msgctxt "textanimtabpage|BTN_LEFT-atkobject"
 msgid "Left"
 msgstr "Chwith"
 
-#: textanimtabpage.ui:218
+#: cui/uiconfig/ui/textanimtabpage.ui:218
 msgctxt "textanimtabpage|BTN_DOWN|tooltip_text"
 msgid "To bottom"
 msgstr "I'r gwaelod"
 
-#: textanimtabpage.ui:224
+#: cui/uiconfig/ui/textanimtabpage.ui:224
 msgctxt "textanimtabpage|BTN_DOWN-atkobject"
 msgid "Down"
 msgstr "I lawr"
 
-#: textanimtabpage.ui:289
+#: cui/uiconfig/ui/textanimtabpage.ui:289
 msgctxt "textanimtabpage|TSB_START_INSIDE"
 msgid "S_tart inside"
 msgstr "Cychwyn ­­_tu fewn"
 
-#: textanimtabpage.ui:306
+#: cui/uiconfig/ui/textanimtabpage.ui:306
 msgctxt "textanimtabpage|TSB_STOP_INSIDE"
 msgid "Text _visible when exiting"
 msgstr "Testun yn ­_weladwy wrth adael"
 
-#: textanimtabpage.ui:326
+#: cui/uiconfig/ui/textanimtabpage.ui:326
 msgctxt "textanimtabpage|FT_COUNT"
 msgid "Animation cycles:"
 msgstr "Cylchoedd animeiddio:"
 
-#: textanimtabpage.ui:344
+#: cui/uiconfig/ui/textanimtabpage.ui:344
 msgctxt "textanimtabpage|TSB_ENDLESS"
 msgid "_Continuous"
 msgstr "_Di-dor"
 
-#: textanimtabpage.ui:390
+#: cui/uiconfig/ui/textanimtabpage.ui:389
 msgctxt "textanimtabpage|FT_AMOUNT"
 msgid "Increment:"
 msgstr "Cynyddiad:"
 
-#: textanimtabpage.ui:408
+#: cui/uiconfig/ui/textanimtabpage.ui:407
 msgctxt "textanimtabpage|TSB_PIXEL"
 msgid "_Pixels"
 msgstr "_Picseli"
 
-#: textanimtabpage.ui:454
+#: cui/uiconfig/ui/textanimtabpage.ui:452
 msgctxt "textanimtabpage|FT_DELAY"
 msgid "Delay:"
 msgstr "Oediad:"
 
-#: textanimtabpage.ui:472
+#: cui/uiconfig/ui/textanimtabpage.ui:470
 msgctxt "textanimtabpage|TSB_AUTO"
 msgid "_Automatic"
 msgstr "_Awtomatig"
 
-#: textanimtabpage.ui:522
+#: cui/uiconfig/ui/textanimtabpage.ui:519
 msgctxt "textanimtabpage|label2"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: textattrtabpage.ui:43
+#: cui/uiconfig/ui/textattrtabpage.ui:43
 msgctxt "textattrtabpage|TSB_AUTOGROW_WIDTH"
 msgid "Fit wi_dth to text"
 msgstr "Ffitio'r _lled i'r testun"
 
-#: textattrtabpage.ui:59
+#: cui/uiconfig/ui/textattrtabpage.ui:59
 msgctxt "textattrtabpage|TSB_AUTOGROW_HEIGHT"
 msgid "Fit h_eight to text"
 msgstr "Ffitio'r _uchder i'r testun"
 
-#: textattrtabpage.ui:75
+#: cui/uiconfig/ui/textattrtabpage.ui:75
 msgctxt "textattrtabpage|TSB_FIT_TO_SIZE"
 msgid "_Fit to frame"
 msgstr "Ffitio'r _ffrâm i'r testun"
 
-#: textattrtabpage.ui:91
+#: cui/uiconfig/ui/textattrtabpage.ui:91
 msgctxt "textattrtabpage|TSB_CONTOUR"
 msgid "_Adjust to contour"
 msgstr "Addasu i'r _amlinell"
 
-#: textattrtabpage.ui:113
+#: cui/uiconfig/ui/textattrtabpage.ui:113
 msgctxt "textattrtabpage|label1"
 msgid "Drawing Object Text"
 msgstr "Testun Gwrthrych Testun"
 
-#: textattrtabpage.ui:146
+#: cui/uiconfig/ui/textattrtabpage.ui:146
 msgctxt "textattrtabpage|TSB_WORDWRAP_TEXT"
 msgid "_Word wrap text in shape"
 msgstr "Amlapio testun i'r _siâp"
 
-#: textattrtabpage.ui:162
+#: cui/uiconfig/ui/textattrtabpage.ui:162
 msgctxt "textattrtabpage|TSB_AUTOGROW_SIZE"
 msgid "_Resize shape to fit text"
 msgstr "_Ailfaintioli'r siap i ffitio'r testun"
 
-#: textattrtabpage.ui:190
+#: cui/uiconfig/ui/textattrtabpage.ui:190
 msgctxt "textattrtabpage|label8"
 msgid "Custom Shape Text"
 msgstr "Testun Siâp Cyfaddas"
 
-#: textattrtabpage.ui:237
+#: cui/uiconfig/ui/textattrtabpage.ui:237
 msgctxt "textattrtabpage|label4"
 msgid "_Left:"
 msgstr "_Chwith:"
 
-#: textattrtabpage.ui:251
+#: cui/uiconfig/ui/textattrtabpage.ui:251
 msgctxt "textattrtabpage|label5"
 msgid "_Right:"
 msgstr "_De:"
 
-#: textattrtabpage.ui:265
+#: cui/uiconfig/ui/textattrtabpage.ui:265
 msgctxt "textattrtabpage|label6"
 msgid "_Top:"
 msgstr "_Brig:"
 
-#: textattrtabpage.ui:279
+#: cui/uiconfig/ui/textattrtabpage.ui:279
 msgctxt "textattrtabpage|label7"
 msgid "_Bottom:"
 msgstr "_Gwaelod:"
 
-#: textattrtabpage.ui:349
+#: cui/uiconfig/ui/textattrtabpage.ui:345
 msgctxt "textattrtabpage|label2"
 msgid "Spacing to Borders"
 msgstr "Bylchu i'r Borderi"
 
-#: textattrtabpage.ui:398
+#: cui/uiconfig/ui/textattrtabpage.ui:394
 msgctxt "textattrtabpage|TSB_FULL_WIDTH"
 msgid "Full _width"
 msgstr "Lled _llawn"
 
-#: textattrtabpage.ui:421
+#: cui/uiconfig/ui/textattrtabpage.ui:417
 msgctxt "textattrtabpage|label3"
 msgid "Text Anchor"
 msgstr "Angor Testun"
 
-#: textdialog.ui:8
+#: cui/uiconfig/ui/textdialog.ui:8
 msgctxt "textdialog|TextDialog"
 msgid "Text"
 msgstr "Testun"
 
-#: textdialog.ui:106
+#: cui/uiconfig/ui/textdialog.ui:106
 msgctxt "textdialog|RID_SVXPAGE_TEXTATTR"
 msgid "Text"
 msgstr "Testun"
 
-#: textdialog.ui:128
+#: cui/uiconfig/ui/textdialog.ui:128
 msgctxt "textdialog|RID_SVXPAGE_TEXTANIMATION"
 msgid "Text Animation"
 msgstr "Animeiddio Testun"
 
-#: textflowpage.ui:53
+#: cui/uiconfig/ui/textflowpage.ui:53
 msgctxt "textflowpage|checkAuto"
 msgid "A_utomatically"
 msgstr "_Awtomatig"
 
-#: textflowpage.ui:118
+#: cui/uiconfig/ui/textflowpage.ui:115
 msgctxt "textflowpage|labelLineEnd"
 msgid "C_haracters at line end"
 msgstr "_Nodau ar ddiwedd llinell"
 
-#: textflowpage.ui:132
+#: cui/uiconfig/ui/textflowpage.ui:129
 msgctxt "textflowpage|labelLineBegin"
 msgid "Cha_racters at line begin"
 msgstr "_Nodau ar ddechrau llinell"
 
-#: textflowpage.ui:146
+#: cui/uiconfig/ui/textflowpage.ui:143
 msgctxt "textflowpage|labelMaxNum"
 msgid "_Maximum number of consecutive hyphens"
 msgstr "_Uchafswm y nifer o gyplysnodau olynol"
 
-#: textflowpage.ui:163
+#: cui/uiconfig/ui/textflowpage.ui:160
 msgctxt "textflowpage|LabelHyphenation"
 msgid "Hyphenation"
 msgstr "Cysylltnodi"
 
-#: textflowpage.ui:196
+#: cui/uiconfig/ui/textflowpage.ui:193
 msgctxt "textflowpage|checkInsert"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: textflowpage.ui:212
+#: cui/uiconfig/ui/textflowpage.ui:209
 msgctxt "textflowpage|checkPageStyle"
 msgid "With page st_yle:"
 msgstr "Gydag arddull _tudalen:"
 
-#: textflowpage.ui:231
+#: cui/uiconfig/ui/textflowpage.ui:231
 msgctxt "textflowpage|labelType"
 msgid "_Type:"
 msgstr "_Math:"
 
-#: textflowpage.ui:260
+#: cui/uiconfig/ui/textflowpage.ui:259
 msgctxt "textflowpage|labelPageNum"
 msgid "Page _number:"
 msgstr "Rhif _tudalen:"
 
-#: textflowpage.ui:275
+#: cui/uiconfig/ui/textflowpage.ui:277
 msgctxt "textflowpage|labelPosition"
 msgid "Position:"
 msgstr "Safle:"
 
-#: textflowpage.ui:295
+#: cui/uiconfig/ui/textflowpage.ui:297
 msgctxt "textflowpage|comboPageStyle-atkobject"
 msgid "Page Style"
 msgstr "Arddull Tudalen"
 
-#: textflowpage.ui:309
+#: cui/uiconfig/ui/textflowpage.ui:311
 msgctxt "textflowpage|comboBreakType"
 msgid "Page"
 msgstr "Tudalen"
 
-#: textflowpage.ui:310
+#: cui/uiconfig/ui/textflowpage.ui:312
 msgctxt "textflowpage|comboBreakType"
 msgid "Column"
 msgstr "Colofn"
 
-#: textflowpage.ui:323
+#: cui/uiconfig/ui/textflowpage.ui:325
 msgctxt "textflowpage|comboBreakPosition"
 msgid "Before"
 msgstr "Cynt"
 
-#: textflowpage.ui:324
+#: cui/uiconfig/ui/textflowpage.ui:326
 msgctxt "textflowpage|comboBreakPosition"
 msgid "After"
 msgstr "Wedi"
 
-#: textflowpage.ui:343
+#: cui/uiconfig/ui/textflowpage.ui:345
 msgctxt "textflowpage|label3"
 msgid "Breaks"
 msgstr "Toriadau"
 
-#: textflowpage.ui:375
+#: cui/uiconfig/ui/textflowpage.ui:377
 msgctxt "textflowpage|checkSplitPara"
 msgid "_Do not split paragraph"
 msgstr "_Peidio hollti paragraffau"
 
-#: textflowpage.ui:391
+#: cui/uiconfig/ui/textflowpage.ui:393
 msgctxt "textflowpage|checkKeepPara"
 msgid "_Keep with next paragraph"
 msgstr "C_adw gyda'r paragraff nesaf"
 
-#: textflowpage.ui:407
+#: cui/uiconfig/ui/textflowpage.ui:409
 msgctxt "textflowpage|checkOrphan"
 msgid "_Orphan control"
 msgstr "Rheoli _amddifaid"
 
-#: textflowpage.ui:423
+#: cui/uiconfig/ui/textflowpage.ui:428
 msgctxt "textflowpage|checkWidow"
 msgid "_Widow control"
 msgstr "Rheoli _gweddwon"
 
-#: textflowpage.ui:473
+#: cui/uiconfig/ui/textflowpage.ui:479
 msgctxt "textflowpage|labelOrphan"
 msgid "lines"
 msgstr "llinellau"
 
-#: textflowpage.ui:485
+#: cui/uiconfig/ui/textflowpage.ui:491
 msgctxt "textflowpage|labelWidow"
 msgid "lines"
 msgstr "llinellau"
 
-#: textflowpage.ui:513
+#: cui/uiconfig/ui/textflowpage.ui:519
 msgctxt "textflowpage|labelOptions"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: thesaurus.ui:14
+#: cui/uiconfig/ui/thesaurus.ui:14
 msgctxt "thesaurus|ThesaurusDialog"
 msgid "Thesaurus"
 msgstr "Thesawrws"
 
-#: thesaurus.ui:43
+#: cui/uiconfig/ui/thesaurus.ui:43
 msgctxt "thesaurus|replace"
 msgid "_Replace"
 msgstr "_Newid"
 
-#: thesaurus.ui:89
+#: cui/uiconfig/ui/thesaurus.ui:89
 msgctxt "thesaurus|label1"
 msgid "Current word:"
 msgstr "Gair cyfredol:"
 
-#: thesaurus.ui:104
+#: cui/uiconfig/ui/thesaurus.ui:104
 msgctxt "thesaurus|label2"
 msgid "Alternatives:"
 msgstr "Eraill:"
 
-#: thesaurus.ui:119
+#: cui/uiconfig/ui/thesaurus.ui:119
 msgctxt "thesaurus|label3"
 msgid "Replace with:"
 msgstr "Newid gyda:"
 
-#: transparencytabpage.ui:25
+#: cui/uiconfig/ui/transparencytabpage.ui:25
 msgctxt "transparencytabpage|liststoreTYPE"
 msgid "Linear"
 msgstr "Llinol"
 
-#: transparencytabpage.ui:29
+#: cui/uiconfig/ui/transparencytabpage.ui:29
 msgctxt "transparencytabpage|liststoreTYPE"
 msgid "Axial"
 msgstr "Echelinol"
 
-#: transparencytabpage.ui:33
+#: cui/uiconfig/ui/transparencytabpage.ui:33
 msgctxt "transparencytabpage|liststoreTYPE"
 msgid "Radial"
 msgstr "Rheiddiol"
 
-#: transparencytabpage.ui:37
+#: cui/uiconfig/ui/transparencytabpage.ui:37
 msgctxt "transparencytabpage|liststoreTYPE"
 msgid "Ellipsoid"
 msgstr "Elipsoid"
 
-#: transparencytabpage.ui:41
+#: cui/uiconfig/ui/transparencytabpage.ui:41
 msgctxt "transparencytabpage|liststoreTYPE"
 msgid "Quadratic"
 msgstr "Cwadratig"
 
-#: transparencytabpage.ui:45
+#: cui/uiconfig/ui/transparencytabpage.ui:45
 msgctxt "transparencytabpage|liststoreTYPE"
 msgid "Square"
 msgstr "Sgwâr"
 
-#: transparencytabpage.ui:85
+#: cui/uiconfig/ui/transparencytabpage.ui:85
 msgctxt "transparencytabpage|RBT_TRANS_OFF"
 msgid "_No transparency"
 msgstr "_Dim tryloywder"
 
-#: transparencytabpage.ui:103
+#: cui/uiconfig/ui/transparencytabpage.ui:103
 msgctxt "transparencytabpage|RBT_TRANS_LINEAR"
 msgid "_Transparency:"
 msgstr "_Tryloywder:"
 
-#: transparencytabpage.ui:124
+#: cui/uiconfig/ui/transparencytabpage.ui:124
 msgctxt "transparencytabpage|RBT_TRANS_GRADIENT"
 msgid "_Gradient"
 msgstr "_Graddiant"
 
-#: transparencytabpage.ui:266
+#: cui/uiconfig/ui/transparencytabpage.ui:259
 msgctxt "transparencytabpage|FT_TRGR_TYPE"
 msgid "Ty_pe:"
 msgstr "_Math:"
 
-#: transparencytabpage.ui:287
+#: cui/uiconfig/ui/transparencytabpage.ui:280
 msgctxt "transparencytabpage|FT_TRGR_CENTER_X"
 msgid "Center _X:"
 msgstr "Canol _X:"
 
-#: transparencytabpage.ui:308
+#: cui/uiconfig/ui/transparencytabpage.ui:301
 msgctxt "transparencytabpage|FT_TRGR_CENTER_Y"
 msgid "Center _Y:"
 msgstr "Canol _Y:"
 
-#: transparencytabpage.ui:329
+#: cui/uiconfig/ui/transparencytabpage.ui:322
 msgctxt "transparencytabpage|FT_TRGR_ANGLE"
 msgid "_Angle:"
 msgstr "_Ongl:"
 
-#: transparencytabpage.ui:350
+#: cui/uiconfig/ui/transparencytabpage.ui:343
 msgctxt "transparencytabpage|FT_TRGR_BORDER"
 msgid "_Border:"
 msgstr "_Border:"
 
-#: transparencytabpage.ui:371
+#: cui/uiconfig/ui/transparencytabpage.ui:364
 msgctxt "transparencytabpage|FT_TRGR_START_VALUE"
 msgid "_Start value:"
 msgstr "_Gwerth cychwyn:"
 
-#: transparencytabpage.ui:392
+#: cui/uiconfig/ui/transparencytabpage.ui:385
 msgctxt "transparencytabpage|FT_TRGR_END_VALUE"
 msgid "_End value:"
 msgstr "_Gwerth diwedd:"
 
-#: transparencytabpage.ui:435
+#: cui/uiconfig/ui/transparencytabpage.ui:428
 msgctxt "transparencytabpage|CTL_BITMAP_PREVIEW-atkobject"
 msgid "Example"
 msgstr "Esiampl"
 
-#: transparencytabpage.ui:453
+#: cui/uiconfig/ui/transparencytabpage.ui:446
 msgctxt "transparencytabpage|CTL_TRANS_PREVIEW-atkobject"
 msgid "Example"
 msgstr "Esiampl"
 
-#: transparencytabpage.ui:494
+#: cui/uiconfig/ui/transparencytabpage.ui:487
 msgctxt "transparencytabpage|FL_PROP"
 msgid "Area Transparency Mode"
 msgstr "Modd Tryloywder Ardal"
 
-#: tsaurldialog.ui:7
+#: cui/uiconfig/ui/tsaurldialog.ui:7
 msgctxt "tsaurldialog|TSAURLDialog"
 msgid "Time Stamping Authority URLs"
 msgstr "URLau Awdurdod Stamp Amser"
 
-#: tsaurldialog.ui:35
+#: cui/uiconfig/ui/tsaurldialog.ui:35
 msgctxt "tsaurldialog|delete"
 msgid "_Delete..."
 msgstr "_Dileu..."
 
-#: tsaurldialog.ui:51
+#: cui/uiconfig/ui/tsaurldialog.ui:51
 msgctxt "tsaurldialog|add"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: tsaurldialog.ui:131
+#: cui/uiconfig/ui/tsaurldialog.ui:131
 msgctxt "tsaurldialog|label2"
 msgid "Add or delete Time Stamp Authority URLs"
 msgstr "Ychwanegu neu ddileu URLau Awdurdod Stamp Amser"
 
-#: tsaurldialog.ui:167
+#: cui/uiconfig/ui/tsaurldialog.ui:167
 msgctxt "tsaurldialog|enteraurl"
 msgid "Enter a Time Stamp Authority URL"
 msgstr "Rhowch URL Awdurdod Stamp Amser"
 
-#: tsaurldialog.ui:197
+#: cui/uiconfig/ui/tsaurldialog.ui:197
 msgctxt "tsaurldialog|label1"
 msgid "TSA URL"
 msgstr "URL TSA"
 
-#: twolinespage.ui:14
+#: cui/uiconfig/ui/twolinespage.ui:14
 msgctxt "twolinespage|liststore1"
 msgid "(None)"
 msgstr "(Dim)"
 
-#: twolinespage.ui:18
+#: cui/uiconfig/ui/twolinespage.ui:18
 msgctxt "twolinespage|liststore1"
 msgid "("
 msgstr "("
 
-#: twolinespage.ui:22
+#: cui/uiconfig/ui/twolinespage.ui:22
 msgctxt "twolinespage|liststore1"
 msgid "["
 msgstr "["
 
-#: twolinespage.ui:26
+#: cui/uiconfig/ui/twolinespage.ui:26
 msgctxt "twolinespage|liststore1"
 msgid "<"
 msgstr "<"
 
-#: twolinespage.ui:30
+#: cui/uiconfig/ui/twolinespage.ui:30
 msgctxt "twolinespage|liststore1"
 msgid "{"
 msgstr "{"
 
-#: twolinespage.ui:34
+#: cui/uiconfig/ui/twolinespage.ui:34
 msgctxt "twolinespage|liststore1"
 msgid "Other Characters..."
 msgstr "Nodau Eraill..."
 
-#: twolinespage.ui:48
+#: cui/uiconfig/ui/twolinespage.ui:48
 msgctxt "twolinespage|liststore2"
 msgid "(None)"
 msgstr "(Dim)"
 
-#: twolinespage.ui:52
+#: cui/uiconfig/ui/twolinespage.ui:52
 msgctxt "twolinespage|liststore2"
 msgid ")"
 msgstr ")"
 
-#: twolinespage.ui:56
+#: cui/uiconfig/ui/twolinespage.ui:56
 msgctxt "twolinespage|liststore2"
 msgid "]"
 msgstr "]"
 
-#: twolinespage.ui:60
+#: cui/uiconfig/ui/twolinespage.ui:60
 msgctxt "twolinespage|liststore2"
 msgid ">"
 msgstr ">"
 
-#: twolinespage.ui:64
+#: cui/uiconfig/ui/twolinespage.ui:64
 msgctxt "twolinespage|liststore2"
 msgid "}"
 msgstr "}"
 
-#: twolinespage.ui:68
+#: cui/uiconfig/ui/twolinespage.ui:68
 msgctxt "twolinespage|liststore2"
 msgid "Other Characters..."
 msgstr "Nodau Eraill..."
 
-#: twolinespage.ui:93
+#: cui/uiconfig/ui/twolinespage.ui:93
 msgctxt "twolinespage|twolines"
 msgid "Write in double lines"
 msgstr "Ysgrifennu mewn llinellau dwbl"
 
-#: twolinespage.ui:107
+#: cui/uiconfig/ui/twolinespage.ui:108
 msgctxt "twolinespage|label2"
 msgid "Double-lined"
 msgstr "Llinellu dwbl"
 
-#: twolinespage.ui:142
+#: cui/uiconfig/ui/twolinespage.ui:143
 msgctxt "twolinespage|label29"
 msgid "Initial character"
 msgstr "Nod cyntaf"
 
-#: twolinespage.ui:155
+#: cui/uiconfig/ui/twolinespage.ui:156
 msgctxt "twolinespage|label30"
 msgid "Final character"
 msgstr "Nod terfynol"
 
-#: twolinespage.ui:206
+#: cui/uiconfig/ui/twolinespage.ui:207
 msgctxt "twolinespage|label28"
 msgid "Enclosing Character"
 msgstr "Nod Amgáu"
 
-#: twolinespage.ui:233
+#: cui/uiconfig/ui/twolinespage.ui:234
 msgctxt "twolinespage|preview-atkobject"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: wordcompletionpage.ui:43
+#: cui/uiconfig/ui/wordcompletionpage.ui:43
 msgctxt "wordcompletionpage|delete"
 msgid "_Delete Entry"
 msgstr "_Dileu Cofnod"
 
-#: wordcompletionpage.ui:87
+#: cui/uiconfig/ui/wordcompletionpage.ui:87
 msgctxt "wordcompletionpage|label1"
 msgid "_Max. entries:"
 msgstr "_Uchafswm cofnodion:"
 
-#: wordcompletionpage.ui:126
+#: cui/uiconfig/ui/wordcompletionpage.ui:126
 msgctxt "wordcompletionpage|label2"
 msgid "Mi_n. word length:"
 msgstr "_Hyd leiaf gair:"
 
-#: wordcompletionpage.ui:172
+#: cui/uiconfig/ui/wordcompletionpage.ui:172
 msgctxt "wordcompletionpage|appendspace"
 msgid "_Append space"
 msgstr "_Bwlch atodi"
 
-#: wordcompletionpage.ui:187
+#: cui/uiconfig/ui/wordcompletionpage.ui:187
 msgctxt "wordcompletionpage|showastip"
 msgid "_Show as tip"
 msgstr "Dangos fel _cyngor"
 
-#: wordcompletionpage.ui:210
+#: cui/uiconfig/ui/wordcompletionpage.ui:210
 msgctxt "wordcompletionpage|enablewordcomplete"
 msgid "Enable word _completion"
 msgstr "_Galluogi cwblhau gair"
 
-#: wordcompletionpage.ui:246
+#: cui/uiconfig/ui/wordcompletionpage.ui:246
 msgctxt "wordcompletionpage|whenclosing"
 msgid "_When closing a document, remove the words collected from it from the list"
 msgstr "_Wrth gau dogfen, tynnu'r geiriau sydd wedi eu casglu oddi arno o'r rhestr"
 
-#: wordcompletionpage.ui:269
+#: cui/uiconfig/ui/wordcompletionpage.ui:269
 msgctxt "wordcompletionpage|collectwords"
 msgid "C_ollect words"
 msgstr "Ca_sglu geiriau"
 
-#: wordcompletionpage.ui:299
+#: cui/uiconfig/ui/wordcompletionpage.ui:299
 msgctxt "wordcompletionpage|label3"
 msgid "Acc_ept with:"
 msgstr "Derbyn _gyda:"
 
-#: zoomdialog.ui:14
+#: cui/uiconfig/ui/zoomdialog.ui:19
 msgctxt "zoomdialog|ZoomDialog"
 msgid "Zoom & View Layout"
 msgstr "Chwyddo a Golwg Cynllun"
 
-#: zoomdialog.ui:103
+#: cui/uiconfig/ui/zoomdialog.ui:112
 msgctxt "zoomdialog|optimal"
 msgid "Optimal"
 msgstr "Gorau"
 
-#: zoomdialog.ui:120
+#: cui/uiconfig/ui/zoomdialog.ui:129
 msgctxt "zoomdialog|fitwandh"
 msgid "Fit width and height"
 msgstr "Ffitio i'r lled a'r uchder"
 
-#: zoomdialog.ui:137
+#: cui/uiconfig/ui/zoomdialog.ui:146
 msgctxt "zoomdialog|fitw"
 msgid "Fit width"
 msgstr "Ffitio'r lled"
 
-#: zoomdialog.ui:154
+#: cui/uiconfig/ui/zoomdialog.ui:163
 msgctxt "zoomdialog|100pc"
 msgid "100%"
 msgstr "100%"
 
-#: zoomdialog.ui:176
+#: cui/uiconfig/ui/zoomdialog.ui:185
 msgctxt "zoomdialog|variable"
 msgid "Variable:"
 msgstr "Amrywiolyn:"
 
-#: zoomdialog.ui:204
+#: cui/uiconfig/ui/zoomdialog.ui:214
 msgctxt "zoomdialog|zoomsb-atkobject"
 msgid "Variable"
 msgstr "Newidiol"
 
-#: zoomdialog.ui:229
+#: cui/uiconfig/ui/zoomdialog.ui:239
 msgctxt "zoomdialog|label2"
 msgid "Zoom Factor"
 msgstr "Ffactor Chwyddo"
 
-#: zoomdialog.ui:262
+#: cui/uiconfig/ui/zoomdialog.ui:272
 msgctxt "zoomdialog|automatic"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: zoomdialog.ui:279
+#: cui/uiconfig/ui/zoomdialog.ui:288
 msgctxt "zoomdialog|singlepage"
 msgid "Single page"
 msgstr "Tudalen sengl"
 
-#: zoomdialog.ui:301
+#: cui/uiconfig/ui/zoomdialog.ui:310
 msgctxt "zoomdialog|columns"
 msgid "Columns:"
 msgstr "Colofnau:"
 
-#: zoomdialog.ui:332
+#: cui/uiconfig/ui/zoomdialog.ui:341
 msgctxt "zoomdialog|columnssb-atkobject"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: zoomdialog.ui:356
+#: cui/uiconfig/ui/zoomdialog.ui:365
 msgctxt "zoomdialog|bookmode"
 msgid "Book mode"
 msgstr "Modd llyfr"
 
-#: zoomdialog.ui:383
+#: cui/uiconfig/ui/zoomdialog.ui:393
 msgctxt "zoomdialog|label1"
 msgid "View Layout"
 msgstr "Golwg Cynllun"
diff --git a/source/cy/dbaccess/messages.po b/source/cy/dbaccess/messages.po
index 62c89d395aa..e3b138de7fe 100644
--- a/source/cy/dbaccess/messages.po
+++ b/source/cy/dbaccess/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: 2017-11-22 13:53+0100\n"
-"PO-Revision-Date: 2017-12-29 14:57+0000\n"
+"POT-Creation-Date: 2018-04-23 18:10+0200\n"
+"PO-Revision-Date: 2018-04-18 08:33+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,65 +13,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1514559439.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1524040433.000000\n"
 
-#: query.hrc:26
+#: dbaccess/inc/query.hrc:26
 msgctxt "RSC_QUERY_OBJECT_TYPE"
 msgid "The table view"
 msgstr "Y golwg tabl"
 
-#: query.hrc:27
+#: dbaccess/inc/query.hrc:27
 msgctxt "RSC_QUERY_OBJECT_TYPE"
 msgid "The query"
 msgstr "Yr ymholiad"
 
-#: query.hrc:28
+#: dbaccess/inc/query.hrc:28
 msgctxt "RSC_QUERY_OBJECT_TYPE"
 msgid "The SQL statement"
 msgstr "Datganiad SQL"
 
-#: strings.hrc:25
+#: dbaccess/inc/strings.hrc:25
 msgctxt "RID_STR_CONNECTION_INVALID"
 msgid "No connection could be established."
 msgstr "Methu creu cysylltiad."
 
-#: strings.hrc:26
+#: dbaccess/inc/strings.hrc:26
 msgctxt "RID_STR_TABLE_IS_FILTERED"
 msgid "The table $name$ already exists. It is not visible because it has been filtered out."
 msgstr "Mae'r tabl $name$ yn bodoli eisoes. Nid yw'n weladwy am ei fod wedi cael ei hidlo allan."
 
-#: strings.hrc:27
+#: dbaccess/inc/strings.hrc:27
 msgctxt "RID_STR_COULDNOTCONNECT_UNSPECIFIED"
 msgid "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective."
 msgstr "Methu creu cysylltiad â'r ffynhonnell data allanol. Digwyddodd gwall anhysbys. Mwy na thebyg mae'r ddisg yn wallus."
 
-#: strings.hrc:28
+#: dbaccess/inc/strings.hrc:28
 msgctxt "RID_STR_COULDNOTCONNECT_NODRIVER"
 msgid "The connection to the external data source could not be established. No SDBC driver was found for the URL '$name$'."
 msgstr "Methu creu cysylltiad â'r ffynhonnell data allanol. Doedd dim gyrwyr SDBC yn URL '$name$'."
 
-#: strings.hrc:29
+#: dbaccess/inc/strings.hrc:29
 msgctxt "RID_STR_COULDNOTLOAD_MANAGER"
 msgid "The connection to the external data source could not be established. The SDBC driver manager could not be loaded."
 msgstr "Methu creu cysylltiad â'r ffynhonnell data allanol. Methu llwytho rheolwr gyrrwr SDBC."
 
-#: strings.hrc:30
+#: dbaccess/inc/strings.hrc:30
 msgctxt "RID_STR_FORM"
 msgid "Form"
 msgstr "Ffurflen"
 
-#: strings.hrc:31
+#: dbaccess/inc/strings.hrc:31
 msgctxt "RID_STR_REPORT"
 msgid "Report"
 msgstr "Adroddiad"
 
-#: strings.hrc:32
+#: dbaccess/inc/strings.hrc:32
 msgctxt "RID_STR_DATASOURCE_NOT_STORED"
 msgid "The data source was not saved. Please use the interface XStorable to save the data source."
 msgstr "Nid yw'r ffynhonnell data wedi ei gadw. Defnyddiwch ryngwyneb XStorable i gadw'r ffynhonnell data."
 
-#: strings.hrc:33
+#: dbaccess/inc/strings.hrc:33
 msgctxt "RID_STR_ONLY_QUERY"
 msgid ""
 "The given command is not a SELECT statement.\n"
@@ -80,138 +80,138 @@ msgstr ""
 "Nid gosodiad SELECT yw'r gorchymyn yma.\n"
 "Dim ond ymholiadau sy'n cael eu caniatáu."
 
-#: strings.hrc:34
+#: dbaccess/inc/strings.hrc:34
 msgctxt "RID_STR_NO_VALUE_CHANGED"
 msgid "No values were modified."
 msgstr "Heb newid gwerthoedd."
 
-#: strings.hrc:35
+#: dbaccess/inc/strings.hrc:35
 msgctxt "RID_STR_NO_XROWUPDATE"
 msgid "Values could not be inserted. The XRowUpdate interface is not supported by ResultSet."
 msgstr "Methu mewnosod gwerthoedd. Nid yw rhyngwyneb XRowUpdate yn cael ei gynnal gan ResultSet."
 
-#: strings.hrc:36
+#: dbaccess/inc/strings.hrc:36
 msgctxt "RID_STR_NO_XRESULTSETUPDATE"
 msgid "Values could not be inserted. The XResultSetUpdate interface is not supported by ResultSet."
 msgstr "Methu mewnosod gwerthoedd. Nid yw rhyngwyneb XResultSetUpdate yn cael ei gynnal gan ResultSet."
 
-#: strings.hrc:37
+#: dbaccess/inc/strings.hrc:37
 msgctxt "RID_STR_NO_UPDATE_MISSING_CONDITION"
 msgid "Values could not be modified, due to a missing condition statement."
 msgstr "Methu newid gwerthoedd, oherwydd datganiad amod coll."
 
-#: strings.hrc:38
+#: dbaccess/inc/strings.hrc:38
 msgctxt "RID_STR_NO_COLUMN_ADD"
 msgid "The adding of columns is not supported."
 msgstr "Nid yw ychwanegu colofnau'n cael ei gynnal."
 
-#: strings.hrc:39
+#: dbaccess/inc/strings.hrc:39
 msgctxt "RID_STR_NO_COLUMN_DROP"
 msgid "The dropping of columns is not supported."
 msgstr "Nid yw gollwng colofnau'n cael ei gynnal."
 
-#: strings.hrc:40
+#: dbaccess/inc/strings.hrc:40
 msgctxt "RID_STR_NO_CONDITION_FOR_PK"
 msgid "The WHERE condition could not be created for the primary key."
 msgstr "Methu creu'r amod WHERE ar gyfer yr allwedd gynradd."
 
-#: strings.hrc:41
+#: dbaccess/inc/strings.hrc:41
 msgctxt "RID_STR_COLUMN_UNKNOWN_PROP"
 msgid "The column does not support the property '%value'."
 msgstr "Nid yw'r golofn yn cynnwys priodwedd '%value'."
 
-#: strings.hrc:42
+#: dbaccess/inc/strings.hrc:42
 msgctxt "RID_STR_COLUMN_NOT_SEARCHABLE"
 msgid "The column is not searchable!"
 msgstr "Nid yw'r golofn yn chwiliadwy!"
 
-#: strings.hrc:43
+#: dbaccess/inc/strings.hrc:43
 msgctxt "RID_STR_NOT_SEQUENCE_INT8"
 msgid "The value of the columns is not of the type Sequence<sal_Int8>."
 msgstr "Nid yw gwerth colofnau o fath Sequence<sal_Int8>."
 
-#: strings.hrc:44
+#: dbaccess/inc/strings.hrc:44
 msgctxt "RID_STR_COLUMN_NOT_VALID"
 msgid "The column is not valid."
 msgstr "Nid yw'r golofn yn ddilys."
 
-#: strings.hrc:45
+#: dbaccess/inc/strings.hrc:45
 #, c-format
 msgctxt "RID_STR_COLUMN_MUST_VISIBLE"
 msgid "The column '%name' must be visible as a column."
 msgstr "Rhaid i golofn '%name' fod yn weladwy fel colofn."
 
-#: strings.hrc:46
+#: dbaccess/inc/strings.hrc:46
 msgctxt "RID_STR_NO_XQUERIESSUPPLIER"
 msgid "The interface XQueriesSupplier is not available."
 msgstr "Nid yw rhyngwyneb XQueriesSupplier ar gael."
 
-#: strings.hrc:47
+#: dbaccess/inc/strings.hrc:47
 msgctxt "RID_STR_NO_ABS_ZERO"
 msgid "An 'absolute(0)' call is not allowed."
 msgstr "Mae galwad 'absoliwt(0)' yn waharddedig."
 
-#: strings.hrc:48
+#: dbaccess/inc/strings.hrc:48
 msgctxt "RID_STR_NO_RELATIVE"
 msgid "Relative positioning is not allowed in this state."
 msgstr "Nid yw safle cymharol yn cael ei ganiatáu yn y cyflwr hwn."
 
-#: strings.hrc:49
+#: dbaccess/inc/strings.hrc:49
 msgctxt "RID_STR_NO_REFESH_AFTERLAST"
 msgid "A row cannot be refreshed when the ResultSet is positioned after the last row."
 msgstr "Nid oes modd adnewyddu rhes pan mae'r ResultSet wedi ei osod ar ôl y rhes olaf."
 
-#: strings.hrc:50
+#: dbaccess/inc/strings.hrc:50
 msgctxt "RID_STR_NO_MOVETOINSERTROW_CALLED"
 msgid "A new row cannot be inserted when the ResultSet is not first moved to the insert row."
 msgstr "Nid oes modd mewnosod rhes newydd pan nad yw ResultSet wedi ei symud yn gyntaf i'r rhes mewnosod."
 
-#: strings.hrc:51
+#: dbaccess/inc/strings.hrc:51
 msgctxt "RID_STR_NO_UPDATEROW"
 msgid "A row cannot be modified in this state"
 msgstr "Nid oes modd newid rhes yn y cyflwr hwn"
 
-#: strings.hrc:52
+#: dbaccess/inc/strings.hrc:52
 msgctxt "RID_STR_NO_DELETEROW"
 msgid "A row cannot be deleted in this state."
 msgstr "Nid oes modd dileu rhes yn y cyflwr hwn."
 
-#: strings.hrc:53
+#: dbaccess/inc/strings.hrc:53
 msgctxt "RID_STR_NO_TABLE_RENAME"
 msgid "The driver does not support table renaming."
 msgstr "Nid yw'r gyrrwr yn cynnal ailenwi tabl."
 
-#: strings.hrc:54
+#: dbaccess/inc/strings.hrc:54
 msgctxt "RID_STR_COLUMN_ALTER_BY_NAME"
 msgid "The driver does not support the modification of column descriptions by changing the name."
 msgstr "Nid yw'r gyrrwr yn cynnal newid disgrifiad colofnau drwy newid yr enw."
 
-#: strings.hrc:55
+#: dbaccess/inc/strings.hrc:55
 msgctxt "RID_STR_COLUMN_ALTER_BY_INDEX"
 msgid "The driver does not support the modification of column descriptions by changing the index."
 msgstr "Nid yw'r gyrrwr yn cynnal newid disgrifiad colofnau drwy newid y mynegai."
 
-#: strings.hrc:56
+#: dbaccess/inc/strings.hrc:56
 msgctxt "RID_STR_FILE_DOES_NOT_EXIST"
 msgid "The file \"$file$\" does not exist."
 msgstr "Nid yw ffeil \"$file$\" yn bodoli."
 
-#: strings.hrc:57
+#: dbaccess/inc/strings.hrc:57
 msgctxt "RID_STR_TABLE_DOES_NOT_EXIST"
 msgid "There exists no table named \"$table$\"."
 msgstr "Nid oes tabl o'r enw \"$table$\"."
 
-#: strings.hrc:58
+#: dbaccess/inc/strings.hrc:58
 msgctxt "RID_STR_QUERY_DOES_NOT_EXIST"
 msgid "There exists no query named \"$table$\"."
 msgstr "Dim ymholiad o'r enw \"$table$\" yn bodoli."
 
-#: strings.hrc:59
+#: dbaccess/inc/strings.hrc:59
 msgctxt "RID_STR_CONFLICTING_NAMES"
 msgid "There are tables in the database whose names conflict with the names of existing queries. To make full use of all queries and tables, make sure they have distinct names."
 msgstr "Mae tablau yn y gronfa ddata sy'n gwrthdaro gydag enwau'r ymholiadau presennol. I wneud defnydd llawn o'r holl ymholiadau a thablau, gwnewch yn siŵr fod ganddynt enwau unigryw."
 
-#: strings.hrc:60
+#: dbaccess/inc/strings.hrc:60
 msgctxt "RID_STR_COMMAND_LEADING_TO_ERROR"
 msgid ""
 "The SQL command leading to this error is:\n"
@@ -222,42 +222,42 @@ msgstr ""
 "\n"
 "$command$"
 
-#: strings.hrc:61
+#: dbaccess/inc/strings.hrc:61
 msgctxt "RID_STR_STATEMENT_WITHOUT_RESULT_SET"
 msgid "The SQL command does not describe a result set."
 msgstr "Nid yw gorchymyn yr SQL yn disgrifio'r canlyniad a osodwyd."
 
-#: strings.hrc:62
+#: dbaccess/inc/strings.hrc:62
 msgctxt "RID_STR_NAME_MUST_NOT_BE_EMPTY"
 msgid "The name must not be empty."
 msgstr "Rhaid i'r enw beidio â bod yn wag."
 
-#: strings.hrc:63
+#: dbaccess/inc/strings.hrc:63
 msgctxt "RID_STR_NO_NULL_OBJECTS_IN_CONTAINER"
 msgid "The container cannot contain NULL objects."
 msgstr "Ni all y cynhwysydd gynnwys gwrthrychau NULL."
 
-#: strings.hrc:64
+#: dbaccess/inc/strings.hrc:64
 msgctxt "RID_STR_NAME_ALREADY_USED"
 msgid "There already is an object with the given name."
 msgstr "Mae eisoes gwrthrych gyda'r enw yna."
 
-#: strings.hrc:65
+#: dbaccess/inc/strings.hrc:65
 msgctxt "RID_STR_OBJECT_CONTAINER_MISMATCH"
 msgid "This object cannot be part of this container."
 msgstr "Ni all y gwrthrych fod yn rhan o'r cynhwysydd yma."
 
-#: strings.hrc:66
+#: dbaccess/inc/strings.hrc:66
 msgctxt "RID_STR_OBJECT_ALREADY_CONTAINED"
 msgid "The object already is, with a different name, part of the container."
 msgstr "Mae'r gwrthrych eisoes yn rhan o'r cynhwysydd ond mae iddo enw arall."
 
-#: strings.hrc:67
+#: dbaccess/inc/strings.hrc:67
 msgctxt "RID_STR_NAME_NOT_FOUND"
 msgid "Unable to find the document '$name$'."
 msgstr "Methu canfod y ddogfen '$name$'."
 
-#: strings.hrc:68
+#: dbaccess/inc/strings.hrc:68
 msgctxt "RID_STR_ERROR_WHILE_SAVING"
 msgid ""
 "Could not save the document to $location$:\n"
@@ -266,7 +266,7 @@ msgstr ""
 "Methu cadw'r ddogfen i $location$:\n"
 "$message$"
 
-#: strings.hrc:69
+#: dbaccess/inc/strings.hrc:69
 msgctxt "RID_NO_SUCH_DATA_SOURCE"
 msgid ""
 "Error accessing data source '$name$':\n"
@@ -275,445 +275,445 @@ msgstr ""
 "Gwall wrth geisio mynediad i ffynhonnell data '$name$':\n"
 "$error$"
 
-#: strings.hrc:70
+#: dbaccess/inc/strings.hrc:70
 msgctxt "RID_STR_NO_SUB_FOLDER"
 msgid "There exists no folder named \"$folder$\"."
 msgstr "Nid oes ffolder o'r enw \"$folder$\"."
 
-#: strings.hrc:71
+#: dbaccess/inc/strings.hrc:71
 msgctxt "RID_STR_NO_DELETE_BEFORE_AFTER"
 msgid "Cannot delete the before-first or after-last row."
 msgstr "Methu dilwu'r rhes cyn-cyntaf na wedi'r-olaf."
 
-#: strings.hrc:72
+#: dbaccess/inc/strings.hrc:72
 msgctxt "RID_STR_NO_DELETE_INSERT_ROW"
 msgid "Cannot delete the insert-row."
 msgstr "Methu dileu'r rhes-mewnosod."
 
-#: strings.hrc:73
+#: dbaccess/inc/strings.hrc:73
 msgctxt "RID_STR_RESULT_IS_READONLY"
 msgid "Result set is read only."
 msgstr "Canlyniad wedi ei osod fel darllen yn unig."
 
-#: strings.hrc:74
+#: dbaccess/inc/strings.hrc:74
 msgctxt "RID_STR_NO_DELETE_PRIVILEGE"
 msgid "DELETE privilege not available."
 msgstr "Nid yw breintiau DELETE ar gael."
 
-#: strings.hrc:75
+#: dbaccess/inc/strings.hrc:75
 msgctxt "RID_STR_ROW_ALREADY_DELETED"
 msgid "Current row is already deleted."
 msgstr "Mae'r rhes yma eisoes wedi ei dileu."
 
-#: strings.hrc:76
+#: dbaccess/inc/strings.hrc:76
 msgctxt "RID_STR_UPDATE_FAILED"
 msgid "Current row could not be updated."
 msgstr "Methu diweddaru'r rhes gyfredol."
 
-#: strings.hrc:77
+#: dbaccess/inc/strings.hrc:77
 msgctxt "RID_STR_NO_INSERT_PRIVILEGE"
 msgid "INSERT privilege not available."
 msgstr "Nid yw breintiau INSERT ar gael."
 
-#: strings.hrc:78
+#: dbaccess/inc/strings.hrc:78
 msgctxt "RID_STR_INTERNAL_ERROR"
 msgid "Internal error: no statement object provided by the database driver."
 msgstr "Gwall mewnol: dim datganiad gwrthrych wedi ei ddarparu gan yrrwr y gronfa ddata."
 
-#: strings.hrc:79
+#: dbaccess/inc/strings.hrc:79
 msgctxt "RID_STR_EXPRESSION1"
 msgid "Expression1"
 msgstr "Expression1"
 
-#: strings.hrc:80
+#: dbaccess/inc/strings.hrc:80
 msgctxt "RID_STR_NO_SQL_COMMAND"
 msgid "No SQL command was provided."
 msgstr "Heb ddarparu gorchymyn SQL."
 
-#: strings.hrc:81
+#: dbaccess/inc/strings.hrc:81
 msgctxt "RID_STR_INVALID_INDEX"
 msgid "Invalid column index."
 msgstr "Mynegai colofn annilys."
 
-#: strings.hrc:82
+#: dbaccess/inc/strings.hrc:82
 msgctxt "RID_STR_INVALID_CURSOR_STATE"
 msgid "Invalid cursor state."
 msgstr "Cyflwr cyrchwr annilys."
 
-#: strings.hrc:83
+#: dbaccess/inc/strings.hrc:83
 msgctxt "RID_STR_CURSOR_BEFORE_OR_AFTER"
 msgid "The cursor points to before the first or after the last row."
 msgstr "Mae'r cyrchwr yn cyfeirio at gyn y rhes gyntaf neu ar ôl yr olaf."
 
-#: strings.hrc:84
+#: dbaccess/inc/strings.hrc:84
 msgctxt "RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER"
 msgid "The rows before the first and after the last row don't have a bookmark."
 msgstr "Nid oes gan y rhes cyn y cyntaf ac ar ôl y rhes olaf nod tudalen."
 
-#: strings.hrc:85
+#: dbaccess/inc/strings.hrc:85
 msgctxt "RID_STR_NO_BOOKMARK_DELETED"
 msgid "The current row is deleted, and thus doesn't have a bookmark."
 msgstr "Mae'r rhes yma wedi ei dileu ac felly nid oes ganddi nod tudalen."
 
-#: strings.hrc:86
+#: dbaccess/inc/strings.hrc:86
 msgctxt "RID_STR_CONNECTION_REQUEST"
 msgid "A connection for the following URL was requested \"$name$\"."
 msgstr "Cafwyd cais i wendu cysylltiad â'r URL canlynol \"$name$\"."
 
-#: strings.hrc:87
+#: dbaccess/inc/strings.hrc:87
 msgctxt "RID_STR_MISSING_EXTENSION"
 msgid "The extension is not installed."
 msgstr "Nid yw'r estyniad wedi ei osod."
 
-#: strings.hrc:89
+#: dbaccess/inc/strings.hrc:89
 msgctxt "STR_QUERY_AND_TABLE_DISTINCT_NAMES"
 msgid "You cannot give a table and a query the same name. Please use a name which is not yet used by a query or table."
 msgstr "Nid oes modd rhoi'r un enw i dabl ac ymholiad. Defnyddiwch enw nad yw wedi ei ddefnyddio ar gyfer ymholiad na thabl."
 
-#: strings.hrc:90
+#: dbaccess/inc/strings.hrc:90
 msgctxt "STR_BASENAME_TABLE"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:91
+#: dbaccess/inc/strings.hrc:91
 msgctxt "STR_BASENAME_QUERY"
 msgid "Query"
 msgstr "Ymholiad"
 
-#: strings.hrc:92
+#: dbaccess/inc/strings.hrc:92
 msgctxt "STR_CONN_WITHOUT_QUERIES_OR_TABLES"
 msgid "The given connection is no valid query and/or tables supplier."
 msgstr "Nid yw'r cysylltiad yn ddarparwr tablau neu/ac ymholiad dilys."
 
-#: strings.hrc:93
+#: dbaccess/inc/strings.hrc:93
 msgctxt "STR_NO_TABLE_OBJECT"
 msgid "The given object is no table object."
 msgstr "Nid gwrthrych tabl yw'r gwrthrych yna."
 
-#: strings.hrc:94
+#: dbaccess/inc/strings.hrc:94
 msgctxt "STR_INVALID_COMPOSITION_TYPE"
 msgid "Invalid composition type - need a value from com.sun.star.sdb.tools.CompositionType."
 msgstr "Math cyfansoddiad anghywir - mae angen gwerth o com.sun.star.sdb.tools.CompositionType."
 
-#: strings.hrc:95
+#: dbaccess/inc/strings.hrc:95
 msgctxt "STR_INVALID_COMMAND_TYPE"
 msgid "Invalid command type - only TABLE and QUERY from com.sun.star.sdb.CommandType are allowed."
 msgstr "Math o orchymyn annilys - dim ond TABLE a QUERY gan com.sun.star.sdb.CommandType sy'n cael eu caniatáu."
 
-#: strings.hrc:97
+#: dbaccess/inc/strings.hrc:97
 msgctxt "STR_STATE_CLOSE_SUB_DOCS"
 msgid "Prepare"
 msgstr "Paratoi"
 
-#: strings.hrc:98
+#: dbaccess/inc/strings.hrc:98
 msgctxt "STR_STATE_BACKUP_DBDOC"
 msgid "Backup Document"
 msgstr "Gwybodaeth Wrth gefn"
 
-#: strings.hrc:99
+#: dbaccess/inc/strings.hrc:99
 msgctxt "STR_STATE_MIGRATE"
 msgid "Migrate"
 msgstr "Mudo"
 
-#: strings.hrc:100
+#: dbaccess/inc/strings.hrc:100
 msgctxt "STR_STATE_SUMMARY"
 msgid "Summary"
 msgstr "Crynodeb"
 
 #. To translators: This refers to a form documen    t inside a database document.
-#: strings.hrc:102
+#: dbaccess/inc/strings.hrc:102
 msgctxt "STR_FORM"
 msgid "Form '$name$'"
 msgstr "Ffurflen '$name$'"
 
 #. To translators: This refers to a report docum    ent inside a database document.
-#: strings.hrc:104
+#: dbaccess/inc/strings.hrc:104
 msgctxt "STR_REPORT"
 msgid "Report '$name$'"
 msgstr "Adroddiad '$name$'"
 
-#: strings.hrc:105
+#: dbaccess/inc/strings.hrc:105
 msgctxt "STR_OVERALL_PROGRESS"
 msgid "document $current$ of $overall$"
 msgstr "dogfen $current$ o $overall$"
 
-#: strings.hrc:106
+#: dbaccess/inc/strings.hrc:106
 msgctxt "STR_DATABASE_DOCUMENT"
 msgid "Database Document"
 msgstr "Dogfen Cronfa Ddata"
 
-#: strings.hrc:107
+#: dbaccess/inc/strings.hrc:107
 msgctxt "STR_SAVED_COPY_TO"
 msgid "saved copy to $location$"
 msgstr "wedi cadw copi i $location$"
 
-#: strings.hrc:108
+#: dbaccess/inc/strings.hrc:108
 msgctxt "STR_MOVED_LIBRARY"
 msgid "migrated $type$ library '$old$' to '$new$'"
 msgstr "mudo llyfrgell $type$ '$old$' i '$new$'"
 
-#: strings.hrc:109
+#: dbaccess/inc/strings.hrc:109
 msgctxt "STR_LIBRARY_TYPE_AND_NAME"
 msgid "$type$ library '$library$'"
 msgstr "llyfrgell $type$ '$library$'"
 
-#: strings.hrc:110
+#: dbaccess/inc/strings.hrc:110
 msgctxt "STR_MIGRATING_LIBS"
 msgid "migrating libraries ..."
 msgstr "mudo llyfrgelloedd ..."
 
-#: strings.hrc:111
+#: dbaccess/inc/strings.hrc:111
 msgctxt "STR_OOO_BASIC"
 msgid "%PRODUCTNAME Basic"
 msgstr "Basic %PRODUCTNAME"
 
-#: strings.hrc:112
+#: dbaccess/inc/strings.hrc:112
 msgctxt "STR_JAVA_SCRIPT"
 msgid "JavaScript"
 msgstr "JavaScript"
 
-#: strings.hrc:113
+#: dbaccess/inc/strings.hrc:113
 msgctxt "STR_BEAN_SHELL"
 msgid "BeanShell"
 msgstr "BeanShell"
 
-#: strings.hrc:114
+#: dbaccess/inc/strings.hrc:114
 msgctxt "STR_JAVA"
 msgid "Java"
 msgstr "Java"
 
-#: strings.hrc:115
+#: dbaccess/inc/strings.hrc:115
 msgctxt "STR_PYTHON"
 msgid "Python"
 msgstr "Python"
 
-#: strings.hrc:116
+#: dbaccess/inc/strings.hrc:116
 msgctxt "STR_DIALOG"
 msgid "dialog"
 msgstr "deialog"
 
-#: strings.hrc:117
+#: dbaccess/inc/strings.hrc:117
 msgctxt "STR_ERRORS"
 msgid "Error(s)"
 msgstr "Gwall(au)"
 
-#: strings.hrc:118
+#: dbaccess/inc/strings.hrc:118
 msgctxt "STR_WARNINGS"
 msgid "Warnings"
 msgstr "Rhybuddion"
 
-#: strings.hrc:119
+#: dbaccess/inc/strings.hrc:119
 msgctxt "STR_EXCEPTION"
 msgid "caught exception:"
 msgstr "eithriadau cipiwyd:"
 
-#: strings.hrc:120
+#: dbaccess/inc/strings.hrc:120
 msgctxt "STR_INVALID_BACKUP_LOCATION"
 msgid "You need to choose a backup location other than the document location itself."
 msgstr "Rhaid dewis lleoliad wrth gefn ar wahân i leoliad y ddogfen ei hun."
 
-#: strings.hrc:121
+#: dbaccess/inc/strings.hrc:121
 msgctxt "STR_INVALID_NUMBER_ARGS"
 msgid "Invalid number of initialization arguments. Expected 1."
 msgstr "Nifer o ymresymiadau cychwyn annilys. Disgwyl 1."
 
-#: strings.hrc:122
+#: dbaccess/inc/strings.hrc:122
 msgctxt "STR_NO_DATABASE"
 msgid "No database document found in the initialization arguments."
 msgstr "Heb ganfod dogfen cronfa ddata yn yr ymresymiadau cychwynnol."
 
-#: strings.hrc:123
+#: dbaccess/inc/strings.hrc:123
 msgctxt "STR_NOT_READONLY"
 msgid "Not applicable to read-only documents."
 msgstr "Nid yw'n berthnasol i ddogfennau darllen yn unig."
 
-#: strings.hrc:125
+#: dbaccess/inc/strings.hrc:125
 msgctxt "STR_QUERY_UNDO_TABWINSHOW"
 msgid "Add Table Window"
 msgstr "Ychwanegu Ffenestr Tabl"
 
-#: strings.hrc:126
+#: dbaccess/inc/strings.hrc:126
 msgctxt "STR_QUERY_UNDO_MOVETABWIN"
 msgid "Move table window"
 msgstr "Symud ffenestr tabl"
 
-#: strings.hrc:127
+#: dbaccess/inc/strings.hrc:127
 msgctxt "STR_QUERY_UNDO_INSERTCONNECTION"
 msgid "Insert Join"
 msgstr "Mewnosod Uniad"
 
-#: strings.hrc:128
+#: dbaccess/inc/strings.hrc:128
 msgctxt "STR_QUERY_UNDO_REMOVECONNECTION"
 msgid "Delete Join"
 msgstr "Dileu Uniad"
 
-#: strings.hrc:129
+#: dbaccess/inc/strings.hrc:129
 msgctxt "STR_QUERY_UNDO_SIZETABWIN"
 msgid "Resize table window"
 msgstr "Newid maint ffenestr tabl"
 
-#: strings.hrc:130
+#: dbaccess/inc/strings.hrc:130
 msgctxt "STR_QUERY_UNDO_TABFIELDDELETE"
 msgid "Delete Column"
 msgstr "Dileu Colofn"
 
-#: strings.hrc:131
+#: dbaccess/inc/strings.hrc:131
 msgctxt "STR_QUERY_UNDO_TABFIELDMOVED"
 msgid "Move column"
 msgstr "Symud colofn"
 
-#: strings.hrc:132
+#: dbaccess/inc/strings.hrc:132
 msgctxt "STR_QUERY_UNDO_TABFIELDCREATE"
 msgid "Add Column"
 msgstr "Ychwanegu Colofn"
 
-#: strings.hrc:133
+#: dbaccess/inc/strings.hrc:133
 msgctxt "RID_STR_FIELD_DOESNT_EXIST"
 msgid "Invalid expression, field name '$name$' does not exist."
 msgstr "Mynegiad annilys, nid yw enw maes '$name$' yn bodoli."
 
-#: strings.hrc:134
+#: dbaccess/inc/strings.hrc:134
 msgctxt "STR_QUERY_UNDO_TABWINDELETE"
 msgid "Delete Table Window"
 msgstr "Dileu Ffenestr Tabl"
 
-#: strings.hrc:135
+#: dbaccess/inc/strings.hrc:135
 msgctxt "STR_QUERY_UNDO_MODIFY_CELL"
 msgid "Edit Column Description"
 msgstr "Golygu Disgrifiad Colofn"
 
-#: strings.hrc:136
+#: dbaccess/inc/strings.hrc:136
 msgctxt "STR_QUERY_UNDO_SIZE_COLUMN"
 msgid "Adjust column width"
 msgstr "Newid lled colofn"
 
-#: strings.hrc:137
+#: dbaccess/inc/strings.hrc:137
 msgctxt "STR_QUERY_SORTTEXT"
 msgid "(not sorted);ascending;descending"
 msgstr "(heb drefnu);esgyn;gostwng"
 
-#: strings.hrc:138
+#: dbaccess/inc/strings.hrc:138
 msgctxt "STR_QUERY_FUNCTIONS"
 msgid "(no function);Group"
 msgstr "(dim swyddogaeth);Grŵp"
 
-#: strings.hrc:139
+#: dbaccess/inc/strings.hrc:139
 msgctxt "STR_QUERY_NOTABLE"
 msgid "(no table)"
 msgstr "(dim tabl)"
 
-#: strings.hrc:140
+#: dbaccess/inc/strings.hrc:140
 msgctxt "STR_QRY_ORDERBY_UNRELATED"
 msgid "The database only supports sorting for visible fields."
 msgstr "Dim ond trefnu meysydd gweladwy mae'r gronfa ddata'n ei gynnal."
 
-#: strings.hrc:141
+#: dbaccess/inc/strings.hrc:141
 msgctxt "STR_QUERY_HANDLETEXT"
 msgid "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or"
 msgstr "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or"
 
-#: strings.hrc:142
+#: dbaccess/inc/strings.hrc:142
 msgctxt "STR_QUERY_LIMIT_ALL"
 msgid "All"
 msgstr "Popeth"
 
-#: strings.hrc:143
+#: dbaccess/inc/strings.hrc:143
 msgctxt "STR_QRY_TOO_MANY_COLUMNS"
 msgid "There are too many columns."
 msgstr "Mae yna ormod o golofnau."
 
-#: strings.hrc:144
+#: dbaccess/inc/strings.hrc:144
 msgctxt "STR_QRY_CRITERIA_ON_ASTERISK"
 msgid "A condition cannot be applied to field [*]"
 msgstr "Methu gosod amod i faes [*]"
 
-#: strings.hrc:145
+#: dbaccess/inc/strings.hrc:145
 msgctxt "STR_QRY_TOO_LONG_STATEMENT"
 msgid "The SQL statement created is too long."
 msgstr "Mae'r datganiad SQL grëwyd yn rhy hir."
 
-#: strings.hrc:146
+#: dbaccess/inc/strings.hrc:146
 msgctxt "STR_QRY_TOOCOMPLEX"
 msgid "Query is too complex"
 msgstr "Mae'r ymholiad yn rhy gymhleth"
 
-#: strings.hrc:147
+#: dbaccess/inc/strings.hrc:147
 msgctxt "STR_QRY_NOSELECT"
 msgid "Nothing has been selected."
 msgstr "Dim wedi ei ddewis."
 
-#: strings.hrc:148
+#: dbaccess/inc/strings.hrc:148
 msgctxt "STR_QRY_SYNTAX"
 msgid "SQL syntax error"
 msgstr "Gwall cystrawen SQL"
 
-#: strings.hrc:149
+#: dbaccess/inc/strings.hrc:149
 msgctxt "STR_QRY_ORDERBY_ON_ASTERISK"
 msgid "[*] cannot be used as a sort criterion."
 msgstr "methu defnyddio [*] fel maen prawf trefnu."
 
-#: strings.hrc:150
+#: dbaccess/inc/strings.hrc:150
 msgctxt "STR_QRY_TOO_MANY_TABLES"
 msgid "There are too many tables."
 msgstr "Gormod o dablau."
 
-#: strings.hrc:151
+#: dbaccess/inc/strings.hrc:151
 msgctxt "STR_QRY_NATIVE"
 msgid "The statement will not be applied when querying in the SQL dialect of the database."
 msgstr "Ni fydd y datganiad yn cael ei osod wrth ymholi i dafodiaith SQL y gronfa ddata."
 
-#: strings.hrc:152
+#: dbaccess/inc/strings.hrc:152
 msgctxt "STR_QRY_ILLEGAL_JOIN"
 msgid "Join could not be processed"
 msgstr "Methu prosesu uniad"
 
-#: strings.hrc:153
+#: dbaccess/inc/strings.hrc:153
 msgctxt "STR_SVT_SQL_SYNTAX_ERROR"
 msgid "Syntax error in SQL statement"
 msgstr "Gwall cystrawen yn natganiad SQL"
 
-#: strings.hrc:154
+#: dbaccess/inc/strings.hrc:154
 msgctxt "STR_QUERYDESIGN_NO_VIEW_SUPPORT"
 msgid "This database does not support table views."
 msgstr "Nid yw'r gronfa ddata'n cynnal golwg tabl."
 
-#: strings.hrc:155
+#: dbaccess/inc/strings.hrc:155
 msgctxt "STR_NO_ALTER_VIEW_SUPPORT"
 msgid "This database does not support altering of existing table views."
 msgstr "Nid yw'r gronfa ddata'n cynnal newid y golwg tabl presennol."
 
-#: strings.hrc:156
+#: dbaccess/inc/strings.hrc:156
 msgctxt "STR_QUERYDESIGN_NO_VIEW_ASK"
 msgid "Do you want to create a query instead?"
 msgstr "Hoffech chi greu ymholiad yn lle hynny?"
 
-#: strings.hrc:157
+#: dbaccess/inc/strings.hrc:157
 msgctxt "STR_DATASOURCE_DELETED"
 msgid "The corresponding data source has been deleted. Therefore, data relevant to that data source cannot be saved."
 msgstr "Mae'r ffynhonnell data cyfatebol wedi ei ddileu. Felly nid oes modd cadw data sy'n berthnasol i'r ffynhonnell data honno."
 
-#: strings.hrc:158
+#: dbaccess/inc/strings.hrc:158
 msgctxt "STR_QRY_COLUMN_NOT_FOUND"
 msgid "The column '$name$' is unknown."
 msgstr "Mae colofn '$name$' yn anhysbys."
 
-#: strings.hrc:159
+#: dbaccess/inc/strings.hrc:159
 msgctxt "STR_QRY_JOIN_COLUMN_COMPARE"
 msgid "Columns can only be compared using '='."
 msgstr "Dim ond gyda '=' mae modd cymharu colofnau."
 
-#: strings.hrc:160
+#: dbaccess/inc/strings.hrc:160
 msgctxt "STR_QRY_LIKE_LEFT_NO_COLUMN"
 msgid "You must use a column name before 'LIKE'."
 msgstr "Rhaid defnyddio enw colofn cyn 'LIKE'."
 
-#: strings.hrc:161
+#: dbaccess/inc/strings.hrc:161
 msgctxt "STR_QRY_CHECK_CASESENSITIVE"
 msgid "The column could not be found. Please note that the database is case-sensitive."
 msgstr "Methu canfod y golofn. Sylwch fod y gronfa ddata'n sensitif i lythrennau bach a mawr."
 
 #. To translators: For $object$, one of the valu    es of the RSC_QUERY_OBJECT_TYPE resource will be inserted.
-#: strings.hrc:163
+#: dbaccess/inc/strings.hrc:163
 msgctxt "STR_QUERY_SAVEMODIFIED"
 msgid ""
 "$object$ has been changed.\n"
@@ -723,233 +723,233 @@ msgstr ""
 "Hoffech chi gadw'r newid?"
 
 #. To translators: For $object$, one of the valu    es of the RSC_QUERY_OBJECT_TYPE resource (except \"SQL command\", which doesn't make sense here) will be inserted.
-#: strings.hrc:165
+#: dbaccess/inc/strings.hrc:165
 msgctxt "STR_ERROR_PARSING_STATEMENT"
 msgid "$object$ is based on an SQL command which could not be parsed."
 msgstr "Mae $object$ wedi ei seilio ar orchymyn SQL nad oedd modd ei didoli."
 
 #. To translators: For $object$, one of the valu    es of the RSC_QUERY_OBJECT_TYPE resource (except \"SQL command\", which doesn't make sense here) will be inserted.
-#: strings.hrc:167
+#: dbaccess/inc/strings.hrc:167
 msgctxt "STR_INFO_OPENING_IN_SQL_VIEW"
 msgid "$object$ will be opened in SQL view."
 msgstr "Bydd $object$ yn cael ei agor mewn golwg SQL."
 
-#: strings.hrc:168
+#: dbaccess/inc/strings.hrc:168
 msgctxt "STR_STATEMENT_WITHOUT_RESULT_SET"
 msgid "The query does not create a result set, and thus cannot be part of another query."
 msgstr "Nid yw'r ymholiad yn creu set adroddiad, ac felly ni all fod yn rhan o ymholiad arall."
 
-#: strings.hrc:170
+#: dbaccess/inc/strings.hrc:170
 msgctxt "RID_STR_COLUMN_FORMAT"
 msgid "Column ~Format..."
 msgstr "Ffo~rmat Colofn..."
 
-#: strings.hrc:171
+#: dbaccess/inc/strings.hrc:171
 msgctxt "RID_STR_COLUMN_WIDTH"
 msgid "Column ~Width..."
 msgstr "~Lled Colofn..."
 
-#: strings.hrc:172
+#: dbaccess/inc/strings.hrc:172
 msgctxt "RID_STR_TABLE_FORMAT"
 msgid "Table Format..."
 msgstr "Fformat Tabl..."
 
-#: strings.hrc:173
+#: dbaccess/inc/strings.hrc:173
 msgctxt "RID_STR_ROW_HEIGHT"
 msgid "Row Height..."
 msgstr "Uchder Rhes..."
 
-#: strings.hrc:174
+#: dbaccess/inc/strings.hrc:174
 msgctxt "RID_STR_COPY"
 msgid "~Copy"
 msgstr "~Copïo"
 
-#: strings.hrc:175
+#: dbaccess/inc/strings.hrc:175
 msgctxt "RID_STR_UNDO_MODIFY_RECORD"
 msgid "Undo: Data Input"
 msgstr "Dadwneud: Mewnbwn Data"
 
-#: strings.hrc:176
+#: dbaccess/inc/strings.hrc:176
 msgctxt "RID_STR_SAVE_CURRENT_RECORD"
 msgid "Save current record"
 msgstr "Cadw'r cofnod presennol"
 
-#: strings.hrc:177
+#: dbaccess/inc/strings.hrc:177
 msgctxt "STR_QRY_TITLE"
 msgid "Query #"
 msgstr "Ymholiad #"
 
-#: strings.hrc:178
+#: dbaccess/inc/strings.hrc:178
 msgctxt "STR_TBL_TITLE"
 msgid "Table #"
 msgstr "Tabl #"
 
-#: strings.hrc:179
+#: dbaccess/inc/strings.hrc:179
 msgctxt "STR_VIEW_TITLE"
 msgid "View #"
 msgstr "Golwg #"
 
-#: strings.hrc:180
+#: dbaccess/inc/strings.hrc:180
 msgctxt "STR_NAME_ALREADY_EXISTS"
 msgid "The name \"#\" already exists."
 msgstr "Mae'r enw \"#\" yn bodoli eisoes."
 
-#: strings.hrc:181
+#: dbaccess/inc/strings.hrc:181
 msgctxt "STR_NO_COLUMNNAME_MATCHING"
 msgid "No matching column names were found."
 msgstr "Heb ganfod enwau colofn sy'n cydweddu."
 
-#: strings.hrc:182
+#: dbaccess/inc/strings.hrc:182
 msgctxt "STR_ERROR_OCCURRED_WHILE_COPYING"
 msgid "An error occurred. Do you want to continue copying?"
 msgstr "Digwyddodd gwall. Hoffech chi barhau i gopïo?"
 
-#: strings.hrc:183
+#: dbaccess/inc/strings.hrc:183
 msgctxt "STR_DATASOURCE_GRIDCONTROL_NAME"
 msgid "Data source table view"
 msgstr "Golwg tabl ffynhonnell data"
 
-#: strings.hrc:184
+#: dbaccess/inc/strings.hrc:184
 msgctxt "STR_DATASOURCE_GRIDCONTROL_DESC"
 msgid "Shows the selected table or query."
 msgstr "Dangos y tabl dewiswyd neu'r ymholiad."
 
-#: strings.hrc:186
+#: dbaccess/inc/strings.hrc:186
 msgctxt "STR_QUERY_UNDO_MODIFYSQLEDIT"
 msgid "Modify SQL statement(s)"
 msgstr "Newid datganiad(au) SQL"
 
-#: strings.hrc:188
+#: dbaccess/inc/strings.hrc:188
 msgctxt "RID_STR_NEW_FORM"
 msgid "Create Form in Design View..."
 msgstr "Creu Ffurflen yng Ngolwg Cynllunio..."
 
-#: strings.hrc:189
+#: dbaccess/inc/strings.hrc:189
 msgctxt "RID_STR_NEW_FORM_AUTO"
 msgid "Use Wizard to Create Form..."
 msgstr "Defnyddio Dewin i Greu Ffurflen..."
 
-#: strings.hrc:190
+#: dbaccess/inc/strings.hrc:190
 msgctxt "RID_STR_NEW_REPORT_AUTO"
 msgid "Use Wizard to Create Report..."
 msgstr "Defnyddio Dewin i Greu Adroddiad..."
 
-#: strings.hrc:191
+#: dbaccess/inc/strings.hrc:191
 msgctxt "RID_STR_NEW_REPORT"
 msgid "Create Report in Design View..."
 msgstr "Creu adroddiad yng Ngolwg Cynllunio..."
 
-#: strings.hrc:192
+#: dbaccess/inc/strings.hrc:192
 msgctxt "RID_STR_NEW_QUERY"
 msgid "Create Query in Design View..."
 msgstr "Creu Ymholiad yng Ngolwg Cynllunio..."
 
-#: strings.hrc:193
+#: dbaccess/inc/strings.hrc:193
 msgctxt "RID_STR_NEW_QUERY_SQL"
 msgid "Create Query in SQL View..."
 msgstr "Creu Ymholiad yng Ngolwg SQL..."
 
-#: strings.hrc:194
+#: dbaccess/inc/strings.hrc:194
 msgctxt "RID_STR_NEW_QUERY_AUTO"
 msgid "Use Wizard to Create Query..."
 msgstr "Defnyddio Dewin i Greu Ymholiad..."
 
-#: strings.hrc:195
+#: dbaccess/inc/strings.hrc:195
 msgctxt "RID_STR_NEW_TABLE"
 msgid "Create Table in Design View..."
 msgstr "Creu Tabl yng Ngolwg Cynllunio..."
 
-#: strings.hrc:196
+#: dbaccess/inc/strings.hrc:196
 msgctxt "RID_STR_NEW_TABLE_AUTO"
 msgid "Use Wizard to Create Table..."
 msgstr "Defnyddio Dewin i Greu Tabl..."
 
-#: strings.hrc:197
+#: dbaccess/inc/strings.hrc:197
 msgctxt "RID_STR_NEW_VIEW"
 msgid "Create View..."
 msgstr "Creu Golwg..."
 
-#: strings.hrc:198
+#: dbaccess/inc/strings.hrc:198
 msgctxt "RID_STR_FORMS_CONTAINER"
 msgid "Forms"
 msgstr "Ffurflenni"
 
-#: strings.hrc:199
+#: dbaccess/inc/strings.hrc:199
 msgctxt "RID_STR_REPORTS_CONTAINER"
 msgid "Reports"
 msgstr "Adroddiadau"
 
-#: strings.hrc:200
+#: dbaccess/inc/strings.hrc:200
 msgctxt "RID_STR_REPORTS_HELP_TEXT_WIZARD"
 msgid "The wizard will guide you through the steps necessary to create a report."
 msgstr "Bydd y dewin yn eich arwain drwy'r camau angenrheidiol i greu adroddiad."
 
-#: strings.hrc:201
+#: dbaccess/inc/strings.hrc:201
 msgctxt "RID_STR_FORMS_HELP_TEXT"
 msgid "Create a form by specifying the record source, controls, and control properties."
 msgstr "Creu ffurflen drwy enwi'r ffynhonnell cofnod, rheolyddion a phriodweddau'r rheolyddion."
 
-#: strings.hrc:202
+#: dbaccess/inc/strings.hrc:202
 msgctxt "RID_STR_REPORT_HELP_TEXT"
 msgid "Create a report by specifying the record source, controls, and control properties."
 msgstr "Creu adroddiad drwy bennu ffynhonnell y cofnod, rheolaeth a phriodweddau'r rheolaeth."
 
-#: strings.hrc:203
+#: dbaccess/inc/strings.hrc:203
 msgctxt "RID_STR_FORMS_HELP_TEXT_WIZARD"
 msgid "The wizard will guide you through the steps necessary to create a form."
 msgstr "Bydd y dewin yn eich arwain drwy'r camau angenrheidiol i greu ffurflen."
 
-#: strings.hrc:204
+#: dbaccess/inc/strings.hrc:204
 msgctxt "RID_STR_QUERIES_HELP_TEXT"
 msgid "Create a query by specifying the filters, input tables, field names, and properties for sorting or grouping."
 msgstr "Creu ymholiad drwy enwi'r hidlau, tablau mewnbwn, enw meysydd, a phriodweddau er mwyn trefnu neu grwpio."
 
-#: strings.hrc:205
+#: dbaccess/inc/strings.hrc:205
 msgctxt "RID_STR_QUERIES_HELP_TEXT_SQL"
 msgid "Create a query by entering an SQL statement directly."
 msgstr "Creu ymholiad gan osod datganiad SQL yn uniongyrchol."
 
-#: strings.hrc:206
+#: dbaccess/inc/strings.hrc:206
 msgctxt "RID_STR_QUERIES_HELP_TEXT_WIZARD"
 msgid "The wizard will guide you through the steps necessary to create a query."
 msgstr "Bydd y dewin yn eich arwain drwy'r camau angenrheidiol i greu ymholiad."
 
-#: strings.hrc:207
+#: dbaccess/inc/strings.hrc:207
 msgctxt "RID_STR_TABLES_HELP_TEXT_DESIGN"
 msgid "Create a table by specifying the field names and properties, as well as the data types."
 msgstr "Creu tabl drwy enwi'r enwau meysydd a phriodweddau, yn ogystal â'r mathau o ddata."
 
-#: strings.hrc:208
+#: dbaccess/inc/strings.hrc:208
 msgctxt "RID_STR_TABLES_HELP_TEXT_WIZARD"
 msgid "Choose from a selection of business and personal table samples, which you customize to create a table."
 msgstr "Dewis o amrywiaeth o samplau busnes a phersonol, y mae modd i chi eu cyfaddasu i greu tabl."
 
-#: strings.hrc:209
+#: dbaccess/inc/strings.hrc:209
 msgctxt "RID_STR_VIEWS_HELP_TEXT_DESIGN"
 msgid "Create a view by specifying the tables and field names you would like to have visible."
 msgstr "Creu golwg drwy enwi tablau ac enw meysydd yr hoffech chi eu cael yn weladwy."
 
-#: strings.hrc:210
+#: dbaccess/inc/strings.hrc:210
 msgctxt "STR_DATABASE"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: strings.hrc:211
+#: dbaccess/inc/strings.hrc:211
 msgctxt "STR_TASKS"
 msgid "Tasks"
 msgstr "Tasgau"
 
-#: strings.hrc:212
+#: dbaccess/inc/strings.hrc:212
 msgctxt "STR_DESCRIPTION"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: strings.hrc:213
+#: dbaccess/inc/strings.hrc:213
 msgctxt "STR_PREVIEW"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: strings.hrc:214
+#: dbaccess/inc/strings.hrc:214
 msgctxt "STR_QUERY_CLOSEDOCUMENTS"
 msgid ""
 "The connection type has been altered.\n"
@@ -962,27 +962,27 @@ msgstr ""
 "\n"
 "Hoffech chi gau pob dogfen?"
 
-#: strings.hrc:217
+#: dbaccess/inc/strings.hrc:217
 msgctxt "STR_FRM_LABEL"
 msgid "F~orm name"
 msgstr "Enw ~ffurflen"
 
-#: strings.hrc:218
+#: dbaccess/inc/strings.hrc:218
 msgctxt "STR_RPT_LABEL"
 msgid "~Report name"
 msgstr "Enw ~adroddiad"
 
-#: strings.hrc:219
+#: dbaccess/inc/strings.hrc:219
 msgctxt "STR_FOLDER_LABEL"
 msgid "F~older name"
 msgstr "~Enw ffolder"
 
-#: strings.hrc:220
+#: dbaccess/inc/strings.hrc:220
 msgctxt "STR_SUB_DOCS_WITH_SCRIPTS"
 msgid "The document contains forms or reports with embedded macros."
 msgstr "Mae'r ddogfen yn cynnwys ffurflenni neu adroddiadau gyda macros wedi eu mewnosod."
 
-#: strings.hrc:221
+#: dbaccess/inc/strings.hrc:221
 msgctxt "STR_SUB_DOCS_WITH_SCRIPTS_DETAIL"
 msgid ""
 "Macros should be embedded into the database document itself.\n"
@@ -997,263 +997,263 @@ msgstr ""
 "\n"
 "Sylwch na fydd modd mewnosod y macros i ddogfen y gronfa ddata nes i hyn gael ei gyflawni. "
 
-#: strings.hrc:226
+#: dbaccess/inc/strings.hrc:226
 msgctxt "RID_STR_EMBEDDED_DATABASE"
 msgid "Embedded database"
 msgstr "Cronfa ddata wedi ei fewnosod"
 
-#: strings.hrc:227
+#: dbaccess/inc/strings.hrc:227
 msgctxt "RID_STR_NO_DIFF_CAT"
 msgid "You cannot select different categories."
 msgstr "Nid oes modd dewis categorïau gwahanol."
 
-#: strings.hrc:228
+#: dbaccess/inc/strings.hrc:228
 msgctxt "RID_STR_UNSUPPORTED_OBJECT_TYPE"
 msgid "Unsupported object type found ($type$)."
 msgstr "Wedi canfod math o wrthrych nad yw'n cael ei gynnal ($type$)."
 
-#: strings.hrc:229
+#: dbaccess/inc/strings.hrc:229
 msgctxt "STR_PAGETITLE_GENERAL"
 msgid "Advanced Properties"
 msgstr "Priodweddau Uwch"
 
-#: strings.hrc:230
+#: dbaccess/inc/strings.hrc:230
 msgctxt "STR_PAGETITLE_ADVANCED"
 msgid "Additional Settings"
 msgstr "Gosodiadau Ychwanegol"
 
-#: strings.hrc:231
+#: dbaccess/inc/strings.hrc:231
 msgctxt "STR_PAGETITLE_CONNECTION"
 msgid "Connection settings"
 msgstr "Gosodiadau'r cysylltiad"
 
-#: strings.hrc:232
+#: dbaccess/inc/strings.hrc:232
 msgctxt "STR_TBL_LABEL"
 msgid "~Table Name"
 msgstr "~Enw'r Tabl"
 
-#: strings.hrc:233
+#: dbaccess/inc/strings.hrc:233
 msgctxt "STR_QRY_LABEL"
 msgid "~Query name"
 msgstr "Enw'r ~ymholiad"
 
-#: strings.hrc:234
+#: dbaccess/inc/strings.hrc:234
 msgctxt "STR_TITLE_RENAME"
 msgid "Rename to"
 msgstr "Ailenwi fel"
 
-#: strings.hrc:235
+#: dbaccess/inc/strings.hrc:235
 msgctxt "STR_TITLE_PASTE_AS"
 msgid "Insert as"
 msgstr "Mewnoli fel"
 
-#: strings.hrc:237
+#: dbaccess/inc/strings.hrc:237
 msgctxt "STR_QUERY_BRW_DELETE_ROWS"
 msgid "Do you want to delete the selected data?"
 msgstr "Hoffech chi ddileu'r data hwn?"
 
-#: strings.hrc:238
+#: dbaccess/inc/strings.hrc:238
 msgctxt "SBA_BROWSER_SETTING_ORDER"
 msgid "Error setting the sort criteria"
 msgstr "Gwall wrth osod meini prawf trefnu"
 
-#: strings.hrc:239
+#: dbaccess/inc/strings.hrc:239
 msgctxt "SBA_BROWSER_SETTING_FILTER"
 msgid "Error setting the filter criteria"
 msgstr "Gwall wrth osod meini prawf hidlo"
 
-#: strings.hrc:240
+#: dbaccess/inc/strings.hrc:240
 msgctxt "RID_STR_CONNECTION_LOST"
 msgid "Connection lost"
 msgstr "Colli'r cysylltiad"
 
-#: strings.hrc:241
+#: dbaccess/inc/strings.hrc:241
 msgctxt "RID_STR_QUERIES_CONTAINER"
 msgid "Queries"
 msgstr "Ymholiadau"
 
-#: strings.hrc:242
+#: dbaccess/inc/strings.hrc:242
 msgctxt "RID_STR_TABLES_CONTAINER"
 msgid "Tables"
 msgstr "Tablau"
 
-#: strings.hrc:243
+#: dbaccess/inc/strings.hrc:243
 msgctxt "STR_TITLE_CONFIRM_DELETION"
 msgid "Confirm Deletion"
 msgstr "Cadarnhau Dileu"
 
-#: strings.hrc:244
+#: dbaccess/inc/strings.hrc:244
 msgctxt "STR_QUERY_DELETE_TABLE"
 msgid "Do you want to delete the table '%1'?"
 msgstr "Hoffech chi ddileu'r tabl '%1'?"
 
-#: strings.hrc:245
+#: dbaccess/inc/strings.hrc:245
 msgctxt "STR_QUERY_CONNECTION_LOST"
 msgid "The connection to the database has been lost. Do you want to reconnect?"
 msgstr "Mae'r cysylltiad â'r gronfa ddata wedi ei golli. Hoffech chi ailgysylltu?"
 
-#: strings.hrc:246
+#: dbaccess/inc/strings.hrc:246
 msgctxt "STR_OPENTABLES_WARNINGS"
 msgid "Warnings encountered"
 msgstr "Canfod rhybuddion"
 
-#: strings.hrc:247
+#: dbaccess/inc/strings.hrc:247
 msgctxt "STR_OPENTABLES_WARNINGS_DETAILS"
 msgid "While retrieving the tables, warnings were reported by the database connection."
 msgstr "Wrth adfer y tablau, cafwyd rhybuddion gan gysylltiad y gronfa ddata."
 
-#: strings.hrc:248
+#: dbaccess/inc/strings.hrc:248
 msgctxt "STR_CONNECTING_DATASOURCE"
 msgid "Connecting to \"$name$\" ..."
 msgstr "Cysylltu â \"$name$\" ..."
 
-#: strings.hrc:249
+#: dbaccess/inc/strings.hrc:249
 msgctxt "STR_LOADING_QUERY"
 msgid "Loading query $name$ ..."
 msgstr "Llwytho ymholiad $name$ ..."
 
-#: strings.hrc:250
+#: dbaccess/inc/strings.hrc:250
 msgctxt "STR_LOADING_TABLE"
 msgid "Loading table $name$ ..."
 msgstr "Llwytho tabl $name$ ..."
 
-#: strings.hrc:251
+#: dbaccess/inc/strings.hrc:251
 msgctxt "STR_NO_TABLE_FORMAT_INSIDE"
 msgid "No table format could be found."
 msgstr "Methu canfod fformat tabl."
 
-#: strings.hrc:252
+#: dbaccess/inc/strings.hrc:252
 msgctxt "STR_COULDNOTCONNECT_DATASOURCE"
 msgid "The connection to the data source \"$name$\" could not be established."
 msgstr "Methu creu cysylltiad â'r ffynhonnell data \"$name$\"."
 
-#: strings.hrc:254
+#: dbaccess/inc/strings.hrc:254
 msgctxt "STR_TABLEDESIGN_DBFIELDTYPES"
 msgid "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)"
 msgstr "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)"
 
-#: strings.hrc:255
+#: dbaccess/inc/strings.hrc:255
 msgctxt "STR_TABLEDESIGN_UNDO_PRIMKEY"
 msgid "Insert/remove primary key"
 msgstr "Mewnosod/tynnu allwedd gynradd"
 
-#: strings.hrc:256
+#: dbaccess/inc/strings.hrc:256
 msgctxt "STR_VALUE_YES"
 msgid "Yes"
 msgstr "Iawn"
 
-#: strings.hrc:257
+#: dbaccess/inc/strings.hrc:257
 msgctxt "STR_VALUE_NO"
 msgid "No"
 msgstr "Na"
 
 #. Note: should somehow fit to the word "value" in other languages as well: value - none ....
-#: strings.hrc:259
+#: dbaccess/inc/strings.hrc:259
 msgctxt "STR_VALUE_NONE"
 msgid "<none>"
 msgstr "<dim>"
 
-#: strings.hrc:260
+#: dbaccess/inc/strings.hrc:260
 msgctxt "STR_TAB_FIELD_NAME"
 msgid "Field name"
 msgstr "Enw maes"
 
-#: strings.hrc:261
+#: dbaccess/inc/strings.hrc:261
 msgctxt "STR_TAB_FIELD_COLUMN_NAME"
 msgid "Field Name"
 msgstr "Enw Maes"
 
-#: strings.hrc:262
+#: dbaccess/inc/strings.hrc:262
 msgctxt "STR_TAB_FIELD_DATATYPE"
 msgid "Field ~type"
 msgstr "Math ~maes"
 
-#: strings.hrc:263
+#: dbaccess/inc/strings.hrc:263
 msgctxt "STR_TAB_FIELD_COLUMN_DATATYPE"
 msgid "Field Type"
 msgstr "Math o Faes"
 
-#: strings.hrc:264
+#: dbaccess/inc/strings.hrc:264
 msgctxt "STR_TAB_HELP_TEXT"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: strings.hrc:265
+#: dbaccess/inc/strings.hrc:265
 msgctxt "STR_COLUMN_DESCRIPTION"
 msgid "Column Description"
 msgstr "Disgrifiad Colofn"
 
-#: strings.hrc:266
+#: dbaccess/inc/strings.hrc:266
 msgctxt "STR_FIELD_AUTOINCREMENT"
 msgid "~AutoValue"
 msgstr "~AwtoGwerth"
 
-#: strings.hrc:267
+#: dbaccess/inc/strings.hrc:267
 msgctxt "STR_TAB_PROPERTIES"
 msgid "Field Properties"
 msgstr "Priodweddau Maes"
 
-#: strings.hrc:268
+#: dbaccess/inc/strings.hrc:268
 msgctxt "STR_TABED_UNDO_CELLMODIFIED"
 msgid "Modify cell"
 msgstr "Newid cell"
 
-#: strings.hrc:269
+#: dbaccess/inc/strings.hrc:269
 msgctxt "STR_TABED_UNDO_ROWDELETED"
 msgid "Delete row"
 msgstr "Dileu rhes"
 
-#: strings.hrc:270
+#: dbaccess/inc/strings.hrc:270
 msgctxt "STR_TABED_UNDO_TYPE_CHANGED"
 msgid "Modify field type"
 msgstr "Newid math maes"
 
-#: strings.hrc:271
+#: dbaccess/inc/strings.hrc:271
 msgctxt "STR_TABED_UNDO_ROWINSERTED"
 msgid "Insert row"
 msgstr "Mewnosod rhes"
 
-#: strings.hrc:272
+#: dbaccess/inc/strings.hrc:272
 msgctxt "STR_TABED_UNDO_NEWROWINSERTED"
 msgid "Insert new row"
 msgstr "Mewnosod rhes newydd"
 
-#: strings.hrc:273
+#: dbaccess/inc/strings.hrc:273
 msgctxt "STR_DEFAULT_VALUE"
 msgid "~Default value"
 msgstr "~Gwerth rhagosodedig"
 
-#: strings.hrc:274
+#: dbaccess/inc/strings.hrc:274
 msgctxt "STR_FIELD_REQUIRED"
 msgid "~Entry required"
 msgstr "~Angen cofnod"
 
-#: strings.hrc:275
+#: dbaccess/inc/strings.hrc:275
 msgctxt "STR_TEXT_LENGTH"
 msgid "~Length"
 msgstr "~Hyd"
 
-#: strings.hrc:276
+#: dbaccess/inc/strings.hrc:276
 msgctxt "STR_NUMERIC_TYPE"
 msgid "~Type"
 msgstr "~Math"
 
-#: strings.hrc:277
+#: dbaccess/inc/strings.hrc:277
 msgctxt "STR_LENGTH"
 msgid "~Length"
 msgstr "~Hyd"
 
-#: strings.hrc:278
+#: dbaccess/inc/strings.hrc:278
 msgctxt "STR_SCALE"
 msgid "Decimal ~places"
 msgstr "Mannau ~degol"
 
-#: strings.hrc:279
+#: dbaccess/inc/strings.hrc:279
 msgctxt "STR_FORMAT"
 msgid "Format example"
 msgstr "Enghraifft fformat"
 
-#: strings.hrc:280
+#: dbaccess/inc/strings.hrc:280
 msgctxt "STR_HELP_BOOL_DEFAULT"
 msgid ""
 "Select a value that is to appear in all new records as default.\n"
@@ -1262,7 +1262,7 @@ msgstr ""
 "Dewiswch werth sydd i ymddangos mewn pob cofnod newydd fel rhagosodedig.\n"
 "Os nad yw'r maes i gael gwerth rhagosodedig, dewiswch linyn gwag."
 
-#: strings.hrc:281
+#: dbaccess/inc/strings.hrc:281
 msgctxt "STR_HELP_DEFAULT_VALUE"
 msgid ""
 "Enter a default value for this field.\n"
@@ -1273,22 +1273,22 @@ msgstr ""
 "\n"
 "Pan fyddwch yn rhoi data i'r tabl, bydd y llinyn hwn yn cael ei ddefnyddio ar gyfer pob cofnod newydd yn y maes dewiswyd. Dylai, felly, gyd-fynd â fformat cell sydd angen ei osod islaw."
 
-#: strings.hrc:282
+#: dbaccess/inc/strings.hrc:282
 msgctxt "STR_HELP_FIELD_REQUIRED"
 msgid "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data."
 msgstr "Gweithredwch y dewis os nad yw'r maes yn gallu cynnwys gwerthoedd NULL, h.y. rhaid i'r defnyddiwr rhoi data bob tro."
 
-#: strings.hrc:283
+#: dbaccess/inc/strings.hrc:283
 msgctxt "STR_HELP_TEXT_LENGTH"
 msgid "Enter the maximum text length permitted."
 msgstr "Rhowch hyd y testun mwyaf sy'n cael ei ganiatáu."
 
-#: strings.hrc:284
+#: dbaccess/inc/strings.hrc:284
 msgctxt "STR_HELP_NUMERIC_TYPE"
 msgid "Enter the number format."
 msgstr "Rhowch fformat rhif."
 
-#: strings.hrc:285
+#: dbaccess/inc/strings.hrc:285
 msgctxt "STR_HELP_LENGTH"
 msgid ""
 "Determine the length data can have in this field.\n"
@@ -1301,22 +1301,22 @@ msgstr ""
 "Os meysydd degol, hyd fwyaf rhif i'w osod, os maes deuaidd hyd y bloc data.\n"
 "Bydd y gwerth yn cael ei gywiro'n awtomatig pan fydd yn mynd tu hwnt i'r hiraf ar gyfer y gronfa ddata hon."
 
-#: strings.hrc:286
+#: dbaccess/inc/strings.hrc:286
 msgctxt "STR_HELP_SCALE"
 msgid "Specify the number of decimal places permitted in this field."
 msgstr "Enwi'r nifer o leoedd degol sy'n cael eu caniatáu yn y maes."
 
-#: strings.hrc:287
+#: dbaccess/inc/strings.hrc:287
 msgctxt "STR_HELP_FORMAT_CODE"
 msgid "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format)."
 msgstr "Dyma le rydych yn gweld sut fydd eich data'n cael ei ddangos yn ei fformat presennol (defnyddiwch y botwm ar y dde i newid y fformat)."
 
-#: strings.hrc:288
+#: dbaccess/inc/strings.hrc:288
 msgctxt "STR_HELP_FORMAT_BUTTON"
 msgid "This is where you determine the output format of the data."
 msgstr "Dyma'r lle i bennu fformat allwn y data."
 
-#: strings.hrc:289
+#: dbaccess/inc/strings.hrc:289
 msgctxt "STR_HELP_AUTOINCREMENT"
 msgid ""
 "Choose if this field should contain AutoIncrement values.\n"
@@ -1327,47 +1327,47 @@ msgstr ""
 "\n"
 "Nid oes modd rhoi data mewn meysydd o'r math yma. Bydd gwerth cynhenid yn cael ei osod yn awtomatig i bob cofnod newydd (o ganlyniad i gynyddiad y cofnod blaenorol)."
 
-#: strings.hrc:290
+#: dbaccess/inc/strings.hrc:290
 msgctxt "STR_BUTTON_FORMAT"
 msgid "~..."
 msgstr "~..."
 
-#: strings.hrc:291
+#: dbaccess/inc/strings.hrc:291
 msgctxt "STR_TABLEDESIGN_DUPLICATE_NAME"
 msgid "The table cannot be saved because column name \"$column$\" was assigned twice."
 msgstr "Methu cadw'r tabl oherwydd i enw'r golofn \"$column$\" gael ei neilltuo ddwywaith."
 
-#: strings.hrc:292
+#: dbaccess/inc/strings.hrc:292
 msgctxt "STR_TBL_COLUMN_IS_KEYCOLUMN"
 msgid "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?"
 msgstr "Mae'r golofn \"$column$\" yn perthyn i'r allwedd gynradd. Os fydd y golofn yn cael ei ddileu, bydd yr allwedd gynradd yn cael ei ddileu hefyd. Ydych chi wir eisiau parhau?"
 
-#: strings.hrc:293
+#: dbaccess/inc/strings.hrc:293
 msgctxt "STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE"
 msgid "Primary Key Affected"
 msgstr "Yr Allwedd Gynradd Effeithiwyd"
 
-#: strings.hrc:294
+#: dbaccess/inc/strings.hrc:294
 msgctxt "STR_COLUMN_NAME"
 msgid "Column"
 msgstr "Colofn"
 
-#: strings.hrc:295
+#: dbaccess/inc/strings.hrc:295
 msgctxt "STR_QRY_CONTINUE"
 msgid "Continue anyway?"
 msgstr "Parhau beth bynnag?"
 
-#: strings.hrc:296
+#: dbaccess/inc/strings.hrc:296
 msgctxt "STR_TABLEDESIGN_CONNECTION_MISSING"
 msgid "The table could not be saved due to problems connecting to the database."
 msgstr "Methu cadw'r tabl oherwydd anawsterau cysylltu â'r tabl."
 
-#: strings.hrc:297
+#: dbaccess/inc/strings.hrc:297
 msgctxt "STR_TABLEDESIGN_DATASOURCE_DELETED"
 msgid "The table filter could not be adjusted because the data source has been deleted."
 msgstr "Methu addasu hidl y tabl gan fod y ffynhonnell data wedi ei ddileu."
 
-#: strings.hrc:298
+#: dbaccess/inc/strings.hrc:298
 msgctxt "STR_QUERY_SAVE_TABLE_EDIT_INDEXES"
 msgid ""
 "Before you can edit the indexes of a table, you have to save it.\n"
@@ -1376,12 +1376,12 @@ msgstr ""
 "Cyn gallu golygu mynegeion tabl, rhaid ei gadw.\n"
 "Hoffech chi gadw'r newidiadau?"
 
-#: strings.hrc:299
+#: dbaccess/inc/strings.hrc:299
 msgctxt "STR_TABLEDESIGN_NO_PRIM_KEY_HEAD"
 msgid "No primary key"
 msgstr "Dim allwedd gynradd"
 
-#: strings.hrc:300
+#: dbaccess/inc/strings.hrc:300
 msgctxt "STR_TABLEDESIGN_NO_PRIM_KEY"
 msgid ""
 "A unique index or primary key is required for data record identification in this database.\n"
@@ -1394,27 +1394,27 @@ msgstr ""
 "\n"
 "A ddylid creu allwedd gynradd?"
 
-#: strings.hrc:301
+#: dbaccess/inc/strings.hrc:301
 msgctxt "STR_TABLEDESIGN_ALTER_ERROR"
 msgid "The column \"$column$\" could not be changed. Should the column instead be deleted and the new format appended?"
 msgstr "Methu newid colofn \"$column$\". A ddylid dileu'r golofn ac ategu fformat newydd?"
 
-#: strings.hrc:302
+#: dbaccess/inc/strings.hrc:302
 msgctxt "STR_TABLEDESIGN_SAVE_ERROR"
 msgid "Error while saving the table design"
 msgstr "Gwall wrth gadw cynllun y tabl"
 
-#: strings.hrc:303
+#: dbaccess/inc/strings.hrc:303
 msgctxt "STR_TABLEDESIGN_COULD_NOT_DROP_COL"
 msgid "The column $column$ could not be deleted."
 msgstr "Methu dileu colofn $column$."
 
-#: strings.hrc:304
+#: dbaccess/inc/strings.hrc:304
 msgctxt "STR_AUTOINCREMENT_VALUE"
 msgid "A~uto-increment statement"
 msgstr "Datganiad ~awtogynyddol"
 
-#: strings.hrc:305
+#: dbaccess/inc/strings.hrc:305
 msgctxt "STR_HELP_AUTOINCREMENT_VALUE"
 msgid ""
 "Enter an SQL statement for the auto-increment field.\n"
@@ -1425,7 +1425,7 @@ msgstr ""
 "\n"
 "Bydd y datganiad yn cael ei drosglwyddo ar ei union i'r gronfa ddata wedi i'r tabl gael ei greu."
 
-#: strings.hrc:306
+#: dbaccess/inc/strings.hrc:306
 msgctxt "STR_NO_TYPE_INFO_AVAILABLE"
 msgid ""
 "No type information could be retrieved from the database.\n"
@@ -1434,32 +1434,32 @@ msgstr ""
 "Methu canfod manylion am fath o'r gronfa ddata.\n"
 "Nid yw modd cynllun tabl ar gael o'r ffynhonnell data."
 
-#: strings.hrc:307
+#: dbaccess/inc/strings.hrc:307
 msgctxt "STR_CHANGE_COLUMN_NAME"
 msgid "change field name"
 msgstr "newid enw maes"
 
-#: strings.hrc:308
+#: dbaccess/inc/strings.hrc:308
 msgctxt "STR_CHANGE_COLUMN_TYPE"
 msgid "change field type"
 msgstr "newid math o faes"
 
-#: strings.hrc:309
+#: dbaccess/inc/strings.hrc:309
 msgctxt "STR_CHANGE_COLUMN_DESCRIPTION"
 msgid "change field description"
 msgstr "newid disgrifiad maes"
 
-#: strings.hrc:310
+#: dbaccess/inc/strings.hrc:310
 msgctxt "STR_CHANGE_COLUMN_ATTRIBUTE"
 msgid "change field attribute"
 msgstr "newid priodoleddau maes"
 
-#: strings.hrc:312
+#: dbaccess/inc/strings.hrc:312
 msgctxt "STR_ENTER_CONNECTION_PASSWORD"
 msgid "A password is needed to connect to the data source \"$name$\"."
 msgstr "Mae angen cyfrinair i gysylltu â'r ffynhonnell data \"$name$\"."
 
-#: strings.hrc:313
+#: dbaccess/inc/strings.hrc:313
 msgctxt "STR_ASK_FOR_DIRECTORY_CREATION"
 msgid ""
 "The directory\n"
@@ -1474,42 +1474,42 @@ msgstr ""
 "\n"
 "yn bodoli. Dylai gael ei greu?"
 
-#: strings.hrc:314
+#: dbaccess/inc/strings.hrc:314
 msgctxt "STR_COULD_NOT_CREATE_DIRECTORY"
 msgid "The directory $name$ could not be created."
 msgstr "Methu creu cyfeiriadur $name$."
 
-#: strings.hrc:315
+#: dbaccess/inc/strings.hrc:315
 msgctxt "STR_ALREADYEXISTOVERWRITE"
 msgid "The file already exists. Overwrite?"
 msgstr "Mae'r ffeil yn bodoli eisoes. Trosysgrifo?"
 
-#: strings.hrc:316
+#: dbaccess/inc/strings.hrc:316
 msgctxt "STR_NEW_FOLDER"
 msgid "Folder"
 msgstr "Ffolder"
 
-#: strings.hrc:318
+#: dbaccess/inc/strings.hrc:318
 msgctxt "STR_DATABASE_TYPE_CHANGE"
 msgid "Database properties"
 msgstr "Priodweddau cronfa ddata"
 
-#: strings.hrc:319
+#: dbaccess/inc/strings.hrc:319
 msgctxt "STR_PARENTTITLE_GENERAL"
 msgid "Data Source Properties: #"
 msgstr "Priodweddau Ffynhonnell Data: #"
 
-#: strings.hrc:320
+#: dbaccess/inc/strings.hrc:320
 msgctxt "STR_ERR_USE_CONNECT_TO"
 msgid "Please choose 'Connect to an existing database' to connect to an existing database instead."
 msgstr "Dewis 'Cysylltu i gronfa ddata presennol' i gysylltu â chronfa ddata presennol yn lle hynny."
 
-#: strings.hrc:321
+#: dbaccess/inc/strings.hrc:321
 msgctxt "STR_COULD_NOT_LOAD_ODBC_LIB"
 msgid "Could not load the program library #lib# or it is corrupted. The ODBC data source selection is not available."
 msgstr "Methu llwytho llyfrgell #lib# neu mae wedi ei lygru. Nid yw'r dewis ffynhonnell data ODBC ar gael."
 
-#: strings.hrc:322
+#: dbaccess/inc/strings.hrc:322
 msgctxt "STR_UNSUPPORTED_DATASOURCE_TYPE"
 msgid ""
 "This kind of data source is not supported on this platform.\n"
@@ -1518,128 +1518,128 @@ msgstr ""
 "Nid yw'r math yma o ddata'n cael ei gynnal ar y platfform yma.\n"
 "Mae gennych hawl i newid y gosodiadau, ond mwy na thebyg, ni fydd modd i chi gysylltu â'r gronfa ddata."
 
-#: strings.hrc:323
+#: dbaccess/inc/strings.hrc:323
 msgctxt "STR_AUTOTEXT_FIELD_SEP_NONE"
 msgid "{None}"
 msgstr "{Dim}"
 
 #. To translators: EM Dec 2002: 'Space' refers t    o what you get when you hit the space bar on your keyboard.
-#: strings.hrc:325
+#: dbaccess/inc/strings.hrc:325
 msgctxt "STR_AUTOFIELDSEPARATORLIST"
 msgid ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32"
 msgstr ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32"
 
-#: strings.hrc:326
+#: dbaccess/inc/strings.hrc:326
 msgctxt "STR_AUTODELIMITER_MISSING"
 msgid "#1 must be set."
 msgstr "Rhaid gosod #1."
 
-#: strings.hrc:327
+#: dbaccess/inc/strings.hrc:327
 msgctxt "STR_AUTODELIMITER_MUST_DIFFER"
 msgid "#1 and #2 must be different."
 msgstr "Rhaid i #1 a #2 fod yn wahanol."
 
-#: strings.hrc:328
+#: dbaccess/inc/strings.hrc:328
 msgctxt "STR_AUTONO_WILDCARDS"
 msgid "Wildcards such as ?,* are not allowed in #1."
 msgstr "Methu defnyddio cardiau gwyllt megis ?,* yn #1."
 
-#: strings.hrc:330
+#: dbaccess/inc/strings.hrc:330
 msgctxt "STR_CONNECTION_TEST"
 msgid "Connection Test"
 msgstr "Cysylltiad Prawf"
 
-#: strings.hrc:331
+#: dbaccess/inc/strings.hrc:331
 msgctxt "STR_CONNECTION_SUCCESS"
 msgid "The connection was established successfully."
 msgstr "Gwnaed cysylltiad yn llwyddiannus."
 
-#: strings.hrc:332
+#: dbaccess/inc/strings.hrc:332
 msgctxt "STR_CONNECTION_NO_SUCCESS"
 msgid "The connection could not be established."
 msgstr "Nid oedd modd creu cysylltiad llwyddiannus."
 
-#: strings.hrc:333
+#: dbaccess/inc/strings.hrc:333
 msgctxt "STR_JDBCDRIVER_SUCCESS"
 msgid "The JDBC driver was loaded successfully."
 msgstr "Llwythwyd y gyrrwr JDBC yn llwyddiannus."
 
-#: strings.hrc:334
+#: dbaccess/inc/strings.hrc:334
 msgctxt "STR_JDBCDRIVER_NO_SUCCESS"
 msgid "The JDBC driver could not be loaded."
 msgstr "Methu llwytho gyrrwr JDBC."
 
-#: strings.hrc:335
+#: dbaccess/inc/strings.hrc:335
 msgctxt "STR_MSACCESS_FILTERNAME"
 msgid "MS Access file"
 msgstr "Ffeil MS Access"
 
-#: strings.hrc:336
+#: dbaccess/inc/strings.hrc:336
 msgctxt "STR_MSACCESS_2007_FILTERNAME"
 msgid "MS Access 2007 file"
 msgstr "Ffeil MS Access 2007"
 
-#: strings.hrc:337
+#: dbaccess/inc/strings.hrc:337
 msgctxt "STR_FIREBIRD_FILTERNAME"
 msgid "Firebird Database"
 msgstr "Cronfa Ddata Firebird"
 
-#: strings.hrc:339
+#: dbaccess/inc/strings.hrc:339
 msgctxt "STR_RSC_CHARSETS"
 msgid "System"
 msgstr "System"
 
-#: strings.hrc:340
+#: dbaccess/inc/strings.hrc:340
 msgctxt "STR_ERROR_DURING_CREATION"
 msgid "Error during creation"
 msgstr "Gwall wrth greu"
 
-#: strings.hrc:341
+#: dbaccess/inc/strings.hrc:341
 msgctxt "STR_UNEXPECTED_ERROR"
 msgid "An unexpected error occurred. The operation could not be performed."
 msgstr "Digwyddodd gwall annisgwyl. Methu cyflawni'r weithred."
 
-#: strings.hrc:342
+#: dbaccess/inc/strings.hrc:342
 msgctxt "STR_COULDNOTOPEN_LINKEDDOC"
 msgid "The document \"$file$\" could not be opened."
 msgstr "Nid oedd modd agor dogfen \"$file$\"."
 
-#: strings.hrc:343
+#: dbaccess/inc/strings.hrc:343
 msgctxt "STR_MISSING_TABLES_XDROP"
 msgid "The table cannot be deleted because the database connection does not support this."
 msgstr "Nid oes modd dileu'r tabl am nad yw'r cysylltiad cronfa ddata'n cynnal hynny."
 
-#: strings.hrc:344
+#: dbaccess/inc/strings.hrc:344
 msgctxt "STR_BUTTON_TEXT_ALL"
 msgid "~All"
 msgstr "P~opeth"
 
-#: strings.hrc:345
+#: dbaccess/inc/strings.hrc:345
 msgctxt "STR_UNDO_COLON"
 msgid "Undo:"
 msgstr "Dadwneud:"
 
-#: strings.hrc:346
+#: dbaccess/inc/strings.hrc:346
 msgctxt "STR_REDO_COLON"
 msgid "Redo:"
 msgstr "Ail-wneud:"
 
-#: strings.hrc:347
+#: dbaccess/inc/strings.hrc:347
 msgctxt "STR_UNKNOWN_TYPE_FOUND"
 msgid "No corresponding column type could be found for column '#1'."
 msgstr "Methu canfod math golofn gyfatebol ar gyfer colofn '#1'."
 
-#: strings.hrc:348
+#: dbaccess/inc/strings.hrc:348
 msgctxt "STR_FILE_DOES_NOT_EXIST"
 msgid "The file \"$file$\" does not exist."
 msgstr "Nid yw ffeil \"$file$\" yn bodoli."
 
-#: strings.hrc:349
+#: dbaccess/inc/strings.hrc:349
 msgctxt "STR_WARNINGS_DURING_CONNECT"
 msgid "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them."
 msgstr "Cafwyd rhybudd wrth gysylltu â ffynhonnell y data. Cliciwch \"$buttontext$\" i'w gweld."
 
-#: strings.hrc:350
+#: dbaccess/inc/strings.hrc:350
 msgctxt "STR_NAMED_OBJECT_ALREADY_EXISTS"
 msgid ""
 "The name '$#$' already exists.\n"
@@ -1649,168 +1649,168 @@ msgstr ""
 "Rhowch enw arall."
 
 #. #i96130# use hard coded name
-#: strings.hrc:352
+#: dbaccess/inc/strings.hrc:352
 msgctxt "RID_STR_EXTENSION_NOT_PRESENT"
-msgid "The report, \"$file$\", requires the Oracle Report Builder feature."
-msgstr "Mae adroddiad, \"$file$\", angen yr Oracle Report Builder."
+msgid "The report, \"$file$\", requires the Report Builder feature."
+msgstr "Mae adroddiad, \"$file$\", angen y nodwedd Report Builder."
 
-#: strings.hrc:354
+#: dbaccess/inc/strings.hrc:354
 msgctxt "STR_COULDNOTCREATE_DRIVERMANAGER"
 msgid "Cannot connect to the SDBC driver manager (#servicename#)."
 msgstr "Methu cysylltu â rheolwr gyrrwr SDBC (#servicename#)."
 
-#: strings.hrc:355
+#: dbaccess/inc/strings.hrc:355
 msgctxt "STR_NOREGISTEREDDRIVER"
 msgid "A driver is not registered for the URL #connurl#."
 msgstr "Heb adnabod y gyrrwr ar gyfer yr URL #connurl#."
 
-#: strings.hrc:356
+#: dbaccess/inc/strings.hrc:356
 msgctxt "STR_NOTABLEINFO"
 msgid "Successfully connected, but information about database tables is not available."
 msgstr "Wedi cysylltu'n llwyddiannus, ond nid oes manylion am gronfeydd data ar gael."
 
-#: strings.hrc:357
+#: dbaccess/inc/strings.hrc:357
 msgctxt "STR_ALL_TABLES"
 msgid "All tables"
 msgstr "Pob tabl"
 
-#: strings.hrc:358
+#: dbaccess/inc/strings.hrc:358
 msgctxt "STR_ALL_VIEWS"
 msgid "All views"
 msgstr "Pob golwg"
 
-#: strings.hrc:359
+#: dbaccess/inc/strings.hrc:359
 msgctxt "STR_ALL_TABLES_AND_VIEWS"
 msgid "All tables and views"
 msgstr "Pob tabl a golwg"
 
-#: strings.hrc:361
+#: dbaccess/inc/strings.hrc:361
 msgctxt "STR_TABLE_PRIV_NAME"
 msgid "Table name"
 msgstr "Enw tabl"
 
-#: strings.hrc:362
+#: dbaccess/inc/strings.hrc:362
 msgctxt "STR_TABLE_PRIV_INSERT"
 msgid "Insert data"
 msgstr "Mewnosod data"
 
-#: strings.hrc:363
+#: dbaccess/inc/strings.hrc:363
 msgctxt "STR_TABLE_PRIV_DELETE"
 msgid "Delete data"
 msgstr "Dileu data"
 
-#: strings.hrc:364
+#: dbaccess/inc/strings.hrc:364
 msgctxt "STR_TABLE_PRIV_UPDATE"
 msgid "Modify data"
 msgstr "Newid data"
 
-#: strings.hrc:365
+#: dbaccess/inc/strings.hrc:365
 msgctxt "STR_TABLE_PRIV_ALTER"
 msgid "Alter structure"
 msgstr "Newid strwythur"
 
-#: strings.hrc:366
+#: dbaccess/inc/strings.hrc:366
 msgctxt "STR_TABLE_PRIV_SELECT"
 msgid "Read data"
 msgstr "Darllen data"
 
-#: strings.hrc:367
+#: dbaccess/inc/strings.hrc:367
 msgctxt "STR_TABLE_PRIV_REFERENCE"
 msgid "Modify references"
 msgstr "Newid cyfeiriadau"
 
-#: strings.hrc:368
+#: dbaccess/inc/strings.hrc:368
 msgctxt "STR_TABLE_PRIV_DROP"
 msgid "Drop structure"
 msgstr "Gollwng strwythur"
 
-#: strings.hrc:370
+#: dbaccess/inc/strings.hrc:370
 msgctxt "STR_DBASE_PATH_OR_FILE"
 msgid "Path to the dBASE files"
 msgstr "Llwybr i ffeiliau dBASE"
 
-#: strings.hrc:371
+#: dbaccess/inc/strings.hrc:371
 msgctxt "STR_FLAT_PATH_OR_FILE"
 msgid "Path to the text files"
 msgstr "Llwybr i ffeiliau testun"
 
-#: strings.hrc:372
+#: dbaccess/inc/strings.hrc:372
 msgctxt "STR_CALC_PATH_OR_FILE"
 msgid "Path to the spreadsheet document"
 msgstr "Llwybr i'r ddogfen taenlen"
 
-#: strings.hrc:373
+#: dbaccess/inc/strings.hrc:373
 msgctxt "STR_NAME_OF_ODBC_DATASOURCE"
 msgid "Name of the ODBC data source on your system"
 msgstr "Enw ffynhonnell data ODBC ar eich system"
 
-#: strings.hrc:374
+#: dbaccess/inc/strings.hrc:374
 msgctxt "STR_WRITER_PATH_OR_FILE"
 msgid "Path to the Writer document"
 msgstr "Llwybr i ddogfen Writer"
 
-#: strings.hrc:375
+#: dbaccess/inc/strings.hrc:375
 msgctxt "STR_MYSQL_DATABASE_NAME"
 msgid "Name of the MySQL database"
 msgstr "Enw'r gronfa ddata MySQL"
 
-#: strings.hrc:376
+#: dbaccess/inc/strings.hrc:376
 msgctxt "STR_ORACLE_DATABASE_NAME"
 msgid "Name of the Oracle database"
 msgstr "Enw'r gronfa ddata Oracle"
 
-#: strings.hrc:377
+#: dbaccess/inc/strings.hrc:377
 msgctxt "STR_MSACCESS_MDB_FILE"
 msgid "Microsoft Access database file"
 msgstr "Ffeil cronfa ddata Microsoft Access"
 
-#: strings.hrc:378
+#: dbaccess/inc/strings.hrc:378
 #, c-format
 msgctxt "STR_NO_ADDITIONAL_SETTINGS"
 msgid "No more settings are necessary. To verify that the connection is working, click the '%test' button."
 msgstr "Does dim angen rhagor o osodiadau. I wirio bod y cysylltiad yn gweithio, cliciwch ar y botwm '%test'."
 
-#: strings.hrc:379
+#: dbaccess/inc/strings.hrc:379
 msgctxt "STR_COMMONURL"
-msgid "Datasource URL (e.g. postgresql://host:port/database)"
-msgstr "URL ffynhonnell data (e.e. postgresql://host:port/database)"
+msgid "Datasource URL (e.g. host=$host:$port dbname=$database)"
+msgstr ""
 
-#: strings.hrc:380
+#: dbaccess/inc/strings.hrc:380
 msgctxt "STR_HOSTNAME"
 msgid "~Host name"
 msgstr "Enw ~gwesteiwr"
 
-#: strings.hrc:381
+#: dbaccess/inc/strings.hrc:381
 msgctxt "STR_MOZILLA_PROFILE_NAME"
 msgid "~Mozilla profile name"
 msgstr "Enw proffil ~Gwe-lywiwr"
 
-#: strings.hrc:382
+#: dbaccess/inc/strings.hrc:382
 msgctxt "STR_THUNDERBIRD_PROFILE_NAME"
 msgid "~Thunderbird profile name"
 msgstr "Enw proffil ~Thunderbird"
 
-#: strings.hrc:383
+#: dbaccess/inc/strings.hrc:383
 msgctxt "STR_ADD_TABLES"
 msgid "Add Tables"
 msgstr "Ychwanegu Tablau"
 
-#: strings.hrc:384
+#: dbaccess/inc/strings.hrc:384
 msgctxt "STR_ADD_TABLE_OR_QUERY"
 msgid "Add Table or Query"
 msgstr "Ychwanegu Tabl neu Ymholiad"
 
-#: strings.hrc:386
+#: dbaccess/inc/strings.hrc:386
 msgctxt "STR_WIZ_COLUMN_SELECT_TITEL"
 msgid "Apply columns"
 msgstr "Gosod colofnau"
 
-#: strings.hrc:387
+#: dbaccess/inc/strings.hrc:387
 msgctxt "STR_WIZ_TYPE_SELECT_TITEL"
 msgid "Type formatting"
 msgstr "Fformatio math"
 
-#: strings.hrc:388
+#: dbaccess/inc/strings.hrc:388
 msgctxt "STR_WIZ_NAME_ALREADY_DEFINED"
 msgid ""
 "Enter a unique name for the new primary key data field.\n"
@@ -1819,137 +1819,137 @@ msgstr ""
 "Rhowch enw unigryw i brif allwedd y maes data.\n"
 "Mae'r enw canlynol eisoes yn cael ei ddefnyddio:"
 
-#: strings.hrc:389
+#: dbaccess/inc/strings.hrc:389
 msgctxt "STR_WIZ_NAME_MATCHING_TITEL"
 msgid "Assign columns"
 msgstr "Neilltuo colofnau"
 
-#: strings.hrc:390
+#: dbaccess/inc/strings.hrc:390
 msgctxt "STR_WIZ_PB_PREV"
 msgid "< ~Back"
 msgstr "< ~Nôl"
 
-#: strings.hrc:391
+#: dbaccess/inc/strings.hrc:391
 msgctxt "STR_WIZ_PB_NEXT"
 msgid "~Next>"
 msgstr "N~esaf>"
 
-#: strings.hrc:392
+#: dbaccess/inc/strings.hrc:392
 msgctxt "STR_WIZ_PB_OK"
 msgid "C~reate"
 msgstr "~Creu"
 
-#: strings.hrc:393
+#: dbaccess/inc/strings.hrc:393
 msgctxt "STR_WIZ_TABLE_COPY"
 msgid "Copy table"
 msgstr "Copïo tabl"
 
-#: strings.hrc:394
+#: dbaccess/inc/strings.hrc:394
 msgctxt "STR_COPYTABLE_TITLE_COPY"
 msgid "Copy table"
 msgstr "Copïo tabl"
 
-#: strings.hrc:395
+#: dbaccess/inc/strings.hrc:395
 msgctxt "STR_INVALID_TABLE_NAME"
 msgid "This table name is not valid in the current database."
 msgstr "Nid yw'r enw hwn yn ddilys yn y gronfa ddata bresennol."
 
-#: strings.hrc:396
+#: dbaccess/inc/strings.hrc:396
 msgctxt "STR_SUGGEST_APPEND_TABLE_DATA"
 msgid "Choose the option 'Append data' on the first page to append data to an existing table."
 msgstr "Dewiswch y dewis 'Atodi data' ar y dudalen gyntaf i atodi data i'r tabl presennol."
 
-#: strings.hrc:397
+#: dbaccess/inc/strings.hrc:397
 msgctxt "STR_INVALID_TABLE_NAME_LENGTH"
 msgid "Please change the table name. It is too long."
 msgstr "Newidiwch enw'r tabl. Mae'n rhy hir."
 
-#: strings.hrc:399
+#: dbaccess/inc/strings.hrc:399
 msgctxt "STR_DBWIZARDTITLE"
 msgid "Database Wizard"
 msgstr "Dewin Cronfa Ddata"
 
-#: strings.hrc:400
+#: dbaccess/inc/strings.hrc:400
 msgctxt "STR_PAGETITLE_INTROPAGE"
 msgid "Select database"
 msgstr "Dewis cronfa ddata"
 
-#: strings.hrc:401
+#: dbaccess/inc/strings.hrc:401
 msgctxt "STR_PAGETITLE_DBASE"
 msgid "Set up dBASE connection"
 msgstr "Gosod cysylltiad dBASE"
 
-#: strings.hrc:402
+#: dbaccess/inc/strings.hrc:402
 msgctxt "STR_PAGETITLE_TEXT"
 msgid "Set up a connection to text files"
 msgstr "Gosod cysylltiad i ffeiliau testun"
 
-#: strings.hrc:403
+#: dbaccess/inc/strings.hrc:403
 msgctxt "STR_PAGETITLE_MSACCESS"
 msgid "Set up Microsoft Access connection"
 msgstr "Gosod cysylltiad Microsoft Access"
 
-#: strings.hrc:404
+#: dbaccess/inc/strings.hrc:404
 msgctxt "STR_PAGETITLE_LDAP"
 msgid "Set up LDAP connection"
 msgstr "Gosod cysylltiad LDAP"
 
-#: strings.hrc:405
+#: dbaccess/inc/strings.hrc:405
 msgctxt "STR_PAGETITLE_ADO"
 msgid "Set up ADO connection"
 msgstr "Gosod cysylltiad ADO"
 
-#: strings.hrc:406
+#: dbaccess/inc/strings.hrc:406
 msgctxt "STR_PAGETITLE_JDBC"
 msgid "Set up JDBC connection"
 msgstr "Gosod cysylltiad JDBC"
 
-#: strings.hrc:407
+#: dbaccess/inc/strings.hrc:407
 msgctxt "STR_PAGETITLE_ORACLE"
 msgid "Set up Oracle database connection"
 msgstr "Gosod cysylltiad i gronfa ddata Oracle"
 
-#: strings.hrc:408
+#: dbaccess/inc/strings.hrc:408
 msgctxt "STR_PAGETITLE_MYSQL"
 msgid "Set up MySQL connection"
 msgstr "Gosod cysylltiad MySQL"
 
-#: strings.hrc:409
+#: dbaccess/inc/strings.hrc:409
 msgctxt "STR_PAGETITLE_ODBC"
 msgid "Set up ODBC connection"
 msgstr "Gosod cysylltiad ODBC"
 
-#: strings.hrc:410
+#: dbaccess/inc/strings.hrc:410
 msgctxt "STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET"
 msgid "Set up Writer Document or Spreadsheet connection"
 msgstr "Creu cysylltiaid Dogfen Writer neu Daenlen"
 
-#: strings.hrc:411
+#: dbaccess/inc/strings.hrc:411
 msgctxt "STR_PAGETITLE_AUTHENTIFICATION"
 msgid "Set up user authentication"
 msgstr "Gosod dilysiad defnyddiwr"
 
-#: strings.hrc:412
+#: dbaccess/inc/strings.hrc:412
 msgctxt "STR_PAGETITLE_MYSQL_NATIVE"
 msgid "Set up MySQL server data"
 msgstr "Gosod data gweinydd MySQL"
 
-#: strings.hrc:413
+#: dbaccess/inc/strings.hrc:413
 msgctxt "STR_PAGETITLE_FINAL"
 msgid "Save and proceed"
 msgstr "Cadw a pharhau"
 
-#: strings.hrc:414
+#: dbaccess/inc/strings.hrc:414
 msgctxt "STR_DATABASEDEFAULTNAME"
 msgid "New Database"
 msgstr "Cronfa Ddata Newydd"
 
-#: strings.hrc:415
+#: dbaccess/inc/strings.hrc:415
 msgctxt "STR_MYSQLJDBC_HEADERTEXT"
 msgid "Set up connection to a MySQL database using JDBC"
 msgstr "Creu cysylltiad i gronfa ddata MySQL drwy JDBC"
 
-#: strings.hrc:416
+#: dbaccess/inc/strings.hrc:416
 msgctxt "STR_MYSQLJDBC_HELPTEXT"
 msgid ""
 "Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\n"
@@ -1958,57 +1958,57 @@ msgstr ""
 "Rhowch y manylion angenrheidiol i gysylltu â chronfa ddata MySQL drwy JDBC. Sylwch fod yn rhaid gosod dosbarth gyrrwr JDBC ar eich system â'i gofrestru gyda %PRODUCTNAME.\n"
 "Cysylltwch â'ch gweinyddwr system os ydych yn ansicr am y gosodiadau canlynol."
 
-#: strings.hrc:417
+#: dbaccess/inc/strings.hrc:417
 msgctxt "STR_MYSQL_DRIVERCLASSTEXT"
 msgid "MySQL JDBC d~river class:"
 msgstr "~Dosbarth gyrrwr MySQL JDBC:"
 
-#: strings.hrc:418
+#: dbaccess/inc/strings.hrc:418
 msgctxt "STR_MYSQL_DEFAULT"
 msgid "Default: 3306"
 msgstr "Rhagosodedig: 3306"
 
-#: strings.hrc:419
+#: dbaccess/inc/strings.hrc:419
 msgctxt "STR_DBASE_HEADERTEXT"
 msgid "Set up a connection to dBASE files"
 msgstr "Creu cysylltiad i ffeiliau dBASE"
 
-#: strings.hrc:420
+#: dbaccess/inc/strings.hrc:420
 msgctxt "STR_DBASE_HELPTEXT"
 msgid "Select the folder where the dBASE files are stored."
 msgstr "Dewis y ffolder lle mae ffeiliau dBASE wedi eu cadw."
 
-#: strings.hrc:421
+#: dbaccess/inc/strings.hrc:421
 msgctxt "STR_TEXT_HEADERTEXT"
 msgid "Set up a connection to text files"
 msgstr "Gosod cysylltiad i ffeiliau testun"
 
-#: strings.hrc:422
+#: dbaccess/inc/strings.hrc:422
 msgctxt "STR_TEXT_HELPTEXT"
 msgid "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode."
 msgstr "Dewis y ffolder lle mae'r ffeiliau CSV (Comma Separated Values) wedi eu cadw. Bydd Base %PRODUCTNAME yn agor y ffeiliau ym modd darllen yn unig."
 
-#: strings.hrc:423
+#: dbaccess/inc/strings.hrc:423
 msgctxt "STR_TEXT_PATH_OR_FILE"
 msgid "Path to text files"
 msgstr "Llwybr i ffeiliau testun"
 
-#: strings.hrc:424
+#: dbaccess/inc/strings.hrc:424
 msgctxt "STR_MSACCESS_HEADERTEXT"
 msgid "Set up a connection to a Microsoft Access database"
 msgstr "Creu cysylltiad i gronfa ddata Microsoft Access"
 
-#: strings.hrc:425
+#: dbaccess/inc/strings.hrc:425
 msgctxt "STR_MSACCESS_HELPTEXT"
 msgid "Please select the Microsoft Access file you want to access."
 msgstr "Dewiswch ffeil Microsoft Access hoffech chi gael mynediad ato."
 
-#: strings.hrc:426
+#: dbaccess/inc/strings.hrc:426
 msgctxt "STR_ADO_HEADERTEXT"
 msgid "Set up a connection to an ADO database"
 msgstr "Creu cysylltiad i gronfa ddata ADO"
 
-#: strings.hrc:427
+#: dbaccess/inc/strings.hrc:427
 msgctxt "STR_ADO_HELPTEXT"
 msgid ""
 "Please enter the URL of the ADO data source you want to connect to.\n"
@@ -2019,12 +2019,12 @@ msgstr ""
 "Cliciwch 'Pori' i ffurfweddu gosodiadau'r defnyddiwr.\n"
 "Cysylltwch â'ch gweinyddwr system os ydych yn ansicr am y gosodiadau canlynol."
 
-#: strings.hrc:428
+#: dbaccess/inc/strings.hrc:428
 msgctxt "STR_ODBC_HEADERTEXT"
 msgid "Set up a connection to an ODBC database"
 msgstr "Creu cysylltiad i gronfa ddata ODBC"
 
-#: strings.hrc:429
+#: dbaccess/inc/strings.hrc:429
 msgctxt "STR_ODBC_HELPTEXT"
 msgid ""
 "Enter the name of the ODBC database you want to connect to.\n"
@@ -2035,12 +2035,12 @@ msgstr ""
 "Cliciwch 'Pori...' i ddewis y gronfa ddata sydd wedi ei chofrestri eisoes yn %PRODUCTNAME.\n"
 "Cysylltwch â'ch gweinyddwr system os ydych yn ansicr am y gosodiadau canlynol."
 
-#: strings.hrc:430
+#: dbaccess/inc/strings.hrc:430
 msgctxt "STR_JDBC_HEADERTEXT"
 msgid "Set up a connection to a JDBC database"
 msgstr "Creu cysylltiad i gronfa ddata JDBC"
 
-#: strings.hrc:431
+#: dbaccess/inc/strings.hrc:431
 msgctxt "STR_JDBC_HELPTEXT"
 msgid ""
 "Please enter the required information to connect to a JDBC database.\n"
@@ -2049,22 +2049,22 @@ msgstr ""
 "Rhowch y manylion angenrheidiol i gysylltu â chyfeiriadur JDBC..\n"
 "Cysylltwch â'ch gweinyddwr system os ydych yn ansicr am y gosodiadau canlynol."
 
-#: strings.hrc:432
+#: dbaccess/inc/strings.hrc:432
 msgctxt "STR_ORACLE_HEADERTEXT"
 msgid "Set up a connection to an Oracle database"
 msgstr "Creu cysylltiad i gronfa ddata Oracle"
 
-#: strings.hrc:433
+#: dbaccess/inc/strings.hrc:433
 msgctxt "STR_ORACLE_DEFAULT"
 msgid "Default: 1521"
 msgstr "Rhagosodedig: 1521"
 
-#: strings.hrc:434
+#: dbaccess/inc/strings.hrc:434
 msgctxt "STR_ORACLE_DRIVERCLASSTEXT"
 msgid "Oracle JDBC ~driver class"
 msgstr "~Dosbarth gyrrwr Oracle JDBC"
 
-#: strings.hrc:435
+#: dbaccess/inc/strings.hrc:435
 msgctxt "STR_ORACLE_HELPTEXT"
 msgid ""
 "Please enter the required information to connect to an Oracle database. Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\n"
@@ -2073,12 +2073,12 @@ msgstr ""
 "Rhowch y manylion angenrheidiol i gysylltu â chyfeiriadur Oracle. Sylwch fod yn rhaid gosod Dosbarth Gyrrwr JDBC ar eich system a'i chofrestri gyda %PRODUCTNAME.\n"
 "Cysylltwch â'ch gweinyddwr system os ydych yn ansicr am y gosodiadau canlynol."
 
-#: strings.hrc:436
+#: dbaccess/inc/strings.hrc:436
 msgctxt "STR_SPREADSHEET_HEADERTEXT"
 msgid "Set up a connection to spreadsheets"
 msgstr "Creu cysylltiad i daenlenni"
 
-#: strings.hrc:437
+#: dbaccess/inc/strings.hrc:437
 msgctxt "STR_SPREADSHEET_HELPTEXT"
 msgid ""
 "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n"
@@ -2087,232 +2087,232 @@ msgstr ""
 "Cliciwch 'Pori...' i ddewis taenlen %PRODUCTNAME neu lyfr gwaith Microsoft Excel.\n"
 ".Bydd %PRODUCTNAME yn agor y ffeil ym modd darllen yn unig."
 
-#: strings.hrc:438
+#: dbaccess/inc/strings.hrc:438
 msgctxt "STR_SPREADSHEETPATH"
 msgid "~Location and file name"
 msgstr "~Lleoliad ac enw ffeil"
 
-#: strings.hrc:440
+#: dbaccess/inc/strings.hrc:440
 msgctxt "STR_COMMAND_EXECUTED_SUCCESSFULLY"
 msgid "Command successfully executed."
 msgstr "Gorchymyn wedi ei weithredu'n llwyddiannus."
 
-#: strings.hrc:441
+#: dbaccess/inc/strings.hrc:441
 msgctxt "STR_DIRECTSQL_CONNECTIONLOST"
 msgid "The connection to the database has been lost. This dialog will be closed."
 msgstr "Mae'r cysylltiad i'r gronfa ddata wedi ei golli. Bydd y deialog yn cau."
 
-#: strings.hrc:443
+#: dbaccess/inc/strings.hrc:443
 msgctxt "STR_TAB_INDEX_SORTORDER"
 msgid "Sort order"
 msgstr "Trefn didoli"
 
-#: strings.hrc:444
+#: dbaccess/inc/strings.hrc:444
 msgctxt "STR_TAB_INDEX_FIELD"
 msgid "Index field"
 msgstr "Maes mynegai"
 
-#: strings.hrc:445
+#: dbaccess/inc/strings.hrc:445
 msgctxt "STR_ORDER_ASCENDING"
 msgid "Ascending"
 msgstr "Esgyn"
 
-#: strings.hrc:446
+#: dbaccess/inc/strings.hrc:446
 msgctxt "STR_ORDER_DESCENDING"
 msgid "Descending"
 msgstr "Disgyn"
 
-#: strings.hrc:447
+#: dbaccess/inc/strings.hrc:447
 msgctxt "STR_CONFIRM_DROP_INDEX"
 msgid "Do you really want to delete the index '$name$'?"
 msgstr "Ydych chi wir am ddileu mynegai '$name$'?"
 
-#: strings.hrc:448
+#: dbaccess/inc/strings.hrc:448
 msgctxt "STR_LOGICAL_INDEX_NAME"
 msgid "index"
 msgstr "mynegai"
 
-#: strings.hrc:449
+#: dbaccess/inc/strings.hrc:449
 msgctxt "STR_NEED_INDEX_FIELDS"
 msgid "The index must contain at least one field."
 msgstr "Rhaid i'r mynegai gynnwys o leiaf un maes."
 
-#: strings.hrc:450
+#: dbaccess/inc/strings.hrc:450
 msgctxt "STR_INDEX_NAME_ALREADY_USED"
 msgid "There is already another index named \"$name$\"."
 msgstr "Mae yna fynegai arall o'r enw \"$name$\"."
 
-#: strings.hrc:451
+#: dbaccess/inc/strings.hrc:451
 msgctxt "STR_INDEXDESIGN_DOUBLE_COLUMN_NAME"
 msgid "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice."
 msgstr "Yn niffiniad y mynegai, ni fydd tabl colofn yn cael digwydd nwy nag unwaith. Er hynny, rydych wedi rhoi colofn \"$name$\" ddwywaith."
 
-#: strings.hrc:453
+#: dbaccess/inc/strings.hrc:453
 msgctxt "STR_COULD_NOT_CONVERT_PARAM"
 msgid "The entry could not be converted to a valid value for the \"$name$\" parameter"
 msgstr "Nid oedd modd trosi'r cofnod i werth dilys ar gyfer paramedr\"$name$\""
 
-#: strings.hrc:455
+#: dbaccess/inc/strings.hrc:455
 msgctxt "STR_EXCEPTION_STATUS"
 msgid "SQL Status"
 msgstr "Statws SQL"
 
-#: strings.hrc:456
+#: dbaccess/inc/strings.hrc:456
 msgctxt "STR_EXCEPTION_ERRORCODE"
 msgid "Error code"
 msgstr "Cod gwall"
 
-#: strings.hrc:457
+#: dbaccess/inc/strings.hrc:457
 msgctxt "STR_EXPLAN_STRINGCONVERSION_ERROR"
 msgid "A frequent reason for this error is an inappropriate character set setting for the language of your database. Check the setting by choosing Edit - Database - Properties."
 msgstr "Rheswm aml ar gyfer y gwall hwn yw gosodiadau set nodau anghywir ar gyfer iaith eich cronfa ddata. Gwiriwch y gosodiadau drwy ddewis Golygu - Cronfa Ddata - Priodweddau."
 
-#: strings.hrc:458
+#: dbaccess/inc/strings.hrc:458
 msgctxt "STR_EXCEPTION_ERROR"
 msgid "Error"
 msgstr "Gwall"
 
-#: strings.hrc:459
+#: dbaccess/inc/strings.hrc:459
 msgctxt "STR_EXCEPTION_WARNING"
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: strings.hrc:460
+#: dbaccess/inc/strings.hrc:460
 msgctxt "STR_EXCEPTION_INFO"
 msgid "Information"
 msgstr "Gwybodaeth"
 
-#: strings.hrc:461
+#: dbaccess/inc/strings.hrc:461
 msgctxt "STR_EXCEPTION_DETAILS"
 msgid "Details"
 msgstr "Manylion"
 
-#: strings.hrc:463
+#: dbaccess/inc/strings.hrc:463
 msgctxt "STR_QUERY_USERADMIN_DELETE_USER"
 msgid "Do you really want to delete the user?"
 msgstr "Ydych chi wir eisiau dileu'r defnyddiwr?"
 
-#: strings.hrc:464
+#: dbaccess/inc/strings.hrc:464
 msgctxt "STR_USERADMIN_NOT_AVAILABLE"
 msgid "The database does not support user administration."
 msgstr "Nid yw'r gronfa ddata'n cynnal gweinyddiaeth defnyddiwr."
 
-#: strings.hrc:465
+#: dbaccess/inc/strings.hrc:465
 msgctxt "STR_ERROR_PASSWORDS_NOT_IDENTICAL"
 msgid "The passwords do not match. Please enter the password again."
 msgstr "Nid yw'r cyfrineiriau'n cydweddu. Rhowch y cyfrinair eto."
 
-#: strings.hrc:467
+#: dbaccess/inc/strings.hrc:467
 msgctxt "STR_JOIN_TYPE_HINT"
 msgid "Please note that some databases may not support this join type."
 msgstr "Sylwch na fydd rhai mathau o gronfeydd data'n cynnal y math yma o uniad."
 
-#: strings.hrc:468
+#: dbaccess/inc/strings.hrc:468
 msgctxt "STR_QUERY_INNER_JOIN"
 msgid "Includes only records for which the contents of the related fields of both tables are identical."
 msgstr "Cynnwys dim ond cofnodion y mae eu cynnwys yn y meysydd cydberthynol y ddau dabl yn cyfateb."
 
-#: strings.hrc:469
+#: dbaccess/inc/strings.hrc:469
 msgctxt "STR_QUERY_LEFTRIGHT_JOIN"
 msgid "Contains ALL records from table '%1' but only records from table '%2' where the values in the related fields are matching."
 msgstr "Yn cynnwys POB cofnod o dabl '%1' a dim ond cofnodion o dabl '%2' lle mae gwerthoedd mewn meysydd cydberthynol yn cydweddu."
 
-#: strings.hrc:470
+#: dbaccess/inc/strings.hrc:470
 msgctxt "STR_QUERY_FULL_JOIN"
 msgid "Contains ALL records from '%1' and from '%2'."
 msgstr "Yn cynnwys POB cofnod o '%1' ac o '%2'."
 
-#: strings.hrc:471
+#: dbaccess/inc/strings.hrc:471
 msgctxt "STR_QUERY_CROSS_JOIN"
 msgid "Contains the Cartesian product of ALL records from '%1' and from '%2'."
 msgstr "Mae'n cynnwys cynnyrch Cartesaidd POB cofnod o '%1' ac o '%2'."
 
-#: strings.hrc:473
+#: dbaccess/inc/strings.hrc:473
 msgctxt "STR_CTW_NO_VIEWS_SUPPORT"
 msgid "The destination database does not support views."
 msgstr "Nid yw'r gronfa ddata'n cynnal golwg tabl."
 
-#: strings.hrc:474
+#: dbaccess/inc/strings.hrc:474
 msgctxt "STR_CTW_NO_PRIMARY_KEY_SUPPORT"
 msgid "The destination database does not support primary keys."
 msgstr "Nid yw'r gronfa ddata cyrchfan yn cynnal allweddi cynradd."
 
-#: strings.hrc:475
+#: dbaccess/inc/strings.hrc:475
 msgctxt "STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR"
 msgid "no data access descriptor found, or no data access descriptor able to provide all necessary information"
 msgstr "heb ganfod disgrifiwr mynediad i ddata, neu dim disgrifiwr mynediad i ddata sy'n darparu'r wybodaeth angenrheidiol"
 
-#: strings.hrc:476
+#: dbaccess/inc/strings.hrc:476
 msgctxt "STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT"
 msgid "Only tables and queries are supported at the moment."
 msgstr "Dim ond tablau ac ymholiadau sy'n cael eu cynnal ar hyn o bryd."
 
-#: strings.hrc:477
+#: dbaccess/inc/strings.hrc:477
 msgctxt "STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS"
 msgid "The copy source's result set must support bookmarks."
 msgstr "Rhaid i ffynhonnell canlyniadau'r ffynhonnell gynnal nodau tudalen."
 
-#: strings.hrc:478
+#: dbaccess/inc/strings.hrc:478
 msgctxt "STR_CTW_UNSUPPORTED_COLUMN_TYPE"
 msgid "Unsupported source column type ($type$) at column position $pos$."
 msgstr "Math colofn ffynhonnell heb ei gynnal ($type$) ar safle colofn $pos$."
 
-#: strings.hrc:479
+#: dbaccess/inc/strings.hrc:479
 msgctxt "STR_CTW_ILLEGAL_PARAMETER_COUNT"
 msgid "Illegal number of initialization parameters."
 msgstr "Nifer anghyfreithlon o baramedrau ymgychwyn."
 
-#: strings.hrc:480
+#: dbaccess/inc/strings.hrc:480
 msgctxt "STR_CTW_ERROR_DURING_INITIALIZATION"
 msgid "An error occurred during initialization."
 msgstr "Digwyddodd gwall wrth ymgychwyn."
 
-#: strings.hrc:481
+#: dbaccess/inc/strings.hrc:481
 msgctxt "STR_CTW_ERROR_UNSUPPORTED_SETTING"
 msgid "Unsupported setting in the copy source descriptor: $name$."
 msgstr "Gosodiadau heb eu cynnal yn nisgrifiad ffynhonnell y copi: $name$."
 
-#: strings.hrc:482
+#: dbaccess/inc/strings.hrc:482
 msgctxt "STR_CTW_ERROR_NO_QUERY"
 msgid "To copy a query, your connection must be able to provide queries."
 msgstr "Er mwyn copïo ymholiad, rhaid i'ch cysylltiad allu darparu ymholiadau."
 
-#: strings.hrc:483
+#: dbaccess/inc/strings.hrc:483
 msgctxt "STR_CTW_ERROR_INVALID_INTERACTIONHANDLER"
 msgid "The given interaction handler is invalid."
 msgstr "Mae'r triniwr rhyngweithiad yma'n annilys."
 
-#: strings.hrc:485
+#: dbaccess/inc/strings.hrc:485
 msgctxt "STR_QUERY_REL_EDIT_RELATION"
 msgid "This relation already exists. Do you want to edit it or create a new one?"
 msgstr "Mae'r gydberthynas yn bodoli. Hoffech chi ei olygu?"
 
-#: strings.hrc:486
+#: dbaccess/inc/strings.hrc:486
 msgctxt "STR_QUERY_REL_EDIT"
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: strings.hrc:487
+#: dbaccess/inc/strings.hrc:487
 msgctxt "STR_QUERY_REL_CREATE"
 msgid "Create..."
 msgstr "Creu..."
 
-#: strings.hrc:488
+#: dbaccess/inc/strings.hrc:488
 msgctxt "STR_RELATIONDESIGN"
 msgid " - %PRODUCTNAME Base: Relation design"
 msgstr " - Base %PRODUCTNAME: Cynllun cydberthynol"
 
-#: strings.hrc:489
+#: dbaccess/inc/strings.hrc:489
 msgctxt "STR_RELATIONDESIGN_NOT_AVAILABLE"
 msgid "The database does not support relations."
 msgstr "Nid yw'r gronfa ddata'n cynnal cydberthynas."
 
-#: strings.hrc:490
+#: dbaccess/inc/strings.hrc:490
 msgctxt "STR_QUERY_REL_DELETE_WINDOW"
 msgid "When you delete this table all corresponding relations will be deleted as well. Continue?"
 msgstr "Wrth ddileu'r tabl hwn bydd holl gydberthynas gyfatebol yn cael ei ddileu hefyd. Parhau?"
 
-#: strings.hrc:491
+#: dbaccess/inc/strings.hrc:491
 msgctxt "STR_QUERY_REL_COULD_NOT_CREATE"
 msgid ""
 "The database could not create the relation. Maybe foreign keys for this kind of table aren't supported.\n"
@@ -2321,332 +2321,332 @@ msgstr ""
 "Nid yw'r gronfa ddata yn gallu creu perthynas. Efalla nad yw allweddi dieithr ar gyfer y math yma o dabl yn cael eu cynnal.\n"
 "Gwiriwch ddogfennaeth y gronfa ddata."
 
-#: admindialog.ui:8
+#: dbaccess/uiconfig/ui/admindialog.ui:8
 msgctxt "admindialog|AdminDialog"
 msgid "Database Properties"
 msgstr "Priodweddau Cronfa Ddata"
 
-#: admindialog.ui:92
+#: dbaccess/uiconfig/ui/admindialog.ui:92
 msgctxt "admindialog|advanced"
 msgid "Advanced Properties"
 msgstr "Priodweddau Uwch"
 
-#: advancedsettingsdialog.ui:8
+#: dbaccess/uiconfig/ui/advancedsettingsdialog.ui:8
 msgctxt "advancedsettingsdialog|AdvancedSettingsDialog"
 msgid "Advanced Settings"
 msgstr "Gosodiadau Uwch"
 
-#: advancedsettingsdialog.ui:92
+#: dbaccess/uiconfig/ui/advancedsettingsdialog.ui:92
 msgctxt "advancedsettingsdialog|generated"
 msgid "Generated Values"
 msgstr "Gwerthoedd a Gynhyrchwyd"
 
-#: advancedsettingsdialog.ui:114
+#: dbaccess/uiconfig/ui/advancedsettingsdialog.ui:114
 msgctxt "advancedsettingsdialog|special"
 msgid "Special Settings"
 msgstr "Gosodiadau Arbennig"
 
-#: applycolpage.ui:162
+#: dbaccess/uiconfig/ui/applycolpage.ui:162
 msgctxt "applycolpage|label1"
 msgid "Existing Columns"
 msgstr "Colofnau Cyfredol"
 
-#: authentificationpage.ui:18
+#: dbaccess/uiconfig/ui/authentificationpage.ui:18
 msgctxt "authentificationpage|header"
 msgid "Set up the user authentication"
 msgstr "Gosod dilysiad defnyddiwr"
 
-#: authentificationpage.ui:35
+#: dbaccess/uiconfig/ui/authentificationpage.ui:35
 msgctxt "authentificationpage|helptext"
 msgid "Some databases require you to enter a user name."
 msgstr "Mae rhai cronfeydd data'n gofyn i chi roi eich enw defnyddiwr."
 
-#: authentificationpage.ui:60
+#: dbaccess/uiconfig/ui/authentificationpage.ui:60
 msgctxt "authentificationpage|generalUserNameLabel"
 msgid "_User name"
 msgstr "_Enw defnyddiwr"
 
-#: authentificationpage.ui:86
+#: dbaccess/uiconfig/ui/authentificationpage.ui:86
 msgctxt "authentificationpage|passRequiredCheckbutton"
 msgid "Password re_quired"
 msgstr "_Mae angen cyfrinair"
 
-#: authentificationpage.ui:111
+#: dbaccess/uiconfig/ui/authentificationpage.ui:111
 msgctxt "authentificationpage|testConnectionButton"
 msgid "_Test Connection"
 msgstr "Cysylltiad _Prawf"
 
-#: autocharsetpage.ui:38
+#: dbaccess/uiconfig/ui/autocharsetpage.ui:38
 msgctxt "autocharsetpage|charsetlabel"
 msgid "_Character set:"
 msgstr "_Set nod:"
 
-#: autocharsetpage.ui:68
+#: dbaccess/uiconfig/ui/autocharsetpage.ui:68
 msgctxt "autocharsetpage|charsetheader"
 msgid "Data Conversion"
 msgstr "Trosi Data"
 
-#: backuppage.ui:18
+#: dbaccess/uiconfig/ui/backuppage.ui:18
 msgctxt "backuppage|label1"
 msgid "Backup Your Document"
 msgstr "Creu Copi wrth Gefn o'ch Dogfen"
 
-#: backuppage.ui:35
+#: dbaccess/uiconfig/ui/backuppage.ui:35
 msgctxt "backuppage|label2"
 msgid "To allow you to go back to the state before the migration, the database document will be backed up to a location of your choice. Every change done by the wizard will be made to the original document, the backup will stay untouched."
 msgstr "I ganiatáu i chi fynd yn ôl at eich cyflwr cyn mudo, bydd dogfen y gronfa ddata'n cael ei chopïo i leoliad o'ch dewis. Bydd pob newid fydd gan y dewin yn cael ei wneud i'r ddogfen wreiddiol a bydd y copi wrth gefn yn aros heb ei newid."
 
-#: backuppage.ui:51
+#: dbaccess/uiconfig/ui/backuppage.ui:51
 msgctxt "backuppage|startmigrate"
 msgid "Press 'Next' to save a copy of your document, and to begin the migration."
 msgstr "Pwyswch 'Nesaf' i gadw copi o'ch dogfen, a chychwyn mudo."
 
-#: backuppage.ui:76
+#: dbaccess/uiconfig/ui/backuppage.ui:76
 msgctxt "backuppage|label3"
 msgid "Save to:"
 msgstr "Cadw i:"
 
-#: backuppage.ui:110
+#: dbaccess/uiconfig/ui/backuppage.ui:110
 msgctxt "backuppage|browse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: choosedatasourcedialog.ui:8
+#: dbaccess/uiconfig/ui/choosedatasourcedialog.ui:8
 msgctxt "choosedatasourcedialog|ChooseDataSourceDialog"
 msgid "Data Source"
 msgstr "Ffynhonnell Data"
 
-#: choosedatasourcedialog.ui:67
+#: dbaccess/uiconfig/ui/choosedatasourcedialog.ui:67
 msgctxt "choosedatasourcedialog|organize"
 msgid "Or_ganize..."
 msgstr "_Trefnu..."
 
-#: choosedatasourcedialog.ui:100
+#: dbaccess/uiconfig/ui/choosedatasourcedialog.ui:100
 msgctxt "choosedatasourcedialog|label1"
 msgid "Choose a data source:"
 msgstr "Dewis ffynhonnell data:"
 
-#: collectionviewdialog.ui:11
+#: dbaccess/uiconfig/ui/collectionviewdialog.ui:11
 msgctxt "collectionviewdialog|CollectionView"
 msgid "Save"
 msgstr "Cadw"
 
-#: collectionviewdialog.ui:26
+#: dbaccess/uiconfig/ui/collectionviewdialog.ui:26
 msgctxt "collectionviewdialog|ok"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: collectionviewdialog.ui:119
+#: dbaccess/uiconfig/ui/collectionviewdialog.ui:120
 msgctxt "collectionviewdialog|newFolderButton|tooltip_text"
 msgid "Create New Directory"
 msgstr "Creu Cyfeiriadur Newydd"
 
-#: collectionviewdialog.ui:135
+#: dbaccess/uiconfig/ui/collectionviewdialog.ui:136
 msgctxt "collectionviewdialog|upButton|tooltip_text"
 msgid "Up One Level"
 msgstr "I Fyny Un Lefel"
 
-#: collectionviewdialog.ui:176
+#: dbaccess/uiconfig/ui/collectionviewdialog.ui:177
 msgctxt "collectionviewdialog|fileNameLabel"
 msgid "File _name:"
 msgstr "_Enw ffeil:"
 
-#: colwidthdialog.ui:15
+#: dbaccess/uiconfig/ui/colwidthdialog.ui:15
 msgctxt "colwidthdialog|ColWidthDialog"
 msgid "Column Width"
 msgstr "Lled Colofn"
 
-#: colwidthdialog.ui:94
+#: dbaccess/uiconfig/ui/colwidthdialog.ui:94
 msgctxt "colwidthdialog|label1"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: colwidthdialog.ui:119
+#: dbaccess/uiconfig/ui/colwidthdialog.ui:118
 msgctxt "colwidthdialog|automatic"
 msgid "_Automatic"
 msgstr "_Awtomatig"
 
-#: connectionpage.ui:41
+#: dbaccess/uiconfig/ui/connectionpage.ui:41
 msgctxt "connectionpage|browseurllabel"
 msgid "Path to the dBASE files:"
 msgstr "Llwybr i ffeiliau dBASE:"
 
-#: connectionpage.ui:64
+#: dbaccess/uiconfig/ui/connectionpage.ui:63
 msgctxt "connectionpage|create"
 msgid "_Create New"
 msgstr "C_reu Un Newydd"
 
-#: connectionpage.ui:78
+#: dbaccess/uiconfig/ui/connectionpage.ui:77
 msgctxt "connectionpage|browse"
 msgid "_Browse…"
 msgstr "_Pori…"
 
-#: connectionpage.ui:98
+#: dbaccess/uiconfig/ui/connectionpage.ui:97
 msgctxt "connectionpage|generalLabel"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: connectionpage.ui:140
+#: dbaccess/uiconfig/ui/connectionpage.ui:139
 msgctxt "connectionpage|userNameLabel"
 msgid "_User name:"
 msgstr "_Enw defnyddiwr:"
 
-#: connectionpage.ui:162
+#: dbaccess/uiconfig/ui/connectionpage.ui:161
 msgctxt "connectionpage|passCheckbutton"
 msgid "Password required"
 msgstr "Mae angen cyfrinair"
 
-#: connectionpage.ui:186
+#: dbaccess/uiconfig/ui/connectionpage.ui:186
 msgctxt "connectionpage|userlabel"
 msgid "User Authentication"
 msgstr "Dilysiad Defnyddiwr"
 
-#: connectionpage.ui:227
+#: dbaccess/uiconfig/ui/connectionpage.ui:227
 msgctxt "connectionpage|javaDriverLabel"
 msgid "_JDBC driver class:"
 msgstr "Gyrrwr dosbarth _JDBC:"
 
-#: connectionpage.ui:252
+#: dbaccess/uiconfig/ui/connectionpage.ui:251
 msgctxt "connectionpage|driverButton"
 msgid "Test Class"
 msgstr "Dosbarth Prawf"
 
-#: connectionpage.ui:272
+#: dbaccess/uiconfig/ui/connectionpage.ui:271
 msgctxt "connectionpage|JDBCLabel"
 msgid "JDBC Properties"
 msgstr "Priodweddau JDBC"
 
-#: connectionpage.ui:287
+#: dbaccess/uiconfig/ui/connectionpage.ui:286
 msgctxt "connectionpage|connectionButton"
 msgid "Test Connection"
 msgstr "Cysylltiad Prawf"
 
-#: copytablepage.ui:35
+#: dbaccess/uiconfig/ui/copytablepage.ui:35
 msgctxt "copytablepage|defdata"
 msgid "De_finition and data"
 msgstr "_Diffiniad a data"
 
-#: copytablepage.ui:52
+#: dbaccess/uiconfig/ui/copytablepage.ui:52
 msgctxt "copytablepage|def"
 msgid "Def_inition"
 msgstr "D_iffiniad"
 
-#: copytablepage.ui:68
+#: dbaccess/uiconfig/ui/copytablepage.ui:68
 msgctxt "copytablepage|view"
 msgid "A_s table view"
 msgstr "_Fel golwg tabl"
 
-#: copytablepage.ui:84
+#: dbaccess/uiconfig/ui/copytablepage.ui:84
 msgctxt "copytablepage|data"
 msgid "Append _data"
 msgstr "Atodi _data"
 
-#: copytablepage.ui:100
+#: dbaccess/uiconfig/ui/copytablepage.ui:100
 msgctxt "copytablepage|firstline"
 msgid "Use first _line as column names"
 msgstr "Defnyddio'r _llinell gyntaf fel enwau colofnau"
 
-#: copytablepage.ui:115
+#: dbaccess/uiconfig/ui/copytablepage.ui:115
 msgctxt "copytablepage|primarykey"
 msgid "Crea_te new field as primary key"
 msgstr "Creu maes newydd fel prif allwedd"
 
-#: copytablepage.ui:143
+#: dbaccess/uiconfig/ui/copytablepage.ui:143
 msgctxt "copytablepage|keynamelabel"
 msgid "Name:"
 msgstr "Enw:"
 
-#: copytablepage.ui:175
+#: dbaccess/uiconfig/ui/copytablepage.ui:175
 msgctxt "copytablepage|infoLabel"
 msgid "Existing data fields can be set as primary key on the type formatting step (third page) of the wizard."
 msgstr "Mae modd gosod y meysydd data cyfredol fel allwedd cynradd ar y cam math o fformatio (tudalen tri) y dewin."
 
-#: copytablepage.ui:192
+#: dbaccess/uiconfig/ui/copytablepage.ui:192
 msgctxt "copytablepage|label1"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: copytablepage.ui:215
+#: dbaccess/uiconfig/ui/copytablepage.ui:215
 msgctxt "copytablepage|label2"
 msgid "Ta_ble name:"
 msgstr "Enw _tabl:"
 
-#: dbaseindexdialog.ui:28
+#: dbaccess/uiconfig/ui/dbaseindexdialog.ui:28
 msgctxt "dbaseindexdialog|DBaseIndexDialog"
 msgid "Indexes"
 msgstr "Mynegeion"
 
-#: dbaseindexdialog.ui:107
+#: dbaccess/uiconfig/ui/dbaseindexdialog.ui:107
 msgctxt "dbaseindexdialog|label1"
 msgid "_Table:"
 msgstr "_Tabl:"
 
-#: dbaseindexdialog.ui:162
+#: dbaccess/uiconfig/ui/dbaseindexdialog.ui:162
 msgctxt "dbaseindexdialog|label3"
 msgid "T_able indexes"
 msgstr "Mynegeion ta_bl"
 
-#: dbaseindexdialog.ui:176
+#: dbaccess/uiconfig/ui/dbaseindexdialog.ui:176
 msgctxt "dbaseindexdialog|label4"
 msgid "_Free indexes"
 msgstr "Mynegeion _rhydd"
 
-#: dbaseindexdialog.ui:294
+#: dbaccess/uiconfig/ui/dbaseindexdialog.ui:294
 msgctxt "dbaseindexdialog|label2"
 msgid "Assignment"
 msgstr "Aseiniad"
 
-#: dbasepage.ui:38
+#: dbaccess/uiconfig/ui/dbasepage.ui:38
 msgctxt "dbasepage|charsetlabel"
 msgid "_Character set:"
 msgstr "_Set nod:"
 
-#: dbasepage.ui:68
+#: dbaccess/uiconfig/ui/dbasepage.ui:68
 msgctxt "dbasepage|charsetheader"
 msgid "Data Conversion"
 msgstr "Trosi Data"
 
-#: dbasepage.ui:104
+#: dbaccess/uiconfig/ui/dbasepage.ui:104
 msgctxt "dbasepage|showDelRowsCheckbutton"
 msgid "Display deleted records as well"
 msgstr "Dangos cofnodion dilëwyd hefyd"
 
-#: dbasepage.ui:123
+#: dbaccess/uiconfig/ui/dbasepage.ui:124
 msgctxt "dbasepage|specMessageLabel"
 msgid "Note: When deleted, and thus inactive, records are displayed, you will not be able to delete records from the data source."
 msgstr "Sylwch: Pan mae cofnodion dilëwyd ac felly anweithredol yn cael ei dangos, ni fydd modd i chi ddangos y cofnodion o'r ffynhonnell data."
 
-#: dbasepage.ui:141
+#: dbaccess/uiconfig/ui/dbasepage.ui:142
 msgctxt "dbasepage|label1"
 msgid "Optional Settings"
 msgstr "Gosodiadau Dewisol"
 
-#: dbasepage.ui:156
+#: dbaccess/uiconfig/ui/dbasepage.ui:157
 msgctxt "dbasepage|indiciesButton"
 msgid "Indexes..."
 msgstr "Mynegeion..."
 
-#: dbwizconnectionpage.ui:36
+#: dbaccess/uiconfig/ui/dbwizconnectionpage.ui:36
 msgctxt "dbwizconnectionpage|helptext"
 msgid "label"
 msgstr "label"
 
-#: dbwizconnectionpage.ui:57
+#: dbaccess/uiconfig/ui/dbwizconnectionpage.ui:57
 msgctxt "dbwizconnectionpage|browseurllabel"
 msgid "Path to the dBASE files:"
 msgstr "Llwybr i ffeiliau dBASE:"
 
-#: dbwizconnectionpage.ui:80
+#: dbaccess/uiconfig/ui/dbwizconnectionpage.ui:79
 msgctxt "dbwizconnectionpage|create"
 msgid "_Create New"
 msgstr "Creu _Newydd"
 
-#: dbwizconnectionpage.ui:94
+#: dbaccess/uiconfig/ui/dbwizconnectionpage.ui:93
 msgctxt "dbwizconnectionpage|browse"
 msgid "_Browse…"
 msgstr "_Pori…"
 
-#: dbwizmysqlintropage.ui:38
+#: dbaccess/uiconfig/ui/dbwizmysqlintropage.ui:38
 msgctxt "dbwizmysqlintropage|label2"
 msgid ""
 "You can connect to a MySQL database using either ODBC or JDBC.\n"
@@ -2655,192 +2655,192 @@ msgstr ""
 "Gallwch gysylltu â chronfa ddata MySQL gan ddefnyddio un ai ODBC neu JDBC.\n"
 "Cysylltwch â'ch gweinyddwr system os ydych yn ansicr am y gosodiadau canlynol."
 
-#: dbwizmysqlintropage.ui:69
+#: dbaccess/uiconfig/ui/dbwizmysqlintropage.ui:69
 msgctxt "dbwizmysqlintropage|odbc"
 msgid "Connect using ODBC (Open Database Connectivity)"
 msgstr "Cysylltu drwy ODBC (Open Database Connectivity)"
 
-#: dbwizmysqlintropage.ui:85
+#: dbaccess/uiconfig/ui/dbwizmysqlintropage.ui:86
 msgctxt "dbwizmysqlintropage|jdbc"
 msgid "Connect using JDBC (Java Database Connectivity)"
 msgstr "Cysylltu drwy JDBC (Java Database Connectivity)"
 
-#: dbwizmysqlintropage.ui:103
+#: dbaccess/uiconfig/ui/dbwizmysqlintropage.ui:105
 msgctxt "dbwizmysqlintropage|directly"
 msgid "Connect directly"
 msgstr "Cysylltu'n uniongyrchol"
 
-#: dbwizmysqlintropage.ui:125
+#: dbaccess/uiconfig/ui/dbwizmysqlintropage.ui:128
 msgctxt "dbwizmysqlintropage|label1"
 msgid "How do you want to connect to your MySQL database?"
 msgstr "Sut hoffech chi gysylltu â'ch cronfa ddata MySQL?"
 
-#: dbwizmysqlintropage.ui:143
+#: dbaccess/uiconfig/ui/dbwizmysqlintropage.ui:146
 msgctxt "dbwizmysqlintropage|header"
 msgid "Set Up a Connection to a MySQL Database"
 msgstr "Gosod Cysylltiad i Gronfa Ddata MySQL"
 
-#: dbwizmysqlnativepage.ui:41
+#: dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui:41
 msgctxt "dbwizmysqlnativepage|helptext"
 msgid "Please enter the required information to connect to a MySQL database."
 msgstr "Rhowch y manylion angenrheidiol i gysylltu a chronfa ddata MySQL."
 
-#: dbwizmysqlnativepage.ui:76
+#: dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui:76
 msgctxt "dbwizmysqlnativepage|header"
 msgid "Set Up a Connection to a MySQL Database"
 msgstr "Gosod Cysylltiad i Gronfa Ddata MySQL"
 
-#: dbwizspreadsheetpage.ui:74
+#: dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui:73
 msgctxt "dbwizspreadsheetpage|browse"
 msgid "Browse"
 msgstr "Pori"
 
-#: dbwizspreadsheetpage.ui:90
+#: dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui:89
 msgctxt "dbwizspreadsheetpage|create"
 msgid "Create New"
 msgstr "Creu Newydd"
 
-#: dbwizspreadsheetpage.ui:148
+#: dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui:147
 msgctxt "dbwizspreadsheetpage|passwordrequired"
 msgid "_Password required"
 msgstr "_Mae angen cyfrinair"
 
-#: dbwiztextpage.ui:74
+#: dbaccess/uiconfig/ui/dbwiztextpage.ui:73
 msgctxt "dbwiztextpage|browse"
 msgid "Browse"
 msgstr "Pori"
 
-#: dbwiztextpage.ui:90
+#: dbaccess/uiconfig/ui/dbwiztextpage.ui:89
 msgctxt "dbwiztextpage|create"
 msgid "Create New"
 msgstr "Creu Un Newydd"
 
-#: deleteallrowsdialog.ui:12
+#: dbaccess/uiconfig/ui/deleteallrowsdialog.ui:12
 msgctxt "deleteallrowsdialog|DeleteAllRowsDialog"
 msgid "You are trying to delete all the columns in the table. A table cannot exist without columns. Should the table be deleted from the database? If not, the table will remain unchanged."
 msgstr "Rydych yn ceisio dileu'r holl golofnau yn y tabl. Nid yw tabl yn gallu bodoli heb golofnau. A ddylid dileu'r tabl o'r gronfa ddata? Os nad, bydd y tabl yn parhau heb ei newid."
 
-#: designsavemodifieddialog.ui:12
+#: dbaccess/uiconfig/ui/designsavemodifieddialog.ui:12
 msgctxt "designsavemodifieddialog|DesignSaveModifiedDialog"
 msgid "Do you want to save the changes?"
 msgstr "A ydych am gadw'ch newidiadau?"
 
-#: designsavemodifieddialog.ui:13
+#: dbaccess/uiconfig/ui/designsavemodifieddialog.ui:13
 msgctxt "designsavemodifieddialog|DesignSaveModifiedDialog"
 msgid "The relation design has been changed."
 msgstr "Mae'r cynllun perthyn wedi ei newid."
 
-#: directsqldialog.ui:9
+#: dbaccess/uiconfig/ui/directsqldialog.ui:9
 msgctxt "directsqldialog|DirectSQLDialog"
 msgid "Execute SQL Statement"
 msgstr "Gweithredu Datganiad SQL"
 
-#: directsqldialog.ui:92
+#: dbaccess/uiconfig/ui/directsqldialog.ui:92
 msgctxt "directsqldialog|sql_label"
 msgid "_Command to execute:"
 msgstr "_Gorchymyn i'w weithredu:"
 
-#: directsqldialog.ui:108
+#: dbaccess/uiconfig/ui/directsqldialog.ui:108
 msgctxt "directsqldialog|showoutput"
 msgid "_Show output of \"select\" statements"
 msgstr "_Dangos allbwn datganiadau \"select\""
 
-#: directsqldialog.ui:123
+#: dbaccess/uiconfig/ui/directsqldialog.ui:123
 msgctxt "directsqldialog|execute"
 msgid "_Execute"
 msgstr "_Gweithredu"
 
-#: directsqldialog.ui:158
+#: dbaccess/uiconfig/ui/directsqldialog.ui:158
 msgctxt "directsqldialog|sqlhistory_label"
 msgid "_Previous commands:"
 msgstr "_Gorchmynion blaenorol:"
 
-#: directsqldialog.ui:175
+#: dbaccess/uiconfig/ui/directsqldialog.ui:175
 msgctxt "directsqldialog|label1"
 msgid "SQL Command"
 msgstr "Gorchymyn SQL"
 
-#: directsqldialog.ui:220
+#: dbaccess/uiconfig/ui/directsqldialog.ui:220
 msgctxt "directsqldialog|label2"
 msgid "Status"
 msgstr "Statws"
 
-#: directsqldialog.ui:265
+#: dbaccess/uiconfig/ui/directsqldialog.ui:265
 msgctxt "directsqldialog|label3"
 msgid "Output"
 msgstr "Allbwn"
 
-#: fielddialog.ui:8
+#: dbaccess/uiconfig/ui/fielddialog.ui:8
 msgctxt "fielddialog|FieldDialog"
 msgid "Field Format"
 msgstr "Fformat Maes"
 
-#: fielddialog.ui:111
+#: dbaccess/uiconfig/ui/fielddialog.ui:111
 msgctxt "fielddialog|format"
 msgid "Format"
 msgstr "Fformat"
 
-#: fielddialog.ui:133
+#: dbaccess/uiconfig/ui/fielddialog.ui:133
 msgctxt "fielddialog|alignment"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: fielddialog.ui:152
+#: dbaccess/uiconfig/ui/fielddialog.ui:152
 msgctxt "fielddialog|alttitle"
 msgid "Table Format"
 msgstr "Fformat Tabl"
 
-#: finalpagewizard.ui:17
+#: dbaccess/uiconfig/ui/finalpagewizard.ui:17
 msgctxt "finalpagewizard|headerText"
 msgid "Decide How to Proceed After Saving the Database"
 msgstr "Pennu sut i Barhau ar ôl Cadw'r Gronfa Ddata"
 
-#: finalpagewizard.ui:44
+#: dbaccess/uiconfig/ui/finalpagewizard.ui:44
 msgctxt "finalpagewizard|helpText"
 msgid "Do you want the wizard to register the database in %PRODUCTNAME?"
 msgstr "Ydych chi am i'r dewin gofrestru'r gronfa ddata yn %PRODUCTNAME?"
 
-#: finalpagewizard.ui:56
+#: dbaccess/uiconfig/ui/finalpagewizard.ui:56
 msgctxt "finalpagewizard|yesregister"
 msgid "_Yes, register the database for me"
 msgstr "_Iawn, cofrestru'r gronfa ddata i mi"
 
-#: finalpagewizard.ui:74
+#: dbaccess/uiconfig/ui/finalpagewizard.ui:74
 msgctxt "finalpagewizard|noregister"
 msgid "N_o, do not register the database"
 msgstr "_Na, peidio cofrestru'r gronfa ddata"
 
-#: finalpagewizard.ui:105
+#: dbaccess/uiconfig/ui/finalpagewizard.ui:105
 msgctxt "finalpagewizard|additionalText"
 msgid "After the database file has been saved, what do you want to do?"
 msgstr "Ar ôl i ffeil y gronfa ddata gael ei chadw, beth hoffech chi ei wneud?"
 
-#: finalpagewizard.ui:116
+#: dbaccess/uiconfig/ui/finalpagewizard.ui:116
 msgctxt "finalpagewizard|openediting"
 msgid "Open the database for editing"
 msgstr "Agor y gronfa ddata i'w golygu"
 
-#: finalpagewizard.ui:132
+#: dbaccess/uiconfig/ui/finalpagewizard.ui:132
 msgctxt "finalpagewizard|usewizard"
 msgid "Create tables using the table wizard"
 msgstr "Creu tablau gan ddefnyddio'r dewin tabl"
 
-#: finalpagewizard.ui:156
+#: dbaccess/uiconfig/ui/finalpagewizard.ui:157
 msgctxt "finalpagewizard|finishText"
 msgid "Click 'Finish' to save the database."
 msgstr "Clicio 'Gorffen' i gadw'r gronfa ddata."
 
-#: generalpagedialog.ui:17
+#: dbaccess/uiconfig/ui/generalpagedialog.ui:17
 msgctxt "generalpagedialog|datasourceTypePre"
 msgid "Select the type of database to which you want to establish a connection."
 msgstr "Dewiswch y math o gronfa ddata i greu cysylltiad iddi."
 
-#: generalpagedialog.ui:31
+#: dbaccess/uiconfig/ui/generalpagedialog.ui:31
 msgctxt "generalpagedialog|datasourceTypeLabel"
 msgid "Database _type:"
 msgstr "_Math o gronfa ddata:"
 
-#: generalpagedialog.ui:59
+#: dbaccess/uiconfig/ui/generalpagedialog.ui:59
 msgctxt "generalpagedialog|datasourceTypeHelp"
 msgid ""
 "On the following pages, you can make detailed settings for the connection.\n"
@@ -2851,527 +2851,547 @@ msgstr ""
 "\n"
 "Bydd y gosodiadau newydd yn tros ysgrifennu eich gosodiadau cyfredol."
 
-#: generalpagewizard.ui:18
+#: dbaccess/uiconfig/ui/generalpagewizard.ui:18
 msgctxt "generalpagewizard|headerText"
 msgid "Welcome to the %PRODUCTNAME Database Wizard"
 msgstr "Croeso i Ddewin Cronfa Ddata %PRODUCTNAME"
 
-#: generalpagewizard.ui:35
+#: dbaccess/uiconfig/ui/generalpagewizard.ui:35
 msgctxt "generalpagewizard|helpText"
 msgid "Use the Database Wizard to create a new database, open an existing database file, or connect to a database stored on a server."
 msgstr "Defnyddiwch y Dewin Cronfa Ddata i greu cronfeydd data newydd, agor ffeiliau cronfa ddata neu gysylltu â chronfa ddata sydd ar weinydd."
 
-#: generalpagewizard.ui:50
+#: dbaccess/uiconfig/ui/generalpagewizard.ui:50
 msgctxt "generalpagewizard|sourceTypeHeader"
 msgid "What do you want to do?"
 msgstr "Beth hoffech chi ei wneud?"
 
-#: generalpagewizard.ui:61
+#: dbaccess/uiconfig/ui/generalpagewizard.ui:61
 msgctxt "generalpagewizard|createDatabase"
 msgid "Create a n_ew database"
 msgstr "Creu cronfa ddata _newydd"
 
-#: generalpagewizard.ui:88
+#: dbaccess/uiconfig/ui/generalpagewizard.ui:88
 msgctxt "generalpagewizard|embeddeddbLabel"
 msgid "_Embedded database:"
 msgstr "_Cronfa ddata mewnosodedig:"
 
-#: generalpagewizard.ui:118
+#: dbaccess/uiconfig/ui/generalpagewizard.ui:118
 msgctxt "generalpagewizard|openExistingDatabase"
 msgid "Open an existing database _file"
 msgstr "Agor ffeil cronfa ddata _presennol"
 
-#: generalpagewizard.ui:146
+#: dbaccess/uiconfig/ui/generalpagewizard.ui:146
 msgctxt "generalpagewizard|docListLabel"
 msgid "_Recently used:"
 msgstr "_Defnyddiwyd yn ddiweddar:"
 
-#: generalpagewizard.ui:179
+#: dbaccess/uiconfig/ui/generalpagewizard.ui:179
 msgctxt "generalpagewizard|openDatabase"
 msgid "Open"
 msgstr "Agor"
 
-#: generalpagewizard.ui:195
+#: dbaccess/uiconfig/ui/generalpagewizard.ui:195
 msgctxt "generalpagewizard|connectDatabase"
 msgid "Connect to an e_xisting database"
 msgstr "Cysylltu i gronfa ddata p_resennol"
 
-#: generalspecialjdbcdetailspage.ui:39
+#: dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui:39
 msgctxt "generalspecialjdbcdetailspage|label2"
 msgid "_Host name:"
 msgstr "_Enw gwesteiwr:"
 
-#: generalspecialjdbcdetailspage.ui:53
+#: dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui:53
 msgctxt "generalspecialjdbcdetailspage|label3"
 msgid "_Port number:"
 msgstr "_Rhif porth:"
 
-#: generalspecialjdbcdetailspage.ui:78
+#: dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui:78
 msgctxt "generalspecialjdbcdetailspage|socketLabel"
 msgid "Socket:"
 msgstr "Soced:"
 
-#: generalspecialjdbcdetailspage.ui:90
+#: dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui:90
 msgctxt "generalspecialjdbcdetailspage|driverClassLabel"
 msgid "MySQL JDBC d_river class:"
 msgstr "_Dosbarth gyrrwr MySQL JDBC:"
 
-#: generalspecialjdbcdetailspage.ui:112
+#: dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui:112
 msgctxt "generalspecialjdbcdetailspage|testDriverClassButton"
 msgid "Test Class"
 msgstr "Dosbarth Prawf"
 
-#: generalspecialjdbcdetailspage.ui:162
+#: dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui:162
 msgctxt "generalspecialjdbcdetailspage|label1"
 msgid "Connection Settings"
 msgstr "Gosodiadau Cysylltiad"
 
-#: generalspecialjdbcdetailspage.ui:199
+#: dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui:199
 msgctxt "generalspecialjdbcdetailspage|charsetlabel"
 msgid "_Character set:"
 msgstr "_Set nod:"
 
-#: generalspecialjdbcdetailspage.ui:229
+#: dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui:229
 msgctxt "generalspecialjdbcdetailspage|charsetheader"
 msgid "Data Conversion"
 msgstr "Trosi Data"
 
-#: generatedvaluespage.ui:29
+#: dbaccess/uiconfig/ui/generatedvaluespage.ui:29
 msgctxt "generatedvaluespage|autoretrieve"
 msgid "Re_trieve generated values"
 msgstr "_Adfer gwerthoedd gynhyrchwyd"
 
-#: generatedvaluespage.ui:65
+#: dbaccess/uiconfig/ui/generatedvaluespage.ui:65
 msgctxt "generatedvaluespage|statementft"
 msgid "_Auto-increment statement:"
 msgstr "_Datganiad awto-gynyddiad:"
 
-#: generatedvaluespage.ui:103
+#: dbaccess/uiconfig/ui/generatedvaluespage.ui:103
 msgctxt "generatedvaluespage|queryft"
 msgid "_Query of generated values:"
 msgstr "_Ymholiad o werthoedd gynhyrchwyd:"
 
-#: generatedvaluespage.ui:146
+#: dbaccess/uiconfig/ui/generatedvaluespage.ui:146
 msgctxt "generatedvaluespage|label1"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: indexdesigndialog.ui:9
+#: dbaccess/uiconfig/ui/indexdesigndialog.ui:9
 msgctxt "indexdesigndialog|IndexDesignDialog"
 msgid "Indexes"
 msgstr "Mynegeion"
 
-#: indexdesigndialog.ui:80
+#: dbaccess/uiconfig/ui/indexdesigndialog.ui:80
 msgctxt "indexdesigndialog|ID_INDEX_NEW"
 msgid "New Index"
 msgstr "Mynegai Newydd"
 
-#: indexdesigndialog.ui:95
+#: dbaccess/uiconfig/ui/indexdesigndialog.ui:95
 msgctxt "indexdesigndialog|ID_INDEX_DROP"
 msgid "Delete Current Index"
 msgstr "Dileu'r Mynegai Presennol"
 
-#: indexdesigndialog.ui:110
+#: dbaccess/uiconfig/ui/indexdesigndialog.ui:110
 msgctxt "indexdesigndialog|ID_INDEX_RENAME"
 msgid "Rename Current Index"
 msgstr "Ailenwi'r Mynegai Presennol"
 
-#: indexdesigndialog.ui:125
+#: dbaccess/uiconfig/ui/indexdesigndialog.ui:125
 msgctxt "indexdesigndialog|ID_INDEX_SAVE"
 msgid "Save Current Index"
 msgstr "Cadw'r Mynegai Presennol"
 
-#: indexdesigndialog.ui:140
+#: dbaccess/uiconfig/ui/indexdesigndialog.ui:140
 msgctxt "indexdesigndialog|ID_INDEX_RESET"
 msgid "Reset Current Index"
 msgstr "Ailosod y Mynegai Presennol"
 
-#: indexdesigndialog.ui:276
+#: dbaccess/uiconfig/ui/indexdesigndialog.ui:276
 msgctxt "indexdesigndialog|DESC_LABEL"
 msgid "Index identifier:"
 msgstr "Enw'r mynegai:"
 
-#: indexdesigndialog.ui:297
+#: dbaccess/uiconfig/ui/indexdesigndialog.ui:297
 msgctxt "indexdesigndialog|UNIQUE"
 msgid "_Unique"
 msgstr "_Unigryw"
 
-#: indexdesigndialog.ui:319
+#: dbaccess/uiconfig/ui/indexdesigndialog.ui:319
 msgctxt "indexdesigndialog|FIELDS_LABEL"
 msgid "Fields:"
 msgstr "Meysydd:"
 
-#: indexdesigndialog.ui:352
+#: dbaccess/uiconfig/ui/indexdesigndialog.ui:352
 msgctxt "indexdesigndialog|INDEX_DETAILS"
 msgid "Index Details"
 msgstr "Manylion Mynegai"
 
-#: jdbcconnectionpage.ui:20
+#: dbaccess/uiconfig/ui/jdbcconnectionpage.ui:20
 msgctxt "jdbcconnectionpage|header"
 msgid "Set Up a Connection to a JDBC Database"
 msgstr "Creu Cysylltiad i Gronfa Ddata JDBC"
 
-#: jdbcconnectionpage.ui:36
+#: dbaccess/uiconfig/ui/jdbcconnectionpage.ui:36
 msgctxt "jdbcconnectionpage|helptext"
 msgid "Please enter the required information to connect to a JDBC database. Please contact your system administrator if you are unsure about the following settings."
 msgstr "Rhowch y manylion angenrheidiol i gysylltu â chyfeiriadur JDBC. Cysylltwch â'ch gweinyddwr system os ydych yn ansicr am y gosodiadau canlynol."
 
-#: jdbcconnectionpage.ui:57
+#: dbaccess/uiconfig/ui/jdbcconnectionpage.ui:57
 msgctxt "jdbcconnectionpage|browseurllabel"
 msgid "Path to the dBASE files:"
 msgstr "Llwybr i ffeiliau dBASE:"
 
-#: jdbcconnectionpage.ui:80
+#: dbaccess/uiconfig/ui/jdbcconnectionpage.ui:79
 msgctxt "jdbcconnectionpage|create"
 msgid "_Create New"
 msgstr "_Creu Newydd"
 
-#: jdbcconnectionpage.ui:94
+#: dbaccess/uiconfig/ui/jdbcconnectionpage.ui:93
 msgctxt "jdbcconnectionpage|browse"
 msgid "_Browse…"
 msgstr "_Pori…"
 
-#: jdbcconnectionpage.ui:126
+#: dbaccess/uiconfig/ui/jdbcconnectionpage.ui:125
 msgctxt "jdbcconnectionpage|jdbcLabel"
 msgid "JDBC d_river class:"
 msgstr "_Dosbarth gyrrwr JDBC:"
 
-#: jdbcconnectionpage.ui:156
+#: dbaccess/uiconfig/ui/jdbcconnectionpage.ui:155
 msgctxt "jdbcconnectionpage|jdbcButton"
 msgid "_Test Class"
 msgstr "_Dosbarth Prawf"
 
-#: joindialog.ui:15
+#: dbaccess/uiconfig/ui/joindialog.ui:15
 msgctxt "joindialog|liststore1"
 msgid "Inner join"
 msgstr "Uniad mewnol"
 
-#: joindialog.ui:19
+#: dbaccess/uiconfig/ui/joindialog.ui:19
 msgctxt "joindialog|liststore1"
 msgid "Left join"
 msgstr "Uniad chwith"
 
-#: joindialog.ui:23
+#: dbaccess/uiconfig/ui/joindialog.ui:23
 msgctxt "joindialog|liststore1"
 msgid "Right join"
 msgstr "Uniad de"
 
-#: joindialog.ui:27
+#: dbaccess/uiconfig/ui/joindialog.ui:27
 msgctxt "joindialog|liststore1"
 msgid "Full (outer) join"
 msgstr "Uniad (allanol) llawn"
 
-#: joindialog.ui:31
+#: dbaccess/uiconfig/ui/joindialog.ui:31
 msgctxt "joindialog|liststore1"
 msgid "Cross join"
 msgstr "Uniad croes"
 
-#: joindialog.ui:39
+#: dbaccess/uiconfig/ui/joindialog.ui:39
 msgctxt "joindialog|JoinDialog"
 msgid "Join Properties"
 msgstr "Uno Priodweddau"
 
-#: joindialog.ui:162
+#: dbaccess/uiconfig/ui/joindialog.ui:162
 msgctxt "joindialog|label1"
 msgid "Tables Involved"
 msgstr "Tablau Cysylltiedig"
 
-#: joindialog.ui:228
+#: dbaccess/uiconfig/ui/joindialog.ui:228
 msgctxt "joindialog|label2"
 msgid "Fields Involved"
 msgstr "Meysydd Cysylltiedig"
 
-#: joindialog.ui:264
+#: dbaccess/uiconfig/ui/joindialog.ui:264
 msgctxt "joindialog|label5"
 msgid "_Type:"
 msgstr "_Math:"
 
-#: joindialog.ui:287
+#: dbaccess/uiconfig/ui/joindialog.ui:287
 msgctxt "joindialog|natural"
 msgid "Natural"
 msgstr "Naturiol"
 
-#: joindialog.ui:311
+#: dbaccess/uiconfig/ui/joindialog.ui:311
 msgctxt "joindialog|label6"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: jointablemenu.ui:12
+#: dbaccess/uiconfig/ui/jointablemenu.ui:12
 msgctxt "jointablemenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: joinviewmenu.ui:12
+#: dbaccess/uiconfig/ui/joinviewmenu.ui:12
 msgctxt "joinviewmenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: joinviewmenu.ui:20
+#: dbaccess/uiconfig/ui/joinviewmenu.ui:20
 msgctxt "joinviewmenu|edit"
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: keymenu.ui:12
+#: dbaccess/uiconfig/ui/keymenu.ui:12
 msgctxt "keymenu|primarykey"
 msgid "Primary Key"
 msgstr "Allwedd Gynradd"
 
-#: ldapconnectionpage.ui:18
+#: dbaccess/uiconfig/ui/ldapconnectionpage.ui:18
 msgctxt "ldapconnectionpage|header"
 msgid "Set Up a Connection to an LDAP Directory"
 msgstr "Creu Cysylltiad i Gyfeiriadur LDAP"
 
-#: ldapconnectionpage.ui:34
+#: dbaccess/uiconfig/ui/ldapconnectionpage.ui:34
 msgctxt "ldapconnectionpage|helpLabel"
 msgid "Please enter the required information to connect to an LDAP directory. Please contact your system administrator if you are unsure about the following settings."
 msgstr "Rhowch y manylion angenrheidiol i gysylltu â chyfeiriadur LDAP. Cysylltwch â'ch gweinyddwr system os ydych yn ansicr am y gosodiadau canlynol."
 
-#: ldapconnectionpage.ui:57
+#: dbaccess/uiconfig/ui/ldapconnectionpage.ui:57
 msgctxt "ldapconnectionpage|hostNameLabel"
 msgid "_Server:"
 msgstr "_Gweinydd:"
 
-#: ldapconnectionpage.ui:71
+#: dbaccess/uiconfig/ui/ldapconnectionpage.ui:71
 msgctxt "ldapconnectionpage|portNumLabel"
 msgid "_Port number:"
 msgstr "_Rhif porth:"
 
-#: ldapconnectionpage.ui:113
+#: dbaccess/uiconfig/ui/ldapconnectionpage.ui:113
 msgctxt "ldapconnectionpage|portNumDefLabel"
 msgid "Default: 389"
 msgstr "Rhagosodedig: 389"
 
-#: ldapconnectionpage.ui:132
+#: dbaccess/uiconfig/ui/ldapconnectionpage.ui:132
 msgctxt "ldapconnectionpage|baseDNLabel"
 msgid "Base _DN:"
 msgstr "_DN sail:"
 
-#: ldapconnectionpage.ui:161
+#: dbaccess/uiconfig/ui/ldapconnectionpage.ui:161
 msgctxt "ldapconnectionpage|useSSLCheckbutton"
 msgid "Use _secure connection (SSL)"
 msgstr "Defnyddiwch gysylltiad _diogel (SSL)"
 
-#: ldappage.ui:39
+#: dbaccess/uiconfig/ui/ldappage.ui:39
 msgctxt "ldappage|label1"
 msgid "_Base DN:"
 msgstr "_DN sail:"
 
-#: ldappage.ui:61
+#: dbaccess/uiconfig/ui/ldappage.ui:61
 msgctxt "ldappage|useSSLCheckbutton"
 msgid "Use secure connection (SSL)"
 msgstr "Defnyddiwch gysylltiad diogel (SSL)"
 
-#: ldappage.ui:80
+#: dbaccess/uiconfig/ui/ldappage.ui:81
 msgctxt "ldappage|label2"
 msgid "_Port number:"
 msgstr "_Rhif porth:"
 
-#: ldappage.ui:105
+#: dbaccess/uiconfig/ui/ldappage.ui:106
 msgctxt "ldappage|label3"
 msgid "Maximum number of _records:"
 msgstr "Nifer mwyaf o _gofnodion:"
 
-#: ldappage.ui:133
+#: dbaccess/uiconfig/ui/ldappage.ui:134
 msgctxt "ldappage|charsetheader"
 msgid "Connection Settings"
 msgstr "Gosodiadau'r Cysylltiad"
 
-#: migratepage.ui:17
+#: dbaccess/uiconfig/ui/migratepage.ui:17
 msgctxt "migratepage|label1"
 msgid "Migration Progress"
 msgstr "Proses Mudo"
 
-#: migratepage.ui:34
+#: dbaccess/uiconfig/ui/migratepage.ui:34
 msgctxt "migratepage|count"
 msgid "The database document contains $forms$ form(s) and $reports$ report(s), which are currently being processed:"
 msgstr "Mae dogfen y gronfa ddata yn cynnwys $forms$ ffurflen(ni) ac $reports$ adroddiad(au), sy'n cael eu prosesu ar hyn o bryd:"
 
-#: migratepage.ui:50
+#: dbaccess/uiconfig/ui/migratepage.ui:50
 msgctxt "migratepage|done"
 msgid "All forms and reports have been successfully processed. Press 'Next' to show a detailed summary."
 msgstr "Mae pob ffurflen ac adroddiad wedi eu prosesu'n llwyddiannus. Cliciwch 'Nesaf' i ddangos crynodeb manwl."
 
-#: migratepage.ui:71
+#: dbaccess/uiconfig/ui/migratepage.ui:71
 msgctxt "migratepage|label4"
 msgid "Overall progress:"
 msgstr "Cynnydd cyffredinol:"
 
-#: migratepage.ui:83
+#: dbaccess/uiconfig/ui/migratepage.ui:83
 msgctxt "migratepage|overall"
 msgid "document $current$ of $overall$"
 msgstr "dogfen $current$ o $overall$"
 
-#: migratepage.ui:123
+#: dbaccess/uiconfig/ui/migratepage.ui:123
 msgctxt "migratepage|label6"
 msgid "Current progress:"
 msgstr "Cynnydd presennol:"
 
-#: migratepage.ui:174
+#: dbaccess/uiconfig/ui/migratepage.ui:174
 msgctxt "migratepage|label5"
 msgid "Current object:"
 msgstr "Y gwrthrych presennol:"
 
-#: mysqlnativepage.ui:48
+#: dbaccess/uiconfig/ui/migrwarndlg.ui:7
+msgctxt "migrationwarndialog|MigrationWarnDialog"
+msgid "Confirm Migration"
+msgstr "Cadarnhau'r Mudo"
+
+#: dbaccess/uiconfig/ui/migrwarndlg.ui:11
+msgctxt "migrationwarndialog|MigrationWarnDialog"
+msgid "The document contains embedded HSQL data, which is deprecated."
+msgstr ""
+
+#: dbaccess/uiconfig/ui/migrwarndlg.ui:12
+msgctxt "migrationwarndialog|MigrationWarnDialog"
+msgid "Would you like to migrate to Firebird now?"
+msgstr ""
+
+#: dbaccess/uiconfig/ui/migrwarndlg.ui:37
+msgctxt "migrationwarndialog|later"
+msgid "_Later"
+msgstr ""
+
+#: dbaccess/uiconfig/ui/mysqlnativepage.ui:48
 msgctxt "mysqlnativepage|connectionheader"
 msgid "Connection Settings"
 msgstr "Gosodiadau'r Cysylltiad"
 
-#: mysqlnativepage.ui:90
+#: dbaccess/uiconfig/ui/mysqlnativepage.ui:90
 msgctxt "mysqlnativepage|usernamelabel"
 msgid "_User name:"
 msgstr "_Enw defnyddiwr:"
 
-#: mysqlnativepage.ui:113
+#: dbaccess/uiconfig/ui/mysqlnativepage.ui:112
 msgctxt "mysqlnativepage|passwordrequired"
 msgid "Password required"
 msgstr "Mae angen cyfrinair"
 
-#: mysqlnativepage.ui:137
+#: dbaccess/uiconfig/ui/mysqlnativepage.ui:137
 msgctxt "mysqlnativepage|userheader"
 msgid "User Authentication"
 msgstr "Dilysiad Defnyddiwr"
 
-#: mysqlnativepage.ui:176
+#: dbaccess/uiconfig/ui/mysqlnativepage.ui:176
 msgctxt "mysqlnativepage|charsetlabel"
 msgid "_Character set:"
 msgstr "_Set nod:"
 
-#: mysqlnativepage.ui:206
+#: dbaccess/uiconfig/ui/mysqlnativepage.ui:206
 msgctxt "mysqlnativepage|charsetheader"
 msgid "Data Conversion"
 msgstr "Trosi Data"
 
-#: mysqlnativesettings.ui:25
+#: dbaccess/uiconfig/ui/mysqlnativesettings.ui:25
 msgctxt "mysqlnativesettings|dbnamelabel"
 msgid "_Database name:"
 msgstr "_Enw'r gronfa ddata:"
 
-#: mysqlnativesettings.ui:63
+#: dbaccess/uiconfig/ui/mysqlnativesettings.ui:62
 msgctxt "mysqlnativesettings|hostport"
 msgid "Se_rver/port"
 msgstr "_Gweinydd/porth"
 
-#: mysqlnativesettings.ui:96
+#: dbaccess/uiconfig/ui/mysqlnativesettings.ui:95
 msgctxt "mysqlnativesettings|serverlabel"
 msgid "_Server:"
 msgstr "_Gweinydd:"
 
-#: mysqlnativesettings.ui:110
+#: dbaccess/uiconfig/ui/mysqlnativesettings.ui:109
 msgctxt "mysqlnativesettings|portlabel"
 msgid "_Port:"
 msgstr "_Porth:"
 
-#: mysqlnativesettings.ui:138
+#: dbaccess/uiconfig/ui/mysqlnativesettings.ui:136
 msgctxt "mysqlnativesettings|defaultport"
 msgid "Default: 3306"
 msgstr "Rhagosodedig: 3306"
 
-#: mysqlnativesettings.ui:182
+#: dbaccess/uiconfig/ui/mysqlnativesettings.ui:179
 msgctxt "mysqlnativesettings|socketlabel"
 msgid "So_cket:"
 msgstr "_Soced:"
 
-#: mysqlnativesettings.ui:225
+#: dbaccess/uiconfig/ui/mysqlnativesettings.ui:221
 msgctxt "mysqlnativesettings|namedpipelabel"
 msgid "Named p_ipe:"
 msgstr "P_eipen enwyd:"
 
-#: namematchingpage.ui:48
+#: dbaccess/uiconfig/ui/namematchingpage.ui:48
 msgctxt "namematchingpage|all"
 msgid "_All"
 msgstr "_Y Cyfan"
 
-#: namematchingpage.ui:65
+#: dbaccess/uiconfig/ui/namematchingpage.ui:65
 msgctxt "namematchingpage|none"
 msgid "Non_e"
 msgstr "_Dim"
 
-#: namematchingpage.ui:101
+#: dbaccess/uiconfig/ui/namematchingpage.ui:101
 msgctxt "namematchingpage|leftlabel"
 msgid "Source table: "
 msgstr "Tabl ffynhonnell: "
 
-#: namematchingpage.ui:146
+#: dbaccess/uiconfig/ui/namematchingpage.ui:146
 msgctxt "namematchingpage|rightlabel"
 msgid "Destination table: "
 msgstr "Tabl cyrchfan: "
 
-#: odbcpage.ui:38
+#: dbaccess/uiconfig/ui/odbcpage.ui:38
 msgctxt "odbcpage|charsetlabel"
 msgid "_Character set:"
 msgstr "_Set nod:"
 
-#: odbcpage.ui:68
+#: dbaccess/uiconfig/ui/odbcpage.ui:68
 msgctxt "odbcpage|charsetheader"
 msgid "Data Conversion"
 msgstr "Trosi Data"
 
-#: odbcpage.ui:112
+#: dbaccess/uiconfig/ui/odbcpage.ui:112
 msgctxt "odbcpage|optionslabel"
 msgid "ODBC _options:"
 msgstr "Dewisiadau _ODBC:"
 
-#: odbcpage.ui:143
+#: dbaccess/uiconfig/ui/odbcpage.ui:143
 msgctxt "odbcpage|useCatalogCheckbutton"
 msgid "Use catalog for file-based databases"
 msgstr "Defnyddiwch gatalog ar gyfer cronfeydd data ffeil"
 
-#: odbcpage.ui:165
+#: dbaccess/uiconfig/ui/odbcpage.ui:166
 msgctxt "odbcpage|label1"
 msgid "Optional Settings"
 msgstr "Gosodiadau Dewisol"
 
-#: parametersdialog.ui:10
+#: dbaccess/uiconfig/ui/parametersdialog.ui:10
 msgctxt "parametersdialog|Parameters"
 msgid "Parameter Input"
 msgstr "Mewnbwn Paramedr"
 
-#: parametersdialog.ui:122
+#: dbaccess/uiconfig/ui/parametersdialog.ui:122
 msgctxt "parametersdialog|label2"
 msgid "_Value:"
 msgstr "_Gwerth:"
 
-#: parametersdialog.ui:153
+#: dbaccess/uiconfig/ui/parametersdialog.ui:152
 msgctxt "parametersdialog|next"
 msgid "_Next"
 msgstr "_Nesaf"
 
-#: parametersdialog.ui:181
+#: dbaccess/uiconfig/ui/parametersdialog.ui:180
 msgctxt "parametersdialog|label1"
 msgid "_Parameters"
 msgstr "_Paramedrau"
 
-#: password.ui:8
+#: dbaccess/uiconfig/ui/password.ui:8
 msgctxt "password|PasswordDialog"
 msgid "Change Password"
 msgstr "Newid Cyfrinair"
 
-#: password.ui:120
+#: dbaccess/uiconfig/ui/password.ui:120
 msgctxt "password|label2"
 msgid "Old p_assword:"
 msgstr "_Hen gyfrinair:"
 
-#: password.ui:134
+#: dbaccess/uiconfig/ui/password.ui:134
 msgctxt "password|label3"
 msgid "_Password:"
 msgstr "C_yfrinair:"
 
-#: password.ui:148
+#: dbaccess/uiconfig/ui/password.ui:148
 msgctxt "password|label4"
 msgid "_Confirm password:"
 msgstr "C_adarnhau'r cyfrinair:"
 
-#: password.ui:177
+#: dbaccess/uiconfig/ui/password.ui:177
 msgctxt "password|label1"
 msgid "User “$name$:  $”"
 msgstr "Defnyddiwr “$name$:  $”"
 
-#: preparepage.ui:17
+#: dbaccess/uiconfig/ui/preparepage.ui:17
 msgctxt "preparepage|label1"
 msgid "Welcome to the Database Macro Migration Wizard"
 msgstr "Croeso i'r Dewin Mudo Macro Cronfa Ddata"
 
-#: preparepage.ui:34
+#: dbaccess/uiconfig/ui/preparepage.ui:34
 msgctxt "preparepage|label2"
 msgid ""
 "This wizard will guide you through the task of migrating your macros.\n"
@@ -3390,842 +3410,842 @@ msgstr ""
 "\n"
 "Cyn cychwyn y mudo rhaid cau pob ffurflen, adroddiad, ymholiad a thabl sy'n perthyn i'r ddogfen. Cliciwch 'Nesaf' i wneud hynny."
 
-#: preparepage.ui:56
+#: dbaccess/uiconfig/ui/preparepage.ui:56
 msgctxt "preparepage|closedocerror"
 msgid "Not all objects could be closed. Please close them manually, and re-start the wizard."
 msgstr "Nid oedd modd cau pob gwrthrych. Caewch nhw gyda llaw, ac ailgychwyn y dewin."
 
-#: querycolmenu.ui:12
+#: dbaccess/uiconfig/ui/querycolmenu.ui:12
 msgctxt "querycolmenu|width"
 msgid "Column _Width..."
 msgstr "_Lled Colofn..."
 
-#: querycolmenu.ui:26
+#: dbaccess/uiconfig/ui/querycolmenu.ui:26
 msgctxt "querycolmenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: queryfilterdialog.ui:8
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:8
 msgctxt "queryfilterdialog|QueryFilterDialog"
 msgid "Standard Filter"
 msgstr "Hidl Safonol"
 
-#: queryfilterdialog.ui:96
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:96
 msgctxt "queryfilterdialog|label2"
 msgid "Operator"
 msgstr "Gweithredydd"
 
-#: queryfilterdialog.ui:108
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:108
 msgctxt "queryfilterdialog|label5"
 msgid "Field name"
 msgstr "Enw Maes"
 
-#: queryfilterdialog.ui:120
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:120
 msgctxt "queryfilterdialog|label6"
 msgid "Condition"
 msgstr "Cyflwr"
 
-#: queryfilterdialog.ui:134
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:134
 msgctxt "queryfilterdialog|field1"
 msgid "- none -"
 msgstr "- dim -"
 
-#: queryfilterdialog.ui:148
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:148
 msgctxt "queryfilterdialog|cond1"
 msgid "="
 msgstr "="
 
-#: queryfilterdialog.ui:149
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:149
 msgctxt "queryfilterdialog|cond1"
 msgid "<>"
 msgstr "<>"
 
-#: queryfilterdialog.ui:150
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:150
 msgctxt "queryfilterdialog|cond1"
 msgid "<"
 msgstr "<"
 
-#: queryfilterdialog.ui:151
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:151
 msgctxt "queryfilterdialog|cond1"
 msgid "<="
 msgstr "<="
 
-#: queryfilterdialog.ui:152
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:152
 msgctxt "queryfilterdialog|cond1"
 msgid ">"
 msgstr ">"
 
-#: queryfilterdialog.ui:153
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:153
 msgctxt "queryfilterdialog|cond1"
 msgid ">="
 msgstr ">="
 
-#: queryfilterdialog.ui:154
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:154
 msgctxt "queryfilterdialog|cond1"
 msgid "like"
 msgstr "hoffi"
 
-#: queryfilterdialog.ui:155
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:155
 msgctxt "queryfilterdialog|cond1"
 msgid "not like"
 msgstr "dim hoffi"
 
-#: queryfilterdialog.ui:156
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:156
 msgctxt "queryfilterdialog|cond1"
 msgid "null"
 msgstr "nwl"
 
-#: queryfilterdialog.ui:157
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:157
 msgctxt "queryfilterdialog|cond1"
 msgid "not null"
 msgstr "nid nwl"
 
-#: queryfilterdialog.ui:171
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:171
 msgctxt "queryfilterdialog|field2"
 msgid "- none -"
 msgstr "- dim -"
 
-#: queryfilterdialog.ui:185
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:185
 msgctxt "queryfilterdialog|field3"
 msgid "- none -"
 msgstr "- dim -"
 
-#: queryfilterdialog.ui:219
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:219
 msgctxt "queryfilterdialog|label7"
 msgid "Value"
 msgstr "Gwerth"
 
-#: queryfilterdialog.ui:263
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:263
 msgctxt "queryfilterdialog|op2"
 msgid "AND"
 msgstr "AND"
 
-#: queryfilterdialog.ui:264
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:264
 msgctxt "queryfilterdialog|op2"
 msgid "OR"
 msgstr "OR"
 
-#: queryfilterdialog.ui:278
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:278
 msgctxt "queryfilterdialog|op3"
 msgid "AND"
 msgstr "AND"
 
-#: queryfilterdialog.ui:279
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:279
 msgctxt "queryfilterdialog|op3"
 msgid "OR"
 msgstr "OR"
 
-#: queryfilterdialog.ui:298
+#: dbaccess/uiconfig/ui/queryfilterdialog.ui:298
 msgctxt "queryfilterdialog|label1"
 msgid "Criteria"
 msgstr "Maen prawf"
 
-#: queryfuncmenu.ui:12
+#: dbaccess/uiconfig/ui/queryfuncmenu.ui:12
 msgctxt "queryfuncmenu|functions"
 msgid "Functions"
 msgstr "Ffwythiannau"
 
-#: queryfuncmenu.ui:26
+#: dbaccess/uiconfig/ui/queryfuncmenu.ui:26
 msgctxt "queryfuncmenu|tablename"
 msgid "Table Name"
 msgstr "Enw Tabl"
 
-#: queryfuncmenu.ui:34
+#: dbaccess/uiconfig/ui/queryfuncmenu.ui:34
 msgctxt "queryfuncmenu|alias"
 msgid "Alias"
 msgstr "Enw Arall"
 
-#: queryfuncmenu.ui:48
+#: dbaccess/uiconfig/ui/queryfuncmenu.ui:48
 msgctxt "queryfuncmenu|distinct"
 msgid "Distinct Values"
 msgstr "Gwerthoedd Penodol"
 
-#: querypropertiesdialog.ui:9
+#: dbaccess/uiconfig/ui/querypropertiesdialog.ui:9
 msgctxt "querypropertiesdialog|QueryPropertiesDialog"
 msgid "Query Properties"
 msgstr "Priodweddau Ymholiad"
 
-#: querypropertiesdialog.ui:101
+#: dbaccess/uiconfig/ui/querypropertiesdialog.ui:101
 msgctxt "querypropertiesdialog|limit-label"
 msgid "Limit:"
 msgstr "Terfyn:"
 
-#: querypropertiesdialog.ui:117
+#: dbaccess/uiconfig/ui/querypropertiesdialog.ui:117
 msgctxt "querypropertiesdialog|distinct"
 msgid "Yes"
 msgstr "Iawn"
 
-#: querypropertiesdialog.ui:133
+#: dbaccess/uiconfig/ui/querypropertiesdialog.ui:134
 msgctxt "querypropertiesdialog|nondistinct"
 msgid "No"
 msgstr "Na"
 
-#: querypropertiesdialog.ui:160
+#: dbaccess/uiconfig/ui/querypropertiesdialog.ui:162
 msgctxt "querypropertiesdialog|distinctvalues"
 msgid "Distinct values:"
 msgstr "Gwerthoedd penodol:"
 
-#: relationdialog.ui:9
+#: dbaccess/uiconfig/ui/relationdialog.ui:9
 msgctxt "relationdialog|RelationDialog"
 msgid "Relations"
 msgstr "Perthnasau"
 
-#: relationdialog.ui:132
+#: dbaccess/uiconfig/ui/relationdialog.ui:132
 msgctxt "relationdialog|label1"
 msgid "Tables Involved"
 msgstr "Tablau Cysylltiedig"
 
-#: relationdialog.ui:173
+#: dbaccess/uiconfig/ui/relationdialog.ui:173
 msgctxt "relationdialog|label2"
 msgid "Fields Involved"
 msgstr "Meysydd Cysylltiedig"
 
-#: relationdialog.ui:211
+#: dbaccess/uiconfig/ui/relationdialog.ui:211
 msgctxt "relationdialog|addaction"
 msgid "_No action"
 msgstr "_Dim gweithred"
 
-#: relationdialog.ui:228
+#: dbaccess/uiconfig/ui/relationdialog.ui:228
 msgctxt "relationdialog|addcascade"
 msgid "_Update cascade"
 msgstr "_Diweddaru raeadr"
 
-#: relationdialog.ui:244
+#: dbaccess/uiconfig/ui/relationdialog.ui:244
 msgctxt "relationdialog|addnull"
-msgid "_Set null"
-msgstr "Gosod _nwl"
+msgid "_Set NULL"
+msgstr "Gosod NULL"
 
-#: relationdialog.ui:260
+#: dbaccess/uiconfig/ui/relationdialog.ui:260
 msgctxt "relationdialog|adddefault"
 msgid "Set _default"
 msgstr "Gosod _rhagosodiad"
 
-#: relationdialog.ui:282
+#: dbaccess/uiconfig/ui/relationdialog.ui:282
 msgctxt "relationdialog|label3"
 msgid "Update Options"
 msgstr "Dewisiadau Diweddaru"
 
-#: relationdialog.ui:315
+#: dbaccess/uiconfig/ui/relationdialog.ui:315
 msgctxt "relationdialog|delaction"
 msgid "_No action"
 msgstr "_Dim gweithred"
 
-#: relationdialog.ui:331
+#: dbaccess/uiconfig/ui/relationdialog.ui:331
 msgctxt "relationdialog|delcascade"
 msgid "Delete _cascade"
 msgstr "Dileu r_haeadru"
 
-#: relationdialog.ui:346
+#: dbaccess/uiconfig/ui/relationdialog.ui:346
 msgctxt "relationdialog|delnull"
-msgid "_Set null"
-msgstr "Gosod _nwl"
+msgid "_Set NULL"
+msgstr "_Gosod NULL"
 
-#: relationdialog.ui:361
+#: dbaccess/uiconfig/ui/relationdialog.ui:361
 msgctxt "relationdialog|deldefault"
 msgid "Set _default"
 msgstr "Gosod _rhagosodiad"
 
-#: relationdialog.ui:382
+#: dbaccess/uiconfig/ui/relationdialog.ui:382
 msgctxt "relationdialog|label4"
 msgid "Delete Options"
 msgstr "Dileu Dewisiadau"
 
-#: relationdialog.ui:435
+#: dbaccess/uiconfig/ui/relationdialog.ui:435
 msgctxt "relationdialog|liststore1"
 msgid "Inner join"
 msgstr "Uniad mewnol"
 
-#: relationdialog.ui:439
+#: dbaccess/uiconfig/ui/relationdialog.ui:439
 msgctxt "relationdialog|liststore1"
 msgid "Left join"
 msgstr "Uniad chwith"
 
-#: relationdialog.ui:443
+#: dbaccess/uiconfig/ui/relationdialog.ui:443
 msgctxt "relationdialog|liststore1"
 msgid "Right join"
 msgstr "Uniad de"
 
-#: relationdialog.ui:447
+#: dbaccess/uiconfig/ui/relationdialog.ui:447
 msgctxt "relationdialog|liststore1"
 msgid "Full (outer) join"
 msgstr "Uniad (allanol) llawn"
 
-#: relationdialog.ui:451
+#: dbaccess/uiconfig/ui/relationdialog.ui:451
 msgctxt "relationdialog|liststore1"
 msgid "Cross join"
 msgstr "Uniad croes"
 
-#: rowheightdialog.ui:15
+#: dbaccess/uiconfig/ui/rowheightdialog.ui:15
 msgctxt "rowheightdialog|RowHeightDialog"
 msgid "Row Height"
 msgstr "Uchder Rhes"
 
-#: rowheightdialog.ui:94
+#: dbaccess/uiconfig/ui/rowheightdialog.ui:94
 msgctxt "rowheightdialog|label1"
 msgid "_Height:"
 msgstr "_Uchder:"
 
-#: rowheightdialog.ui:119
+#: dbaccess/uiconfig/ui/rowheightdialog.ui:118
 msgctxt "rowheightdialog|automatic"
 msgid "_Automatic"
 msgstr "_Awtomatig"
 
-#: rtfcopytabledialog.ui:9
+#: dbaccess/uiconfig/ui/rtfcopytabledialog.ui:9
 msgctxt "rtfcopytabledialog|RTFCopyTable"
 msgid "Copy RTF Table"
 msgstr "Copïo tabl RTF"
 
-#: savedialog.ui:9
+#: dbaccess/uiconfig/ui/savedialog.ui:9
 msgctxt "savedialog|SaveDialog"
 msgid "Save As"
 msgstr "Cadw Fel"
 
-#: savedialog.ui:85
+#: dbaccess/uiconfig/ui/savedialog.ui:85
 msgctxt "savedialog|descriptionft"
 msgid "Please enter a name for the object to be created:"
 msgstr "Rhowch enw'r gwrthrych i'w greu:"
 
-#: savedialog.ui:100
+#: dbaccess/uiconfig/ui/savedialog.ui:100
 msgctxt "savedialog|catalogft"
 msgid "_Catalog:"
 msgstr "_Catalog:"
 
-#: savedialog.ui:114
+#: dbaccess/uiconfig/ui/savedialog.ui:114
 msgctxt "savedialog|schemaft"
 msgid "_Schema:"
 msgstr "_Sgema:"
 
-#: saveindexdialog.ui:8
+#: dbaccess/uiconfig/ui/saveindexdialog.ui:7
 msgctxt "saveindexdialog|SaveIndexDialog"
 msgid "Exit Index Design"
 msgstr "Gadael Cynllunio'r Mynegai"
 
-#: saveindexdialog.ui:13
+#: dbaccess/uiconfig/ui/saveindexdialog.ui:13
 msgctxt "saveindexdialog|SaveIndexDialog"
 msgid "Do you want to save the changes made to the current index?"
 msgstr "Hoffech chi gadw'r newidiadau wnaed i'r mynegai presennol?"
 
-#: savemodifieddialog.ui:12
+#: dbaccess/uiconfig/ui/savemodifieddialog.ui:12
 msgctxt "savemodifieddialog|SaveModifiedDialog"
 msgid "Do you want to save the changes?"
 msgstr "Hoffech gadw eich newidiadau?"
 
-#: savemodifieddialog.ui:13
+#: dbaccess/uiconfig/ui/savemodifieddialog.ui:13
 msgctxt "savemodifieddialog|SaveModifiedDialog"
 msgid "The current record has been changed."
 msgstr "Mae'r cofnod cyfredol wedi ei newid."
 
-#: sortdialog.ui:8
+#: dbaccess/uiconfig/ui/sortdialog.ui:8
 msgctxt "sortdialog|SortDialog"
 msgid "Sort Order"
 msgstr "Trefnu Didoli"
 
-#: sortdialog.ui:96
+#: dbaccess/uiconfig/ui/sortdialog.ui:96
 msgctxt "sortdialog|label2"
 msgid "Operator"
 msgstr "Gweithredydd"
 
-#: sortdialog.ui:109
+#: dbaccess/uiconfig/ui/sortdialog.ui:109
 msgctxt "sortdialog|label3"
 msgid "and then"
 msgstr "ac yna"
 
-#: sortdialog.ui:122
+#: dbaccess/uiconfig/ui/sortdialog.ui:122
 msgctxt "sortdialog|label4"
 msgid "and then"
 msgstr "ac yna"
 
-#: sortdialog.ui:134
+#: dbaccess/uiconfig/ui/sortdialog.ui:134
 msgctxt "sortdialog|label5"
 msgid "Field name"
 msgstr "Enw Maes"
 
-#: sortdialog.ui:146
+#: dbaccess/uiconfig/ui/sortdialog.ui:146
 msgctxt "sortdialog|label6"
 msgid "Order"
 msgstr "Trefn"
 
-#: sortdialog.ui:171
+#: dbaccess/uiconfig/ui/sortdialog.ui:171
 msgctxt "sortdialog|value1"
 msgid "ascending"
 msgstr "esgyn"
 
-#: sortdialog.ui:172
+#: dbaccess/uiconfig/ui/sortdialog.ui:172
 msgctxt "sortdialog|value1"
 msgid "descending"
 msgstr "gostyngol"
 
-#: sortdialog.ui:208
+#: dbaccess/uiconfig/ui/sortdialog.ui:208
 msgctxt "sortdialog|value2"
 msgid "ascending"
 msgstr "esgyn"
 
-#: sortdialog.ui:209
+#: dbaccess/uiconfig/ui/sortdialog.ui:209
 msgctxt "sortdialog|value2"
 msgid "descending"
 msgstr "gostyngol"
 
-#: sortdialog.ui:223
+#: dbaccess/uiconfig/ui/sortdialog.ui:223
 msgctxt "sortdialog|value3"
 msgid "ascending"
 msgstr "esgyn"
 
-#: sortdialog.ui:224
+#: dbaccess/uiconfig/ui/sortdialog.ui:224
 msgctxt "sortdialog|value3"
 msgid "descending"
 msgstr "gostyngol"
 
-#: sortdialog.ui:243
+#: dbaccess/uiconfig/ui/sortdialog.ui:243
 msgctxt "sortdialog|label1"
 msgid "Sort Order"
 msgstr "Trefnu Didoli"
 
-#: specialjdbcconnectionpage.ui:19
+#: dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui:19
 msgctxt "specialjdbcconnectionpage|header"
 msgid "Set up connection to a MySQL database using JDBC"
 msgstr "Creu cysylltiad i gronfa ddata MySQL drwy JDBC"
 
-#: specialjdbcconnectionpage.ui:35
+#: dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui:35
 msgctxt "specialjdbcconnectionpage|helpLabel"
 msgid "Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME. Please contact your system administrator if you are unsure about the following settings. "
 msgstr "Rhowch y manylion angenrheidiol i gysylltu â chronfa ddata MySQL drwy JDBC. Sylwch fod yn rhaid gosod dosbarth gyrrwr JDBC ar eich system â'i gofrestru gyda %PRODUCTNAME. Cysylltwch â'ch gweinyddwr system os ydych yn ansicr am y gosodiadau canlynol. "
 
-#: specialjdbcconnectionpage.ui:58
+#: dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui:58
 msgctxt "specialjdbcconnectionpage|dbNameLabel"
 msgid "_Database name:"
 msgstr "_Enw'r gronfa ddata:"
 
-#: specialjdbcconnectionpage.ui:72
+#: dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui:72
 msgctxt "specialjdbcconnectionpage|hostNameLabel"
 msgid "_Server:"
 msgstr "_Gweinydd:"
 
-#: specialjdbcconnectionpage.ui:86
+#: dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui:86
 msgctxt "specialjdbcconnectionpage|portNumLabel"
 msgid "_Port number:"
 msgstr "_Rhif porth:"
 
-#: specialjdbcconnectionpage.ui:139
+#: dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui:139
 msgctxt "specialjdbcconnectionpage|portNumDefLabel"
 msgid "Default: 3306"
 msgstr "Rhagosodedig: 3306"
 
-#: specialjdbcconnectionpage.ui:173
+#: dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui:173
 msgctxt "specialjdbcconnectionpage|jdbcDriverLabel"
 msgid "MySQL JDBC d_river class:"
 msgstr "_Dosbarth gyrrwr MySQL JDBC:"
 
-#: specialjdbcconnectionpage.ui:195
+#: dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui:195
 msgctxt "specialjdbcconnectionpage|testDriverButton"
 msgid "_Test Class"
 msgstr "_Dosbarth Prawf"
 
-#: specialsettingspage.ui:18
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:18
 msgctxt "specialsettingspage|usesql92"
 msgid "Use SQL92 naming constraints"
 msgstr "Defnyddio cyfyngiad enwi SQL92"
 
-#: specialsettingspage.ui:35
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:35
 msgctxt "specialsettingspage|append"
 msgid "Append the table alias name on SELECT statements"
 msgstr "Atodi enw arall y tabl ar ddatganiadau SELECT"
 
-#: specialsettingspage.ui:52
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:52
 msgctxt "specialsettingspage|useas"
 msgid "Use keyword AS before table alias names"
 msgstr "Defnyddio allweddair AS cyn enwau eraill tabl"
 
-#: specialsettingspage.ui:69
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:69
 msgctxt "specialsettingspage|useoj"
 msgid "Use Outer Join syntax '{oj }'"
 msgstr "Defnyddiwch gystrawen Outer Join '{oj }'"
 
-#: specialsettingspage.ui:86
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:86
 msgctxt "specialsettingspage|ignoreprivs"
 msgid "Ignore the privileges from the database driver"
 msgstr "Anwybyddu breintiau o yrrwr y gronfa ddata"
 
-#: specialsettingspage.ui:103
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:103
 msgctxt "specialsettingspage|replaceparams"
 msgid "Replace named parameters with '?'"
 msgstr "Newid y paramedrau enwyd gyda '?'"
 
-#: specialsettingspage.ui:120
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:120
 msgctxt "specialsettingspage|displayver"
 msgid "Display version columns (when available)"
 msgstr "Dangos fersiwn y colofnau (lle mae ar gael)"
 
-#: specialsettingspage.ui:137
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:137
 msgctxt "specialsettingspage|usecatalogname"
 msgid "Use catalog name in SELECT statements"
 msgstr "Defnyddio enw catalog mewn datganiadau SELECT"
 
-#: specialsettingspage.ui:154
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:154
 msgctxt "specialsettingspage|useschemaname"
 msgid "Use schema name in SELECT statements"
 msgstr "Defnyddio enw sgema mewn datganiadau SELECT"
 
-#: specialsettingspage.ui:171
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:171
 msgctxt "specialsettingspage|createindex"
 msgid "Create index with ASC or DESC statement"
 msgstr "Creu mynegai gyda datganiad ASC neu DESC"
 
-#: specialsettingspage.ui:188
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:188
 msgctxt "specialsettingspage|eol"
 msgid "End text lines with CR+LF"
 msgstr "Diwedd llinellau testun gyda CR+LF"
 
-#: specialsettingspage.ui:205
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:205
 msgctxt "specialsettingspage|ignorecurrency"
 msgid "Ignore currency field information"
 msgstr "Anwybyddu gwybodaeth maes arian"
 
-#: specialsettingspage.ui:222
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:222
 msgctxt "specialsettingspage|inputchecks"
 msgid "Form data input checks for required fields"
 msgstr "Gwiriadau mewnbwn data ffurflen ar gyfer y meysydd angenrheidiol"
 
-#: specialsettingspage.ui:239
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:239
 msgctxt "specialsettingspage|useodbcliterals"
 msgid "Use ODBC conformant date/time literals"
 msgstr "Defnyddio llythrennydd dyddiad/amser cydymffurfiwr ODBC"
 
-#: specialsettingspage.ui:256
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:256
 msgctxt "specialsettingspage|primarykeys"
 msgid "Supports primary keys"
 msgstr "Cynnal alleddi cynradd"
 
-#: specialsettingspage.ui:273
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:273
 msgctxt "specialsettingspage|resulttype"
 msgid "Respect the result set type from the database driver"
 msgstr "Parchu'r math gosod canlyniad o yrrwr y gronfa ddata"
 
-#: specialsettingspage.ui:299
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:299
 msgctxt "specialsettingspage|comparisonft"
 msgid "Comparison of Boolean values:"
 msgstr "Cymhariaeth o werthoedd Boole:"
 
-#: specialsettingspage.ui:315
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:315
 msgctxt "specialsettingspage|comparison"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: specialsettingspage.ui:316
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:316
 msgctxt "specialsettingspage|comparison"
 msgid "SQL"
 msgstr "SQL"
 
-#: specialsettingspage.ui:317
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:317
 msgctxt "specialsettingspage|comparison"
 msgid "Mixed"
 msgstr "Cymysg"
 
-#: specialsettingspage.ui:318
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:318
 msgctxt "specialsettingspage|comparison"
 msgid "MS Access"
 msgstr "MS Access"
 
-#: specialsettingspage.ui:333
+#: dbaccess/uiconfig/ui/specialsettingspage.ui:333
 msgctxt "specialsettingspage|rowsft"
 msgid "Rows to scan column types:"
 msgstr "Rhesi i'w sganio mathau colofnau:"
 
-#: sqlexception.ui:9
+#: dbaccess/uiconfig/ui/sqlexception.ui:18
 msgctxt "sqlexception|SQLExceptionDialog"
 msgid "Error Details"
 msgstr "Manylion Gwall"
 
-#: sqlexception.ui:58
+#: dbaccess/uiconfig/ui/sqlexception.ui:68
 msgctxt "sqlexception|label2"
 msgid "Error _list:"
 msgstr "_Rhestr gwall:"
 
-#: sqlexception.ui:72
+#: dbaccess/uiconfig/ui/sqlexception.ui:82
 msgctxt "sqlexception|label3"
 msgid "_Description:"
 msgstr "_Disgrifiad:"
 
-#: summarypage.ui:17
+#: dbaccess/uiconfig/ui/summarypage.ui:17
 msgctxt "summarypage|label1"
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: summarypage.ui:34
+#: dbaccess/uiconfig/ui/summarypage.ui:34
 msgctxt "summarypage|success"
 msgid "The migration was successful. Below is a log of the actions which have been taken to your document."
 msgstr "Bu'r mudo'n llwyddiant. Isod mae cofnod o'r gweithredoedd sydd wedi eu cyflawni ar eich dogfen."
 
-#: summarypage.ui:50
+#: dbaccess/uiconfig/ui/summarypage.ui:50
 msgctxt "summarypage|failure"
 msgid "The migration was not successful. Examine the migration log below for details."
 msgstr "Ni fu'r mudo'n llwyddiant. Darllenwch y cofnod isod am fanylion."
 
-#: tabledesignrowmenu.ui:12
+#: dbaccess/uiconfig/ui/tabledesignrowmenu.ui:12
 msgctxt "tabledesignrowmenu|cut"
 msgid "Cu_t"
 msgstr "_Torri"
 
-#: tabledesignrowmenu.ui:20
+#: dbaccess/uiconfig/ui/tabledesignrowmenu.ui:20
 msgctxt "tabledesignrowmenu|copy"
 msgid "_Copy"
 msgstr "­_Copïo"
 
-#: tabledesignrowmenu.ui:28
+#: dbaccess/uiconfig/ui/tabledesignrowmenu.ui:28
 msgctxt "tabledesignrowmenu|paste"
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: tabledesignrowmenu.ui:35
+#: dbaccess/uiconfig/ui/tabledesignrowmenu.ui:35
 msgctxt "tabledesignrowmenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: tabledesignrowmenu.ui:42
+#: dbaccess/uiconfig/ui/tabledesignrowmenu.ui:42
 msgctxt "tabledesignrowmenu|insert"
 msgid "Insert Rows"
 msgstr "Mewnosod Rhesi"
 
-#: tabledesignrowmenu.ui:55
+#: dbaccess/uiconfig/ui/tabledesignrowmenu.ui:55
 msgctxt "tabledesignrowmenu|primarykey"
 msgid "Primary Key"
 msgstr "Allwedd Gynradd"
 
-#: tabledesignsavemodifieddialog.ui:12
+#: dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui:12
 msgctxt "tabledesignsavemodifieddialog|TableDesignSaveModifiedDialog"
 msgid "Do you want to save the changes?"
 msgstr "Hoffech chi gadw'r newidiadau?"
 
-#: tabledesignsavemodifieddialog.ui:13
+#: dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui:13
 msgctxt "tabledesignsavemodifieddialog|TableDesignSaveModifiedDialog"
 msgid "The table has been changed."
 msgstr "Mae'r tabl wedi ei newid."
 
-#: tablesfilterdialog.ui:8
+#: dbaccess/uiconfig/ui/tablesfilterdialog.ui:8
 msgctxt "tablesfilterdialog|TablesFilterDialog"
 msgid "Tables Filter"
 msgstr "Hidl Tablau"
 
-#: tablesfilterpage.ui:34
+#: dbaccess/uiconfig/ui/tablesfilterpage.ui:34
 msgctxt "tablesfilterpage|label2"
 msgid "Mark the tables that should be visible for the applications."
 msgstr "Marcio'r tablau ddylai fod yn weladwy ar gyfer rhaglenni."
 
-#: tablesfilterpage.ui:70
+#: dbaccess/uiconfig/ui/tablesfilterpage.ui:70
 msgctxt "tablesfilterpage|label1"
 msgid "Tables and Table Filter"
 msgstr "Tablau a Hidl Tabl"
 
-#: tablesjoindialog.ui:82
+#: dbaccess/uiconfig/ui/tablesjoindialog.ui:82
 msgctxt "tablesjoindialog|tables"
 msgid "Tables"
 msgstr "Tablau"
 
-#: tablesjoindialog.ui:99
+#: dbaccess/uiconfig/ui/tablesjoindialog.ui:99
 msgctxt "tablesjoindialog|queries"
 msgid "Queries"
 msgstr "Ymholiadau"
 
-#: tablesjoindialog.ui:132
+#: dbaccess/uiconfig/ui/tablesjoindialog.ui:132
 msgctxt "tablesjoindialog|title"
 msgid "Add Tables"
 msgstr "Ychwanegu Tablau"
 
-#: tablesjoindialog.ui:143
+#: dbaccess/uiconfig/ui/tablesjoindialog.ui:143
 msgctxt "tablesjoindialog|alttitle"
 msgid "Add Table or Query"
 msgstr "Ychwanegu Tabl neu Ymholiad"
 
-#: textconnectionsettings.ui:8
+#: dbaccess/uiconfig/ui/textconnectionsettings.ui:8
 msgctxt "textconnectionsettings|TextConnectionSettingsDialog"
 msgid "Text Connection Settings"
 msgstr "Gosodiadau'r Cysylltiad Testun"
 
-#: textpage.ui:39
+#: dbaccess/uiconfig/ui/textpage.ui:39
 msgctxt "textpage|textfile"
 msgid "Plain text files (*.txt)"
 msgstr "Ffeiliau testun plaen (*.txt)"
 
-#: textpage.ui:56
+#: dbaccess/uiconfig/ui/textpage.ui:57
 msgctxt "textpage|csvfile"
 msgid "Comma-separated value files (*.csv)"
 msgstr "Ffeiliau gwahanwyd gan goma (*.csv)"
 
-#: textpage.ui:73
+#: dbaccess/uiconfig/ui/textpage.ui:75
 msgctxt "textpage|custom"
 msgid "Custom:"
 msgstr "Cyfaddas:"
 
-#: textpage.ui:106
+#: dbaccess/uiconfig/ui/textpage.ui:107
 msgctxt "textpage|example"
 msgid "Custom: *.abc"
 msgstr "Cyfaddas: *.abc"
 
-#: textpage.ui:121
+#: dbaccess/uiconfig/ui/textpage.ui:122
 msgctxt "textpage|extensionheader"
 msgid "Specify the Type of Files You Want to Access"
 msgstr "Enwi'r Math o Ffeiliau i Gael Mynediad Atynt"
 
-#: textpage.ui:159
+#: dbaccess/uiconfig/ui/textpage.ui:160
 msgctxt "textpage|containsheaders"
 msgid "_Text contains headers"
 msgstr "_Testun yn cynnwys penynnau"
 
-#: textpage.ui:181
+#: dbaccess/uiconfig/ui/textpage.ui:182
 msgctxt "textpage|fieldlabel"
 msgid "Field separator:"
 msgstr "Ymwahanydd Maes:"
 
-#: textpage.ui:195
+#: dbaccess/uiconfig/ui/textpage.ui:196
 msgctxt "textpage|textlabel"
 msgid "Text separator:"
 msgstr "Ymwahanydd testun:"
 
-#: textpage.ui:209
+#: dbaccess/uiconfig/ui/textpage.ui:210
 msgctxt "textpage|decimallabel"
 msgid "Decimal separator:"
 msgstr "Ymwahanydd degol:"
 
-#: textpage.ui:223
+#: dbaccess/uiconfig/ui/textpage.ui:224
 msgctxt "textpage|thousandslabel"
 msgid "Thousands separator:"
 msgstr "Ymwahanydd miloedd:"
 
-#: textpage.ui:273
+#: dbaccess/uiconfig/ui/textpage.ui:274
 msgctxt "textpage|decimalseparator"
 msgid "."
 msgstr "."
 
-#: textpage.ui:274
+#: dbaccess/uiconfig/ui/textpage.ui:275
 msgctxt "textpage|decimalseparator"
 msgid ","
 msgstr ","
 
-#: textpage.ui:275
+#: dbaccess/uiconfig/ui/textpage.ui:276
 msgctxt "textpage|decimalseparator"
 msgid ";"
 msgstr ";"
 
-#: textpage.ui:276
+#: dbaccess/uiconfig/ui/textpage.ui:277
 msgctxt "textpage|decimalseparator"
 msgid ":"
 msgstr ":"
 
-#: textpage.ui:296
+#: dbaccess/uiconfig/ui/textpage.ui:297
 msgctxt "textpage|thousandsseparator"
 msgid "."
 msgstr "."
 
-#: textpage.ui:297
+#: dbaccess/uiconfig/ui/textpage.ui:298
 msgctxt "textpage|thousandsseparator"
 msgid ","
 msgstr ","
 
-#: textpage.ui:318
+#: dbaccess/uiconfig/ui/textpage.ui:319
 msgctxt "textpage|formatlabel"
 msgid "Row Format"
 msgstr "Fformat Rhes"
 
-#: textpage.ui:359
+#: dbaccess/uiconfig/ui/textpage.ui:360
 msgctxt "textpage|charsetlabel"
 msgid "_Character set:"
 msgstr "_Set nod:"
 
-#: textpage.ui:389
+#: dbaccess/uiconfig/ui/textpage.ui:390
 msgctxt "textpage|charsetheader"
 msgid "Data Conversion"
 msgstr "Trosi Data"
 
-#: typeselectpage.ui:71
+#: dbaccess/uiconfig/ui/typeselectpage.ui:71
 msgctxt "typeselectpage|columns"
 msgid "Column Information"
 msgstr "Manylion Colofn"
 
-#: typeselectpage.ui:110
+#: dbaccess/uiconfig/ui/typeselectpage.ui:110
 msgctxt "typeselectpage|autolabel"
 msgid "Lines (ma_x.):"
 msgstr "Llinellau (_uchafswm):"
 
-#: typeselectpage.ui:121
+#: dbaccess/uiconfig/ui/typeselectpage.ui:121
 msgctxt "typeselectpage|autobutton"
 msgid "_Auto"
 msgstr "_Awto"
 
-#: typeselectpage.ui:153
+#: dbaccess/uiconfig/ui/typeselectpage.ui:152
 msgctxt "typeselectpage|autotype"
 msgid "Automatic Type Recognition"
 msgstr "Adnabod Math yn Awtomatig"
 
-#: useradmindialog.ui:8
+#: dbaccess/uiconfig/ui/useradmindialog.ui:8
 msgctxt "useradmindialog|UserAdminDialog"
 msgid "User Administration"
 msgstr "Gweinyddiaeth Defnyddiwr"
 
-#: useradmindialog.ui:92
+#: dbaccess/uiconfig/ui/useradmindialog.ui:92
 msgctxt "useradmindialog|settings"
 msgid "User Settings"
 msgstr "Gosodiadau'r Defnyddiwr"
 
-#: useradminpage.ui:47
+#: dbaccess/uiconfig/ui/useradminpage.ui:47
 msgctxt "useradminpage|label3"
 msgid "Us_er:"
 msgstr "_Defnyddiwr:"
 
-#: useradminpage.ui:83
+#: dbaccess/uiconfig/ui/useradminpage.ui:83
 msgctxt "useradminpage|add"
 msgid "_Add User..."
 msgstr "_Ychwanegu Defnyddiwr..."
 
-#: useradminpage.ui:98
+#: dbaccess/uiconfig/ui/useradminpage.ui:98
 msgctxt "useradminpage|changepass"
 msgid "Change _Password..."
 msgstr "_Newid Cyfrinair..."
 
-#: useradminpage.ui:113
+#: dbaccess/uiconfig/ui/useradminpage.ui:113
 msgctxt "useradminpage|delete"
 msgid "_Delete User..."
 msgstr "_Dileu Defnyddiwr..."
 
-#: useradminpage.ui:141
+#: dbaccess/uiconfig/ui/useradminpage.ui:141
 msgctxt "useradminpage|label1"
 msgid "User Selection"
 msgstr "Dewis Defnyddiwr"
 
-#: useradminpage.ui:180
+#: dbaccess/uiconfig/ui/useradminpage.ui:180
 msgctxt "useradminpage|label2"
 msgid "Access Rights for Selected User"
 msgstr "Hawl Mynediad i Ddefnyddwyr Dewisedig"
 
-#: userdetailspage.ui:40
+#: dbaccess/uiconfig/ui/userdetailspage.ui:40
 msgctxt "userdetailspage|hostnameft"
 msgid "_Host name:"
 msgstr "_Enw gwesteiwr:"
 
-#: userdetailspage.ui:56
+#: dbaccess/uiconfig/ui/userdetailspage.ui:56
 msgctxt "userdetailspage|portnumberft"
 msgid "_Port number:"
 msgstr "_Rhif porth:"
 
-#: userdetailspage.ui:89
+#: dbaccess/uiconfig/ui/userdetailspage.ui:89
 msgctxt "userdetailspage|usecatalog"
 msgid "_Use catalog"
 msgstr "_Defnyddio catalog"
 
-#: userdetailspage.ui:109
+#: dbaccess/uiconfig/ui/userdetailspage.ui:109
 msgctxt "userdetailspage|optionslabel"
 msgid "_Driver settings:"
 msgstr "_Gosodiadau gyrrwr:"
 
-#: userdetailspage.ui:137
+#: dbaccess/uiconfig/ui/userdetailspage.ui:137
 msgctxt "userdetailspage|label1"
 msgid "Connection Settings"
 msgstr "Gosodiadau Cysylltu"
 
-#: userdetailspage.ui:175
+#: dbaccess/uiconfig/ui/userdetailspage.ui:175
 msgctxt "userdetailspage|charsetlabel"
 msgid "_Character set:"
 msgstr "_Set nod:"
 
-#: userdetailspage.ui:205
+#: dbaccess/uiconfig/ui/userdetailspage.ui:205
 msgctxt "userdetailspage|charsetheader"
 msgid "Data conversion"
 msgstr "Trosi data"
diff --git a/source/cy/desktop/messages.po b/source/cy/desktop/messages.po
index 6f78c9a1542..f09b5de73b8 100644
--- a/source/cy/desktop/messages.po
+++ b/source/cy/desktop/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-11-22 13:53+0100\n"
+"POT-Creation-Date: 2018-04-23 18:11+0200\n"
 "PO-Revision-Date: 2018-02-13 16:44+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,220 +13,220 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1518540265.000000\n"
 
-#: strings.hrc:25
+#: desktop/inc/strings.hrc:25
 msgctxt "RID_STR_COPYING_PACKAGE"
 msgid "Copying: "
 msgstr "Copïo: "
 
-#: strings.hrc:26
+#: desktop/inc/strings.hrc:26
 msgctxt "RID_STR_ERROR_WHILE_ADDING"
 msgid "Error while adding: "
 msgstr "Gwall wrth ychwanegu: "
 
-#: strings.hrc:27
+#: desktop/inc/strings.hrc:27
 msgctxt "RID_STR_ERROR_WHILE_REMOVING"
 msgid "Error while removing: "
 msgstr "Gwall wrth dynnu: "
 
-#: strings.hrc:28
+#: desktop/inc/strings.hrc:28
 msgctxt "RID_STR_PACKAGE_ALREADY_ADDED"
 msgid "Extension has already been added: "
 msgstr "Mae'r estyniad wedi ei osod eisoes: "
 
-#: strings.hrc:29
+#: desktop/inc/strings.hrc:29
 msgctxt "RID_STR_NO_SUCH_PACKAGE"
 msgid "There is no such extension deployed: "
 msgstr "Nid oes estyniad o'r fath wedi ei ddarparu: "
 
-#: strings.hrc:30
+#: desktop/inc/strings.hrc:30
 msgctxt "RID_STR_SYNCHRONIZING_REPOSITORY"
 msgid "Synchronizing repository for %NAME extensions"
 msgstr "Cydweddu'r storfa ynghylch estyniad %NAME"
 
-#: strings.hrc:32
+#: desktop/inc/strings.hrc:32
 msgctxt "RID_STR_REGISTERING_PACKAGE"
 msgid "Enabling: "
 msgstr "Galluogi: "
 
-#: strings.hrc:33
+#: desktop/inc/strings.hrc:33
 msgctxt "RID_STR_REVOKING_PACKAGE"
 msgid "Disabling: "
 msgstr "Anablu: "
 
-#: strings.hrc:34
+#: desktop/inc/strings.hrc:34
 msgctxt "RID_STR_CANNOT_DETECT_MEDIA_TYPE"
 msgid "Cannot detect media-type: "
 msgstr "Methu canfod cyfrwng o'r fath: "
 
-#: strings.hrc:35
+#: desktop/inc/strings.hrc:35
 msgctxt "RID_STR_UNSUPPORTED_MEDIA_TYPE"
 msgid "This media-type is not supported: "
 msgstr "Dim cefnogaeth i gyfrwng o fath: "
 
-#: strings.hrc:36
+#: desktop/inc/strings.hrc:36
 msgctxt "RID_STR_ERROR_WHILE_REGISTERING"
 msgid "An error occurred while enabling: "
 msgstr "Digwyddodd gwall wrth alluogi: "
 
-#: strings.hrc:37
+#: desktop/inc/strings.hrc:37
 msgctxt "RID_STR_ERROR_WHILE_REVOKING"
 msgid "An error occurred while disabling: "
 msgstr "Digwyddodd gwall wrth anablu: "
 
-#: strings.hrc:39
+#: desktop/inc/strings.hrc:39
 msgctxt "RID_STR_CONF_SCHEMA"
 msgid "Configuration Schema"
 msgstr "Sgema Ffurfweddiad"
 
-#: strings.hrc:40
+#: desktop/inc/strings.hrc:40
 msgctxt "RID_STR_CONF_DATA"
 msgid "Configuration Data"
 msgstr "Data Ffurfweddiad"
 
-#: strings.hrc:42
+#: desktop/inc/strings.hrc:42
 msgctxt "RID_STR_BASIC_LIB"
 msgid "%PRODUCTNAME Basic Library"
 msgstr "Llyfrgell Basic %PRODUCTNAME"
 
-#: strings.hrc:43
+#: desktop/inc/strings.hrc:43
 msgctxt "RID_STR_DIALOG_LIB"
 msgid "Dialog Library"
 msgstr "Llyfrgell Deialog"
 
-#: strings.hrc:44
+#: desktop/inc/strings.hrc:44
 msgctxt "RID_STR_CANNOT_DETERMINE_LIBNAME"
 msgid "The library name could not be determined."
 msgstr "Methu canfod enw'r llyfrgell."
 
-#: strings.hrc:46
+#: desktop/inc/strings.hrc:46
 msgctxt "RID_STR_PACKAGE_BUNDLE"
 msgid "Extension"
 msgstr "Estyniad"
 
-#: strings.hrc:48
+#: desktop/inc/strings.hrc:48
 msgctxt "RID_STR_DYN_COMPONENT"
 msgid "UNO Dynamic Library Component"
 msgstr "Cydran Llyfrgell Dynamig UNO"
 
-#: strings.hrc:49
+#: desktop/inc/strings.hrc:49
 msgctxt "RID_STR_JAVA_COMPONENT"
 msgid "UNO Java Component"
 msgstr "Cydran Java UNO"
 
-#: strings.hrc:50
+#: desktop/inc/strings.hrc:50
 msgctxt "RID_STR_PYTHON_COMPONENT"
 msgid "UNO Python Component"
 msgstr "Cydran Python UNO"
 
-#: strings.hrc:51
+#: desktop/inc/strings.hrc:51
 msgctxt "RID_STR_COMPONENTS"
 msgid "UNO Components"
 msgstr "Cydrannau UNO"
 
-#: strings.hrc:52
+#: desktop/inc/strings.hrc:52
 msgctxt "RID_STR_RDB_TYPELIB"
 msgid "UNO RDB Type Library"
 msgstr "Math Llyfrgell RDB UNO"
 
-#: strings.hrc:53
+#: desktop/inc/strings.hrc:53
 msgctxt "RID_STR_JAVA_TYPELIB"
 msgid "UNO Java Type Library"
 msgstr "Math Llyfrgell Java UNO"
 
-#: strings.hrc:55
+#: desktop/inc/strings.hrc:55
 msgctxt "RID_STR_SFWK_LIB"
 msgid "%MACROLANG Library"
 msgstr "Llyfrgell %MACROLANG"
 
-#: strings.hrc:57
+#: desktop/inc/strings.hrc:57
 msgctxt "RID_STR_HELP"
 msgid "Help"
 msgstr "Cymorth"
 
-#: strings.hrc:58
+#: desktop/inc/strings.hrc:58
 msgctxt "RID_STR_HELPPROCESSING_GENERAL_ERROR"
 msgid "The extension cannot be installed because:\n"
 msgstr "Nid oes modd gosod yr estyniad oherwydd:\n"
 
-#: strings.hrc:59
+#: desktop/inc/strings.hrc:59
 msgctxt "RID_STR_HELPPROCESSING_XMLPARSING_ERROR"
 msgid "The extension will not be installed because an error occurred in the Help files:\n"
 msgstr "Nid oedd modd gosod yr estyniad am i wall ddigwydd yn y ffeiliau Cymorth:\n"
 
-#: strings.hrc:61
+#: desktop/inc/strings.hrc:61
 msgctxt "RID_STR_ADD_PACKAGES"
 msgid "Add Extension(s)"
 msgstr "Ychwanegu Estyniad(au)"
 
-#: strings.hrc:62
+#: desktop/inc/strings.hrc:62
 msgctxt "RID_CTX_ITEM_REMOVE"
 msgid "~Remove"
 msgstr "~Tynnu"
 
-#: strings.hrc:63
+#: desktop/inc/strings.hrc:63
 msgctxt "RID_CTX_ITEM_ENABLE"
 msgid "~Enable"
 msgstr "~Galluogi"
 
-#: strings.hrc:64
+#: desktop/inc/strings.hrc:64
 msgctxt "RID_CTX_ITEM_DISABLE"
 msgid "~Disable"
 msgstr "~Anablu"
 
-#: strings.hrc:65
+#: desktop/inc/strings.hrc:65
 msgctxt "RID_CTX_ITEM_CHECK_UPDATE"
 msgid "~Update..."
 msgstr "~Diweddariad..."
 
-#: strings.hrc:66
+#: desktop/inc/strings.hrc:66
 #, c-format
 msgctxt "RID_STR_ADDING_PACKAGES"
 msgid "Adding %EXTENSION_NAME"
 msgstr "Ychwanegu %EXTENSION_NAME"
 
-#: strings.hrc:67
+#: desktop/inc/strings.hrc:67
 #, c-format
 msgctxt "RID_STR_REMOVING_PACKAGES"
 msgid "Removing %EXTENSION_NAME"
 msgstr "Tynnu %EXTENSION_NAME"
 
-#: strings.hrc:68
+#: desktop/inc/strings.hrc:68
 #, c-format
 msgctxt "RID_STR_ENABLING_PACKAGES"
 msgid "Enabling %EXTENSION_NAME"
 msgstr "Galluogi %EXTENSION_NAME"
 
-#: strings.hrc:69
+#: desktop/inc/strings.hrc:69
 #, c-format
 msgctxt "RID_STR_DISABLING_PACKAGES"
 msgid "Disabling %EXTENSION_NAME"
 msgstr "Anablu %EXTENSION_NAME"
 
-#: strings.hrc:70
+#: desktop/inc/strings.hrc:70
 #, c-format
 msgctxt "RID_STR_ACCEPT_LICENSE"
 msgid "Accept license for %EXTENSION_NAME"
 msgstr "Derbyn trwydded %EXTENSION_NAME"
 
-#: strings.hrc:71
+#: desktop/inc/strings.hrc:71
 msgctxt "RID_STR_ERROR_UNKNOWN_STATUS"
 msgid "Error: The status of this extension is unknown"
 msgstr "Gwall: Nid yw statws yr estyniad yn hysbys"
 
-#: strings.hrc:72
+#: desktop/inc/strings.hrc:72
 msgctxt "RID_STR_CLOSE_BTN"
 msgid "Close"
 msgstr "Cau"
 
-#: strings.hrc:73
+#: desktop/inc/strings.hrc:73
 msgctxt "RID_STR_EXIT_BTN"
 msgid "Quit"
 msgstr "Gadael"
 
-#: strings.hrc:74
+#: desktop/inc/strings.hrc:74
 msgctxt "RID_STR_NO_ADMIN_PRIVILEGE"
 msgid ""
 "%PRODUCTNAME has been updated to a new version. Some shared %PRODUCTNAME extensions are not compatible with this version and need to be updated before %PRODUCTNAME can be started.\n"
@@ -237,22 +237,22 @@ msgstr ""
 "\n"
 "Mae diweddaru estyniadau yn gofyn am ganiatâd gweinyddwr. Cysylltwch â'ch gweinyddwr system i ddiweddaru'r estyniadau rhanedig canlynol:"
 
-#: strings.hrc:77
+#: desktop/inc/strings.hrc:77
 msgctxt "RID_STR_ERROR_MISSING_DEPENDENCIES"
 msgid "The extension cannot be enabled as the following system dependencies are not fulfilled:"
 msgstr "Nid oes modd galluogi'r estyniad gan nad yw'r dibyniaethau system canlynol wedi eu bodloni:"
 
-#: strings.hrc:78
+#: desktop/inc/strings.hrc:78
 msgctxt "RID_STR_ERROR_MISSING_LICENSE"
 msgid "This extension is disabled because you haven't accepted the license yet.\n"
 msgstr "Mae'r estyniad wedi ei analluogi gan nad ydych wedi derbyn y drwydded eto.\n"
 
-#: strings.hrc:79
+#: desktop/inc/strings.hrc:79
 msgctxt "RID_STR_SHOW_LICENSE_CMD"
 msgid "Show license"
 msgstr "Dangos y drwydded"
 
-#: strings.hrc:80
+#: desktop/inc/strings.hrc:80
 msgctxt "RID_STR_WARNING_INSTALL_EXTENSION"
 msgid ""
 "You are about to install the extension '%NAME'.\n"
@@ -263,17 +263,17 @@ msgstr ""
 "Cliciwch 'Iawn' i barhau gyda'r gosod.\n"
 "Cliciwch 'Diddymu' i atal y gosod."
 
-#: strings.hrc:83
+#: desktop/inc/strings.hrc:83
 msgctxt "RID_STR_WARNING_INSTALL_EXTENSION_DISABLED"
 msgid "Extension installation is currently disabled. Please consult your system administrator for more information."
 msgstr "Mae gosod estyniadau wedi ei analluogi ar hyn o bryd. Cysylltwch a'ch gweinyddwr system am rhagor o wybodaeth."
 
-#: strings.hrc:85
+#: desktop/inc/strings.hrc:85
 msgctxt "RID_STR_WARNING_REMOVE_EXTENSION_DISABLED"
 msgid "Extension removal is currently disabled. Please consult your system administrator for more information."
 msgstr "Mae tynnu estyniadau wedi ei analluogi ar hyn o bryd. Cysylltwch â'ch gweinyddwr system am rhagor o wybodaeth."
 
-#: strings.hrc:87
+#: desktop/inc/strings.hrc:87
 msgctxt "RID_STR_WARNING_REMOVE_EXTENSION"
 msgid ""
 "You are about to remove the extension '%NAME'.\n"
@@ -284,7 +284,7 @@ msgstr ""
 "Cliciwch 'Iawn' i dynnu'r estyniad.\n"
 "Cliciwch 'Diddymu' i atal tynnu'r estyniad."
 
-#: strings.hrc:90
+#: desktop/inc/strings.hrc:90
 msgctxt "RID_STR_WARNING_REMOVE_SHARED_EXTENSION"
 msgid ""
 "Make sure that no further users are working with the same %PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
@@ -295,7 +295,7 @@ msgstr ""
 "Cliciwch 'Iawn' i dynnu'r estyniad.\n"
 "Cliciwch 'Diddymu' i atal tynnu'r estyniad."
 
-#: strings.hrc:94
+#: desktop/inc/strings.hrc:94
 msgctxt "RID_STR_WARNING_ENABLE_SHARED_EXTENSION"
 msgid ""
 "Make sure that no further users are working with the same %PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
@@ -306,7 +306,7 @@ msgstr ""
 "Cliciwch 'Iawn' i alluogi’r estyniad.\n"
 "Cliciwch 'Diddymu' i atal galluogi'r estyniad."
 
-#: strings.hrc:98
+#: desktop/inc/strings.hrc:98
 msgctxt "RID_STR_WARNING_DISABLE_SHARED_EXTENSION"
 msgid ""
 "Make sure that no further users are working with the same %PRODUCTNAME, when changing shared extensions in a multi user environment.\n"
@@ -317,72 +317,72 @@ msgstr ""
 "Cliciwch 'Iawn' i analluogi’r estyniad.\n"
 "Cliciwch 'Diddymu' i atal analluogi'r estyniad."
 
-#: strings.hrc:102
+#: desktop/inc/strings.hrc:102
 msgctxt "RID_STR_UNSUPPORTED_PLATFORM"
 msgid "The extension '%Name' does not work on this computer."
 msgstr "Nid yw'r estyniad '%Name' yn gweithio ar y cyfrifiadur hwn."
 
-#: strings.hrc:104
+#: desktop/inc/strings.hrc:104
 msgctxt "RID_DLG_UPDATE_INSTALL_INSTALLING"
 msgid "Installing extensions..."
 msgstr "Gosod estyniadau..."
 
-#: strings.hrc:105
+#: desktop/inc/strings.hrc:105
 msgctxt "RID_DLG_UPDATE_INSTALL_FINISHED"
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
-#: strings.hrc:106
+#: desktop/inc/strings.hrc:106
 msgctxt "RID_DLG_UPDATE_INSTALL_NO_ERRORS"
 msgid "No errors."
 msgstr "Dim gwallau."
 
-#: strings.hrc:107
+#: desktop/inc/strings.hrc:107
 msgctxt "RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD"
 msgid "Error while downloading extension %NAME. "
 msgstr "Gwall wrth lwytho i lawr estyniad %NAME. "
 
-#: strings.hrc:108
+#: desktop/inc/strings.hrc:108
 msgctxt "RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED"
 msgid "The error message is: "
 msgstr "Neges gwall: "
 
-#: strings.hrc:109
+#: desktop/inc/strings.hrc:109
 msgctxt "RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION"
 msgid "Error while installing extension %NAME. "
 msgstr "Gwall wrth osod estyniad %NAME. "
 
-#: strings.hrc:110
+#: desktop/inc/strings.hrc:110
 msgctxt "RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED"
 msgid "The license agreement for extension %NAME was refused. "
 msgstr "Gwrthodwyd cytundeb trwydded estyniad %NAME. "
 
-#: strings.hrc:111
+#: desktop/inc/strings.hrc:111
 msgctxt "RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL"
 msgid "The extension will not be installed."
 msgstr "Ni fydd yr estyniad yn cael ei osod."
 
-#: strings.hrc:113
+#: desktop/inc/strings.hrc:113
 msgctxt "RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN"
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: strings.hrc:114
+#: desktop/inc/strings.hrc:114
 msgctxt "RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN"
 msgid "Extension requires at least OpenOffice.org reference version %VERSION"
 msgstr "Mae'r estyniad angen o leiaf cyfeirnod OpenOffice fersiwn %VERSION"
 
-#: strings.hrc:115
+#: desktop/inc/strings.hrc:115
 msgctxt "RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX"
 msgid "Extension does not support OpenOffice.org reference versions greater than %VERSION"
 msgstr "Nid yw'r estyniad yn cynnal fersiynau cyfeirio OpenOffice.org mwy na %VERSION"
 
-#: strings.hrc:116
+#: desktop/inc/strings.hrc:116
 msgctxt "RID_DEPLOYMENT_DEPENDENCIES_LO_MIN"
 msgid "Extension requires at least %PRODUCTNAME version %VERSION"
 msgstr "Mae'r estyniad angen o leiaf %PRODUCTNAME fersiwn %VERSION"
 
-#: strings.hrc:118
+#: desktop/inc/strings.hrc:118
 msgctxt "RID_STR_WARNING_VERSION_LESS"
 msgid ""
 "You are about to install version $NEW of the extension '$NAME'.\n"
@@ -395,7 +395,7 @@ msgstr ""
 "Cliciwch 'Iawn' i newid yr estyniad sydd wedi ei osod.\n"
 "Cliciwch 'Diddymu' i atal y gosod."
 
-#: strings.hrc:122
+#: desktop/inc/strings.hrc:122
 msgctxt "RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES"
 msgid ""
 "You are about to install version $NEW of the extension '$NAME'.\n"
@@ -408,7 +408,7 @@ msgstr ""
 "Cliciwch 'Iawn' i newid yr estyniad sydd wedi ei osod.\n"
 "Cliciwch 'Diddymu' i atal y gosod."
 
-#: strings.hrc:126
+#: desktop/inc/strings.hrc:126
 msgctxt "RID_STR_WARNING_VERSION_EQUAL"
 msgid ""
 "You are about to install version $NEW of the extension '$NAME'.\n"
@@ -421,7 +421,7 @@ msgstr ""
 "Cliciwch 'Iawn' i newid yr estyniad sydd wedi ei osod.\n"
 "Cliciwch 'Diddymu' i atal y gosod."
 
-#: strings.hrc:130
+#: desktop/inc/strings.hrc:130
 msgctxt "RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES"
 msgid ""
 "You are about to install version $NEW of the extension '$NAME'.\n"
@@ -434,7 +434,7 @@ msgstr ""
 "Cliciwch 'Iawn' i newid yr estyniad sydd wedi ei osod.\n"
 "Cliciwch 'Diddymu' i atal y gosod."
 
-#: strings.hrc:134
+#: desktop/inc/strings.hrc:134
 msgctxt "RID_STR_WARNING_VERSION_GREATER"
 msgid ""
 "You are about to install version $NEW of the extension '$NAME'.\n"
@@ -447,7 +447,7 @@ msgstr ""
 "Cliciwch 'Iawn' i newid yr estyniad sydd wedi ei osod.\n"
 "Cliciwch 'Diddymu' i atal y gosod."
 
-#: strings.hrc:138
+#: desktop/inc/strings.hrc:138
 msgctxt "RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES"
 msgid ""
 "You are about to install version $NEW of the extension '$NAME'.\n"
@@ -460,137 +460,137 @@ msgstr ""
 "Cliciwch 'Iawn' i newid yr estyniad sydd wedi ei osod.\n"
 "Cliciwch 'Diddymu' i atal y gosod."
 
-#: strings.hrc:143
+#: desktop/inc/strings.hrc:143
 msgctxt "RID_DLG_UPDATE_NONE"
 msgid "No new updates are available."
 msgstr "Nid oes diweddariadau newydd ar gael."
 
-#: strings.hrc:144
+#: desktop/inc/strings.hrc:144
 msgctxt "RID_DLG_UPDATE_NOINSTALLABLE"
 msgid "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'."
 msgstr "Dim diweddariadau gosodadwy ar gael. I weld pob diweddariad, marciwch y blwch ticio 'Dangos pob diweddariad'."
 
-#: strings.hrc:145
+#: desktop/inc/strings.hrc:145
 msgctxt "RID_DLG_UPDATE_FAILURE"
 msgid "An error occurred:"
 msgstr "Digwyddodd gwall:"
 
-#: strings.hrc:146
+#: desktop/inc/strings.hrc:146
 msgctxt "RID_DLG_UPDATE_UNKNOWNERROR"
 msgid "Unknown error."
 msgstr "Gwall anhysbys."
 
-#: strings.hrc:147
+#: desktop/inc/strings.hrc:147
 msgctxt "RID_DLG_UPDATE_NODESCRIPTION"
 msgid "No more details are available for this update."
 msgstr "Dim disgrifiad o'r diweddariad ar gael."
 
-#: strings.hrc:148
+#: desktop/inc/strings.hrc:148
 msgctxt "RID_DLG_UPDATE_NOINSTALL"
 msgid "The extension cannot be updated because:"
 msgstr "Nid oes modd gosod yr estyniad oherwydd:"
 
-#: strings.hrc:149
+#: desktop/inc/strings.hrc:149
 msgctxt "RID_DLG_UPDATE_NODEPENDENCY"
 msgid "Required %PRODUCTNAME version doesn't match:"
 msgstr "Nid yw'r fersiwn angenrheidiol o %PRODUCTNAME yn gydnaws:"
 
-#: strings.hrc:150
+#: desktop/inc/strings.hrc:150
 msgctxt "RID_DLG_UPDATE_NODEPENDENCY_CUR_VER"
 msgid "You have %PRODUCTNAME %VERSION"
 msgstr "Mae gennych %PRODUCTNAME %VERSION"
 
-#: strings.hrc:151
+#: desktop/inc/strings.hrc:151
 msgctxt "RID_DLG_UPDATE_BROWSERBASED"
 msgid "browser based update"
 msgstr "diweddaru drwy'r porwr"
 
-#: strings.hrc:152
+#: desktop/inc/strings.hrc:152
 msgctxt "RID_DLG_UPDATE_VERSION"
 msgid "Version"
 msgstr "Fersiwn"
 
-#: strings.hrc:153
+#: desktop/inc/strings.hrc:153
 msgctxt "RID_DLG_UPDATE_IGNORE"
 msgid "Ignore this Update"
 msgstr "Anwybyddu'r Diweddariad"
 
-#: strings.hrc:154
+#: desktop/inc/strings.hrc:154
 msgctxt "RID_DLG_UPDATE_IGNORE_ALL"
 msgid "Ignore all Updates"
 msgstr "Anwybyddu pob diweddariad"
 
-#: strings.hrc:155
+#: desktop/inc/strings.hrc:155
 msgctxt "RID_DLG_UPDATE_ENABLE"
 msgid "Enable Updates"
 msgstr "Galluogi Diweddariadau"
 
-#: strings.hrc:156
+#: desktop/inc/strings.hrc:156
 msgctxt "RID_DLG_UPDATE_IGNORED_UPDATE"
 msgid "This update will be ignored.\n"
 msgstr "Bydd y diweddariad yn cael ei hanwybyddu.\n"
 
-#: strings.hrc:158
+#: desktop/inc/strings.hrc:158
 msgctxt "STR_BOOTSTRAP_ERR_CANNOT_START"
 msgid "The application cannot be started. "
 msgstr "Methu cychwyn y rhaglen. "
 
-#: strings.hrc:159
+#: desktop/inc/strings.hrc:159
 msgctxt "STR_BOOTSTRAP_ERR_DIR_MISSING"
 msgid "The configuration directory \"$1\" could not be found."
 msgstr "Methu canfod cyfeiriadur ffurfweddu \"$1\"."
 
-#: strings.hrc:160
+#: desktop/inc/strings.hrc:160
 msgctxt "STR_BOOTSTRAP_ERR_PATH_INVALID"
 msgid "The installation path is invalid."
 msgstr "Mae'r llwybr gosod yn annilys."
 
-#: strings.hrc:161
+#: desktop/inc/strings.hrc:161
 msgctxt "STR_BOOTSTRAP_ERR_INTERNAL"
 msgid "An internal error occurred."
 msgstr "Ddigwyddodd gwall mewnol."
 
-#: strings.hrc:162
+#: desktop/inc/strings.hrc:162
 msgctxt "STR_BOOTSTRAP_ERR_FILE_CORRUPT"
 msgid "The configuration file \"$1\" is corrupt."
 msgstr "Mae'r ffeil ffurfweddiad \"$1\" wedi llygru."
 
-#: strings.hrc:163
+#: desktop/inc/strings.hrc:163
 msgctxt "STR_BOOTSTRAP_ERR_FILE_MISSING"
 msgid "The configuration file \"$1\" was not found."
 msgstr "Methu canfod ffeil ffurfweddiad \"$1\"."
 
-#: strings.hrc:164
+#: desktop/inc/strings.hrc:164
 msgctxt "STR_BOOTSTRAP_ERR_NO_SUPPORT"
 msgid "The configuration file \"$1\" does not support the current version."
 msgstr "Nid yw'r ffeil ffurfweddiad \"$1\" yn cynnal y fersiwn cyfredol."
 
-#: strings.hrc:165
+#: desktop/inc/strings.hrc:165
 msgctxt "STR_BOOTSTRAP_ERR_LANGUAGE_MISSING"
 msgid "The user interface language cannot be determined."
 msgstr "Nid oes modd adnabod iaith rhyngwyneb y defnyddiwr."
 
-#: strings.hrc:166
+#: desktop/inc/strings.hrc:166
 msgctxt "STR_BOOTSTRAP_ERR_USERINSTALL_FAILED"
 msgid "User installation could not be completed. "
 msgstr "Ni fu'n bosibl cwblhau godod gan ddefnyddiwr. "
 
-#: strings.hrc:167
+#: desktop/inc/strings.hrc:167
 msgctxt "STR_BOOTSTRAP_ERR_NO_CFG_SERVICE"
 msgid "The configuration service is not available."
 msgstr "Nid yw'r gwasanaeth ffurfweddu ar gael."
 
-#: strings.hrc:168
+#: desktop/inc/strings.hrc:168
 msgctxt "STR_ASK_START_SETUP_MANUALLY"
 msgid "Start the setup application to repair the installation from the CD or the folder containing the installation packages."
 msgstr "Cychwyn y rhaglen osod i drwsio'r gosodiad o'r CD neu ffolder sy'n cynnwys y pecynnau gosod."
 
-#: strings.hrc:169
+#: desktop/inc/strings.hrc:169
 msgctxt "STR_CONFIG_ERR_ACCESS_GENERAL"
 msgid "A general error occurred while accessing your central configuration. "
 msgstr "Digwyddodd gwall cyffredinol wrth gael mynediad i'ch ffurfweddiad canolog. "
 
-#: strings.hrc:170
+#: desktop/inc/strings.hrc:170
 msgctxt "STR_BOOTSTRAP_ERR_CFG_DATAACCESS"
 msgid ""
 "%PRODUCTNAME cannot be started due to an error in accessing the %PRODUCTNAME configuration data.\n"
@@ -601,17 +601,17 @@ msgstr ""
 "\n"
 "Cysylltwch â'ch gweinyddwr system."
 
-#: strings.hrc:171
+#: desktop/inc/strings.hrc:171
 msgctxt "STR_INTERNAL_ERRMSG"
 msgid "The following internal error has occurred: "
 msgstr "Digwyddodd y gwall mewnol canlynol: "
 
-#: strings.hrc:172
+#: desktop/inc/strings.hrc:172
 msgctxt "STR_LO_MUST_BE_RESTARTED"
 msgid "%PRODUCTNAME must unfortunately be manually restarted once after installation or update."
 msgstr "Rhaid ailgychwyn %PRODUCTNAME gyda llaw ar ôl gosod neu ddiweddaru."
 
-#: strings.hrc:173
+#: desktop/inc/strings.hrc:173
 msgctxt "STR_QUERY_USERDATALOCKED"
 msgid ""
 "Either another instance of %PRODUCTNAME is accessing your personal settings or your personal settings are locked.\n"
@@ -624,22 +624,22 @@ msgstr ""
 "\n"
 "Ydych chi am barhau?"
 
-#: strings.hrc:174
+#: desktop/inc/strings.hrc:174
 msgctxt "STR_TITLE_USERDATALOCKED"
 msgid "%PRODUCTNAME %PRODUCTVERSION"
 msgstr "%PRODUCTNAME %PRODUCTVERSION"
 
-#: strings.hrc:175
+#: desktop/inc/strings.hrc:175
 msgctxt "STR_ERR_PRINTDISABLED"
 msgid "Printing is disabled. No documents can be printed."
 msgstr "Mae argraffu wedi ei analluogi. Nid oes modd argraffu dogfennau."
 
-#: strings.hrc:176
+#: desktop/inc/strings.hrc:176
 msgctxt "STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE"
 msgid "The path manager is not available.\n"
 msgstr "Nid yw'r rheolwr llwybr ar gael.\n"
 
-#: strings.hrc:177
+#: desktop/inc/strings.hrc:177
 msgctxt "STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE"
 msgid ""
 "%PRODUCTNAME user installation could not be completed due to insufficient free disk space. Please free more disc space at the following location and restart %PRODUCTNAME:\n"
@@ -648,7 +648,7 @@ msgstr ""
 "Nid oedd modd cwblhau gosodiad defnyddiwr %PRODUCTNAME am nad oedd yna ddigon o le rhydd ar ddisg. Ryddhewch le yn y lleoliad canlynol ac ailgychwyn %PRODUCTNAME:\n"
 "\n"
 
-#: strings.hrc:178
+#: desktop/inc/strings.hrc:178
 msgctxt "STR_BOOSTRAP_ERR_NOACCESSRIGHTS"
 msgid ""
 "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n"
@@ -657,282 +657,282 @@ msgstr ""
 "Nid oedd modd prosesu gosodiad defnyddiwr %PRODUCTNAME oherwydd hawl mynediad coll. Gwnewch yn siŵr fod gennych hawl mynediad digonol ar gyfer y lleoliad canlynol ac ailgychwyn %PRODUCTNAME:\n"
 "\n"
 
-#: strings.hrc:180
+#: desktop/inc/strings.hrc:180
 msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_1"
 msgid "Extension Software License Agreement of $NAME:"
 msgstr "Cytundeb Trwydded Meddalwedd Estyniad $NAME:"
 
-#: strings.hrc:181
+#: desktop/inc/strings.hrc:181
 msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_2"
 msgid "Read the complete License Agreement displayed above. Accept the License Agreement by typing \"yes\" on the console then press the Return key. Type \"no\" to decline and to abort the extension setup."
 msgstr "Darllenwch yr holl Gytundeb Trwyddedu uchod. Derbyniwch y Cytundeb Trwydded drwy deipio \"iawn\" ar y consol ac yna pwyso'r bysell Return. Teipiwch \"na\" i wrthod ac atal gosod yr estyniad."
 
-#: strings.hrc:185
+#: desktop/inc/strings.hrc:185
 msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_3"
 msgid "[Enter \"yes\" or \"no\"]:"
 msgstr "[Rhowch \"iawn\" neu \"na\"]:"
 
-#: strings.hrc:186
+#: desktop/inc/strings.hrc:186
 msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_4"
 msgid "Your input was not correct. Please enter \"yes\" or \"no\":"
 msgstr "Nid oedd eich mewnbwn yn gywir. Rhowch \"iawn\" neu \"na\":"
 
-#: strings.hrc:187
+#: desktop/inc/strings.hrc:187
 msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_YES"
 msgid "YES"
 msgstr "YES"
 
-#: strings.hrc:188
+#: desktop/inc/strings.hrc:188
 msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_Y"
 msgid "Y"
 msgstr "Y"
 
-#: strings.hrc:189
+#: desktop/inc/strings.hrc:189
 msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_NO"
 msgid "NO"
 msgstr "NO"
 
-#: strings.hrc:190
+#: desktop/inc/strings.hrc:190
 msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_N"
 msgid "N"
 msgstr "N"
 
-#: strings.hrc:191
+#: desktop/inc/strings.hrc:191
 msgctxt "RID_STR_CONCURRENTINSTANCE"
 msgid "unopkg cannot be started. The lock file indicates it is already running. If this does not apply, delete the lock file at:"
 msgstr "methu cychwyn unopkg. Mae'r ffeil cloi yn awgrymu ei fod dal yn rhedeg. Os nad yw hyn yn berthnasol, dilëwch y ffeil cloi yn:"
 
-#: strings.hrc:193
+#: desktop/inc/strings.hrc:193
 msgctxt "RID_STR_UNOPKG_ERROR"
 msgid "ERROR: "
 msgstr "GWALL: "
 
-#: dependenciesdialog.ui:9
+#: desktop/uiconfig/ui/dependenciesdialog.ui:9
 msgctxt "dependenciesdialog|Dependencies"
 msgid "System dependencies check"
 msgstr "Gwiriad dibyniaethau system"
 
-#: dependenciesdialog.ui:60
+#: desktop/uiconfig/ui/dependenciesdialog.ui:60
 msgctxt "dependenciesdialog|label1"
 msgid "The extension cannot be installed as the following system dependencies are not fulfilled:"
 msgstr "Nid oes modd gosod yr estyniad gan nad yw'r dibyniaethau system canlynol wedi eu bodloni:"
 
-#: extensionmanager.ui:9
+#: desktop/uiconfig/ui/extensionmanager.ui:9
 msgctxt "extensionmanager|ExtensionManagerDialog"
 msgid "Extension Manager"
 msgstr "Rheolwr Estyniadau"
 
-#: extensionmanager.ui:82
+#: desktop/uiconfig/ui/extensionmanager.ui:82
 msgctxt "extensionmanager|optionsbtn"
 msgid "_Options"
 msgstr "_Dewisiadau"
 
-#: extensionmanager.ui:96
+#: desktop/uiconfig/ui/extensionmanager.ui:96
 msgctxt "extensionmanager|updatebtn"
 msgid "Check for _Updates"
 msgstr "Gwirio am _Ddiweddariadau"
 
-#: extensionmanager.ui:111
+#: desktop/uiconfig/ui/extensionmanager.ui:111
 msgctxt "extensionmanager|addbtn"
 msgid "_Add"
 msgstr "_Ychwanegu"
 
-#: extensionmanager.ui:128
+#: desktop/uiconfig/ui/extensionmanager.ui:128
 msgctxt "extensionmanager|removebtn"
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: extensionmanager.ui:143
+#: desktop/uiconfig/ui/extensionmanager.ui:143
 msgctxt "extensionmanager|enablebtn"
 msgid "_Enable"
 msgstr "_Galluogi"
 
-#: extensionmanager.ui:187
+#: desktop/uiconfig/ui/extensionmanager.ui:187
 msgctxt "extensionmanager|shared"
 msgid "Installed for all users"
 msgstr "Wedi eu gosod ar gyfer pob defnyddiwr"
 
-#: extensionmanager.ui:203
+#: desktop/uiconfig/ui/extensionmanager.ui:204
 msgctxt "extensionmanager|user"
 msgid "Installed for current user"
 msgstr "Wedi eu gosod ar gyfer y defnyddiwr cyfredol"
 
-#: extensionmanager.ui:219
+#: desktop/uiconfig/ui/extensionmanager.ui:221
 msgctxt "extensionmanager|bundled"
 msgid "Bundled with %PRODUCTNAME"
 msgstr "Crynhowyd gyda %PRODUCTNAME"
 
-#: extensionmanager.ui:241
+#: desktop/uiconfig/ui/extensionmanager.ui:244
 msgctxt "extensionmanager|label1"
 msgid "Display Extensions"
 msgstr "Dangos Estyniadau"
 
-#: extensionmanager.ui:263
+#: desktop/uiconfig/ui/extensionmanager.ui:266
 msgctxt "extensionmanager|progressft"
 msgid "Adding %EXTENSION_NAME"
 msgstr "Ychwanegu %EXTENSION_NAME"
 
-#: extensionmanager.ui:298
+#: desktop/uiconfig/ui/extensionmanager.ui:301
 msgctxt "extensionmanager|getextensions"
 msgid "Get more extensions online..."
 msgstr "Estyn rhagor o estyniadau ar-lein..."
 
-#: installforalldialog.ui:12
+#: desktop/uiconfig/ui/installforalldialog.ui:12
 msgctxt "installforalldialog|InstallForAllDialog"
 msgid "For whom do you want to install the extension?"
 msgstr "Ar gyfer pwy yr hoffech chi osod yr estyniad?"
 
-#: installforalldialog.ui:13
+#: desktop/uiconfig/ui/installforalldialog.ui:13
 msgctxt "installforalldialog|InstallForAllDialog"
 msgid "Make sure that no further users are working with the same %PRODUCTNAME, when installing an extension for all users in a multi user environment."
 msgstr "Gwnewch yn siŵr nad oes rhagor o ddefnyddwyr yn gweithio gyda'r un %PRODUCTNAME, wrth osod estyniad ar gyfer pob defnyddiwr mewn amgylchedd defnyddwyr lluosog."
 
-#: installforalldialog.ui:25
+#: desktop/uiconfig/ui/installforalldialog.ui:24
 msgctxt "installforalldialog|no"
 msgid "_For all users"
 msgstr "_Ar gyfer pob defnyddiwr"
 
-#: installforalldialog.ui:39
+#: desktop/uiconfig/ui/installforalldialog.ui:38
 msgctxt "installforalldialog|yes"
 msgid "_Only for me"
 msgstr "_Dim ond i mi"
 
-#: licensedialog.ui:8
+#: desktop/uiconfig/ui/licensedialog.ui:8
 msgctxt "licensedialog|LicenseDialog"
 msgid "Extension Software License Agreement"
 msgstr "Cytundeb Trwyddedu Meddalwedd Estyniad"
 
-#: licensedialog.ui:21
+#: desktop/uiconfig/ui/licensedialog.ui:21
 msgctxt "licensedialog|accept"
 msgid "Accept"
 msgstr "Derbyn"
 
-#: licensedialog.ui:36
+#: desktop/uiconfig/ui/licensedialog.ui:36
 msgctxt "licensedialog|decline"
 msgid "Decline"
 msgstr "Gwrthod"
 
-#: licensedialog.ui:67
+#: desktop/uiconfig/ui/licensedialog.ui:67
 msgctxt "licensedialog|head"
 msgid "Please follow these steps to proceed with the installation of the extension:"
 msgstr "Dilynwch y camau canlynol i osod yr estyniad:"
 
-#: licensedialog.ui:90
+#: desktop/uiconfig/ui/licensedialog.ui:90
 msgctxt "licensedialog|label2"
 msgid "1."
 msgstr "1."
 
-#: licensedialog.ui:105
+#: desktop/uiconfig/ui/licensedialog.ui:105
 msgctxt "licensedialog|label3"
 msgid "2."
 msgstr "2."
 
-#: licensedialog.ui:149
+#: desktop/uiconfig/ui/licensedialog.ui:149
 msgctxt "licensedialog|label4"
 msgid "Read the complete License Agreement. Use the scroll bar or the 'Scroll Down' button in this dialog to view the entire license text."
 msgstr "Darllenwch y Cytundeb Trwyddedu i gyd. Defnyddiwch y bar sgrolio neu'r botwm 'Sgrolio i Lawr' i weld yr holl destun."
 
-#: licensedialog.ui:167
+#: desktop/uiconfig/ui/licensedialog.ui:167
 msgctxt "licensedialog|label5"
 msgid "Accept the License Agreement for the extension by pressing the 'Accept' button."
 msgstr "Derbyniwch y Cytundeb Trwyddedu ar gyfer yr estyniad drwy glicio ar fotwm 'Derbyn'."
 
-#: licensedialog.ui:180
+#: desktop/uiconfig/ui/licensedialog.ui:180
 msgctxt "licensedialog|down"
 msgid "_Scroll Down"
 msgstr "_Sgrolio Lawr"
 
-#: showlicensedialog.ui:7
+#: desktop/uiconfig/ui/showlicensedialog.ui:7
 msgctxt "showlicensedialog|ShowLicenseDialog"
 msgid "Extension Software License Agreement"
 msgstr "Cytundeb Trwyddedu Meddalwedd Estyniad"
 
-#: updatedialog.ui:10
+#: desktop/uiconfig/ui/updatedialog.ui:10
 msgctxt "updatedialog|UpdateDialog"
 msgid "Extension Update"
 msgstr "Diweddaru Estyniad"
 
-#: updatedialog.ui:38
+#: desktop/uiconfig/ui/updatedialog.ui:38
 msgctxt "updatedialog|INSTALL"
 msgid "_Install"
 msgstr "_Gosod"
 
-#: updatedialog.ui:104
+#: desktop/uiconfig/ui/updatedialog.ui:104
 msgctxt "updatedialog|UPDATE_LABEL"
 msgid "_Available extension updates"
 msgstr "_Ddiweddariadau estyniadau sydd ar gael"
 
-#: updatedialog.ui:117
+#: desktop/uiconfig/ui/updatedialog.ui:117
 msgctxt "updatedialog|UPDATE_CHECKING"
 msgid "Checking..."
 msgstr "Gwirio..."
 
-#: updatedialog.ui:160
+#: desktop/uiconfig/ui/updatedialog.ui:160
 msgctxt "updatedialog|UPDATE_ALL"
 msgid "_Show all updates"
 msgstr "_Dangos pob diweddariad"
 
-#: updatedialog.ui:196
+#: desktop/uiconfig/ui/updatedialog.ui:196
 msgctxt "updatedialog|DESCRIPTION_LABEL"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: updatedialog.ui:214
+#: desktop/uiconfig/ui/updatedialog.ui:214
 msgctxt "updatedialog|PUBLISHER_LABEL"
 msgid "Publisher:"
 msgstr "Cyhoeddwr:"
 
-#: updatedialog.ui:225
+#: desktop/uiconfig/ui/updatedialog.ui:225
 msgctxt "updatedialog|PUBLISHER_LINK"
 msgid "button"
 msgstr "botwm"
 
-#: updatedialog.ui:242
+#: desktop/uiconfig/ui/updatedialog.ui:242
 msgctxt "updatedialog|RELEASE_NOTES_LABEL"
 msgid "What is new:"
 msgstr "Beth sy'n newydd:"
 
-#: updatedialog.ui:253
+#: desktop/uiconfig/ui/updatedialog.ui:253
 msgctxt "updatedialog|RELEASE_NOTES_LINK"
 msgid "Release notes"
 msgstr "Nodiadau rhyddhau"
 
-#: updateinstalldialog.ui:8
+#: desktop/uiconfig/ui/updateinstalldialog.ui:8
 msgctxt "updateinstalldialog|UpdateInstallDialog"
 msgid "Download and Installation"
 msgstr "Llwytho i Lawr a Gosod"
 
-#: updateinstalldialog.ui:87
+#: desktop/uiconfig/ui/updateinstalldialog.ui:87
 msgctxt "updateinstalldialog|DOWNLOADING"
 msgid "Downloading extensions..."
 msgstr "Llwytho estyniadau i lawr..."
 
-#: updateinstalldialog.ui:125
+#: desktop/uiconfig/ui/updateinstalldialog.ui:125
 msgctxt "updateinstalldialog|RESULTS"
 msgid "Result"
 msgstr "Canlyniad"
 
-#: updaterequireddialog.ui:9
+#: desktop/uiconfig/ui/updaterequireddialog.ui:9
 msgctxt "updaterequireddialog|UpdateRequiredDialog"
 msgid "Extension Update Required"
 msgstr "Mae angen Diweddaru'r Estyniad"
 
-#: updaterequireddialog.ui:26
+#: desktop/uiconfig/ui/updaterequireddialog.ui:26
 msgctxt "updaterequireddialog|updatelabel"
 msgid "%PRODUCTNAME has been updated to a new version. Some installed %PRODUCTNAME extensions are not compatible with this version and need to be updated before they can be used."
 msgstr "Mae %PRODUCTNAME wedi ei ddiweddaru i fersiwn newydd. Nid yw rhai estyniadau sydd ar %PRODUCTNAME yn cydweddu a'r fersiwn yma ac mae angen eu diweddaru cyn bod modd eu defnyddio."
 
-#: updaterequireddialog.ui:62
+#: desktop/uiconfig/ui/updaterequireddialog.ui:62
 msgctxt "updaterequireddialog|progresslabel"
 msgid "Adding %EXTENSION_NAME"
 msgstr "Ychwanegu %EXTENSION_NAME"
 
-#: updaterequireddialog.ui:106
+#: desktop/uiconfig/ui/updaterequireddialog.ui:106
 msgctxt "updaterequireddialog|check"
 msgid "Check for _Updates..."
 msgstr "Gwirio am _Ddiweddariadau..."
 
-#: updaterequireddialog.ui:122
+#: desktop/uiconfig/ui/updaterequireddialog.ui:122
 msgctxt "updaterequireddialog|disable"
 msgid "Disable all"
 msgstr "Analluogi popeth"
diff --git a/source/cy/dictionaries/id.po b/source/cy/dictionaries/id.po
new file mode 100644
index 00000000000..15b7b595128
--- /dev/null
+++ b/source/cy/dictionaries/id.po
@@ -0,0 +1,25 @@
+#. extracted from dictionaries/id
+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-03-13 12:10+0100\n"
+"PO-Revision-Date: 2018-03-23 16:02+0000\n"
+"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: cy\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
+"X-Accelerator-Marker: ~\n"
+"X-Generator: Pootle 2.8\n"
+"X-POOTLE-MTIME: 1521820928.000000\n"
+
+#: description.xml
+msgctxt ""
+"description.xml\n"
+"dispname\n"
+"description.text"
+msgid "Indonesian spelling dictionary and thesaurus"
+msgstr "Indonesieg - geiriadur sillafu a thesawrws"
diff --git a/source/cy/editeng/messages.po b/source/cy/editeng/messages.po
index c4c33243bd0..96f3c830620 100644
--- a/source/cy/editeng/messages.po
+++ b/source/cy/editeng/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
+"POT-Creation-Date: 2018-02-27 13:56+0100\n"
 "PO-Revision-Date: 2017-11-08 16:59+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,1319 +13,1314 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1510160385.000000\n"
 
-#: spellmenu.ui:12
+#: editeng/uiconfig/ui/spellmenu.ui:12
 msgctxt "spellmenu|ignore"
 msgid "I_gnore All"
 msgstr "Anwybyddu _Popeth"
 
-#: spellmenu.ui:19
+#: editeng/uiconfig/ui/spellmenu.ui:19
 msgctxt "spellmenu|insert"
 msgid "_Add to Dictionary"
 msgstr "_Ychwanegu at y Geiriadur"
 
-#: spellmenu.ui:33
+#: editeng/uiconfig/ui/spellmenu.ui:33
 msgctxt "spellmenu|add"
 msgid "_Add to Dictionary"
 msgstr "_Ychwanegu at y Geiriadur"
 
-#: spellmenu.ui:41
+#: editeng/uiconfig/ui/spellmenu.ui:41
 msgctxt "spellmenu|check"
 msgid "_Spellcheck..."
 msgstr "_Gwirio Sillafu..."
 
-#: spellmenu.ui:55
+#: editeng/uiconfig/ui/spellmenu.ui:55
 msgctxt "spellmenu|autocorrect"
 msgid "AutoCorrect _To"
 msgstr "AwtoGywiro _i"
 
-#: spellmenu.ui:69
+#: editeng/uiconfig/ui/spellmenu.ui:69
 msgctxt "spellmenu|autocorrectdlg"
 msgid "Auto_Correct Options..."
 msgstr "Dewisiadau Awto_Gywiro..."
 
 #. enum SvxBreak ------------------------------------------------------------
-#: editrids.hrc:26
+#: include/editeng/editrids.hrc:26
 msgctxt "RID_SVXITEMS_BREAK_NONE"
 msgid "No break"
 msgstr "Dim toriad"
 
-#: editrids.hrc:27
+#: include/editeng/editrids.hrc:27
 msgctxt "RID_SVXITEMS_BREAK_COLUMN_BEFORE"
 msgid "Break before new column"
 msgstr "Toriad cyn colofn newydd"
 
-#: editrids.hrc:28
+#: include/editeng/editrids.hrc:28
 msgctxt "RID_SVXITEMS_BREAK_COLUMN_AFTER"
 msgid "Break after new column"
 msgstr "Toriad wedi colofn newydd"
 
-#: editrids.hrc:29
+#: include/editeng/editrids.hrc:29
 msgctxt "RID_SVXITEMS_BREAK_COLUMN_BOTH"
 msgid "Break before and after new column"
 msgstr "Toriad cyn ac wedi colofn newydd"
 
-#: editrids.hrc:30
+#: include/editeng/editrids.hrc:30
 msgctxt "RID_SVXITEMS_BREAK_PAGE_BEFORE"
 msgid "Break before new page"
 msgstr "Toriad cyn tudalen newydd"
 
-#: editrids.hrc:31
+#: include/editeng/editrids.hrc:31
 msgctxt "RID_SVXITEMS_BREAK_PAGE_AFTER"
 msgid "Break after new page"
 msgstr "Toriad wedi tudalen newydd"
 
-#: editrids.hrc:32
+#: include/editeng/editrids.hrc:32
 msgctxt "RID_SVXITEMS_BREAK_PAGE_BOTH"
 msgid "Break before and after new page"
 msgstr "Toriad cyn ac wedi tudalen newydd"
 
 #. enum SvxShadowLocation ---------------------------------------------------
-#: editrids.hrc:35
+#: include/editeng/editrids.hrc:35
 msgctxt "RID_SVXITEMS_SHADOW_NONE"
 msgid "No Shadow"
 msgstr "Dim Cysgod"
 
-#: editrids.hrc:36
+#: include/editeng/editrids.hrc:36
 msgctxt "RID_SVXITEMS_SHADOW_TOPLEFT"
 msgid "Shadow top left"
 msgstr "Cysgod brig chwith"
 
-#: editrids.hrc:37
+#: include/editeng/editrids.hrc:37
 msgctxt "RID_SVXITEMS_SHADOW_TOPRIGHT"
 msgid "Shadow top right"
 msgstr "Cysgod brig de"
 
-#: editrids.hrc:38
+#: include/editeng/editrids.hrc:38
 msgctxt "RID_SVXITEMS_SHADOW_BOTTOMLEFT"
 msgid "Shadow bottom left"
 msgstr "Cysgod gwaelod chwith"
 
-#: editrids.hrc:39
+#: include/editeng/editrids.hrc:39
 msgctxt "RID_SVXITEMS_SHADOW_BOTTOMRIGHT"
 msgid "Shadow bottom right"
 msgstr "Cysgod gwaelod de"
 
 #. enum ColorName -----------------------------------------------------------
-#: editrids.hrc:42
-msgctxt "RID_SVXITEMS_COLOR"
-msgid "Color "
-msgstr "Lliw "
-
-#: editrids.hrc:43
+#: include/editeng/editrids.hrc:42
 msgctxt "RID_SVXITEMS_COLOR_BLACK"
 msgid "Black"
 msgstr "Du"
 
-#: editrids.hrc:44
+#: include/editeng/editrids.hrc:43
 msgctxt "RID_SVXITEMS_COLOR_BLUE"
 msgid "Blue"
 msgstr "Glas"
 
-#: editrids.hrc:45
+#: include/editeng/editrids.hrc:44
 msgctxt "RID_SVXITEMS_COLOR_GREEN"
 msgid "Green"
 msgstr "Gwyrdd"
 
-#: editrids.hrc:46
+#: include/editeng/editrids.hrc:45
 msgctxt "RID_SVXITEMS_COLOR_CYAN"
 msgid "Cyan"
 msgstr "Cyan"
 
-#: editrids.hrc:47
+#: include/editeng/editrids.hrc:46
 msgctxt "RID_SVXITEMS_COLOR_RED"
 msgid "Red"
 msgstr "Coch"
 
-#: editrids.hrc:48
+#: include/editeng/editrids.hrc:47
 msgctxt "RID_SVXITEMS_COLOR_MAGENTA"
 msgid "Magenta"
 msgstr "Magenta"
 
-#: editrids.hrc:49
+#: include/editeng/editrids.hrc:48
 msgctxt "RID_SVXITEMS_COLOR_BROWN"
 msgid "Brown"
 msgstr "Brown"
 
-#: editrids.hrc:50
+#: include/editeng/editrids.hrc:49
 msgctxt "RID_SVXITEMS_COLOR_GRAY"
 msgid "Gray"
 msgstr "Llwyd"
 
-#: editrids.hrc:51
+#: include/editeng/editrids.hrc:50
 msgctxt "RID_SVXITEMS_COLOR_LIGHTGRAY"
 msgid "Light Gray"
 msgstr "Llwyd Golau"
 
-#: editrids.hrc:52
+#: include/editeng/editrids.hrc:51
 msgctxt "RID_SVXITEMS_COLOR_LIGHTBLUE"
 msgid "Light Blue"
 msgstr "Glas golau"
 
-#: editrids.hrc:53
+#: include/editeng/editrids.hrc:52
 msgctxt "RID_SVXITEMS_COLOR_LIGHTGREEN"
 msgid "Light Green"
 msgstr "Gwyrdd Golau"
 
-#: editrids.hrc:54
+#: include/editeng/editrids.hrc:53
 msgctxt "RID_SVXITEMS_COLOR_LIGHTCYAN"
 msgid "Light Cyan"
 msgstr "Gwyrddlas Golau"
 
-#: editrids.hrc:55
+#: include/editeng/editrids.hrc:54
 msgctxt "RID_SVXITEMS_COLOR_LIGHTRED"
 msgid "Light Red"
 msgstr "Coch Golau"
 
-#: editrids.hrc:56
+#: include/editeng/editrids.hrc:55
 msgctxt "RID_SVXITEMS_COLOR_LIGHTMAGENTA"
 msgid "Light Magenta"
 msgstr "Magenta Golau"
 
-#: editrids.hrc:57
+#: include/editeng/editrids.hrc:56
 msgctxt "RID_SVXITEMS_COLOR_YELLOW"
 msgid "Yellow"
 msgstr "Melyn"
 
-#: editrids.hrc:58
+#: include/editeng/editrids.hrc:57
 msgctxt "RID_SVXITEMS_COLOR_WHITE"
 msgid "White"
 msgstr "Gwyn"
 
 #. enum FontItalic -------------------------------------------------------
-#: editrids.hrc:61
+#: include/editeng/editrids.hrc:60
 msgctxt "RID_SVXITEMS_ITALIC_NONE"
 msgid "Not Italic"
 msgstr "Nid Italig"
 
-#: editrids.hrc:62
+#: include/editeng/editrids.hrc:61
 msgctxt "RID_SVXITEMS_ITALIC_OBLIQUE"
 msgid "Oblique italic"
 msgstr "Italig arosgo"
 
-#: editrids.hrc:63
+#: include/editeng/editrids.hrc:62
 msgctxt "RID_SVXITEMS_ITALIC_NORMAL"
 msgid "Italic"
 msgstr "Italig"
 
 #. enum FontWeight -------------------------------------------------------
-#: editrids.hrc:66
+#: include/editeng/editrids.hrc:65
 msgctxt "RID_SVXITEMS_WEIGHT_DONTKNOW"
 msgid "?"
 msgstr "?"
 
-#: editrids.hrc:67
+#: include/editeng/editrids.hrc:66
 msgctxt "RID_SVXITEMS_WEIGHT_THIN"
 msgid "thin"
 msgstr "tenau"
 
-#: editrids.hrc:68
+#: include/editeng/editrids.hrc:67
 msgctxt "RID_SVXITEMS_WEIGHT_ULTRALIGHT"
 msgid "ultra thin"
 msgstr "tenau iawn"
 
-#: editrids.hrc:69
+#: include/editeng/editrids.hrc:68
 msgctxt "RID_SVXITEMS_WEIGHT_LIGHT"
 msgid "light"
 msgstr "ysgafn"
 
-#: editrids.hrc:70
+#: include/editeng/editrids.hrc:69
 msgctxt "RID_SVXITEMS_WEIGHT_SEMILIGHT"
 msgid "semi light"
 msgstr "rhannol ysgafn"
 
-#: editrids.hrc:71
+#: include/editeng/editrids.hrc:70
 msgctxt "RID_SVXITEMS_WEIGHT_NORMAL"
 msgid "normal"
 msgstr "normal"
 
-#: editrids.hrc:72
+#: include/editeng/editrids.hrc:71
 msgctxt "RID_SVXITEMS_WEIGHT_MEDIUM"
 msgid "medium"
 msgstr "canolig"
 
-#: editrids.hrc:73
+#: include/editeng/editrids.hrc:72
 msgctxt "RID_SVXITEMS_WEIGHT_SEMIBOLD"
 msgid "semi bold"
 msgstr "rhannol drwm"
 
-#: editrids.hrc:74
+#: include/editeng/editrids.hrc:73
 msgctxt "RID_SVXITEMS_WEIGHT_BOLD"
 msgid "bold"
 msgstr "trwm"
 
-#: editrids.hrc:75
+#: include/editeng/editrids.hrc:74
 msgctxt "RID_SVXITEMS_WEIGHT_ULTRABOLD"
 msgid "ultra bold"
 msgstr "trwm iawn"
 
-#: editrids.hrc:76
+#: include/editeng/editrids.hrc:75
 msgctxt "RID_SVXITEMS_WEIGHT_BLACK"
 msgid "black"
 msgstr "du"
 
 #. enum FontUnderline - used for underline ------------------------------
-#: editrids.hrc:79
+#: include/editeng/editrids.hrc:78
 msgctxt "RID_SVXITEMS_UL_NONE"
 msgid "No underline"
 msgstr "Dim tanlinellu"
 
-#: editrids.hrc:80
+#: include/editeng/editrids.hrc:79
 msgctxt "RID_SVXITEMS_UL_SINGLE"
 msgid "Single underline"
 msgstr "Tanlinellu sengl"
 
-#: editrids.hrc:81
+#: include/editeng/editrids.hrc:80
 msgctxt "RID_SVXITEMS_UL_DOUBLE"
 msgid "Double underline"
 msgstr "Tanlinellu dwbl"
 
-#: editrids.hrc:82
+#: include/editeng/editrids.hrc:81
 msgctxt "RID_SVXITEMS_UL_DOTTED"
 msgid "Dotted underline"
 msgstr "Tanlinellu dotiog"
 
-#: editrids.hrc:83
+#: include/editeng/editrids.hrc:82
 msgctxt "RID_SVXITEMS_UL_DONTKNOW"
 msgid "Underline"
 msgstr "Tanlinellu"
 
-#: editrids.hrc:84
+#: include/editeng/editrids.hrc:83
 msgctxt "RID_SVXITEMS_UL_DASH"
 msgid "Underline (dashes)"
 msgstr "Tanlinellu (toriad)"
 
-#: editrids.hrc:85
+#: include/editeng/editrids.hrc:84
 msgctxt "RID_SVXITEMS_UL_LONGDASH"
 msgid "Underline (long dashes)"
 msgstr "Tanlinellu (toriad hir)"
 
-#: editrids.hrc:86
+#: include/editeng/editrids.hrc:85
 msgctxt "RID_SVXITEMS_UL_DASHDOT"
 msgid "Underline (dot dash)"
 msgstr "Tanlinellu (dot toriad)"
 
-#: editrids.hrc:87
+#: include/editeng/editrids.hrc:86
 msgctxt "RID_SVXITEMS_UL_DASHDOTDOT"
 msgid "Underline (dot dot dash)"
 msgstr "Tanlinellu (dot dot toriad)"
 
-#: editrids.hrc:88
+#: include/editeng/editrids.hrc:87
 msgctxt "RID_SVXITEMS_UL_SMALLWAVE"
 msgid "Underline (small wave)"
 msgstr "Tanlinellu (ton fechan)"
 
-#: editrids.hrc:89
+#: include/editeng/editrids.hrc:88
 msgctxt "RID_SVXITEMS_UL_WAVE"
 msgid "Underline (Wave)"
 msgstr "Tanlinellu (Ton)"
 
-#: editrids.hrc:90
+#: include/editeng/editrids.hrc:89
 msgctxt "RID_SVXITEMS_UL_DOUBLEWAVE"
 msgid "Underline (Double wave)"
 msgstr "Tanlinellu (Ton ddwbl)"
 
-#: editrids.hrc:91
+#: include/editeng/editrids.hrc:90
 msgctxt "RID_SVXITEMS_UL_BOLD"
 msgid "Underlined (Bold)"
 msgstr "Tanlinellu (Trwm)"
 
-#: editrids.hrc:92
+#: include/editeng/editrids.hrc:91
 msgctxt "RID_SVXITEMS_UL_BOLDDOTTED"
 msgid "Dotted underline (Bold)"
 msgstr "Tanlinellu dotiog (Trwm)"
 
-#: editrids.hrc:93
+#: include/editeng/editrids.hrc:92
 msgctxt "RID_SVXITEMS_UL_BOLDDASH"
 msgid "Underline (Dash bold)"
 msgstr "Tanlinellu (Toriad trwm)"
 
-#: editrids.hrc:94
+#: include/editeng/editrids.hrc:93
 msgctxt "RID_SVXITEMS_UL_BOLDLONGDASH"
 msgid "Underline (long dash, bold)"
 msgstr "Tanlinellu (toriad hir, trwm)"
 
-#: editrids.hrc:95
+#: include/editeng/editrids.hrc:94
 msgctxt "RID_SVXITEMS_UL_BOLDDASHDOT"
 msgid "Underline (dot dash, bold)"
 msgstr "Tanlinellu (dot toriad, trwm)"
 
-#: editrids.hrc:96
+#: include/editeng/editrids.hrc:95
 msgctxt "RID_SVXITEMS_UL_BOLDDASHDOTDOT"
 msgid "Underline (dot dot dash, bold)"
 msgstr "Tanlinellu (dot dot dash, trwm)"
 
-#: editrids.hrc:97
+#: include/editeng/editrids.hrc:96
 msgctxt "RID_SVXITEMS_UL_BOLDWAVE"
 msgid "Underline (wave, bold)"
 msgstr "Tanlinellu (ton, trwm)"
 
 #. enum FontUnderline - used for overline -------------------------------
-#: editrids.hrc:100
+#: include/editeng/editrids.hrc:99
 msgctxt "RID_SVXITEMS_OL_NONE"
 msgid "No overline"
 msgstr "Dim troslinellu"
 
-#: editrids.hrc:101
+#: include/editeng/editrids.hrc:100
 msgctxt "RID_SVXITEMS_OL_SINGLE"
 msgid "Single overline"
 msgstr "Troslinellu sengl"
 
-#: editrids.hrc:102
+#: include/editeng/editrids.hrc:101
 msgctxt "RID_SVXITEMS_OL_DOUBLE"
 msgid "Double overline"
 msgstr "Troslinellu dwbl"
 
-#: editrids.hrc:103
+#: include/editeng/editrids.hrc:102
 msgctxt "RID_SVXITEMS_OL_DOTTED"
 msgid "Dotted overline"
 msgstr "Troslinellu dotiog"
 
-#: editrids.hrc:104
+#: include/editeng/editrids.hrc:103
 msgctxt "RID_SVXITEMS_OL_DONTKNOW"
 msgid "Overline"
 msgstr "Troslinell"
 
-#: editrids.hrc:105
+#: include/editeng/editrids.hrc:104
 msgctxt "RID_SVXITEMS_OL_DASH"
 msgid "Overline (dashes)"
 msgstr "Troslinellu (toriad)"
 
-#: editrids.hrc:106
+#: include/editeng/editrids.hrc:105
 msgctxt "RID_SVXITEMS_OL_LONGDASH"
 msgid "Overline (long dashes)"
 msgstr "Troslinellu (toriad hir)"
 
-#: editrids.hrc:107
+#: include/editeng/editrids.hrc:106
 msgctxt "RID_SVXITEMS_OL_DASHDOT"
 msgid "Overline (dot dash)"
 msgstr "Troslinellu (dot toriad)"
 
-#: editrids.hrc:108
+#: include/editeng/editrids.hrc:107
 msgctxt "RID_SVXITEMS_OL_DASHDOTDOT"
 msgid "Overline (dot dot dash)"
 msgstr "Troslinellu (dot dot toriad)"
 
-#: editrids.hrc:109
+#: include/editeng/editrids.hrc:108
 msgctxt "RID_SVXITEMS_OL_SMALLWAVE"
 msgid "Overline (small wave)"
 msgstr "Troslinellu (ton fechan)"
 
-#: editrids.hrc:110
+#: include/editeng/editrids.hrc:109
 msgctxt "RID_SVXITEMS_OL_WAVE"
 msgid "Overline (Wave)"
 msgstr "Troslinellu (Ton)"
 
-#: editrids.hrc:111
+#: include/editeng/editrids.hrc:110
 msgctxt "RID_SVXITEMS_OL_DOUBLEWAVE"
 msgid "Overline (Double wave)"
 msgstr "Troslinellu (Ton ddwbl)"
 
-#: editrids.hrc:112
+#: include/editeng/editrids.hrc:111
 msgctxt "RID_SVXITEMS_OL_BOLD"
 msgid "Overlined (Bold)"
 msgstr "Troslinellu (Trwm)"
 
-#: editrids.hrc:113
+#: include/editeng/editrids.hrc:112
 msgctxt "RID_SVXITEMS_OL_BOLDDOTTED"
 msgid "Dotted overline (Bold)"
 msgstr "Troslinellu dotiog (Trwm)"
 
-#: editrids.hrc:114
+#: include/editeng/editrids.hrc:113
 msgctxt "RID_SVXITEMS_OL_BOLDDASH"
 msgid "Overline (Dash bold)"
 msgstr "Troslinell (Toriad trwm)"
 
-#: editrids.hrc:115
+#: include/editeng/editrids.hrc:114
 msgctxt "RID_SVXITEMS_OL_BOLDLONGDASH"
 msgid "Overline (long dash, bold)"
 msgstr "Troslinell (toriad hir, trwm)"
 
-#: editrids.hrc:116
+#: include/editeng/editrids.hrc:115
 msgctxt "RID_SVXITEMS_OL_BOLDDASHDOT"
 msgid "Overline (dot dash, bold)"
 msgstr "Troslinellu (dot toriad, trwm)"
 
-#: editrids.hrc:117
+#: include/editeng/editrids.hrc:116
 msgctxt "RID_SVXITEMS_OL_BOLDDASHDOTDOT"
 msgid "Overline (dot dot dash, bold)"
 msgstr "Troslinellu (dot dot dash, trwm)"
 
-#: editrids.hrc:118
+#: include/editeng/editrids.hrc:117
 msgctxt "RID_SVXITEMS_OL_BOLDWAVE"
 msgid "Overline (wave, bold)"
 msgstr "Troslinellu (ton, trwm)"
 
 #. enum FontStrikeout ----------------------------------------------------
-#: editrids.hrc:121
+#: include/editeng/editrids.hrc:120
 msgctxt "RID_SVXITEMS_STRIKEOUT_NONE"
 msgid "No strikethrough"
 msgstr "Dim taro drwodd"
 
-#: editrids.hrc:122
+#: include/editeng/editrids.hrc:121
 msgctxt "RID_SVXITEMS_STRIKEOUT_SINGLE"
 msgid "Single strikethrough"
 msgstr "Taro drwodd sengl"
 
-#: editrids.hrc:123
+#: include/editeng/editrids.hrc:122
 msgctxt "RID_SVXITEMS_STRIKEOUT_DOUBLE"
 msgid "Double strikethrough"
 msgstr "Taro drwodd dwbl"
 
-#: editrids.hrc:124
+#: include/editeng/editrids.hrc:123
 msgctxt "RID_SVXITEMS_STRIKEOUT_DONTKNOW"
 msgid "Strikethrough"
 msgstr "Taro Drwodd"
 
-#: editrids.hrc:125
+#: include/editeng/editrids.hrc:124
 msgctxt "RID_SVXITEMS_STRIKEOUT_BOLD"
 msgid "Bold strikethrough"
 msgstr "Taro drwodd trwm"
 
-#: editrids.hrc:126
+#: include/editeng/editrids.hrc:125
 msgctxt "RID_SVXITEMS_STRIKEOUT_SLASH"
 msgid "Strike through with slash"
 msgstr "Taro drwodd gyda slaes"
 
-#: editrids.hrc:127
+#: include/editeng/editrids.hrc:126
 msgctxt "RID_SVXITEMS_STRIKEOUT_X"
 msgid "Strike through with Xes"
 msgstr "Taro drwodd gyda Xes"
 
 #. enum CASEMAP ----------------------------------------------------------
-#: editrids.hrc:130
+#: include/editeng/editrids.hrc:129
 msgctxt "RID_SVXITEMS_CASEMAP_NONE"
 msgid "None"
 msgstr "Dim"
 
-#: editrids.hrc:131
+#: include/editeng/editrids.hrc:130
 msgctxt "RID_SVXITEMS_CASEMAP_VERSALIEN"
 msgid "Caps"
 msgstr "Prif lythrennau"
 
-#: editrids.hrc:132
+#: include/editeng/editrids.hrc:131
 msgctxt "RID_SVXITEMS_CASEMAP_GEMEINE"
 msgid "Lowercase"
 msgstr "Llythyren is"
 
-#: editrids.hrc:133
+#: include/editeng/editrids.hrc:132
 msgctxt "RID_SVXITEMS_CASEMAP_TITEL"
 msgid "Title"
 msgstr "Teitl"
 
-#: editrids.hrc:134
+#: include/editeng/editrids.hrc:133
 msgctxt "RID_SVXITEMS_CASEMAP_KAPITAELCHEN"
 msgid "Small caps"
 msgstr "Prif bach"
 
 #. enum ESCAPEMENT -------------------------------------------------------
-#: editrids.hrc:137
+#: include/editeng/editrids.hrc:136
 msgctxt "RID_SVXITEMS_ESCAPEMENT_OFF"
 msgid "Normal position"
 msgstr "Safle arferol"
 
-#: editrids.hrc:138
+#: include/editeng/editrids.hrc:137
 msgctxt "RID_SVXITEMS_ESCAPEMENT_SUPER"
 msgid "Superscript "
 msgstr "Uwchysgrif "
 
-#: editrids.hrc:139
+#: include/editeng/editrids.hrc:138
 msgctxt "RID_SVXITEMS_ESCAPEMENT_SUB"
 msgid "Subscript "
 msgstr "Isysgrif "
 
-#: editrids.hrc:140
+#: include/editeng/editrids.hrc:139
 msgctxt "RID_SVXITEMS_ESCAPEMENT_AUTO"
 msgid "automatic"
 msgstr "awtomatig"
 
 #. enum SvxAdjust -----------------------------------------------------------
-#: editrids.hrc:143
+#: include/editeng/editrids.hrc:142
 msgctxt "RID_SVXITEMS_ADJUST_LEFT"
 msgid "Align left"
 msgstr "Alinio chwith"
 
-#: editrids.hrc:144
+#: include/editeng/editrids.hrc:143
 msgctxt "RID_SVXITEMS_ADJUST_RIGHT"
 msgid "Align right"
 msgstr "Alinio de"
 
-#: editrids.hrc:145
+#: include/editeng/editrids.hrc:144
 msgctxt "RID_SVXITEMS_ADJUST_BLOCK"
 msgid "Justify"
 msgstr "Unioni"
 
-#: editrids.hrc:146
+#: include/editeng/editrids.hrc:145
 msgctxt "RID_SVXITEMS_ADJUST_CENTER"
 msgid "Centered"
 msgstr "Canoli"
 
-#: editrids.hrc:147
+#: include/editeng/editrids.hrc:146
 msgctxt "RID_SVXITEMS_ADJUST_BLOCKLINE"
 msgid "Justify"
 msgstr "Unioni"
 
-#: editrids.hrc:148
+#: include/editeng/editrids.hrc:147
 msgctxt "RID_SOLID"
 msgid "Single, solid"
 msgstr "Sengl, solet"
 
-#: editrids.hrc:149
+#: include/editeng/editrids.hrc:148
 msgctxt "RID_DOTTED"
 msgid "Single, dotted"
 msgstr "Dotiog, sengl"
 
-#: editrids.hrc:150
+#: include/editeng/editrids.hrc:149
 msgctxt "RID_DASHED"
 msgid "Single, dashed"
 msgstr "Seng, llinell doriad"
 
-#: editrids.hrc:151
+#: include/editeng/editrids.hrc:150
 msgctxt "RID_DOUBLE"
 msgid "Double"
 msgstr "Dwbl"
 
-#: editrids.hrc:152
+#: include/editeng/editrids.hrc:151
 msgctxt "RID_THINTHICK_SMALLGAP"
 msgid "Double, inside: fine, outside: thick, spacing: small"
 msgstr "Dwbl, mewnol:, mân, allanol, trwchus. bylchu: bach"
 
-#: editrids.hrc:153
+#: include/editeng/editrids.hrc:152
 msgctxt "RID_THINTHICK_MEDIUMGAP"
 msgid "Double, inside: fine, outside: thick, spacing: medium"
 msgstr "Dwbl, tu fewn; llinellau mân, tu allan: trwchus, bylchu: canolig"
 
-#: editrids.hrc:154
+#: include/editeng/editrids.hrc:153
 msgctxt "RID_THINTHICK_LARGEGAP"
 msgid "Double, inside: fine, outside: thick, spacing: large"
 msgstr "Dwbl, tu fewn; llinellau mân, tu allan: trwchus, bylchu: mawr"
 
-#: editrids.hrc:155
+#: include/editeng/editrids.hrc:154
 msgctxt "RID_THICKTHIN_SMALLGAP"
 msgid "Double, inside: thick, outside: fine, spacing: small"
 msgstr "Dwbl, tu fewn; llinellau mân, tu allan: tenau, bylchu: bach"
 
-#: editrids.hrc:156
+#: include/editeng/editrids.hrc:155
 msgctxt "RID_THICKTHIN_MEDIUMGAP"
 msgid "Double, inside: thick, outside: fine, spacing: medium"
 msgstr "Dwbl, tu fewn; llinellau trwchus, tu allan, man, bylchu: canolig"
 
-#: editrids.hrc:157
+#: include/editeng/editrids.hrc:156
 msgctxt "RID_THICKTHIN_LARGEGAP"
 msgid "Double, inside: thick, outside: fine, spacing: large"
 msgstr "Dwbl, tu fewn; trwchus, tu allan: mân, bylchu: mawr"
 
-#: editrids.hrc:158
+#: include/editeng/editrids.hrc:157
 msgctxt "RID_EMBOSSED"
 msgid "3D embossed"
 msgstr "Boglynnog 3D"
 
-#: editrids.hrc:159
+#: include/editeng/editrids.hrc:158
 msgctxt "RID_ENGRAVED"
 msgid "3D engraved"
 msgstr "Ysgythredig 3D"
 
-#: editrids.hrc:160
+#: include/editeng/editrids.hrc:159
 msgctxt "RID_INSET"
 msgid "Inset"
 msgstr "Mewnosod"
 
-#: editrids.hrc:161
+#: include/editeng/editrids.hrc:160
 msgctxt "RID_OUTSET"
 msgid "Outset"
 msgstr "Allosodiad"
 
-#: editrids.hrc:162
+#: include/editeng/editrids.hrc:161
 msgctxt "RID_FINE_DASHED"
 msgid "Single, fine dashed"
 msgstr "Llinell Doredig, sengl"
 
-#: editrids.hrc:163
+#: include/editeng/editrids.hrc:162
 msgctxt "RID_DOUBLE_THIN"
 msgid "Double, fixed thin lines"
 msgstr "Llinellau tennau gosodedig, dwbl"
 
-#: editrids.hrc:164
+#: include/editeng/editrids.hrc:163
 msgctxt "RID_DASH_DOT"
 msgid "Single, dash-dot"
 msgstr "Dot-doriad, sengl"
 
-#: editrids.hrc:165
+#: include/editeng/editrids.hrc:164
 msgctxt "RID_DASH_DOT_DOT"
 msgid "Single, dash-dot-dot"
 msgstr "Toriad-dot-dot, sengl"
 
-#: editrids.hrc:166
+#: include/editeng/editrids.hrc:165
 msgctxt "RID_SVXITEMS_METRIC_MM"
 msgid "mm"
 msgstr "mm"
 
-#: editrids.hrc:167
+#: include/editeng/editrids.hrc:166
 msgctxt "RID_SVXITEMS_METRIC_CM"
 msgid "cm"
 msgstr "cm"
 
-#: editrids.hrc:168
+#: include/editeng/editrids.hrc:167
 msgctxt "RID_SVXITEMS_METRIC_INCH"
 msgid "inch"
 msgstr "mod"
 
-#: editrids.hrc:169
+#: include/editeng/editrids.hrc:168
 msgctxt "RID_SVXITEMS_METRIC_POINT"
 msgid "pt"
 msgstr "pt"
 
-#: editrids.hrc:170
+#: include/editeng/editrids.hrc:169
 msgctxt "RID_SVXITEMS_METRIC_TWIP"
 msgid "twip"
 msgstr "twip"
 
-#: editrids.hrc:171
+#: include/editeng/editrids.hrc:170
 msgctxt "RID_SVXITEMS_METRIC_PIXEL"
 msgid "pixel"
 msgstr "picsel"
 
 #. GetValueText of BoolItems
-#: editrids.hrc:174
+#: include/editeng/editrids.hrc:173
 msgctxt "RID_SVXITEMS_SHADOWED_TRUE"
 msgid "Shadowed"
 msgstr "Cysgodi"
 
-#: editrids.hrc:175
+#: include/editeng/editrids.hrc:174
 msgctxt "RID_SVXITEMS_SHADOWED_FALSE"
 msgid "Not Shadowed"
 msgstr "Heb Gysgodi"
 
-#: editrids.hrc:176
+#: include/editeng/editrids.hrc:175
 msgctxt "RID_SVXITEMS_BLINK_TRUE"
 msgid "Blinking"
 msgstr "Blincio"
 
-#: editrids.hrc:177
+#: include/editeng/editrids.hrc:176
 msgctxt "RID_SVXITEMS_BLINK_FALSE"
 msgid "Not Blinking"
 msgstr "Dim Blincio"
 
-#: editrids.hrc:178
+#: include/editeng/editrids.hrc:177
 msgctxt "RID_SVXITEMS_AUTOKERN_TRUE"
 msgid "Pair Kerning"
 msgstr "Gorgyffwrdd deuol"
 
-#: editrids.hrc:179
+#: include/editeng/editrids.hrc:178
 msgctxt "RID_SVXITEMS_AUTOKERN_FALSE"
 msgid "No pair kerning"
 msgstr "Dim gorgyffwrdd deuol"
 
-#: editrids.hrc:180
+#: include/editeng/editrids.hrc:179
 msgctxt "RID_SVXITEMS_WORDLINE_TRUE"
 msgid "Individual words"
 msgstr "Geiriau unigol"
 
-#: editrids.hrc:181
+#: include/editeng/editrids.hrc:180
 msgctxt "RID_SVXITEMS_WORDLINE_FALSE"
 msgid "Not Words Only"
 msgstr "Nid Geiriau'n Unig"
 
-#: editrids.hrc:182
+#: include/editeng/editrids.hrc:181
 msgctxt "RID_SVXITEMS_CONTOUR_TRUE"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: editrids.hrc:183
+#: include/editeng/editrids.hrc:182
 msgctxt "RID_SVXITEMS_CONTOUR_FALSE"
 msgid "No Outline"
 msgstr "Dim Amlinell"
 
-#: editrids.hrc:184
+#: include/editeng/editrids.hrc:183
 msgctxt "RID_SVXITEMS_PRINT_TRUE"
 msgid "Print"
 msgstr "Argraffu"
 
-#: editrids.hrc:185
+#: include/editeng/editrids.hrc:184
 msgctxt "RID_SVXITEMS_PRINT_FALSE"
 msgid "Don't print"
 msgstr "Peidio argraffu"
 
-#: editrids.hrc:186
+#: include/editeng/editrids.hrc:185
 msgctxt "RID_SVXITEMS_OPAQUE_TRUE"
 msgid "Opaque"
 msgstr "Adloyw"
 
-#: editrids.hrc:187
+#: include/editeng/editrids.hrc:186
 msgctxt "RID_SVXITEMS_OPAQUE_FALSE"
 msgid "Not Opaque"
 msgstr "Heb Afloyw"
 
-#: editrids.hrc:188
+#: include/editeng/editrids.hrc:187
 msgctxt "RID_SVXITEMS_FMTKEEP_TRUE"
 msgid "Keep with next paragraph"
 msgstr "Cadw gyda'r paragraff nesaf"
 
-#: editrids.hrc:189
+#: include/editeng/editrids.hrc:188
 msgctxt "RID_SVXITEMS_FMTKEEP_FALSE"
 msgid "Don't Keep Paragraphs Together"
 msgstr "Peidio â Chadw Paragraffau Gyda'i Gilydd"
 
-#: editrids.hrc:190
+#: include/editeng/editrids.hrc:189
 msgctxt "RID_SVXITEMS_FMTSPLIT_TRUE"
 msgid "Split paragraph"
 msgstr "Hollti paragraff"
 
-#: editrids.hrc:191
+#: include/editeng/editrids.hrc:190
 msgctxt "RID_SVXITEMS_FMTSPLIT_FALSE"
 msgid "Don't split paragraph"
 msgstr "Peidio hollti'r paragraff"
 
-#: editrids.hrc:192
+#: include/editeng/editrids.hrc:191
 msgctxt "RID_SVXITEMS_PROT_CONTENT_TRUE"
 msgid "Contents protected"
 msgstr "Diogelu'r cynnwys"
 
-#: editrids.hrc:193
+#: include/editeng/editrids.hrc:192
 msgctxt "RID_SVXITEMS_PROT_CONTENT_FALSE"
 msgid "Contents not protected"
 msgstr "Cynnwys heb ei ddiogelu"
 
-#: editrids.hrc:194
+#: include/editeng/editrids.hrc:193
 msgctxt "RID_SVXITEMS_PROT_SIZE_TRUE"
 msgid "Size protected"
 msgstr "Diogelu maint"
 
-#: editrids.hrc:195
+#: include/editeng/editrids.hrc:194
 msgctxt "RID_SVXITEMS_PROT_SIZE_FALSE"
 msgid "Size not protected"
 msgstr "Maint heb ei ddiogelu"
 
-#: editrids.hrc:196
+#: include/editeng/editrids.hrc:195
 msgctxt "RID_SVXITEMS_PROT_POS_TRUE"
 msgid "Position protected"
 msgstr "Safle diogel"
 
-#: editrids.hrc:197
+#: include/editeng/editrids.hrc:196
 msgctxt "RID_SVXITEMS_PROT_POS_FALSE"
 msgid "Position not protected"
 msgstr "Safle heb ei ddiogelu"
 
-#: editrids.hrc:198
+#: include/editeng/editrids.hrc:197
 msgctxt "RID_SVXITEMS_TRANSPARENT_TRUE"
 msgid "Transparent"
 msgstr "Tryloyw"
 
-#: editrids.hrc:199
+#: include/editeng/editrids.hrc:198
 msgctxt "RID_SVXITEMS_TRANSPARENT_FALSE"
 msgid "Not Transparent"
 msgstr "Nid Tryloyw"
 
-#: editrids.hrc:200
+#: include/editeng/editrids.hrc:199
 msgctxt "RID_SVXITEMS_HYPHEN_TRUE"
 msgid "Hyphenation"
 msgstr "Cysylltnodi"
 
-#: editrids.hrc:201
+#: include/editeng/editrids.hrc:200
 msgctxt "RID_SVXITEMS_HYPHEN_FALSE"
 msgid "No hyphenation"
 msgstr "Dim cyplysnodi"
 
-#: editrids.hrc:202
+#: include/editeng/editrids.hrc:201
 msgctxt "RID_SVXITEMS_PAGE_END_TRUE"
 msgid "Page End"
 msgstr "Diwedd Tudalen"
 
-#: editrids.hrc:203
+#: include/editeng/editrids.hrc:202
 msgctxt "RID_SVXITEMS_PAGE_END_FALSE"
 msgid "No Page End"
 msgstr "Dim Diwedd Tudalen"
 
-#: editrids.hrc:204
+#: include/editeng/editrids.hrc:203
 msgctxt "RID_SVXITEMS_SIZE_WIDTH"
 msgid "Width: "
 msgstr "Lled: "
 
-#: editrids.hrc:205
+#: include/editeng/editrids.hrc:204
 msgctxt "RID_SVXITEMS_SIZE_HEIGHT"
 msgid "Height: "
 msgstr "Uchder: "
 
-#: editrids.hrc:206
+#: include/editeng/editrids.hrc:205
 msgctxt "RID_SVXITEMS_LRSPACE_LEFT"
 msgid "Indent left "
 msgstr "Mewnoliad chwith "
 
-#: editrids.hrc:207
+#: include/editeng/editrids.hrc:206
 msgctxt "RID_SVXITEMS_LRSPACE_FLINE"
 msgid "First Line "
 msgstr "Llinell gynaf "
 
-#: editrids.hrc:208
+#: include/editeng/editrids.hrc:207
 msgctxt "RID_SVXITEMS_LRSPACE_RIGHT"
 msgid "Indent right "
 msgstr "Mewnoliad de "
 
-#: editrids.hrc:209
+#: include/editeng/editrids.hrc:208
 msgctxt "RID_SVXITEMS_SHADOW_COMPLETE"
 msgid "Shadow: "
 msgstr "Cysgod: "
 
-#: editrids.hrc:210
+#: include/editeng/editrids.hrc:209
 msgctxt "RID_SVXITEMS_BORDER_COMPLETE"
 msgid "Borders "
 msgstr "Borderi "
 
-#: editrids.hrc:211
+#: include/editeng/editrids.hrc:210
 msgctxt "RID_SVXITEMS_BORDER_NONE"
 msgid "No border"
 msgstr "Dim border"
 
-#: editrids.hrc:212
+#: include/editeng/editrids.hrc:211
 msgctxt "RID_SVXITEMS_BORDER_TOP"
 msgid "top "
 msgstr "brig "
 
-#: editrids.hrc:213
+#: include/editeng/editrids.hrc:212
 msgctxt "RID_SVXITEMS_BORDER_BOTTOM"
 msgid "bottom "
 msgstr "gwaelod "
 
-#: editrids.hrc:214
+#: include/editeng/editrids.hrc:213
 msgctxt "RID_SVXITEMS_BORDER_LEFT"
 msgid "left "
 msgstr "chwith "
 
-#: editrids.hrc:215
+#: include/editeng/editrids.hrc:214
 msgctxt "RID_SVXITEMS_BORDER_RIGHT"
 msgid "right "
 msgstr "de "
 
-#: editrids.hrc:216
+#: include/editeng/editrids.hrc:215
 msgctxt "RID_SVXITEMS_BORDER_DISTANCE"
 msgid "Spacing "
 msgstr "Bylchu "
 
-#: editrids.hrc:217
+#: include/editeng/editrids.hrc:216
 msgctxt "RID_SVXITEMS_ULSPACE_UPPER"
 msgid "From top "
 msgstr "O'r brig "
 
-#: editrids.hrc:218
+#: include/editeng/editrids.hrc:217
 msgctxt "RID_SVXITEMS_ULSPACE_LOWER"
 msgid "From bottom "
 msgstr "O'r gwaelod "
 
 #. To translators: %1 == will be replaced by the number of lines
-#: editrids.hrc:220
+#: include/editeng/editrids.hrc:219
 msgctxt "RID_SVXITEMS_LINES"
 msgid "%1 Lines"
 msgstr "%1 Llinell"
 
-#: editrids.hrc:221
+#: include/editeng/editrids.hrc:220
 msgctxt "RID_SVXITEMS_WIDOWS_COMPLETE"
 msgid "Widow control"
 msgstr "Rheoli gweddw"
 
-#: editrids.hrc:222
+#: include/editeng/editrids.hrc:221
 msgctxt "RID_SVXITEMS_ORPHANS_COMPLETE"
 msgid "Orphan control"
 msgstr "Rheoli amddifad"
 
-#: editrids.hrc:223
+#: include/editeng/editrids.hrc:222
 msgctxt "RID_SVXITEMS_HYPHEN_MINLEAD"
 msgid "%1 characters at end of line"
 msgstr "%1 nod ar ddiwedd llinell"
 
-#: editrids.hrc:224
+#: include/editeng/editrids.hrc:223
 msgctxt "RID_SVXITEMS_HYPHEN_MINTRAIL"
 msgid "%1 characters at beginning of line"
 msgstr "%1 nod ar ddechrau llinell"
 
-#: editrids.hrc:225
+#: include/editeng/editrids.hrc:224
 msgctxt "RID_SVXITEMS_HYPHEN_MAX"
 msgid "%1 hyphens"
 msgstr "%1 cysylltnod"
 
-#: editrids.hrc:226
+#: include/editeng/editrids.hrc:225
 msgctxt "RID_SVXITEMS_PAGEMODEL_COMPLETE"
 msgid "Page Style: "
 msgstr "Arddull Tudalen: "
 
-#: editrids.hrc:227
+#: include/editeng/editrids.hrc:226
 msgctxt "RID_SVXITEMS_KERNING_COMPLETE"
 msgid "Kerning "
 msgstr "Gorgyffwrdd "
 
-#: editrids.hrc:228
+#: include/editeng/editrids.hrc:227
 msgctxt "RID_SVXITEMS_KERNING_EXPANDED"
 msgid "locked "
 msgstr "wedi cloi "
 
-#: editrids.hrc:229
+#: include/editeng/editrids.hrc:228
 msgctxt "RID_SVXITEMS_KERNING_CONDENSED"
 msgid "Condensed "
 msgstr "Cyddwysedig "
 
-#: editrids.hrc:230
+#: include/editeng/editrids.hrc:229
 msgctxt "RID_SVXITEMS_GRAPHIC"
 msgid "Graphic"
 msgstr "Graffig"
 
-#: editrids.hrc:231
+#: include/editeng/editrids.hrc:230
 msgctxt "RID_SVXITEMS_EMPHASIS_NONE_STYLE"
 msgid "none"
 msgstr "dim"
 
-#: editrids.hrc:232
+#: include/editeng/editrids.hrc:231
 msgctxt "RID_SVXITEMS_EMPHASIS_DOT_STYLE"
 msgid "Dots "
 msgstr "Dotiau "
 
-#: editrids.hrc:233
+#: include/editeng/editrids.hrc:232
 msgctxt "RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE"
 msgid "Circle "
 msgstr "Cylch "
 
 #. ??? disc == filled ring
-#: editrids.hrc:235
+#: include/editeng/editrids.hrc:234
 msgctxt "RID_SVXITEMS_EMPHASIS_DISC_STYLE"
 msgid "Filled circle "
 msgstr "Cylch llawn "
 
-#: editrids.hrc:236
+#: include/editeng/editrids.hrc:235
 msgctxt "RID_SVXITEMS_EMPHASIS_ACCENT_STYLE"
 msgid "Accent "
 msgstr "Acen "
 
-#: editrids.hrc:237
+#: include/editeng/editrids.hrc:236
 msgctxt "RID_SVXITEMS_EMPHASIS_ABOVE_POS"
 msgid "Above"
 msgstr "Uwchlaw"
 
-#: editrids.hrc:238
+#: include/editeng/editrids.hrc:237
 msgctxt "RID_SVXITEMS_EMPHASIS_BELOW_POS"
 msgid "Below"
 msgstr "Islaw"
 
-#: editrids.hrc:239
+#: include/editeng/editrids.hrc:238
 msgctxt "RID_SVXITEMS_TWOLINES_OFF"
 msgid "Double-lined off"
 msgstr "Llinell ddwbl diffodd"
 
-#: editrids.hrc:240
+#: include/editeng/editrids.hrc:239
 msgctxt "RID_SVXITEMS_TWOLINES"
 msgid "Double-lined"
 msgstr "Llinellu ddwbl"
 
-#: editrids.hrc:241
+#: include/editeng/editrids.hrc:240
 msgctxt "RID_SVXITEMS_SCRPTSPC_OFF"
 msgid "No automatic character spacing"
 msgstr "Dim bylchu nod awtomatig"
 
-#: editrids.hrc:242
+#: include/editeng/editrids.hrc:241
 msgctxt "RID_SVXITEMS_SCRPTSPC_ON"
 msgid "No automatic character spacing"
 msgstr "Dim bylchu nod awtomatig"
 
-#: editrids.hrc:243
+#: include/editeng/editrids.hrc:242
 msgctxt "RID_SVXITEMS_HNGPNCT_OFF"
 msgid "No hanging punctuation at line end"
 msgstr "Dim atalnodi crog ar ddiwedd llinell"
 
-#: editrids.hrc:244
+#: include/editeng/editrids.hrc:243
 msgctxt "RID_SVXITEMS_HNGPNCT_ON"
 msgid "Hanging punctuation at line end"
 msgstr "Atalnodi crog ar ddiwedd llinell"
 
-#: editrids.hrc:245
+#: include/editeng/editrids.hrc:244
 msgctxt "RID_SVXITEMS_FORBIDDEN_RULE_OFF"
 msgid "Apply list of forbidden characters to beginning and end of lines"
 msgstr "Gosod rhestr o nodau gwaharddedig ar ddechrau a diwedd llinellau"
 
-#: editrids.hrc:246
+#: include/editeng/editrids.hrc:245
 msgctxt "RID_SVXITEMS_FORBIDDEN_RULE_ON"
 msgid "Don't apply list of forbidden characters to beginning and end of lines"
 msgstr "Peidio gosod rhestr o nodau gwaharddedig ar ddechrau a diwedd llinellau"
 
-#: editrids.hrc:247
+#: include/editeng/editrids.hrc:246
 msgctxt "RID_SVXITEMS_CHARROTATE_OFF"
 msgid "No rotated characters"
 msgstr "Dim nodau troi"
 
-#: editrids.hrc:248
+#: include/editeng/editrids.hrc:247
 msgctxt "RID_SVXITEMS_CHARROTATE"
 msgid "Character rotated by $(ARG1)°"
 msgstr "Nod trowyd yn ôl $(ARG1)°"
 
-#: editrids.hrc:249
+#: include/editeng/editrids.hrc:248
 msgctxt "RID_SVXITEMS_CHARROTATE_FITLINE"
 msgid "Fit to line"
 msgstr "Ffitio i'r linell"
 
-#: editrids.hrc:250
+#: include/editeng/editrids.hrc:249
 msgctxt "RID_SVXITEMS_TEXTROTATE_OFF"
 msgid "Text is not rotated"
 msgstr "Nid yw'r testun wedi ei droi"
 
-#: editrids.hrc:251
+#: include/editeng/editrids.hrc:250
 msgctxt "RID_SVXITEMS_TEXTROTATE"
 msgid "Text is rotated by $(ARG1)°"
 msgstr "Testun wedi ei droi gan $(ARG1)°"
 
-#: editrids.hrc:252
+#: include/editeng/editrids.hrc:251
 msgctxt "RID_SVXITEMS_CHARSCALE"
 msgid "Characters scaled $(ARG1)%"
 msgstr "Nodau wedi graddio $(ARG1)%"
 
-#: editrids.hrc:253
+#: include/editeng/editrids.hrc:252
 msgctxt "RID_SVXITEMS_CHARSCALE_OFF"
 msgid "No scaled characters"
 msgstr "Dim nodau graddedig"
 
-#: editrids.hrc:254
+#: include/editeng/editrids.hrc:253
 msgctxt "RID_SVXITEMS_RELIEF_NONE"
 msgid "No relief"
 msgstr "Din cerfwedd"
 
-#: editrids.hrc:255
+#: include/editeng/editrids.hrc:254
 msgctxt "RID_SVXITEMS_RELIEF_EMBOSSED"
 msgid "Relief"
 msgstr "Cerfweddol"
 
-#: editrids.hrc:256
+#: include/editeng/editrids.hrc:255
 msgctxt "RID_SVXITEMS_RELIEF_ENGRAVED"
 msgid "Engraved"
 msgstr "Ysgythru"
 
-#: editrids.hrc:257
+#: include/editeng/editrids.hrc:256
 msgctxt "RID_SVXITEMS_PARAVERTALIGN_AUTO"
 msgid "Automatic text alignment"
 msgstr "Aliniad testun awtomatig"
 
-#: editrids.hrc:258
+#: include/editeng/editrids.hrc:257
 msgctxt "RID_SVXITEMS_PARAVERTALIGN_BASELINE"
 msgid "Text aligned to base line"
 msgstr "Testun wedi ei alinio i'r llinell sail"
 
-#: editrids.hrc:259
+#: include/editeng/editrids.hrc:258
 msgctxt "RID_SVXITEMS_PARAVERTALIGN_TOP"
 msgid "Text aligned top"
 msgstr "Testun alinio i'r brig"
 
-#: editrids.hrc:260
+#: include/editeng/editrids.hrc:259
 msgctxt "RID_SVXITEMS_PARAVERTALIGN_CENTER"
 msgid "Text aligned middle"
 msgstr "Testun alinio i'r canol"
 
-#: editrids.hrc:261
+#: include/editeng/editrids.hrc:260
 msgctxt "RID_SVXITEMS_PARAVERTALIGN_BOTTOM"
 msgid "Text aligned bottom"
 msgstr "Testun alinio i'r gwaelod"
 
-#: editrids.hrc:262
+#: include/editeng/editrids.hrc:261
 msgctxt "RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP"
 msgid "Text direction left-to-right (horizontal)"
 msgstr "Cyfeiriad testun o'r chwith i'r dde (llorweddol)"
 
-#: editrids.hrc:263
+#: include/editeng/editrids.hrc:262
 msgctxt "RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP"
 msgid "Text direction right-to-left (horizontal)"
 msgstr "Cyfeiriad testun o'r chwith i'r dde (llorweddol)"
 
-#: editrids.hrc:264
+#: include/editeng/editrids.hrc:263
 msgctxt "RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT"
 msgid "Text direction right-to-left (vertical)"
 msgstr "Cyfeiriad testun o'r chwith i'r dde (fertigol)"
 
-#: editrids.hrc:265
+#: include/editeng/editrids.hrc:264
 msgctxt "RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT"
 msgid "Text direction left-to-right (vertical)"
 msgstr "Cyfeiriad testun o'r chwith i'r dde (fertigol)"
 
-#: editrids.hrc:266
+#: include/editeng/editrids.hrc:265
 msgctxt "RID_SVXITEMS_FRMDIR_ENVIRONMENT"
 msgid "Use superordinate object text direction setting"
 msgstr "Defnyddio gosodiadau cyfeiriad testun gwrthrych uwcholyn"
 
-#: editrids.hrc:267
+#: include/editeng/editrids.hrc:266
 msgctxt "RID_SVXITEMS_PARASNAPTOGRID_ON"
 msgid "Paragraph snaps to text grid (if active)"
 msgstr "Paragraff yn snapio i'r grid (os gweithredol)"
 
-#: editrids.hrc:268
+#: include/editeng/editrids.hrc:267
 msgctxt "RID_SVXITEMS_PARASNAPTOGRID_OFF"
 msgid "Paragraph does not snap to text grid"
 msgstr "Paragraff ddim y snapio i'r grid testun"
 
-#: editrids.hrc:269
+#: include/editeng/editrids.hrc:268
 msgctxt "RID_SVXITEMS_CHARHIDDEN_FALSE"
 msgid "Not hidden"
 msgstr "Nid cudd"
 
-#: editrids.hrc:270
+#: include/editeng/editrids.hrc:269
 msgctxt "RID_SVXITEMS_CHARHIDDEN_TRUE"
 msgid "Hidden"
 msgstr "Cudd"
 
 #. enum SvxCellHorJustify ----------------------------------------------------
-#: editrids.hrc:273
+#: include/editeng/editrids.hrc:272
 msgctxt "RID_SVXITEMS_HORJUST_STANDARD"
 msgid "Horizontal alignment default"
 msgstr "Aliniad llorweddol rhagosodedig"
 
-#: editrids.hrc:274
+#: include/editeng/editrids.hrc:273
 msgctxt "RID_SVXITEMS_HORJUST_LEFT"
 msgid "Align left"
 msgstr "Alinio chwith"
 
-#: editrids.hrc:275
+#: include/editeng/editrids.hrc:274
 msgctxt "RID_SVXITEMS_HORJUST_CENTER"
 msgid "Centered horizontally"
 msgstr "Canoli’r llorweddol"
 
-#: editrids.hrc:276
+#: include/editeng/editrids.hrc:275
 msgctxt "RID_SVXITEMS_HORJUST_RIGHT"
 msgid "Align right"
 msgstr "Alinio de"
 
-#: editrids.hrc:277
+#: include/editeng/editrids.hrc:276
 msgctxt "RID_SVXITEMS_HORJUST_BLOCK"
 msgid "Justify"
 msgstr "Unioni"
 
-#: editrids.hrc:278
+#: include/editeng/editrids.hrc:277
 msgctxt "RID_SVXITEMS_HORJUST_REPEAT"
 msgid "Repeat alignment"
 msgstr "Ailadrodd aliniad"
 
 #. enum SvxCellVerJustify ----------------------------------------------------
-#: editrids.hrc:281
+#: include/editeng/editrids.hrc:280
 msgctxt "RID_SVXITEMS_VERJUST_STANDARD"
 msgid "Vertical alignment default"
 msgstr "Aliniad fertigol rhagosodedig"
 
-#: editrids.hrc:282
+#: include/editeng/editrids.hrc:281
 msgctxt "RID_SVXITEMS_VERJUST_TOP"
 msgid "Align to top"
 msgstr "Alinio i’r brig"
 
-#: editrids.hrc:283
+#: include/editeng/editrids.hrc:282
 msgctxt "RID_SVXITEMS_VERJUST_CENTER"
 msgid "Centered vertically"
 msgstr "Canoli'n fertigol"
 
-#: editrids.hrc:284
+#: include/editeng/editrids.hrc:283
 msgctxt "RID_SVXITEMS_VERJUST_BOTTOM"
 msgid "Align to bottom"
 msgstr "Alinio i'r gwaelod"
 
 #. enum SvxCellJustifyMethod ----------------------------------------------------
-#: editrids.hrc:287
+#: include/editeng/editrids.hrc:286
 msgctxt "RID_SVXITEMS_JUSTMETHOD_AUTO"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: editrids.hrc:288
+#: include/editeng/editrids.hrc:287
 msgctxt "RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE"
 msgid "Distributed"
 msgstr "Dosbarthiad"
 
-#: editrids.hrc:290
+#: include/editeng/editrids.hrc:289
 msgctxt "RID_SVXSTR_PAPERBIN"
 msgid "Paper tray"
 msgstr "Dror papur"
 
-#: editrids.hrc:291
+#: include/editeng/editrids.hrc:290
 msgctxt "RID_SVXSTR_PAPERBIN_SETTINGS"
 msgid "[From printer settings]"
 msgstr "[O osodiadau'r argraffydd]"
 
-#: editrids.hrc:293
+#: include/editeng/editrids.hrc:292
 msgctxt "RID_EDITUNDO_DEL"
 msgid "Delete"
 msgstr "Dileu"
 
-#: editrids.hrc:294
+#: include/editeng/editrids.hrc:293
 msgctxt "RID_EDITUNDO_MOVE"
 msgid "Move"
 msgstr "Symud"
 
-#: editrids.hrc:295
+#: include/editeng/editrids.hrc:294
 msgctxt "RID_EDITUNDO_INSERT"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: editrids.hrc:296
+#: include/editeng/editrids.hrc:295
 msgctxt "RID_EDITUNDO_REPLACE"
 msgid "Replace"
 msgstr "Newid"
 
-#: editrids.hrc:297
+#: include/editeng/editrids.hrc:296
 msgctxt "RID_EDITUNDO_SETATTRIBS"
 msgid "Apply attributes"
 msgstr "Gosod priodoleddau"
 
-#: editrids.hrc:298
+#: include/editeng/editrids.hrc:297
 msgctxt "RID_EDITUNDO_RESETATTRIBS"
 msgid "Reset attributes"
 msgstr "Ailosod priodoleddau"
 
-#: editrids.hrc:299
+#: include/editeng/editrids.hrc:298
 msgctxt "RID_EDITUNDO_INDENT"
 msgid "Indent"
 msgstr "Mewnoliad"
 
-#: editrids.hrc:300
+#: include/editeng/editrids.hrc:299
 msgctxt "RID_EDITUNDO_SETSTYLE"
 msgid "Apply Styles"
 msgstr "Gosod Arddulliau"
 
-#: editrids.hrc:301
+#: include/editeng/editrids.hrc:300
 msgctxt "RID_EDITUNDO_TRANSLITERATE"
 msgid "Change Case"
 msgstr "Newid Maint"
 
-#: editrids.hrc:302
+#: include/editeng/editrids.hrc:301
 #, c-format
 msgctxt "RID_STR_WORD"
 msgid "Word is %x"
 msgstr "Gair yn %x"
 
-#: editrids.hrc:303
+#: include/editeng/editrids.hrc:302
 #, c-format
 msgctxt "RID_STR_PARAGRAPH"
 msgid "Paragraph is %x"
 msgstr "Paragraff yn %x"
 
-#: editrids.hrc:304
+#: include/editeng/editrids.hrc:303
 msgctxt "RID_SVXSTR_AUTOMATIC"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: editrids.hrc:306
+#: include/editeng/editrids.hrc:305
 msgctxt "RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION"
 msgid "Image bullet in paragraph"
 msgstr "Bwled delwedd yn y paragraff"
 
-#: editrids.hrc:307
+#: include/editeng/editrids.hrc:306
 msgctxt "RID_SVXSTR_A11Y_IMAGEBULLET_NAME"
 msgid "Image bullet"
 msgstr "Bwled delwedd"
 
-#: editrids.hrc:308
+#: include/editeng/editrids.hrc:307
 msgctxt "RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION"
 msgid "Paragraph: $(ARG) "
 msgstr "Paragraff: $(ARG) "
 
-#: editrids.hrc:310
+#: include/editeng/editrids.hrc:309
 msgctxt "RID_SVXSTR_QUERY_CONTINUE"
 msgid "Continue checking at beginning of document?"
 msgstr "Parhau i wirio o gychwyn y ddogfen?"
 
-#: editrids.hrc:311
+#: include/editeng/editrids.hrc:310
 msgctxt "RID_SVXSTR_QUERY_BW_CONTINUE"
 msgid "Continue checking at end of document?"
 msgstr "Parhau i wirio ar ddiwedd y ddogfen?"
 
-#: editrids.hrc:312
+#: include/editeng/editrids.hrc:311
 msgctxt "RID_SVXSTR_DIC_ERR_UNKNOWN"
 msgid ""
 "Word cannot be added to dictionary\n"
@@ -1334,37 +1329,37 @@ msgstr ""
 "Nid oes modd gosod y gair yn y geiriadur\n"
 "am reswm anhysbys."
 
-#: editrids.hrc:313
+#: include/editeng/editrids.hrc:312
 msgctxt "RID_SVXSTR_DIC_ERR_FULL"
 msgid "The dictionary is already full."
 msgstr "Mae'r geiriadur eisoes yn llawn."
 
-#: editrids.hrc:314
+#: include/editeng/editrids.hrc:313
 msgctxt "RID_SVXSTR_DIC_ERR_READONLY"
 msgid "The dictionary is read-only."
 msgstr "Geiriadur darllen yn unig."
 
-#: editrids.hrc:316
+#: include/editeng/editrids.hrc:315
 msgctxt "RID_OUTLUNDO_DEPTH"
 msgid "Indent"
 msgstr "Mewnoliad"
 
-#: editrids.hrc:317
+#: include/editeng/editrids.hrc:316
 msgctxt "RID_OUTLUNDO_EXPAND"
 msgid "Show subpoints"
 msgstr "Dangos isbwyntiau"
 
-#: editrids.hrc:318
+#: include/editeng/editrids.hrc:317
 msgctxt "RID_OUTLUNDO_COLLAPSE"
 msgid "Collapse"
 msgstr "Cwympo"
 
-#: editrids.hrc:319
+#: include/editeng/editrids.hrc:318
 msgctxt "RID_OUTLUNDO_ATTR"
 msgid "Apply attributes"
 msgstr "Gosod priodoleddau"
 
-#: editrids.hrc:320
+#: include/editeng/editrids.hrc:319
 msgctxt "RID_OUTLUNDO_INSERT"
 msgid "Insert"
 msgstr "Mewnoliad"
diff --git a/source/cy/extensions/messages.po b/source/cy/extensions/messages.po
index 69fa98da0f6..0e593c194b7 100644
--- a/source/cy/extensions/messages.po
+++ b/source/cy/extensions/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: 2017-11-22 13:53+0100\n"
-"PO-Revision-Date: 2017-12-29 15:13+0000\n"
+"POT-Creation-Date: 2018-04-23 18:10+0200\n"
+"PO-Revision-Date: 2018-03-01 09:08+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,1739 +13,1739 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1514560391.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1519895299.000000\n"
 
-#: command.hrc:29
+#: extensions/inc/command.hrc:29
 msgctxt "RID_RSC_ENUM_COMMAND_TYPE"
 msgid "Table"
 msgstr "Tabl"
 
-#: command.hrc:30
+#: extensions/inc/command.hrc:30
 msgctxt "RID_RSC_ENUM_COMMAND_TYPE"
 msgid "Query"
 msgstr "Ymholiad"
 
-#: command.hrc:31
+#: extensions/inc/command.hrc:31
 msgctxt "RID_RSC_ENUM_COMMAND_TYPE"
 msgid "SQL command"
 msgstr "Gorchymyn SQL"
 
-#: showhide.hrc:29
+#: extensions/inc/showhide.hrc:29
 msgctxt "RID_RSC_ENUM_SHOWHIDE"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: showhide.hrc:30
+#: extensions/inc/showhide.hrc:30
 msgctxt "RID_RSC_ENUM_SHOWHIDE"
 msgid "Show"
 msgstr "Dangos"
 
-#: stringarrays.hrc:27
+#: extensions/inc/stringarrays.hrc:27
 msgctxt "RID_RSC_ENUM_VERTICAL_ALIGN"
 msgid "Top"
 msgstr "Brig"
 
-#: stringarrays.hrc:28
+#: extensions/inc/stringarrays.hrc:28
 msgctxt "RID_RSC_ENUM_VERTICAL_ALIGN"
 msgid "Middle"
 msgstr "Canol"
 
-#: stringarrays.hrc:29
+#: extensions/inc/stringarrays.hrc:29
 msgctxt "RID_RSC_ENUM_VERTICAL_ALIGN"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: stringarrays.hrc:34
+#: extensions/inc/stringarrays.hrc:34
 msgctxt "RID_RSC_ENUM_ICONSIZE_TYPE"
 msgid "Small"
 msgstr "Bach"
 
-#: stringarrays.hrc:35
+#: extensions/inc/stringarrays.hrc:35
 msgctxt "RID_RSC_ENUM_ICONSIZE_TYPE"
 msgid "Large"
 msgstr "Mawr"
 
-#: stringarrays.hrc:40
+#: extensions/inc/stringarrays.hrc:40
 msgctxt "RID_RSC_ENUM_BORDER_TYPE"
 msgid "Without frame"
 msgstr "Heb ffrâm"
 
-#: stringarrays.hrc:41
+#: extensions/inc/stringarrays.hrc:41
 msgctxt "RID_RSC_ENUM_BORDER_TYPE"
 msgid "3D look"
 msgstr "Golwg 3D"
 
-#: stringarrays.hrc:42
+#: extensions/inc/stringarrays.hrc:42
 msgctxt "RID_RSC_ENUM_BORDER_TYPE"
 msgid "Flat"
 msgstr "Gwastad"
 
-#: stringarrays.hrc:47
+#: extensions/inc/stringarrays.hrc:47
 msgctxt "RID_RSC_ENUM_LISTSOURCE_TYPE"
 msgid "Valuelist"
 msgstr "Rhestr gwerth"
 
-#: stringarrays.hrc:48
+#: extensions/inc/stringarrays.hrc:48
 msgctxt "RID_RSC_ENUM_LISTSOURCE_TYPE"
 msgid "Table"
 msgstr "Tabl"
 
-#: stringarrays.hrc:49
+#: extensions/inc/stringarrays.hrc:49
 msgctxt "RID_RSC_ENUM_LISTSOURCE_TYPE"
 msgid "Query"
 msgstr "Ymholiad"
 
-#: stringarrays.hrc:50
+#: extensions/inc/stringarrays.hrc:50
 msgctxt "RID_RSC_ENUM_LISTSOURCE_TYPE"
 msgid "Sql"
 msgstr "Sql"
 
-#: stringarrays.hrc:51
+#: extensions/inc/stringarrays.hrc:51
 msgctxt "RID_RSC_ENUM_LISTSOURCE_TYPE"
 msgid "Sql [Native]"
 msgstr "Sql [Native]"
 
-#: stringarrays.hrc:52
+#: extensions/inc/stringarrays.hrc:52
 msgctxt "RID_RSC_ENUM_LISTSOURCE_TYPE"
 msgid "Tablefields"
 msgstr "Meysydd tablau"
 
-#: stringarrays.hrc:57
+#: extensions/inc/stringarrays.hrc:57
 msgctxt "RID_RSC_ENUM_ALIGNMENT"
 msgid "Left"
 msgstr "Chwith"
 
-#: stringarrays.hrc:58
+#: extensions/inc/stringarrays.hrc:58
 msgctxt "RID_RSC_ENUM_ALIGNMENT"
 msgid "Center"
 msgstr "Canoli"
 
-#: stringarrays.hrc:59
+#: extensions/inc/stringarrays.hrc:59
 msgctxt "RID_RSC_ENUM_ALIGNMENT"
 msgid "Right"
 msgstr "De"
 
-#: stringarrays.hrc:64
+#: extensions/inc/stringarrays.hrc:64
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "None"
 msgstr "Dim"
 
-#: stringarrays.hrc:65
+#: extensions/inc/stringarrays.hrc:65
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "Submit form"
 msgstr "Cyflwyno ffurflen"
 
-#: stringarrays.hrc:66
+#: extensions/inc/stringarrays.hrc:66
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "Reset form"
 msgstr "Ailosod ffurflen"
 
-#: stringarrays.hrc:67
+#: extensions/inc/stringarrays.hrc:67
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "Open document/web page"
 msgstr "Dogfen/tudalen gwe agored"
 
-#: stringarrays.hrc:68
+#: extensions/inc/stringarrays.hrc:68
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "First record"
 msgstr "Cofnod cyntaf"
 
-#: stringarrays.hrc:69
+#: extensions/inc/stringarrays.hrc:69
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "Previous record"
 msgstr "Cofnod blaenorol"
 
-#: stringarrays.hrc:70
+#: extensions/inc/stringarrays.hrc:70
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "Next record"
 msgstr "Cofnod nesaf"
 
-#: stringarrays.hrc:71
+#: extensions/inc/stringarrays.hrc:71
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "Last record"
 msgstr "Cofnod olaf"
 
-#: stringarrays.hrc:72
+#: extensions/inc/stringarrays.hrc:72
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "Save record"
 msgstr "Cadw cofnod"
 
-#: stringarrays.hrc:73
+#: extensions/inc/stringarrays.hrc:73
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "Undo data entry"
 msgstr "Dadwneud cofnodi data"
 
-#: stringarrays.hrc:74
+#: extensions/inc/stringarrays.hrc:74
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "New record"
 msgstr "Cofnod newydd"
 
-#: stringarrays.hrc:75
+#: extensions/inc/stringarrays.hrc:75
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "Delete record"
 msgstr "Dileu cofnod"
 
-#: stringarrays.hrc:76
+#: extensions/inc/stringarrays.hrc:76
 msgctxt "RID_RSC_ENUM_BUTTONTYPE"
 msgid "Refresh form"
 msgstr "Adnewyddu'r ffurflen"
 
-#: stringarrays.hrc:81
+#: extensions/inc/stringarrays.hrc:81
 msgctxt "RID_RSC_ENUM_SUBMIT_METHOD"
 msgid "Get"
 msgstr "Estyn"
 
-#: stringarrays.hrc:82
+#: extensions/inc/stringarrays.hrc:82
 msgctxt "RID_RSC_ENUM_SUBMIT_METHOD"
 msgid "Post"
 msgstr "Cofnod"
 
-#: stringarrays.hrc:87
+#: extensions/inc/stringarrays.hrc:87
 msgctxt "RID_RSC_ENUM_SUBMIT_ENCODING"
 msgid "URL"
 msgstr "URL"
 
-#: stringarrays.hrc:88
+#: extensions/inc/stringarrays.hrc:88
 msgctxt "RID_RSC_ENUM_SUBMIT_ENCODING"
 msgid "Multipart"
 msgstr "Aml ddarn"
 
-#: stringarrays.hrc:89
+#: extensions/inc/stringarrays.hrc:89
 msgctxt "RID_RSC_ENUM_SUBMIT_ENCODING"
 msgid "Text"
 msgstr "Testun"
 
-#: stringarrays.hrc:94
+#: extensions/inc/stringarrays.hrc:94
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "Standard (short)"
 msgstr "Safonol (byr)"
 
-#: stringarrays.hrc:95
+#: extensions/inc/stringarrays.hrc:95
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "Standard (short YY)"
 msgstr "Safonol (byr YY)"
 
-#: stringarrays.hrc:96
+#: extensions/inc/stringarrays.hrc:96
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "Standard (short YYYY)"
 msgstr "Safonol (byr YYYY)"
 
-#: stringarrays.hrc:97
+#: extensions/inc/stringarrays.hrc:97
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "Standard (long)"
 msgstr "Safonol (hir)"
 
-#: stringarrays.hrc:98
+#: extensions/inc/stringarrays.hrc:98
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "DD/MM/YY"
 msgstr "DD/MM/BB"
 
-#: stringarrays.hrc:99
+#: extensions/inc/stringarrays.hrc:99
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "MM/DD/YY"
 msgstr "MM/DD/BB"
 
-#: stringarrays.hrc:100
+#: extensions/inc/stringarrays.hrc:100
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "YY/MM/DD"
 msgstr "BB/MM/DD"
 
-#: stringarrays.hrc:101
+#: extensions/inc/stringarrays.hrc:101
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "DD/MM/YYYY"
 msgstr "DD/MM/BBBB"
 
-#: stringarrays.hrc:102
+#: extensions/inc/stringarrays.hrc:102
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "MM/DD/YYYY"
 msgstr "MM/DD/BBBB"
 
-#: stringarrays.hrc:103
+#: extensions/inc/stringarrays.hrc:103
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "YYYY/MM/DD"
 msgstr "BBBB/MM/DD"
 
-#: stringarrays.hrc:104
+#: extensions/inc/stringarrays.hrc:104
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "YY-MM-DD"
 msgstr "BB-MM-DD"
 
-#: stringarrays.hrc:105
+#: extensions/inc/stringarrays.hrc:105
 msgctxt "RID_RSC_ENUM_DATEFORMAT_LIST"
 msgid "YYYY-MM-DD"
 msgstr "BBBB-MM-DD"
 
-#: stringarrays.hrc:110
+#: extensions/inc/stringarrays.hrc:110
 msgctxt "RID_RSC_ENUM_TIMEFORMAT_LIST"
 msgid "13:45"
 msgstr "13:45"
 
-#: stringarrays.hrc:111
+#: extensions/inc/stringarrays.hrc:111
 msgctxt "RID_RSC_ENUM_TIMEFORMAT_LIST"
 msgid "13:45:00"
 msgstr "13:45:00"
 
-#: stringarrays.hrc:112
+#: extensions/inc/stringarrays.hrc:112
 msgctxt "RID_RSC_ENUM_TIMEFORMAT_LIST"
 msgid "01:45 PM"
 msgstr "01:45 PM"
 
-#: stringarrays.hrc:113
+#: extensions/inc/stringarrays.hrc:113
 msgctxt "RID_RSC_ENUM_TIMEFORMAT_LIST"
 msgid "01:45:00 PM"
 msgstr "01:45:00 PM"
 
-#: stringarrays.hrc:118
+#: extensions/inc/stringarrays.hrc:118
 msgctxt "RID_RSC_ENUM_CHECKED"
 msgid "Not Selected"
 msgstr "Heb ei Ddewis"
 
-#: stringarrays.hrc:119
+#: extensions/inc/stringarrays.hrc:119
 msgctxt "RID_RSC_ENUM_CHECKED"
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#: stringarrays.hrc:120
+#: extensions/inc/stringarrays.hrc:120
 msgctxt "RID_RSC_ENUM_CHECKED"
 msgid "Not Defined"
 msgstr "Heb ei Ddiffinio"
 
-#: stringarrays.hrc:125
+#: extensions/inc/stringarrays.hrc:125
 msgctxt "RID_RSC_ENUM_CYCLE"
 msgid "All records"
 msgstr "Pob cofnod"
 
-#: stringarrays.hrc:126
+#: extensions/inc/stringarrays.hrc:126
 msgctxt "RID_RSC_ENUM_CYCLE"
 msgid "Active record"
 msgstr "Cofnodion byw"
 
-#: stringarrays.hrc:127
+#: extensions/inc/stringarrays.hrc:127
 msgctxt "RID_RSC_ENUM_CYCLE"
 msgid "Current page"
 msgstr "Tudalen bresennol"
 
-#: stringarrays.hrc:132
+#: extensions/inc/stringarrays.hrc:132
 msgctxt "RID_RSC_ENUM_NAVIGATION"
 msgid "No"
 msgstr "Na"
 
-#: stringarrays.hrc:133
+#: extensions/inc/stringarrays.hrc:133
 msgctxt "RID_RSC_ENUM_NAVIGATION"
 msgid "Yes"
 msgstr "Iawn"
 
-#: stringarrays.hrc:134
+#: extensions/inc/stringarrays.hrc:134
 msgctxt "RID_RSC_ENUM_NAVIGATION"
 msgid "Parent Form"
 msgstr "Ffurflen Rhiant"
 
-#: stringarrays.hrc:139
+#: extensions/inc/stringarrays.hrc:139
 msgctxt "RID_RSC_ENUM_SUBMIT_TARGET"
 msgid "_blank"
 msgstr "_gwag"
 
-#: stringarrays.hrc:140
+#: extensions/inc/stringarrays.hrc:140
 msgctxt "RID_RSC_ENUM_SUBMIT_TARGET"
 msgid "_parent"
 msgstr "_rhiant"
 
-#: stringarrays.hrc:141
+#: extensions/inc/stringarrays.hrc:141
 msgctxt "RID_RSC_ENUM_SUBMIT_TARGET"
 msgid "_self"
 msgstr "_hunan"
 
-#: stringarrays.hrc:142
+#: extensions/inc/stringarrays.hrc:142
 msgctxt "RID_RSC_ENUM_SUBMIT_TARGET"
 msgid "_top"
 msgstr "_brig"
 
-#: stringarrays.hrc:147
+#: extensions/inc/stringarrays.hrc:147
 msgctxt "RID_RSC_ENUM_SELECTION_TYPE"
 msgid "None"
 msgstr "Dim"
 
-#: stringarrays.hrc:148
+#: extensions/inc/stringarrays.hrc:148
 msgctxt "RID_RSC_ENUM_SELECTION_TYPE"
 msgid "Single"
 msgstr "Sengl"
 
-#: stringarrays.hrc:149
+#: extensions/inc/stringarrays.hrc:149
 msgctxt "RID_RSC_ENUM_SELECTION_TYPE"
 msgid "Multi"
 msgstr "Aml"
 
-#: stringarrays.hrc:150
+#: extensions/inc/stringarrays.hrc:150
 msgctxt "RID_RSC_ENUM_SELECTION_TYPE"
 msgid "Range"
 msgstr "Amrediad"
 
-#: stringarrays.hrc:155
+#: extensions/inc/stringarrays.hrc:155
 msgctxt "RID_RSC_ENUM_ORIENTATION"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: stringarrays.hrc:156
+#: extensions/inc/stringarrays.hrc:156
 msgctxt "RID_RSC_ENUM_ORIENTATION"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: stringarrays.hrc:161
+#: extensions/inc/stringarrays.hrc:161
 msgctxt "RID_RSC_ENUM_PUSHBUTTONTYPE"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: stringarrays.hrc:162
+#: extensions/inc/stringarrays.hrc:162
 msgctxt "RID_RSC_ENUM_PUSHBUTTONTYPE"
 msgid "OK"
 msgstr "Iawn"
 
-#: stringarrays.hrc:163
+#: extensions/inc/stringarrays.hrc:163
 msgctxt "RID_RSC_ENUM_PUSHBUTTONTYPE"
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: stringarrays.hrc:164
+#: extensions/inc/stringarrays.hrc:164
 msgctxt "RID_RSC_ENUM_PUSHBUTTONTYPE"
 msgid "Help"
 msgstr "Cymorth"
 
-#: stringarrays.hrc:169
+#: extensions/inc/stringarrays.hrc:169
 msgctxt "RID_RSC_ENUM_CELL_EXCHANGE_TYPE"
 msgid "The selected entry"
 msgstr "Y cofnod dewiswyd"
 
-#: stringarrays.hrc:170
+#: extensions/inc/stringarrays.hrc:170
 msgctxt "RID_RSC_ENUM_CELL_EXCHANGE_TYPE"
 msgid "Position of the selected entry"
 msgstr "Safle'r cofnod dewiswyd"
 
-#: stringarrays.hrc:175
+#: extensions/inc/stringarrays.hrc:175
 msgctxt "RID_RSC_ENUM_TEXTTYPE"
 msgid "Single-line"
 msgstr "Llinell sengl"
 
-#: stringarrays.hrc:176
+#: extensions/inc/stringarrays.hrc:176
 msgctxt "RID_RSC_ENUM_TEXTTYPE"
 msgid "Multi-line"
 msgstr "Aml-linell"
 
-#: stringarrays.hrc:177
+#: extensions/inc/stringarrays.hrc:177
 msgctxt "RID_RSC_ENUM_TEXTTYPE"
 msgid "Multi-line with formatting"
 msgstr "Aml-linell gyda fformatio"
 
-#: stringarrays.hrc:182
+#: extensions/inc/stringarrays.hrc:182
 msgctxt "RID_RSC_ENUM_LINEEND_FORMAT"
 msgid "LF (Unix)"
 msgstr "LF (Unix)"
 
-#: stringarrays.hrc:183
+#: extensions/inc/stringarrays.hrc:183
 msgctxt "RID_RSC_ENUM_LINEEND_FORMAT"
 msgid "CR+LF (Windows)"
 msgstr "CR+LF (Windows)"
 
-#: stringarrays.hrc:188
+#: extensions/inc/stringarrays.hrc:188
 msgctxt "RID_RSC_ENUM_SCROLLBARS"
 msgid "None"
 msgstr "Dim"
 
-#: stringarrays.hrc:189
+#: extensions/inc/stringarrays.hrc:189
 msgctxt "RID_RSC_ENUM_SCROLLBARS"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: stringarrays.hrc:190
+#: extensions/inc/stringarrays.hrc:190
 msgctxt "RID_RSC_ENUM_SCROLLBARS"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: stringarrays.hrc:191
+#: extensions/inc/stringarrays.hrc:191
 msgctxt "RID_RSC_ENUM_SCROLLBARS"
 msgid "Both"
 msgstr "Y ddau"
 
-#: stringarrays.hrc:196
+#: extensions/inc/stringarrays.hrc:196
 msgctxt "RID_RSC_ENUM_VISUALEFFECT"
 msgid "3D"
 msgstr "3D"
 
-#: stringarrays.hrc:197
+#: extensions/inc/stringarrays.hrc:197
 msgctxt "RID_RSC_ENUM_VISUALEFFECT"
 msgid "Flat"
 msgstr "Gwastad"
 
-#: stringarrays.hrc:202
+#: extensions/inc/stringarrays.hrc:202
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Left top"
 msgstr "Brig chwith"
 
-#: stringarrays.hrc:203
+#: extensions/inc/stringarrays.hrc:203
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Left centered"
 msgstr "Canoli i'r chwith"
 
-#: stringarrays.hrc:204
+#: extensions/inc/stringarrays.hrc:204
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Left bottom"
 msgstr "Gwaelod chwith"
 
-#: stringarrays.hrc:205
+#: extensions/inc/stringarrays.hrc:205
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Right top"
 msgstr "Brig de"
 
-#: stringarrays.hrc:206
+#: extensions/inc/stringarrays.hrc:206
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Right centered"
 msgstr "Canoli i'r dde"
 
-#: stringarrays.hrc:207
+#: extensions/inc/stringarrays.hrc:207
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Right bottom"
 msgstr "Gwaelod de"
 
-#: stringarrays.hrc:208
+#: extensions/inc/stringarrays.hrc:208
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Above left"
 msgstr "Uwchlaw chwith"
 
-#: stringarrays.hrc:209
+#: extensions/inc/stringarrays.hrc:209
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Above centered"
 msgstr "Canoli uwchlaw"
 
-#: stringarrays.hrc:210
+#: extensions/inc/stringarrays.hrc:210
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Above right"
 msgstr "Uwchlaw de"
 
-#: stringarrays.hrc:211
+#: extensions/inc/stringarrays.hrc:211
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Below left"
 msgstr "Islaw chwith"
 
-#: stringarrays.hrc:212
+#: extensions/inc/stringarrays.hrc:212
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Below centered"
 msgstr "Canoli islaw"
 
-#: stringarrays.hrc:213
+#: extensions/inc/stringarrays.hrc:213
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Below right"
 msgstr "Islaw de"
 
-#: stringarrays.hrc:214
+#: extensions/inc/stringarrays.hrc:214
 msgctxt "RID_RSC_ENUM_IMAGE_POSITION"
 msgid "Centered"
 msgstr "Canolwyd"
 
-#: stringarrays.hrc:219
+#: extensions/inc/stringarrays.hrc:219
 msgctxt "RID_RSC_ENUM_WHITESPACE_HANDLING"
 msgid "Preserve"
 msgstr "Diogelu"
 
-#: stringarrays.hrc:220
+#: extensions/inc/stringarrays.hrc:220
 msgctxt "RID_RSC_ENUM_WHITESPACE_HANDLING"
 msgid "Replace"
 msgstr "Amnewid"
 
-#: stringarrays.hrc:221
+#: extensions/inc/stringarrays.hrc:221
 msgctxt "RID_RSC_ENUM_WHITESPACE_HANDLING"
 msgid "Collapse"
 msgstr "Cwympo"
 
-#: stringarrays.hrc:226
+#: extensions/inc/stringarrays.hrc:226
 msgctxt "RID_RSC_ENUM_SCALE_MODE"
 msgid "No"
 msgstr "Na"
 
-#: stringarrays.hrc:227
+#: extensions/inc/stringarrays.hrc:227
 msgctxt "RID_RSC_ENUM_SCALE_MODE"
 msgid "Keep Ratio"
 msgstr "Cadw Cymhareb"
 
-#: stringarrays.hrc:228
+#: extensions/inc/stringarrays.hrc:228
 msgctxt "RID_RSC_ENUM_SCALE_MODE"
 msgid "Fit to Size"
 msgstr "Ffitio i'r Maint"
 
-#: stringarrays.hrc:233
+#: extensions/inc/stringarrays.hrc:233
 msgctxt "RID_RSC_ENUM_WRITING_MODE"
 msgid "Left-to-right"
 msgstr "Chwith i dde"
 
-#: stringarrays.hrc:234
+#: extensions/inc/stringarrays.hrc:234
 msgctxt "RID_RSC_ENUM_WRITING_MODE"
 msgid "Right-to-left"
 msgstr "De i chwith"
 
-#: stringarrays.hrc:235
+#: extensions/inc/stringarrays.hrc:235
 msgctxt "RID_RSC_ENUM_WRITING_MODE"
 msgid "Use superordinate object settings"
 msgstr "Defnyddio gosodiadau gwrthrych uwcholyn"
 
-#: stringarrays.hrc:240
+#: extensions/inc/stringarrays.hrc:240
 msgctxt "RID_RSC_ENUM_WHEEL_BEHAVIOR"
 msgid "Never"
 msgstr "Byth"
 
-#: stringarrays.hrc:241
+#: extensions/inc/stringarrays.hrc:241
 msgctxt "RID_RSC_ENUM_WHEEL_BEHAVIOR"
 msgid "When focused"
 msgstr "Wedi ffocysu"
 
-#: stringarrays.hrc:242
+#: extensions/inc/stringarrays.hrc:242
 msgctxt "RID_RSC_ENUM_WHEEL_BEHAVIOR"
 msgid "Always"
 msgstr "Bob tro"
 
-#: stringarrays.hrc:247
+#: extensions/inc/stringarrays.hrc:247
 msgctxt "RID_RSC_ENUM_TEXT_ANCHOR_TYPE"
 msgid "To Paragraph"
 msgstr "I Baragraff"
 
-#: stringarrays.hrc:248
+#: extensions/inc/stringarrays.hrc:248
 msgctxt "RID_RSC_ENUM_TEXT_ANCHOR_TYPE"
 msgid "As Character"
 msgstr "Fel Nod"
 
-#: stringarrays.hrc:249
+#: extensions/inc/stringarrays.hrc:249
 msgctxt "RID_RSC_ENUM_TEXT_ANCHOR_TYPE"
 msgid "To Page"
 msgstr "I Dudalen"
 
-#: stringarrays.hrc:250
+#: extensions/inc/stringarrays.hrc:250
 msgctxt "RID_RSC_ENUM_TEXT_ANCHOR_TYPE"
 msgid "To Frame"
 msgstr "I Ffrâm"
 
-#: stringarrays.hrc:251
+#: extensions/inc/stringarrays.hrc:251
 msgctxt "RID_RSC_ENUM_TEXT_ANCHOR_TYPE"
 msgid "To Character"
 msgstr "I Nod"
 
-#: stringarrays.hrc:256
+#: extensions/inc/stringarrays.hrc:256
 msgctxt "RID_RSC_ENUM_SHEET_ANCHOR_TYPE"
 msgid "To Page"
 msgstr "I Dudalen"
 
-#: stringarrays.hrc:257
+#: extensions/inc/stringarrays.hrc:257
 msgctxt "RID_RSC_ENUM_SHEET_ANCHOR_TYPE"
 msgid "To Cell"
 msgstr "I Gell"
 
-#: strings.hrc:25
+#: extensions/inc/strings.hrc:25
 msgctxt "RID_STR_EDITMASK"
 msgid "Edit mask"
 msgstr "Golygu masg"
 
-#: strings.hrc:26
+#: extensions/inc/strings.hrc:26
 msgctxt "RID_STR_LITERALMASK"
 msgid "Literal mask"
 msgstr "Masg llythrennydd"
 
-#: strings.hrc:27
+#: extensions/inc/strings.hrc:27
 msgctxt "RID_STR_READONLY"
 msgid "Read-only"
 msgstr "Darllen yn unig"
 
-#: strings.hrc:28
+#: extensions/inc/strings.hrc:28
 msgctxt "RID_STR_ENABLED"
 msgid "Enabled"
 msgstr "Galluogwyd"
 
-#: strings.hrc:29
+#: extensions/inc/strings.hrc:29
 msgctxt "RID_STR_ENABLE_VISIBLE"
 msgid "Visible"
 msgstr "Gweladwy"
 
-#: strings.hrc:30
+#: extensions/inc/strings.hrc:30
 msgctxt "RID_STR_AUTOCOMPLETE"
 msgid "AutoFill"
 msgstr "AwtoLanw"
 
-#: strings.hrc:31
+#: extensions/inc/strings.hrc:31
 msgctxt "RID_STR_LINECOUNT"
 msgid "Line count"
 msgstr "Cyfrif llinell"
 
-#: strings.hrc:32
+#: extensions/inc/strings.hrc:32
 msgctxt "RID_STR_MAXTEXTLEN"
 msgid "Max. text length"
 msgstr "Hyd eithaf testun"
 
-#: strings.hrc:33
+#: extensions/inc/strings.hrc:33
 msgctxt "RID_STR_SPIN"
 msgid "Spin Button"
 msgstr "Botwm Troilli"
 
-#: strings.hrc:34
+#: extensions/inc/strings.hrc:34
 msgctxt "RID_STR_STRICTFORMAT"
 msgid "Strict format"
 msgstr "Fformat caeth"
 
-#: strings.hrc:35
+#: extensions/inc/strings.hrc:35
 msgctxt "RID_STR_SHOWTHOUSANDSEP"
 msgid "Thousands separator"
 msgstr "Ymwahanydd miloedd"
 
-#: strings.hrc:36
+#: extensions/inc/strings.hrc:36
 msgctxt "RID_STR_PRINTABLE"
 msgid "Printable"
 msgstr "Argraffu"
 
-#: strings.hrc:37
+#: extensions/inc/strings.hrc:37
 msgctxt "RID_STR_TARGET_URL"
 msgid "URL"
 msgstr "URL"
 
-#: strings.hrc:38
+#: extensions/inc/strings.hrc:38
 msgctxt "RID_STR_TARGET_FRAME"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: strings.hrc:39
+#: extensions/inc/strings.hrc:39
 msgctxt "RID_STR_HELPTEXT"
 msgid "Help text"
 msgstr "Testun cymorth"
 
-#: strings.hrc:40
+#: extensions/inc/strings.hrc:40
 msgctxt "RID_STR_HELPURL"
 msgid "Help URL"
 msgstr "URL cymorth"
 
-#: strings.hrc:41
+#: extensions/inc/strings.hrc:41
 msgctxt "RID_STR_TAG"
 msgid "Additional information"
 msgstr "Gwybodaeth bellach"
 
-#: strings.hrc:42
+#: extensions/inc/strings.hrc:42
 msgctxt "RID_STR_ECHO_CHAR"
 msgid "Password character"
 msgstr "Cyfrinair"
 
-#: strings.hrc:43
+#: extensions/inc/strings.hrc:43
 msgctxt "RID_STR_TRISTATE"
 msgid "Tristate"
 msgstr "Trichyflwr"
 
-#: strings.hrc:44
+#: extensions/inc/strings.hrc:44
 msgctxt "RID_STR_EMPTY_IS_NULL"
 msgid "Empty string is NULL"
 msgstr "Llinell wag yn NULL"
 
-#: strings.hrc:45
+#: extensions/inc/strings.hrc:45
 msgctxt "RID_STR_DECIMAL_ACCURACY"
 msgid "Decimal accuracy"
 msgstr "Cywirdeb degol"
 
-#: strings.hrc:46
+#: extensions/inc/strings.hrc:46
 msgctxt "RID_STR_IMAGE_URL"
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: strings.hrc:47
+#: extensions/inc/strings.hrc:47
 msgctxt "RID_STR_DEFAULT_SELECT_SEQ"
 msgid "Default selection"
 msgstr "Dewis rhagosodedig"
 
-#: strings.hrc:48
+#: extensions/inc/strings.hrc:48
 msgctxt "RID_STR_DEFAULT_BUTTON"
 msgid "Default button"
 msgstr "Botwm rhagosodedig"
 
-#: strings.hrc:49
+#: extensions/inc/strings.hrc:49
 msgctxt "RID_STR_LABELCONTROL"
 msgid "Label Field"
 msgstr "Maes Label"
 
-#: strings.hrc:50
+#: extensions/inc/strings.hrc:50
 msgctxt "RID_STR_LABEL"
 msgid "Label"
 msgstr "Label"
 
-#: strings.hrc:51
+#: extensions/inc/strings.hrc:51
 msgctxt "RID_STR_ALIGN"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: strings.hrc:52
+#: extensions/inc/strings.hrc:52
 msgctxt "RID_STR_VERTICAL_ALIGN"
 msgid "Vert. Alignment"
 msgstr "Aliniad Fertigol"
 
-#: strings.hrc:53
+#: extensions/inc/strings.hrc:53
 msgctxt "RID_STR_IMAGEPOSITION"
 msgid "Graphics alignment"
 msgstr "Aliniad graffigau"
 
-#: strings.hrc:54
+#: extensions/inc/strings.hrc:54
 msgctxt "RID_STR_FONT"
 msgid "Font"
 msgstr "Ffont"
 
-#: strings.hrc:55
+#: extensions/inc/strings.hrc:55
 msgctxt "RID_STR_BACKGROUNDCOLOR"
 msgid "Background color"
 msgstr "Lliw cefndir"
 
-#: strings.hrc:56
+#: extensions/inc/strings.hrc:56
 msgctxt "RID_STR_BORDER"
 msgid "Border"
 msgstr "Border"
 
-#: strings.hrc:57
+#: extensions/inc/strings.hrc:57
 msgctxt "RID_STR_ICONSIZE"
 msgid "Icon size"
 msgstr "Eicon maint"
 
-#: strings.hrc:58
+#: extensions/inc/strings.hrc:58
 msgctxt "RID_STR_SHOW_POSITION"
 msgid "Positioning"
 msgstr "Lleoli"
 
-#: strings.hrc:59
+#: extensions/inc/strings.hrc:59
 msgctxt "RID_STR_SHOW_NAVIGATION"
 msgid "Navigation"
 msgstr "Dewis"
 
-#: strings.hrc:60
+#: extensions/inc/strings.hrc:60
 msgctxt "RID_STR_SHOW_RECORDACTIONS"
 msgid "Acting on a record"
 msgstr "Gweithredu ar gofnod"
 
-#: strings.hrc:61
+#: extensions/inc/strings.hrc:61
 msgctxt "RID_STR_SHOW_FILTERSORT"
 msgid "Filtering / Sorting"
 msgstr "Hidlo / Trefnu"
 
-#: strings.hrc:62
+#: extensions/inc/strings.hrc:62
 msgctxt "RID_STR_HSCROLL"
 msgid "Horizontal scroll bar"
 msgstr "Bar sgrolio llorweddol"
 
-#: strings.hrc:63
+#: extensions/inc/strings.hrc:63
 msgctxt "RID_STR_VSCROLL"
 msgid "Vertical scroll bar"
 msgstr "Bar sgrolio fertigol"
 
-#: strings.hrc:64
+#: extensions/inc/strings.hrc:64
 msgctxt "RID_STR_WORDBREAK"
 msgid "Word break"
 msgstr "Toriad gair"
 
-#: strings.hrc:65
+#: extensions/inc/strings.hrc:65
 msgctxt "RID_STR_MULTILINE"
 msgid "Multiline input"
 msgstr "Mewnbwn aml-linell"
 
-#: strings.hrc:66
+#: extensions/inc/strings.hrc:66
 msgctxt "RID_STR_MULTISELECTION"
 msgid "Multiselection"
 msgstr "Amladran"
 
-#: strings.hrc:67
+#: extensions/inc/strings.hrc:67
 msgctxt "RID_STR_NAME"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:68
+#: extensions/inc/strings.hrc:68
 msgctxt "RID_STR_GROUP_NAME"
 msgid "Group name"
 msgstr "Enw'r grŵp"
 
-#: strings.hrc:69
+#: extensions/inc/strings.hrc:69
 msgctxt "RID_STR_TABINDEX"
 msgid "Tab order"
 msgstr "Trefn tabiau"
 
-#: strings.hrc:70
+#: extensions/inc/strings.hrc:70
 msgctxt "RID_STR_WHEEL_BEHAVIOR"
 msgid "Mouse wheel scroll"
 msgstr "Olwyn llygoden yn sgrolio"
 
-#: strings.hrc:71
+#: extensions/inc/strings.hrc:71
 msgctxt "RID_STR_FILTER"
 msgid "Filter"
 msgstr "Hidl"
 
-#: strings.hrc:72
+#: extensions/inc/strings.hrc:72
 msgctxt "RID_STR_SORT_CRITERIA"
 msgid "Sort"
 msgstr "Trefnu"
 
-#: strings.hrc:73
+#: extensions/inc/strings.hrc:73
 msgctxt "RID_STR_RECORDMARKER"
 msgid "Record marker"
 msgstr "Marciwr cofnod"
 
-#: strings.hrc:74
+#: extensions/inc/strings.hrc:74
 msgctxt "RID_STR_FILTERPROPOSAL"
 msgid "Filter proposal"
 msgstr "Cynnig hidlo"
 
-#: strings.hrc:75
+#: extensions/inc/strings.hrc:75
 msgctxt "RID_STR_NAVIGATION"
 msgid "Navigation bar"
 msgstr "Bar llywio"
 
-#: strings.hrc:76
+#: extensions/inc/strings.hrc:76
 msgctxt "RID_STR_CYCLE"
 msgid "Cycle"
 msgstr "Cylchdroi"
 
-#: strings.hrc:77
+#: extensions/inc/strings.hrc:77
 msgctxt "RID_STR_TABSTOP"
 msgid "Tabstop"
 msgstr "Tabstop"
 
-#: strings.hrc:78
+#: extensions/inc/strings.hrc:78
 msgctxt "RID_STR_CONTROLSOURCE"
 msgid "Data field"
 msgstr "Maes data"
 
-#: strings.hrc:79
+#: extensions/inc/strings.hrc:79
 msgctxt "RID_STR_DROPDOWN"
 msgid "Dropdown"
 msgstr "Cwymplen"
 
-#: strings.hrc:80
+#: extensions/inc/strings.hrc:80
 msgctxt "RID_STR_BOUNDCOLUMN"
 msgid "Bound field"
 msgstr "Maes rhwymedig"
 
-#: strings.hrc:81
+#: extensions/inc/strings.hrc:81
 msgctxt "RID_STR_LISTSOURCE"
 msgid "List content"
 msgstr "Rhestr cynnwys"
 
-#: strings.hrc:82
+#: extensions/inc/strings.hrc:82
 msgctxt "RID_STR_LISTSOURCETYPE"
 msgid "Type of list contents"
 msgstr "Math o gynnwys rhestr"
 
-#: strings.hrc:83
+#: extensions/inc/strings.hrc:83
 msgctxt "RID_STR_CURSORSOURCE"
 msgid "Content"
 msgstr "Cynnwys"
 
-#: strings.hrc:84
+#: extensions/inc/strings.hrc:84
 msgctxt "RID_STR_CURSORSOURCETYPE"
 msgid "Content type"
 msgstr "Math o gynnwys"
 
-#: strings.hrc:85
+#: extensions/inc/strings.hrc:85
 msgctxt "RID_STR_ALLOW_ADDITIONS"
 msgid "Allow additions"
 msgstr "Caniatáu ychwanegiadau"
 
-#: strings.hrc:86
+#: extensions/inc/strings.hrc:86
 msgctxt "RID_STR_ALLOW_DELETIONS"
 msgid "Allow deletions"
 msgstr "Caniatáu dileu"
 
-#: strings.hrc:87
+#: extensions/inc/strings.hrc:87
 msgctxt "RID_STR_ALLOW_EDITS"
 msgid "Allow modifications"
 msgstr "Caniatáu newidiadau"
 
-#: strings.hrc:88
+#: extensions/inc/strings.hrc:88
 msgctxt "RID_STR_DATAENTRY"
 msgid "Add data only"
 msgstr "Ychwanegu data'n unig"
 
-#: strings.hrc:89
+#: extensions/inc/strings.hrc:89
 msgctxt "RID_STR_DATASOURCE"
 msgid "Data source"
 msgstr "Ffynhonnell data"
 
-#: strings.hrc:90
+#: extensions/inc/strings.hrc:90
 msgctxt "RID_STR_MASTERFIELDS"
 msgid "Link master fields"
 msgstr "Cysylltu prif feysydd"
 
-#: strings.hrc:91
+#: extensions/inc/strings.hrc:91
 msgctxt "RID_STR_SLAVEFIELDS"
 msgid "Link slave fields"
 msgstr "Cysylltu meysydd gwas"
 
-#: strings.hrc:92
+#: extensions/inc/strings.hrc:92
 msgctxt "RID_STR_VALUEMIN"
 msgid "Value min."
 msgstr "Gwerth lleiaf."
 
-#: strings.hrc:93
+#: extensions/inc/strings.hrc:93
 msgctxt "RID_STR_VALUEMAX"
 msgid "Value max."
 msgstr "Gwerth mwyaf."
 
-#: strings.hrc:94
+#: extensions/inc/strings.hrc:94
 msgctxt "RID_STR_VALUESTEP"
 msgid "Incr./decrement value"
 msgstr "Gwerth cynyddol/gostyngol"
 
-#: strings.hrc:95
+#: extensions/inc/strings.hrc:95
 msgctxt "RID_STR_CURRENCYSYMBOL"
 msgid "Currency symbol"
 msgstr "Symbol arian"
 
-#: strings.hrc:96
+#: extensions/inc/strings.hrc:96
 msgctxt "RID_STR_DATEMIN"
 msgid "Date min."
 msgstr "Dyddiad lleiaf."
 
-#: strings.hrc:97
+#: extensions/inc/strings.hrc:97
 msgctxt "RID_STR_DATEMAX"
 msgid "Date max."
 msgstr "Dyddiad mwyaf."
 
-#: strings.hrc:98
+#: extensions/inc/strings.hrc:98
 msgctxt "RID_STR_DATEFORMAT"
 msgid "Date format"
 msgstr "Fformat dyddiad"
 
-#: strings.hrc:99
+#: extensions/inc/strings.hrc:99
 msgctxt "RID_STR_SELECTEDITEMS"
 msgid "Selection"
 msgstr "Dewis"
 
-#: strings.hrc:100
+#: extensions/inc/strings.hrc:100
 msgctxt "RID_STR_TIMEMIN"
 msgid "Time min."
 msgstr "Lleiafswm amser."
 
-#: strings.hrc:101
+#: extensions/inc/strings.hrc:101
 msgctxt "RID_STR_TIMEMAX"
 msgid "Time max."
 msgstr "Uchafswm amser."
 
-#: strings.hrc:102
+#: extensions/inc/strings.hrc:102
 msgctxt "RID_STR_TIMEFORMAT"
 msgid "Time format"
 msgstr "Fformat amser"
 
-#: strings.hrc:103
+#: extensions/inc/strings.hrc:103
 msgctxt "RID_STR_CURRSYM_POSITION"
 msgid "Prefix symbol"
 msgstr "Symbol rhagddodiad"
 
-#: strings.hrc:104
+#: extensions/inc/strings.hrc:104
 msgctxt "RID_STR_VALUE"
 msgid "Value"
 msgstr "Gwerth"
 
-#: strings.hrc:105
+#: extensions/inc/strings.hrc:105
 msgctxt "RID_STR_FORMATKEY"
 msgid "Formatting"
 msgstr "Fformatio"
 
-#: strings.hrc:106
+#: extensions/inc/strings.hrc:106
 msgctxt "RID_STR_CLASSID"
 msgid "Class ID"
 msgstr "Enw dosbarth"
 
-#: strings.hrc:107
+#: extensions/inc/strings.hrc:107
 msgctxt "RID_STR_HEIGHT"
 msgid "Height"
 msgstr "Uchder"
 
-#: strings.hrc:108
+#: extensions/inc/strings.hrc:108
 msgctxt "RID_STR_WIDTH"
 msgid "Width"
 msgstr "Lled"
 
-#: strings.hrc:109
+#: extensions/inc/strings.hrc:109
 msgctxt "RID_STR_LISTINDEX"
 msgid "List index"
 msgstr "Mynegai rhestr"
 
-#: strings.hrc:110
+#: extensions/inc/strings.hrc:110
 msgctxt "RID_STR_ROWHEIGHT"
 msgid "Row height"
 msgstr "Uchder rhes"
 
-#: strings.hrc:111
+#: extensions/inc/strings.hrc:111
 msgctxt "RID_STR_FILLCOLOR"
 msgid "Fill color"
 msgstr "Lliw llanw"
 
-#: strings.hrc:112
+#: extensions/inc/strings.hrc:112
 msgctxt "RID_STR_LINECOLOR"
 msgid "Line color"
 msgstr "Lliw llinell"
 
-#: strings.hrc:113
+#: extensions/inc/strings.hrc:113
 msgctxt "RID_STR_REFVALUE"
 msgid "Reference value (on)"
 msgstr "Gwerth cyfeirio (ymlaen)"
 
-#: strings.hrc:114
+#: extensions/inc/strings.hrc:114
 msgctxt "RID_STR_UNCHECKEDREFVALUE"
 msgid "Reference value (off)"
 msgstr "Gwerth cyfeirio (diffodd)"
 
-#: strings.hrc:115
+#: extensions/inc/strings.hrc:115
 msgctxt "RID_STR_STRINGITEMLIST"
 msgid "List entries"
 msgstr "Rhestru cofnodion"
 
-#: strings.hrc:116
+#: extensions/inc/strings.hrc:116
 msgctxt "RID_STR_BUTTONTYPE"
 msgid "Action"
 msgstr "Gweithred"
 
-#: strings.hrc:117
+#: extensions/inc/strings.hrc:117
 msgctxt "RID_STR_SUBMIT_ACTION"
 msgid "URL"
 msgstr "URL"
 
-#: strings.hrc:118
+#: extensions/inc/strings.hrc:118
 msgctxt "RID_STR_SUBMIT_METHOD"
 msgid "Type of submission"
 msgstr "Math o gyflwyniad"
 
-#: strings.hrc:119
+#: extensions/inc/strings.hrc:119
 msgctxt "RID_STR_DEFAULT_STATE"
 msgid "Default status"
 msgstr "Statws rhagosodedig"
 
-#: strings.hrc:120
+#: extensions/inc/strings.hrc:120
 msgctxt "RID_STR_SUBMIT_ENCODING"
 msgid "Submission encoding"
 msgstr "Amgodio cyflwyniad"
 
-#: strings.hrc:121
+#: extensions/inc/strings.hrc:121
 msgctxt "RID_STR_DEFAULTVALUE"
 msgid "Default value"
 msgstr "Gwerth rhagosodedig"
 
-#: strings.hrc:122
+#: extensions/inc/strings.hrc:122
 msgctxt "RID_STR_DEFAULTTEXT"
 msgid "Default text"
 msgstr "Rhagosodedig testun"
 
-#: strings.hrc:123
+#: extensions/inc/strings.hrc:123
 msgctxt "RID_STR_DEFAULTDATE"
 msgid "Default date"
 msgstr "Rhagosodedig"
 
-#: strings.hrc:124
+#: extensions/inc/strings.hrc:124
 msgctxt "RID_STR_DEFAULTTIME"
 msgid "Default time"
 msgstr "Rhagosodedig"
 
-#: strings.hrc:125
+#: extensions/inc/strings.hrc:125
 msgctxt "RID_STR_SUBMIT_TARGET"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: strings.hrc:126
+#: extensions/inc/strings.hrc:126
 msgctxt "RID_STR_EVT_APPROVEPARAMETER"
 msgid "Fill parameters"
 msgstr "Paramedrau llanw"
 
-#: strings.hrc:127
+#: extensions/inc/strings.hrc:127
 msgctxt "RID_STR_EVT_ACTIONPERFORMED"
 msgid "Execute action"
 msgstr "Wrth gychwyn"
 
-#: strings.hrc:128
+#: extensions/inc/strings.hrc:128
 msgctxt "RID_STR_EVT_AFTERUPDATE"
 msgid "After updating"
 msgstr "Wedi diweddaru"
 
-#: strings.hrc:129
+#: extensions/inc/strings.hrc:129
 msgctxt "RID_STR_EVT_BEFOREUPDATE"
 msgid "Before updating"
 msgstr "Cyn diweddaru"
 
-#: strings.hrc:130
+#: extensions/inc/strings.hrc:130
 msgctxt "RID_STR_EVT_APPROVEROWCHANGE"
 msgid "Before record action"
 msgstr "Cyn gweithred cofnodi"
 
-#: strings.hrc:131
+#: extensions/inc/strings.hrc:131
 msgctxt "RID_STR_EVT_ROWCHANGE"
 msgid "After record action"
 msgstr "Wedi'r weithred gofnodi"
 
-#: strings.hrc:132
+#: extensions/inc/strings.hrc:132
 msgctxt "RID_STR_EVT_CONFIRMDELETE"
 msgid "Confirm deletion"
 msgstr "Cadarnhau dileu"
 
-#: strings.hrc:133
+#: extensions/inc/strings.hrc:133
 msgctxt "RID_STR_EVT_ERROROCCURRED"
 msgid "Error occurred"
 msgstr "Digwyddodd gwall"
 
-#: strings.hrc:134
+#: extensions/inc/strings.hrc:134
 msgctxt "RID_STR_EVT_FOCUSGAINED"
 msgid "When receiving focus"
 msgstr "Wrth dderbyn canolbwynt"
 
-#: strings.hrc:135
+#: extensions/inc/strings.hrc:135
 msgctxt "RID_STR_EVT_FOCUSLOST"
 msgid "When losing focus"
 msgstr "Wrth golli canolbwynt"
 
-#: strings.hrc:136
+#: extensions/inc/strings.hrc:136
 msgctxt "RID_STR_EVT_ITEMSTATECHANGED"
 msgid "Item status changed"
 msgstr "Newidiwyd statws eitem"
 
-#: strings.hrc:137
+#: extensions/inc/strings.hrc:137
 msgctxt "RID_STR_EVT_KEYTYPED"
 msgid "Key pressed"
 msgstr "Bysellau pwyswyd"
 
-#: strings.hrc:138
+#: extensions/inc/strings.hrc:138
 msgctxt "RID_STR_EVT_KEYUP"
 msgid "Key released"
 msgstr "Bysellau ryddhawyd"
 
-#: strings.hrc:139
+#: extensions/inc/strings.hrc:139
 msgctxt "RID_STR_EVT_LOADED"
 msgid "When loading"
 msgstr "Wrth lwytho"
 
-#: strings.hrc:140
+#: extensions/inc/strings.hrc:140
 msgctxt "RID_STR_EVT_RELOADING"
 msgid "Before reloading"
 msgstr "Cyn ail-lwytho"
 
-#: strings.hrc:141
+#: extensions/inc/strings.hrc:141
 msgctxt "RID_STR_EVT_RELOADED"
 msgid "When reloading"
 msgstr "Wrth ail-lwytho"
 
-#: strings.hrc:142
+#: extensions/inc/strings.hrc:142
 msgctxt "RID_STR_EVT_MOUSEDRAGGED"
 msgid "Mouse moved while key pressed"
 msgstr "Symud llygoden wrth bwyso bysell"
 
-#: strings.hrc:143
+#: extensions/inc/strings.hrc:143
 msgctxt "RID_STR_EVT_MOUSEENTERED"
 msgid "Mouse inside"
 msgstr "Llygoden o fewn"
 
-#: strings.hrc:144
+#: extensions/inc/strings.hrc:144
 msgctxt "RID_STR_EVT_MOUSEEXITED"
 msgid "Mouse outside"
 msgstr "Llygoden tu allan"
 
-#: strings.hrc:145
+#: extensions/inc/strings.hrc:145
 msgctxt "RID_STR_EVT_MOUSEMOVED"
 msgid "Mouse moved"
 msgstr "Symud llygoden"
 
-#: strings.hrc:146
+#: extensions/inc/strings.hrc:146
 msgctxt "RID_STR_EVT_MOUSEPRESSED"
 msgid "Mouse button pressed"
 msgstr "Pwyso botwm llygoden"
 
-#: strings.hrc:147
+#: extensions/inc/strings.hrc:147
 msgctxt "RID_STR_EVT_MOUSERELEASED"
 msgid "Mouse button released"
 msgstr "Rhyddhau botwm llygoden"
 
-#: strings.hrc:148
+#: extensions/inc/strings.hrc:148
 msgctxt "RID_STR_EVT_POSITIONING"
 msgid "Before record change"
 msgstr "Cyn newid cofnod"
 
-#: strings.hrc:149
+#: extensions/inc/strings.hrc:149
 msgctxt "RID_STR_EVT_POSITIONED"
 msgid "After record change"
 msgstr "Wedi newid cofnod"
 
-#: strings.hrc:150
+#: extensions/inc/strings.hrc:150
 msgctxt "RID_STR_EVT_RESETTED"
 msgid "After resetting"
 msgstr "Wedi ailosod"
 
-#: strings.hrc:151
+#: extensions/inc/strings.hrc:151
 msgctxt "RID_STR_EVT_APPROVERESETTED"
 msgid "Prior to reset"
 msgstr "Cyn ailosod"
 
-#: strings.hrc:152
+#: extensions/inc/strings.hrc:152
 msgctxt "RID_STR_EVT_APPROVEACTIONPERFORMED"
 msgid "Approve action"
 msgstr "Cyn cychwyn"
 
-#: strings.hrc:153
+#: extensions/inc/strings.hrc:153
 msgctxt "RID_STR_EVT_SUBMITTED"
 msgid "Before submitting"
 msgstr "Cyn cyflwyno"
 
-#: strings.hrc:154
+#: extensions/inc/strings.hrc:154
 msgctxt "RID_STR_EVT_TEXTCHANGED"
 msgid "Text modified"
 msgstr "Newid testun"
 
-#: strings.hrc:155
+#: extensions/inc/strings.hrc:155
 msgctxt "RID_STR_EVT_UNLOADING"
 msgid "Before unloading"
 msgstr "Cyn dadlwytho"
 
-#: strings.hrc:156
+#: extensions/inc/strings.hrc:156
 msgctxt "RID_STR_EVT_UNLOADED"
 msgid "When unloading"
 msgstr "Wrth ddadlwytho"
 
-#: strings.hrc:157
+#: extensions/inc/strings.hrc:157
 msgctxt "RID_STR_EVT_CHANGED"
 msgid "Changed"
 msgstr "Wedi newid"
 
-#: strings.hrc:158
+#: extensions/inc/strings.hrc:158
 msgctxt "RID_STR_EVENTS"
 msgid "Events"
 msgstr "Digwyddiadau"
 
-#: strings.hrc:159
+#: extensions/inc/strings.hrc:159
 msgctxt "RID_STR_ESCAPE_PROCESSING"
 msgid "Analyze SQL command"
 msgstr "Dadansoddi gorchymyn SQL"
 
-#: strings.hrc:160
+#: extensions/inc/strings.hrc:160
 msgctxt "RID_STR_POSITIONX"
 msgid "PositionX"
 msgstr "SafleX"
 
-#: strings.hrc:161
+#: extensions/inc/strings.hrc:161
 msgctxt "RID_STR_POSITIONY"
 msgid "PositionY"
 msgstr "SafleY"
 
-#: strings.hrc:162
+#: extensions/inc/strings.hrc:162
 msgctxt "RID_STR_TITLE"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:163
+#: extensions/inc/strings.hrc:163
 msgctxt "RID_STR_STEP"
 msgid "Page (step)"
 msgstr "Tudalen(cam)"
 
-#: strings.hrc:164
+#: extensions/inc/strings.hrc:164
 msgctxt "RID_STR_PROGRESSVALUE"
 msgid "Progress value"
 msgstr "Gwerth cynnydd"
 
-#: strings.hrc:165
+#: extensions/inc/strings.hrc:165
 msgctxt "RID_STR_PROGRESSVALUE_MIN"
 msgid "Progress value min."
 msgstr "Lleiafswm gwerth cynnydd."
 
-#: strings.hrc:166
+#: extensions/inc/strings.hrc:166
 msgctxt "RID_STR_PROGRESSVALUE_MAX"
 msgid "Progress value max."
 msgstr "Uchafswm gwerth cynnydd."
 
-#: strings.hrc:167
+#: extensions/inc/strings.hrc:167
 msgctxt "RID_STR_SCROLLVALUE"
 msgid "Scroll value"
 msgstr "Gwerth sgrolio"
 
-#: strings.hrc:168
+#: extensions/inc/strings.hrc:168
 msgctxt "RID_STR_SCROLLVALUE_MAX"
 msgid "Scroll value max."
 msgstr "Uchafswm gwerth sgrolio."
 
-#: strings.hrc:169
+#: extensions/inc/strings.hrc:169
 msgctxt "RID_STR_SCROLLVALUE_MIN"
 msgid "Scroll value min."
 msgstr "Lleiafswm gwerth cynnydd."
 
-#: strings.hrc:170
+#: extensions/inc/strings.hrc:170
 msgctxt "RID_STR_SCROLL_WIDTH"
 msgid "Scroll width"
 msgstr "Lled sgrolio"
 
-#: strings.hrc:171
+#: extensions/inc/strings.hrc:171
 msgctxt "RID_STR_SCROLL_HEIGHT"
 msgid "Scroll height"
 msgstr "Uchder sgrolio"
 
-#: strings.hrc:172
+#: extensions/inc/strings.hrc:172
 msgctxt "RID_STR_SCROLL_TOP"
 msgid "Scroll top"
 msgstr "Sgrolio'r brig"
 
-#: strings.hrc:173
+#: extensions/inc/strings.hrc:173
 msgctxt "RID_STR_SCROLL_LEFT"
 msgid "Scroll left"
 msgstr "Sgrolio chwith"
 
-#: strings.hrc:174
+#: extensions/inc/strings.hrc:174
 msgctxt "RID_STR_DEFAULT_SCROLLVALUE"
 msgid "Default scroll value"
 msgstr "Rhagosodedig gwerth"
 
-#: strings.hrc:175
+#: extensions/inc/strings.hrc:175
 msgctxt "RID_STR_LINEINCREMENT"
 msgid "Small change"
 msgstr "Newid bach"
 
-#: strings.hrc:176
+#: extensions/inc/strings.hrc:176
 msgctxt "RID_STR_BLOCKINCREMENT"
 msgid "Large change"
 msgstr "Newid mawr"
 
-#: strings.hrc:177
+#: extensions/inc/strings.hrc:177
 msgctxt "RID_STR_REPEAT_DELAY"
 msgid "Delay"
 msgstr "Oediad"
 
-#: strings.hrc:178
+#: extensions/inc/strings.hrc:178
 msgctxt "RID_STR_REPEAT"
 msgid "Repeat"
 msgstr "Ailadrodd"
 
-#: strings.hrc:179
+#: extensions/inc/strings.hrc:179
 msgctxt "RID_STR_VISIBLESIZE"
 msgid "Visible size"
 msgstr "Maint gweladwy"
 
-#: strings.hrc:180
+#: extensions/inc/strings.hrc:180
 msgctxt "RID_STR_ORIENTATION"
 msgid "Orientation"
 msgstr "Cyfeiriadedd"
 
-#: strings.hrc:181
+#: extensions/inc/strings.hrc:181
 msgctxt "RID_STR_EVT_ADJUSTMENTVALUECHANGED"
 msgid "While adjusting"
 msgstr "Wrth newid"
 
-#: strings.hrc:182
+#: extensions/inc/strings.hrc:182
 msgctxt "RID_STR_DATE"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: strings.hrc:183
+#: extensions/inc/strings.hrc:183
 msgctxt "RID_STR_STATE"
 msgid "State"
 msgstr "Sir/Talaith"
 
-#: strings.hrc:184
+#: extensions/inc/strings.hrc:184
 msgctxt "RID_STR_TIME"
 msgid "Time"
 msgstr "Amser"
 
-#: strings.hrc:185
+#: extensions/inc/strings.hrc:185
 msgctxt "RID_STR_SCALEIMAGE"
 msgid "Scale"
 msgstr "Graddfa"
 
-#: strings.hrc:186
+#: extensions/inc/strings.hrc:186
 msgctxt "RID_STR_PUSHBUTTONTYPE"
 msgid "Button type"
 msgstr "Math o fotwm"
 
-#: strings.hrc:187
+#: extensions/inc/strings.hrc:187
 msgctxt "RID_STR_UNABLETOCONNECT"
 msgid "The connection to the data source \"$name$\" could not be established."
 msgstr "Methu creu cysylltiad â'r ffynhonnell data \"$name$\"."
 
-#: strings.hrc:188
+#: extensions/inc/strings.hrc:188
 msgctxt "RID_STR_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:189
+#: extensions/inc/strings.hrc:189
 msgctxt "RID_STR_BOUND_CELL"
 msgid "Linked cell"
 msgstr "Cell cysylltiedig"
 
-#: strings.hrc:190
+#: extensions/inc/strings.hrc:190
 msgctxt "RID_STR_LIST_CELL_RANGE"
 msgid "Source cell range"
 msgstr "Ystod cell ffynhonnell"
 
-#: strings.hrc:191
+#: extensions/inc/strings.hrc:191
 msgctxt "RID_STR_CELL_EXCHANGE_TYPE"
 msgid "Contents of the linked cell"
 msgstr "Cynnwys cell cysylltiad"
 
-#: strings.hrc:192
+#: extensions/inc/strings.hrc:192
 msgctxt "RID_STR_SYMBOLCOLOR"
 msgid "Symbol color"
 msgstr "Lliw symbol"
 
-#: strings.hrc:193
+#: extensions/inc/strings.hrc:193
 msgctxt "RID_STR_LINEEND_FORMAT"
 msgid "Text lines end with"
 msgstr "Testun llinellau diwedd gyda"
 
-#: strings.hrc:194
+#: extensions/inc/strings.hrc:194
 msgctxt "RID_STR_TOGGLE"
 msgid "Toggle"
 msgstr "Newid"
 
-#: strings.hrc:195
+#: extensions/inc/strings.hrc:195
 msgctxt "RID_STR_FOCUSONCLICK"
 msgid "Take Focus on Click"
 msgstr "Canolbwyntio wrth Glicio"
 
-#: strings.hrc:196
+#: extensions/inc/strings.hrc:196
 msgctxt "RID_STR_HIDEINACTIVESELECTION"
 msgid "Hide selection"
 msgstr "Cuddio'r dewis"
 
-#: strings.hrc:197
+#: extensions/inc/strings.hrc:197
 msgctxt "RID_STR_VISUALEFFECT"
 msgid "Style"
 msgstr "Arddull"
 
-#: strings.hrc:198
+#: extensions/inc/strings.hrc:198
 msgctxt "RID_STR_AUTOLINEBREAK"
 msgid "Wrap text automatically"
 msgstr "Amlapio testun yn awtomatig"
 
-#: strings.hrc:199
+#: extensions/inc/strings.hrc:199
 msgctxt "RID_STR_TEXTTYPE"
 msgid "Text type"
 msgstr "Math o destun"
 
-#: strings.hrc:200
+#: extensions/inc/strings.hrc:200
 msgctxt "RID_STR_XML_DATA_MODEL"
 msgid "XML data model"
 msgstr "Model data XML"
 
-#: strings.hrc:201
+#: extensions/inc/strings.hrc:201
 msgctxt "RID_STR_BIND_EXPRESSION"
 msgid "Binding expression"
 msgstr "Mynegiant rhwymo"
 
-#: strings.hrc:202
+#: extensions/inc/strings.hrc:202
 msgctxt "RID_STR_XSD_REQUIRED"
 msgid "Required"
 msgstr "Angen"
 
-#: strings.hrc:203
+#: extensions/inc/strings.hrc:203
 msgctxt "RID_STR_LIST_BINDING"
 msgid "List entry source"
 msgstr "Ffynhonnell cofnod rhestr"
 
-#: strings.hrc:204
+#: extensions/inc/strings.hrc:204
 msgctxt "RID_STR_XSD_RELEVANT"
 msgid "Relevant"
 msgstr "Perthnasol"
 
-#: strings.hrc:205
+#: extensions/inc/strings.hrc:205
 msgctxt "RID_STR_XSD_READONLY"
 msgid "Read-only"
 msgstr "Darllen yn unig"
 
-#: strings.hrc:206
+#: extensions/inc/strings.hrc:206
 msgctxt "RID_STR_XSD_CONSTRAINT"
 msgid "Constraint"
 msgstr "Cyfyngiad"
 
-#: strings.hrc:207
+#: extensions/inc/strings.hrc:207
 msgctxt "RID_STR_XSD_CALCULATION"
 msgid "Calculation"
 msgstr "Cyfrifo"
 
-#: strings.hrc:208
+#: extensions/inc/strings.hrc:208
 msgctxt "RID_STR_XSD_DATA_TYPE"
 msgid "Data type"
 msgstr "Math o ddata"
 
-#: strings.hrc:209
+#: extensions/inc/strings.hrc:209
 msgctxt "RID_STR_XSD_WHITESPACES"
 msgid "Whitespaces"
 msgstr "Bylchau gwyn"
 
-#: strings.hrc:210
+#: extensions/inc/strings.hrc:210
 msgctxt "RID_STR_SHOW_SCROLLBARS"
 msgid "Scrollbars"
 msgstr "Bariau sgrolio"
 
-#: strings.hrc:211
+#: extensions/inc/strings.hrc:211
 msgctxt "RID_STR_XSD_PATTERN"
 msgid "Pattern"
 msgstr "Patrwm"
 
-#: strings.hrc:212
+#: extensions/inc/strings.hrc:212
 msgctxt "RID_STR_XSD_LENGTH"
 msgid "Length"
 msgstr "Hyd"
 
-#: strings.hrc:213
+#: extensions/inc/strings.hrc:213
 msgctxt "RID_STR_XSD_MIN_LENGTH"
 msgid "Length (at least)"
 msgstr "Hyd (o leiaf)"
 
-#: strings.hrc:214
+#: extensions/inc/strings.hrc:214
 msgctxt "RID_STR_XSD_MAX_LENGTH"
 msgid "Length (at most)"
 msgstr "Hyd (y mwyaf)"
 
-#: strings.hrc:215
+#: extensions/inc/strings.hrc:215
 msgctxt "RID_STR_XSD_TOTAL_DIGITS"
 msgid "Digits (total)"
 msgstr "Digidau (cyfanswm)"
 
-#: strings.hrc:216
+#: extensions/inc/strings.hrc:216
 msgctxt "RID_STR_XSD_FRACTION_DIGITS"
 msgid "Digits (fraction)"
 msgstr "Digidau (ffractiwn)"
 
-#: strings.hrc:217
+#: extensions/inc/strings.hrc:217
 msgctxt "RID_STR_XSD_MAX_INCLUSIVE"
 msgid "Max. (inclusive)"
 msgstr "Mwyaf (cynwysedig)"
 
-#: strings.hrc:218
+#: extensions/inc/strings.hrc:218
 msgctxt "RID_STR_XSD_MAX_EXCLUSIVE"
 msgid "Max. (exclusive)"
 msgstr "Mwyaf (cyfyngedig)"
 
-#: strings.hrc:219
+#: extensions/inc/strings.hrc:219
 msgctxt "RID_STR_XSD_MIN_INCLUSIVE"
 msgid "Min. (inclusive)"
 msgstr "Lleiaf (cynwysedig)"
 
-#: strings.hrc:220
+#: extensions/inc/strings.hrc:220
 msgctxt "RID_STR_XSD_MIN_EXCLUSIVE"
 msgid "Min. (exclusive)"
 msgstr "Lleiaf (cyfyngedig)"
 
-#: strings.hrc:221
+#: extensions/inc/strings.hrc:221
 msgctxt "RID_STR_SUBMISSION_ID"
 msgid "Submission"
 msgstr "Cyflwyniad"
 
-#: strings.hrc:222
+#: extensions/inc/strings.hrc:222
 msgctxt "RID_STR_BINDING_NAME"
 msgid "Binding"
 msgstr "Rhwymiad"
 
-#: strings.hrc:223
+#: extensions/inc/strings.hrc:223
 msgctxt "RID_STR_SELECTION_TYPE"
 msgid "Selection type"
 msgstr "Math o ddewis"
 
-#: strings.hrc:224
+#: extensions/inc/strings.hrc:224
 msgctxt "RID_STR_ROOT_DISPLAYED"
 msgid "Root displayed"
 msgstr "Dangos root"
 
-#: strings.hrc:225
+#: extensions/inc/strings.hrc:225
 msgctxt "RID_STR_SHOWS_HANDLES"
 msgid "Show handles"
 msgstr "Dangos dolenni"
 
-#: strings.hrc:226
+#: extensions/inc/strings.hrc:226
 msgctxt "RID_STR_SHOWS_ROOT_HANDLES"
 msgid "Show root handles"
 msgstr "Dangos dolenni root"
 
-#: strings.hrc:227
+#: extensions/inc/strings.hrc:227
 msgctxt "RID_STR_EDITABLE"
 msgid "Editable"
 msgstr "Golygadwy"
 
-#: strings.hrc:228
+#: extensions/inc/strings.hrc:228
 msgctxt "RID_STR_INVOKES_STOP_NOT_EDITING"
 msgid "Invokes stop node editing"
 msgstr "Ymgychwyn golygu nod atal"
 
-#: strings.hrc:229
+#: extensions/inc/strings.hrc:229
 msgctxt "RID_STR_DECORATION"
 msgid "With title bar"
 msgstr "Guyda bar teitl"
 
-#: strings.hrc:230
+#: extensions/inc/strings.hrc:230
 msgctxt "RID_STR_NOLABEL"
 msgid "No Label"
 msgstr "Dim Label"
 
-#: strings.hrc:231
+#: extensions/inc/strings.hrc:231
 msgctxt "RID_STR_BORDERCOLOR"
 msgid "Border color"
 msgstr "Lliw border"
 
-#: strings.hrc:232
+#: extensions/inc/strings.hrc:232
 msgctxt "RID_STR_INPUT_REQUIRED"
 msgid "Input required"
 msgstr "Angen mewnbwn"
 
-#: strings.hrc:233
+#: extensions/inc/strings.hrc:233
 msgctxt "RID_STR_WRITING_MODE"
 msgid "Text direction"
 msgstr "Cyfeiriad testun"
 
-#: strings.hrc:234
+#: extensions/inc/strings.hrc:234
 msgctxt "RID_STR_ANCHOR_TYPE"
 msgid "Anchor"
 msgstr "Angor"
 
 #. To translators: That's the 'Regular' as used for a font style (as opposed to 'italic' and 'bold'), so please use a consistent translation.
-#: strings.hrc:236
+#: extensions/inc/strings.hrc:236
 msgctxt "RID_STR_FONTSTYLE_REGULAR"
 msgid "Regular"
 msgstr "Arferol"
 
 #. To translators: That's the 'Bold Italic' as used for a font style, so please use a consistent translation.
-#: strings.hrc:238
+#: extensions/inc/strings.hrc:238
 msgctxt "RID_STR_FONTSTYLE_BOLD_ITALIC"
 msgid "Bold Italic"
 msgstr "Italig Trwm"
 
 #. To translators: That's the 'Italic' as used for a font style, so please use a consistent translation.
-#: strings.hrc:240
+#: extensions/inc/strings.hrc:240
 msgctxt "RID_STR_FONTSTYLE_ITALIC"
 msgid "Italic"
 msgstr "Italig"
 
 #. To translators: That's the 'Bold' as used for a font style, so please use a consistent translation."
-#: strings.hrc:242
+#: extensions/inc/strings.hrc:242
 msgctxt "RID_STR_FONTSTYLE_BOLD"
 msgid "Bold"
 msgstr "Trwm"
 
-#: strings.hrc:243
+#: extensions/inc/strings.hrc:243
 msgctxt "RID_STR_FONT_DEFAULT"
 msgid "(Default)"
 msgstr "(Rhagosodiad)"
 
-#: strings.hrc:245
+#: extensions/inc/strings.hrc:245
 msgctxt "RID_STR_STANDARD"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: strings.hrc:246
+#: extensions/inc/strings.hrc:246
 msgctxt "RID_STR_PROPPAGE_DEFAULT"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: strings.hrc:247
+#: extensions/inc/strings.hrc:247
 msgctxt "RID_STR_PROPPAGE_DATA"
 msgid "Data"
 msgstr "Data"
 
-#: strings.hrc:248
+#: extensions/inc/strings.hrc:248
 msgctxt "RID_STR_HELP_SECTION_LABEL"
 msgid "Help"
 msgstr "Cymorth"
 
-#: strings.hrc:249
+#: extensions/inc/strings.hrc:249
 msgctxt "RID_EMBED_IMAGE_PLACEHOLDER"
 msgid "<Embedded-Image>"
 msgstr "<Embedded-Image>"
 
-#: strings.hrc:250
+#: extensions/inc/strings.hrc:250
 msgctxt "RID_STR_TEXT_FORMAT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:252
+#: extensions/inc/strings.hrc:252
 msgctxt "RID_STR_CONFIRM_DELETE_DATA_TYPE"
 msgid ""
 "Do you want to delete the data type '#type#' from the model?\n"
@@ -1754,143 +1754,143 @@ msgstr ""
 "Hoffech chi ddileu'r math o ddata '#type#' o'r model?\n"
 "Sylwch y bydd hyn yn effeithio ar pob rheolydd sy ynghlwm â'r math yma o ddata."
 
-#: strings.hrc:254
+#: extensions/inc/strings.hrc:254
 msgctxt "RID_STR_PROPTITLE_PUSHBUTTON"
 msgid "Button"
 msgstr "Botwm"
 
-#: strings.hrc:255
+#: extensions/inc/strings.hrc:255
 msgctxt "RID_STR_PROPTITLE_RADIOBUTTON"
 msgid "Option Button"
 msgstr "Botwm Dewis"
 
-#: strings.hrc:256
+#: extensions/inc/strings.hrc:256
 msgctxt "RID_STR_PROPTITLE_CHECKBOX"
 msgid "Check Box"
 msgstr "Blwch Ticio"
 
-#: strings.hrc:257
+#: extensions/inc/strings.hrc:257
 msgctxt "RID_STR_PROPTITLE_FIXEDTEXT"
 msgid "Label Field"
 msgstr "Maes Label"
 
-#: strings.hrc:258
+#: extensions/inc/strings.hrc:258
 msgctxt "RID_STR_PROPTITLE_GROUPBOX"
 msgid "Group Box"
 msgstr "Blwch Grŵp"
 
-#: strings.hrc:259
+#: extensions/inc/strings.hrc:259
 msgctxt "RID_STR_PROPTITLE_EDIT"
 msgid "Text Box"
 msgstr "Blwch Testun"
 
-#: strings.hrc:260
+#: extensions/inc/strings.hrc:260
 msgctxt "RID_STR_PROPTITLE_FORMATTED"
 msgid "Formatted Field"
 msgstr "Maes wedi ei Fformatio"
 
-#: strings.hrc:261
+#: extensions/inc/strings.hrc:261
 msgctxt "RID_STR_PROPTITLE_LISTBOX"
 msgid "List Box"
 msgstr "Blwch Rhestr"
 
-#: strings.hrc:262
+#: extensions/inc/strings.hrc:262
 msgctxt "RID_STR_PROPTITLE_COMBOBOX"
 msgid "Combo Box"
 msgstr "Blwch Cyfun"
 
-#: strings.hrc:263
+#: extensions/inc/strings.hrc:263
 msgctxt "RID_STR_PROPTITLE_IMAGEBUTTON"
 msgid "Image Button"
 msgstr "Botwm Delwedd"
 
-#: strings.hrc:264
+#: extensions/inc/strings.hrc:264
 msgctxt "RID_STR_PROPTITLE_HIDDENCONTROL"
 msgid "Hidden Control"
 msgstr "Rheolaeth Gudd"
 
-#: strings.hrc:265
+#: extensions/inc/strings.hrc:265
 msgctxt "RID_STR_PROPTITLE_UNKNOWNCONTROL"
 msgid "Control (unknown type)"
 msgstr "Rheolydd (math anhysbys)"
 
-#: strings.hrc:266
+#: extensions/inc/strings.hrc:266
 msgctxt "RID_STR_PROPTITLE_IMAGECONTROL"
 msgid "Image Control"
 msgstr "Rheolaeth Delwedd"
 
-#: strings.hrc:267
+#: extensions/inc/strings.hrc:267
 msgctxt "RID_STR_PROPTITLE_FILECONTROL"
 msgid "File Selection"
 msgstr "Dewis Ffeil"
 
-#: strings.hrc:268
+#: extensions/inc/strings.hrc:268
 msgctxt "RID_STR_PROPTITLE_DATEFIELD"
 msgid "Date Field"
 msgstr "Maes Dyddiad"
 
-#: strings.hrc:269
+#: extensions/inc/strings.hrc:269
 msgctxt "RID_STR_PROPTITLE_TIMEFIELD"
 msgid "Time Field"
 msgstr "Maes Amser"
 
-#: strings.hrc:270
+#: extensions/inc/strings.hrc:270
 msgctxt "RID_STR_PROPTITLE_NUMERICFIELD"
 msgid "Numeric Field"
 msgstr "Maes Rhifol"
 
-#: strings.hrc:271
+#: extensions/inc/strings.hrc:271
 msgctxt "RID_STR_PROPTITLE_CURRENCYFIELD"
 msgid "Currency Field"
 msgstr "Maes Arian"
 
-#: strings.hrc:272
+#: extensions/inc/strings.hrc:272
 msgctxt "RID_STR_PROPTITLE_PATTERNFIELD"
 msgid "Pattern Field"
 msgstr "Maes Patrwm"
 
-#: strings.hrc:273
+#: extensions/inc/strings.hrc:273
 msgctxt "RID_STR_PROPTITLE_DBGRID"
 msgid "Table Control "
 msgstr "Rheolaeth Tabl "
 
-#: strings.hrc:275
+#: extensions/inc/strings.hrc:275
 msgctxt "STR_DETAIL_FORM"
 msgid "Sub Form"
 msgstr "Is-ffurflen"
 
-#: strings.hrc:276
+#: extensions/inc/strings.hrc:276
 msgctxt "STR_MASTER_FORM"
 msgid "Master Form"
 msgstr "Prif ffurflen"
 
 #. To translators: # will be replace with a name.
-#: strings.hrc:278
+#: extensions/inc/strings.hrc:278
 msgctxt "STR_ERROR_RETRIEVING_COLUMNS"
 msgid "The columns of '#' could not be retrieved."
 msgstr "Methu estyn colofnau '#'."
 
-#: strings.hrc:280
+#: extensions/inc/strings.hrc:280
 msgctxt "RID_STR_FORMS"
 msgid "Forms"
 msgstr "Ffurflenni"
 
-#: strings.hrc:282
+#: extensions/inc/strings.hrc:282
 msgctxt "RID_UPDATE_STR_CHECKING"
 msgid "Checking..."
 msgstr "Gwirio..."
 
-#: strings.hrc:283
+#: extensions/inc/strings.hrc:283
 msgctxt "RID_UPDATE_STR_CHECKING_ERR"
 msgid "Checking for an update failed."
 msgstr "Gwirio am ddiweddariad a fethwyd."
 
-#: strings.hrc:284
+#: extensions/inc/strings.hrc:284
 msgctxt "RID_UPDATE_STR_NO_UPD_FOUND"
 msgid "%PRODUCTNAME %PRODUCTVERSION is up to date."
 msgstr "Mae %PRODUCTNAME %PRODUCTVERSION yn gyfoes."
 
-#: strings.hrc:285
+#: extensions/inc/strings.hrc:285
 msgctxt "RID_UPDATE_STR_UPD_FOUND"
 msgid ""
 "%PRODUCTNAME %NEXTVERSION is available.\n"
@@ -1907,22 +1907,22 @@ msgstr ""
 "Sylw: Cyn llwytho diweddariad i lawr, gwnewch yn siŵr fod gennych hawliau mynediad digonol i'w osod.\n"
 "Efallai bydd angen cyfrinair, cyfrinair y gweinyddwr neu root."
 
-#: strings.hrc:286
+#: extensions/inc/strings.hrc:286
 msgctxt "RID_UPDATE_STR_DLG_TITLE"
 msgid "Check for Updates"
 msgstr "Gwirio am Ddiweddariadau"
 
-#: strings.hrc:287
+#: extensions/inc/strings.hrc:287
 msgctxt "RID_UPDATE_STR_DOWNLOAD_PAUSE"
 msgid "Downloading %PRODUCTNAME %NEXTVERSION paused at..."
 msgstr "Oedwyd llwytho %PRODUCTNAME %NEXTVERSION i lawr yn..."
 
-#: strings.hrc:288
+#: extensions/inc/strings.hrc:288
 msgctxt "RID_UPDATE_STR_DOWNLOAD_ERR"
 msgid "Downloading %PRODUCTNAME %NEXTVERSION stalled at"
 msgstr "Ataliwyd llwytho %PRODUCTNAME %NEXTVERSION i lawr yn"
 
-#: strings.hrc:289
+#: extensions/inc/strings.hrc:289
 msgctxt "RID_UPDATE_STR_DOWNLOAD_WARN"
 msgid ""
 "The download location is: %DOWNLOAD_PATH.\n"
@@ -1933,12 +1933,12 @@ msgstr ""
 "\n"
 "O dan Offer – Dewisiadau... - %PRODUCTNAME – Diweddariad Ar-lein mae modd i chi newid y lleoliad llwytho i lawr."
 
-#: strings.hrc:290
+#: extensions/inc/strings.hrc:290
 msgctxt "RID_UPDATE_STR_DOWNLOAD_DESCR"
 msgid "%FILE_NAME has been downloaded to %DOWNLOAD_PATH."
 msgstr "Mae %FILE_NAME wedi ei llwytho i lawr i %DOWNLOAD_PATH."
 
-#: strings.hrc:291
+#: extensions/inc/strings.hrc:291
 msgctxt "RID_UPDATE_STR_DOWNLOAD_UNAVAIL"
 msgid ""
 "The automatic download of the update is currently not available.\n"
@@ -1949,207 +1949,207 @@ msgstr ""
 "\n"
 "Cliciwch 'Llwytho i Lawr...' i lwytho i lawr %PRODUCTNAME %NEXTVERSION gyda llaw o'r wefan."
 
-#: strings.hrc:292
+#: extensions/inc/strings.hrc:292
 msgctxt "RID_UPDATE_STR_DOWNLOADING"
 msgid "Downloading %PRODUCTNAME %NEXTVERSION..."
 msgstr "Llwytho %PRODUCTNAME %NEXTVERSION i lawr..."
 
-#: strings.hrc:293
+#: extensions/inc/strings.hrc:293
 msgctxt "RID_UPDATE_STR_READY_INSTALL"
 msgid "Download of %PRODUCTNAME %NEXTVERSION completed. Ready for installation."
 msgstr "Cwbwlhawyd Llwytho i Lawr %PRODUCTNAME %NEXTVERSION. Parod i'w osod."
 
-#: strings.hrc:294
+#: extensions/inc/strings.hrc:294
 msgctxt "RID_UPDATE_STR_CANCEL_TITLE"
 msgid "%PRODUCTNAME %PRODUCTVERSION"
 msgstr "%PRODUCTNAME %PRODUCTVERSION"
 
-#: strings.hrc:295
+#: extensions/inc/strings.hrc:295
 msgctxt "RID_UPDATE_STR_CANCEL_DOWNLOAD"
 msgid "Do you really want to cancel the download?"
 msgstr "Ydych chi wir eisiau atal y llwytho i lawr?"
 
-#: strings.hrc:296
+#: extensions/inc/strings.hrc:296
 msgctxt "RID_UPDATE_STR_BEGIN_INSTALL"
 msgid "To install the update, %PRODUCTNAME %PRODUCTVERSION needs to be closed. Do you want to install the update now?"
 msgstr "Er mwyn gosod y diweddariad rhaid i %PRODUCTNAME %PRODUCTVERSION gael ei gau. Hoffech chi osod y diweddariad nawr?"
 
-#: strings.hrc:297
+#: extensions/inc/strings.hrc:297
 msgctxt "RID_UPDATE_STR_INSTALL_NOW"
 msgid "Install ~now"
 msgstr "Gosod ~nawr"
 
-#: strings.hrc:298
+#: extensions/inc/strings.hrc:298
 msgctxt "RID_UPDATE_STR_INSTALL_LATER"
 msgid "Install ~later"
 msgstr "Gosod yn ~hwyrach"
 
-#: strings.hrc:299
+#: extensions/inc/strings.hrc:299
 msgctxt "RID_UPDATE_STR_INSTALL_ERROR"
 msgid "Could not run the installer application, please run %FILE_NAME in %DOWNLOAD_PATH manually."
 msgstr "Methu rhedeg y rhaglen osod, rhedwch %FILE_NAME yn %DOWNLOAD_PATH gyda llaw."
 
-#: strings.hrc:300
+#: extensions/inc/strings.hrc:300
 msgctxt "RID_UPDATE_STR_OVERWRITE_WARNING"
 msgid "A file with that name already exists! Do you want to overwrite the existing file?"
 msgstr "Mae ffeil gyda'r enw yna'n bodoli eisoes! Hoffech chi drosysgrifo'r ffeil bresennol?"
 
-#: strings.hrc:301
+#: extensions/inc/strings.hrc:301
 msgctxt "RID_UPDATE_STR_RELOAD_WARNING"
 msgid "A file with the name '%FILENAME' already exists in '%DOWNLOAD_PATH'! Do you want to continue with the download or delete and reload the file?"
 msgstr "Mae ffeil gyda'r enw '%FILENAME' yn bodoli'n barod yn '%DOWNLOAD_PATH'! Hoffech chi barhau gyda'r llwytho i lawr neu ddileu ac ail lwytho'r ffeil?"
 
-#: strings.hrc:302
+#: extensions/inc/strings.hrc:302
 msgctxt "RID_UPDATE_STR_RELOAD_RELOAD"
 msgid "Reload File"
 msgstr "Ail-lwytho'r Ffeil"
 
-#: strings.hrc:303
+#: extensions/inc/strings.hrc:303
 msgctxt "RID_UPDATE_STR_RELOAD_CONTINUE"
 msgid "Continue"
 msgstr "Parhau"
 
-#: strings.hrc:304
+#: extensions/inc/strings.hrc:304
 msgctxt "RID_UPDATE_STR_PERCENT"
 msgid "%PERCENT%"
 msgstr "%PERCENT%"
 
-#: strings.hrc:305
+#: extensions/inc/strings.hrc:305
 msgctxt "RID_UPDATE_FT_STATUS"
 msgid "Status"
 msgstr "Statws"
 
-#: strings.hrc:306
+#: extensions/inc/strings.hrc:306
 msgctxt "RID_UPDATE_FT_DESCRIPTION"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: strings.hrc:307
+#: extensions/inc/strings.hrc:307
 msgctxt "RID_UPDATE_BTN_CLOSE"
 msgid "Close"
 msgstr "Cau"
 
-#: strings.hrc:308
+#: extensions/inc/strings.hrc:308
 msgctxt "RID_UPDATE_BTN_DOWNLOAD"
 msgid "~Download"
 msgstr "~Llwytho i Lawr"
 
-#: strings.hrc:309
+#: extensions/inc/strings.hrc:309
 msgctxt "RID_UPDATE_BTN_INSTALL"
 msgid "~Install"
 msgstr "~Gosod"
 
-#: strings.hrc:310
+#: extensions/inc/strings.hrc:310
 msgctxt "RID_UPDATE_BTN_PAUSE"
 msgid "~Pause"
 msgstr "~Oedi"
 
-#: strings.hrc:311
+#: extensions/inc/strings.hrc:311
 msgctxt "RID_UPDATE_BTN_RESUME"
 msgid "~Resume"
 msgstr "~Ailgychwyn"
 
-#: strings.hrc:312
+#: extensions/inc/strings.hrc:312
 msgctxt "RID_UPDATE_BTN_CANCEL"
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: strings.hrc:313
+#: extensions/inc/strings.hrc:313
 msgctxt "RID_UPDATE_BUBBLE_T_UPDATE_AVAIL"
 msgid "%PRODUCTNAME update available"
 msgstr "Mae diweddariad %PRODUCTNAME ar gael"
 
-#: strings.hrc:314
+#: extensions/inc/strings.hrc:314
 msgctxt "RID_UPDATE_BUBBLE_UPDATE_AVAIL"
 msgid "Click the icon to start the download."
 msgstr "Cliciwch yr eicon i gychwyn llwytho i lawr."
 
-#: strings.hrc:315
+#: extensions/inc/strings.hrc:315
 msgctxt "RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN"
 msgid "%PRODUCTNAME update available"
 msgstr "Mae diweddariad %PRODUCTNAME ar gael"
 
-#: strings.hrc:316
+#: extensions/inc/strings.hrc:316
 msgctxt "RID_UPDATE_BUBBLE_UPDATE_NO_DOWN"
 msgid "Click the icon for more information."
 msgstr "Cliciwch yr eicon am ragor o wybodaeth."
 
-#: strings.hrc:317
+#: extensions/inc/strings.hrc:317
 msgctxt "RID_UPDATE_BUBBLE_T_AUTO_START"
 msgid "%PRODUCTNAME update available"
 msgstr "Mae diweddariad %PRODUCTNAME ar gael"
 
-#: strings.hrc:318
+#: extensions/inc/strings.hrc:318
 msgctxt "RID_UPDATE_BUBBLE_AUTO_START"
 msgid "Download of update begins."
 msgstr "Mae'r llwytho i lawr ar fin cychwyn."
 
-#: strings.hrc:319
+#: extensions/inc/strings.hrc:319
 msgctxt "RID_UPDATE_BUBBLE_T_DOWNLOADING"
 msgid "Download of update in progress"
 msgstr "Wrthi'n llwytho i lawr"
 
-#: strings.hrc:320
+#: extensions/inc/strings.hrc:320
 msgctxt "RID_UPDATE_BUBBLE_DOWNLOADING"
 msgid ""
 msgstr ""
 
-#: strings.hrc:321
+#: extensions/inc/strings.hrc:321
 msgctxt "RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED"
 msgid "Download of update paused"
 msgstr "Oedwyd y llwytho i lawr"
 
-#: strings.hrc:322
+#: extensions/inc/strings.hrc:322
 msgctxt "RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED"
 msgid "Click the icon to resume."
 msgstr "Cliciwch yr eicon i ailgychwyn."
 
-#: strings.hrc:323
+#: extensions/inc/strings.hrc:323
 msgctxt "RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING"
 msgid "Download of update stalled"
 msgstr "Ataliwyd y llwytho i lawr"
 
-#: strings.hrc:324
+#: extensions/inc/strings.hrc:324
 msgctxt "RID_UPDATE_BUBBLE_ERROR_DOWNLOADING"
 msgid "Click the icon for more information."
 msgstr "Cliciwch yr eicon am ragor o wybodaeth."
 
-#: strings.hrc:325
+#: extensions/inc/strings.hrc:325
 msgctxt "RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL"
 msgid "Download of update completed"
 msgstr "Cwblhawyd y llwytho i lawr"
 
-#: strings.hrc:326
+#: extensions/inc/strings.hrc:326
 msgctxt "RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL"
 msgid "Click the icon to start the installation."
 msgstr "Cliciwch yr eicon i gychwyn gosod."
 
-#: strings.hrc:327
+#: extensions/inc/strings.hrc:327
 msgctxt "RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL"
 msgid "Updates for extensions available"
 msgstr "Diweddariad ar gyfer estyniadau ar gael"
 
-#: strings.hrc:328
+#: extensions/inc/strings.hrc:328
 msgctxt "RID_UPDATE_BUBBLE_EXT_UPD_AVAIL"
 msgid "Click the icon for more information."
 msgstr "Cliciwch yr eicon am ragor o wybodaeth."
 
-#: strings.hrc:330
+#: extensions/inc/strings.hrc:330
 msgctxt "STR_COULD_NOT_BE_INIT"
 msgid "The SANE interface could not be initialized. Scanning is not possible."
 msgstr "Methu cychwyn rhyngwyneb SANE. Nid yw sganio'n bosibl."
 
-#: strings.hrc:331
+#: extensions/inc/strings.hrc:331
 msgctxt "STR_SLOW_PREVIEW"
 msgid "The device does not offer a preview option. Therefore, a normal scan will be used as a preview instead. This may take a considerable amount of time."
 msgstr "Nid yw'r ddyfais yn cynnig dewis rhagolwg. Felly, bydd sgan arferol yn cael ei ddefnyddio fel rhagolwg. Gall hyn gymryd tipyn o amser."
 
-#: strings.hrc:332
+#: extensions/inc/strings.hrc:332
 msgctxt "STR_ERROR_SCAN"
 msgid "An error occurred while scanning."
 msgstr "Digwyddodd gwall wrth sganio."
 
-#: strings.hrc:333
+#: extensions/inc/strings.hrc:333
 #, c-format
 msgctxt "STR_DEVICE_DESC"
 msgid ""
@@ -2163,177 +2163,177 @@ msgstr ""
 "Model: %s\n"
 "Math: %s"
 
-#: strings.hrc:335
+#: extensions/inc/strings.hrc:335
 msgctxt "RID_BIB_STR_FRAME_TITLE"
 msgid "Bibliography Database"
 msgstr "Cronfa Ddata Llyfryddiaeth"
 
-#: strings.hrc:336
+#: extensions/inc/strings.hrc:336
 msgctxt "RID_MAP_QUESTION"
 msgid "Do you want to edit the column arrangement?"
 msgstr "Hoffech chi olygu trefniant y colofnau?"
 
-#: strings.hrc:337
+#: extensions/inc/strings.hrc:337
 msgctxt "RID_BIB_STR_NONE"
 msgid "<none>"
 msgstr "<dim>"
 
-#: strings.hrc:339
+#: extensions/inc/strings.hrc:339
 msgctxt "ST_ERROR_PREFIX"
 msgid "The following column names could not be assigned:\n"
 msgstr "Methu neilltuo'r enwau colofn ganlynol:\n"
 
-#: strings.hrc:340
+#: extensions/inc/strings.hrc:340
 msgctxt "ST_TYPE_ARTICLE"
 msgid "Article"
 msgstr "Erthygl"
 
-#: strings.hrc:341
+#: extensions/inc/strings.hrc:341
 msgctxt "ST_TYPE_BOOK"
 msgid "Book"
 msgstr "Llyfr"
 
-#: strings.hrc:342
+#: extensions/inc/strings.hrc:342
 msgctxt "ST_TYPE_BOOKLET"
 msgid "Brochures"
 msgstr "Llyfryn"
 
-#: strings.hrc:343
+#: extensions/inc/strings.hrc:343
 msgctxt "ST_TYPE_CONFERENCE"
 msgid "Conference proceedings article (BiBTeX)"
 msgstr "Erthygl gweithrediadau cynhadledd (BiBTeX)"
 
-#: strings.hrc:344
+#: extensions/inc/strings.hrc:344
 msgctxt "ST_TYPE_INBOOK"
 msgid "Book excerpt"
 msgstr "Dyfyniad o lyfr"
 
-#: strings.hrc:345
+#: extensions/inc/strings.hrc:345
 msgctxt "ST_TYPE_INCOLLECTION"
 msgid "Book excerpt with title"
 msgstr "Dyfyniad o lyfr gyda theitl"
 
-#: strings.hrc:346
+#: extensions/inc/strings.hrc:346
 msgctxt "ST_TYPE_INPROCEEDINGS"
 msgid "Conference proceedings article"
 msgstr "Erthygl gweithrediadau cynhadledd"
 
-#: strings.hrc:347
+#: extensions/inc/strings.hrc:347
 msgctxt "ST_TYPE_JOURNAL"
 msgid "Journal"
 msgstr "Siwrnal"
 
-#: strings.hrc:348
+#: extensions/inc/strings.hrc:348
 msgctxt "ST_TYPE_MANUAL"
 msgid "Techn. documentation"
 msgstr "Dogfennaeth dechnegol"
 
-#: strings.hrc:349
+#: extensions/inc/strings.hrc:349
 msgctxt "ST_TYPE_MASTERSTHESIS"
 msgid "Thesis"
 msgstr "Thesis"
 
-#: strings.hrc:350
+#: extensions/inc/strings.hrc:350
 msgctxt "ST_TYPE_MISC"
 msgid "Miscellaneous"
 msgstr "Amrywiol"
 
-#: strings.hrc:351
+#: extensions/inc/strings.hrc:351
 msgctxt "ST_TYPE_PHDTHESIS"
 msgid "Dissertation"
 msgstr "Traethawd"
 
-#: strings.hrc:352
+#: extensions/inc/strings.hrc:352
 msgctxt "ST_TYPE_PROCEEDINGS"
 msgid "Conference proceedings"
 msgstr "Gweithrediadau cynhadledd"
 
-#: strings.hrc:353
+#: extensions/inc/strings.hrc:353
 msgctxt "ST_TYPE_TECHREPORT"
 msgid "Research report"
 msgstr "Adroddiad ymchwil"
 
-#: strings.hrc:354
+#: extensions/inc/strings.hrc:354
 msgctxt "ST_TYPE_UNPUBLISHED"
 msgid "Unpublished"
 msgstr "Heb ei gyhoeddi"
 
-#: strings.hrc:355
+#: extensions/inc/strings.hrc:355
 msgctxt "ST_TYPE_EMAIL"
 msgid "E-mail"
 msgstr "E-bost"
 
-#: strings.hrc:356
+#: extensions/inc/strings.hrc:356
 msgctxt "ST_TYPE_WWW"
 msgid "WWW document"
 msgstr "Dogfen WWW"
 
-#: strings.hrc:357
+#: extensions/inc/strings.hrc:357
 msgctxt "ST_TYPE_CUSTOM1"
 msgid "User-defined1"
 msgstr "Defnyddiwr diffinedig1"
 
-#: strings.hrc:358
+#: extensions/inc/strings.hrc:358
 msgctxt "ST_TYPE_CUSTOM2"
 msgid "User-defined2"
 msgstr "Defnyddiwr diffinedig2"
 
-#: strings.hrc:359
+#: extensions/inc/strings.hrc:359
 msgctxt "ST_TYPE_CUSTOM3"
 msgid "User-defined3"
 msgstr "Defnyddiwr diffinedig3"
 
-#: strings.hrc:360
+#: extensions/inc/strings.hrc:360
 msgctxt "ST_TYPE_CUSTOM4"
 msgid "User-defined4"
 msgstr "Defnyddiwr diffinedig4"
 
-#: strings.hrc:361
+#: extensions/inc/strings.hrc:361
 msgctxt "ST_TYPE_CUSTOM5"
 msgid "User-defined5"
 msgstr "Defnyddiwr diffinedig5"
 
-#: strings.hrc:362
+#: extensions/inc/strings.hrc:362
 msgctxt "ST_TYPE_TITLE"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: strings.hrc:364
+#: extensions/inc/strings.hrc:364
 msgctxt "RID_STR_ABSOURCEDIALOGTITLE"
 msgid "Address Book Data Source Wizard"
 msgstr "Dewin Ffynhonnell Data Llyfr Cyfeiriadau"
 
-#: strings.hrc:365
+#: extensions/inc/strings.hrc:365
 msgctxt "RID_STR_SELECT_ABTYPE"
 msgid "Address book type"
 msgstr "Math o lyfr cyfeiriad"
 
-#: strings.hrc:366
+#: extensions/inc/strings.hrc:366
 msgctxt "RID_STR_INVOKE_ADMIN_DIALOG"
 msgid "Connection Settings"
 msgstr "Gosodiadau cysylltiad"
 
-#: strings.hrc:367
+#: extensions/inc/strings.hrc:367
 msgctxt "RID_STR_TABLE_SELECTION"
 msgid "Table selection"
 msgstr "Dewis tabl"
 
-#: strings.hrc:368
+#: extensions/inc/strings.hrc:368
 msgctxt "RID_STR_MANUAL_FIELD_MAPPING"
 msgid "Field Assignment"
 msgstr "Aseiniad Maes"
 
-#: strings.hrc:369
+#: extensions/inc/strings.hrc:369
 msgctxt "RID_STR_FINAL_CONFIRM"
 msgid "Data Source Title"
 msgstr "Teitl Ffynhonnell Data"
 
-#: strings.hrc:370
+#: extensions/inc/strings.hrc:370
 msgctxt "RID_STR_NEEDTYPESELECTION"
 msgid "Please select a type of address book."
 msgstr "Dewiswch y math o lyfr cyfeiriad."
 
-#: strings.hrc:371
+#: extensions/inc/strings.hrc:371
 msgctxt "RID_STR_QRY_NOTABLES"
 msgid ""
 "The data source does not contain any tables.\n"
@@ -2342,7 +2342,7 @@ msgstr ""
 "Nid yw'r ffynhonnell data'n cynnwys tablau.\n"
 "Hoffech chi ei osod yn ffynhonnell data cyfeiriadau, beth bynnag?"
 
-#: strings.hrc:372
+#: extensions/inc/strings.hrc:372
 msgctxt "RID_STR_QRY_NO_EVO_GW"
 msgid ""
 "You don't seem to have any GroupWise account configured in Evolution.\n"
@@ -2351,32 +2351,32 @@ msgstr ""
 "Nid oes cyfrif GroupWise wedi ei ffurfweddu yn Evolution.\n"
 "Hoffech ei osod fel ffynhonnell data cyfeiriadau, beth bynnag?"
 
-#: strings.hrc:373
+#: extensions/inc/strings.hrc:373
 msgctxt "RID_STR_DEFAULT_NAME"
 msgid "Addresses"
 msgstr "Cyfeiriadau"
 
-#: strings.hrc:374
+#: extensions/inc/strings.hrc:374
 msgctxt "RID_STR_ADMINDIALOGTITLE"
 msgid "Create Address Data Source"
 msgstr "Creu Ffynhonnell Data Cyfeiriadau"
 
-#: strings.hrc:375
+#: extensions/inc/strings.hrc:375
 msgctxt "RID_STR_NOCONNECTION"
 msgid "The connection could not be established."
 msgstr "Methu creu cysylltiad."
 
-#: strings.hrc:376
+#: extensions/inc/strings.hrc:376
 msgctxt "RID_STR_PLEASECHECKSETTINGS"
 msgid "Please check the settings made for the data source."
 msgstr "Gwiriwch osodiadau'r ffynhonnell data."
 
-#: strings.hrc:377
+#: extensions/inc/strings.hrc:377
 msgctxt "RID_STR_FIELDDIALOGTITLE"
 msgid "Address Data - Field Assignment"
 msgstr "Data Cyfeiriadau - Aseiniad Maes"
 
-#: strings.hrc:378
+#: extensions/inc/strings.hrc:378
 msgctxt "RID_STR_NOFIELDSASSIGNED"
 msgid ""
 "There are no fields assigned at this time.\n"
@@ -2387,122 +2387,122 @@ msgstr ""
 "Mae modd, un ai neilltuo maes neu yn ddiweddarach, drwy ddewis:\n"
 "\"Ffeil - Templed - Ffynhonnell Llyfr Cyfeiriadau...\""
 
-#: strings.hrc:380
+#: extensions/inc/strings.hrc:380
 msgctxt "RID_STR_OPTION_DB_FIELD_TITLE"
 msgid "Database Field"
 msgstr "Maes Cronfa Ddata"
 
-#: strings.hrc:381
+#: extensions/inc/strings.hrc:381
 msgctxt "RID_STR_TYPE_TABLE"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:382
+#: extensions/inc/strings.hrc:382
 msgctxt "RID_STR_TYPE_QUERY"
 msgid "Query"
 msgstr "Ymholiad"
 
-#: strings.hrc:383
+#: extensions/inc/strings.hrc:383
 msgctxt "RID_STR_TYPE_COMMAND"
 msgid "SQL command"
 msgstr "Gorchymyn SQL"
 
-#: strings.hrc:385
+#: extensions/inc/strings.hrc:385
 msgctxt "RID_STR_GROUPWIZARD_TITLE"
 msgid "Group Element Wizard"
 msgstr "Dewin Elfen Grŵp"
 
-#: strings.hrc:386
+#: extensions/inc/strings.hrc:386
 msgctxt "RID_STR_GRIDWIZARD_TITLE"
 msgid "Table Element Wizard"
 msgstr "Dewin Elfen Tabl"
 
-#: strings.hrc:387
+#: extensions/inc/strings.hrc:387
 msgctxt "RID_STR_LISTWIZARD_TITLE"
 msgid "List Box Wizard"
 msgstr "Dewin Blwch Rhestr"
 
-#: strings.hrc:388
+#: extensions/inc/strings.hrc:388
 msgctxt "RID_STR_COMBOWIZARD_TITLE"
 msgid "Combo Box Wizard"
 msgstr "Dewin Blwch Cyfun"
 
-#: strings.hrc:389
+#: extensions/inc/strings.hrc:389
 msgctxt "RID_STR_COULDNOTOPENTABLE"
 msgid "The table connection to the data source could not be established."
 msgstr "Methu creu cysylltiad tabl â'r ffynhonnell data."
 
-#: strings.hrc:391
+#: extensions/inc/strings.hrc:391
 msgctxt "RID_STR_DATEPOSTFIX"
 msgid " (Date)"
 msgstr " (Dyddiad)"
 
-#: strings.hrc:392
+#: extensions/inc/strings.hrc:392
 msgctxt "RID_STR_TIMEPOSTFIX"
 msgid " (Time)"
 msgstr " (Amser)"
 
-#: strings.hrc:394
+#: extensions/inc/strings.hrc:394
 msgctxt "RID_STR_FIELDINFO_COMBOBOX"
 msgid "The contents of the field selected will be shown in the combo box list."
 msgstr "Bydd cynnwys y maes hwn yn cael ei ddangos yn rhestr y blwch cyfun."
 
-#: strings.hrc:395
+#: extensions/inc/strings.hrc:395
 msgctxt "RID_STR_FIELDINFO_LISTBOX"
 msgid "The contents of the selected field will be shown in the list box if the linked fields are identical."
 msgstr "Bydd cynnwys y meysydd hyn yn cael eu dangos yn y blwch rhestr os yw'r maes cysylltiad yr un peth."
 
-#: strings.hrc:396
+#: extensions/inc/strings.hrc:396
 msgctxt "RID_STR_COMBOWIZ_DBFIELD"
 msgid "You can either save the value of the combo box in a database field or use it for display purposes."
 msgstr "Medrwch un ai gadw gwerth y blwch cyfun mewn maes cronfa ddata neu ei ddefnyddio ar gyfer arddangos."
 
-#: strings.hrc:398
+#: extensions/inc/strings.hrc:398
 msgctxt "RID_STR_GROUPWIZ_DBFIELD"
 msgid "You can either save the value of the option group in a database field or use it for a later action."
 msgstr "Gallwch un ai gadw'r gwerth y grŵp dewis mewn maes cronfa ddata neu ei ddefnyddio ar gyfer gweithred ddiweddarach."
 
-#: yesno.hrc:29
+#: extensions/inc/yesno.hrc:29
 msgctxt "RID_RSC_ENUM_YESNO"
 msgid "No"
 msgstr "Na"
 
-#: yesno.hrc:30
+#: extensions/inc/yesno.hrc:30
 msgctxt "RID_RSC_ENUM_YESNO"
 msgid "Yes"
 msgstr "Iawn"
 
-#: contentfieldpage.ui:34
+#: extensions/uiconfig/sabpilot/ui/contentfieldpage.ui:34
 msgctxt "contentfieldpage|label1"
 msgid "Existing fields"
 msgstr "Meysydd presennol"
 
-#: contentfieldpage.ui:81
+#: extensions/uiconfig/sabpilot/ui/contentfieldpage.ui:81
 msgctxt "contentfieldpage|label3"
 msgid "Display field"
 msgstr "Maes dangos"
 
-#: contenttablepage.ui:43
+#: extensions/uiconfig/sabpilot/ui/contenttablepage.ui:43
 msgctxt "contenttablepage|datasourcelabel"
 msgid "Data source"
 msgstr "Ffynhonnell data"
 
-#: contenttablepage.ui:57
+#: extensions/uiconfig/sabpilot/ui/contenttablepage.ui:57
 msgctxt "contenttablepage|contenttypelabel"
 msgid "Content type"
 msgstr "Math o gynnwys"
 
-#: contenttablepage.ui:71
+#: extensions/uiconfig/sabpilot/ui/contenttablepage.ui:71
 msgctxt "contenttablepage|formtablelabel"
 msgid "Content"
 msgstr "Cynnwys"
 
-#: contenttablepage.ui:148
+#: extensions/uiconfig/sabpilot/ui/contenttablepage.ui:148
 msgctxt "contenttablepage|formsettings"
 msgid "Form"
 msgstr "Ffurflen"
 
-#: contenttablepage.ui:194
+#: extensions/uiconfig/sabpilot/ui/contenttablepage.ui:194
 msgctxt "contenttablepage|label3"
 msgid ""
 "On the right side, you see all the tables from the data source of the form.\n"
@@ -2515,12 +2515,12 @@ msgstr ""
 "\n"
 "Dewiswch y tabl o le ddaw'r data i'w ddefnyddio fel sail i'r rhestr cynnwys:"
 
-#: contenttablepage.ui:233
+#: extensions/uiconfig/sabpilot/ui/contenttablepage.ui:233
 msgctxt "contenttablepage|label2"
 msgid "Control"
 msgstr "Rheolydd"
 
-#: datasourcepage.ui:17
+#: extensions/uiconfig/sabpilot/ui/datasourcepage.ui:17
 msgctxt "datasourcepage|label2"
 msgid ""
 "That was all the information necessary to integrate your address data into %PRODUCTNAME.\n"
@@ -2531,52 +2531,52 @@ msgstr ""
 "\n"
 "Nesaf, rhowch enw i gofrestru'r ffynhonnell data yn v %PRODUCTNAME."
 
-#: datasourcepage.ui:38
+#: extensions/uiconfig/sabpilot/ui/datasourcepage.ui:38
 msgctxt "datasourcepage|embed"
 msgid "Embed this address book definition into the current document."
 msgstr "Mewnblannwch diffiniad y llyfr cyfeiriadau i'r ddogfen gyfredol."
 
-#: datasourcepage.ui:61
+#: extensions/uiconfig/sabpilot/ui/datasourcepage.ui:62
 msgctxt "datasourcepage|locationft"
 msgid "Location"
 msgstr "Lleoliad"
 
-#: datasourcepage.ui:74
+#: extensions/uiconfig/sabpilot/ui/datasourcepage.ui:75
 msgctxt "datasourcepage|browse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: datasourcepage.ui:116
+#: extensions/uiconfig/sabpilot/ui/datasourcepage.ui:117
 msgctxt "datasourcepage|available"
 msgid "Make this address book available to all modules in %PRODUCTNAME."
 msgstr "Mae'r llyfr cyfeiriadau ar gael i bob modiwl yn %PRODUCTNAME."
 
-#: datasourcepage.ui:153
+#: extensions/uiconfig/sabpilot/ui/datasourcepage.ui:155
 msgctxt "datasourcepage|nameft"
 msgid "Address book name"
 msgstr "Enw'r llyfr cyfeiriadau"
 
-#: datasourcepage.ui:191
+#: extensions/uiconfig/sabpilot/ui/datasourcepage.ui:193
 msgctxt "datasourcepage|warning"
 msgid "Another data source already has this name. As data sources have to have globally unique names, you need to choose another one."
 msgstr "Mae'r enw wedi ei roi i ffynhonnell data arall. Gan fod rhaid i ffynonellau data gael enw unigryw bydd rhaid dewis enw arall."
 
-#: defaultfieldselectionpage.ui:18
+#: extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui:18
 msgctxt "defaultfieldselectionpage|label1"
 msgid "Should one option field be selected as a default?"
 msgstr "A ddylid dewis un maes dewis fel y rhagosodedig?"
 
-#: defaultfieldselectionpage.ui:34
+#: extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui:34
 msgctxt "defaultfieldselectionpage|defaultselectionyes"
 msgid "_Yes, the following:"
 msgstr "_Iawn, i'r canlynol:"
 
-#: defaultfieldselectionpage.ui:76
+#: extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui:76
 msgctxt "defaultfieldselectionpage|defaultselectionno"
 msgid "No, one particular field is not going to be selected."
 msgstr "Na, nid yw un maes penodol yn mynd i gael ei ddewis."
 
-#: fieldassignpage.ui:16
+#: extensions/uiconfig/sabpilot/ui/fieldassignpage.ui:16
 msgctxt "fieldassignpage|label2"
 msgid ""
 "To incorporate the address data in your templates, %PRODUCTNAME has to know which fields contain which data.\n"
@@ -2591,127 +2591,127 @@ msgstr ""
 "\n"
 "Cliciwch y botwm islaw i agor deialog arall lle mae modd nodi gosodiadau eich ffynhonnell data."
 
-#: fieldassignpage.ui:33
+#: extensions/uiconfig/sabpilot/ui/fieldassignpage.ui:33
 msgctxt "fieldassignpage|assign"
 msgid "Field Assignment"
 msgstr "Aseiniad Maes"
 
-#: fieldlinkpage.ui:19
+#: extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui:19
 msgctxt "fieldlinkpage|desc"
 msgid "This is where you select fields with matching contents so that the value from the display field will be shown."
 msgstr "Dyma lle rydych yn dewis meysydd gyda chynnwys sy'n cydweddu fel bo gwerth y maes dangos yn cael ei arddangos."
 
-#: fieldlinkpage.ui:49
+#: extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui:49
 msgctxt "fieldlinkpage|label2"
 msgid "Field from the _Value Table"
 msgstr "Maes o'r _Tabl Gwerth"
 
-#: fieldlinkpage.ui:97
+#: extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui:97
 msgctxt "fieldlinkpage|label3"
 msgid "Field from the _List Table"
 msgstr "Maes o'r Tabl _Rhestr"
 
-#: gridfieldsselectionpage.ui:44
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:44
 msgctxt "gridfieldsselectionpage|datasourcelabel"
 msgid "Data source"
 msgstr "Ffynhonnell data"
 
-#: gridfieldsselectionpage.ui:58
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:58
 msgctxt "gridfieldsselectionpage|contenttypelabel"
 msgid "Content type"
 msgstr "Math o gynnwys"
 
-#: gridfieldsselectionpage.ui:72
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:72
 msgctxt "gridfieldsselectionpage|formtablelabel"
 msgid "Content"
 msgstr "Cynnwys"
 
-#: gridfieldsselectionpage.ui:148
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:148
 msgctxt "gridfieldsselectionpage|formsettings"
 msgid "Form"
 msgstr "Ffurflen"
 
-#: gridfieldsselectionpage.ui:205
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:205
 msgctxt "gridfieldsselectionpage|label3"
 msgid "Selected fields"
 msgstr "Meysydd â ddewiswyd"
 
-#: gridfieldsselectionpage.ui:231
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:231
 msgctxt "gridfieldsselectionpage|fieldright"
 msgid "->"
 msgstr "->"
 
-#: gridfieldsselectionpage.ui:245
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:245
 msgctxt "gridfieldsselectionpage|allfieldsright"
 msgid "=>>"
 msgstr "=>>"
 
-#: gridfieldsselectionpage.ui:273
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:273
 msgctxt "gridfieldsselectionpage|fieldleft"
 msgid "<-"
 msgstr "<-"
 
-#: gridfieldsselectionpage.ui:287
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:287
 msgctxt "gridfieldsselectionpage|allfieldsleft"
 msgid "<<="
 msgstr "<<="
 
-#: gridfieldsselectionpage.ui:336
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:336
 msgctxt "gridfieldsselectionpage|label1"
 msgid "Existing fields"
 msgstr "Meysydd cyfredol"
 
-#: gridfieldsselectionpage.ui:358
+#: extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui:358
 msgctxt "gridfieldsselectionpage|label2"
 msgid "Table element"
 msgstr "Elfen tabl"
 
-#: groupradioselectionpage.ui:44
+#: extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui:44
 msgctxt "groupradioselectionpage|datasourcelabel"
 msgid "Data source"
 msgstr "Ffynhonnell data"
 
-#: groupradioselectionpage.ui:58
+#: extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui:58
 msgctxt "groupradioselectionpage|contenttypelabel"
 msgid "Content type"
 msgstr "Math o gynnwys"
 
-#: groupradioselectionpage.ui:72
+#: extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui:72
 msgctxt "groupradioselectionpage|formtablelabel"
 msgid "Content"
 msgstr "Cynnwys"
 
-#: groupradioselectionpage.ui:149
+#: extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui:149
 msgctxt "groupradioselectionpage|formsettings"
 msgid "Form"
 msgstr "Ffurflen"
 
-#: groupradioselectionpage.ui:210
+#: extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui:210
 msgctxt "groupradioselectionpage|label3"
 msgid "_Option fields"
 msgstr "_Meysydd dewis"
 
-#: groupradioselectionpage.ui:230
+#: extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui:230
 msgctxt "groupradioselectionpage|toright"
 msgid "_>>"
 msgstr "_>>"
 
-#: groupradioselectionpage.ui:245
+#: extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui:245
 msgctxt "groupradioselectionpage|toleft"
 msgid "_<<"
 msgstr "_<<"
 
-#: groupradioselectionpage.ui:287
+#: extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui:286
 msgctxt "groupradioselectionpage|label1"
 msgid "Which _names do you want to give the option fields?"
 msgstr "Pa _enw i'w roi i'r meysydd dewis?"
 
-#: groupradioselectionpage.ui:310
+#: extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui:309
 msgctxt "groupradioselectionpage|label2"
 msgid "Table element"
 msgstr "Elfen tabl"
 
-#: invokeadminpage.ui:16
+#: extensions/uiconfig/sabpilot/ui/invokeadminpage.ui:16
 msgctxt "invokeadminpage|label2"
 msgid ""
 "To set up the new data source, additional information is required.\n"
@@ -2722,12 +2722,12 @@ msgstr ""
 "\n"
 "Cliciwch y botwm canlynol i agor blwch deialog arall lle fyddwch yn rhoi'r manylion angenrheidiol."
 
-#: invokeadminpage.ui:31
+#: extensions/uiconfig/sabpilot/ui/invokeadminpage.ui:31
 msgctxt "invokeadminpage|settings"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: invokeadminpage.ui:50
+#: extensions/uiconfig/sabpilot/ui/invokeadminpage.ui:50
 msgctxt "invokeadminpage|warning"
 msgid ""
 "The connection to the data source could not be established.\n"
@@ -2736,47 +2736,47 @@ msgstr ""
 "Methu creu'r cysylltiad gyda'r ffynhonnell data.\n"
 "Cyn mynd ymhellach, gwiriwch y gosodiadau wnaed, neu (ar y dudalen flaenorol) dewiswch fath arall o ffynhonnell data cyfeiriadau."
 
-#: optiondbfieldpage.ui:35
+#: extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui:35
 msgctxt "optiondbfieldpage|label1"
 msgid "Do you want to save the value in a database field?"
 msgstr "Hoffech chi gadw'r gwerth mewn maes cronfa ddata?"
 
-#: optiondbfieldpage.ui:53
+#: extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui:53
 msgctxt "optiondbfieldpage|yesRadiobutton"
 msgid "_Yes, I want to save it in the following database field:"
 msgstr "_Ydw, rwyf am ei gadw yn y maes cronfa ddata canlynol:"
 
-#: optiondbfieldpage.ui:73
+#: extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui:73
 msgctxt "optiondbfieldpage|noRadiobutton"
 msgid "_No, I only want to save the value in the form."
 msgstr "_Na, dim ond y gwerth rwyf am ei gadw yn y ffurflen."
 
-#: optionsfinalpage.ui:18
+#: extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui:18
 msgctxt "optionsfinalpage|label1"
 msgid "Which _caption is to be given to your option group?"
 msgstr "Pa _egluryn i'w osod yn eich grŵp dewis?"
 
-#: optionsfinalpage.ui:48
+#: extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui:47
 msgctxt "optionsfinalpage|label2"
 msgid "These were all details needed to create the option group."
 msgstr "Dyna'r holl fanylion angenrheidiol i greu'r grŵp dewis."
 
-#: optionvaluespage.ui:28
+#: extensions/uiconfig/sabpilot/ui/optionvaluespage.ui:28
 msgctxt "optionvaluespage|label1"
 msgid "When you select an option, the option group is given a specific value."
 msgstr "Pan fyddwch yn dewis, bydd y grŵp dewis yn derbyn gwerth penodol."
 
-#: optionvaluespage.ui:45
+#: extensions/uiconfig/sabpilot/ui/optionvaluespage.ui:45
 msgctxt "optionvaluespage|label2"
 msgid "Which _value do you want to assign to each option?"
 msgstr "Pa _werth hoffech ei roi i bob dewis?"
 
-#: optionvaluespage.ui:90
+#: extensions/uiconfig/sabpilot/ui/optionvaluespage.ui:89
 msgctxt "optionvaluespage|label3"
 msgid "_Option fields"
 msgstr "_Meysydd dewis"
 
-#: selecttablepage.ui:16
+#: extensions/uiconfig/sabpilot/ui/selecttablepage.ui:16
 msgctxt "selecttablepage|label2"
 msgid ""
 "The external data source you have chosen contains more than one address book.\n"
@@ -2785,63 +2785,63 @@ msgstr ""
 "Mae'r ffynhonnell data allanol rydych wedi ei ddewis yn cynnwys mwy nag un llyfr cyfeiriadau.\n"
 "Dewiswch yr un byddwch am weithio ohono'n bennaf:"
 
-#: selecttypepage.ui:31
+#: extensions/uiconfig/sabpilot/ui/selecttypepage.ui:14
+msgctxt "selecttypepage|label2"
+msgid ""
+"%PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form.\n"
+"\n"
+"This wizard helps you create the data source."
+msgstr ""
+"Mae %PRODUCTNAME yn caniatáu i chi gael mynediad at y cyfeiriad ar eich system. I wneud hyn bydd ffynhonnell data %PRODUCTNAME yn cael ei greu lle fydd eich data ar gael ar ffurf tabl.\n"
+"\n"
+"Bydd yr AwtoPeilot hwn yn eich cynorthwyo i greu ffynhonnell data."
+
+#: extensions/uiconfig/sabpilot/ui/selecttypepage.ui:34
 msgctxt "selecttypepage|evolution"
 msgid "Evolution"
 msgstr "Evolution"
 
-#: selecttypepage.ui:49
+#: extensions/uiconfig/sabpilot/ui/selecttypepage.ui:51
 msgctxt "selecttypepage|groupwise"
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: selecttypepage.ui:66
+#: extensions/uiconfig/sabpilot/ui/selecttypepage.ui:67
 msgctxt "selecttypepage|evoldap"
 msgid "Evolution LDAP"
 msgstr "LDAP Evolution"
 
-#: selecttypepage.ui:83
+#: extensions/uiconfig/sabpilot/ui/selecttypepage.ui:83
 msgctxt "selecttypepage|firefox"
-msgid "Firefox/Iceweasel"
-msgstr "Mozilla Firefox"
+msgid "Firefox"
+msgstr ""
 
-#: selecttypepage.ui:100
+#: extensions/uiconfig/sabpilot/ui/selecttypepage.ui:99
 msgctxt "selecttypepage|thunderbird"
-msgid "Thunderbird/Icedove"
-msgstr "Thunderbird/Icedove"
+msgid "Thunderbird"
+msgstr ""
 
-#: selecttypepage.ui:117
+#: extensions/uiconfig/sabpilot/ui/selecttypepage.ui:115
 msgctxt "selecttypepage|kde"
 msgid "KDE address book"
 msgstr "Llyfr Cyfeiriadau KDE"
 
-#: selecttypepage.ui:134
+#: extensions/uiconfig/sabpilot/ui/selecttypepage.ui:131
 msgctxt "selecttypepage|macosx"
 msgid "Mac OS X address book"
 msgstr "Llyfr cyfeiriadau Mac OS X"
 
-#: selecttypepage.ui:151
+#: extensions/uiconfig/sabpilot/ui/selecttypepage.ui:147
 msgctxt "selecttypepage|other"
 msgid "Other external data source"
 msgstr "Ffynonellau data allanol eraill"
 
-#: selecttypepage.ui:174
+#: extensions/uiconfig/sabpilot/ui/selecttypepage.ui:165
 msgctxt "selecttypepage|label1"
-msgid "Please Select the Type of Your External Address Book"
-msgstr "Dewiswch y Math o Lyfr Cyfeiriadau Allanol"
-
-#: selecttypepage.ui:194
-msgctxt "selecttypepage|label2"
-msgid ""
-"%PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form.\n"
-"\n"
-"This wizard helps you create the data source."
+msgid "Select the type of your external address book:"
 msgstr ""
-"Mae %PRODUCTNAME yn caniatáu i chi gael mynediad at y cyfeiriad ar eich system. I wneud hyn bydd ffynhonnell data %PRODUCTNAME yn cael ei greu lle fydd eich data ar gael ar ffurf tabl.\n"
-"\n"
-"Bydd yr AwtoPeilot hwn yn eich cynorthwyo i greu ffynhonnell data."
 
-#: tableselectionpage.ui:42
+#: extensions/uiconfig/sabpilot/ui/tableselectionpage.ui:42
 msgctxt "tableselectionpage|label3"
 msgid ""
 "Currently, the form the control belongs to is not (or not completely) bound to a data source.\n"
@@ -2858,582 +2858,587 @@ msgstr ""
 "\n"
 "Sylwch fod y gosodiadau wnaed ar y dudalen hon yn dod i rym yn syth ar ôl gadael y dudalen."
 
-#: tableselectionpage.ui:72
+#: extensions/uiconfig/sabpilot/ui/tableselectionpage.ui:72
 msgctxt "tableselectionpage|datasourcelabel"
 msgid "_Data source:"
 msgstr "_Ffynhonnell data:"
 
-#: tableselectionpage.ui:100
+#: extensions/uiconfig/sabpilot/ui/tableselectionpage.ui:100
 msgctxt "tableselectionpage|search"
 msgid "_..."
 msgstr "_..."
 
-#: tableselectionpage.ui:133
+#: extensions/uiconfig/sabpilot/ui/tableselectionpage.ui:133
 msgctxt "tableselectionpage|tablelabel"
 msgid "_Table / Query:"
 msgstr "_Tabl / Ymholiad:"
 
-#: tableselectionpage.ui:174
+#: extensions/uiconfig/sabpilot/ui/tableselectionpage.ui:174
 msgctxt "tableselectionpage|label1"
 msgid "Data"
 msgstr "Data"
 
-#: choosedatasourcedialog.ui:8
+#: extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui:8
 msgctxt "choosedatasourcedialog|ChooseDataSourceDialog"
 msgid "Choose Data Source"
 msgstr "Dewis Ffynhonnell Data"
 
-#: choosedatasourcedialog.ui:90
+#: extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui:90
 msgctxt "choosedatasourcedialog|label1"
 msgid "Entry"
 msgstr "Mynediad"
 
-#: generalpage.ui:36
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:36
 msgctxt "generalpage|shortname"
 msgid "_Short name"
 msgstr "_Enw byr"
 
-#: generalpage.ui:52
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:52
 msgctxt "generalpage|authtype"
 msgid "_Type"
 msgstr "_Math"
 
-#: generalpage.ui:67
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:67
 msgctxt "generalpage|authors"
 msgid "Author(s)"
 msgstr "Awdur(on)"
 
-#: generalpage.ui:82
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:82
 msgctxt "generalpage|publisher"
 msgid "_Publisher"
 msgstr "_Cyhoeddwr"
 
-#: generalpage.ui:97
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:97
 msgctxt "generalpage|chapter"
 msgid "_Chapter"
 msgstr "_Pennod"
 
-#: generalpage.ui:113
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:113
 msgctxt "generalpage|title"
 msgid "Tit_le"
 msgstr "_Teitl"
 
-#: generalpage.ui:129
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:129
 msgctxt "generalpage|address"
 msgid "A_ddress"
 msgstr "C_yfeiriad"
 
-#: generalpage.ui:145
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:145
 msgctxt "generalpage|pages"
 msgid "Pa_ge(s)"
 msgstr "_Tudalen(au)"
 
-#: generalpage.ui:161
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:161
 msgctxt "generalpage|year"
 msgid "_Year"
 msgstr "_Blwyddyn"
 
-#: generalpage.ui:177
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:177
 msgctxt "generalpage|isbn"
 msgid "_ISBN"
 msgstr "_ISBN"
 
-#: generalpage.ui:210
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:210
 msgctxt "generalpage|editor"
 msgid "Editor"
 msgstr "Golygydd"
 
-#: generalpage.ui:225
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:225
 msgctxt "generalpage|booktitle"
 msgid "_Book title"
 msgstr "Teitl _llyfr"
 
-#: generalpage.ui:241
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:241
 msgctxt "generalpage|edition"
 msgid "Ed_ition"
 msgstr "C_yfrol"
 
-#: generalpage.ui:257
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:257
 msgctxt "generalpage|volume"
 msgid "Volume"
 msgstr "Lefel Sain"
 
-#: generalpage.ui:273
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:273
 msgctxt "generalpage|institution"
 msgid "Instit_ution"
 msgstr "_Sefydliad"
 
-#: generalpage.ui:289
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:289
 msgctxt "generalpage|month"
 msgid "_Month"
 msgstr "M_is"
 
-#: generalpage.ui:305
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:305
 msgctxt "generalpage|publicationtype"
 msgid "Publication t_ype"
 msgstr "Math o _gyhoeddiad"
 
-#: generalpage.ui:321
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:321
 msgctxt "generalpage|university"
 msgid "University"
 msgstr "Prifysgol"
 
-#: generalpage.ui:336
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:336
 msgctxt "generalpage|reporttype"
 msgid "Type of re_port"
 msgstr "Math o _adroddiad"
 
-#: generalpage.ui:351
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:351
 msgctxt "generalpage|organization"
 msgid "Organi_zation"
 msgstr "C_orff"
 
-#: generalpage.ui:384
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:384
 msgctxt "generalpage|journal"
 msgid "_Journal"
 msgstr "_Dyddlyfr"
 
-#: generalpage.ui:399
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:399
 msgctxt "generalpage|annotation"
 msgid "Ann_otation"
 msgstr "_Anodiad"
 
-#: generalpage.ui:415
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:415
 msgctxt "generalpage|number"
 msgid "Numb_er"
 msgstr "_Rhif"
 
-#: generalpage.ui:431
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:431
 msgctxt "generalpage|note"
 msgid "_Note"
 msgstr "_Nodyn"
 
-#: generalpage.ui:447
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:447
 msgctxt "generalpage|series"
 msgid "Se_ries"
 msgstr "C_yfres"
 
-#: generalpage.ui:463
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:463
 msgctxt "generalpage|url"
 msgid "URL"
 msgstr "URL"
 
-#: generalpage.ui:496
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:496
 msgctxt "generalpage|custom1"
 msgid "User-defined field _1"
 msgstr "Maes diffiniwyd gan y defnyddiwr _1"
 
-#: generalpage.ui:511
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:511
 msgctxt "generalpage|custom4"
 msgid "User-defined field _4"
 msgstr "Maes diffinio _4"
 
-#: generalpage.ui:527
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:527
 msgctxt "generalpage|custom2"
 msgid "User-defined field _2"
 msgstr "Maes diffinio _2"
 
-#: generalpage.ui:543
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:543
 msgctxt "generalpage|custom5"
 msgid "User-defined field _5"
 msgstr "Maes diffinio _5"
 
-#: generalpage.ui:559
+#: extensions/uiconfig/sbibliography/ui/generalpage.ui:559
 msgctxt "generalpage|custom3"
 msgid "User-defined field _3"
 msgstr "Maes diffinio _3"
 
-#: mappingdialog.ui:8
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:8
 msgctxt "mappingdialog|MappingDialog"
 msgid "Column Layout for Table “%1”"
 msgstr "Cynllun Colofn ar gyfer Tabl “%1”"
 
-#: mappingdialog.ui:107
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:107
 msgctxt "mappingdialog|label2"
 msgid "_Short name"
 msgstr "_Enw byr"
 
-#: mappingdialog.ui:122
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:122
 msgctxt "mappingdialog|label3"
 msgid "_Author(s)"
 msgstr "_Awdur(on)"
 
-#: mappingdialog.ui:137
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:137
 msgctxt "mappingdialog|label4"
 msgid "_Publisher"
 msgstr "_Cyhoeddwr"
 
-#: mappingdialog.ui:152
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:152
 msgctxt "mappingdialog|label5"
 msgid "_Chapter"
 msgstr "_Pennod"
 
-#: mappingdialog.ui:167
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:167
 msgctxt "mappingdialog|label6"
 msgid "Editor"
 msgstr "Golygydd"
 
-#: mappingdialog.ui:228
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:228
 msgctxt "mappingdialog|label7"
 msgid "_Type"
 msgstr "_Math"
 
-#: mappingdialog.ui:243
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:243
 msgctxt "mappingdialog|label8"
 msgid "_Year"
 msgstr "_Blwyddyn"
 
-#: mappingdialog.ui:258
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:258
 msgctxt "mappingdialog|label9"
 msgid "Tit_le"
 msgstr "_Teitl"
 
-#: mappingdialog.ui:309
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:309
 msgctxt "mappingdialog|label10"
 msgid "A_ddress"
 msgstr "C_yfeiriad"
 
-#: mappingdialog.ui:324
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:324
 msgctxt "mappingdialog|label11"
 msgid "_ISBN"
 msgstr "_ISBN"
 
-#: mappingdialog.ui:339
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:339
 msgctxt "mappingdialog|label12"
 msgid "Pa_ge(s)"
 msgstr "_Tudalen(nau)"
 
-#: mappingdialog.ui:390
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:390
 msgctxt "mappingdialog|label13"
 msgid "Ed_ition"
 msgstr "Cy_frol"
 
-#: mappingdialog.ui:417
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:417
 msgctxt "mappingdialog|label14"
 msgid "_Book title"
 msgstr "Teitl _llyfr"
 
-#: mappingdialog.ui:432
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:432
 msgctxt "mappingdialog|label15"
 msgid "Volume"
 msgstr "Cyfrol"
 
-#: mappingdialog.ui:445
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:445
 msgctxt "mappingdialog|label16"
 msgid "Publication t_ype"
 msgstr "Math o _gyhoeddiad"
 
-#: mappingdialog.ui:496
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:496
 msgctxt "mappingdialog|label17"
 msgid "Organi_zation"
 msgstr "C_orff"
 
-#: mappingdialog.ui:511
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:511
 msgctxt "mappingdialog|label18"
 msgid "Instit_ution"
 msgstr "_Sefydliad"
 
-#: mappingdialog.ui:526
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:526
 msgctxt "mappingdialog|label19"
 msgid "Uni_versity"
 msgstr "_Prifysgol"
 
-#: mappingdialog.ui:577
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:577
 msgctxt "mappingdialog|label20"
 msgid "Type of re_port"
 msgstr "Math o _adroddiad"
 
-#: mappingdialog.ui:592
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:592
 msgctxt "mappingdialog|label21"
 msgid "_Month"
 msgstr "M_is"
 
-#: mappingdialog.ui:631
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:631
 msgctxt "mappingdialog|label22"
 msgid "_Journal"
 msgstr "_Dyddlyfr"
 
-#: mappingdialog.ui:646
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:646
 msgctxt "mappingdialog|label23"
 msgid "Numb_er"
 msgstr "_Rhif"
 
-#: mappingdialog.ui:661
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:661
 msgctxt "mappingdialog|label24"
 msgid "Se_ries"
 msgstr "Cyf_res"
 
-#: mappingdialog.ui:712
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:712
 msgctxt "mappingdialog|label25"
 msgid "Ann_otation"
 msgstr "A_nodiad"
 
-#: mappingdialog.ui:727
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:727
 msgctxt "mappingdialog|label26"
 msgid "_Note"
 msgstr "_Nodyn"
 
-#: mappingdialog.ui:742
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:742
 msgctxt "mappingdialog|label27"
 msgid "URL"
 msgstr "URL"
 
-#: mappingdialog.ui:791
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:791
 msgctxt "mappingdialog|label28"
 msgid "User-defined field _1"
 msgstr "Maes diffiniwyd gan y defnyddiwr _1"
 
-#: mappingdialog.ui:806
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:806
 msgctxt "mappingdialog|label29"
 msgid "User-defined field _2"
 msgstr "Maes diffiniwyd gan y defnyddiwr _2"
 
-#: mappingdialog.ui:821
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:821
 msgctxt "mappingdialog|label30"
 msgid "User-defined field _3"
 msgstr "Maes diffiniwyd gan y defnyddiwr _3"
 
-#: mappingdialog.ui:836
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:836
 msgctxt "mappingdialog|label31"
 msgid "User-defined field _4"
 msgstr "Maes diffiniwyd gan y defnyddiwr _4"
 
-#: mappingdialog.ui:851
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:851
 msgctxt "mappingdialog|label32"
 msgid "User-defined field _5"
 msgstr "Maes diffiniwyd gan y defnyddiwr _5"
 
-#: mappingdialog.ui:970
+#: extensions/uiconfig/sbibliography/ui/mappingdialog.ui:970
 msgctxt "mappingdialog|label1"
 msgid "Column Names"
 msgstr "Enwau Colofnau"
 
-#: toolbar.ui:14
+#: extensions/uiconfig/sbibliography/ui/querydialog.ui:30
+msgctxt "querydialog|ask"
+msgid "Do not show this question again."
+msgstr "Peidio dangos y cwestiwn yma eto."
+
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:14
 msgctxt "toolbar|TBC_FT_SOURCE"
 msgid "Table"
 msgstr "Tabl"
 
-#: toolbar.ui:49
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:49
 msgctxt "toolbar|TBC_FT_QUERY"
 msgid "Search Key"
 msgstr "Allwedd Chwilio"
 
-#: toolbar.ui:84
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:84
 msgctxt "toolbar|TBC_BT_AUTOFILTER"
 msgid "AutoFilter"
 msgstr "AwtoHidl"
 
-#: toolbar.ui:97
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:97
 msgctxt "toolbar|TBC_BT_FILTERCRIT"
 msgid "Standard Filter"
 msgstr "Hidl Safonnol"
 
-#: toolbar.ui:110
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:110
 msgctxt "toolbar|TBC_BT_REMOVEFILTER"
 msgid "Reset Filter"
 msgstr "Ailosod yr Hidl"
 
-#: toolbar.ui:123
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:123
 msgctxt "toolbar|TBC_BT_COL_ASSIGN"
 msgid "Column Arrangement"
 msgstr "Trefniant Colofnau"
 
-#: toolbar.ui:136
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:136
 msgctxt "toolbar|TBC_BT_CHANGESOURCE"
 msgid "Data Source"
 msgstr "Ffynhonnell Data"
 
-#: controlfontdialog.ui:8
+#: extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui:8
 msgctxt "controlfontdialog|ControlFontDialog"
 msgid "Character"
 msgstr "Nod"
 
-#: controlfontdialog.ui:105
+#: extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui:105
 msgctxt "controlfontdialog|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: controlfontdialog.ui:127
+#: extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui:127
 msgctxt "controlfontdialog|fonteffects"
 msgid "Font Effects"
 msgstr "Effeithiau Ffontiau"
 
-#: datatypedialog.ui:8
+#: extensions/uiconfig/spropctrlr/ui/datatypedialog.ui:8
 msgctxt "datatypedialog|DataTypeDialog"
 msgid "New Data Type"
 msgstr "Math Newydd o Ddata"
 
-#: datatypedialog.ui:85
+#: extensions/uiconfig/spropctrlr/ui/datatypedialog.ui:85
 msgctxt "datatypedialog|label"
 msgid "Type a name for the new data type:"
 msgstr "Teipiwch enw ar gyfer y math newydd o ddata:"
 
-#: formlinksdialog.ui:9
+#: extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui:9
 msgctxt "formlinksdialog|FormLinks"
 msgid "Link fields"
 msgstr "Cysylltu'r meysydd"
 
-#: formlinksdialog.ui:72
+#: extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui:72
 msgctxt "formlinksdialog|suggestButton"
 msgid "Suggest"
 msgstr "Cynnig"
 
-#: formlinksdialog.ui:105
+#: extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui:105
 msgctxt "formlinksdialog|explanationLabel"
 msgid "Sub forms can be used to display detailed data about the current record of the master form. To do this, you can specify which columns in the sub form match which columns in the master form."
 msgstr "Mae modd defnyddio Is-ffurflen i ddangos data manwl am y cofnod cyfredol yn y brif ffurflen. I wneud hyn, gallwch bennu pa golofnau yn y ffurflen sy'n cydweddu â cholofnau yn y brif ffurflen."
 
-#: formlinksdialog.ui:125
+#: extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui:125
 msgctxt "formlinksdialog|detailLabel"
 msgid "label"
 msgstr "label"
 
-#: formlinksdialog.ui:137
+#: extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui:137
 msgctxt "formlinksdialog|masterLabel"
 msgid "label"
 msgstr "label"
 
-#: labelselectiondialog.ui:9
+#: extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui:9
 msgctxt "labelselectiondialog|LabelSelectionDialog"
 msgid "Label Field Selection"
 msgstr "Dewis Maes Labeli"
 
-#: labelselectiondialog.ui:88
+#: extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui:88
 msgctxt "labelselectiondialog|label"
 msgid "These are control fields that can be used as label fields for the $controlclass$ $controlname$."
 msgstr "Dyma'r meysydd rheoli y mae modd eu defnyddio fel meysydd labeli ar gyfer $controlclass$ $controlname$."
 
-#: labelselectiondialog.ui:122
+#: extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui:122
 msgctxt "labelselectiondialog|noassignment"
 msgid "_No assignment"
 msgstr "_Dim aseiniad"
 
-#: taborder.ui:8
+#: extensions/uiconfig/spropctrlr/ui/taborder.ui:8
 msgctxt "taborder|TabOrderDialog"
 msgid "Tab Order"
 msgstr "Trefn Tabiau"
 
-#: taborder.ui:21
+#: extensions/uiconfig/spropctrlr/ui/taborder.ui:21
 msgctxt "taborder|upB"
 msgid "_Move Up"
 msgstr "_Symud Fyny"
 
-#: taborder.ui:35
+#: extensions/uiconfig/spropctrlr/ui/taborder.ui:35
 msgctxt "taborder|downB"
 msgid "Move _Down"
 msgstr "Symud _Lawr"
 
-#: taborder.ui:49
+#: extensions/uiconfig/spropctrlr/ui/taborder.ui:49
 msgctxt "taborder|autoB"
 msgid "_Automatic Sort"
 msgstr "Trefnu _Awtomatig"
 
-#: taborder.ui:146
+#: extensions/uiconfig/spropctrlr/ui/taborder.ui:146
 msgctxt "taborder|label2"
 msgid "Controls"
 msgstr "Rheolyddion"
 
-#: griddialog.ui:56
+#: extensions/uiconfig/scanner/ui/griddialog.ui:56
 msgctxt "griddialog|resetTypeCombobox"
 msgid "Linear ascending"
 msgstr "Llinellol esgynnol"
 
-#: griddialog.ui:57
+#: extensions/uiconfig/scanner/ui/griddialog.ui:57
 msgctxt "griddialog|resetTypeCombobox"
 msgid "Linear descending"
 msgstr "Llinellol disgynnol"
 
-#: griddialog.ui:58
+#: extensions/uiconfig/scanner/ui/griddialog.ui:58
 msgctxt "griddialog|resetTypeCombobox"
 msgid "Original values"
 msgstr "Gwerthoedd gwreiddiol"
 
-#: griddialog.ui:59
+#: extensions/uiconfig/scanner/ui/griddialog.ui:59
 msgctxt "griddialog|resetTypeCombobox"
 msgid "Exponential increasing"
 msgstr "Cynyddiad esbonyddol"
 
-#: griddialog.ui:70
+#: extensions/uiconfig/scanner/ui/griddialog.ui:70
 msgctxt "griddialog|resetButton"
 msgid "_Set"
 msgstr "_Gosod"
 
-#: sanedialog.ui:9
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:9
 msgctxt "sanedialog|SaneDialog"
 msgid "Scanner"
 msgstr "Sganiwr"
 
-#: sanedialog.ui:46
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:46
 msgctxt "sanedialog|label3"
 msgid "_Left:"
 msgstr "_Chwith:"
 
-#: sanedialog.ui:62
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:62
 msgctxt "sanedialog|label4"
 msgid "To_p:"
 msgstr "_Brig:"
 
-#: sanedialog.ui:78
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:78
 msgctxt "sanedialog|label5"
 msgid "_Right:"
 msgstr "_De:"
 
-#: sanedialog.ui:94
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:94
 msgctxt "sanedialog|label6"
 msgid "_Bottom:"
 msgstr "_Gwaelod:"
 
-#: sanedialog.ui:166
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:166
 msgctxt "sanedialog|label1"
 msgid "Scan area"
 msgstr "Ardal sganio"
 
-#: sanedialog.ui:208
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:208
 msgctxt "sanedialog|label2"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: sanedialog.ui:242
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:242
 msgctxt "sanedialog|label7"
 msgid "Device _used"
 msgstr "Dyfais _defnyddiwyd"
 
-#: sanedialog.ui:258
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:258
 msgctxt "sanedialog|label8"
 msgid "Resolution [_DPI]"
 msgstr "Cydraniad [_DPI]"
 
-#: sanedialog.ui:312
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:312
 msgctxt "sanedialog|advancedCheckbutton"
 msgid "Show advanced options"
 msgstr "Dangos dewisiadau uwch"
 
-#: sanedialog.ui:344
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:345
 msgctxt "sanedialog|label10"
 msgid "Options:"
 msgstr "Dewisiadau:"
 
-#: sanedialog.ui:416
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:417
 msgctxt "sanedialog|optionsButton"
 msgid "Se_t"
 msgstr "_Gosod"
 
-#: sanedialog.ui:500
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:502
 msgctxt "sanedialog|vectorLabel"
 msgid "Vector element"
 msgstr "Elfen fector"
 
-#: sanedialog.ui:629
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:631
 msgctxt "sanedialog|deviceInfoButton"
 msgid "About Dev_ice"
 msgstr "Ynghylch y _Ddyfais"
 
-#: sanedialog.ui:644
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:646
 msgctxt "sanedialog|previewButton"
 msgid "Create Previe_w"
 msgstr "Creu _Rhagolwg"
 
-#: sanedialog.ui:659
+#: extensions/uiconfig/scanner/ui/sanedialog.ui:661
 msgctxt "sanedialog|scanButton"
 msgid "_Scan"
 msgstr "_Sganio"
diff --git a/source/cy/extras/source/gallery/share.po b/source/cy/extras/source/gallery/share.po
index 70c2b29d963..52ff756017e 100644
--- a/source/cy/extras/source/gallery/share.po
+++ b/source/cy/extras/source/gallery/share.po
@@ -2,19 +2,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2013-05-23 12:06+0200\n"
-"PO-Revision-Date: 2013-06-17 12:22+0000\n"
-"Last-Translator: Rhoslyn <rprys@yahoo.com>\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-27 13:56+0100\n"
+"PO-Revision-Date: 2018-03-01 09:08+0000\n"
+"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1371471750.0\n"
+"X-Generator: Pootle 2.8\n"
+"X-POOTLE-MTIME: 1519895306.000000\n"
 
 #: gallery_names.ulf
 msgctxt ""
@@ -27,6 +27,14 @@ msgstr "Saethau"
 #: gallery_names.ulf
 msgctxt ""
 "gallery_names.ulf\n"
+"backgrounds\n"
+"LngText.text"
+msgid "Backgrounds"
+msgstr "Cefndiroedd"
+
+#: gallery_names.ulf
+msgctxt ""
+"gallery_names.ulf\n"
 "computers\n"
 "LngText.text"
 msgid "Computers"
diff --git a/source/cy/filter/messages.po b/source/cy/filter/messages.po
index ca70d776f7c..78b51e54caa 100644
--- a/source/cy/filter/messages.po
+++ b/source/cy/filter/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-11-22 13:53+0100\n"
+"POT-Creation-Date: 2018-04-23 18:11+0200\n"
 "PO-Revision-Date: 2017-12-29 14:59+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,183 +13,183 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1514559594.000000\n"
 
-#: strings.hrc:25
+#: filter/inc/strings.hrc:25
 msgctxt "STR_COLUMN_HEADER_NAME"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:26
+#: filter/inc/strings.hrc:26
 msgctxt "STR_COLUMN_HEADER_TYPE"
 msgid "Type"
 msgstr "Math"
 
-#: strings.hrc:27
+#: filter/inc/strings.hrc:27
 msgctxt "STR_UNKNOWN_APPLICATION"
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: strings.hrc:28
+#: filter/inc/strings.hrc:28
 msgctxt "STR_IMPORT_ONLY"
 msgid "import filter"
 msgstr "mewnforio hidl"
 
-#: strings.hrc:29
+#: filter/inc/strings.hrc:29
 msgctxt "STR_IMPORT_EXPORT"
 msgid "import/export filter"
 msgstr "mewnforio/allforio hidl"
 
-#: strings.hrc:30
+#: filter/inc/strings.hrc:30
 msgctxt "STR_EXPORT_ONLY"
 msgid "export filter"
 msgstr "allforio hidl"
 
-#: strings.hrc:31
+#: filter/inc/strings.hrc:31
 #, c-format
 msgctxt "STR_WARN_DELETE"
 msgid "Do you really want to delete the XML Filter '%s'? This action cannot be undone."
 msgstr "Ydych chi wir eisiau dileu Hidl XML '%s'? Ni fydd modd dadwneud hynny."
 
-#: strings.hrc:32
+#: filter/inc/strings.hrc:32
 #, c-format
 msgctxt "STR_ERROR_FILTER_NAME_EXISTS"
 msgid "An XML filter with the name '%s' already exists. Please enter a different name."
 msgstr "Mae hidl XML gyda'r enw '%s' yn bodoli eisoes. Defnyddiwch enw arall."
 
-#: strings.hrc:33
+#: filter/inc/strings.hrc:33
 #, c-format
 msgctxt "STR_ERROR_TYPE_NAME_EXISTS"
 msgid "The name for the user interface '%s1' is already used by the XML filter '%s2'. Please enter a different name."
 msgstr "Mae'r enw ar gyfer rhyngwyneb defnyddiwr '%s1' yn cael ei ddefnyddio eisoes gan hidl XML '%s2'. Rhowch enw gwahanol."
 
-#: strings.hrc:34
+#: filter/inc/strings.hrc:34
 msgctxt "STR_ERROR_EXPORT_XSLT_NOT_FOUND"
 msgid "The XSLT for export cannot be found. Please enter a valid path."
 msgstr "Methu canfod XSLT ar gyfer allforio. Rhowch lwybr dilys."
 
-#: strings.hrc:35
+#: filter/inc/strings.hrc:35
 msgctxt "STR_ERROR_IMPORT_XSLT_NOT_FOUND"
 msgid "The XSLT for import cannot be found. Please enter a valid path."
 msgstr "Methu canfod XSLT ar gyfer mewnforio. Rhowch lwybr dilys."
 
-#: strings.hrc:36
+#: filter/inc/strings.hrc:36
 msgctxt "STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND"
 msgid "The given import template cannot be found. Please enter a valid path."
 msgstr "Methu canfod y templed mewnforio hwn. Rhowch lwybr dilys."
 
-#: strings.hrc:37
+#: filter/inc/strings.hrc:37
 msgctxt "STR_DEFAULT_FILTER_NAME"
 msgid "New Filter"
 msgstr "Hidl Newydd"
 
-#: strings.hrc:38
+#: filter/inc/strings.hrc:38
 msgctxt "STR_DEFAULT_UI_NAME"
 msgid "Untitled"
 msgstr "Dideitl"
 
-#: strings.hrc:39
+#: filter/inc/strings.hrc:39
 msgctxt "STR_UNDEFINED_FILTER"
 msgid "undefined filter"
 msgstr "hidl heb ei ddiffinio"
 
-#: strings.hrc:40
+#: filter/inc/strings.hrc:40
 #, c-format
 msgctxt "STR_FILTER_HAS_BEEN_SAVED"
 msgid "The XML filter '%s' has been saved as package '%s'. "
 msgstr "Mae'r hidl XML '%s' wedi ei gadw fel pecyn '%s'. "
 
-#: strings.hrc:41
+#: filter/inc/strings.hrc:41
 #, c-format
 msgctxt "STR_FILTERS_HAVE_BEEN_SAVED"
 msgid "%s XML filters have been saved in the package '%s'."
 msgstr "Mae %s hidl XML wedi eu cadw ym mhecyn '%s'."
 
-#: strings.hrc:42
+#: filter/inc/strings.hrc:42
 msgctxt "STR_FILTER_PACKAGE"
 msgid "XSLT filter package"
 msgstr "Pecyn hidl XSLT"
 
-#: strings.hrc:43
+#: filter/inc/strings.hrc:43
 #, c-format
 msgctxt "STR_FILTER_INSTALLED"
 msgid "The XML filter '%s' has been installed successfully."
 msgstr "Mae'r hidl XML '%s' wedi ei osod yn llwyddiannus."
 
-#: strings.hrc:44
+#: filter/inc/strings.hrc:44
 #, c-format
 msgctxt "STR_FILTERS_INSTALLED"
 msgid "%s XML filters have been installed successfully."
 msgstr "Mae %s hidl XML wedi eu gosod yn llwyddiannus."
 
-#: strings.hrc:45
+#: filter/inc/strings.hrc:45
 #, c-format
 msgctxt "STR_NO_FILTERS_FOUND"
 msgid "No XML filter could be installed because the package '%s' does not contain any XML filters."
 msgstr "Methu gosod hidl XML am nad yw pecyn '%s' yn cynnwys unrhyw hidlau XML."
 
-#: strings.hrc:46
+#: filter/inc/strings.hrc:46
 msgctxt "STR_XML_FILTER_LISTBOX"
 msgid "XML Filter List"
 msgstr "Rhestr Hidl XML"
 
-#: strings.hrc:48
+#: filter/inc/strings.hrc:48
 msgctxt "T602FILTER_STR_IMPORT_DIALOG_TITLE"
 msgid "Settings for T602 import"
 msgstr "Gosodiadau mewnforio T602"
 
-#: strings.hrc:49
+#: filter/inc/strings.hrc:49
 msgctxt "T602FILTER_STR_ENCODING_LABEL"
 msgid "Encoding"
 msgstr "Amgodio"
 
-#: strings.hrc:50
+#: filter/inc/strings.hrc:50
 msgctxt "T602FILTER_STR_ENCODING_AUTO"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: strings.hrc:51
+#: filter/inc/strings.hrc:51
 msgctxt "T602FILTER_STR_ENCODING_CP852"
 msgid "CP852 (Latin2)"
 msgstr "CP852 (Lladin2)"
 
-#: strings.hrc:52
+#: filter/inc/strings.hrc:52
 msgctxt "T602FILTER_STR_ENCODING_CP895"
 msgid "CP895 (KEYB2CS, Kamenicky)"
 msgstr "CP895 (KEYB2CS, Kamenicky)"
 
-#: strings.hrc:53
+#: filter/inc/strings.hrc:53
 msgctxt "T602FILTER_STR_ENCODING_KOI8CS2"
 msgid "KOI8 CS2"
 msgstr "KOI8 CS2"
 
-#: strings.hrc:54
+#: filter/inc/strings.hrc:54
 msgctxt "T602FILTER_STR_CYRILLIC_MODE"
 msgid "Mode for Russian language (Cyrillic)"
 msgstr "Modd Rwsieg (Cyrillig)"
 
-#: strings.hrc:55
+#: filter/inc/strings.hrc:55
 msgctxt "T602FILTER_STR_REFORMAT_TEXT"
 msgid "Reformat the text"
 msgstr "Ailfformatio'r testun"
 
-#: strings.hrc:56
+#: filter/inc/strings.hrc:56
 msgctxt "T602FILTER_STR_DOT_COMMANDS"
 msgid "Display dot commands"
 msgstr "Dangos gorchmynion dot"
 
-#: strings.hrc:57
+#: filter/inc/strings.hrc:57
 msgctxt "T602FILTER_STR_CANCEL_BUTTON"
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: strings.hrc:58
+#: filter/inc/strings.hrc:58
 msgctxt "T602FILTER_STR_OK_BUTTON"
 msgid "OK"
 msgstr "Iawn"
 
-#: strings.hrc:60
+#: filter/inc/strings.hrc:60
 msgctxt "KEY_VERSION_CHECK"
 msgid ""
 "Warning: Not all of the imported EPS graphics could be saved at level1\n"
@@ -198,85 +198,85 @@ msgstr ""
 "Rhybudd: Nid oedd modd cadw pob graffig EPS mewnforiwyd ar lefel 1\n"
 "gan fod rhai ar lefel uwch!"
 
-#: strings.hrc:62
+#: filter/inc/strings.hrc:62
 msgctxt "PDF_PROGRESS_BAR"
 msgid "Export as PDF"
 msgstr "Allforio fel PDF"
 
 #. strings used in encryption UI
 #. password dialog title
-#: strings.hrc:66
+#: filter/inc/strings.hrc:66
 msgctxt "STR_PDF_EXPORT_UDPWD"
 msgid "Set open password"
 msgstr "Gosod cyfrinair agored"
 
 #. password dialog title
-#: strings.hrc:68
+#: filter/inc/strings.hrc:68
 msgctxt "STR_PDF_EXPORT_ODPWD"
 msgid "Set permission password"
 msgstr "Gosod cyfrinair caniatáu"
 
-#: strings.hrc:69
+#: filter/inc/strings.hrc:69
 msgctxt "STR_WARN_PASSWORD_PDFA"
 msgid "PDF/A does not allow encryption. The exported PDF file will not be password protected."
 msgstr "Nid yw PDF/A yn caniatáu amgryptio. Ni fydd diogelwch cyfrinair yn rhan o ddarpariaeth y ffeil PDF."
 
-#: strings.hrc:70
+#: filter/inc/strings.hrc:70
 msgctxt "STR_WARN_TRANSP_PDFA_SHORT"
 msgid "PDF/A transparency"
 msgstr "Tryloywder PDF/A"
 
-#: strings.hrc:71
+#: filter/inc/strings.hrc:71
 msgctxt "STR_WARN_TRANSP_PDFA"
 msgid "PDF/A forbids transparency. A transparent object was painted opaque instead."
 msgstr "Mae PDF/A yn gwahardd tryloywder. Cafodd gwrthrych tryloyw ei baentio'n afloyw."
 
-#: strings.hrc:72
+#: filter/inc/strings.hrc:72
 msgctxt "STR_WARN_TRANSP_VERSION_SHORT"
 msgid "PDF version conflict"
 msgstr "Gwrthdaro fersiwn PDF"
 
-#: strings.hrc:73
+#: filter/inc/strings.hrc:73
 msgctxt "STR_WARN_TRANSP_VERSION"
 msgid "Transparency is not supported in PDF versions earlier than PDF 1.4. A transparent object was painted opaque instead"
 msgstr "Nid yw tryloywder yn cael ei gynnal mewn fersiynau o PDF cyn fersiwn 1.4. Cafodd gwrthrych tryloyw ei baentio'n afloyw"
 
-#: strings.hrc:74
+#: filter/inc/strings.hrc:74
 msgctxt "STR_WARN_FORMACTION_PDFA_SHORT"
 msgid "PDF/A form action"
 msgstr "Gweithred ffurflen PDF/A"
 
-#: strings.hrc:75
+#: filter/inc/strings.hrc:75
 msgctxt "STR_WARN_FORMACTION_PDFA"
 msgid "A form control contained an action not supported by the PDF/A standard. The action was skipped"
 msgstr "Mae rheoli ffurflen wedi atal gweithred nad yw'n cael ei gynnal gan safon PDF/A. Hepgorwyd y weithred"
 
-#: strings.hrc:76
+#: filter/inc/strings.hrc:76
 msgctxt "STR_WARN_TRANSP_CONVERTED"
 msgid "Some objects were converted to an image in order to remove transparencies, because the target PDF format does not support transparencies. Possibly better results can be achieved if you remove the transparent objects before exporting."
 msgstr "Mae rhai gwrthrychau wedi eu trosi i ddelweddau er mwyn tynnu tryloywderau, gan nad yw fformat y PDF targed yn cynnal tryloywderau. Mae'n bosibl cael canlyniadau gwell drwy dynnu'r gwrthrychau tryloyw cyn allforio."
 
-#: strings.hrc:77
+#: filter/inc/strings.hrc:77
 msgctxt "STR_WARN_TRANSP_CONVERTED_SHORT"
 msgid "Transparencies removed"
 msgstr "Sleidiau wedi eu tynnu"
 
-#: strings.hrc:78
+#: filter/inc/strings.hrc:78
 msgctxt "STR_ERR_SIGNATURE_FAILED"
 msgid "Signature generation failed"
 msgstr "Methu cynhyrchu llofnod"
 
-#: strings.hrc:79
+#: filter/inc/strings.hrc:79
 msgctxt "STR_ERR_PDF_EXPORT_ABORTED"
 msgid "PDF export aborted"
 msgstr "Ataliwyd allforio'r PDF"
 
-#: impswfdialog.ui:14
+#: filter/uiconfig/ui/impswfdialog.ui:14
 msgctxt "impswfdialog|ImpSWFDialog"
 msgid "Flash (SWF) Options"
 msgstr "Dewisiadau Flash (SWF)"
 
-#: impswfdialog.ui:95
+#: filter/uiconfig/ui/impswfdialog.ui:95
 msgctxt "impswfdialog|label1"
 msgid ""
 "1: min. quality\n"
@@ -285,862 +285,862 @@ msgstr ""
 "1: ansawdd salaf\n"
 "100: ansawdd orau"
 
-#: impswfdialog.ui:136
+#: filter/uiconfig/ui/impswfdialog.ui:135
 msgctxt "impswfdialog|exportall"
 msgid "Export _all slides (uncheck to export current slide)"
 msgstr "Allforio _Pob Sleid (dad-dicio'n allforio'r sleid cyfredol)"
 
-#: impswfdialog.ui:158
+#: filter/uiconfig/ui/impswfdialog.ui:157
 msgctxt "impswfdialog|exportmultiplefiles"
 msgid "Export as _multiple files"
 msgstr "Allforio fel ffeiliau _lluosog"
 
-#: impswfdialog.ui:181
+#: filter/uiconfig/ui/impswfdialog.ui:180
 msgctxt "impswfdialog|exportbackgrounds"
 msgid "Export _backgrounds"
 msgstr "Allforio _cefndiroedd"
 
-#: impswfdialog.ui:198
+#: filter/uiconfig/ui/impswfdialog.ui:197
 msgctxt "impswfdialog|exportbackgroundobjects"
 msgid "Export back_ground objects"
 msgstr "Allforio gwrthrychau c_efndirol"
 
-#: impswfdialog.ui:215
+#: filter/uiconfig/ui/impswfdialog.ui:214
 msgctxt "impswfdialog|exportslidecontents"
 msgid "Export _slide contents"
 msgstr "Allforio c_ynnwys sleid"
 
-#: impswfdialog.ui:248
+#: filter/uiconfig/ui/impswfdialog.ui:247
 msgctxt "impswfdialog|exportsound"
 msgid "Export _Verilogix Slide Annotations"
 msgstr "Allforio Anodiadau Sleid _Verilogix"
 
-#: impswfdialog.ui:265
+#: filter/uiconfig/ui/impswfdialog.ui:264
 msgctxt "impswfdialog|exportoleasjpeg"
 msgid "Export OLE objects as _JPEG images"
 msgstr "Allforio gwrthrychau OLE fel delweddau _JPEG"
 
-#: pdfgeneralpage.ui:42
+#: filter/uiconfig/ui/pdfgeneralpage.ui:42
 msgctxt "pdfgeneralpage|all"
 msgid "_All"
 msgstr "_Pob Un"
 
-#: pdfgeneralpage.ui:60
+#: filter/uiconfig/ui/pdfgeneralpage.ui:60
 msgctxt "pdfgeneralpage|range"
 msgid "_Pages:"
 msgstr "_Tudalennau:"
 
-#: pdfgeneralpage.ui:79
+#: filter/uiconfig/ui/pdfgeneralpage.ui:79
 msgctxt "pdfgeneralpage|selection"
 msgid "_Selection"
 msgstr "_Dewis"
 
-#: pdfgeneralpage.ui:113
+#: filter/uiconfig/ui/pdfgeneralpage.ui:112
 msgctxt "pdfgeneralpage|slides"
 msgid "Slides:"
 msgstr "Sleidiau:"
 
-#: pdfgeneralpage.ui:125
+#: filter/uiconfig/ui/pdfgeneralpage.ui:124
 msgctxt "pdfgeneralpage|selectedsheets"
 msgid "_Selection/Selected sheet(s)"
 msgstr "Dalen(ni) _Dewis/Dewiswyd"
 
-#: pdfgeneralpage.ui:141
+#: filter/uiconfig/ui/pdfgeneralpage.ui:140
 msgctxt "pdfgeneralpage|label1"
 msgid "Range"
 msgstr "Ystod"
 
-#: pdfgeneralpage.ui:202
+#: filter/uiconfig/ui/pdfgeneralpage.ui:200
 msgctxt "pdfgeneralpage|label6"
 msgid "_Quality:"
 msgstr "_Ansawdd:"
 
-#: pdfgeneralpage.ui:227
+#: filter/uiconfig/ui/pdfgeneralpage.ui:225
 msgctxt "pdfgeneralpage|reduceresolution"
 msgid "_Reduce image resolution"
 msgstr "_Lleihau cydraniad delwedd"
 
-#: pdfgeneralpage.ui:249
+#: filter/uiconfig/ui/pdfgeneralpage.ui:247
 msgctxt "pdfgeneralpage|resolution"
 msgid "75 DPI"
 msgstr "75 DPI"
 
-#: pdfgeneralpage.ui:250
+#: filter/uiconfig/ui/pdfgeneralpage.ui:248
 msgctxt "pdfgeneralpage|resolution"
 msgid "150 DPI"
 msgstr "150 DPI"
 
-#: pdfgeneralpage.ui:251
+#: filter/uiconfig/ui/pdfgeneralpage.ui:249
 msgctxt "pdfgeneralpage|resolution"
 msgid "300 DPI"
 msgstr "300 DPI"
 
-#: pdfgeneralpage.ui:252
+#: filter/uiconfig/ui/pdfgeneralpage.ui:250
 msgctxt "pdfgeneralpage|resolution"
 msgid "600 DPI"
 msgstr "600 DPI"
 
-#: pdfgeneralpage.ui:253
+#: filter/uiconfig/ui/pdfgeneralpage.ui:251
 msgctxt "pdfgeneralpage|resolution"
 msgid "1200 DPI"
 msgstr "1200 DPI"
 
-#: pdfgeneralpage.ui:259
+#: filter/uiconfig/ui/pdfgeneralpage.ui:256
 msgctxt "pdfgeneralpage|comboboxtext-entry"
 msgid "75 DPI"
 msgstr "75 DPI"
 
-#: pdfgeneralpage.ui:283
+#: filter/uiconfig/ui/pdfgeneralpage.ui:280
 msgctxt "pdfgeneralpage|losslesscompress"
 msgid "_Lossless compression"
 msgstr "_Cywasgiad digoll"
 
-#: pdfgeneralpage.ui:300
+#: filter/uiconfig/ui/pdfgeneralpage.ui:297
 msgctxt "pdfgeneralpage|jpegcompress"
 msgid "_JPEG compression"
 msgstr "_Cywasgiad JPEG"
 
-#: pdfgeneralpage.ui:322
+#: filter/uiconfig/ui/pdfgeneralpage.ui:319
 msgctxt "pdfgeneralpage|label2"
 msgid "Images"
 msgstr "Delweddau"
 
-#: pdfgeneralpage.ui:354
+#: filter/uiconfig/ui/pdfgeneralpage.ui:351
 msgctxt "pdfgeneralpage|watermark"
 msgid "Sign with _watermark"
 msgstr "Llofnodi gyda _marc dŵr"
 
-#: pdfgeneralpage.ui:389
+#: filter/uiconfig/ui/pdfgeneralpage.ui:385
 msgctxt "pdfgeneralpage|watermarklabel"
 msgid "Text:"
 msgstr "Testun:"
 
-#: pdfgeneralpage.ui:409
+#: filter/uiconfig/ui/pdfgeneralpage.ui:405
 msgctxt "pdfgeneralpage|label3"
 msgid "Watermark"
 msgstr "Marc Dŵr"
 
-#: pdfgeneralpage.ui:446
+#: filter/uiconfig/ui/pdfgeneralpage.ui:442
 msgctxt "pdfgeneralpage|embed"
 msgid "Hybrid PDF (em_bed ODF file)"
 msgstr "PDF hybrid (_mewnblannu ffeil ODF)"
 
-#: pdfgeneralpage.ui:450
+#: filter/uiconfig/ui/pdfgeneralpage.ui:446
 msgctxt "pdfgeneralpage|embed|tooltip_text"
 msgid "Creates a PDF that is easily editable in %PRODUCTNAME"
 msgstr "Creu PDF sy'n hawdd ei olygu yn %PRODUCTNAME"
 
-#: pdfgeneralpage.ui:462
+#: filter/uiconfig/ui/pdfgeneralpage.ui:458
 msgctxt "pdfgeneralpage|pdfa"
 msgid "Archive P_DF/A-1a (ISO 19005-1)"
 msgstr "Archif P_DF/A-1a (ISO 19005-1)"
 
-#: pdfgeneralpage.ui:466
+#: filter/uiconfig/ui/pdfgeneralpage.ui:462
 msgctxt "pdfgeneralpage|pdfa|tooltip_text"
 msgid "Creates an ISO 19005-1 compliant PDF file, ideal for long-term document preservation"
 msgstr "Mae'n creu ffeil PDF sy'n cyd-fynd ag ISO 19005-1, sy'n ddelfrydol ar gyfer dogfen i'w chadw ar gyfer y tymor hir"
 
-#: pdfgeneralpage.ui:478
+#: filter/uiconfig/ui/pdfgeneralpage.ui:474
 msgctxt "pdfgeneralpage|tagged"
 msgid "_Tagged PDF (add document structure)"
 msgstr "PDF wedi ei _thagio (ychwanegu strwythur dogfen)"
 
-#: pdfgeneralpage.ui:482
+#: filter/uiconfig/ui/pdfgeneralpage.ui:478
 msgctxt "pdfgeneralpage|tagged|tooltip_text"
 msgid "Includes a document's content structure information in a PDF"
 msgstr "Yn cynnwys manylion strwythur cynnwys dogfen mewn PDF"
 
-#: pdfgeneralpage.ui:494
+#: filter/uiconfig/ui/pdfgeneralpage.ui:490
 msgctxt "pdfgeneralpage|forms"
 msgid "_Create PDF form"
 msgstr "­­_Creu ffurflen PDF"
 
-#: pdfgeneralpage.ui:498
+#: filter/uiconfig/ui/pdfgeneralpage.ui:494
 msgctxt "pdfgeneralpage|forms|tooltip_text"
 msgid "Creates a PDF with fields that can be filled out"
 msgstr "Creu PDF sydd â meysydd y mae modd eu llanw"
 
-#: pdfgeneralpage.ui:523
+#: filter/uiconfig/ui/pdfgeneralpage.ui:519
 msgctxt "pdfgeneralpage|label7"
 msgid "Submit _format:"
 msgstr "Cyflwyno _fformat:"
 
-#: pdfgeneralpage.ui:538
+#: filter/uiconfig/ui/pdfgeneralpage.ui:534
 msgctxt "pdfgeneralpage|format"
 msgid "FDF"
 msgstr "FDF"
 
-#: pdfgeneralpage.ui:539
+#: filter/uiconfig/ui/pdfgeneralpage.ui:535
 msgctxt "pdfgeneralpage|format"
 msgid "PDF"
 msgstr "PDF"
 
-#: pdfgeneralpage.ui:540
+#: filter/uiconfig/ui/pdfgeneralpage.ui:536
 msgctxt "pdfgeneralpage|format"
 msgid "HTML"
 msgstr "HTML"
 
-#: pdfgeneralpage.ui:541
+#: filter/uiconfig/ui/pdfgeneralpage.ui:537
 msgctxt "pdfgeneralpage|format"
 msgid "XML"
 msgstr "XML"
 
-#: pdfgeneralpage.ui:551
+#: filter/uiconfig/ui/pdfgeneralpage.ui:547
 msgctxt "pdfgeneralpage|allowdups"
 msgid "Allow duplicate field _names"
 msgstr "Caniatáu _enwau meysydd dyblyg"
 
-#: pdfgeneralpage.ui:575
+#: filter/uiconfig/ui/pdfgeneralpage.ui:571
 msgctxt "pdfgeneralpage|bookmarks"
 msgid "Export _bookmarks"
 msgstr "Allforio ­_nodau tudalen"
 
-#: pdfgeneralpage.ui:590
+#: filter/uiconfig/ui/pdfgeneralpage.ui:586
 msgctxt "pdfgeneralpage|exportplaceholders"
 msgid "Expo_rt placeholders"
 msgstr "_Allforio deilyddion lle"
 
-#: pdfgeneralpage.ui:605
+#: filter/uiconfig/ui/pdfgeneralpage.ui:601
 msgctxt "pdfgeneralpage|comments"
 msgid "_Export comments"
 msgstr "_Allforio nodiadau"
 
-#: pdfgeneralpage.ui:620
+#: filter/uiconfig/ui/pdfgeneralpage.ui:616
 msgctxt "pdfgeneralpage|emptypages"
 msgid "Exp_ort automatically inserted blank pages"
 msgstr "Allforio tudalennau _gwag mewnosodwyd yn awtomatig"
 
-#: pdfgeneralpage.ui:635
+#: filter/uiconfig/ui/pdfgeneralpage.ui:631
 msgctxt "pdfgeneralpage|viewpdf"
 msgid "_View PDF after export"
 msgstr "_Gweld PDF ar ôl allforio"
 
-#: pdfgeneralpage.ui:650
+#: filter/uiconfig/ui/pdfgeneralpage.ui:646
 msgctxt "pdfgeneralpage|usereferencexobject"
 msgid "Use reference XObjects"
 msgstr "Defnyddio cyfeiriadau XObjects"
 
-#: pdfgeneralpage.ui:665
+#: filter/uiconfig/ui/pdfgeneralpage.ui:661
 msgctxt "pdfgeneralpage|hiddenpages"
 msgid "Export _hidden pages"
 msgstr "Allforio tudalennau _cudd"
 
-#: pdfgeneralpage.ui:680
+#: filter/uiconfig/ui/pdfgeneralpage.ui:676
 msgctxt "pdfgeneralpage|notes"
 msgid "Export _notes pages"
 msgstr "Allforio tudalennau _nodiadau"
 
-#: pdfgeneralpage.ui:700
+#: filter/uiconfig/ui/pdfgeneralpage.ui:696
 msgctxt "pdfgeneralpage|onlynotes"
 msgid "Export onl_y notes pages"
 msgstr "Allforio dim ond tudalennau _nodiadau"
 
-#: pdfgeneralpage.ui:723
+#: filter/uiconfig/ui/pdfgeneralpage.ui:719
 msgctxt "pdfgeneralpage|label4"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: pdflinkspage.ui:29
+#: filter/uiconfig/ui/pdflinkspage.ui:29
 msgctxt "pdflinkspage|export"
 msgid "Export bookmarks as named destinations"
 msgstr "Allforio nodau tudalen fel cyrchfannau ag enwau"
 
-#: pdflinkspage.ui:47
+#: filter/uiconfig/ui/pdflinkspage.ui:47
 msgctxt "pdflinkspage|convert"
 msgid "_Convert document references to PDF targets"
 msgstr "_Trosi cyfeirnod dogfen i dargedau PDF"
 
-#: pdflinkspage.ui:65
+#: filter/uiconfig/ui/pdflinkspage.ui:65
 msgctxt "pdflinkspage|exporturl"
 msgid "Export _URLs relative to file system"
 msgstr "Allforio _URLau'n berthnasol i'r system ffeil"
 
-#: pdflinkspage.ui:89
+#: filter/uiconfig/ui/pdflinkspage.ui:89
 msgctxt "pdflinkspage|label1"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: pdflinkspage.ui:121
+#: filter/uiconfig/ui/pdflinkspage.ui:121
 msgctxt "pdflinkspage|default"
 msgid "Default mode"
 msgstr "Modd rhagosodedig"
 
-#: pdflinkspage.ui:140
+#: filter/uiconfig/ui/pdflinkspage.ui:140
 msgctxt "pdflinkspage|openpdf"
 msgid "Open with PDF reader application"
 msgstr "Agor gyda rhaglen darllen PDF"
 
-#: pdflinkspage.ui:158
+#: filter/uiconfig/ui/pdflinkspage.ui:158
 msgctxt "pdflinkspage|openinternet"
 msgid "Open _with Internet browser"
 msgstr "Agor _gyda phorwr Gwe"
 
-#: pdflinkspage.ui:182
+#: filter/uiconfig/ui/pdflinkspage.ui:182
 msgctxt "pdflinkspage|label5"
 msgid "Cross-document Links"
 msgstr "Cysylltiadau traws dogfen"
 
-#: pdfoptionsdialog.ui:8
+#: filter/uiconfig/ui/pdfoptionsdialog.ui:8
 msgctxt "pdfoptionsdialog|PdfOptionsDialog"
 msgid "PDF Options"
 msgstr "Dewisiadau PDF"
 
-#: pdfoptionsdialog.ui:22
+#: filter/uiconfig/ui/pdfoptionsdialog.ui:22
 msgctxt "pdfoptionsdialog|ok"
 msgid "E_xport"
 msgstr "A_llforio"
 
-#: pdfoptionsdialog.ui:92
+#: filter/uiconfig/ui/pdfoptionsdialog.ui:92
 msgctxt "pdfoptionsdialog|general"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: pdfoptionsdialog.ui:114
+#: filter/uiconfig/ui/pdfoptionsdialog.ui:114
 msgctxt "pdfoptionsdialog|initialview"
 msgid "Initial View"
 msgstr "Golwg Gyntaf"
 
-#: pdfoptionsdialog.ui:137
+#: filter/uiconfig/ui/pdfoptionsdialog.ui:137
 msgctxt "pdfoptionsdialog|userinterface"
 msgid "User Interface"
 msgstr "Rhyngwyneb Defnyddiwr"
 
-#: pdfoptionsdialog.ui:160
+#: filter/uiconfig/ui/pdfoptionsdialog.ui:160
 msgctxt "pdfoptionsdialog|links"
 msgid "Links"
 msgstr "Cysylltiadau"
 
-#: pdfoptionsdialog.ui:183
+#: filter/uiconfig/ui/pdfoptionsdialog.ui:183
 msgctxt "pdfoptionsdialog|security"
 msgid "Security"
 msgstr "Diogelwch"
 
-#: pdfoptionsdialog.ui:206
+#: filter/uiconfig/ui/pdfoptionsdialog.ui:206
 msgctxt "pdfoptionsdialog|digitalsignatures"
 msgid "Digital Signatures"
 msgstr "Llofnodion Digidol"
 
-#: pdfsecuritypage.ui:30
+#: filter/uiconfig/ui/pdfsecuritypage.ui:30
 msgctxt "pdfsecuritypage|setpassword"
 msgid "Set _Passwords…"
 msgstr "Gosod Cy_frineiriau…"
 
-#: pdfsecuritypage.ui:53
+#: filter/uiconfig/ui/pdfsecuritypage.ui:53
 msgctxt "pdfsecuritypage|label5"
 msgid "Open password set"
 msgstr "Agor y cyfrinair gosod"
 
-#: pdfsecuritypage.ui:65
+#: filter/uiconfig/ui/pdfsecuritypage.ui:65
 msgctxt "pdfsecuritypage|label6"
 msgid "PDF document will be encrypted"
 msgstr "Nid fydd y PDF yn cael ei amgryptio"
 
-#: pdfsecuritypage.ui:88
+#: filter/uiconfig/ui/pdfsecuritypage.ui:88
 msgctxt "pdfsecuritypage|label7"
 msgid "No open password set"
 msgstr "Dim cyfrinair agored wedi ei osod"
 
-#: pdfsecuritypage.ui:100
+#: filter/uiconfig/ui/pdfsecuritypage.ui:100
 msgctxt "pdfsecuritypage|label8"
 msgid "PDF document will not be encrypted"
 msgstr "Nid fydd y PDF yn cael ei amgryptio"
 
-#: pdfsecuritypage.ui:123
+#: filter/uiconfig/ui/pdfsecuritypage.ui:123
 msgctxt "pdfsecuritypage|label30"
 msgid "PDF document will not be encrypted due to PDF/A export."
 msgstr "Ni fydd y ddogfen PDF yn cael ei hamgryptio oherwydd allforio PDF/A."
 
-#: pdfsecuritypage.ui:147
+#: filter/uiconfig/ui/pdfsecuritypage.ui:147
 msgctxt "pdfsecuritypage|label9"
 msgid "Permission password set"
 msgstr "Gosod cyfrinair caniatáu"
 
-#: pdfsecuritypage.ui:159
+#: filter/uiconfig/ui/pdfsecuritypage.ui:159
 msgctxt "pdfsecuritypage|label11"
 msgid "PDF document will be restricted"
 msgstr "Bydd y ddogfen PDF yn cael ei chyfyngu"
 
-#: pdfsecuritypage.ui:182
+#: filter/uiconfig/ui/pdfsecuritypage.ui:182
 msgctxt "pdfsecuritypage|label12"
 msgid "No permission password set"
 msgstr "Dim cyfrinair caniatâd wedi ei osod"
 
-#: pdfsecuritypage.ui:194
+#: filter/uiconfig/ui/pdfsecuritypage.ui:194
 msgctxt "pdfsecuritypage|label13"
 msgid "PDF document will be unrestricted"
 msgstr "Bydd y ddogfen PDF yn ddigyfyngiad"
 
-#: pdfsecuritypage.ui:217
+#: filter/uiconfig/ui/pdfsecuritypage.ui:217
 msgctxt "pdfsecuritypage|label14"
 msgid "PDF document will not be restricted due to PDF/A export."
 msgstr "Ni fydd y ddogfen PDF yn cael ei chyfyngu oherwydd PDF/A."
 
-#: pdfsecuritypage.ui:237
+#: filter/uiconfig/ui/pdfsecuritypage.ui:237
 msgctxt "pdfsecuritypage|setpasswordstitle"
 msgid "Set Passwords"
 msgstr "Gosod Cyfrineiriau"
 
-#: pdfsecuritypage.ui:253
+#: filter/uiconfig/ui/pdfsecuritypage.ui:253
 msgctxt "pdfsecuritypage|label2"
 msgid "File Encryption and Permission"
 msgstr "Amgryptiad a Chaniatâd Ffeil"
 
-#: pdfsecuritypage.ui:291
+#: filter/uiconfig/ui/pdfsecuritypage.ui:291
 msgctxt "pdfsecuritypage|printnone"
 msgid "_Not permitted"
 msgstr "_Dim caniatâd"
 
-#: pdfsecuritypage.ui:307
+#: filter/uiconfig/ui/pdfsecuritypage.ui:307
 msgctxt "pdfsecuritypage|printlow"
 msgid "_Low resolution (150 dpi)"
 msgstr "_Cydraniad isel (150dpi)"
 
-#: pdfsecuritypage.ui:323
+#: filter/uiconfig/ui/pdfsecuritypage.ui:323
 msgctxt "pdfsecuritypage|printhigh"
 msgid "_High resolution"
 msgstr "_Cydraniad uchel"
 
-#: pdfsecuritypage.ui:346
+#: filter/uiconfig/ui/pdfsecuritypage.ui:346
 msgctxt "pdfsecuritypage|label1"
 msgid "Printing"
 msgstr "Argraffu"
 
-#: pdfsecuritypage.ui:378
+#: filter/uiconfig/ui/pdfsecuritypage.ui:378
 msgctxt "pdfsecuritypage|changenone"
 msgid "No_t permitted"
 msgstr "_Dim caniatâd"
 
-#: pdfsecuritypage.ui:394
+#: filter/uiconfig/ui/pdfsecuritypage.ui:394
 msgctxt "pdfsecuritypage|changeinsdel"
 msgid "_Inserting, deleting, and rotating pages"
 msgstr "_Mewnosod, dileu a throi tudalennau"
 
-#: pdfsecuritypage.ui:410
+#: filter/uiconfig/ui/pdfsecuritypage.ui:410
 msgctxt "pdfsecuritypage|changeform"
 msgid "_Filling in form fields"
 msgstr "_Llenwi meysydd ffurflen"
 
-#: pdfsecuritypage.ui:426
+#: filter/uiconfig/ui/pdfsecuritypage.ui:426
 msgctxt "pdfsecuritypage|changecomment"
 msgid "_Commenting, filling in form fields"
 msgstr "_Sylwadau, llenwi meysydd ffurflen"
 
-#: pdfsecuritypage.ui:442
+#: filter/uiconfig/ui/pdfsecuritypage.ui:442
 msgctxt "pdfsecuritypage|changeany"
 msgid "_Any except extracting pages"
 msgstr "_Unrhyw beth heblaw echdynnu tudalennau"
 
-#: pdfsecuritypage.ui:465
+#: filter/uiconfig/ui/pdfsecuritypage.ui:465
 msgctxt "pdfsecuritypage|label3"
 msgid "Changes"
 msgstr "Newidiadau"
 
-#: pdfsecuritypage.ui:497
+#: filter/uiconfig/ui/pdfsecuritypage.ui:497
 msgctxt "pdfsecuritypage|enablecopy"
 msgid "Ena_ble copying of content"
 msgstr "_Galluogi copïo’r cynnwys"
 
-#: pdfsecuritypage.ui:513
+#: filter/uiconfig/ui/pdfsecuritypage.ui:513
 msgctxt "pdfsecuritypage|enablea11y"
 msgid "Enable text access for acce_ssibility tools"
 msgstr "_Galluogi mynediad testun ar gyfer offer mynediad"
 
-#: pdfsecuritypage.ui:535
+#: filter/uiconfig/ui/pdfsecuritypage.ui:535
 msgctxt "pdfsecuritypage|label4"
 msgid "Content"
 msgstr "Cynnwys"
 
-#: pdfsignpage.ui:37
+#: filter/uiconfig/ui/pdfsignpage.ui:37
 msgctxt "pdfsignpage|label2"
 msgid "Use this certificate to digitally sign PDF documents:"
 msgstr "Defnyddio'r dystysgrif i lofnodi'n ddigidol dogfennau PDF:"
 
-#: pdfsignpage.ui:60
+#: filter/uiconfig/ui/pdfsignpage.ui:59
 msgctxt "pdfsignpage|select"
 msgid "Select..."
 msgstr "Dewis..."
 
-#: pdfsignpage.ui:159
+#: filter/uiconfig/ui/pdfsignpage.ui:154
 msgctxt "pdfsignpage|tsa"
 msgid "None"
 msgstr "Dim"
 
-#: pdfsignpage.ui:172
+#: filter/uiconfig/ui/pdfsignpage.ui:167
 msgctxt "pdfsignpage|label7"
 msgid "Certificate password:"
 msgstr "Cyfrinair tystysgrif:"
 
-#: pdfsignpage.ui:186
+#: filter/uiconfig/ui/pdfsignpage.ui:181
 msgctxt "pdfsignpage|label12"
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: pdfsignpage.ui:200
+#: filter/uiconfig/ui/pdfsignpage.ui:195
 msgctxt "pdfsignpage|label13"
 msgid "Contact information:"
 msgstr "Manylion cysylltu:"
 
-#: pdfsignpage.ui:214
+#: filter/uiconfig/ui/pdfsignpage.ui:209
 msgctxt "pdfsignpage|label14"
 msgid "Reason:"
 msgstr "Rheswm:"
 
-#: pdfsignpage.ui:228
+#: filter/uiconfig/ui/pdfsignpage.ui:223
 msgctxt "pdfsignpage|label15"
 msgid "Time Stamp Authority:"
 msgstr "Awdurdod Stamp Amser:"
 
-#: pdfsignpage.ui:251
+#: filter/uiconfig/ui/pdfsignpage.ui:246
 msgctxt "pdfsignpage|label1"
 msgid "Certificate"
 msgstr "Tystysgrif"
 
-#: pdfuserinterfacepage.ui:43
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:43
 msgctxt "pdfuserinterfacepage|center"
 msgid "_Center window on screen"
 msgstr "_Canoli'r ffenestr ar y sgrin"
 
-#: pdfuserinterfacepage.ui:59
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:59
 msgctxt "pdfuserinterfacepage|resize"
 msgid "_Resize window to initial page"
 msgstr "_Ail-feintioli ffenestr i'r dudalen gyntaf"
 
-#: pdfuserinterfacepage.ui:75
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:75
 msgctxt "pdfuserinterfacepage|open"
 msgid "_Open in full screen mode"
 msgstr "_Agor ym modd sgrin lawn"
 
-#: pdfuserinterfacepage.ui:91
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:91
 msgctxt "pdfuserinterfacepage|display"
 msgid "_Display document title"
 msgstr "_Dangos teitl y ddogfen"
 
-#: pdfuserinterfacepage.ui:113
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:113
 msgctxt "pdfuserinterfacepage|label1"
 msgid "Window Options"
 msgstr "Dewisiadau Ffenestr"
 
-#: pdfuserinterfacepage.ui:144
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:144
 msgctxt "pdfuserinterfacepage|toolbar"
 msgid "Hide _toolbar"
 msgstr "Cuddio'r bar _offer"
 
-#: pdfuserinterfacepage.ui:160
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:160
 msgctxt "pdfuserinterfacepage|menubar"
 msgid "Hide _menubar"
 msgstr "Cuddio'r bar _dewis"
 
-#: pdfuserinterfacepage.ui:176
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:176
 msgctxt "pdfuserinterfacepage|window"
 msgid "Hide _window controls"
 msgstr "Cuddio _rheolyddion ffenestr"
 
-#: pdfuserinterfacepage.ui:198
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:198
 msgctxt "pdfuserinterfacepage|label2"
 msgid "User Interface Options"
 msgstr "Dewisiadau Rhyngwyneb Defnyddiwr"
 
-#: pdfuserinterfacepage.ui:228
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:228
 msgctxt "pdfuserinterfacepage|effects"
 msgid "_Use transition effects"
 msgstr "_Defnyddio effeithiau trawsnewid"
 
-#: pdfuserinterfacepage.ui:250
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:250
 msgctxt "pdfuserinterfacepage|label3"
 msgid "Transitions"
 msgstr "Trawsnewid"
 
-#: pdfuserinterfacepage.ui:282
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:282
 msgctxt "pdfuserinterfacepage|allbookmarks"
 msgid "_All bookmark levels"
 msgstr "_Pob lefel nod tudalen"
 
-#: pdfuserinterfacepage.ui:299
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:299
 msgctxt "pdfuserinterfacepage|visiblebookmark"
 msgid "_Visible bookmark levels:"
 msgstr "_Lefelau nodau tudalen gweladwy:"
 
-#: pdfuserinterfacepage.ui:343
+#: filter/uiconfig/ui/pdfuserinterfacepage.ui:342
 msgctxt "pdfuserinterfacepage|label4"
 msgid "Bookmarks"
 msgstr "Nodau Tudalen"
 
-#: pdfviewpage.ui:49
+#: filter/uiconfig/ui/pdfviewpage.ui:49
 msgctxt "pdfviewpage|pageonly"
 msgid "_Page only"
 msgstr "_Tudalen yn unig"
 
-#: pdfviewpage.ui:66
+#: filter/uiconfig/ui/pdfviewpage.ui:66
 msgctxt "pdfviewpage|outline"
 msgid "_Bookmarks and page"
 msgstr "_Nodau tudalen a thudalen"
 
-#: pdfviewpage.ui:82
+#: filter/uiconfig/ui/pdfviewpage.ui:82
 msgctxt "pdfviewpage|thumbs"
 msgid "_Thumbnails and page"
 msgstr "_Lluniau bach a thudalen"
 
-#: pdfviewpage.ui:106
+#: filter/uiconfig/ui/pdfviewpage.ui:106
 msgctxt "pdfviewpage|label4"
 msgid "Open on pa_ge:"
 msgstr "_Agor ar dudalen:"
 
-#: pdfviewpage.ui:141
+#: filter/uiconfig/ui/pdfviewpage.ui:140
 msgctxt "pdfviewpage|label2"
 msgid "Panes"
 msgstr "Paenau"
 
-#: pdfviewpage.ui:173
+#: filter/uiconfig/ui/pdfviewpage.ui:172
 msgctxt "pdfviewpage|fitdefault"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: pdfviewpage.ui:190
+#: filter/uiconfig/ui/pdfviewpage.ui:189
 msgctxt "pdfviewpage|fitwin"
 msgid "_Fit in window"
 msgstr "_Ffitio i'r ffenestr"
 
-#: pdfviewpage.ui:206
+#: filter/uiconfig/ui/pdfviewpage.ui:205
 msgctxt "pdfviewpage|fitwidth"
 msgid "Fit _width"
 msgstr "_Ffitio'r lled"
 
-#: pdfviewpage.ui:222
+#: filter/uiconfig/ui/pdfviewpage.ui:221
 msgctxt "pdfviewpage|fitvis"
 msgid "Fit _visible"
 msgstr "Ffitio'r _gweladwy"
 
-#: pdfviewpage.ui:243
+#: filter/uiconfig/ui/pdfviewpage.ui:242
 msgctxt "pdfviewpage|fitzoom"
 msgid "_Zoom factor:"
 msgstr "_Ffactor chwyddo:"
 
-#: pdfviewpage.ui:289
+#: filter/uiconfig/ui/pdfviewpage.ui:287
 msgctxt "pdfviewpage|label3"
 msgid "Magnification"
 msgstr "Chwyddiad"
 
-#: pdfviewpage.ui:328
+#: filter/uiconfig/ui/pdfviewpage.ui:326
 msgctxt "pdfviewpage|defaultlayout"
 msgid "D_efault"
 msgstr "R_hagosodedig"
 
-#: pdfviewpage.ui:345
+#: filter/uiconfig/ui/pdfviewpage.ui:343
 msgctxt "pdfviewpage|singlelayout"
 msgid "_Single page"
 msgstr "_Tudalen unigol"
 
-#: pdfviewpage.ui:361
+#: filter/uiconfig/ui/pdfviewpage.ui:359
 msgctxt "pdfviewpage|contlayout"
 msgid "_Continuous"
 msgstr "_Di-dor"
 
-#: pdfviewpage.ui:377
+#: filter/uiconfig/ui/pdfviewpage.ui:375
 msgctxt "pdfviewpage|contfacinglayout"
 msgid "C_ontinuous facing"
 msgstr "D_i-dor gwynebu"
 
-#: pdfviewpage.ui:393
+#: filter/uiconfig/ui/pdfviewpage.ui:391
 msgctxt "pdfviewpage|firstonleft"
 msgid "First page is _left"
 msgstr "Tudalen gyntaf yw'r _chwith"
 
-#: pdfviewpage.ui:415
+#: filter/uiconfig/ui/pdfviewpage.ui:413
 msgctxt "pdfviewpage|label1"
 msgid "Page Layout"
 msgstr "Gosodiad Tudalen"
 
-#: testxmlfilter.ui:8
+#: filter/uiconfig/ui/testxmlfilter.ui:8
 msgctxt "testxmlfilter|TestXMLFilterDialog"
 msgid "Test XML Filter: %s"
 msgstr "Prawf Hidl XML: %s"
 
-#: testxmlfilter.ui:89
+#: filter/uiconfig/ui/testxmlfilter.ui:91
 msgctxt "testxmlfilter|label3"
 msgid "XSLT for export"
 msgstr "XSLT i'w fewnforio"
 
-#: testxmlfilter.ui:102
+#: filter/uiconfig/ui/testxmlfilter.ui:104
 msgctxt "testxmlfilter|label4"
 msgid "Transform document"
 msgstr "Trawsnewid dogfen"
 
-#: testxmlfilter.ui:111
+#: filter/uiconfig/ui/testxmlfilter.ui:114
 msgctxt "testxmlfilter|exportbrowse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: testxmlfilter.ui:123
+#: filter/uiconfig/ui/testxmlfilter.ui:126
 msgctxt "testxmlfilter|currentdocument"
 msgid "Current Document"
 msgstr "Dogfen Gyfredol"
 
-#: testxmlfilter.ui:168
+#: filter/uiconfig/ui/testxmlfilter.ui:171
 msgctxt "testxmlfilter|label1"
 msgid "Export"
 msgstr "Allforio"
 
-#: testxmlfilter.ui:205
+#: filter/uiconfig/ui/testxmlfilter.ui:207
 msgctxt "testxmlfilter|label5"
 msgid "XSLT for import"
 msgstr "XSLT i'w fewnforio"
 
-#: testxmlfilter.ui:214
+#: filter/uiconfig/ui/testxmlfilter.ui:217
 msgctxt "testxmlfilter|importbrowse"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: testxmlfilter.ui:226
+#: filter/uiconfig/ui/testxmlfilter.ui:229
 msgctxt "testxmlfilter|recentfile"
 msgid "Recent File"
 msgstr "Ffeil Diweddar"
 
-#: testxmlfilter.ui:242
+#: filter/uiconfig/ui/testxmlfilter.ui:244
 msgctxt "testxmlfilter|templateimport"
 msgid "Template for import"
 msgstr "Templed i'w fewnforio"
 
-#: testxmlfilter.ui:262
+#: filter/uiconfig/ui/testxmlfilter.ui:265
 msgctxt "testxmlfilter|displaysource"
 msgid "Display source"
 msgstr "Dangos ffynhonnell"
 
-#: testxmlfilter.ui:281
+#: filter/uiconfig/ui/testxmlfilter.ui:283
 msgctxt "testxmlfilter|label6"
 msgid "Transform file"
 msgstr "Trawsnewid ffeil"
 
-#: testxmlfilter.ui:326
+#: filter/uiconfig/ui/testxmlfilter.ui:329
 msgctxt "testxmlfilter|label2"
 msgid "Import"
 msgstr "Mewnforio"
 
-#: warnpdfdialog.ui:9
+#: filter/uiconfig/ui/warnpdfdialog.ui:19
 msgctxt "warnpdfdialog|WarnPDFDialog"
 msgid "Problems During PDF Export"
 msgstr "Anawsterau wrth Allforio PDF"
 
-#: warnpdfdialog.ui:15
+#: filter/uiconfig/ui/warnpdfdialog.ui:26
 msgctxt "warnpdfdialog|WarnPDFDialog"
 msgid "During PDF export the following problems occurred:"
 msgstr "Wrth allforio'r PDF digwyddodd yr anawsterau canlynol:"
 
-#: xmlfiltersettings.ui:9
+#: filter/uiconfig/ui/xmlfiltersettings.ui:9
 msgctxt "xmlfiltersettings|XMLFilterSettingsDialog"
 msgid "XML Filter Settings"
 msgstr "Gosodiadau Hidl XML"
 
-#: xmlfiltersettings.ui:24
+#: filter/uiconfig/ui/xmlfiltersettings.ui:24
 msgctxt "xmlfiltersettings|new"
 msgid "_New..."
 msgstr "_Newydd..."
 
-#: xmlfiltersettings.ui:38
+#: filter/uiconfig/ui/xmlfiltersettings.ui:38
 msgctxt "xmlfiltersettings|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: xmlfiltersettings.ui:52
+#: filter/uiconfig/ui/xmlfiltersettings.ui:52
 msgctxt "xmlfiltersettings|test"
 msgid "_Test XSLTs..."
 msgstr "_Prawf XSLTs..."
 
-#: xmlfiltersettings.ui:66
+#: filter/uiconfig/ui/xmlfiltersettings.ui:66
 msgctxt "xmlfiltersettings|delete"
 msgid "_Delete..."
 msgstr "_Dileu..."
 
-#: xmlfiltersettings.ui:80
+#: filter/uiconfig/ui/xmlfiltersettings.ui:80
 msgctxt "xmlfiltersettings|save"
 msgid "_Save as Package..."
 msgstr "_Cadw fel Pecyn..."
 
-#: xmlfiltersettings.ui:94
+#: filter/uiconfig/ui/xmlfiltersettings.ui:94
 msgctxt "xmlfiltersettings|open"
 msgid "_Open Package..."
 msgstr "_Agor Pecyn..."
 
-#: xmlfiltersettings.ui:151
+#: filter/uiconfig/ui/xmlfiltersettings.ui:151
 msgctxt "xmlfiltersettings|filterlist-atkobject"
 msgid "XML Filter List"
 msgstr "Rhestr Hidl XML"
 
-#: xmlfiltertabpagegeneral.ui:23
+#: filter/uiconfig/ui/xmlfiltertabpagegeneral.ui:22
 msgctxt "xmlfiltertabpagegeneral|label2"
 msgid "_Filter name:"
 msgstr "_Enw hidl:"
 
-#: xmlfiltertabpagegeneral.ui:37
+#: filter/uiconfig/ui/xmlfiltertabpagegeneral.ui:36
 msgctxt "xmlfiltertabpagegeneral|label3"
 msgid "_Application:"
 msgstr "_Rhaglen:"
 
-#: xmlfiltertabpagegeneral.ui:51
+#: filter/uiconfig/ui/xmlfiltertabpagegeneral.ui:50
 msgctxt "xmlfiltertabpagegeneral|label4"
 msgid "_Name of file type:"
 msgstr "_Rhowch enw ffeil ddilys:"
 
-#: xmlfiltertabpagegeneral.ui:65
+#: filter/uiconfig/ui/xmlfiltertabpagegeneral.ui:64
 msgctxt "xmlfiltertabpagegeneral|label5"
 msgid "File _extension:"
 msgstr "_Estyniad ffeil:"
 
-#: xmlfiltertabpagegeneral.ui:80
+#: filter/uiconfig/ui/xmlfiltertabpagegeneral.ui:78
 msgctxt "xmlfiltertabpagegeneral|label6"
 msgid "Comment_s:"
 msgstr "_Sylwadau:"
 
-#: xmlfiltertabpagetransformation.ui:25
+#: filter/uiconfig/ui/xmlfiltertabpagetransformation.ui:23
 msgctxt "xmlfiltertabpagetransformation|label2"
 msgid "_DocType:"
 msgstr "Math o _Ddogfen:"
 
-#: xmlfiltertabpagetransformation.ui:52
+#: filter/uiconfig/ui/xmlfiltertabpagetransformation.ui:50
 msgctxt "xmlfiltertabpagetransformation|label4"
 msgid "_XSLT for export:"
 msgstr "_XSLT i'w fewnforio:"
 
-#: xmlfiltertabpagetransformation.ui:63
+#: filter/uiconfig/ui/xmlfiltertabpagetransformation.ui:62
 msgctxt "xmlfiltertabpagetransformation|browseexport"
 msgid "Brows_e..."
 msgstr "_Pori..."
 
-#: xmlfiltertabpagetransformation.ui:79
+#: filter/uiconfig/ui/xmlfiltertabpagetransformation.ui:77
 msgctxt "xmlfiltertabpagetransformation|label5"
 msgid "XSLT _for import:"
 msgstr "XSLT i'w _fewnforio:"
 
-#: xmlfiltertabpagetransformation.ui:90
+#: filter/uiconfig/ui/xmlfiltertabpagetransformation.ui:89
 msgctxt "xmlfiltertabpagetransformation|browseimport"
 msgid "B_rowse..."
 msgstr "_Pori..."
 
-#: xmlfiltertabpagetransformation.ui:106
+#: filter/uiconfig/ui/xmlfiltertabpagetransformation.ui:104
 msgctxt "xmlfiltertabpagetransformation|label6"
 msgid "Template for _import:"
 msgstr "Templed i'w _fewnforio:"
 
-#: xmlfiltertabpagetransformation.ui:117
+#: filter/uiconfig/ui/xmlfiltertabpagetransformation.ui:116
 msgctxt "xmlfiltertabpagetransformation|browsetemp"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: xmlfiltertabpagetransformation.ui:175
+#: filter/uiconfig/ui/xmlfiltertabpagetransformation.ui:189
 msgctxt "xmlfiltertabpagetransformation|filtercb"
 msgid "The filter needs XSLT 2.0 processor"
 msgstr "Mae angen prosesydd XSLT 2.0 ar yr hidl"
 
-#: xsltfilterdialog.ui:8
+#: filter/uiconfig/ui/xsltfilterdialog.ui:8
 msgctxt "xsltfilterdialog|XSLTFilterDialog"
 msgid "XML Filter: %s"
 msgstr "Hidl XML: %s"
 
-#: xsltfilterdialog.ui:92
+#: filter/uiconfig/ui/xsltfilterdialog.ui:119
 msgctxt "xsltfilterdialog|general"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: xsltfilterdialog.ui:114
+#: filter/uiconfig/ui/xsltfilterdialog.ui:165
 msgctxt "xsltfilterdialog|transformation"
 msgid "Transformation"
 msgstr "Trawsnewidiad"
diff --git a/source/cy/filter/source/config/fragments/filters.po b/source/cy/filter/source/config/fragments/filters.po
index 25430600a46..e4520bcec0d 100644
--- a/source/cy/filter/source/config/fragments/filters.po
+++ b/source/cy/filter/source/config/fragments/filters.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-12-06 15:59+0100\n"
-"PO-Revision-Date: 2017-12-22 11:04+0000\n"
+"POT-Creation-Date: 2018-04-23 18:11+0200\n"
+"PO-Revision-Date: 2018-03-01 09:08+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,8 +13,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1513940668.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1519895315.000000\n"
 
 #: ADO_rowset_XML.xcu
 msgctxt ""
@@ -40,8 +40,8 @@ msgctxt ""
 "Apple Keynote\n"
 "UIName\n"
 "value.text"
-msgid "Apple Keynote 5"
-msgstr "Apple Keynote 5"
+msgid "Apple Keynote"
+msgstr ""
 
 #: AppleNumbers.xcu
 msgctxt ""
@@ -49,8 +49,8 @@ msgctxt ""
 "Apple Numbers\n"
 "UIName\n"
 "value.text"
-msgid "Apple Numbers 2"
-msgstr "Rhifau Apple 2"
+msgid "Apple Numbers"
+msgstr ""
 
 #: ApplePages.xcu
 msgctxt ""
@@ -58,8 +58,8 @@ msgctxt ""
 "Apple Pages\n"
 "UIName\n"
 "value.text"
-msgid "Apple Pages 4"
-msgstr "Tudalennau Apple 4"
+msgid "Apple Pages"
+msgstr ""
 
 #: BMP___MS_Windows.xcu
 msgctxt ""
@@ -322,6 +322,15 @@ msgctxt ""
 msgid "Microsoft Excel 2003 XML"
 msgstr "Microsoft Excel 2003 XML"
 
+#: MS_Excel_2003_XML_Orcus.xcu
+msgctxt ""
+"MS_Excel_2003_XML_Orcus.xcu\n"
+"MS Excel 2003 XML Orcus\n"
+"UIName\n"
+"value.text"
+msgid "Microsoft Excel 2003 XML"
+msgstr "Microsoft Excel 2003 XML"
+
 #: MS_Excel_4_0.xcu
 msgctxt ""
 "MS_Excel_4_0.xcu\n"
@@ -454,8 +463,8 @@ msgctxt ""
 "MS Word 2007 XML\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft Word 2007-2013 XML"
-msgstr "Microsoft Word 97-2003 XML"
+msgid "Microsoft Word OOXML"
+msgstr ""
 
 #: MS_Word_2007_XML_Template.xcu
 msgctxt ""
@@ -463,8 +472,8 @@ msgctxt ""
 "MS Word 2007 XML Template\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft Word 2007-2013 XML Template"
-msgstr "Templed XML Microsoft Word 2007-2013"
+msgid "Microsoft Word OOXML Template"
+msgstr ""
 
 #: MS_Word_2007_XML_VBA.xcu
 msgctxt ""
@@ -472,8 +481,8 @@ msgctxt ""
 "MS Word 2007 XML VBA\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft Word 2007-2013 XML VBA"
-msgstr "Microsoft Word 2007-2013 XML VBA"
+msgid "Microsoft Word OOXML VBA"
+msgstr ""
 
 #: MS_Word_95.xcu
 msgctxt ""
@@ -1273,8 +1282,8 @@ msgctxt ""
 "Calc MS Excel 2007 XML\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft Excel 2007-2013 XML"
-msgstr "Microsoft Excel 2007-2013 XML"
+msgid "Microsoft Excel OOXML"
+msgstr ""
 
 #: calc_MS_Excel_2007_XML_Template.xcu
 msgctxt ""
@@ -1282,8 +1291,8 @@ msgctxt ""
 "Calc MS Excel 2007 XML Template\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft Excel 2007-2013 XML Template"
-msgstr "Templed XML Microsoft Excel 2007-2013"
+msgid "Microsoft Excel OOXML Template"
+msgstr ""
 
 #: calc_OOXML.xcu
 msgctxt ""
@@ -1552,8 +1561,8 @@ msgctxt ""
 "Impress MS PowerPoint 2007 XML\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft PowerPoint 2007-2013 XML"
-msgstr "Microsoft PowerPoint 2007-2013 XML"
+msgid "Microsoft PowerPoint OOXML"
+msgstr ""
 
 #: impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
 msgctxt ""
@@ -1561,8 +1570,8 @@ msgctxt ""
 "Impress MS PowerPoint 2007 XML AutoPlay\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft PowerPoint 2007-2013 XML AutoPlay"
-msgstr "Awto Chwarae Microsoft PowerPoint 2007-2013 XML"
+msgid "Microsoft PowerPoint OOXML AutoPlay"
+msgstr ""
 
 #: impress_MS_PowerPoint_2007_XML_Template.xcu
 msgctxt ""
@@ -1570,8 +1579,8 @@ msgctxt ""
 "Impress MS PowerPoint 2007 XML Template\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft PowerPoint 2007-2013 XML Template"
-msgstr "Templed XML Microsoft PowerPoint 2007-2013"
+msgid "Microsoft PowerPoint OOXML Template"
+msgstr ""
 
 #: impress_MS_PowerPoint_2007_XML_VBA.xcu
 msgctxt ""
@@ -1579,8 +1588,8 @@ msgctxt ""
 "Impress MS PowerPoint 2007 XML VBA\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft PowerPoint 2007-2013 XML VBA"
-msgstr "Microsoft PowerPoint 2007-2013 XML VBA"
+msgid "Microsoft PowerPoint OOXML VBA"
+msgstr ""
 
 #: impress_OOXML.xcu
 msgctxt ""
diff --git a/source/cy/filter/source/config/fragments/types.po b/source/cy/filter/source/config/fragments/types.po
index a4b3b93ce00..88db08ffefb 100644
--- a/source/cy/filter/source/config/fragments/types.po
+++ b/source/cy/filter/source/config/fragments/types.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
+"POT-Creation-Date: 2018-04-23 18:11+0200\n"
 "PO-Revision-Date: 2017-10-06 13:52+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1507297953.000000\n"
 
 #: MS_Excel_2007_Binary.xcu
@@ -40,8 +40,8 @@ msgctxt ""
 "MS Excel 2007 XML\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft Excel 2007-2013 XML"
-msgstr "Microsoft Excel 2007-2013 XML"
+msgid "Microsoft Excel OOXML"
+msgstr ""
 
 #: MS_Excel_2007_XML_Template.xcu
 msgctxt ""
@@ -49,8 +49,8 @@ msgctxt ""
 "MS Excel 2007 XML Template\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft Excel 2007-2013 XML Template"
-msgstr "Templed XML Microsoft Excel 2007-2013"
+msgid "Microsoft Excel OOXML Template"
+msgstr ""
 
 #: MS_PowerPoint_2007_XML.xcu
 msgctxt ""
@@ -58,8 +58,8 @@ msgctxt ""
 "MS PowerPoint 2007 XML\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft PowerPoint 2007-2013 XML"
-msgstr "Microsoft PowerPoint 2007-2013 XML"
+msgid "Microsoft PowerPoint OOXML"
+msgstr ""
 
 #: MS_PowerPoint_2007_XML_AutoPlay.xcu
 msgctxt ""
@@ -67,8 +67,8 @@ msgctxt ""
 "MS PowerPoint 2007 XML AutoPlay\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft PowerPoint 2007-2013 XML"
-msgstr "Microsoft PowerPoint 2007-2013 XML"
+msgid "Microsoft PowerPoint OOXML"
+msgstr ""
 
 #: MS_PowerPoint_2007_XML_Template.xcu
 msgctxt ""
@@ -76,8 +76,8 @@ msgctxt ""
 "MS PowerPoint 2007 XML Template\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft PowerPoint 2007-2013 XML Template"
-msgstr "Templed XML Microsoft PowerPoint 2007-2013"
+msgid "Microsoft PowerPoint OOXML Template"
+msgstr ""
 
 #: MS_PowerPoint_2007_XML_VBA.xcu
 msgctxt ""
@@ -85,8 +85,8 @@ msgctxt ""
 "MS PowerPoint 2007 XML VBA\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft PowerPoint 2007-2013 XML VBA"
-msgstr "Microsoft PowerPoint 2007-2013 XML VBA"
+msgid "Microsoft PowerPoint OOXML VBA"
+msgstr ""
 
 #: StarBase.xcu
 msgctxt ""
@@ -301,8 +301,8 @@ msgctxt ""
 "writer_MS_Word_2007\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft Word 2007-2013 XML"
-msgstr "Microsoft Word 2007-2013 XML"
+msgid "Microsoft Word OOXML"
+msgstr ""
 
 #: writer_MS_Word_2007_XML_Template.xcu
 msgctxt ""
@@ -310,8 +310,8 @@ msgctxt ""
 "writer_MS_Word_2007_Template\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft Word 2007-2013 XML Template"
-msgstr "Templed XML Microsoft Word 2007-2013"
+msgid "Microsoft Word OOXML Template"
+msgstr ""
 
 #: writer_MS_Word_2007_XML_VBA.xcu
 msgctxt ""
@@ -319,8 +319,8 @@ msgctxt ""
 "writer_MS_Word_2007_VBA\n"
 "UIName\n"
 "value.text"
-msgid "Microsoft Word 2007-2013 XML VBA"
-msgstr "Microsoft Word 2007-2013 XML VBA"
+msgid "Microsoft Word OOXML VBA"
+msgstr ""
 
 #: writer_ODT_FlatXML.xcu
 msgctxt ""
diff --git a/source/cy/forms/messages.po b/source/cy/forms/messages.po
index 2a8e603fe74..28d6df42350 100644
--- a/source/cy/forms/messages.po
+++ b/source/cy/forms/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
+"POT-Creation-Date: 2018-02-27 13:56+0100\n"
 "PO-Revision-Date: 2017-12-29 14:39+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,115 +13,115 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1514558356.000000\n"
 
-#: strings.hrc:25
+#: forms/inc/strings.hrc:25
 msgctxt "RID_BASELISTBOX_ERROR_FILLLIST"
 msgid "The contents of a combo box or list field could not be determined."
 msgstr "Nid oedd modd deall cynnwys y blwch cyfun neu'r rhestr maes."
 
-#: strings.hrc:26
+#: forms/inc/strings.hrc:26
 msgctxt "RID_STR_IMPORT_GRAPHIC"
 msgid "Insert Image"
 msgstr "Mewnosod Delwedd"
 
-#: strings.hrc:27
+#: forms/inc/strings.hrc:27
 msgctxt "RID_STR_CONTROL_SUBSTITUTED_NAME"
 msgid "substituted"
 msgstr "newidiwyd"
 
-#: strings.hrc:28
+#: forms/inc/strings.hrc:28
 msgctxt "RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN"
 msgid "An error occurred while this control was being loaded. It was therefore replaced with a placeholder."
 msgstr "Digwyddodd gwall wrth i'r rheolwr gael ei lwytho. Cafodd ei newid gyda dalfan."
 
-#: strings.hrc:29
+#: forms/inc/strings.hrc:29
 msgctxt "RID_STR_READERROR"
 msgid "Error reading data from database"
 msgstr "Gwall wrth ddarllen data o'r gronfa ddata"
 
-#: strings.hrc:30
+#: forms/inc/strings.hrc:30
 msgctxt "RID_STR_CONNECTERROR"
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: strings.hrc:31
+#: forms/inc/strings.hrc:31
 msgctxt "RID_ERR_LOADING_FORM"
 msgid "The data content could not be loaded."
 msgstr "Methu llwytho cynnwys y data."
 
-#: strings.hrc:32
+#: forms/inc/strings.hrc:32
 msgctxt "RID_ERR_REFRESHING_FORM"
 msgid "The data content could not be updated"
 msgstr "Methu diweddaru'r cynnwys data"
 
-#: strings.hrc:33
+#: forms/inc/strings.hrc:33
 msgctxt "RID_STR_ERR_INSERTRECORD"
 msgid "Error inserting the new record"
 msgstr "Gwall mewnosod cofnod newydd"
 
-#: strings.hrc:34
+#: forms/inc/strings.hrc:34
 msgctxt "RID_STR_ERR_UPDATERECORD"
 msgid "Error updating the current record"
 msgstr "Gwall diweddaru'r cofnod presennol"
 
-#: strings.hrc:35
+#: forms/inc/strings.hrc:35
 msgctxt "RID_STR_ERR_DELETERECORD"
 msgid "Error deleting the current record"
 msgstr "Gwall dileu'r cofnod presennol"
 
-#: strings.hrc:36
+#: forms/inc/strings.hrc:36
 msgctxt "RID_STR_ERR_DELETERECORDS"
 msgid "Error deleting the specified records"
 msgstr "Gwall dileu'r cofnodion penodol"
 
-#: strings.hrc:37
+#: forms/inc/strings.hrc:37
 msgctxt "RID_STR_NEED_NON_NULL_OBJECT"
 msgid "The object cannot be NULL."
 msgstr "Mae'r gwrthrych yn methu bod yn NULL."
 
-#: strings.hrc:38
+#: forms/inc/strings.hrc:38
 msgctxt "RID_STR_OPEN_GRAPHICS"
 msgid "Insert Image from..."
 msgstr "Mewnosod Delwedd o..."
 
-#: strings.hrc:39
+#: forms/inc/strings.hrc:39
 msgctxt "RID_STR_CLEAR_GRAPHICS"
 msgid "Remove Image"
 msgstr "Tynnu Delwedd"
 
-#: strings.hrc:40
+#: forms/inc/strings.hrc:40
 msgctxt "RID_STR_INVALIDSTREAM"
 msgid "The given stream is invalid."
 msgstr "Mae'r llif hwn yn annilys."
 
-#: strings.hrc:41
+#: forms/inc/strings.hrc:41
 msgctxt "RID_STR_SYNTAXERROR"
 msgid "Syntax error in query expression"
 msgstr "Gwall cystrawen ym mynegiant yr ymholiad"
 
-#: strings.hrc:42
+#: forms/inc/strings.hrc:42
 msgctxt "RID_STR_INCOMPATIBLE_TYPES"
 msgid "The value types supported by the binding cannot be used for exchanging data with this control."
 msgstr "Nid oes modd defnyddio'r mathau gwerth sy'n cael cynnal gan y rhwymiad ar gyfer cyfnewid data gyda rheolydd hwn."
 
-#: strings.hrc:43
+#: forms/inc/strings.hrc:43
 msgctxt "RID_STR_LABEL_RECORD"
 msgid "Record"
 msgstr "Cofnod"
 
-#: strings.hrc:44
+#: forms/inc/strings.hrc:44
 msgctxt "RID_STR_INVALID_VALIDATOR"
 msgid "The control is connected to an external value binding, which at the same time acts as validator. You need to revoke the value binding, before you can set a new validator."
 msgstr "Mae'r rheolydd wedi ei gysylltu i rwymiad gwerth allanol, sydd ar yr un pryd yn gweithredu fel dilysydd. Rhaid adalw'r rhwymiad gwerth cyn bod modd gosod dilysydd newydd."
 
-#: strings.hrc:45
+#: forms/inc/strings.hrc:45
 msgctxt "RID_STR_LABEL_OF"
 msgid "of"
 msgstr "o"
 
-#: strings.hrc:46
+#: forms/inc/strings.hrc:46
 msgctxt "RID_STR_QUERY_SAVE_MODIFIED_ROW"
 msgid ""
 "The content of the current form has been modified.\n"
@@ -130,182 +130,182 @@ msgstr ""
 "Mae cynnwys y ffurflen gyfredol wedi ei newid.\n"
 "Hoffech chi gadw'r newidiadau?"
 
-#: strings.hrc:47
+#: forms/inc/strings.hrc:47
 msgctxt "RID_STR_COULD_NOT_SET_ORDER"
 msgid "Error setting the sort criteria"
 msgstr "Gwall wrth osod y meini prawf didoli"
 
-#: strings.hrc:48
+#: forms/inc/strings.hrc:48
 msgctxt "RID_STR_COULD_NOT_SET_FILTER"
 msgid "Error setting the filter criteria"
 msgstr "Gwall wrth osod y meini prawf hidlo"
 
-#: strings.hrc:49
+#: forms/inc/strings.hrc:49
 msgctxt "RID_STR_FEATURE_REQUIRES_PARAMETERS"
 msgid "To execute this function, parameters are needed."
 msgstr "I weithredu'r swyddogaeth, mae angen paramedrau."
 
-#: strings.hrc:50
+#: forms/inc/strings.hrc:50
 msgctxt "RID_STR_FEATURE_NOT_EXECUTABLE"
 msgid "This function cannot be executed, but is only for status queries."
 msgstr "Nid oes modd gweithredu'r swyddogaeth, mae ar gyfer ymholiad statws."
 
-#: strings.hrc:51
+#: forms/inc/strings.hrc:51
 msgctxt "RID_STR_FEATURE_UNKNOWN"
 msgid "Unknown function."
 msgstr "Swyddogaeth anhysbys."
 
-#: strings.hrc:53
+#: forms/inc/strings.hrc:53
 msgctxt "RID_STR_XFORMS_NO_BINDING_EXPRESSION"
 msgid "Please enter a binding expression."
 msgstr "Cyflwynwch fynegiant rhwymedig."
 
-#: strings.hrc:54
+#: forms/inc/strings.hrc:54
 msgctxt "RID_STR_XFORMS_INVALID_BINDING_EXPRESSION"
 msgid "This is an invalid binding expression."
 msgstr "Mae hwn yn fynegiant rhwymiad annilys."
 
-#: strings.hrc:55
+#: forms/inc/strings.hrc:55
 msgctxt "RID_STR_XFORMS_INVALID_VALUE"
 msgid "Value is invalid."
 msgstr "Gwerth annilys."
 
-#: strings.hrc:56
+#: forms/inc/strings.hrc:56
 msgctxt "RID_STR_XFORMS_REQUIRED"
 msgid "A value is required."
 msgstr "Mae angen gwerth."
 
-#: strings.hrc:57
+#: forms/inc/strings.hrc:57
 msgctxt "RID_STR_XFORMS_INVALID_CONSTRAINT"
 msgid "The constraint '$1' not validated."
 msgstr "Nid yw cyfyngiad '$1' yn ddilys."
 
-#: strings.hrc:58
+#: forms/inc/strings.hrc:58
 msgctxt "RID_STR_XFORMS_VALUE_IS_NOT_A"
 msgid "The value is not of the type '$2'."
 msgstr "Nid yw'r gwerth o fath '$2'."
 
-#: strings.hrc:59
+#: forms/inc/strings.hrc:59
 msgctxt "RID_STR_XFORMS_VALUE_MAX_INCL"
 msgid "The value must be smaller than or equal to $2."
 msgstr "Rhaid i'r gwerth fod yn llai neu gydradd a $2."
 
-#: strings.hrc:60
+#: forms/inc/strings.hrc:60
 msgctxt "RID_STR_XFORMS_VALUE_MAX_EXCL"
 msgid "The value must be smaller than $2."
 msgstr "Rhaid i'r gwerth fod yn llai na $2.gwerth."
 
-#: strings.hrc:61
+#: forms/inc/strings.hrc:61
 msgctxt "RID_STR_XFORMS_VALUE_MIN_INCL"
 msgid "The value must be greater than or equal to $2."
 msgstr "Rhaid i'r gwerth fod yn fwy neu gydradd a $2."
 
-#: strings.hrc:62
+#: forms/inc/strings.hrc:62
 msgctxt "RID_STR_XFORMS_VALUE_MIN_EXCL"
 msgid "The value must be greater than $2."
 msgstr "Rhaid i'r gwerth fod yn fwy na $2."
 
-#: strings.hrc:63
+#: forms/inc/strings.hrc:63
 msgctxt "RID_STR_XFORMS_VALUE_TOTAL_DIGITS"
 msgid "$2 digits allowed at most."
 msgstr "$2 ddigid ar y mwyaf."
 
-#: strings.hrc:64
+#: forms/inc/strings.hrc:64
 msgctxt "RID_STR_XFORMS_VALUE_FRACTION_DIGITS"
 msgid "$2 fraction digits allowed at most."
 msgstr "$2 ddigid ffracsiwn ar y mwyaf."
 
-#: strings.hrc:65
+#: forms/inc/strings.hrc:65
 msgctxt "RID_STR_XFORMS_VALUE_LENGTH"
 msgid "The string must be $2 characters long."
 msgstr "Rhaid i linyn fod yn $2 nod o hyd."
 
-#: strings.hrc:66
+#: forms/inc/strings.hrc:66
 msgctxt "RID_STR_XFORMS_VALUE_MIN_LENGTH"
 msgid "The string must be at least $2 characters long."
 msgstr "Rhaid i linyn fod o leiaf $2 nod o hyd."
 
-#: strings.hrc:67
+#: forms/inc/strings.hrc:67
 msgctxt "RID_STR_XFORMS_VALUE_MAX_LENGTH"
 msgid "The string can only be $2 characters long at most."
 msgstr "Gall llinyn fod yn ddim ond $2 nod o hyd."
 
-#: strings.hrc:68
+#: forms/inc/strings.hrc:68
 msgctxt "RID_STR_DATATYPE_STRING"
 msgid "String"
 msgstr "Llinyn"
 
-#: strings.hrc:69
+#: forms/inc/strings.hrc:69
 msgctxt "RID_STR_DATATYPE_URL"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: strings.hrc:70
+#: forms/inc/strings.hrc:70
 msgctxt "RID_STR_DATATYPE_BOOLEAN"
 msgid "True/False (Boolean)"
 msgstr "Gwir/Gau (Boole)"
 
-#: strings.hrc:71
+#: forms/inc/strings.hrc:71
 msgctxt "RID_STR_DATATYPE_DECIMAL"
 msgid "Decimal"
 msgstr "Degol"
 
-#: strings.hrc:72
+#: forms/inc/strings.hrc:72
 msgctxt "RID_STR_DATATYPE_FLOAT"
 msgid "Floating point"
 msgstr "Pwynt arnofio"
 
-#: strings.hrc:73
+#: forms/inc/strings.hrc:73
 msgctxt "RID_STR_DATATYPE_DOUBLE"
 msgid "Double"
 msgstr "Dwbl"
 
-#: strings.hrc:74
+#: forms/inc/strings.hrc:74
 msgctxt "RID_STR_DATATYPE_DATE"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: strings.hrc:75
+#: forms/inc/strings.hrc:75
 msgctxt "RID_STR_DATATYPE_TIME"
 msgid "Time"
 msgstr "Amser"
 
-#: strings.hrc:76
+#: forms/inc/strings.hrc:76
 msgctxt "RID_STR_DATATYPE_DATETIME"
 msgid "Date and Time"
 msgstr "Dyddiad ac Amser"
 
-#: strings.hrc:77
+#: forms/inc/strings.hrc:77
 msgctxt "RID_STR_DATATYPE_YEAR"
 msgid "Year"
 msgstr "Blwyddyn"
 
-#: strings.hrc:78
+#: forms/inc/strings.hrc:78
 msgctxt "RID_STR_DATATYPE_MONTH"
 msgid "Month"
 msgstr "Mis"
 
-#: strings.hrc:79
+#: forms/inc/strings.hrc:79
 msgctxt "RID_STR_DATATYPE_DAY"
 msgid "Day"
 msgstr "Diwrnod"
 
-#: strings.hrc:80
+#: forms/inc/strings.hrc:80
 msgctxt "RID_STR_XFORMS_CANT_EVALUATE"
 msgid "Error during evaluation"
 msgstr "Gwall wrth ei arfarnu"
 
-#: strings.hrc:81
+#: forms/inc/strings.hrc:81
 msgctxt "RID_STR_XFORMS_PATTERN_DOESNT_MATCH"
 msgid "The string '$1' does not match the required regular expression '$2'."
 msgstr "Nid yw llinyn '$1' yn cydweddu â'r mynegiant rheolaidd angenrheidiol '$2'."
 
-#: strings.hrc:82
+#: forms/inc/strings.hrc:82
 msgctxt "RID_STR_XFORMS_BINDING_UI_NAME"
 msgid "Binding"
 msgstr "Rhwymiad"
 
-#: strings.hrc:83
+#: forms/inc/strings.hrc:83
 msgctxt "RID_STR_XFORMS_CANT_REMOVE_TYPE"
 msgid "This is a built-in type and cannot be removed."
 msgstr "Mae hwn yn fath creiddiol ac nid oes modd ei dynnu."
diff --git a/source/cy/formula/messages.po b/source/cy/formula/messages.po
index 22fe340a8e9..9bba9b74363 100644
--- a/source/cy/formula/messages.po
+++ b/source/cy/formula/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-11-22 13:53+0100\n"
+"POT-Creation-Date: 2018-04-23 18:10+0200\n"
 "PO-Revision-Date: 2017-10-06 13:53+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,2199 +16,2199 @@ msgstr ""
 "X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1507298001.000000\n"
 
-#: core_resource.hrc:2258
+#: formula/inc/core_resource.hrc:2258
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "IF"
 msgstr "IF"
 
-#: core_resource.hrc:2259
+#: formula/inc/core_resource.hrc:2259
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "IFERROR"
 msgstr "IFERROR"
 
-#: core_resource.hrc:2260
+#: formula/inc/core_resource.hrc:2260
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "IFNA"
 msgstr "IFNA"
 
-#: core_resource.hrc:2261
+#: formula/inc/core_resource.hrc:2261
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHOOSE"
 msgstr "CHOOSE"
 
-#: core_resource.hrc:2262
+#: formula/inc/core_resource.hrc:2262
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#All"
 msgstr "#Popeth"
 
-#: core_resource.hrc:2263
+#: formula/inc/core_resource.hrc:2263
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#Headers"
 msgstr "#Penynnau"
 
-#: core_resource.hrc:2264
+#: formula/inc/core_resource.hrc:2264
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#Data"
 msgstr "#Data"
 
-#: core_resource.hrc:2265
+#: formula/inc/core_resource.hrc:2265
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#Totals"
 msgstr "#Cyfansymiau"
 
-#: core_resource.hrc:2266
+#: formula/inc/core_resource.hrc:2266
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#This Row"
 msgstr "#Y Rhes Hon"
 
-#: core_resource.hrc:2267
+#: formula/inc/core_resource.hrc:2267
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "AND"
 msgstr "AND"
 
-#: core_resource.hrc:2268
+#: formula/inc/core_resource.hrc:2268
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "OR"
 msgstr "OR"
 
-#: core_resource.hrc:2269
+#: formula/inc/core_resource.hrc:2269
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "XOR"
 msgstr "XOR"
 
-#: core_resource.hrc:2270
+#: formula/inc/core_resource.hrc:2270
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NOT"
 msgstr "NOT"
 
-#: core_resource.hrc:2271
+#: formula/inc/core_resource.hrc:2271
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NEG"
 msgstr "NEG"
 
-#: core_resource.hrc:2272
+#: formula/inc/core_resource.hrc:2272
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PI"
 msgstr "PI"
 
 #. ???
-#: core_resource.hrc:2273
+#: formula/inc/core_resource.hrc:2273
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RAND"
 msgstr "RAND"
 
-#: core_resource.hrc:2274
+#: formula/inc/core_resource.hrc:2274
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TRUE"
 msgstr "TRUE"
 
-#: core_resource.hrc:2275
+#: formula/inc/core_resource.hrc:2275
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FALSE"
 msgstr "FALSE"
 
-#: core_resource.hrc:2276
+#: formula/inc/core_resource.hrc:2276
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TODAY"
 msgstr "TODAY"
 
-#: core_resource.hrc:2277
+#: formula/inc/core_resource.hrc:2277
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NOW"
 msgstr "NOW"
 
-#: core_resource.hrc:2278
+#: formula/inc/core_resource.hrc:2278
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NA"
 msgstr "NA"
 
-#: core_resource.hrc:2279
+#: formula/inc/core_resource.hrc:2279
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CURRENT"
 msgstr "CURRENT"
 
-#: core_resource.hrc:2280
+#: formula/inc/core_resource.hrc:2280
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DEGREES"
 msgstr "DEGREES"
 
-#: core_resource.hrc:2281
+#: formula/inc/core_resource.hrc:2281
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RADIANS"
 msgstr "RADIANS"
 
-#: core_resource.hrc:2282
+#: formula/inc/core_resource.hrc:2282
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SIN"
 msgstr "SIN"
 
-#: core_resource.hrc:2283
+#: formula/inc/core_resource.hrc:2283
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COS"
 msgstr "COS"
 
-#: core_resource.hrc:2284
+#: formula/inc/core_resource.hrc:2284
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TAN"
 msgstr "TAN"
 
-#: core_resource.hrc:2285
+#: formula/inc/core_resource.hrc:2285
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COT"
 msgstr "COT"
 
-#: core_resource.hrc:2286
+#: formula/inc/core_resource.hrc:2286
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ASIN"
 msgstr "ASIN"
 
-#: core_resource.hrc:2287
+#: formula/inc/core_resource.hrc:2287
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ACOS"
 msgstr "ACOS"
 
-#: core_resource.hrc:2288
+#: formula/inc/core_resource.hrc:2288
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ATAN"
 msgstr "ATAN"
 
-#: core_resource.hrc:2289
+#: formula/inc/core_resource.hrc:2289
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ACOT"
 msgstr "ACOT"
 
-#: core_resource.hrc:2290
+#: formula/inc/core_resource.hrc:2290
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SINH"
 msgstr "SINH"
 
-#: core_resource.hrc:2291
+#: formula/inc/core_resource.hrc:2291
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COSH"
 msgstr "COSH"
 
-#: core_resource.hrc:2292
+#: formula/inc/core_resource.hrc:2292
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TANH"
 msgstr "TANH"
 
-#: core_resource.hrc:2293
+#: formula/inc/core_resource.hrc:2293
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COTH"
 msgstr "COTH"
 
-#: core_resource.hrc:2294
+#: formula/inc/core_resource.hrc:2294
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ASINH"
 msgstr "ASINH"
 
-#: core_resource.hrc:2295
+#: formula/inc/core_resource.hrc:2295
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ACOSH"
 msgstr "ACOSH"
 
-#: core_resource.hrc:2296
+#: formula/inc/core_resource.hrc:2296
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ATANH"
 msgstr "ATANH"
 
-#: core_resource.hrc:2297
+#: formula/inc/core_resource.hrc:2297
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ACOTH"
 msgstr "ACOTH"
 
-#: core_resource.hrc:2298
+#: formula/inc/core_resource.hrc:2298
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CSC"
 msgstr "CSC"
 
-#: core_resource.hrc:2299
+#: formula/inc/core_resource.hrc:2299
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SEC"
 msgstr "SEC"
 
-#: core_resource.hrc:2300
+#: formula/inc/core_resource.hrc:2300
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CSCH"
 msgstr "CSCH"
 
-#: core_resource.hrc:2301
+#: formula/inc/core_resource.hrc:2301
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SECH"
 msgstr "SECH"
 
-#: core_resource.hrc:2302
+#: formula/inc/core_resource.hrc:2302
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "EXP"
 msgstr "EXP"
 
-#: core_resource.hrc:2303
+#: formula/inc/core_resource.hrc:2303
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LN"
 msgstr "LN"
 
-#: core_resource.hrc:2304
+#: formula/inc/core_resource.hrc:2304
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SQRT"
 msgstr "SQRT"
 
-#: core_resource.hrc:2305
+#: formula/inc/core_resource.hrc:2305
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FACT"
 msgstr "FACT"
 
-#: core_resource.hrc:2306
+#: formula/inc/core_resource.hrc:2306
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "YEAR"
 msgstr "YEAR"
 
-#: core_resource.hrc:2307
+#: formula/inc/core_resource.hrc:2307
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MONTH"
 msgstr "MONTH"
 
-#: core_resource.hrc:2308
+#: formula/inc/core_resource.hrc:2308
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DAY"
 msgstr "DAY"
 
-#: core_resource.hrc:2309
+#: formula/inc/core_resource.hrc:2309
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "HOUR"
 msgstr "HOUR"
 
-#: core_resource.hrc:2310
+#: formula/inc/core_resource.hrc:2310
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MINUTE"
 msgstr "MINUTE"
 
-#: core_resource.hrc:2311
+#: formula/inc/core_resource.hrc:2311
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SECOND"
 msgstr "SECOND"
 
-#: core_resource.hrc:2312
+#: formula/inc/core_resource.hrc:2312
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SIGN"
 msgstr "SIGN"
 
-#: core_resource.hrc:2313
+#: formula/inc/core_resource.hrc:2313
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ABS"
 msgstr "ABS"
 
-#: core_resource.hrc:2314
+#: formula/inc/core_resource.hrc:2314
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "INT"
 msgstr "INT"
 
-#: core_resource.hrc:2315
+#: formula/inc/core_resource.hrc:2315
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PHI"
 msgstr "PHI"
 
-#: core_resource.hrc:2316
+#: formula/inc/core_resource.hrc:2316
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GAUSS"
 msgstr "GAUSS"
 
-#: core_resource.hrc:2317
+#: formula/inc/core_resource.hrc:2317
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISBLANK"
 msgstr "ISBLANK"
 
-#: core_resource.hrc:2318
+#: formula/inc/core_resource.hrc:2318
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISTEXT"
 msgstr "ISTEXT"
 
-#: core_resource.hrc:2319
+#: formula/inc/core_resource.hrc:2319
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISNONTEXT"
 msgstr "ISNONTEXT"
 
-#: core_resource.hrc:2320
+#: formula/inc/core_resource.hrc:2320
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISLOGICAL"
 msgstr "ISLOGICAL"
 
-#: core_resource.hrc:2321
+#: formula/inc/core_resource.hrc:2321
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TYPE"
 msgstr "TYPE"
 
-#: core_resource.hrc:2322
+#: formula/inc/core_resource.hrc:2322
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CELL"
 msgstr "CELL"
 
-#: core_resource.hrc:2323
+#: formula/inc/core_resource.hrc:2323
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISREF"
 msgstr "ISREF"
 
-#: core_resource.hrc:2324
+#: formula/inc/core_resource.hrc:2324
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISNUMBER"
 msgstr "ISNUMBER"
 
-#: core_resource.hrc:2325
+#: formula/inc/core_resource.hrc:2325
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISFORMULA"
 msgstr "ISFORMULA"
 
-#: core_resource.hrc:2326
+#: formula/inc/core_resource.hrc:2326
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISNA"
 msgstr "ISNA"
 
-#: core_resource.hrc:2327
+#: formula/inc/core_resource.hrc:2327
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISERR"
 msgstr "ISERR"
 
-#: core_resource.hrc:2328
+#: formula/inc/core_resource.hrc:2328
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISERROR"
 msgstr "ISERROR"
 
-#: core_resource.hrc:2329
+#: formula/inc/core_resource.hrc:2329
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISEVEN"
 msgstr "ISEVEN"
 
-#: core_resource.hrc:2330
+#: formula/inc/core_resource.hrc:2330
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISODD"
 msgstr "ISODD"
 
-#: core_resource.hrc:2331
+#: formula/inc/core_resource.hrc:2331
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "N"
 msgstr "N"
 
-#: core_resource.hrc:2332
+#: formula/inc/core_resource.hrc:2332
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DATEVALUE"
 msgstr "DATEVALUE"
 
-#: core_resource.hrc:2333
+#: formula/inc/core_resource.hrc:2333
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TIMEVALUE"
 msgstr "TIMEVALUE"
 
-#: core_resource.hrc:2334
+#: formula/inc/core_resource.hrc:2334
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CODE"
 msgstr "CODE"
 
-#: core_resource.hrc:2335
+#: formula/inc/core_resource.hrc:2335
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TRIM"
 msgstr "TRIM"
 
-#: core_resource.hrc:2336
+#: formula/inc/core_resource.hrc:2336
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "UPPER"
 msgstr "UPPER"
 
-#: core_resource.hrc:2337
+#: formula/inc/core_resource.hrc:2337
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PROPER"
 msgstr "PROPER"
 
-#: core_resource.hrc:2338
+#: formula/inc/core_resource.hrc:2338
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LOWER"
 msgstr "LOWER"
 
-#: core_resource.hrc:2339
+#: formula/inc/core_resource.hrc:2339
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LEN"
 msgstr "LEN"
 
-#: core_resource.hrc:2340
+#: formula/inc/core_resource.hrc:2340
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "T"
 msgstr "T"
 
-#: core_resource.hrc:2341
+#: formula/inc/core_resource.hrc:2341
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "VALUE"
 msgstr "VALUE"
 
-#: core_resource.hrc:2342
+#: formula/inc/core_resource.hrc:2342
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CLEAN"
 msgstr "CLEAN"
 
-#: core_resource.hrc:2343
+#: formula/inc/core_resource.hrc:2343
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHAR"
 msgstr "CHAR"
 
-#: core_resource.hrc:2344
+#: formula/inc/core_resource.hrc:2344
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "JIS"
 msgstr "JIS"
 
-#: core_resource.hrc:2345
+#: formula/inc/core_resource.hrc:2345
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ASC"
 msgstr "ASC"
 
-#: core_resource.hrc:2346
+#: formula/inc/core_resource.hrc:2346
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "UNICODE"
 msgstr "UNICODE"
 
-#: core_resource.hrc:2347
+#: formula/inc/core_resource.hrc:2347
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "UNICHAR"
 msgstr "UNICHAR"
 
-#: core_resource.hrc:2348
+#: formula/inc/core_resource.hrc:2348
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LOG10"
 msgstr "LOG10"
 
-#: core_resource.hrc:2349
+#: formula/inc/core_resource.hrc:2349
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "EVEN"
 msgstr "EVEN"
 
-#: core_resource.hrc:2350
+#: formula/inc/core_resource.hrc:2350
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ODD"
 msgstr "ODD"
 
-#: core_resource.hrc:2351
+#: formula/inc/core_resource.hrc:2351
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NORMSDIST"
 msgstr "NORMSDIST"
 
-#: core_resource.hrc:2352
+#: formula/inc/core_resource.hrc:2352
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NORM.S.DIST"
 msgstr "NORM.S.DIST"
 
-#: core_resource.hrc:2353
+#: formula/inc/core_resource.hrc:2353
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FISHER"
 msgstr "FISHER"
 
-#: core_resource.hrc:2354
+#: formula/inc/core_resource.hrc:2354
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FISHERINV"
 msgstr "FISHERINV"
 
-#: core_resource.hrc:2355
+#: formula/inc/core_resource.hrc:2355
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NORMSINV"
 msgstr "NORMSINV"
 
-#: core_resource.hrc:2356
+#: formula/inc/core_resource.hrc:2356
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NORM.S.INV"
 msgstr "NORM.S.INV"
 
-#: core_resource.hrc:2357
+#: formula/inc/core_resource.hrc:2357
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GAMMALN"
 msgstr "GAMMALN"
 
-#: core_resource.hrc:2358
+#: formula/inc/core_resource.hrc:2358
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GAMMALN.PRECISE"
 msgstr "GAMMALN.PRECISE"
 
-#: core_resource.hrc:2359
+#: formula/inc/core_resource.hrc:2359
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ERRORTYPE"
 msgstr "ERRORTYPE"
 
-#: core_resource.hrc:2360
+#: formula/inc/core_resource.hrc:2360
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ERROR.TYPE"
 msgstr "ERROR.TYPE"
 
-#: core_resource.hrc:2361
+#: formula/inc/core_resource.hrc:2361
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FORMULA"
 msgstr "FORMULA"
 
-#: core_resource.hrc:2362
+#: formula/inc/core_resource.hrc:2362
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ARABIC"
 msgstr "ARABIC"
 
-#: core_resource.hrc:2363
+#: formula/inc/core_resource.hrc:2363
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ATAN2"
 msgstr "ATAN2"
 
-#: core_resource.hrc:2364
+#: formula/inc/core_resource.hrc:2364
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CEILING.MATH"
 msgstr "CEILING.MATH"
 
-#: core_resource.hrc:2365
+#: formula/inc/core_resource.hrc:2365
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CEILING"
 msgstr "CEILING"
 
-#: core_resource.hrc:2366
+#: formula/inc/core_resource.hrc:2366
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CEILING.XCL"
 msgstr "CEILING.XCL"
 
-#: core_resource.hrc:2367
+#: formula/inc/core_resource.hrc:2367
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CEILING.PRECISE"
 msgstr "CEILING.PRECISE"
 
-#: core_resource.hrc:2368
+#: formula/inc/core_resource.hrc:2368
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISO.CEILING"
 msgstr "ISO.CEILING"
 
-#: core_resource.hrc:2369
+#: formula/inc/core_resource.hrc:2369
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FLOOR"
 msgstr "FLOOR"
 
-#: core_resource.hrc:2370
+#: formula/inc/core_resource.hrc:2370
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FLOOR.XCL"
 msgstr "FLOOR.XCL"
 
-#: core_resource.hrc:2371
+#: formula/inc/core_resource.hrc:2371
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FLOOR.MATH"
 msgstr "FLOOR.MATH"
 
-#: core_resource.hrc:2372
+#: formula/inc/core_resource.hrc:2372
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FLOOR.PRECISE"
 msgstr "FLOOR.PRECISE"
 
-#: core_resource.hrc:2373
+#: formula/inc/core_resource.hrc:2373
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ROUND"
 msgstr "ROUND"
 
-#: core_resource.hrc:2374
+#: formula/inc/core_resource.hrc:2374
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ROUNDUP"
 msgstr "ROUNDUP"
 
-#: core_resource.hrc:2375
+#: formula/inc/core_resource.hrc:2375
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ROUNDDOWN"
 msgstr "ROUNDDOWN"
 
-#: core_resource.hrc:2376
+#: formula/inc/core_resource.hrc:2376
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TRUNC"
 msgstr "TRUNC"
 
-#: core_resource.hrc:2377
+#: formula/inc/core_resource.hrc:2377
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LOG"
 msgstr "LOG"
 
-#: core_resource.hrc:2378
+#: formula/inc/core_resource.hrc:2378
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "POWER"
 msgstr "POWER"
 
-#: core_resource.hrc:2379
+#: formula/inc/core_resource.hrc:2379
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GCD"
 msgstr "GCD"
 
-#: core_resource.hrc:2380
+#: formula/inc/core_resource.hrc:2380
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LCM"
 msgstr "LCM"
 
-#: core_resource.hrc:2381
+#: formula/inc/core_resource.hrc:2381
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MOD"
 msgstr "MOD"
 
-#: core_resource.hrc:2382
+#: formula/inc/core_resource.hrc:2382
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SUMPRODUCT"
 msgstr "SUMPRODUCT"
 
-#: core_resource.hrc:2383
+#: formula/inc/core_resource.hrc:2383
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SUMSQ"
 msgstr "SUMSQ"
 
-#: core_resource.hrc:2384
+#: formula/inc/core_resource.hrc:2384
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SUMX2MY2"
 msgstr "SUMX2MY2"
 
-#: core_resource.hrc:2385
+#: formula/inc/core_resource.hrc:2385
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SUMX2PY2"
 msgstr "SUMX2PY2"
 
-#: core_resource.hrc:2386
+#: formula/inc/core_resource.hrc:2386
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SUMXMY2"
 msgstr "SUMXMY2"
 
-#: core_resource.hrc:2387
+#: formula/inc/core_resource.hrc:2387
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DATE"
 msgstr "DATE"
 
-#: core_resource.hrc:2388
+#: formula/inc/core_resource.hrc:2388
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TIME"
 msgstr "TIME"
 
-#: core_resource.hrc:2389
+#: formula/inc/core_resource.hrc:2389
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DAYS"
 msgstr "DAYS"
 
-#: core_resource.hrc:2390
+#: formula/inc/core_resource.hrc:2390
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DAYS360"
 msgstr "DAYS360"
 
-#: core_resource.hrc:2391
+#: formula/inc/core_resource.hrc:2391
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DATEDIF"
 msgstr "DATEDIF"
 
-#: core_resource.hrc:2392
+#: formula/inc/core_resource.hrc:2392
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MIN"
 msgstr "MIN"
 
-#: core_resource.hrc:2393
+#: formula/inc/core_resource.hrc:2393
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MINA"
 msgstr "MINA"
 
-#: core_resource.hrc:2394
+#: formula/inc/core_resource.hrc:2394
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MAX"
 msgstr "MAX"
 
-#: core_resource.hrc:2395
+#: formula/inc/core_resource.hrc:2395
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MAXA"
 msgstr "MAXA"
 
-#: core_resource.hrc:2396
+#: formula/inc/core_resource.hrc:2396
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SUM"
 msgstr "SUM"
 
-#: core_resource.hrc:2397
+#: formula/inc/core_resource.hrc:2397
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PRODUCT"
 msgstr "PRODUCT"
 
-#: core_resource.hrc:2398
+#: formula/inc/core_resource.hrc:2398
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "AVERAGE"
 msgstr "AVERAGE"
 
-#: core_resource.hrc:2399
+#: formula/inc/core_resource.hrc:2399
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "AVERAGEA"
 msgstr "AVERAGEA"
 
-#: core_resource.hrc:2400
+#: formula/inc/core_resource.hrc:2400
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COUNT"
 msgstr "COUNT"
 
-#: core_resource.hrc:2401
+#: formula/inc/core_resource.hrc:2401
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COUNTA"
 msgstr "COUNTA"
 
-#: core_resource.hrc:2402
+#: formula/inc/core_resource.hrc:2402
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NPV"
 msgstr "NPV"
 
-#: core_resource.hrc:2403
+#: formula/inc/core_resource.hrc:2403
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "IRR"
 msgstr "IRR"
 
-#: core_resource.hrc:2404
+#: formula/inc/core_resource.hrc:2404
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MIRR"
 msgstr "MIRR"
 
-#: core_resource.hrc:2405
+#: formula/inc/core_resource.hrc:2405
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISPMT"
 msgstr "ISPMT"
 
-#: core_resource.hrc:2406
+#: formula/inc/core_resource.hrc:2406
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "VAR"
 msgstr "VAR"
 
-#: core_resource.hrc:2407
+#: formula/inc/core_resource.hrc:2407
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "VARA"
 msgstr "VARA"
 
-#: core_resource.hrc:2408
+#: formula/inc/core_resource.hrc:2408
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "VARP"
 msgstr "VARP"
 
-#: core_resource.hrc:2409
+#: formula/inc/core_resource.hrc:2409
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "VARPA"
 msgstr "VARPA"
 
-#: core_resource.hrc:2410
+#: formula/inc/core_resource.hrc:2410
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "VAR.P"
 msgstr "VAR.P"
 
-#: core_resource.hrc:2411
+#: formula/inc/core_resource.hrc:2411
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "VAR.S"
 msgstr "VAR.S"
 
-#: core_resource.hrc:2412
+#: formula/inc/core_resource.hrc:2412
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: core_resource.hrc:2413
+#: formula/inc/core_resource.hrc:2413
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "STDEVA"
 msgstr "STDEVA"
 
-#: core_resource.hrc:2414
+#: formula/inc/core_resource.hrc:2414
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "STDEVP"
 msgstr "STDEVP"
 
-#: core_resource.hrc:2415
+#: formula/inc/core_resource.hrc:2415
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "STDEVPA"
 msgstr "STDEVPA"
 
-#: core_resource.hrc:2416
+#: formula/inc/core_resource.hrc:2416
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "STDEV.P"
 msgstr "STDEV.P"
 
-#: core_resource.hrc:2417
+#: formula/inc/core_resource.hrc:2417
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "STDEV.S"
 msgstr "STDEV.S"
 
-#: core_resource.hrc:2418
+#: formula/inc/core_resource.hrc:2418
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "B"
 msgstr "B"
 
-#: core_resource.hrc:2419
+#: formula/inc/core_resource.hrc:2419
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NORMDIST"
 msgstr "NORMDIST"
 
-#: core_resource.hrc:2420
+#: formula/inc/core_resource.hrc:2420
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NORM.DIST"
 msgstr "NORM.DIST"
 
-#: core_resource.hrc:2421
+#: formula/inc/core_resource.hrc:2421
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "EXPONDIST"
 msgstr "EXPONDIST"
 
-#: core_resource.hrc:2422
+#: formula/inc/core_resource.hrc:2422
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "EXPON.DIST"
 msgstr "EXPON.DIST"
 
-#: core_resource.hrc:2423
+#: formula/inc/core_resource.hrc:2423
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BINOMDIST"
 msgstr "BINOMDIST"
 
-#: core_resource.hrc:2424
+#: formula/inc/core_resource.hrc:2424
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BINOM.DIST"
 msgstr "BINOM.DIST"
 
-#: core_resource.hrc:2425
+#: formula/inc/core_resource.hrc:2425
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "POISSON"
 msgstr "POISSON"
 
-#: core_resource.hrc:2426
+#: formula/inc/core_resource.hrc:2426
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "POISSON.DIST"
 msgstr "POISSON.DIST"
 
-#: core_resource.hrc:2427
+#: formula/inc/core_resource.hrc:2427
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COMBIN"
 msgstr "COMBIN"
 
-#: core_resource.hrc:2428
+#: formula/inc/core_resource.hrc:2428
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COMBINA"
 msgstr "COMBINA"
 
-#: core_resource.hrc:2429
+#: formula/inc/core_resource.hrc:2429
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PERMUT"
 msgstr "PERMUT"
 
-#: core_resource.hrc:2430
+#: formula/inc/core_resource.hrc:2430
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PERMUTATIONA"
 msgstr "PERMUTATIONA"
 
-#: core_resource.hrc:2431
+#: formula/inc/core_resource.hrc:2431
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PV"
 msgstr "PV"
 
-#: core_resource.hrc:2432
+#: formula/inc/core_resource.hrc:2432
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SYD"
 msgstr "SYD"
 
-#: core_resource.hrc:2433
+#: formula/inc/core_resource.hrc:2433
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DDB"
 msgstr "DDB"
 
-#: core_resource.hrc:2434
+#: formula/inc/core_resource.hrc:2434
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DB"
 msgstr "DB"
 
-#: core_resource.hrc:2435
+#: formula/inc/core_resource.hrc:2435
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "VDB"
 msgstr "VDB"
 
-#: core_resource.hrc:2436
+#: formula/inc/core_resource.hrc:2436
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PDURATION"
 msgstr "PDURATION"
 
-#: core_resource.hrc:2437
+#: formula/inc/core_resource.hrc:2437
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SLN"
 msgstr "SLN"
 
-#: core_resource.hrc:2438
+#: formula/inc/core_resource.hrc:2438
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PMT"
 msgstr "PMT"
 
-#: core_resource.hrc:2439
+#: formula/inc/core_resource.hrc:2439
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COLUMNS"
 msgstr "COLUMNS"
 
-#: core_resource.hrc:2440
+#: formula/inc/core_resource.hrc:2440
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ROWS"
 msgstr "ROWS"
 
-#: core_resource.hrc:2441
+#: formula/inc/core_resource.hrc:2441
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SHEETS"
 msgstr "DALENNAU"
 
-#: core_resource.hrc:2442
+#: formula/inc/core_resource.hrc:2442
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COLUMN"
 msgstr "COLUMN"
 
-#: core_resource.hrc:2443
+#: formula/inc/core_resource.hrc:2443
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ROW"
 msgstr "ROW"
 
-#: core_resource.hrc:2444
+#: formula/inc/core_resource.hrc:2444
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SHEET"
 msgstr "DALEN"
 
-#: core_resource.hrc:2445
+#: formula/inc/core_resource.hrc:2445
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RRI"
 msgstr "RRI"
 
-#: core_resource.hrc:2446
+#: formula/inc/core_resource.hrc:2446
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FV"
 msgstr "FV"
 
-#: core_resource.hrc:2447
+#: formula/inc/core_resource.hrc:2447
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NPER"
 msgstr "NPER"
 
-#: core_resource.hrc:2448
+#: formula/inc/core_resource.hrc:2448
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RATE"
 msgstr "RATE"
 
-#: core_resource.hrc:2449
+#: formula/inc/core_resource.hrc:2449
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "IPMT"
 msgstr "IPMT"
 
-#: core_resource.hrc:2450
+#: formula/inc/core_resource.hrc:2450
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PPMT"
 msgstr "PPMT"
 
-#: core_resource.hrc:2451
+#: formula/inc/core_resource.hrc:2451
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CUMIPMT"
 msgstr "CUMIPMT"
 
-#: core_resource.hrc:2452
+#: formula/inc/core_resource.hrc:2452
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CUMPRINC"
 msgstr "CUMPRINC"
 
-#: core_resource.hrc:2453
+#: formula/inc/core_resource.hrc:2453
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "EFFECT"
 msgstr "EFFECT"
 
-#: core_resource.hrc:2454
+#: formula/inc/core_resource.hrc:2454
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NOMINAL"
 msgstr "NOMINAL"
 
-#: core_resource.hrc:2455
+#: formula/inc/core_resource.hrc:2455
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SUBTOTAL"
 msgstr "SUBTOTAL"
 
-#: core_resource.hrc:2456
+#: formula/inc/core_resource.hrc:2456
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DSUM"
 msgstr "DSUM"
 
-#: core_resource.hrc:2457
+#: formula/inc/core_resource.hrc:2457
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DCOUNT"
 msgstr "DCOUNT"
 
-#: core_resource.hrc:2458
+#: formula/inc/core_resource.hrc:2458
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DCOUNTA"
 msgstr "DCOUNTA"
 
-#: core_resource.hrc:2459
+#: formula/inc/core_resource.hrc:2459
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DAVERAGE"
 msgstr "DAVERAGE"
 
-#: core_resource.hrc:2460
+#: formula/inc/core_resource.hrc:2460
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DGET"
 msgstr "DGET"
 
-#: core_resource.hrc:2461
+#: formula/inc/core_resource.hrc:2461
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DMAX"
 msgstr "DMAX"
 
-#: core_resource.hrc:2462
+#: formula/inc/core_resource.hrc:2462
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DMIN"
 msgstr "DMIN"
 
-#: core_resource.hrc:2463
+#: formula/inc/core_resource.hrc:2463
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DPRODUCT"
 msgstr "DPRODUCT"
 
-#: core_resource.hrc:2464
+#: formula/inc/core_resource.hrc:2464
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DSTDEV"
 msgstr "DSTDEV"
 
-#: core_resource.hrc:2465
+#: formula/inc/core_resource.hrc:2465
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DSTDEVP"
 msgstr "DSTDEVP"
 
-#: core_resource.hrc:2466
+#: formula/inc/core_resource.hrc:2466
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DVAR"
 msgstr "DVAR"
 
-#: core_resource.hrc:2467
+#: formula/inc/core_resource.hrc:2467
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DVARP"
 msgstr "DVARP"
 
-#: core_resource.hrc:2468
+#: formula/inc/core_resource.hrc:2468
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "INDIRECT"
 msgstr "INDIRECT"
 
-#: core_resource.hrc:2469
+#: formula/inc/core_resource.hrc:2469
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
-#: core_resource.hrc:2470
+#: formula/inc/core_resource.hrc:2470
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MATCH"
 msgstr "MATCH"
 
-#: core_resource.hrc:2471
+#: formula/inc/core_resource.hrc:2471
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COUNTBLANK"
 msgstr "COUNTBLANK"
 
-#: core_resource.hrc:2472
+#: formula/inc/core_resource.hrc:2472
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COUNTIF"
 msgstr "COUNTIF"
 
-#: core_resource.hrc:2473
+#: formula/inc/core_resource.hrc:2473
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SUMIF"
 msgstr "SUMIF"
 
-#: core_resource.hrc:2474
+#: formula/inc/core_resource.hrc:2474
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "AVERAGEIF"
 msgstr "AVERAGEIF"
 
-#: core_resource.hrc:2475
+#: formula/inc/core_resource.hrc:2475
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SUMIFS"
 msgstr "SUMIFS"
 
-#: core_resource.hrc:2476
+#: formula/inc/core_resource.hrc:2476
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "AVERAGEIFS"
 msgstr "AVERAGEIFS"
 
-#: core_resource.hrc:2477
+#: formula/inc/core_resource.hrc:2477
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COUNTIFS"
 msgstr "COUNTIFS"
 
-#: core_resource.hrc:2478
+#: formula/inc/core_resource.hrc:2478
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LOOKUP"
 msgstr "LOOKUP"
 
-#: core_resource.hrc:2479
+#: formula/inc/core_resource.hrc:2479
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "VLOOKUP"
 msgstr "VLOOKUP"
 
-#: core_resource.hrc:2480
+#: formula/inc/core_resource.hrc:2480
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "HLOOKUP"
 msgstr "HLOOKUP"
 
-#: core_resource.hrc:2481
+#: formula/inc/core_resource.hrc:2481
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MULTIRANGE"
 msgstr "MULTIRANGE"
 
 #. legacy for range list (union)
-#: core_resource.hrc:2482
+#: formula/inc/core_resource.hrc:2482
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "OFFSET"
 msgstr "OFFSET"
 
-#: core_resource.hrc:2483
+#: formula/inc/core_resource.hrc:2483
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "INDEX"
 msgstr "INDEX"
 
 #. ?? first character = I ??
-#: core_resource.hrc:2484
+#: formula/inc/core_resource.hrc:2484
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "AREAS"
 msgstr "AREAS"
 
-#: core_resource.hrc:2485
+#: formula/inc/core_resource.hrc:2485
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DOLLAR"
 msgstr "DOLLAR"
 
-#: core_resource.hrc:2486
+#: formula/inc/core_resource.hrc:2486
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "REPLACE"
 msgstr "REPLACE"
 
-#: core_resource.hrc:2487
+#: formula/inc/core_resource.hrc:2487
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FIXED"
 msgstr "FIXED"
 
-#: core_resource.hrc:2488
+#: formula/inc/core_resource.hrc:2488
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FIND"
 msgstr "FIND"
 
-#: core_resource.hrc:2489
+#: formula/inc/core_resource.hrc:2489
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "EXACT"
 msgstr "EXACT"
 
-#: core_resource.hrc:2490
+#: formula/inc/core_resource.hrc:2490
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LEFT"
 msgstr "LEFT"
 
-#: core_resource.hrc:2491
+#: formula/inc/core_resource.hrc:2491
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RIGHT"
 msgstr "RIGHT"
 
-#: core_resource.hrc:2492
+#: formula/inc/core_resource.hrc:2492
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SEARCH"
 msgstr "SEARCH"
 
-#: core_resource.hrc:2493
+#: formula/inc/core_resource.hrc:2493
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MID"
 msgstr "MID"
 
-#: core_resource.hrc:2494
+#: formula/inc/core_resource.hrc:2494
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LENB"
 msgstr "LENB"
 
-#: core_resource.hrc:2495
+#: formula/inc/core_resource.hrc:2495
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RIGHTB"
 msgstr "RIGHTB"
 
-#: core_resource.hrc:2496
+#: formula/inc/core_resource.hrc:2496
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LEFTB"
 msgstr "LEFTB"
 
-#: core_resource.hrc:2497
+#: formula/inc/core_resource.hrc:2497
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "REPLACEB"
 msgstr "REPLACEB"
 
-#: core_resource.hrc:2498
+#: formula/inc/core_resource.hrc:2498
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MIDB"
 msgstr "MIDB"
 
-#: core_resource.hrc:2499
+#: formula/inc/core_resource.hrc:2499
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TEXT"
 msgstr "TEXT"
 
-#: core_resource.hrc:2500
+#: formula/inc/core_resource.hrc:2500
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SUBSTITUTE"
 msgstr "SUBSTITUTE"
 
-#: core_resource.hrc:2501
+#: formula/inc/core_resource.hrc:2501
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "REPT"
 msgstr "REPT"
 
-#: core_resource.hrc:2502
+#: formula/inc/core_resource.hrc:2502
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CONCATENATE"
 msgstr "CONCATENATE"
 
-#: core_resource.hrc:2503
+#: formula/inc/core_resource.hrc:2503
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CONCAT"
 msgstr "CONCAT"
 
-#: core_resource.hrc:2504
+#: formula/inc/core_resource.hrc:2504
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TEXTJOIN"
 msgstr "TEXTJOIN"
 
-#: core_resource.hrc:2505
+#: formula/inc/core_resource.hrc:2505
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "IFS"
 msgstr "IFS"
 
-#: core_resource.hrc:2506
+#: formula/inc/core_resource.hrc:2506
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SWITCH"
 msgstr "SWITCH"
 
-#: core_resource.hrc:2507
+#: formula/inc/core_resource.hrc:2507
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MINIFS"
 msgstr "MINIFS"
 
-#: core_resource.hrc:2508
+#: formula/inc/core_resource.hrc:2508
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MAXIFS"
 msgstr "MAXIFS"
 
-#: core_resource.hrc:2509
+#: formula/inc/core_resource.hrc:2509
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MVALUE"
 msgstr "MVALUE"
 
-#: core_resource.hrc:2510
+#: formula/inc/core_resource.hrc:2510
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MDETERM"
 msgstr "MDETERM"
 
-#: core_resource.hrc:2511
+#: formula/inc/core_resource.hrc:2511
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MINVERSE"
 msgstr "MINVERSE"
 
-#: core_resource.hrc:2512
+#: formula/inc/core_resource.hrc:2512
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MMULT"
 msgstr "MMULT"
 
-#: core_resource.hrc:2513
+#: formula/inc/core_resource.hrc:2513
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TRANSPOSE"
 msgstr "TRANSPOSE"
 
-#: core_resource.hrc:2514
+#: formula/inc/core_resource.hrc:2514
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MUNIT"
 msgstr "MUNIT"
 
-#: core_resource.hrc:2515
+#: formula/inc/core_resource.hrc:2515
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GOALSEEK"
 msgstr "GOALSEEK"
 
-#: core_resource.hrc:2516
+#: formula/inc/core_resource.hrc:2516
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "HYPGEOMDIST"
 msgstr "HYPGEOMDIST"
 
-#: core_resource.hrc:2517
+#: formula/inc/core_resource.hrc:2517
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "HYPGEOM.DIST"
 msgstr "HYPGEOM.DIST"
 
-#: core_resource.hrc:2518
+#: formula/inc/core_resource.hrc:2518
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LOGNORMDIST"
 msgstr "LOGNORMDIST"
 
-#: core_resource.hrc:2519
+#: formula/inc/core_resource.hrc:2519
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LOGNORM.DIST"
 msgstr "LOGNORM.DIST"
 
-#: core_resource.hrc:2520
+#: formula/inc/core_resource.hrc:2520
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TDIST"
 msgstr "TDIST"
 
-#: core_resource.hrc:2521
+#: formula/inc/core_resource.hrc:2521
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "T.DIST.2T"
 msgstr "T.DIST.2T"
 
-#: core_resource.hrc:2522
+#: formula/inc/core_resource.hrc:2522
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "T.DIST"
 msgstr "T.DIST"
 
-#: core_resource.hrc:2523
+#: formula/inc/core_resource.hrc:2523
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "T.DIST.RT"
 msgstr "T.DIST.RT"
 
-#: core_resource.hrc:2524
+#: formula/inc/core_resource.hrc:2524
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FDIST"
 msgstr "FDIST"
 
-#: core_resource.hrc:2525
+#: formula/inc/core_resource.hrc:2525
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "F.DIST"
 msgstr "F.DIST"
 
-#: core_resource.hrc:2526
+#: formula/inc/core_resource.hrc:2526
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "F.DIST.RT"
 msgstr "F.DIST.RT"
 
-#: core_resource.hrc:2527
+#: formula/inc/core_resource.hrc:2527
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHIDIST"
 msgstr "CHIDIST"
 
-#: core_resource.hrc:2528
+#: formula/inc/core_resource.hrc:2528
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHISQ.DIST.RT"
 msgstr "CHISQ.DIST.RT"
 
-#: core_resource.hrc:2529
+#: formula/inc/core_resource.hrc:2529
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "WEIBULL"
 msgstr "WEIBULL"
 
-#: core_resource.hrc:2530
+#: formula/inc/core_resource.hrc:2530
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "WEIBULL.DIST"
 msgstr "WEIBULL.DIST"
 
-#: core_resource.hrc:2531
+#: formula/inc/core_resource.hrc:2531
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NEGBINOMDIST"
 msgstr "NEGBINOMDIST"
 
-#: core_resource.hrc:2532
+#: formula/inc/core_resource.hrc:2532
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NEGBINOM.DIST"
 msgstr "NEGBINOM.DIST"
 
-#: core_resource.hrc:2533
+#: formula/inc/core_resource.hrc:2533
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CRITBINOM"
 msgstr "CRITBINOM"
 
-#: core_resource.hrc:2534
+#: formula/inc/core_resource.hrc:2534
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BINOM.INV"
 msgstr "BINOM.INV"
 
-#: core_resource.hrc:2535
+#: formula/inc/core_resource.hrc:2535
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "KURT"
 msgstr "KURT"
 
-#: core_resource.hrc:2536
+#: formula/inc/core_resource.hrc:2536
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "HARMEAN"
 msgstr "HARMEAN"
 
-#: core_resource.hrc:2537
+#: formula/inc/core_resource.hrc:2537
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GEOMEAN"
 msgstr "GEOMEAN"
 
-#: core_resource.hrc:2538
+#: formula/inc/core_resource.hrc:2538
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "STANDARDIZE"
 msgstr "STANDARDIZE"
 
-#: core_resource.hrc:2539
+#: formula/inc/core_resource.hrc:2539
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "AVEDEV"
 msgstr "AVEDEV"
 
-#: core_resource.hrc:2540
+#: formula/inc/core_resource.hrc:2540
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SKEW"
 msgstr "SKEW"
 
-#: core_resource.hrc:2541
+#: formula/inc/core_resource.hrc:2541
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SKEWP"
 msgstr "SKEWP"
 
-#: core_resource.hrc:2542
+#: formula/inc/core_resource.hrc:2542
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DEVSQ"
 msgstr "DEVSQ"
 
-#: core_resource.hrc:2543
+#: formula/inc/core_resource.hrc:2543
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MEDIAN"
 msgstr "MEDIAN"
 
-#: core_resource.hrc:2544
+#: formula/inc/core_resource.hrc:2544
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MODE"
 msgstr "MODE"
 
-#: core_resource.hrc:2545
+#: formula/inc/core_resource.hrc:2545
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MODE.SNGL"
 msgstr "MODE.SNGL"
 
-#: core_resource.hrc:2546
+#: formula/inc/core_resource.hrc:2546
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MODE.MULT"
 msgstr "MODE.MULT"
 
-#: core_resource.hrc:2547
+#: formula/inc/core_resource.hrc:2547
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ZTEST"
 msgstr "ZTEST"
 
-#: core_resource.hrc:2548
+#: formula/inc/core_resource.hrc:2548
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "Z.TEST"
 msgstr "Z.TEST"
 
-#: core_resource.hrc:2549
+#: formula/inc/core_resource.hrc:2549
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "AGGREGATE"
 msgstr "AGGREGATE"
 
-#: core_resource.hrc:2550
+#: formula/inc/core_resource.hrc:2550
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TTEST"
 msgstr "TTEST"
 
-#: core_resource.hrc:2551
+#: formula/inc/core_resource.hrc:2551
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "T.TEST"
 msgstr "T.TEST"
 
-#: core_resource.hrc:2552
+#: formula/inc/core_resource.hrc:2552
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RANK"
 msgstr "RANK"
 
-#: core_resource.hrc:2553
+#: formula/inc/core_resource.hrc:2553
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PERCENTILE"
 msgstr "PERCENTILE"
 
-#: core_resource.hrc:2554
+#: formula/inc/core_resource.hrc:2554
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PERCENTRANK"
 msgstr "PERCENTRANK"
 
-#: core_resource.hrc:2555
+#: formula/inc/core_resource.hrc:2555
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PERCENTILE.INC"
 msgstr "PERCENTILE.INC"
 
-#: core_resource.hrc:2556
+#: formula/inc/core_resource.hrc:2556
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PERCENTRANK.INC"
 msgstr "PERCENTRANK.INC"
 
-#: core_resource.hrc:2557
+#: formula/inc/core_resource.hrc:2557
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "QUARTILE.INC"
 msgstr "QUARTILE.INC"
 
-#: core_resource.hrc:2558
+#: formula/inc/core_resource.hrc:2558
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RANK.EQ"
 msgstr "RANK.EQ"
 
-#: core_resource.hrc:2559
+#: formula/inc/core_resource.hrc:2559
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PERCENTILE.EXC"
 msgstr "PERCENTILE.EXC"
 
-#: core_resource.hrc:2560
+#: formula/inc/core_resource.hrc:2560
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PERCENTRANK.EXC"
 msgstr "PERCENTRANK.EXC"
 
-#: core_resource.hrc:2561
+#: formula/inc/core_resource.hrc:2561
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "QUARTILE.EXC"
 msgstr "QUARTILE.EXC"
 
-#: core_resource.hrc:2562
+#: formula/inc/core_resource.hrc:2562
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RANK.AVG"
 msgstr "RANK.AVG"
 
-#: core_resource.hrc:2563
+#: formula/inc/core_resource.hrc:2563
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LARGE"
 msgstr "LARGE"
 
-#: core_resource.hrc:2564
+#: formula/inc/core_resource.hrc:2564
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SMALL"
 msgstr "SMALL"
 
-#: core_resource.hrc:2565
+#: formula/inc/core_resource.hrc:2565
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FREQUENCY"
 msgstr "FREQUENCY"
 
-#: core_resource.hrc:2566
+#: formula/inc/core_resource.hrc:2566
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "QUARTILE"
 msgstr "QUARTILE"
 
-#: core_resource.hrc:2567
+#: formula/inc/core_resource.hrc:2567
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NORMINV"
 msgstr "NORMINV"
 
-#: core_resource.hrc:2568
+#: formula/inc/core_resource.hrc:2568
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NORM.INV"
 msgstr "NORM.INV"
 
-#: core_resource.hrc:2569
+#: formula/inc/core_resource.hrc:2569
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CONFIDENCE"
 msgstr "CONFIDENCE"
 
-#: core_resource.hrc:2570
+#: formula/inc/core_resource.hrc:2570
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CONFIDENCE.NORM"
 msgstr "CONFIDENCE.NORM"
 
-#: core_resource.hrc:2571
+#: formula/inc/core_resource.hrc:2571
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CONFIDENCE.T"
 msgstr "CONFIDENCE.T"
 
-#: core_resource.hrc:2572
+#: formula/inc/core_resource.hrc:2572
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FTEST"
 msgstr "FTEST"
 
-#: core_resource.hrc:2573
+#: formula/inc/core_resource.hrc:2573
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "F.TEST"
 msgstr "F.TEST"
 
-#: core_resource.hrc:2574
+#: formula/inc/core_resource.hrc:2574
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TRIMMEAN"
 msgstr "TRIMMEAN"
 
-#: core_resource.hrc:2575
+#: formula/inc/core_resource.hrc:2575
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PROB"
 msgstr "PROB"
 
-#: core_resource.hrc:2576
+#: formula/inc/core_resource.hrc:2576
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CORREL"
 msgstr "CORREL"
 
-#: core_resource.hrc:2577
+#: formula/inc/core_resource.hrc:2577
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COVAR"
 msgstr "COVAR"
 
-#: core_resource.hrc:2578
+#: formula/inc/core_resource.hrc:2578
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COVARIANCE.P"
 msgstr "COVARIANCE.P"
 
-#: core_resource.hrc:2579
+#: formula/inc/core_resource.hrc:2579
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COVARIANCE.S"
 msgstr "COVARIANCE.S"
 
-#: core_resource.hrc:2580
+#: formula/inc/core_resource.hrc:2580
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "PEARSON"
 msgstr "PEARSON"
 
-#: core_resource.hrc:2581
+#: formula/inc/core_resource.hrc:2581
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RSQ"
 msgstr "RSQ"
 
-#: core_resource.hrc:2582
+#: formula/inc/core_resource.hrc:2582
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "STEYX"
 msgstr "STEYX"
 
-#: core_resource.hrc:2583
+#: formula/inc/core_resource.hrc:2583
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SLOPE"
 msgstr "SLOPE"
 
-#: core_resource.hrc:2584
+#: formula/inc/core_resource.hrc:2584
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "INTERCEPT"
 msgstr "INTERCEPT"
 
-#: core_resource.hrc:2585
+#: formula/inc/core_resource.hrc:2585
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TREND"
 msgstr "TREND"
 
-#: core_resource.hrc:2586
+#: formula/inc/core_resource.hrc:2586
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GROWTH"
 msgstr "GROWTH"
 
-#: core_resource.hrc:2587
+#: formula/inc/core_resource.hrc:2587
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LINEST"
 msgstr "LINEST"
 
-#: core_resource.hrc:2588
+#: formula/inc/core_resource.hrc:2588
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LOGEST"
 msgstr "LOGEST"
 
-#: core_resource.hrc:2589
+#: formula/inc/core_resource.hrc:2589
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FORECAST"
 msgstr "FORECAST"
 
-#: core_resource.hrc:2590
+#: formula/inc/core_resource.hrc:2590
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FORECAST.ETS.ADD"
 msgstr "FORECAST.ETS.ADD"
 
-#: core_resource.hrc:2591
+#: formula/inc/core_resource.hrc:2591
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FORECAST.ETS.SEASONALITY"
 msgstr "FORECAST.ETS.SEASONALITY"
 
-#: core_resource.hrc:2592
+#: formula/inc/core_resource.hrc:2592
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FORECAST.ETS.MULT"
 msgstr "FORECAST.ETS.MULT"
 
-#: core_resource.hrc:2593
+#: formula/inc/core_resource.hrc:2593
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FORECAST.ETS.PI.ADD"
 msgstr "FORECAST.ETS.PI.ADD"
 
-#: core_resource.hrc:2594
+#: formula/inc/core_resource.hrc:2594
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FORECAST.ETS.PI.MULT"
 msgstr "FORECAST.ETS.PI.MULT"
 
-#: core_resource.hrc:2595
+#: formula/inc/core_resource.hrc:2595
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FORECAST.ETS.STAT.ADD"
 msgstr "FORECAST.ETS.STAT.ADD"
 
-#: core_resource.hrc:2596
+#: formula/inc/core_resource.hrc:2596
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FORECAST.ETS.STAT.MULT"
 msgstr "FORECAST.ETS.STAT.MULT"
 
-#: core_resource.hrc:2597
+#: formula/inc/core_resource.hrc:2597
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FORECAST.LINEAR"
 msgstr "FORECAST.LINEAR"
 
-#: core_resource.hrc:2598
+#: formula/inc/core_resource.hrc:2598
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHIINV"
 msgstr "CHIINV"
 
-#: core_resource.hrc:2599
+#: formula/inc/core_resource.hrc:2599
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHISQ.INV.RT"
 msgstr "CHISQ.INV.RT"
 
-#: core_resource.hrc:2600
+#: formula/inc/core_resource.hrc:2600
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GAMMADIST"
 msgstr "GAMMADIST"
 
-#: core_resource.hrc:2601
+#: formula/inc/core_resource.hrc:2601
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GAMMA.DIST"
 msgstr "GAMMA.DIST"
 
-#: core_resource.hrc:2602
+#: formula/inc/core_resource.hrc:2602
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GAMMAINV"
 msgstr "GAMMAINV"
 
-#: core_resource.hrc:2603
+#: formula/inc/core_resource.hrc:2603
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GAMMA.INV"
 msgstr "GAMMA.INV"
 
-#: core_resource.hrc:2604
+#: formula/inc/core_resource.hrc:2604
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "TINV"
 msgstr "TINV"
 
-#: core_resource.hrc:2605
+#: formula/inc/core_resource.hrc:2605
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "T.INV.2T"
 msgstr "T.INV.2T"
 
-#: core_resource.hrc:2606
+#: formula/inc/core_resource.hrc:2606
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "T.INV"
 msgstr "T.INV"
 
-#: core_resource.hrc:2607
+#: formula/inc/core_resource.hrc:2607
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FINV"
 msgstr "FINV"
 
-#: core_resource.hrc:2608
+#: formula/inc/core_resource.hrc:2608
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "F.INV"
 msgstr "F.INV"
 
-#: core_resource.hrc:2609
+#: formula/inc/core_resource.hrc:2609
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "F.INV.RT"
 msgstr "F.INV.RT"
 
-#: core_resource.hrc:2610
+#: formula/inc/core_resource.hrc:2610
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHITEST"
 msgstr "CHITEST"
 
-#: core_resource.hrc:2611
+#: formula/inc/core_resource.hrc:2611
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHISQ.TEST"
 msgstr "CHISQ.TEST"
 
-#: core_resource.hrc:2612
+#: formula/inc/core_resource.hrc:2612
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LOGINV"
 msgstr "LOGINV"
 
-#: core_resource.hrc:2613
+#: formula/inc/core_resource.hrc:2613
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "LOGNORM.INV"
 msgstr "LOGNORM.INV"
 
-#: core_resource.hrc:2614
+#: formula/inc/core_resource.hrc:2614
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "MULTIPLE.OPERATIONS"
 msgstr "MULTIPLE.OPERATIONS"
 
-#: core_resource.hrc:2615
+#: formula/inc/core_resource.hrc:2615
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BETADIST"
 msgstr "BETADIST"
 
-#: core_resource.hrc:2616
+#: formula/inc/core_resource.hrc:2616
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BETAINV"
 msgstr "BETAINV"
 
-#: core_resource.hrc:2617
+#: formula/inc/core_resource.hrc:2617
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BETA.DIST"
 msgstr "BETA.DIST"
 
-#: core_resource.hrc:2618
+#: formula/inc/core_resource.hrc:2618
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BETA.INV"
 msgstr "BETA.INV"
 
-#: core_resource.hrc:2619
+#: formula/inc/core_resource.hrc:2619
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "WEEKNUM"
 msgstr "WEEKNUM"
 
-#: core_resource.hrc:2620
+#: formula/inc/core_resource.hrc:2620
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ISOWEEKNUM"
 msgstr "ISOWEEKNUM"
 
-#: core_resource.hrc:2621
+#: formula/inc/core_resource.hrc:2621
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "WEEKNUM_OOO"
 msgstr "WEEKNUM_OOO"
 
-#: core_resource.hrc:2622
+#: formula/inc/core_resource.hrc:2622
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "EASTERSUNDAY"
 msgstr "EASTERSUNDAY"
 
-#: core_resource.hrc:2623
+#: formula/inc/core_resource.hrc:2623
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "WEEKDAY"
 msgstr "WEEKDAY"
 
-#: core_resource.hrc:2624
+#: formula/inc/core_resource.hrc:2624
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NETWORKDAYS"
 msgstr "NETWORKDAYS"
 
-#: core_resource.hrc:2625
+#: formula/inc/core_resource.hrc:2625
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NETWORKDAYS.INTL"
 msgstr "NETWORKDAYS.INTL"
 
-#: core_resource.hrc:2626
+#: formula/inc/core_resource.hrc:2626
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "WORKDAY.INTL"
 msgstr "WORKDAY.INTL"
 
-#: core_resource.hrc:2627
+#: formula/inc/core_resource.hrc:2627
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#NAME!"
 msgstr "#NAME!"
 
-#: core_resource.hrc:2628
+#: formula/inc/core_resource.hrc:2628
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "STYLE"
 msgstr "STYLE"
 
-#: core_resource.hrc:2629
+#: formula/inc/core_resource.hrc:2629
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DDE"
 msgstr "DDE"
 
-#: core_resource.hrc:2630
+#: formula/inc/core_resource.hrc:2630
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BASE"
 msgstr "BASE"
 
-#: core_resource.hrc:2631
+#: formula/inc/core_resource.hrc:2631
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "DECIMAL"
 msgstr "DECIMAL"
 
-#: core_resource.hrc:2632
+#: formula/inc/core_resource.hrc:2632
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CONVERT_OOO"
 msgstr "CONVERT_OOO"
 
-#: core_resource.hrc:2633
+#: formula/inc/core_resource.hrc:2633
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ROMAN"
 msgstr "ROMAN"
 
-#: core_resource.hrc:2634
+#: formula/inc/core_resource.hrc:2634
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "HYPERLINK"
 msgstr "HYPERLINK"
 
-#: core_resource.hrc:2635
+#: formula/inc/core_resource.hrc:2635
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "INFO"
 msgstr "INFO"
 
-#: core_resource.hrc:2636
+#: formula/inc/core_resource.hrc:2636
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BAHTTEXT"
 msgstr "BAHTTEXT"
 
-#: core_resource.hrc:2637
+#: formula/inc/core_resource.hrc:2637
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GETPIVOTDATA"
 msgstr "GETPIVOTDATA"
 
-#: core_resource.hrc:2638
+#: formula/inc/core_resource.hrc:2638
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "EUROCONVERT"
 msgstr "EUROCONVERT"
 
-#: core_resource.hrc:2639
+#: formula/inc/core_resource.hrc:2639
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "NUMBERVALUE"
 msgstr "NUMBERVALUE"
 
-#: core_resource.hrc:2640
+#: formula/inc/core_resource.hrc:2640
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "GAMMA"
 msgstr "GAMMA"
 
-#: core_resource.hrc:2641
+#: formula/inc/core_resource.hrc:2641
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHISQDIST"
 msgstr "CHISQDIST"
 
-#: core_resource.hrc:2642
+#: formula/inc/core_resource.hrc:2642
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHISQ.DIST"
 msgstr "CHISQ.DIST"
 
-#: core_resource.hrc:2643
+#: formula/inc/core_resource.hrc:2643
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHISQINV"
 msgstr "CHISQINV"
 
-#: core_resource.hrc:2644
+#: formula/inc/core_resource.hrc:2644
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "CHISQ.INV"
 msgstr "CHISQ.INV"
 
-#: core_resource.hrc:2645
+#: formula/inc/core_resource.hrc:2645
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BITAND"
 msgstr "BITAND"
 
-#: core_resource.hrc:2646
+#: formula/inc/core_resource.hrc:2646
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BITOR"
 msgstr "BITOR"
 
-#: core_resource.hrc:2647
+#: formula/inc/core_resource.hrc:2647
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BITXOR"
 msgstr "BITXOR"
 
-#: core_resource.hrc:2648
+#: formula/inc/core_resource.hrc:2648
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BITRSHIFT"
 msgstr "BITRSHIFT"
 
-#: core_resource.hrc:2649
+#: formula/inc/core_resource.hrc:2649
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "BITLSHIFT"
 msgstr "BITLSHIFT"
 
 #. BEGIN defined ERROR.TYPE() values.
 #. ERROR.TYPE( #NULL! ) == 1
-#: core_resource.hrc:2652
+#: formula/inc/core_resource.hrc:2652
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#NULL!"
 msgstr "#NULL!"
 
 #. ERROR.TYPE( #DIV/0! ) == 2
-#: core_resource.hrc:2654
+#: formula/inc/core_resource.hrc:2654
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#DIV/0!"
 msgstr "#DIV/0!"
 
 #. ERROR.TYPE( #VALUE! ) == 3
-#: core_resource.hrc:2656
+#: formula/inc/core_resource.hrc:2656
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#VALUE!"
 msgstr "#VALUE!"
 
 #. ERROR.TYPE( #REF! ) == 4
-#: core_resource.hrc:2658
+#: formula/inc/core_resource.hrc:2658
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#REF!"
 msgstr "#REF!"
 
 #. ERROR.TYPE( #NAME! ) == 5
-#: core_resource.hrc:2660
+#: formula/inc/core_resource.hrc:2660
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#NAME?"
 msgstr "#NAME?"
 
 #. ERROR.TYPE( #NUM! ) == 6
-#: core_resource.hrc:2662
+#: formula/inc/core_resource.hrc:2662
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#NUM!"
 msgstr "#NUM!"
 
 #. ERROR.TYPE( #N/A ) == 7
-#: core_resource.hrc:2664
+#: formula/inc/core_resource.hrc:2664
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "#N/A"
 msgstr "#N/A"
 
 #. END defined ERROR.TYPE() values.
-#: core_resource.hrc:2667
+#: formula/inc/core_resource.hrc:2667
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FILTERXML"
 msgstr "FILTERXML"
 
-#: core_resource.hrc:2668
+#: formula/inc/core_resource.hrc:2668
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COLOR"
 msgstr "LLIW"
 
-#: core_resource.hrc:2669
+#: formula/inc/core_resource.hrc:2669
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "WEBSERVICE"
 msgstr "WEBSERVICE"
 
-#: core_resource.hrc:2670
+#: formula/inc/core_resource.hrc:2670
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ERF.PRECISE"
 msgstr "ERF.PRECISE"
 
-#: core_resource.hrc:2671
+#: formula/inc/core_resource.hrc:2671
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ERFC.PRECISE"
 msgstr "ERFC.PRECISE"
 
-#: core_resource.hrc:2672
+#: formula/inc/core_resource.hrc:2672
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ENCODEURL"
 msgstr "ENCODEURL"
 
-#: core_resource.hrc:2673
+#: formula/inc/core_resource.hrc:2673
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "RAWSUBTRACT"
 msgstr "RAWSUBTRACT"
 
-#: core_resource.hrc:2674
+#: formula/inc/core_resource.hrc:2674
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "ROUNDSIG"
 msgstr "ROUNDSIG"
 
-#: core_resource.hrc:2675
+#: formula/inc/core_resource.hrc:2675
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "FINDB"
 msgstr "FINDB"
 
-#: core_resource.hrc:2676
+#: formula/inc/core_resource.hrc:2676
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "SEARCHB"
 msgstr "SEARCHB"
 
-#: strings.hrc:25
+#: formula/inc/strings.hrc:25
 msgctxt "STR_OPTIONAL"
 msgid "(optional)"
 msgstr "(dewisol)"
 
-#: strings.hrc:26
+#: formula/inc/strings.hrc:26
 msgctxt "STR_REQUIRED"
 msgid "(required)"
 msgstr "(angenrheidiol)"
 
-#: strings.hrc:28
+#: formula/inc/strings.hrc:28
 msgctxt "STR_TITLE1"
 msgid "Function Wizard"
 msgstr "Dewin Swyddogaeth"
 
-#: strings.hrc:29
+#: formula/inc/strings.hrc:29
 msgctxt "STR_TITLE2"
 msgid "Function Wizard  -"
 msgstr "Dewin Swyddogaeth  -"
 
-#: strings.hrc:30
+#: formula/inc/strings.hrc:30
 msgctxt "STR_END"
 msgid "~End"
 msgstr "~Diwedd"
 
-#: strings.hrc:31
+#: formula/inc/strings.hrc:31
 msgctxt "RID_STR_SHRINK"
 msgid "Shrink"
 msgstr "Lleihau"
 
-#: strings.hrc:32
+#: formula/inc/strings.hrc:32
 msgctxt "RID_STR_EXPAND"
 msgid "Expand"
 msgstr "Ehangu"
 
-#: formuladialog.ui:22
+#: formula/uiconfig/ui/formuladialog.ui:22
 msgctxt "formuladialog|array"
 msgid "Array"
 msgstr "Arae"
 
-#: formuladialog.ui:57
+#: formula/uiconfig/ui/formuladialog.ui:58
 msgctxt "formuladialog|back"
 msgid "< _Back"
 msgstr "< _Nôl"
 
-#: formuladialog.ui:72
+#: formula/uiconfig/ui/formuladialog.ui:73
 msgctxt "formuladialog|next"
 msgid "_Next >"
 msgstr "_Nesaf >"
 
-#: formuladialog.ui:158
+#: formula/uiconfig/ui/formuladialog.ui:159
 msgctxt "formuladialog|function"
 msgid "Functions"
 msgstr "Swyddogaethau"
 
-#: formuladialog.ui:180
+#: formula/uiconfig/ui/formuladialog.ui:181
 msgctxt "formuladialog|struct"
 msgid "Structure"
 msgstr "Strwythur"
 
-#: formuladialog.ui:227
+#: formula/uiconfig/ui/formuladialog.ui:228
 msgctxt "formuladialog|label2"
 msgid "Function result"
 msgstr "Canlyniad swyddogaeth"
 
-#: formuladialog.ui:368
+#: formula/uiconfig/ui/formuladialog.ui:369
 msgctxt "formuladialog|formula"
 msgid "For_mula"
 msgstr "_Fformiwla"
 
-#: formuladialog.ui:383
+#: formula/uiconfig/ui/formuladialog.ui:384
 msgctxt "formuladialog|label1"
 msgid "Result"
 msgstr "Canlyniad"
 
-#: formuladialog.ui:418
+#: formula/uiconfig/ui/formuladialog.ui:419
 msgctxt "formuladialog|ed_formula-atkobject"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: formuladialog.ui:467
+#: formula/uiconfig/ui/formuladialog.ui:468
 msgctxt "formuladialog|RB_REF|tooltip_text"
 msgid "Maximize"
 msgstr "Mwyhau"
 
-#: functionpage.ui:19
+#: formula/uiconfig/ui/functionpage.ui:19
 msgctxt "functionpage|label_search"
 msgid "_Search"
 msgstr "_Chwilio"
 
-#: functionpage.ui:47
+#: formula/uiconfig/ui/functionpage.ui:47
 msgctxt "functionpage|label1"
 msgid "_Category"
 msgstr "_Categori"
 
-#: functionpage.ui:63
+#: formula/uiconfig/ui/functionpage.ui:63
 msgctxt "functionpage|category"
 msgid "Last Used"
 msgstr "Defnyddiwyd Diwethaf"
 
-#: functionpage.ui:64
+#: formula/uiconfig/ui/functionpage.ui:64
 msgctxt "functionpage|category"
 msgid "All"
 msgstr "Y Cyfan"
 
-#: functionpage.ui:78
+#: formula/uiconfig/ui/functionpage.ui:78
 msgctxt "functionpage|label2"
 msgid "_Function"
 msgstr "_Swyddogaeth"
 
-#: parameter.ui:30
+#: formula/uiconfig/ui/parameter.ui:30
 msgctxt "parameter|editdesc"
 msgid "Function not known"
 msgstr "Swyddogaeth anhysbys"
 
-#: parameter.ui:279
+#: formula/uiconfig/ui/parameter.ui:279
 msgctxt "parameter|RB_ARG1|tooltip_text"
 msgid "Select"
 msgstr "Dewis"
 
-#: parameter.ui:295
+#: formula/uiconfig/ui/parameter.ui:295
 msgctxt "parameter|RB_ARG2|tooltip_text"
 msgid "Select"
 msgstr "Dewis"
 
-#: parameter.ui:311
+#: formula/uiconfig/ui/parameter.ui:311
 msgctxt "parameter|RB_ARG3|tooltip_text"
 msgid "Select"
 msgstr "Dewis"
 
-#: parameter.ui:327
+#: formula/uiconfig/ui/parameter.ui:327
 msgctxt "parameter|RB_ARG4|tooltip_text"
 msgid "Select"
 msgstr "Dewis"
 
-#: structpage.ui:19
+#: formula/uiconfig/ui/structpage.ui:19
 msgctxt "structpage|label1"
 msgid "_Structure"
 msgstr "S_trwythur"
diff --git a/source/cy/fpicker/messages.po b/source/cy/fpicker/messages.po
index 404c1172e27..0873f5ecd23 100644
--- a/source/cy/fpicker/messages.po
+++ b/source/cy/fpicker/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: 2017-11-24 14:55+0100\n"
-"PO-Revision-Date: 2017-12-05 11:18+0000\n"
+"POT-Creation-Date: 2018-04-23 18:10+0200\n"
+"PO-Revision-Date: 2018-03-01 09:08+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,86 +13,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1512472701.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1519895323.000000\n"
 
-#: strings.hrc:14
+#: include/fpicker/strings.hrc:14
 msgctxt "STR_SVT_FILEPICKER_AUTO_EXTENSION"
 msgid "~Automatic file name extension"
 msgstr "~Estyniad enw ffeil awtomatig"
 
-#: strings.hrc:15
+#: include/fpicker/strings.hrc:15
 msgctxt "STR_SVT_FILEPICKER_PASSWORD"
 msgid "Save with pass~word"
 msgstr "Cadw gyda ~chyfrinair"
 
 #. dear loplugins, please don't remove this constant, it will be used in follow-up commits
-#: strings.hrc:17
+#: include/fpicker/strings.hrc:17
 msgctxt "STR_SVT_FILEPICKER_GPGENCRYPT"
 msgid "Encrypt with ~GPG key"
 msgstr "Amgryptio gydag allwedd ~GPG"
 
-#: strings.hrc:18
+#: include/fpicker/strings.hrc:18
 msgctxt "STR_SVT_FILEPICKER_FILTER_OPTIONS"
 msgid "~Edit filter settings"
 msgstr "~Golygu gosodiadau'r hidl"
 
-#: strings.hrc:19
+#: include/fpicker/strings.hrc:19
 msgctxt "STR_SVT_FILEPICKER_READONLY"
 msgid "~Read-only"
 msgstr "~Darllen-yn-unig"
 
-#: strings.hrc:20
+#: include/fpicker/strings.hrc:20
 msgctxt "STR_SVT_FILEPICKER_INSERT_AS_LINK"
 msgid "~Link"
 msgstr "~Cysylltu"
 
-#: strings.hrc:21
+#: include/fpicker/strings.hrc:21
 msgctxt "STR_SVT_FILEPICKER_SHOW_PREVIEW"
 msgid "Pr~eview"
 msgstr "~Rhagolwg"
 
-#: strings.hrc:22
+#: include/fpicker/strings.hrc:22
 msgctxt "STR_SVT_FILEPICKER_PLAY"
 msgid "~Play"
 msgstr "~Chwarae"
 
-#: strings.hrc:23
+#: include/fpicker/strings.hrc:23
 msgctxt "STR_SVT_FILEPICKER_VERSION"
 msgid "~Version:"
 msgstr "~Fersiwn:"
 
-#: strings.hrc:24
+#: include/fpicker/strings.hrc:24
 msgctxt "STR_SVT_FILEPICKER_TEMPLATES"
 msgid "S~tyles:"
 msgstr "~Arddulliau:"
 
-#: strings.hrc:25
+#: include/fpicker/strings.hrc:25
 msgctxt "STR_SVT_FILEPICKER_IMAGE_TEMPLATE"
 msgid "Style:"
 msgstr "Arddull:"
 
-#: strings.hrc:26
+#: include/fpicker/strings.hrc:26
+msgctxt "STR_SVT_FILEPICKER_IMAGE_ANCHOR"
+msgid "A~nchor:"
+msgstr "~Angor:"
+
+#: include/fpicker/strings.hrc:27
 msgctxt "STR_SVT_FILEPICKER_SELECTION"
 msgid "~Selection"
 msgstr "~Dewis"
 
-#: strings.hrc:27
+#: include/fpicker/strings.hrc:28
 msgctxt "STR_SVT_FILEPICKER_FILTER_TITLE"
 msgid "File ~type:"
 msgstr "~Math o ffeil:"
 
-#: strings.hrc:28
+#: include/fpicker/strings.hrc:29
 msgctxt "STR_SVT_FOLDERPICKER_DEFAULT_TITLE"
 msgid "Select Path"
 msgstr "Dewis Llwybr"
 
-#: strings.hrc:29
+#: include/fpicker/strings.hrc:30
 msgctxt "STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION"
 msgid "Please select a folder."
 msgstr "Dewis ffolder."
 
-#: strings.hrc:30
+#: include/fpicker/strings.hrc:31
 msgctxt "STR_SVT_ALREADYEXISTOVERWRITE"
 msgid ""
 "A file named \"$filename$\" already exists.\n"
@@ -103,7 +108,7 @@ msgstr ""
 "\n"
 "Hoffech chi ei newid?"
 
-#: strings.hrc:31
+#: include/fpicker/strings.hrc:32
 msgctxt "STR_SVT_DELETESERVICE"
 msgid ""
 "Are you sure you want to delete the service?\n"
@@ -112,77 +117,77 @@ msgstr ""
 "Ydych chi'n siŵr eich bod am ddileu'r gwasanaeth yma?\n"
 "\"$servicename$\""
 
-#: strings.hrc:32
+#: include/fpicker/strings.hrc:33
 msgctxt "STR_SVT_ROOTLABEL"
 msgid "Root"
 msgstr "Gwraidd"
 
-#: strings.hrc:33
+#: include/fpicker/strings.hrc:34
 msgctxt "STR_FILTERNAME_ALL"
 msgid "All files"
 msgstr "Pob Ffeil"
 
-#: strings.hrc:34
+#: include/fpicker/strings.hrc:35
 msgctxt "STR_FILEDLG_OPEN"
 msgid "Open"
 msgstr "Agor"
 
-#: strings.hrc:35
+#: include/fpicker/strings.hrc:36
 msgctxt "STR_FILEDLG_TYPE"
 msgid "File ~type"
 msgstr "Math o ~ffeil"
 
-#: strings.hrc:36
+#: include/fpicker/strings.hrc:37
 msgctxt "STR_FILEDLG_SAVE"
 msgid "Save"
 msgstr "Cadw"
 
-#: strings.hrc:25
+#: fpicker/inc/strings.hrc:25
 msgctxt "STR_EXPLORERFILE_OPEN"
 msgid "Open"
 msgstr "Agor"
 
-#: strings.hrc:26
+#: fpicker/inc/strings.hrc:26
 msgctxt "STR_EXPLORERFILE_SAVE"
 msgid "Save as"
 msgstr "Cadw fel"
 
-#: strings.hrc:27
+#: fpicker/inc/strings.hrc:27
 msgctxt "STR_EXPLORERFILE_BUTTONSAVE"
 msgid "~Save"
 msgstr "~Cadw"
 
-#: strings.hrc:28
+#: fpicker/inc/strings.hrc:28
 msgctxt "STR_PATHNAME"
 msgid "~Path:"
 msgstr "~Llwybr:"
 
-#: strings.hrc:29
+#: fpicker/inc/strings.hrc:29
 msgctxt "STR_PATHSELECT"
 msgid "Select path"
 msgstr "Dewis llwybr"
 
-#: strings.hrc:30
+#: fpicker/inc/strings.hrc:30
 msgctxt "STR_BUTTONSELECT"
 msgid "~Select"
 msgstr "~Dewis"
 
-#: strings.hrc:31
+#: fpicker/inc/strings.hrc:31
 msgctxt "STR_PREVIEW"
 msgid "File Preview"
 msgstr "Rhagolwg Ffeil"
 
-#: strings.hrc:32
+#: fpicker/inc/strings.hrc:32
 msgctxt "STR_DEFAULT_DIRECTORY"
 msgid "My Documents"
 msgstr "Dogfennau Personol"
 
-#: strings.hrc:33
+#: fpicker/inc/strings.hrc:33
 msgctxt "STR_PLACES_TITLE"
 msgid "Places"
 msgstr "Llefydd"
 
-#: strings.hrc:34
+#: fpicker/inc/strings.hrc:34
 msgctxt "RID_FILEOPEN_NOTEXISTENTFILE"
 msgid ""
 "The file $name$ does not exist.\n"
@@ -191,12 +196,12 @@ msgstr ""
 "Nid yw'r ffeil $name$ yn bodoli.\n"
 "Gwnewch yn siŵr eich bod wedi rhoi'r enw ffeil cywir."
 
-#: strings.hrc:35
+#: fpicker/inc/strings.hrc:35
 msgctxt "STR_SVT_NEW_FOLDER"
 msgid "Folder"
 msgstr "Ffolder"
 
-#: strings.hrc:36
+#: fpicker/inc/strings.hrc:36
 msgctxt "STR_SVT_NOREMOVABLEDEVICE"
 msgid ""
 "No removable storage device detected.\n"
@@ -205,132 +210,132 @@ msgstr ""
 "Heb ganfod dyfais storio cludadwy.\n"
 "Gwnewch yn siŵr ei fod wedi ei osod yn iawn a cheisiwch eto."
 
-#: explorerfiledialog.ui:72
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:72
 msgctxt "explorerfiledialog|connect_to_server"
 msgid "Servers..."
 msgstr "Gweinyddion..."
 
-#: explorerfiledialog.ui:78
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:78
 msgctxt "explorerfiledialog|connect_to_server|tooltip_text"
 msgid "Connect To Server"
 msgstr "Cysylltu â'r Gweinydd"
 
-#: explorerfiledialog.ui:81
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:81
 msgctxt "explorerfiledialog|connect_to_server-atkobject"
 msgid "Connect To Server"
 msgstr "Cysylltu â'r Gweinydd"
 
-#: explorerfiledialog.ui:113
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:114
 msgctxt "explorerfiledialog|new_folder|tooltip_text"
 msgid "Create New Folder"
 msgstr "Creu Ffolder Newydd"
 
-#: explorerfiledialog.ui:116
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:117
 msgctxt "explorerfiledialog|new_folder-atkobject"
 msgid "Create New Folder"
 msgstr "Creu Ffolder Newydd"
 
-#: explorerfiledialog.ui:252
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:253
 msgctxt "explorerfiledialog|file_name_label"
 msgid "File _name:"
 msgstr "_Enw ffeil:"
 
-#: explorerfiledialog.ui:277
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:278
 msgctxt "explorerfiledialog|file_type_label"
 msgid "File _type:"
 msgstr "_Math o ffeil:"
 
-#: explorerfiledialog.ui:373
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:376
 msgctxt "explorerfiledialog|readonly"
 msgid "_Read-only"
 msgstr "_Darllen-yn-unig"
 
-#: explorerfiledialog.ui:397
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:400
 msgctxt "explorerfiledialog|password"
 msgid "Save with password"
 msgstr "Cadw gyda chyfrinair"
 
-#: explorerfiledialog.ui:411
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:415
 msgctxt "explorerfiledialog|extension"
 msgid "_Automatic file name extension"
 msgstr "_Estyniad enw ffeil awtomatig"
 
-#: explorerfiledialog.ui:426
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:430
 msgctxt "explorerfiledialog|options"
 msgid "Edit _filter settings"
 msgstr "_Golygu gosodiadau'r hidl"
 
-#: explorerfiledialog.ui:456
+#: fpicker/uiconfig/ui/explorerfiledialog.ui:461
 msgctxt "explorerfiledialog|gpgencrypt"
 msgid "Encrypt with GPG key"
 msgstr "Amgryptio gydag allwedd GPG"
 
-#: foldernamedialog.ui:7
+#: fpicker/uiconfig/ui/foldernamedialog.ui:7
 msgctxt "foldernamedialog|FolderNameDialog"
 msgid "Folder Name ?"
 msgstr "Enw Ffolder ?"
 
-#: foldernamedialog.ui:84
+#: fpicker/uiconfig/ui/foldernamedialog.ui:84
 msgctxt "foldernamedialog|label2"
 msgid "Na_me"
 msgstr "E_nw"
 
-#: foldernamedialog.ui:115
+#: fpicker/uiconfig/ui/foldernamedialog.ui:114
 msgctxt "foldernamedialog|label1"
 msgid "Create New Folder"
 msgstr "Creu Ffolder Newydd"
 
-#: remotefilesdialog.ui:18
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:18
 msgctxt "remotefilesdialog|RemoteFilesDialog"
 msgid "Remote Files"
 msgstr "Ffeiliau Pell"
 
-#: remotefilesdialog.ui:105
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:105
 msgctxt "remotefilesdialog|label1"
 msgid "Service:"
 msgstr "Gwasanaeth:"
 
-#: remotefilesdialog.ui:132
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:132
 msgctxt "remotefilesdialog|add_service_btn"
 msgid "Add service"
 msgstr "Ychwanegu gwasanaeth"
 
-#: remotefilesdialog.ui:177
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:177
 msgctxt "remotefilesdialog|list_view|tooltip_text"
 msgid "List view"
 msgstr "Golwg rhestr"
 
-#: remotefilesdialog.ui:192
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:192
 msgctxt "remotefilesdialog|icon_view|tooltip_text"
 msgid "Icon view"
 msgstr "Golwg eicon"
 
-#: remotefilesdialog.ui:210
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:210
 msgctxt "remotefilesdialog|new_folder|tooltip_text"
 msgid "Create New Folder"
 msgstr "Creu Ffolder Newydd"
 
-#: remotefilesdialog.ui:255
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:255
 msgctxt "remotefilesdialog|filterLabel"
 msgid "Filter"
 msgstr "Hidl"
 
-#: remotefilesdialog.ui:267
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:267
 msgctxt "remotefilesdialog|nameLabel"
 msgid "File name"
 msgstr "Enw ffeil"
 
-#: remotefilesdialog.ui:318
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:318
 msgctxt "remotefilesdialog|edit_service"
 msgid "_Edit service"
 msgstr "_Golygu'r gwasanaeth"
 
-#: remotefilesdialog.ui:326
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:326
 msgctxt "remotefilesdialog|delete_service"
 msgid "_Delete service"
 msgstr "_Dileu'r gwasanaeth"
 
-#: remotefilesdialog.ui:334
+#: fpicker/uiconfig/ui/remotefilesdialog.ui:334
 msgctxt "remotefilesdialog|change_password"
 msgid "_Change password"
 msgstr "_Newid cyfrinair"
diff --git a/source/cy/framework/messages.po b/source/cy/framework/messages.po
index 5b55e64a88f..9b0c356398b 100644
--- a/source/cy/framework/messages.po
+++ b/source/cy/framework/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
+"POT-Creation-Date: 2018-02-27 13:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,92 +13,92 @@ msgstr ""
 "X-Accelerator-Marker: ~\n"
 "X-Generator: LibreOffice\n"
 
-#: strings.hrc:25
+#: framework/inc/strings.hrc:25
 msgctxt "STR_MENU_HEADFOOTALL"
 msgid "All"
 msgstr "Popeth"
 
-#: strings.hrc:26
+#: framework/inc/strings.hrc:26
 msgctxt "STR_UPDATEDOC"
 msgid "~Update"
 msgstr "~Diweddaru"
 
-#: strings.hrc:27
+#: framework/inc/strings.hrc:27
 msgctxt "STR_CLOSEDOC_ANDRETURN"
 msgid "~Close & Return to "
 msgstr "C~au a Dychwelyd i "
 
-#: strings.hrc:28
+#: framework/inc/strings.hrc:28
 msgctxt "STR_TOOLBAR_VISIBLE_BUTTONS"
 msgid "Visible ~Buttons"
 msgstr "~Botymau Gweladwy"
 
-#: strings.hrc:29
+#: framework/inc/strings.hrc:29
 msgctxt "STR_TOOLBAR_CUSTOMIZE_TOOLBAR"
 msgid "~Customize Toolbar..."
 msgstr "~Cyfaddasu'r Bar Offer..."
 
-#: strings.hrc:30
+#: framework/inc/strings.hrc:30
 msgctxt "STR_TOOLBAR_DOCK_TOOLBAR"
 msgid "~Dock Toolbar"
 msgstr "~Docio'r Bar Offer"
 
-#: strings.hrc:31
+#: framework/inc/strings.hrc:31
 msgctxt "STR_TOOLBAR_DOCK_ALL_TOOLBARS"
 msgid "Dock ~All Toolbars"
 msgstr "~Docio Pob Bar Offer"
 
-#: strings.hrc:32
+#: framework/inc/strings.hrc:32
 msgctxt "STR_TOOLBAR_LOCK_TOOLBAR"
 msgid "~Lock Toolbar Position"
 msgstr "C~lo Safle'r Bar Offer"
 
-#: strings.hrc:33
+#: framework/inc/strings.hrc:33
 msgctxt "STR_TOOLBAR_CLOSE_TOOLBAR"
 msgid "Close ~Toolbar"
 msgstr "Cau'r Bar ~Offer"
 
-#: strings.hrc:34
+#: framework/inc/strings.hrc:34
 msgctxt "STR_SAVECOPYDOC"
 msgid "Save Copy ~as..."
 msgstr "C~adw Copi fel..."
 
-#: strings.hrc:35
+#: framework/inc/strings.hrc:35
 msgctxt "STR_NODOCUMENT"
 msgid "No Documents"
 msgstr "Dim dogfennau"
 
-#: strings.hrc:36
+#: framework/inc/strings.hrc:36
 msgctxt "STR_CLEAR_RECENT_FILES"
 msgid "Clear List"
 msgstr "Clirio'r Rhestr"
 
-#: strings.hrc:37
+#: framework/inc/strings.hrc:37
 msgctxt "STR_CLEAR_RECENT_FILES_HELP"
 msgid "Clears the list with the most recently opened files. This action can not be undone."
 msgstr "Mae'n clirio'r rhestr gyda'r ffeiliau agorwyd diwethaf. Nid oes modd dadwneud y weithred hon."
 
-#: strings.hrc:38
+#: framework/inc/strings.hrc:38
 msgctxt "STR_REMOTE_TITLE"
 msgid " (Remote)"
 msgstr " (Pell)"
 
-#: strings.hrc:39
+#: framework/inc/strings.hrc:39
 msgctxt "STR_SAFEMODE_TITLE"
 msgid " (Safe Mode)"
 msgstr " (Modd Diogel)"
 
-#: strings.hrc:40
+#: framework/inc/strings.hrc:40
 msgctxt "STR_TOOLBAR_TITLE_ADDON"
 msgid "Add-On %num%"
 msgstr "Ychwanegyn %num%"
 
-#: strings.hrc:41
+#: framework/inc/strings.hrc:41
 msgctxt "STR_FULL_DISC_RETRY_BUTTON"
 msgid "Retry"
 msgstr "Ceisio Eto"
 
-#: strings.hrc:42
+#: framework/inc/strings.hrc:42
 msgctxt "STR_FULL_DISC_MSG"
 msgid ""
 "%PRODUCTNAME could not save important internal information due to insufficient free disk space at the following location:\n"
@@ -117,12 +117,12 @@ msgstr ""
 "Cliciwch y botwm 'Ceisio Eto' ar ôl i chi ddynodi rhagor o le rhydd i geisio cadw'r data eto.\n"
 "\n"
 
-#: strings.hrc:43
+#: framework/inc/strings.hrc:43
 msgctxt "STR_RESTORE_TOOLBARS"
 msgid "~Reset"
 msgstr "~Ailosod"
 
-#: strings.hrc:44
+#: framework/inc/strings.hrc:44
 msgctxt "STR_CORRUPT_UICFG_SHARE"
 msgid ""
 "An error occurred while loading the user interface configuration data. The application will be terminated now.\n"
@@ -131,7 +131,7 @@ msgstr ""
 "Digwyddodd gwall wrth lwytho data ffurfweddiad rhyngwyneb defnyddiwr. Bydd y rhaglen yn cael ei chau.\n"
 "Ceisiwch ailosod y rhaglen."
 
-#: strings.hrc:45
+#: framework/inc/strings.hrc:45
 msgctxt "STR_CORRUPT_UICFG_USER"
 msgid ""
 "An error occurred while loading the user interface configuration data. The application will be terminated now.\n"
@@ -140,7 +140,7 @@ msgstr ""
 "Digwyddodd gwall wrth lwytho data ffurfweddiad rhyngwyneb defnyddiwr. Bydd y rhaglen yn cael ei chau.\n"
 "Ceisiwch dynnu eich proffil personol o fewn y rhaglen."
 
-#: strings.hrc:46
+#: framework/inc/strings.hrc:46
 msgctxt "STR_CORRUPT_UICFG_GENERAL"
 msgid ""
 "An error occurred while loading the user interface configuration data. The application will be terminated now.\n"
@@ -149,38 +149,38 @@ msgstr ""
 "Digwyddodd gwall wrth lwytho data ffurfweddiad rhyngwyneb defnyddiwr. Bydd y rhaglen yn cael ei chau.\n"
 "Ceisiwch dynnu eich proffil personol o fewn y rhaglen neu geisio ailosod y rhaglen."
 
-#: strings.hrc:47
+#: framework/inc/strings.hrc:47
 msgctxt "STR_UNTITLED_DOCUMENT"
 msgid "Untitled"
 msgstr "Dideitl"
 
 #. To translators: for displaying 'Multiple Languages' in the language statusbar control
-#: strings.hrc:49
+#: framework/inc/strings.hrc:49
 msgctxt "STR_LANGSTATUS_MULTIPLE_LANGUAGES"
 msgid "Multiple Languages"
 msgstr "Ieithoedd Niferus"
 
-#: strings.hrc:50
+#: framework/inc/strings.hrc:50
 msgctxt "STR_LANGSTATUS_NONE"
 msgid "None (Do not check spelling)"
 msgstr "Dim (Peidio gwirio sillafu)"
 
-#: strings.hrc:51
+#: framework/inc/strings.hrc:51
 msgctxt "STR_RESET_TO_DEFAULT_LANGUAGE"
 msgid "Reset to Default Language"
 msgstr "Ailosod i'r Iaith Ragosodedig"
 
-#: strings.hrc:52
+#: framework/inc/strings.hrc:52
 msgctxt "STR_LANGSTATUS_MORE"
 msgid "More..."
 msgstr "Rhagor..."
 
-#: strings.hrc:53
+#: framework/inc/strings.hrc:53
 msgctxt "STR_SET_LANGUAGE_FOR_PARAGRAPH"
 msgid "Set Language for Paragraph"
 msgstr "Gosod Iaith ar gyfer y Paragraff"
 
-#: strings.hrc:54
+#: framework/inc/strings.hrc:54
 msgctxt "STR_LANGSTATUS_HINT"
 msgid "Text Language. Right-click to set character or paragraph language"
 msgstr "Iaith Testun. Rhowch glic de i osod iaith nod a pharagraff"
diff --git a/source/cy/instsetoo_native/inc_openoffice/windows/msi_languages.po b/source/cy/instsetoo_native/inc_openoffice/windows/msi_languages.po
index 7df2f74428f..7750aadd280 100644
--- a/source/cy/instsetoo_native/inc_openoffice/windows/msi_languages.po
+++ b/source/cy/instsetoo_native/inc_openoffice/windows/msi_languages.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
-"PO-Revision-Date: 2017-10-06 13:56+0000\n"
+"POT-Creation-Date: 2018-04-17 15:54+0200\n"
+"PO-Revision-Date: 2018-04-18 08:36+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1507298191.000000\n"
+"X-POOTLE-MTIME: 1524040562.000000\n"
 
 #: ActionTe.ulf
 msgctxt ""
@@ -2816,14 +2816,6 @@ msgctxt ""
 msgid "The same version of this product is already installed."
 msgstr "Mae'r un fersiwn o'r cynnyrch wedi ei osod eisoes."
 
-#: CustomAc.ulf
-msgctxt ""
-"CustomAc.ulf\n"
-"OOO_CUSTOMACTION_5\n"
-"LngText.text"
-msgid "[ProductName] cannot be installed on this Windows version. [WindowsMinVersionText] or newer is required."
-msgstr "Nid oes modd gosod [ProductName] ar y fersiwn Windows hwn. Mae angen [WindowsMinVersionText] neu ddiweddarach."
-
 #: Error.ulf
 msgctxt ""
 "Error.ulf\n"
@@ -3872,6 +3864,22 @@ msgctxt ""
 msgid "The Installation Wizard cannot be run properly because you are logged in as a user without sufficient administrator rights for this system."
 msgstr "Nid oes modd rhedeg y Dewin Gosod yn iawn am eich bod wedi mewngofnodi fel defnyddiwr heb ganiatâd digonol ar gyfer y system yma."
 
+#: LaunchCo.ulf
+msgctxt ""
+"LaunchCo.ulf\n"
+"OOO_LAUNCH_2\n"
+"LngText.text"
+msgid "[ProductName] cannot be installed on this Windows version. [WindowsMinVersionText] or newer is required."
+msgstr "Nid oes modd gosod [ProductName] ar y fersiwn Windows hwn. Mae angen [WindowsMinVersionText] neu ddiweddarach."
+
+#: LaunchCo.ulf
+msgctxt ""
+"LaunchCo.ulf\n"
+"OOO_LAUNCH_3\n"
+"LngText.text"
+msgid "To install [ProductName] on Windows 8.1, at least April 2014 update rollup (MS KB 2919355) must be installed."
+msgstr "I osod [ProductName] ar Windows 8.1, rhaid gosod o leiaf diweddariad cyfun Ebrill 2014 (MS KB 2919355)."
+
 #: Property.ulf
 msgctxt ""
 "Property.ulf\n"
@@ -3885,32 +3893,24 @@ msgctxt ""
 "Property.ulf\n"
 "OOO_ARPHELPLINKTEMPLATE\n"
 "LngText.text"
-msgid "http://www.libreoffice.org/get-help"
-msgstr "http://www.libreoffice.org/get-help"
-
-#: Property.ulf
-msgctxt ""
-"Property.ulf\n"
-"OOO_ARPHELPTELEPHONETEMPLATE\n"
-"LngText.text"
-msgid "x-xxx-xxx-xxx"
-msgstr "x-xxx-xxx-xxx"
+msgid "https://www.libreoffice.org/get-help"
+msgstr "https://www.libreoffice.org/get-help"
 
 #: Property.ulf
 msgctxt ""
 "Property.ulf\n"
 "OOO_ARPURLINFOABOUTTEMPLATE\n"
 "LngText.text"
-msgid "http://www.documentfoundation.org"
-msgstr "http://www.documentfoundation.org"
+msgid "https://www.libreoffice.org/"
+msgstr "https://www.libreoffice.org/"
 
 #: Property.ulf
 msgctxt ""
 "Property.ulf\n"
 "OOO_ARPURLUPDATEINFOTEMPLATE\n"
 "LngText.text"
-msgid "http://www.libreoffice.org/download"
-msgstr "http://www.libreoffice.org/download"
+msgid "https://www.libreoffice.org/download"
+msgstr "https://www.libreoffice.org/download"
 
 #: Property.ulf
 msgctxt ""
diff --git a/source/cy/officecfg/registry/data/org/openoffice.po b/source/cy/officecfg/registry/data/org/openoffice.po
index 828792ecfe6..a0fa849d841 100644
--- a/source/cy/officecfg/registry/data/org/openoffice.po
+++ b/source/cy/officecfg/registry/data/org/openoffice.po
@@ -3,18 +3,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2013-11-20 13:02+0100\n"
-"PO-Revision-Date: 2013-12-28 16:03+0000\n"
-"Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
+"POT-Creation-Date: 2018-02-27 13:56+0100\n"
+"PO-Revision-Date: 2018-03-01 09:09+0000\n"
+"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1388246624.0\n"
+"X-Generator: Pootle 2.8\n"
+"X-POOTLE-MTIME: 1519895341.000000\n"
 
 #: Setup.xcu
 msgctxt ""
@@ -94,5 +94,5 @@ msgctxt ""
 "..Setup.Office.Factories.com.sun.star.report.ReportDefinition\n"
 "ooSetupFactoryUIName\n"
 "value.text"
-msgid "Base: Oracle Report Builder"
-msgstr "Base: Adeiladydd Adroddiad Oracle"
+msgid "Base: Report Builder"
+msgstr "Base: Adeiladydd Adroddiad"
diff --git a/source/cy/officecfg/registry/data/org/openoffice/Office.po b/source/cy/officecfg/registry/data/org/openoffice/Office.po
index f0521c2e219..b4c706c0722 100644
--- a/source/cy/officecfg/registry/data/org/openoffice/Office.po
+++ b/source/cy/officecfg/registry/data/org/openoffice/Office.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-11-22 13:53+0100\n"
-"PO-Revision-Date: 2017-12-05 11:18+0000\n"
+"POT-Creation-Date: 2018-02-27 13:56+0100\n"
+"PO-Revision-Date: 2018-03-01 09:09+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1512472729.000000\n"
+"X-POOTLE-MTIME: 1519895349.000000\n"
 
 #: Addons.xcu
 msgctxt ""
@@ -715,8 +715,8 @@ msgctxt ""
 ".ExtendedColorScheme.EntryNames.SunReportBuilder\n"
 "DisplayName\n"
 "value.text"
-msgid "Oracle Report Builder"
-msgstr "Adeiladydd Adroddiad Oracle"
+msgid "Report Builder"
+msgstr "Adeiladwr Adroddiad"
 
 #: ExtendedColorScheme.xcu
 msgctxt ""
diff --git a/source/cy/officecfg/registry/data/org/openoffice/Office/UI.po b/source/cy/officecfg/registry/data/org/openoffice/Office/UI.po
index 73c5d3fb173..5a8c4b1f85b 100644
--- a/source/cy/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/cy/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-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-01-10 11:50+0100\n"
-"PO-Revision-Date: 2018-02-06 09:42+0000\n"
+"POT-Creation-Date: 2018-04-25 13:24+0200\n"
+"PO-Revision-Date: 2018-04-18 08:36+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,8 +13,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1517910145.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1524040618.000000\n"
 
 #: BaseWindowState.xcu
 msgctxt ""
@@ -82,6 +82,15 @@ msgstr "Mynd at Linell..."
 #: BasicIDECommands.xcu
 msgctxt ""
 "BasicIDECommands.xcu\n"
+"..BasicIDECommands.UserInterface.Commands..uno:RepeatSearch\n"
+"Label\n"
+"value.text"
+msgid "Repeat Search"
+msgstr ""
+
+#: BasicIDECommands.xcu
+msgctxt ""
+"BasicIDECommands.xcu\n"
 "..BasicIDECommands.UserInterface.Commands..uno:ShowLines\n"
 "Label\n"
 "value.text"
@@ -436,8 +445,26 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:ResetAttributes\n"
 "Label\n"
 "value.text"
+msgid "Clear"
+msgstr "Clirio"
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:ResetAttributes\n"
+"ContextLabel\n"
+"value.text"
 msgid "Clear ~Direct Formatting"
-msgstr "Clirio ~Fformatio Uniongyrchol"
+msgstr "Clirio Fformatio ~Uniongyrchol"
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:ResetAttributes\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Clear Direct Formatting"
+msgstr "Clirio Fformatio Uniongyrchol"
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -649,15 +676,6 @@ msgstr "Troswr Ewro"
 #: CalcCommands.xcu
 msgctxt ""
 "CalcCommands.xcu\n"
-"..CalcCommands.UserInterface.Commands..uno:ProtectTraceChangeMode\n"
-"Label\n"
-"value.text"
-msgid "~Protect Records..."
-msgstr "~Diogelu Cofnodion..."
-
-#: CalcCommands.xcu
-msgctxt ""
-"CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:InsertExternalDataSource\n"
 "Label\n"
 "value.text"
@@ -1147,8 +1165,8 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:ConditionalFormatMenu\n"
 "Label\n"
 "value.text"
-msgid "C~onditional Formatting"
-msgstr "Ffo~rmatio Amodol"
+msgid "C~onditional"
+msgstr "~Amodol"
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -1171,6 +1189,15 @@ msgstr "Amod..."
 #: CalcCommands.xcu
 msgctxt ""
 "CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:CurrentConditionalFormatDialog\n"
+"Label\n"
+"value.text"
+msgid "Conditional Formatting..."
+msgstr ""
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:ColorScaleFormatDialog\n"
 "Label\n"
 "value.text"
@@ -1252,6 +1279,15 @@ msgstr "Rheoli..."
 #: CalcCommands.xcu
 msgctxt ""
 "CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:CurrentConditionalFormatManagerDialog\n"
+"Label\n"
+"value.text"
+msgid "Manage Conditional Formatting..."
+msgstr "Rheoli Fformatio Amodol..."
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:Deselect\n"
 "Label\n"
 "value.text"
@@ -1810,6 +1846,15 @@ msgstr "~Dilysrwydd..."
 #: CalcCommands.xcu
 msgctxt ""
 "CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:CurrentValidation\n"
+"Label\n"
+"value.text"
+msgid "Data ~Validation..."
+msgstr "Dilysu ~Data..."
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:DeleteRows\n"
 "Label\n"
 "value.text"
@@ -1849,8 +1894,17 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:TraceChangeMode\n"
 "Label\n"
 "value.text"
-msgid "~Record Changes"
-msgstr "~Cofnodi Newidiadau"
+msgid "~Record"
+msgstr "~Cofnod"
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:TraceChangeMode\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Record Track Changes"
+msgstr "Recordio Tracio Newidiadau"
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -1858,8 +1912,17 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:ShowChanges\n"
 "Label\n"
 "value.text"
-msgid "~Show Changes..."
-msgstr "~Dangos Newidiadau..."
+msgid "~Show..."
+msgstr "~Dangos..."
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:ShowChanges\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Show Track Changes"
+msgstr "Dangos Tracio Newidiadau"
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -1975,8 +2038,8 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:ViewRowColumnHeaders\n"
 "Label\n"
 "value.text"
-msgid "C~olumn & Row Headers"
-msgstr "~Penynnau Colofn a Rhes"
+msgid "View Headers"
+msgstr ""
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -2083,17 +2146,17 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:AcceptChanges\n"
 "Label\n"
 "value.text"
-msgid "~Manage Changes..."
-msgstr "~Rheoli Enwau..."
+msgid "~Manage..."
+msgstr "~Rheoli..."
 
 #: CalcCommands.xcu
 msgctxt ""
 "CalcCommands.xcu\n"
-"..CalcCommands.UserInterface.Commands..uno:UnderlineDouble\n"
-"Label\n"
+"..CalcCommands.UserInterface.Commands..uno:AcceptChanges\n"
+"TooltipLabel\n"
 "value.text"
-msgid "Underline: Double"
-msgstr "Tanlinellu: Dwbl"
+msgid "Manage Track Changes"
+msgstr "Rheoli Tracio Newidiadau"
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -2101,8 +2164,17 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:CommentChange\n"
 "Label\n"
 "value.text"
-msgid "~Comment on Change..."
-msgstr "~Sylw ar Newid..."
+msgid "~Comment..."
+msgstr "~Sylw..."
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:CommentChange\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Insert Track Change Comment"
+msgstr "Mewnosod Sylw Tracio Newid"
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -2476,6 +2548,15 @@ msgstr "~Rheoli..."
 #: CalcCommands.xcu
 msgctxt ""
 "CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:DefineCurrentName\n"
+"Label\n"
+"value.text"
+msgid "~Manage Names..."
+msgstr "~Rheoli Enwau..."
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:InsertName\n"
 "Label\n"
 "value.text"
@@ -2974,17 +3055,8 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:DefineDBName\n"
 "Label\n"
 "value.text"
-msgid "~Define Data Range..."
-msgstr "~Diffinio Ystod Data..."
-
-#: CalcCommands.xcu
-msgctxt ""
-"CalcCommands.xcu\n"
-"..CalcCommands.UserInterface.Commands..uno:DefineDBName\n"
-"ContextLabel\n"
-"value.text"
 msgid "~Define Range..."
-msgstr "~Diffinio Ystod..."
+msgstr ""
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -2992,17 +3064,8 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:SelectDB\n"
 "Label\n"
 "value.text"
-msgid "Select Data ~Range..."
-msgstr "Dewis ~Ystod Data..."
-
-#: CalcCommands.xcu
-msgctxt ""
-"CalcCommands.xcu\n"
-"..CalcCommands.UserInterface.Commands..uno:SelectDB\n"
-"ContextLabel\n"
-"value.text"
 msgid "Select ~Range..."
-msgstr "Dewis ~Ystod..."
+msgstr ""
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -3271,8 +3334,8 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:AlignHorizontalCenter\n"
 "Label\n"
 "value.text"
-msgid "Center Horizontally"
-msgstr "Canoli'n Llorweddol"
+msgid "Align Center"
+msgstr "Alinio i'r Canol"
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -3511,6 +3574,15 @@ msgstr "Dileu'r Lle Degol"
 #: CalcCommands.xcu
 msgctxt ""
 "CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:NumberFormatThousands\n"
+"Label\n"
+"value.text"
+msgid "Thousands Separator"
+msgstr "Ymwahanydd Miloedd"
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:EditLinks\n"
 "Label\n"
 "value.text"
@@ -3565,6 +3637,15 @@ msgstr "I ~Dudalen"
 #: CalcCommands.xcu
 msgctxt ""
 "CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:SetAnchorToPage\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Anchor to p~age"
+msgstr "Angori i'r ~dudalen"
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:SetAnchorToCell\n"
 "Label\n"
 "value.text"
@@ -3583,6 +3664,42 @@ msgstr "I ~Gell"
 #: CalcCommands.xcu
 msgctxt ""
 "CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:SetAnchorToCell\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Anchor to ~cell (move with cell)"
+msgstr "Angori i ~gell (symud gyda cell)"
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:SetAnchorToCellResize\n"
+"Label\n"
+"value.text"
+msgid "Anchor: To Cell (~resize with cell)"
+msgstr "Angori i ~gell (~newid maint gyda cell)"
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:SetAnchorToCellResize\n"
+"ContextLabel\n"
+"value.text"
+msgid "To Cell (~resize with cell)"
+msgstr "I Gell (~newid maint gyda chell)"
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
+"..CalcCommands.UserInterface.Commands..uno:SetAnchorToCellResize\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Anchor to cell (move and ~resize with cell)"
+msgstr "Angori i gell (symud a newid maint gyda chell)"
+
+#: CalcCommands.xcu
+msgctxt ""
+"CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:SendMailDocAsMS\n"
 "Label\n"
 "value.text"
@@ -3613,17 +3730,8 @@ msgctxt ""
 "..CalcCommands.UserInterface.Commands..uno:ToggleSheetGrid\n"
 "Label\n"
 "value.text"
-msgid "Toggle Grid Lines for Current Sheet"
-msgstr "Newid Llinellau Grid y Ddalen Bresennol"
-
-#: CalcCommands.xcu
-msgctxt ""
-"CalcCommands.xcu\n"
-"..CalcCommands.UserInterface.Commands..uno:ToggleSheetGrid\n"
-"ContextLabel\n"
-"value.text"
-msgid "Grid Lines for Sheet"
-msgstr "Llinellau Grid y Ddalen"
+msgid "View Grid Lines"
+msgstr ""
 
 #: CalcCommands.xcu
 msgctxt ""
@@ -6832,6 +6940,24 @@ msgstr "S~leid"
 #: DrawImpressCommands.xcu
 msgctxt ""
 "DrawImpressCommands.xcu\n"
+"..DrawImpressCommands.UserInterface.Commands..uno:PageMenu\n"
+"Label\n"
+"value.text"
+msgid "~Page"
+msgstr "~Tudalen"
+
+#: DrawImpressCommands.xcu
+msgctxt ""
+"DrawImpressCommands.xcu\n"
+"..DrawImpressCommands.UserInterface.Commands..uno:ShapeMenu\n"
+"Label\n"
+"value.text"
+msgid "~Shape"
+msgstr "~Siâp"
+
+#: DrawImpressCommands.xcu
+msgctxt ""
+"DrawImpressCommands.xcu\n"
 "..DrawImpressCommands.UserInterface.Commands..uno:SlideMoveMenu\n"
 "Label\n"
 "value.text"
@@ -7654,8 +7780,8 @@ msgctxt ""
 "..DrawImpressCommands.UserInterface.Commands..uno:PageSetup\n"
 "ContextLabel\n"
 "value.text"
-msgid "~Page Properties..."
-msgstr "Priodweddau ~Tudalen..."
+msgid "Properties..."
+msgstr "Priodweddau..."
 
 #: DrawImpressCommands.xcu
 msgctxt ""
@@ -7780,8 +7906,8 @@ msgctxt ""
 "..DrawImpressCommands.UserInterface.Commands..uno:ImportFromFile\n"
 "Label\n"
 "value.text"
-msgid "~File..."
-msgstr "~Ffeil..."
+msgid "Insert Page from File..."
+msgstr "Mewnosod Tudalen o Ffeil..."
 
 #: DrawImpressCommands.xcu
 msgctxt ""
@@ -8083,6 +8209,15 @@ msgstr "Prif Sleid..."
 #: DrawImpressCommands.xcu
 msgctxt ""
 "DrawImpressCommands.xcu\n"
+"..DrawImpressCommands.UserInterface.Commands..uno:DrawingLayout\n"
+"Label\n"
+"value.text"
+msgid "Master Page..."
+msgstr "Prif Dudalen..."
+
+#: DrawImpressCommands.xcu
+msgctxt ""
+"DrawImpressCommands.xcu\n"
 "..DrawImpressCommands.UserInterface.Commands..uno:AssignLayout\n"
 "Label\n"
 "value.text"
@@ -9352,15 +9487,6 @@ msgstr "Priodweddau ~Tabl..."
 #: DrawImpressCommands.xcu
 msgctxt ""
 "DrawImpressCommands.xcu\n"
-"..DrawImpressCommands.UserInterface.Popups..uno:AutoSum\n"
-"Label\n"
-"value.text"
-msgid "Sum"
-msgstr "Swm"
-
-#: DrawImpressCommands.xcu
-msgctxt ""
-"DrawImpressCommands.xcu\n"
 "..DrawImpressCommands.UserInterface.Popups..uno:TableSort\n"
 "Label\n"
 "value.text"
@@ -9379,15 +9505,6 @@ msgstr "~Tabl..."
 #: DrawImpressCommands.xcu
 msgctxt ""
 "DrawImpressCommands.xcu\n"
-"..DrawImpressCommands.UserInterface.Popups..uno:UnderlineDouble\n"
-"Label\n"
-"value.text"
-msgid "Double Underline "
-msgstr "Tanlinellu Dwbl "
-
-#: DrawImpressCommands.xcu
-msgctxt ""
-"DrawImpressCommands.xcu\n"
 "..DrawImpressCommands.UserInterface.Popups..uno:InsertAnnotation\n"
 "Label\n"
 "value.text"
@@ -15904,6 +16021,15 @@ msgstr "Tanlinellu"
 #: GenericCommands.xcu
 msgctxt ""
 "GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Commands..uno:UnderlineDouble\n"
+"Label\n"
+"value.text"
+msgid "Double Underline"
+msgstr "Tanlinellu Dwbl"
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:Overline\n"
 "Label\n"
 "value.text"
@@ -16123,8 +16249,8 @@ msgctxt ""
 "..GenericCommands.UserInterface.Commands..uno:CenterPara\n"
 "TooltipLabel\n"
 "value.text"
-msgid "Center Horizontally"
-msgstr "Canoli'n Llorweddol"
+msgid "Align Center"
+msgstr "Alinio i'r Canol"
 
 #: GenericCommands.xcu
 msgctxt ""
@@ -16723,6 +16849,15 @@ msgstr "~Maint Gwreiddiol"
 #: GenericCommands.xcu
 msgctxt ""
 "GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Commands..uno:FitCellSize\n"
+"Label\n"
+"value.text"
+msgid "~Fit to Cell Size"
+msgstr "~Ffitio i Faint Cell"
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:GridMenu\n"
 "Label\n"
 "value.text"
@@ -17358,17 +17493,17 @@ msgctxt ""
 "..GenericCommands.UserInterface.Commands..uno:ChangeCaseRotateCase\n"
 "Label\n"
 "value.text"
-msgid "Cycle Case (Title Case, UPPERCASE, lowercase)"
-msgstr "Cylchdroi Maint (Maint Teitl, MAWR, bach)"
+msgid "Cycle Case"
+msgstr "Maint Cylchol"
 
 #: GenericCommands.xcu
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:ChangeCaseRotateCase\n"
-"ContextLabel\n"
+"TooltipLabel\n"
 "value.text"
-msgid "Cycle Case"
-msgstr "Cylchdroi Maint"
+msgid "Cycle Case (Title Case, Sentence case, UPPERCASE, lowercase)"
+msgstr "Maint Cylchol (Maint Teitl, Maint brawddeg,MAWR, bach)"
 
 #: GenericCommands.xcu
 msgctxt ""
@@ -17625,6 +17760,24 @@ msgstr "Toglo'r Modd Golygu"
 #: GenericCommands.xcu
 msgctxt ""
 "GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Commands..uno:ReadOnlyDoc\n"
+"Label\n"
+"value.text"
+msgid "Read Only Mode"
+msgstr "Modd Darllen yn Unig"
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Commands..uno:ReadOnlyDoc\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Toggle Read Only Mode"
+msgstr "Toglo'r Modd Darllen yn Unig"
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:InsertImageControl\n"
 "Label\n"
 "value.text"
@@ -18501,7 +18654,7 @@ msgctxt ""
 "..GenericCommands.UserInterface.Commands..uno:FormatFormMenu\n"
 "Label\n"
 "value.text"
-msgid "~Form"
+msgid "Fo~rm"
 msgstr "~Ffurflen"
 
 #: GenericCommands.xcu
@@ -19839,6 +19992,24 @@ msgstr "AwtoPeilot: Memo"
 #: GenericCommands.xcu
 msgctxt ""
 "GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Commands..uno:ProtectTraceChangeMode\n"
+"Label\n"
+"value.text"
+msgid "~Protect..."
+msgstr "~Diogelu..."
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Commands..uno:ProtectTraceChangeMode\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Protect Track Changes"
+msgstr "Diogelu Tracio Newidiadau"
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:CompareDocuments\n"
 "Label\n"
 "value.text"
@@ -20031,8 +20202,26 @@ msgctxt ""
 "..GenericCommands.UserInterface.Commands..uno:SetDefault\n"
 "Label\n"
 "value.text"
-msgid "~Default Formatting"
-msgstr "~Rhagosodedig"
+msgid "Clear"
+msgstr ""
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Commands..uno:SetDefault\n"
+"ContextLabel\n"
+"value.text"
+msgid "Clear ~Direct Formatting"
+msgstr ""
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Commands..uno:SetDefault\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Clear Direct Formatting"
+msgstr ""
 
 #: GenericCommands.xcu
 msgctxt ""
@@ -21876,8 +22065,8 @@ msgctxt ""
 "..GenericCommands.UserInterface.Commands..uno:ToolbarMode\n"
 "Label\n"
 "value.text"
-msgid "Toolbar ~Layout"
-msgstr "~Cynllun Bar Offer"
+msgid "User ~Interface"
+msgstr "Rhyngwyneb ~Defnyddiwr"
 
 #: GenericCommands.xcu
 msgctxt ""
@@ -22134,6 +22323,15 @@ msgstr "Alinio'r Gwaelod"
 #: GenericCommands.xcu
 msgctxt ""
 "GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Commands..uno:AutoSum\n"
+"Label\n"
+"value.text"
+msgid "Sum"
+msgstr "Swm"
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:ThesaurusFromContext\n"
 "Label\n"
 "value.text"
@@ -22740,8 +22938,8 @@ msgctxt ""
 "..GenericCommands.UserInterface.Popups..uno:ClassificationApply\n"
 "Label\n"
 "value.text"
-msgid "Apply Document Classification"
-msgstr "Gosod Dosbarthiad Dogfen"
+msgid "Apply document classification"
+msgstr "Gosod dosbarthiad dogfen"
 
 #: GenericCommands.xcu
 msgctxt ""
@@ -22749,8 +22947,8 @@ msgctxt ""
 "..GenericCommands.UserInterface.Popups..uno:ClassificationDialog\n"
 "Label\n"
 "value.text"
-msgid "Classification Dialog"
-msgstr "Deialog Dosbarthiad"
+msgid "Manage document classification"
+msgstr "Rheoli dosbarthiad dogfen"
 
 #: GenericCommands.xcu
 msgctxt ""
@@ -22758,8 +22956,8 @@ msgctxt ""
 "..GenericCommands.UserInterface.Popups..uno:ParagraphClassificationDialog\n"
 "Label\n"
 "value.text"
-msgid "Paragraph Classification Dialog"
-msgstr "Deialog Dosbarthiad Paragraff"
+msgid "Manage paragraph classification"
+msgstr "Rheoli dosbarthiad paragraffau"
 
 #: GenericCommands.xcu
 msgctxt ""
@@ -22824,6 +23022,42 @@ msgctxt ""
 msgid "Navigate"
 msgstr "Llywio"
 
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Popups..uno:BreaksMenu\n"
+"Label\n"
+"value.text"
+msgid "More Breaks"
+msgstr "Rhagor o Doriadau"
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Popups..uno:InsertSignatureLine\n"
+"Label\n"
+"value.text"
+msgid "Signatu~re Line..."
+msgstr "Llinell ~Llofnod..."
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Popups..uno:EditSignatureLine\n"
+"Label\n"
+"value.text"
+msgid "Edit Signature ~Line..."
+msgstr "~Golygu'r Llinell Llofnod..."
+
+#: GenericCommands.xcu
+msgctxt ""
+"GenericCommands.xcu\n"
+"..GenericCommands.UserInterface.Popups..uno:SignSignatureLine\n"
+"Label\n"
+"value.text"
+msgid "~Sign Signature Line..."
+msgstr "~Llinell Llofnodi Llofnod..."
+
 #: ImpressWindowState.xcu
 msgctxt ""
 "ImpressWindowState.xcu\n"
@@ -23904,132 +24138,6 @@ msgctxt ""
 msgid "Full Screen"
 msgstr "Sgrin Lawn"
 
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Writer.Implementations.Tabbed\n"
-"Label\n"
-"value.text"
-msgid "Tabbed"
-msgstr "Tabedig"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Writer.Implementations.TabbedCompact\n"
-"Label\n"
-"value.text"
-msgid "Tabbed Compact"
-msgstr "Tabiau Cryno"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Writer.Implementations.GroupedbarCompact\n"
-"Label\n"
-"value.text"
-msgid "Groupedbar Compact"
-msgstr "Bar Grŵp Cryno"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Writer.Implementations.GroupedbarFull\n"
-"Label\n"
-"value.text"
-msgid "Groupedbar Full"
-msgstr "Bar Grŵp Llawn"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Writer.Implementations.Groups\n"
-"Label\n"
-"value.text"
-msgid "Contextual groups"
-msgstr "Grwpiau cyd-destunol"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Writer.Implementations.Single\n"
-"Label\n"
-"value.text"
-msgid "Contextual single"
-msgstr "Cyd-destunol sengl"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Calc.Implementations.Tabbed\n"
-"Label\n"
-"value.text"
-msgid "Tabbed"
-msgstr "Tabedig"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Calc.Implementations.GroupedbarCompact\n"
-"Label\n"
-"value.text"
-msgid "Groupedbar Compact"
-msgstr "Bar Grŵp Cryno"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Calc.Implementations.GroupedbarFull\n"
-"Label\n"
-"value.text"
-msgid "Groupedbar Full"
-msgstr "Bar Grŵp Llawn"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Calc.Implementations.Groups\n"
-"Label\n"
-"value.text"
-msgid "Contextual groups"
-msgstr "Grwpiau cyd-destunol"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Impress.Implementations.Tabbed\n"
-"Label\n"
-"value.text"
-msgid "Tabbed"
-msgstr "Tabedig"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Impress.Implementations.Groups\n"
-"Label\n"
-"value.text"
-msgid "Contextual groups"
-msgstr "Grwpiau cyd-destunol"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Impress.Implementations.GroupedbarCompact\n"
-"Label\n"
-"value.text"
-msgid "Groupedbar Compact"
-msgstr "Bar Grŵp Cryno"
-
-#: Notebookbar.xcu
-msgctxt ""
-"Notebookbar.xcu\n"
-"..Notebookbar.Applications.Impress.Implementations.GroupedbarFull\n"
-"Label\n"
-"value.text"
-msgid "Groupedbar Full"
-msgstr "Bar Grŵp Llawn"
-
 #: ReportCommands.xcu
 msgctxt ""
 "ReportCommands.xcu\n"
@@ -25002,347 +25110,239 @@ msgctxt ""
 msgid "Character"
 msgstr "Nod"
 
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:AddDirect\n"
-"Label\n"
-"value.text"
-msgid "~New"
-msgstr "~Newydd"
-
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:CloseDoc\n"
-"Label\n"
-"value.text"
-msgid "~Close"
-msgstr "~Cau"
-
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:CloseWin\n"
-"Label\n"
-"value.text"
-msgid "Close Window"
-msgstr "Cau Ffenestr"
-
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:Copy\n"
-"Label\n"
-"value.text"
-msgid "~Copy"
-msgstr "~Copïo"
-
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:Cut\n"
-"Label\n"
-"value.text"
-msgid "~Cut"
-msgstr "~Torri"
-
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:ExtendedHelp\n"
-"Label\n"
-"value.text"
-msgid "What's ~This?"
-msgstr "Beth yw ~Hwn?"
-
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:HelpIndex\n"
-"Label\n"
-"value.text"
-msgid "%PRODUCTNAME ~Help"
-msgstr "~Cymorth %PRODUCTNAME"
-
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:NewDoc\n"
-"Label\n"
-"value.text"
-msgid "New Document From Template"
-msgstr "Dogfen Newydd o Dempled"
-
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:Open\n"
-"Label\n"
-"value.text"
-msgid "~Open..."
-msgstr "~Agor..."
-
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:OpenUrl\n"
-"Label\n"
-"value.text"
-msgid "Load URL"
-msgstr "Llwytho URL"
-
-#: StartModuleCommands.xcu
-msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:Paste\n"
-"Label\n"
-"value.text"
-msgid "~Paste"
-msgstr "~Gludo"
-
-#: StartModuleCommands.xcu
+#: StartModuleWindowState.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:Print\n"
-"Label\n"
+"StartModuleWindowState.xcu\n"
+"..StartModuleWindowState.UIElements.States.private:resource/toolbar/standardbar\n"
+"UIName\n"
 "value.text"
-msgid "~Print..."
-msgstr "~Argraffu..."
+msgid "Standard"
+msgstr "Safonol"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:PrinterSetup\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Writer.Modes.Default\n"
 "Label\n"
 "value.text"
-msgid "P~rinter Settings..."
-msgstr "G~osodiadau'r Argraffydd..."
+msgid "Standard Toolbar"
+msgstr "Bar Offer Safonol"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:Quit\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Writer.Modes.Single\n"
 "Label\n"
 "value.text"
-msgid "E~xit"
-msgstr "~Gadael"
+msgid "Single Toolbar"
+msgstr "Bar Offer Unigol"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:Save\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Writer.Modes.Sidebar\n"
 "Label\n"
 "value.text"
-msgid "~Save"
-msgstr "C~adw"
+msgid "Sidebar"
+msgstr "Bar Ochr"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:SaveAs\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Writer.Modes.ContextualGroups\n"
 "Label\n"
 "value.text"
-msgid "Save ~As..."
-msgstr "Cadw ~Fel..."
+msgid "Contextual groups"
+msgstr "Grwpiau cyd-destunol"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:SendMail\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Writer.Modes.ContextualSingle\n"
 "Label\n"
 "value.text"
-msgid "Document as ~E-mail..."
-msgstr "Dogfen fel ~E-bost..."
+msgid "Contextual Single"
+msgstr "Cyd-destun sengl"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:SetDocumentProperties\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Writer.Modes.Tabbed\n"
 "Label\n"
 "value.text"
-msgid "Propert~ies..."
-msgstr "~Priodweddau..."
+msgid "Tabbed"
+msgstr "Tabedig"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Commands..uno:Undo\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Writer.Modes.TabbedCompact\n"
 "Label\n"
 "value.text"
-msgid "Undo"
-msgstr "Dadwneud"
+msgid "Tabbed Compact"
+msgstr "Tabedig Cryno"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Popups..uno:EditMenu\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Writer.Modes.GroupedbarCompact\n"
 "Label\n"
 "value.text"
-msgid "~Edit"
-msgstr "~Golygu"
+msgid "Groupedbar Compact"
+msgstr "Bar Grŵp Cryno"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Popups..uno:HelpMenu\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Writer.Modes.GroupedbarFull\n"
 "Label\n"
 "value.text"
-msgid "~Help"
-msgstr "~Cymorth"
+msgid "Groupedbar"
+msgstr "Bar Grŵp"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Popups..uno:MacrosMenu\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Calc.Modes.Default\n"
 "Label\n"
 "value.text"
-msgid "~Macros"
-msgstr "~Macros"
+msgid "Standard Toolbar"
+msgstr "Bar Offer Safonol"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Popups..uno:PickList\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Calc.Modes.Single\n"
 "Label\n"
 "value.text"
-msgid "~File"
-msgstr "~Ffeil"
+msgid "Single Toolbar"
+msgstr "Bar Offer Unigol"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Popups..uno:ToolsMenu\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Calc.Modes.Sidebar\n"
 "Label\n"
 "value.text"
-msgid "~Tools"
-msgstr "Offe~r"
+msgid "Sidebar"
+msgstr "Bar Ochr"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Popups..uno:ViewMenu\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Calc.Modes.ContextualGroups\n"
 "Label\n"
 "value.text"
-msgid "~View"
-msgstr "Go~lwg"
+msgid "Contextual groups"
+msgstr "Grwpiau cyd-destunol"
 
-#: StartModuleCommands.xcu
+#: ToolbarMode.xcu
 msgctxt ""
-"StartModuleCommands.xcu\n"
-"..StartModuleCommands.UserInterface.Popups..uno:WindowList\n"
+"ToolbarMode.xcu\n"
+"..ToolbarMode.Applications.Calc.Modes.Tabbed\n"
 "Label\n"
 "value.text"
-msgid "~Window"
-msgstr "Ff~enestr"
-
-#: StartModuleWindowState.xcu
-msgctxt ""
-"StartModuleWindowState.xcu\n"
-"..StartModuleWindowState.UIElements.States.private:resource/toolbar/standardbar\n"
-"UIName\n"
-"value.text"
-msgid "Standard"
-msgstr "Safonol"
+msgid "Tabbed"
+msgstr "Tabedig"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Writer.Modes.Default\n"
+"..ToolbarMode.Applications.Calc.Modes.GroupedbarCompact\n"
 "Label\n"
 "value.text"
-msgid "Default"
-msgstr "Rhagosodiad"
+msgid "Groupedbar Compact"
+msgstr "Bar Grŵp Cryno"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Writer.Modes.Single\n"
+"..ToolbarMode.Applications.Calc.Modes.GroupedbarFull\n"
 "Label\n"
 "value.text"
-msgid "Single Toolbar"
-msgstr "Bar Offer Unigol"
+msgid "Groupedbar"
+msgstr "Bar Grŵp"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Writer.Modes.Sidebar\n"
+"..ToolbarMode.Applications.Impress.Modes.Default\n"
 "Label\n"
 "value.text"
-msgid "Sidebar"
-msgstr "Bar Ochr"
+msgid "Standard Toolbar"
+msgstr "Bar Offer Safonol"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Writer.Modes.Notebookbar\n"
+"..ToolbarMode.Applications.Impress.Modes.Single\n"
 "Label\n"
 "value.text"
-msgid "Notebookbar"
-msgstr "Bar Adnoddau"
+msgid "Single Toolbar"
+msgstr "Bar Offer Unigol"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Calc.Modes.Default\n"
+"..ToolbarMode.Applications.Impress.Modes.ContextualGroups\n"
 "Label\n"
 "value.text"
-msgid "Default"
-msgstr "Rhagosodiad"
+msgid "Contextual groups"
+msgstr "Grwpiau cyd-destunol"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Calc.Modes.Single\n"
+"..ToolbarMode.Applications.Impress.Modes.Tabbed\n"
 "Label\n"
 "value.text"
-msgid "Single Toolbar"
-msgstr "Bar Offer Unigol"
+msgid "Tabbed"
+msgstr "Tabedig"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Calc.Modes.Sidebar\n"
+"..ToolbarMode.Applications.Impress.Modes.GroupedbarCompact\n"
 "Label\n"
 "value.text"
-msgid "Sidebar"
-msgstr "Bar Ochr"
+msgid "Groupedbar Compact"
+msgstr "Bar Grŵp Cryno"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Calc.Modes.Notebookbar\n"
+"..ToolbarMode.Applications.Impress.Modes.GroupedbarFull\n"
 "Label\n"
 "value.text"
-msgid "Notebookbar"
-msgstr "Bar Adnoddau"
+msgid "Groupedbar"
+msgstr "Bar Grŵp"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Impress.Modes.Default\n"
+"..ToolbarMode.Applications.Draw.Modes.Default\n"
 "Label\n"
 "value.text"
-msgid "Default"
-msgstr "Rhagosodiad"
+msgid "Standard Toolbar"
+msgstr "Bar Offer Safonol"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Impress.Modes.Single\n"
+"..ToolbarMode.Applications.Formula.Modes.Default\n"
 "Label\n"
 "value.text"
-msgid "Single Toolbar"
-msgstr "Bar Offer Unigol"
+msgid "Standard Toolbar"
+msgstr "Bar Offer Safonol"
 
 #: ToolbarMode.xcu
 msgctxt ""
 "ToolbarMode.xcu\n"
-"..ToolbarMode.Applications.Impress.Modes.Notebookbar\n"
+"..ToolbarMode.Applications.Base.Modes.Default\n"
 "Label\n"
 "value.text"
-msgid "Notebookbar"
-msgstr "Bar Adnoddau"
+msgid "Standard Toolbar"
+msgstr "Bar Offer Safonol"
 
 #: WriterCommands.xcu
 msgctxt ""
@@ -25662,24 +25662,6 @@ msgstr "Dileu mynegai"
 #: WriterCommands.xcu
 msgctxt ""
 "WriterCommands.xcu\n"
-"..WriterCommands.UserInterface.Commands..uno:ProtectTraceChangeMode\n"
-"Label\n"
-"value.text"
-msgid "~Protect..."
-msgstr "~Diogelu..."
-
-#: WriterCommands.xcu
-msgctxt ""
-"WriterCommands.xcu\n"
-"..WriterCommands.UserInterface.Commands..uno:ProtectTraceChangeMode\n"
-"TooltipLabel\n"
-"value.text"
-msgid "Protect Track Changes"
-msgstr "Diogelu Tracio Newidiadau"
-
-#: WriterCommands.xcu
-msgctxt ""
-"WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Commands..uno:RejectTrackedChange\n"
 "Label\n"
 "value.text"
@@ -25896,11 +25878,29 @@ msgstr "~Tracio Newidiadau"
 #: WriterCommands.xcu
 msgctxt ""
 "WriterCommands.xcu\n"
+"..WriterCommands.UserInterface.Commands..uno:ShowInlineTooltips\n"
+"Label\n"
+"value.text"
+msgid "T~ooltips"
+msgstr "_Cynghorion"
+
+#: WriterCommands.xcu
+msgctxt ""
+"WriterCommands.xcu\n"
+"..WriterCommands.UserInterface.Commands..uno:ShowInlineTooltips\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Show change authorship in tooltips"
+msgstr "Dangos newid awdur mewn cynghoryn"
+
+#: WriterCommands.xcu
+msgctxt ""
+"WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Commands..uno:GotoPage\n"
 "Label\n"
 "value.text"
-msgid "Go t~o Page"
-msgstr "Mynd i ~Dudalen"
+msgid "Go t~o Page..."
+msgstr "Mynd i ~Dudalen..."
 
 #: WriterCommands.xcu
 msgctxt ""
@@ -26619,8 +26619,8 @@ msgctxt ""
 "..WriterCommands.UserInterface.Commands..uno:InsertAuthorField\n"
 "Label\n"
 "value.text"
-msgid "~Author"
-msgstr "~Awdur"
+msgid "First ~Author"
+msgstr "Awdur ~Cyntaf"
 
 #: WriterCommands.xcu
 msgctxt ""
@@ -26679,15 +26679,6 @@ msgstr "Arddull Tudalen"
 #: WriterCommands.xcu
 msgctxt ""
 "WriterCommands.xcu\n"
-"..WriterCommands.UserInterface.Commands..uno:UnderlineDouble\n"
-"Label\n"
-"value.text"
-msgid "Double Underline "
-msgstr "Tanlinellu Dwbl "
-
-#: WriterCommands.xcu
-msgctxt ""
-"WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Commands..uno:AutoFormatRedlineApply\n"
 "Label\n"
 "value.text"
@@ -29019,15 +29010,6 @@ msgstr "Mynd i'r Marc Mynegai Blaenorol"
 #: WriterCommands.xcu
 msgctxt ""
 "WriterCommands.xcu\n"
-"..WriterCommands.UserInterface.Commands..uno:AutoSum\n"
-"Label\n"
-"value.text"
-msgid "Sum"
-msgstr "Swm"
-
-#: WriterCommands.xcu
-msgctxt ""
-"WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Commands..uno:GotoNextTableFormula\n"
 "Label\n"
 "value.text"
@@ -29379,6 +29361,33 @@ msgstr "Dewisiadau ~Tag Clyfar..."
 #: WriterCommands.xcu
 msgctxt ""
 "WriterCommands.xcu\n"
+"..WriterCommands.UserInterface.Commands..uno:FormatPaintbrush\n"
+"Label\n"
+"value.text"
+msgid "Clone"
+msgstr "Clonio"
+
+#: WriterCommands.xcu
+msgctxt ""
+"WriterCommands.xcu\n"
+"..WriterCommands.UserInterface.Commands..uno:FormatPaintbrush\n"
+"ContextLabel\n"
+"value.text"
+msgid "Clone Formatting"
+msgstr "Fformatio Clôn"
+
+#: WriterCommands.xcu
+msgctxt ""
+"WriterCommands.xcu\n"
+"..WriterCommands.UserInterface.Commands..uno:FormatPaintbrush\n"
+"TooltipLabel\n"
+"value.text"
+msgid "Clone Formatting (double click and Ctrl or Cmd to alter behavior)"
+msgstr "Fformatio Clôn (clic dwbl a Ctrl neu Cmd i newid yr ymddygiad)"
+
+#: WriterCommands.xcu
+msgctxt ""
+"WriterCommands.xcu\n"
 "..WriterCommands.UserInterface.Popups..uno:TableMenu\n"
 "Label\n"
 "value.text"
@@ -29472,8 +29481,8 @@ msgctxt ""
 "..WriterCommands.UserInterface.Popups..uno:WordCountDialog\n"
 "Label\n"
 "value.text"
-msgid "~Word Count"
-msgstr "~Cyfrif Geiriau"
+msgid "~Word Count..."
+msgstr "~Cyfrif Geiriau..."
 
 #: WriterCommands.xcu
 msgctxt ""
diff --git a/source/cy/readlicense_oo/docs.po b/source/cy/readlicense_oo/docs.po
index 0ad638cbb42..8d41c0a6724 100644
--- a/source/cy/readlicense_oo/docs.po
+++ b/source/cy/readlicense_oo/docs.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
-"PO-Revision-Date: 2017-12-05 11:25+0000\n"
+"POT-Creation-Date: 2018-04-17 15:54+0200\n"
+"PO-Revision-Date: 2018-04-18 08:37+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1512473143.000000\n"
+"X-POOTLE-MTIME: 1524040634.000000\n"
 
 #: readme.xrm
 msgctxt ""
@@ -29,8 +29,8 @@ msgctxt ""
 "readme.xrm\n"
 "LatestUpdates\n"
 "readmeitem.text"
-msgid "For the latest updates to this readme file, see <a href=\"http://www.libreoffice.org/welcome/readme.html\">http://www.libreoffice.org/welcome/readme.html</a>"
-msgstr "I gael diweddariadau diweddaraf y ffeil darllen fi, gweler <a href=\"http://www.libreoffice.org/welcome/readme.html\">http://www.libreoffice.org/welcome/readme.html</a>"
+msgid "For the latest updates to this readme file, see <a href=\"https://www.libreoffice.org/welcome/readme.html\">https://www.libreoffice.org/welcome/readme.html</a>"
+msgstr "I gael diweddariadau diweddaraf y ffeil darllen fi, gweler <a href=\"https://www.libreoffice.org/welcome/readme.html\">https://www.libreoffice.org/welcome/readme.html</a>"
 
 #: readme.xrm
 msgctxt ""
@@ -45,8 +45,8 @@ msgctxt ""
 "readme.xrm\n"
 "A7\n"
 "readmeitem.text"
-msgid "The ${PRODUCTNAME} community is responsible for the development of this product, and invites you to consider participating as a community member. If you are a new user, you can visit the ${PRODUCTNAME} site, where you will find lots of information about the ${PRODUCTNAME} project and the communities that exist around it. Go to <a href=\"http://www.libreoffice.org/\">http://www.libreoffice.org/</a>."
-msgstr "Mae cymuned ${PRODUCTNAME} yn gyfrifol am ddatblygu'r cynnyrch hwn, ac yn eich gwahodd i ystyried cymryd rhan fel aelod cymunedol. Os ydych chi'n ddefnyddiwr newydd, gallwch ymweld â gwefan ${PRODUCTNAME}, lle mae lawer o wybodaeth am brosiect ${PRODUCTNAME} a'r cymunedau sy'n bodoli o'i gwmpas. Ewch i <a href=\"http://www.libreoffice.org/\">http://www.libreoffice.org/</a>."
+msgid "The ${PRODUCTNAME} community is responsible for the development of this product, and invites you to consider participating as a community member. If you are a new user, you can visit the ${PRODUCTNAME} site, where you will find lots of information about the ${PRODUCTNAME} project and the communities that exist around it. Go to <a href=\"https://www.libreoffice.org/\">https://www.libreoffice.org/</a>."
+msgstr "Mae cymuned ${PRODUCTNAME} yn gyfrifol am ddatblygu'r cynnyrch hwn, ac yn eich gwahodd i ystyried cymryd rhan fel aelod cymunedol. Os ydych chi'n ddefnyddiwr newydd, gallwch ymweld â gwefan ${PRODUCTNAME}, lle mae lawer o wybodaeth am brosiect ${PRODUCTNAME} a'r cymunedau sy'n bodoli o'i gwmpas. Ewch i <a href=\"https://www.libreoffice.org/\">https://www.libreoffice.org/</a>."
 
 #: readme.xrm
 msgctxt ""
@@ -85,8 +85,8 @@ msgctxt ""
 "readme.xrm\n"
 "A13b\n"
 "readmeitem.text"
-msgid "If you appreciate their efforts, and would like to ensure that ${PRODUCTNAME} continues to be available far into the future, please consider contributing to the project - see <a href=\"http://www.documentfoundation.org/contribution/\">http://www.documentfoundation.org/contribution/</a> for details. Everyone can make a contribution of some kind."
-msgstr "Os byddwch yn gwerthfawrogi eu hymdrechion, a hoffi sicrhau fod ${PRODUCTNAME} yn parhau i fod ar gael ymhell i'r dyfodol, ystyriwch gyfrannu at y prosiect - gweler <a href=\"http://www.documentfoundation.org/contribution/\">http://www.documentfoundation.org/contribution/</a> am fanylion. Gall pawb wneud cyfraniad o ryw fath."
+msgid "If you appreciate their efforts, and would like to ensure that ${PRODUCTNAME} continues to be available far into the future, please consider contributing to the project - see <a href=\"https://www.documentfoundation.org/contribution/\">https://www.documentfoundation.org/contribution/</a> for details. Everyone can make a contribution of some kind."
+msgstr "Os ydych yn gwerthfawrogi eu hymdrechion, ac yn dymunofi sicrhau fod ${PRODUCTNAME} yn parhau i fod ar gael ymhell i'r dyfodol, ystyriwch gyfrannu at y prosiect - gweler <a href=\"https://www.documentfoundation.org/contribution/\">https://www.documentfoundation.org/contribution/</a> am fanylion. Gall pawb wneud cyfraniad o ryw fath."
 
 #: readme.xrm
 msgctxt ""
@@ -125,8 +125,8 @@ msgctxt ""
 "readme.xrm\n"
 "s2s3sdf21\n"
 "readmeitem.text"
-msgid "Microsoft Windows 7, 8.x, or 10"
-msgstr "Microsoft Windows 7, 8.x, neu 10"
+msgid "Microsoft Windows 7 SP1, 8, 8.1 Update (S14) or 10"
+msgstr "Microsoft Windows 7 SP1, 8, 8.1 Diweddariad (S14) neu 10"
 
 #: readme.xrm
 msgctxt ""
@@ -405,8 +405,8 @@ msgctxt ""
 "readme.xrm\n"
 "otherinstall2\n"
 "readmeitem.text"
-msgid "The RPMS (or DEBS, respectively) directory also contains a package named libreoffice${PRODUCTVERSION}-freedesktop-menus-${PRODUCTVERSION}.0.1-1.noarch.rpm (or libreoffice${PRODUCTVERSION}-debian-menus_${PRODUCTVERSION}.0.1-1_all.deb, respectively, or similar). This is a package for all Linux distributions that support the Freedesktop.org specifications/recommendations (<a href=\"http://en.wikipedia.org/wiki/Freedesktop.org\">http://en.wikipedia.org/wiki/Freedesktop.org</a>), and is provided for installation on other Linux distributions not covered in the aforementioned instructions."
-msgstr "Mae'r cyfarwyddiadur RPMS (neu DEBS) hefyd yn cynnwys pecyn a enwir libreoffice${PRODUCTVERSION}-freedesktop-menus-${PRODUCTVERSION}.0.1-1.noarch.rpm (neu libreoffice${PRODUCTVERSION}-debian-menus_${PRODUCTVERSION}.0.1-1_all.deb, neu debyg). Mae hwn yn becyn ar gyfer yr holl ddosbarthiadau Linux sy'n cefnogi'r manylebau/argymhellion Freedesktop.org (<a href=\"http://en.wikipedia.org/wiki/Freedesktop.org\">http://en.wikipedia.org/wiki/Freedesktop.org</a>), ac mae'n cael ei ddarparu ar gyfer ei osod ar ddosbarthiadau Linux eraill heb eu cynnwys yn y cyfarwyddiadau uchod."
+msgid "The RPMS (or DEBS, respectively) directory also contains a package named libreoffice${PRODUCTVERSION}-freedesktop-menus-${PRODUCTVERSION}.0.1-1.noarch.rpm (or libreoffice${PRODUCTVERSION}-debian-menus_${PRODUCTVERSION}.0.1-1_all.deb, respectively, or similar). This is a package for all Linux distributions that support the Freedesktop.org specifications/recommendations (<a href=\"https://en.wikipedia.org/wiki/Freedesktop.org\">https://en.wikipedia.org/wiki/Freedesktop.org</a>), and is provided for installation on other Linux distributions not covered in the aforementioned instructions."
+msgstr "Mae'r cyfarwyddiadur RPMS (neu DEBS) hefyd yn cynnwys pecyn a enwir libreoffice${PRODUCTVERSION}-freedesktop-menus-${PRODUCTVERSION}.0.1-1.noarch.rpm (neu libreoffice${PRODUCTVERSION}-debian-menus_${PRODUCTVERSION}.0.1-1_all.deb, neu debyg). Mae hwn yn becyn ar gyfer yr holl ddosbarthiadau Linux sy'n cefnogi'r manylebau/argymhellion Freedesktop.org (<a href=\"https://en.wikipedia.org/wiki/Freedesktop.org\">https://en.wikipedia.org/wiki/Freedesktop.org</a>), ac mae'n cael ei ddarparu ar gyfer ei osod ar ddosbarthiadau Linux eraill heb eu cynnwys yn y cyfarwyddiadau uchod."
 
 #: readme.xrm
 msgctxt ""
@@ -645,8 +645,8 @@ msgctxt ""
 "readme.xrm\n"
 "pji76w1\n"
 "readmeitem.text"
-msgid "When sending a document via 'File - Send - Document as E-mail' or 'Document as PDF Attachment' problems might occur (program crashes or hangs). This is due to the Windows system file \"Mapi\" (Messaging Application Programming Interface) which causes problems in some file versions. Unfortunately, the problem cannot be narrowed down to a certain version number. For more information visit <a href=\"http://www.microsoft.com\">http://www.microsoft.com</a> to search the Microsoft Knowledge Base for \"mapi dll\"."
-msgstr "Wrth anfon dogfen drwy 'Ffeil - Anfon - Dogfen fel E-bost' neu 'Dogfen fel Atodiad PDF' gall anawsterau ddigwydd (rhaglen yn atal). Mae hyn oherwydd ffeil system Windows \"Mapi\" (Messaging Application Programming Interface) sy'n achosi anawsterau mewn rhai fersiynau o'r ffeil. Yn anffodus, nid oes modd cyfyngu'r brobem i fersiwn benodol. Am ragor o wybodaeth ewch i <a href=\"http://www.microsoft.com\">http://www.microsoft.com</a> i chwilio'r Microsoft Knowledge Base am \"mapi dll\"."
+msgid "When sending a document via 'File - Send - Document as E-mail' or 'Document as PDF Attachment' problems might occur (program crashes or hangs). This is due to the Windows system file \"Mapi\" (Messaging Application Programming Interface) which causes problems in some file versions. Unfortunately, the problem cannot be narrowed down to a certain version number. For more information visit <a href=\"https://www.microsoft.com\">https://www.microsoft.com</a> to search the Microsoft Knowledge Base for \"mapi dll\"."
+msgstr "Wrth anfon dogfen drwy 'Ffeil - Anfon - Dogfen fel E-bost' neu 'Dogfen fel Atodiad PDF' gall anawsterau ddigwydd (rhaglen yn atal). Mae hyn oherwydd ffeil system Windows \"Mapi\" (Messaging Application Programming Interface) sy'n achosi anawsterau mewn rhai fersiynau o'r ffeil. Yn anffodus, nid oes modd cyfyngu'r brobem i fersiwn benodol. Am ragor o wybodaeth ewch i <a href=\"https://www.microsoft.com\">https://www.microsoft.com</a> i chwilio'r Microsoft Knowledge Base am \"mapi dll\"."
 
 #: readme.xrm
 msgctxt ""
@@ -661,8 +661,8 @@ msgctxt ""
 "readme.xrm\n"
 "access7\n"
 "readmeitem.text"
-msgid "For more information on the accessibility features in ${PRODUCTNAME}, see <a href=\"http://www.libreoffice.org/accessibility/\">http://www.libreoffice.org/accessibility/</a>"
-msgstr "Am ragor o wybodaeth am nodweddion hygyrchedd o fewn ${PRODUCTNAME}, gweler <a href=\"http://www.libreoffice.org/accessibility/\">http://www.libreoffice.org/accessibility/</a>"
+msgid "For more information on the accessibility features in ${PRODUCTNAME}, see <a href=\"https://www.libreoffice.org/accessibility/\">https://www.libreoffice.org/accessibility/</a>"
+msgstr "Am ragor o wybodaeth am nodweddion hygyrchedd o fewn ${PRODUCTNAME}, gweler <a href=\"https://www.libreoffice.org/accessibility/\">https://www.libreoffice.org/accessibility/</a>"
 
 #: readme.xrm
 msgctxt ""
@@ -677,16 +677,16 @@ msgctxt ""
 "readme.xrm\n"
 "support1\n"
 "readmeitem.text"
-msgid "The main support page <a href=\"http://www.libreoffice.org/support/\">http://www.libreoffice.org/support/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href=\"http://www.documentfoundation.org/nabble/\">http://www.documentfoundation.org/nabble/</a> or search the archives of the 'users@libreoffice.org' mailing list at <a href=\"http://www.libreoffice.org/lists/users/\">http://www.libreoffice.org/lists/users/</a>. Alternatively, you can send in your questions to <a href=\"mailto:users@libreoffice.org\">users@libreoffice.org</a>. If you like to subscribe to the list (to get email responses), send an empty mail to: <a href=\"mailto:users+subscribe@libreoffice.org\">users+subscribe@libreoffice.org</a>."
-msgstr "Mae'r brif dudalen cymorth <a href=\"http://www.libreoffice.org/support/\">http://www.libreoffice.org/support/</a> yn cynnig amrywiaeth o bosibiliadau i dderbyn cymorth gyda ${PRODUCTNAME}. Efallai fod eich cwestiwn eisoes wedi cael ei hateb - edrychwch ar y Fforwm Cymunedol ar <a href=\"http://www.documentfoundation.org/nabble/\">http://www.documentfoundation.org/nabble/</a> neu chwiliwch archifau rhestr e-bostio 'users@libreoffice.org' yn <a href=\"http://www.libreoffice.org/lists/users/\">http://www.libreoffice.org/lists/users/</a>. Fel arall, gallwch anfon eich cwestiynau at <a href=\"mailto:users@libreoffice.org\">users@libreoffice.org</a>. Os hoffech danysgrifio i'r rhestr (i gael ymatebion e-bost), anfon e-bost gwag at: <a href=\"mailto:users+subscribe@libreoffice.org\">users+subscribe@libreoffice.org</a>."
+msgid "The <a href=\"https://www.libreoffice.org/get-help/community-support/\">main support page</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href=\"https://www.documentfoundation.org/nabble/\">https://www.documentfoundation.org/nabble/</a> or search the archives of the 'users@libreoffice.org' mailing list at <a href=\"https://www.libreoffice.org/lists/users/\">https://www.libreoffice.org/lists/users/</a>. Alternatively, you can send in your questions to <a href=\"mailto:users@libreoffice.org\">users@libreoffice.org</a>. If you like to subscribe to the list (to get email responses), send an empty mail to: <a href=\"mailto:users+subscribe@libreoffice.org\">users+subscribe@libreoffice.org</a>."
+msgstr "Mae'r <a href=\"https://www.libreoffice.org/get-help/community-support/\">brif dudalen cymorth</a> yn cynnig amrywiaeth o bosibiliadau i dderbyn cymorth gyda ${PRODUCTNAME}. Efallai fod eich cwestiwn eisoes wedi cael ei hateb - edrychwch ar y Fforwm Cymunedol ar <a href=\"https://www.documentfoundation.org/nabble/\">https://www.documentfoundation.org/nabble/</a> neu chwiliwch archifau rhestr e-bostio 'users@libreoffice.org' yn <a href=\"https://www.libreoffice.org/lists/users/\">https://www.libreoffice.org/lists/users/</a>. Fel arall, gallwch anfon eich cwestiynau at <a href=\"mailto:users@libreoffice.org\">users@libreoffice.org</a>. Os hoffech danysgrifio i'r rhestr (i gael ymatebion e-bost), anfon e-bost gwag at: <a href=\"mailto:users+subscribe@libreoffice.org\">users+subscribe@libreoffice.org</a>."
 
 #: readme.xrm
 msgctxt ""
 "readme.xrm\n"
 "faq\n"
 "readmeitem.text"
-msgid "Also check the FAQ section at <a href=\"http://www.libreoffice.org/faq/\">http://www.libreoffice.org/faq/.</a>"
-msgstr "Hefyd darllenwch adran Cwestiynau Cyffredin yn <a href=\"http://www.libreoffice.org/faq/\">http://www.libreoffice.org/faq/.</a>"
+msgid "Also check the FAQ section at <a href=\"https://www.libreoffice.org/get-help/frequently-asked-questions/\">the LibreOffice website</a>."
+msgstr "Hefyd ewch i'n hadran Cwestiynnau Cyffredin yng <a href=\"https://www.libreoffice.org/get-help/frequently-asked-questions/\">ngwefan LibreOffice</a>."
 
 #: readme.xrm
 msgctxt ""
@@ -701,8 +701,8 @@ msgctxt ""
 "readme.xrm\n"
 "reportbugs1\n"
 "readmeitem.text"
-msgid "Our system for reporting, tracking and solving bugs is currently BugZilla, kindly hosted at <a href=\"https://bugs.libreoffice.org/\">https://bugs.libreoffice.org/</a>. We encourage all users to feel entitled and welcome to report bugs that may arise on your particular platform. Energetic reporting of bugs is one of the most important contributions that the user community can make to the ongoing development and improvement of ${PRODUCTNAME}."
-msgstr "Bugzilla yw ein system ar gyfer adrodd, olrhain a datrys bygiau ar hyn o bryd, sy'n cael ei gynnal, diolch i <a href=\"https://bugs.libreoffice.org/\">https://bugs.libreoffice.org/</a>. Rydym yn annog pob defnyddwyr i feddu'r hawl a bod croeso i roi gwybod am wallau a all godi ar eich platfform penodol. Mae adrodd egnïol ar wallau yn un o'r cyfraniadau pwysicaf y gall y gymuned ddefnyddwyr ei wneud i ddatblygiad a gwelliant parhaus ${PRODUCTNAME}."
+msgid "Our system for reporting, tracking and solving bugs is currently Bugzilla, hosted at <a href=\"http://bugs.documentfoundation.org/\">http://bugs.documentfoundation.org/</a>. We encourage all users to feel entitled and welcome to report bugs that may arise on your particular platform. Energetic reporting of bugs is one of the most important contributions that the user community can make to the ongoing development and improvement of ${PRODUCTNAME}."
+msgstr "Bugzilla yw ein system ar gyfer adrodd, olrhain a datrys bygiau ar hyn o bryd, sy'n cael ei gynnal, diolch i <a href=\"http://bugs.documentfoundation.org/\">http://bugs.documentfoundation.org/</a>. Rydym yn annog pob defnyddwyr i feddu'r hawl a bod croeso i roi gwybod am wallau a all godi ar eich platfform penodol. Mae adrodd egnïol ar wallau yn un o'r cyfraniadau pwysicaf y gall y gymuned ddefnyddwyr ei wneud i ddatblygiad a gwelliant parhaus ${PRODUCTNAME}."
 
 #: readme.xrm
 msgctxt ""
@@ -725,8 +725,8 @@ msgctxt ""
 "readme.xrm\n"
 "gettingimvolved3\n"
 "readmeitem.text"
-msgid "As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the contributing page at <a href=\"http://www.libreoffice.org/contribution/\">http://www.libreoffice.org/contribution/</a>"
-msgstr "Fel defnyddiwr, rydych eisoes yn rhan werthfawr o'r broses ddatblygu'r rhaglenni a hoffem eich annog i gymryd rhan hyd yn oed yn fwy gweithgar gyda golwg ar fod yn gyfrannwr tymor hir i'r gymuned. Ymunwch a darllen y dudalen cyfrannu yn <a href=\"http://www.libreoffice.org/contribution/\">http://www.libreoffice.org/contribution/</a>"
+msgid "As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the contributing page at <a href=\"https://www.libreoffice.org/community/get-involved/\">the LibreOffice website</a>."
+msgstr "Fel defnyddiwr, rydych eisoes yn rhan werthfawr o'r broses ddatblygu'r rhaglenni a hoffem eich annog i gymryd rhan hyd yn oed yn fwy gweithgar gyda golwg ar fod yn gyfrannwr tymor hir i'r gymuned. Ymunwch a darllen y dudalen cyfrannu yng <a href=\"https://www.libreoffice.org/community/get-involved/\">ngwefan LibreOffice</a>."
 
 #: readme.xrm
 msgctxt ""
@@ -741,8 +741,8 @@ msgctxt ""
 "readme.xrm\n"
 "howtostart1\n"
 "readmeitem.text"
-msgid "The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in. If you are familiar with Open Source Projects, check out our To-Dos list and see if there is anything you would like to help with at <a href=\"http://www.libreoffice.org/develop/\">http://www.libreoffice.org/develop/</a>."
-msgstr "Y ffordd orau i ddechrau cyfrannu yw drwy danysgrifio i un neu fwy o'r rhestrau e-bostio, llechu am ychydig, ac yn raddol ddefnyddio'r post archifau i ymgyfarwyddo â llawer o'r pynciau sy'n cael eu trafod ers i'r cod ffynhonnell ${PRODUCTNAME} gael ei rhyddhau yn ôl yn Hydref 2000. Pan fyddwch yn gyfforddus, dim ond angen i chi gyflwyno eich hun sydd ei angen ac ymuno'r gwaith. Os ydych yn gyfarwydd â Phrosiectau Cod Agored, edrychwch ar ein rhestr Gwneud a gweld os oes unrhyw beth yr hoffech chi gyfrannu tuag ato <a href=\"http://www.libreoffice.org/develop/\">http://www.libreoffice.org/develop/</a>."
+msgid "The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in. If you are familiar with Open Source Projects, check out our To-Dos list and see if there is anything you would like to help with at <a href=\"https://www.libreoffice.org/community/developers/\">the LibreOffice website</a>."
+msgstr "Y ffordd orau i ddechrau cyfrannu yw drwy danysgrifio i un neu fwy o'r rhestrau e-bostio, llechu am ychydig, ac yn raddol ddefnyddio'r post archifau i ymgyfarwyddo â llawer o'r pynciau sy'n cael eu trafod ers i'r cod ffynhonnell ${PRODUCTNAME} gael ei rhyddhau yn ôl yn Hydref 2000. Pan fyddwch yn gyfforddus, dim ond angen i chi gyflwyno eich hun sydd ei angen ac ymuno'r gwaith. Os ydych yn gyfarwydd â Phrosiectau Cod Agored, edrychwch ar ein rhestr Gwneud a gweld os oes unrhyw beth yr hoffech chi gyfrannu tuag ato yng<a href=\"https://www.libreoffice.org/community/developers/\">ngwefan LibreOffice</a>."
 
 #: readme.xrm
 msgctxt ""
@@ -757,8 +757,8 @@ msgctxt ""
 "readme.xrm\n"
 "subscribe1\n"
 "readmeitem.text"
-msgid "Here are a few of the mailing lists to which you can subscribe at <a href=\"http://www.libreoffice.org/contribution/\">http://www.libreoffice.org/contribution/</a>"
-msgstr "Dyma rai o'r rhestrau e-bostio at y gallwch danysgrifio iddynt <a href=\"http://www.libreoffice.org/contribution/\">http://www.libreoffice.org/contribution/</a>"
+msgid "Here are a few of the mailing lists to which you can subscribe at <a href=\"https://www.libreoffice.org/get-help/mailing-lists/\">https://www.libreoffice.org/get-help/mailing-lists/</a>"
+msgstr "Dyma rai o'r rhestrau e-bostio at y gallwch danysgrifio iddynt <a href=\"https://www.libreoffice.org/get-help/mailing-lists/\">https://www.libreoffice.org/get-help/mailing-lists/</a>"
 
 #: readme.xrm
 msgctxt ""
diff --git a/source/cy/reportdesign/messages.po b/source/cy/reportdesign/messages.po
index fb67b857b97..44cccd8bf52 100644
--- a/source/cy/reportdesign/messages.po
+++ b/source/cy/reportdesign/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-11-22 13:53+0100\n"
+"POT-Creation-Date: 2018-04-23 18:11+0200\n"
 "PO-Revision-Date: 2017-12-05 11:26+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,1302 +13,1302 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1512473206.000000\n"
 
-#: stringarray.hrc:17
+#: reportdesign/inc/stringarray.hrc:17
 msgctxt "RID_STR_FORCENEWPAGE_CONST"
 msgid "None"
 msgstr "Dim"
 
-#: stringarray.hrc:18
+#: reportdesign/inc/stringarray.hrc:18
 msgctxt "RID_STR_FORCENEWPAGE_CONST"
 msgid "Before Section"
 msgstr "Cyn yr Adran"
 
-#: stringarray.hrc:19
+#: reportdesign/inc/stringarray.hrc:19
 msgctxt "RID_STR_FORCENEWPAGE_CONST"
 msgid "After Section"
 msgstr "Wedi'r Adran"
 
-#: stringarray.hrc:20
+#: reportdesign/inc/stringarray.hrc:20
 msgctxt "RID_STR_FORCENEWPAGE_CONST"
 msgid "Before & After Section"
 msgstr "Cyn ac ar Ôl yr Adran"
 
-#: stringarray.hrc:26
+#: reportdesign/inc/stringarray.hrc:26
 msgctxt "RID_STR_GROUPKEEPTOGETHER_CONST"
 msgid "Per Page"
 msgstr "Y Dudalen"
 
-#: stringarray.hrc:27
+#: reportdesign/inc/stringarray.hrc:27
 msgctxt "RID_STR_GROUPKEEPTOGETHER_CONST"
 msgid "Per Column"
 msgstr "Y Golofn"
 
-#: stringarray.hrc:33
+#: reportdesign/inc/stringarray.hrc:33
 msgctxt "RID_STR_REPORTPRINTOPTION_CONST"
 msgid "All Pages"
 msgstr "Pob Tudalen"
 
-#: stringarray.hrc:34
+#: reportdesign/inc/stringarray.hrc:34
 msgctxt "RID_STR_REPORTPRINTOPTION_CONST"
 msgid "Not With Report Header"
 msgstr "Heb Bennyn Adroddiad"
 
-#: stringarray.hrc:35
+#: reportdesign/inc/stringarray.hrc:35
 msgctxt "RID_STR_REPORTPRINTOPTION_CONST"
 msgid "Not With Report Footer"
 msgstr "Heb Droedyn Adroddiad"
 
-#: stringarray.hrc:36
+#: reportdesign/inc/stringarray.hrc:36
 msgctxt "RID_STR_REPORTPRINTOPTION_CONST"
 msgid "Not With Report Header/Footer"
 msgstr "Heb Bennyn/Troedyn Adroddiad"
 
-#: stringarray.hrc:42
+#: reportdesign/inc/stringarray.hrc:42
 msgctxt "RID_STR_TYPE_CONST"
 msgid "Field or Formula"
 msgstr "Maes neu Fformiwla"
 
-#: stringarray.hrc:43
+#: reportdesign/inc/stringarray.hrc:43
 msgctxt "RID_STR_TYPE_CONST"
 msgid "Function"
 msgstr "Swyddogaeth"
 
-#: stringarray.hrc:44
+#: reportdesign/inc/stringarray.hrc:44
 msgctxt "RID_STR_TYPE_CONST"
 msgid "Counter"
 msgstr "Rhifydd"
 
-#: stringarray.hrc:45
+#: reportdesign/inc/stringarray.hrc:45
 msgctxt "RID_STR_TYPE_CONST"
 msgid "User defined Function"
 msgstr "Swyddogaeth defnyddiwr diffiniedig"
 
-#: stringarray.hrc:51
+#: reportdesign/inc/stringarray.hrc:51
 msgctxt "RID_STR_BOOL"
 msgid "No"
 msgstr "Na"
 
-#: stringarray.hrc:52
+#: reportdesign/inc/stringarray.hrc:52
 msgctxt "RID_STR_BOOL"
 msgid "Yes"
 msgstr "Iawn"
 
-#: stringarray.hrc:58
+#: reportdesign/inc/stringarray.hrc:58
 msgctxt "RID_STR_KEEPTOGETHER_CONST"
 msgid "No"
 msgstr "Na"
 
-#: stringarray.hrc:59
+#: reportdesign/inc/stringarray.hrc:59
 msgctxt "RID_STR_KEEPTOGETHER_CONST"
 msgid "Whole Group"
 msgstr "Grŵp Cyfan"
 
-#: stringarray.hrc:60
+#: reportdesign/inc/stringarray.hrc:60
 msgctxt "RID_STR_KEEPTOGETHER_CONST"
 msgid "With First Detail"
 msgstr "Gyda'r Manylyn Cyntaf"
 
-#: stringarray.hrc:66
+#: reportdesign/inc/stringarray.hrc:66
 msgctxt "RID_STR_VERTICAL_ALIGN_CONST"
 msgid "Top"
 msgstr "Brig"
 
-#: stringarray.hrc:67
+#: reportdesign/inc/stringarray.hrc:67
 msgctxt "RID_STR_VERTICAL_ALIGN_CONST"
 msgid "Middle"
 msgstr "Canol"
 
-#: stringarray.hrc:68
+#: reportdesign/inc/stringarray.hrc:68
 msgctxt "RID_STR_VERTICAL_ALIGN_CONST"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: stringarray.hrc:74
+#: reportdesign/inc/stringarray.hrc:74
 msgctxt "RID_STR_PARAADJUST_CONST"
 msgid "Left"
 msgstr "Chwith"
 
-#: stringarray.hrc:75
+#: reportdesign/inc/stringarray.hrc:75
 msgctxt "RID_STR_PARAADJUST_CONST"
 msgid "Right"
 msgstr "De"
 
-#: stringarray.hrc:76
+#: reportdesign/inc/stringarray.hrc:76
 msgctxt "RID_STR_PARAADJUST_CONST"
 msgid "Block"
 msgstr "Bloc"
 
-#: stringarray.hrc:77
+#: reportdesign/inc/stringarray.hrc:77
 msgctxt "RID_STR_PARAADJUST_CONST"
 msgid "Center"
 msgstr "Canoli"
 
-#: strings.hrc:25
+#: reportdesign/inc/strings.hrc:25
 msgctxt "RID_STR_PROPPAGE_DEFAULT"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: strings.hrc:26
+#: reportdesign/inc/strings.hrc:26
 msgctxt "RID_STR_PROPPAGE_DATA"
 msgid "Data"
 msgstr "Data"
 
-#: strings.hrc:27
+#: reportdesign/inc/strings.hrc:27
 msgctxt "RID_STR_FORCENEWPAGE"
 msgid "Force New Page"
 msgstr "Gorfodi Tudalen Newydd"
 
-#: strings.hrc:28
+#: reportdesign/inc/strings.hrc:28
 msgctxt "RID_STR_NEWROWORCOL"
 msgid "New Row Or Column"
 msgstr "Rhes neu Golofn Newydd"
 
-#: strings.hrc:29
+#: reportdesign/inc/strings.hrc:29
 msgctxt "RID_STR_KEEPTOGETHER"
 msgid "Keep Together"
 msgstr "Cadw gyda'i Gilydd"
 
-#: strings.hrc:30
+#: reportdesign/inc/strings.hrc:30
 msgctxt "RID_STR_CANGROW"
 msgid "Can Grow"
 msgstr "Gall Dyfu"
 
-#: strings.hrc:31
+#: reportdesign/inc/strings.hrc:31
 msgctxt "RID_STR_CANSHRINK"
 msgid "Can Shrink"
 msgstr "Gall Grebachu"
 
-#: strings.hrc:32
+#: reportdesign/inc/strings.hrc:32
 msgctxt "RID_STR_REPEATSECTION"
 msgid "Repeat Section"
 msgstr "Ailadrodd Adran"
 
-#: strings.hrc:33
+#: reportdesign/inc/strings.hrc:33
 msgctxt "RID_STR_PRINTREPEATEDVALUES"
 msgid "Print repeated values"
 msgstr "Argraffu gwerthoedd ailadroddus"
 
-#: strings.hrc:34
+#: reportdesign/inc/strings.hrc:34
 msgctxt "RID_STR_CONDITIONALPRINTEXPRESSION"
 msgid "Conditional Print Expression"
 msgstr "Mynegiad Argraffu Amodol"
 
-#: strings.hrc:35
+#: reportdesign/inc/strings.hrc:35
 msgctxt "RID_STR_STARTNEWCOLUMN"
 msgid "Start new column"
 msgstr "Cychwyn colofn newydd"
 
-#: strings.hrc:36
+#: reportdesign/inc/strings.hrc:36
 msgctxt "RID_STR_STARTNEWPAGE"
 msgid "Start new page"
 msgstr "Cychwyn tudalen newydd"
 
-#: strings.hrc:37
+#: reportdesign/inc/strings.hrc:37
 msgctxt "RID_STR_RESETPAGENUMBER"
 msgid "Reset page number"
 msgstr "Ailosod rhif tudalen"
 
-#: strings.hrc:38
+#: reportdesign/inc/strings.hrc:38
 msgctxt "RID_STR_CHARTTYPE"
 msgid "Chart type"
 msgstr "Math o siart"
 
-#: strings.hrc:39
+#: reportdesign/inc/strings.hrc:39
 msgctxt "RID_STR_PRINTWHENGROUPCHANGE"
 msgid "Print repeated value on group change"
 msgstr "Argraffu'r gwerth ailadroddwyd ar newid grŵp"
 
-#: strings.hrc:40
+#: reportdesign/inc/strings.hrc:40
 msgctxt "RID_STR_VISIBLE"
 msgid "Visible"
 msgstr "Gweladwy"
 
-#: strings.hrc:41
+#: reportdesign/inc/strings.hrc:41
 msgctxt "RID_STR_GROUPKEEPTOGETHER"
 msgid "Group keep together"
 msgstr "Cadw grŵp gyda'i gilydd"
 
-#: strings.hrc:42
+#: reportdesign/inc/strings.hrc:42
 msgctxt "RID_STR_PAGEHEADEROPTION"
 msgid "Page header"
 msgstr "Pennyn tudalen"
 
-#: strings.hrc:43
+#: reportdesign/inc/strings.hrc:43
 msgctxt "RID_STR_PAGEFOOTEROPTION"
 msgid "Page footer"
 msgstr "Troedyn tudalen"
 
-#: strings.hrc:44
+#: reportdesign/inc/strings.hrc:44
 msgctxt "RID_STR_DEEPTRAVERSING"
 msgid "Deep traversing"
 msgstr "Treiddio dwfn"
 
-#: strings.hrc:45
+#: reportdesign/inc/strings.hrc:45
 msgctxt "RID_STR_PREEVALUATED"
 msgid "Pre evaluation"
 msgstr "Cyn gwerthuso"
 
-#: strings.hrc:46
+#: reportdesign/inc/strings.hrc:46
 msgctxt "RID_STR_POSITIONX"
 msgid "Position X"
 msgstr "Lleoliad X"
 
-#: strings.hrc:47
+#: reportdesign/inc/strings.hrc:47
 msgctxt "RID_STR_POSITIONY"
 msgid "Position Y"
 msgstr "Lleoliad Y"
 
-#: strings.hrc:48
+#: reportdesign/inc/strings.hrc:48
 msgctxt "RID_STR_WIDTH"
 msgid "Width"
 msgstr "Lled"
 
-#: strings.hrc:49
+#: reportdesign/inc/strings.hrc:49
 msgctxt "RID_STR_HEIGHT"
 msgid "Height"
 msgstr "Uchder"
 
-#: strings.hrc:50
+#: reportdesign/inc/strings.hrc:50
 msgctxt "RID_STR_INITIALFORMULA"
 msgid "Initial value"
 msgstr "Gwerth cyntaf"
 
-#: strings.hrc:51
+#: reportdesign/inc/strings.hrc:51
 msgctxt "RID_STR_PRESERVEIRI"
 msgid "Preserve as Link"
 msgstr "Cadw fel Cysylltiad"
 
-#: strings.hrc:52
+#: reportdesign/inc/strings.hrc:52
 msgctxt "RID_STR_FORMULA"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: strings.hrc:53
+#: reportdesign/inc/strings.hrc:53
 msgctxt "RID_STR_DATAFIELD"
 msgid "Data field"
 msgstr "Maes data"
 
-#: strings.hrc:54
+#: reportdesign/inc/strings.hrc:54
 msgctxt "RID_STR_FONT"
 msgid "Font"
 msgstr "Ffont"
 
-#: strings.hrc:55
+#: reportdesign/inc/strings.hrc:55
 msgctxt "RID_STR_BACKCOLOR"
 msgid "Background color"
 msgstr "Lliw cefndir"
 
-#: strings.hrc:56
+#: reportdesign/inc/strings.hrc:56
 msgctxt "RID_STR_BACKTRANSPARENT"
 msgid "Background Transparent"
 msgstr "Cefndir Tryloyw"
 
-#: strings.hrc:57
+#: reportdesign/inc/strings.hrc:57
 msgctxt "RID_STR_CONTROLBACKGROUNDTRANSPARENT"
 msgid "Background Transparent"
 msgstr "Cefndir Tryloyw"
 
-#: strings.hrc:58
+#: reportdesign/inc/strings.hrc:58
 msgctxt "RID_STR_OVERLAP_OTHER_CONTROL"
 msgid "This operation is not allowed. The control overlaps with another one."
 msgstr "Nid yw'r weithred hon yn cael ei chaniatáu. Mae'r rheolydd yn gorgyffwrdd un arall."
 
-#: strings.hrc:59
+#: reportdesign/inc/strings.hrc:59
 msgctxt "RID_STR_ILLEGAL_POSITION"
 msgid "This position can not be set. It is invalid."
 msgstr "Nid oes modd gosod y lleoliad yma. Mae'n annilys."
 
-#: strings.hrc:60
+#: reportdesign/inc/strings.hrc:60
 msgctxt "RID_STR_SCOPE_GROUP"
 msgid "Group: %1"
 msgstr "Grŵp: %1"
 
-#: strings.hrc:61
+#: reportdesign/inc/strings.hrc:61
 msgctxt "RID_STR_FORMULALIST"
 msgid "Function"
 msgstr "Swyddogaeth"
 
-#: strings.hrc:62
+#: reportdesign/inc/strings.hrc:62
 msgctxt "RID_STR_SCOPE"
 msgid "Scope"
 msgstr "Cwmpas"
 
-#: strings.hrc:63
+#: reportdesign/inc/strings.hrc:63
 msgctxt "RID_STR_TYPE"
 msgid "Data Field Type"
 msgstr "Math Maes Data"
 
-#: strings.hrc:64
+#: reportdesign/inc/strings.hrc:64
 msgctxt "RID_STR_MASTERFIELDS"
 msgid "Link master fields"
 msgstr "Cysylltu prif feysydd"
 
-#: strings.hrc:65
+#: reportdesign/inc/strings.hrc:65
 msgctxt "RID_STR_DETAILFIELDS"
 msgid "Link slave fields"
 msgstr "Cysylltu meysydd gwas"
 
-#: strings.hrc:67
+#: reportdesign/inc/strings.hrc:67
 msgctxt "RID_STR_DETAILLABEL"
 msgid "Chart"
 msgstr "Siart"
 
-#: strings.hrc:68
+#: reportdesign/inc/strings.hrc:68
 msgctxt "RID_STR_MASTERLABEL"
 msgid "Report"
 msgstr "Adroddiad"
 
-#: strings.hrc:69
+#: reportdesign/inc/strings.hrc:69
 msgctxt "RID_STR_PREVIEW_COUNT"
 msgid "Preview Row(s)"
 msgstr "Rhagolwg Rhes(i)"
 
-#: strings.hrc:70
+#: reportdesign/inc/strings.hrc:70
 msgctxt "RID_STR_AREA"
 msgid "Area"
 msgstr "Ardal"
 
-#: strings.hrc:71
+#: reportdesign/inc/strings.hrc:71
 msgctxt "RID_STR_MIMETYPE"
 msgid "Report Output Format"
 msgstr "FFormat Allbwn Adroddiad"
 
-#: strings.hrc:72
+#: reportdesign/inc/strings.hrc:72
 msgctxt "RID_STR_VERTICALALIGN"
 msgid "Vert. Alignment"
 msgstr "Aliniad Fertigol"
 
-#: strings.hrc:73
+#: reportdesign/inc/strings.hrc:73
 msgctxt "RID_STR_PARAADJUST"
 msgid "Horz. Alignment"
 msgstr "Aliniad Llorweddol"
 
-#: strings.hrc:74
+#: reportdesign/inc/strings.hrc:74
 msgctxt "RID_STR_F_COUNTER"
 msgid "Counter"
 msgstr "Cyfrif"
 
-#: strings.hrc:75
+#: reportdesign/inc/strings.hrc:75
 msgctxt "RID_STR_F_ACCUMULATION"
 msgid "Accumulation"
 msgstr "Croniad"
 
-#: strings.hrc:76
+#: reportdesign/inc/strings.hrc:76
 msgctxt "RID_STR_F_MINIMUM"
 msgid "Minimum"
 msgstr "Lleiafswm"
 
-#: strings.hrc:77
+#: reportdesign/inc/strings.hrc:77
 msgctxt "RID_STR_F_MAXIMUM"
 msgid "Maximum"
 msgstr "Mwyaf"
 
-#: strings.hrc:79
+#: reportdesign/inc/strings.hrc:79
 msgctxt "RID_STR_BRWTITLE_PROPERTIES"
 msgid "Properties: "
 msgstr "Priodweddau: "
 
-#: strings.hrc:80
+#: reportdesign/inc/strings.hrc:80
 msgctxt "RID_STR_BRWTITLE_NO_PROPERTIES"
 msgid "No Control marked"
 msgstr "Dim Rheolaeth wedi ei nodi"
 
-#: strings.hrc:81
+#: reportdesign/inc/strings.hrc:81
 msgctxt "RID_STR_BRWTITLE_MULTISELECT"
 msgid "Multiselection"
 msgstr "Amladran"
 
-#: strings.hrc:82
+#: reportdesign/inc/strings.hrc:82
 msgctxt "RID_STR_PROPTITLE_IMAGECONTROL"
 msgid "Image Control"
 msgstr "Rheolaeth Delwedd"
 
-#: strings.hrc:83
+#: reportdesign/inc/strings.hrc:83
 msgctxt "RID_STR_PROPTITLE_FIXEDTEXT"
 msgid "Label field"
 msgstr "Label maes"
 
-#: strings.hrc:84
+#: reportdesign/inc/strings.hrc:84
 msgctxt "RID_STR_PROPTITLE_FIXEDLINE"
 msgid "Line"
 msgstr "Llinell"
 
-#: strings.hrc:85
+#: reportdesign/inc/strings.hrc:85
 msgctxt "RID_STR_PROPTITLE_FORMATTED"
 msgid "Formatted Field"
 msgstr "Maes wedi ei Fformatio"
 
-#: strings.hrc:86
+#: reportdesign/inc/strings.hrc:86
 msgctxt "RID_STR_PROPTITLE_SHAPE"
 msgid "Shape"
 msgstr "Siâp"
 
-#: strings.hrc:87
+#: reportdesign/inc/strings.hrc:87
 msgctxt "RID_STR_PROPTITLE_REPORT"
 msgid "Report"
 msgstr "Adroddiad"
 
-#: strings.hrc:88
+#: reportdesign/inc/strings.hrc:88
 msgctxt "RID_STR_PROPTITLE_SECTION"
 msgid "Section"
 msgstr "Adran"
 
-#: strings.hrc:89
+#: reportdesign/inc/strings.hrc:89
 msgctxt "RID_STR_PROPTITLE_FUNCTION"
 msgid "Function"
 msgstr "Swyddogaeth"
 
-#: strings.hrc:90
+#: reportdesign/inc/strings.hrc:90
 msgctxt "RID_STR_PROPTITLE_GROUP"
 msgid "Group"
 msgstr "Grŵp"
 
-#: strings.hrc:91
+#: reportdesign/inc/strings.hrc:91
 msgctxt "RID_STR_UNDO_CHANGEPOSITION"
 msgid "Change Object"
 msgstr "Newid Gwrthrych"
 
-#: strings.hrc:92
+#: reportdesign/inc/strings.hrc:92
 msgctxt "RID_STR_UNDO_MOVE_GROUP"
 msgid "Move Group(s)"
 msgstr "Symud Grŵp(iau)"
 
-#: strings.hrc:93
+#: reportdesign/inc/strings.hrc:93
 msgctxt "RID_STR_UNDO_CONDITIONAL_FORMATTING"
 msgid "Conditional Formatting"
 msgstr "Fformatio Amodol"
 
-#: strings.hrc:94
+#: reportdesign/inc/strings.hrc:94
 msgctxt "RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER"
 msgid "Remove report header / report footer"
 msgstr "Tynnu pennyn adroddiad / troedyn adroddiad"
 
-#: strings.hrc:95
+#: reportdesign/inc/strings.hrc:95
 msgctxt "RID_STR_UNDO_ADD_REPORTHEADERFOOTER"
 msgid "Add report header / report footer"
 msgstr "Ychwanegu pennyn adroddiad / troedyn adroddiad"
 
 #. The # character is used for replacing
-#: strings.hrc:97
+#: reportdesign/inc/strings.hrc:97
 msgctxt "RID_STR_UNDO_PROPERTY"
 msgid "Change property '#'"
 msgstr "Newid priodwedd '#'"
 
-#: strings.hrc:98
+#: reportdesign/inc/strings.hrc:98
 msgctxt "RID_STR_UNDO_ADD_GROUP_HEADER"
 msgid "Add group header "
 msgstr "Ychwanegu pennyn grŵp "
 
-#: strings.hrc:99
+#: reportdesign/inc/strings.hrc:99
 msgctxt "RID_STR_UNDO_REMOVE_GROUP_HEADER"
 msgid "Remove group header "
 msgstr "Tynnu pennyn grŵp "
 
-#: strings.hrc:100
+#: reportdesign/inc/strings.hrc:100
 msgctxt "RID_STR_UNDO_ADD_GROUP_FOOTER"
 msgid "Add group footer "
 msgstr "Ychwanegu troedyn grŵp "
 
-#: strings.hrc:101
+#: reportdesign/inc/strings.hrc:101
 msgctxt "RID_STR_UNDO_REMOVE_GROUP_FOOTER"
 msgid "Remove group footer "
 msgstr "Tynnu troedyn grŵp "
 
-#: strings.hrc:102
+#: reportdesign/inc/strings.hrc:102
 msgctxt "RID_STR_UNDO_ADDFUNCTION"
 msgid "Add function"
 msgstr "Ychwanegu swyddogaeth"
 
-#: strings.hrc:103
+#: reportdesign/inc/strings.hrc:103
 msgctxt "STR_RPT_LABEL"
 msgid "~Report name"
 msgstr "Enw ~adroddiad"
 
-#: strings.hrc:104
+#: reportdesign/inc/strings.hrc:104
 msgctxt "RID_STR_UNDO_REMOVE_GROUP"
 msgid "Delete Group"
 msgstr "Dileu Grŵp"
 
-#: strings.hrc:105
+#: reportdesign/inc/strings.hrc:105
 msgctxt "RID_STR_UNDO_APPEND_GROUP"
 msgid "Add Group"
 msgstr "Ychwanegu Grŵp"
 
-#: strings.hrc:106
+#: reportdesign/inc/strings.hrc:106
 msgctxt "RID_STR_UNDO_REMOVE_SELECTION"
 msgid "Delete Selection"
 msgstr "Dileu Dewis"
 
-#: strings.hrc:107
+#: reportdesign/inc/strings.hrc:107
 msgctxt "RID_STR_UNDO_REMOVE_FUNCTION"
 msgid "Delete Function"
 msgstr "Dileu Swyddogaeth"
 
-#: strings.hrc:108
+#: reportdesign/inc/strings.hrc:108
 msgctxt "RID_STR_UNDO_CHANGE_SIZE"
 msgid "Change Size"
 msgstr "Newid Maint"
 
-#: strings.hrc:109
+#: reportdesign/inc/strings.hrc:109
 msgctxt "RID_STR_UNDO_PASTE"
 msgid "Paste"
 msgstr "Gludo"
 
-#: strings.hrc:110
+#: reportdesign/inc/strings.hrc:110
 msgctxt "RID_STR_UNDO_INSERT_CONTROL"
 msgid "Insert Control"
 msgstr "Mewnosod Rheolydd"
 
-#: strings.hrc:111
+#: reportdesign/inc/strings.hrc:111
 msgctxt "RID_STR_UNDO_DELETE_CONTROL"
 msgid "Delete Control"
 msgstr "Dileu Rheolydd"
 
 #. Please try to avoid spaces in the name. It is used as a programmatic one.
-#: strings.hrc:113
+#: reportdesign/inc/strings.hrc:113
 msgctxt "RID_STR_GROUPHEADER"
 msgid "GroupHeader"
 msgstr "PennynGrŵp"
 
 #. Please try to avoid spaces in the name. It is used as a programmatic one.
-#: strings.hrc:115
+#: reportdesign/inc/strings.hrc:115
 msgctxt "RID_STR_GROUPFOOTER"
 msgid "GroupFooter"
 msgstr "TroedynGrŵp"
 
-#: strings.hrc:116
+#: reportdesign/inc/strings.hrc:116
 msgctxt "RID_STR_FIELDSELECTION"
 msgid "Add field:"
 msgstr "Ychwanegu maes:"
 
-#: strings.hrc:117
+#: reportdesign/inc/strings.hrc:117
 msgctxt "RID_STR_FILTER"
 msgid "Filter"
 msgstr "Hidl"
 
-#: strings.hrc:118
+#: reportdesign/inc/strings.hrc:118
 msgctxt "RID_STR_UNDO_ALIGNMENT"
 msgid "Change Alignment"
 msgstr "Newid Aliniad"
 
 #. # will be replaced with a name.
-#: strings.hrc:120
+#: reportdesign/inc/strings.hrc:120
 msgctxt "RID_STR_HEADER"
 msgid "# Header"
 msgstr "Pennyn #"
 
 #. # will be replaced with a name.";
-#: strings.hrc:122
+#: reportdesign/inc/strings.hrc:122
 msgctxt "RID_STR_FOOTER"
 msgid "# Footer"
 msgstr "Troedyn #"
 
-#: strings.hrc:123
+#: reportdesign/inc/strings.hrc:123
 msgctxt "RID_STR_IMPORT_GRAPHIC"
 msgid "Insert graphics"
 msgstr "Mewnosod graffigau"
 
-#: strings.hrc:124
+#: reportdesign/inc/strings.hrc:124
 msgctxt "RID_STR_DELETE"
 msgid "Delete"
 msgstr "Dileu"
 
-#: strings.hrc:125
+#: reportdesign/inc/strings.hrc:125
 msgctxt "RID_STR_FUNCTION"
 msgid "Function"
 msgstr "Swyddogaeth"
 
-#: strings.hrc:126
+#: reportdesign/inc/strings.hrc:126
 msgctxt "RID_STR_COULD_NOT_CREATE_REPORT"
 msgid "An error occurred while creating the report."
 msgstr "Ddigwyddodd gwall wrth greu'r adroddiad."
 
-#: strings.hrc:127
+#: reportdesign/inc/strings.hrc:127
 msgctxt "RID_STR_CAUGHT_FOREIGN_EXCEPTION"
 msgid "An exception of type $type$ was caught."
 msgstr "Cipiwyd eithriad o fath $type$."
 
-#: strings.hrc:128
+#: reportdesign/inc/strings.hrc:128
 msgctxt "RID_STR_UNDO_CHANGEFONT"
 msgid "Change font"
 msgstr "Newid ffont"
 
-#: strings.hrc:129
+#: reportdesign/inc/strings.hrc:129
 msgctxt "RID_STR_UNDO_CHANGEPAGE"
 msgid "Change page attributes"
 msgstr "Newid priodoledd tudalen"
 
-#: strings.hrc:130
+#: reportdesign/inc/strings.hrc:130
 msgctxt "RID_STR_PAGEHEADERFOOTER_INSERT"
 msgid "Insert Page Header/Footer"
 msgstr "Mewnosod Pennyn/Troedyn Tudalen"
 
-#: strings.hrc:131
+#: reportdesign/inc/strings.hrc:131
 msgctxt "RID_STR_PAGEHEADERFOOTER_DELETE"
 msgid "Delete Page Header/Footer"
 msgstr "Dileu Pennyn/Troedyn Tudalen"
 
-#: strings.hrc:132
+#: reportdesign/inc/strings.hrc:132
 msgctxt "RID_STR_REPORTHEADERFOOTER_INSERT"
 msgid "Insert Report Header/Footer"
 msgstr "Mewnosod Pennyn/Troedyn Adroddiad"
 
-#: strings.hrc:133
+#: reportdesign/inc/strings.hrc:133
 msgctxt "RID_STR_REPORTHEADERFOOTER_DELETE"
 msgid "Delete Report Header/Footer"
 msgstr "Dileu Pennyn/Troedyn Adroddiad"
 
-#: strings.hrc:134
+#: reportdesign/inc/strings.hrc:134
 msgctxt "RID_ERR_NO_COMMAND"
 msgid "The report can not be executed unless it is bound to content."
 msgstr "Nid oes modd gweithredu'r adroddiad oni bai ei fod wedi ei rwymo at gynnwys."
 
-#: strings.hrc:135
+#: reportdesign/inc/strings.hrc:135
 msgctxt "RID_ERR_NO_OBJECTS"
 msgid "The report can not be executed unless at least one object has been inserted."
 msgstr "Nid oes modd gweithredu'r adroddiad oni bai fod o leiaf un gwrthrych wedi ei fewnosod."
 
-#: strings.hrc:136
+#: reportdesign/inc/strings.hrc:136
 msgctxt "RID_STR_UNDO_SHRINK"
 msgid "Shrink Section"
 msgstr "Lleihau'r Adran"
 
-#: strings.hrc:137 /home/cl/vc/git/libo-core/reportdesign/inc/strings.hrc:171
+#: reportdesign/inc/strings.hrc:137 reportdesign/inc/strings.hrc:171
 msgctxt "RID_STR_DETAIL"
 msgid "Detail"
 msgstr "Manylyn"
 
-#: strings.hrc:138 /home/cl/vc/git/libo-core/reportdesign/inc/strings.hrc:172
+#: reportdesign/inc/strings.hrc:138 reportdesign/inc/strings.hrc:172
 msgctxt "RID_STR_PAGE_HEADER"
 msgid "Page Header"
 msgstr "Pennyn Tudalen"
 
-#: strings.hrc:139 /home/cl/vc/git/libo-core/reportdesign/inc/strings.hrc:173
+#: reportdesign/inc/strings.hrc:139 reportdesign/inc/strings.hrc:173
 msgctxt "RID_STR_PAGE_FOOTER"
 msgid "Page Footer"
 msgstr "Troedyn Tudalen"
 
-#: strings.hrc:140 /home/cl/vc/git/libo-core/reportdesign/inc/strings.hrc:176
+#: reportdesign/inc/strings.hrc:140 reportdesign/inc/strings.hrc:176
 msgctxt "RID_STR_REPORT_HEADER"
 msgid "Report Header"
 msgstr "Pennyn Adroddiad"
 
-#: strings.hrc:141 /home/cl/vc/git/libo-core/reportdesign/inc/strings.hrc:177
+#: reportdesign/inc/strings.hrc:141 reportdesign/inc/strings.hrc:177
 msgctxt "RID_STR_REPORT_FOOTER"
 msgid "Report Footer"
 msgstr "Troedyn Adroddiad"
 
-#: strings.hrc:143
+#: reportdesign/inc/strings.hrc:143
 msgctxt "STR_NUMBERED_CONDITION"
 msgid "Condition $number$"
 msgstr "$number$ amodol"
 
-#: strings.hrc:145
+#: reportdesign/inc/strings.hrc:145
 msgctxt "STR_RPT_EXPRESSION"
 msgid "Field/Expression"
 msgstr "Maes/ Mynegiad"
 
-#: strings.hrc:146
+#: reportdesign/inc/strings.hrc:146
 msgctxt "STR_RPT_PREFIXCHARS"
 msgid "Prefix Characters"
 msgstr "Nod Rhagddodiad"
 
-#: strings.hrc:147
+#: reportdesign/inc/strings.hrc:147
 msgctxt "STR_RPT_YEAR"
 msgid "Year"
 msgstr "Blwyddyn"
 
-#: strings.hrc:148
+#: reportdesign/inc/strings.hrc:148
 msgctxt "STR_RPT_QUARTER"
 msgid "Quarter"
 msgstr "Chwarter"
 
-#: strings.hrc:149
+#: reportdesign/inc/strings.hrc:149
 msgctxt "STR_RPT_MONTH"
 msgid "Month"
 msgstr "Mis"
 
-#: strings.hrc:150
+#: reportdesign/inc/strings.hrc:150
 msgctxt "STR_RPT_WEEK"
 msgid "Week"
 msgstr "Wythnos"
 
-#: strings.hrc:151
+#: reportdesign/inc/strings.hrc:151
 msgctxt "STR_RPT_DAY"
 msgid "Day"
 msgstr "Diwrnod"
 
-#: strings.hrc:152
+#: reportdesign/inc/strings.hrc:152
 msgctxt "STR_RPT_HOUR"
 msgid "Hour"
 msgstr "Awr"
 
-#: strings.hrc:153
+#: reportdesign/inc/strings.hrc:153
 msgctxt "STR_RPT_MINUTE"
 msgid "Minute"
 msgstr "Munud"
 
-#: strings.hrc:154
+#: reportdesign/inc/strings.hrc:154
 msgctxt "STR_RPT_INTERVAL"
 msgid "Interval"
 msgstr "Cyfwng"
 
-#: strings.hrc:155
+#: reportdesign/inc/strings.hrc:155
 msgctxt "STR_RPT_HELP_FIELD"
 msgid "Select a field or type an expression to sort or group on."
 msgstr "Dewiswch faes neu fath o fynegiad i ddidoli neu grwpio."
 
-#: strings.hrc:156
+#: reportdesign/inc/strings.hrc:156
 msgctxt "STR_RPT_HELP_HEADER"
 msgid "Display a header for this group?"
 msgstr "Dangos pennyn ar gyfer y grŵp?"
 
-#: strings.hrc:157
+#: reportdesign/inc/strings.hrc:157
 msgctxt "STR_RPT_HELP_FOOTER"
 msgid "Display a footer for this group?"
 msgstr "Dangos troedyn ar gyfer y grŵp?"
 
-#: strings.hrc:158
+#: reportdesign/inc/strings.hrc:158
 msgctxt "STR_RPT_HELP_GROUPON"
 msgid "Select the value or range of values that starts a new group."
 msgstr "Dewis gwerth neu ystod sy'n cychwyn grŵp newydd."
 
-#: strings.hrc:159
+#: reportdesign/inc/strings.hrc:159
 msgctxt "STR_RPT_HELP_INTERVAL"
 msgid "Interval or number of characters to group on."
 msgstr "Cyfwng neu nifer o nodau i grwpio iddynt."
 
-#: strings.hrc:160
+#: reportdesign/inc/strings.hrc:160
 msgctxt "STR_RPT_HELP_KEEP"
 msgid "Keep group together on one page?"
 msgstr "Cadw grŵp at ei gilydd ar un tudalen?"
 
-#: strings.hrc:161
+#: reportdesign/inc/strings.hrc:161
 msgctxt "STR_RPT_HELP_SORT"
 msgid "Select ascending or descending sort order. Ascending means from A to Z or 0 to 9"
 msgstr "Dewis trefn esgyn neu ddisgyn. Mae esgyn yn golygu o A i Z neu 0 i 9"
 
 #. The space after the word is no error. #PAGENUMBER# is a replacement and & must not be translated as well as "
-#: strings.hrc:164
+#: reportdesign/inc/strings.hrc:164
 msgctxt "STR_RPT_PN_PAGE"
 msgid "\"Page \" & #PAGENUMBER#"
 msgstr "\"Tudalen \" & #PAGENUMBER#"
 
 #. The space before and after the word is no error. #PAGECOUNT# is a replacement and & must not be translated  as well as "
-#: strings.hrc:166
+#: reportdesign/inc/strings.hrc:166
 msgctxt "STR_RPT_PN_PAGE_OF"
 msgid " & \" of \" & #PAGECOUNT#"
 msgstr " & \" o \" & #PAGECOUNT#"
 
-#: strings.hrc:168
+#: reportdesign/inc/strings.hrc:168
 msgctxt "RID_STR_FUNCTIONS"
 msgid "Functions"
 msgstr "Swyddogaethau"
 
-#: strings.hrc:169
+#: reportdesign/inc/strings.hrc:169
 msgctxt "RID_STR_GROUPS"
 msgid "Groups"
 msgstr "Grwpiau"
 
-#: strings.hrc:174
+#: reportdesign/inc/strings.hrc:174
 msgctxt "RID_STR_GROUP_HEADER"
 msgid "Group Header"
 msgstr "Pennyn Grŵp"
 
-#: strings.hrc:175
+#: reportdesign/inc/strings.hrc:175
 msgctxt "RID_STR_GROUP_FOOTER"
 msgid "Group Footer"
 msgstr "Troedyn Grŵp"
 
-#: strings.hrc:178
+#: reportdesign/inc/strings.hrc:178
 msgctxt "RID_STR_ERROR_WRONG_ARGUMENT"
 msgid "You tried to set an illegal argument. Please have a look at '#1' for valid arguments."
 msgstr "Rydych wedi ceisio gosod ymresymiad anghyfreithlon. Edrychwch ar '#1' am ymresymiad cyfreithlon."
 
-#: strings.hrc:179
+#: reportdesign/inc/strings.hrc:179
 msgctxt "RID_STR_ARGUMENT_IS_NULL"
 msgid "The element is invalid."
 msgstr "Mae'r elfen yn annilys."
 
-#: strings.hrc:180
+#: reportdesign/inc/strings.hrc:180
 msgctxt "RID_STR_FIXEDTEXT"
 msgid "Label field"
 msgstr "Maes label"
 
-#: strings.hrc:181
+#: reportdesign/inc/strings.hrc:181
 msgctxt "RID_STR_FORMATTEDFIELD"
 msgid "Formatted field"
 msgstr "Maes wedi ei fformatio"
 
-#: strings.hrc:182
+#: reportdesign/inc/strings.hrc:182
 msgctxt "RID_STR_IMAGECONTROL"
 msgid "Image control"
 msgstr "Rheolydd delwedd"
 
-#: strings.hrc:183
+#: reportdesign/inc/strings.hrc:183
 msgctxt "RID_STR_REPORT"
 msgid "Report"
 msgstr "Adroddiad"
 
-#: strings.hrc:184
+#: reportdesign/inc/strings.hrc:184
 msgctxt "RID_STR_SHAPE"
 msgid "Shape"
 msgstr "Siâp"
 
-#: strings.hrc:185
+#: reportdesign/inc/strings.hrc:185
 msgctxt "RID_STR_FIXEDLINE"
 msgid "Fixed line"
 msgstr "Llinell osodedig"
 
-#: backgrounddialog.ui:8
+#: reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui:8
 msgctxt "backgrounddialog|BackgroundDialog"
 msgid "Section Setup"
 msgstr "Gosodiad Adran"
 
-#: backgrounddialog.ui:105
+#: reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui:105
 msgctxt "backgrounddialog|background"
 msgid "Background"
 msgstr "Cefndir"
 
-#: chardialog.ui:8
+#: reportdesign/uiconfig/dbreport/ui/chardialog.ui:8
 msgctxt "chardialog|CharDialog"
 msgid "Character Settings"
 msgstr "Gosodiadau Nod"
 
-#: chardialog.ui:105
+#: reportdesign/uiconfig/dbreport/ui/chardialog.ui:105
 msgctxt "chardialog|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: chardialog.ui:127
+#: reportdesign/uiconfig/dbreport/ui/chardialog.ui:127
 msgctxt "chardialog|fonteffects"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: chardialog.ui:150
+#: reportdesign/uiconfig/dbreport/ui/chardialog.ui:150
 msgctxt "chardialog|position"
 msgid "Position"
 msgstr "Safle"
 
-#: chardialog.ui:173
+#: reportdesign/uiconfig/dbreport/ui/chardialog.ui:173
 msgctxt "chardialog|asianlayout"
 msgid "Asian Layout"
 msgstr "Cynllun Asiaidd"
 
-#: chardialog.ui:196
+#: reportdesign/uiconfig/dbreport/ui/chardialog.ui:196
 msgctxt "chardialog|background"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: chardialog.ui:219
+#: reportdesign/uiconfig/dbreport/ui/chardialog.ui:219
 msgctxt "chardialog|alignment"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: condformatdialog.ui:10
+#: reportdesign/uiconfig/dbreport/ui/condformatdialog.ui:10
 msgctxt "condformatdialog|CondFormat"
 msgid "Conditional Formatting"
 msgstr "Fformatio Amodol"
 
-#: conditionwin.ui:56
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:56
 msgctxt "conditionwin|typeCombobox"
 msgid "Field Value Is"
 msgstr "Gwerth Maes Yw"
 
-#: conditionwin.ui:57
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:57
 msgctxt "conditionwin|typeCombobox"
 msgid "Expression Is"
 msgstr "Mynegiad Yw"
 
-#: conditionwin.ui:71
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:71
 msgctxt "conditionwin|opCombobox"
 msgid "between"
 msgstr "rhwng"
 
-#: conditionwin.ui:72
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:72
 msgctxt "conditionwin|opCombobox"
 msgid "not between"
 msgstr "nid rhwng"
 
-#: conditionwin.ui:73
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:73
 msgctxt "conditionwin|opCombobox"
 msgid "equal to"
 msgstr "yn hafal i"
 
-#: conditionwin.ui:74
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:74
 msgctxt "conditionwin|opCombobox"
 msgid "not equal to"
 msgstr "heb fod yn hafal â"
 
-#: conditionwin.ui:75
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:75
 msgctxt "conditionwin|opCombobox"
 msgid "greater than"
 msgstr "yn fwy na"
 
-#: conditionwin.ui:76
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:76
 msgctxt "conditionwin|opCombobox"
 msgid "less than"
 msgstr "yn llai na"
 
-#: conditionwin.ui:77
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:77
 msgctxt "conditionwin|opCombobox"
 msgid "greater than or equal to"
 msgstr "mwy na neu gydradd â"
 
-#: conditionwin.ui:78
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:78
 msgctxt "conditionwin|opCombobox"
 msgid "less than or equal to"
 msgstr "llai na neu gyfartal â"
 
-#: conditionwin.ui:107
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:107
 msgctxt "conditionwin|lhsButton"
 msgid "..."
 msgstr "..."
 
-#: conditionwin.ui:130
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:130
 msgctxt "conditionwin|andLabel"
 msgid "and"
 msgstr "a"
 
-#: conditionwin.ui:158
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:158
 msgctxt "conditionwin|rhsButton"
 msgid "..."
 msgstr "..."
 
-#: conditionwin.ui:220
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:221
 msgctxt "conditionwin|ToolBoxItem1"
 msgid "Bold"
 msgstr "Trwm"
 
-#: conditionwin.ui:235
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:236
 msgctxt "conditionwin|ToolBoxItem2"
 msgid "Italic"
 msgstr "Italig"
 
-#: conditionwin.ui:250
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:251
 msgctxt "conditionwin|ToolBoxItem3"
 msgid "Underline"
 msgstr "Tanlinellu"
 
-#: conditionwin.ui:275
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:276
 msgctxt "conditionwin|ToolBoxItem4"
 msgid "Background Color"
 msgstr "Lliw Cefndir"
 
-#: conditionwin.ui:290
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:291
 msgctxt "conditionwin|ToolBoxItem5"
 msgid "Font Color"
 msgstr "Lliw Ffont"
 
-#: conditionwin.ui:305
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:306
 msgctxt "conditionwin|ToolBoxItem6"
 msgid "Character Formatting"
 msgstr "Fformatio Nod"
 
-#: conditionwin.ui:371
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:373
 msgctxt "conditionwin|removeButton"
 msgid "-"
 msgstr "-"
 
-#: conditionwin.ui:385
+#: reportdesign/uiconfig/dbreport/ui/conditionwin.ui:388
 msgctxt "conditionwin|addButton"
 msgid "+"
 msgstr "+"
 
-#: datetimedialog.ui:8
+#: reportdesign/uiconfig/dbreport/ui/datetimedialog.ui:8
 msgctxt "datetimedialog|DateTimeDialog"
 msgid "Date and Time"
 msgstr "Dyddiad ac Amser"
 
-#: datetimedialog.ui:87
+#: reportdesign/uiconfig/dbreport/ui/datetimedialog.ui:87
 msgctxt "datetimedialog|date"
 msgid "_Include Date"
 msgstr "_Cynnwys Dyddiad"
 
-#: datetimedialog.ui:108
+#: reportdesign/uiconfig/dbreport/ui/datetimedialog.ui:108
 msgctxt "datetimedialog|datelistbox_label"
 msgid "_Format:"
 msgstr "_Fformat:"
 
-#: datetimedialog.ui:119
+#: reportdesign/uiconfig/dbreport/ui/datetimedialog.ui:119
 msgctxt "datetimedialog|time"
 msgid "Include _Time"
 msgstr "Cynnwys _Amser"
 
-#: datetimedialog.ui:140
+#: reportdesign/uiconfig/dbreport/ui/datetimedialog.ui:140
 msgctxt "datetimedialog|timelistbox_label"
 msgid "Fo_rmat:"
 msgstr "Ff_ormat:"
 
-#: floatingfield.ui:11
+#: reportdesign/uiconfig/dbreport/ui/floatingfield.ui:11
 msgctxt "floatingfield|FloatingField"
 msgid "Sorting and Grouping"
 msgstr "Trefnu a Grwpio"
 
-#: floatingfield.ui:30
+#: reportdesign/uiconfig/dbreport/ui/floatingfield.ui:30
 msgctxt "floatingfield|up"
 msgid "Sort Ascending"
 msgstr "Trefnu Esgynnol"
 
-#: floatingfield.ui:43
+#: reportdesign/uiconfig/dbreport/ui/floatingfield.ui:43
 msgctxt "floatingfield|down"
 msgid "Sort Descending"
 msgstr "Trefnu Disgynnol"
 
-#: floatingfield.ui:56
+#: reportdesign/uiconfig/dbreport/ui/floatingfield.ui:56
 msgctxt "floatingfield|delete"
 msgid "Remove sorting"
 msgstr "Tynnu trefnu"
 
-#: floatingfield.ui:79
+#: reportdesign/uiconfig/dbreport/ui/floatingfield.ui:79
 msgctxt "floatingfield|insert"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: floatingfield.ui:98
+#: reportdesign/uiconfig/dbreport/ui/floatingfield.ui:98
 msgctxt "floatingfield|helptext"
 msgid "Highlight the fields to insert into the selected section of the template, then click Insert or press Enter."
 msgstr "Amlygwch y meysydd i'w mewnosod i'r adran hon yn y templed, ac wedyn cliciwch Mewnosod neu bwyso Enter."
 
-#: floatingnavigator.ui:10
+#: reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui:10
 msgctxt "floatingnavigator|FloatingNavigator"
 msgid "Report navigator"
 msgstr "Llywiwr adroddiad"
 
-#: floatingsort.ui:11
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:11
 msgctxt "floatingsort|FloatingSort"
 msgid "Sorting and Grouping"
 msgstr "Trefnu a Grwpio"
 
-#: floatingsort.ui:53
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:53
 msgctxt "floatingsort|label5"
 msgid "Group actions"
 msgstr "Gweithredoedd grŵp"
 
-#: floatingsort.ui:75
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:75
 msgctxt "floatingsort|up"
 msgid "Move up"
 msgstr "Symud i fyny"
 
-#: floatingsort.ui:88
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:88
 msgctxt "floatingsort|down"
 msgid "Move down"
 msgstr "Symud i lawr"
 
-#: floatingsort.ui:101
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:101
 msgctxt "floatingsort|delete"
 msgid "Delete"
 msgstr "Dileu"
 
-#: floatingsort.ui:152
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:152
 msgctxt "floatingsort|label1"
 msgid "Groups"
 msgstr "Grwpiau"
 
-#: floatingsort.ui:192
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:192
 msgctxt "floatingsort|label6"
 msgid "Sorting"
 msgstr "Didoli"
 
-#: floatingsort.ui:208
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:208
 msgctxt "floatingsort|label7"
 msgid "Group Header"
 msgstr "Pennyn Grŵp"
 
-#: floatingsort.ui:224
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:224
 msgctxt "floatingsort|label8"
 msgid "Group Footer"
 msgstr "Troedyn Grŵp"
 
-#: floatingsort.ui:240
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:240
 msgctxt "floatingsort|label9"
 msgid "Group On"
 msgstr "Grŵp Ymlaen"
 
-#: floatingsort.ui:256
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:256
 msgctxt "floatingsort|label10"
 msgid "Group Interval"
 msgstr "Cyfwng Grŵp"
 
-#: floatingsort.ui:272
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:272
 msgctxt "floatingsort|label11"
 msgid "Keep Together"
 msgstr "Cadw Gyda'i Gilydd"
 
-#: floatingsort.ui:290
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:290
 msgctxt "floatingsort|sorting"
 msgid "Ascending"
 msgstr "Esgyn"
 
-#: floatingsort.ui:291
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:291
 msgctxt "floatingsort|sorting"
 msgid "Descending"
 msgstr "Disgyn"
 
-#: floatingsort.ui:308
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:308
 msgctxt "floatingsort|header"
 msgid "Present"
 msgstr "Presennol"
 
-#: floatingsort.ui:309
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:309
 msgctxt "floatingsort|header"
 msgid "Not present"
 msgstr "Ddim yn bresennol"
 
-#: floatingsort.ui:326
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:326
 msgctxt "floatingsort|keep"
 msgid "No"
 msgstr "Na"
 
-#: floatingsort.ui:327
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:327
 msgctxt "floatingsort|keep"
 msgid "Whole Group"
 msgstr "Grŵp Cyfan"
 
-#: floatingsort.ui:328
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:328
 msgctxt "floatingsort|keep"
 msgid "With First Detail"
 msgstr "Gyda'r Manylyn Cyntaf"
 
-#: floatingsort.ui:345
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:345
 msgctxt "floatingsort|footer"
 msgid "Present"
 msgstr "Presennol"
 
-#: floatingsort.ui:346
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:346
 msgctxt "floatingsort|footer"
 msgid "Not present"
 msgstr "Ddim yn bresennol"
 
-#: floatingsort.ui:363
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:363
 msgctxt "floatingsort|group"
 msgid "Each Value"
 msgstr "Pob Gwerth"
 
-#: floatingsort.ui:394
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:394
 msgctxt "floatingsort|label2"
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: floatingsort.ui:436
+#: reportdesign/uiconfig/dbreport/ui/floatingsort.ui:436
 msgctxt "floatingsort|label3"
 msgid "Help"
 msgstr "Cymorth"
 
-#: groupsortmenu.ui:12
+#: reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui:12
 msgctxt "groupsortmenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: navigatormenu.ui:12
+#: reportdesign/uiconfig/dbreport/ui/navigatormenu.ui:12
 msgctxt "navigatormenu|sorting"
 msgid "Sorting and Grouping..."
 msgstr "Trefnu a Grwpio..."
 
-#: navigatormenu.ui:26
+#: reportdesign/uiconfig/dbreport/ui/navigatormenu.ui:26
 msgctxt "navigatormenu|page"
 msgid "Page Header/Footer..."
 msgstr "Pennyn/Troedyn Tudalen..."
 
-#: navigatormenu.ui:34
+#: reportdesign/uiconfig/dbreport/ui/navigatormenu.ui:34
 msgctxt "navigatormenu|report"
 msgid "Report Header/Footer..."
 msgstr "Pennyn/Troedyn Adroddiad..."
 
-#: navigatormenu.ui:48
+#: reportdesign/uiconfig/dbreport/ui/navigatormenu.ui:48
 msgctxt "navigatormenu|function"
 msgid "New Function"
 msgstr "Swyddogaeth Newydd"
 
-#: navigatormenu.ui:62
+#: reportdesign/uiconfig/dbreport/ui/navigatormenu.ui:62
 msgctxt "navigatormenu|properties"
 msgid "Properties..."
 msgstr "Priodweddau..."
 
-#: navigatormenu.ui:70
+#: reportdesign/uiconfig/dbreport/ui/navigatormenu.ui:70
 msgctxt "navigatormenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: pagedialog.ui:8
+#: reportdesign/uiconfig/dbreport/ui/pagedialog.ui:8
 msgctxt "pagedialog|PageDialog"
 msgid "Page Setup"
 msgstr "Gosodiad Tudalen"
 
-#: pagedialog.ui:105
+#: reportdesign/uiconfig/dbreport/ui/pagedialog.ui:105
 msgctxt "pagedialog|page"
 msgid "Page"
 msgstr "Tudalen"
 
-#: pagedialog.ui:127
+#: reportdesign/uiconfig/dbreport/ui/pagedialog.ui:127
 msgctxt "pagedialog|background"
 msgid "Background"
 msgstr "Cefndir"
 
-#: pagenumberdialog.ui:8
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:8
 msgctxt "pagenumberdialog|PageNumberDialog"
 msgid "Page Numbers"
 msgstr "Rhif Tudalennau"
 
-#: pagenumberdialog.ui:98
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:98
 msgctxt "pagenumberdialog|pagen"
 msgid "_Page N"
 msgstr "_Tudalen N"
 
-#: pagenumberdialog.ui:116
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:116
 msgctxt "pagenumberdialog|pagenofm"
 msgid "Page _N of M"
 msgstr "Tudalen _N o M"
 
-#: pagenumberdialog.ui:140
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:140
 msgctxt "pagenumberdialog|label1"
 msgid "Format"
 msgstr "Fformat"
 
-#: pagenumberdialog.ui:177
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:177
 msgctxt "pagenumberdialog|toppage"
 msgid "_Top of Page (Header)"
 msgstr "_Brig y Dudalen (Pennyn)"
 
-#: pagenumberdialog.ui:195
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:195
 msgctxt "pagenumberdialog|bottompage"
 msgid "_Bottom of Page (Footer)"
 msgstr "_Gwaelod y Dudalen (Troedyn)"
 
-#: pagenumberdialog.ui:219
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:219
 msgctxt "pagenumberdialog|label2"
 msgid "Position"
 msgstr "Safle"
 
-#: pagenumberdialog.ui:262
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:262
 msgctxt "pagenumberdialog|alignment"
 msgid "Left"
 msgstr "Chwith"
 
-#: pagenumberdialog.ui:263
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:263
 msgctxt "pagenumberdialog|alignment"
 msgid "Center"
 msgstr "Canol"
 
-#: pagenumberdialog.ui:264
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:264
 msgctxt "pagenumberdialog|alignment"
 msgid "Right"
 msgstr "De"
 
-#: pagenumberdialog.ui:277
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:277
 msgctxt "pagenumberdialog|alignment_label"
 msgid "_Alignment:"
 msgstr "_Ainiad:"
 
-#: pagenumberdialog.ui:288
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:288
 msgctxt "pagenumberdialog|shownumberonfirstpage"
 msgid "Show Number on First Page"
 msgstr "Dangos y Rhif ar y Dudalen Gyntaf"
 
-#: pagenumberdialog.ui:309
+#: reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui:310
 msgctxt "pagenumberdialog|label3"
 msgid "General"
 msgstr "Cyffredinol"
diff --git a/source/cy/sc/messages.po b/source/cy/sc/messages.po
index 441b9fec404..1a5f70ac474 100644
--- a/source/cy/sc/messages.po
+++ b/source/cy/sc/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-01-10 11:50+0100\n"
-"PO-Revision-Date: 2018-01-17 12:25+0000\n"
+"POT-Creation-Date: 2018-04-17 15:53+0200\n"
+"PO-Revision-Date: 2018-04-18 08:39+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,59 +14,59 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1516191903.000000\n"
+"X-POOTLE-MTIME: 1524040748.000000\n"
 
-#: compiler.hrc:27
+#: sc/inc/compiler.hrc:27
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Database"
 msgstr "Cronfa ddata"
 
-#: compiler.hrc:28
+#: sc/inc/compiler.hrc:28
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Date&Time"
 msgstr "Dyddiad ac Amser"
 
-#: compiler.hrc:29
+#: sc/inc/compiler.hrc:29
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Financial"
 msgstr "Cyllid"
 
-#: compiler.hrc:30
+#: sc/inc/compiler.hrc:30
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Information"
 msgstr "Gwybodaeth"
 
-#: compiler.hrc:31
+#: sc/inc/compiler.hrc:31
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Logical"
 msgstr "Rhesymegol"
 
-#: compiler.hrc:32
+#: sc/inc/compiler.hrc:32
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Mathematical"
 msgstr "Mathemategol"
 
-#: compiler.hrc:33
+#: sc/inc/compiler.hrc:33
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Array"
 msgstr "Arae"
 
-#: compiler.hrc:34
+#: sc/inc/compiler.hrc:34
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Statistical"
 msgstr "Ystadegol"
 
-#: compiler.hrc:35
+#: sc/inc/compiler.hrc:35
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Spreadsheet"
 msgstr "Taenlen"
 
-#: compiler.hrc:36
+#: sc/inc/compiler.hrc:36
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Text"
 msgstr "Testun"
 
-#: compiler.hrc:37
+#: sc/inc/compiler.hrc:37
 msgctxt "RID_FUNCTION_CATEGORIES"
 msgid "Add-in"
 msgstr "Ychwanegyn"
@@ -77,457 +77,462 @@ msgstr "Ychwanegyn"
 #. * RID_GLOBSTR and are meant to be accessed via ScGlobal::GetRscString(). All
 #. * other string IDs of strings used in message boxes and elsewhere go into
 #. * sc/inc/strings.hrc
-#: globstr.hrc:34
+#: sc/inc/globstr.hrc:34
 msgctxt "STR_UNDO_INSERTCELLS"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: globstr.hrc:35
+#: sc/inc/globstr.hrc:35
 msgctxt "STR_UNDO_DELETECELLS"
 msgid "Delete"
 msgstr "Dileu"
 
-#: globstr.hrc:36
+#: sc/inc/globstr.hrc:36
 msgctxt "STR_UNDO_CUT"
 msgid "Cut"
 msgstr "Torri"
 
-#: globstr.hrc:37
+#: sc/inc/globstr.hrc:37
 msgctxt "STR_UNDO_PASTE"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: globstr.hrc:38
+#: sc/inc/globstr.hrc:38
 msgctxt "STR_UNDO_DRAGDROP"
 msgid "Drag and Drop"
 msgstr "Llusgo a Gollwng"
 
-#: globstr.hrc:39
+#: sc/inc/globstr.hrc:39
 msgctxt "STR_UNDO_MOVE"
 msgid "Move"
 msgstr "Symud"
 
-#: globstr.hrc:40
+#: sc/inc/globstr.hrc:40
 msgctxt "STR_UNDO_COPY"
 msgid "Copy"
 msgstr "Copïo"
 
-#: globstr.hrc:41
+#: sc/inc/globstr.hrc:41
 msgctxt "STR_UNDO_DELETECONTENTS"
 msgid "Delete"
 msgstr "Dileu"
 
-#: globstr.hrc:42
+#: sc/inc/globstr.hrc:42
 msgctxt "STR_UNDO_SELATTR"
 msgid "Attributes"
 msgstr "Priodoleddau"
 
-#: globstr.hrc:43
+#: sc/inc/globstr.hrc:43
 msgctxt "STR_UNDO_SELATTRLINES"
 msgid "Attributes/Lines"
 msgstr "Priodoleddau/Llinellau"
 
-#: globstr.hrc:44
+#: sc/inc/globstr.hrc:44
 msgctxt "STR_UNDO_COLWIDTH"
 msgid "Column Width"
 msgstr "Lled Colofn"
 
-#: globstr.hrc:45
+#: sc/inc/globstr.hrc:45
 msgctxt "STR_UNDO_OPTCOLWIDTH"
 msgid "Optimal Column Width"
 msgstr "Lled Colofn Gorau"
 
-#: globstr.hrc:46
+#: sc/inc/globstr.hrc:46
 msgctxt "STR_UNDO_ROWHEIGHT"
 msgid "Row height"
 msgstr "Uchder rhes"
 
-#: globstr.hrc:47
+#: sc/inc/globstr.hrc:47
 msgctxt "STR_UNDO_OPTROWHEIGHT"
 msgid "Optimal Row Height"
 msgstr "Uchder Rhes Gorau"
 
-#: globstr.hrc:48
+#: sc/inc/globstr.hrc:48
 msgctxt "STR_UNDO_AUTOFILL"
 msgid "Fill"
 msgstr "Llanw"
 
-#: globstr.hrc:49
+#: sc/inc/globstr.hrc:49
 msgctxt "STR_UNDO_MERGE"
 msgid "Merge"
 msgstr "Cyfuno"
 
-#: globstr.hrc:50
+#: sc/inc/globstr.hrc:50
 msgctxt "STR_UNDO_REMERGE"
 msgid "Split"
 msgstr "Hollti"
 
-#: globstr.hrc:51
+#: sc/inc/globstr.hrc:51
 msgctxt "STR_UNDO_AUTOFORMAT"
 msgid "AutoFormat"
 msgstr "AwtoFformat"
 
-#: globstr.hrc:52
+#: sc/inc/globstr.hrc:52
 msgctxt "STR_UNDO_REPLACE"
 msgid "Replace"
 msgstr "Newid"
 
-#: globstr.hrc:53
+#: sc/inc/globstr.hrc:53
 msgctxt "STR_UNDO_CURSORATTR"
 msgid "Attributes"
 msgstr "Priodoleddau"
 
-#: globstr.hrc:54
+#: sc/inc/globstr.hrc:54
 msgctxt "STR_UNDO_ENTERDATA"
 msgid "Input"
 msgstr "Mewnbwn"
 
-#: globstr.hrc:55
+#: sc/inc/globstr.hrc:55
 msgctxt "STR_UNDO_INSCOLBREAK"
 msgid "Insert Column Break"
 msgstr "Mewnosod Toriad Colofn"
 
-#: globstr.hrc:56
+#: sc/inc/globstr.hrc:56
 msgctxt "STR_UNDO_DELCOLBREAK"
 msgid "Delete column break"
 msgstr "Dileu toriad colofn"
 
-#: globstr.hrc:57
+#: sc/inc/globstr.hrc:57
 msgctxt "STR_UNDO_INSROWBREAK"
 msgid "Insert Row Break"
 msgstr "Mewnosod Toriad Rhes"
 
-#: globstr.hrc:58
+#: sc/inc/globstr.hrc:58
 msgctxt "STR_UNDO_DELROWBREAK"
 msgid "Delete row break"
 msgstr "Dileu toriad rhes"
 
-#: globstr.hrc:59
+#: sc/inc/globstr.hrc:59
 msgctxt "STR_UNDO_DOOUTLINE"
 msgid "View Details"
 msgstr "Golwg Manylion"
 
-#: globstr.hrc:60
+#: sc/inc/globstr.hrc:60
 msgctxt "STR_UNDO_REDOOUTLINE"
 msgid "Hide details"
 msgstr "Cuddio manylion"
 
-#: globstr.hrc:61
+#: sc/inc/globstr.hrc:61
 msgctxt "STR_UNDO_MAKEOUTLINE"
 msgid "Group"
 msgstr "Grŵp"
 
-#: globstr.hrc:62
+#: sc/inc/globstr.hrc:62
 msgctxt "STR_UNDO_REMAKEOUTLINE"
 msgid "Ungroup"
 msgstr "Dad-grwpio"
 
-#: globstr.hrc:63
+#: sc/inc/globstr.hrc:63
 msgctxt "STR_UNDO_OUTLINELEVEL"
 msgid "Select outline level"
 msgstr "Dewis lefel amlinell"
 
-#: globstr.hrc:64
+#: sc/inc/globstr.hrc:64
 msgctxt "STR_UNDO_DOOUTLINEBLK"
 msgid "View Details"
 msgstr "Golwg Manylion"
 
-#: globstr.hrc:65
+#: sc/inc/globstr.hrc:65
 msgctxt "STR_UNDO_REDOOUTLINEBLK"
 msgid "Hide details"
 msgstr "Cuddio manylion"
 
-#: globstr.hrc:66
+#: sc/inc/globstr.hrc:66
 msgctxt "STR_UNDO_REMOVEALLOTLNS"
 msgid "Clear Outline"
 msgstr "Clirio'r Amlinell"
 
-#: globstr.hrc:67
+#: sc/inc/globstr.hrc:67
 msgctxt "STR_UNDO_AUTOOUTLINE"
 msgid "AutoOutline"
 msgstr "AwtoAmlinelliad"
 
-#: globstr.hrc:68
+#: sc/inc/globstr.hrc:68
 msgctxt "STR_UNDO_SUBTOTALS"
 msgid "Subtotals"
 msgstr "Is gyfansymiau"
 
-#: globstr.hrc:69
+#: sc/inc/globstr.hrc:69
 msgctxt "STR_UNDO_SORT"
 msgid "Sort"
 msgstr "Trefnu"
 
-#: globstr.hrc:70
+#: sc/inc/globstr.hrc:70
 msgctxt "STR_UNDO_QUERY"
 msgid "Filter"
 msgstr "Hidl"
 
-#: globstr.hrc:71
+#: sc/inc/globstr.hrc:71
 msgctxt "STR_UNDO_DBDATA"
 msgid "Change Database Range"
 msgstr "Newid Ystod Cronfa Ddata"
 
-#: globstr.hrc:72
+#: sc/inc/globstr.hrc:72
 msgctxt "STR_UNDO_IMPORTDATA"
 msgid "Importing"
 msgstr "Mewnforio"
 
-#: globstr.hrc:73
+#: sc/inc/globstr.hrc:73
 msgctxt "STR_UNDO_REPEATDB"
 msgid "Refresh range"
 msgstr "Adnewyddu ystod"
 
-#: globstr.hrc:74
+#: sc/inc/globstr.hrc:74
 msgctxt "STR_UNDO_LISTNAMES"
 msgid "List names"
 msgstr "Rhestru enwau"
 
-#: globstr.hrc:75
+#: sc/inc/globstr.hrc:75
 msgctxt "STR_UNDO_PIVOT_NEW"
 msgid "Create pivot table"
 msgstr "Creu tabl colynnu"
 
-#: globstr.hrc:76
+#: sc/inc/globstr.hrc:76
 msgctxt "STR_UNDO_PIVOT_MODIFY"
 msgid "Edit pivot table"
 msgstr "Golygu tabl colynnu"
 
-#: globstr.hrc:77
+#: sc/inc/globstr.hrc:77
 msgctxt "STR_UNDO_PIVOT_DELETE"
 msgid "Delete pivot table"
 msgstr "Dileu tabl colynnu"
 
-#: globstr.hrc:78
+#: sc/inc/globstr.hrc:78
 msgctxt "STR_UNDO_CONSOLIDATE"
 msgid "Consolidate"
 msgstr "Cyfnerthu"
 
-#: globstr.hrc:79
+#: sc/inc/globstr.hrc:79
 msgctxt "STR_UNDO_USESCENARIO"
 msgid "Use scenario"
 msgstr "Defnyddio senario"
 
-#: globstr.hrc:80
+#: sc/inc/globstr.hrc:80
 msgctxt "STR_UNDO_MAKESCENARIO"
 msgid "Create scenario"
 msgstr "Creu senario"
 
-#: globstr.hrc:81
+#: sc/inc/globstr.hrc:81
 msgctxt "STR_UNDO_EDITSCENARIO"
 msgid "Edit scenario"
 msgstr "Golygu senario"
 
-#: globstr.hrc:82
+#: sc/inc/globstr.hrc:82
 msgctxt "STR_UNDO_APPLYCELLSTYLE"
 msgid "Apply Cell Style"
 msgstr "Gosod Arddull Cell"
 
-#: globstr.hrc:83
+#: sc/inc/globstr.hrc:83
 msgctxt "STR_UNDO_EDITCELLSTYLE"
 msgid "Edit Cell Style"
 msgstr "Golygu Arddull Cell"
 
-#: globstr.hrc:84
+#: sc/inc/globstr.hrc:84
 msgctxt "STR_UNDO_APPLYPAGESTYLE"
 msgid "Apply Page Style"
 msgstr "Gosod Arddull Tudalen"
 
-#: globstr.hrc:85
+#: sc/inc/globstr.hrc:85
 msgctxt "STR_UNDO_EDITPAGESTYLE"
 msgid "Edit Page Style"
 msgstr "Golygu Arddull Tudalen"
 
-#: globstr.hrc:86
+#: sc/inc/globstr.hrc:86
 msgctxt "STR_UNDO_DETADDPRED"
 msgid "Trace Precedents"
 msgstr "Cynsail Olin"
 
-#: globstr.hrc:87
+#: sc/inc/globstr.hrc:87
 msgctxt "STR_UNDO_DETDELPRED"
 msgid "Remove Precedent"
 msgstr "Tynnu Blaenoriaeth"
 
-#: globstr.hrc:88
+#: sc/inc/globstr.hrc:88
 msgctxt "STR_UNDO_DETADDSUCC"
 msgid "Trace Dependents"
 msgstr "Dibyniaethau Olin"
 
-#: globstr.hrc:89
+#: sc/inc/globstr.hrc:89
 msgctxt "STR_UNDO_DETDELSUCC"
 msgid "Remove Dependent"
 msgstr "Tynnu Dibynnol"
 
-#: globstr.hrc:90
+#: sc/inc/globstr.hrc:90
 msgctxt "STR_UNDO_DETADDERROR"
 msgid "Trace Error"
 msgstr "Gwall Olin"
 
-#: globstr.hrc:91
+#: sc/inc/globstr.hrc:91
 msgctxt "STR_UNDO_DETDELALL"
 msgid "Remove all Traces"
 msgstr "Tynnu pob Olin"
 
-#: globstr.hrc:92
+#: sc/inc/globstr.hrc:92
 msgctxt "STR_UNDO_DETINVALID"
 msgid "Mark invalid data"
 msgstr "Marcio data annilys"
 
-#: globstr.hrc:93
+#: sc/inc/globstr.hrc:93
 msgctxt "STR_UNDO_DETREFRESH"
 msgid "Refresh Traces"
 msgstr "Adnewyddu Olin"
 
-#: globstr.hrc:94
+#: sc/inc/globstr.hrc:94
 msgctxt "STR_UNDO_CHARTDATA"
 msgid "Modify chart data range"
 msgstr "Newid data ystod siart"
 
-#: globstr.hrc:95
+#: sc/inc/globstr.hrc:95
 msgctxt "STR_UNDO_ORIGINALSIZE"
 msgid "Original Size"
 msgstr "Maint Gwreiddiol"
 
-#: globstr.hrc:96
+#: sc/inc/globstr.hrc:96
+msgctxt "STR_UNDO_FITCELLSIZE"
+msgid "Fit to Cell Size"
+msgstr "Ffitio i Faint Cell"
+
+#: sc/inc/globstr.hrc:97
 msgctxt "STR_UNDO_UPDATELINK"
 msgid "Update Link"
 msgstr "Diweddaru Cysylltiad"
 
-#: globstr.hrc:97
+#: sc/inc/globstr.hrc:98
 msgctxt "STR_UNDO_REMOVELINK"
 msgid "Unlink"
 msgstr "Datgysylltu"
 
-#: globstr.hrc:98
+#: sc/inc/globstr.hrc:99
 msgctxt "STR_UNDO_INSERTAREALINK"
 msgid "Insert Link"
 msgstr "Mewnosod Cysylltiad"
 
-#: globstr.hrc:99
+#: sc/inc/globstr.hrc:100
 msgctxt "STR_UNDO_ENTERMATRIX"
 msgid "Insert Array Formula"
 msgstr "Mewnosod Fformiwla Arae"
 
-#: globstr.hrc:100
+#: sc/inc/globstr.hrc:101
 msgctxt "STR_UNDO_INSERTNOTE"
 msgid "Insert Comment"
 msgstr "Mewnosod Sylw"
 
-#: globstr.hrc:101
+#: sc/inc/globstr.hrc:102
 msgctxt "STR_UNDO_DELETENOTE"
 msgid "Delete Comment"
 msgstr "Dileu Sylw"
 
-#: globstr.hrc:102
+#: sc/inc/globstr.hrc:103
 msgctxt "STR_UNDO_SHOWNOTE"
 msgid "Show Comment"
 msgstr "Dangos Nodyn"
 
-#: globstr.hrc:103
+#: sc/inc/globstr.hrc:104
 msgctxt "STR_UNDO_HIDENOTE"
 msgid "Hide Comment"
 msgstr "Cuddio Nodyn"
 
-#: globstr.hrc:104
+#: sc/inc/globstr.hrc:105
 msgctxt "STR_UNDO_SHOWALLNOTES"
 msgid "Show All Comments"
 msgstr "Dangos Pob Sylw"
 
-#: globstr.hrc:105
+#: sc/inc/globstr.hrc:106
 msgctxt "STR_UNDO_HIDEALLNOTES"
 msgid "Hide All Comments"
 msgstr "Cuddio Pob Sylw"
 
-#: globstr.hrc:106
+#: sc/inc/globstr.hrc:107
 msgctxt "STR_UNDO_EDITNOTE"
 msgid "Edit Comment"
 msgstr "Golygu Nodyn"
 
-#: globstr.hrc:107
+#: sc/inc/globstr.hrc:108
 msgctxt "STR_UNDO_DEC_INDENT"
 msgid "Decrease Indent"
 msgstr "Lleihau Mewnoliad"
 
-#: globstr.hrc:108
+#: sc/inc/globstr.hrc:109
 msgctxt "STR_UNDO_INC_INDENT"
 msgid "Increase Indent"
 msgstr "Cynyddu Mewnoliad"
 
-#: globstr.hrc:109
+#: sc/inc/globstr.hrc:110
 msgctxt "STR_UNDO_PROTECT_TAB"
 msgid "Protect sheet"
 msgstr "Diogelu dalen"
 
-#: globstr.hrc:110
+#: sc/inc/globstr.hrc:111
 msgctxt "STR_UNDO_UNPROTECT_TAB"
 msgid "Unprotect sheet"
 msgstr "Dad-ddiogelu'r ddalen"
 
-#: globstr.hrc:111
+#: sc/inc/globstr.hrc:112
 msgctxt "STR_UNDO_PROTECT_DOC"
 msgid "Protect document"
 msgstr "Diogelu dogfen"
 
-#: globstr.hrc:112
+#: sc/inc/globstr.hrc:113
 msgctxt "STR_UNDO_UNPROTECT_DOC"
 msgid "Unprotect document"
 msgstr "Dad-diogelu dogfen"
 
-#: globstr.hrc:113
+#: sc/inc/globstr.hrc:114
 msgctxt "STR_UNDO_PRINTRANGES"
 msgid "Print range"
 msgstr "Ystod argraffu"
 
-#: globstr.hrc:114
+#: sc/inc/globstr.hrc:115
 msgctxt "STR_UNDO_REMOVEBREAKS"
 msgid "Delete Page Breaks"
 msgstr "Dileu Toriadau Tudalen"
 
-#: globstr.hrc:115
+#: sc/inc/globstr.hrc:116
 msgctxt "STR_UNDO_PRINTSCALE"
 msgid "Change Scale"
 msgstr "Newid Graddfa"
 
-#: globstr.hrc:116
+#: sc/inc/globstr.hrc:117
 msgctxt "STR_UNDO_DRAG_BREAK"
 msgid "Move Page Break"
 msgstr "Symud Toriad Tudalen"
 
-#: globstr.hrc:117
+#: sc/inc/globstr.hrc:118
 msgctxt "STR_UNDO_RANGENAMES"
 msgid "Edit range names"
 msgstr "Golygu enwau ystodau"
 
-#: globstr.hrc:118
+#: sc/inc/globstr.hrc:119
 msgctxt "STR_UNDO_TRANSLITERATE"
 msgid "Change Case"
 msgstr "Newid Maint"
 
-#: globstr.hrc:119
+#: sc/inc/globstr.hrc:120
 msgctxt "STR_DBNAME_IMPORT"
 msgid "Import"
 msgstr "Mewnforio"
 
-#: globstr.hrc:120
+#: sc/inc/globstr.hrc:121
 msgctxt "STR_MSSG_DOSUBTOTALS_0"
 msgid "%PRODUCTNAME Calc"
 msgstr "Calc %PRODUCTNAME"
 
-#: globstr.hrc:121
+#: sc/inc/globstr.hrc:122
 msgctxt "STR_MSSG_DOSUBTOTALS_1"
 msgid "Delete data?"
 msgstr "Dileu data?"
 
-#: globstr.hrc:122
+#: sc/inc/globstr.hrc:123
 msgctxt "STR_MSSG_DOSUBTOTALS_2"
 msgid "Unable to insert rows"
 msgstr "Methu mewnosod rhesi"
 
-#: globstr.hrc:123
+#: sc/inc/globstr.hrc:124
 msgctxt "STR_MSSG_REPEATDB_0"
 msgid "No operations to execute"
 msgstr "Dim gweithredoedd i'w gweithredu"
 
-#: globstr.hrc:124
+#: sc/inc/globstr.hrc:125
 msgctxt "STR_MSSG_MAKEAUTOFILTER_0"
 msgid ""
 "The range does not contain column headers.\n"
@@ -536,62 +541,62 @@ msgstr ""
 "Nid yw'r ystod yn cynnwys penawdau colofnau.\n"
 "Hoffech chi i'r llinell gyntaf gael ei ddefnyddio fel pennyn colofn?"
 
-#: globstr.hrc:125
+#: sc/inc/globstr.hrc:126
 msgctxt "STR_MSSG_IMPORTDATA_0"
 msgid "Error while importing data!"
 msgstr "Gwall wrth fewnforio data!"
 
-#: globstr.hrc:126
+#: sc/inc/globstr.hrc:127
 msgctxt "STR_PROGRESS_IMPORT"
 msgid "# records imported..."
 msgstr "# cofnod wedi eu mewnforio..."
 
-#: globstr.hrc:127
+#: sc/inc/globstr.hrc:128
 msgctxt "STR_MSSG_MAKEOUTLINE_0"
 msgid "Grouping not possible"
 msgstr "Grwpio'n amhosibl"
 
-#: globstr.hrc:128
+#: sc/inc/globstr.hrc:129
 msgctxt "STR_MSSG_REMOVEOUTLINE_0"
 msgid "Ungrouping not possible"
 msgstr "Dadgrwpio'n amhosibl"
 
-#: globstr.hrc:129
+#: sc/inc/globstr.hrc:130
 msgctxt "STR_MSSG_PASTEFROMCLIP_0"
 msgid "Insert into multiple selection not possible"
 msgstr "Mewnosod i amladran yn amhosibl"
 
-#: globstr.hrc:130
+#: sc/inc/globstr.hrc:131
 msgctxt "STR_MSSG_MOVEBLOCKTO_0"
 msgid "Cell merge not possible if cells already merged!"
 msgstr "Cyfuno celloedd yn amhosibl os yw'r celloedd wedi cyfuno eisoes!"
 
-#: globstr.hrc:131
+#: sc/inc/globstr.hrc:132
 msgctxt "STR_MSSG_INSERTCELLS_0"
 msgid "Inserting into merged ranges not possible"
 msgstr "Mewnosod i ystod unedig yn amhosibl"
 
-#: globstr.hrc:132
+#: sc/inc/globstr.hrc:133
 msgctxt "STR_MSSG_DELETECELLS_0"
 msgid "Deleting in merged ranges not possible"
 msgstr "Dileu mewn ystod unedig yn amhosibl"
 
-#: globstr.hrc:133
+#: sc/inc/globstr.hrc:134
 msgctxt "STR_MSSG_MERGECELLS_0"
 msgid "Cell merge not possible if cells already merged"
 msgstr "Cyfuno celloedd yn amhosibl os yw'r celloedd wedi cyfuno eisoes"
 
-#: globstr.hrc:134
+#: sc/inc/globstr.hrc:135
 msgctxt "STR_SORT_ERR_MERGED"
 msgid "Ranges containing merged cells can only be sorted without formats."
 msgstr "Ystodau'n cynnwys celloedd unedig i'w trefnu'n ddifformat."
 
-#: globstr.hrc:135
+#: sc/inc/globstr.hrc:136
 msgctxt "STR_MSSG_SOLVE_0"
 msgid "Goal Seek succeeded. Result: "
 msgstr "Llwyddodd Goal Seek. Canlyniad: "
 
-#: globstr.hrc:136
+#: sc/inc/globstr.hrc:137
 msgctxt "STR_MSSG_SOLVE_1"
 msgid ""
 "\n"
@@ -602,7 +607,7 @@ msgstr ""
 "\n"
 "Mewnosod canlyniad i'r cell newidiol?"
 
-#: globstr.hrc:137
+#: sc/inc/globstr.hrc:138
 msgctxt "STR_MSSG_SOLVE_2"
 msgid ""
 "Goal Seek failed.\n"
@@ -611,77 +616,77 @@ msgstr ""
 "Methodd Goal Seek.\n"
 "\n"
 
-#: globstr.hrc:138
+#: sc/inc/globstr.hrc:139
 msgctxt "STR_MSSG_SOLVE_3"
 msgid "Insert the closest value ("
 msgstr "Mewnosod y gwerth agosaf ("
 
-#: globstr.hrc:139
+#: sc/inc/globstr.hrc:140
 msgctxt "STR_MSSG_SOLVE_4"
 msgid ") into the variable cell anyway?"
 msgstr ") i'r cell newidiol beth bynnag?"
 
-#: globstr.hrc:140
+#: sc/inc/globstr.hrc:141
 msgctxt "STR_TABLE_GRAND"
 msgid "Grand"
 msgstr "Mawr"
 
-#: globstr.hrc:141
+#: sc/inc/globstr.hrc:142
 msgctxt "STR_TABLE_ERGEBNIS"
 msgid "Result"
 msgstr "Canlyniad"
 
-#: globstr.hrc:142
+#: sc/inc/globstr.hrc:143
 msgctxt "STR_UNDO_SPELLING"
 msgid "Spellcheck"
 msgstr "Gwirio Sillafu"
 
-#: globstr.hrc:143
+#: sc/inc/globstr.hrc:144
 msgctxt "STR_TABLE_UND"
 msgid "AND"
 msgstr "AND"
 
-#: globstr.hrc:144
+#: sc/inc/globstr.hrc:145
 msgctxt "STR_TABLE_ODER"
 msgid "OR"
 msgstr "OR"
 
-#: globstr.hrc:145
+#: sc/inc/globstr.hrc:146
 msgctxt "STR_TABLE_DEF"
 msgid "Sheet"
 msgstr "Dalen"
 
-#: globstr.hrc:146
+#: sc/inc/globstr.hrc:147
 msgctxt "STR_MOVE_TO_END"
 msgid "- move to end position -"
 msgstr "- symud i'r safle terfynol -"
 
-#: globstr.hrc:147
+#: sc/inc/globstr.hrc:148
 msgctxt "STR_NO_REF_TABLE"
 msgid "#REF!"
 msgstr "#REF!"
 
-#: globstr.hrc:148
+#: sc/inc/globstr.hrc:149
 msgctxt "STR_PIVOT_NODATA"
 msgid "The pivot table must contain at least one entry."
 msgstr "Rhaid i dabl colynnu gynnwys o leiaf un cofnod."
 
-#: globstr.hrc:149
+#: sc/inc/globstr.hrc:150
 msgctxt "STR_PIVOT_MOVENOTALLOWED"
 msgid "The data range can not be deleted."
 msgstr "Methu dileu'r ystod data."
 
-#: globstr.hrc:150
+#: sc/inc/globstr.hrc:151
 msgctxt "STR_PIVOT_ERROR"
 msgid "Error creating the pivot table."
 msgstr "Gwall wrth greu tabl colynnu."
 
-#: globstr.hrc:151
+#: sc/inc/globstr.hrc:152
 msgctxt "STR_PIVOT_NOTEMPTY"
 msgid "The destination range is not empty. Overwrite existing contents?"
 msgstr "Nid yw'r ystod cyfan yn wag. Trosysgrifo'r cynnwys?"
 
-#: globstr.hrc:152
+#: sc/inc/globstr.hrc:153
 msgctxt "STR_PIVOT_REMOVE_PIVOTCHART"
 msgid ""
 "Deleting the pivot table will also remove any associated pivot charts.\n"
@@ -690,127 +695,127 @@ msgstr ""
 "Bydd dileu'r tabl troi hefyd yn tynnu unrhyw siartiau troi cysylltiedig.\n"
 "Hoffech chi barhau?"
 
-#: globstr.hrc:153
+#: sc/inc/globstr.hrc:154
 msgctxt "STR_DATAPILOT_SUBTOTAL"
 msgid "The source range contains subtotals which may distort the results. Use it anyway?"
 msgstr "Mae ffynhonnell yr ystod yn cynnwys is gyfansymiau fydd efallai'n gwyrdroi'r cyfansymiau. Defnyddio beth bynnag?"
 
-#: globstr.hrc:154
+#: sc/inc/globstr.hrc:155
 msgctxt "STR_PIVOT_TOTAL"
 msgid "Total"
 msgstr "Cyfanswm"
 
-#: globstr.hrc:155
+#: sc/inc/globstr.hrc:156
 msgctxt "STR_PIVOT_DATA"
 msgid "Data"
 msgstr "Data"
 
-#: globstr.hrc:156
+#: sc/inc/globstr.hrc:157
 msgctxt "STR_PIVOT_GROUP"
 msgid "Group"
 msgstr "Grŵp"
 
-#: globstr.hrc:157
+#: sc/inc/globstr.hrc:158
 msgctxt "STR_ROWCOL_SELCOUNT"
 msgid "$1 rows, $2 columns selected"
 msgstr "$1 rhes, $2 colofn wedi eu dewis"
 
-#: globstr.hrc:158
+#: sc/inc/globstr.hrc:159
 msgctxt "STR_FILTER_SELCOUNT"
 msgid "$1 of $2 records found"
 msgstr "$1 o $2 cofnod wedi eu canfod"
 
-#: globstr.hrc:159
+#: sc/inc/globstr.hrc:160
 msgctxt "STR_COLUMN"
 msgid "Column"
 msgstr "Colofn"
 
-#: globstr.hrc:160
+#: sc/inc/globstr.hrc:161
 msgctxt "STR_ROW"
 msgid "Row"
 msgstr "Rhes"
 
-#: globstr.hrc:161
+#: sc/inc/globstr.hrc:162
 msgctxt "STR_PAGE"
 msgid "Page"
 msgstr "Tudalen"
 
-#: globstr.hrc:162
+#: sc/inc/globstr.hrc:163
 msgctxt "STR_PGNUM"
 msgid "Page %1"
 msgstr "Tudalen %1"
 
-#: globstr.hrc:163
+#: sc/inc/globstr.hrc:164
 msgctxt "STR_LOAD_DOC"
 msgid "Load document"
 msgstr "Llwytho dogfen"
 
-#: globstr.hrc:164
+#: sc/inc/globstr.hrc:165
 msgctxt "STR_SAVE_DOC"
 msgid "Save document"
 msgstr "Cadw dogfen"
 
-#: globstr.hrc:165
+#: sc/inc/globstr.hrc:166
 msgctxt "STR_AREA_ALREADY_INSERTED"
 msgid "This range has already been inserted."
 msgstr "Mae'r ystod wedi ei fewnosod eisoes."
 
-#: globstr.hrc:166
+#: sc/inc/globstr.hrc:167
 msgctxt "STR_INVALID_TABREF"
 msgid "Invalid sheet reference."
 msgstr "Cyfeiriad dalen annilys."
 
-#: globstr.hrc:167
+#: sc/inc/globstr.hrc:168
 msgctxt "STR_INVALID_QUERYAREA"
 msgid "This range does not contain a valid query."
 msgstr "Nid yw'r ystod yn cynnwys ymholiad dilys."
 
-#: globstr.hrc:168
+#: sc/inc/globstr.hrc:169
 msgctxt "STR_REIMPORT_EMPTY"
 msgid "This range does not contain imported data."
 msgstr "Nid yw'r ystod yn cynnwys data wedi ei fewnforio."
 
-#: globstr.hrc:169
+#: sc/inc/globstr.hrc:170
 msgctxt "STR_NOMULTISELECT"
 msgid "This function cannot be used with multiple selections."
 msgstr "Methu defnyddio'r swyddogaeth gyda dewisiadau amladran."
 
-#: globstr.hrc:170
+#: sc/inc/globstr.hrc:171
 msgctxt "STR_FILL_SERIES_PROGRESS"
 msgid "Fill Row..."
 msgstr "Llanw Rhes..."
 
-#: globstr.hrc:171
+#: sc/inc/globstr.hrc:172
 msgctxt "STR_UNDO_THESAURUS"
 msgid "Thesaurus"
 msgstr "Thesawrws"
 
-#: globstr.hrc:172
+#: sc/inc/globstr.hrc:173
 msgctxt "STR_FILL_TAB"
 msgid "Fill Sheets"
 msgstr "Dalenni llanw"
 
-#: globstr.hrc:173
+#: sc/inc/globstr.hrc:174
 msgctxt "STR_UPDATE_SCENARIO"
 msgid "Add selected ranges to current scenario?"
 msgstr "Ychwanegu ystodau dewiswyd i'r senario bresennol?"
 
-#: globstr.hrc:174
+#: sc/inc/globstr.hrc:175
 msgctxt "STR_ERR_NEWSCENARIO"
 msgid "The scenario ranges must be selected in order to be able to create a new scenario."
 msgstr "Rhaid dewis ystodau senario er mwyn creu senario newydd."
 
-#: globstr.hrc:175
+#: sc/inc/globstr.hrc:176
 msgctxt "STR_NOAREASELECTED"
 msgid "A range has not been selected."
 msgstr "Nid oes ystod wedi ei ddewis."
 
-#: globstr.hrc:176
+#: sc/inc/globstr.hrc:177
 msgctxt "STR_NEWTABNAMENOTUNIQUE"
 msgid "This name already exists."
 msgstr "Mae'r enw'n bodoli eisoes."
 
-#: globstr.hrc:177
+#: sc/inc/globstr.hrc:178
 msgctxt "STR_INVALIDTABNAME"
 msgid ""
 "Invalid sheet name.\n"
@@ -823,323 +828,293 @@ msgstr ""
 "ac nid yw'n gallu cynnwys y nodau [ ] * ? : / \\ \n"
 "na'r nod ' (collnod) fel y nod cyntaf neu olaf."
 
-#: globstr.hrc:178
+#: sc/inc/globstr.hrc:179
 msgctxt "STR_SCENARIO"
 msgid "Scenario"
 msgstr "Senario"
 
-#: globstr.hrc:179
+#: sc/inc/globstr.hrc:180
 msgctxt "STR_PIVOT_TABLE"
 msgid "Pivot Table"
 msgstr "Tabl Colynnu"
 
 #. Text strings for captions of subtotal functions.
-#: globstr.hrc:181
+#: sc/inc/globstr.hrc:182
 msgctxt "STR_FUN_TEXT_SUM"
 msgid "Sum"
 msgstr "Swm"
 
-#: globstr.hrc:182
+#: sc/inc/globstr.hrc:183
 msgctxt "STR_FUN_TEXT_SELECTION_COUNT"
 msgid "Selection count"
 msgstr "Cyfrif dewis"
 
-#: globstr.hrc:183
+#: sc/inc/globstr.hrc:184
 msgctxt "STR_FUN_TEXT_COUNT"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: globstr.hrc:184
+#: sc/inc/globstr.hrc:185
 msgctxt "STR_FUN_TEXT_COUNT2"
 msgid "CountA"
 msgstr "CyfrifA"
 
-#: globstr.hrc:185
+#: sc/inc/globstr.hrc:186
 msgctxt "STR_FUN_TEXT_AVG"
 msgid "Average"
 msgstr "Cyfartaledd"
 
-#: globstr.hrc:186
+#: sc/inc/globstr.hrc:187
 msgctxt "STR_FUN_TEXT_MEDIAN"
 msgid "Median"
 msgstr "Canolrif"
 
-#: globstr.hrc:187
+#: sc/inc/globstr.hrc:188
 msgctxt "STR_FUN_TEXT_MAX"
 msgid "Max"
 msgstr "Mwyaf"
 
-#: globstr.hrc:188
+#: sc/inc/globstr.hrc:189
 msgctxt "STR_FUN_TEXT_MIN"
 msgid "Min"
 msgstr "Lleiaf"
 
-#: globstr.hrc:189
+#: sc/inc/globstr.hrc:190
 msgctxt "STR_FUN_TEXT_PRODUCT"
 msgid "Product"
 msgstr "Cynnyrch"
 
-#: globstr.hrc:190
+#: sc/inc/globstr.hrc:191
 msgctxt "STR_FUN_TEXT_STDDEV"
 msgid "StDev"
 msgstr "StDev"
 
-#: globstr.hrc:191
+#: sc/inc/globstr.hrc:192
 msgctxt "STR_FUN_TEXT_VAR"
 msgid "Var"
 msgstr "Amr"
 
-#: globstr.hrc:192
+#: sc/inc/globstr.hrc:193
 msgctxt "STR_NOCHARTATCURSOR"
 msgid "No chart found at this position."
 msgstr "Heb ganfod siart yn y safle hwn."
 
-#: globstr.hrc:193
+#: sc/inc/globstr.hrc:194
 msgctxt "STR_PIVOT_NOTFOUND"
 msgid "No pivot table found at this position."
 msgstr "Heb ganfod tabl colynnu yn y safle hwn."
 
-#: globstr.hrc:194
+#: sc/inc/globstr.hrc:195
 msgctxt "STR_EMPTYDATA"
 msgid "(empty)"
 msgstr "(gwag)"
 
-#: globstr.hrc:195
+#: sc/inc/globstr.hrc:196
 msgctxt "STR_PRINT_INVALID_AREA"
 msgid "Invalid print range"
 msgstr "Ystod argraffu annilys"
 
-#: globstr.hrc:196
+#: sc/inc/globstr.hrc:197
 msgctxt "STR_PAGESTYLE"
 msgid "Page Style"
 msgstr "Arddull Tudalen"
 
-#: globstr.hrc:197
+#: sc/inc/globstr.hrc:198
 msgctxt "STR_HEADER"
 msgid "Header"
 msgstr "Pennyn"
 
-#: globstr.hrc:198
+#: sc/inc/globstr.hrc:199
 msgctxt "STR_FOOTER"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: globstr.hrc:199
+#: sc/inc/globstr.hrc:200
 msgctxt "STR_TEXTATTRS"
 msgid "Text Attributes"
 msgstr "Priodoleddau Testun"
 
-#: globstr.hrc:200
-msgctxt "STR_HFCMD_PAGE"
-msgid "PAGE"
-msgstr "PAGE"
-
-#: globstr.hrc:201
-msgctxt "STR_HFCMD_PAGES"
-msgid "PAGES"
-msgstr "PAGES"
-
-#: globstr.hrc:202
-msgctxt "STR_HFCMD_DATE"
-msgid "DATE"
-msgstr "DATE"
-
-#: globstr.hrc:203
-msgctxt "STR_HFCMD_TIME"
-msgid "TIME"
-msgstr "TIME"
-
-#: globstr.hrc:204
-msgctxt "STR_HFCMD_FILE"
-msgid "FILE"
-msgstr "FFEIL"
-
-#: globstr.hrc:205
-msgctxt "STR_HFCMD_TABLE"
-msgid "SHEET"
-msgstr "DALEN"
-
-#: globstr.hrc:206
+#: sc/inc/globstr.hrc:201
 msgctxt "STR_PROTECTIONERR"
 msgid "Protected cells can not be modified."
 msgstr "Methu newid celloedd wedi eu diogelu."
 
-#: globstr.hrc:207
+#: sc/inc/globstr.hrc:202
 msgctxt "STR_READONLYERR"
 msgid "Document opened in read-only mode."
 msgstr "Agor dogfen ym modd darllen yn unig."
 
-#: globstr.hrc:208
+#: sc/inc/globstr.hrc:203
 msgctxt "STR_MATRIXFRAGMENTERR"
 msgid "You cannot change only part of an array."
 msgstr "Methu newid dim ond rhan o'r arae."
 
-#: globstr.hrc:209
+#: sc/inc/globstr.hrc:204
 msgctxt "STR_PAGEHEADER"
 msgid "Header"
 msgstr "Pennyn"
 
-#: globstr.hrc:210
+#: sc/inc/globstr.hrc:205
 msgctxt "STR_PAGEFOOTER"
 msgid "Footer"
 msgstr "Troedyn"
 
 #. BEGIN error constants and error strings.
-#: globstr.hrc:213
+#: sc/inc/globstr.hrc:208
 msgctxt "STR_ERROR_STR"
 msgid "Err:"
 msgstr "Gw:"
 
 #. BEGIN defined ERROR.TYPE() values.
 #. ERROR.TYPE( #DIV/0! ) == 2
-#: globstr.hrc:216
+#: sc/inc/globstr.hrc:211
 msgctxt "STR_LONG_ERR_DIV_ZERO"
 msgid "Error: Division by zero"
 msgstr "Gwall: Rhannu gyda sero"
 
 #. ERROR.TYPE( #VALUE! ) == 3
-#: globstr.hrc:218
+#: sc/inc/globstr.hrc:213
 msgctxt "STR_LONG_ERR_NO_VALUE"
 msgid "Error: Wrong data type"
 msgstr "Gwall: Dim canlyniad"
 
 #. ERROR.TYPE( #REF! ) == 4
-#: globstr.hrc:220
+#: sc/inc/globstr.hrc:215
 msgctxt "STR_LONG_ERR_NO_REF"
 msgid "Error: Not a valid reference"
 msgstr "Gwall: Nid yw'n cyfeiriadaeth ddilys"
 
 #. ERROR.TYPE( #NAME! ) == 5
-#: globstr.hrc:222
+#: sc/inc/globstr.hrc:217
 msgctxt "STR_LONG_ERR_NO_NAME"
 msgid "Error: Invalid name"
 msgstr "Gwall: Enw annilys"
 
 #. ERROR.TYPE( #NUM! ) == 6
-#: globstr.hrc:224
+#: sc/inc/globstr.hrc:219
 msgctxt "STR_LONG_ERR_ILL_FPO"
 msgid "Error: Invalid numeric value"
 msgstr "Gwall: Gweithred pwynt arnofio annilys"
 
 #. ERROR.TYPE( #N/A ) == 7
-#: globstr.hrc:226
+#: sc/inc/globstr.hrc:221
 msgctxt "STR_LONG_ERR_NV"
 msgid "Error: Value not available"
 msgstr "Gwall: Nid yw'r gwerth ar gael"
 
 #. END defined ERROR.TYPE() values.
-#: globstr.hrc:228
+#: sc/inc/globstr.hrc:223
 msgctxt "STR_NO_ADDIN"
 msgid "#ADDIN?"
 msgstr "#ADDIN?"
 
-#: globstr.hrc:229
+#: sc/inc/globstr.hrc:224
 msgctxt "STR_LONG_ERR_NO_ADDIN"
 msgid "Error: Add-in not found"
 msgstr "Gwall: Heb ganfod ategynnau"
 
-#: globstr.hrc:230
+#: sc/inc/globstr.hrc:225
 msgctxt "STR_NO_MACRO"
 msgid "#MACRO?"
 msgstr "#MACRO?"
 
-#: globstr.hrc:231
+#: sc/inc/globstr.hrc:226
 msgctxt "STR_LONG_ERR_NO_MACRO"
 msgid "Error: Macro not found"
 msgstr "Gwall: Heb ganfod macro"
 
-#: globstr.hrc:232
+#: sc/inc/globstr.hrc:227
 msgctxt "STR_LONG_ERR_SYNTAX"
 msgid "Internal syntactical error"
 msgstr "Gwall cystrawennol mewnol"
 
-#: globstr.hrc:233
+#: sc/inc/globstr.hrc:228
 msgctxt "STR_LONG_ERR_ILL_ARG"
 msgid "Error: Invalid argument"
 msgstr "Gwall: Ymresymiad annilys"
 
-#: globstr.hrc:234
+#: sc/inc/globstr.hrc:229
 msgctxt "STR_LONG_ERR_ILL_PAR"
 msgid "Error in parameter list"
 msgstr "Gwall n rhestr paramedr"
 
-#: globstr.hrc:235
+#: sc/inc/globstr.hrc:230
 msgctxt "STR_LONG_ERR_ILL_CHAR"
 msgid "Error: Invalid character"
 msgstr "Gwall: Nod annilys"
 
-#: globstr.hrc:236
+#: sc/inc/globstr.hrc:231
 msgctxt "STR_LONG_ERR_PAIR"
 msgid "Error: in bracketing"
 msgstr "Gwall: mewn bracedi"
 
-#: globstr.hrc:237
+#: sc/inc/globstr.hrc:232
 msgctxt "STR_LONG_ERR_OP_EXP"
 msgid "Error: Operator missing"
 msgstr "Gwall: Gweithredydd coll"
 
-#: globstr.hrc:238
+#: sc/inc/globstr.hrc:233
 msgctxt "STR_LONG_ERR_VAR_EXP"
 msgid "Error: Variable missing"
 msgstr "Gwall: Newidyn coll"
 
-#: globstr.hrc:239
+#: sc/inc/globstr.hrc:234
 msgctxt "STR_LONG_ERR_CODE_OVF"
 msgid "Error: Formula overflow"
 msgstr "Gwall: Gorlif fformiwla"
 
-#: globstr.hrc:240
+#: sc/inc/globstr.hrc:235
 msgctxt "STR_LONG_ERR_STR_OVF"
 msgid "Error: String overflow"
 msgstr "Gwall: Gorlif llinyn"
 
-#: globstr.hrc:241
+#: sc/inc/globstr.hrc:236
 msgctxt "STR_LONG_ERR_STACK_OVF"
 msgid "Error: Internal overflow"
 msgstr "Gwall: Gorlif mewnol"
 
-#: globstr.hrc:242
+#: sc/inc/globstr.hrc:237
 msgctxt "STR_LONG_ERR_MATRIX_SIZE"
 msgid "Error: Array or matrix size"
 msgstr "Gwall: Maint arae neu fatrics"
 
-#: globstr.hrc:243
+#: sc/inc/globstr.hrc:238
 msgctxt "STR_LONG_ERR_CIRC_REF"
 msgid "Error: Circular reference"
 msgstr "Gwall: Cyfeiriadaeth cylchol"
 
-#: globstr.hrc:244
+#: sc/inc/globstr.hrc:239
 msgctxt "STR_LONG_ERR_NO_CONV"
 msgid "Error: Calculation does not converge"
 msgstr "Gwall: Nid yw'r cyfrifo'n cydgyfeirio"
 
 #. END error constants and error strings.
-#: globstr.hrc:247
+#: sc/inc/globstr.hrc:242
 msgctxt "STR_GRIDCOLOR"
 msgid "Grid color"
 msgstr "Lliw'r grid"
 
-#: globstr.hrc:248
+#: sc/inc/globstr.hrc:243
 msgctxt "STR_CELL_FILTER"
 msgid "Filter"
 msgstr "Hidl"
 
-#: globstr.hrc:249
+#: sc/inc/globstr.hrc:244
 msgctxt "STR_TARGETNOTFOUND"
 msgid "The target database range does not exist."
 msgstr "Nid yw'r ystod cronfa ddata targed yn bod."
 
-#: globstr.hrc:250
+#: sc/inc/globstr.hrc:245
 msgctxt "STR_INVALID_EPS"
 msgid "Invalid increment"
 msgstr "Cynyddiad annilys"
 
-#: globstr.hrc:251
+#: sc/inc/globstr.hrc:246
 msgctxt "STR_UNDO_TABOP"
 msgid "Multiple operations"
 msgstr "Gweithrediadau lluosog"
 
-#: globstr.hrc:252
+#: sc/inc/globstr.hrc:247
 msgctxt "STR_INVALID_AFNAME"
 msgid ""
 "You have entered an invalid name.\n"
@@ -1150,42 +1125,42 @@ msgstr ""
 "Methu creu AwtoFformat. \n"
 "Ceisiwch eto gan ddefnyddio enw gwahanol."
 
-#: globstr.hrc:253
+#: sc/inc/globstr.hrc:248
 msgctxt "STR_AREA"
 msgid "Range"
 msgstr "Ystod"
 
-#: globstr.hrc:254
+#: sc/inc/globstr.hrc:249
 msgctxt "STR_YES"
 msgid "Yes"
 msgstr "Iawn"
 
-#: globstr.hrc:255
+#: sc/inc/globstr.hrc:250
 msgctxt "STR_NO"
 msgid "No"
 msgstr "Na"
 
-#: globstr.hrc:256
+#: sc/inc/globstr.hrc:251
 msgctxt "STR_PROTECTION"
 msgid "Protection"
 msgstr "Diogelwch"
 
-#: globstr.hrc:257
+#: sc/inc/globstr.hrc:252
 msgctxt "STR_FORMULAS"
 msgid "Formulas"
 msgstr "Fformiwlâu"
 
-#: globstr.hrc:258
+#: sc/inc/globstr.hrc:253
 msgctxt "STR_HIDE"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: globstr.hrc:259
+#: sc/inc/globstr.hrc:254
 msgctxt "STR_PRINT"
 msgid "Print"
 msgstr "Argraffu"
 
-#: globstr.hrc:260
+#: sc/inc/globstr.hrc:255
 msgctxt "STR_INVALID_AFAREA"
 msgid ""
 "To apply an AutoFormat,\n"
@@ -1196,102 +1171,102 @@ msgstr ""
 "rhaid dewis ystod\n"
 "tabl o leiaf 3x3 cell."
 
-#: globstr.hrc:261
+#: sc/inc/globstr.hrc:256
 msgctxt "STR_OPTIONAL"
 msgid "(optional)"
 msgstr "(dewisol)"
 
-#: globstr.hrc:262
+#: sc/inc/globstr.hrc:257
 msgctxt "STR_REQUIRED"
 msgid "(required)"
 msgstr "(angenrheidiol)"
 
-#: globstr.hrc:263
+#: sc/inc/globstr.hrc:258
 msgctxt "STR_NOTES"
 msgid "Comments"
 msgstr "Nodiadau"
 
-#: globstr.hrc:264
+#: sc/inc/globstr.hrc:259
 msgctxt "STR_QUERY_DELTAB"
 msgid "Are you sure you want to delete the selected sheet(s)?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r dalen(nau) hyn?"
 
-#: globstr.hrc:265
+#: sc/inc/globstr.hrc:260
 msgctxt "STR_QUERY_DELSCENARIO"
 msgid "Are you sure you want to delete the selected scenario?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r senarios hyn?"
 
-#: globstr.hrc:266
+#: sc/inc/globstr.hrc:261
 msgctxt "STR_EXPORT_ASCII"
 msgid "Export Text File"
 msgstr "Allforio Ffeil Testun"
 
-#: globstr.hrc:267
+#: sc/inc/globstr.hrc:262
 msgctxt "STR_IMPORT_LOTUS"
 msgid "Import Lotus files"
 msgstr "Mewnforio ffeiliau Lotus"
 
-#: globstr.hrc:268
+#: sc/inc/globstr.hrc:263
 msgctxt "STR_IMPORT_DBF"
 msgid "Import DBase files"
 msgstr "Mewnforio ffeiliau DBase"
 
-#: globstr.hrc:269
+#: sc/inc/globstr.hrc:264
 msgctxt "STR_EXPORT_DBF"
 msgid "DBase export"
 msgstr "Allforio i DBase"
 
-#: globstr.hrc:270
+#: sc/inc/globstr.hrc:265
 msgctxt "STR_EXPORT_DIF"
 msgid "Dif Export"
 msgstr "Allforio dif"
 
-#: globstr.hrc:271
+#: sc/inc/globstr.hrc:266
 msgctxt "STR_IMPORT_DIF"
 msgid "Dif Import"
 msgstr "Mewnforion dif"
 
-#: globstr.hrc:272
+#: sc/inc/globstr.hrc:267
 msgctxt "STR_STYLENAME_STANDARD"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: globstr.hrc:273
+#: sc/inc/globstr.hrc:268
 msgctxt "STR_STYLENAME_RESULT"
 msgid "Result"
 msgstr "Canlyniad"
 
-#: globstr.hrc:274
+#: sc/inc/globstr.hrc:269
 msgctxt "STR_STYLENAME_RESULT1"
 msgid "Result2"
 msgstr "Canlyniad2"
 
-#: globstr.hrc:275
+#: sc/inc/globstr.hrc:270
 msgctxt "STR_STYLENAME_HEADLINE"
 msgid "Heading"
 msgstr "Pennawd"
 
-#: globstr.hrc:276
+#: sc/inc/globstr.hrc:271
 msgctxt "STR_STYLENAME_HEADLINE1"
 msgid "Heading1"
 msgstr "Pennawd1"
 
-#: globstr.hrc:277
+#: sc/inc/globstr.hrc:272
 msgctxt "STR_STYLENAME_REPORT"
 msgid "Report"
 msgstr "Adroddiad"
 
-#: globstr.hrc:278
+#: sc/inc/globstr.hrc:273
 msgctxt "STR_THESAURUS_NO_STRING"
 msgid "Thesaurus can only be used in text cells!"
 msgstr "Dim ond mewn celloedd testun mae modd defnyddio'r thesawrws!"
 
-#: globstr.hrc:279
+#: sc/inc/globstr.hrc:274
 msgctxt "STR_SPELLING_BEGIN_TAB"
 msgid "Should the spellcheck be continued at the beginning of the current sheet?"
 msgstr "Parhau'r gwirio sillafu ar ddechrau'r ddalen bresennol?"
 
-#: globstr.hrc:280
+#: sc/inc/globstr.hrc:275
 msgctxt "STR_SPELLING_NO_LANG"
 msgid ""
 "is not available for the thesaurus.\n"
@@ -1302,276 +1277,272 @@ msgstr ""
 "Gwiriwch eich gosodiad a gosod yr iaith\n"
 "angenrheidiol"
 
-#: globstr.hrc:281
+#: sc/inc/globstr.hrc:276
 msgctxt "STR_SPELLING_STOP_OK"
 msgid "The spellcheck of this sheet has been completed."
 msgstr "Wedi cwblhau gwirio sillafu ar y ddalen hon."
 
-#: globstr.hrc:282
+#: sc/inc/globstr.hrc:277
 msgctxt "STR_UNDO_INSERT_TAB"
 msgid "Insert Sheet"
 msgstr "Mewnosod Dalen"
 
-#: globstr.hrc:283
+#: sc/inc/globstr.hrc:278
 msgctxt "STR_UNDO_DELETE_TAB"
 msgid "Delete Sheets"
 msgstr "Dileu Dalen"
 
-#: globstr.hrc:284
+#: sc/inc/globstr.hrc:279
 msgctxt "STR_UNDO_RENAME_TAB"
 msgid "Rename Sheet"
 msgstr "Ail-enwi Dalen"
 
-#: globstr.hrc:285
+#: sc/inc/globstr.hrc:280
 msgctxt "STR_UNDO_SET_TAB_BG_COLOR"
 msgid "Color Tab"
 msgstr "Tab Lliw"
 
-#: globstr.hrc:286
+#: sc/inc/globstr.hrc:281
 msgctxt "STR_UNDO_SET_MULTI_TAB_BG_COLOR"
 msgid "Color Tabs"
 msgstr "Tabiau Lliw"
 
-#: globstr.hrc:287
+#: sc/inc/globstr.hrc:282
 msgctxt "STR_UNDO_MOVE_TAB"
 msgid "Move Sheets"
 msgstr "Symud Dalennau"
 
-#: globstr.hrc:288
+#: sc/inc/globstr.hrc:283
 msgctxt "STR_UNDO_COPY_TAB"
 msgid "Copy Sheet"
 msgstr "Copïo Dalen"
 
-#: globstr.hrc:289
+#: sc/inc/globstr.hrc:284
 msgctxt "STR_UNDO_APPEND_TAB"
 msgid "Append sheet"
 msgstr "Atodi dalen"
 
-#: globstr.hrc:290
+#: sc/inc/globstr.hrc:285
 msgctxt "STR_UNDO_SHOWTAB"
 msgid "Show Sheet"
 msgstr "Dangos Dalen"
 
-#: globstr.hrc:291
+#: sc/inc/globstr.hrc:286
 msgctxt "STR_UNDO_SHOWTABS"
 msgid "Show Sheets"
 msgstr "Dangos Dalenni"
 
-#: globstr.hrc:292
+#: sc/inc/globstr.hrc:287
 msgctxt "STR_UNDO_HIDETAB"
 msgid "Hide sheet"
 msgstr "Cuddio dalen"
 
-#: globstr.hrc:293
+#: sc/inc/globstr.hrc:288
 msgctxt "STR_UNDO_HIDETABS"
 msgid "Hide sheets"
 msgstr "Cuddio Dalenni"
 
-#: globstr.hrc:294
+#: sc/inc/globstr.hrc:289
 msgctxt "STR_UNDO_TAB_RTL"
 msgid "Flip sheet"
 msgstr "Gwrthdroi'r ddalen"
 
-#: globstr.hrc:295
+#: sc/inc/globstr.hrc:290
 msgctxt "STR_ABSREFLOST"
 msgid "The new table contains absolute references to other tables which may be incorrect!"
 msgstr "Mae'r tabl newydd yn cynnwys cyfeiriadau absoliwt i dablau eraill sydd efallai'n anghywir!"
 
-#: globstr.hrc:296
+#: sc/inc/globstr.hrc:291
 msgctxt "STR_NAMECONFLICT"
 msgid "Due to identical names, an existing range name in the destination document has been altered!"
 msgstr "Gan fod yr enw yr un fath, mae enw ystod arall yn y ddogfen targed wedi ei newid!"
 
-#: globstr.hrc:297
+#: sc/inc/globstr.hrc:292
 msgctxt "STR_ERR_AUTOFILTER"
 msgid "AutoFilter not possible"
 msgstr "AwtoHidl yn amhosibl"
 
-#: globstr.hrc:298
+#: sc/inc/globstr.hrc:293
 msgctxt "STR_CREATENAME_REPLACE"
 msgid "Replace existing definition of #?"
 msgstr "Newid diffiniad presennol o #?"
 
-#: globstr.hrc:299
+#: sc/inc/globstr.hrc:294
 msgctxt "STR_CREATENAME_MARKERR"
 msgid "Invalid selection for range names"
 msgstr "Dewis annilys fel enwau ystodau"
 
-#: globstr.hrc:300
+#: sc/inc/globstr.hrc:295
 msgctxt "STR_CONSOLIDATE_ERR1"
 msgid "References can not be inserted above the source data."
 msgstr "Methu mewnosod cyfeirnodau uwchlaw ffynhonnell data."
 
-#: globstr.hrc:301
+#: sc/inc/globstr.hrc:296
 msgctxt "STR_SCENARIO_NOTFOUND"
 msgid "Scenario not found"
 msgstr "Heb ganfod senario"
 
-#: globstr.hrc:302
+#: sc/inc/globstr.hrc:297
 msgctxt "STR_QUERY_DELENTRY"
 msgid "Do you really want to delete the entry #?"
 msgstr "Ydych chi wir eisiau dileu cofnod #?"
 
-#: globstr.hrc:303
+#: sc/inc/globstr.hrc:298
 msgctxt "STR_VOBJ_OBJECT"
 msgid "Objects/Images"
 msgstr "Gwrthrychau/Delweddau"
 
-#: globstr.hrc:304
+#: sc/inc/globstr.hrc:299
 msgctxt "STR_VOBJ_CHART"
 msgid "Charts"
 msgstr "Siartiau"
 
-#: globstr.hrc:305
+#: sc/inc/globstr.hrc:300
 msgctxt "STR_VOBJ_DRAWINGS"
 msgid "Drawing Objects"
 msgstr "Gwrthrychau Lluniadu"
 
-#: globstr.hrc:306
+#: sc/inc/globstr.hrc:301
 msgctxt "STR_VOBJ_MODE_SHOW"
 msgid "Show"
 msgstr "Dangos"
 
-#: globstr.hrc:307
+#: sc/inc/globstr.hrc:302
 msgctxt "STR_VOBJ_MODE_HIDE"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: globstr.hrc:308
+#: sc/inc/globstr.hrc:303
 msgctxt "STR_SCATTR_PAGE_TOPDOWN"
 msgid "Top to bottom"
 msgstr "Brig i'r gwaelod"
 
-#: globstr.hrc:309
+#: sc/inc/globstr.hrc:304
 msgctxt "STR_SCATTR_PAGE_LEFTRIGHT"
 msgid "Left-to-right"
 msgstr "Chwith i dde"
 
-#: globstr.hrc:310
+#: sc/inc/globstr.hrc:305
 msgctxt "STR_SCATTR_PAGE_NOTES"
 msgid "Comments"
 msgstr "Nodiadau"
 
-#: globstr.hrc:311
+#: sc/inc/globstr.hrc:306
 msgctxt "STR_SCATTR_PAGE_GRID"
 msgid "Grid"
 msgstr "Grid"
 
-#: globstr.hrc:312
+#: sc/inc/globstr.hrc:307
 msgctxt "STR_SCATTR_PAGE_HEADERS"
 msgid "Row & Column Headers"
 msgstr "Penynnau Rhes a Cholofn"
 
-#: globstr.hrc:313
+#: sc/inc/globstr.hrc:308
 msgctxt "STR_SCATTR_PAGE_FORMULAS"
 msgid "Formulas"
 msgstr "Fformiwlâu"
 
-#: globstr.hrc:314
+#: sc/inc/globstr.hrc:309
 msgctxt "STR_SCATTR_PAGE_NULLVALS"
 msgid "Zero Values"
 msgstr "Gwerthoedd Sero"
 
-#: globstr.hrc:315
+#: sc/inc/globstr.hrc:310
 msgctxt "STR_SCATTR_PAGE_PRINTDIR"
 msgid "Print direction"
 msgstr "Cyfeiriad argraffu"
 
-#: globstr.hrc:316
+#: sc/inc/globstr.hrc:311
 msgctxt "STR_SCATTR_PAGE_FIRSTPAGENO"
 msgid "First page number"
 msgstr "Rhif tudalen cyntaf"
 
-#: globstr.hrc:317
+#: sc/inc/globstr.hrc:312
 msgctxt "STR_SCATTR_PAGE_SCALE"
 msgid "Reduce/enlarge printout"
 msgstr "Lleihau/ehangu allbrint"
 
-#: globstr.hrc:318
+#: sc/inc/globstr.hrc:313
 msgctxt "STR_SCATTR_PAGE_SCALETOPAGES"
 msgid "Fit print range(s) on number of pages"
 msgstr "Ffitio ystod(au) argraffu ar y nifer o dudalennau"
 
-#: globstr.hrc:319
+#: sc/inc/globstr.hrc:314
 msgctxt "STR_SCATTR_PAGE_SCALETO"
 msgid "Fit print range(s) to width/height"
 msgstr "Ffitio ystod(au) argraffu i led/uchder"
 
-#: globstr.hrc:320
+#: sc/inc/globstr.hrc:315
 msgctxt "STR_SCATTR_PAGE_SCALE_WIDTH"
 msgid "Width"
 msgstr "Lled"
 
-#: globstr.hrc:321
+#: sc/inc/globstr.hrc:316
 msgctxt "STR_SCATTR_PAGE_SCALE_HEIGHT"
 msgid "Height"
 msgstr "Uchder"
 
-#: globstr.hrc:322
+#: sc/inc/globstr.hrc:317
 msgctxt "STR_SCATTR_PAGE_SCALE_PAGES"
 msgid "%1 page(s)"
 msgstr "%1 tudalen"
 
-#: globstr.hrc:323
+#: sc/inc/globstr.hrc:318
 msgctxt "STR_SCATTR_PAGE_SCALE_AUTO"
 msgid "automatic"
 msgstr "awtomatig"
 
-#: globstr.hrc:324
+#: sc/inc/globstr.hrc:319
 msgctxt "STR_DOC_STAT"
 msgid "Statistics"
 msgstr "Ystadegau"
 
-#: globstr.hrc:325
+#: sc/inc/globstr.hrc:320
 msgctxt "STR_LINKERROR"
 msgid "The link could not be updated."
 msgstr "Methu diweddaru'r cysylltiad."
 
-#: globstr.hrc:326
+#: sc/inc/globstr.hrc:321
 msgctxt "STR_LINKERRORFILE"
 msgid "File:"
 msgstr "Ffeil:"
 
-#: globstr.hrc:327
+#: sc/inc/globstr.hrc:322
 msgctxt "STR_LINKERRORTAB"
 msgid "Sheet:"
 msgstr "Dalen:"
 
-#: globstr.hrc:328
+#: sc/inc/globstr.hrc:323
 msgctxt "STR_OVERVIEW"
 msgid "Overview"
 msgstr "Trosolwg"
 
-#: globstr.hrc:329
+#: sc/inc/globstr.hrc:324
 msgctxt "STR_DOC_INFO"
 msgid "Doc.Information"
 msgstr "Doc.Information"
 
-#: globstr.hrc:330
+#: sc/inc/globstr.hrc:325
 msgctxt "STR_DOC_PRINTED"
 msgid "Printed"
 msgstr "Argraffwyd"
 
-#: globstr.hrc:331
+#: sc/inc/globstr.hrc:326
 msgctxt "STR_BY"
 msgid "by"
 msgstr "gan"
 
-#: globstr.hrc:332
+#: sc/inc/globstr.hrc:327
 msgctxt "STR_ON"
 msgid "on"
 msgstr "ymlaen"
 
-#: globstr.hrc:333
+#: sc/inc/globstr.hrc:328
 msgctxt "STR_RELOAD_TABLES"
-msgid ""
-"This file contains links to other files.\n"
-"Should they be updated?"
-msgstr ""
-"Mae'r ffeil yn cynnwys cysylltau i ffeiliau eraill.\n"
-"Diweddaru?"
+msgid "Automatic update of external links has been disabled."
+msgstr "Mae diweddaru awtomatig dolenni allanol wedi ei analluogi."
 
-#: globstr.hrc:334
+#: sc/inc/globstr.hrc:329
 msgctxt "STR_REIMPORT_AFTER_LOAD"
 msgid ""
 "This file contains queries. The results of these queries were not saved.\n"
@@ -1580,7 +1551,7 @@ msgstr ""
 "Mae'r ffeil yn cynnwys ymholiadau. Nid yw canlyniad yr ymholiadau wedi eu cadw.\n"
 "Ydych chi eisiau ailadrodd yr ymholiadau?"
 
-#: globstr.hrc:335
+#: sc/inc/globstr.hrc:330
 msgctxt "STR_INSERT_FULL"
 msgid ""
 "Filled cells cannot be shifted\n"
@@ -1589,27 +1560,27 @@ msgstr ""
 "Methu symud celloedd llawn\n"
 "o fewn y ddalen."
 
-#: globstr.hrc:336
+#: sc/inc/globstr.hrc:331
 msgctxt "STR_TABINSERT_ERROR"
 msgid "The table could not be inserted."
 msgstr "Methu mewnosod y tabl."
 
-#: globstr.hrc:337
+#: sc/inc/globstr.hrc:332
 msgctxt "STR_TABREMOVE_ERROR"
 msgid "The sheets could not be deleted."
 msgstr "Methu dileu'r dalenni."
 
-#: globstr.hrc:338
+#: sc/inc/globstr.hrc:333
 msgctxt "STR_PASTE_ERROR"
 msgid "The contents of the clipboard could not be pasted."
 msgstr "Methu gludo cynnwys y clipfwrdd."
 
-#: globstr.hrc:339
+#: sc/inc/globstr.hrc:334
 msgctxt "STR_PASTE_FULL"
 msgid "There is not enough space on the sheet to insert here."
 msgstr "Dim digon o le ar y ddalen i fewnosod yma."
 
-#: globstr.hrc:340
+#: sc/inc/globstr.hrc:335
 msgctxt "STR_PASTE_BIGGER"
 msgid ""
 "The content of the clipboard is bigger than the range selected.\n"
@@ -1618,52 +1589,52 @@ msgstr ""
 "Mae cynnwys y clipfwrdd yn fwy na'r ystod ddewiswyd.\n"
 "Mewnosod beth bynnag?"
 
-#: globstr.hrc:341
+#: sc/inc/globstr.hrc:336
 msgctxt "STR_ERR_NOREF"
 msgid "No cell references are found in the selected cells."
 msgstr "Dim cyfeirnodau cell wedi eu canfod o fewn y celloedd hyn."
 
-#: globstr.hrc:342
+#: sc/inc/globstr.hrc:337
 msgctxt "STR_GRAPHICNAME"
 msgid "Image"
 msgstr "Delwedd"
 
-#: globstr.hrc:343
+#: sc/inc/globstr.hrc:338
 msgctxt "STR_INVALIDNAME"
 msgid "Invalid name."
 msgstr "Enw annilys."
 
-#: globstr.hrc:344
+#: sc/inc/globstr.hrc:339
 msgctxt "STR_VALID_MACRONOTFOUND"
 msgid "Selected macro not found."
 msgstr "Heb ganfod y macro hwn."
 
-#: globstr.hrc:345
+#: sc/inc/globstr.hrc:340
 msgctxt "STR_VALID_DEFERROR"
 msgid "Invalid value."
 msgstr "Gwerth annilys."
 
-#: globstr.hrc:346
+#: sc/inc/globstr.hrc:341
 msgctxt "STR_PROGRESS_CALCULATING"
 msgid "calculating"
 msgstr "cyfrifo"
 
-#: globstr.hrc:347
+#: sc/inc/globstr.hrc:342
 msgctxt "STR_PROGRESS_SORTING"
 msgid "sorting"
 msgstr "didoli"
 
-#: globstr.hrc:348
+#: sc/inc/globstr.hrc:343
 msgctxt "STR_PROGRESS_HEIGHTING"
 msgid "Adapt row height"
 msgstr "Addasu uchder rhes"
 
-#: globstr.hrc:349
+#: sc/inc/globstr.hrc:344
 msgctxt "STR_PROGRESS_COMPARING"
 msgid "Compare #"
 msgstr "Cymharu #"
 
-#: globstr.hrc:350
+#: sc/inc/globstr.hrc:345
 msgctxt "STR_DETINVALID_OVERFLOW"
 msgid ""
 "The maximum number of invalid cells has been exceeded.\n"
@@ -1672,123 +1643,123 @@ msgstr ""
 "Mae'r nifer o gelloedd annilys yn ormod.\n"
 "Heb farcio pob cell annilys."
 
-#: globstr.hrc:351
+#: sc/inc/globstr.hrc:346
 msgctxt "STR_QUICKHELP_DELETE"
 msgid "Delete contents"
 msgstr "Dileu cynnwys"
 
-#: globstr.hrc:352
+#: sc/inc/globstr.hrc:347
 msgctxt "STR_QUICKHELP_REF"
 msgid "%1 R  x %2 C"
 msgstr "%1 R  x %2 C"
 
-#: globstr.hrc:353
+#: sc/inc/globstr.hrc:348
 msgctxt "STR_FUNCTIONLIST_MORE"
 msgid "More..."
 msgstr "Rhagor..."
 
-#: globstr.hrc:354
+#: sc/inc/globstr.hrc:349
 msgctxt "STR_ERR_INVALID_AREA"
 msgid "Invalid range"
 msgstr "Ystod annilys"
 
 #. Templates for data pilot tables.
-#: globstr.hrc:356
+#: sc/inc/globstr.hrc:351
 msgctxt "STR_PIVOT_STYLE_INNER"
 msgid "Pivot Table Value"
 msgstr "Gwerth tabl Colynnu"
 
-#: globstr.hrc:357
+#: sc/inc/globstr.hrc:352
 msgctxt "STR_PIVOT_STYLE_RESULT"
 msgid "Pivot Table Result"
 msgstr "Canlyniad Tabl Colynnu"
 
-#: globstr.hrc:358
+#: sc/inc/globstr.hrc:353
 msgctxt "STR_PIVOT_STYLE_CATEGORY"
 msgid "Pivot Table Category"
 msgstr "Categori Tabl Colynnu"
 
-#: globstr.hrc:359
+#: sc/inc/globstr.hrc:354
 msgctxt "STR_PIVOT_STYLE_TITLE"
 msgid "Pivot Table Title"
 msgstr "Teitl Tabl Colynnu"
 
-#: globstr.hrc:360
+#: sc/inc/globstr.hrc:355
 msgctxt "STR_PIVOT_STYLE_FIELDNAME"
 msgid "Pivot Table Field"
 msgstr "Maes Tabl Colynnu"
 
-#: globstr.hrc:361
+#: sc/inc/globstr.hrc:356
 msgctxt "STR_PIVOT_STYLE_TOP"
 msgid "Pivot Table Corner"
 msgstr "Cornel Tabl Colynnu"
 
-#: globstr.hrc:362
+#: sc/inc/globstr.hrc:357
 msgctxt "STR_OPERATION_FILTER"
 msgid "Filter"
 msgstr "Hidl"
 
-#: globstr.hrc:363
+#: sc/inc/globstr.hrc:358
 msgctxt "STR_OPERATION_SORT"
 msgid "Sort"
 msgstr "Trefnu"
 
-#: globstr.hrc:364
+#: sc/inc/globstr.hrc:359
 msgctxt "STR_OPERATION_SUBTOTAL"
 msgid "Subtotals"
 msgstr "Is gyfansymiau"
 
-#: globstr.hrc:365
+#: sc/inc/globstr.hrc:360
 msgctxt "STR_OPERATION_NONE"
 msgid "None"
 msgstr "Dim"
 
-#: globstr.hrc:366
+#: sc/inc/globstr.hrc:361
 msgctxt "STR_IMPORT_REPLACE"
 msgid "Do you want to replace the contents of #?"
 msgstr "Hoffech chi newid cynnwys #?"
 
-#: globstr.hrc:367
+#: sc/inc/globstr.hrc:362
 msgctxt "STR_TIP_WIDTH"
 msgid "Width:"
 msgstr "Lled:"
 
-#: globstr.hrc:368
+#: sc/inc/globstr.hrc:363
 msgctxt "STR_TIP_HEIGHT"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: globstr.hrc:369
+#: sc/inc/globstr.hrc:364
 msgctxt "STR_TIP_HIDE"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: globstr.hrc:370
+#: sc/inc/globstr.hrc:365
 msgctxt "STR_CHANGED_BLANK"
 msgid "<empty>"
 msgstr "<gwag>"
 
-#: globstr.hrc:371
+#: sc/inc/globstr.hrc:366
 msgctxt "STR_CHANGED_CELL"
 msgid "Cell #1 changed from '#2' to '#3'"
 msgstr "Newidiodd cell #1 o '#2' i '#3'"
 
-#: globstr.hrc:372
+#: sc/inc/globstr.hrc:367
 msgctxt "STR_CHANGED_INSERT"
 msgid "#1 inserted"
 msgstr "mewnosodwyd #1"
 
-#: globstr.hrc:373
+#: sc/inc/globstr.hrc:368
 msgctxt "STR_CHANGED_DELETE"
 msgid "#1 deleted"
 msgstr "dilëwyd #1"
 
-#: globstr.hrc:374
+#: sc/inc/globstr.hrc:369
 msgctxt "STR_CHANGED_MOVE"
 msgid "Range moved from #1 to #2"
 msgstr "Ystod wedi symud o #1 i #2"
 
-#: globstr.hrc:375
+#: sc/inc/globstr.hrc:370
 msgctxt "STR_END_REDLINING"
 msgid ""
 "This action will exit the change recording mode.\n"
@@ -1803,112 +1774,112 @@ msgstr ""
 " Gadael modd recordio newid?\n"
 "\n"
 
-#: globstr.hrc:376
+#: sc/inc/globstr.hrc:371
 msgctxt "STR_CLOSE_ERROR_LINK"
 msgid "The document can not be closed while a link is being updated."
 msgstr "Methu cau'r ddogfen pan fo cysylltiad yn cael ei ddiweddaru."
 
-#: globstr.hrc:377
+#: sc/inc/globstr.hrc:372
 msgctxt "STR_UNDO_RESIZEMATRIX"
 msgid "Adapt array area"
 msgstr "Newid ardal arae"
 
-#: globstr.hrc:378
+#: sc/inc/globstr.hrc:373
 msgctxt "STR_TIP_RESIZEMATRIX"
 msgid "Array formula  %1 R x %2 C"
 msgstr "Fformiwla arae  %1 R x %2 C"
 
-#: globstr.hrc:379
+#: sc/inc/globstr.hrc:374
 msgctxt "STR_UNDO_HANGULHANJA"
 msgid "Hangul/Hanja Conversion"
 msgstr "Trosi Hangul/Hanja"
 
-#: globstr.hrc:380
+#: sc/inc/globstr.hrc:375
 msgctxt "STR_NAME_INPUT_CELL"
 msgid "Select Cell"
 msgstr "Dewis Arddull Call"
 
-#: globstr.hrc:381
+#: sc/inc/globstr.hrc:376
 msgctxt "STR_NAME_INPUT_RANGE"
 msgid "Select Range"
 msgstr "Dewis Ystod"
 
-#: globstr.hrc:382
+#: sc/inc/globstr.hrc:377
 msgctxt "STR_NAME_INPUT_DBRANGE"
 msgid "Select Database Range"
 msgstr "Dewis Ystod Cronfa Ddata"
 
-#: globstr.hrc:383
+#: sc/inc/globstr.hrc:378
 msgctxt "STR_NAME_INPUT_ROW"
 msgid "Go To Row"
 msgstr "Mynd i ddogfen"
 
-#: globstr.hrc:384
+#: sc/inc/globstr.hrc:379
 msgctxt "STR_NAME_INPUT_SHEET"
 msgid "Go To Sheet"
 msgstr "I'r Ddalen Nesaf"
 
-#: globstr.hrc:385
+#: sc/inc/globstr.hrc:380
 msgctxt "STR_NAME_INPUT_DEFINE"
 msgid "Define Name for Range"
 msgstr "Rhoi Enw i'r Ystod"
 
-#: globstr.hrc:386
+#: sc/inc/globstr.hrc:381
 msgctxt "STR_NAME_ERROR_SELECTION"
 msgid "The selection needs to be rectangular in order to name it."
 msgstr "Mae'r dewis angen bod yn betryal er mwyn ei enwi."
 
-#: globstr.hrc:387
+#: sc/inc/globstr.hrc:382
 msgctxt "STR_NAME_ERROR_NAME"
 msgid "You must enter a valid reference or type a valid name for the selected range."
 msgstr "Rhaid rhoi cyfeirnod dilys neu enw dilys ar gyfer yr ystod dan sylw."
 
-#: globstr.hrc:388
+#: sc/inc/globstr.hrc:383
 msgctxt "STR_CHANGED_MOVE_REJECTION_WARNING"
 msgid "WARNING: This action may have resulted in unintended changes to cell references in formulas."
 msgstr "RHYBUDD: Gall fod y weithred wedi achosi newidiadau anfwriadol i gyfeirnodau celloedd mewn fformiwlâu."
 
-#: globstr.hrc:389
+#: sc/inc/globstr.hrc:384
 msgctxt "STR_CHANGED_DELETE_REJECTION_WARNING"
 msgid "WARNING: This action may have resulted in references to the deleted area not being restored."
 msgstr "RHYBUDD: Gall fod y weithred wedi achosi i gyfeirnodau yn yr ardal dilëwyd peidio a chael eu hadfer."
 
-#: globstr.hrc:390
+#: sc/inc/globstr.hrc:385
 msgctxt "STR_UNDO_CHINESE_TRANSLATION"
 msgid "Chinese conversion"
 msgstr "Trosi Tsieineaidd"
 
-#: globstr.hrc:391
+#: sc/inc/globstr.hrc:386
 msgctxt "STR_ERR_DATAPILOT_INPUT"
 msgid "You cannot change this part of the pivot table."
 msgstr "Nid oes modd newid y rhan yma o dabl y tabl colynnu."
 
-#: globstr.hrc:392
+#: sc/inc/globstr.hrc:387
 msgctxt "STR_RECALC_MANUAL"
 msgid "Manual"
 msgstr "Gyda llaw"
 
-#: globstr.hrc:393
+#: sc/inc/globstr.hrc:388
 msgctxt "STR_RECALC_AUTO"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: globstr.hrc:394
+#: sc/inc/globstr.hrc:389
 msgctxt "STR_ERR_LONG_NESTED_ARRAY"
 msgid "Nested arrays are not supported."
 msgstr "Nid yw arae nythog yn cael eu cynnal bob tro."
 
-#: globstr.hrc:395
+#: sc/inc/globstr.hrc:390
 msgctxt "STR_UNDO_TEXTTOCOLUMNS"
 msgid "Text to Columns"
 msgstr "Testun i Golofnau"
 
-#: globstr.hrc:396
+#: sc/inc/globstr.hrc:391
 msgctxt "STR_DOC_UPDATED"
 msgid "Your spreadsheet has been updated with changes saved by other users."
 msgstr "Mae eich taenlen wedi ei diweddaru gyda newidiadau gadwyd gan ddefnyddwyr eraill."
 
-#: globstr.hrc:397
+#: sc/inc/globstr.hrc:392
 msgctxt "STR_DOC_WILLBESAVED"
 msgid ""
 "The spreadsheet must be saved now to activate sharing mode.\n"
@@ -1919,7 +1890,7 @@ msgstr ""
 "\n"
 "Hoffech chi barhau?"
 
-#: globstr.hrc:398
+#: sc/inc/globstr.hrc:393
 msgctxt "STR_DOC_WILLNOTBESAVED"
 msgid ""
 "Already resolved merge conflicts will be lost and your changes to the shared spreadsheet will not be saved.\n"
@@ -1930,7 +1901,7 @@ msgstr ""
 "\n"
 "Hoffech chi barhau?"
 
-#: globstr.hrc:399
+#: sc/inc/globstr.hrc:394
 msgctxt "STR_DOC_DISABLESHARED"
 msgid ""
 "Disabling shared mode of a spreadsheet hinders all other users of the shared spreadsheet to merge back their work.\n"
@@ -1941,7 +1912,7 @@ msgstr ""
 "\n"
 "Hoffech chi barhau?"
 
-#: globstr.hrc:400
+#: sc/inc/globstr.hrc:395
 msgctxt "STR_DOC_NOLONGERSHARED"
 msgid ""
 "This spreadsheet is no longer in shared mode.\n"
@@ -1952,18 +1923,7 @@ msgstr ""
 "\n"
 "Cadwch eich taenlen i ffeil wahanol a chyfuno eich newidiadau i'r daenlen ranedig gyda llaw."
 
-#: globstr.hrc:401
-msgctxt "STR_SHARED_DOC_WARNING"
-msgid ""
-"The spreadsheet is in shared mode. This allows multiple users to access and edit the spreadsheet at the same time.\n"
-"\n"
-"Changes to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities."
-msgstr ""
-"Mae'r daenlen yn y modd rhannu. Mae hyn yn caniatáu i nifer o ddefnyddwyr i gael mynediad at a golygu'r daenlen ar yr un pryd.\n"
-"\n"
-"Ni fydd rhai newidiadau i briodoleddau fformatio megis, ffontiau, lliwiau a fformat rhifau yn cael eu cadw ac nid yw rhai swyddogaethau megis golygu siartiau a gwrthrychau lluniadu ar gael yn y modd rhannu. Diffoddwch y modd rhannu i gael mynediad unigol ar gyfer y newidiadau a'r swyddogaethau hynny."
-
-#: globstr.hrc:402
+#: sc/inc/globstr.hrc:396
 msgctxt "STR_FILE_LOCKED_TRY_LATER"
 msgid ""
 "The shared spreadsheet file is locked due to a merge in progress by user: '%1'\n"
@@ -1974,7 +1934,7 @@ msgstr ""
 "\n"
 "Nid oes modd analluogi'r modd rhannu mewn ffeil wedi ei chloi. Ceisiwch eto."
 
-#: globstr.hrc:403
+#: sc/inc/globstr.hrc:397
 msgctxt "STR_FILE_LOCKED_SAVE_LATER"
 msgid ""
 "The shared spreadsheet file is locked due to a merge in progress by user: '%1'\n"
@@ -1985,147 +1945,147 @@ msgstr ""
 "\n"
 "Ceisiwch eto i gadw eich newidiadau."
 
-#: globstr.hrc:404
+#: sc/inc/globstr.hrc:398
 msgctxt "STR_UNKNOWN_USER"
 msgid "Unknown User"
 msgstr "Defnyddiwr Anhysbys"
 
-#: globstr.hrc:405
+#: sc/inc/globstr.hrc:399
 msgctxt "STR_SHAPE_AUTOSHAPE"
 msgid "AutoShape"
 msgstr "AwtoSiap"
 
-#: globstr.hrc:406
+#: sc/inc/globstr.hrc:400
 msgctxt "STR_SHAPE_RECTANGLE"
 msgid "Rectangle"
 msgstr "Petryal"
 
-#: globstr.hrc:407
+#: sc/inc/globstr.hrc:401
 msgctxt "STR_SHAPE_LINE"
 msgid "Line"
 msgstr "Llinell"
 
-#: globstr.hrc:408
+#: sc/inc/globstr.hrc:402
 msgctxt "STR_SHAPE_OVAL"
 msgid "Oval"
 msgstr "Hirgrwn"
 
-#: globstr.hrc:409
+#: sc/inc/globstr.hrc:403
 msgctxt "STR_FORM_BUTTON"
 msgid "Button"
 msgstr "Botwm"
 
-#: globstr.hrc:410
+#: sc/inc/globstr.hrc:404
 msgctxt "STR_FORM_CHECKBOX"
 msgid "Check Box"
 msgstr "Blwch Ticio"
 
-#: globstr.hrc:411
+#: sc/inc/globstr.hrc:405
 msgctxt "STR_FORM_OPTIONBUTTON"
 msgid "Option Button"
 msgstr "Botwm Dewis"
 
-#: globstr.hrc:412
+#: sc/inc/globstr.hrc:406
 msgctxt "STR_FORM_LABEL"
 msgid "Label"
 msgstr "Label"
 
-#: globstr.hrc:413
+#: sc/inc/globstr.hrc:407
 msgctxt "STR_FORM_LISTBOX"
 msgid "List Box"
 msgstr "Blwch Rhestr"
 
-#: globstr.hrc:414
+#: sc/inc/globstr.hrc:408
 msgctxt "STR_FORM_GROUPBOX"
 msgid "Group Box"
 msgstr "Blwch Grŵp"
 
-#: globstr.hrc:415
+#: sc/inc/globstr.hrc:409
 msgctxt "STR_FORM_DROPDOWN"
 msgid "Drop Down"
 msgstr "Cwymplen"
 
-#: globstr.hrc:416
+#: sc/inc/globstr.hrc:410
 msgctxt "STR_FORM_SPINNER"
 msgid "Spinner"
 msgstr "Troellwr"
 
-#: globstr.hrc:417
+#: sc/inc/globstr.hrc:411
 msgctxt "STR_FORM_SCROLLBAR"
 msgid "Scroll Bar"
 msgstr "Bar Sgrolio"
 
-#: globstr.hrc:418
+#: sc/inc/globstr.hrc:412
 msgctxt "STR_STYLE_FAMILY_CELL"
 msgid "Cell Styles"
 msgstr "Arddull Cell"
 
-#: globstr.hrc:419
+#: sc/inc/globstr.hrc:413
 msgctxt "STR_STYLE_FAMILY_PAGE"
 msgid "Page Styles"
 msgstr "Arddull Tudalen"
 
-#: globstr.hrc:420
+#: sc/inc/globstr.hrc:414
 msgctxt "STR_ERR_DATAPILOTSOURCE"
 msgid "Pivot table source data is invalid."
 msgstr "Mae ffynhonnell y tabl colynnu yn annilys."
 
-#: globstr.hrc:421
+#: sc/inc/globstr.hrc:415
 msgctxt "STR_OPTIONS_WARN_SEPARATORS"
 msgid "Because the current formula separator settings conflict with the locale, the formula separators have been reset to their default values."
 msgstr "Oherwydd bod gwrthdaro rhwng y gosodiadau'r gwahanydd fformiwla cyfredol a'r locale, mae'r gwahanyddion fformiwla wedi cael eu hailosod i'w gwerthoedd rhagosodedig."
 
-#: globstr.hrc:422
+#: sc/inc/globstr.hrc:416
 msgctxt "STR_UNDO_INSERT_CURRENT_DATE"
 msgid "Insert Current Date"
 msgstr "Mewnosod y Dyddiad Cyfredol"
 
-#: globstr.hrc:423
+#: sc/inc/globstr.hrc:417
 msgctxt "STR_UNDO_INSERT_CURRENT_TIME"
 msgid "Insert Current Time"
 msgstr "Mewnosod yr Amser Cyfredol"
 
-#: globstr.hrc:424
+#: sc/inc/globstr.hrc:418
 msgctxt "STR_MANAGE_NAMES"
 msgid "Manage Names..."
 msgstr "Rheoli Enwau..."
 
-#: globstr.hrc:425
+#: sc/inc/globstr.hrc:419
 msgctxt "STR_HEADER_NAME"
 msgid "Name"
 msgstr "Enw"
 
-#: globstr.hrc:426
+#: sc/inc/globstr.hrc:420
 msgctxt "STR_HEADER_RANGE_OR_EXPR"
 msgid "Range or formula expression"
 msgstr "Mynegiad ystod neu fformiwla"
 
-#: globstr.hrc:427
+#: sc/inc/globstr.hrc:421
 msgctxt "STR_HEADER_SCOPE"
 msgid "Scope"
 msgstr "Cwmpas"
 
-#: globstr.hrc:428
+#: sc/inc/globstr.hrc:422
 msgctxt "STR_MULTI_SELECT"
 msgid "(multiple)"
 msgstr "(lluosog)"
 
-#: globstr.hrc:429
+#: sc/inc/globstr.hrc:423
 msgctxt "STR_GLOBAL_SCOPE"
 msgid "Document (Global)"
 msgstr "Dogfen (Eang)"
 
-#: globstr.hrc:430
+#: sc/inc/globstr.hrc:424
 msgctxt "STR_ERR_NAME_EXISTS"
 msgid "Invalid name. Already in use for the selected scope."
 msgstr "Enw annilys. Mae eisoes yn cael ei ddefnyddio ar gyfer y cwmpas a ddewiswyd."
 
-#: globstr.hrc:431
+#: sc/inc/globstr.hrc:425
 msgctxt "STR_ERR_NAME_INVALID"
 msgid "Invalid name. Only use letters, numbers and underscore."
 msgstr "Enw annilys. Defnyddiwch lythrennau, rhifau a tanlinellu yn unig."
 
-#: globstr.hrc:432
+#: sc/inc/globstr.hrc:426
 msgctxt "STR_UNSAVED_EXT_REF"
 msgid ""
 "This Document contains external references to unsaved documents.\n"
@@ -2136,217 +2096,217 @@ msgstr ""
 "\n"
 "Hoffech chi barhau?"
 
-#: globstr.hrc:433
+#: sc/inc/globstr.hrc:427
 msgctxt "STR_CLOSE_WITH_UNSAVED_REFS"
 msgid "This Document is referenced by another document and not yet saved. Closing it without saving will result in data loss."
 msgstr "Mae'r Ddogfen wedi ei chyfeirio at ddogfen arall sydd heb ei chadw. Bydd cau'r ddogfen heb ei chadw'n arwain at golli data."
 
-#: globstr.hrc:434
+#: sc/inc/globstr.hrc:428
 msgctxt "STR_HEADER_RANGE"
 msgid "Range"
 msgstr "Ystod"
 
-#: globstr.hrc:435
+#: sc/inc/globstr.hrc:429
 msgctxt "STR_HEADER_COND"
 msgid "First Condition"
 msgstr "Cyflwr Cyntaf"
 
-#: globstr.hrc:436
+#: sc/inc/globstr.hrc:430
 msgctxt "STR_COND_CONDITION"
 msgid "Cell value is"
 msgstr "Gwerth cell yw"
 
-#: globstr.hrc:437
+#: sc/inc/globstr.hrc:431
 msgctxt "STR_COND_COLORSCALE"
 msgid "ColorScale"
 msgstr "ColorScale"
 
-#: globstr.hrc:438
+#: sc/inc/globstr.hrc:432
 msgctxt "STR_COND_DATABAR"
 msgid "DataBar"
 msgstr "DataBar"
 
-#: globstr.hrc:439
+#: sc/inc/globstr.hrc:433
 msgctxt "STR_COND_ICONSET"
 msgid "IconSet"
 msgstr "SetEicon"
 
-#: globstr.hrc:440
+#: sc/inc/globstr.hrc:434
 msgctxt "STR_COND_BETWEEN"
 msgid "between"
 msgstr "rhwng"
 
-#: globstr.hrc:441
+#: sc/inc/globstr.hrc:435
 msgctxt "STR_COND_NOTBETWEEN"
 msgid "not between"
 msgstr "nid rhwng"
 
-#: globstr.hrc:442
+#: sc/inc/globstr.hrc:436
 msgctxt "STR_COND_UNIQUE"
 msgid "unique"
 msgstr "unigryw"
 
-#: globstr.hrc:443
+#: sc/inc/globstr.hrc:437
 msgctxt "STR_COND_DUPLICATE"
 msgid "duplicate"
 msgstr "dyblyg"
 
-#: globstr.hrc:444
+#: sc/inc/globstr.hrc:438
 msgctxt "STR_COND_FORMULA"
 msgid "Formula is"
 msgstr "Y fformiwla yw"
 
-#: globstr.hrc:445
+#: sc/inc/globstr.hrc:439
 msgctxt "STR_COND_TOP10"
 msgid "Top Elements"
 msgstr "Elfennau Brig"
 
-#: globstr.hrc:446
+#: sc/inc/globstr.hrc:440
 msgctxt "STR_COND_BOTTOM10"
 msgid "Bottom Elements"
 msgstr "Elfennau Gwaelod"
 
-#: globstr.hrc:447
+#: sc/inc/globstr.hrc:441
 msgctxt "STR_COND_TOP_PERCENT"
 msgid "Top Percent"
 msgstr "Canradd Brig"
 
-#: globstr.hrc:448
+#: sc/inc/globstr.hrc:442
 msgctxt "STR_COND_DATE"
 msgid "Date is"
 msgstr "Y dyddiad yw"
 
-#: globstr.hrc:449
+#: sc/inc/globstr.hrc:443
 msgctxt "STR_COND_BOTTOM_PERCENT"
 msgid "Bottom Percent"
 msgstr "Canran Gwaelod"
 
-#: globstr.hrc:450
+#: sc/inc/globstr.hrc:444
 msgctxt "STR_COND_ABOVE_AVERAGE"
 msgid "Above Average"
 msgstr "Uwchlaw'r Cyfartaledd"
 
-#: globstr.hrc:451
+#: sc/inc/globstr.hrc:445
 msgctxt "STR_COND_BELOW_AVERAGE"
 msgid "Below Average"
 msgstr "Islaw'r Cyfartaledd"
 
-#: globstr.hrc:452
+#: sc/inc/globstr.hrc:446
 msgctxt "STR_COND_ABOVE_EQUAL_AVERAGE"
 msgid "Above or equal Average"
 msgstr "Uwch neu gydradd â'r Cyfartaledd"
 
-#: globstr.hrc:453
+#: sc/inc/globstr.hrc:447
 msgctxt "STR_COND_BELOW_EQUAL_AVERAGE"
 msgid "Below or equal Average"
 msgstr "Is neu gydradd a'r cyfartaledd"
 
-#: globstr.hrc:454
+#: sc/inc/globstr.hrc:448
 msgctxt "STR_COND_ERROR"
 msgid "an Error code"
 msgstr "Cod gwall"
 
-#: globstr.hrc:455
+#: sc/inc/globstr.hrc:449
 msgctxt "STR_COND_NOERROR"
 msgid "not an Error code"
 msgstr "nid cod Gwall"
 
-#: globstr.hrc:456
+#: sc/inc/globstr.hrc:450
 msgctxt "STR_COND_BEGINS_WITH"
 msgid "Begins with"
 msgstr "Cychwyn gyda"
 
-#: globstr.hrc:457
+#: sc/inc/globstr.hrc:451
 msgctxt "STR_COND_ENDS_WITH"
 msgid "Ends with"
 msgstr "Gorffen gyda"
 
-#: globstr.hrc:458
+#: sc/inc/globstr.hrc:452
 msgctxt "STR_COND_CONTAINS"
 msgid "Contains"
 msgstr "Yn cynnwys"
 
-#: globstr.hrc:459
+#: sc/inc/globstr.hrc:453
 msgctxt "STR_COND_NOT_CONTAINS"
 msgid "Not Contains"
 msgstr "Ddim yn Cynnwys"
 
-#: globstr.hrc:460
+#: sc/inc/globstr.hrc:454
 msgctxt "STR_COND_TODAY"
 msgid "today"
 msgstr "heddiw"
 
-#: globstr.hrc:461
+#: sc/inc/globstr.hrc:455
 msgctxt "STR_COND_YESTERDAY"
 msgid "yesterday"
 msgstr "ddoe"
 
-#: globstr.hrc:462
+#: sc/inc/globstr.hrc:456
 msgctxt "STR_COND_TOMORROW"
 msgid "tomorrow"
 msgstr "yfory"
 
-#: globstr.hrc:463
+#: sc/inc/globstr.hrc:457
 msgctxt "STR_COND_LAST7DAYS"
 msgid "in the last 7 days"
 msgstr "yn y 7 diwrnod diwethaf"
 
-#: globstr.hrc:464
+#: sc/inc/globstr.hrc:458
 msgctxt "STR_COND_THISWEEK"
 msgid "this week"
 msgstr "yr wythnos hon"
 
-#: globstr.hrc:465
+#: sc/inc/globstr.hrc:459
 msgctxt "STR_COND_LASTWEEK"
 msgid "last week"
 msgstr "yr wythnos ddiwethaf"
 
-#: globstr.hrc:466
+#: sc/inc/globstr.hrc:460
 msgctxt "STR_COND_NEXTWEEK"
 msgid "next week"
 msgstr "wythnos nesaf"
 
-#: globstr.hrc:467
+#: sc/inc/globstr.hrc:461
 msgctxt "STR_COND_THISMONTH"
 msgid "this month"
 msgstr "mis yma"
 
-#: globstr.hrc:468
+#: sc/inc/globstr.hrc:462
 msgctxt "STR_COND_LASTMONTH"
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: globstr.hrc:469
+#: sc/inc/globstr.hrc:463
 msgctxt "STR_COND_NEXTMONTH"
 msgid "next month"
 msgstr "mis nesaf"
 
-#: globstr.hrc:470
+#: sc/inc/globstr.hrc:464
 msgctxt "STR_COND_THISYEAR"
 msgid "this year"
 msgstr "eleni"
 
-#: globstr.hrc:471
+#: sc/inc/globstr.hrc:465
 msgctxt "STR_COND_LASTYEAR"
 msgid "last year"
 msgstr "llynedd"
 
-#: globstr.hrc:472
+#: sc/inc/globstr.hrc:466
 msgctxt "STR_COND_NEXTYEAR"
 msgid "next year"
 msgstr "blwyddyn nesaf"
 
-#: globstr.hrc:473
+#: sc/inc/globstr.hrc:467
 msgctxt "STR_COND_AND"
 msgid "and"
 msgstr "a"
 
-#: globstr.hrc:474
+#: sc/inc/globstr.hrc:468
 msgctxt "STR_ERR_CONDFORMAT_PROTECTED"
-msgid "Conditional Formats can not be created, deleted or changed in protected sheets!"
+msgid "Conditional Formats can not be created, deleted or changed in protected sheets."
 msgstr "Nid oes modd creu, dileu na newid Fformatau Amodol mewn dalennau diogelwyd!"
 
-#: globstr.hrc:475
+#: sc/inc/globstr.hrc:469
 msgctxt "STR_EDIT_EXISTING_COND_FORMATS"
 msgid ""
 "The selected cell already contains conditional formatting. You can either edit the existing conditional format or you define a new overlapping conditional format.\n"
@@ -2357,7 +2317,7 @@ msgstr ""
 "\n"
 " Hoffech chi olygu'r fformat amodol presennol?"
 
-#: globstr.hrc:476
+#: sc/inc/globstr.hrc:470
 msgctxt "STR_QUERY_FORMULA_RECALC_ONLOAD_ODS"
 msgid ""
 "This document was last saved by an application other than %PRODUCTNAME.  Some formula cells may produce different results when recalculated.\n"
@@ -2368,7 +2328,7 @@ msgstr ""
 "\n"
 "Hoffech chi ail-gyfrifo pob cell fformiwla yn y ddogfen hon nawr?"
 
-#: globstr.hrc:477
+#: sc/inc/globstr.hrc:471
 msgctxt "STR_QUERY_FORMULA_RECALC_ONLOAD_XLS"
 msgid ""
 "This document was last saved by Excel.  Some formula cells may produce different results when recalculated.\n"
@@ -2379,82 +2339,77 @@ msgstr ""
 "\n"
 "Hoffech chi ail-gyfrifo'r holl gelloedd fformiwla nawr?"
 
-#: globstr.hrc:478
-msgctxt "STR_ALWAYS_PERFORM_SELECTED"
-msgid "Always perform this without prompt in the future."
-msgstr "Gwneud hyn heb anogaeth yn y dyfodol."
-
-#: globstr.hrc:479
+#: sc/inc/globstr.hrc:472
 msgctxt "STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE"
 msgid "You cannot insert or delete cells when the affected range intersects with pivot table."
 msgstr "Nid oes modd mewnosod na dileu celloedd pan fod yr ystod sy'n cael eu heffeithio'n croestorri gyda thabl troi."
 
-#: globstr.hrc:480
+#: sc/inc/globstr.hrc:473
 msgctxt "STR_DPFIELD_GROUP_BY_SECONDS"
 msgid "Seconds"
 msgstr "Eiladau"
 
-#: globstr.hrc:481
+#: sc/inc/globstr.hrc:474
 msgctxt "STR_DPFIELD_GROUP_BY_MINUTES"
 msgid "Minutes"
 msgstr "Munudau"
 
-#: globstr.hrc:482
+#: sc/inc/globstr.hrc:475
 msgctxt "STR_DPFIELD_GROUP_BY_HOURS"
 msgid "Hours"
 msgstr "Oriau"
 
-#: globstr.hrc:483
+#: sc/inc/globstr.hrc:476
 msgctxt "STR_DPFIELD_GROUP_BY_DAYS"
 msgid "Days"
 msgstr "Dyddiau"
 
-#: globstr.hrc:484
+#: sc/inc/globstr.hrc:477
 msgctxt "STR_DPFIELD_GROUP_BY_MONTHS"
 msgid "Months"
 msgstr "Misoedd"
 
-#: globstr.hrc:485
+#: sc/inc/globstr.hrc:478
 msgctxt "STR_DPFIELD_GROUP_BY_QUARTERS"
 msgid "Quarters"
 msgstr "Chwarteri"
 
-#: globstr.hrc:486
+#: sc/inc/globstr.hrc:479
 msgctxt "STR_DPFIELD_GROUP_BY_YEARS"
 msgid "Years"
 msgstr "Blynyddoedd"
 
-#: globstr.hrc:487
+#: sc/inc/globstr.hrc:480
 msgctxt "STR_INVALIDVAL"
 msgid "Invalid target value."
 msgstr "Gwerth targed annilys."
 
-#: globstr.hrc:488
+#: sc/inc/globstr.hrc:481
 msgctxt "STR_INVALIDVAR"
 msgid "Undefined name for variable cell."
 msgstr "Enw heb ei ddiffinio ar gyfer cell newidiol."
 
-#: globstr.hrc:489
+#: sc/inc/globstr.hrc:482
 msgctxt "STR_INVALIDFORM"
 msgid "Undefined name as formula cell."
 msgstr "Enw anniffiniedig fel cell fformiwla."
 
-#: globstr.hrc:490
+#: sc/inc/globstr.hrc:483
 msgctxt "STR_NOFORMULA"
 msgid "Formula cell must contain a formula."
 msgstr "Rhaid i gell fformiwla gynnwys fformiwla."
 
-#: globstr.hrc:491
+#: sc/inc/globstr.hrc:484
 msgctxt "STR_INVALIDINPUT"
 msgid "Invalid input."
 msgstr "Mewnbwn annilys."
 
-#: globstr.hrc:492
+#: sc/inc/globstr.hrc:485
 msgctxt "STR_INVALIDCONDITION"
 msgid "Invalid condition."
 msgstr "Cyflwr annilys."
 
-#: globstr.hrc:493
+#: sc/inc/globstr.hrc:486
 msgctxt "STR_QUERYREMOVE"
 msgid ""
 "Should the entry\n"
@@ -2465,316 +2420,316 @@ msgstr ""
 "#\n"
 "gael ei dileu?"
 
-#: globstr.hrc:494
+#: sc/inc/globstr.hrc:487
 msgctxt "STR_COPYLIST"
 msgid "Copy List"
 msgstr "Rhestr Copïo"
 
-#: globstr.hrc:495
+#: sc/inc/globstr.hrc:488
 msgctxt "STR_COPYFROM"
 msgid "List from"
 msgstr "Rhestr o"
 
-#: globstr.hrc:496
+#: sc/inc/globstr.hrc:489
 msgctxt "STR_COPYERR"
 msgid "Cells without text have been ignored."
 msgstr "Celloedd heb destun wedi eu hanwybyddu."
 
-#: globstr.hrc:497
+#: sc/inc/globstr.hrc:490
 #, c-format
 msgctxt "STR_CTRLCLICKHYPERLINK"
 msgid "%s-click to follow hyperlink:"
 msgstr "Cliciwch %s i ddilyn y ddolen:"
 
-#: globstr.hrc:498
+#: sc/inc/globstr.hrc:491
 msgctxt "STR_CLICKHYPERLINK"
 msgid "click to open hyperlink:"
 msgstr "clic i agor dolen:"
 
-#: globstr.hrc:499
+#: sc/inc/globstr.hrc:492
 msgctxt "STR_PRINT_PREVIEW_NODATA"
 msgid "No Data"
 msgstr "Dim Data"
 
-#: globstr.hrc:500
+#: sc/inc/globstr.hrc:493
 msgctxt "STR_PRINT_PREVIEW_EMPTY_RANGE"
 msgid "Print Range Empty"
 msgstr "Ystod Argraffu yn Wag"
 
-#: globstr.hrc:501
+#: sc/inc/globstr.hrc:494
 msgctxt "STR_UNDO_CONDFORMAT"
 msgid "Conditional Format"
 msgstr "Fformatio Amodol"
 
-#: globstr.hrc:502
+#: sc/inc/globstr.hrc:495
 msgctxt "STR_UNDO_CONDFORMAT_LIST"
 msgid "Conditional Formats"
 msgstr "Fformatiau Amodol"
 
-#: globstr.hrc:503
+#: sc/inc/globstr.hrc:496
 msgctxt "STR_UNDO_FORMULA_TO_VALUE"
 msgid "Convert Formula To Value"
 msgstr "Trosi'r Fformiwla i Werth"
 
-#: globstr.hrc:504
+#: sc/inc/globstr.hrc:497
 msgctxt "STR_UNQUOTED_STRING"
 msgid "Strings without quotes are interpreted as column/row labels."
 msgstr "Mae llinynnau heb ddyfynodau'n cael eu dehongli fel labeli colofn/rhes."
 
-#: globstr.hrc:505
+#: sc/inc/globstr.hrc:498
 msgctxt "STR_ENTER_VALUE"
 msgid "Enter a value!"
 msgstr "Rhowch werth!"
 
-#: globstr.hrc:506
+#: sc/inc/globstr.hrc:499
 msgctxt "STR_TABLE_COUNT"
 msgid "Sheet %1 of %2"
 msgstr "Dalen %1 o %2"
 
-#: globstr.hrc:507
+#: sc/inc/globstr.hrc:500
 msgctxt "STR_FUNCTIONS_FOUND"
 msgid "%1 and %2 more"
 msgstr "%1 a %2 yn rhagor"
 
-#: globstr.hrc:508
+#: sc/inc/globstr.hrc:501
 msgctxt "STR_GENERAL"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: globstr.hrc:509
+#: sc/inc/globstr.hrc:502
 msgctxt "STR_NUMBER"
 msgid "Number"
 msgstr "Rhif"
 
-#: globstr.hrc:510
+#: sc/inc/globstr.hrc:503
 msgctxt "STR_PERCENT"
 msgid "Percent"
 msgstr "Canran"
 
-#: globstr.hrc:511
+#: sc/inc/globstr.hrc:504
 msgctxt "STR_CURRENCY"
 msgid "Currency"
 msgstr "Arian"
 
-#: globstr.hrc:512
+#: sc/inc/globstr.hrc:505
 msgctxt "STR_DATE"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: globstr.hrc:513
+#: sc/inc/globstr.hrc:506
 msgctxt "STR_TIME"
 msgid "Time"
 msgstr "Amser"
 
-#: globstr.hrc:514
+#: sc/inc/globstr.hrc:507
 msgctxt "STR_SCIENTIFIC"
 msgid "Scientific"
 msgstr "Gwyddonol"
 
-#: globstr.hrc:515
+#: sc/inc/globstr.hrc:508
 msgctxt "STR_FRACTION"
 msgid "Fraction"
 msgstr "Ffracsiwn"
 
-#: globstr.hrc:516
+#: sc/inc/globstr.hrc:509
 msgctxt "STR_BOOLEAN_VALUE"
 msgid "Boolean Value"
 msgstr "Gwerth Boole"
 
-#: globstr.hrc:517
+#: sc/inc/globstr.hrc:510
 msgctxt "STR_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: globstr.hrc:518
+#: sc/inc/globstr.hrc:511
 msgctxt "STR_QUERY_PIVOTTABLE_DELTAB"
 msgid "The selected sheet(s) contain source data of related pivot tables that will be lost. Are you sure you want to delete the selected sheet(s)?"
 msgstr "Mae'r ddalen yn cynnwys data ffynhonnell tablau perthynol troi fydd yn cael eu colli. Ydych chi'n siŵr eich bod am ddileu'r ddalen?"
 
-#: globstr.hrc:519
+#: sc/inc/globstr.hrc:512
 msgctxt "STR_ERR_NAME_INVALID_CELL_REF"
 msgid "Invalid name. Reference to a cell, or a range of cells not allowed."
 msgstr "Enw annilys. Nid oes caniatâd i gyfeirio at gell, neu ystod o gellau."
 
-#: pvfundlg.hrc:27
+#: sc/inc/pvfundlg.hrc:27
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "Sum"
 msgstr "Swm"
 
-#: pvfundlg.hrc:28
+#: sc/inc/pvfundlg.hrc:28
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: pvfundlg.hrc:29
+#: sc/inc/pvfundlg.hrc:29
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "Average"
 msgstr "Cyfartaledd"
 
-#: pvfundlg.hrc:30
+#: sc/inc/pvfundlg.hrc:30
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "Median"
 msgstr "Canolrif"
 
-#: pvfundlg.hrc:31
+#: sc/inc/pvfundlg.hrc:31
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "Max"
 msgstr "Mwyaf"
 
-#: pvfundlg.hrc:32
+#: sc/inc/pvfundlg.hrc:32
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "Min"
 msgstr "Lleiaf"
 
-#: pvfundlg.hrc:33
+#: sc/inc/pvfundlg.hrc:33
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "Product"
 msgstr "Cynnyrch"
 
-#: pvfundlg.hrc:34
+#: sc/inc/pvfundlg.hrc:34
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "Count (Numbers only)"
 msgstr "Cyfrif (Rhifau yn unig)"
 
-#: pvfundlg.hrc:35
+#: sc/inc/pvfundlg.hrc:35
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "StDev (Sample)"
 msgstr "StDev (Enghraifft)"
 
-#: pvfundlg.hrc:36
+#: sc/inc/pvfundlg.hrc:36
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "StDevP (Population)"
 msgstr "StDevP (Poblogaeth)"
 
-#: pvfundlg.hrc:37
+#: sc/inc/pvfundlg.hrc:37
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "Var (Sample)"
 msgstr "Var (Enghraifft)"
 
-#: pvfundlg.hrc:38
+#: sc/inc/pvfundlg.hrc:38
 msgctxt "SCSTR_DPFUNCLISTBOX"
 msgid "VarP (Population)"
 msgstr "VarP (Poblogaeth)"
 
 #. ERRORS -----------------------------------------------------
-#: scerrors.hrc:30
+#: sc/inc/scerrors.hrc:30
 msgctxt "RID_ERRHDLSC"
 msgid "Impossible to connect to the file."
 msgstr "Amhosibl cysylltu â'r ffeil."
 
-#: scerrors.hrc:32
+#: sc/inc/scerrors.hrc:32
 msgctxt "RID_ERRHDLSC"
 msgid "File could not be opened."
 msgstr "Methu agor y ffeil."
 
-#: scerrors.hrc:34
+#: sc/inc/scerrors.hrc:34
 msgctxt "RID_ERRHDLSC"
 msgid "An unknown error has occurred."
 msgstr "Digwyddodd gwall anhysbys."
 
-#: scerrors.hrc:36
+#: sc/inc/scerrors.hrc:36
 msgctxt "RID_ERRHDLSC"
 msgid "Not enough memory while importing."
 msgstr "Dim digon o gof wrth fewnforio."
 
-#: scerrors.hrc:38
+#: sc/inc/scerrors.hrc:38
 msgctxt "RID_ERRHDLSC"
 msgid "Unknown Lotus1-2-3 file format."
 msgstr "Fformat ffeil Lotus 1-2-3 anhysbys."
 
-#: scerrors.hrc:40
+#: sc/inc/scerrors.hrc:40
 msgctxt "RID_ERRHDLSC"
 msgid "Error in file structure while importing."
 msgstr "Gwall yn strwythur ffeil wrth fewnforio."
 
-#: scerrors.hrc:42
+#: sc/inc/scerrors.hrc:42
 msgctxt "RID_ERRHDLSC"
 msgid "There is no filter available for this file type."
 msgstr "Dim hidlau ar gael ar gyfer y math yma o ffeil."
 
-#: scerrors.hrc:44
+#: sc/inc/scerrors.hrc:44
 msgctxt "RID_ERRHDLSC"
 msgid "Unknown or unsupported Excel file format."
 msgstr "Fformat ffeil Excel anhysbys neu heb ei gynnal."
 
-#: scerrors.hrc:46
+#: sc/inc/scerrors.hrc:46
 msgctxt "RID_ERRHDLSC"
 msgid "Excel file format not yet implemented."
 msgstr "Fformat ffeil Excel heb ei weithredu."
 
-#: scerrors.hrc:48
+#: sc/inc/scerrors.hrc:48
 msgctxt "RID_ERRHDLSC"
 msgid "This file is password-protected."
 msgstr "Mae'r ffeil wedi ei ddiogelu gan gyfrinair."
 
-#: scerrors.hrc:50
+#: sc/inc/scerrors.hrc:50
 msgctxt "RID_ERRHDLSC"
 msgid "Internal import error."
 msgstr "Gwall mewnforio mewnol."
 
-#: scerrors.hrc:52
+#: sc/inc/scerrors.hrc:52
 msgctxt "RID_ERRHDLSC"
 msgid "The file contains data after row 8192 and therefore can not be read."
 msgstr "Mae'r ffeil yn cynnwys data ar ôl rhes 8192 ac felly nid oes modd ei ddarllen."
 
-#: scerrors.hrc:54 /home/cl/vc/git/libo-core/sc/inc/scerrors.hrc:102
+#: sc/inc/scerrors.hrc:54 sc/inc/scerrors.hrc:102
 msgctxt "RID_ERRHDLSC"
 msgid "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."
 msgstr "Gwall fformatio wedi ei ganfod yn y ffeil yn is ddogfen $(ARG1) yn $(ARG2)(rhes,col)."
 
-#: scerrors.hrc:56
+#: sc/inc/scerrors.hrc:56
 msgctxt "RID_ERRHDLSC"
 msgid "File format error found at $(ARG1)(row,col)."
 msgstr "Gwall fformatio wedi ei ganfod yn $(ARG1)(rhes,col)."
 
 #. Export ----------------------------------------------------
-#: scerrors.hrc:60
+#: sc/inc/scerrors.hrc:60
 msgctxt "RID_ERRHDLSC"
 msgid "Connection to the file could not be established."
 msgstr "Methu creu cysylltiad â'r ffeil."
 
-#: scerrors.hrc:62
+#: sc/inc/scerrors.hrc:62
 msgctxt "RID_ERRHDLSC"
 msgid "Data could not be written."
 msgstr "Methu ysgrifennu'r data."
 
-#: scerrors.hrc:64
+#: sc/inc/scerrors.hrc:64
 msgctxt "RID_ERRHDLSC"
 msgid "$(ARG1)"
 msgstr "$(ARG1)"
 
-#: scerrors.hrc:66
+#: sc/inc/scerrors.hrc:66
 msgctxt "RID_ERRHDLSC"
 msgid "Cell $(ARG1) contains characters that are not representable in the selected target character set \"$(ARG2)\"."
 msgstr "Mae cell $(ARG1) yn cynnwys nod nad oes modd eu hatgynhyrchu yn y set nod dewiswyd \"$(ARG2)\"."
 
-#: scerrors.hrc:68
+#: sc/inc/scerrors.hrc:68
 msgctxt "RID_ERRHDLSC"
 msgid "Cell $(ARG1) contains a string that is longer in the selected target character set \"$(ARG2)\" than the given field width."
 msgstr "Mae Cell $(ARG1) yn cynnwys llinyn sy'n hirach yn y set nod targed \"$(ARG2)\" nag yn y lled maes gosodedig."
 
 #. WARNINGS ---------------------------------------------------
-#: scerrors.hrc:72
+#: sc/inc/scerrors.hrc:72
 msgctxt "RID_ERRHDLSC"
 msgid "Only the active sheet was saved."
 msgstr "Dim ond y ddalen weithredol oedd modd ei chadw."
 
-#: scerrors.hrc:74
+#: sc/inc/scerrors.hrc:74
 msgctxt "RID_ERRHDLSC"
 msgid "The maximum number of rows has been exceeded. Excess rows were not imported!"
 msgstr "Wedi mynd dros yr uchafswm o resi. Heb fewnforio'r rhesi gormodedd!"
 
-#: scerrors.hrc:76
+#: sc/inc/scerrors.hrc:76
 msgctxt "RID_ERRHDLSC"
 msgid "The data could not be loaded completely because the maximum number of rows per sheet was exceeded."
 msgstr "Methu mewnforio'r data i gyd oherwydd fod yna ormod o resi i'r ddalen."
 
-#: scerrors.hrc:78
+#: sc/inc/scerrors.hrc:78
 msgctxt "RID_ERRHDLSC"
 msgid "The data could not be loaded completely because the maximum number of columns per sheet was exceeded."
 msgstr "Methu llwytho'r data'n llawn oherwydd fod yna ormod o golofnau i'r ddalen."
 
-#: scerrors.hrc:80
+#: sc/inc/scerrors.hrc:80
 msgctxt "RID_ERRHDLSC"
 msgid ""
 "Not all sheets have been loaded because the maximum number of sheets was exceeded.\n"
@@ -2785,27 +2740,27 @@ msgstr ""
 "\n"
 "Cofiwch y bydd ail lwytho'r ddogfen yn dileu'n barhaol y taenlenni chafodd ddim eu llwytho!"
 
-#: scerrors.hrc:82
+#: sc/inc/scerrors.hrc:82
 msgctxt "RID_ERRHDLSC"
 msgid "The data could not be loaded completely because the maximum number of characters per cell was exceeded."
 msgstr "Nid oedd modd llwytho'r data yn gyflawn gan fod yr uchafswm nifer y nodau ar gyfer pob cell wedi ei ragori."
 
-#: scerrors.hrc:84
+#: sc/inc/scerrors.hrc:84
 msgctxt "RID_ERRHDLSC"
 msgid "Corresponding FM3-File could not be opened."
 msgstr "Methu agor ffeil y FM3-File cyfatebol."
 
-#: scerrors.hrc:86
+#: sc/inc/scerrors.hrc:86
 msgctxt "RID_ERRHDLSC"
 msgid "Error in file structure of corresponding FM3-File."
 msgstr "Gwall yn strwythur y ffeil FM3-File cyfatebol."
 
-#: scerrors.hrc:88
+#: sc/inc/scerrors.hrc:88
 msgctxt "RID_ERRHDLSC"
 msgid "Document too complex for automatic calculation. Press F9 to recalculate."
 msgstr "Mae'r ddogfen yn rhy gymhleth ar gyfer cyfrifo awtomatig. Pwyswch F9 i ail gyfrifo."
 
-#: scerrors.hrc:90
+#: sc/inc/scerrors.hrc:90
 msgctxt "RID_ERRHDLSC"
 msgid ""
 "The document contains more rows than supported in the selected format.\n"
@@ -2814,7 +2769,7 @@ msgstr ""
 "Mae'r ddogfen yn cynnwys mwy o resi nag sy'n cael ei gynnal yn y fformat hwn.\n"
 "Nid yw'r rhesi ychwanegol wedi eu cadw."
 
-#: scerrors.hrc:92
+#: sc/inc/scerrors.hrc:92
 msgctxt "RID_ERRHDLSC"
 msgid ""
 "The document contains more columns than supported in the selected format.\n"
@@ -2823,7 +2778,7 @@ msgstr ""
 "Mae'r ddogfen yn cynnwys mwy o golofnau na mae'r fformat hwn yn ei gynnal.\n"
 "Nid yw'r colofnau ychwanegol wedi eu cadw."
 
-#: scerrors.hrc:94
+#: sc/inc/scerrors.hrc:94
 msgctxt "RID_ERRHDLSC"
 msgid ""
 "The document contains more sheets than supported in the selected format.\n"
@@ -2832,7 +2787,7 @@ msgstr ""
 "Mae'r ddogfen yn cynnwys mwy o ddalenni na mae'r fformat hwn yn ei gynnal.\n"
 "Nid yw'r colofnau ychwanegol wedi eu cadw."
 
-#: scerrors.hrc:96
+#: sc/inc/scerrors.hrc:96
 msgctxt "RID_ERRHDLSC"
 msgid ""
 "The document contains information not recognized by this program version.\n"
@@ -2841,12 +2796,12 @@ msgstr ""
 "Mae'r ddogfen yn cynnwys gwybodaeth nad yw'r fersiwn yma o'r rhaglen yn ei adnabod.\n"
 "Bydd ail gadw'r ddogfen yn dileu'r wybodaeth!"
 
-#: scerrors.hrc:98
+#: sc/inc/scerrors.hrc:98
 msgctxt "RID_ERRHDLSC"
 msgid "Not all cell contents could be saved in the specified format."
 msgstr "Methu cadw'r holl gynnwys y celloedd yn y fformat hwn."
 
-#: scerrors.hrc:100
+#: sc/inc/scerrors.hrc:100
 msgctxt "RID_ERRHDLSC"
 msgid ""
 "The following characters could not be converted to the selected character set\n"
@@ -2859,927 +2814,927 @@ msgstr ""
 "\n"
 "$(ARG1)"
 
-#: scerrors.hrc:104
+#: sc/inc/scerrors.hrc:104
 msgctxt "RID_ERRHDLSC"
 msgid "Not all attributes could be read."
 msgstr "Methu darllen yr holl briodoleddau."
 
-#: scfuncs.hrc:37
+#: sc/inc/scfuncs.hrc:37
 msgctxt "SC_OPCODE_DB_COUNT"
 msgid "Counts the cells of a data range whose contents match the search criteria."
 msgstr "Cyfrif celloedd ystod data y mae eu cynnwys yn cydweddu â'r maen prawf chwilio."
 
-#: scfuncs.hrc:38
+#: sc/inc/scfuncs.hrc:38
 msgctxt "SC_OPCODE_DB_COUNT"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:39
+#: sc/inc/scfuncs.hrc:39
 msgctxt "SC_OPCODE_DB_COUNT"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:40
+#: sc/inc/scfuncs.hrc:40
 msgctxt "SC_OPCODE_DB_COUNT"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:41
+#: sc/inc/scfuncs.hrc:41
 msgctxt "SC_OPCODE_DB_COUNT"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:42
+#: sc/inc/scfuncs.hrc:42
 msgctxt "SC_OPCODE_DB_COUNT"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:43
+#: sc/inc/scfuncs.hrc:43
 msgctxt "SC_OPCODE_DB_COUNT"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:49
+#: sc/inc/scfuncs.hrc:49
 msgctxt "SC_OPCODE_DB_COUNT_2"
 msgid "Counts all non-blank cells of a data range where the content corresponds to the search criteria."
 msgstr "Cyfrif pob cell anwag o'r ystod data lle mae'r cynnwys yn cyfateb i'r meini prawf chwilio."
 
-#: scfuncs.hrc:50
+#: sc/inc/scfuncs.hrc:50
 msgctxt "SC_OPCODE_DB_COUNT_2"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:51
+#: sc/inc/scfuncs.hrc:51
 msgctxt "SC_OPCODE_DB_COUNT_2"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:52
+#: sc/inc/scfuncs.hrc:52
 msgctxt "SC_OPCODE_DB_COUNT_2"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:53
+#: sc/inc/scfuncs.hrc:53
 msgctxt "SC_OPCODE_DB_COUNT_2"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:54
+#: sc/inc/scfuncs.hrc:54
 msgctxt "SC_OPCODE_DB_COUNT_2"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:55
+#: sc/inc/scfuncs.hrc:55
 msgctxt "SC_OPCODE_DB_COUNT_2"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:61
+#: sc/inc/scfuncs.hrc:61
 msgctxt "SC_OPCODE_DB_AVERAGE"
 msgid "Returns the average value of all the cells of a data range whose contents match the search criteria."
 msgstr "Dychwelyd y gwerth cyfartalog o holl gelloedd yr ystod data y mae eu cynnwys yn cydweddu â'r meini prawf chwilio."
 
-#: scfuncs.hrc:62
+#: sc/inc/scfuncs.hrc:62
 msgctxt "SC_OPCODE_DB_AVERAGE"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:63
+#: sc/inc/scfuncs.hrc:63
 msgctxt "SC_OPCODE_DB_AVERAGE"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:64
+#: sc/inc/scfuncs.hrc:64
 msgctxt "SC_OPCODE_DB_AVERAGE"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:65
+#: sc/inc/scfuncs.hrc:65
 msgctxt "SC_OPCODE_DB_AVERAGE"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:66
+#: sc/inc/scfuncs.hrc:66
 msgctxt "SC_OPCODE_DB_AVERAGE"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:67
+#: sc/inc/scfuncs.hrc:67
 msgctxt "SC_OPCODE_DB_AVERAGE"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:73
+#: sc/inc/scfuncs.hrc:73
 msgctxt "SC_OPCODE_DB_GET"
 msgid "Defines the contents of the cell of a data range which matches the search criteria."
 msgstr "Diffinio cynnwys celloedd yr ystod data sy'n cydweddu â'r meini prawf chwilio."
 
-#: scfuncs.hrc:74
+#: sc/inc/scfuncs.hrc:74
 msgctxt "SC_OPCODE_DB_GET"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:75
+#: sc/inc/scfuncs.hrc:75
 msgctxt "SC_OPCODE_DB_GET"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:76
+#: sc/inc/scfuncs.hrc:76
 msgctxt "SC_OPCODE_DB_GET"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:77
+#: sc/inc/scfuncs.hrc:77
 msgctxt "SC_OPCODE_DB_GET"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:78
+#: sc/inc/scfuncs.hrc:78
 msgctxt "SC_OPCODE_DB_GET"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:79
+#: sc/inc/scfuncs.hrc:79
 msgctxt "SC_OPCODE_DB_GET"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:85
+#: sc/inc/scfuncs.hrc:85
 msgctxt "SC_OPCODE_DB_MAX"
 msgid "Returns the maximum value from all of the cells of a data range which correspond to the search criteria."
 msgstr "Dychwelyd y gwerth mwyaf o holl gelloedd ystod data sy'n cyfateb i'r meini prawf chwilio."
 
-#: scfuncs.hrc:86
+#: sc/inc/scfuncs.hrc:86
 msgctxt "SC_OPCODE_DB_MAX"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:87
+#: sc/inc/scfuncs.hrc:87
 msgctxt "SC_OPCODE_DB_MAX"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:88
+#: sc/inc/scfuncs.hrc:88
 msgctxt "SC_OPCODE_DB_MAX"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:89
+#: sc/inc/scfuncs.hrc:89
 msgctxt "SC_OPCODE_DB_MAX"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:90
+#: sc/inc/scfuncs.hrc:90
 msgctxt "SC_OPCODE_DB_MAX"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:91
+#: sc/inc/scfuncs.hrc:91
 msgctxt "SC_OPCODE_DB_MAX"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:97
+#: sc/inc/scfuncs.hrc:97
 msgctxt "SC_OPCODE_DB_MIN"
 msgid "Returns the minimum of all cells of a data range where the contents correspond to the search criteria."
 msgstr "Dychwelyd lleiafswm celloedd ystod data lle mae'r cynnwys yn cyfateb i'r meini prawf chwilio."
 
-#: scfuncs.hrc:98
+#: sc/inc/scfuncs.hrc:98
 msgctxt "SC_OPCODE_DB_MIN"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:99
+#: sc/inc/scfuncs.hrc:99
 msgctxt "SC_OPCODE_DB_MIN"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:100
+#: sc/inc/scfuncs.hrc:100
 msgctxt "SC_OPCODE_DB_MIN"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:101
+#: sc/inc/scfuncs.hrc:101
 msgctxt "SC_OPCODE_DB_MIN"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:102
+#: sc/inc/scfuncs.hrc:102
 msgctxt "SC_OPCODE_DB_MIN"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:103
+#: sc/inc/scfuncs.hrc:103
 msgctxt "SC_OPCODE_DB_MIN"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:109
+#: sc/inc/scfuncs.hrc:109
 msgctxt "SC_OPCODE_DB_PRODUCT"
 msgid "Multiplies all cells of a data range where the contents match the search criteria."
 msgstr "Dychwelyd y gwerth cyfartalog o holl gelloedd yr ystod data y mae eu cynnwys yn cydweddu â'r meini prawf chwilio."
 
-#: scfuncs.hrc:110
+#: sc/inc/scfuncs.hrc:110
 msgctxt "SC_OPCODE_DB_PRODUCT"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:111
+#: sc/inc/scfuncs.hrc:111
 msgctxt "SC_OPCODE_DB_PRODUCT"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:112
+#: sc/inc/scfuncs.hrc:112
 msgctxt "SC_OPCODE_DB_PRODUCT"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:113
+#: sc/inc/scfuncs.hrc:113
 msgctxt "SC_OPCODE_DB_PRODUCT"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:114
+#: sc/inc/scfuncs.hrc:114
 msgctxt "SC_OPCODE_DB_PRODUCT"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:115
+#: sc/inc/scfuncs.hrc:115
 msgctxt "SC_OPCODE_DB_PRODUCT"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:121
+#: sc/inc/scfuncs.hrc:121
 msgctxt "SC_OPCODE_DB_STD_DEV"
 msgid "Calculates the standard deviation of all cells in a data range whose contents match the search criteria."
 msgstr "Cyfrifo'r gwyriad safonol pob cell mewn ystod data y mae eu cynnwys yn cyfateb i'r meini prawf chwilio."
 
-#: scfuncs.hrc:122
+#: sc/inc/scfuncs.hrc:122
 msgctxt "SC_OPCODE_DB_STD_DEV"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:123
+#: sc/inc/scfuncs.hrc:123
 msgctxt "SC_OPCODE_DB_STD_DEV"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:124
+#: sc/inc/scfuncs.hrc:124
 msgctxt "SC_OPCODE_DB_STD_DEV"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:125
+#: sc/inc/scfuncs.hrc:125
 msgctxt "SC_OPCODE_DB_STD_DEV"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:126
+#: sc/inc/scfuncs.hrc:126
 msgctxt "SC_OPCODE_DB_STD_DEV"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:127
+#: sc/inc/scfuncs.hrc:127
 msgctxt "SC_OPCODE_DB_STD_DEV"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:133
+#: sc/inc/scfuncs.hrc:133
 msgctxt "SC_OPCODE_DB_STD_DEV_P"
 msgid "Returns the standard deviation with regards to the population of all cells of a data range matching the search criteria."
 msgstr "Dychwelyd y gwyriad safonol mewn perthynas â phoblogaeth pob cell yr ystod data sy'n cyfateb i'r meini prawf chwilio."
 
-#: scfuncs.hrc:134
+#: sc/inc/scfuncs.hrc:134
 msgctxt "SC_OPCODE_DB_STD_DEV_P"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:135
+#: sc/inc/scfuncs.hrc:135
 msgctxt "SC_OPCODE_DB_STD_DEV_P"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:136
+#: sc/inc/scfuncs.hrc:136
 msgctxt "SC_OPCODE_DB_STD_DEV_P"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:137
+#: sc/inc/scfuncs.hrc:137
 msgctxt "SC_OPCODE_DB_STD_DEV_P"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:138
+#: sc/inc/scfuncs.hrc:138
 msgctxt "SC_OPCODE_DB_STD_DEV_P"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:139
+#: sc/inc/scfuncs.hrc:139
 msgctxt "SC_OPCODE_DB_STD_DEV_P"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:145
+#: sc/inc/scfuncs.hrc:145
 msgctxt "SC_OPCODE_DB_SUM"
 msgid "Adds all the cells of a data range where the contents match the search criteria."
 msgstr "Dychwelyd y gwerth cyfartalog o holl gelloedd yr ystod data y mae eu cynnwys yn cydweddu â'r meini prawf chwilio."
 
-#: scfuncs.hrc:146
+#: sc/inc/scfuncs.hrc:146
 msgctxt "SC_OPCODE_DB_SUM"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:147
+#: sc/inc/scfuncs.hrc:147
 msgctxt "SC_OPCODE_DB_SUM"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:148
+#: sc/inc/scfuncs.hrc:148
 msgctxt "SC_OPCODE_DB_SUM"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:149
+#: sc/inc/scfuncs.hrc:149
 msgctxt "SC_OPCODE_DB_SUM"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:150
+#: sc/inc/scfuncs.hrc:150
 msgctxt "SC_OPCODE_DB_SUM"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:151
+#: sc/inc/scfuncs.hrc:151
 msgctxt "SC_OPCODE_DB_SUM"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:157
+#: sc/inc/scfuncs.hrc:157
 msgctxt "SC_OPCODE_DB_VAR"
 msgid "Determines the variance of all the cells in a data range where the contents match the search criteria."
 msgstr "Pennu ystod pob cell yn yr ystod data lle mae'r cynnwys yn cyfateb i'r meini prawf."
 
-#: scfuncs.hrc:158
+#: sc/inc/scfuncs.hrc:158
 msgctxt "SC_OPCODE_DB_VAR"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:159
+#: sc/inc/scfuncs.hrc:159
 msgctxt "SC_OPCODE_DB_VAR"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:160
+#: sc/inc/scfuncs.hrc:160
 msgctxt "SC_OPCODE_DB_VAR"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:161
+#: sc/inc/scfuncs.hrc:161
 msgctxt "SC_OPCODE_DB_VAR"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:162
+#: sc/inc/scfuncs.hrc:162
 msgctxt "SC_OPCODE_DB_VAR"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:163
+#: sc/inc/scfuncs.hrc:163
 msgctxt "SC_OPCODE_DB_VAR"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:169
+#: sc/inc/scfuncs.hrc:169
 msgctxt "SC_OPCODE_DB_VAR_P"
 msgid "Determines variance of a population based on all cells in a data range where contents match the search criteria."
 msgstr "Pennu'r o amrywiad o boblogaeth yn seiliedig ar bob cell mewn ystod data lle mae'r cynnwys yn cyfateb i'r meini prawf chwilio."
 
-#: scfuncs.hrc:170
+#: sc/inc/scfuncs.hrc:170
 msgctxt "SC_OPCODE_DB_VAR_P"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: scfuncs.hrc:171
+#: sc/inc/scfuncs.hrc:171
 msgctxt "SC_OPCODE_DB_VAR_P"
 msgid "The range of cells containing data."
 msgstr "Ystod celloedd sy'n cynnwys data."
 
-#: scfuncs.hrc:172
+#: sc/inc/scfuncs.hrc:172
 msgctxt "SC_OPCODE_DB_VAR_P"
 msgid "Database field"
 msgstr "Maes cronfa ddata"
 
-#: scfuncs.hrc:173
+#: sc/inc/scfuncs.hrc:173
 msgctxt "SC_OPCODE_DB_VAR_P"
 msgid "Indicates which database field (column) is to be used for the search criteria."
 msgstr "Dangos pa faes cronfa ddata (colofn) i'w ddefnyddio ar gyfer y meini prawf chwilio."
 
-#: scfuncs.hrc:174
+#: sc/inc/scfuncs.hrc:174
 msgctxt "SC_OPCODE_DB_VAR_P"
 msgid "Search criteria"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:175
+#: sc/inc/scfuncs.hrc:175
 msgctxt "SC_OPCODE_DB_VAR_P"
 msgid "Defines the cell range containing the search criteria."
 msgstr "Diffinio ystod celloedd sy'n cynnwys y meini prawf chwilio."
 
-#: scfuncs.hrc:181
+#: sc/inc/scfuncs.hrc:181
 msgctxt "SC_OPCODE_GET_DATE"
 msgid "Provides an internal number for the date given."
 msgstr "Darparu rhif mewnol ar gyfer y dyddiad rhoddwyd."
 
-#: scfuncs.hrc:182
+#: sc/inc/scfuncs.hrc:182
 msgctxt "SC_OPCODE_GET_DATE"
 msgid "Year"
 msgstr "Blwyddyn"
 
-#: scfuncs.hrc:183
+#: sc/inc/scfuncs.hrc:183
 msgctxt "SC_OPCODE_GET_DATE"
 msgid "An integer between 1583 and 9956 or 0 and 99 (19xx or 20xx depending on the defined option)."
 msgstr "Cyfanrif rhwng 1583 a 9956 neu 0 a 99 (19xx a 20xx yn ddibynnol ar y dewisiadau diffiniwyd)."
 
-#: scfuncs.hrc:184
+#: sc/inc/scfuncs.hrc:184
 msgctxt "SC_OPCODE_GET_DATE"
 msgid "Month"
 msgstr "Mis"
 
-#: scfuncs.hrc:185
+#: sc/inc/scfuncs.hrc:185
 msgctxt "SC_OPCODE_GET_DATE"
 msgid "An integer between 1 and 12 representing the month."
 msgstr "Cyfanrif rhwng 1 a 12 yn cynrychioli'r mis."
 
-#: scfuncs.hrc:186
+#: sc/inc/scfuncs.hrc:186
 msgctxt "SC_OPCODE_GET_DATE"
 msgid "Day"
 msgstr "Diwrnod"
 
-#: scfuncs.hrc:187
+#: sc/inc/scfuncs.hrc:187
 msgctxt "SC_OPCODE_GET_DATE"
 msgid "An integer between 1 and 31 representing the day of the month."
 msgstr "Cyfanrif rhwng 1 a 31 yn cynrychioli diwrnod y mis."
 
-#: scfuncs.hrc:193
+#: sc/inc/scfuncs.hrc:193
 msgctxt "SC_OPCODE_GET_DATE_VALUE"
 msgid "Returns an internal number for a text having a possible date format."
 msgstr "Dychwelyd rhif mewnol fel testun sydd â'r posibilrwydd o fformat dyddiad."
 
-#: scfuncs.hrc:194
+#: sc/inc/scfuncs.hrc:194
 msgctxt "SC_OPCODE_GET_DATE_VALUE"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:195
+#: sc/inc/scfuncs.hrc:195
 msgctxt "SC_OPCODE_GET_DATE_VALUE"
 msgid "A text enclosed in quotation marks which returns a date in a %PRODUCTNAME date format."
 msgstr "Testun sydd wedi ei amgáu gan ddyfynodau sy'n dychwelyd dyddiad yn fformat dyddiad %PRODUCTNAME."
 
-#: scfuncs.hrc:201
+#: sc/inc/scfuncs.hrc:201
 msgctxt "SC_OPCODE_GET_DAY"
 msgid "Returns the sequential date of the month as an integer (1-31) in relation to the date value."
 msgstr "Dychwelyd dyddiad dilyniadol mis fel cyfanrif (1-31) mewn perthynas â gwerth dyddiad."
 
-#: scfuncs.hrc:202
+#: sc/inc/scfuncs.hrc:202
 msgctxt "SC_OPCODE_GET_DAY"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:203
+#: sc/inc/scfuncs.hrc:203
 msgctxt "SC_OPCODE_GET_DAY"
 msgid "The internal number for the date."
 msgstr "Rhif mewnol ar gyfer y dyddiad."
 
-#: scfuncs.hrc:209
+#: sc/inc/scfuncs.hrc:209
 msgctxt "SC_OPCODE_GET_DIFF_DATE_360"
 msgid "Calculates the number of days between two dates based on a 360-day year."
 msgstr "Cyfrifo'r nifer o ddyddiau rhwng dau ddyddiad yn seiliedig ar flwyddyn o 360 niwrnod."
 
-#: scfuncs.hrc:210
+#: sc/inc/scfuncs.hrc:210
 msgctxt "SC_OPCODE_GET_DIFF_DATE_360"
 msgid "Date 1"
 msgstr "Dyddiad 1"
 
-#: scfuncs.hrc:211
+#: sc/inc/scfuncs.hrc:211
 msgctxt "SC_OPCODE_GET_DIFF_DATE_360"
 msgid "The start date for calculating the difference in days."
 msgstr "Dyddiad cychwyn ar gyfer cyfrifo'r gwahaniaeth mewn dyddiau."
 
-#: scfuncs.hrc:212
+#: sc/inc/scfuncs.hrc:212
 msgctxt "SC_OPCODE_GET_DIFF_DATE_360"
 msgid "Date 2"
 msgstr "Dyddiad 2"
 
-#: scfuncs.hrc:213
+#: sc/inc/scfuncs.hrc:213
 msgctxt "SC_OPCODE_GET_DIFF_DATE_360"
 msgid "The end date for calculating the difference in days."
 msgstr "Dyddiad diwedd ar gyfer cyfrifo'r gwahaniaeth mewn dyddiau."
 
-#: scfuncs.hrc:214
+#: sc/inc/scfuncs.hrc:214
 msgctxt "SC_OPCODE_GET_DIFF_DATE_360"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:215
+#: sc/inc/scfuncs.hrc:215
 msgctxt "SC_OPCODE_GET_DIFF_DATE_360"
 msgid "Method used to form differences: Type = 0 denotes US method (NASD), Type = 1 denotes the European method."
 msgstr "Ddull defnyddir i ffurfio gwahaniaethau: Math = 0 yn dynodi dull UDA (NASD), Math = 1 yn dynodi'r dull Ewropeaidd."
 
-#: scfuncs.hrc:221
+#: sc/inc/scfuncs.hrc:221
 msgctxt "SC_OPCODE_NETWORKDAYS"
 msgid "Returns the number of workdays between two dates using arguments to indicate weekenddays and holidays."
 msgstr "Dychwelyd y nifer o ddyddiau gwaith rhwng ddau ddyddiad gan ddefnyddio ymresymiadau i ddynodi dyddiau'r penwythnos a gwyliau."
 
-#: scfuncs.hrc:222
+#: sc/inc/scfuncs.hrc:222
 msgctxt "SC_OPCODE_NETWORKDAYS"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: scfuncs.hrc:223
+#: sc/inc/scfuncs.hrc:223
 msgctxt "SC_OPCODE_NETWORKDAYS"
 msgid "Start date for calculation."
 msgstr "Dyddiad cychwyn cyfrifo."
 
-#: scfuncs.hrc:224
+#: sc/inc/scfuncs.hrc:224
 msgctxt "SC_OPCODE_NETWORKDAYS"
 msgid "End date"
 msgstr "Dyddiad gorffen"
 
-#: scfuncs.hrc:225
+#: sc/inc/scfuncs.hrc:225
 msgctxt "SC_OPCODE_NETWORKDAYS"
 msgid "End date for calculation."
 msgstr "Dyddiad gorffen cyfrifo."
 
-#: scfuncs.hrc:226
+#: sc/inc/scfuncs.hrc:226
 msgctxt "SC_OPCODE_NETWORKDAYS"
 msgid "List of dates"
 msgstr "Rhestr dyddiadau"
 
-#: scfuncs.hrc:227
+#: sc/inc/scfuncs.hrc:227
 msgctxt "SC_OPCODE_NETWORKDAYS"
 msgid "Optional set of one or more dates to be considered as holiday."
 msgstr "Set dewisol o un neu ragor o ddyddiadau y mae modd eu hystyried fel gwyliau."
 
-#: scfuncs.hrc:228
+#: sc/inc/scfuncs.hrc:228
 msgctxt "SC_OPCODE_NETWORKDAYS"
 msgid "Array"
 msgstr "Arae"
 
-#: scfuncs.hrc:229
+#: sc/inc/scfuncs.hrc:229
 msgctxt "SC_OPCODE_NETWORKDAYS"
 msgid "Optional list of numbers to indicate working (0) and weekend (non-zero) days. When omitted, weekend is Saturday and Sunday."
 msgstr "Rhestr ddewisol o rifau'n dynodi dyddiau gwaith (0) a phenwythnos (nid sero). Pan yn cael eu hepgor y penwythnos yw'r Sadwrn a'r Sul."
 
-#: scfuncs.hrc:235
+#: sc/inc/scfuncs.hrc:235
 msgctxt "SC_OPCODE_NETWORKDAYS_MS"
 msgid "Returns the number of workdays between two dates using arguments to indicate weekend days and holidays."
 msgstr "Dychwelyd y nifer o ddyddiau gwaith rhwng dau ddyddiad gan ddefnyddio ymresymiadau i ddangos dyddiau penwythnos a gwyliau."
 
-#: scfuncs.hrc:236
+#: sc/inc/scfuncs.hrc:236
 msgctxt "SC_OPCODE_NETWORKDAYS_MS"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: scfuncs.hrc:237
+#: sc/inc/scfuncs.hrc:237
 msgctxt "SC_OPCODE_NETWORKDAYS_MS"
 msgid "Start date for calculation."
 msgstr "Dyddiad cychwyn cyfrifo."
 
-#: scfuncs.hrc:238
+#: sc/inc/scfuncs.hrc:238
 msgctxt "SC_OPCODE_NETWORKDAYS_MS"
 msgid "End date"
 msgstr "Dyddiad gorffen"
 
-#: scfuncs.hrc:239
+#: sc/inc/scfuncs.hrc:239
 msgctxt "SC_OPCODE_NETWORKDAYS_MS"
 msgid "End date for calculation."
 msgstr "Dyddiad gorffen cyfrifo."
 
-#: scfuncs.hrc:240
+#: sc/inc/scfuncs.hrc:240
 msgctxt "SC_OPCODE_NETWORKDAYS_MS"
 msgid "Number or string"
 msgstr "Nifer o linynnau"
 
-#: scfuncs.hrc:241
+#: sc/inc/scfuncs.hrc:241
 msgctxt "SC_OPCODE_NETWORKDAYS_MS"
 msgid "Optional number or string to indicate when weekends occur. When omitted, weekend is Saturday and Sunday."
 msgstr "Nifer neu linyn dewisol i ddangos pryd mae penwythnos yn digwydd. Os nad, y penwythnos yw dyddiau Sadwrn a Sul."
 
-#: scfuncs.hrc:242
+#: sc/inc/scfuncs.hrc:242
 msgctxt "SC_OPCODE_NETWORKDAYS_MS"
 msgid "Array"
 msgstr "Arae"
 
-#: scfuncs.hrc:243
+#: sc/inc/scfuncs.hrc:243
 msgctxt "SC_OPCODE_NETWORKDAYS_MS"
 msgid "Optional set of one or more dates to be considered as holiday."
 msgstr "Set dewisol o un neu ragor o ddyddiadau y mae modd eu hystyried fel gwyliau."
 
-#: scfuncs.hrc:249
+#: sc/inc/scfuncs.hrc:249
 msgctxt "SC_OPCODE_WORKDAY_MS"
 msgid "Returns the serial number of the date before or after a number of workdays using arguments to indicate weekend days and holidays."
 msgstr "Dychwelyd rhif cyfresol y dyddiad cyn neu ar ôl nifer o ddyddiau gwaith gan ddefnyddio ymresymiadau i ddangos dyddiau penwythnos a gwyliau."
 
-#: scfuncs.hrc:250
+#: sc/inc/scfuncs.hrc:250
 msgctxt "SC_OPCODE_WORKDAY_MS"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: scfuncs.hrc:251
+#: sc/inc/scfuncs.hrc:251
 msgctxt "SC_OPCODE_WORKDAY_MS"
 msgid "Start date for calculation."
 msgstr "Dyddiad cychwyn cyfrifo."
 
-#: scfuncs.hrc:252
+#: sc/inc/scfuncs.hrc:252
 msgctxt "SC_OPCODE_WORKDAY_MS"
 msgid "Days"
 msgstr "Dyddiau"
 
-#: scfuncs.hrc:253
+#: sc/inc/scfuncs.hrc:253
 msgctxt "SC_OPCODE_WORKDAY_MS"
 msgid "The number of workdays before or after start date."
 msgstr "Nifer y dyddiau gwaith cyn neu wedi'r dyddiad cychwyn."
 
-#: scfuncs.hrc:254
+#: sc/inc/scfuncs.hrc:254
 msgctxt "SC_OPCODE_WORKDAY_MS"
 msgid "Number or string"
 msgstr "Nifer y llinynnau"
 
-#: scfuncs.hrc:255
+#: sc/inc/scfuncs.hrc:255
 msgctxt "SC_OPCODE_WORKDAY_MS"
 msgid "Optional number or string to indicate when weekends occur. When omitted, weekend is Saturday and Sunday."
 msgstr "Rhifau neu linyn dewisol i ddangos pryd mae'r penwythnos yn digwydd. Os nad, dyddiau Sadwrn a Sul yw'r penwythnos."
 
-#: scfuncs.hrc:256
+#: sc/inc/scfuncs.hrc:256
 msgctxt "SC_OPCODE_WORKDAY_MS"
 msgid "Array"
 msgstr "Arae"
 
-#: scfuncs.hrc:257
+#: sc/inc/scfuncs.hrc:257
 msgctxt "SC_OPCODE_WORKDAY_MS"
 msgid "Optional set of one or more dates to be considered as holiday."
 msgstr "Set dewisol o un neu ragor o ddyddiadau y mae modd eu hystyried fel gwyliau."
 
-#: scfuncs.hrc:263
+#: sc/inc/scfuncs.hrc:263
 msgctxt "SC_OPCODE_GET_HOUR"
 msgid "Determines the sequential number of the hour of the day (0-23) for the time value."
 msgstr "Pennu rhif dilyniadol awr y dydd (0 - 23) ar gyfer gwerth amser."
 
-#: scfuncs.hrc:264
+#: sc/inc/scfuncs.hrc:264
 msgctxt "SC_OPCODE_GET_HOUR"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:265
+#: sc/inc/scfuncs.hrc:265
 msgctxt "SC_OPCODE_GET_HOUR"
 msgid "Internal time value"
 msgstr "Gwerth amser mewnol"
 
-#: scfuncs.hrc:271
+#: sc/inc/scfuncs.hrc:271
 msgctxt "SC_OPCODE_GET_MIN"
 msgid "Determines the sequential number for the minute of the hour (0-59) for the time value."
 msgstr "Pennu rhif dilyniadol munud yr awr (0-59) ar gyfer gwerth amser."
 
-#: scfuncs.hrc:272
+#: sc/inc/scfuncs.hrc:272
 msgctxt "SC_OPCODE_GET_MIN"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:273
+#: sc/inc/scfuncs.hrc:273
 msgctxt "SC_OPCODE_GET_MIN"
 msgid "Internal time value."
 msgstr "Gwerth amser mewnol."
 
-#: scfuncs.hrc:279
+#: sc/inc/scfuncs.hrc:279
 msgctxt "SC_OPCODE_GET_MONTH"
 msgid "Determines the sequential number of a month of the year (1-12) for the date value."
 msgstr "Pennu'r rhif dilyniadol mis y flwyddyn (1-12) ar gyfer gwerth dyddiad."
 
-#: scfuncs.hrc:280
+#: sc/inc/scfuncs.hrc:280
 msgctxt "SC_OPCODE_GET_MONTH"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:281
+#: sc/inc/scfuncs.hrc:281
 msgctxt "SC_OPCODE_GET_MONTH"
 msgid "The internal number of the date."
 msgstr "Rhif mewnol dyddiad."
 
-#: scfuncs.hrc:287
+#: sc/inc/scfuncs.hrc:287
 msgctxt "SC_OPCODE_GET_ACT_TIME"
 msgid "Determines the current time of the computer."
 msgstr "Pennu amser presennol y cyfrifiadur."
 
-#: scfuncs.hrc:293
+#: sc/inc/scfuncs.hrc:293
 msgctxt "SC_OPCODE_GET_SEC"
 msgid "Determines the sequential number of the second of a minute (0-59) for the time value."
 msgstr "Pennu rhif dilyniadol eiliad y funud (0-59) ar gyfer y gwerth amser."
 
-#: scfuncs.hrc:294
+#: sc/inc/scfuncs.hrc:294
 msgctxt "SC_OPCODE_GET_SEC"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:295
+#: sc/inc/scfuncs.hrc:295
 msgctxt "SC_OPCODE_GET_SEC"
 msgid "The internal time value."
 msgstr "Gwerth amser mewnol."
 
-#: scfuncs.hrc:301
+#: sc/inc/scfuncs.hrc:301
 msgctxt "SC_OPCODE_GET_TIME"
 msgid "Determines a time value from the details for hour, minute and second."
 msgstr "Pennu gwerth amser o fanylion awr, munud a eiliad."
 
-#: scfuncs.hrc:302
+#: sc/inc/scfuncs.hrc:302
 msgctxt "SC_OPCODE_GET_TIME"
 msgid "Hour"
 msgstr "Awr"
 
-#: scfuncs.hrc:303
+#: sc/inc/scfuncs.hrc:303
 msgctxt "SC_OPCODE_GET_TIME"
 msgid "The integer for the hour."
 msgstr "Cyfanrif ar gyfer yr awr."
 
-#: scfuncs.hrc:304
+#: sc/inc/scfuncs.hrc:304
 msgctxt "SC_OPCODE_GET_TIME"
 msgid "Minute"
 msgstr "Munud"
 
-#: scfuncs.hrc:305
+#: sc/inc/scfuncs.hrc:305
 msgctxt "SC_OPCODE_GET_TIME"
 msgid "The integer for the minute."
 msgstr "Cyfanrif ar gyfer y funud."
 
-#: scfuncs.hrc:306
+#: sc/inc/scfuncs.hrc:306
 msgctxt "SC_OPCODE_GET_TIME"
 msgid "Second"
 msgstr "Eiliad"
 
-#: scfuncs.hrc:307
+#: sc/inc/scfuncs.hrc:307
 msgctxt "SC_OPCODE_GET_TIME"
 msgid "The integer for the second."
 msgstr "Cyfanrif ar gyfer yr eiliad."
 
-#: scfuncs.hrc:313
+#: sc/inc/scfuncs.hrc:313
 msgctxt "SC_OPCODE_GET_TIME_VALUE"
 msgid "Returns a sequential number for a text shown in a possible time entry format."
 msgstr "Dychwelyd rhif dilyniannol ar gyfer testun sy'n cael ei ddangos ar gyfer fformat amser posibl."
 
-#: scfuncs.hrc:314
+#: sc/inc/scfuncs.hrc:314
 msgctxt "SC_OPCODE_GET_TIME_VALUE"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:315
+#: sc/inc/scfuncs.hrc:315
 msgctxt "SC_OPCODE_GET_TIME_VALUE"
 msgid "A text enclosed in quotation marks which returns a time in a %PRODUCTNAME time format."
 msgstr "Testun wedi ei amgylchynu gyda dyfynodau sy'n dychwelyd amser mewn fformat amser %PRODUCTNAME."
 
-#: scfuncs.hrc:321
+#: sc/inc/scfuncs.hrc:321
 msgctxt "SC_OPCODE_GET_ACT_DATE"
 msgid "Determines the current date of the computer."
 msgstr "Pennu dyddiad presennol y cyfrifiadur."
 
-#: scfuncs.hrc:327
+#: sc/inc/scfuncs.hrc:327
 msgctxt "SC_OPCODE_GET_DAY_OF_WEEK"
 msgid "Returns the day of the week for the date value as an integer."
 msgstr "Dychwelyd diwrnod yr wythnos ar gyfer gwerth dyddiad fel cyfanrif."
 
-#: scfuncs.hrc:328
+#: sc/inc/scfuncs.hrc:328
 msgctxt "SC_OPCODE_GET_DAY_OF_WEEK"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:329
+#: sc/inc/scfuncs.hrc:329
 msgctxt "SC_OPCODE_GET_DAY_OF_WEEK"
 msgid "The internal number for the date."
 msgstr "Rhif mewnol ar gyfer y dyddiad."
 
-#: scfuncs.hrc:330
+#: sc/inc/scfuncs.hrc:330
 msgctxt "SC_OPCODE_GET_DAY_OF_WEEK"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:331
+#: sc/inc/scfuncs.hrc:331
 msgctxt "SC_OPCODE_GET_DAY_OF_WEEK"
 msgid "Fixes the beginning of the week and the type of calculation to be used."
 msgstr "Gosod dechrau'r wythnos a'r math o gyfrifo i'w ddefnyddio."
 
-#: scfuncs.hrc:337
+#: sc/inc/scfuncs.hrc:337
 msgctxt "SC_OPCODE_GET_YEAR"
 msgid "Returns the year of a date value as an integer."
 msgstr "Dychwelyd blwyddyn gwerth dyddiad fel cyfanrif."
 
-#: scfuncs.hrc:338
+#: sc/inc/scfuncs.hrc:338
 msgctxt "SC_OPCODE_GET_YEAR"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:339
+#: sc/inc/scfuncs.hrc:339
 msgctxt "SC_OPCODE_GET_YEAR"
 msgid "Internal number of the date."
 msgstr "Mewnol rhif dyddiad."
 
-#: scfuncs.hrc:345
+#: sc/inc/scfuncs.hrc:345
 msgctxt "SC_OPCODE_GET_DIFF_DATE"
 msgid "Calculates the number of days between two dates."
 msgstr "Cyfrifo'r nifer o ddyddiau rhwng dau ddyddiad."
 
-#: scfuncs.hrc:346
+#: sc/inc/scfuncs.hrc:346
 msgctxt "SC_OPCODE_GET_DIFF_DATE"
 msgid "Date 2"
 msgstr "Dyddiad 2"
 
-#: scfuncs.hrc:347
+#: sc/inc/scfuncs.hrc:347
 msgctxt "SC_OPCODE_GET_DIFF_DATE"
 msgid "The end date for calculating the difference in days."
 msgstr "Dyddiad diwedd ar gyfer cyfrifo'r gwahaniaeth mewn dyddiau."
 
-#: scfuncs.hrc:348
+#: sc/inc/scfuncs.hrc:348
 msgctxt "SC_OPCODE_GET_DIFF_DATE"
 msgid "Date 1"
 msgstr "Dyddiad 1"
 
-#: scfuncs.hrc:349
+#: sc/inc/scfuncs.hrc:349
 msgctxt "SC_OPCODE_GET_DIFF_DATE"
 msgid "The start date for calculating the difference in days."
 msgstr "Dyddiad cychwyn ar gyfer cyfrifo'r gwahaniaeth mewn dyddiau."
 
-#: scfuncs.hrc:355
+#: sc/inc/scfuncs.hrc:355
 msgctxt "SC_OPCODE_GET_DATEDIF"
 msgid "Returns the number of whole days, months or years between 'start date' and 'end date'."
 msgstr "Yn dychwelyd y nifer o ddiwrnodau, misoedd neu flynyddoedd cyfan rhwng y 'dyddiad cychwyn' a'r 'dyddiad gorffen'."
 
-#: scfuncs.hrc:356
+#: sc/inc/scfuncs.hrc:356
 msgctxt "SC_OPCODE_GET_DATEDIF"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: scfuncs.hrc:357
+#: sc/inc/scfuncs.hrc:357
 msgctxt "SC_OPCODE_GET_DATEDIF"
 msgid "The start date."
 msgstr "Y dyddiad cychwyn."
 
-#: scfuncs.hrc:358
+#: sc/inc/scfuncs.hrc:358
 msgctxt "SC_OPCODE_GET_DATEDIF"
 msgid "End date"
 msgstr "Dyddiad gorffen"
 
-#: scfuncs.hrc:359
+#: sc/inc/scfuncs.hrc:359
 msgctxt "SC_OPCODE_GET_DATEDIF"
 msgid "The end date."
 msgstr "Y dyddiad gorffen."
 
-#: scfuncs.hrc:360
+#: sc/inc/scfuncs.hrc:360
 msgctxt "SC_OPCODE_GET_DATEDIF"
 msgid "Interval"
 msgstr "Cyfwng"
 
-#: scfuncs.hrc:361
+#: sc/inc/scfuncs.hrc:361
 msgctxt "SC_OPCODE_GET_DATEDIF"
 msgid "Interval to be calculated. Can be \"d\", \"m\", \"y\", \"ym\", \"md\" or \"yd\"."
 msgstr "Cyfwng i'w gyfrifo. Gall fod yn \"d\", \"m\", \"y\", \"ym\", \"md\" neu \"yd\"."
 
-#: scfuncs.hrc:367
+#: sc/inc/scfuncs.hrc:367
 msgctxt "SC_OPCODE_WEEK"
 msgid "Calculates the calendar week corresponding to the given date."
 msgstr "Cyfrifo'r wythnos galendr yn cyfateb i ddyddiad neilltuol."
 
-#: scfuncs.hrc:368
+#: sc/inc/scfuncs.hrc:368
 msgctxt "SC_OPCODE_WEEK"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:369
+#: sc/inc/scfuncs.hrc:369
 msgctxt "SC_OPCODE_WEEK"
 msgid "The internal number of the date."
 msgstr "Rhif mewnol dyddiad."
 
-#: scfuncs.hrc:370
+#: sc/inc/scfuncs.hrc:370
 msgctxt "SC_OPCODE_WEEK"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:371
+#: sc/inc/scfuncs.hrc:371
 msgctxt "SC_OPCODE_WEEK"
 msgid "Indicates the first day of the week and when week 1 starts."
 msgstr "Dangos diwrnod cyntaf yr wythnos a pan mae wythnos 1 yn cychwyn."
 
-#: scfuncs.hrc:377
+#: sc/inc/scfuncs.hrc:377
 msgctxt "SC_OPCODE_ISOWEEKNUM"
 msgid "Calculates the ISO 8601 calendar week for the given date."
 msgstr "Cyfrifo wythnos galendr ISO 8601 y dyddiad penodol."
 
-#: scfuncs.hrc:378
+#: sc/inc/scfuncs.hrc:378
 msgctxt "SC_OPCODE_ISOWEEKNUM"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:379
+#: sc/inc/scfuncs.hrc:379
 msgctxt "SC_OPCODE_ISOWEEKNUM"
 msgid "The internal number of the date."
 msgstr "Rhif mewnol dyddiad."
 
-#: scfuncs.hrc:384
+#: sc/inc/scfuncs.hrc:384
 msgctxt "SC_OPCODE_WEEKNUM_OOO"
 msgid ""
 "Calculates the calendar week corresponding to the given date.\n"
@@ -3788,2577 +3743,2577 @@ msgstr ""
 "Cyfrifo'r wythnos galendr sy'n cyfateb i'r dyddiad neilltuol.\n"
 "Mae hyn yn darparu rhyngweithiad gyda %PRODUCTNAME 5.0 a chynt ac OpenOffice.org, yn unig."
 
-#: scfuncs.hrc:385
+#: sc/inc/scfuncs.hrc:385
 msgctxt "SC_OPCODE_WEEKNUM_OOO"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:386
+#: sc/inc/scfuncs.hrc:386
 msgctxt "SC_OPCODE_WEEKNUM_OOO"
 msgid "The internal number of the date."
 msgstr "Rhif mewnol y dyddiad."
 
-#: scfuncs.hrc:387
+#: sc/inc/scfuncs.hrc:387
 msgctxt "SC_OPCODE_WEEKNUM_OOO"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:388
+#: sc/inc/scfuncs.hrc:388
 msgctxt "SC_OPCODE_WEEKNUM_OOO"
 msgid "Indicates the first day of the week (1 = Sunday, other values = Monday)."
 msgstr "Dynodi diwrnod cyntaf yr wythnos (1 = Dydd Sul, gwerthoedd eraill = Dydd Llun)."
 
-#: scfuncs.hrc:394
+#: sc/inc/scfuncs.hrc:394
 msgctxt "SC_OPCODE_EASTERSUNDAY"
 msgid "Calculates the date of Easter Sunday in a given year."
 msgstr "Cyfrifo dyddiad Sul y Pasg mewn unrhyw flwyddyn."
 
-#: scfuncs.hrc:395
+#: sc/inc/scfuncs.hrc:395
 msgctxt "SC_OPCODE_EASTERSUNDAY"
 msgid "Year"
 msgstr "Blwyddyn"
 
-#: scfuncs.hrc:396
+#: sc/inc/scfuncs.hrc:396
 msgctxt "SC_OPCODE_EASTERSUNDAY"
 msgid "An integer between 1583 and 9956, or 0 and 99 (19xx or 20xx depending on the option set)."
 msgstr "Cyfanrif rhwng 1583 a 9956, neu 0 a 99 (19xx neu 20xx yn dibynnu ar y dewis wnaed)."
 
-#: scfuncs.hrc:402
+#: sc/inc/scfuncs.hrc:402
 msgctxt "SC_OPCODE_PV"
 msgid "Present value. Calculates the present value of an investment."
 msgstr "Gwerth presennol. Cyfrifo'r gwerth presennol y buddsoddiad."
 
-#: scfuncs.hrc:403
+#: sc/inc/scfuncs.hrc:403
 msgctxt "SC_OPCODE_PV"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:404
+#: sc/inc/scfuncs.hrc:404
 msgctxt "SC_OPCODE_PV"
 msgid "The rate of interest for the period given."
 msgstr "Cyfradd llog ar gyfer cyfnod."
 
-#: scfuncs.hrc:405
+#: sc/inc/scfuncs.hrc:405
 msgctxt "SC_OPCODE_PV"
 msgid "NPER"
 msgstr "NPER"
 
-#: scfuncs.hrc:406
+#: sc/inc/scfuncs.hrc:406
 msgctxt "SC_OPCODE_PV"
 msgid "The payment period. The total number of periods in which the annuity is paid."
 msgstr "Y cyfnod talu. Cyfanswm nifer y cyfnodau y mae'r blwydd-dâl yn cael ei dalu."
 
-#: scfuncs.hrc:407
+#: sc/inc/scfuncs.hrc:407
 msgctxt "SC_OPCODE_PV"
 msgid "PMT"
 msgstr "PMT"
 
-#: scfuncs.hrc:408
+#: sc/inc/scfuncs.hrc:408
 msgctxt "SC_OPCODE_PV"
 msgid "Regular payments. The constant amount of annuity that is paid in each period."
 msgstr "Taliadau rheolaidd. Swm cyson y blwydd-dâl sy'n cael ei dalu ym mhob cyfnod."
 
-#: scfuncs.hrc:409
+#: sc/inc/scfuncs.hrc:409
 msgctxt "SC_OPCODE_PV"
 msgid "FV"
 msgstr "FV"
 
-#: scfuncs.hrc:410
+#: sc/inc/scfuncs.hrc:410
 msgctxt "SC_OPCODE_PV"
 msgid "Future value. The value (final value) to be attained after the last payment."
 msgstr "Gwerth y dyfodol. Bydd y gwerth (gwerth terfynol) cyn cael ei gyrraedd wedi'r taliad olaf."
 
-#: scfuncs.hrc:411
+#: sc/inc/scfuncs.hrc:411
 msgctxt "SC_OPCODE_PV"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:412
+#: sc/inc/scfuncs.hrc:412
 msgctxt "SC_OPCODE_PV"
 msgid "Type = 1 denotes due at the beginning of the period, = 0 at the end."
 msgstr "Math = 1 yn dynodi yn ddisgwyliedig ar ddechrau'r cyfnod, = 0 ar y diwedd."
 
-#: scfuncs.hrc:418
+#: sc/inc/scfuncs.hrc:418
 msgctxt "SC_OPCODE_FV"
 msgid "Future value. Returns the future value of an investment based on regular payments and a constant interest rate."
 msgstr "Gwerth y dyfodol. Dychwelyd gwerth dyfodol buddsoddiad yn seiliedig ar daliadau rheolaidd a chyfradd llog cyson."
 
-#: scfuncs.hrc:419
+#: sc/inc/scfuncs.hrc:419
 msgctxt "SC_OPCODE_FV"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:420
+#: sc/inc/scfuncs.hrc:420
 msgctxt "SC_OPCODE_FV"
 msgid "The rate of interest per period."
 msgstr "Cyfradd llog yn ôl y cyfnod."
 
-#: scfuncs.hrc:421
+#: sc/inc/scfuncs.hrc:421
 msgctxt "SC_OPCODE_FV"
 msgid "NPER"
 msgstr "NPER"
 
-#: scfuncs.hrc:422
+#: sc/inc/scfuncs.hrc:422
 msgctxt "SC_OPCODE_FV"
 msgid "Payment period. The total number of periods in which the annuity (pension) is paid."
 msgstr "Cyfnod talu. Cyfanswm y cyfnodau y mae'r budd-dâl (pensiwn) yn cael ei dalu."
 
-#: scfuncs.hrc:423
+#: sc/inc/scfuncs.hrc:423
 msgctxt "SC_OPCODE_FV"
 msgid "PMT"
 msgstr "PMT"
 
-#: scfuncs.hrc:424
+#: sc/inc/scfuncs.hrc:424
 msgctxt "SC_OPCODE_FV"
 msgid "Regular payments. The constant annuity to be paid in each period."
 msgstr "Taliadau rheolaidd. Y blwydd-dâl cyson i'w dalu ym mhob cyfnod."
 
-#: scfuncs.hrc:425
+#: sc/inc/scfuncs.hrc:425
 msgctxt "SC_OPCODE_FV"
 msgid "PV"
 msgstr "PV"
 
-#: scfuncs.hrc:426
+#: sc/inc/scfuncs.hrc:426
 msgctxt "SC_OPCODE_FV"
 msgid "Present value. The current value of a series of payments"
 msgstr "Gwerth presennol. Gwerth presennol cyfres o daliadau"
 
-#: scfuncs.hrc:427
+#: sc/inc/scfuncs.hrc:427
 msgctxt "SC_OPCODE_FV"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:428
+#: sc/inc/scfuncs.hrc:428
 msgctxt "SC_OPCODE_FV"
 msgid "Type = 1 denotes due at the beginning of the period, = 0 at the end."
 msgstr "Math = 1 yn dynodi yn ddisgwyliedig ar ddechrau'r cyfnod, = 0 ar y diwedd."
 
-#: scfuncs.hrc:434
+#: sc/inc/scfuncs.hrc:434
 msgctxt "SC_OPCODE_NPER"
 msgid "Payment period. Calculates the number of payment periods for an investment based on regular payments and a constant interest rate."
 msgstr "Cyfnod talu. Cyfrifo'r nifer o gyfnodau talu ar gyfer buddsoddiad wedi ei seilio ar daliadau rheolaidd a chyfradd llog cyson."
 
-#: scfuncs.hrc:435
+#: sc/inc/scfuncs.hrc:435
 msgctxt "SC_OPCODE_NPER"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:436
+#: sc/inc/scfuncs.hrc:436
 msgctxt "SC_OPCODE_NPER"
 msgid "The rate of interest per period."
 msgstr "Cyfradd llog yn ôl y cyfnod."
 
-#: scfuncs.hrc:437
+#: sc/inc/scfuncs.hrc:437
 msgctxt "SC_OPCODE_NPER"
 msgid "PMT"
 msgstr "PMT"
 
-#: scfuncs.hrc:438
+#: sc/inc/scfuncs.hrc:438
 msgctxt "SC_OPCODE_NPER"
 msgid "Regular payments. The constant annuity to be paid in each period."
 msgstr "Taliadau rheolaidd. Y blwydd-dâl cyson i'w dalu ym mhob cyfnod."
 
-#: scfuncs.hrc:439
+#: sc/inc/scfuncs.hrc:439
 msgctxt "SC_OPCODE_NPER"
 msgid "PV"
 msgstr "PV"
 
-#: scfuncs.hrc:440
+#: sc/inc/scfuncs.hrc:440
 msgctxt "SC_OPCODE_NPER"
 msgid "Present value. The current value of a series of payments"
 msgstr "Gwerth presennol. Gwerth presennol cyfres o daliadau"
 
-#: scfuncs.hrc:441
+#: sc/inc/scfuncs.hrc:441
 msgctxt "SC_OPCODE_NPER"
 msgid "FV"
 msgstr "FV"
 
-#: scfuncs.hrc:442
+#: sc/inc/scfuncs.hrc:442
 msgctxt "SC_OPCODE_NPER"
 msgid "Future value. The value (end value) to be attained after the final payment."
 msgstr "Gwerth y dyfodol. Bydd y gwerth (gwerth diwedd) yn cael ei gyrraedd wedi'r taliad olaf."
 
-#: scfuncs.hrc:443
+#: sc/inc/scfuncs.hrc:443
 msgctxt "SC_OPCODE_NPER"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:444
+#: sc/inc/scfuncs.hrc:444
 msgctxt "SC_OPCODE_NPER"
 msgid "Type = 1 denotes due at the beginning of the period, = 0 at the end."
 msgstr "Math = 1 yn dynodi yn ddisgwyliedig ar ddechrau'r cyfnod, = 0 ar y diwedd."
 
-#: scfuncs.hrc:450
+#: sc/inc/scfuncs.hrc:450
 msgctxt "SC_OPCODE_PMT"
 msgid "Regular payments. Returns the periodic payment of an annuity, based on regular payments and a fixed periodic interest rate."
 msgstr "Taliadau rheolaidd. Dychwelyd taliad cyfnodol blwydd-dal, yn seiliedig ar daliadau rheolaidd a chyfradd llog cyfnodol gosodedig."
 
-#: scfuncs.hrc:451
+#: sc/inc/scfuncs.hrc:451
 msgctxt "SC_OPCODE_PMT"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:452
+#: sc/inc/scfuncs.hrc:452
 msgctxt "SC_OPCODE_PMT"
 msgid "The rate of interest per period."
 msgstr "Cyfradd llog yn ôl y cyfnod."
 
-#: scfuncs.hrc:453
+#: sc/inc/scfuncs.hrc:453
 msgctxt "SC_OPCODE_PMT"
 msgid "NPER"
 msgstr "NPER"
 
-#: scfuncs.hrc:454
+#: sc/inc/scfuncs.hrc:454
 msgctxt "SC_OPCODE_PMT"
 msgid "Payment period. The total number of periods in which the annuity (pension) is paid."
 msgstr "Cyfnod talu. Cyfanswm y cyfnodau y mae'r budd-dâl (pensiwn) yn cael ei dalu."
 
-#: scfuncs.hrc:455
+#: sc/inc/scfuncs.hrc:455
 msgctxt "SC_OPCODE_PMT"
 msgid "PV"
 msgstr "PV"
 
-#: scfuncs.hrc:456
+#: sc/inc/scfuncs.hrc:456
 msgctxt "SC_OPCODE_PMT"
 msgid "Present value. The current value of a series of payments"
 msgstr "Gwerth presennol. Gwerth presennol cyfres o daliadau"
 
-#: scfuncs.hrc:457
+#: sc/inc/scfuncs.hrc:457
 msgctxt "SC_OPCODE_PMT"
 msgid "FV"
 msgstr "FV"
 
-#: scfuncs.hrc:458
+#: sc/inc/scfuncs.hrc:458
 msgctxt "SC_OPCODE_PMT"
 msgid "Future value. The value (end value) to be attained after the final payment."
 msgstr "Gwerth y dyfodol. Bydd y gwerth (gwerth diwedd) yn cael ei gyrraedd wedi'r taliad olaf."
 
-#: scfuncs.hrc:459
+#: sc/inc/scfuncs.hrc:459
 msgctxt "SC_OPCODE_PMT"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:460
+#: sc/inc/scfuncs.hrc:460
 msgctxt "SC_OPCODE_PMT"
 msgid "Type = 1 denotes due at the beginning of the period, = 0 at the end."
 msgstr "Math = 1 yn dynodi yn ddisgwyliedig ar ddechrau'r cyfnod, = 0 ar y diwedd."
 
-#: scfuncs.hrc:466
+#: sc/inc/scfuncs.hrc:466
 msgctxt "SC_OPCODE_RATE"
 msgid "Calculates the constant interest rate of an investment with regular payments."
 msgstr "Cyfrifo cyfradd llog cyson buddsoddiad gyda thaliadau rheolaidd."
 
-#: scfuncs.hrc:467
+#: sc/inc/scfuncs.hrc:467
 msgctxt "SC_OPCODE_RATE"
 msgid "NPER"
 msgstr "NPER"
 
-#: scfuncs.hrc:468
+#: sc/inc/scfuncs.hrc:468
 msgctxt "SC_OPCODE_RATE"
 msgid "Payment period. The total number of periods in which the annuity (pension) is paid."
 msgstr "Cyfnod talu. Cyfanswm y cyfnodau y mae'r budd-dâl (pensiwn) yn cael ei dalu."
 
-#: scfuncs.hrc:469
+#: sc/inc/scfuncs.hrc:469
 msgctxt "SC_OPCODE_RATE"
 msgid "PMT"
 msgstr "PMT"
 
-#: scfuncs.hrc:470
+#: sc/inc/scfuncs.hrc:470
 msgctxt "SC_OPCODE_RATE"
 msgid "Regular payments. The constant annuity to be paid in each period."
 msgstr "Taliadau rheolaidd. Y blwydd-dâl cyson i'w dalu ym mhob cyfnod."
 
-#: scfuncs.hrc:471
+#: sc/inc/scfuncs.hrc:471
 msgctxt "SC_OPCODE_RATE"
 msgid "PV"
 msgstr "PV"
 
-#: scfuncs.hrc:472
+#: sc/inc/scfuncs.hrc:472
 msgctxt "SC_OPCODE_RATE"
 msgid "Present value. The current value of a series of payments"
 msgstr "Gwerth presennol. Gwerth presennol cyfres o daliadau"
 
-#: scfuncs.hrc:473
+#: sc/inc/scfuncs.hrc:473
 msgctxt "SC_OPCODE_RATE"
 msgid "FV"
 msgstr "FV"
 
-#: scfuncs.hrc:474
+#: sc/inc/scfuncs.hrc:474
 msgctxt "SC_OPCODE_RATE"
 msgid "Future value. The value (end value) to be attained after the final payment."
 msgstr "Gwerth y dyfodol. Bydd y gwerth (gwerth diwedd) yn cael ei gyrraedd wedi'r taliad olaf."
 
-#: scfuncs.hrc:475
+#: sc/inc/scfuncs.hrc:475
 msgctxt "SC_OPCODE_RATE"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:476
+#: sc/inc/scfuncs.hrc:476
 msgctxt "SC_OPCODE_RATE"
 msgid "Type = 1 denotes due at the beginning of the period, = 0 at the end."
 msgstr "Math = 1 yn dynodi yn ddisgwyliedig ar ddechrau'r cyfnod, = 0 ar y diwedd."
 
-#: scfuncs.hrc:477
+#: sc/inc/scfuncs.hrc:477
 msgctxt "SC_OPCODE_RATE"
 msgid "Guess"
 msgstr "Dyfaliad"
 
-#: scfuncs.hrc:478
+#: sc/inc/scfuncs.hrc:478
 msgctxt "SC_OPCODE_RATE"
 msgid "Guess. The estimate of the interest rate for the iterative calculating method."
 msgstr "Dyfalu. Dyfalu graddfa llog ar gyfer y dull cyfrifo iteraidd."
 
-#: scfuncs.hrc:484
+#: sc/inc/scfuncs.hrc:484
 msgctxt "SC_OPCODE_IPMT"
 msgid "Compounded interest. Calculates the interest payment on the principal for an investment with regular payments and a constant interest rate for a given period."
 msgstr "Llog cyfansawdd. Cyfrifo'r taliad llog ar y prifswm ar gyfer buddsoddiad gyda thaliadau rheolaidd a chyfradd llog cyson am gyfnod penodol."
 
-#: scfuncs.hrc:485
+#: sc/inc/scfuncs.hrc:485
 msgctxt "SC_OPCODE_IPMT"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:486
+#: sc/inc/scfuncs.hrc:486
 msgctxt "SC_OPCODE_IPMT"
 msgid "The rate of interest per period."
 msgstr "Cyfradd llog yn ôl y cyfnod."
 
-#: scfuncs.hrc:487
+#: sc/inc/scfuncs.hrc:487
 msgctxt "SC_OPCODE_IPMT"
 msgid "Period"
 msgstr "Cyfnod"
 
-#: scfuncs.hrc:488
+#: sc/inc/scfuncs.hrc:488
 msgctxt "SC_OPCODE_IPMT"
 msgid "Periods. The periods for which the compounded interest is to be calculated. P = 1 denotes for the first period, P = NPER for the last one."
 msgstr "Cyfnodau. Cyfnodau y bydd y llog cyfansawdd yn cael ei gyfrifo. P = 1 yn dynodi'r cyfnod cyntaf, P = NPER yr un olaf."
 
-#: scfuncs.hrc:489
+#: sc/inc/scfuncs.hrc:489
 msgctxt "SC_OPCODE_IPMT"
 msgid "NPER"
 msgstr "NPER"
 
-#: scfuncs.hrc:490
+#: sc/inc/scfuncs.hrc:490
 msgctxt "SC_OPCODE_IPMT"
 msgid "Payment period. The total number of periods in which the annuity (pension) is paid."
 msgstr "Cyfnod talu. Cyfanswm y cyfnodau y mae'r budd-dâl (pensiwn) yn cael ei dalu."
 
-#: scfuncs.hrc:491
+#: sc/inc/scfuncs.hrc:491
 msgctxt "SC_OPCODE_IPMT"
 msgid "PV"
 msgstr "PV"
 
-#: scfuncs.hrc:492
+#: sc/inc/scfuncs.hrc:492
 msgctxt "SC_OPCODE_IPMT"
 msgid "Present value. The current value of a series of payments"
 msgstr "Gwerth presennol. Gwerth presennol cyfres o daliadau"
 
-#: scfuncs.hrc:493
+#: sc/inc/scfuncs.hrc:493
 msgctxt "SC_OPCODE_IPMT"
 msgid "FV"
 msgstr "FV"
 
-#: scfuncs.hrc:494
+#: sc/inc/scfuncs.hrc:494
 msgctxt "SC_OPCODE_IPMT"
 msgid "Future value. The value (end value) to be attained after the final payment."
 msgstr "Gwerth y dyfodol. Bydd y gwerth (gwerth diwedd) yn cael ei gyrraedd wedi'r taliad olaf."
 
-#: scfuncs.hrc:495
+#: sc/inc/scfuncs.hrc:495
 msgctxt "SC_OPCODE_IPMT"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:496
+#: sc/inc/scfuncs.hrc:496
 msgctxt "SC_OPCODE_IPMT"
 msgid "Type = 1 denotes due at the beginning of the period, = 0 at the end."
 msgstr "Math = 1 yn dynodi yn ddisgwyliedig ar ddechrau'r cyfnod, = 0 ar y diwedd."
 
-#: scfuncs.hrc:502
+#: sc/inc/scfuncs.hrc:502
 msgctxt "SC_OPCODE_PPMT"
 msgid "Repayment. Calculates the repayment amount for a period for an investment whereby the payments are at regular intervals and the interest rate constant."
 msgstr "Ad-daliad. Cyfrifo swm yr ad-daliad am gyfnod ar gyfer buddsoddiad lle mae'r taliadau ar gyfnodau rheolaidd ac mae'r cyfradd llog yn gyson."
 
-#: scfuncs.hrc:503
+#: sc/inc/scfuncs.hrc:503
 msgctxt "SC_OPCODE_PPMT"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:504
+#: sc/inc/scfuncs.hrc:504
 msgctxt "SC_OPCODE_PPMT"
 msgid "The interest rate per period."
 msgstr "Cyfradd llog am y cyfnod."
 
-#: scfuncs.hrc:505
+#: sc/inc/scfuncs.hrc:505
 msgctxt "SC_OPCODE_PPMT"
 msgid "Period"
 msgstr "Cyfnod"
 
-#: scfuncs.hrc:506
+#: sc/inc/scfuncs.hrc:506
 msgctxt "SC_OPCODE_PPMT"
 msgid "Period. The period for which the repayments are to be calculated. Per = 1 denotes for the first period, P = NPER for the last"
 msgstr "Cyfnod. Y cyfnod y mae'r ad-daliadau'n cael eu cyfrifo. Per = 1 yn dynodi'r cyfnod cyntaf, P = NPER ar gyfer yr olaf"
 
-#: scfuncs.hrc:507
+#: sc/inc/scfuncs.hrc:507
 msgctxt "SC_OPCODE_PPMT"
 msgid "NPER"
 msgstr "NPER"
 
-#: scfuncs.hrc:508
+#: sc/inc/scfuncs.hrc:508
 msgctxt "SC_OPCODE_PPMT"
 msgid "The payment period. The total number of periods in which the annuity (pension) is paid."
 msgstr "Y cyfnod ad-dalu. Cyfanswm y nifer o gyfnodau y mae'r blwydd-dal(pensiwn) yn cael ei dalu."
 
-#: scfuncs.hrc:509
+#: sc/inc/scfuncs.hrc:509
 msgctxt "SC_OPCODE_PPMT"
 msgid "PV"
 msgstr "PV"
 
-#: scfuncs.hrc:510
+#: sc/inc/scfuncs.hrc:510
 msgctxt "SC_OPCODE_PPMT"
 msgid "The present value. The present value or the amount the annuity is currently worth."
 msgstr "Gwerth presennol. Y gwerth presennol neu gwerth presennol y blwydd-dâl."
 
-#: scfuncs.hrc:511
+#: sc/inc/scfuncs.hrc:511
 msgctxt "SC_OPCODE_PPMT"
 msgid "FV"
 msgstr "FV"
 
-#: scfuncs.hrc:512
+#: sc/inc/scfuncs.hrc:512
 msgctxt "SC_OPCODE_PPMT"
 msgid "Future value. The value (end value) attained after the last payment has been made."
 msgstr "Gwerth dyfodol. Gwerth (gwerth diwedd) wedi'r taliad olaf."
 
-#: scfuncs.hrc:513
+#: sc/inc/scfuncs.hrc:513
 msgctxt "SC_OPCODE_PPMT"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:514
+#: sc/inc/scfuncs.hrc:514
 msgctxt "SC_OPCODE_PPMT"
 msgid "Type = 1 denotes due at the beginning of the period, = 0 at the end."
 msgstr "Math = 1 yn dynodi yn ddisgwyliedig ar ddechrau'r cyfnod, = 0 ar y diwedd."
 
-#: scfuncs.hrc:520
+#: sc/inc/scfuncs.hrc:520
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "Cumulative capital. Calculates the total amount of the repayment share in a period for an investment with constant interest rate."
 msgstr "Cyfalaf Cronnus. Cyfrifo cyfanswm cyfran yr ad-daliadau mewn cyfnod ar gyfer buddsoddiad gyda chyfradd llog cyson."
 
-#: scfuncs.hrc:521
+#: sc/inc/scfuncs.hrc:521
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:522
+#: sc/inc/scfuncs.hrc:522
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "The rate of interest per period."
 msgstr "Cyfradd llog yn ôl y cyfnod."
 
-#: scfuncs.hrc:523
+#: sc/inc/scfuncs.hrc:523
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "NPER"
 msgstr "NPER"
 
-#: scfuncs.hrc:524
+#: sc/inc/scfuncs.hrc:524
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "Payment period. The total number of periods in which the annuity (pension) is paid."
 msgstr "Cyfnod talu. Cyfanswm y cyfnodau y mae'r budd-dâl (pensiwn) yn cael ei dalu."
 
-#: scfuncs.hrc:525
+#: sc/inc/scfuncs.hrc:525
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "PV"
 msgstr "PV"
 
-#: scfuncs.hrc:526
+#: sc/inc/scfuncs.hrc:526
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "The present value. The present value or the amount the annuity is currently worth."
 msgstr "Gwerth presennol. Y gwerth presennol neu gwerth presennol y blwydd-dâl."
 
-#: scfuncs.hrc:527
+#: sc/inc/scfuncs.hrc:527
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "S"
 msgstr "C"
 
-#: scfuncs.hrc:528
+#: sc/inc/scfuncs.hrc:528
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "The start period. The first period to be taken into account. S = 1 denotes the very first period."
 msgstr "Cyfnod cychwyn. Y cyfnod cyntaf i'w gymryd i ystyriaeth. S = 1 yn dynodi'r cyfnod cyntaf."
 
-#: scfuncs.hrc:529
+#: sc/inc/scfuncs.hrc:529
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "E"
 msgstr "E"
 
-#: scfuncs.hrc:530
+#: sc/inc/scfuncs.hrc:530
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "End period. The last period to be taken into account."
 msgstr "Cyfnod diwedd. Y cyfnod olaf i'w gyfrifo."
 
-#: scfuncs.hrc:531
+#: sc/inc/scfuncs.hrc:531
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:532
+#: sc/inc/scfuncs.hrc:532
 msgctxt "SC_OPCODE_CUM_PRINC"
 msgid "Type = 1 denotes due at the beginning of the period, = 0 at the end."
 msgstr "Math = 1 yn dynodi yn ddisgwyliedig ar ddechrau'r cyfnod, = 0 ar y diwedd."
 
-#: scfuncs.hrc:538
+#: sc/inc/scfuncs.hrc:538
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "Cumulative compounded interest. Calculates the total amount of the interest share in a period for an investment with a constant interest rate."
 msgstr "Llog Cyfansawdd cronnus. Cyfrifo cyfanswm cyfran y llog mewn cyfnod ar gyfer buddsoddiad gyda chyfradd llog cyson."
 
-#: scfuncs.hrc:539
+#: sc/inc/scfuncs.hrc:539
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:540
+#: sc/inc/scfuncs.hrc:540
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "The rate of interest per period."
 msgstr "Cyfradd llog yn ôl y cyfnod."
 
-#: scfuncs.hrc:541
+#: sc/inc/scfuncs.hrc:541
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "NPER"
 msgstr "NPER"
 
-#: scfuncs.hrc:542
+#: sc/inc/scfuncs.hrc:542
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "Payment period. The total number of periods in which the annuity (pension) is paid."
 msgstr "Cyfnod talu. Cyfanswm y cyfnodau y mae'r budd-dâl (pensiwn) yn cael ei dalu."
 
-#: scfuncs.hrc:543
+#: sc/inc/scfuncs.hrc:543
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "PV"
 msgstr "PV"
 
-#: scfuncs.hrc:544
+#: sc/inc/scfuncs.hrc:544
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "The present value. The present value or the amount the annuity is currently worth."
 msgstr "Gwerth presennol. Y gwerth presennol neu gwerth presennol y blwydd-dâl."
 
-#: scfuncs.hrc:545
+#: sc/inc/scfuncs.hrc:545
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "S"
 msgstr "S"
 
-#: scfuncs.hrc:546
+#: sc/inc/scfuncs.hrc:546
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "The start period. The first period to be taken into account. S = 1 denotes the very first period."
 msgstr "Cyfnod cychwyn. Y cyfnod cyntaf i'w gymryd i ystyriaeth. S = 1 yn dynodi'r cyfnod cyntaf."
 
-#: scfuncs.hrc:547
+#: sc/inc/scfuncs.hrc:547
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "E"
 msgstr "E"
 
-#: scfuncs.hrc:548
+#: sc/inc/scfuncs.hrc:548
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "The end period. The last period to be taken into account."
 msgstr "Y cyfnod olaf. Y cyfnod olaf i'w gyfrifo."
 
-#: scfuncs.hrc:549
+#: sc/inc/scfuncs.hrc:549
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:550
+#: sc/inc/scfuncs.hrc:550
 msgctxt "SC_OPCODE_CUM_IPMT"
 msgid "Type = 1 denotes due at the beginning of the period, = 0 at the end."
 msgstr "Math = 1 yn dynodi yn ddisgwyliedig ar ddechrau'r cyfnod, = 0 ar y diwedd."
 
-#: scfuncs.hrc:556
+#: sc/inc/scfuncs.hrc:556
 msgctxt "SC_OPCODE_SYD"
 msgid "Calculates the arithmetically declining value of an asset (depreciation) for a specified period."
 msgstr "Cyfrifo gwerth rhifyddol cwymp yng ngwerth ased (dibrisiad) am gyfnod penodol."
 
-#: scfuncs.hrc:557
+#: sc/inc/scfuncs.hrc:557
 msgctxt "SC_OPCODE_SYD"
 msgid "Cost"
 msgstr "Cost"
 
-#: scfuncs.hrc:558
+#: sc/inc/scfuncs.hrc:558
 msgctxt "SC_OPCODE_SYD"
 msgid "Acquisition costs. The initial cost of the asset."
 msgstr "Cost prynu. Cost gychwynnol yr ased."
 
-#: scfuncs.hrc:559
+#: sc/inc/scfuncs.hrc:559
 msgctxt "SC_OPCODE_SYD"
 msgid "Salvage"
 msgstr "Achubiad"
 
-#: scfuncs.hrc:560
+#: sc/inc/scfuncs.hrc:560
 msgctxt "SC_OPCODE_SYD"
 msgid "Salvage: The remaining value of the asset at the end of its life."
 msgstr "Achubiad: Gweddill gwerth yr ased ar ddiwedd ei fywyd."
 
-#: scfuncs.hrc:561
+#: sc/inc/scfuncs.hrc:561
 msgctxt "SC_OPCODE_SYD"
 msgid "Life"
 msgstr "Bywyd"
 
-#: scfuncs.hrc:562
+#: sc/inc/scfuncs.hrc:562
 msgctxt "SC_OPCODE_SYD"
 msgid "Useful life. The number of periods in the useful life of the asset."
 msgstr "Bywyd defnyddiol. Nifer o gyfnodau ym mywyd defnyddiol yr ased."
 
-#: scfuncs.hrc:563
+#: sc/inc/scfuncs.hrc:563
 msgctxt "SC_OPCODE_SYD"
 msgid "Period"
 msgstr "Cyfnod"
 
-#: scfuncs.hrc:564
+#: sc/inc/scfuncs.hrc:564
 msgctxt "SC_OPCODE_SYD"
 msgid "Period. The depreciation period which must have the same time unit as average useful life."
 msgstr "Cyfnod. Rhaid i'r cyfnod dibrisiad fod a'r un uned cyfartaledd."
 
-#: scfuncs.hrc:570
+#: sc/inc/scfuncs.hrc:570
 msgctxt "SC_OPCODE_SLN"
 msgid "Calculates the linear depreciation per period."
 msgstr "Cyfrifo'r dibrisiad llinellol yn ôl y cyfnod."
 
-#: scfuncs.hrc:571
+#: sc/inc/scfuncs.hrc:571
 msgctxt "SC_OPCODE_SLN"
 msgid "Cost"
 msgstr "Cost"
 
-#: scfuncs.hrc:572
+#: sc/inc/scfuncs.hrc:572
 msgctxt "SC_OPCODE_SLN"
 msgid "Acquisition cost. The initial cost of an asset."
 msgstr "Cost prynu. Cost gychwynnol ased."
 
-#: scfuncs.hrc:573
+#: sc/inc/scfuncs.hrc:573
 msgctxt "SC_OPCODE_SLN"
 msgid "Salvage"
 msgstr "Achubiad"
 
-#: scfuncs.hrc:574
+#: sc/inc/scfuncs.hrc:574
 msgctxt "SC_OPCODE_SLN"
 msgid "Salvage: The remaining value of the asset at the end of its life."
 msgstr "Achubiad: Gweddill gwerth yr ased ar ddiwedd ei fywyd."
 
-#: scfuncs.hrc:575
+#: sc/inc/scfuncs.hrc:575
 msgctxt "SC_OPCODE_SLN"
 msgid "Life"
 msgstr "Bywyd"
 
-#: scfuncs.hrc:576
+#: sc/inc/scfuncs.hrc:576
 msgctxt "SC_OPCODE_SLN"
 msgid "Useful life. The number of periods in the useful life of the asset."
 msgstr "Bywyd defnyddiol. Nifer o gyfnodau ym mywyd defnyddiol yr ased."
 
-#: scfuncs.hrc:582
+#: sc/inc/scfuncs.hrc:582
 msgctxt "SC_OPCODE_DDB"
 msgid "Calculates the depreciation of an asset for a specific period using the double-declining balance method or declining balance factor."
 msgstr "Cyfrifo dibrisiad yr ased am gyfnod penodol gan ddefnyddio dull mantolen dirywiad dwbl neu ffactor mantolen dirywiad."
 
-#: scfuncs.hrc:583
+#: sc/inc/scfuncs.hrc:583
 msgctxt "SC_OPCODE_DDB"
 msgid "Cost"
 msgstr "Cost"
 
-#: scfuncs.hrc:584
+#: sc/inc/scfuncs.hrc:584
 msgctxt "SC_OPCODE_DDB"
 msgid "Acquisition costs. The initial cost of the asset."
 msgstr "Cost prynu. Cost gychwynnol yr ased."
 
-#: scfuncs.hrc:585
+#: sc/inc/scfuncs.hrc:585
 msgctxt "SC_OPCODE_DDB"
 msgid "Salvage"
 msgstr "Achubiad"
 
-#: scfuncs.hrc:586
+#: sc/inc/scfuncs.hrc:586
 msgctxt "SC_OPCODE_DDB"
 msgid "Salvage: The remaining value of the asset at the end of its life."
 msgstr "Achubiad: Gweddill gwerth yr ased ar ddiwedd ei fywyd."
 
-#: scfuncs.hrc:587
+#: sc/inc/scfuncs.hrc:587
 msgctxt "SC_OPCODE_DDB"
 msgid "Life"
 msgstr "Bywyd"
 
-#: scfuncs.hrc:588
+#: sc/inc/scfuncs.hrc:588
 msgctxt "SC_OPCODE_DDB"
 msgid "Useful life. The number of periods in the useful life of the asset."
 msgstr "Bywyd defnyddiol. Nifer o gyfnodau ym mywyd defnyddiol yr ased."
 
-#: scfuncs.hrc:589
+#: sc/inc/scfuncs.hrc:589
 msgctxt "SC_OPCODE_DDB"
 msgid "Period"
 msgstr "Cyfnod"
 
-#: scfuncs.hrc:590
+#: sc/inc/scfuncs.hrc:590
 msgctxt "SC_OPCODE_DDB"
 msgid "Period. The depreciation period in the same time unit as the average useful life entry."
 msgstr "Cyfnod. Cyfnod dibrisiad yn yr un uned amser â'r cofnod cyfartaledd bywyd defnyddiol."
 
-#: scfuncs.hrc:591
+#: sc/inc/scfuncs.hrc:591
 msgctxt "SC_OPCODE_DDB"
 msgid "Factor"
 msgstr "Ffactor"
 
-#: scfuncs.hrc:592
+#: sc/inc/scfuncs.hrc:592
 msgctxt "SC_OPCODE_DDB"
 msgid "Factor. The factor for balance decline. F = 2 means a double declining balance factor"
 msgstr "Ffactor. Y ffactor ar gyfer dirywiad mantolen. F = 2 yn golygu ffactor mantolen dirywiad dwbl"
 
-#: scfuncs.hrc:598
+#: sc/inc/scfuncs.hrc:598
 msgctxt "SC_OPCODE_DB"
 msgid "Returns the real depreciation of an asset for a specified period using the fixed-declining balance method."
 msgstr "Dychwelyd dibrisiad real ased am gyfnod penodol gan ddefnyddio'r dull mantolen dirywiad gosodedig."
 
-#: scfuncs.hrc:599
+#: sc/inc/scfuncs.hrc:599
 msgctxt "SC_OPCODE_DB"
 msgid "Cost"
 msgstr "Cost"
 
-#: scfuncs.hrc:600
+#: sc/inc/scfuncs.hrc:600
 msgctxt "SC_OPCODE_DB"
 msgid "Acquisition costs: The initial cost of the asset."
 msgstr "Cost prynu: Cost gychwynnol yr ased."
 
-#: scfuncs.hrc:601
+#: sc/inc/scfuncs.hrc:601
 msgctxt "SC_OPCODE_DB"
 msgid "Salvage"
 msgstr "Achubiad"
 
-#: scfuncs.hrc:602
+#: sc/inc/scfuncs.hrc:602
 msgctxt "SC_OPCODE_DB"
 msgid "Salvage: The remaining value of the asset at the end of its life."
 msgstr "Achubiad: Gweddill gwerth yr ased ar ddiwedd ei fywyd."
 
-#: scfuncs.hrc:603
+#: sc/inc/scfuncs.hrc:603
 msgctxt "SC_OPCODE_DB"
 msgid "Life"
 msgstr "Bywyd"
 
-#: scfuncs.hrc:604
+#: sc/inc/scfuncs.hrc:604
 msgctxt "SC_OPCODE_DB"
 msgid "Useful life. The number of periods in the useful life of the asset."
 msgstr "Bywyd defnyddiol. Nifer o gyfnodau ym mywyd defnyddiol yr ased."
 
-#: scfuncs.hrc:605
+#: sc/inc/scfuncs.hrc:605
 msgctxt "SC_OPCODE_DB"
 msgid "Period"
 msgstr "Cyfnod"
 
-#: scfuncs.hrc:606
+#: sc/inc/scfuncs.hrc:606
 msgctxt "SC_OPCODE_DB"
 msgid "Periods: The period for which the depreciation is calculated. The time unit used for period must be the same as that for the useful life."
 msgstr "Cyfnodau: Y cyfnod y bydd dibrisiad yn cael ei gyfrifo. Rhaid i'r uned amser sy'n cael ei ddefnyddio ar gyfer y cyfnod fod yr un â'r bywyd defnyddiol."
 
-#: scfuncs.hrc:607
+#: sc/inc/scfuncs.hrc:607
 msgctxt "SC_OPCODE_DB"
 msgid "Month"
 msgstr "Mis"
 
-#: scfuncs.hrc:608
+#: sc/inc/scfuncs.hrc:608
 msgctxt "SC_OPCODE_DB"
 msgid "Months: The number of months in the first year of depreciation."
 msgstr "Misoedd: Nifer o fisoedd ym mlwyddyn cyntaf dirywiad."
 
-#: scfuncs.hrc:614
+#: sc/inc/scfuncs.hrc:614
 msgctxt "SC_OPCODE_VBD"
 msgid "Variable declining balance. Returns the declining balance depreciation for a particular period."
 msgstr "Mantolen dirywio newidiol. Dychwelyd dibrisiad balans gostyngol ar gyfer cyfnod penodol."
 
-#: scfuncs.hrc:615
+#: sc/inc/scfuncs.hrc:615
 msgctxt "SC_OPCODE_VBD"
 msgid "Cost"
 msgstr "Cost"
 
-#: scfuncs.hrc:616
+#: sc/inc/scfuncs.hrc:616
 msgctxt "SC_OPCODE_VBD"
 msgid "Cost. The initial cost of the asset."
 msgstr "Cost prynu. Cost gychwynnol yr ased."
 
-#: scfuncs.hrc:617
+#: sc/inc/scfuncs.hrc:617
 msgctxt "SC_OPCODE_VBD"
 msgid "Salvage"
 msgstr "Achubiad"
 
-#: scfuncs.hrc:618
+#: sc/inc/scfuncs.hrc:618
 msgctxt "SC_OPCODE_VBD"
 msgid "Salvage. The salvage value of an asset at the end of its useful life."
 msgstr "Achubiad. Gwerth achubiaeth ased ar ddiwedd ei fywyd defnyddiol."
 
-#: scfuncs.hrc:619
+#: sc/inc/scfuncs.hrc:619
 msgctxt "SC_OPCODE_VBD"
 msgid "Life"
 msgstr "Bywyd"
 
-#: scfuncs.hrc:620
+#: sc/inc/scfuncs.hrc:620
 msgctxt "SC_OPCODE_VBD"
 msgid "Useful life. The number of periods in the useful life of the asset."
 msgstr "Bywyd defnyddiol. Nifer o gyfnodau ym mywyd defnyddiol yr ased."
 
-#: scfuncs.hrc:621
+#: sc/inc/scfuncs.hrc:621
 msgctxt "SC_OPCODE_VBD"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: scfuncs.hrc:622
+#: sc/inc/scfuncs.hrc:622
 msgctxt "SC_OPCODE_VBD"
 msgid "Start. The first period for depreciation in the same time unit as the useful life."
 msgstr "Cychwyn. Cyfnod cyntaf dibrisiad ar gyfer yr un uned amser â'r bywyd defnyddiol."
 
-#: scfuncs.hrc:623
+#: sc/inc/scfuncs.hrc:623
 msgctxt "SC_OPCODE_VBD"
 msgid "End"
 msgstr "Diwedd"
 
-#: scfuncs.hrc:624
+#: sc/inc/scfuncs.hrc:624
 msgctxt "SC_OPCODE_VBD"
 msgid "End. The last period of the depreciation using the same time unit as for the useful life."
 msgstr "Diwedd. Cyfnod olaf dibrisiad gan ddefnyddio'r un uned amser â'r bywyd defnyddiol."
 
-#: scfuncs.hrc:625
+#: sc/inc/scfuncs.hrc:625
 msgctxt "SC_OPCODE_VBD"
 msgid "Factor"
 msgstr "Ffactor"
 
-#: scfuncs.hrc:626
+#: sc/inc/scfuncs.hrc:626
 msgctxt "SC_OPCODE_VBD"
 msgid "Factor. The factor for the reduction of the depreciation. Factor = 2 denotes double rate depreciation."
 msgstr "Ffactor. Ffactor lleihad dibrisiad. Ffactor = 2 yn dynodi graddfa dibrisiad dwbl."
 
-#: scfuncs.hrc:627
+#: sc/inc/scfuncs.hrc:627
 msgctxt "SC_OPCODE_VBD"
 msgid "NoSwitch"
 msgstr "NoSwitch"
 
-#: scfuncs.hrc:628
+#: sc/inc/scfuncs.hrc:628
 msgctxt "SC_OPCODE_VBD"
 msgid "NoSwitch = 0 denotes switch to linear depreciation, NoSwitch = 1 do not switch."
 msgstr "NoSwitch = 0 yn dynodi newid i ddibrisiant llinellol, NoSwitch = 1 methu newid."
 
-#: scfuncs.hrc:634
+#: sc/inc/scfuncs.hrc:634
 msgctxt "SC_OPCODE_EFFECT"
 msgid "Calculates the annual net interest rate for a nominal interest rate."
 msgstr "Cyfrifo cyfradd llog net blynyddol ar gyfer cyfradd llog enwol."
 
-#: scfuncs.hrc:635
+#: sc/inc/scfuncs.hrc:635
 msgctxt "SC_OPCODE_EFFECT"
 msgid "NOM"
 msgstr "NOM"
 
-#: scfuncs.hrc:636
+#: sc/inc/scfuncs.hrc:636
 msgctxt "SC_OPCODE_EFFECT"
 msgid "Nominal interest"
 msgstr "Llog nominal"
 
-#: scfuncs.hrc:637
+#: sc/inc/scfuncs.hrc:637
 msgctxt "SC_OPCODE_EFFECT"
 msgid "P"
 msgstr "P"
 
-#: scfuncs.hrc:638
+#: sc/inc/scfuncs.hrc:638
 msgctxt "SC_OPCODE_EFFECT"
 msgid "Periods. The number of interest payments per year."
 msgstr "Cyfnodau. Nifer o daliadau llog y flwyddyn."
 
-#: scfuncs.hrc:644
+#: sc/inc/scfuncs.hrc:644
 msgctxt "SC_OPCODE_NOMINAL"
 msgid "Calculates the yearly nominal interest rate as an effective interest rate."
 msgstr "Cyfrifo graddfa gyfradd llog enwol y flwyddyn fel graddfa llog real."
 
-#: scfuncs.hrc:645
+#: sc/inc/scfuncs.hrc:645
 msgctxt "SC_OPCODE_NOMINAL"
 msgid "Effective rate"
 msgstr "Graddfa effeithiol"
 
-#: scfuncs.hrc:646
+#: sc/inc/scfuncs.hrc:646
 msgctxt "SC_OPCODE_NOMINAL"
 msgid "The effective interest rate"
 msgstr "Y raddfa llog real"
 
-#: scfuncs.hrc:647
+#: sc/inc/scfuncs.hrc:647
 msgctxt "SC_OPCODE_NOMINAL"
 msgid "NPER"
 msgstr "NPER"
 
-#: scfuncs.hrc:648
+#: sc/inc/scfuncs.hrc:648
 msgctxt "SC_OPCODE_NOMINAL"
 msgid "Periods. The number of interest payment per year."
 msgstr "Cyfnodau. Nifer o daliadau llog y flwyddyn."
 
-#: scfuncs.hrc:654
+#: sc/inc/scfuncs.hrc:654
 msgctxt "SC_OPCODE_NPV"
 msgid "Net present value. Calculates the net present value of an investment based on a series of periodic payments and a discount rate."
 msgstr "Gwerth net presennol. Cyfrifo'r gwerth net presennol buddsoddiad yn seiliedig ar gyfres o daliadau cyfnodol a chyfradd disgownt."
 
-#: scfuncs.hrc:655
+#: sc/inc/scfuncs.hrc:655
 msgctxt "SC_OPCODE_NPV"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:656
+#: sc/inc/scfuncs.hrc:656
 msgctxt "SC_OPCODE_NPV"
 msgid "The rate of discount for one period."
 msgstr "Cyfradd disgownt ar gyfer un cyfnod."
 
-#: scfuncs.hrc:657
+#: sc/inc/scfuncs.hrc:657
 msgctxt "SC_OPCODE_NPV"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:658
+#: sc/inc/scfuncs.hrc:658
 msgctxt "SC_OPCODE_NPV"
 msgid "Value 1, value 2,... are arguments representing payments and income."
 msgstr "Gwerth 1, gwerth 2,... yn ymresymiadau sy'n cynrychioli taliadau ac incwm."
 
-#: scfuncs.hrc:664
+#: sc/inc/scfuncs.hrc:664
 msgctxt "SC_OPCODE_IRR"
 msgid "Returns the actuarial rate of interest of an investment excluding costs or profits."
 msgstr "Yn dychwelyd llog cyfradd graddfa ystadegol buddsoddiad yn hepgor cost neu elw."
 
-#: scfuncs.hrc:665
+#: sc/inc/scfuncs.hrc:665
 msgctxt "SC_OPCODE_IRR"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: scfuncs.hrc:666
+#: sc/inc/scfuncs.hrc:666
 msgctxt "SC_OPCODE_IRR"
 msgid "An array or reference to cells whose contents correspond to the payments."
 msgstr "Arae neu gyfeiriad at gelloedd y mae eu cynnwys yn cyfateb i'r taliad."
 
-#: scfuncs.hrc:667
+#: sc/inc/scfuncs.hrc:667
 msgctxt "SC_OPCODE_IRR"
 msgid "Guess"
 msgstr "Dyfaliad"
 
-#: scfuncs.hrc:668
+#: sc/inc/scfuncs.hrc:668
 msgctxt "SC_OPCODE_IRR"
 msgid "Guess. An estimated value of the rate of return to be used for the iteration calculation."
 msgstr "Dyfaliad. Dyfaliad gwerth cyfradd elw i'w ddefnyddio ar gyfer iteriad."
 
-#: scfuncs.hrc:674
+#: sc/inc/scfuncs.hrc:674
 msgctxt "SC_OPCODE_MIRR"
 msgid "Returns the modified internal rate of return for a series of investments."
 msgstr "Dychwelyd cyfradd fewnol newidiol elw ar gyfres o fuddsoddiadau."
 
-#: scfuncs.hrc:675
+#: sc/inc/scfuncs.hrc:675
 msgctxt "SC_OPCODE_MIRR"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: scfuncs.hrc:676
+#: sc/inc/scfuncs.hrc:676
 msgctxt "SC_OPCODE_MIRR"
 msgid "An array or reference to cells whose contents correspond to the payments."
 msgstr "Arae neu gyfeiriad at gelloedd y mae eu cynnwys yn cyfateb i'r taliad."
 
-#: scfuncs.hrc:677
+#: sc/inc/scfuncs.hrc:677
 msgctxt "SC_OPCODE_MIRR"
 msgid "Investment"
 msgstr "Buddsoddiad"
 
-#: scfuncs.hrc:678
+#: sc/inc/scfuncs.hrc:678
 msgctxt "SC_OPCODE_MIRR"
 msgid "Interest rate for investments (the negative values in the array)."
 msgstr "Cyfradd llog ar gyfer buddsoddiad (gwerthoedd negyddol yr arae)."
 
-#: scfuncs.hrc:679
+#: sc/inc/scfuncs.hrc:679
 msgctxt "SC_OPCODE_MIRR"
 msgid "Reinvest rate"
 msgstr "Graddfa ailfuddsoddi"
 
-#: scfuncs.hrc:680
+#: sc/inc/scfuncs.hrc:680
 msgctxt "SC_OPCODE_MIRR"
 msgid "Interest rate for reinvestments (the positive values in the array)."
 msgstr "Cyfradd llog o ail-fuddsoddiadau (y gwerthoedd positif yn yr arae)."
 
-#: scfuncs.hrc:686
+#: sc/inc/scfuncs.hrc:686
 msgctxt "SC_OPCODE_ISPMT"
 msgid "Returns the amount of interest for constant amortization rates."
 msgstr "Dychwelyd swm y llog ar gyfer cyfraddau amorteiddiad cyson."
 
-#: scfuncs.hrc:687
+#: sc/inc/scfuncs.hrc:687
 msgctxt "SC_OPCODE_ISPMT"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:688
+#: sc/inc/scfuncs.hrc:688
 msgctxt "SC_OPCODE_ISPMT"
 msgid "Interest rate for a single amortization rate."
 msgstr "Cyfradd llog ar gyfer cyfradd amorteiddiad."
 
-#: scfuncs.hrc:689
+#: sc/inc/scfuncs.hrc:689
 msgctxt "SC_OPCODE_ISPMT"
 msgid "Period"
 msgstr "Cyfnod"
 
-#: scfuncs.hrc:690
+#: sc/inc/scfuncs.hrc:690
 msgctxt "SC_OPCODE_ISPMT"
 msgid "Number of amortization periods for the calculation of the interest."
 msgstr "Nifer y cyfnodau amorteiddiad ar gyfer cyfrifo llog."
 
-#: scfuncs.hrc:691
+#: sc/inc/scfuncs.hrc:691
 msgctxt "SC_OPCODE_ISPMT"
 msgid "Total periods"
 msgstr "Cyfanswm cyfnodau"
 
-#: scfuncs.hrc:692
+#: sc/inc/scfuncs.hrc:692
 msgctxt "SC_OPCODE_ISPMT"
 msgid "Sum total of amortization periods."
 msgstr "Cyfanswm cyfnodau amorteiddiad."
 
-#: scfuncs.hrc:693
+#: sc/inc/scfuncs.hrc:693
 msgctxt "SC_OPCODE_ISPMT"
 msgid "Investment"
 msgstr "Buddsoddiad"
 
-#: scfuncs.hrc:694
+#: sc/inc/scfuncs.hrc:694
 msgctxt "SC_OPCODE_ISPMT"
 msgid "Amount of the investment."
 msgstr "Swm y buddsoddiad."
 
-#: scfuncs.hrc:700
+#: sc/inc/scfuncs.hrc:700
 msgctxt "SC_OPCODE_PDURATION"
 msgid "Duration. Calculates the number of periods required by an investment to attain the desired value."
 msgstr "Hyd. Cyfrifo'r nifer o gyfnodau sy'n angenrheidiol gan fuddsoddiad i gyrraedd y gwerth dymunir."
 
-#: scfuncs.hrc:701
+#: sc/inc/scfuncs.hrc:701
 msgctxt "SC_OPCODE_PDURATION"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: scfuncs.hrc:702
+#: sc/inc/scfuncs.hrc:702
 msgctxt "SC_OPCODE_PDURATION"
 msgid "The constant rate of interest."
 msgstr "Cyfradd gyson llog."
 
-#: scfuncs.hrc:703
+#: sc/inc/scfuncs.hrc:703
 msgctxt "SC_OPCODE_PDURATION"
 msgid "PV"
 msgstr "PV"
 
-#: scfuncs.hrc:704
+#: sc/inc/scfuncs.hrc:704
 msgctxt "SC_OPCODE_PDURATION"
 msgid "The present value. The current value of the investment."
 msgstr "Y gwerth presennol. Gwerth presennol y buddsoddiad."
 
-#: scfuncs.hrc:705
+#: sc/inc/scfuncs.hrc:705
 msgctxt "SC_OPCODE_PDURATION"
 msgid "FV"
 msgstr "FV"
 
-#: scfuncs.hrc:706
+#: sc/inc/scfuncs.hrc:706
 msgctxt "SC_OPCODE_PDURATION"
 msgid "The future value of the investment."
 msgstr "Gwerth buddsoddiadau'r dyfodol."
 
-#: scfuncs.hrc:712
+#: sc/inc/scfuncs.hrc:712
 msgctxt "SC_OPCODE_RRI"
 msgid "Interest. Calculates the interest rate which represents the rate of return from an investment."
 msgstr "Llog. Cyfrifo cyfradd llog sy'n cynrychioli cyfradd yr elw buddsoddiad."
 
-#: scfuncs.hrc:713
+#: sc/inc/scfuncs.hrc:713
 msgctxt "SC_OPCODE_RRI"
 msgid "Periods"
 msgstr "Cyfnodau"
 
-#: scfuncs.hrc:714
+#: sc/inc/scfuncs.hrc:714
 msgctxt "SC_OPCODE_RRI"
 msgid "The number of periods used in the calculation."
 msgstr "Nifer y cyfnodau i'w defnyddio wrth gyfrifo."
 
-#: scfuncs.hrc:715
+#: sc/inc/scfuncs.hrc:715
 msgctxt "SC_OPCODE_RRI"
 msgid "PV"
 msgstr "PV"
 
-#: scfuncs.hrc:716
+#: sc/inc/scfuncs.hrc:716
 msgctxt "SC_OPCODE_RRI"
 msgid "Present value. The current value of the investment."
 msgstr "Gwerth presennol. Gwerth presennol y buddsoddiad."
 
-#: scfuncs.hrc:717
+#: sc/inc/scfuncs.hrc:717
 msgctxt "SC_OPCODE_RRI"
 msgid "FV"
 msgstr "FV"
 
-#: scfuncs.hrc:718
+#: sc/inc/scfuncs.hrc:718
 msgctxt "SC_OPCODE_RRI"
 msgid "The future value of the investment."
 msgstr "Gwerth y buddsoddiadau'r dyfodol."
 
-#: scfuncs.hrc:724
+#: sc/inc/scfuncs.hrc:724
 msgctxt "SC_OPCODE_IS_REF"
 msgid "Returns TRUE if value is a reference."
 msgstr "Dychwelyd TRUE os yw gwerth yn gyfeirnod."
 
-#: scfuncs.hrc:725
+#: sc/inc/scfuncs.hrc:725
 msgctxt "SC_OPCODE_IS_REF"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:726
+#: sc/inc/scfuncs.hrc:726
 msgctxt "SC_OPCODE_IS_REF"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:732
+#: sc/inc/scfuncs.hrc:732
 msgctxt "SC_OPCODE_IS_ERR"
 msgid "Returns TRUE if the value is an error value not equal to #N/A."
 msgstr "Dychwelyd TRUE os yw'r gwerth yn werth gwallus nid yn gydradd â #N/A."
 
-#: scfuncs.hrc:733
+#: sc/inc/scfuncs.hrc:733
 msgctxt "SC_OPCODE_IS_ERR"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:734
+#: sc/inc/scfuncs.hrc:734
 msgctxt "SC_OPCODE_IS_ERR"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:740
+#: sc/inc/scfuncs.hrc:740
 msgctxt "SC_OPCODE_IS_ERROR"
 msgid "Returns TRUE if the value is an error value."
 msgstr "Dychwelyd TRUE os yw'r gwerth yn werth gwallus."
 
-#: scfuncs.hrc:741
+#: sc/inc/scfuncs.hrc:741
 msgctxt "SC_OPCODE_IS_ERROR"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:742
+#: sc/inc/scfuncs.hrc:742
 msgctxt "SC_OPCODE_IS_ERROR"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:748
+#: sc/inc/scfuncs.hrc:748
 msgctxt "SC_OPCODE_IS_EMPTY"
 msgid "Returns TRUE if value refers to an empty cell."
 msgstr "Dychwelyd TRUE os yw'r gwerth yn cyfeirio at gell wag."
 
-#: scfuncs.hrc:749
+#: sc/inc/scfuncs.hrc:749
 msgctxt "SC_OPCODE_IS_EMPTY"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:750
+#: sc/inc/scfuncs.hrc:750
 msgctxt "SC_OPCODE_IS_EMPTY"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:756
+#: sc/inc/scfuncs.hrc:756
 msgctxt "SC_OPCODE_IS_LOGICAL"
 msgid "Returns TRUE if the value carries a logical number format."
 msgstr "Dychwelyd TRUE os yw'r gwerth yn cario fformat rhif rhesymegol."
 
-#: scfuncs.hrc:757
+#: sc/inc/scfuncs.hrc:757
 msgctxt "SC_OPCODE_IS_LOGICAL"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:758
+#: sc/inc/scfuncs.hrc:758
 msgctxt "SC_OPCODE_IS_LOGICAL"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:764
+#: sc/inc/scfuncs.hrc:764
 msgctxt "SC_OPCODE_IS_NV"
 msgid "Returns TRUE if value equals #N/A."
 msgstr "Dychwelyd TRUE os yw'r gwerth yn gydradd â #N/A."
 
-#: scfuncs.hrc:765
+#: sc/inc/scfuncs.hrc:765
 msgctxt "SC_OPCODE_IS_NV"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:766
+#: sc/inc/scfuncs.hrc:766
 msgctxt "SC_OPCODE_IS_NV"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:772
+#: sc/inc/scfuncs.hrc:772
 msgctxt "SC_OPCODE_IS_NON_STRING"
 msgid "Returns TRUE if the value is not text."
 msgstr "Dychwelyd TRUE os nad yw'r gwerth yn destun."
 
-#: scfuncs.hrc:773
+#: sc/inc/scfuncs.hrc:773
 msgctxt "SC_OPCODE_IS_NON_STRING"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:774
+#: sc/inc/scfuncs.hrc:774
 msgctxt "SC_OPCODE_IS_NON_STRING"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:780
+#: sc/inc/scfuncs.hrc:780
 msgctxt "SC_OPCODE_IS_STRING"
 msgid "Returns TRUE if value is text."
 msgstr "Dychwelyd TRUE os yw'r gwerth yn destun."
 
-#: scfuncs.hrc:781
+#: sc/inc/scfuncs.hrc:781
 msgctxt "SC_OPCODE_IS_STRING"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:782
+#: sc/inc/scfuncs.hrc:782
 msgctxt "SC_OPCODE_IS_STRING"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:788
+#: sc/inc/scfuncs.hrc:788
 msgctxt "SC_OPCODE_IS_VALUE"
 msgid "Returns TRUE if value is a number."
 msgstr "Dychwelyd TRUE os yw'r gwerth yn rif."
 
-#: scfuncs.hrc:789
+#: sc/inc/scfuncs.hrc:789
 msgctxt "SC_OPCODE_IS_VALUE"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:790
+#: sc/inc/scfuncs.hrc:790
 msgctxt "SC_OPCODE_IS_VALUE"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:796
+#: sc/inc/scfuncs.hrc:796
 msgctxt "SC_OPCODE_IS_FORMULA"
 msgid "Returns TRUE if the cell is a formula cell."
 msgstr "Dychwelyd TRUE os yw'r gell yn gell fformiwla."
 
-#: scfuncs.hrc:797
+#: sc/inc/scfuncs.hrc:797
 msgctxt "SC_OPCODE_IS_FORMULA"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:798
+#: sc/inc/scfuncs.hrc:798
 msgctxt "SC_OPCODE_IS_FORMULA"
 msgid "The cell to be tested."
 msgstr "Y cell i'w phrofi."
 
-#: scfuncs.hrc:804
+#: sc/inc/scfuncs.hrc:804
 msgctxt "SC_OPCODE_FORMULA"
 msgid "Returns the formula of a formula cell."
 msgstr "Dychwelyd fformiwla ar gyfer fformiwla cell."
 
-#: scfuncs.hrc:805
+#: sc/inc/scfuncs.hrc:805
 msgctxt "SC_OPCODE_FORMULA"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:806
+#: sc/inc/scfuncs.hrc:806
 msgctxt "SC_OPCODE_FORMULA"
 msgid "The formula cell."
 msgstr "Cell fformiwla."
 
-#: scfuncs.hrc:812
+#: sc/inc/scfuncs.hrc:812
 msgctxt "SC_OPCODE_N"
 msgid "Converts a value to a number."
 msgstr "Trosi gwerth i rif."
 
-#: scfuncs.hrc:813
+#: sc/inc/scfuncs.hrc:813
 msgctxt "SC_OPCODE_N"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:814
+#: sc/inc/scfuncs.hrc:814
 msgctxt "SC_OPCODE_N"
 msgid "The value to be interpreted as a number."
 msgstr "Gwerth i'w ddehongli fel rhif."
 
-#: scfuncs.hrc:820
+#: sc/inc/scfuncs.hrc:820
 msgctxt "SC_OPCODE_NO_VALUE"
 msgid "Not available. Returns the error value #N/A."
 msgstr "Ddim ar gael. Dychwelyd gwerth gwallus #N/A."
 
-#: scfuncs.hrc:826
+#: sc/inc/scfuncs.hrc:826
 msgctxt "SC_OPCODE_TYPE"
 msgid "Returns the data type of a value (1 = number, 2 = text, 4 = Boolean value, 8 = formula, 16 = error value, 64 = array)."
 msgstr "Dychwelyd math data gwerth (1 = rhif, 2 = testun, 4 = gwerth Boole, 8 = fformiwla, 16 = gwerth gwall, 64 = arae)."
 
-#: scfuncs.hrc:827
+#: sc/inc/scfuncs.hrc:827
 msgctxt "SC_OPCODE_TYPE"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:828
+#: sc/inc/scfuncs.hrc:828
 msgctxt "SC_OPCODE_TYPE"
 msgid "The value for which the data type is to be determined."
 msgstr "Gwerth y mae pennu'r math o ddata."
 
-#: scfuncs.hrc:834
+#: sc/inc/scfuncs.hrc:834
 msgctxt "SC_OPCODE_CELL"
 msgid "Determines information about address, formatting or contents of a cell."
 msgstr "Pennu gwybodaeth ynghylch cyfeiriad, fformatio neu gynnwys cell."
 
-#: scfuncs.hrc:835
+#: sc/inc/scfuncs.hrc:835
 msgctxt "SC_OPCODE_CELL"
 msgid "Info type"
 msgstr "Math o wybodaeth"
 
-#: scfuncs.hrc:836
+#: sc/inc/scfuncs.hrc:836
 msgctxt "SC_OPCODE_CELL"
 msgid "String that specifies the type of information."
 msgstr "Llinynnau sy'n nodi'r math o wybodaeth."
 
-#: scfuncs.hrc:837
+#: sc/inc/scfuncs.hrc:837
 msgctxt "SC_OPCODE_CELL"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:838
+#: sc/inc/scfuncs.hrc:838
 msgctxt "SC_OPCODE_CELL"
 msgid "The position of the cell you want to examine."
 msgstr "Safle cell rydych am ei archwilio."
 
-#: scfuncs.hrc:844
+#: sc/inc/scfuncs.hrc:844
 msgctxt "SC_OPCODE_CURRENT"
 msgid "Calculates the current value of the formula at the present location."
 msgstr "Cyfrifo gwerth presennol y fformiwla yn y lleoliad presennol."
 
-#: scfuncs.hrc:850
+#: sc/inc/scfuncs.hrc:850
 msgctxt "SC_OPCODE_FALSE"
 msgid "Defines the logical value as FALSE."
 msgstr "Diffinio'r gwerth rhesymegol fel FALSE."
 
-#: scfuncs.hrc:856
+#: sc/inc/scfuncs.hrc:856
 msgctxt "SC_OPCODE_NOT"
 msgid "Reverses the value of the argument."
 msgstr "Gwrth-droi gwerth yr ymresymiad."
 
-#: scfuncs.hrc:857
+#: sc/inc/scfuncs.hrc:857
 msgctxt "SC_OPCODE_NOT"
 msgid "Logical value"
 msgstr "Gwerth rhesymegol"
 
-#: scfuncs.hrc:858
+#: sc/inc/scfuncs.hrc:858
 msgctxt "SC_OPCODE_NOT"
 msgid "An expression that can be either TRUE or FALSE."
 msgstr "Mynegiad sy'n un ai yn TRUE neu FALSE."
 
-#: scfuncs.hrc:864
+#: sc/inc/scfuncs.hrc:864
 msgctxt "SC_OPCODE_TRUE"
 msgid "Returns the logical value TRUE."
 msgstr "Dychwelyd gwerth rhesymegol TRUE."
 
-#: scfuncs.hrc:870
+#: sc/inc/scfuncs.hrc:870
 msgctxt "SC_OPCODE_IF"
 msgid "Specifies a logical test to be performed."
 msgstr "Enwi prawf rhesymegol i'w gyflawni."
 
-#: scfuncs.hrc:871
+#: sc/inc/scfuncs.hrc:871
 msgctxt "SC_OPCODE_IF"
 msgid "Test"
 msgstr "Prawf"
 
-#: scfuncs.hrc:872
+#: sc/inc/scfuncs.hrc:872
 msgctxt "SC_OPCODE_IF"
 msgid "Any value or expression which can be either TRUE or FALSE."
 msgstr "Unrhyw werth neu fynegiad a all fod yn TRUE neu FALSE."
 
-#: scfuncs.hrc:873
+#: sc/inc/scfuncs.hrc:873
 msgctxt "SC_OPCODE_IF"
 msgid "Then value"
 msgstr "Yna'r gwerth"
 
-#: scfuncs.hrc:874
+#: sc/inc/scfuncs.hrc:874
 msgctxt "SC_OPCODE_IF"
 msgid "The result of the function if the logical test returns a TRUE."
 msgstr "Canlyniad y swyddogaeth os yw prawf rhesymegol yn dychwelyd TRUE."
 
-#: scfuncs.hrc:875
+#: sc/inc/scfuncs.hrc:875
 msgctxt "SC_OPCODE_IF"
 msgid "Otherwise value"
 msgstr "Gwerth fel arall"
 
-#: scfuncs.hrc:876
+#: sc/inc/scfuncs.hrc:876
 msgctxt "SC_OPCODE_IF"
 msgid "The result of the function if the logical test returns FALSE."
 msgstr "Canlyniad swyddogaeth os yw prawf rhesymegol yn dychwelyd FALSE."
 
-#: scfuncs.hrc:882
+#: sc/inc/scfuncs.hrc:882
 msgctxt "SC_OPCODE_IF_ERROR"
 msgid "Returns value if not an error value, else alternative."
 msgstr "Dychwelyd gwerth os nad gwerth gwall, neu fel arall."
 
-#: scfuncs.hrc:883
+#: sc/inc/scfuncs.hrc:883
 msgctxt "SC_OPCODE_IF_ERROR"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:884
+#: sc/inc/scfuncs.hrc:884
 msgctxt "SC_OPCODE_IF_ERROR"
 msgid "The value to be calculated."
 msgstr "Y gwerth i'w gyfrifo."
 
-#: scfuncs.hrc:885
+#: sc/inc/scfuncs.hrc:885
 msgctxt "SC_OPCODE_IF_ERROR"
 msgid "Alternative value"
 msgstr "Gwerth arall"
 
-#: scfuncs.hrc:886
+#: sc/inc/scfuncs.hrc:886
 msgctxt "SC_OPCODE_IF_ERROR"
 msgid "The alternative to be returned, should value be an error value."
 msgstr "Y gwerth i'w ddychwelyd, petai'r gwerth yn werth gwall."
 
-#: scfuncs.hrc:892
+#: sc/inc/scfuncs.hrc:892
 msgctxt "SC_OPCODE_IF_NA"
 msgid "Returns value if not a #N/A error, else alternative."
 msgstr "Dychwelyd gwerth os nad gwall #N/A, neu fel arall."
 
-#: scfuncs.hrc:893
+#: sc/inc/scfuncs.hrc:893
 msgctxt "SC_OPCODE_IF_NA"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:894
+#: sc/inc/scfuncs.hrc:894
 msgctxt "SC_OPCODE_IF_NA"
 msgid "The value to be calculated."
 msgstr "Y gwerth i'w gyfrifo."
 
-#: scfuncs.hrc:895
+#: sc/inc/scfuncs.hrc:895
 msgctxt "SC_OPCODE_IF_NA"
 msgid "Alternative value"
 msgstr "Gwerth arall"
 
-#: scfuncs.hrc:896
+#: sc/inc/scfuncs.hrc:896
 msgctxt "SC_OPCODE_IF_NA"
 msgid "The alternative to be returned, should value be a #N/A error."
 msgstr "Y gwerth i'w ddychwelyd, petai'r gwerth yn wall #N/A."
 
-#: scfuncs.hrc:902
+#: sc/inc/scfuncs.hrc:902
 msgctxt "SC_OPCODE_OR"
 msgid "Returns TRUE if an argument is TRUE."
 msgstr "Dychwelyd TRUE os yw ymresymiad yn TRUE."
 
-#: scfuncs.hrc:903
+#: sc/inc/scfuncs.hrc:903
 msgctxt "SC_OPCODE_OR"
 msgid "Logical value "
 msgstr "Gwerth rhesymegol "
 
-#: scfuncs.hrc:904
+#: sc/inc/scfuncs.hrc:904
 msgctxt "SC_OPCODE_OR"
 msgid "Logical value 1, logical value 2,... are conditions to be tested and which return either TRUE or FALSE."
 msgstr "Gwerth rhesymegol 1, gwerth rhesymegol 2,... yn gyflyrau i'w profi ac sy'n dychwelyd un ai TRUE neu FALSE."
 
-#: scfuncs.hrc:910
+#: sc/inc/scfuncs.hrc:910
 msgctxt "SC_OPCODE_XOR"
 msgid "Returns TRUE if an odd number of arguments evaluates to TRUE."
 msgstr "Dychwelyd TRUE os yw odrif o ymresymiadau yn enrhifo i TRUE."
 
-#: scfuncs.hrc:911
+#: sc/inc/scfuncs.hrc:911
 msgctxt "SC_OPCODE_XOR"
 msgid "Logical value "
 msgstr "Gwerth rhesymegol "
 
-#: scfuncs.hrc:912
+#: sc/inc/scfuncs.hrc:912
 msgctxt "SC_OPCODE_XOR"
 msgid "Logical value 1, logical value 2, ... are conditions to be tested and which return either TRUE or FALSE."
 msgstr "Gwerth rhesymegol 1, gwerth rhesymegol 2,... yn gyflyrau i'w profi ac sy'n dychwelyd un ai TRUE neu FALSE."
 
-#: scfuncs.hrc:918
+#: sc/inc/scfuncs.hrc:918
 msgctxt "SC_OPCODE_AND"
 msgid "Returns TRUE if all arguments are TRUE."
 msgstr "Dychwelyd TRUE os yw pob ymresymiad yn TRUE."
 
-#: scfuncs.hrc:919
+#: sc/inc/scfuncs.hrc:919
 msgctxt "SC_OPCODE_AND"
 msgid "Logical value "
 msgstr "Gwerth rhesymegol "
 
-#: scfuncs.hrc:920
+#: sc/inc/scfuncs.hrc:920
 msgctxt "SC_OPCODE_AND"
 msgid "Logical value 1, logical value 2;...are conditions to be tested and each returns either TRUE or FALSE."
 msgstr "Gwerth rhesymegol 1, gwerth rhesymegol 2,... yn gyflyrau i'w profi ac sy'n dychwelyd un ai TRUE neu FALSE."
 
-#: scfuncs.hrc:926
+#: sc/inc/scfuncs.hrc:926
 msgctxt "SC_OPCODE_ABS"
 msgid "Absolute value of a number."
 msgstr "Gwerth absoliwt rhif."
 
-#: scfuncs.hrc:927
+#: sc/inc/scfuncs.hrc:927
 msgctxt "SC_OPCODE_ABS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:928
+#: sc/inc/scfuncs.hrc:928
 msgctxt "SC_OPCODE_ABS"
 msgid "The number whose absolute value is to be returned."
 msgstr "Rhif y mae ei werth absoliwt i'w ddychwelyd."
 
-#: scfuncs.hrc:934
+#: sc/inc/scfuncs.hrc:934
 msgctxt "SC_OPCODE_POWER"
 msgid "Returns a^b, base a raised to the power of exponent b."
 msgstr "Codi rhif i b?er un arall."
 
-#: scfuncs.hrc:935
+#: sc/inc/scfuncs.hrc:935
 msgctxt "SC_OPCODE_POWER"
 msgid "Base"
 msgstr "Sail"
 
-#: scfuncs.hrc:936
+#: sc/inc/scfuncs.hrc:936
 msgctxt "SC_OPCODE_POWER"
 msgid "The base a of the power a^b."
 msgstr "Y rhif i'w godi i b?er un arall."
 
-#: scfuncs.hrc:937
+#: sc/inc/scfuncs.hrc:937
 msgctxt "SC_OPCODE_POWER"
 msgid "Exponent"
 msgstr "Pwer"
 
-#: scfuncs.hrc:938
+#: sc/inc/scfuncs.hrc:938
 msgctxt "SC_OPCODE_POWER"
 msgid "The exponent b of the power a^b."
 msgstr "Y p?er y bydd rhif yn cael ei godi."
 
-#: scfuncs.hrc:944
+#: sc/inc/scfuncs.hrc:944
 msgctxt "SC_OPCODE_COUNT_EMPTY_CELLS"
 msgid "Counts the blank cells in a specified range."
 msgstr "Cyfrif y celloedd gwag mewn ystod neilltuol."
 
-#: scfuncs.hrc:945
+#: sc/inc/scfuncs.hrc:945
 msgctxt "SC_OPCODE_COUNT_EMPTY_CELLS"
 msgid "Range"
 msgstr "Amrediad"
 
-#: scfuncs.hrc:946
+#: sc/inc/scfuncs.hrc:946
 msgctxt "SC_OPCODE_COUNT_EMPTY_CELLS"
 msgid "The range in which empty cells are to be counted."
 msgstr "Ystod y bydd celloedd gwag yn cael eu cyfrif."
 
-#: scfuncs.hrc:952
+#: sc/inc/scfuncs.hrc:952
 msgctxt "SC_OPCODE_PI"
 msgid "Returns the value of the number Pi."
 msgstr "Dychwelyd gwerth rhif Pi."
 
-#: scfuncs.hrc:958
+#: sc/inc/scfuncs.hrc:958
 msgctxt "SC_OPCODE_SUM"
 msgid "Returns the sum of all arguments."
 msgstr "Dychwelyd swm yr holl ymresymiadau."
 
-#: scfuncs.hrc:959
+#: sc/inc/scfuncs.hrc:959
 msgctxt "SC_OPCODE_SUM"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:960
+#: sc/inc/scfuncs.hrc:960
 msgctxt "SC_OPCODE_SUM"
 msgid "Number 1, number 2, ... are arguments whose total is to be calculated."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau y mae eu cyfanswm i'w cyfrifo."
 
-#: scfuncs.hrc:966
+#: sc/inc/scfuncs.hrc:966
 msgctxt "SC_OPCODE_SUM_SQ"
 msgid "Returns the sum of the squares of the arguments."
 msgstr "Dychwelyd swm sgwariau ymresymiad."
 
-#: scfuncs.hrc:967
+#: sc/inc/scfuncs.hrc:967
 msgctxt "SC_OPCODE_SUM_SQ"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:968
+#: sc/inc/scfuncs.hrc:968
 msgctxt "SC_OPCODE_SUM_SQ"
 msgid "Number 1, number 2,... are arguments for which the sum of the squares is to be calculated."
 msgstr "Rhif 1, rhif 2,... yn ymresymiadau y mae eu cyfanswm y sgwariau i'w cyfrifo."
 
-#: scfuncs.hrc:974
+#: sc/inc/scfuncs.hrc:974
 msgctxt "SC_OPCODE_PRODUCT"
 msgid "Multiplies the arguments."
 msgstr "Lluosogi'r ymresymiadau."
 
-#: scfuncs.hrc:975
+#: sc/inc/scfuncs.hrc:975
 msgctxt "SC_OPCODE_PRODUCT"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:976
+#: sc/inc/scfuncs.hrc:976
 msgctxt "SC_OPCODE_PRODUCT"
 msgid "Number 1, number 2, ... are arguments to be multiplied and a result returned."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau i'w lluosogi a dychwelyd canlyniad."
 
-#: scfuncs.hrc:982
+#: sc/inc/scfuncs.hrc:982
 msgctxt "SC_OPCODE_SUM_IF"
 msgid "Totals the arguments that meet the condition."
 msgstr "Cyfansymu'r ymresymiadau i gwrdd â'r gofyn."
 
-#: scfuncs.hrc:983
+#: sc/inc/scfuncs.hrc:983
 msgctxt "SC_OPCODE_SUM_IF"
 msgid "Range"
 msgstr "Amrediad"
 
-#: scfuncs.hrc:984
+#: sc/inc/scfuncs.hrc:984
 msgctxt "SC_OPCODE_SUM_IF"
 msgid "The range to be evaluated by the criteria given."
 msgstr "Ystod i'w arfarnu yn ôl y meini prawf a roddwyd."
 
-#: scfuncs.hrc:985
+#: sc/inc/scfuncs.hrc:985
 msgctxt "SC_OPCODE_SUM_IF"
 msgid "Criteria"
 msgstr "Meini prawf"
 
-#: scfuncs.hrc:986
+#: sc/inc/scfuncs.hrc:986
 msgctxt "SC_OPCODE_SUM_IF"
 msgid "The criteria to be applied to the range."
 msgstr "Y meini prawf i'w gosod ar yr ystod."
 
-#: scfuncs.hrc:987
+#: sc/inc/scfuncs.hrc:987
 msgctxt "SC_OPCODE_SUM_IF"
 msgid "Sum range"
 msgstr "Ystod sym"
 
-#: scfuncs.hrc:988
+#: sc/inc/scfuncs.hrc:988
 msgctxt "SC_OPCODE_SUM_IF"
 msgid "The range from which the values are to be totalled."
 msgstr "Yr ystod o le fydd y gwerthoedd yn cael cyfansymu."
 
-#: scfuncs.hrc:994
+#: sc/inc/scfuncs.hrc:994
 msgctxt "SC_OPCODE_AVERAGE_IF"
 msgid "Averages the arguments that meet the conditions."
 msgstr "Cyfartalu'r ymresymiadau i gwrdd â'r gofynion."
 
-#: scfuncs.hrc:995
+#: sc/inc/scfuncs.hrc:995
 msgctxt "SC_OPCODE_AVERAGE_IF"
 msgid "Range"
 msgstr "Amrediad"
 
-#: scfuncs.hrc:996
+#: sc/inc/scfuncs.hrc:996
 msgctxt "SC_OPCODE_AVERAGE_IF"
 msgid "The range to be evaluated by the criteria given."
 msgstr "Ystod i'w arfarnu yn ôl y meini prawf a roddwyd."
 
-#: scfuncs.hrc:997
+#: sc/inc/scfuncs.hrc:997
 msgctxt "SC_OPCODE_AVERAGE_IF"
 msgid "Criteria"
 msgstr "Meini prawf"
 
-#: scfuncs.hrc:998
+#: sc/inc/scfuncs.hrc:998
 msgctxt "SC_OPCODE_AVERAGE_IF"
 msgid "The criteria to be applied to the range."
 msgstr "Y meini prawf i'w gosod ar yr ystod."
 
-#: scfuncs.hrc:999
+#: sc/inc/scfuncs.hrc:999
 msgctxt "SC_OPCODE_AVERAGE_IF"
 msgid "Average range"
 msgstr "Ystod cyfartalog"
 
-#: scfuncs.hrc:1000
+#: sc/inc/scfuncs.hrc:1000
 msgctxt "SC_OPCODE_AVERAGE_IF"
 msgid "The range from which the values are to be averaged."
 msgstr "Yr ystod o le fydd y gwerthoedd yn cael eu cyfartalu."
 
-#: scfuncs.hrc:1005
+#: sc/inc/scfuncs.hrc:1005
 msgctxt "SC_OPCODE_SUM_IFS"
 msgid "Totals the values of cells in a range that meet multiple criteria in multiple ranges."
 msgstr "Cyfansymu gwerthoedd celloedd mewn ystod sy'n cwrdd â meini prawf mewn ystodau lluosog."
 
-#: scfuncs.hrc:1006
+#: sc/inc/scfuncs.hrc:1006
 msgctxt "SC_OPCODE_SUM_IFS"
 msgid "Sum range"
 msgstr "Ystod swm"
 
-#: scfuncs.hrc:1007
+#: sc/inc/scfuncs.hrc:1007
 msgctxt "SC_OPCODE_SUM_IFS"
 msgid "The range from which the values are to be totalled."
 msgstr "Yr ystod o le fydd y gwerthoedd yn cael cyfansymu."
 
-#: scfuncs.hrc:1008
+#: sc/inc/scfuncs.hrc:1008
 msgctxt "SC_OPCODE_SUM_IFS"
 msgid "Range "
 msgstr "Ystod "
 
-#: scfuncs.hrc:1009
+#: sc/inc/scfuncs.hrc:1009
 msgctxt "SC_OPCODE_SUM_IFS"
 msgid "Range 1, range 2,... are the ranges to be evaluated by the criteria given."
 msgstr "Ystod 1, ystod 2,... yw'r ystodau i'w gwerthuso gan y meini prawf dynodedig."
 
-#: scfuncs.hrc:1010
+#: sc/inc/scfuncs.hrc:1010
 msgctxt "SC_OPCODE_SUM_IFS"
 msgid "Criteria "
 msgstr "Meini prawf "
 
-#: scfuncs.hrc:1011
+#: sc/inc/scfuncs.hrc:1011
 msgctxt "SC_OPCODE_SUM_IFS"
 msgid "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given."
 msgstr "Meini Prawf 1, meini prawf 2,... yw'r ystod celloedd y mae'r meini prawf yn cael eu gosod arnynt."
 
-#: scfuncs.hrc:1017
+#: sc/inc/scfuncs.hrc:1017
 msgctxt "SC_OPCODE_AVERAGE_IFS"
 msgid "Averages the value of the cells that meet multiple criteria in multiple ranges."
 msgstr "Cyfartalu gwerth y celloedd sy'n cwrdd â meini prawf niferus mewn ystodau lluosog."
 
-#: scfuncs.hrc:1018
+#: sc/inc/scfuncs.hrc:1018
 msgctxt "SC_OPCODE_AVERAGE_IFS"
 msgid "Average range"
 msgstr "Ystod cyfartalog"
 
-#: scfuncs.hrc:1019
+#: sc/inc/scfuncs.hrc:1019
 msgctxt "SC_OPCODE_AVERAGE_IFS"
 msgid "The range from which the values are to be averaged."
 msgstr "Yr ystod o le fydd y gwerthoedd yn cael eu cyfartalu."
 
-#: scfuncs.hrc:1020
+#: sc/inc/scfuncs.hrc:1020
 msgctxt "SC_OPCODE_AVERAGE_IFS"
 msgid "Range "
 msgstr "Ystod cyfartalog "
 
-#: scfuncs.hrc:1021
+#: sc/inc/scfuncs.hrc:1021
 msgctxt "SC_OPCODE_AVERAGE_IFS"
 msgid "Range 1, range 2,... are the ranges to be evaluated by the criteria given."
 msgstr "Ystod 1, ystod 2,... yw'r ystodau i'w gwerthuso gan y meini prawf dynodedig."
 
-#: scfuncs.hrc:1022
+#: sc/inc/scfuncs.hrc:1022
 msgctxt "SC_OPCODE_AVERAGE_IFS"
 msgid "Criteria "
 msgstr "Meini prawf "
 
-#: scfuncs.hrc:1023
+#: sc/inc/scfuncs.hrc:1023
 msgctxt "SC_OPCODE_AVERAGE_IFS"
 msgid "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given."
 msgstr "Meini Prawf 1, meini prawf 2,... yw'r ystod celloedd y mae'r meini prawf yn cael eu gosod arnynt."
 
-#: scfuncs.hrc:1029
+#: sc/inc/scfuncs.hrc:1029
 msgctxt "SC_OPCODE_COUNT_IFS"
 msgid "Counts the cells that meet multiple criteria in multiple ranges."
 msgstr "Cyfrifo'r celloedd sy'n cwrdd â'r meini prawf mewn ystodau lluosog."
 
-#: scfuncs.hrc:1030
+#: sc/inc/scfuncs.hrc:1030
 msgctxt "SC_OPCODE_COUNT_IFS"
 msgid "Range "
 msgstr "Ystod "
 
-#: scfuncs.hrc:1031
+#: sc/inc/scfuncs.hrc:1031
 msgctxt "SC_OPCODE_COUNT_IFS"
 msgid "Range 1, range 2,... are the ranges to be evaluated by the criteria given."
 msgstr "Ystod 1, ystod 2,... yw'r ystodau i'w gwerthuso gan y meini prawf dynodedig."
 
-#: scfuncs.hrc:1032
+#: sc/inc/scfuncs.hrc:1032
 msgctxt "SC_OPCODE_COUNT_IFS"
 msgid "Criteria "
 msgstr "Meini prawf "
 
-#: scfuncs.hrc:1033
+#: sc/inc/scfuncs.hrc:1033
 msgctxt "SC_OPCODE_COUNT_IFS"
 msgid "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given."
 msgstr "Meini Prawf 1, meini prawf 2,... yw'r ystod celloedd y mae'r meini prawf yn cael eu gosod arnynt."
 
-#: scfuncs.hrc:1039
+#: sc/inc/scfuncs.hrc:1039
 msgctxt "SC_OPCODE_COUNT_IF"
 msgid "Counts the arguments which meet the set conditions."
 msgstr "Cyfri'r ymresymiadau sy'n cwrdd â'r amodau a osodwyd."
 
-#: scfuncs.hrc:1040
+#: sc/inc/scfuncs.hrc:1040
 msgctxt "SC_OPCODE_COUNT_IF"
 msgid "Range"
 msgstr "Amrediad"
 
-#: scfuncs.hrc:1041
+#: sc/inc/scfuncs.hrc:1041
 msgctxt "SC_OPCODE_COUNT_IF"
 msgid "The range of cells to be evaluated by the criteria given."
 msgstr "Ystod o gelloedd i'w harfarnu yn ôl y meini prawf a roddwyd."
 
-#: scfuncs.hrc:1042
+#: sc/inc/scfuncs.hrc:1042
 msgctxt "SC_OPCODE_COUNT_IF"
 msgid "Criteria"
 msgstr "Meini prawf"
 
-#: scfuncs.hrc:1043
+#: sc/inc/scfuncs.hrc:1043
 msgctxt "SC_OPCODE_COUNT_IF"
 msgid "The criteria to be applied to the range."
 msgstr "Y meini prawf i'w gosod ar yr ystod."
 
-#: scfuncs.hrc:1049
+#: sc/inc/scfuncs.hrc:1049
 msgctxt "SC_OPCODE_SQRT"
 msgid "Returns the square root of a number."
 msgstr "Dychwelyd ail isradd rhif."
 
-#: scfuncs.hrc:1050
+#: sc/inc/scfuncs.hrc:1050
 msgctxt "SC_OPCODE_SQRT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1051
+#: sc/inc/scfuncs.hrc:1051
 msgctxt "SC_OPCODE_SQRT"
 msgid "A positive value for which the square root is to be calculated."
 msgstr "Gwerth positif y mae'r ail isradd i'w gyfrifo."
 
-#: scfuncs.hrc:1057
+#: sc/inc/scfuncs.hrc:1057
 msgctxt "SC_OPCODE_RANDOM"
 msgid "Returns a random number between 0 and 1."
 msgstr "Dychwelyd rhif hap rhwng 0 ac 1."
 
-#: scfuncs.hrc:1063
+#: sc/inc/scfuncs.hrc:1063
 msgctxt "SC_OPCODE_IS_EVEN"
 msgid "Returns TRUE if value is an even integer."
 msgstr "Dychwelyd TRUE os yw gwerth mewn cyfanrif eilrif."
 
-#: scfuncs.hrc:1064
+#: sc/inc/scfuncs.hrc:1064
 msgctxt "SC_OPCODE_IS_EVEN"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:1065
+#: sc/inc/scfuncs.hrc:1065
 msgctxt "SC_OPCODE_IS_EVEN"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:1071
+#: sc/inc/scfuncs.hrc:1071
 msgctxt "SC_OPCODE_IS_ODD"
 msgid "Returns TRUE if value is an odd integer."
 msgstr "Dychwelyd TRUE os yw'r gwerth yn gyfanrif odrif."
 
-#: scfuncs.hrc:1072
+#: sc/inc/scfuncs.hrc:1072
 msgctxt "SC_OPCODE_IS_ODD"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:1073
+#: sc/inc/scfuncs.hrc:1073
 msgctxt "SC_OPCODE_IS_ODD"
 msgid "The value to be tested."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:1079
+#: sc/inc/scfuncs.hrc:1079
 msgctxt "SC_OPCODE_COMBIN"
 msgid "Calculates the number of combinations for elements without repetition."
 msgstr "Cyfrifo'r nifer o gyfuniadau ar gyfer elfennau heb ailadrodd."
 
-#: scfuncs.hrc:1080
+#: sc/inc/scfuncs.hrc:1080
 msgctxt "SC_OPCODE_COMBIN"
 msgid "Number 1"
 msgstr "Rhif 1"
 
-#: scfuncs.hrc:1081
+#: sc/inc/scfuncs.hrc:1081
 msgctxt "SC_OPCODE_COMBIN"
 msgid "The total number of elements."
 msgstr "Cyfanswm yr elfennau."
 
-#: scfuncs.hrc:1082
+#: sc/inc/scfuncs.hrc:1082
 msgctxt "SC_OPCODE_COMBIN"
 msgid "Number 2"
 msgstr "Rhif 2"
 
-#: scfuncs.hrc:1083
+#: sc/inc/scfuncs.hrc:1083
 msgctxt "SC_OPCODE_COMBIN"
 msgid "The number of elements selected."
 msgstr "Nifer o elfennau a ddewiswyd."
 
-#: scfuncs.hrc:1089
+#: sc/inc/scfuncs.hrc:1089
 msgctxt "SC_OPCODE_COMBIN_A"
 msgid "Calculates the number of combinations of elements including repetition."
 msgstr "Cyfrifo'r nifer o gyfuniadau o elfennau gan gynnwys ailadrodd."
 
-#: scfuncs.hrc:1090
+#: sc/inc/scfuncs.hrc:1090
 msgctxt "SC_OPCODE_COMBIN_A"
 msgid "Number 1"
 msgstr "Rhif 1"
 
-#: scfuncs.hrc:1091
+#: sc/inc/scfuncs.hrc:1091
 msgctxt "SC_OPCODE_COMBIN_A"
 msgid "The total number of elements."
 msgstr "Cyfanswm yr elfennau."
 
-#: scfuncs.hrc:1092
+#: sc/inc/scfuncs.hrc:1092
 msgctxt "SC_OPCODE_COMBIN_A"
 msgid "Number 2"
 msgstr "Rhif 2"
 
-#: scfuncs.hrc:1093
+#: sc/inc/scfuncs.hrc:1093
 msgctxt "SC_OPCODE_COMBIN_A"
 msgid "The number of elements selected."
 msgstr "Nifer o elfennau a ddewiswyd."
 
-#: scfuncs.hrc:1099
+#: sc/inc/scfuncs.hrc:1099
 msgctxt "SC_OPCODE_ARC_COS"
 msgid "Returns the arccosine of a number."
 msgstr "Dychwelwyd arcosin rhif."
 
-#: scfuncs.hrc:1100
+#: sc/inc/scfuncs.hrc:1100
 msgctxt "SC_OPCODE_ARC_COS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1101
+#: sc/inc/scfuncs.hrc:1101
 msgctxt "SC_OPCODE_ARC_COS"
 msgid "A value between -1 and 1 for which the arccosine is to be returned."
 msgstr "Gwerth rhwng -1 ac 1 y mae arcosin i'w ddychwelyd."
 
-#: scfuncs.hrc:1107
+#: sc/inc/scfuncs.hrc:1107
 msgctxt "SC_OPCODE_ARC_SIN"
 msgid "Returns the arcsine of a number."
 msgstr "Dychwelyd arcosin rhif."
 
-#: scfuncs.hrc:1108
+#: sc/inc/scfuncs.hrc:1108
 msgctxt "SC_OPCODE_ARC_SIN"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1109
+#: sc/inc/scfuncs.hrc:1109
 msgctxt "SC_OPCODE_ARC_SIN"
 msgid "A value between -1 and 1 for which the arcsine is to be returned."
 msgstr "Gwerth rhwng -1 ac 1 y mae arcosin i'w ddychwelyd."
 
-#: scfuncs.hrc:1115
+#: sc/inc/scfuncs.hrc:1115
 msgctxt "SC_OPCODE_ARC_COS_HYP"
 msgid "Returns the inverse hyperbolic cosine of a number."
 msgstr "Dychwelyd cosin hyperbolig gwrthdro rhif."
 
-#: scfuncs.hrc:1116
+#: sc/inc/scfuncs.hrc:1116
 msgctxt "SC_OPCODE_ARC_COS_HYP"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1117
+#: sc/inc/scfuncs.hrc:1117
 msgctxt "SC_OPCODE_ARC_COS_HYP"
 msgid "A value greater than or equal to 1 for which the inverse hyperbolic cosine is to be returned."
 msgstr "Gwerth uwch na chydradd ag 1 ar gyfer yr hyn bydd cosin hyperbolig gwrthdro yn cael ei ddychwelyd."
 
-#: scfuncs.hrc:1123
+#: sc/inc/scfuncs.hrc:1123
 msgctxt "SC_OPCODE_ARC_SIN_HYP"
 msgid "Returns the inverse hyperbolic sine of a number."
 msgstr "Dychwelyd sin hyperbolig gwrthdro rhif."
 
-#: scfuncs.hrc:1124
+#: sc/inc/scfuncs.hrc:1124
 msgctxt "SC_OPCODE_ARC_SIN_HYP"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1125
+#: sc/inc/scfuncs.hrc:1125
 msgctxt "SC_OPCODE_ARC_SIN_HYP"
 msgid "The value for which the inverse hyperbolic sine is to be returned."
 msgstr "Gwerth y mae sin hyperbolig gwrthdro i'w ddychwelyd."
 
-#: scfuncs.hrc:1131
+#: sc/inc/scfuncs.hrc:1131
 msgctxt "SC_OPCODE_ARC_COT"
 msgid "Returns the inverse cotangent of a number."
 msgstr "Dychwelyd cotangiad gwrthdro rhif."
 
-#: scfuncs.hrc:1132
+#: sc/inc/scfuncs.hrc:1132
 msgctxt "SC_OPCODE_ARC_COT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1133
+#: sc/inc/scfuncs.hrc:1133
 msgctxt "SC_OPCODE_ARC_COT"
 msgid "The value for which the inverse cotangent is to be returned."
 msgstr "Gwerth y mae cotangiad gwrthdro i'w ddychwelyd."
 
-#: scfuncs.hrc:1139
+#: sc/inc/scfuncs.hrc:1139
 msgctxt "SC_OPCODE_ARC_TAN"
 msgid "Returns the arctangent of a number."
 msgstr "Dychwelyd gwrthdangiad rhif."
 
-#: scfuncs.hrc:1140
+#: sc/inc/scfuncs.hrc:1140
 msgctxt "SC_OPCODE_ARC_TAN"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1141
+#: sc/inc/scfuncs.hrc:1141
 msgctxt "SC_OPCODE_ARC_TAN"
 msgid "The value for which the arctangent is to be returned."
 msgstr "Gwerth y mae gwrthdangiad gwrthdro i'w ddychwelyd."
 
-#: scfuncs.hrc:1147
+#: sc/inc/scfuncs.hrc:1147
 msgctxt "SC_OPCODE_ARC_COT_HYP"
 msgid "Returns the inverse hyperbolic cotangent of a number."
 msgstr "Dychwelyd cotangiad hyperbolig gwrthdro rhif."
 
-#: scfuncs.hrc:1148
+#: sc/inc/scfuncs.hrc:1148
 msgctxt "SC_OPCODE_ARC_COT_HYP"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1149
+#: sc/inc/scfuncs.hrc:1149
 msgctxt "SC_OPCODE_ARC_COT_HYP"
 msgid "A value smaller than -1 or greater than 1 for which the inverse hyperbolic cotangent is to be returned."
 msgstr "Gwerth llai na 1 neu fwy na g 1 y mae cotangiad hyperbolig gwrthdro i'w ddychwelyd."
 
-#: scfuncs.hrc:1155
+#: sc/inc/scfuncs.hrc:1155
 msgctxt "SC_OPCODE_ARC_TAN_HYP"
 msgid "Returns the inverse hyperbolic tangent of a number."
 msgstr "Dychwelyd tangiad hyperbolig gwrthdro rhif."
 
-#: scfuncs.hrc:1156
+#: sc/inc/scfuncs.hrc:1156
 msgctxt "SC_OPCODE_ARC_TAN_HYP"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1157
+#: sc/inc/scfuncs.hrc:1157
 msgctxt "SC_OPCODE_ARC_TAN_HYP"
 msgid "A value between -1 and 1 for which the inverse hyperbolic tangent is to be returned."
 msgstr "Gwerth rhwng -1 ac 1 y mae tangiad hyperbolig gwrthdro i'w ddychwelyd."
 
-#: scfuncs.hrc:1163
+#: sc/inc/scfuncs.hrc:1163
 msgctxt "SC_OPCODE_COS"
 msgid "Returns the cosine of a number."
 msgstr "Dychwelyd cosin rhif."
 
-#: scfuncs.hrc:1164
+#: sc/inc/scfuncs.hrc:1164
 msgctxt "SC_OPCODE_COS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1165
+#: sc/inc/scfuncs.hrc:1165
 msgctxt "SC_OPCODE_COS"
 msgid "The angle in the radians for which the cosine is to be returned."
 msgstr "Ongl o fewn y radianau y mae'r cosinau i'w dychwelyd."
 
-#: scfuncs.hrc:1171
+#: sc/inc/scfuncs.hrc:1171
 msgctxt "SC_OPCODE_SIN"
 msgid "Returns the sine of a number."
 msgstr "Dychwelyd sin rhif."
 
-#: scfuncs.hrc:1172
+#: sc/inc/scfuncs.hrc:1172
 msgctxt "SC_OPCODE_SIN"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1173
+#: sc/inc/scfuncs.hrc:1173
 msgctxt "SC_OPCODE_SIN"
 msgid "The angle in radians for which the sine is to be calculated."
 msgstr "Ongl o fewn y radianau y mae'r sinau i'w cyfrifo."
 
-#: scfuncs.hrc:1179
+#: sc/inc/scfuncs.hrc:1179
 msgctxt "SC_OPCODE_COT"
 msgid "Returns the cotangent of a number."
 msgstr "Dychwelyd cotangiad rhif."
 
-#: scfuncs.hrc:1180
+#: sc/inc/scfuncs.hrc:1180
 msgctxt "SC_OPCODE_COT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1181
+#: sc/inc/scfuncs.hrc:1181
 msgctxt "SC_OPCODE_COT"
 msgid "The angle in radians whose cotangent value is to be returned."
 msgstr "Ongl o fewn radianau y mae gwerth ei gotangiad i'w ddychwelyd."
 
-#: scfuncs.hrc:1187
+#: sc/inc/scfuncs.hrc:1187
 msgctxt "SC_OPCODE_TAN"
 msgid "Returns the tangent of a number."
 msgstr "Dychwelyd tangiad rhif."
 
-#: scfuncs.hrc:1188
+#: sc/inc/scfuncs.hrc:1188
 msgctxt "SC_OPCODE_TAN"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1189
+#: sc/inc/scfuncs.hrc:1189
 msgctxt "SC_OPCODE_TAN"
 msgid "The angle in radians for which the tangent is to be calculated."
 msgstr "Ongl mewn radianau y mae'r tangiad i'w dychwelyd."
 
-#: scfuncs.hrc:1195
+#: sc/inc/scfuncs.hrc:1195
 msgctxt "SC_OPCODE_COS_HYP"
 msgid "Returns the hyperbolic cosine of a number."
 msgstr "Dychwelyd cosin hypebolig rhif."
 
-#: scfuncs.hrc:1196
+#: sc/inc/scfuncs.hrc:1196
 msgctxt "SC_OPCODE_COS_HYP"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1197
+#: sc/inc/scfuncs.hrc:1197
 msgctxt "SC_OPCODE_COS_HYP"
 msgid "The value for which the hyperbolic cosine is to be returned."
 msgstr "Gwerth y mae cosin hyperbolig i'w ddychwelyd."
 
-#: scfuncs.hrc:1203
+#: sc/inc/scfuncs.hrc:1203
 msgctxt "SC_OPCODE_SIN_HYP"
 msgid "Returns the hyperbolic sine of a number."
 msgstr "Dychwelyd sin hyperbolig rhif."
 
-#: scfuncs.hrc:1204
+#: sc/inc/scfuncs.hrc:1204
 msgctxt "SC_OPCODE_SIN_HYP"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1205
+#: sc/inc/scfuncs.hrc:1205
 msgctxt "SC_OPCODE_SIN_HYP"
 msgid "The value for which the hyperbolic sine is to be calculated."
 msgstr "Gwerth y mae sin hyperbolig i'w gyfrifo."
 
-#: scfuncs.hrc:1211
+#: sc/inc/scfuncs.hrc:1211
 msgctxt "SC_OPCODE_COT_HYP"
 msgid "Returns the hyperbolic cotangent of a number."
 msgstr "Dychwelyd cotangiad hyperbolig rhif."
 
-#: scfuncs.hrc:1212
+#: sc/inc/scfuncs.hrc:1212
 msgctxt "SC_OPCODE_COT_HYP"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1213
+#: sc/inc/scfuncs.hrc:1213
 msgctxt "SC_OPCODE_COT_HYP"
 msgid "A value not equal to 0 for which the hyperbolic cotangent is to be returned."
 msgstr "Gwerth nid cydradd ag 0 y mae cotangiad hyperbolig i'w ddychwelyd."
 
-#: scfuncs.hrc:1219
+#: sc/inc/scfuncs.hrc:1219
 msgctxt "SC_OPCODE_TAN_HYP"
 msgid "Returns the hyperbolic tangent of a number."
 msgstr "Dychwelyd tangiad hyperbolig rhif."
 
-#: scfuncs.hrc:1220
+#: sc/inc/scfuncs.hrc:1220
 msgctxt "SC_OPCODE_TAN_HYP"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1221
+#: sc/inc/scfuncs.hrc:1221
 msgctxt "SC_OPCODE_TAN_HYP"
 msgid "The value for which the hyperbolic tangent is to be calculated."
 msgstr "Gwerth y mae tangiad hyperbolig i'w gyfrifo."
 
-#: scfuncs.hrc:1227
+#: sc/inc/scfuncs.hrc:1227
 msgctxt "SC_OPCODE_ARC_TAN_2"
 msgid "Returns the arctangent for the specified coordinates."
 msgstr "Dychwelyd yr arctangiad i'r cyfesurynnau enwyd."
 
-#: scfuncs.hrc:1228
+#: sc/inc/scfuncs.hrc:1228
 msgctxt "SC_OPCODE_ARC_TAN_2"
 msgid "Number X"
 msgstr "Rhif X"
 
-#: scfuncs.hrc:1229
+#: sc/inc/scfuncs.hrc:1229
 msgctxt "SC_OPCODE_ARC_TAN_2"
 msgid "The value for the X coordinate."
 msgstr "Gwerth y cyfesuryn x."
 
-#: scfuncs.hrc:1230
+#: sc/inc/scfuncs.hrc:1230
 msgctxt "SC_OPCODE_ARC_TAN_2"
 msgid "Number Y"
 msgstr "Rhif Y"
 
-#: scfuncs.hrc:1231
+#: sc/inc/scfuncs.hrc:1231
 msgctxt "SC_OPCODE_ARC_TAN_2"
 msgid "The value for the Y coordinate."
 msgstr "Gwerth y cyfesuryn Y."
 
-#: scfuncs.hrc:1237
+#: sc/inc/scfuncs.hrc:1237
 msgctxt "SC_OPCODE_COSECANT"
 msgid "Return the cosecant of an angle. CSC(x)=1/SIN(x)"
 msgstr "Dychwelyd cosecant ongl. CSC(x)=1/SIN(x)"
 
-#: scfuncs.hrc:1238
+#: sc/inc/scfuncs.hrc:1238
 msgctxt "SC_OPCODE_COSECANT"
 msgid "Angle"
 msgstr "Ongl"
 
-#: scfuncs.hrc:1239
+#: sc/inc/scfuncs.hrc:1239
 msgctxt "SC_OPCODE_COSECANT"
 msgid "The angle in radians for which the cosecant is to be calculated."
 msgstr "Ongl o fewn y radianau y mae'r cosecant i'w cyfrifo."
 
-#: scfuncs.hrc:1245
+#: sc/inc/scfuncs.hrc:1245
 msgctxt "SC_OPCODE_SECANT"
 msgid "Return the secant of an angle. SEC(x)=1/COS(x)"
 msgstr "Dychwelyd secant ongl. SEC(x)=1/COS(x)"
 
-#: scfuncs.hrc:1246
+#: sc/inc/scfuncs.hrc:1246
 msgctxt "SC_OPCODE_SECANT"
 msgid "Angle"
 msgstr "Ongl"
 
-#: scfuncs.hrc:1247
+#: sc/inc/scfuncs.hrc:1247
 msgctxt "SC_OPCODE_SECANT"
 msgid "The angle in radians for which the secant is to be calculated."
 msgstr "Ongl o fewn y radianau y mae'r cosicant i'w cyfrifo."
 
-#: scfuncs.hrc:1253
+#: sc/inc/scfuncs.hrc:1253
 msgctxt "SC_OPCODE_COSECANT_HYP"
 msgid "Return the hyperbolic cosecant of a hyperbolic angle. CSCH(x)=1/SINH(x)"
 msgstr "Dychwelyd ongl hyperbolig cosecant hyperbolig. CSCH(x)=1/SINH(x)"
 
-#: scfuncs.hrc:1254
+#: sc/inc/scfuncs.hrc:1254
 msgctxt "SC_OPCODE_COSECANT_HYP"
 msgid "Angle"
 msgstr "Ongl"
 
-#: scfuncs.hrc:1255
+#: sc/inc/scfuncs.hrc:1255
 msgctxt "SC_OPCODE_COSECANT_HYP"
 msgid "The hyperbolic angle in radians for which the hyperbolic cosecant is to be calculated."
 msgstr "Ongl hyperbolig radian y mae cosecant hyperbolig i'w cyfrifo."
 
-#: scfuncs.hrc:1261
+#: sc/inc/scfuncs.hrc:1261
 msgctxt "SC_OPCODE_SECANT_HYP"
 msgid "Return the hyperbolic secant of a hyperbolic angle. SECH(x)=1/COSH(x)"
 msgstr "Dychwelyd secant hyperbolig ongl hyperbolig. SECH(x)=1/COSH(x)"
 
-#: scfuncs.hrc:1262
+#: sc/inc/scfuncs.hrc:1262
 msgctxt "SC_OPCODE_SECANT_HYP"
 msgid "Angle"
 msgstr "Ongl"
 
-#: scfuncs.hrc:1263
+#: sc/inc/scfuncs.hrc:1263
 msgctxt "SC_OPCODE_SECANT_HYP"
 msgid "The hyperbolic angle in radians for which the hyperbolic secant is to be calculated."
 msgstr "Ongl hyperbolig radian y mae secantt hyperbolig i'w cyfrifo."
 
-#: scfuncs.hrc:1269
+#: sc/inc/scfuncs.hrc:1269
 msgctxt "SC_OPCODE_DEG"
 msgid "Converts a radian to degrees"
 msgstr "Trosi radian i raddau"
 
-#: scfuncs.hrc:1270
+#: sc/inc/scfuncs.hrc:1270
 msgctxt "SC_OPCODE_DEG"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1271
+#: sc/inc/scfuncs.hrc:1271
 msgctxt "SC_OPCODE_DEG"
 msgid "The angle in a radian"
 msgstr "Ongl mewn radian"
 
-#: scfuncs.hrc:1277
+#: sc/inc/scfuncs.hrc:1277
 msgctxt "SC_OPCODE_RAD"
 msgid "Converts degrees to radians"
 msgstr "Trosi graddau i radianau"
 
-#: scfuncs.hrc:1278
+#: sc/inc/scfuncs.hrc:1278
 msgctxt "SC_OPCODE_RAD"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1279
+#: sc/inc/scfuncs.hrc:1279
 msgctxt "SC_OPCODE_RAD"
 msgid "The angle in degrees."
 msgstr "Ongl mewn graddau."
 
-#: scfuncs.hrc:1285
+#: sc/inc/scfuncs.hrc:1285
 msgctxt "SC_OPCODE_EXP"
 msgid "Calculates the exponent for basis e."
 msgstr "Cyfrifo yr esbonydd ar gyfer sail e."
 
-#: scfuncs.hrc:1286
+#: sc/inc/scfuncs.hrc:1286
 msgctxt "SC_OPCODE_EXP"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1287
+#: sc/inc/scfuncs.hrc:1287
 msgctxt "SC_OPCODE_EXP"
 msgid "The exponent applied to base e."
 msgstr "Yr esbonydd wedi ei osod i sail e."
 
-#: scfuncs.hrc:1293
+#: sc/inc/scfuncs.hrc:1293
 msgctxt "SC_OPCODE_LOG"
 msgid "Calculates the logarithm to any specified base."
 msgstr "Cyfrifo'r logarithm i unrhyw sail neilltuol."
 
-#: scfuncs.hrc:1294
+#: sc/inc/scfuncs.hrc:1294
 msgctxt "SC_OPCODE_LOG"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1295
+#: sc/inc/scfuncs.hrc:1295
 msgctxt "SC_OPCODE_LOG"
 msgid "A value greater than 0 for which the logarithm is to be calculated."
 msgstr "Gwerth mwy na 0 ar ei gyfer y mae logarithm i'w gyfrif."
 
-#: scfuncs.hrc:1296
+#: sc/inc/scfuncs.hrc:1296
 msgctxt "SC_OPCODE_LOG"
 msgid "Base"
 msgstr "Sail"
 
-#: scfuncs.hrc:1297
+#: sc/inc/scfuncs.hrc:1297
 msgctxt "SC_OPCODE_LOG"
 msgid "The base of the logarithm. If omitted, the base is regarded as 10."
 msgstr "Sail y logarithm. Os ei hepgor, y sail yw 10."
 
-#: scfuncs.hrc:1303
+#: sc/inc/scfuncs.hrc:1303
 msgctxt "SC_OPCODE_LN"
 msgid "Calculates the natural logarithm of a number."
 msgstr "Cyfrifo logarithm naturiol rhif."
 
-#: scfuncs.hrc:1304
+#: sc/inc/scfuncs.hrc:1304
 msgctxt "SC_OPCODE_LN"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1305
+#: sc/inc/scfuncs.hrc:1305
 msgctxt "SC_OPCODE_LN"
 msgid "A value greater than 0 for which the natural logarithm is to be calculated."
 msgstr "Gwerth mwy na 0 am yr hyn y bydd y logarithm naturiol yn cael ei gyfrifo."
 
-#: scfuncs.hrc:1311
+#: sc/inc/scfuncs.hrc:1311
 msgctxt "SC_OPCODE_LOG10"
 msgid "Calculates the base-10 logarithm of a number."
 msgstr "Cyfrifo base-10 logarithm rhif."
 
-#: scfuncs.hrc:1312
+#: sc/inc/scfuncs.hrc:1312
 msgctxt "SC_OPCODE_LOG10"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1313
+#: sc/inc/scfuncs.hrc:1313
 msgctxt "SC_OPCODE_LOG10"
 msgid "A value greater than 0 for which the logarithm is to be calculated."
 msgstr "Gwerth mwy na 0 ar ei gyfer y mae logarithm i'w gyfrif."
 
-#: scfuncs.hrc:1319
+#: sc/inc/scfuncs.hrc:1319
 msgctxt "SC_OPCODE_FACT"
 msgid "Calculates the factorial of a number."
 msgstr "Cyfrifo ffactorial rhif."
 
-#: scfuncs.hrc:1320
+#: sc/inc/scfuncs.hrc:1320
 msgctxt "SC_OPCODE_FACT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1321
+#: sc/inc/scfuncs.hrc:1321
 msgctxt "SC_OPCODE_FACT"
 msgid "The number for which the factorial is to be calculated."
 msgstr "Y rhif y bydd y ffactorial yn cael ei gyfrifo."
 
-#: scfuncs.hrc:1327
+#: sc/inc/scfuncs.hrc:1327
 msgctxt "SC_OPCODE_MOD"
 msgid "Calculates the remainder of a division."
 msgstr "Cyfrifo gweddill yr adran."
 
-#: scfuncs.hrc:1328
+#: sc/inc/scfuncs.hrc:1328
 msgctxt "SC_OPCODE_MOD"
 msgid "Dividend"
 msgstr "Rhannyn"
 
-#: scfuncs.hrc:1329
+#: sc/inc/scfuncs.hrc:1329
 msgctxt "SC_OPCODE_MOD"
 msgid "The number to be divided."
 msgstr "Y rhif i'w rannu."
 
-#: scfuncs.hrc:1330
+#: sc/inc/scfuncs.hrc:1330
 msgctxt "SC_OPCODE_MOD"
 msgid "Divisor"
 msgstr "Rhannydd"
 
-#: scfuncs.hrc:1331
+#: sc/inc/scfuncs.hrc:1331
 msgctxt "SC_OPCODE_MOD"
 msgid "The number by which the dividend is divided."
 msgstr "Y rhif y bydd y rhannyn yn cael ei rannu."
 
-#: scfuncs.hrc:1337
+#: sc/inc/scfuncs.hrc:1337
 msgctxt "SC_OPCODE_PLUS_MINUS"
 msgid "Returns the algebraic sign of a number."
 msgstr "Dychwelyd arwydd algebreg rhif."
 
-#: scfuncs.hrc:1338
+#: sc/inc/scfuncs.hrc:1338
 msgctxt "SC_OPCODE_PLUS_MINUS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1339
+#: sc/inc/scfuncs.hrc:1339
 msgctxt "SC_OPCODE_PLUS_MINUS"
 msgid "The number for which the algebraic sign is to be determined."
 msgstr "Rhif y bydd yr arwydd algebreg yn cael ei bennu."
 
-#: scfuncs.hrc:1345
+#: sc/inc/scfuncs.hrc:1345
 msgctxt "SC_OPCODE_SUB_TOTAL"
 msgid "Calculates subtotals in a spreadsheet."
 msgstr "Cyfrifo'r is gyfansymiau mewn taenlen."
 
-#: scfuncs.hrc:1346
+#: sc/inc/scfuncs.hrc:1346
 msgctxt "SC_OPCODE_SUB_TOTAL"
 msgid "Function"
 msgstr "Ffwythiant"
 
-#: scfuncs.hrc:1347
+#: sc/inc/scfuncs.hrc:1347
 msgctxt "SC_OPCODE_SUB_TOTAL"
 msgid "Function index. Is an index of the possible functions Total, Max, ..."
 msgstr "Mynegai swyddogaeth. Mynegai o swyddogaethau Cyfanswm, Mwyaf, ..."
 
-#: scfuncs.hrc:1348
+#: sc/inc/scfuncs.hrc:1348
 msgctxt "SC_OPCODE_SUB_TOTAL"
 msgid "Range"
 msgstr "Amrediad"
 
-#: scfuncs.hrc:1349
+#: sc/inc/scfuncs.hrc:1349
 msgctxt "SC_OPCODE_SUB_TOTAL"
 msgid "The cells of the range which are to be taken into account."
 msgstr "Celloedd ystod sydd i'w ystyried."
 
-#: scfuncs.hrc:1355
+#: sc/inc/scfuncs.hrc:1355
 msgctxt "SC_OPCODE_AGGREGATE"
 msgid "Calculates an aggregate in a spreadsheet."
 msgstr "Cyfrifo'r is gyfansymiau mewn taenlen."
 
-#: scfuncs.hrc:1356
+#: sc/inc/scfuncs.hrc:1356
 msgctxt "SC_OPCODE_AGGREGATE"
 msgid "Function"
 msgstr "Swyddogaeth"
 
-#: scfuncs.hrc:1357
+#: sc/inc/scfuncs.hrc:1357
 msgctxt "SC_OPCODE_AGGREGATE"
 msgid "Function index. Is an index of the possible functions Total, Max, ..."
 msgstr "Mynegai swyddogaeth. Mynegai o swyddogaethau Cyfanswm, Mwyaf, ..."
 
-#: scfuncs.hrc:1358
+#: sc/inc/scfuncs.hrc:1358
 msgctxt "SC_OPCODE_AGGREGATE"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: scfuncs.hrc:1359
+#: sc/inc/scfuncs.hrc:1359
 msgctxt "SC_OPCODE_AGGREGATE"
 msgid "Option index. Is an index of the possible ignore options."
 msgstr "Mynegai dewis. Mynegai'r dewisiadau anwybyddu posib."
 
-#: scfuncs.hrc:1360
+#: sc/inc/scfuncs.hrc:1360
 msgctxt "SC_OPCODE_AGGREGATE"
 msgid "Reference 1 or array"
 msgstr "Cyfeirnod 1 neu arae"
 
-#: scfuncs.hrc:1361
+#: sc/inc/scfuncs.hrc:1361
 msgctxt "SC_OPCODE_AGGREGATE"
 msgid "The cell(s) of the range which are to be taken into account."
 msgstr "Cell(oedd) ystod sydd i'w ystyried."
 
-#: scfuncs.hrc:1362
+#: sc/inc/scfuncs.hrc:1362
 msgctxt "SC_OPCODE_AGGREGATE"
 msgid "Reference 2..n or k "
 msgstr "Cyfeirnod 2..n neu k "
 
-#: scfuncs.hrc:1363
+#: sc/inc/scfuncs.hrc:1363
 msgctxt "SC_OPCODE_AGGREGATE"
 msgid "The cells of the range which are to be taken into account or mandatory 2nd argument for certain functions."
 msgstr "Celloedd yr ystod ail ymresymiad i'w ystyried neu'n orfodol ar gyfer rai swyddogaethau."
 
-#: scfuncs.hrc:1369
+#: sc/inc/scfuncs.hrc:1369
 msgctxt "SC_OPCODE_INT"
 msgid "Rounds a number down to the nearest integer."
 msgstr "Talgrynnu rhif i lawr i'r cyfanrif agosaf."
 
-#: scfuncs.hrc:1370
+#: sc/inc/scfuncs.hrc:1370
 msgctxt "SC_OPCODE_INT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1371
+#: sc/inc/scfuncs.hrc:1371
 msgctxt "SC_OPCODE_INT"
 msgid "The number to be rounded down."
 msgstr "Rhif i'w talgrynnu i lawr."
 
-#: scfuncs.hrc:1377
+#: sc/inc/scfuncs.hrc:1377
 msgctxt "SC_OPCODE_TRUNC"
 msgid "Truncates the decimal places of a number."
 msgstr "Blaendorri'r lleoedd degol rhif."
 
-#: scfuncs.hrc:1378
+#: sc/inc/scfuncs.hrc:1378
 msgctxt "SC_OPCODE_TRUNC"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1379
+#: sc/inc/scfuncs.hrc:1379
 msgctxt "SC_OPCODE_TRUNC"
 msgid "The number to be truncated."
 msgstr "Y rhif i'w flaendorri."
 
-#: scfuncs.hrc:1380
+#: sc/inc/scfuncs.hrc:1380
 msgctxt "SC_OPCODE_TRUNC"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: scfuncs.hrc:1381
+#: sc/inc/scfuncs.hrc:1381
 msgctxt "SC_OPCODE_TRUNC"
 msgid "The number of places after the decimal point that are not to be truncated."
 msgstr "Y nifer o leoedd wedi'r pwynt degol nad ydynt wedi eu blaendorri."
 
-#: scfuncs.hrc:1387
+#: sc/inc/scfuncs.hrc:1387
 msgctxt "SC_OPCODE_ROUND"
 msgid "Rounds a number to a predefined accuracy."
 msgstr "Talgrynnu rhif i gywirdeb rhag diffiniedig."
 
-#: scfuncs.hrc:1388
+#: sc/inc/scfuncs.hrc:1388
 msgctxt "SC_OPCODE_ROUND"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1389
+#: sc/inc/scfuncs.hrc:1389
 msgctxt "SC_OPCODE_ROUND"
 msgid "The number to be rounded."
 msgstr "Y rhif i'w dalgrynnu."
 
-#: scfuncs.hrc:1390
+#: sc/inc/scfuncs.hrc:1390
 msgctxt "SC_OPCODE_ROUND"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: scfuncs.hrc:1391
+#: sc/inc/scfuncs.hrc:1391
 msgctxt "SC_OPCODE_ROUND"
 msgid "The number of places to which a number is to be rounded."
 msgstr "Nifer o leoedd y mae rhif i'w dalgrynnu."
 
-#: scfuncs.hrc:1397
+#: sc/inc/scfuncs.hrc:1397
 msgctxt "SC_OPCODE_ROUND_UP"
 msgid "Rounds a number up to the predefined accuracy."
 msgstr "Talgrynnu rhif i gywirdeb rhagddiffinedig."
 
-#: scfuncs.hrc:1398
+#: sc/inc/scfuncs.hrc:1398
 msgctxt "SC_OPCODE_ROUND_UP"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1399
+#: sc/inc/scfuncs.hrc:1399
 msgctxt "SC_OPCODE_ROUND_UP"
 msgid "The number to be rounded up."
 msgstr "Y rhif i'w dalgrynnu i fyny."
 
-#: scfuncs.hrc:1400
+#: sc/inc/scfuncs.hrc:1400
 msgctxt "SC_OPCODE_ROUND_UP"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: scfuncs.hrc:1401
+#: sc/inc/scfuncs.hrc:1401
 msgctxt "SC_OPCODE_ROUND_UP"
 msgid "The number of places to which a number is to be rounded."
 msgstr "Nifer o leoedd y mae rhif i'w dalgrynnu."
 
-#: scfuncs.hrc:1407
+#: sc/inc/scfuncs.hrc:1407
 msgctxt "SC_OPCODE_ROUND_DOWN"
 msgid "Rounds a number down to a predefined accuracy."
 msgstr "Talgrynnu rhif i gywirdeb rhagddiffinedig."
 
-#: scfuncs.hrc:1408
+#: sc/inc/scfuncs.hrc:1408
 msgctxt "SC_OPCODE_ROUND_DOWN"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1409
+#: sc/inc/scfuncs.hrc:1409
 msgctxt "SC_OPCODE_ROUND_DOWN"
 msgid "The number to be rounded down."
 msgstr "Rhif i'w talgrynnu i lawr."
 
-#: scfuncs.hrc:1410
+#: sc/inc/scfuncs.hrc:1410
 msgctxt "SC_OPCODE_ROUND_DOWN"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: scfuncs.hrc:1411
+#: sc/inc/scfuncs.hrc:1411
 msgctxt "SC_OPCODE_ROUND_DOWN"
 msgid "The number of places down to which a number is to be rounded."
 msgstr "Nifer o leoedd i lawr y mae rhif i'w dalgrynnu."
 
-#: scfuncs.hrc:1417
+#: sc/inc/scfuncs.hrc:1417
 msgctxt "SC_OPCODE_EVEN"
 msgid "Rounds a positive number up and negative number down to the nearest even integer."
 msgstr "Talgrynnu rhif positif i fyny a rhif negyddol lawr i'r eil gyfanrif agosaf."
 
-#: scfuncs.hrc:1418
+#: sc/inc/scfuncs.hrc:1418
 msgctxt "SC_OPCODE_EVEN"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1419
+#: sc/inc/scfuncs.hrc:1419
 msgctxt "SC_OPCODE_EVEN"
 msgid "The number to be rounded up."
 msgstr "Y rhif i'w dalgrynnu i fyny."
 
-#: scfuncs.hrc:1425
+#: sc/inc/scfuncs.hrc:1425
 msgctxt "SC_OPCODE_ODD"
 msgid "Rounds a positive number up and negative number down to the nearest odd integer."
 msgstr "Talgrynnu rhif positif i fyny a rhif negyddol lawr i'r od gyfanrif agosaf."
 
-#: scfuncs.hrc:1426
+#: sc/inc/scfuncs.hrc:1426
 msgctxt "SC_OPCODE_ODD"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1427
+#: sc/inc/scfuncs.hrc:1427
 msgctxt "SC_OPCODE_ODD"
 msgid "The number to be rounded up."
 msgstr "Y rhif i'w dalgrynnu i fyny."
 
-#: scfuncs.hrc:1433
+#: sc/inc/scfuncs.hrc:1433
 msgctxt "SC_OPCODE_CEIL_MS"
 msgid ""
 "Rounds a number away from zero to the nearest multiple of significance.\n"
@@ -6367,182 +6322,182 @@ msgstr ""
 "Talgrynnu rhif oddi wrth sero i'r lluosog gwerth absoliwt arwyddocaol agosaf.\n"
 "Mae'r swyddogaeth yn bodoli er mwyn rhyngweithredu gyda Microsoft Excel 2007 neu fersiynau hŷn."
 
-#: scfuncs.hrc:1434
+#: sc/inc/scfuncs.hrc:1434
 msgctxt "SC_OPCODE_CEIL_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1435
+#: sc/inc/scfuncs.hrc:1435
 msgctxt "SC_OPCODE_CEIL_MS"
 msgid "The number to be rounded up."
 msgstr "Y rhif i'w dalgrynnu i fyny."
 
-#: scfuncs.hrc:1436
+#: sc/inc/scfuncs.hrc:1436
 msgctxt "SC_OPCODE_CEIL_MS"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:1437
+#: sc/inc/scfuncs.hrc:1437
 msgctxt "SC_OPCODE_CEIL_MS"
 msgid "The number to whose multiple the value is rounded."
 msgstr "Rhif y mae ei luosog yn werth i'w dalgrynnu."
 
-#: scfuncs.hrc:1443
+#: sc/inc/scfuncs.hrc:1443
 msgctxt "SC_OPCODE_CEIL_PRECISE"
 msgid "Rounds a number up to the nearest multiple of significance, regardless of sign of significance."
 msgstr "Talgrynnu'r rhif i'r lluosog arwyddocaol agosaf, beth bynnag yw'r arwydd o'r arwyddocâd."
 
-#: scfuncs.hrc:1444
+#: sc/inc/scfuncs.hrc:1444
 msgctxt "SC_OPCODE_CEIL_PRECISE"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1445
+#: sc/inc/scfuncs.hrc:1445
 msgctxt "SC_OPCODE_CEIL_PRECISE"
 msgid "The number to be rounded up."
 msgstr "Y rhif i'w dalgrynnu i fyny."
 
-#: scfuncs.hrc:1446
+#: sc/inc/scfuncs.hrc:1446
 msgctxt "SC_OPCODE_CEIL_PRECISE"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:1447
+#: sc/inc/scfuncs.hrc:1447
 msgctxt "SC_OPCODE_CEIL_PRECISE"
 msgid "The number to whose multiple the value is rounded."
 msgstr "Rhif y mae ei luosog yn werth i'w dalgrynnu."
 
-#: scfuncs.hrc:1453
+#: sc/inc/scfuncs.hrc:1453
 msgctxt "SC_OPCODE_CEIL_ISO"
 msgid "Rounds a number up to the nearest multiple of significance, regardless of sign of significance."
 msgstr "Cyfannu'r lluosogyn agosaf arwyddocaol i fyny, heb ystyried yr arwyddo o arwyddocâd."
 
-#: scfuncs.hrc:1454
+#: sc/inc/scfuncs.hrc:1454
 msgctxt "SC_OPCODE_CEIL_ISO"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1455
+#: sc/inc/scfuncs.hrc:1455
 msgctxt "SC_OPCODE_CEIL_ISO"
 msgid "The number to be rounded up."
 msgstr "Y rhif i'w dalgrynnu i fyny."
 
-#: scfuncs.hrc:1456
+#: sc/inc/scfuncs.hrc:1456
 msgctxt "SC_OPCODE_CEIL_ISO"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:1457
+#: sc/inc/scfuncs.hrc:1457
 msgctxt "SC_OPCODE_CEIL_ISO"
 msgid "The number to whose multiple the value is rounded."
 msgstr "Rhif y mae ei luosog yn werth i'w dalgrynnu."
 
-#: scfuncs.hrc:1463
+#: sc/inc/scfuncs.hrc:1463
 msgctxt "SC_OPCODE_CEIL"
 msgid "Rounds a number up to the nearest multiple of significance."
 msgstr "Talgrynnu rhif i fyny i'r lluosrif agosaf o arwyddocâd."
 
-#: scfuncs.hrc:1464
+#: sc/inc/scfuncs.hrc:1464
 msgctxt "SC_OPCODE_CEIL"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1465
+#: sc/inc/scfuncs.hrc:1465
 msgctxt "SC_OPCODE_CEIL"
 msgid "The number to be rounded up."
 msgstr "Y rhif i'w dalgrynnu i fyny."
 
-#: scfuncs.hrc:1466
+#: sc/inc/scfuncs.hrc:1466
 msgctxt "SC_OPCODE_CEIL"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:1467
+#: sc/inc/scfuncs.hrc:1467
 msgctxt "SC_OPCODE_CEIL"
 msgid "If given the number to whose multiple the value is rounded, else -1 or 1 depending on sign of Number."
 msgstr "Os yn derbyn y rhif y mae ei werth lluosrif yn cael ei dalgrynnu, fel arall -1 neu 1 yn ddibynnol ar arwydd y Rhif."
 
-#: scfuncs.hrc:1468
+#: sc/inc/scfuncs.hrc:1468
 msgctxt "SC_OPCODE_CEIL"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:1469
+#: sc/inc/scfuncs.hrc:1469
 msgctxt "SC_OPCODE_CEIL"
 msgid "If given and not equal to zero then rounded up according to amount when a negative number and significance."
 msgstr "Os rhoddedig ac nid yn gydradd â sero yna ei grynhoi yn ôl y swm pan yn rhif negyddol ac arwyddocâd."
 
-#: scfuncs.hrc:1475
+#: sc/inc/scfuncs.hrc:1475
 msgctxt "SC_OPCODE_CEIL_MATH"
 msgid "Rounds a number up to the nearest multiple of significance."
 msgstr "Talgrynnu rhif i fyny i'r lluosrif agosaf o arwyddocâd."
 
-#: scfuncs.hrc:1476
+#: sc/inc/scfuncs.hrc:1476
 msgctxt "SC_OPCODE_CEIL_MATH"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1477
+#: sc/inc/scfuncs.hrc:1477
 msgctxt "SC_OPCODE_CEIL_MATH"
 msgid "The number to be rounded up."
 msgstr "Y rhif i'w dalgrynnu i fyny."
 
-#: scfuncs.hrc:1478
+#: sc/inc/scfuncs.hrc:1478
 msgctxt "SC_OPCODE_CEIL_MATH"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:1479
+#: sc/inc/scfuncs.hrc:1479
 msgctxt "SC_OPCODE_CEIL_MATH"
 msgid "If given the number to whose multiple the value is rounded, else 1."
 msgstr "Rhif y mae ei luosog yn werth i'w dalgrynnu, fel arall 1."
 
-#: scfuncs.hrc:1480
+#: sc/inc/scfuncs.hrc:1480
 msgctxt "SC_OPCODE_CEIL_MATH"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:1481
+#: sc/inc/scfuncs.hrc:1481
 msgctxt "SC_OPCODE_CEIL_MATH"
 msgid "For negative numbers; if given and not equal to zero then rounds away from zero, else rounds towards zero."
 msgstr "Ar gyfer rhifau negyddol; os yn cael ei roi ac nid yw'n gydradd â sero ac yna'n talgrynnu o sero, fel arall talgrynnu tuag at sero."
 
-#: scfuncs.hrc:1487
+#: sc/inc/scfuncs.hrc:1487
 msgctxt "SC_OPCODE_FLOOR"
 msgid "Rounds number down to the nearest multiple of significance."
 msgstr "Talgrynnu rhif i lawr i'r lluosrif agosaf o arwyddocâd."
 
-#: scfuncs.hrc:1488
+#: sc/inc/scfuncs.hrc:1488
 msgctxt "SC_OPCODE_FLOOR"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1489
+#: sc/inc/scfuncs.hrc:1489
 msgctxt "SC_OPCODE_FLOOR"
 msgid "The number to be rounded down."
 msgstr "Rhif i'w talgrynnu i lawr."
 
-#: scfuncs.hrc:1490
+#: sc/inc/scfuncs.hrc:1490
 msgctxt "SC_OPCODE_FLOOR"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:1491
+#: sc/inc/scfuncs.hrc:1491
 msgctxt "SC_OPCODE_FLOOR"
 msgid "The number to whose multiple the value is to be rounded down."
 msgstr "Rhif y mae ei luosog yn werth i'w dalgrynnu i lawr."
 
-#: scfuncs.hrc:1492
+#: sc/inc/scfuncs.hrc:1492
 msgctxt "SC_OPCODE_FLOOR"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:1493
+#: sc/inc/scfuncs.hrc:1493
 msgctxt "SC_OPCODE_FLOOR"
 msgid "If given and not equal to zero then rounded towards zero with negative number and significance."
 msgstr "Os rhoddedig ac nid yn gydradd â sero yna ei grynhoi yn ôl y swm pan yn rhif negyddol ac arwyddocaol."
 
-#: scfuncs.hrc:1499
+#: sc/inc/scfuncs.hrc:1499
 msgctxt "SC_OPCODE_FLOOR_MS"
 msgid ""
 "Rounds number towards zero to the nearest multiple of absolute value of significance.\n"
@@ -6551,7230 +6506,7240 @@ msgstr ""
 "Talgrynnu rhif tuag at sero i'r lluosog gwerth absoliwt agosaf arwyddocaol.\n"
 "Mae'r swyddogaeth yn bodoli er mwyn rhyngweithredu gyda Microsoft Excel 2007 neu fersiynau hŷn."
 
-#: scfuncs.hrc:1500
+#: sc/inc/scfuncs.hrc:1500
 msgctxt "SC_OPCODE_FLOOR_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1501
+#: sc/inc/scfuncs.hrc:1501
 msgctxt "SC_OPCODE_FLOOR_MS"
 msgid "The number to be rounded down."
 msgstr "Rhif i'w talgrynnu i lawr."
 
-#: scfuncs.hrc:1502
+#: sc/inc/scfuncs.hrc:1502
 msgctxt "SC_OPCODE_FLOOR_MS"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:1503
+#: sc/inc/scfuncs.hrc:1503
 msgctxt "SC_OPCODE_FLOOR_MS"
 msgid "The number to whose multiple the value is to be rounded down."
 msgstr "Rhif y mae ei luosog yn werth i'w dalgrynnu i lawr."
 
-#: scfuncs.hrc:1509
+#: sc/inc/scfuncs.hrc:1509
 msgctxt "SC_OPCODE_FLOOR_MATH"
 msgid "Rounds number down to the nearest multiple of significance, regardless of sign of significance."
 msgstr "Talgrynnu'r lluosogyn agosaf arwyddocaol i lawr i'r lluosog arwyddocaol, heb ystyried yr arwyddo o arwyddocâd."
 
-#: scfuncs.hrc:1510
+#: sc/inc/scfuncs.hrc:1510
 msgctxt "SC_OPCODE_FLOOR_MATH"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1511
+#: sc/inc/scfuncs.hrc:1511
 msgctxt "SC_OPCODE_FLOOR_MATH"
 msgid "The number to be rounded down."
 msgstr "Rhif i'w dalgrynnu i lawr."
 
-#: scfuncs.hrc:1512
+#: sc/inc/scfuncs.hrc:1512
 msgctxt "SC_OPCODE_FLOOR_MATH"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:1513
+#: sc/inc/scfuncs.hrc:1513
 msgctxt "SC_OPCODE_FLOOR_MATH"
 msgid "The number to whose multiple the value is to be rounded down."
 msgstr "Rhif y mae ei luosog yn werth i'w dalgrynnu i lawr."
 
-#: scfuncs.hrc:1514
+#: sc/inc/scfuncs.hrc:1514
 msgctxt "SC_OPCODE_FLOOR_MATH"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:1515
+#: sc/inc/scfuncs.hrc:1515
 msgctxt "SC_OPCODE_FLOOR_MATH"
 msgid "For negative numbers; if given and not equal to or less than zero rounds towards zero."
 msgstr "Ar gyfer rhifau negyddol; os yn cael ei roi ac nid yw'n gydradd â sero ac yna'n talgrynnu tuag at sero."
 
-#: scfuncs.hrc:1521
+#: sc/inc/scfuncs.hrc:1521
 msgctxt "SC_OPCODE_FLOOR_PRECISE"
 msgid "Rounds number down (towards -∞) to the nearest multiple of significance."
 msgstr "Talgrynnu rhif i lawr (tuag at -∞) i'r lluosrif agosaf o arwyddocâd."
 
-#: scfuncs.hrc:1522
+#: sc/inc/scfuncs.hrc:1522
 msgctxt "SC_OPCODE_FLOOR_PRECISE"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:1523
+#: sc/inc/scfuncs.hrc:1523
 msgctxt "SC_OPCODE_FLOOR_PRECISE"
 msgid "The number to be rounded down."
 msgstr "Rhif i'w dalgrynnu i lawr."
 
-#: scfuncs.hrc:1524
+#: sc/inc/scfuncs.hrc:1524
 msgctxt "SC_OPCODE_FLOOR_PRECISE"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:1525
+#: sc/inc/scfuncs.hrc:1525
 msgctxt "SC_OPCODE_FLOOR_PRECISE"
 msgid "The number to whose multiple the value is to be rounded down. Sign has no meaning."
 msgstr "Rhif y mae ei luosog yn werth i'w dalgrynnu i lawr. Nid oes gan yr arwydd ystyr."
 
-#: scfuncs.hrc:1531
+#: sc/inc/scfuncs.hrc:1531
 msgctxt "SC_OPCODE_GCD"
 msgid "Greatest Common Divisor"
 msgstr "Rhannydd Cyffredin Mwyaf"
 
-#: scfuncs.hrc:1532
+#: sc/inc/scfuncs.hrc:1532
 msgctxt "SC_OPCODE_GCD"
 msgid "Integer "
 msgstr "Cyfanrif "
 
-#: scfuncs.hrc:1533
+#: sc/inc/scfuncs.hrc:1533
 msgctxt "SC_OPCODE_GCD"
 msgid "Integer 1; integer 2,... are integers for which the greatest common divisor is to be calculated."
 msgstr "Cyfanrif 1; cyfanrif 2,... yn gyfanrifau y mae'r rhannydd cyffredin mwyaf yn cael ei gyfrifo."
 
-#: scfuncs.hrc:1539
+#: sc/inc/scfuncs.hrc:1539
 msgctxt "SC_OPCODE_LCM"
 msgid "Lowest common multiple"
 msgstr "Lluosog cyffredin isaf"
 
-#: scfuncs.hrc:1540
+#: sc/inc/scfuncs.hrc:1540
 msgctxt "SC_OPCODE_LCM"
 msgid "Integer "
 msgstr "Cyfanrif "
 
-#: scfuncs.hrc:1541
+#: sc/inc/scfuncs.hrc:1541
 msgctxt "SC_OPCODE_LCM"
 msgid "Integer 1; integer 2,... are integers whose smallest common multiple is to be calculated."
 msgstr "Mae cyfanrif 1; cyfanrif 2,... yn gyfanrifau y bydd eu lluosog cyffredin lleiaf yn cael ei gyfrifo."
 
-#: scfuncs.hrc:1547
+#: sc/inc/scfuncs.hrc:1547
 msgctxt "SC_OPCODE_MAT_TRANS"
 msgid "Array transposition. Exchanges the rows and columns of an array."
 msgstr "Trawsddodiad arae. Cyfnewid rhesi a cholofnau arae."
 
-#: scfuncs.hrc:1548
+#: sc/inc/scfuncs.hrc:1548
 msgctxt "SC_OPCODE_MAT_TRANS"
 msgid "Array"
 msgstr "Arae"
 
-#: scfuncs.hrc:1549
+#: sc/inc/scfuncs.hrc:1549
 msgctxt "SC_OPCODE_MAT_TRANS"
 msgid "The array in which the rows and columns have been transposed."
 msgstr "Yr arae y mae'r rhesi a'r colofnau wedi eu trawsddodi."
 
-#: scfuncs.hrc:1555
+#: sc/inc/scfuncs.hrc:1555
 msgctxt "SC_OPCODE_MAT_MULT"
 msgid "Array multiplication. Returns the product of two arrays."
 msgstr "Lluosiad arae. Dychwelyd cynnyrch dau aräe."
 
-#: scfuncs.hrc:1556
+#: sc/inc/scfuncs.hrc:1556
 msgctxt "SC_OPCODE_MAT_MULT"
 msgid "Array 1"
 msgstr "Arae 1"
 
-#: scfuncs.hrc:1557
+#: sc/inc/scfuncs.hrc:1557
 msgctxt "SC_OPCODE_MAT_MULT"
 msgid "The first array for the array product."
 msgstr "Arae cyntaf cynnyrch arae."
 
-#: scfuncs.hrc:1558
+#: sc/inc/scfuncs.hrc:1558
 msgctxt "SC_OPCODE_MAT_MULT"
 msgid "Array 2"
 msgstr "Arae 2"
 
-#: scfuncs.hrc:1559
+#: sc/inc/scfuncs.hrc:1559
 msgctxt "SC_OPCODE_MAT_MULT"
 msgid "The second array having the same number of rows as the first array has columns."
 msgstr "Ail arae sydd a'r un nifer o resi ag sydd gan yr arae cyntaf o golofnau."
 
-#: scfuncs.hrc:1565
+#: sc/inc/scfuncs.hrc:1565
 msgctxt "SC_OPCODE_MAT_DET"
 msgid "Returns the array determinant."
 msgstr "Dychwelyd determinant yr arae."
 
-#: scfuncs.hrc:1566
+#: sc/inc/scfuncs.hrc:1566
 msgctxt "SC_OPCODE_MAT_DET"
 msgid "Array"
 msgstr "Arae"
 
-#: scfuncs.hrc:1567
+#: sc/inc/scfuncs.hrc:1567
 msgctxt "SC_OPCODE_MAT_DET"
 msgid "The array for which the determinant is to be determined."
 msgstr "Arae y bydd y determinant yn cael ei benderfynu."
 
-#: scfuncs.hrc:1573
+#: sc/inc/scfuncs.hrc:1573
 msgctxt "SC_OPCODE_MAT_INV"
 msgid "Returns the inverse of an array."
 msgstr "Dychwelyd gwrthdro arae."
 
-#: scfuncs.hrc:1574
+#: sc/inc/scfuncs.hrc:1574
 msgctxt "SC_OPCODE_MAT_INV"
 msgid "Array"
 msgstr "Arae"
 
-#: scfuncs.hrc:1575
+#: sc/inc/scfuncs.hrc:1575
 msgctxt "SC_OPCODE_MAT_INV"
 msgid "The array to be inverted."
 msgstr "Yr arae i'w wrth-droi."
 
-#: scfuncs.hrc:1581
+#: sc/inc/scfuncs.hrc:1581
 msgctxt "SC_OPCODE_MATRIX_UNIT"
 msgid "Returns the unitary square array of a certain size."
 msgstr "Dychwelyd arae sgwâr unedol o faint arbennig."
 
-#: scfuncs.hrc:1582
+#: sc/inc/scfuncs.hrc:1582
 msgctxt "SC_OPCODE_MATRIX_UNIT"
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: scfuncs.hrc:1583
+#: sc/inc/scfuncs.hrc:1583
 msgctxt "SC_OPCODE_MATRIX_UNIT"
 msgid "The size of the unitary array."
 msgstr "Maint yr arae unedol."
 
-#: scfuncs.hrc:1589
+#: sc/inc/scfuncs.hrc:1589
 msgctxt "SC_OPCODE_SUM_PRODUCT"
 msgid "(Inner products) Returns the sum of the products of array arguments."
 msgstr "(Cynnyrch mewnol) Dychwelyd swm y cynnyrch ymresymiadau arae."
 
-#: scfuncs.hrc:1590
+#: sc/inc/scfuncs.hrc:1590
 msgctxt "SC_OPCODE_SUM_PRODUCT"
 msgid "Array "
 msgstr "Arae "
 
-#: scfuncs.hrc:1591
+#: sc/inc/scfuncs.hrc:1591
 msgctxt "SC_OPCODE_SUM_PRODUCT"
 msgid "Array 1, array 2, ... are arrays whose arguments are to be multiplied."
 msgstr "Arae 1, arae 2, ... yn arae y mae eu hymresymiadau i'w lluosogi."
 
-#: scfuncs.hrc:1597
+#: sc/inc/scfuncs.hrc:1597
 msgctxt "SC_OPCODE_SUM_X2MY2"
 msgid "Returns the sum of the difference of squares of two arrays."
 msgstr "Dychwelyd swm y gwahaniaeth o sgwariau dau arae."
 
-#: scfuncs.hrc:1598
+#: sc/inc/scfuncs.hrc:1598
 msgctxt "SC_OPCODE_SUM_X2MY2"
 msgid "Array X"
 msgstr "Arae X"
 
-#: scfuncs.hrc:1599
+#: sc/inc/scfuncs.hrc:1599
 msgctxt "SC_OPCODE_SUM_X2MY2"
 msgid "First array where the square of the arguments are totalled."
 msgstr "Arae cyntaf lle mae sgwâr yr ymresymiadau i'w cyfansymu."
 
-#: scfuncs.hrc:1600
+#: sc/inc/scfuncs.hrc:1600
 msgctxt "SC_OPCODE_SUM_X2MY2"
 msgid "Array Y"
 msgstr "Arae Y"
 
-#: scfuncs.hrc:1601
+#: sc/inc/scfuncs.hrc:1601
 msgctxt "SC_OPCODE_SUM_X2MY2"
 msgid "Second array where the square of the arguments is to be subtracted."
 msgstr "Ail arae lle mae sgwâr yr ymresymiadau i'w tynnu."
 
-#: scfuncs.hrc:1607
+#: sc/inc/scfuncs.hrc:1607
 msgctxt "SC_OPCODE_SUM_X2DY2"
 msgid "Returns the total of the square sum of two arrays."
 msgstr "Dychwelyd cyfanswm swm sgwâr y ddau arae."
 
-#: scfuncs.hrc:1608
+#: sc/inc/scfuncs.hrc:1608
 msgctxt "SC_OPCODE_SUM_X2DY2"
 msgid "Array X"
 msgstr "Arae X"
 
-#: scfuncs.hrc:1609
+#: sc/inc/scfuncs.hrc:1609
 msgctxt "SC_OPCODE_SUM_X2DY2"
 msgid "First array where the square of the arguments are totalled."
 msgstr "Arae cyntaf lle mae sgwâr yr ymresymiadau i'w cyfansymu."
 
-#: scfuncs.hrc:1610
+#: sc/inc/scfuncs.hrc:1610
 msgctxt "SC_OPCODE_SUM_X2DY2"
 msgid "Array Y"
 msgstr "Arae Y"
 
-#: scfuncs.hrc:1611
+#: sc/inc/scfuncs.hrc:1611
 msgctxt "SC_OPCODE_SUM_X2DY2"
 msgid "Second array where the square of the arguments is to be totalled."
 msgstr "Ail arae lle mae sgwâr yr ymresymiadau i'w cyfansymu."
 
-#: scfuncs.hrc:1617
+#: sc/inc/scfuncs.hrc:1617
 msgctxt "SC_OPCODE_SUM_XMY2"
 msgid "Returns the sum of squares of differences of two arrays."
 msgstr "Dychwelyd swm y sgwariau o'r ddau arae gwahanol."
 
-#: scfuncs.hrc:1618
+#: sc/inc/scfuncs.hrc:1618
 msgctxt "SC_OPCODE_SUM_XMY2"
 msgid "Array X"
 msgstr "Arae X"
 
-#: scfuncs.hrc:1619
+#: sc/inc/scfuncs.hrc:1619
 msgctxt "SC_OPCODE_SUM_XMY2"
 msgid "First array for forming argument differences."
 msgstr "Arae cyntaf ar gyfer ffurfio gwahaniaethau ymresymiad."
 
-#: scfuncs.hrc:1620
+#: sc/inc/scfuncs.hrc:1620
 msgctxt "SC_OPCODE_SUM_XMY2"
 msgid "Array Y"
 msgstr "Arae Y"
 
-#: scfuncs.hrc:1621
+#: sc/inc/scfuncs.hrc:1621
 msgctxt "SC_OPCODE_SUM_XMY2"
 msgid "Second array for forming the argument differences."
 msgstr "Ail arae ar gyfer ffurfio gwahaniaeth ymresymiad."
 
-#: scfuncs.hrc:1627
+#: sc/inc/scfuncs.hrc:1627
 msgctxt "SC_OPCODE_FREQUENCY"
 msgid "Returns a frequency distribution as a vertical array."
 msgstr "Dychwelyd dosbarthiad amledd fel arae fertigol."
 
-#: scfuncs.hrc:1628
+#: sc/inc/scfuncs.hrc:1628
 msgctxt "SC_OPCODE_FREQUENCY"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:1629
+#: sc/inc/scfuncs.hrc:1629
 msgctxt "SC_OPCODE_FREQUENCY"
 msgid "The array of the data."
 msgstr "Arae o'r data."
 
-#: scfuncs.hrc:1630
+#: sc/inc/scfuncs.hrc:1630
 msgctxt "SC_OPCODE_FREQUENCY"
 msgid "Classes"
 msgstr "Dosbarthiadau"
 
-#: scfuncs.hrc:1631
+#: sc/inc/scfuncs.hrc:1631
 msgctxt "SC_OPCODE_FREQUENCY"
 msgid "The array for forming classes."
 msgstr "Arae dosbarthiadau ffurf."
 
-#: scfuncs.hrc:1637
+#: sc/inc/scfuncs.hrc:1637
 msgctxt "SC_OPCODE_LINEST"
 msgid "Calculates parameters of the linear regression as an array."
 msgstr "Cyfrifo paramedrau atchweliad llinol fel arae."
 
-#: scfuncs.hrc:1638
+#: sc/inc/scfuncs.hrc:1638
 msgctxt "SC_OPCODE_LINEST"
 msgid "Data Y"
 msgstr "Data Y"
 
-#: scfuncs.hrc:1639
+#: sc/inc/scfuncs.hrc:1639
 msgctxt "SC_OPCODE_LINEST"
 msgid "The Y data array."
 msgstr "Arae data Y."
 
-#: scfuncs.hrc:1640
+#: sc/inc/scfuncs.hrc:1640
 msgctxt "SC_OPCODE_LINEST"
 msgid "Data X"
 msgstr "Data X"
 
-#: scfuncs.hrc:1641
+#: sc/inc/scfuncs.hrc:1641
 msgctxt "SC_OPCODE_LINEST"
 msgid "The X data array."
 msgstr "Arae data X."
 
-#: scfuncs.hrc:1642
+#: sc/inc/scfuncs.hrc:1642
 msgctxt "SC_OPCODE_LINEST"
 msgid "Linear type"
 msgstr "Math llinellol"
 
-#: scfuncs.hrc:1643
+#: sc/inc/scfuncs.hrc:1643
 msgctxt "SC_OPCODE_LINEST"
 msgid "If type = 0 the linears will be calculated through the zero point, or else moved linears."
 msgstr "Os yw'r math = 0 bydd y llinol yn cael eu cyfrifo drwy'r pwynt sero, neu efallai llinolau symudol."
 
-#: scfuncs.hrc:1644
+#: sc/inc/scfuncs.hrc:1644
 msgctxt "SC_OPCODE_LINEST"
 msgid "Stats"
 msgstr "Ystadegau"
 
-#: scfuncs.hrc:1645
+#: sc/inc/scfuncs.hrc:1645
 msgctxt "SC_OPCODE_LINEST"
 msgid "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well."
 msgstr "Os yw paramedr = 0 yna dim ond y cyfernod atchwilio fydd yn cael ei gyfrifo, neu werthoedd eraill hefyd."
 
-#: scfuncs.hrc:1651
+#: sc/inc/scfuncs.hrc:1651
 msgctxt "SC_OPCODE_LOGEST"
 msgid "Calculates the parameters of the exponential regression curve as an array."
 msgstr "Cyfrifo paramedrau cromlin atchweliad esbonyddol fel arae."
 
-#: scfuncs.hrc:1652
+#: sc/inc/scfuncs.hrc:1652
 msgctxt "SC_OPCODE_LOGEST"
 msgid "Data Y"
 msgstr "Data Y"
 
-#: scfuncs.hrc:1653
+#: sc/inc/scfuncs.hrc:1653
 msgctxt "SC_OPCODE_LOGEST"
 msgid "The Y data array."
 msgstr "Arae data Y."
 
-#: scfuncs.hrc:1654
+#: sc/inc/scfuncs.hrc:1654
 msgctxt "SC_OPCODE_LOGEST"
 msgid "Data X"
 msgstr "Data X"
 
-#: scfuncs.hrc:1655
+#: sc/inc/scfuncs.hrc:1655
 msgctxt "SC_OPCODE_LOGEST"
 msgid "The X data array."
 msgstr "Arae data X."
 
-#: scfuncs.hrc:1656
+#: sc/inc/scfuncs.hrc:1656
 msgctxt "SC_OPCODE_LOGEST"
 msgid "Function type"
 msgstr "Math ffwythiant"
 
-#: scfuncs.hrc:1657
+#: sc/inc/scfuncs.hrc:1657
 msgctxt "SC_OPCODE_LOGEST"
 msgid "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x."
 msgstr "Os yw math = 0 yna bydd y swyddogaethau'n cael eu cyfrifo yn ffurf y=m^x, neu hefyd swyddogaethau y=b*m^x."
 
-#: scfuncs.hrc:1658
+#: sc/inc/scfuncs.hrc:1658
 msgctxt "SC_OPCODE_LOGEST"
 msgid "Stats"
 msgstr "Ystadegau"
 
-#: scfuncs.hrc:1659
+#: sc/inc/scfuncs.hrc:1659
 msgctxt "SC_OPCODE_LOGEST"
 msgid "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well."
 msgstr "Os yw paramedr = 0 yna dim ond y cyfernod atchwilio fydd yn cael ei gyfrifo, neu werthoedd eraill hefyd."
 
-#: scfuncs.hrc:1665
+#: sc/inc/scfuncs.hrc:1665
 msgctxt "SC_OPCODE_TREND"
 msgid "Calculates points along a regression line."
 msgstr "Cyfrifo pwyntiau ar hyd llinell atchweliad."
 
-#: scfuncs.hrc:1666
+#: sc/inc/scfuncs.hrc:1666
 msgctxt "SC_OPCODE_TREND"
 msgid "Data Y"
 msgstr "Data Y"
 
-#: scfuncs.hrc:1667
+#: sc/inc/scfuncs.hrc:1667
 msgctxt "SC_OPCODE_TREND"
 msgid "The Y data array."
 msgstr "Arae data Y."
 
-#: scfuncs.hrc:1668
+#: sc/inc/scfuncs.hrc:1668
 msgctxt "SC_OPCODE_TREND"
 msgid "Data X"
 msgstr "Data X"
 
-#: scfuncs.hrc:1669
+#: sc/inc/scfuncs.hrc:1669
 msgctxt "SC_OPCODE_TREND"
 msgid "The X data array as the basis for the regression."
 msgstr "Arae data X fel sail atchweliad."
 
-#: scfuncs.hrc:1670
+#: sc/inc/scfuncs.hrc:1670
 msgctxt "SC_OPCODE_TREND"
 msgid "New data X"
 msgstr "Data newydd X"
 
-#: scfuncs.hrc:1671
+#: sc/inc/scfuncs.hrc:1671
 msgctxt "SC_OPCODE_TREND"
 msgid "The array of X data for recalculating the values."
 msgstr "Arae data X ar gyfer ail-gyfrifo'r gwerthoedd."
 
-#: scfuncs.hrc:1672
+#: sc/inc/scfuncs.hrc:1672
 msgctxt "SC_OPCODE_TREND"
 msgid "Linear type"
 msgstr "Math llinellol"
 
-#: scfuncs.hrc:1673
+#: sc/inc/scfuncs.hrc:1673
 msgctxt "SC_OPCODE_TREND"
 msgid "If type = 0 the linears will be calculated through the zero point, or else moved linears."
 msgstr "Os yw'r math = 0 bydd y llinol yn cael eu cyfrifo drwy'r pwynt sero, neu efallai llinolau symudol."
 
-#: scfuncs.hrc:1679
+#: sc/inc/scfuncs.hrc:1679
 msgctxt "SC_OPCODE_GROWTH"
 msgid "Calculates points on the exponential regression function."
 msgstr "Cyfrifo pwyntiau ar swyddogaeth atchweliad esbonyddol."
 
-#: scfuncs.hrc:1680
+#: sc/inc/scfuncs.hrc:1680
 msgctxt "SC_OPCODE_GROWTH"
 msgid "Data Y"
 msgstr "Data Y"
 
-#: scfuncs.hrc:1681
+#: sc/inc/scfuncs.hrc:1681
 msgctxt "SC_OPCODE_GROWTH"
 msgid "The Y data array."
 msgstr "Arae data Y."
 
-#: scfuncs.hrc:1682
+#: sc/inc/scfuncs.hrc:1682
 msgctxt "SC_OPCODE_GROWTH"
 msgid "Data X"
 msgstr "Data X"
 
-#: scfuncs.hrc:1683
+#: sc/inc/scfuncs.hrc:1683
 msgctxt "SC_OPCODE_GROWTH"
 msgid "The X data array as the basis for the regression."
 msgstr "Arae data X fel sail atchweliad."
 
-#: scfuncs.hrc:1684
+#: sc/inc/scfuncs.hrc:1684
 msgctxt "SC_OPCODE_GROWTH"
 msgid "New data X"
 msgstr "Data newydd X"
 
-#: scfuncs.hrc:1685
+#: sc/inc/scfuncs.hrc:1685
 msgctxt "SC_OPCODE_GROWTH"
 msgid "The array of X data for recalculating the values."
 msgstr "Arae data X ar gyfer ailgyfrifo'r gwerthoedd."
 
-#: scfuncs.hrc:1686
+#: sc/inc/scfuncs.hrc:1686
 msgctxt "SC_OPCODE_GROWTH"
 msgid "Function type"
 msgstr "Math ffwythiant"
 
-#: scfuncs.hrc:1687
+#: sc/inc/scfuncs.hrc:1687
 msgctxt "SC_OPCODE_GROWTH"
 msgid "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x."
 msgstr "Os yw math = 0 yna bydd y swyddogaethau'n cael eu cyfrifo yn ffurf y=m^x, neu hefyd swyddogaethau y=b*m^x."
 
-#: scfuncs.hrc:1693
+#: sc/inc/scfuncs.hrc:1693
 msgctxt "SC_OPCODE_COUNT"
 msgid "Counts how many numbers are in the list of arguments."
 msgstr "Cyfrif sawl rhif sydd yn y rhestr ymresymiadau."
 
-#: scfuncs.hrc:1694
+#: sc/inc/scfuncs.hrc:1694
 msgctxt "SC_OPCODE_COUNT"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:1695
+#: sc/inc/scfuncs.hrc:1695
 msgctxt "SC_OPCODE_COUNT"
 msgid "Value 1, value 2, ... are arguments containing different data types but where only numbers are counted."
 msgstr "Gwerth 1, gwerth 2, ... yn ymresymiadau yn cynnwys mathau data gwahanol lle mae rhifau yn unig yn cael eu cyfrif."
 
-#: scfuncs.hrc:1701
+#: sc/inc/scfuncs.hrc:1701
 msgctxt "SC_OPCODE_COUNT_2"
 msgid "Counts how many values are in the list of arguments."
 msgstr "Cyfrif faint o werthoedd sydd yn rhestr o ymresymiadau."
 
-#: scfuncs.hrc:1702
+#: sc/inc/scfuncs.hrc:1702
 msgctxt "SC_OPCODE_COUNT_2"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:1703
+#: sc/inc/scfuncs.hrc:1703
 msgctxt "SC_OPCODE_COUNT_2"
 msgid "Value 1, value 2, ... are arguments representing the values to be counted."
 msgstr "Gwerth 1, gwerth 2, ... yn ymresymiadau sy'n cynrychioli'r gwerthoedd i'w cyfrif."
 
-#: scfuncs.hrc:1709
+#: sc/inc/scfuncs.hrc:1709
 msgctxt "SC_OPCODE_MAX"
 msgid "Returns the maximum value in a list of arguments."
 msgstr "Dychwelyd gwerthoedd mwyaf mewn rhestr o ymresymiadau."
 
-#: scfuncs.hrc:1710
+#: sc/inc/scfuncs.hrc:1710
 msgctxt "SC_OPCODE_MAX"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1711
+#: sc/inc/scfuncs.hrc:1711
 msgctxt "SC_OPCODE_MAX"
 msgid "Number 1, number 2, ... are numerical arguments for which the largest number is to be determined."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol y mae'r rhif mwyaf i'w bennu."
 
-#: scfuncs.hrc:1717
+#: sc/inc/scfuncs.hrc:1717
 msgctxt "SC_OPCODE_MAX_A"
 msgid "Returns the maximum value in a list of arguments. Text is evaluated as Zero."
 msgstr "Dychwelyd y gwerth mwyaf mewn rhestr o ymresymiadau. Mae testun yn cael ei werthuso fel Sero."
 
-#: scfuncs.hrc:1718
+#: sc/inc/scfuncs.hrc:1718
 msgctxt "SC_OPCODE_MAX_A"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:1719
+#: sc/inc/scfuncs.hrc:1719
 msgctxt "SC_OPCODE_MAX_A"
 msgid "Value 1, value 2,    are arguments whose largest value is to be determined."
 msgstr "Gwerth 1, gwerth 2,    yn ymresymiadau y mae'r gwerth mwyaf i'w bennu."
 
-#: scfuncs.hrc:1725
+#: sc/inc/scfuncs.hrc:1725
 msgctxt "SC_OPCODE_MIN"
 msgid "Returns the minimum value in a list of arguments."
 msgstr "Dychwelyd y gwerth lleiaf mewn rhestr o ymresymiadau."
 
-#: scfuncs.hrc:1726
+#: sc/inc/scfuncs.hrc:1726
 msgctxt "SC_OPCODE_MIN"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1727
+#: sc/inc/scfuncs.hrc:1727
 msgctxt "SC_OPCODE_MIN"
 msgid "Number 1, number 2, ... are numerical arguments for which the smallest number is to be determined."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol ar ei gyfer y mae'r rhif lleiaf i'w bennu."
 
-#: scfuncs.hrc:1733
+#: sc/inc/scfuncs.hrc:1733
 msgctxt "SC_OPCODE_MIN_A"
 msgid "Returns the smallest value in a list of arguments. Text is evaluated as zero."
 msgstr "Dychwelyd y gwerth lleiaf mewn rhestr o ymresymiadau. Testun yn cael ei werthuso fel Sero."
 
-#: scfuncs.hrc:1734
+#: sc/inc/scfuncs.hrc:1734
 msgctxt "SC_OPCODE_MIN_A"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:1735
+#: sc/inc/scfuncs.hrc:1735
 msgctxt "SC_OPCODE_MIN_A"
 msgid "Value 1; value 2;... are arguments whose smallest number is to be determined."
 msgstr "Gwerth 1, gwerth 2, ... yn ymresymiadau y mae'r gwerth lleiaf i'w bennu."
 
-#: scfuncs.hrc:1741
+#: sc/inc/scfuncs.hrc:1741
 msgctxt "SC_OPCODE_VAR"
 msgid "Calculates the variance based on a sample."
 msgstr "Cyfrifo'r amrywiant yn seiliedig ar sampl."
 
-#: scfuncs.hrc:1742
+#: sc/inc/scfuncs.hrc:1742
 msgctxt "SC_OPCODE_VAR"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1743
+#: sc/inc/scfuncs.hrc:1743
 msgctxt "SC_OPCODE_VAR"
 msgid "Number 1, number 2, ... are numerical arguments which portray a sample of a population."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n dangos sampl o boblogaeth."
 
-#: scfuncs.hrc:1749
+#: sc/inc/scfuncs.hrc:1749
 msgctxt "SC_OPCODE_VAR_S"
 msgid "Calculates the variance based on a sample."
 msgstr "Cyfrifo'r amrywiant yn seiliedig ar sampl."
 
-#: scfuncs.hrc:1750
+#: sc/inc/scfuncs.hrc:1750
 msgctxt "SC_OPCODE_VAR_S"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1751
+#: sc/inc/scfuncs.hrc:1751
 msgctxt "SC_OPCODE_VAR_S"
 msgid "Number 1, number 2, ... are numerical arguments which portray a sample of a population."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n dangos sampl o boblogaeth."
 
-#: scfuncs.hrc:1757
+#: sc/inc/scfuncs.hrc:1757
 msgctxt "SC_OPCODE_VAR_A"
 msgid "Returns the variance based on a sample. Text is evaluated as zero."
 msgstr "Dychwelyd yr amrywiant yn seiliedig ar sampl. Testun yn cael ei werthuso fel sero."
 
-#: scfuncs.hrc:1758
+#: sc/inc/scfuncs.hrc:1758
 msgctxt "SC_OPCODE_VAR_A"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:1759
+#: sc/inc/scfuncs.hrc:1759
 msgctxt "SC_OPCODE_VAR_A"
 msgid "Value 1; value 2; ... are arguments representing a sample taken from a basic total population."
 msgstr "Gwerth 1; gwerth 2; ... yn ymresymiad sy'n cynrychioli sampl wedi ei gymryd o boblogaeth gyfan sylfaenol."
 
-#: scfuncs.hrc:1765
+#: sc/inc/scfuncs.hrc:1765
 msgctxt "SC_OPCODE_VAR_P"
 msgid "Calculates variance based on the entire population."
 msgstr "Cyfrifo'r amrywiant yn seiliedig ar boblogaeth gyfan."
 
-#: scfuncs.hrc:1766
+#: sc/inc/scfuncs.hrc:1766
 msgctxt "SC_OPCODE_VAR_P"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1767
+#: sc/inc/scfuncs.hrc:1767
 msgctxt "SC_OPCODE_VAR_P"
 msgid "Number 1, number 2, ... are numerical arguments which represent a population."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n cynrychioli poblogaeth."
 
-#: scfuncs.hrc:1773
+#: sc/inc/scfuncs.hrc:1773
 msgctxt "SC_OPCODE_VAR_P_MS"
 msgid "Calculates variance based on the entire population."
 msgstr "Cyfrifo'r amrywiant yn seiliedig ar boblogaeth gyfan."
 
-#: scfuncs.hrc:1774
+#: sc/inc/scfuncs.hrc:1774
 msgctxt "SC_OPCODE_VAR_P_MS"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1775
+#: sc/inc/scfuncs.hrc:1775
 msgctxt "SC_OPCODE_VAR_P_MS"
 msgid "Number 1, number 2, ... are numerical arguments which represent a population."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n cynrychioli poblogaeth."
 
-#: scfuncs.hrc:1781
+#: sc/inc/scfuncs.hrc:1781
 msgctxt "SC_OPCODE_VAR_P_A"
 msgid "Returns the variance based on the entire population. Text is evaluated as zero."
 msgstr "Dychwelyd amrywiant yn seiliedig ar boblogaeth gyfan. Testun yn cael ei werthuso fel sero."
 
-#: scfuncs.hrc:1782
+#: sc/inc/scfuncs.hrc:1782
 msgctxt "SC_OPCODE_VAR_P_A"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:1783
+#: sc/inc/scfuncs.hrc:1783
 msgctxt "SC_OPCODE_VAR_P_A"
 msgid "Value 1; value 2;... are arguments representing a population."
 msgstr "Gwerth 1, gwerth 2,... yn ymresymiadau yn cynrychioli poblogaeth."
 
-#: scfuncs.hrc:1789
+#: sc/inc/scfuncs.hrc:1789
 msgctxt "SC_OPCODE_ST_DEV"
 msgid "Calculates the standard deviation based on a sample."
 msgstr "Cyfrifo'r gwyriad safonol yn seiliedig ar sampl."
 
-#: scfuncs.hrc:1790
+#: sc/inc/scfuncs.hrc:1790
 msgctxt "SC_OPCODE_ST_DEV"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1791
+#: sc/inc/scfuncs.hrc:1791
 msgctxt "SC_OPCODE_ST_DEV"
 msgid "Number 1, number 2, ... are numerical arguments which portray a sample of a population."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n dangos sampl o boblogaeth."
 
-#: scfuncs.hrc:1797
+#: sc/inc/scfuncs.hrc:1797
 msgctxt "SC_OPCODE_ST_DEV_S"
 msgid "Calculates the standard deviation based on a sample."
 msgstr "Cyfrifo'r gwyriad safonol yn seiliedig ar sampl."
 
-#: scfuncs.hrc:1798
+#: sc/inc/scfuncs.hrc:1798
 msgctxt "SC_OPCODE_ST_DEV_S"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1799
+#: sc/inc/scfuncs.hrc:1799
 msgctxt "SC_OPCODE_ST_DEV_S"
 msgid "Number 1, number 2, ... are numerical arguments which portray a sample of a population."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n dangos sampl o boblogaeth."
 
-#: scfuncs.hrc:1805
+#: sc/inc/scfuncs.hrc:1805
 msgctxt "SC_OPCODE_ST_DEV_A"
 msgid "Returns the standard deviation based on a sample. Text is evaluated as zero."
 msgstr "Dychwelyd y gwyriad safonol yn seiliedig ar sampl. Testun yn cael ei werthuso fel sero."
 
-#: scfuncs.hrc:1806
+#: sc/inc/scfuncs.hrc:1806
 msgctxt "SC_OPCODE_ST_DEV_A"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:1807
+#: sc/inc/scfuncs.hrc:1807
 msgctxt "SC_OPCODE_ST_DEV_A"
 msgid "Value 1; value 2; ... are arguments representing a sample taken from a basic total population."
 msgstr "Gwerth 1; gwerth 2; ... yn ymresymiadau sy'n cynrychioli sampl wedi eu cymryd o boblogaeth gyfan sylfaenol."
 
-#: scfuncs.hrc:1813
+#: sc/inc/scfuncs.hrc:1813
 msgctxt "SC_OPCODE_ST_DEV_P"
 msgid "Calculates the standard deviation based on the entire population."
 msgstr "Cyfrifo'r gwyriad safonol yn seiliedig ar y boblogaeth gyfan."
 
-#: scfuncs.hrc:1814
+#: sc/inc/scfuncs.hrc:1814
 msgctxt "SC_OPCODE_ST_DEV_P"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1815
+#: sc/inc/scfuncs.hrc:1815
 msgctxt "SC_OPCODE_ST_DEV_P"
 msgid "Number 1, number 2, ... are numerical arguments which portray a population."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n cynrychioli poblogaeth."
 
-#: scfuncs.hrc:1821
+#: sc/inc/scfuncs.hrc:1821
 msgctxt "SC_OPCODE_ST_DEV_P_MS"
 msgid "Calculates the standard deviation based on the entire population."
 msgstr "Cyfrifo'r gwyriad safonol yn seiliedig ar y boblogaeth gyfan."
 
-#: scfuncs.hrc:1822
+#: sc/inc/scfuncs.hrc:1822
 msgctxt "SC_OPCODE_ST_DEV_P_MS"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1823
+#: sc/inc/scfuncs.hrc:1823
 msgctxt "SC_OPCODE_ST_DEV_P_MS"
 msgid "Number 1, number 2, ... are numerical arguments which portray a population."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n cynrychioli poblogaeth."
 
-#: scfuncs.hrc:1829
+#: sc/inc/scfuncs.hrc:1829
 msgctxt "SC_OPCODE_ST_DEV_P_A"
 msgid "Returns the standard deviation based on the entire population. Text is evaluated as zero."
 msgstr "Dychwelyd y gwyriad safonol ar y boblogaeth gyfan. Testun yn cael ei werthuso fel sero."
 
-#: scfuncs.hrc:1830
+#: sc/inc/scfuncs.hrc:1830
 msgctxt "SC_OPCODE_ST_DEV_P_A"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:1831
+#: sc/inc/scfuncs.hrc:1831
 msgctxt "SC_OPCODE_ST_DEV_P_A"
 msgid "Value 1; value 2;... are arguments corresponding to a population."
 msgstr "Gwerth 1, gwerth 2,... yn ymresymiadau yn cynrychioli poblogaeth."
 
-#: scfuncs.hrc:1837
+#: sc/inc/scfuncs.hrc:1837
 msgctxt "SC_OPCODE_AVERAGE"
 msgid "Returns the average of a sample."
 msgstr "Dychwelyd cyfartaledd sampl."
 
-#: scfuncs.hrc:1838
+#: sc/inc/scfuncs.hrc:1838
 msgctxt "SC_OPCODE_AVERAGE"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1839
+#: sc/inc/scfuncs.hrc:1839
 msgctxt "SC_OPCODE_AVERAGE"
 msgid "Number 1, number 2;...are numeric arguments representing a population sample."
 msgstr "Rhif 1, rhif 2;...yn ymresymiadau rhifol sy'n portreadu sampl o boblogaeth."
 
-#: scfuncs.hrc:1845
+#: sc/inc/scfuncs.hrc:1845
 msgctxt "SC_OPCODE_AVERAGE_A"
 msgid "Returns the average value for a sample. Text is evaluated as zero."
 msgstr "Dychwelyd cyfartaledd gwerth ar gyfer y sampl. Gwerth testun yw sero."
 
-#: scfuncs.hrc:1846
+#: sc/inc/scfuncs.hrc:1846
 msgctxt "SC_OPCODE_AVERAGE_A"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:1847
+#: sc/inc/scfuncs.hrc:1847
 msgctxt "SC_OPCODE_AVERAGE_A"
 msgid "Value 1; value 2; ... are arguments representing a sample taken from a basic total population."
 msgstr "Gwerth 1; gwerth 2; ... yn ymresymiadau sy'n cynrychioli sampl wedi eu cymryd o boblogaeth gyfan sylfaenol."
 
-#: scfuncs.hrc:1853
+#: sc/inc/scfuncs.hrc:1853
 msgctxt "SC_OPCODE_DEV_SQ"
 msgid "Returns the sum of squares of deviations from the sample mean value"
 msgstr "Dychwelyd swm sgwariau gwyriadau o'r werth cymedrig sampl"
 
-#: scfuncs.hrc:1854
+#: sc/inc/scfuncs.hrc:1854
 msgctxt "SC_OPCODE_DEV_SQ"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1855
+#: sc/inc/scfuncs.hrc:1855
 msgctxt "SC_OPCODE_DEV_SQ"
 msgid "Number 1, number 2, ... are numerical arguments which portray a sample."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n portreadu sampl."
 
-#: scfuncs.hrc:1861
+#: sc/inc/scfuncs.hrc:1861
 msgctxt "SC_OPCODE_AVE_DEV"
 msgid "Returns the average of the absolute deviations of a sample from the mean."
 msgstr "Dychwelyd cyfartaledd y gwyriadau absoliwt o sampl o'r cymedrig."
 
-#: scfuncs.hrc:1862
+#: sc/inc/scfuncs.hrc:1862
 msgctxt "SC_OPCODE_AVE_DEV"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1863
+#: sc/inc/scfuncs.hrc:1863
 msgctxt "SC_OPCODE_AVE_DEV"
 msgid "Number 1, number 2;...are numerical arguments representing a sample."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n portreadu sampl."
 
-#: scfuncs.hrc:1869
+#: sc/inc/scfuncs.hrc:1869
 msgctxt "SC_OPCODE_SKEW"
 msgid "Returns the skewness of a distribution."
 msgstr "Dychwelyd sgiwedd dosbarthiad."
 
-#: scfuncs.hrc:1870
+#: sc/inc/scfuncs.hrc:1870
 msgctxt "SC_OPCODE_SKEW"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1871
+#: sc/inc/scfuncs.hrc:1871
 msgctxt "SC_OPCODE_SKEW"
 msgid "Number 1, number 2, ... are numerical arguments portraying a sample of the distribution."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n dangos sampl o boblogaeth."
 
-#: scfuncs.hrc:1877
+#: sc/inc/scfuncs.hrc:1877
 msgctxt "SC_OPCODE_SKEWP"
 msgid "Returns the skewness of a distribution using the population of a random variable."
 msgstr "Dychwelyd sgiwedd dosbarthiad sy'n defnyddio poblogaeth hapnewidyn."
 
-#: scfuncs.hrc:1878
+#: sc/inc/scfuncs.hrc:1878
 msgctxt "SC_OPCODE_SKEWP"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1879
+#: sc/inc/scfuncs.hrc:1879
 msgctxt "SC_OPCODE_SKEWP"
 msgid "Number 1, number 2, ... are numerical arguments portraying the population."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n cynrychioli poblogaeth."
 
-#: scfuncs.hrc:1885
+#: sc/inc/scfuncs.hrc:1885
 msgctxt "SC_OPCODE_KURT"
 msgid "Returns the kurtosis of a distribution."
 msgstr "Dychwelyd cwrtosis dosbarthiad."
 
-#: scfuncs.hrc:1886
+#: sc/inc/scfuncs.hrc:1886
 msgctxt "SC_OPCODE_KURT"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1887
+#: sc/inc/scfuncs.hrc:1887
 msgctxt "SC_OPCODE_KURT"
 msgid "Number 1, number 2, ... are numerical arguments, representing a sample of the distribution."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n dangos sampl o boblogaeth."
 
-#: scfuncs.hrc:1893
+#: sc/inc/scfuncs.hrc:1893
 msgctxt "SC_OPCODE_GEO_MEAN"
 msgid "Returns the geometric mean of a sample."
 msgstr "Dychwelyd cymedrig geometrig sampl."
 
-#: scfuncs.hrc:1894
+#: sc/inc/scfuncs.hrc:1894
 msgctxt "SC_OPCODE_GEO_MEAN"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1895
+#: sc/inc/scfuncs.hrc:1895
 msgctxt "SC_OPCODE_GEO_MEAN"
 msgid "Number 1, number 2, ... are numerical arguments which portray a sample."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n portreadu sampl."
 
-#: scfuncs.hrc:1901
+#: sc/inc/scfuncs.hrc:1901
 msgctxt "SC_OPCODE_HAR_MEAN"
 msgid "Returns the harmonic mean of a sample."
 msgstr "Dychwelyd y modd harmonig o'r sampl."
 
-#: scfuncs.hrc:1902
+#: sc/inc/scfuncs.hrc:1902
 msgctxt "SC_OPCODE_HAR_MEAN"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1903
+#: sc/inc/scfuncs.hrc:1903
 msgctxt "SC_OPCODE_HAR_MEAN"
 msgid "Number 1, number 2, ... are numerical arguments which portray a sample."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n portreadu sampl."
 
-#: scfuncs.hrc:1909
+#: sc/inc/scfuncs.hrc:1909
 msgctxt "SC_OPCODE_MODAL_VALUE"
 msgid "Returns the most common value in a sample."
 msgstr "Dychwelyd y gwerth mwyaf cyffredin mewn sampl."
 
-#: scfuncs.hrc:1910
+#: sc/inc/scfuncs.hrc:1910
 msgctxt "SC_OPCODE_MODAL_VALUE"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1911
+#: sc/inc/scfuncs.hrc:1911
 msgctxt "SC_OPCODE_MODAL_VALUE"
 msgid "Number 1, number 2, ... are numerical arguments which portray a sample."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n portreadu sampl."
 
-#: scfuncs.hrc:1917
+#: sc/inc/scfuncs.hrc:1917
 msgctxt "SC_OPCODE_MODAL_VALUE_MS"
 msgid "Returns the most common value in a sample."
 msgstr "Dychwelyd y gwerth mwyaf cyffredin mewn sampl."
 
-#: scfuncs.hrc:1918
+#: sc/inc/scfuncs.hrc:1918
 msgctxt "SC_OPCODE_MODAL_VALUE_MS"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1919
+#: sc/inc/scfuncs.hrc:1919
 msgctxt "SC_OPCODE_MODAL_VALUE_MS"
 msgid "Number 1, number 2, ... are numerical arguments which portray a sample."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n portreadu sampl."
 
-#: scfuncs.hrc:1925
+#: sc/inc/scfuncs.hrc:1925
 msgctxt "SC_OPCODE_MODAL_VALUE_MULTI"
 msgid "Returns the most common value in a sample."
 msgstr "Dychwelyd y gwerth mwyaf cyffredin mewn sampl."
 
-#: scfuncs.hrc:1926
+#: sc/inc/scfuncs.hrc:1926
 msgctxt "SC_OPCODE_MODAL_VALUE_MULTI"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1927
+#: sc/inc/scfuncs.hrc:1927
 msgctxt "SC_OPCODE_MODAL_VALUE_MULTI"
 msgid "Number 1, number 2, ... are 1 to 254 numerical arguments which portray a sample."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol 1 i 254 sy'n portreu sampl."
 
-#: scfuncs.hrc:1933
+#: sc/inc/scfuncs.hrc:1933
 msgctxt "SC_OPCODE_MEDIAN"
 msgid "Returns the median of a given sample."
 msgstr "Dychwelyd cymedrig sampl benodol."
 
-#: scfuncs.hrc:1934
+#: sc/inc/scfuncs.hrc:1934
 msgctxt "SC_OPCODE_MEDIAN"
 msgid "Number "
 msgstr "Rhif "
 
-#: scfuncs.hrc:1935
+#: sc/inc/scfuncs.hrc:1935
 msgctxt "SC_OPCODE_MEDIAN"
 msgid "Number 1, number 2, ... are numerical arguments which portray a sample."
 msgstr "Rhif 1, rhif 2, ... yn ymresymiadau rhifol sy'n portreadu sampl."
 
-#: scfuncs.hrc:1941
+#: sc/inc/scfuncs.hrc:1941
 msgctxt "SC_OPCODE_PERCENTILE"
 msgid "Returns the alpha quantile of a sample."
 msgstr "Dychwelyd meintiolyn alffa sampl."
 
-#: scfuncs.hrc:1942
+#: sc/inc/scfuncs.hrc:1942
 msgctxt "SC_OPCODE_PERCENTILE"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:1943
+#: sc/inc/scfuncs.hrc:1943
 msgctxt "SC_OPCODE_PERCENTILE"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:1944
+#: sc/inc/scfuncs.hrc:1944
 msgctxt "SC_OPCODE_PERCENTILE"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:1945
+#: sc/inc/scfuncs.hrc:1945
 msgctxt "SC_OPCODE_PERCENTILE"
 msgid "The percentage rate of the quantile between 0 and 1."
 msgstr "Cyfradd canran meintiolyn rhwng 0 ac 1."
 
-#: scfuncs.hrc:1951
+#: sc/inc/scfuncs.hrc:1951
 msgctxt "SC_OPCODE_PERCENTILE_EXC"
 msgid "Returns the alpha percentile of a sample."
 msgstr "Dychwelyd meintiolyn alffa sampl."
 
-#: scfuncs.hrc:1952
+#: sc/inc/scfuncs.hrc:1952
 msgctxt "SC_OPCODE_PERCENTILE_EXC"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:1953
+#: sc/inc/scfuncs.hrc:1953
 msgctxt "SC_OPCODE_PERCENTILE_EXC"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:1954
+#: sc/inc/scfuncs.hrc:1954
 msgctxt "SC_OPCODE_PERCENTILE_EXC"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:1955
+#: sc/inc/scfuncs.hrc:1955
 msgctxt "SC_OPCODE_PERCENTILE_EXC"
 msgid "The percentile value, range 0...1, exclusive."
 msgstr "Gwerth canolradd, ystod 0...1, anghynhwysol."
 
-#: scfuncs.hrc:1961
+#: sc/inc/scfuncs.hrc:1961
 msgctxt "SC_OPCODE_PERCENTILE_INC"
 msgid "Returns the alpha percentile of a sample."
 msgstr "Dychwelyd meintiolyn alffa sampl."
 
-#: scfuncs.hrc:1962
+#: sc/inc/scfuncs.hrc:1962
 msgctxt "SC_OPCODE_PERCENTILE_INC"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:1963
+#: sc/inc/scfuncs.hrc:1963
 msgctxt "SC_OPCODE_PERCENTILE_INC"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:1964
+#: sc/inc/scfuncs.hrc:1964
 msgctxt "SC_OPCODE_PERCENTILE_INC"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:1965
+#: sc/inc/scfuncs.hrc:1965
 msgctxt "SC_OPCODE_PERCENTILE_INC"
 msgid "The percentile value, range 0...1, inclusive."
 msgstr "Gwerth canolradd, ystod 0...1, cynhwysol."
 
-#: scfuncs.hrc:1971
+#: sc/inc/scfuncs.hrc:1971
 msgctxt "SC_OPCODE_QUARTILE"
 msgid "Returns the quartile of a sample."
 msgstr "Dychwelyd chwartel sampl."
 
-#: scfuncs.hrc:1972
+#: sc/inc/scfuncs.hrc:1972
 msgctxt "SC_OPCODE_QUARTILE"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:1973
+#: sc/inc/scfuncs.hrc:1973
 msgctxt "SC_OPCODE_QUARTILE"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:1974
+#: sc/inc/scfuncs.hrc:1974
 msgctxt "SC_OPCODE_QUARTILE"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:1975
+#: sc/inc/scfuncs.hrc:1975
 msgctxt "SC_OPCODE_QUARTILE"
 msgid "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX)."
 msgstr "Math o chwartel (0 = MIN, 1 = 25%, 2 = 50 %, 3 = 75 %, 4 =MAX)."
 
-#: scfuncs.hrc:1981
+#: sc/inc/scfuncs.hrc:1981
 msgctxt "SC_OPCODE_QUARTILE_EXC"
 msgid "Returns the quartile of a sample."
 msgstr "Dychwelyd chwartel sampl."
 
-#: scfuncs.hrc:1982
+#: sc/inc/scfuncs.hrc:1982
 msgctxt "SC_OPCODE_QUARTILE_EXC"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:1983
+#: sc/inc/scfuncs.hrc:1983
 msgctxt "SC_OPCODE_QUARTILE_EXC"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:1984
+#: sc/inc/scfuncs.hrc:1984
 msgctxt "SC_OPCODE_QUARTILE_EXC"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:1985
+#: sc/inc/scfuncs.hrc:1985
 msgctxt "SC_OPCODE_QUARTILE_EXC"
 msgid "The type of the quartile (1 = 25%, 2 = 50%, 3 = 75%)."
 msgstr "Math y chwartel (1 = 25%, 2 = 50 %, 3 = 75 %)."
 
-#: scfuncs.hrc:1991
+#: sc/inc/scfuncs.hrc:1991
 msgctxt "SC_OPCODE_QUARTILE_INC"
 msgid "Returns the quartile of a sample."
 msgstr "Dychwelyd chwartel sampl."
 
-#: scfuncs.hrc:1992
+#: sc/inc/scfuncs.hrc:1992
 msgctxt "SC_OPCODE_QUARTILE_INC"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:1993
+#: sc/inc/scfuncs.hrc:1993
 msgctxt "SC_OPCODE_QUARTILE_INC"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:1994
+#: sc/inc/scfuncs.hrc:1994
 msgctxt "SC_OPCODE_QUARTILE_INC"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:1995
+#: sc/inc/scfuncs.hrc:1995
 msgctxt "SC_OPCODE_QUARTILE_INC"
 msgid "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX)."
 msgstr "Math o chwartel (0 = MIN, 1 = 25%, 2 = 50 %, 3 = 75 %, 4 =MAX)."
 
-#: scfuncs.hrc:2001
+#: sc/inc/scfuncs.hrc:2001
 msgctxt "SC_OPCODE_LARGE"
 msgid "Returns the k-th largest value of a sample."
 msgstr "Dychwelyd gwerth mwyaf k-th sampl."
 
-#: scfuncs.hrc:2002
+#: sc/inc/scfuncs.hrc:2002
 msgctxt "SC_OPCODE_LARGE"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2003
+#: sc/inc/scfuncs.hrc:2003
 msgctxt "SC_OPCODE_LARGE"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:2004
+#: sc/inc/scfuncs.hrc:2004
 msgctxt "SC_OPCODE_LARGE"
 msgid "Rank c"
 msgstr "Safle c"
 
-#: scfuncs.hrc:2005
+#: sc/inc/scfuncs.hrc:2005
 msgctxt "SC_OPCODE_LARGE"
 msgid "The ranking of the value."
 msgstr "Graddio'r gwerth."
 
-#: scfuncs.hrc:2011
+#: sc/inc/scfuncs.hrc:2011
 msgctxt "SC_OPCODE_SMALL"
 msgid "Returns the k-th smallest value of a sample."
 msgstr "Dychwelyd gwerth mwyaf k-th sampl."
 
-#: scfuncs.hrc:2012
+#: sc/inc/scfuncs.hrc:2012
 msgctxt "SC_OPCODE_SMALL"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2013
+#: sc/inc/scfuncs.hrc:2013
 msgctxt "SC_OPCODE_SMALL"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:2014
+#: sc/inc/scfuncs.hrc:2014
 msgctxt "SC_OPCODE_SMALL"
 msgid "Rank c"
 msgstr "Safle c"
 
-#: scfuncs.hrc:2015
+#: sc/inc/scfuncs.hrc:2015
 msgctxt "SC_OPCODE_SMALL"
 msgid "The ranking of the value."
 msgstr "Graddio'r gwerth."
 
-#: scfuncs.hrc:2021
+#: sc/inc/scfuncs.hrc:2021
 msgctxt "SC_OPCODE_PERCENT_RANK"
 msgid "Returns the percentage rank of a value in a sample."
 msgstr "Dychwelyd gradd canran gwerth mewn sampl."
 
-#: scfuncs.hrc:2022
+#: sc/inc/scfuncs.hrc:2022
 msgctxt "SC_OPCODE_PERCENT_RANK"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2023
+#: sc/inc/scfuncs.hrc:2023
 msgctxt "SC_OPCODE_PERCENT_RANK"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:2024
+#: sc/inc/scfuncs.hrc:2024
 msgctxt "SC_OPCODE_PERCENT_RANK"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:2025
+#: sc/inc/scfuncs.hrc:2025
 msgctxt "SC_OPCODE_PERCENT_RANK"
 msgid "The value for which percentage ranking is to be determined."
 msgstr "Gwerth y mae gradd y ganran i'w bennu."
 
-#: scfuncs.hrc:2026
+#: sc/inc/scfuncs.hrc:2026
 msgctxt "SC_OPCODE_PERCENT_RANK"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:2027
+#: sc/inc/scfuncs.hrc:2027
 msgctxt "SC_OPCODE_PERCENT_RANK"
 msgid "The number of significant digits for the returned percentage: if omitted, a value of 3 is used."
 msgstr "Nifer y digidau arwyddocaol ar gyfer y canran dychwelwyd: s hepgorwyd, mae gwerth o 3 yn cael ei ddefnyddio."
 
-#: scfuncs.hrc:2033
+#: sc/inc/scfuncs.hrc:2033
 msgctxt "SC_OPCODE_PERCENT_RANK_EXC"
 msgid "Returns the percentage rank (0..1, exclusive) of a value in a sample."
 msgstr "Dychwelyd safle canran (0..1, allgynhwysol) gwerth mewn sampl."
 
-#: scfuncs.hrc:2034
+#: sc/inc/scfuncs.hrc:2034
 msgctxt "SC_OPCODE_PERCENT_RANK_EXC"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2035
+#: sc/inc/scfuncs.hrc:2035
 msgctxt "SC_OPCODE_PERCENT_RANK_EXC"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:2036
+#: sc/inc/scfuncs.hrc:2036
 msgctxt "SC_OPCODE_PERCENT_RANK_EXC"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:2037
+#: sc/inc/scfuncs.hrc:2037
 msgctxt "SC_OPCODE_PERCENT_RANK_EXC"
 msgid "The value for which percentage ranking is to be determined."
 msgstr "Gwerth y mae gradd y ganran i'w bennu."
 
-#: scfuncs.hrc:2038
+#: sc/inc/scfuncs.hrc:2038
 msgctxt "SC_OPCODE_PERCENT_RANK_EXC"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:2039
+#: sc/inc/scfuncs.hrc:2039
 msgctxt "SC_OPCODE_PERCENT_RANK_EXC"
 msgid "The number of significant digits for the returned percentage: if omitted, a value of 3 is used."
 msgstr "Nifer y digidau arwyddocaol ar gyfer y canran dychwelwyd: os hepgorwyd, mae gwerth o 3 yn cael ei ddefnyddio."
 
-#: scfuncs.hrc:2045
+#: sc/inc/scfuncs.hrc:2045
 msgctxt "SC_OPCODE_PERCENT_RANK_INC"
 msgid "Returns the percentage rank (0..1, inclusive) of a value in a sample."
 msgstr "Dychwelyd safle canran (0..1, allgynhwysol) gwerth mewn sampl."
 
-#: scfuncs.hrc:2046
+#: sc/inc/scfuncs.hrc:2046
 msgctxt "SC_OPCODE_PERCENT_RANK_INC"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2047
+#: sc/inc/scfuncs.hrc:2047
 msgctxt "SC_OPCODE_PERCENT_RANK_INC"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:2048
+#: sc/inc/scfuncs.hrc:2048
 msgctxt "SC_OPCODE_PERCENT_RANK_INC"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:2049
+#: sc/inc/scfuncs.hrc:2049
 msgctxt "SC_OPCODE_PERCENT_RANK_INC"
 msgid "The value for which percentage ranking is to be determined."
 msgstr "Gwerth y mae gradd y ganran i'w bennu."
 
-#: scfuncs.hrc:2050
+#: sc/inc/scfuncs.hrc:2050
 msgctxt "SC_OPCODE_PERCENT_RANK_INC"
 msgid "Significance"
 msgstr "Arwyddocâd"
 
-#: scfuncs.hrc:2051
+#: sc/inc/scfuncs.hrc:2051
 msgctxt "SC_OPCODE_PERCENT_RANK_INC"
 msgid "The number of significant digits for the returned percentage: if omitted, a value of 3 is used."
 msgstr "Nifer y digidau arwyddocaol ar gyfer y canran dychwelwyd: os hepgorwyd, mae gwerth o 3 yn cael ei ddefnyddio."
 
-#: scfuncs.hrc:2057
+#: sc/inc/scfuncs.hrc:2057
 msgctxt "SC_OPCODE_RANK"
 msgid "Returns the ranking of a value in a sample."
 msgstr "Dychwelyd graddio gwerth mewn sampl."
 
-#: scfuncs.hrc:2058
+#: sc/inc/scfuncs.hrc:2058
 msgctxt "SC_OPCODE_RANK"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:2059
+#: sc/inc/scfuncs.hrc:2059
 msgctxt "SC_OPCODE_RANK"
 msgid "The value for which the rank is to be determined."
 msgstr "Gwerth y mae gradd y ganran i'w bennu."
 
-#: scfuncs.hrc:2060
+#: sc/inc/scfuncs.hrc:2060
 msgctxt "SC_OPCODE_RANK"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2061
+#: sc/inc/scfuncs.hrc:2061
 msgctxt "SC_OPCODE_RANK"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:2062
+#: sc/inc/scfuncs.hrc:2062
 msgctxt "SC_OPCODE_RANK"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:2063
+#: sc/inc/scfuncs.hrc:2063
 msgctxt "SC_OPCODE_RANK"
 msgid "Sequence order: 0 or omitted means descending, any other value than 0 means ascending."
 msgstr "Trefn dilyniant: 0 neu ddim yn golygu trefn ddisgynnol, unrhyw werth heblaw 0 yn golygu esgynnol."
 
-#: scfuncs.hrc:2069
+#: sc/inc/scfuncs.hrc:2069
 msgctxt "SC_OPCODE_RANK_EQ"
 msgid "Returns the ranking of a value in a sample; if more than one value has the same rank, the top rank of that set of values is returned."
 msgstr "Dychwelyd y safle gwerth mewn sampl; os oes gan fwy nag un gwerth yr un safle, y safle uchaf o'r set yma o werthoedd sy'n cael eu dychwelyd."
 
-#: scfuncs.hrc:2070
+#: sc/inc/scfuncs.hrc:2070
 msgctxt "SC_OPCODE_RANK_EQ"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:2071
+#: sc/inc/scfuncs.hrc:2071
 msgctxt "SC_OPCODE_RANK_EQ"
 msgid "The value for which the rank is to be determined."
 msgstr "Gwerth y mae gradd y ganran i'w bennu."
 
-#: scfuncs.hrc:2072
+#: sc/inc/scfuncs.hrc:2072
 msgctxt "SC_OPCODE_RANK_EQ"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2073
+#: sc/inc/scfuncs.hrc:2073
 msgctxt "SC_OPCODE_RANK_EQ"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:2074
+#: sc/inc/scfuncs.hrc:2074
 msgctxt "SC_OPCODE_RANK_EQ"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:2075
+#: sc/inc/scfuncs.hrc:2075
 msgctxt "SC_OPCODE_RANK_EQ"
 msgid "Sequence order: 0 or omitted means descending, any other value than 0 means ascending."
 msgstr "Trefn dilyniant: 0 neu ddim yn golygu trefn ddisgynnol, unrhyw werth heblaw 0 yn golygu esgynnol."
 
-#: scfuncs.hrc:2081
+#: sc/inc/scfuncs.hrc:2081
 msgctxt "SC_OPCODE_RANK_AVG"
 msgid "Returns the ranking of a value in a sample; if more than one value has the same rank, the average rank is returned."
 msgstr "Dychwelyd y safle gwerth mewn sampl; os oes gan fwy nag un gwerth yr un safle, y safle canolig o'r set yma o werthoedd sy'n cael eu dychwelyd."
 
-#: scfuncs.hrc:2082
+#: sc/inc/scfuncs.hrc:2082
 msgctxt "SC_OPCODE_RANK_AVG"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:2083
+#: sc/inc/scfuncs.hrc:2083
 msgctxt "SC_OPCODE_RANK_AVG"
 msgid "The value for which the rank is to be determined."
 msgstr "Gwerth y mae gradd y ganran i'w bennu."
 
-#: scfuncs.hrc:2084
+#: sc/inc/scfuncs.hrc:2084
 msgctxt "SC_OPCODE_RANK_AVG"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2085
+#: sc/inc/scfuncs.hrc:2085
 msgctxt "SC_OPCODE_RANK_AVG"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:2086
+#: sc/inc/scfuncs.hrc:2086
 msgctxt "SC_OPCODE_RANK_AVG"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:2087
+#: sc/inc/scfuncs.hrc:2087
 msgctxt "SC_OPCODE_RANK_AVG"
 msgid "Sequence order: 0 or omitted means descending, any other value than 0 means ascending."
 msgstr "Trefn dilyniant: 0 neu ddim yn golygu trefn ddisgynnol, unrhyw werth heblaw 0 yn golygu esgynnol."
 
-#: scfuncs.hrc:2093
+#: sc/inc/scfuncs.hrc:2093
 msgctxt "SC_OPCODE_TRIM_MEAN"
 msgid "Returns the mean of a sample without including the marginal values."
 msgstr "Dychwelyd modd y sampl heb gynnwys y gwerthoedd ymylol."
 
-#: scfuncs.hrc:2094
+#: sc/inc/scfuncs.hrc:2094
 msgctxt "SC_OPCODE_TRIM_MEAN"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2095
+#: sc/inc/scfuncs.hrc:2095
 msgctxt "SC_OPCODE_TRIM_MEAN"
 msgid "The array of the data in the sample."
 msgstr "Arae data yn y sampl."
 
-#: scfuncs.hrc:2096
+#: sc/inc/scfuncs.hrc:2096
 msgctxt "SC_OPCODE_TRIM_MEAN"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2097
+#: sc/inc/scfuncs.hrc:2097
 msgctxt "SC_OPCODE_TRIM_MEAN"
 msgid "The percentage of marginal data that is not to be taken into account."
 msgstr "Canran data ymylol nad yw i'w ystyried."
 
-#: scfuncs.hrc:2103
+#: sc/inc/scfuncs.hrc:2103
 msgctxt "SC_OPCODE_PROB"
 msgid "Returns the discrete probability of an interval."
 msgstr "Dychwelyd y tebygolrwydd arwahanol egwyl."
 
-#: scfuncs.hrc:2104
+#: sc/inc/scfuncs.hrc:2104
 msgctxt "SC_OPCODE_PROB"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2105
+#: sc/inc/scfuncs.hrc:2105
 msgctxt "SC_OPCODE_PROB"
 msgid "The sample data array."
 msgstr "Arae data syml."
 
-#: scfuncs.hrc:2106
+#: sc/inc/scfuncs.hrc:2106
 msgctxt "SC_OPCODE_PROB"
 msgid "Probability"
 msgstr "Tebygolrwydd"
 
-#: scfuncs.hrc:2107
+#: sc/inc/scfuncs.hrc:2107
 msgctxt "SC_OPCODE_PROB"
 msgid "The array of the associated probabilities."
 msgstr "Arae o debygolrwyddau cysylltiedig."
 
-#: scfuncs.hrc:2108
+#: sc/inc/scfuncs.hrc:2108
 msgctxt "SC_OPCODE_PROB"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: scfuncs.hrc:2109
+#: sc/inc/scfuncs.hrc:2109
 msgctxt "SC_OPCODE_PROB"
 msgid "The start of the value interval whose probabilities is to be totalled."
 msgstr "Cychwyn y cyfwng gwerth y bydd ei debygolrwyddau yn cael ei gyfansymu."
 
-#: scfuncs.hrc:2110
+#: sc/inc/scfuncs.hrc:2110
 msgctxt "SC_OPCODE_PROB"
 msgid "End"
 msgstr "Diwedd"
 
-#: scfuncs.hrc:2111
+#: sc/inc/scfuncs.hrc:2111
 msgctxt "SC_OPCODE_PROB"
 msgid "The end of the value interval where the probabilities are to be totalled."
 msgstr "Diwedd y cyfwng gwerth lle mae'r tebygolrwyddau i'w cyfansymu."
 
-#: scfuncs.hrc:2117
+#: sc/inc/scfuncs.hrc:2117
 msgctxt "SC_OPCODE_B"
 msgid "Returns the probability of a trial result using binomial distribution."
 msgstr "Yn dychwelyd y tebygolrwydd o ganlyniad prawf drwy ddosbarthiad bionomial."
 
-#: scfuncs.hrc:2118
+#: sc/inc/scfuncs.hrc:2118
 msgctxt "SC_OPCODE_B"
 msgid "Trials"
 msgstr "Arbrofion"
 
-#: scfuncs.hrc:2119
+#: sc/inc/scfuncs.hrc:2119
 msgctxt "SC_OPCODE_B"
 msgid "The number of trials."
 msgstr "Nifer o arbrofion."
 
-#: scfuncs.hrc:2120
+#: sc/inc/scfuncs.hrc:2120
 msgctxt "SC_OPCODE_B"
 msgid "SP"
 msgstr "SP"
 
-#: scfuncs.hrc:2121
+#: sc/inc/scfuncs.hrc:2121
 msgctxt "SC_OPCODE_B"
 msgid "The individual probability of a trial result."
 msgstr "Tebygolrwydd unigol canlyniad arbrawf."
 
-#: scfuncs.hrc:2122
+#: sc/inc/scfuncs.hrc:2122
 msgctxt "SC_OPCODE_B"
 msgid "T 1"
 msgstr "T 1"
 
-#: scfuncs.hrc:2123
+#: sc/inc/scfuncs.hrc:2123
 msgctxt "SC_OPCODE_B"
 msgid "Lower limit for the number of trials."
 msgstr "Terfyn isaf ar gyfer nifer o arbrofion."
 
-#: scfuncs.hrc:2124
+#: sc/inc/scfuncs.hrc:2124
 msgctxt "SC_OPCODE_B"
 msgid "T 2"
 msgstr "T 2"
 
-#: scfuncs.hrc:2125
+#: sc/inc/scfuncs.hrc:2125
 msgctxt "SC_OPCODE_B"
 msgid "Upper limit for the number of trials."
 msgstr "Terfyn uchaf ar gyfer nifer o arbrofion."
 
-#: scfuncs.hrc:2131
+#: sc/inc/scfuncs.hrc:2131
 msgctxt "SC_OPCODE_PHI"
 msgid "Values of the distribution function for a standard normal distribution."
 msgstr "Gwerthoedd swyddogaeth dosbarthu ar gyfer dosbarthiad normal safonol."
 
-#: scfuncs.hrc:2132
+#: sc/inc/scfuncs.hrc:2132
 msgctxt "SC_OPCODE_PHI"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2133
+#: sc/inc/scfuncs.hrc:2133
 msgctxt "SC_OPCODE_PHI"
 msgid "The value for which the standard normal distribution is to be calculated."
 msgstr "Gwerth y bydd dosbarthiad normal safonol yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2139
+#: sc/inc/scfuncs.hrc:2139
 msgctxt "SC_OPCODE_GAUSS"
 msgid "Returns the integral values of the standard normal cumulative distribution."
 msgstr "Dychwelyd gwerthoedd integrol o ddosbarthiad cronnus normal."
 
-#: scfuncs.hrc:2140
+#: sc/inc/scfuncs.hrc:2140
 msgctxt "SC_OPCODE_GAUSS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2141
+#: sc/inc/scfuncs.hrc:2141
 msgctxt "SC_OPCODE_GAUSS"
 msgid "The value for which the integral value of the standard normal distribution is to be calculated."
 msgstr "Gwerth y bydd gwerth integrol dosbarthiad normal safonol yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2147
+#: sc/inc/scfuncs.hrc:2147
 msgctxt "SC_OPCODE_FISHER"
 msgid "Returns the Fisher transformation."
 msgstr "Dychwelyd trawsffurfiad Fisher."
 
-#: scfuncs.hrc:2148
+#: sc/inc/scfuncs.hrc:2148
 msgctxt "SC_OPCODE_FISHER"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2149
+#: sc/inc/scfuncs.hrc:2149
 msgctxt "SC_OPCODE_FISHER"
 msgid "The value to be transformed (-1 < VALUE < 1)."
 msgstr "Gwerth i'w drawsffurfio (-1 < VALUE < 1)."
 
-#: scfuncs.hrc:2155
+#: sc/inc/scfuncs.hrc:2155
 msgctxt "SC_OPCODE_FISHER_INV"
 msgid "Returns the inverse of the Fisher transformation."
 msgstr "Dychwelyd gwrthdro trawsffurfiad Fisher."
 
-#: scfuncs.hrc:2156
+#: sc/inc/scfuncs.hrc:2156
 msgctxt "SC_OPCODE_FISHER_INV"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2157
+#: sc/inc/scfuncs.hrc:2157
 msgctxt "SC_OPCODE_FISHER_INV"
 msgid "The value that is to be transformed back."
 msgstr "Y gwerth i'w drawsffurfio'n ôl."
 
-#: scfuncs.hrc:2163
+#: sc/inc/scfuncs.hrc:2163
 msgctxt "SC_OPCODE_BINOM_DIST"
 msgid "Values of the binomial distribution."
 msgstr "Gwerthoedd dosbarthiad binomaidd."
 
-#: scfuncs.hrc:2164
+#: sc/inc/scfuncs.hrc:2164
 msgctxt "SC_OPCODE_BINOM_DIST"
 msgid "X"
 msgstr "X"
 
-#: scfuncs.hrc:2165
+#: sc/inc/scfuncs.hrc:2165
 msgctxt "SC_OPCODE_BINOM_DIST"
 msgid "The number of successes in a series of trials."
 msgstr "Nifer o lwyddiannau mewn arbrofion."
 
-#: scfuncs.hrc:2166
+#: sc/inc/scfuncs.hrc:2166
 msgctxt "SC_OPCODE_BINOM_DIST"
 msgid "Trials"
 msgstr "Arbrofion"
 
-#: scfuncs.hrc:2167
+#: sc/inc/scfuncs.hrc:2167
 msgctxt "SC_OPCODE_BINOM_DIST"
 msgid "The total number of trials."
 msgstr "Cyfanswm yr arbrofion."
 
-#: scfuncs.hrc:2168
+#: sc/inc/scfuncs.hrc:2168
 msgctxt "SC_OPCODE_BINOM_DIST"
 msgid "SP"
 msgstr "SP"
 
-#: scfuncs.hrc:2169
+#: sc/inc/scfuncs.hrc:2169
 msgctxt "SC_OPCODE_BINOM_DIST"
 msgid "The success probability of a trial."
 msgstr "Tebygolrwydd llwyddiant arbrawf."
 
-#: scfuncs.hrc:2170
+#: sc/inc/scfuncs.hrc:2170
 msgctxt "SC_OPCODE_BINOM_DIST"
 msgid "C"
 msgstr "C"
 
-#: scfuncs.hrc:2171
+#: sc/inc/scfuncs.hrc:2171
 msgctxt "SC_OPCODE_BINOM_DIST"
 msgid "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability."
 msgstr "Cronnus. C=0 cyfrifo'r tebygolrwydd unigol, C=1 y tebygolrwydd cronnus."
 
-#: scfuncs.hrc:2177
+#: sc/inc/scfuncs.hrc:2177
 msgctxt "SC_OPCODE_BINOM_DIST_MS"
 msgid "Values of the binomial distribution."
 msgstr "Gwerthoedd dosbarthiad binomaidd."
 
-#: scfuncs.hrc:2178
+#: sc/inc/scfuncs.hrc:2178
 msgctxt "SC_OPCODE_BINOM_DIST_MS"
 msgid "X"
 msgstr "X"
 
-#: scfuncs.hrc:2179
+#: sc/inc/scfuncs.hrc:2179
 msgctxt "SC_OPCODE_BINOM_DIST_MS"
 msgid "The number of successes in a series of trials."
 msgstr "Nifer o lwyddiannau mewn arbrofion."
 
-#: scfuncs.hrc:2180
+#: sc/inc/scfuncs.hrc:2180
 msgctxt "SC_OPCODE_BINOM_DIST_MS"
 msgid "Trials"
 msgstr "Arbrofion"
 
-#: scfuncs.hrc:2181
+#: sc/inc/scfuncs.hrc:2181
 msgctxt "SC_OPCODE_BINOM_DIST_MS"
 msgid "The total number of trials."
 msgstr "Cyfanswm yr arbrofion."
 
-#: scfuncs.hrc:2182
+#: sc/inc/scfuncs.hrc:2182
 msgctxt "SC_OPCODE_BINOM_DIST_MS"
 msgid "SP"
 msgstr "SP"
 
-#: scfuncs.hrc:2183
+#: sc/inc/scfuncs.hrc:2183
 msgctxt "SC_OPCODE_BINOM_DIST_MS"
 msgid "The success probability of a trial."
 msgstr "Tebygolrwydd llwyddiant arbrawf."
 
-#: scfuncs.hrc:2184
+#: sc/inc/scfuncs.hrc:2184
 msgctxt "SC_OPCODE_BINOM_DIST_MS"
 msgid "C"
 msgstr "C"
 
-#: scfuncs.hrc:2185
+#: sc/inc/scfuncs.hrc:2185
 msgctxt "SC_OPCODE_BINOM_DIST_MS"
 msgid "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability."
 msgstr "Cronnus. C=0 cyfrifo'r tebygolrwydd unigol, C=1 y tebygolrwydd cronnus."
 
-#: scfuncs.hrc:2191
+#: sc/inc/scfuncs.hrc:2191
 msgctxt "SC_OPCODE_NEG_BINOM_VERT"
 msgid "Values of the negative binomial distribution."
 msgstr "Gwerthoedd dosbarthiad binomaidd negyddol."
 
-#: scfuncs.hrc:2192
+#: sc/inc/scfuncs.hrc:2192
 msgctxt "SC_OPCODE_NEG_BINOM_VERT"
 msgid "X"
 msgstr "X"
 
-#: scfuncs.hrc:2193
+#: sc/inc/scfuncs.hrc:2193
 msgctxt "SC_OPCODE_NEG_BINOM_VERT"
 msgid "The number of failures in the trial range."
 msgstr "Nifer o fethiannau yn yr ystod arbrofol."
 
-#: scfuncs.hrc:2194
+#: sc/inc/scfuncs.hrc:2194
 msgctxt "SC_OPCODE_NEG_BINOM_VERT"
 msgid "R"
 msgstr "R"
 
-#: scfuncs.hrc:2195
+#: sc/inc/scfuncs.hrc:2195
 msgctxt "SC_OPCODE_NEG_BINOM_VERT"
 msgid "The number of successes in the trial sequence."
 msgstr "Nifer o lwyddiannau yn y dilyniant arbrofol."
 
-#: scfuncs.hrc:2196
+#: sc/inc/scfuncs.hrc:2196
 msgctxt "SC_OPCODE_NEG_BINOM_VERT"
 msgid "SP"
 msgstr "SP"
 
-#: scfuncs.hrc:2197
+#: sc/inc/scfuncs.hrc:2197
 msgctxt "SC_OPCODE_NEG_BINOM_VERT"
 msgid "The success probability of a trial."
 msgstr "Tebygolrwydd llwyddiant arbrawf."
 
-#: scfuncs.hrc:2203
+#: sc/inc/scfuncs.hrc:2203
 msgctxt "SC_OPCODE_NEG_BINOM_DIST_MS"
 msgid "Values of the negative binomial distribution."
 msgstr "Gwerthoedd dosbarthiad binomaidd negyddol."
 
-#: scfuncs.hrc:2204
+#: sc/inc/scfuncs.hrc:2204
 msgctxt "SC_OPCODE_NEG_BINOM_DIST_MS"
 msgid "X"
 msgstr "X"
 
-#: scfuncs.hrc:2205
+#: sc/inc/scfuncs.hrc:2205
 msgctxt "SC_OPCODE_NEG_BINOM_DIST_MS"
 msgid "The number of failures in the trial range."
 msgstr "Nifer o fethiannau yn yr ystod arbrofol."
 
-#: scfuncs.hrc:2206
+#: sc/inc/scfuncs.hrc:2206
 msgctxt "SC_OPCODE_NEG_BINOM_DIST_MS"
 msgid "R"
 msgstr "R"
 
-#: scfuncs.hrc:2207
+#: sc/inc/scfuncs.hrc:2207
 msgctxt "SC_OPCODE_NEG_BINOM_DIST_MS"
 msgid "The number of successes in the trial sequence."
 msgstr "Nifer o lwyddiannau yn y dilyniant arbrofol."
 
-#: scfuncs.hrc:2208
+#: sc/inc/scfuncs.hrc:2208
 msgctxt "SC_OPCODE_NEG_BINOM_DIST_MS"
 msgid "SP"
 msgstr "SP"
 
-#: scfuncs.hrc:2209
+#: sc/inc/scfuncs.hrc:2209
 msgctxt "SC_OPCODE_NEG_BINOM_DIST_MS"
 msgid "The success probability of a trial."
 msgstr "Tebygolrwydd llwyddiant arbrawf."
 
-#: scfuncs.hrc:2210
+#: sc/inc/scfuncs.hrc:2210
 msgctxt "SC_OPCODE_NEG_BINOM_DIST_MS"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2211
+#: sc/inc/scfuncs.hrc:2211
 msgctxt "SC_OPCODE_NEG_BINOM_DIST_MS"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2217
+#: sc/inc/scfuncs.hrc:2217
 msgctxt "SC_OPCODE_CRIT_BINOM"
 msgid "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value."
 msgstr "Yn dychwelyd y gwerth lleiaf y mae'r dosraniad binomaidd cronnus yn fwy neu cydradd â gwerth y maen prawf."
 
-#: scfuncs.hrc:2218
+#: sc/inc/scfuncs.hrc:2218
 msgctxt "SC_OPCODE_CRIT_BINOM"
 msgid "Trials"
 msgstr "Arbrofion"
 
-#: scfuncs.hrc:2219
+#: sc/inc/scfuncs.hrc:2219
 msgctxt "SC_OPCODE_CRIT_BINOM"
 msgid "The total number of trials."
 msgstr "Cyfanswm yr arbrofion."
 
-#: scfuncs.hrc:2220
+#: sc/inc/scfuncs.hrc:2220
 msgctxt "SC_OPCODE_CRIT_BINOM"
 msgid "SP"
 msgstr "SP"
 
-#: scfuncs.hrc:2221
+#: sc/inc/scfuncs.hrc:2221
 msgctxt "SC_OPCODE_CRIT_BINOM"
 msgid "The success probability of a trial."
 msgstr "Tebygolrwydd llwyddiant arbrawf."
 
-#: scfuncs.hrc:2222
+#: sc/inc/scfuncs.hrc:2222
 msgctxt "SC_OPCODE_CRIT_BINOM"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2223
+#: sc/inc/scfuncs.hrc:2223
 msgctxt "SC_OPCODE_CRIT_BINOM"
 msgid "The border probability that is attained or exceeded."
 msgstr "Tebygolrwydd border sydd i'w ymgyrraedd neu ei ragori."
 
-#: scfuncs.hrc:2229
+#: sc/inc/scfuncs.hrc:2229
 msgctxt "SC_OPCODE_BINOM_INV"
 msgid "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value."
 msgstr "Dychwelyd y gwerth lleiaf o'r hyn y mae'r dosbarthiad binomaidd cronus yn fwy neu gydradd â gwerth y maen prawf."
 
-#: scfuncs.hrc:2230
+#: sc/inc/scfuncs.hrc:2230
 msgctxt "SC_OPCODE_BINOM_INV"
 msgid "Trials"
 msgstr "Arbrofion"
 
-#: scfuncs.hrc:2231
+#: sc/inc/scfuncs.hrc:2231
 msgctxt "SC_OPCODE_BINOM_INV"
 msgid "The total number of trials."
 msgstr "Cyfanswm yr arbrofion."
 
-#: scfuncs.hrc:2232
+#: sc/inc/scfuncs.hrc:2232
 msgctxt "SC_OPCODE_BINOM_INV"
 msgid "SP"
 msgstr "SP"
 
-#: scfuncs.hrc:2233
+#: sc/inc/scfuncs.hrc:2233
 msgctxt "SC_OPCODE_BINOM_INV"
 msgid "The success probability of a trial."
 msgstr "Tebygolrwydd llwyddiant arbrawf."
 
-#: scfuncs.hrc:2234
+#: sc/inc/scfuncs.hrc:2234
 msgctxt "SC_OPCODE_BINOM_INV"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2235
+#: sc/inc/scfuncs.hrc:2235
 msgctxt "SC_OPCODE_BINOM_INV"
 msgid "The border probability that is attained or exceeded."
 msgstr "Tebygolrwydd border sydd i'w ymgyrraedd neu ei ragori."
 
-#: scfuncs.hrc:2241
+#: sc/inc/scfuncs.hrc:2241
 msgctxt "SC_OPCODE_POISSON_DIST"
 msgid "Returns the Poisson distribution."
 msgstr "Dychwelyd dosbarthiad Poisson."
 
-#: scfuncs.hrc:2242
+#: sc/inc/scfuncs.hrc:2242
 msgctxt "SC_OPCODE_POISSON_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2243
+#: sc/inc/scfuncs.hrc:2243
 msgctxt "SC_OPCODE_POISSON_DIST"
 msgid "The value for which the Poisson distribution is to be calculated."
 msgstr "Gwerth ar gyfer cyfrifo dosbarthiad Poisson."
 
-#: scfuncs.hrc:2244
+#: sc/inc/scfuncs.hrc:2244
 msgctxt "SC_OPCODE_POISSON_DIST"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2245
+#: sc/inc/scfuncs.hrc:2245
 msgctxt "SC_OPCODE_POISSON_DIST"
 msgid "Mean. The mean value of the Poisson distribution."
 msgstr "Cymedr. Gwerth cymedrig dosbarthiad Poisson."
 
-#: scfuncs.hrc:2246
+#: sc/inc/scfuncs.hrc:2246
 msgctxt "SC_OPCODE_POISSON_DIST"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2247
+#: sc/inc/scfuncs.hrc:2247
 msgctxt "SC_OPCODE_POISSON_DIST"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2253
+#: sc/inc/scfuncs.hrc:2253
 msgctxt "SC_OPCODE_POISSON_DIST_MS"
 msgid "Returns the Poisson distribution."
 msgstr "Dychwelyd dosbarthiad Poisson."
 
-#: scfuncs.hrc:2254
+#: sc/inc/scfuncs.hrc:2254
 msgctxt "SC_OPCODE_POISSON_DIST_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2255
+#: sc/inc/scfuncs.hrc:2255
 msgctxt "SC_OPCODE_POISSON_DIST_MS"
 msgid "The value for which the Poisson distribution is to be calculated."
 msgstr "Gwerth ar gyfer cyfrifo dosbarthiad Poisson."
 
-#: scfuncs.hrc:2256
+#: sc/inc/scfuncs.hrc:2256
 msgctxt "SC_OPCODE_POISSON_DIST_MS"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2257
+#: sc/inc/scfuncs.hrc:2257
 msgctxt "SC_OPCODE_POISSON_DIST_MS"
 msgid "Mean. The mean value of the Poisson distribution."
 msgstr "Cymedr. Gwerth cymedrig dosbarthiad Poisson."
 
-#: scfuncs.hrc:2258
+#: sc/inc/scfuncs.hrc:2258
 msgctxt "SC_OPCODE_POISSON_DIST_MS"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2259
+#: sc/inc/scfuncs.hrc:2259
 msgctxt "SC_OPCODE_POISSON_DIST_MS"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2265
+#: sc/inc/scfuncs.hrc:2265
 msgctxt "SC_OPCODE_NORM_DIST"
 msgid "Values of the normal distribution."
 msgstr "Gwerthoedd y dosbarthiad normal."
 
-#: scfuncs.hrc:2266
+#: sc/inc/scfuncs.hrc:2266
 msgctxt "SC_OPCODE_NORM_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2267
+#: sc/inc/scfuncs.hrc:2267
 msgctxt "SC_OPCODE_NORM_DIST"
 msgid "The value for which the normal distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad normal yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2268
+#: sc/inc/scfuncs.hrc:2268
 msgctxt "SC_OPCODE_NORM_DIST"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2269
+#: sc/inc/scfuncs.hrc:2269
 msgctxt "SC_OPCODE_NORM_DIST"
 msgid "The mean value. The mean value of the normal distribution."
 msgstr "Gwerth cymedrig. Gwerth cymedrig y dosbarthiad normal."
 
-#: scfuncs.hrc:2270
+#: sc/inc/scfuncs.hrc:2270
 msgctxt "SC_OPCODE_NORM_DIST"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2271
+#: sc/inc/scfuncs.hrc:2271
 msgctxt "SC_OPCODE_NORM_DIST"
 msgid "Standard deviation. The standard deviation of the normal distribution."
 msgstr "Gwyriad safonol. Gwyriad safonol y dosbarthiad normal."
 
-#: scfuncs.hrc:2272
+#: sc/inc/scfuncs.hrc:2272
 msgctxt "SC_OPCODE_NORM_DIST"
 msgid "C"
 msgstr "C"
 
-#: scfuncs.hrc:2273
+#: sc/inc/scfuncs.hrc:2273
 msgctxt "SC_OPCODE_NORM_DIST"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2279
+#: sc/inc/scfuncs.hrc:2279
 msgctxt "SC_OPCODE_NORM_DIST_MS"
 msgid "Values of the normal distribution."
 msgstr "Gwerthoedd y dosbarthiad normal."
 
-#: scfuncs.hrc:2280
+#: sc/inc/scfuncs.hrc:2280
 msgctxt "SC_OPCODE_NORM_DIST_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2281
+#: sc/inc/scfuncs.hrc:2281
 msgctxt "SC_OPCODE_NORM_DIST_MS"
 msgid "The value for which the normal distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad normal yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2282
+#: sc/inc/scfuncs.hrc:2282
 msgctxt "SC_OPCODE_NORM_DIST_MS"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2283
+#: sc/inc/scfuncs.hrc:2283
 msgctxt "SC_OPCODE_NORM_DIST_MS"
 msgid "The mean value. The mean value of the normal distribution."
 msgstr "Gwerth cymedrig. Gwerth cymedrig y dosbarthiad normal."
 
-#: scfuncs.hrc:2284
+#: sc/inc/scfuncs.hrc:2284
 msgctxt "SC_OPCODE_NORM_DIST_MS"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2285
+#: sc/inc/scfuncs.hrc:2285
 msgctxt "SC_OPCODE_NORM_DIST_MS"
 msgid "Standard deviation. The standard deviation of the normal distribution."
 msgstr "Gwyriad safonol. Gwyriad safonol y dosbarthiad normal."
 
-#: scfuncs.hrc:2286
+#: sc/inc/scfuncs.hrc:2286
 msgctxt "SC_OPCODE_NORM_DIST_MS"
 msgid "C"
 msgstr "C"
 
-#: scfuncs.hrc:2287
+#: sc/inc/scfuncs.hrc:2287
 msgctxt "SC_OPCODE_NORM_DIST_MS"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2293
+#: sc/inc/scfuncs.hrc:2293
 msgctxt "SC_OPCODE_NORM_INV"
 msgid "Values of the inverse normal distribution."
 msgstr "Gwerthoedd y dosbarthiad normal gwrthdro."
 
-#: scfuncs.hrc:2294
+#: sc/inc/scfuncs.hrc:2294
 msgctxt "SC_OPCODE_NORM_INV"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2295
+#: sc/inc/scfuncs.hrc:2295
 msgctxt "SC_OPCODE_NORM_INV"
 msgid "The probability value for which the inverse normal distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd y bydd y dosbarthiad normal gwrthdro yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2296
+#: sc/inc/scfuncs.hrc:2296
 msgctxt "SC_OPCODE_NORM_INV"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2297
+#: sc/inc/scfuncs.hrc:2297
 msgctxt "SC_OPCODE_NORM_INV"
 msgid "The mean value. The mean value of the normal distribution."
 msgstr "Gwerth cymedrig. Gwerth cymedrig y dosbarthiad normal."
 
-#: scfuncs.hrc:2298
+#: sc/inc/scfuncs.hrc:2298
 msgctxt "SC_OPCODE_NORM_INV"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2299
+#: sc/inc/scfuncs.hrc:2299
 msgctxt "SC_OPCODE_NORM_INV"
 msgid "Standard deviation. The standard deviation of the normal distribution."
 msgstr "Gwyriad safonol. Gwyriad safonol y dosbarthiad normal."
 
-#: scfuncs.hrc:2305
+#: sc/inc/scfuncs.hrc:2305
 msgctxt "SC_OPCODE_NORM_INV_MS"
 msgid "Values of the inverse normal distribution."
 msgstr "Gwerthoedd y dosbarthiad normal gwrthdro."
 
-#: scfuncs.hrc:2306
+#: sc/inc/scfuncs.hrc:2306
 msgctxt "SC_OPCODE_NORM_INV_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2307
+#: sc/inc/scfuncs.hrc:2307
 msgctxt "SC_OPCODE_NORM_INV_MS"
 msgid "The probability value for which the inverse normal distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd y bydd y dosbarthiad normal gwrthdro yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2308
+#: sc/inc/scfuncs.hrc:2308
 msgctxt "SC_OPCODE_NORM_INV_MS"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2309
+#: sc/inc/scfuncs.hrc:2309
 msgctxt "SC_OPCODE_NORM_INV_MS"
 msgid "The mean value. The mean value of the normal distribution."
 msgstr "Gwerth cymedrig. Gwerth cymedrig y dosbarthiad normal."
 
-#: scfuncs.hrc:2310
+#: sc/inc/scfuncs.hrc:2310
 msgctxt "SC_OPCODE_NORM_INV_MS"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2311
+#: sc/inc/scfuncs.hrc:2311
 msgctxt "SC_OPCODE_NORM_INV_MS"
 msgid "Standard deviation. The standard deviation of the normal distribution."
 msgstr "Gwyriad safonol. Gwyriad safonol y dosbarthiad normal."
 
-#: scfuncs.hrc:2317
+#: sc/inc/scfuncs.hrc:2317
 msgctxt "SC_OPCODE_STD_NORM_DIST"
 msgid "The values of the standard normal cumulative distribution."
 msgstr "Gwerthoedd y dosbarthiad cronnus normal safonol."
 
-#: scfuncs.hrc:2318
+#: sc/inc/scfuncs.hrc:2318
 msgctxt "SC_OPCODE_STD_NORM_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2319
+#: sc/inc/scfuncs.hrc:2319
 msgctxt "SC_OPCODE_STD_NORM_DIST"
 msgid "The value for which the standard normal distribution is to be calculated."
 msgstr "Gwerth y bydd dosbarthiad normal safonol yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2325
+#: sc/inc/scfuncs.hrc:2325
 msgctxt "SC_OPCODE_STD_NORM_DIST_MS"
 msgid "The values of the standard normal distribution."
 msgstr "Gwerthoedd y dosbarthiad normal safonol."
 
-#: scfuncs.hrc:2326
+#: sc/inc/scfuncs.hrc:2326
 msgctxt "SC_OPCODE_STD_NORM_DIST_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2327
+#: sc/inc/scfuncs.hrc:2327
 msgctxt "SC_OPCODE_STD_NORM_DIST_MS"
 msgid "The value for which the standard normal distribution is to be calculated."
 msgstr "Gwerth y bydd dosbarthiad normal safonol yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2328
+#: sc/inc/scfuncs.hrc:2328
 msgctxt "SC_OPCODE_STD_NORM_DIST_MS"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2329
+#: sc/inc/scfuncs.hrc:2329
 msgctxt "SC_OPCODE_STD_NORM_DIST_MS"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2335
+#: sc/inc/scfuncs.hrc:2335
 msgctxt "SC_OPCODE_S_NORM_INV"
 msgid "Values of the inverse standard normal distribution."
 msgstr "Gwerthoedd y dosbarthiad normal safonol gwrthdro."
 
-#: scfuncs.hrc:2336
+#: sc/inc/scfuncs.hrc:2336
 msgctxt "SC_OPCODE_S_NORM_INV"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2337
+#: sc/inc/scfuncs.hrc:2337
 msgctxt "SC_OPCODE_S_NORM_INV"
 msgid "The probability value for which the inverse standard normal distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd y bydd y dosbarthiad normal gwrthdro yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2343
+#: sc/inc/scfuncs.hrc:2343
 msgctxt "SC_OPCODE_S_NORM_INV_MS"
 msgid "Values of the inverse standard normal distribution."
 msgstr "Gwerthoedd y dosbarthiad normal safonol gwrthdro."
 
-#: scfuncs.hrc:2344
+#: sc/inc/scfuncs.hrc:2344
 msgctxt "SC_OPCODE_S_NORM_INV_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2345
+#: sc/inc/scfuncs.hrc:2345
 msgctxt "SC_OPCODE_S_NORM_INV_MS"
 msgid "The probability value for which the inverse standard normal distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd y bydd y dosbarthiad normal gwrthdro yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2351
+#: sc/inc/scfuncs.hrc:2351
 msgctxt "SC_OPCODE_LOG_NORM_DIST"
 msgid "Values of the log normal distribution."
 msgstr "Gwerthoedd o normal."
 
-#: scfuncs.hrc:2352
+#: sc/inc/scfuncs.hrc:2352
 msgctxt "SC_OPCODE_LOG_NORM_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2353
+#: sc/inc/scfuncs.hrc:2353
 msgctxt "SC_OPCODE_LOG_NORM_DIST"
 msgid "The value for which the log normal distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad log normal yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2354
+#: sc/inc/scfuncs.hrc:2354
 msgctxt "SC_OPCODE_LOG_NORM_DIST"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2355
+#: sc/inc/scfuncs.hrc:2355
 msgctxt "SC_OPCODE_LOG_NORM_DIST"
 msgid "The mean value of the log normal distribution. It is set to 0 if omitted."
 msgstr "Gwerth cymedrig cofnod dosbarthiad arferol. Mae wedi ei osod i 0 os wedi ei hepgor."
 
-#: scfuncs.hrc:2356
+#: sc/inc/scfuncs.hrc:2356
 msgctxt "SC_OPCODE_LOG_NORM_DIST"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2357
+#: sc/inc/scfuncs.hrc:2357
 msgctxt "SC_OPCODE_LOG_NORM_DIST"
 msgid "The standard deviation of the log normal distribution. It is set to 1 if omitted."
 msgstr "Gwyriad safonol y cofnod dosbarthiad normal. Mae wedi ei osod i 1 os wedi ei hepgor."
 
-#: scfuncs.hrc:2358
+#: sc/inc/scfuncs.hrc:2358
 msgctxt "SC_OPCODE_LOG_NORM_DIST"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2359
+#: sc/inc/scfuncs.hrc:2359
 msgctxt "SC_OPCODE_LOG_NORM_DIST"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2365
+#: sc/inc/scfuncs.hrc:2365
 msgctxt "SC_OPCODE_LOG_NORM_DIST_MS"
 msgid "Values of the log normal distribution."
 msgstr "Gwerthoedd o normal."
 
-#: scfuncs.hrc:2366
+#: sc/inc/scfuncs.hrc:2366
 msgctxt "SC_OPCODE_LOG_NORM_DIST_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2367
+#: sc/inc/scfuncs.hrc:2367
 msgctxt "SC_OPCODE_LOG_NORM_DIST_MS"
 msgid "The value for which the log normal distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad log normal yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2368
+#: sc/inc/scfuncs.hrc:2368
 msgctxt "SC_OPCODE_LOG_NORM_DIST_MS"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2369
+#: sc/inc/scfuncs.hrc:2369
 msgctxt "SC_OPCODE_LOG_NORM_DIST_MS"
 msgid "The mean value of the log normal distribution."
 msgstr "Gwerth cymedrig dosbarthiad normal cofnod."
 
-#: scfuncs.hrc:2370
+#: sc/inc/scfuncs.hrc:2370
 msgctxt "SC_OPCODE_LOG_NORM_DIST_MS"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2371
+#: sc/inc/scfuncs.hrc:2371
 msgctxt "SC_OPCODE_LOG_NORM_DIST_MS"
 msgid "The standard deviation of the log normal distribution."
 msgstr "Gwyriad safonol y dosbarthiad log normal."
 
-#: scfuncs.hrc:2372
+#: sc/inc/scfuncs.hrc:2372
 msgctxt "SC_OPCODE_LOG_NORM_DIST_MS"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2373
+#: sc/inc/scfuncs.hrc:2373
 msgctxt "SC_OPCODE_LOG_NORM_DIST_MS"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2379
+#: sc/inc/scfuncs.hrc:2379
 msgctxt "SC_OPCODE_LOG_INV"
 msgid "Values of the inverse of the lognormal distribution."
 msgstr "Gwerthoedd y gwrthdro dosbarthiad lognormal."
 
-#: scfuncs.hrc:2380
+#: sc/inc/scfuncs.hrc:2380
 msgctxt "SC_OPCODE_LOG_INV"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2381
+#: sc/inc/scfuncs.hrc:2381
 msgctxt "SC_OPCODE_LOG_INV"
 msgid "The probability value for which the inverse log normal distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd u bydd y dosbarthiad lognormal gwrthdro'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2382
+#: sc/inc/scfuncs.hrc:2382
 msgctxt "SC_OPCODE_LOG_INV"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2383
+#: sc/inc/scfuncs.hrc:2383
 msgctxt "SC_OPCODE_LOG_INV"
 msgid "Mean value. The mean value of the log normal distribution."
 msgstr "Cymedr gwerth. Gwerth cymedrig dosbarthiad normal cofnod."
 
-#: scfuncs.hrc:2384
+#: sc/inc/scfuncs.hrc:2384
 msgctxt "SC_OPCODE_LOG_INV"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2385
+#: sc/inc/scfuncs.hrc:2385
 msgctxt "SC_OPCODE_LOG_INV"
 msgid "Standard deviation. The standard deviation of the log normal distribution."
 msgstr "Gwyriad safonol. Gwyriad safonol y dosbarthiad log normal."
 
-#: scfuncs.hrc:2391
+#: sc/inc/scfuncs.hrc:2391
 msgctxt "SC_OPCODE_LOG_INV_MS"
 msgid "Values of the inverse of the lognormal distribution."
 msgstr "Gwerthoedd y gwrthdro dosbarthiad lognormal."
 
-#: scfuncs.hrc:2392
+#: sc/inc/scfuncs.hrc:2392
 msgctxt "SC_OPCODE_LOG_INV_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2393
+#: sc/inc/scfuncs.hrc:2393
 msgctxt "SC_OPCODE_LOG_INV_MS"
 msgid "The probability value for which the inverse log normal distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd u bydd y dosbarthiad lognormal gwrthdro'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2394
+#: sc/inc/scfuncs.hrc:2394
 msgctxt "SC_OPCODE_LOG_INV_MS"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2395
+#: sc/inc/scfuncs.hrc:2395
 msgctxt "SC_OPCODE_LOG_INV_MS"
 msgid "Mean value. The mean value of the log normal distribution."
 msgstr "Cymedr gwerth. Gwerth cymedrig dosbarthiad normal cofnod."
 
-#: scfuncs.hrc:2396
+#: sc/inc/scfuncs.hrc:2396
 msgctxt "SC_OPCODE_LOG_INV_MS"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2397
+#: sc/inc/scfuncs.hrc:2397
 msgctxt "SC_OPCODE_LOG_INV_MS"
 msgid "Standard deviation. The standard deviation of the log normal distribution."
 msgstr "Gwyriad safonol. Gwyriad safonol y dosbarthiad log normal."
 
-#: scfuncs.hrc:2403
+#: sc/inc/scfuncs.hrc:2403
 msgctxt "SC_OPCODE_EXP_DIST"
 msgid "Values of the exponential distribution."
 msgstr "Gwerthoedd y dosbarthiad esbonyddol."
 
-#: scfuncs.hrc:2404
+#: sc/inc/scfuncs.hrc:2404
 msgctxt "SC_OPCODE_EXP_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2405
+#: sc/inc/scfuncs.hrc:2405
 msgctxt "SC_OPCODE_EXP_DIST"
 msgid "The value to which the exponential distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad esbonyddol yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2406
+#: sc/inc/scfuncs.hrc:2406
 msgctxt "SC_OPCODE_EXP_DIST"
 msgid "Lambda"
 msgstr "Lambda"
 
-#: scfuncs.hrc:2407
+#: sc/inc/scfuncs.hrc:2407
 msgctxt "SC_OPCODE_EXP_DIST"
 msgid "The parameters of the exponential distribution."
 msgstr "Paramedrau'r dosbarthiad esbonyddol."
 
-#: scfuncs.hrc:2408
+#: sc/inc/scfuncs.hrc:2408
 msgctxt "SC_OPCODE_EXP_DIST"
 msgid "C"
 msgstr "C"
 
-#: scfuncs.hrc:2409
+#: sc/inc/scfuncs.hrc:2409
 msgctxt "SC_OPCODE_EXP_DIST"
 msgid "Cumulated. C=0 calculates the density function, C=1 the distribution."
 msgstr "Cronnus. C=0 cyfrifo'r swyddogaeth dwysiad, C=1 y dosbarthiad."
 
-#: scfuncs.hrc:2415
+#: sc/inc/scfuncs.hrc:2415
 msgctxt "SC_OPCODE_EXP_DIST_MS"
 msgid "Values of the exponential distribution."
 msgstr "Gwerthoedd y dosbarthiad esbonyddol."
 
-#: scfuncs.hrc:2416
+#: sc/inc/scfuncs.hrc:2416
 msgctxt "SC_OPCODE_EXP_DIST_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2417
+#: sc/inc/scfuncs.hrc:2417
 msgctxt "SC_OPCODE_EXP_DIST_MS"
 msgid "The value to which the exponential distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad esbonyddol yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2418
+#: sc/inc/scfuncs.hrc:2418
 msgctxt "SC_OPCODE_EXP_DIST_MS"
 msgid "Lambda"
 msgstr "Lambda"
 
-#: scfuncs.hrc:2419
+#: sc/inc/scfuncs.hrc:2419
 msgctxt "SC_OPCODE_EXP_DIST_MS"
 msgid "The parameters of the exponential distribution."
 msgstr "Paramedrau'r dosbarthiad esbonyddol."
 
-#: scfuncs.hrc:2420
+#: sc/inc/scfuncs.hrc:2420
 msgctxt "SC_OPCODE_EXP_DIST_MS"
 msgid "C"
 msgstr "C"
 
-#: scfuncs.hrc:2421
+#: sc/inc/scfuncs.hrc:2421
 msgctxt "SC_OPCODE_EXP_DIST_MS"
 msgid "Cumulated. C=0 calculates the density function, C=1 the distribution."
 msgstr "Cronnus. C=0 cyfrifo'r swyddogaeth dwysiad, C=1 y dosbarthiad."
 
-#: scfuncs.hrc:2427
+#: sc/inc/scfuncs.hrc:2427
 msgctxt "SC_OPCODE_GAMMA_DIST"
 msgid "Returns the value of the probability density function or the cumulative distribution function for the Gamma distribution."
 msgstr "Gwerthoedd y dosbarthiad gama."
 
-#: scfuncs.hrc:2428
+#: sc/inc/scfuncs.hrc:2428
 msgctxt "SC_OPCODE_GAMMA_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2429
+#: sc/inc/scfuncs.hrc:2429
 msgctxt "SC_OPCODE_GAMMA_DIST"
 msgid "The value for which the gamma distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad gama'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2430
+#: sc/inc/scfuncs.hrc:2430
 msgctxt "SC_OPCODE_GAMMA_DIST"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2431
+#: sc/inc/scfuncs.hrc:2431
 msgctxt "SC_OPCODE_GAMMA_DIST"
 msgid "The Alpha parameter of the Gamma distribution."
 msgstr "Paramedrau Alffa'r dosbarthiad Gama."
 
-#: scfuncs.hrc:2432
+#: sc/inc/scfuncs.hrc:2432
 msgctxt "SC_OPCODE_GAMMA_DIST"
 msgid "Beta"
 msgstr "Beta"
 
-#: scfuncs.hrc:2433
+#: sc/inc/scfuncs.hrc:2433
 msgctxt "SC_OPCODE_GAMMA_DIST"
 msgid "The Beta parameter of the Gamma distribution."
 msgstr "Paramedrau Beta'r dosbarthiad Gama."
 
-#: scfuncs.hrc:2434
+#: sc/inc/scfuncs.hrc:2434
 msgctxt "SC_OPCODE_GAMMA_DIST"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2435
+#: sc/inc/scfuncs.hrc:2435
 msgctxt "SC_OPCODE_GAMMA_DIST"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2441
+#: sc/inc/scfuncs.hrc:2441
 msgctxt "SC_OPCODE_GAMMA_DIST_MS"
 msgid "Returns the value of the probability density function or the cumulative distribution function for the Gamma distribution."
 msgstr "Dychwelyd gwerth y swyddogaeth dwysedd tebygol neu'r swyddogaeth dosbarthu cronnus ar gyfer dosbarthiad gama."
 
-#: scfuncs.hrc:2442
+#: sc/inc/scfuncs.hrc:2442
 msgctxt "SC_OPCODE_GAMMA_DIST_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2443
+#: sc/inc/scfuncs.hrc:2443
 msgctxt "SC_OPCODE_GAMMA_DIST_MS"
 msgid "The value for which the gamma distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad gama'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2444
+#: sc/inc/scfuncs.hrc:2444
 msgctxt "SC_OPCODE_GAMMA_DIST_MS"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2445
+#: sc/inc/scfuncs.hrc:2445
 msgctxt "SC_OPCODE_GAMMA_DIST_MS"
 msgid "The Alpha parameter of the Gamma distribution."
 msgstr "Paramedrau Alffa'r dosbarthiad Gama."
 
-#: scfuncs.hrc:2446
+#: sc/inc/scfuncs.hrc:2446
 msgctxt "SC_OPCODE_GAMMA_DIST_MS"
 msgid "Beta"
 msgstr "Beta"
 
-#: scfuncs.hrc:2447
+#: sc/inc/scfuncs.hrc:2447
 msgctxt "SC_OPCODE_GAMMA_DIST_MS"
 msgid "The Beta parameter of the Gamma distribution."
 msgstr "Paramedrau Beta'r dosbarthiad Gama."
 
-#: scfuncs.hrc:2448
+#: sc/inc/scfuncs.hrc:2448
 msgctxt "SC_OPCODE_GAMMA_DIST_MS"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2449
+#: sc/inc/scfuncs.hrc:2449
 msgctxt "SC_OPCODE_GAMMA_DIST_MS"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2455
+#: sc/inc/scfuncs.hrc:2455
 msgctxt "SC_OPCODE_GAMMA_INV"
 msgid "Values of the inverse gamma distribution."
 msgstr "Gwerthoedd dosbarthiad gama gwrthdroi."
 
-#: scfuncs.hrc:2456
+#: sc/inc/scfuncs.hrc:2456
 msgctxt "SC_OPCODE_GAMMA_INV"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2457
+#: sc/inc/scfuncs.hrc:2457
 msgctxt "SC_OPCODE_GAMMA_INV"
 msgid "The probability value for which the inverse gamma distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd y bydd y dosbarthiad gama gwrthdro'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2458
+#: sc/inc/scfuncs.hrc:2458
 msgctxt "SC_OPCODE_GAMMA_INV"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2459
+#: sc/inc/scfuncs.hrc:2459
 msgctxt "SC_OPCODE_GAMMA_INV"
 msgid "The Alpha (shape) parameter of the Gamma distribution."
 msgstr "Paramedrau (siâp) Alffa'r dosbarthiad Gama."
 
-#: scfuncs.hrc:2460
+#: sc/inc/scfuncs.hrc:2460
 msgctxt "SC_OPCODE_GAMMA_INV"
 msgid "Beta"
 msgstr "Beta"
 
-#: scfuncs.hrc:2461
+#: sc/inc/scfuncs.hrc:2461
 msgctxt "SC_OPCODE_GAMMA_INV"
 msgid "The Beta (scale) parameter of the Gamma distribution."
 msgstr "Paramedrau (graddfa) Beta'r dosbarthiad Gama."
 
-#: scfuncs.hrc:2467
+#: sc/inc/scfuncs.hrc:2467
 msgctxt "SC_OPCODE_GAMMA_INV_MS"
 msgid "Values of the inverse gamma distribution."
 msgstr "Gwerthoedd dosbarthiad gama gwrthdroi."
 
-#: scfuncs.hrc:2468
+#: sc/inc/scfuncs.hrc:2468
 msgctxt "SC_OPCODE_GAMMA_INV_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2469
+#: sc/inc/scfuncs.hrc:2469
 msgctxt "SC_OPCODE_GAMMA_INV_MS"
 msgid "The probability value for which the inverse gamma distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd y bydd y dosbarthiad gama gwrthdro'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2470
+#: sc/inc/scfuncs.hrc:2470
 msgctxt "SC_OPCODE_GAMMA_INV_MS"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2471
+#: sc/inc/scfuncs.hrc:2471
 msgctxt "SC_OPCODE_GAMMA_INV_MS"
 msgid "The Alpha (shape) parameter of the Gamma distribution."
 msgstr "Paramedrau (siâp) Alffa'r dosbarthiad Gama."
 
-#: scfuncs.hrc:2472
+#: sc/inc/scfuncs.hrc:2472
 msgctxt "SC_OPCODE_GAMMA_INV_MS"
 msgid "Beta"
 msgstr "Beta"
 
-#: scfuncs.hrc:2473
+#: sc/inc/scfuncs.hrc:2473
 msgctxt "SC_OPCODE_GAMMA_INV_MS"
 msgid "The Beta (scale) parameter of the Gamma distribution."
 msgstr "Paramedrau (graddfa) Beta'r dosbarthiad Gama."
 
-#: scfuncs.hrc:2479
+#: sc/inc/scfuncs.hrc:2479
 msgctxt "SC_OPCODE_GAMMA_LN"
 msgid "Returns the natural logarithm of the gamma function."
 msgstr "Dychwelyd logarithm naturiol swyddogaeth gama."
 
-#: scfuncs.hrc:2480
+#: sc/inc/scfuncs.hrc:2480
 msgctxt "SC_OPCODE_GAMMA_LN"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2481
+#: sc/inc/scfuncs.hrc:2481
 msgctxt "SC_OPCODE_GAMMA_LN"
 msgid "The value for which the natural logarithm of the gamma function is to be calculated."
 msgstr "Gwerth y bydd logarithm naturiol y swyddogaeth gama'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2487
+#: sc/inc/scfuncs.hrc:2487
 msgctxt "SC_OPCODE_GAMMA_LN_MS"
 msgid "Returns the natural logarithm of the gamma function."
 msgstr "Dychwelyd logarithm naturiol swyddogaeth gama."
 
-#: scfuncs.hrc:2488
+#: sc/inc/scfuncs.hrc:2488
 msgctxt "SC_OPCODE_GAMMA_LN_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2489
+#: sc/inc/scfuncs.hrc:2489
 msgctxt "SC_OPCODE_GAMMA_LN_MS"
 msgid "The value for which the natural logarithm of the gamma function is to be calculated."
 msgstr "Gwerth y bydd logarithm naturiol y swyddogaeth gama'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2496
+#: sc/inc/scfuncs.hrc:2496
 msgctxt "SC_OPCODE_GAMMA"
 msgid "Returns the value of the Gamma function."
 msgstr "Dychwelyd gwerth swyddogaeth Gamma."
 
-#: scfuncs.hrc:2497
+#: sc/inc/scfuncs.hrc:2497
 msgctxt "SC_OPCODE_GAMMA"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2498
+#: sc/inc/scfuncs.hrc:2498
 msgctxt "SC_OPCODE_GAMMA"
 msgid "The value for which the Gamma function is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad Gamma yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2505
+#: sc/inc/scfuncs.hrc:2505
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "Values of the beta distribution."
 msgstr "Gwerthoedd y dosbarthiad beta."
 
-#: scfuncs.hrc:2506
+#: sc/inc/scfuncs.hrc:2506
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2507
+#: sc/inc/scfuncs.hrc:2507
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "The value for which the beta distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad beta'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2508
+#: sc/inc/scfuncs.hrc:2508
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2509
+#: sc/inc/scfuncs.hrc:2509
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "The Alpha parameter of the Beta distribution."
 msgstr "Paramedrau Alffa'r dosbarthiad Beta."
 
-#: scfuncs.hrc:2510
+#: sc/inc/scfuncs.hrc:2510
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "Beta"
 msgstr "Beta"
 
-#: scfuncs.hrc:2511
+#: sc/inc/scfuncs.hrc:2511
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "The Beta parameter of the Beta distribution."
 msgstr "Paramedr Beta'r dosbarthiad Beta."
 
-#: scfuncs.hrc:2512
+#: sc/inc/scfuncs.hrc:2512
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: scfuncs.hrc:2513
+#: sc/inc/scfuncs.hrc:2513
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "The starting value for the value interval of the distribution."
 msgstr "Gwerth cychwynnol cyfwng gwerth y dosbarthiad."
 
-#: scfuncs.hrc:2514
+#: sc/inc/scfuncs.hrc:2514
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "End"
 msgstr "Diwedd"
 
-#: scfuncs.hrc:2515
+#: sc/inc/scfuncs.hrc:2515
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "The final value for the value interval of the distribution."
 msgstr "Gwerth terfynol cyfwng gwerth y dosbarthiad."
 
-#: scfuncs.hrc:2516
+#: sc/inc/scfuncs.hrc:2516
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2517
+#: sc/inc/scfuncs.hrc:2517
 msgctxt "SC_OPCODE_BETA_DIST"
 msgid "0 or FALSE for probability density function, any other value or TRUE or omitted for cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd, bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2523
+#: sc/inc/scfuncs.hrc:2523
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "Values of the inverse beta distribution."
 msgstr "Gwerthoedd y dosbarthiad beta gwrthdro."
 
-#: scfuncs.hrc:2524
+#: sc/inc/scfuncs.hrc:2524
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2525
+#: sc/inc/scfuncs.hrc:2525
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "The probability value for which the inverse beta distribution is to be calculated."
 msgstr "Tebygolrwydd gwerth y bydd y dosbarthiad beta'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2526
+#: sc/inc/scfuncs.hrc:2526
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2527
+#: sc/inc/scfuncs.hrc:2527
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "The Alpha parameter of the Beta distribution."
 msgstr "Paramedrau Alffa'r dosbarthiad Beta."
 
-#: scfuncs.hrc:2528
+#: sc/inc/scfuncs.hrc:2528
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "Beta"
 msgstr "Beta"
 
-#: scfuncs.hrc:2529
+#: sc/inc/scfuncs.hrc:2529
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "The Beta parameter of the Beta distribution."
 msgstr "Paramedr Beta'r dosbarthiad Beta."
 
-#: scfuncs.hrc:2530
+#: sc/inc/scfuncs.hrc:2530
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: scfuncs.hrc:2531
+#: sc/inc/scfuncs.hrc:2531
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "The starting value for the value interval of the distribution."
 msgstr "Gwerth cychwynnol cyfwng gwerth y dosbarthiad."
 
-#: scfuncs.hrc:2532
+#: sc/inc/scfuncs.hrc:2532
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "End"
 msgstr "Diwedd"
 
-#: scfuncs.hrc:2533
+#: sc/inc/scfuncs.hrc:2533
 msgctxt "SC_OPCODE_BETA_INV"
 msgid "The final value for the value interval of the distribution."
 msgstr "Gwerth terfynol cyfwng gwerth y dosbarthiad."
 
-#: scfuncs.hrc:2539
+#: sc/inc/scfuncs.hrc:2539
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "Values of the beta distribution."
 msgstr "Gwerthoedd y dosbarthiad beta gwrthdro."
 
-#: scfuncs.hrc:2540
+#: sc/inc/scfuncs.hrc:2540
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2541
+#: sc/inc/scfuncs.hrc:2541
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "The value for which the beta distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad beta'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2542
+#: sc/inc/scfuncs.hrc:2542
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2543
+#: sc/inc/scfuncs.hrc:2543
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "The Alpha parameter of the Beta distribution."
 msgstr "Paramedrau Alffa'r dosbarthiad Beta."
 
-#: scfuncs.hrc:2544
+#: sc/inc/scfuncs.hrc:2544
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "Beta"
 msgstr "Beta"
 
-#: scfuncs.hrc:2545
+#: sc/inc/scfuncs.hrc:2545
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "The Beta parameter of the Beta distribution."
 msgstr "Paramedr Beta'r dosbarthiad Beta."
 
-#: scfuncs.hrc:2546
+#: sc/inc/scfuncs.hrc:2546
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2547
+#: sc/inc/scfuncs.hrc:2547
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "0 or FALSE for probability density function, any other value or TRUE or omitted for cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd, bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2548
+#: sc/inc/scfuncs.hrc:2548
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: scfuncs.hrc:2549
+#: sc/inc/scfuncs.hrc:2549
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "The starting value for the value interval of the distribution."
 msgstr "Gwerth cychwynnol cyfwng gwerth y dosbarthiad."
 
-#: scfuncs.hrc:2550
+#: sc/inc/scfuncs.hrc:2550
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "End"
 msgstr "Diwedd"
 
-#: scfuncs.hrc:2551
+#: sc/inc/scfuncs.hrc:2551
 msgctxt "SC_OPCODE_BETA_DIST_MS"
 msgid "The final value for the value interval of the distribution."
 msgstr "Gwerth terfynol cyfwng gwerth y dosbarthiad."
 
-#: scfuncs.hrc:2557
+#: sc/inc/scfuncs.hrc:2557
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "Values of the inverse beta distribution."
 msgstr "Gwerthoedd y dosbarthiad beta gwrthdro."
 
-#: scfuncs.hrc:2558
+#: sc/inc/scfuncs.hrc:2558
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2559
+#: sc/inc/scfuncs.hrc:2559
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "The probability value for which the inverse beta distribution is to be calculated."
 msgstr "Tebygolrwydd gwerth y bydd y dosbarthiad beta'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2560
+#: sc/inc/scfuncs.hrc:2560
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2561
+#: sc/inc/scfuncs.hrc:2561
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "The Alpha parameter of the Beta distribution."
 msgstr "Paramedrau Alffa'r dosbarthiad Beta."
 
-#: scfuncs.hrc:2562
+#: sc/inc/scfuncs.hrc:2562
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "Beta"
 msgstr "Beta"
 
-#: scfuncs.hrc:2563
+#: sc/inc/scfuncs.hrc:2563
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "The Beta parameter of the Beta distribution."
 msgstr "Paramedr Beta'r dosbarthiad Beta."
 
-#: scfuncs.hrc:2564
+#: sc/inc/scfuncs.hrc:2564
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: scfuncs.hrc:2565
+#: sc/inc/scfuncs.hrc:2565
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "The starting value for the value interval of the distribution."
 msgstr "Gwerth cychwynnol cyfwng gwerth y dosbarthiad."
 
-#: scfuncs.hrc:2566
+#: sc/inc/scfuncs.hrc:2566
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "End"
 msgstr "Diwedd"
 
-#: scfuncs.hrc:2567
+#: sc/inc/scfuncs.hrc:2567
 msgctxt "SC_OPCODE_BETA_INV_MS"
 msgid "The final value for the value interval of the distribution."
 msgstr "Gwerth terfynol cyfwng gwerth y dosbarthiad."
 
-#: scfuncs.hrc:2573
+#: sc/inc/scfuncs.hrc:2573
 msgctxt "SC_OPCODE_WEIBULL"
 msgid "Returns the values of the Weibull distribution."
 msgstr "Dychwelyd gwerthoedd dosbarthiad Weibull."
 
-#: scfuncs.hrc:2574
+#: sc/inc/scfuncs.hrc:2574
 msgctxt "SC_OPCODE_WEIBULL"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2575
+#: sc/inc/scfuncs.hrc:2575
 msgctxt "SC_OPCODE_WEIBULL"
 msgid "The value for which the Weibull distribution is to be calculated."
 msgstr "Gwerth y bydd dosbarthiad Weibull yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2576
+#: sc/inc/scfuncs.hrc:2576
 msgctxt "SC_OPCODE_WEIBULL"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2577
+#: sc/inc/scfuncs.hrc:2577
 msgctxt "SC_OPCODE_WEIBULL"
 msgid "The Alpha parameter of the Weibull distribution."
 msgstr "Paramedr Alffa'r dosbarthiad Welbull."
 
-#: scfuncs.hrc:2578
+#: sc/inc/scfuncs.hrc:2578
 msgctxt "SC_OPCODE_WEIBULL"
 msgid "Beta"
 msgstr "Beta"
 
-#: scfuncs.hrc:2579
+#: sc/inc/scfuncs.hrc:2579
 msgctxt "SC_OPCODE_WEIBULL"
 msgid "The Beta parameter of the Weibull distribution."
 msgstr "Paramedr Beta'r dosbarthiad Weibull."
 
-#: scfuncs.hrc:2580
+#: sc/inc/scfuncs.hrc:2580
 msgctxt "SC_OPCODE_WEIBULL"
 msgid "C"
 msgstr "C"
 
-#: scfuncs.hrc:2581
+#: sc/inc/scfuncs.hrc:2581
 msgctxt "SC_OPCODE_WEIBULL"
 msgid "Cumulated. C=0 calculates the density function, C=1 the distribution."
 msgstr "Cronnus. C=0 cyfrifo'r swyddogaeth dwysiad, C=1 y dosbarthiad."
 
-#: scfuncs.hrc:2587
+#: sc/inc/scfuncs.hrc:2587
 msgctxt "SC_OPCODE_WEIBULL_MS"
 msgid "Returns the values of the Weibull distribution."
 msgstr "Dychwelyd gwerthoedd dosbarthiad Weibull."
 
-#: scfuncs.hrc:2588
+#: sc/inc/scfuncs.hrc:2588
 msgctxt "SC_OPCODE_WEIBULL_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2589
+#: sc/inc/scfuncs.hrc:2589
 msgctxt "SC_OPCODE_WEIBULL_MS"
 msgid "The value for which the Weibull distribution is to be calculated."
 msgstr "Gwerth y bydd dosbarthiad Weibull yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2590
+#: sc/inc/scfuncs.hrc:2590
 msgctxt "SC_OPCODE_WEIBULL_MS"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2591
+#: sc/inc/scfuncs.hrc:2591
 msgctxt "SC_OPCODE_WEIBULL_MS"
 msgid "The Alpha parameter of the Weibull distribution."
 msgstr "Paramedr Alffa'r dosbarthiad Welbull."
 
-#: scfuncs.hrc:2592
+#: sc/inc/scfuncs.hrc:2592
 msgctxt "SC_OPCODE_WEIBULL_MS"
 msgid "Beta"
 msgstr "Beta"
 
-#: scfuncs.hrc:2593
+#: sc/inc/scfuncs.hrc:2593
 msgctxt "SC_OPCODE_WEIBULL_MS"
 msgid "The Beta parameter of the Weibull distribution."
 msgstr "Paramedr Beta'r dosbarthiad Weibull."
 
-#: scfuncs.hrc:2594
+#: sc/inc/scfuncs.hrc:2594
 msgctxt "SC_OPCODE_WEIBULL_MS"
 msgid "C"
 msgstr "C"
 
-#: scfuncs.hrc:2595
+#: sc/inc/scfuncs.hrc:2595
 msgctxt "SC_OPCODE_WEIBULL_MS"
 msgid "Cumulated. C=0 calculates the density function, C=1 the distribution."
 msgstr "Cronnus. C=0 cyfrifo'r swyddogaeth dwysiad, C=1 y dosbarthiad."
 
-#: scfuncs.hrc:2601
+#: sc/inc/scfuncs.hrc:2601
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "Values of the hypergeometric distribution."
 msgstr "Gwerthoedd y dosbarthiad hypergeometrig."
 
-#: scfuncs.hrc:2602
+#: sc/inc/scfuncs.hrc:2602
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "X"
 msgstr "X"
 
-#: scfuncs.hrc:2603
+#: sc/inc/scfuncs.hrc:2603
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "The number of successes in the sample."
 msgstr "Nifer y llwyddiannau yn y boblogaeth."
 
-#: scfuncs.hrc:2604
+#: sc/inc/scfuncs.hrc:2604
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "N sample"
 msgstr "Sampl N"
 
-#: scfuncs.hrc:2605
+#: sc/inc/scfuncs.hrc:2605
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "The size of the sample."
 msgstr "Maint y sampl."
 
-#: scfuncs.hrc:2606
+#: sc/inc/scfuncs.hrc:2606
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "Successes"
 msgstr "Llwyddiannau"
 
-#: scfuncs.hrc:2607
+#: sc/inc/scfuncs.hrc:2607
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "The number of successes in the population."
 msgstr "Nifer y llwyddiannau yn y boblogaeth."
 
-#: scfuncs.hrc:2608
+#: sc/inc/scfuncs.hrc:2608
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "N population"
 msgstr "Poblogaeth N"
 
-#: scfuncs.hrc:2609
+#: sc/inc/scfuncs.hrc:2609
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "The population size."
 msgstr "Maint poblogaeth."
 
-#: scfuncs.hrc:2610
+#: sc/inc/scfuncs.hrc:2610
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2611
+#: sc/inc/scfuncs.hrc:2611
 msgctxt "SC_OPCODE_HYP_GEOM_DIST"
 msgid "Cumulated. TRUE calculates the cumulative distribution function, FALSE the probability mass function."
 msgstr "Cronnus. Mae TRUE yn cyfrifo'r swyddogaeth dosbarthu cronnus, FALSE y swyddogaeth mas tebygolrwydd."
 
-#: scfuncs.hrc:2617
+#: sc/inc/scfuncs.hrc:2617
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "Values of the hypergeometric distribution."
 msgstr "Gwerthoedd y dosbarthiad hypergeometrig."
 
-#: scfuncs.hrc:2618
+#: sc/inc/scfuncs.hrc:2618
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "X"
 msgstr "X"
 
-#: scfuncs.hrc:2619
+#: sc/inc/scfuncs.hrc:2619
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "The number of successes in the sample."
 msgstr "Nifer y llwyddiannau yn y boblogaeth."
 
-#: scfuncs.hrc:2620
+#: sc/inc/scfuncs.hrc:2620
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "N sample"
 msgstr "Sampl N"
 
-#: scfuncs.hrc:2621
+#: sc/inc/scfuncs.hrc:2621
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "The size of the sample."
 msgstr "Maint y sampl."
 
-#: scfuncs.hrc:2622
+#: sc/inc/scfuncs.hrc:2622
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "Successes"
 msgstr "Llwyddiannau"
 
-#: scfuncs.hrc:2623
+#: sc/inc/scfuncs.hrc:2623
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "The number of successes in the population."
 msgstr "Nifer y llwyddiannau yn y boblogaeth."
 
-#: scfuncs.hrc:2624
+#: sc/inc/scfuncs.hrc:2624
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "N population"
 msgstr "Poblogaeth N"
 
-#: scfuncs.hrc:2625
+#: sc/inc/scfuncs.hrc:2625
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "The population size."
 msgstr "Maint poblogaeth."
 
-#: scfuncs.hrc:2626
+#: sc/inc/scfuncs.hrc:2626
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2627
+#: sc/inc/scfuncs.hrc:2627
 msgctxt "SC_OPCODE_HYP_GEOM_DIST_MS"
 msgid "Cumulated. TRUE calculates the cumulative distribution function, FALSE the probability mass function."
 msgstr "Cronnus. Mae TRUE yn cyfrifo'r swyddogaeth dosbarthu cronnus, FALSE y swyddogaeth mas tebygolrwydd."
 
-#: scfuncs.hrc:2633
+#: sc/inc/scfuncs.hrc:2633
 msgctxt "SC_OPCODE_T_DIST"
 msgid "Returns the t-distribution."
 msgstr "Dychwelyd y t-distribution."
 
-#: scfuncs.hrc:2634
+#: sc/inc/scfuncs.hrc:2634
 msgctxt "SC_OPCODE_T_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2635
+#: sc/inc/scfuncs.hrc:2635
 msgctxt "SC_OPCODE_T_DIST"
 msgid "The value for which the T distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad T yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2636
+#: sc/inc/scfuncs.hrc:2636
 msgctxt "SC_OPCODE_T_DIST"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2637
+#: sc/inc/scfuncs.hrc:2637
 msgctxt "SC_OPCODE_T_DIST"
 msgid "The degrees of freedom of the T distribution."
 msgstr "Graddau o ryddid y dosbarthiad T."
 
-#: scfuncs.hrc:2638
+#: sc/inc/scfuncs.hrc:2638
 msgctxt "SC_OPCODE_T_DIST"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:2639
+#: sc/inc/scfuncs.hrc:2639
 msgctxt "SC_OPCODE_T_DIST"
 msgid "Mode = 1 calculates the one-tailed test, 2 = two-tailed distribution."
 msgstr "Modd =1 cyfrifo'r prawf un gynffon, 2 = dosbarthiad dwy gynffon."
 
-#: scfuncs.hrc:2645
+#: sc/inc/scfuncs.hrc:2645
 msgctxt "SC_OPCODE_T_DIST_2T"
 msgid "Returns the two-tailed t-distribution."
 msgstr "Dychwelyd t-distribution dwy gynffon."
 
-#: scfuncs.hrc:2646
+#: sc/inc/scfuncs.hrc:2646
 msgctxt "SC_OPCODE_T_DIST_2T"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2647
+#: sc/inc/scfuncs.hrc:2647
 msgctxt "SC_OPCODE_T_DIST_2T"
 msgid "The value for which the T distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad T yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2648
+#: sc/inc/scfuncs.hrc:2648
 msgctxt "SC_OPCODE_T_DIST_2T"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2649
+#: sc/inc/scfuncs.hrc:2649
 msgctxt "SC_OPCODE_T_DIST_2T"
 msgid "The degrees of freedom of the T distribution."
 msgstr "Graddau o ryddid y dosbarthiad T."
 
-#: scfuncs.hrc:2655
+#: sc/inc/scfuncs.hrc:2655
 msgctxt "SC_OPCODE_T_DIST_MS"
 msgid "Returns the t-distribution."
 msgstr "Dychwelyd y t-distribution."
 
-#: scfuncs.hrc:2656
+#: sc/inc/scfuncs.hrc:2656
 msgctxt "SC_OPCODE_T_DIST_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2657
+#: sc/inc/scfuncs.hrc:2657
 msgctxt "SC_OPCODE_T_DIST_MS"
 msgid "The value for which the T distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad T yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2658
+#: sc/inc/scfuncs.hrc:2658
 msgctxt "SC_OPCODE_T_DIST_MS"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2659
+#: sc/inc/scfuncs.hrc:2659
 msgctxt "SC_OPCODE_T_DIST_MS"
 msgid "The degrees of freedom of the T distribution."
 msgstr "Graddau o ryddid y dosbarthiad T."
 
-#: scfuncs.hrc:2660
+#: sc/inc/scfuncs.hrc:2660
 msgctxt "SC_OPCODE_T_DIST_MS"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2661
+#: sc/inc/scfuncs.hrc:2661
 msgctxt "SC_OPCODE_T_DIST_MS"
 msgid "True calculates the cumulative distribution function, false the probability density function."
 msgstr "Mae TRUE yn cyfrifo'r swyddogaeth dosbarthu cronnus, FALSE y swyddogaeth dwysedd tebygolrwydd."
 
-#: scfuncs.hrc:2667
+#: sc/inc/scfuncs.hrc:2667
 msgctxt "SC_OPCODE_T_DIST_RT"
 msgid "Returns the right-tailed t-distribution."
 msgstr "Dychwelyd y t-distribution."
 
-#: scfuncs.hrc:2668
+#: sc/inc/scfuncs.hrc:2668
 msgctxt "SC_OPCODE_T_DIST_RT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2669
+#: sc/inc/scfuncs.hrc:2669
 msgctxt "SC_OPCODE_T_DIST_RT"
 msgid "The value for which the T distribution is to be calculated."
 msgstr "Gwerth y bydd y dosbarthiad T yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2670
+#: sc/inc/scfuncs.hrc:2670
 msgctxt "SC_OPCODE_T_DIST_RT"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2671
+#: sc/inc/scfuncs.hrc:2671
 msgctxt "SC_OPCODE_T_DIST_RT"
 msgid "The degrees of freedom of the T distribution."
 msgstr "Graddau o ryddid y dosbarthiad T."
 
-#: scfuncs.hrc:2677
+#: sc/inc/scfuncs.hrc:2677
 msgctxt "SC_OPCODE_T_INV"
 msgid "Values of the inverse t-distribution."
 msgstr "Gwerthoedd gwrthdroi t-distribution."
 
-#: scfuncs.hrc:2678
+#: sc/inc/scfuncs.hrc:2678
 msgctxt "SC_OPCODE_T_INV"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2679
+#: sc/inc/scfuncs.hrc:2679
 msgctxt "SC_OPCODE_T_INV"
 msgid "The probability value for which the inverse T distribution is to be calculated."
 msgstr "Tebygolrwydd gwerth y bydd dosbarthiad T gwrthdro'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2680
+#: sc/inc/scfuncs.hrc:2680
 msgctxt "SC_OPCODE_T_INV"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2681
+#: sc/inc/scfuncs.hrc:2681
 msgctxt "SC_OPCODE_T_INV"
 msgid "The degrees of freedom of the T distribution."
 msgstr "Graddau o ryddid y dosbarthiad T."
 
-#: scfuncs.hrc:2687
+#: sc/inc/scfuncs.hrc:2687
 msgctxt "SC_OPCODE_T_INV_MS"
 msgid "Values of the left-tailed inverse t-distribution."
 msgstr "Gwerthoedd gwrthdroi t-distribution."
 
-#: scfuncs.hrc:2688
+#: sc/inc/scfuncs.hrc:2688
 msgctxt "SC_OPCODE_T_INV_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2689
+#: sc/inc/scfuncs.hrc:2689
 msgctxt "SC_OPCODE_T_INV_MS"
 msgid "The probability value for which the inverse T distribution is to be calculated."
 msgstr "Tebygolrwydd gwerth y bydd dosbarthiad T gwrthdro'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2690
+#: sc/inc/scfuncs.hrc:2690
 msgctxt "SC_OPCODE_T_INV_MS"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2691
+#: sc/inc/scfuncs.hrc:2691
 msgctxt "SC_OPCODE_T_INV_MS"
 msgid "The degrees of freedom of the T distribution."
 msgstr "Graddau o ryddid y dosbarthiad T."
 
-#: scfuncs.hrc:2697
+#: sc/inc/scfuncs.hrc:2697
 msgctxt "SC_OPCODE_T_INV_2T"
 msgid "Values of the two-tailed inverse t-distribution."
 msgstr "Gwerthoedd gwrthdroi t-distribution."
 
-#: scfuncs.hrc:2698
+#: sc/inc/scfuncs.hrc:2698
 msgctxt "SC_OPCODE_T_INV_2T"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2699
+#: sc/inc/scfuncs.hrc:2699
 msgctxt "SC_OPCODE_T_INV_2T"
 msgid "The probability value for which the inverse T distribution is to be calculated."
 msgstr "Tebygolrwydd gwerth y bydd dosbarthiad T gwrthdro'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2700
+#: sc/inc/scfuncs.hrc:2700
 msgctxt "SC_OPCODE_T_INV_2T"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2701
+#: sc/inc/scfuncs.hrc:2701
 msgctxt "SC_OPCODE_T_INV_2T"
 msgid "The degrees of freedom of the T distribution."
 msgstr "Graddau o ryddid y dosbarthiad T."
 
-#: scfuncs.hrc:2707
+#: sc/inc/scfuncs.hrc:2707
 msgctxt "SC_OPCODE_F_DIST"
 msgid "Values of the F probability distribution."
 msgstr "Gwerthoedd dosbarthiad tebygolrwydd F."
 
-#: scfuncs.hrc:2708
+#: sc/inc/scfuncs.hrc:2708
 msgctxt "SC_OPCODE_F_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2709
+#: sc/inc/scfuncs.hrc:2709
 msgctxt "SC_OPCODE_F_DIST"
 msgid "The value for which the F distribution is to be calculated."
 msgstr "Gwerth y bydd dosbarthiad F yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2710
+#: sc/inc/scfuncs.hrc:2710
 msgctxt "SC_OPCODE_F_DIST"
 msgid "Degrees freedom 1"
 msgstr "Graddau rhyddid 1"
 
-#: scfuncs.hrc:2711
+#: sc/inc/scfuncs.hrc:2711
 msgctxt "SC_OPCODE_F_DIST"
 msgid "The degrees of freedom in the numerator of the F distribution."
 msgstr "Graddau o ryddid yn enwadur dosbarthiad F."
 
-#: scfuncs.hrc:2712
+#: sc/inc/scfuncs.hrc:2712
 msgctxt "SC_OPCODE_F_DIST"
 msgid "Degrees freedom 2"
 msgstr "Graddau rhyddid 2"
 
-#: scfuncs.hrc:2713
+#: sc/inc/scfuncs.hrc:2713
 msgctxt "SC_OPCODE_F_DIST"
 msgid "The degrees of freedom in the denominator of the F distribution."
 msgstr "Graddau o ryddid y dosbarthiad T."
 
-#: scfuncs.hrc:2719
+#: sc/inc/scfuncs.hrc:2719
 msgctxt "SC_OPCODE_F_DIST_LT"
 msgid "Values of the left tail F probability distribution."
 msgstr "Gwerthoedd y dosbarthiad tebygolrwydd F cynffon chwith."
 
-#: scfuncs.hrc:2720
+#: sc/inc/scfuncs.hrc:2720
 msgctxt "SC_OPCODE_F_DIST_LT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2721
+#: sc/inc/scfuncs.hrc:2721
 msgctxt "SC_OPCODE_F_DIST_LT"
 msgid "The value for which the F distribution is to be calculated."
 msgstr "Gwerth y bydd dosbarthiad F yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2722
+#: sc/inc/scfuncs.hrc:2722
 msgctxt "SC_OPCODE_F_DIST_LT"
 msgid "Degrees freedom 1"
 msgstr "Graddau rhyddid 1"
 
-#: scfuncs.hrc:2723
+#: sc/inc/scfuncs.hrc:2723
 msgctxt "SC_OPCODE_F_DIST_LT"
 msgid "The degrees of freedom in the numerator of the F distribution."
 msgstr "Graddau o ryddid yn enwadur dosbarthiad F."
 
-#: scfuncs.hrc:2724
+#: sc/inc/scfuncs.hrc:2724
 msgctxt "SC_OPCODE_F_DIST_LT"
 msgid "Degrees freedom 2"
 msgstr "Graddau rhyddid 2"
 
-#: scfuncs.hrc:2725
+#: sc/inc/scfuncs.hrc:2725
 msgctxt "SC_OPCODE_F_DIST_LT"
 msgid "The degrees of freedom in the denominator of the F distribution."
 msgstr "Graddau o ryddid yn rhifiadur y dosbarthiad T."
 
-#: scfuncs.hrc:2726
+#: sc/inc/scfuncs.hrc:2726
 msgctxt "SC_OPCODE_F_DIST_LT"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2727
+#: sc/inc/scfuncs.hrc:2727
 msgctxt "SC_OPCODE_F_DIST_LT"
 msgid "Cumulative distribution function (TRUE) or probability density function (FALSE)."
 msgstr "Swyddogaeth dosbarthu cronnus (TRUE) neu swyddogaeth dwysedd tebygolrwydd (FALSE)."
 
-#: scfuncs.hrc:2733
+#: sc/inc/scfuncs.hrc:2733
 msgctxt "SC_OPCODE_F_DIST_RT"
 msgid "Values of the right tail F probability distribution."
 msgstr "Gwerthoedd dosbarthiad tebygolrwydd F dwy gynffon."
 
-#: scfuncs.hrc:2734
+#: sc/inc/scfuncs.hrc:2734
 msgctxt "SC_OPCODE_F_DIST_RT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2735
+#: sc/inc/scfuncs.hrc:2735
 msgctxt "SC_OPCODE_F_DIST_RT"
 msgid "The value for which the F distribution is to be calculated."
 msgstr "Gwerth y bydd dosbarthiad F yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2736
+#: sc/inc/scfuncs.hrc:2736
 msgctxt "SC_OPCODE_F_DIST_RT"
 msgid "Degrees freedom 1"
 msgstr "Graddau rhyddid 1"
 
-#: scfuncs.hrc:2737
+#: sc/inc/scfuncs.hrc:2737
 msgctxt "SC_OPCODE_F_DIST_RT"
 msgid "The degrees of freedom in the numerator of the F distribution."
 msgstr "Graddau o ryddid yn enwadur dosbarthiad F."
 
-#: scfuncs.hrc:2738
+#: sc/inc/scfuncs.hrc:2738
 msgctxt "SC_OPCODE_F_DIST_RT"
 msgid "Degrees freedom 2"
 msgstr "Graddau rhyddid 2"
 
-#: scfuncs.hrc:2739
+#: sc/inc/scfuncs.hrc:2739
 msgctxt "SC_OPCODE_F_DIST_RT"
 msgid "The degrees of freedom in the denominator of the F distribution."
 msgstr "Graddau o ryddid n rhifiadur y dosbarthiad F."
 
-#: scfuncs.hrc:2745
+#: sc/inc/scfuncs.hrc:2745
 msgctxt "SC_OPCODE_F_INV"
 msgid "Values of the inverse F distribution."
 msgstr "Gwerthoedd gwrthdro dosbarthiad F."
 
-#: scfuncs.hrc:2746
+#: sc/inc/scfuncs.hrc:2746
 msgctxt "SC_OPCODE_F_INV"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2747
+#: sc/inc/scfuncs.hrc:2747
 msgctxt "SC_OPCODE_F_INV"
 msgid "The probability value for which the inverse F distribution is to be calculated."
 msgstr "Tebygolrwydd gwerth y bydd dosbarthiad F gwrthdro'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2748
+#: sc/inc/scfuncs.hrc:2748
 msgctxt "SC_OPCODE_F_INV"
 msgid "Degrees freedom 1"
 msgstr "Graddau rhyddid 1"
 
-#: scfuncs.hrc:2749
+#: sc/inc/scfuncs.hrc:2749
 msgctxt "SC_OPCODE_F_INV"
 msgid "The degrees of freedom in the numerator of the F distribution."
 msgstr "Graddau o ryddid yn enwadur dosbarthiad F."
 
-#: scfuncs.hrc:2750
+#: sc/inc/scfuncs.hrc:2750
 msgctxt "SC_OPCODE_F_INV"
 msgid "Degrees freedom 2"
 msgstr "Graddau rhyddid 2"
 
-#: scfuncs.hrc:2751
+#: sc/inc/scfuncs.hrc:2751
 msgctxt "SC_OPCODE_F_INV"
 msgid "The degrees of freedom in the denominator of the F distribution."
 msgstr "Graddau o ryddid y dosbarthiad T."
 
-#: scfuncs.hrc:2757
+#: sc/inc/scfuncs.hrc:2757
 msgctxt "SC_OPCODE_F_INV_LT"
 msgid "Values of the inverse left tail F distribution."
 msgstr "Gwerthoedd gwrthdro dosbarthiad F cynffon chwith."
 
-#: scfuncs.hrc:2758
+#: sc/inc/scfuncs.hrc:2758
 msgctxt "SC_OPCODE_F_INV_LT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2759
+#: sc/inc/scfuncs.hrc:2759
 msgctxt "SC_OPCODE_F_INV_LT"
 msgid "The probability value for which the inverse F distribution is to be calculated."
 msgstr "Tebygolrwydd gwerth y bydd dosbarthiad F gwrthdro'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2760
+#: sc/inc/scfuncs.hrc:2760
 msgctxt "SC_OPCODE_F_INV_LT"
 msgid "Degrees freedom 1"
 msgstr "Graddau rhyddid 1"
 
-#: scfuncs.hrc:2761
+#: sc/inc/scfuncs.hrc:2761
 msgctxt "SC_OPCODE_F_INV_LT"
 msgid "The degrees of freedom in the numerator of the F distribution."
 msgstr "Graddau o ryddid yn enwadur y dosbarthiad F."
 
-#: scfuncs.hrc:2762
+#: sc/inc/scfuncs.hrc:2762
 msgctxt "SC_OPCODE_F_INV_LT"
 msgid "Degrees freedom 2"
 msgstr "Graddau rhyddid 2"
 
-#: scfuncs.hrc:2763
+#: sc/inc/scfuncs.hrc:2763
 msgctxt "SC_OPCODE_F_INV_LT"
 msgid "The degrees of freedom in the denominator of the F distribution."
 msgstr "Graddau o ryddid yn rhifiadur y dosbarthiad F."
 
-#: scfuncs.hrc:2769
+#: sc/inc/scfuncs.hrc:2769
 msgctxt "SC_OPCODE_F_INV_RT"
 msgid "Values of the inverse right tail F distribution."
 msgstr "Gwerthoedd gwrthdro dosbarthiad F cynffon de."
 
-#: scfuncs.hrc:2770
+#: sc/inc/scfuncs.hrc:2770
 msgctxt "SC_OPCODE_F_INV_RT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2771
+#: sc/inc/scfuncs.hrc:2771
 msgctxt "SC_OPCODE_F_INV_RT"
 msgid "The probability value for which the inverse F distribution is to be calculated."
 msgstr "Tebygolrwydd gwerth y bydd dosbarthiad F gwrthdro'n cael ei gyfrifo."
 
-#: scfuncs.hrc:2772
+#: sc/inc/scfuncs.hrc:2772
 msgctxt "SC_OPCODE_F_INV_RT"
 msgid "Degrees freedom 1"
 msgstr "Graddau rhyddid 1"
 
-#: scfuncs.hrc:2773
+#: sc/inc/scfuncs.hrc:2773
 msgctxt "SC_OPCODE_F_INV_RT"
 msgid "The degrees of freedom in the numerator of the F distribution."
 msgstr "Graddau o ryddid yn enwadur dosbarthiad F."
 
-#: scfuncs.hrc:2774
+#: sc/inc/scfuncs.hrc:2774
 msgctxt "SC_OPCODE_F_INV_RT"
 msgid "Degrees freedom 2"
 msgstr "Graddau rhyddid 2"
 
-#: scfuncs.hrc:2775
+#: sc/inc/scfuncs.hrc:2775
 msgctxt "SC_OPCODE_F_INV_RT"
 msgid "The degrees of freedom in the denominator of the F distribution."
 msgstr "Graddau o ryddid yn rhifiadur y dosbarthiad F."
 
-#: scfuncs.hrc:2781
+#: sc/inc/scfuncs.hrc:2781
 msgctxt "SC_OPCODE_CHI_DIST"
 msgid "Returns the right-tail probability of the chi-square distribution."
 msgstr "Dychwelyd tebygolrwydd."
 
-#: scfuncs.hrc:2782
+#: sc/inc/scfuncs.hrc:2782
 msgctxt "SC_OPCODE_CHI_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2783
+#: sc/inc/scfuncs.hrc:2783
 msgctxt "SC_OPCODE_CHI_DIST"
 msgid "The value for which the chi square distribution is to be calculated."
 msgstr "Gwerth y bydd dosbarthiad chi sgwâr yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2784
+#: sc/inc/scfuncs.hrc:2784
 msgctxt "SC_OPCODE_CHI_DIST"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2785
+#: sc/inc/scfuncs.hrc:2785
 msgctxt "SC_OPCODE_CHI_DIST"
 msgid "The degrees of freedom of the chi square distribution."
 msgstr "Graddau o ryddid dosbarthiad chi square."
 
-#: scfuncs.hrc:2791
+#: sc/inc/scfuncs.hrc:2791
 msgctxt "SC_OPCODE_CHI_DIST_MS"
 msgid "Returns the right-tail probability of the chi-square distribution."
 msgstr "Dychwelyd tebygolrwydd.cynffon de dosbarthiad chi-square."
 
-#: scfuncs.hrc:2792
+#: sc/inc/scfuncs.hrc:2792
 msgctxt "SC_OPCODE_CHI_DIST_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2793
+#: sc/inc/scfuncs.hrc:2793
 msgctxt "SC_OPCODE_CHI_DIST_MS"
 msgid "The value for which the chi square distribution is to be calculated."
 msgstr "Gwerth y bydd dosbarthiad chi sgwâr yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2794
+#: sc/inc/scfuncs.hrc:2794
 msgctxt "SC_OPCODE_CHI_DIST_MS"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2795
+#: sc/inc/scfuncs.hrc:2795
 msgctxt "SC_OPCODE_CHI_DIST_MS"
 msgid "The degrees of freedom of the chi square distribution."
 msgstr "Graddau o ryddid dosbarthiad chi square."
 
-#: scfuncs.hrc:2802
+#: sc/inc/scfuncs.hrc:2802
 msgctxt "SC_OPCODE_CHISQ_DIST"
 msgid "Returns left-tail probability of the cumulative distribution function or values of the probability density function of the chi-square distribution."
 msgstr "Dychwelyd-tebygolrwydd cynffon chwith y ffwythiant dosbarthiad cronnus neu werthoedd y ffwythiant dwysedd tebygolrwydd y chi-sgwâr."
 
-#: scfuncs.hrc:2803
+#: sc/inc/scfuncs.hrc:2803
 msgctxt "SC_OPCODE_CHISQ_DIST"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2804
+#: sc/inc/scfuncs.hrc:2804
 msgctxt "SC_OPCODE_CHISQ_DIST"
 msgid "The value for which the probability density function or cumulative distribution function is to be calculated."
 msgstr "Y gwerth y mae'r ffwythiant dwysedd tebygolrwydd neu ffwythiant dosraniad cronnus yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2805
+#: sc/inc/scfuncs.hrc:2805
 msgctxt "SC_OPCODE_CHISQ_DIST"
 msgid "Degrees of Freedom"
 msgstr "Graddau Rhyddid"
 
-#: scfuncs.hrc:2806
+#: sc/inc/scfuncs.hrc:2806
 msgctxt "SC_OPCODE_CHISQ_DIST"
 msgid "The degrees of freedom of the chi-square distribution."
 msgstr "Graddau o ryddid dosbarthiad chi square."
 
-#: scfuncs.hrc:2807
+#: sc/inc/scfuncs.hrc:2807
 msgctxt "SC_OPCODE_CHISQ_DIST"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2808
+#: sc/inc/scfuncs.hrc:2808
 msgctxt "SC_OPCODE_CHISQ_DIST"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2815
+#: sc/inc/scfuncs.hrc:2815
 msgctxt "SC_OPCODE_CHISQ_DIST_MS"
 msgid "Returns left-tail probability of the cumulative distribution function or values of the probability density function of the chi-square distribution."
 msgstr "Dychwelyd-tebygolrwydd cynffon chwith y ffwythiant dosbarthiad cronnus neu werthoedd y ffwythiant dwysedd tebygolrwydd y chi-sgwâr."
 
-#: scfuncs.hrc:2816
+#: sc/inc/scfuncs.hrc:2816
 msgctxt "SC_OPCODE_CHISQ_DIST_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2817
+#: sc/inc/scfuncs.hrc:2817
 msgctxt "SC_OPCODE_CHISQ_DIST_MS"
 msgid "The value for which the probability density function or cumulative distribution function is to be calculated."
 msgstr "Y gwerth y mae'r ffwythiant dwysedd tebygolrwydd neu ffwythiant dosraniad cronnus yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2818
+#: sc/inc/scfuncs.hrc:2818
 msgctxt "SC_OPCODE_CHISQ_DIST_MS"
 msgid "Degrees of Freedom"
 msgstr "Graddau o Ryddid"
 
-#: scfuncs.hrc:2819
+#: sc/inc/scfuncs.hrc:2819
 msgctxt "SC_OPCODE_CHISQ_DIST_MS"
 msgid "The degrees of freedom of the chi-square distribution."
 msgstr "Graddau o ryddid dosbarthiad chi square."
 
-#: scfuncs.hrc:2820
+#: sc/inc/scfuncs.hrc:2820
 msgctxt "SC_OPCODE_CHISQ_DIST_MS"
 msgid "Cumulative"
 msgstr "Cronnus"
 
-#: scfuncs.hrc:2821
+#: sc/inc/scfuncs.hrc:2821
 msgctxt "SC_OPCODE_CHISQ_DIST_MS"
 msgid "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function."
 msgstr "Mae 0 neu FALSE yn cyfrifo swyddogaeth dwysedd tebygolrwydd. Bydd unrhyw werth arall neu TRUE neu hepgor yn cyfrifo swyddogaeth dosbarthiad cronnus."
 
-#: scfuncs.hrc:2828
+#: sc/inc/scfuncs.hrc:2828
 msgctxt "SC_OPCODE_CHI_INV"
 msgid "Values of the inverse of CHIDIST(x; DegreesOfFreedom)."
 msgstr "Gwerthoedd gwrthdro CHIDIST (x; DegreesOfFreedom)."
 
-#: scfuncs.hrc:2829
+#: sc/inc/scfuncs.hrc:2829
 msgctxt "SC_OPCODE_CHI_INV"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2830
+#: sc/inc/scfuncs.hrc:2830
 msgctxt "SC_OPCODE_CHI_INV"
 msgid "The probability value for which the inverse chi square distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd y bydd dosbarthiad chi sgwâr yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2831
+#: sc/inc/scfuncs.hrc:2831
 msgctxt "SC_OPCODE_CHI_INV"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2832
+#: sc/inc/scfuncs.hrc:2832
 msgctxt "SC_OPCODE_CHI_INV"
 msgid "The degrees of freedom of the chi square distribution."
 msgstr "Graddau o ryddid dosbarthiad chi square."
 
-#: scfuncs.hrc:2839
+#: sc/inc/scfuncs.hrc:2839
 msgctxt "SC_OPCODE_CHI_INV_MS"
 msgid "Values of the inverse of CHIDIST(x; DegreesOfFreedom)."
 msgstr "Gwerthoedd gwrthdro CHIDIST (x; DegreesOfFreedom)."
 
-#: scfuncs.hrc:2840
+#: sc/inc/scfuncs.hrc:2840
 msgctxt "SC_OPCODE_CHI_INV_MS"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2841
+#: sc/inc/scfuncs.hrc:2841
 msgctxt "SC_OPCODE_CHI_INV_MS"
 msgid "The probability value for which the inverse chi square distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd y bydd dosbarthiad chi sgwâr yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2842
+#: sc/inc/scfuncs.hrc:2842
 msgctxt "SC_OPCODE_CHI_INV_MS"
 msgid "Degrees freedom"
 msgstr "Graddau rhyddid"
 
-#: scfuncs.hrc:2843
+#: sc/inc/scfuncs.hrc:2843
 msgctxt "SC_OPCODE_CHI_INV_MS"
 msgid "The degrees of freedom of the chi square distribution."
 msgstr "Graddau o ryddid dosbarthiad chi square."
 
-#: scfuncs.hrc:2850
+#: sc/inc/scfuncs.hrc:2850
 msgctxt "SC_OPCODE_CHISQ_INV"
 msgid "Values of the inverse of CHISQDIST(x;DegreesOfFreedom;TRUE())."
 msgstr "Gwerthoedd gwrthdro CHISQDIST(x;DegreesOfFreedom;TRUE())."
 
-#: scfuncs.hrc:2851
+#: sc/inc/scfuncs.hrc:2851
 msgctxt "SC_OPCODE_CHISQ_INV"
 msgid "Probability"
 msgstr "Tebygolrwydd"
 
-#: scfuncs.hrc:2852
+#: sc/inc/scfuncs.hrc:2852
 msgctxt "SC_OPCODE_CHISQ_INV"
 msgid "The probability value for which the inverse of the chi square distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd y bydd dosbarthiad chi sgwâr yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2853
+#: sc/inc/scfuncs.hrc:2853
 msgctxt "SC_OPCODE_CHISQ_INV"
 msgid "Degrees of Freedom"
 msgstr "Graddau Rhyddid"
 
-#: scfuncs.hrc:2854
+#: sc/inc/scfuncs.hrc:2854
 msgctxt "SC_OPCODE_CHISQ_INV"
 msgid "The degrees of freedom of the chi square distribution."
 msgstr "Graddau o ryddid dosbarthiad chi square."
 
-#: scfuncs.hrc:2861
+#: sc/inc/scfuncs.hrc:2861
 msgctxt "SC_OPCODE_CHISQ_INV_MS"
 msgid "Values of the inverse of CHISQ.DIST(x;DegreesOfFreedom;TRUE())."
 msgstr "Gwerthoedd gwrthdro CHISQDIST(x;DegreesOfFreedom;TRUE())."
 
-#: scfuncs.hrc:2862
+#: sc/inc/scfuncs.hrc:2862
 msgctxt "SC_OPCODE_CHISQ_INV_MS"
 msgid "Probability"
 msgstr "Tebygolrwydd"
 
-#: scfuncs.hrc:2863
+#: sc/inc/scfuncs.hrc:2863
 msgctxt "SC_OPCODE_CHISQ_INV_MS"
 msgid "The probability value for which the inverse of the chi square distribution is to be calculated."
 msgstr "Gwerth tebygolrwydd y bydd dosbarthiad chi sgwâr yn cael ei gyfrifo."
 
-#: scfuncs.hrc:2864
+#: sc/inc/scfuncs.hrc:2864
 msgctxt "SC_OPCODE_CHISQ_INV_MS"
 msgid "Degrees of Freedom"
 msgstr "Graddau o Ryddid"
 
-#: scfuncs.hrc:2865
+#: sc/inc/scfuncs.hrc:2865
 msgctxt "SC_OPCODE_CHISQ_INV_MS"
 msgid "The degrees of freedom of the chi square distribution."
 msgstr "Graddau o ryddid dosbarthiad chi square."
 
-#: scfuncs.hrc:2872
+#: sc/inc/scfuncs.hrc:2872
 msgctxt "SC_OPCODE_STANDARD"
 msgid "Converts a random variable to a normalized value."
 msgstr "Trosi'r newidyn hap i gwerth normal."
 
-#: scfuncs.hrc:2873
+#: sc/inc/scfuncs.hrc:2873
 msgctxt "SC_OPCODE_STANDARD"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:2874
+#: sc/inc/scfuncs.hrc:2874
 msgctxt "SC_OPCODE_STANDARD"
 msgid "The value to be standardized."
 msgstr "Y gwerth i'w safoni."
 
-#: scfuncs.hrc:2875
+#: sc/inc/scfuncs.hrc:2875
 msgctxt "SC_OPCODE_STANDARD"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: scfuncs.hrc:2876
+#: sc/inc/scfuncs.hrc:2876
 msgctxt "SC_OPCODE_STANDARD"
 msgid "The mean value used for moving."
 msgstr "Y gwerth cymedrig ar gyfer symud."
 
-#: scfuncs.hrc:2877
+#: sc/inc/scfuncs.hrc:2877
 msgctxt "SC_OPCODE_STANDARD"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2878
+#: sc/inc/scfuncs.hrc:2878
 msgctxt "SC_OPCODE_STANDARD"
 msgid "The standard deviation used for scaling."
 msgstr "Gwyriad safonol ar gyfer graddio."
 
-#: scfuncs.hrc:2884
+#: sc/inc/scfuncs.hrc:2884
 msgctxt "SC_OPCODE_PERMUT"
 msgid "Returns the number of permutations for a given number of elements without repetition."
 msgstr "Dychwelyd y nifer o drynewidion ar gyfer nifer penodol o elfennau heb ailadrodd."
 
-#: scfuncs.hrc:2885
+#: sc/inc/scfuncs.hrc:2885
 msgctxt "SC_OPCODE_PERMUT"
 msgid "Count 1"
 msgstr "Cyfrif 1"
 
-#: scfuncs.hrc:2886
+#: sc/inc/scfuncs.hrc:2886
 msgctxt "SC_OPCODE_PERMUT"
 msgid "The total number of elements."
 msgstr "Cyfanswm yr elfennau."
 
-#: scfuncs.hrc:2887
+#: sc/inc/scfuncs.hrc:2887
 msgctxt "SC_OPCODE_PERMUT"
 msgid "Count 2"
 msgstr "Cyfrif 2"
 
-#: scfuncs.hrc:2888
+#: sc/inc/scfuncs.hrc:2888
 msgctxt "SC_OPCODE_PERMUT"
 msgid "The selection number taken from the elements."
 msgstr "Y rhif dewis wedi ei gymryd o'r elfennau."
 
-#: scfuncs.hrc:2894
+#: sc/inc/scfuncs.hrc:2894
 msgctxt "SC_OPCODE_PERMUTATION_A"
 msgid "Returns the number of permutations for a given number of objects (repetition allowed)."
 msgstr "Dychwelyd y nifer o drynewidion ar gyfer nifer penodol o wrthrychau (caniatáu ailadrodd)."
 
-#: scfuncs.hrc:2895
+#: sc/inc/scfuncs.hrc:2895
 msgctxt "SC_OPCODE_PERMUTATION_A"
 msgid "Count 1"
 msgstr "Cyfrif 1"
 
-#: scfuncs.hrc:2896
+#: sc/inc/scfuncs.hrc:2896
 msgctxt "SC_OPCODE_PERMUTATION_A"
 msgid "The total number of elements."
 msgstr "Cyfanswm yr elfennau."
 
-#: scfuncs.hrc:2897
+#: sc/inc/scfuncs.hrc:2897
 msgctxt "SC_OPCODE_PERMUTATION_A"
 msgid "Count 2"
 msgstr "Cyfrif 2"
 
-#: scfuncs.hrc:2898
+#: sc/inc/scfuncs.hrc:2898
 msgctxt "SC_OPCODE_PERMUTATION_A"
 msgid "The selection number taken from the elements."
 msgstr "Y rhif dewis wedi ei gymryd o'r elfennau."
 
-#: scfuncs.hrc:2904
+#: sc/inc/scfuncs.hrc:2904
 msgctxt "SC_OPCODE_CONFIDENCE"
 msgid "Returns a (1-alpha) confidence interval for a normal distribution."
 msgstr "Dychwelyd cyfwng hyder (1-alffa) ar gyfer dosbarthiad normal."
 
-#: scfuncs.hrc:2905
+#: sc/inc/scfuncs.hrc:2905
 msgctxt "SC_OPCODE_CONFIDENCE"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2906
+#: sc/inc/scfuncs.hrc:2906
 msgctxt "SC_OPCODE_CONFIDENCE"
 msgid "The level of the confidence interval."
 msgstr "Lefel y cyfwng hyder."
 
-#: scfuncs.hrc:2907
+#: sc/inc/scfuncs.hrc:2907
 msgctxt "SC_OPCODE_CONFIDENCE"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2908
+#: sc/inc/scfuncs.hrc:2908
 msgctxt "SC_OPCODE_CONFIDENCE"
 msgid "The standard deviation of the population."
 msgstr "Gwyriad safonol poblogaeth."
 
-#: scfuncs.hrc:2909
+#: sc/inc/scfuncs.hrc:2909
 msgctxt "SC_OPCODE_CONFIDENCE"
 msgid "Size"
 msgstr "Maint"
 
-#: scfuncs.hrc:2910
+#: sc/inc/scfuncs.hrc:2910
 msgctxt "SC_OPCODE_CONFIDENCE"
 msgid "The size of the population."
 msgstr "Maint poblogaeth."
 
-#: scfuncs.hrc:2916
+#: sc/inc/scfuncs.hrc:2916
 msgctxt "SC_OPCODE_CONFIDENCE_N"
 msgid "Returns a (1-alpha) confidence interval for a normal distribution."
 msgstr "Dychwelyd cyfwng hyder (1-alffa) ar gyfer dosbarthiad normal."
 
-#: scfuncs.hrc:2917
+#: sc/inc/scfuncs.hrc:2917
 msgctxt "SC_OPCODE_CONFIDENCE_N"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2918
+#: sc/inc/scfuncs.hrc:2918
 msgctxt "SC_OPCODE_CONFIDENCE_N"
 msgid "The level of the confidence interval."
 msgstr "Lefel y cyfwng hyder."
 
-#: scfuncs.hrc:2919
+#: sc/inc/scfuncs.hrc:2919
 msgctxt "SC_OPCODE_CONFIDENCE_N"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2920
+#: sc/inc/scfuncs.hrc:2920
 msgctxt "SC_OPCODE_CONFIDENCE_N"
 msgid "The standard deviation of the population."
 msgstr "Gwyriad safonol poblogaeth."
 
-#: scfuncs.hrc:2921
+#: sc/inc/scfuncs.hrc:2921
 msgctxt "SC_OPCODE_CONFIDENCE_N"
 msgid "Size"
 msgstr "Maint"
 
-#: scfuncs.hrc:2922
+#: sc/inc/scfuncs.hrc:2922
 msgctxt "SC_OPCODE_CONFIDENCE_N"
 msgid "The size of the population."
 msgstr "Maint poblogaeth."
 
-#: scfuncs.hrc:2928
+#: sc/inc/scfuncs.hrc:2928
 msgctxt "SC_OPCODE_CONFIDENCE_T"
 msgid "Returns a (1-alpha) confidence interval for a Student's t distribution."
 msgstr "Dychwelyd cyfwng hyder (1-alffa) ar gyfer dosbarthiad normal."
 
-#: scfuncs.hrc:2929
+#: sc/inc/scfuncs.hrc:2929
 msgctxt "SC_OPCODE_CONFIDENCE_T"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:2930
+#: sc/inc/scfuncs.hrc:2930
 msgctxt "SC_OPCODE_CONFIDENCE_T"
 msgid "The level of the confidence interval."
 msgstr "Lefel y cyfwng hyder."
 
-#: scfuncs.hrc:2931
+#: sc/inc/scfuncs.hrc:2931
 msgctxt "SC_OPCODE_CONFIDENCE_T"
 msgid "STDEV"
 msgstr "STDEV"
 
-#: scfuncs.hrc:2932
+#: sc/inc/scfuncs.hrc:2932
 msgctxt "SC_OPCODE_CONFIDENCE_T"
 msgid "The standard deviation of the population."
 msgstr "Gwyriad safonol poblogaeth."
 
-#: scfuncs.hrc:2933
+#: sc/inc/scfuncs.hrc:2933
 msgctxt "SC_OPCODE_CONFIDENCE_T"
 msgid "Size"
 msgstr "Maint"
 
-#: scfuncs.hrc:2934
+#: sc/inc/scfuncs.hrc:2934
 msgctxt "SC_OPCODE_CONFIDENCE_T"
 msgid "The size of the population."
 msgstr "Maint poblogaeth."
 
-#: scfuncs.hrc:2940
+#: sc/inc/scfuncs.hrc:2940
 msgctxt "SC_OPCODE_Z_TEST"
 msgid "Calculates the probability of observing a z-statistic greater than the one computed based on a sample."
 msgstr "Cyfrifo tebygolrwydd gweld ystadegyn-z mwy na'r un cyfrifwyd ar sail sampl."
 
-#: scfuncs.hrc:2941
+#: sc/inc/scfuncs.hrc:2941
 msgctxt "SC_OPCODE_Z_TEST"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2942
+#: sc/inc/scfuncs.hrc:2942
 msgctxt "SC_OPCODE_Z_TEST"
 msgid "The given sample, drawn from a normally distributed population."
 msgstr "Arae data."
 
-#: scfuncs.hrc:2943
+#: sc/inc/scfuncs.hrc:2943
 msgctxt "SC_OPCODE_Z_TEST"
 msgid "mu"
 msgstr "mu"
 
-#: scfuncs.hrc:2944
+#: sc/inc/scfuncs.hrc:2944
 msgctxt "SC_OPCODE_Z_TEST"
 msgid "The known mean of the population."
 msgstr "Y gwerth i'w brofi."
 
-#: scfuncs.hrc:2945
+#: sc/inc/scfuncs.hrc:2945
 msgctxt "SC_OPCODE_Z_TEST"
 msgid "sigma"
 msgstr "sigma"
 
-#: scfuncs.hrc:2946
+#: sc/inc/scfuncs.hrc:2946
 msgctxt "SC_OPCODE_Z_TEST"
 msgid "The known standard deviation of the population. If omitted, the standard deviation of the given sample is used."
 msgstr "Gwyriad safonol hysbys poblogaeth. Os yw'n cael ei hepgor, bydd y gwyriad safonol y sampl yn cael ei ddefnyddio."
 
-#: scfuncs.hrc:2952
+#: sc/inc/scfuncs.hrc:2952
 msgctxt "SC_OPCODE_Z_TEST_MS"
 msgid "Calculates the probability of observing a z-statistic greater than the one computed based on a sample."
 msgstr "Cyfrifo tebygolrwydd gweld ystadegyn-z mwy na'r un cyfrifwyd ar sail sampl."
 
-#: scfuncs.hrc:2953
+#: sc/inc/scfuncs.hrc:2953
 msgctxt "SC_OPCODE_Z_TEST_MS"
 msgid "Data"
 msgstr "Data"
 
-#: scfuncs.hrc:2954
+#: sc/inc/scfuncs.hrc:2954
 msgctxt "SC_OPCODE_Z_TEST_MS"
 msgid "The given sample, drawn from a normally distributed population."
 msgstr "Y sampl benodol, wedi ei dynnu o boblogaeth wedi ei ddosbarthu'n arferol."
 
-#: scfuncs.hrc:2955
+#: sc/inc/scfuncs.hrc:2955
 msgctxt "SC_OPCODE_Z_TEST_MS"
 msgid "mu"
 msgstr "mu"
 
-#: scfuncs.hrc:2956
+#: sc/inc/scfuncs.hrc:2956
 msgctxt "SC_OPCODE_Z_TEST_MS"
 msgid "The known mean of the population."
 msgstr "Gwerth cymerdr y bobologaeth."
 
-#: scfuncs.hrc:2957
+#: sc/inc/scfuncs.hrc:2957
 msgctxt "SC_OPCODE_Z_TEST_MS"
 msgid "sigma"
 msgstr "sigma"
 
-#: scfuncs.hrc:2958
+#: sc/inc/scfuncs.hrc:2958
 msgctxt "SC_OPCODE_Z_TEST_MS"
 msgid "The known standard deviation of the population. If omitted, the standard deviation of the given sample is used."
 msgstr "Gwyriad safonol hysbys poblogaeth. Os yw'n cael ei hepgor, bydd y gwyriad safonol y sampl yn cael ei ddefnyddio."
 
-#: scfuncs.hrc:2964
+#: sc/inc/scfuncs.hrc:2964
 msgctxt "SC_OPCODE_CHI_TEST"
 msgid "Returns the chi square independence test."
 msgstr "Dychwelyd prawf annibyniaeth chi sgwâr."
 
-#: scfuncs.hrc:2965
+#: sc/inc/scfuncs.hrc:2965
 msgctxt "SC_OPCODE_CHI_TEST"
 msgid "Data B"
 msgstr "Data B"
 
-#: scfuncs.hrc:2966
+#: sc/inc/scfuncs.hrc:2966
 msgctxt "SC_OPCODE_CHI_TEST"
 msgid "The observed data array."
 msgstr "Arae data arsylwedig."
 
-#: scfuncs.hrc:2967
+#: sc/inc/scfuncs.hrc:2967
 msgctxt "SC_OPCODE_CHI_TEST"
 msgid "Data E"
 msgstr "Data E"
 
-#: scfuncs.hrc:2968
+#: sc/inc/scfuncs.hrc:2968
 msgctxt "SC_OPCODE_CHI_TEST"
 msgid "The expected data array."
 msgstr "Arae data disgwyliedig."
 
-#: scfuncs.hrc:2974
+#: sc/inc/scfuncs.hrc:2974
 msgctxt "SC_OPCODE_CHI_TEST_MS"
 msgid "Returns the chi square independence test."
 msgstr "Dychwelyd prawf annibyniaeth chi sgwâr."
 
-#: scfuncs.hrc:2975
+#: sc/inc/scfuncs.hrc:2975
 msgctxt "SC_OPCODE_CHI_TEST_MS"
 msgid "Data B"
 msgstr "Data B"
 
-#: scfuncs.hrc:2976
+#: sc/inc/scfuncs.hrc:2976
 msgctxt "SC_OPCODE_CHI_TEST_MS"
 msgid "The observed data array."
 msgstr "Arae data arsylwedig."
 
-#: scfuncs.hrc:2977
+#: sc/inc/scfuncs.hrc:2977
 msgctxt "SC_OPCODE_CHI_TEST_MS"
 msgid "Data E"
 msgstr "Data E"
 
-#: scfuncs.hrc:2978
+#: sc/inc/scfuncs.hrc:2978
 msgctxt "SC_OPCODE_CHI_TEST_MS"
 msgid "The expected data array."
 msgstr "Arae data disgwyliedig."
 
-#: scfuncs.hrc:2984
+#: sc/inc/scfuncs.hrc:2984
 msgctxt "SC_OPCODE_F_TEST"
 msgid "Calculates the F test."
 msgstr "Cyfrifo'r prawf F."
 
-#: scfuncs.hrc:2985
+#: sc/inc/scfuncs.hrc:2985
 msgctxt "SC_OPCODE_F_TEST"
 msgid "Data 1"
 msgstr "Data 1"
 
-#: scfuncs.hrc:2986
+#: sc/inc/scfuncs.hrc:2986
 msgctxt "SC_OPCODE_F_TEST"
 msgid "The first record array."
 msgstr "Arae cofnod cyntaf."
 
-#: scfuncs.hrc:2987
+#: sc/inc/scfuncs.hrc:2987
 msgctxt "SC_OPCODE_F_TEST"
 msgid "Data 2"
 msgstr "Data 2"
 
-#: scfuncs.hrc:2988
+#: sc/inc/scfuncs.hrc:2988
 msgctxt "SC_OPCODE_F_TEST"
 msgid "The second record array."
 msgstr "Ail gofnod arae."
 
-#: scfuncs.hrc:2994
+#: sc/inc/scfuncs.hrc:2994
 msgctxt "SC_OPCODE_F_TEST_MS"
 msgid "Calculates the F test."
 msgstr "Cyfrifo'r prawf F."
 
-#: scfuncs.hrc:2995
+#: sc/inc/scfuncs.hrc:2995
 msgctxt "SC_OPCODE_F_TEST_MS"
 msgid "Data 1"
 msgstr "Data 1"
 
-#: scfuncs.hrc:2996
+#: sc/inc/scfuncs.hrc:2996
 msgctxt "SC_OPCODE_F_TEST_MS"
 msgid "The first record array."
 msgstr "Arae cofnod cyntaf."
 
-#: scfuncs.hrc:2997
+#: sc/inc/scfuncs.hrc:2997
 msgctxt "SC_OPCODE_F_TEST_MS"
 msgid "Data 2"
 msgstr "Data 2"
 
-#: scfuncs.hrc:2998
+#: sc/inc/scfuncs.hrc:2998
 msgctxt "SC_OPCODE_F_TEST_MS"
 msgid "The second record array."
 msgstr "Ail gofnod arae."
 
-#: scfuncs.hrc:3004
+#: sc/inc/scfuncs.hrc:3004
 msgctxt "SC_OPCODE_T_TEST"
 msgid "Calculates the T test."
 msgstr "Cyfrifo prawf T."
 
-#: scfuncs.hrc:3005
+#: sc/inc/scfuncs.hrc:3005
 msgctxt "SC_OPCODE_T_TEST"
 msgid "Data 1"
 msgstr "Data 1"
 
-#: scfuncs.hrc:3006
+#: sc/inc/scfuncs.hrc:3006
 msgctxt "SC_OPCODE_T_TEST"
 msgid "The first record array."
 msgstr "Arae cofnod cyntaf."
 
-#: scfuncs.hrc:3007
+#: sc/inc/scfuncs.hrc:3007
 msgctxt "SC_OPCODE_T_TEST"
 msgid "Data 2"
 msgstr "Data 2"
 
-#: scfuncs.hrc:3008
+#: sc/inc/scfuncs.hrc:3008
 msgctxt "SC_OPCODE_T_TEST"
 msgid "The second record array."
 msgstr "Ail gofnod arae."
 
-#: scfuncs.hrc:3009
+#: sc/inc/scfuncs.hrc:3009
 msgctxt "SC_OPCODE_T_TEST"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:3010
+#: sc/inc/scfuncs.hrc:3010
 msgctxt "SC_OPCODE_T_TEST"
 msgid "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution"
 msgstr "Modd yn pennu'r nifer o gynffonnau dosbarthiad i'w dychwelyd. 1= un gynffon, 2 = dosbarthiad dwy gynffon"
 
-#: scfuncs.hrc:3011
+#: sc/inc/scfuncs.hrc:3011
 msgctxt "SC_OPCODE_T_TEST"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:3012
+#: sc/inc/scfuncs.hrc:3012
 msgctxt "SC_OPCODE_T_TEST"
 msgid "The type of the T test."
 msgstr "Math o brawf T."
 
-#: scfuncs.hrc:3018
+#: sc/inc/scfuncs.hrc:3018
 msgctxt "SC_OPCODE_T_TEST_MS"
 msgid "Calculates the T test."
 msgstr "Cyfrifo'r prawf T."
 
-#: scfuncs.hrc:3019
+#: sc/inc/scfuncs.hrc:3019
 msgctxt "SC_OPCODE_T_TEST_MS"
 msgid "Data 1"
 msgstr "Data 1"
 
-#: scfuncs.hrc:3020
+#: sc/inc/scfuncs.hrc:3020
 msgctxt "SC_OPCODE_T_TEST_MS"
 msgid "The first record array."
 msgstr "Arae cofnod cyntaf."
 
-#: scfuncs.hrc:3021
+#: sc/inc/scfuncs.hrc:3021
 msgctxt "SC_OPCODE_T_TEST_MS"
 msgid "Data 2"
 msgstr "Data 2"
 
-#: scfuncs.hrc:3022
+#: sc/inc/scfuncs.hrc:3022
 msgctxt "SC_OPCODE_T_TEST_MS"
 msgid "The second record array."
 msgstr "Ail gofnod arae."
 
-#: scfuncs.hrc:3023
+#: sc/inc/scfuncs.hrc:3023
 msgctxt "SC_OPCODE_T_TEST_MS"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:3024
+#: sc/inc/scfuncs.hrc:3024
 msgctxt "SC_OPCODE_T_TEST_MS"
 msgid "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution"
 msgstr "Modd yn pennu'r nifer o gynffonnau dosbarthiad i'w dychwelyd. 1= un gynffon, 2 = dosbarthiad dwy gynffon"
 
-#: scfuncs.hrc:3025
+#: sc/inc/scfuncs.hrc:3025
 msgctxt "SC_OPCODE_T_TEST_MS"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:3026
+#: sc/inc/scfuncs.hrc:3026
 msgctxt "SC_OPCODE_T_TEST_MS"
 msgid "The type of the T test."
 msgstr "Y math o brawf T."
 
-#: scfuncs.hrc:3032
+#: sc/inc/scfuncs.hrc:3032
 msgctxt "SC_OPCODE_RSQ"
 msgid "Returns the square of the Pearson product moment correlation coefficient."
 msgstr "Dychwelyd sgwâr cyfernod cydberthnasiad moment cynnyrch Pearson."
 
-#: scfuncs.hrc:3033
+#: sc/inc/scfuncs.hrc:3033
 msgctxt "SC_OPCODE_RSQ"
 msgid "Data Y"
 msgstr "Data Y"
 
-#: scfuncs.hrc:3034
+#: sc/inc/scfuncs.hrc:3034
 msgctxt "SC_OPCODE_RSQ"
 msgid "The Y data array."
 msgstr "Arae data Y."
 
-#: scfuncs.hrc:3035
+#: sc/inc/scfuncs.hrc:3035
 msgctxt "SC_OPCODE_RSQ"
 msgid "Data X"
 msgstr "Data X"
 
-#: scfuncs.hrc:3036
+#: sc/inc/scfuncs.hrc:3036
 msgctxt "SC_OPCODE_RSQ"
 msgid "The X data array."
 msgstr "Arae data X."
 
-#: scfuncs.hrc:3042
+#: sc/inc/scfuncs.hrc:3042
 msgctxt "SC_OPCODE_INTERCEPT"
 msgid "Returns the intercept of the linear regression line and the Y axis."
 msgstr "Dychwelyd rhyngdoriad llinell atchweliad llinol a'r echel Y."
 
-#: scfuncs.hrc:3043
+#: sc/inc/scfuncs.hrc:3043
 msgctxt "SC_OPCODE_INTERCEPT"
 msgid "Data Y"
 msgstr "Data Y"
 
-#: scfuncs.hrc:3044
+#: sc/inc/scfuncs.hrc:3044
 msgctxt "SC_OPCODE_INTERCEPT"
 msgid "The Y data array."
 msgstr "Arae data Y."
 
-#: scfuncs.hrc:3045
+#: sc/inc/scfuncs.hrc:3045
 msgctxt "SC_OPCODE_INTERCEPT"
 msgid "Data X"
 msgstr "Data X"
 
-#: scfuncs.hrc:3046
+#: sc/inc/scfuncs.hrc:3046
 msgctxt "SC_OPCODE_INTERCEPT"
 msgid "The X data array."
 msgstr "Arae data X."
 
-#: scfuncs.hrc:3052
+#: sc/inc/scfuncs.hrc:3052
 msgctxt "SC_OPCODE_SLOPE"
 msgid "Returns the slope of the linear regression line."
 msgstr "Dychwelyd graddiant llinell atchweliad llinol."
 
-#: scfuncs.hrc:3053
+#: sc/inc/scfuncs.hrc:3053
 msgctxt "SC_OPCODE_SLOPE"
 msgid "Data Y"
 msgstr "Data Y"
 
-#: scfuncs.hrc:3054
+#: sc/inc/scfuncs.hrc:3054
 msgctxt "SC_OPCODE_SLOPE"
 msgid "The Y data array."
 msgstr "Arae data Y."
 
-#: scfuncs.hrc:3055
+#: sc/inc/scfuncs.hrc:3055
 msgctxt "SC_OPCODE_SLOPE"
 msgid "Data X"
 msgstr "Data X"
 
-#: scfuncs.hrc:3056
+#: sc/inc/scfuncs.hrc:3056
 msgctxt "SC_OPCODE_SLOPE"
 msgid "The X data array."
 msgstr "Arae data X."
 
-#: scfuncs.hrc:3062
+#: sc/inc/scfuncs.hrc:3062
 msgctxt "SC_OPCODE_STEYX"
 msgid "Returns the standard error of the linear regression."
 msgstr "Dychwelyd gwall safonol atchweliad llinol."
 
-#: scfuncs.hrc:3063
+#: sc/inc/scfuncs.hrc:3063
 msgctxt "SC_OPCODE_STEYX"
 msgid "Data Y"
 msgstr "Data Y"
 
-#: scfuncs.hrc:3064
+#: sc/inc/scfuncs.hrc:3064
 msgctxt "SC_OPCODE_STEYX"
 msgid "The Y data array."
 msgstr "Arae data Y."
 
-#: scfuncs.hrc:3065
+#: sc/inc/scfuncs.hrc:3065
 msgctxt "SC_OPCODE_STEYX"
 msgid "Data X"
 msgstr "Data X"
 
-#: scfuncs.hrc:3066
+#: sc/inc/scfuncs.hrc:3066
 msgctxt "SC_OPCODE_STEYX"
 msgid "The X data array."
 msgstr "Arae data X."
 
-#: scfuncs.hrc:3072
+#: sc/inc/scfuncs.hrc:3072
 msgctxt "SC_OPCODE_PEARSON"
 msgid "Returns the Pearson product moment correlation coefficient."
 msgstr "Dychwelyd cyfernod cydberthynas moment cynnyrch Pearson."
 
-#: scfuncs.hrc:3073
+#: sc/inc/scfuncs.hrc:3073
 msgctxt "SC_OPCODE_PEARSON"
 msgid "Data 1"
 msgstr "Data 1"
 
-#: scfuncs.hrc:3074
+#: sc/inc/scfuncs.hrc:3074
 msgctxt "SC_OPCODE_PEARSON"
 msgid "The first record array."
 msgstr "Arae cofnod cyntaf."
 
-#: scfuncs.hrc:3075
+#: sc/inc/scfuncs.hrc:3075
 msgctxt "SC_OPCODE_PEARSON"
 msgid "Data 2"
 msgstr "Data 2"
 
-#: scfuncs.hrc:3076
+#: sc/inc/scfuncs.hrc:3076
 msgctxt "SC_OPCODE_PEARSON"
 msgid "The second record array."
 msgstr "Ail gofnod arae."
 
-#: scfuncs.hrc:3082
+#: sc/inc/scfuncs.hrc:3082
 msgctxt "SC_OPCODE_CORREL"
 msgid "Returns the correlation coefficient."
 msgstr "Dychwelyd cyfernod cydberthynas."
 
-#: scfuncs.hrc:3083
+#: sc/inc/scfuncs.hrc:3083
 msgctxt "SC_OPCODE_CORREL"
 msgid "Data 1"
 msgstr "Data 1"
 
-#: scfuncs.hrc:3084
+#: sc/inc/scfuncs.hrc:3084
 msgctxt "SC_OPCODE_CORREL"
 msgid "The first record array."
 msgstr "Arae cofnod cyntaf."
 
-#: scfuncs.hrc:3085
+#: sc/inc/scfuncs.hrc:3085
 msgctxt "SC_OPCODE_CORREL"
 msgid "Data 2"
 msgstr "Data 2"
 
-#: scfuncs.hrc:3086
+#: sc/inc/scfuncs.hrc:3086
 msgctxt "SC_OPCODE_CORREL"
 msgid "The second record array."
 msgstr "Ail gofnod arae."
 
-#: scfuncs.hrc:3092
+#: sc/inc/scfuncs.hrc:3092
 msgctxt "SC_OPCODE_COVAR"
 msgid "Calculates the population covariance."
 msgstr "Cyfrifo cydamrywiad."
 
-#: scfuncs.hrc:3093
+#: sc/inc/scfuncs.hrc:3093
 msgctxt "SC_OPCODE_COVAR"
 msgid "Data 1"
 msgstr "Data 1"
 
-#: scfuncs.hrc:3094
+#: sc/inc/scfuncs.hrc:3094
 msgctxt "SC_OPCODE_COVAR"
 msgid "The first record array."
 msgstr "Arae cofnod cyntaf."
 
-#: scfuncs.hrc:3095
+#: sc/inc/scfuncs.hrc:3095
 msgctxt "SC_OPCODE_COVAR"
 msgid "Data 2"
 msgstr "Data 2"
 
-#: scfuncs.hrc:3096
+#: sc/inc/scfuncs.hrc:3096
 msgctxt "SC_OPCODE_COVAR"
 msgid "The second record array."
 msgstr "Ail gofnod arae."
 
-#: scfuncs.hrc:3102
+#: sc/inc/scfuncs.hrc:3102
 msgctxt "SC_OPCODE_COVARIANCE_P"
 msgid "Calculates the population covariance."
 msgstr "Cyfrifo cydamrywiad."
 
-#: scfuncs.hrc:3103
+#: sc/inc/scfuncs.hrc:3103
 msgctxt "SC_OPCODE_COVARIANCE_P"
 msgid "Data 1"
 msgstr "Data 1"
 
-#: scfuncs.hrc:3104
+#: sc/inc/scfuncs.hrc:3104
 msgctxt "SC_OPCODE_COVARIANCE_P"
 msgid "The first record array."
 msgstr "Arae cofnod cyntaf."
 
-#: scfuncs.hrc:3105
+#: sc/inc/scfuncs.hrc:3105
 msgctxt "SC_OPCODE_COVARIANCE_P"
 msgid "Data 2"
 msgstr "Data 2"
 
-#: scfuncs.hrc:3106
+#: sc/inc/scfuncs.hrc:3106
 msgctxt "SC_OPCODE_COVARIANCE_P"
 msgid "The second record array."
 msgstr "Ail gofnod arae."
 
-#: scfuncs.hrc:3112
+#: sc/inc/scfuncs.hrc:3112
 msgctxt "SC_OPCODE_COVARIANCE_S"
 msgid "Calculates the sample covariance."
 msgstr "Cyfrifo cydamrywiad y sampl."
 
-#: scfuncs.hrc:3113
+#: sc/inc/scfuncs.hrc:3113
 msgctxt "SC_OPCODE_COVARIANCE_S"
 msgid "Data 1"
 msgstr "Data 1"
 
-#: scfuncs.hrc:3114
+#: sc/inc/scfuncs.hrc:3114
 msgctxt "SC_OPCODE_COVARIANCE_S"
 msgid "The first record array."
 msgstr "Arae cofnod cyntaf."
 
-#: scfuncs.hrc:3115
+#: sc/inc/scfuncs.hrc:3115
 msgctxt "SC_OPCODE_COVARIANCE_S"
 msgid "Data 2"
 msgstr "Data 2"
 
-#: scfuncs.hrc:3116
+#: sc/inc/scfuncs.hrc:3116
 msgctxt "SC_OPCODE_COVARIANCE_S"
 msgid "The second record array."
 msgstr "Ail gofnod arae."
 
-#: scfuncs.hrc:3122
+#: sc/inc/scfuncs.hrc:3122
 msgctxt "SC_OPCODE_FORECAST"
 msgid "Returns a value along a linear regression"
 msgstr "Dychwelyd gwerth ar hyd atchweliad llinol"
 
-#: scfuncs.hrc:3123
+#: sc/inc/scfuncs.hrc:3123
 msgctxt "SC_OPCODE_FORECAST"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:3124
+#: sc/inc/scfuncs.hrc:3124
 msgctxt "SC_OPCODE_FORECAST"
 msgid "The X value for which the Y value on the regression linear is to be calculated."
 msgstr "Gwerth X y bydd gwerth Y ar y llinol atchweliad yn cael ei gyfrifo."
 
-#: scfuncs.hrc:3125
+#: sc/inc/scfuncs.hrc:3125
 msgctxt "SC_OPCODE_FORECAST"
 msgid "Data Y"
 msgstr "Data Y"
 
-#: scfuncs.hrc:3126
+#: sc/inc/scfuncs.hrc:3126
 msgctxt "SC_OPCODE_FORECAST"
 msgid "The Y data array."
 msgstr "Arae data Y."
 
-#: scfuncs.hrc:3127
+#: sc/inc/scfuncs.hrc:3127
 msgctxt "SC_OPCODE_FORECAST"
 msgid "Data X"
 msgstr "Data X"
 
-#: scfuncs.hrc:3128
+#: sc/inc/scfuncs.hrc:3128
 msgctxt "SC_OPCODE_FORECAST"
 msgid "The X data array."
 msgstr "Arae data X."
 
-#: scfuncs.hrc:3134
+#: sc/inc/scfuncs.hrc:3134
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "Calculates future value(s) using additive Exponential Smoothing algorithm."
 msgstr "Cyfrifo gwerth(oedd) y dyfodol drwy ddefnyddio algorithm Llyfnhau Esbonyddol."
 
-#: scfuncs.hrc:3135
+#: sc/inc/scfuncs.hrc:3135
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "Target"
 msgstr "Targed"
 
-#: scfuncs.hrc:3136
+#: sc/inc/scfuncs.hrc:3136
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "The date (array) for which you want to predict a value."
 msgstr "Y dyddiad (arae) ar ei gyfer rydych am ddarogan gwerth."
 
-#: scfuncs.hrc:3137
+#: sc/inc/scfuncs.hrc:3137
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: scfuncs.hrc:3138
+#: sc/inc/scfuncs.hrc:3138
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "The data array from which you want to forecast."
 msgstr "Yr arae data o'r hyn rydych eisiau creu rhagolwg."
 
-#: scfuncs.hrc:3139
+#: sc/inc/scfuncs.hrc:3139
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "Timeline"
 msgstr "Llinell Amser"
 
-#: scfuncs.hrc:3140
+#: sc/inc/scfuncs.hrc:3140
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "The date or numeric array; a consistent step between values is needed."
 msgstr "Yr arae dyddiad neu rhif: mae angen cam cyson rhwng gwerthoedd."
 
-#: scfuncs.hrc:3141
+#: sc/inc/scfuncs.hrc:3141
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "Period length"
 msgstr "Hyd y cyfnod"
 
-#: scfuncs.hrc:3142
+#: sc/inc/scfuncs.hrc:3142
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "Number of Samples in Period (default 1); length of the seasonal pattern."
 msgstr "Y Nifero o Samplau mewn Cyfnod (rhagosodiad 1); hyd y patrwm tymhorol."
 
-#: scfuncs.hrc:3143
+#: sc/inc/scfuncs.hrc:3143
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "Data completion"
 msgstr "Cwblhau'r data"
 
-#: scfuncs.hrc:3144
+#: sc/inc/scfuncs.hrc:3144
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."
 msgstr "Cwblhau'r data (rhagosodiad 1); mae 0 yn cynnwys pwyntiau wedi eu colli fel sero, 1 yn rhyngosod."
 
-#: scfuncs.hrc:3145
+#: sc/inc/scfuncs.hrc:3145
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "Aggregation"
 msgstr "Cydgrynhoad"
 
-#: scfuncs.hrc:3146
+#: sc/inc/scfuncs.hrc:3146
 msgctxt "SC_OPCODE_FORECAST_ETS_ADD"
 msgid "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values."
 msgstr "Cydgrynhoad (rhagosodiad 1 = AVERAGE); y dull i'w ddefnyddio i gydgrynhoi gwerthoedd unfath (amser)."
 
-#: scfuncs.hrc:3152
+#: sc/inc/scfuncs.hrc:3152
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "Calculates future value(s) using multiplicative Exponential Smoothing algorithm."
 msgstr "Cyfrifo gwerth(oedd) y dyfodol drwy ddefnyddio algorithm Llyfnhau Esbonyddol lluosol."
 
-#: scfuncs.hrc:3153
+#: sc/inc/scfuncs.hrc:3153
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "Target"
 msgstr "Targed"
 
-#: scfuncs.hrc:3154
+#: sc/inc/scfuncs.hrc:3154
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "The date (array) for which you want to predict a value."
 msgstr "Y dyddiad (arae) ar ei gyfer rydych am ddarogan gwerth."
 
-#: scfuncs.hrc:3155
+#: sc/inc/scfuncs.hrc:3155
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: scfuncs.hrc:3156
+#: sc/inc/scfuncs.hrc:3156
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "The data array from which you want to forecast."
 msgstr "Yr arae data o'r hyn rydych eisiau creu rhagolwg."
 
-#: scfuncs.hrc:3157
+#: sc/inc/scfuncs.hrc:3157
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "Timeline"
 msgstr "Llinell Amser"
 
-#: scfuncs.hrc:3158
+#: sc/inc/scfuncs.hrc:3158
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "The date or numeric array; a consistent step between values is needed."
 msgstr "Yr arae dyddiad neu rhif: mae angen cam cyson rhwng gwerthoedd."
 
-#: scfuncs.hrc:3159
+#: sc/inc/scfuncs.hrc:3159
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "Period length"
 msgstr "Hyd y cyfnod"
 
-#: scfuncs.hrc:3160
+#: sc/inc/scfuncs.hrc:3160
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "Number of Samples in Period (default 1); length of the seasonal pattern."
 msgstr "Y Nifero o Samplau mewn Cyfnod (rhagosodiad 1); hyd y patrwm tymhorol."
 
-#: scfuncs.hrc:3161
+#: sc/inc/scfuncs.hrc:3161
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "Data completion"
 msgstr "Cwblhau'r data"
 
-#: scfuncs.hrc:3162
+#: sc/inc/scfuncs.hrc:3162
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."
 msgstr "Cwblhau'r data (rhagosodiad 1); mae 0 yn cynnwys pwyntiau wedi eu colli fel sero, 1 yn rhyngosod."
 
-#: scfuncs.hrc:3163
+#: sc/inc/scfuncs.hrc:3163
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "Aggregation"
 msgstr "Cydgrynhoad"
 
-#: scfuncs.hrc:3164
+#: sc/inc/scfuncs.hrc:3164
 msgctxt "SC_OPCODE_FORECAST_ETS_MUL"
 msgid "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values."
 msgstr "Cydgrynhoad (rhagosodiad 1 = AVERAGE); y dull i'w ddefnyddio i gydgrynhoi gwerthoedd unfath (amser)."
 
-#: scfuncs.hrc:3170
+#: sc/inc/scfuncs.hrc:3170
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Returns a prediction interval at the specified target value(s) for additive Exponential Smoothing method"
 msgstr "Dychwelyd cyfnod rhagweld ar werth targed penodol ar gyfer dull adiol Llyfnhau Esbonyddol"
 
-#: scfuncs.hrc:3171
+#: sc/inc/scfuncs.hrc:3171
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Target"
 msgstr "Targed"
 
-#: scfuncs.hrc:3172
+#: sc/inc/scfuncs.hrc:3172
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "The date (array) for which you want to predict a value."
 msgstr "Y dyddiad (arae) ar ei gyfer rydych am ddarogan gwerth."
 
-#: scfuncs.hrc:3173
+#: sc/inc/scfuncs.hrc:3173
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: scfuncs.hrc:3174
+#: sc/inc/scfuncs.hrc:3174
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "The data array from which you want to forecast."
 msgstr "Yr arae data o'r hyn rydych eisiau creu rhagolwg."
 
-#: scfuncs.hrc:3175
+#: sc/inc/scfuncs.hrc:3175
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Timeline"
 msgstr "Llinell Amser"
 
-#: scfuncs.hrc:3176
+#: sc/inc/scfuncs.hrc:3176
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "The date or numeric array; a consistent step between values is needed."
 msgstr "Yr arae dyddiad neu rhif: mae angen cam cyson rhwng gwerthoedd."
 
-#: scfuncs.hrc:3177
+#: sc/inc/scfuncs.hrc:3177
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Confidence level"
 msgstr "Lefel hyder"
 
-#: scfuncs.hrc:3178
+#: sc/inc/scfuncs.hrc:3178
 #, c-format
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Confidence level (default 0.95); value 0 to 1 (exclusive) for 0 to 100% calculated prediction interval."
 msgstr "Lefel hyder (rhagosodiad 0.95); gwerth 0 i 1 (anghynhwysol) ar gyfer 0 i 100% o'r cyfnod rhagfynegiad cyfrifo."
 
-#: scfuncs.hrc:3179
+#: sc/inc/scfuncs.hrc:3179
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Period length"
 msgstr "Hyd y cyfnod"
 
-#: scfuncs.hrc:3180
+#: sc/inc/scfuncs.hrc:3180
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Number of Samples in Period (default 1); length of the seasonal pattern."
 msgstr "Y Nifer o Samplau mewn Cyfnod (rhagosodiad 1); hyd y patrwm tymhorol."
 
-#: scfuncs.hrc:3181
+#: sc/inc/scfuncs.hrc:3181
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Data completion"
 msgstr "Cwblhau'r data"
 
-#: scfuncs.hrc:3182
+#: sc/inc/scfuncs.hrc:3182
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."
 msgstr "Cwblhau'r data (rhagosodiad 1); mae 0 yn cynnwys pwyntiau wedi eu colli fel sero, 1 yn rhyngosod."
 
-#: scfuncs.hrc:3183
+#: sc/inc/scfuncs.hrc:3183
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Aggregation"
 msgstr "Cydgrynhoad"
 
-#: scfuncs.hrc:3184
+#: sc/inc/scfuncs.hrc:3184
 msgctxt "SC_OPCODE_FORECAST_ETS_PIA"
 msgid "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values."
 msgstr "Cydgrynhoad (rhagosodiad 1 = AVERAGE); y dull i'w ddefnyddio i gydgrynhoi gwerthoedd unfath (amser)."
 
-#: scfuncs.hrc:3190
+#: sc/inc/scfuncs.hrc:3190
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Returns a prediction interval at the specified target value(s) for multiplicative Exponential Smoothing method"
 msgstr "Dychwelyd cyfnod rhagweld ar werth targed penodol ar gyfer dull adiol Llyfnhau Esbonyddol"
 
-#: scfuncs.hrc:3191
+#: sc/inc/scfuncs.hrc:3191
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Target"
 msgstr "Targed"
 
-#: scfuncs.hrc:3192
+#: sc/inc/scfuncs.hrc:3192
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "The date (array) for which you want to predict a value."
 msgstr "Y dyddiad (arae) ar ei gyfer rydych am rhagfynegi gwerth."
 
-#: scfuncs.hrc:3193
+#: sc/inc/scfuncs.hrc:3193
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: scfuncs.hrc:3194
+#: sc/inc/scfuncs.hrc:3194
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "The data array from which you want to forecast."
 msgstr "Yr arae data o'r hyn rydych eisiau creu rhagolwg."
 
-#: scfuncs.hrc:3195
+#: sc/inc/scfuncs.hrc:3195
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Timeline"
 msgstr "Llinell Amser"
 
-#: scfuncs.hrc:3196
+#: sc/inc/scfuncs.hrc:3196
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "The date or numeric array; a consistent step between values is needed."
 msgstr "Yr arae dyddiad neu rhif: mae angen cam cyson rhwng gwerthoedd."
 
-#: scfuncs.hrc:3197
+#: sc/inc/scfuncs.hrc:3197
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Confidence level"
 msgstr "Lefel hyder"
 
-#: scfuncs.hrc:3198
+#: sc/inc/scfuncs.hrc:3198
 #, c-format
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Confidence level (default 0.95); value 0 to 1 (exclusive) for 0 to 100% calculated prediction interval."
 msgstr "Lefel hyder (rhagosodiad 0.95); gwerth 0 i 1 (anghynhwysol) ar gyfer 0 i 100% o'r cyfnod rhagfynegiad cyfrifo."
 
-#: scfuncs.hrc:3199
+#: sc/inc/scfuncs.hrc:3199
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Period length"
 msgstr "Hyd y cyfnod"
 
-#: scfuncs.hrc:3200
+#: sc/inc/scfuncs.hrc:3200
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Number of Samples in Period (default 1); length of the seasonal pattern."
 msgstr "Y Nifer o Samplau mewn Cyfnod (rhagosodiad 1); hyd y patrwm tymhorol."
 
-#: scfuncs.hrc:3201
+#: sc/inc/scfuncs.hrc:3201
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Data completion"
 msgstr "Cwblhau'r data"
 
-#: scfuncs.hrc:3202
+#: sc/inc/scfuncs.hrc:3202
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."
 msgstr "Cwblhau'r data (rhagosodiad 1); mae 0 yn cynnwys pwyntiau wedi eu colli fel sero, 1 yn rhyngosod."
 
-#: scfuncs.hrc:3203
+#: sc/inc/scfuncs.hrc:3203
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Aggregation"
 msgstr "Cydgrynhoad"
 
-#: scfuncs.hrc:3204
+#: sc/inc/scfuncs.hrc:3204
 msgctxt "SC_OPCODE_FORECAST_ETS_PIM"
 msgid "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values."
 msgstr "Cydgrynhoad (rhagosodiad 1 = AVERAGE); y dull i'w ddefnyddio i gydgrynhoi gwerthoedd unfath (amser)."
 
-#: scfuncs.hrc:3210
+#: sc/inc/scfuncs.hrc:3210
 msgctxt "SC_OPCODE_FORECAST_ETS_SEA"
 msgid "Calculates the number of samples in period (season) using additive Exponential Triple Smoothing algorithm."
 msgstr "Cyfrifo'r nifer o samplau mewn cyfnod (tymor) gan ddefnyddio algorithm Llyfnhau Esbonyddol Triphlyg."
 
-#: scfuncs.hrc:3211
+#: sc/inc/scfuncs.hrc:3211
 msgctxt "SC_OPCODE_FORECAST_ETS_SEA"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: scfuncs.hrc:3212
+#: sc/inc/scfuncs.hrc:3212
 msgctxt "SC_OPCODE_FORECAST_ETS_SEA"
 msgid "The data array from which you want to forecast."
 msgstr "Yr arae data o'r hyn rydych eisiau creu rhagolwg."
 
-#: scfuncs.hrc:3213
+#: sc/inc/scfuncs.hrc:3213
 msgctxt "SC_OPCODE_FORECAST_ETS_SEA"
 msgid "Timeline"
 msgstr "Llinell Amser"
 
-#: scfuncs.hrc:3214
+#: sc/inc/scfuncs.hrc:3214
 msgctxt "SC_OPCODE_FORECAST_ETS_SEA"
 msgid "The date or numeric array; a consistent step between values is needed."
 msgstr "Yr arae dyddiad neu rhif: mae angen cam cyson rhwng gwerthoedd."
 
-#: scfuncs.hrc:3215
+#: sc/inc/scfuncs.hrc:3215
 msgctxt "SC_OPCODE_FORECAST_ETS_SEA"
 msgid "Data completion"
 msgstr "Cwblhau'r data"
 
-#: scfuncs.hrc:3216
+#: sc/inc/scfuncs.hrc:3216
 msgctxt "SC_OPCODE_FORECAST_ETS_SEA"
 msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."
 msgstr "Cwblhau'r data (rhagosodiad 1); mae 0 yn cynnwys pwyntiau wedi eu colli fel sero, 1 yn rhyngosod."
 
-#: scfuncs.hrc:3217
+#: sc/inc/scfuncs.hrc:3217
 msgctxt "SC_OPCODE_FORECAST_ETS_SEA"
 msgid "Aggregation"
 msgstr "Cydgrynhoad"
 
-#: scfuncs.hrc:3218
+#: sc/inc/scfuncs.hrc:3218
 msgctxt "SC_OPCODE_FORECAST_ETS_SEA"
 msgid "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values."
 msgstr "Cydgrynhoad (rhagosodiad 1 = AVERAGE); y dull i'w ddefnyddio i gydgrynhoi gwerthoedd unfath (amser)."
 
-#: scfuncs.hrc:3224
+#: sc/inc/scfuncs.hrc:3224
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Returns statistical value(s) using additive Exponential Smoothing algorithm."
 msgstr "Dychwelyd gwerthoedd ystadegol gan ddefnyddio algorithm Llyfnhau Esbonyddol."
 
-#: scfuncs.hrc:3225
+#: sc/inc/scfuncs.hrc:3225
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: scfuncs.hrc:3226
+#: sc/inc/scfuncs.hrc:3226
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "The data array from which you want to forecast."
 msgstr "Yr arae data o'r hyn rydych eisiau creu rhagolwg."
 
-#: scfuncs.hrc:3227
+#: sc/inc/scfuncs.hrc:3227
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Timeline"
 msgstr "Llinell Amser"
 
-#: scfuncs.hrc:3228
+#: sc/inc/scfuncs.hrc:3228
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "The date or numeric array; a consistent step between values is needed."
 msgstr "Yr arae dyddiad neu rhif: mae angen cam cyson rhwng gwerthoedd."
 
-#: scfuncs.hrc:3229
+#: sc/inc/scfuncs.hrc:3229
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Statistic type"
 msgstr "Math o ystadegau"
 
-#: scfuncs.hrc:3230
+#: sc/inc/scfuncs.hrc:3230
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Value (1-9) or array of values, indicating which statistic will be returned for the calculated forecast"
 msgstr "Gwerth (1-9) neu arae o werthoedd, sy'n dangos pa ystadegyn fydd yn cael ei ddychwelyd ar gyfer y rhagolwg sydd wedi ei gyfrifo"
 
-#: scfuncs.hrc:3231
+#: sc/inc/scfuncs.hrc:3231
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Period length"
 msgstr "Hyd y cyfnod"
 
-#: scfuncs.hrc:3232
+#: sc/inc/scfuncs.hrc:3232
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Number of Samples in Period (default 1); length of the seasonal pattern."
 msgstr "Y Nifer o Samplau mewn Cyfnod (rhagosodiad 1); hyd y patrwm tymhorol."
 
-#: scfuncs.hrc:3233
+#: sc/inc/scfuncs.hrc:3233
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Data completion"
 msgstr "Cwblhau'r data"
 
-#: scfuncs.hrc:3234
+#: sc/inc/scfuncs.hrc:3234
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."
 msgstr "Cwblhau'r data (rhagosodiad 1); mae 0 yn cynnwys pwyntiau wedi eu colli fel sero, 1 yn rhyngosod."
 
-#: scfuncs.hrc:3235
+#: sc/inc/scfuncs.hrc:3235
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Aggregation"
 msgstr "Cydgrynhoad"
 
-#: scfuncs.hrc:3236
+#: sc/inc/scfuncs.hrc:3236
 msgctxt "SC_OPCODE_FORECAST_ETS_STA"
 msgid "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values."
 msgstr "Cydgrynhoad (rhagosodiad 1 = AVERAGE); y dull i'w ddefnyddio i gydgrynhoi gwerthoedd unfath (amser)."
 
-#: scfuncs.hrc:3242
+#: sc/inc/scfuncs.hrc:3242
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Returns statistical value(s) using multiplicative Exponential Smoothing algorithm."
 msgstr "Dychwelyd gwerth(oedd) ystadegol drwy ddefnyddio algorithm Llyfnhau Esbonyddol lluosol."
 
-#: scfuncs.hrc:3243
+#: sc/inc/scfuncs.hrc:3243
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: scfuncs.hrc:3244
+#: sc/inc/scfuncs.hrc:3244
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "The data array from which you want to forecast."
 msgstr "Yr arae data o'r hyn rydych eisiau creu rhagolwg."
 
-#: scfuncs.hrc:3245
+#: sc/inc/scfuncs.hrc:3245
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Timeline"
 msgstr "Llinell Amser"
 
-#: scfuncs.hrc:3246
+#: sc/inc/scfuncs.hrc:3246
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "The date or numeric array; a consistent step between values is needed."
 msgstr "Yr arae dyddiad neu rhif: mae angen cam cyson rhwng gwerthoedd."
 
-#: scfuncs.hrc:3247
+#: sc/inc/scfuncs.hrc:3247
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Statistic type"
 msgstr "Math o ystadegau"
 
-#: scfuncs.hrc:3248
+#: sc/inc/scfuncs.hrc:3248
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Value (1-9) or array of values, indicating which statistic will be returned for the calculated forecast"
 msgstr "Gwerth (1-9) neu arae o werthoedd, sy'n dangos pa ystadegyn fydd yn cael ei ddychwelyd ar gyfer y rhagolwg sydd wedi ei gyfrifo"
 
-#: scfuncs.hrc:3249
+#: sc/inc/scfuncs.hrc:3249
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Period length"
 msgstr "Hyd y cyfnod"
 
-#: scfuncs.hrc:3250
+#: sc/inc/scfuncs.hrc:3250
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Number of samples in period (default 1); length of the seasonal pattern."
 msgstr "Y nifer o o samplau mewn cyfnod (rhagosodiad 1); hyd y patrwm tymhorol."
 
-#: scfuncs.hrc:3251
+#: sc/inc/scfuncs.hrc:3251
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Data completion"
 msgstr "Cwblhau'r data"
 
-#: scfuncs.hrc:3252
+#: sc/inc/scfuncs.hrc:3252
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."
 msgstr "Cwblhau'r data (rhagosodiad 1); mae 0 yn cynnwys pwyntiau wedi eu colli fel sero, 1 yn rhyngosod."
 
-#: scfuncs.hrc:3253
+#: sc/inc/scfuncs.hrc:3253
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Aggregation"
 msgstr "Cydgrynhoad"
 
-#: scfuncs.hrc:3254
+#: sc/inc/scfuncs.hrc:3254
 msgctxt "SC_OPCODE_FORECAST_ETS_STM"
 msgid "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values."
 msgstr "Cydgrynhoad (rhagosodiad 1 = AVERAGE); y dull i'w ddefnyddio i gydgrynhoi gwerthoedd unfath (amser)."
 
-#: scfuncs.hrc:3260
+#: sc/inc/scfuncs.hrc:3260
 msgctxt "SC_OPCODE_FORECAST_LIN"
 msgid "Returns a value along a linear regression"
 msgstr "Dychwelyd gwerth ar hyd atchweliad llinol"
 
-#: scfuncs.hrc:3261
+#: sc/inc/scfuncs.hrc:3261
 msgctxt "SC_OPCODE_FORECAST_LIN"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:3262
+#: sc/inc/scfuncs.hrc:3262
 msgctxt "SC_OPCODE_FORECAST_LIN"
 msgid "The X value for which the Y value on the regression linear is to be calculated."
 msgstr "Gwerth X y bydd gwerth Y ar y llinol atchweliad yn cael ei gyfrifo."
 
-#: scfuncs.hrc:3263
+#: sc/inc/scfuncs.hrc:3263
 msgctxt "SC_OPCODE_FORECAST_LIN"
 msgid "Data Y"
 msgstr "Data Y"
 
-#: scfuncs.hrc:3264
+#: sc/inc/scfuncs.hrc:3264
 msgctxt "SC_OPCODE_FORECAST_LIN"
 msgid "The Y data array."
 msgstr "Arae data Y."
 
-#: scfuncs.hrc:3265
+#: sc/inc/scfuncs.hrc:3265
 msgctxt "SC_OPCODE_FORECAST_LIN"
 msgid "Data X"
 msgstr "Data X"
 
-#: scfuncs.hrc:3266
+#: sc/inc/scfuncs.hrc:3266
 msgctxt "SC_OPCODE_FORECAST_LIN"
 msgid "The X data array."
 msgstr "Arae data X."
 
-#: scfuncs.hrc:3272
+#: sc/inc/scfuncs.hrc:3272
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "Returns the reference to a cell as text."
 msgstr "Dychwelyd cyfeiriad i gell fel testun."
 
-#: scfuncs.hrc:3273
+#: sc/inc/scfuncs.hrc:3273
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "Row"
 msgstr "Rhes"
 
-#: scfuncs.hrc:3274
+#: sc/inc/scfuncs.hrc:3274
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "The row number of the cell."
 msgstr "Rhif rhes cell."
 
-#: scfuncs.hrc:3275
+#: sc/inc/scfuncs.hrc:3275
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "Column"
 msgstr "Colofn"
 
-#: scfuncs.hrc:3276
+#: sc/inc/scfuncs.hrc:3276
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "The column number of the cell."
 msgstr "Rhif colofn cell."
 
-#: scfuncs.hrc:3277
+#: sc/inc/scfuncs.hrc:3277
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "ABS"
 msgstr "ABS"
 
-#: scfuncs.hrc:3278
+#: sc/inc/scfuncs.hrc:3278
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "Specifies whether absolute or relative referencing is to be used."
 msgstr "Pennu p'un ai cyfeiriadu absoliwt neu berthynol i'w ddefnyddio."
 
-#: scfuncs.hrc:3279
+#: sc/inc/scfuncs.hrc:3279
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "A1"
 msgstr "A1"
 
-#: scfuncs.hrc:3280
+#: sc/inc/scfuncs.hrc:3280
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "The reference style: 0 or FALSE means R1C1 style, any other value or omitted means A1 style."
 msgstr "Arddull cyfeiriad: 0 neu FALSE yn golygu arddull R1C1, unrhyw werth arall neu hepgor yn golygu arddull A1."
 
-#: scfuncs.hrc:3281
+#: sc/inc/scfuncs.hrc:3281
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "Sheet"
 msgstr "Dalen"
 
-#: scfuncs.hrc:3282
+#: sc/inc/scfuncs.hrc:3282
 msgctxt "SC_OPCODE_ADDRESS"
 msgid "The spreadsheet name of the cell reference."
 msgstr "Enw taenlen cyfeiriad y gell."
 
-#: scfuncs.hrc:3288
+#: sc/inc/scfuncs.hrc:3288
 msgctxt "SC_OPCODE_AREAS"
 msgid "Returns the number of individual ranges that belong to a (multiple) range."
 msgstr "Dychwelyd rhif ystodau unigol sy'n perthyn i ystod (lluosog)."
 
-#: scfuncs.hrc:3289
+#: sc/inc/scfuncs.hrc:3289
 msgctxt "SC_OPCODE_AREAS"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:3290
+#: sc/inc/scfuncs.hrc:3290
 msgctxt "SC_OPCODE_AREAS"
 msgid "The reference to a (multiple) range."
 msgstr "Cyfeiriad ystod (lluosog)."
 
-#: scfuncs.hrc:3296
+#: sc/inc/scfuncs.hrc:3296
 msgctxt "SC_OPCODE_CHOOSE"
 msgid "Selects a value from a list of up to 30 value arguments."
 msgstr "Dewis gwerth o restr hyd at 30 ymresymiad gwerth."
 
-#: scfuncs.hrc:3297
+#: sc/inc/scfuncs.hrc:3297
 msgctxt "SC_OPCODE_CHOOSE"
 msgid "Index"
 msgstr "Mynegai"
 
-#: scfuncs.hrc:3298
+#: sc/inc/scfuncs.hrc:3298
 msgctxt "SC_OPCODE_CHOOSE"
 msgid "The index of the value (1..30) selected."
 msgstr "Dewis gwerth mynegai (1..30)."
 
-#: scfuncs.hrc:3299
+#: sc/inc/scfuncs.hrc:3299
 msgctxt "SC_OPCODE_CHOOSE"
 msgid "Value "
 msgstr "Gwerth "
 
-#: scfuncs.hrc:3300
+#: sc/inc/scfuncs.hrc:3300
 msgctxt "SC_OPCODE_CHOOSE"
 msgid "Value 1, value 2,... The list of arguments from which a value is chosen."
 msgstr "Gwerth 1, gwerth 2,... Rhestr ymresymiadau o'r hyn dewisir y gwerth."
 
-#: scfuncs.hrc:3306
+#: sc/inc/scfuncs.hrc:3306
 msgctxt "SC_OPCODE_COLUMN"
 msgid "Returns the internal column number of a reference."
 msgstr "Dychwelyd rhif colofn fewnol cyfeiriad."
 
-#: scfuncs.hrc:3307
+#: sc/inc/scfuncs.hrc:3307
 msgctxt "SC_OPCODE_COLUMN"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:3308
+#: sc/inc/scfuncs.hrc:3308
 msgctxt "SC_OPCODE_COLUMN"
 msgid "The reference to a cell or a range."
 msgstr "Cyfeiriad i gell neu ystod."
 
-#: scfuncs.hrc:3314
+#: sc/inc/scfuncs.hrc:3314
 msgctxt "SC_OPCODE_ROW"
 msgid "Defines the internal row number of a reference."
 msgstr "Diffinio'r rhif rhes fewnol cyfeiriad."
 
-#: scfuncs.hrc:3315
+#: sc/inc/scfuncs.hrc:3315
 msgctxt "SC_OPCODE_ROW"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:3316
+#: sc/inc/scfuncs.hrc:3316
 msgctxt "SC_OPCODE_ROW"
 msgid "The reference to a cell or a range."
 msgstr "Cyfeiriad i gell neu ystod."
 
-#: scfuncs.hrc:3322
+#: sc/inc/scfuncs.hrc:3322
 msgctxt "SC_OPCODE_SHEET"
 msgid "Returns the internal sheet number of a reference or a string."
 msgstr "Dychwelyd rhif dalen fewnol cyfeiriad neu linyn."
 
-#: scfuncs.hrc:3323
+#: sc/inc/scfuncs.hrc:3323
 msgctxt "SC_OPCODE_SHEET"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:3324
+#: sc/inc/scfuncs.hrc:3324
 msgctxt "SC_OPCODE_SHEET"
 msgid "The reference to a cell or a range or the character string of a sheet name."
 msgstr "Cyfeiriad i gell neu ystod neu i linyn nodau enw dalen."
 
-#: scfuncs.hrc:3330
+#: sc/inc/scfuncs.hrc:3330
 msgctxt "SC_OPCODE_COLUMNS"
 msgid "Returns the number of columns in an array or reference."
 msgstr "Dychwelyd y nifer o golofnau mewn arae neu gyfeiriad."
 
-#: scfuncs.hrc:3331
+#: sc/inc/scfuncs.hrc:3331
 msgctxt "SC_OPCODE_COLUMNS"
 msgid "Array"
 msgstr "Arae"
 
-#: scfuncs.hrc:3332
+#: sc/inc/scfuncs.hrc:3332
 msgctxt "SC_OPCODE_COLUMNS"
 msgid "The array (reference) for which the number of columns is to be determined."
 msgstr "Arae (cyfeiriad ) y bydd nifer y colofnau yn cael eu pennu."
 
-#: scfuncs.hrc:3338
+#: sc/inc/scfuncs.hrc:3338
 msgctxt "SC_OPCODE_ROWS"
 msgid "Returns the number of rows in a reference or array."
 msgstr "Dychwelyd nifer y rhesi mewn cyfeiriad neu arae."
 
-#: scfuncs.hrc:3339
+#: sc/inc/scfuncs.hrc:3339
 msgctxt "SC_OPCODE_ROWS"
 msgid "Array"
 msgstr "Arae"
 
-#: scfuncs.hrc:3340
+#: sc/inc/scfuncs.hrc:3340
 msgctxt "SC_OPCODE_ROWS"
 msgid "The array (reference) for which the number of rows is to be determined."
 msgstr "Arae (cyfeiriad ) y bydd nifer y colofnau yn cael eu pennu."
 
-#: scfuncs.hrc:3346
+#: sc/inc/scfuncs.hrc:3346
 msgctxt "SC_OPCODE_SHEETS"
 msgid "Returns the number of sheets of a given reference. If no parameter has been entered, the total number of sheets in the document is returned."
 msgstr "Dychwelyd y nifer o ddalennau mewn cyfeiriad penodol. Os nad oes paramedr wedi ei rhoi, bydd cyfanswm y nifer o ddalennau'n cael eu dychwelyd."
 
-#: scfuncs.hrc:3347
+#: sc/inc/scfuncs.hrc:3347
 msgctxt "SC_OPCODE_SHEETS"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:3348
+#: sc/inc/scfuncs.hrc:3348
 msgctxt "SC_OPCODE_SHEETS"
 msgid "The reference to a cell or a range."
 msgstr "Cyfeiriad i gell neu ystod."
 
-#: scfuncs.hrc:3354
+#: sc/inc/scfuncs.hrc:3354
 msgctxt "SC_OPCODE_H_LOOKUP"
 msgid "Horizontal search and reference to the cells located below."
 msgstr "Chwilio llorweddol a cyfeiriadaeth i'r celloedd islaw."
 
-#: scfuncs.hrc:3355
+#: sc/inc/scfuncs.hrc:3355
 msgctxt "SC_OPCODE_H_LOOKUP"
 msgid "Search criterion"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:3356
+#: sc/inc/scfuncs.hrc:3356
 msgctxt "SC_OPCODE_H_LOOKUP"
 msgid "The value to be found in the first row."
 msgstr "Gwerth i'w ganfod yn y rhes gyntaf."
 
-#: scfuncs.hrc:3357
+#: sc/inc/scfuncs.hrc:3357
 msgctxt "SC_OPCODE_H_LOOKUP"
 msgid "Array"
 msgstr "Arae"
 
-#: scfuncs.hrc:3358
+#: sc/inc/scfuncs.hrc:3358
 msgctxt "SC_OPCODE_H_LOOKUP"
 msgid "The array or the range for the reference."
 msgstr "Arae neu ystod ar gyfer cyfeiriadaeth."
 
-#: scfuncs.hrc:3359
+#: sc/inc/scfuncs.hrc:3359
 msgctxt "SC_OPCODE_H_LOOKUP"
 msgid "Index"
 msgstr "Mynegai"
 
-#: scfuncs.hrc:3360
+#: sc/inc/scfuncs.hrc:3360
 msgctxt "SC_OPCODE_H_LOOKUP"
 msgid "The row index in the array."
 msgstr "Rhes mynegai yn yr arae."
 
-#: scfuncs.hrc:3361
+#: sc/inc/scfuncs.hrc:3361
 msgctxt "SC_OPCODE_H_LOOKUP"
 msgid "Sorted"
 msgstr "Trefnwyd"
 
-#: scfuncs.hrc:3362
+#: sc/inc/scfuncs.hrc:3362
 msgctxt "SC_OPCODE_H_LOOKUP"
 msgid "If the value is TRUE or not given, the search row of the array must be sorted in ascending order."
 msgstr "Os yw'r gwerth yn TRUE neu heb ei bennu, rhaid i'r rhes chwilio yr arae gael ei drefnu yn esgynnol."
 
-#: scfuncs.hrc:3368
+#: sc/inc/scfuncs.hrc:3368
 msgctxt "SC_OPCODE_V_LOOKUP"
 msgid "Vertical search and reference to indicated cells."
 msgstr "Chwilio fertigol a cyfeiriadaeth i gelloedd nodwyd."
 
-#: scfuncs.hrc:3369
+#: sc/inc/scfuncs.hrc:3369
 msgctxt "SC_OPCODE_V_LOOKUP"
 msgid "Search criterion"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:3370
+#: sc/inc/scfuncs.hrc:3370
 msgctxt "SC_OPCODE_V_LOOKUP"
 msgid "The value to be found in the first column."
 msgstr "Y gwerth i'w ganfod yn y golofn gyntaf."
 
-#: scfuncs.hrc:3371
+#: sc/inc/scfuncs.hrc:3371
 msgctxt "SC_OPCODE_V_LOOKUP"
 msgid "Array"
 msgstr "Arae"
 
-#: scfuncs.hrc:3372
+#: sc/inc/scfuncs.hrc:3372
 msgctxt "SC_OPCODE_V_LOOKUP"
 msgid "The array or range for referencing."
 msgstr "Arae neu ystod ar gyfer cyfeiriadaeth."
 
-#: scfuncs.hrc:3373
+#: sc/inc/scfuncs.hrc:3373
 msgctxt "SC_OPCODE_V_LOOKUP"
 msgid "Index"
 msgstr "Mynegai"
 
-#: scfuncs.hrc:3374
+#: sc/inc/scfuncs.hrc:3374
 msgctxt "SC_OPCODE_V_LOOKUP"
 msgid "Column index number in the array."
 msgstr "Rhif mynegai colofn yn yr arae."
 
-#: scfuncs.hrc:3375
+#: sc/inc/scfuncs.hrc:3375
 msgctxt "SC_OPCODE_V_LOOKUP"
 msgid "Sort order"
 msgstr "Trefn didoli"
 
-#: scfuncs.hrc:3376
+#: sc/inc/scfuncs.hrc:3376
 msgctxt "SC_OPCODE_V_LOOKUP"
 msgid "If the value is TRUE or not given, the search column of the array must be sorted in ascending order."
 msgstr "Os yw'r gwerth yn TRUE neu heb ei gynnig, bydd colofn chwilio’r arae yn cael ei drefnu yn ôl trefn esgynnol."
 
-#: scfuncs.hrc:3382
+#: sc/inc/scfuncs.hrc:3382
 msgctxt "SC_OPCODE_INDEX"
 msgid "Returns a reference to a cell from a defined range."
 msgstr "Dychwelyd cyfeiriadaeth i gell o ystod diffiniedig."
 
-#: scfuncs.hrc:3383
+#: sc/inc/scfuncs.hrc:3383
 msgctxt "SC_OPCODE_INDEX"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:3384
+#: sc/inc/scfuncs.hrc:3384
 msgctxt "SC_OPCODE_INDEX"
 msgid "The reference to a (multiple) range."
 msgstr "Cyfeiriad ystod (lluosog)."
 
-#: scfuncs.hrc:3385
+#: sc/inc/scfuncs.hrc:3385
 msgctxt "SC_OPCODE_INDEX"
 msgid "Row"
 msgstr "Rhes"
 
-#: scfuncs.hrc:3386
+#: sc/inc/scfuncs.hrc:3386
 msgctxt "SC_OPCODE_INDEX"
 msgid "The row in the range."
 msgstr "Rhes yn yr ystod."
 
-#: scfuncs.hrc:3387
+#: sc/inc/scfuncs.hrc:3387
 msgctxt "SC_OPCODE_INDEX"
 msgid "Column"
 msgstr "Colofn"
 
-#: scfuncs.hrc:3388
+#: sc/inc/scfuncs.hrc:3388
 msgctxt "SC_OPCODE_INDEX"
 msgid "The column in the range."
 msgstr "Colofn yn yr ystod."
 
-#: scfuncs.hrc:3389
+#: sc/inc/scfuncs.hrc:3389
 msgctxt "SC_OPCODE_INDEX"
 msgid "Range"
 msgstr "Ystod"
 
-#: scfuncs.hrc:3390
+#: sc/inc/scfuncs.hrc:3390
 msgctxt "SC_OPCODE_INDEX"
 msgid "The index of the subrange if referring to a multiple range."
 msgstr "Mynegai'r is ystod os yn cyfeirio i ystod lluosog."
 
-#: scfuncs.hrc:3396
+#: sc/inc/scfuncs.hrc:3396
 msgctxt "SC_OPCODE_INDIRECT"
 msgid "Returns the contents of a cell that is referenced in text form."
 msgstr "Dychwelyd cynnwys cell sydd wedi ei gyfeirio mewn ffurf testun."
 
-#: scfuncs.hrc:3397
+#: sc/inc/scfuncs.hrc:3397
 msgctxt "SC_OPCODE_INDIRECT"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:3398
+#: sc/inc/scfuncs.hrc:3398
 msgctxt "SC_OPCODE_INDIRECT"
 msgid "The cell whose contents are to be evaluated is to be referenced in text form (e.g. \"A1\")."
 msgstr "Mae'r gell y mae ei gynnwys i'w werthuso i'w gyfeirio ar ffurf testun (e.e. \"A1\")."
 
-#: scfuncs.hrc:3399
+#: sc/inc/scfuncs.hrc:3399
 msgctxt "SC_OPCODE_INDIRECT"
 msgid "A1"
 msgstr "A1"
 
-#: scfuncs.hrc:3400
+#: sc/inc/scfuncs.hrc:3400
 msgctxt "SC_OPCODE_INDIRECT"
 msgid "The reference style: 0 or FALSE means R1C1 style, any other value or omitted means A1 style."
 msgstr "Arddull cyfeiriad: 0 neu FALSE yn golygu arddull R1C1, unrhyw werth arall neu hepgor yn golygu arddull A1."
 
-#: scfuncs.hrc:3406
+#: sc/inc/scfuncs.hrc:3406
 msgctxt "SC_OPCODE_LOOKUP"
 msgid "Determines a value in a vector by comparison to values in another vector."
 msgstr "Pennu gwerth mewn fector wrth gymharu i werthoedd mewn fector arall."
 
-#: scfuncs.hrc:3407
+#: sc/inc/scfuncs.hrc:3407
 msgctxt "SC_OPCODE_LOOKUP"
 msgid "Search criterion"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:3408
+#: sc/inc/scfuncs.hrc:3408
 msgctxt "SC_OPCODE_LOOKUP"
 msgid "The value to be used for comparison."
 msgstr "Gwerth i'w ddefnyddio mewn cymhariaeth."
 
-#: scfuncs.hrc:3409
+#: sc/inc/scfuncs.hrc:3409
 msgctxt "SC_OPCODE_LOOKUP"
 msgid "Search vector"
 msgstr "Fector chwilio"
 
-#: scfuncs.hrc:3410
+#: sc/inc/scfuncs.hrc:3410
 msgctxt "SC_OPCODE_LOOKUP"
 msgid "The vector (row or column) in which to search."
 msgstr "Fector (rhes neu golofn) i'w chwilio."
 
-#: scfuncs.hrc:3411
+#: sc/inc/scfuncs.hrc:3411
 msgctxt "SC_OPCODE_LOOKUP"
 msgid "Result vector"
 msgstr "Fector canlyniad"
 
-#: scfuncs.hrc:3412
+#: sc/inc/scfuncs.hrc:3412
 msgctxt "SC_OPCODE_LOOKUP"
 msgid "The vector (row or range) from which the value is to be determined."
 msgstr "Fector (rhes neu ystod) o'r hyn bydd gwerth yn cael ei bennu."
 
-#: scfuncs.hrc:3418
+#: sc/inc/scfuncs.hrc:3418
 msgctxt "SC_OPCODE_MATCH"
 msgid "Defines a position in an array after comparing values."
 msgstr "Yn diffinio safle mewn arae wedi cymharu gwerthoedd."
 
-#: scfuncs.hrc:3419
+#: sc/inc/scfuncs.hrc:3419
 msgctxt "SC_OPCODE_MATCH"
 msgid "Search criterion"
 msgstr "Meini prawf chwilio"
 
-#: scfuncs.hrc:3420
+#: sc/inc/scfuncs.hrc:3420
 msgctxt "SC_OPCODE_MATCH"
 msgid "The value to be used for comparison."
 msgstr "Gwerth i'w ddefnyddio mewn cymhariaeth."
 
-#: scfuncs.hrc:3421
+#: sc/inc/scfuncs.hrc:3421
 msgctxt "SC_OPCODE_MATCH"
 msgid "Lookup array"
 msgstr "Arae chwilio"
 
-#: scfuncs.hrc:3422
+#: sc/inc/scfuncs.hrc:3422
 msgctxt "SC_OPCODE_MATCH"
 msgid "The array (range) in which the search is made."
 msgstr "Arae (ystodau) lle gwneir y chwilio."
 
-#: scfuncs.hrc:3423
+#: sc/inc/scfuncs.hrc:3423
 msgctxt "SC_OPCODE_MATCH"
 msgid "Type"
 msgstr "Math"
 
-#: scfuncs.hrc:3424
+#: sc/inc/scfuncs.hrc:3424
 msgctxt "SC_OPCODE_MATCH"
 msgid "Type can take the value 1, 0 or -1 and determines the criteria to be used for comparison purposes."
 msgstr "Mae'r math yn gallu cymryd gwerth 1, 0 neu -1 a phennu'r meini prawf i'w defnyddio ar gyfer pwrpas cymharu."
 
-#: scfuncs.hrc:3430
+#: sc/inc/scfuncs.hrc:3430
 msgctxt "SC_OPCODE_OFFSET"
 msgid "Returns a reference which has been moved in relation to the starting point."
 msgstr "Dychwelyd cyfeiriad sydd wedi ei symud mewn perthynas â'r man cychwyn."
 
-#: scfuncs.hrc:3431
+#: sc/inc/scfuncs.hrc:3431
 msgctxt "SC_OPCODE_OFFSET"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:3432
+#: sc/inc/scfuncs.hrc:3432
 msgctxt "SC_OPCODE_OFFSET"
 msgid "The reference (cell) from which to base the movement."
 msgstr "Cyfeiriad (cell) o le i seilio'r symudiad."
 
-#: scfuncs.hrc:3433
+#: sc/inc/scfuncs.hrc:3433
 msgctxt "SC_OPCODE_OFFSET"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: scfuncs.hrc:3434
+#: sc/inc/scfuncs.hrc:3434
 msgctxt "SC_OPCODE_OFFSET"
 msgid "The number of rows to be moved either up or down."
 msgstr "Nifer o resi i'w symud i fyny neu i lawr."
 
-#: scfuncs.hrc:3435
+#: sc/inc/scfuncs.hrc:3435
 msgctxt "SC_OPCODE_OFFSET"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: scfuncs.hrc:3436
+#: sc/inc/scfuncs.hrc:3436
 msgctxt "SC_OPCODE_OFFSET"
 msgid "The number of columns that are to be moved to the left or to the right."
 msgstr "Nifer o golofnau i'w symud i'r chwith neu i'r dde."
 
-#: scfuncs.hrc:3437
+#: sc/inc/scfuncs.hrc:3437
 msgctxt "SC_OPCODE_OFFSET"
 msgid "Height"
 msgstr "Uchder"
 
-#: scfuncs.hrc:3438
+#: sc/inc/scfuncs.hrc:3438
 msgctxt "SC_OPCODE_OFFSET"
 msgid "The number of rows of the moved reference."
 msgstr "Nifer o resi o'r cyfeiriad symudwyd."
 
-#: scfuncs.hrc:3439
+#: sc/inc/scfuncs.hrc:3439
 msgctxt "SC_OPCODE_OFFSET"
 msgid "Width"
 msgstr "Lled"
 
-#: scfuncs.hrc:3440
+#: sc/inc/scfuncs.hrc:3440
 msgctxt "SC_OPCODE_OFFSET"
 msgid "The number of columns in the moved reference."
 msgstr "Nifer y colofnau yn y cyfeiriad symudwyd."
 
-#: scfuncs.hrc:3446
+#: sc/inc/scfuncs.hrc:3446
 msgctxt "SC_OPCODE_ERROR_TYPE"
 msgid "Returns a number corresponding to an error type"
 msgstr "Dychwelyd rhif yn cyfateb i fath wall"
 
-#: scfuncs.hrc:3447
+#: sc/inc/scfuncs.hrc:3447
 msgctxt "SC_OPCODE_ERROR_TYPE"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: scfuncs.hrc:3448
+#: sc/inc/scfuncs.hrc:3448
 msgctxt "SC_OPCODE_ERROR_TYPE"
 msgid "The reference (cell) in which the error occurred."
 msgstr "Cyfeiriad (cell) lle digwyddodd y gwall."
 
-#: scfuncs.hrc:3454
+#: sc/inc/scfuncs.hrc:3454
 msgctxt "SC_OPCODE_ERROR_TYPE_ODF"
 msgid "Returns a number corresponding to one of the error values or #N/A if no error exists"
 msgstr "Yn dychwelyd rhif sy'n cyfateb i un o'r gwerthoedd gwall neu #N/A os nad oes gwall yn bod"
 
-#: scfuncs.hrc:3455
+#: sc/inc/scfuncs.hrc:3455
 msgctxt "SC_OPCODE_ERROR_TYPE_ODF"
 msgid "Expression"
 msgstr "Expression"
 
-#: scfuncs.hrc:3456
+#: sc/inc/scfuncs.hrc:3456
 msgctxt "SC_OPCODE_ERROR_TYPE_ODF"
 msgid "The error value whose identifying number you want to find. Can be the actual error value or a reference to a cell that you want to test."
 msgstr "Rhif dynodiad gwerth gwall rydych yn ceisio ei ganfod. Gall fod y gwir werth gwall neu gyfeiriad at gell rydych am ei brofi."
 
-#: scfuncs.hrc:3462
+#: sc/inc/scfuncs.hrc:3462
 msgctxt "SC_OPCODE_STYLE"
 msgid "Applies a Style to the formula cell."
 msgstr "Perthyn i Arddull mewn cell fformiwla.i."
 
-#: scfuncs.hrc:3463
+#: sc/inc/scfuncs.hrc:3463
 msgctxt "SC_OPCODE_STYLE"
 msgid "Style"
 msgstr "Arddull"
 
-#: scfuncs.hrc:3464
+#: sc/inc/scfuncs.hrc:3464
 msgctxt "SC_OPCODE_STYLE"
 msgid "The name of the Style to be applied."
 msgstr "Enw'r Arddull i'w osod."
 
-#: scfuncs.hrc:3465
+#: sc/inc/scfuncs.hrc:3465
 msgctxt "SC_OPCODE_STYLE"
 msgid "Time"
 msgstr "Amser"
 
-#: scfuncs.hrc:3466
+#: sc/inc/scfuncs.hrc:3466
 msgctxt "SC_OPCODE_STYLE"
 msgid "The time (in seconds) that the Style is to remain valid."
 msgstr "Amser (mewn eiliadau) bydd yr Arddull yn parhau'n ddilys."
 
-#: scfuncs.hrc:3467
+#: sc/inc/scfuncs.hrc:3467
 msgctxt "SC_OPCODE_STYLE"
 msgid "Style 2"
 msgstr "Arddull 2"
 
-#: scfuncs.hrc:3468
+#: sc/inc/scfuncs.hrc:3468
 msgctxt "SC_OPCODE_STYLE"
 msgid "The style to be applied after time expires."
 msgstr "Arddull i'w osod wedi i'r amser ddod i ben."
 
-#: scfuncs.hrc:3474
+#: sc/inc/scfuncs.hrc:3474
 msgctxt "SC_OPCODE_DDE"
 msgid "Result of a DDE link."
 msgstr "Canlyniad cysylltiadDDE."
 
-#: scfuncs.hrc:3475
+#: sc/inc/scfuncs.hrc:3475
 msgctxt "SC_OPCODE_DDE"
 msgid "Server"
 msgstr "Gweinydd"
 
-#: scfuncs.hrc:3476
+#: sc/inc/scfuncs.hrc:3476
 msgctxt "SC_OPCODE_DDE"
 msgid "The name of the server application."
 msgstr "Enw'r rhaglen gweinydd."
 
-#: scfuncs.hrc:3477
+#: sc/inc/scfuncs.hrc:3477
 msgctxt "SC_OPCODE_DDE"
 msgid "Topic/file"
 msgstr "Pwnc/ffeil"
 
-#: scfuncs.hrc:3478
+#: sc/inc/scfuncs.hrc:3478
 msgctxt "SC_OPCODE_DDE"
 msgid "The topic or name of the file."
 msgstr "Pwnc neu enw'r ffeil."
 
-#: scfuncs.hrc:3479
+#: sc/inc/scfuncs.hrc:3479
 msgctxt "SC_OPCODE_DDE"
 msgid "Item/range"
 msgstr "Eitem/ystod"
 
-#: scfuncs.hrc:3480
+#: sc/inc/scfuncs.hrc:3480
 msgctxt "SC_OPCODE_DDE"
 msgid "The item or range from which data is to be taken."
 msgstr "Yr eitem neu'r ystod o ble ddaw'r data."
 
-#: scfuncs.hrc:3481
+#: sc/inc/scfuncs.hrc:3481
 msgctxt "SC_OPCODE_DDE"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:3482
+#: sc/inc/scfuncs.hrc:3482
 msgctxt "SC_OPCODE_DDE"
 msgid "Defines how data is to be converted to numbers."
 msgstr "Diffinio sut mae'r data'n cael ei drosi i rifau."
 
-#: scfuncs.hrc:3488
+#: sc/inc/scfuncs.hrc:3488
 msgctxt "SC_OPCODE_HYPERLINK"
 msgid "Construct a Hyperlink."
 msgstr "Crëwch Ddolen."
 
-#: scfuncs.hrc:3489
+#: sc/inc/scfuncs.hrc:3489
 msgctxt "SC_OPCODE_HYPERLINK"
 msgid "URL"
 msgstr "URL"
 
-#: scfuncs.hrc:3490
+#: sc/inc/scfuncs.hrc:3490
 msgctxt "SC_OPCODE_HYPERLINK"
 msgid "The clickable URL."
 msgstr "URL clicadwy."
 
-#: scfuncs.hrc:3491
+#: sc/inc/scfuncs.hrc:3491
 msgctxt "SC_OPCODE_HYPERLINK"
 msgid "Cell text"
 msgstr "Testun cell"
 
-#: scfuncs.hrc:3492
+#: sc/inc/scfuncs.hrc:3492
 msgctxt "SC_OPCODE_HYPERLINK"
 msgid "The cell text to be displayed."
 msgstr "Y testun cell i'w ddangos."
 
-#: scfuncs.hrc:3498
+#: sc/inc/scfuncs.hrc:3498
 msgctxt "SC_OPCODE_GET_PIVOT_DATA"
 msgid "Extracts value(s) from a pivot table."
 msgstr "Tynnu gwerth(oedd) o'r tabl colynnog."
 
-#: scfuncs.hrc:3499
+#: sc/inc/scfuncs.hrc:3499
 msgctxt "SC_OPCODE_GET_PIVOT_DATA"
 msgid "Data field"
 msgstr "Maes data"
 
-#: scfuncs.hrc:3500
+#: sc/inc/scfuncs.hrc:3500
 msgctxt "SC_OPCODE_GET_PIVOT_DATA"
 msgid "The name of the pivot table field to extract."
 msgstr "Enw maes y tabl colynnog i'w dynnu."
 
-#: scfuncs.hrc:3501
+#: sc/inc/scfuncs.hrc:3501
 msgctxt "SC_OPCODE_GET_PIVOT_DATA"
 msgid "Pivot table"
 msgstr "Tabl colynnu"
 
-#: scfuncs.hrc:3502
+#: sc/inc/scfuncs.hrc:3502
 msgctxt "SC_OPCODE_GET_PIVOT_DATA"
 msgid "A reference to a cell or range in the pivot table."
 msgstr "Cyfeiriad i at gell neu ystod yn y tabl colynnog."
 
-#: scfuncs.hrc:3503
+#: sc/inc/scfuncs.hrc:3503
 msgctxt "SC_OPCODE_GET_PIVOT_DATA"
 msgid "Field name / item"
 msgstr "Enw maes / eitem"
 
-#: scfuncs.hrc:3504
+#: sc/inc/scfuncs.hrc:3504
 msgctxt "SC_OPCODE_GET_PIVOT_DATA"
 msgid "Field name/value pair to filter the target data."
 msgstr "Pâr enw maes/gwerth i hidlo'r data targed."
 
-#: scfuncs.hrc:3510
+#: sc/inc/scfuncs.hrc:3510
 msgctxt "SC_OPCODE_BAHTTEXT"
 msgid "Converts a number to text (Baht)."
 msgstr "Trosi rhif i destun (Baht)."
 
-#: scfuncs.hrc:3511
+#: sc/inc/scfuncs.hrc:3511
 msgctxt "SC_OPCODE_BAHTTEXT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3512
+#: sc/inc/scfuncs.hrc:3512
 msgctxt "SC_OPCODE_BAHTTEXT"
 msgid "The number to convert."
 msgstr "Y rhif i'w drosi."
 
-#: scfuncs.hrc:3518
+#: sc/inc/scfuncs.hrc:3518
 msgctxt "SC_OPCODE_JIS"
 msgid "Converts half-width ASCII and katakana characters to full-width."
 msgstr "Trosi nodau ASCII a katakana hanner lled i led llawn."
 
-#: scfuncs.hrc:3519
+#: sc/inc/scfuncs.hrc:3519
 msgctxt "SC_OPCODE_JIS"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3520
+#: sc/inc/scfuncs.hrc:3520
 msgctxt "SC_OPCODE_JIS"
 msgid "The text to convert."
 msgstr "Y testun i'w drosi."
 
-#: scfuncs.hrc:3526
+#: sc/inc/scfuncs.hrc:3526
 msgctxt "SC_OPCODE_ASC"
 msgid "Converts full-width ASCII and katakana characters to half-width."
 msgstr "Trosi nodau ASCII a katakana lled llawn i hanner lled."
 
-#: scfuncs.hrc:3527
+#: sc/inc/scfuncs.hrc:3527
 msgctxt "SC_OPCODE_ASC"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3528
+#: sc/inc/scfuncs.hrc:3528
 msgctxt "SC_OPCODE_ASC"
 msgid "The text to convert."
 msgstr "Y testun i'w drosi."
 
-#: scfuncs.hrc:3534
+#: sc/inc/scfuncs.hrc:3534
 msgctxt "SC_OPCODE_CODE"
 msgid "Returns a numeric code for the first character in a text string."
 msgstr "Dychwelyd cod rhifol ar gyfer y nod cyntaf mewn llinyn testun."
 
-#: scfuncs.hrc:3535
+#: sc/inc/scfuncs.hrc:3535
 msgctxt "SC_OPCODE_CODE"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3536
+#: sc/inc/scfuncs.hrc:3536
 msgctxt "SC_OPCODE_CODE"
 msgid "This is the text for which the code of the first character is to be found."
 msgstr "Dyma'r testun lle bydd cod y nod cyntaf yn cael ei ganfod."
 
-#: scfuncs.hrc:3542
+#: sc/inc/scfuncs.hrc:3542
 msgctxt "SC_OPCODE_CURRENCY"
 msgid "Converts a number to text in currency format."
 msgstr "Trosi rhif i destun yn fformat arian."
 
-#: scfuncs.hrc:3543
+#: sc/inc/scfuncs.hrc:3543
 msgctxt "SC_OPCODE_CURRENCY"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:3544
+#: sc/inc/scfuncs.hrc:3544
 msgctxt "SC_OPCODE_CURRENCY"
 msgid "Value is a number, a reference to a cell containing a number or a formula that results in a number."
 msgstr "Gwerth yn rhif, cyfeiriad i gell yn cynnwys rhif neu fformiwla sy'n creu rhif."
 
-#: scfuncs.hrc:3545
+#: sc/inc/scfuncs.hrc:3545
 msgctxt "SC_OPCODE_CURRENCY"
 msgid "Decimals"
 msgstr "Degolion"
 
-#: scfuncs.hrc:3546
+#: sc/inc/scfuncs.hrc:3546
 msgctxt "SC_OPCODE_CURRENCY"
 msgid "Decimal places. Denotes the number of digits to the right of the decimal point."
 msgstr "Lle degol. Dynodi'r nifer o ddigidau i'r dde o'r lle degol."
 
-#: scfuncs.hrc:3552
+#: sc/inc/scfuncs.hrc:3552
 msgctxt "SC_OPCODE_CHAR"
 msgid "Converts a code number into a character or letter."
 msgstr "Trosi'r rhif cod i nod neu lythyren."
 
-#: scfuncs.hrc:3553
+#: sc/inc/scfuncs.hrc:3553
 msgctxt "SC_OPCODE_CHAR"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3554
+#: sc/inc/scfuncs.hrc:3554
 msgctxt "SC_OPCODE_CHAR"
 msgid "The code value for the character."
 msgstr "Gwerth cod ar gyfer y nod."
 
-#: scfuncs.hrc:3560
+#: sc/inc/scfuncs.hrc:3560
 msgctxt "SC_OPCODE_CLEAN"
 msgid "Removes all nonprintable characters from text."
 msgstr "Tynnu pob nod anargraffadwy o'r testun."
 
-#: scfuncs.hrc:3561
+#: sc/inc/scfuncs.hrc:3561
 msgctxt "SC_OPCODE_CLEAN"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3562
+#: sc/inc/scfuncs.hrc:3562
 msgctxt "SC_OPCODE_CLEAN"
 msgid "The text from which nonprintable characters are to be removed."
 msgstr "Testun o le i dynnu'r nodau anargraffadwy."
 
-#: scfuncs.hrc:3568
+#: sc/inc/scfuncs.hrc:3568
 msgctxt "SC_OPCODE_CONCAT"
 msgid "Combines several text items into one."
 msgstr "Cyfuno nifer o eitemau testun yn un."
 
-#: scfuncs.hrc:3569
+#: sc/inc/scfuncs.hrc:3569
 msgctxt "SC_OPCODE_CONCAT"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3570
+#: sc/inc/scfuncs.hrc:3570
 msgctxt "SC_OPCODE_CONCAT"
 msgid "Text for the concatenation."
 msgstr "Testun ar gyfer y cydgadwynedd."
 
-#: scfuncs.hrc:3576
+#: sc/inc/scfuncs.hrc:3576
 msgctxt "SC_OPCODE_CONCAT_MS"
 msgid "Combines several text items into one, accepts cell ranges as arguments."
 msgstr "Cyfuno nifer o eitemau testun i un, derbyn ystod celloedd fel ymresymiadau."
 
-#: scfuncs.hrc:3577
+#: sc/inc/scfuncs.hrc:3577
 msgctxt "SC_OPCODE_CONCAT_MS"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3578
+#: sc/inc/scfuncs.hrc:3578
 msgctxt "SC_OPCODE_CONCAT_MS"
 msgid "Text and/or cell ranges for the concatenation."
 msgstr "Testun a/neu ystodau celloedd ar gyfer y cydgadwynedd."
 
-#: scfuncs.hrc:3584
+#: sc/inc/scfuncs.hrc:3584
 msgctxt "SC_OPCODE_TEXTJOIN_MS"
 msgid "Combines several text items into one, accepts cell ranges as arguments. Uses delimiter between items."
 msgstr "Cyfuno nifer o eitemau testun yn un, derbyn ystodau celloedd fel ymresymiadau. Defnyddio amffinydd rhwng eitemau."
 
-#: scfuncs.hrc:3585
+#: sc/inc/scfuncs.hrc:3585
 msgctxt "SC_OPCODE_TEXTJOIN_MS"
 msgid "Delimiter"
 msgstr "Amffinydd"
 
-#: scfuncs.hrc:3586
+#: sc/inc/scfuncs.hrc:3586
 msgctxt "SC_OPCODE_TEXTJOIN_MS"
 msgid "Text string to be used as delimiter."
 msgstr "Llinyn testun i'w ddefnyddio fel amffinydd."
 
-#: scfuncs.hrc:3587
+#: sc/inc/scfuncs.hrc:3587
 msgctxt "SC_OPCODE_TEXTJOIN_MS"
 msgid "Skip empty cells"
 msgstr "Hepgor celloedd gwag"
 
-#: scfuncs.hrc:3588
+#: sc/inc/scfuncs.hrc:3588
 msgctxt "SC_OPCODE_TEXTJOIN_MS"
 msgid "If TRUE, empty cells will be ignored."
 msgstr "Os TRUE, bydd celloedd gwag yn cael eu hanwybyddu."
 
-#: scfuncs.hrc:3589
+#: sc/inc/scfuncs.hrc:3589
 msgctxt "SC_OPCODE_TEXTJOIN_MS"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3590
+#: sc/inc/scfuncs.hrc:3590
 msgctxt "SC_OPCODE_TEXTJOIN_MS"
 msgid "Text and/or cell ranges for the concatenation."
 msgstr "Testun a/neu ystodau celloedd ar gyfer cydgadwynedd."
 
-#: scfuncs.hrc:3596
+#: sc/inc/scfuncs.hrc:3596
 msgctxt "SC_OPCODE_IFS_MS"
 msgid "Checks 1 or more conditions and returns a value corresponding to the first true condition."
 msgstr "Gwirio 1 neu ragor o gyflyrau a dychwelyd gwerth sy'n cyfateb i'r gwir gyflwr cyntaf."
 
-#: scfuncs.hrc:3597
+#: sc/inc/scfuncs.hrc:3597
 msgctxt "SC_OPCODE_IFS_MS"
 msgid "Test"
 msgstr "Prawf"
 
-#: scfuncs.hrc:3598
+#: sc/inc/scfuncs.hrc:3598
 msgctxt "SC_OPCODE_IFS_MS"
 msgid "Any value or expression which can be either TRUE or FALSE."
 msgstr "Unrhyw werth neu fynegiad a all fod yn TRUE neu FALSE."
 
-#: scfuncs.hrc:3599
+#: sc/inc/scfuncs.hrc:3599
 msgctxt "SC_OPCODE_IFS_MS"
 msgid "Result"
 msgstr "Canlyniad"
 
-#: scfuncs.hrc:3600
+#: sc/inc/scfuncs.hrc:3600
 msgctxt "SC_OPCODE_IFS_MS"
 msgid "The result of the function if test is TRUE."
 msgstr "Canlyniad y swyddogaeth os yw'r prawf yn TRUE."
 
-#: scfuncs.hrc:3606
+#: sc/inc/scfuncs.hrc:3606
 msgctxt "SC_OPCODE_SWITCH_MS"
 msgid "Checks 1 or more values and returns a result corresponding to the first value equal to the given expression."
 msgstr "Yn gwirio 1 neu fwy o werthoedd ac yn dychwelyd canlyniad sy'n cyfateb i werth cyntaf cyfystyr â mynegiad penodol."
 
-#: scfuncs.hrc:3607
+#: sc/inc/scfuncs.hrc:3607
 msgctxt "SC_OPCODE_SWITCH_MS"
 msgid "Expression"
 msgstr "Expression"
 
-#: scfuncs.hrc:3608
+#: sc/inc/scfuncs.hrc:3608
 msgctxt "SC_OPCODE_SWITCH_MS"
 msgid "Value that will be compared against value1-valueN."
 msgstr "Gwerth fydd yn cael ei gymharu yn erbyn value1-valueN."
 
-#: scfuncs.hrc:3609
+#: sc/inc/scfuncs.hrc:3609
 msgctxt "SC_OPCODE_SWITCH_MS"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:3610
+#: sc/inc/scfuncs.hrc:3610
 msgctxt "SC_OPCODE_SWITCH_MS"
 msgid "Value that will be compared against expression."
 msgstr "Gwerth fydd yn cael ei gymharu yn erbyn mynegiant."
 
-#: scfuncs.hrc:3611
+#: sc/inc/scfuncs.hrc:3611
 msgctxt "SC_OPCODE_SWITCH_MS"
 msgid "Result"
 msgstr "Canlyniad"
 
-#: scfuncs.hrc:3612
+#: sc/inc/scfuncs.hrc:3612
 msgctxt "SC_OPCODE_SWITCH_MS"
 msgid "Value to return when corresponding value argument matches expression."
 msgstr "Gwerth i'w ddychwelyd pan fydd y ymresymiad gwerth cyfatebol yn cyfateb i'r mynegiant."
 
-#: scfuncs.hrc:3617
+#: sc/inc/scfuncs.hrc:3617
 msgctxt "SC_OPCODE_MINIFS_MS"
 msgid "Returns the minimum value in a range that meet multiple criteria in multiple ranges."
 msgstr "Cyfansymu gwerthoedd celloedd mewn ystod sy'n cwrdd â meini prawf mewn ystodau lluosog."
 
-#: scfuncs.hrc:3618
+#: sc/inc/scfuncs.hrc:3618
 msgctxt "SC_OPCODE_MINIFS_MS"
 msgid "Min range"
 msgstr "Ystod lleiaf"
 
-#: scfuncs.hrc:3619
+#: sc/inc/scfuncs.hrc:3619
 msgctxt "SC_OPCODE_MINIFS_MS"
 msgid "The range from which the minimum will be determined."
 msgstr "Yr ystod o lle bydd y lleiafswm yn cael ei bennu."
 
-#: scfuncs.hrc:3620
+#: sc/inc/scfuncs.hrc:3620
 msgctxt "SC_OPCODE_MINIFS_MS"
 msgid "Range "
 msgstr "Ystod "
 
-#: scfuncs.hrc:3621
+#: sc/inc/scfuncs.hrc:3621
 msgctxt "SC_OPCODE_MINIFS_MS"
 msgid "Range 1, range 2,... are the ranges to be evaluated by the criteria given."
 msgstr "Ystod 1, ystod 2,... yw'r ystodau i'w gwerthuso gan y meini prawf dynodedig."
 
-#: scfuncs.hrc:3622
+#: sc/inc/scfuncs.hrc:3622
 msgctxt "SC_OPCODE_MINIFS_MS"
 msgid "Criteria "
 msgstr "Meini prawf "
 
-#: scfuncs.hrc:3623
+#: sc/inc/scfuncs.hrc:3623
 msgctxt "SC_OPCODE_MINIFS_MS"
 msgid "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given."
 msgstr "Meini Prawf 1, meini prawf 2,... yw'r meini prawf yn cael eu gosod ar yr ystod benodol."
 
-#: scfuncs.hrc:3628
+#: sc/inc/scfuncs.hrc:3628
 msgctxt "SC_OPCODE_MAXIFS_MS"
 msgid "Returns the maximum value in a range that meet multiple criteria in multiple ranges."
 msgstr "Dychwelyd y gwerth uchaf mewn ystod sy'n cwrdd â meini prawf mewn ystodau lluosog."
 
-#: scfuncs.hrc:3629
+#: sc/inc/scfuncs.hrc:3629
 msgctxt "SC_OPCODE_MAXIFS_MS"
 msgid "Max range"
 msgstr "Ystod mwyaf"
 
-#: scfuncs.hrc:3630
+#: sc/inc/scfuncs.hrc:3630
 msgctxt "SC_OPCODE_MAXIFS_MS"
 msgid "The range from which the maximum will be determined."
 msgstr "Yr ystod o ble bydd yr uchafswm yn cael ei bennu."
 
-#: scfuncs.hrc:3631
+#: sc/inc/scfuncs.hrc:3631
 msgctxt "SC_OPCODE_MAXIFS_MS"
 msgid "Range "
 msgstr "Ystod "
 
-#: scfuncs.hrc:3632
+#: sc/inc/scfuncs.hrc:3632
 msgctxt "SC_OPCODE_MAXIFS_MS"
 msgid "Range 1, range 2,... are the ranges to be evaluated by the criteria given."
 msgstr "Ystod 1, ystod 2,... yw'r ystodau i'w gwerthuso gan y meini prawf dynodedig."
 
-#: scfuncs.hrc:3633
+#: sc/inc/scfuncs.hrc:3633
 msgctxt "SC_OPCODE_MAXIFS_MS"
 msgid "Criteria "
 msgstr "Meini prawf "
 
-#: scfuncs.hrc:3634
+#: sc/inc/scfuncs.hrc:3634
 msgctxt "SC_OPCODE_MAXIFS_MS"
 msgid "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given."
 msgstr "Meini Prawf 1, meini prawf 2,... yw'r meini prawf i'w gosod i'r ystodau penodol."
 
-#: scfuncs.hrc:3640
+#: sc/inc/scfuncs.hrc:3640
 msgctxt "SC_OPCODE_EXACT"
 msgid "Specifies whether two texts are identical."
 msgstr "Enwi p'un ai yw dau destun yr un fath."
 
-#: scfuncs.hrc:3641
+#: sc/inc/scfuncs.hrc:3641
 msgctxt "SC_OPCODE_EXACT"
 msgid "Text 1"
 msgstr "Testun 1"
 
-#: scfuncs.hrc:3642
+#: sc/inc/scfuncs.hrc:3642
 msgctxt "SC_OPCODE_EXACT"
 msgid "The first text to be used for comparing texts."
 msgstr "Testun cyntaf i'w ddefnyddio ar gyfer cymharu testunau."
 
-#: scfuncs.hrc:3643
+#: sc/inc/scfuncs.hrc:3643
 msgctxt "SC_OPCODE_EXACT"
 msgid "Text 2"
 msgstr "Testun 2"
 
-#: scfuncs.hrc:3644
+#: sc/inc/scfuncs.hrc:3644
 msgctxt "SC_OPCODE_EXACT"
 msgid "The second text for comparing texts."
 msgstr "Yr ail destun ar gyfer cymharu testunau."
 
-#: scfuncs.hrc:3650
+#: sc/inc/scfuncs.hrc:3650
 msgctxt "SC_OPCODE_FIND"
 msgid "Looks for a string of text within another (case sensitive)"
 msgstr "Edrych am linyn o destun o fewn un arall (maint llythrennau dibynnol)"
 
-#: scfuncs.hrc:3651
+#: sc/inc/scfuncs.hrc:3651
 msgctxt "SC_OPCODE_FIND"
 msgid "Find text"
 msgstr "Canfod testun"
 
-#: scfuncs.hrc:3652
+#: sc/inc/scfuncs.hrc:3652
 msgctxt "SC_OPCODE_FIND"
 msgid "The text to be found."
 msgstr "Y testun i'w ganfod."
 
-#: scfuncs.hrc:3653
+#: sc/inc/scfuncs.hrc:3653
 msgctxt "SC_OPCODE_FIND"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3654
+#: sc/inc/scfuncs.hrc:3654
 msgctxt "SC_OPCODE_FIND"
 msgid "The text in which a search is to be made."
 msgstr "Testun lle fydd y chwilio'n cael ei wneud."
 
-#: scfuncs.hrc:3655
+#: sc/inc/scfuncs.hrc:3655
 msgctxt "SC_OPCODE_FIND"
 msgid "Position"
 msgstr "Safle"
 
-#: scfuncs.hrc:3656
+#: sc/inc/scfuncs.hrc:3656
 msgctxt "SC_OPCODE_FIND"
 msgid "The position in the text from which the search starts."
 msgstr "Safle o ferwn y testun lle fydd y chwilio'n cychwyn."
 
-#: scfuncs.hrc:3662
+#: sc/inc/scfuncs.hrc:3662
 msgctxt "SC_OPCODE_SEARCH"
 msgid "Looks for one text value within another (not case-sensitive)."
 msgstr "Edrych am un gwerth testun o fewn un arall (nid yn ddibynnol o)."
 
-#: scfuncs.hrc:3663
+#: sc/inc/scfuncs.hrc:3663
 msgctxt "SC_OPCODE_SEARCH"
 msgid "Find text"
 msgstr "Canfod testun"
 
-#: scfuncs.hrc:3664
+#: sc/inc/scfuncs.hrc:3664
 msgctxt "SC_OPCODE_SEARCH"
 msgid "The text to be found."
 msgstr "Y testun i'w ganfod."
 
-#: scfuncs.hrc:3665
+#: sc/inc/scfuncs.hrc:3665
 msgctxt "SC_OPCODE_SEARCH"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3666
+#: sc/inc/scfuncs.hrc:3666
 msgctxt "SC_OPCODE_SEARCH"
 msgid "The text in which a search is to be made."
 msgstr "Testun lle fydd y chwilio'n cael ei wneud."
 
-#: scfuncs.hrc:3667
+#: sc/inc/scfuncs.hrc:3667
 msgctxt "SC_OPCODE_SEARCH"
 msgid "Position"
 msgstr "Safle"
 
-#: scfuncs.hrc:3668
+#: sc/inc/scfuncs.hrc:3668
 msgctxt "SC_OPCODE_SEARCH"
 msgid "The position in the text where the search is started."
 msgstr "Safle o ferwn y testun lle fydd y chwilio'n cychwyn."
 
-#: scfuncs.hrc:3674
+#: sc/inc/scfuncs.hrc:3674
 msgctxt "SC_OPCODE_TRIM"
 msgid "Removes extra spaces from text."
 msgstr "Tynnu bylchau ychwanegol o'r testun."
 
-#: scfuncs.hrc:3675
+#: sc/inc/scfuncs.hrc:3675
 msgctxt "SC_OPCODE_TRIM"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3676
+#: sc/inc/scfuncs.hrc:3676
 msgctxt "SC_OPCODE_TRIM"
 msgid "The text in which extra spaces between words are to be deleted."
 msgstr "Testun lle fydd bylchau ychwanegol rhwng geiriau'n cael eu dileu."
 
-#: scfuncs.hrc:3682
+#: sc/inc/scfuncs.hrc:3682
 msgctxt "SC_OPCODE_PROPER"
 msgid "Capitalizes the first letter in all words."
 msgstr "Priflythrennau llythyren cyntaf pob gair."
 
-#: scfuncs.hrc:3683
+#: sc/inc/scfuncs.hrc:3683
 msgctxt "SC_OPCODE_PROPER"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3684
+#: sc/inc/scfuncs.hrc:3684
 msgctxt "SC_OPCODE_PROPER"
 msgid "The text in which the beginning of words are to be replaced by capital letters."
 msgstr "Testun lle fydd cychwyn pob gair yn cael ei newid gyda phriflythyren."
 
-#: scfuncs.hrc:3690
+#: sc/inc/scfuncs.hrc:3690
 msgctxt "SC_OPCODE_UPPER"
 msgid "Converts text to uppercase."
 msgstr "Trosi testun i lythrennau mawr."
 
-#: scfuncs.hrc:3691
+#: sc/inc/scfuncs.hrc:3691
 msgctxt "SC_OPCODE_UPPER"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3692
+#: sc/inc/scfuncs.hrc:3692
 msgctxt "SC_OPCODE_UPPER"
 msgid "The text in which lower case letters are to be converted to capitals."
 msgstr "Testun lle fydd llythrennau bach yn cael eu trosi i lythrennau mawr."
 
-#: scfuncs.hrc:3698
+#: sc/inc/scfuncs.hrc:3698
 msgctxt "SC_OPCODE_LOWER"
 msgid "Converts text to lowercase."
 msgstr "Trosi testun i lythrennau bach."
 
-#: scfuncs.hrc:3699
+#: sc/inc/scfuncs.hrc:3699
 msgctxt "SC_OPCODE_LOWER"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3700
+#: sc/inc/scfuncs.hrc:3700
 msgctxt "SC_OPCODE_LOWER"
 msgid "The text in which capitals are converted to lower case letters."
 msgstr "Testun lle mae llythrennau mawr yn cael eu trosi i lythrennau bach."
 
-#: scfuncs.hrc:3706
+#: sc/inc/scfuncs.hrc:3706
 msgctxt "SC_OPCODE_VALUE"
 msgid "Converts text to a number."
 msgstr "Trosi testun i rif."
 
-#: scfuncs.hrc:3707
+#: sc/inc/scfuncs.hrc:3707
 msgctxt "SC_OPCODE_VALUE"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3708
+#: sc/inc/scfuncs.hrc:3708
 msgctxt "SC_OPCODE_VALUE"
 msgid "The text to be converted to a number."
 msgstr "Trosi testun i rif."
 
-#: scfuncs.hrc:3714
+#: sc/inc/scfuncs.hrc:3714
 msgctxt "SC_OPCODE_TEXT"
 msgid "Converts a number to text according to a given format."
 msgstr "Trosi rhif i destun yn ôl fformat penodol."
 
-#: scfuncs.hrc:3715
+#: sc/inc/scfuncs.hrc:3715
 msgctxt "SC_OPCODE_TEXT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3716
+#: sc/inc/scfuncs.hrc:3716
 msgctxt "SC_OPCODE_TEXT"
 msgid "The numeric value to be converted."
 msgstr "Gwerth rhifol i'w drosi."
 
-#: scfuncs.hrc:3717
+#: sc/inc/scfuncs.hrc:3717
 msgctxt "SC_OPCODE_TEXT"
 msgid "Format"
 msgstr "Fformat"
 
-#: scfuncs.hrc:3718
+#: sc/inc/scfuncs.hrc:3718
 msgctxt "SC_OPCODE_TEXT"
 msgid "The text that describes the format."
 msgstr "T testun sy'n disgrifio'r fformat."
 
-#: scfuncs.hrc:3724
+#: sc/inc/scfuncs.hrc:3724
 msgctxt "SC_OPCODE_T"
 msgid "Returns a value if it is text, otherwise an empty string."
 msgstr "Trosi gwerth i destun."
 
-#: scfuncs.hrc:3725
+#: sc/inc/scfuncs.hrc:3725
 msgctxt "SC_OPCODE_T"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:3726
+#: sc/inc/scfuncs.hrc:3726
 msgctxt "SC_OPCODE_T"
 msgid "The value to be checked and returned if it is text."
 msgstr "Y gwerth i'w drosi."
 
-#: scfuncs.hrc:3732
+#: sc/inc/scfuncs.hrc:3732
 msgctxt "SC_OPCODE_REPLACE"
 msgid "Replaces characters within a text string with a different text string."
 msgstr "Newid nod o fewn llinyn testun gyda llinyn testun gwahanol."
 
-#: scfuncs.hrc:3733
+#: sc/inc/scfuncs.hrc:3733
 msgctxt "SC_OPCODE_REPLACE"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3734
+#: sc/inc/scfuncs.hrc:3734
 msgctxt "SC_OPCODE_REPLACE"
 msgid "The text in which some characters are to be replaced."
 msgstr "Testun lle mae rhai nodau i gael eu newid."
 
-#: scfuncs.hrc:3735
+#: sc/inc/scfuncs.hrc:3735
 msgctxt "SC_OPCODE_REPLACE"
 msgid "Position"
 msgstr "Safle"
 
-#: scfuncs.hrc:3736
+#: sc/inc/scfuncs.hrc:3736
 msgctxt "SC_OPCODE_REPLACE"
 msgid "The character position from which text is to be replaced."
 msgstr "Safle nod o'r hyn mae testun i gael ei newid."
 
-#: scfuncs.hrc:3737
+#: sc/inc/scfuncs.hrc:3737
 msgctxt "SC_OPCODE_REPLACE"
 msgid "Length"
 msgstr "Hyd"
 
-#: scfuncs.hrc:3738
+#: sc/inc/scfuncs.hrc:3738
 msgctxt "SC_OPCODE_REPLACE"
 msgid "The number of characters to be replaced."
 msgstr "Nifer y nodau i gael eu newid."
 
-#: scfuncs.hrc:3739
+#: sc/inc/scfuncs.hrc:3739
 msgctxt "SC_OPCODE_REPLACE"
 msgid "New text"
 msgstr "Testun newydd"
 
-#: scfuncs.hrc:3740
+#: sc/inc/scfuncs.hrc:3740
 msgctxt "SC_OPCODE_REPLACE"
 msgid "The text to be inserted."
 msgstr "Testun i'w fewnosod."
 
-#: scfuncs.hrc:3746
+#: sc/inc/scfuncs.hrc:3746
 msgctxt "SC_OPCODE_FIXED"
 msgid "Formats a number with a fixed number of places after the decimal point and thousands separator."
 msgstr "Fformatio rhif gyda rhif gosodedig o leoedd wedi'r pwynt degol ac ymwahanydd miloedd."
 
-#: scfuncs.hrc:3747
+#: sc/inc/scfuncs.hrc:3747
 msgctxt "SC_OPCODE_FIXED"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3748
+#: sc/inc/scfuncs.hrc:3748
 msgctxt "SC_OPCODE_FIXED"
 msgid "The number to be formatted."
 msgstr "Rhif i'w fformatio."
 
-#: scfuncs.hrc:3749
+#: sc/inc/scfuncs.hrc:3749
 msgctxt "SC_OPCODE_FIXED"
 msgid "Decimals"
 msgstr "Degolion"
 
-#: scfuncs.hrc:3750
+#: sc/inc/scfuncs.hrc:3750
 msgctxt "SC_OPCODE_FIXED"
 msgid "Decimal places. The number of fixed decimal places that are to be displayed."
 msgstr "Lleoedd degol. Nifer y lleoedd degol gosodedig i'w dangos."
 
-#: scfuncs.hrc:3751
+#: sc/inc/scfuncs.hrc:3751
 msgctxt "SC_OPCODE_FIXED"
 msgid "No thousands separators"
 msgstr "Dim arwahanydd miloedd"
 
-#: scfuncs.hrc:3752
+#: sc/inc/scfuncs.hrc:3752
 msgctxt "SC_OPCODE_FIXED"
 msgid "Thousands separator. If 0 or omitted the locale group separator is used else the separator is suppressed."
 msgstr "Ymwahanydd miloedd. Os yn 0 neu wedi ei hepgor bydd ymwahanydd grŵp locale yn cael ei ddefnyddio neu bydd yr ymwahanydd wedi ei atal."
 
-#: scfuncs.hrc:3758
+#: sc/inc/scfuncs.hrc:3758
 msgctxt "SC_OPCODE_LEN"
 msgid "Calculates length of a text string."
 msgstr "Cyfrifo hyd linyn testun."
 
-#: scfuncs.hrc:3759
+#: sc/inc/scfuncs.hrc:3759
 msgctxt "SC_OPCODE_LEN"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3760
+#: sc/inc/scfuncs.hrc:3760
 msgctxt "SC_OPCODE_LEN"
 msgid "The text in which the length is to be determined."
 msgstr "Testun y mae ei hyd i'w bennu."
 
-#: scfuncs.hrc:3766
+#: sc/inc/scfuncs.hrc:3766
 msgctxt "SC_OPCODE_LEFT"
 msgid "Returns the first character or characters of a text."
 msgstr "Dychwelyd y nod neu nodau cyntaf y testun."
 
-#: scfuncs.hrc:3767
+#: sc/inc/scfuncs.hrc:3767
 msgctxt "SC_OPCODE_LEFT"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3768
+#: sc/inc/scfuncs.hrc:3768
 msgctxt "SC_OPCODE_LEFT"
 msgid "The text where the initial partial words are to be determined."
 msgstr "Testun lle mae'r geiriau rhannol cyntaf i'w pennu."
 
-#: scfuncs.hrc:3769
+#: sc/inc/scfuncs.hrc:3769
 msgctxt "SC_OPCODE_LEFT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3770
+#: sc/inc/scfuncs.hrc:3770
 msgctxt "SC_OPCODE_LEFT"
 msgid "The number of characters for the start text."
 msgstr "Nifer nodau'r testun cychwynnol."
 
-#: scfuncs.hrc:3776
+#: sc/inc/scfuncs.hrc:3776
 msgctxt "SC_OPCODE_RIGHT"
 msgid "Returns the last character or characters of a text."
 msgstr "Dychwelyd y nod neu nodau olaf y testun."
 
-#: scfuncs.hrc:3777
+#: sc/inc/scfuncs.hrc:3777
 msgctxt "SC_OPCODE_RIGHT"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3778
+#: sc/inc/scfuncs.hrc:3778
 msgctxt "SC_OPCODE_RIGHT"
 msgid "The text in which the end partial words are to be determined."
 msgstr "Testun y bydd geiriau rhannol diwedd yn cael eu pennu."
 
-#: scfuncs.hrc:3779
+#: sc/inc/scfuncs.hrc:3779
 msgctxt "SC_OPCODE_RIGHT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3780
+#: sc/inc/scfuncs.hrc:3780
 msgctxt "SC_OPCODE_RIGHT"
 msgid "The number of characters for the end text."
 msgstr "Nifer o nodau ar gyfer diwedd y testun."
 
-#: scfuncs.hrc:3786
+#: sc/inc/scfuncs.hrc:3786
 msgctxt "SC_OPCODE_MID"
 msgid "Returns a partial text string of a text."
 msgstr "Dychwelyd llinyn testun rhannol o destun."
 
-#: scfuncs.hrc:3787
+#: sc/inc/scfuncs.hrc:3787
 msgctxt "SC_OPCODE_MID"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3788
+#: sc/inc/scfuncs.hrc:3788
 msgctxt "SC_OPCODE_MID"
 msgid "The text in which partial words are to be determined."
 msgstr "Testun y bydd geiriau rhannol diwedd yn cael eu pennu."
 
-#: scfuncs.hrc:3789
+#: sc/inc/scfuncs.hrc:3789
 msgctxt "SC_OPCODE_MID"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: scfuncs.hrc:3790
+#: sc/inc/scfuncs.hrc:3790
 msgctxt "SC_OPCODE_MID"
 msgid "The position from which the part word is to be determined."
 msgstr "Safle y bydd geiriau rhannol diwedd yn cael eu pennu."
 
-#: scfuncs.hrc:3791
+#: sc/inc/scfuncs.hrc:3791
 msgctxt "SC_OPCODE_MID"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3792
+#: sc/inc/scfuncs.hrc:3792
 msgctxt "SC_OPCODE_MID"
 msgid "The number of characters for the text."
 msgstr "Nifer y nodau ar gyfer y testun."
 
-#: scfuncs.hrc:3798
+#: sc/inc/scfuncs.hrc:3798
 msgctxt "SC_OPCODE_REPT"
 msgid "Repeats text a given number of times."
 msgstr "Ailadrodd testun nifer penodol o weithiau."
 
-#: scfuncs.hrc:3799
+#: sc/inc/scfuncs.hrc:3799
 msgctxt "SC_OPCODE_REPT"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3800
+#: sc/inc/scfuncs.hrc:3800
 msgctxt "SC_OPCODE_REPT"
 msgid "The text to be repeated."
 msgstr "Testun i'w ailadrodd."
 
-#: scfuncs.hrc:3801
+#: sc/inc/scfuncs.hrc:3801
 msgctxt "SC_OPCODE_REPT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3802
+#: sc/inc/scfuncs.hrc:3802
 msgctxt "SC_OPCODE_REPT"
 msgid "The number of times the text is to be repeated."
 msgstr "Nifer o weithiau bydd y testun yn cael ei ailadrodd."
 
-#: scfuncs.hrc:3808
+#: sc/inc/scfuncs.hrc:3808
 msgctxt "SC_OPCODE_SUBSTITUTE"
 msgid "Substitutes new text for old text in a string."
 msgstr "Newid testun newydd yn lle hen destun mewn llinyn."
 
-#: scfuncs.hrc:3809
+#: sc/inc/scfuncs.hrc:3809
 msgctxt "SC_OPCODE_SUBSTITUTE"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3810
+#: sc/inc/scfuncs.hrc:3810
 msgctxt "SC_OPCODE_SUBSTITUTE"
 msgid "The text in which partial words are to be replaced."
 msgstr "Testun y bydd geiriau rhannol yn cael eu newid."
 
-#: scfuncs.hrc:3811
+#: sc/inc/scfuncs.hrc:3811
 msgctxt "SC_OPCODE_SUBSTITUTE"
 msgid "Search text"
 msgstr "Testun chwilio"
 
-#: scfuncs.hrc:3812
+#: sc/inc/scfuncs.hrc:3812
 msgctxt "SC_OPCODE_SUBSTITUTE"
 msgid "The partial string to be (repeatedly) replaced."
 msgstr "Llinyn rhannol i'w newid (dro ar ôl tro)."
 
-#: scfuncs.hrc:3813
+#: sc/inc/scfuncs.hrc:3813
 msgctxt "SC_OPCODE_SUBSTITUTE"
 msgid "New text"
 msgstr "Testun newydd"
 
-#: scfuncs.hrc:3814
+#: sc/inc/scfuncs.hrc:3814
 msgctxt "SC_OPCODE_SUBSTITUTE"
 msgid "The text which is to replace the text string."
 msgstr "Testun i newid y llinyn testun."
 
-#: scfuncs.hrc:3815
+#: sc/inc/scfuncs.hrc:3815
 msgctxt "SC_OPCODE_SUBSTITUTE"
 msgid "Occurrence"
 msgstr "Digwyddiad"
 
-#: scfuncs.hrc:3816
+#: sc/inc/scfuncs.hrc:3816
 msgctxt "SC_OPCODE_SUBSTITUTE"
 msgid "Which occurrence of the old text is to be replaced."
 msgstr "Pa enghraifft o'r hen destun i'w newid."
 
-#: scfuncs.hrc:3822
+#: sc/inc/scfuncs.hrc:3822
 msgctxt "SC_OPCODE_BASE"
 msgid "Converts a positive integer to text from a number system to the base defined."
 msgstr "Trosi cyfanrif positif i destun o system rifol i'r sail diffiniedig."
 
-#: scfuncs.hrc:3823
+#: sc/inc/scfuncs.hrc:3823
 msgctxt "SC_OPCODE_BASE"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3824
+#: sc/inc/scfuncs.hrc:3824
 msgctxt "SC_OPCODE_BASE"
 msgid "The number to be converted."
 msgstr "Rhif i'w drosi."
 
-#: scfuncs.hrc:3825
+#: sc/inc/scfuncs.hrc:3825
 msgctxt "SC_OPCODE_BASE"
 msgid "Radix"
 msgstr "Radics"
 
-#: scfuncs.hrc:3826
+#: sc/inc/scfuncs.hrc:3826
 msgctxt "SC_OPCODE_BASE"
 msgid "The base number for conversion must be in the range 2 - 36."
 msgstr "Rhaid i'r rhif sail ar gyfer trosi fod o fewn ystod 2 - 36."
 
-#: scfuncs.hrc:3827
+#: sc/inc/scfuncs.hrc:3827
 msgctxt "SC_OPCODE_BASE"
 msgid "Minimum length"
 msgstr "Lleiafswm hyd"
 
-#: scfuncs.hrc:3828
+#: sc/inc/scfuncs.hrc:3828
 msgctxt "SC_OPCODE_BASE"
 msgid "If the text is shorter than the specified length, zeros are added to the left of the string."
 msgstr "Os yw'r testun yn llain na'r hyd pennwyd, bydd sero yn cael eu hychwanegu i'r chwith o'r llinyn."
 
-#: scfuncs.hrc:3834
+#: sc/inc/scfuncs.hrc:3834
 msgctxt "SC_OPCODE_DECIMAL"
 msgid "Converts a text of a specified number system to a positive integer in the base given."
 msgstr "Trosi testun o system rhif penodol i gyfanrif positif yn y sail roddwyd."
 
-#: scfuncs.hrc:3835
+#: sc/inc/scfuncs.hrc:3835
 msgctxt "SC_OPCODE_DECIMAL"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3836
+#: sc/inc/scfuncs.hrc:3836
 msgctxt "SC_OPCODE_DECIMAL"
 msgid "The text to be converted."
 msgstr "Y testun i'w gyfieithu."
 
-#: scfuncs.hrc:3837
+#: sc/inc/scfuncs.hrc:3837
 msgctxt "SC_OPCODE_DECIMAL"
 msgid "Radix"
 msgstr "Radics"
 
-#: scfuncs.hrc:3838
+#: sc/inc/scfuncs.hrc:3838
 msgctxt "SC_OPCODE_DECIMAL"
 msgid "The base number for conversion must be in the range 2 - 36."
 msgstr "Rhaid i'r rhif sail ar gyfer trosi fod o fewn ystod 2 - 36."
 
-#: scfuncs.hrc:3844
+#: sc/inc/scfuncs.hrc:3844
 msgctxt "SC_OPCODE_CONVERT_OOO"
 msgid "Converts a value according to a conversion table in the configuration (main.xcd)."
 msgstr "Trosi gwerth yn ôl tabl trosi yn y ffurfweddiad (main.xcd)."
 
-#: scfuncs.hrc:3845
+#: sc/inc/scfuncs.hrc:3845
 msgctxt "SC_OPCODE_CONVERT_OOO"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:3846
+#: sc/inc/scfuncs.hrc:3846
 msgctxt "SC_OPCODE_CONVERT_OOO"
 msgid "The value to be converted."
 msgstr "Y gwerth i'w drosi."
 
-#: scfuncs.hrc:3847 /home/cl/vc/git/libo-core/sc/inc/scfuncs.hrc:3849
+#: sc/inc/scfuncs.hrc:3847 sc/inc/scfuncs.hrc:3849
 msgctxt "SC_OPCODE_CONVERT_OOO"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3848
+#: sc/inc/scfuncs.hrc:3848
 msgctxt "SC_OPCODE_CONVERT_OOO"
 msgid "Unit from which something is converted, case-sensitive."
 msgstr "Uned o'r hyn droswyd, bach neu fawr yn arwyddocaol."
 
-#: scfuncs.hrc:3850
+#: sc/inc/scfuncs.hrc:3850
 msgctxt "SC_OPCODE_CONVERT_OOO"
 msgid "Unit into which something is converted, case-sensitive."
 msgstr "Uned i'r hwn y bydd rhywbeth yn cael ei drosi, sensitif i faint llythyren."
 
-#: scfuncs.hrc:3856
+#: sc/inc/scfuncs.hrc:3856
 msgctxt "SC_OPCODE_ROMAN"
 msgid "Converts a number to a Roman numeral."
 msgstr "Trosi rhif i rif Rhufeinig."
 
-#: scfuncs.hrc:3857
+#: sc/inc/scfuncs.hrc:3857
 msgctxt "SC_OPCODE_ROMAN"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3858
+#: sc/inc/scfuncs.hrc:3858
 msgctxt "SC_OPCODE_ROMAN"
 msgid "The number to be converted to a Roman numeral must be in the 0 - 3999 range."
 msgstr "Rhaid i'r rhif i'w drosi yn rhif Rhufeinig fod o fewn ystod 0 - 3999."
 
-#: scfuncs.hrc:3859
+#: sc/inc/scfuncs.hrc:3859
 msgctxt "SC_OPCODE_ROMAN"
 msgid "Mode"
 msgstr "Modd"
 
-#: scfuncs.hrc:3860
+#: sc/inc/scfuncs.hrc:3860
 msgctxt "SC_OPCODE_ROMAN"
 msgid "The more this value increases, the more the Roman numeral is simplified. The value must be in the 0 - 4 range."
 msgstr "Po fwyaf mae'r gwerth yn cynyddu, mwyaf syml fydd y rhif Rhufeinig. Rhaid i'r gwerth fod yn ystod 0 - 4."
 
-#: scfuncs.hrc:3866
+#: sc/inc/scfuncs.hrc:3866
 msgctxt "SC_OPCODE_ARABIC"
 msgid "Calculates the value of a Roman numeral."
 msgstr "Cyfrifo gwerth rhif Rhufeinig."
 
-#: scfuncs.hrc:3867
+#: sc/inc/scfuncs.hrc:3867
 msgctxt "SC_OPCODE_ARABIC"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3868
+#: sc/inc/scfuncs.hrc:3868
 msgctxt "SC_OPCODE_ARABIC"
 msgid "The text that represents a Roman numeral."
 msgstr "Testun sy'n cynrychioli rhif Rhufeinig."
 
-#: scfuncs.hrc:3873
+#: sc/inc/scfuncs.hrc:3873
 msgctxt "SC_OPCODE_INFO"
 msgid "Returns information about the environment."
 msgstr "Cynhyrchu gwybodaeth am yr amgylchedd."
 
-#: scfuncs.hrc:3874
+#: sc/inc/scfuncs.hrc:3874
 msgctxt "SC_OPCODE_INFO"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3875
+#: sc/inc/scfuncs.hrc:3875
 msgctxt "SC_OPCODE_INFO"
 msgid "Can be \"osversion\", \"system\", \"release\", \"numfile\", and \"recalc\"."
 msgstr "Gall fod yn \"osversion\", \"system\", \"release\", \"numfile\", a \"recalc\"."
 
-#: scfuncs.hrc:3880
+#: sc/inc/scfuncs.hrc:3880
 msgctxt "SC_OPCODE_UNICODE"
 msgid "Returns the numeric code for the first Unicode character in a text string."
 msgstr "Dychwelyd y cod rhifo ar gyfer y nod Unicode cyntaf yn y llinyn testun."
 
-#: scfuncs.hrc:3881
+#: sc/inc/scfuncs.hrc:3881
 msgctxt "SC_OPCODE_UNICODE"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3882
+#: sc/inc/scfuncs.hrc:3882
 msgctxt "SC_OPCODE_UNICODE"
 msgid "This is the text for which the code of the first character is to be found."
 msgstr "Dyma'r testun lle bydd cod y nod cyntaf yn cael ei ganfod."
 
-#: scfuncs.hrc:3887
+#: sc/inc/scfuncs.hrc:3887
 msgctxt "SC_OPCODE_UNICHAR"
 msgid "Converts a code number into a Unicode character or letter."
 msgstr "Trosi rhif cod i nod Unicode neu lythyren."
 
-#: scfuncs.hrc:3888
+#: sc/inc/scfuncs.hrc:3888
 msgctxt "SC_OPCODE_UNICHAR"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3889
+#: sc/inc/scfuncs.hrc:3889
 msgctxt "SC_OPCODE_UNICHAR"
 msgid "The code value for the character."
 msgstr "Gwerth cod ar gyfer y nod."
 
-#: scfuncs.hrc:3894
+#: sc/inc/scfuncs.hrc:3894
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "Converts a value from one to another Euro currency."
 msgstr "Trosi gwerth o un arian Euro i'r llall."
 
-#: scfuncs.hrc:3895
+#: sc/inc/scfuncs.hrc:3895
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:3896
+#: sc/inc/scfuncs.hrc:3896
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "The value to be converted."
 msgstr "Y gwerth i'w drosi."
 
-#: scfuncs.hrc:3897
+#: sc/inc/scfuncs.hrc:3897
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "From currency"
 msgstr "O arian"
 
-#: scfuncs.hrc:3898
+#: sc/inc/scfuncs.hrc:3898
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "ISO 4217 code of the currency from which is converted, case-sensitive."
 msgstr "Cod ISO 4217 yr arian o'r hyn droswyd, bach neu fawr yn arwyddocaol."
 
-#: scfuncs.hrc:3899
+#: sc/inc/scfuncs.hrc:3899
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "To currency"
 msgstr "i arian"
 
-#: scfuncs.hrc:3900
+#: sc/inc/scfuncs.hrc:3900
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "ISO 4217 code of the currency into which is converted, case-sensitive."
 msgstr "Cod ISO 4217 yr arian i'r hyn droswyd, bach neu fawr yn arwyddocaol."
 
-#: scfuncs.hrc:3901
+#: sc/inc/scfuncs.hrc:3901
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "Full precision"
 msgstr "manylder llawn"
 
-#: scfuncs.hrc:3902
+#: sc/inc/scfuncs.hrc:3902
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "If omitted or 0 or FALSE, the result is rounded to the decimals of To_currency. Else the result is not rounded."
 msgstr "Os hepgorwyd neu 0 neu FALSE, mae'r canlyniad yn cael ei dalgrynnu i ddegolion To_currency. Fel arall nid yw'r canlyniad yn cael ei dalgrynnu."
 
-#: scfuncs.hrc:3903
+#: sc/inc/scfuncs.hrc:3903
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "Triangulation precision"
 msgstr "Manylder triongliant"
 
 #. This description uses almost all available space in the dialog, make sure translations fit in size
-#: scfuncs.hrc:3905
+#: sc/inc/scfuncs.hrc:3905
 msgctxt "SC_OPCODE_EUROCONVERT"
 msgid "If given and >=3, the intermediate result of a triangular conversion is rounded to that precision. If omitted, the result is not rounded."
 msgstr "Os yw'r penodol a >=3, mae'r canlyniad canolog y trosiad trionglog yn cael ei dalgrynnu i'r manylder hynny. Os hepgorwyd, nid yw'r canlyniad yn cael ei dalgrynnu."
 
-#: scfuncs.hrc:3910
+#: sc/inc/scfuncs.hrc:3910
 msgctxt "SC_OPCODE_NUMBERVALUE"
 msgid "Converts text to a number, in a locale-independent way."
 msgstr "Trosi testun i rif, mewn dull locale annibynnol."
 
-#: scfuncs.hrc:3911
+#: sc/inc/scfuncs.hrc:3911
 msgctxt "SC_OPCODE_NUMBERVALUE"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3912
+#: sc/inc/scfuncs.hrc:3912
 msgctxt "SC_OPCODE_NUMBERVALUE"
 msgid "The text to be converted to a number."
 msgstr "Trosi testun i rif."
 
-#: scfuncs.hrc:3913
+#: sc/inc/scfuncs.hrc:3913
 msgctxt "SC_OPCODE_NUMBERVALUE"
 msgid "Decimal separator"
 msgstr "Ymwahanydd degol"
 
-#: scfuncs.hrc:3914
+#: sc/inc/scfuncs.hrc:3914
 msgctxt "SC_OPCODE_NUMBERVALUE"
 msgid "Defines the character used as the decimal separator."
 msgstr "Diffinio'r nod sy'n cael ei ddefnyddio fel gwahanydd degol."
 
-#: scfuncs.hrc:3915
+#: sc/inc/scfuncs.hrc:3915
 msgctxt "SC_OPCODE_NUMBERVALUE"
 msgid "Group separator"
 msgstr "Ymwahanydd grŵp"
 
-#: scfuncs.hrc:3916
+#: sc/inc/scfuncs.hrc:3916
 msgctxt "SC_OPCODE_NUMBERVALUE"
 msgid "Defines the character(s) used as the group separator."
 msgstr "Diffinio'r nod(au) sy'n cael eu defnyddio fel gwahanydd grŵp."
 
-#: scfuncs.hrc:3922
+#: sc/inc/scfuncs.hrc:3922
 msgctxt "SC_OPCODE_BITAND"
 msgid "Bitwise \"AND\" of two integers."
 msgstr "Modd did \"AND\" dau gyfanrif."
 
-#: scfuncs.hrc:3923
+#: sc/inc/scfuncs.hrc:3923
 msgctxt "SC_OPCODE_BITAND"
 msgid "Number1"
 msgstr "Rhif1"
 
-#: scfuncs.hrc:3924 /home/cl/vc/git/libo-core/sc/inc/scfuncs.hrc:3926
+#: sc/inc/scfuncs.hrc:3924 sc/inc/scfuncs.hrc:3926
 msgctxt "SC_OPCODE_BITAND"
 msgid "Positive integer less than 2^48."
 msgstr "Cyfanrif positif llai na 2^48."
 
-#: scfuncs.hrc:3925
+#: sc/inc/scfuncs.hrc:3925
 msgctxt "SC_OPCODE_BITAND"
 msgid "Number2"
 msgstr "Rhif2"
 
-#: scfuncs.hrc:3931
+#: sc/inc/scfuncs.hrc:3931
 msgctxt "SC_OPCODE_BITOR"
 msgid "Bitwise \"OR\" of two integers."
 msgstr "Modd did \"OR\" o ddau gyfanrif."
 
-#: scfuncs.hrc:3932
+#: sc/inc/scfuncs.hrc:3932
 msgctxt "SC_OPCODE_BITOR"
 msgid "Number1"
 msgstr "Rhif1"
 
-#: scfuncs.hrc:3933 /home/cl/vc/git/libo-core/sc/inc/scfuncs.hrc:3935
+#: sc/inc/scfuncs.hrc:3933 sc/inc/scfuncs.hrc:3935
 msgctxt "SC_OPCODE_BITOR"
 msgid "Positive integer less than 2^48."
 msgstr "Cyfanrif positif llai na 2^48."
 
-#: scfuncs.hrc:3934
+#: sc/inc/scfuncs.hrc:3934
 msgctxt "SC_OPCODE_BITOR"
 msgid "Number2"
 msgstr "Rhif2"
 
-#: scfuncs.hrc:3940
+#: sc/inc/scfuncs.hrc:3940
 msgctxt "SC_OPCODE_BITXOR"
 msgid "Bitwise \"exclusive OR\" of two integers."
 msgstr "Modd did \"exclusive OR\" o ddau gyfanrif."
 
-#: scfuncs.hrc:3941
+#: sc/inc/scfuncs.hrc:3941
 msgctxt "SC_OPCODE_BITXOR"
 msgid "Number1"
 msgstr "Rhif1"
 
-#: scfuncs.hrc:3942 /home/cl/vc/git/libo-core/sc/inc/scfuncs.hrc:3944
+#: sc/inc/scfuncs.hrc:3942 sc/inc/scfuncs.hrc:3944
 msgctxt "SC_OPCODE_BITXOR"
 msgid "Positive integer less than 2^48."
 msgstr "Cyfanrif positif llai na 2^48."
 
-#: scfuncs.hrc:3943
+#: sc/inc/scfuncs.hrc:3943
 msgctxt "SC_OPCODE_BITXOR"
 msgid "Number2"
 msgstr "Rhif2"
 
-#: scfuncs.hrc:3949
+#: sc/inc/scfuncs.hrc:3949
 msgctxt "SC_OPCODE_BITRSHIFT"
 msgid "Bitwise right shift of an integer value."
 msgstr "Modd did shifft de o werth cyfanrif."
 
-#: scfuncs.hrc:3950
+#: sc/inc/scfuncs.hrc:3950
 msgctxt "SC_OPCODE_BITRSHIFT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3951
+#: sc/inc/scfuncs.hrc:3951
 msgctxt "SC_OPCODE_BITRSHIFT"
 msgid "The value to be shifted. Positive integer less than 2^48."
 msgstr "Y gwerth i'w shifftio. Cyfanrif positif llai na 2^48."
 
-#: scfuncs.hrc:3952
+#: sc/inc/scfuncs.hrc:3952
 msgctxt "SC_OPCODE_BITRSHIFT"
 msgid "Shift"
 msgstr "Shifft"
 
-#: scfuncs.hrc:3953
+#: sc/inc/scfuncs.hrc:3953
 msgctxt "SC_OPCODE_BITRSHIFT"
 msgid "The integer number of bits the value is to be shifted."
 msgstr "Rhif cyfanrif o ddidau y gwerth i'w shifftio."
 
-#: scfuncs.hrc:3958
+#: sc/inc/scfuncs.hrc:3958
 msgctxt "SC_OPCODE_BITLSHIFT"
 msgid "Bitwise left shift of an integer value."
 msgstr "Shifft chwith modd did o werth cyfanrif."
 
-#: scfuncs.hrc:3959
+#: sc/inc/scfuncs.hrc:3959
 msgctxt "SC_OPCODE_BITLSHIFT"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3960
+#: sc/inc/scfuncs.hrc:3960
 msgctxt "SC_OPCODE_BITLSHIFT"
 msgid "The value to be shifted. Positive integer less than 2^48."
 msgstr "Y gwerth i'w shifftio. Cyfanrif positif llai na 2^48."
 
-#: scfuncs.hrc:3961
+#: sc/inc/scfuncs.hrc:3961
 msgctxt "SC_OPCODE_BITLSHIFT"
 msgid "Shift"
 msgstr "Shifft"
 
-#: scfuncs.hrc:3962
+#: sc/inc/scfuncs.hrc:3962
 msgctxt "SC_OPCODE_BITLSHIFT"
 msgid "The integer number of bits the value is to be shifted."
 msgstr "Rhif cyfanrif o ddidau y gwerth i'w shifftio."
 
-#: scfuncs.hrc:3967
+#: sc/inc/scfuncs.hrc:3967
 msgctxt "SC_OPCODE_LENB"
 msgid "Calculates length of a text string, with DBCS"
 msgstr "Cyfrifo hyd linyn testun, gyda DBCS"
 
-#: scfuncs.hrc:3968
+#: sc/inc/scfuncs.hrc:3968
 msgctxt "SC_OPCODE_LENB"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3969
+#: sc/inc/scfuncs.hrc:3969
 msgctxt "SC_OPCODE_LENB"
 msgid "The text in which the length is to be determined."
 msgstr "Testun y mae ei hyd i'w bennu."
 
-#: scfuncs.hrc:3974
+#: sc/inc/scfuncs.hrc:3974
 msgctxt "SC_OPCODE_RIGHTB"
 msgid "Returns the last character or characters of a text,with DBCS"
 msgstr "Dychwelyd y nod neu nodau olaf y testun, gyda DBCS"
 
-#: scfuncs.hrc:3975
+#: sc/inc/scfuncs.hrc:3975
 msgctxt "SC_OPCODE_RIGHTB"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3976
+#: sc/inc/scfuncs.hrc:3976
 msgctxt "SC_OPCODE_RIGHTB"
 msgid "The text in which the end partial words are to be determined."
 msgstr "Testun y bydd geiriau rhannol diwedd yn cael eu pennu."
 
-#: scfuncs.hrc:3977
+#: sc/inc/scfuncs.hrc:3977
 msgctxt "SC_OPCODE_RIGHTB"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3978
+#: sc/inc/scfuncs.hrc:3978
 msgctxt "SC_OPCODE_RIGHTB"
 msgid "The number of characters for the end text."
 msgstr "Nifer o nodau ar gyfer diwedd y testun."
 
-#: scfuncs.hrc:3983
+#: sc/inc/scfuncs.hrc:3983
 msgctxt "SC_OPCODE_LEFTB"
 msgid "Returns the first character or characters of a text,with DBCS"
 msgstr "Dychwelyd y nod neu nodau cyntaf y testun, dyda DBCS"
 
-#: scfuncs.hrc:3984
+#: sc/inc/scfuncs.hrc:3984
 msgctxt "SC_OPCODE_LEFTB"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3985
+#: sc/inc/scfuncs.hrc:3985
 msgctxt "SC_OPCODE_LEFTB"
 msgid "The text where the initial partial words are to be determined."
 msgstr "Testun lle mae'r geiriau rhannol cyntaf i'w pennu."
 
-#: scfuncs.hrc:3986
+#: sc/inc/scfuncs.hrc:3986
 msgctxt "SC_OPCODE_LEFTB"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3987
+#: sc/inc/scfuncs.hrc:3987
 msgctxt "SC_OPCODE_LEFTB"
 msgid "The number of characters for the start text."
 msgstr "Nifer nodau'r testun cychwynnol."
 
-#: scfuncs.hrc:3992
+#: sc/inc/scfuncs.hrc:3992
 msgctxt "SC_OPCODE_MIDB"
 msgid "Returns a partial text string of a text, with DBCS"
 msgstr "Dychwelyd llinyn testun rhannol o destun, gyda DBCS"
 
-#: scfuncs.hrc:3993
+#: sc/inc/scfuncs.hrc:3993
 msgctxt "SC_OPCODE_MIDB"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:3994
+#: sc/inc/scfuncs.hrc:3994
 msgctxt "SC_OPCODE_MIDB"
 msgid "The text in which partial words are to be determined."
 msgstr "Testun y bydd geiriau rhannol diwedd yn cael eu pennu."
 
-#: scfuncs.hrc:3995
+#: sc/inc/scfuncs.hrc:3995
 msgctxt "SC_OPCODE_MIDB"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: scfuncs.hrc:3996
+#: sc/inc/scfuncs.hrc:3996
 msgctxt "SC_OPCODE_MIDB"
 msgid "The position from which the part word is to be determined."
 msgstr "Safle y bydd geiriau rhannol diwedd yn cael eu pennu."
 
-#: scfuncs.hrc:3997
+#: sc/inc/scfuncs.hrc:3997
 msgctxt "SC_OPCODE_MIDB"
 msgid "Number"
 msgstr "Rhif"
 
-#: scfuncs.hrc:3998
+#: sc/inc/scfuncs.hrc:3998
 msgctxt "SC_OPCODE_MIDB"
 msgid "The number of characters for the text."
 msgstr "Nifer nodau'r testun cychwynnol."
 
-#: scfuncs.hrc:4003
+#: sc/inc/scfuncs.hrc:4003
 msgctxt "SC_OPCODE_FILTERXML"
 msgid "Apply an XPath expression to an XML document"
 msgstr "Gosod mynegiad XPath i ddogfen XML"
 
-#: scfuncs.hrc:4004
+#: sc/inc/scfuncs.hrc:4004
 msgctxt "SC_OPCODE_FILTERXML"
 msgid "XML Document"
 msgstr "Dogfen XML"
 
-#: scfuncs.hrc:4005
+#: sc/inc/scfuncs.hrc:4005
 msgctxt "SC_OPCODE_FILTERXML"
 msgid "String containing a valid XML stream"
 msgstr "Mae'r llinyn yn cynnwys llif XML dilys"
 
-#: scfuncs.hrc:4006
+#: sc/inc/scfuncs.hrc:4006
 msgctxt "SC_OPCODE_FILTERXML"
 msgid "XPath expression"
 msgstr "Mynegiad XPath"
 
-#: scfuncs.hrc:4007
+#: sc/inc/scfuncs.hrc:4007
 msgctxt "SC_OPCODE_FILTERXML"
 msgid "String containing a valid XPath expression"
 msgstr "Mae'r llinyn yn cynnwys mynegiant XPath"
 
-#: scfuncs.hrc:4012
+#: sc/inc/scfuncs.hrc:4012
 msgctxt "SC_OPCODE_COLOR"
 msgid "Returns an implementation defined value representing a RGBA color"
 msgstr "Yn dychwelyd gweithrediad gwerth diffiniedig sy'n cynrychioli lliw RGBA"
 
-#: scfuncs.hrc:4013
+#: sc/inc/scfuncs.hrc:4013
 msgctxt "SC_OPCODE_COLOR"
 msgid "Red"
 msgstr "Coch"
 
-#: scfuncs.hrc:4014
+#: sc/inc/scfuncs.hrc:4014
 msgctxt "SC_OPCODE_COLOR"
 msgid "Value of red"
 msgstr "Gwerth y coch"
 
-#: scfuncs.hrc:4015
+#: sc/inc/scfuncs.hrc:4015
 msgctxt "SC_OPCODE_COLOR"
 msgid "Green"
 msgstr "Gwyrdd"
 
-#: scfuncs.hrc:4016
+#: sc/inc/scfuncs.hrc:4016
 msgctxt "SC_OPCODE_COLOR"
 msgid "Value of green"
 msgstr "Gwerth y gwyrdd"
 
-#: scfuncs.hrc:4017
+#: sc/inc/scfuncs.hrc:4017
 msgctxt "SC_OPCODE_COLOR"
 msgid "Blue"
 msgstr "Glas"
 
-#: scfuncs.hrc:4018
+#: sc/inc/scfuncs.hrc:4018
 msgctxt "SC_OPCODE_COLOR"
 msgid "Value of blue"
 msgstr "Gwerth y glas"
 
-#: scfuncs.hrc:4019
+#: sc/inc/scfuncs.hrc:4019
 msgctxt "SC_OPCODE_COLOR"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: scfuncs.hrc:4020
+#: sc/inc/scfuncs.hrc:4020
 msgctxt "SC_OPCODE_COLOR"
 msgid "Value of alpha"
 msgstr "Gwerth alffa"
 
-#: scfuncs.hrc:4025
+#: sc/inc/scfuncs.hrc:4025
 msgctxt "SC_OPCODE_WEBSERVICE"
 msgid "Get some webcontent from an URI."
 msgstr "Estyn cynnwys gwe o URI."
 
-#: scfuncs.hrc:4026
+#: sc/inc/scfuncs.hrc:4026
 msgctxt "SC_OPCODE_WEBSERVICE"
 msgid "URI"
 msgstr "URI"
 
-#: scfuncs.hrc:4027
+#: sc/inc/scfuncs.hrc:4027
 msgctxt "SC_OPCODE_WEBSERVICE"
 msgid "URI of the webservice"
 msgstr "URI gwasanaeth gwe"
 
-#: scfuncs.hrc:4032
+#: sc/inc/scfuncs.hrc:4032
 msgctxt "SC_OPCODE_ENCODEURL"
 msgid "Return a URL-encoded string."
 msgstr "Dychwelyd llinyn wedi ei amgodio gydag URL."
 
-#: scfuncs.hrc:4033
+#: sc/inc/scfuncs.hrc:4033
 msgctxt "SC_OPCODE_ENCODEURL"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:4034
+#: sc/inc/scfuncs.hrc:4034
 msgctxt "SC_OPCODE_ENCODEURL"
 msgid "A string to be URL-encoded"
 msgstr "Llinyn i'w amgodio gydag URL"
 
-#: scfuncs.hrc:4039
+#: sc/inc/scfuncs.hrc:4039
 msgctxt "SC_OPCODE_ERF_MS"
 msgid "Returns the error function."
 msgstr "Dychwelyd swyddogaeth gwall."
 
-#: scfuncs.hrc:4040
+#: sc/inc/scfuncs.hrc:4040
 msgctxt "SC_OPCODE_ERF_MS"
 msgid "Lower limit"
 msgstr "Terfyn isaf"
 
-#: scfuncs.hrc:4041
+#: sc/inc/scfuncs.hrc:4041
 msgctxt "SC_OPCODE_ERF_MS"
 msgid "The lower limit for integration"
 msgstr "Terfyn isaf ar gyfer integriad"
 
-#: scfuncs.hrc:4046
+#: sc/inc/scfuncs.hrc:4046
 msgctxt "SC_OPCODE_ERFC_MS"
 msgid "Returns the complementary error function."
 msgstr "Dychwelyd gwerth gwall cyflenwol."
 
-#: scfuncs.hrc:4047
+#: sc/inc/scfuncs.hrc:4047
 msgctxt "SC_OPCODE_ERFC_MS"
 msgid "Lower limit"
 msgstr "Terfyn isaf"
 
-#: scfuncs.hrc:4048
+#: sc/inc/scfuncs.hrc:4048
 msgctxt "SC_OPCODE_ERFC_MS"
 msgid "The lower limit for integration"
 msgstr "Terfyn isaf ar gyfer integriad"
 
-#: scfuncs.hrc:4053
+#: sc/inc/scfuncs.hrc:4053
 msgctxt "SC_OPCODE_RAWSUBTRACT"
 msgid "Returns the subtraction of numbers. Like a-b-c but without eliminating small roundoff errors."
 msgstr "Dychwelyd tynnu'r rhifau. Fel a-b-c ond heb ddileu'r gwallau talgrynnu bach."
 
-#: scfuncs.hrc:4054
+#: sc/inc/scfuncs.hrc:4054
 msgctxt "SC_OPCODE_RAWSUBTRACT"
 msgid "Minuend"
 msgstr "Minwend"
 
-#: scfuncs.hrc:4055
+#: sc/inc/scfuncs.hrc:4055
 msgctxt "SC_OPCODE_RAWSUBTRACT"
 msgid "Number from which following arguments are subtracted."
 msgstr "Y rhif y bydd yr ymresymiadau canlynol yn cael eu tynnu ohono."
 
-#: scfuncs.hrc:4056
+#: sc/inc/scfuncs.hrc:4056
 msgctxt "SC_OPCODE_RAWSUBTRACT"
 msgid "Subtrahend "
 msgstr "Isdrahend "
 
-#: scfuncs.hrc:4057
+#: sc/inc/scfuncs.hrc:4057
 msgctxt "SC_OPCODE_RAWSUBTRACT"
 msgid "Subtrahend 1, subtrahend 2, ... are numerical arguments subtracted from the minuend."
 msgstr "Mae subtrahend 1, subtrahend 2, ... yn ymresymiadau rhifol wedi ei eu tynnu o'r minwend."
 
-#: scfuncs.hrc:4063
+#: sc/inc/scfuncs.hrc:4063
 msgctxt "SC_OPCODE_ROUNDSIG"
 msgid "Rounds a number to predefined significant digits."
 msgstr "Talgrynnu rhif i ddigidau arwyddocaol rhagddiffiniedig."
 
-#: scfuncs.hrc:4064
+#: sc/inc/scfuncs.hrc:4064
 msgctxt "SC_OPCODE_ROUNDSIG"
 msgid "Value"
 msgstr "Gwerth"
 
-#: scfuncs.hrc:4065
+#: sc/inc/scfuncs.hrc:4065
 msgctxt "SC_OPCODE_ROUNDSIG"
 msgid "The number to be rounded."
 msgstr "Y rhif i'w dalgrynnu."
 
-#: scfuncs.hrc:4066
+#: sc/inc/scfuncs.hrc:4066
 msgctxt "SC_OPCODE_ROUNDSIG"
 msgid "Digits"
 msgstr "Digidau"
 
-#: scfuncs.hrc:4067
+#: sc/inc/scfuncs.hrc:4067
 msgctxt "SC_OPCODE_ROUNDSIG"
 msgid "The number of significant digits to which value is to be rounded."
 msgstr "Y nifer o ddigidau arwyddocaol i'r hyn y mae'r gwerth yn cael ei dalgrynnu."
 
-#: scfuncs.hrc:4072
+#: sc/inc/scfuncs.hrc:4072
 msgctxt "SC_OPCODE_REPLACEB"
 msgid "Replaces characters within a text string with a different text string, with DBCS."
 msgstr "Yn newid nod o fewn llinyn testun gyda llinyn testun gwahanol, gyda DBCS."
 
-#: scfuncs.hrc:4073
+#: sc/inc/scfuncs.hrc:4073
 msgctxt "SC_OPCODE_REPLACEB"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:4074
+#: sc/inc/scfuncs.hrc:4074
 msgctxt "SC_OPCODE_REPLACEB"
 msgid "The text in which some characters are to be replaced."
 msgstr "Testun lle mae rhai nodau i gael eu newid."
 
-#: scfuncs.hrc:4075
+#: sc/inc/scfuncs.hrc:4075
 msgctxt "SC_OPCODE_REPLACEB"
 msgid "Position"
 msgstr "Safle"
 
-#: scfuncs.hrc:4076
+#: sc/inc/scfuncs.hrc:4076
 msgctxt "SC_OPCODE_REPLACEB"
 msgid "The character position from which text is to be replaced."
 msgstr "Safle nod o'r hyn mae testun i gael ei newid."
 
-#: scfuncs.hrc:4077
+#: sc/inc/scfuncs.hrc:4077
 msgctxt "SC_OPCODE_REPLACEB"
 msgid "Length"
 msgstr "Hyd"
 
-#: scfuncs.hrc:4078
+#: sc/inc/scfuncs.hrc:4078
 msgctxt "SC_OPCODE_REPLACEB"
 msgid "The number of characters to be replaced."
 msgstr "Nifer y nodau i gael eu newid."
 
-#: scfuncs.hrc:4079
+#: sc/inc/scfuncs.hrc:4079
 msgctxt "SC_OPCODE_REPLACEB"
 msgid "New text"
 msgstr "Testun newydd"
 
-#: scfuncs.hrc:4080
+#: sc/inc/scfuncs.hrc:4080
 msgctxt "SC_OPCODE_REPLACEB"
 msgid "The text to be inserted."
 msgstr "Testun i'w fewnosod."
 
-#: scfuncs.hrc:4086
+#: sc/inc/scfuncs.hrc:4086
 msgctxt "SC_OPCODE_FINDB"
 msgid "Looks for a string of text within another (case sensitive), using byte positions."
 msgstr "Edrych am linyn o destun o fewn un arall (maint llythrennau dibynnol) gan ddefnyddio safleoedd didau."
 
-#: scfuncs.hrc:4087
+#: sc/inc/scfuncs.hrc:4087
 msgctxt "SC_OPCODE_FINDB"
 msgid "Find text"
 msgstr "Canfod testun"
 
-#: scfuncs.hrc:4088
+#: sc/inc/scfuncs.hrc:4088
 msgctxt "SC_OPCODE_FINDB"
 msgid "The text to be found."
 msgstr "Y testun i'w ganfod."
 
-#: scfuncs.hrc:4089
+#: sc/inc/scfuncs.hrc:4089
 msgctxt "SC_OPCODE_FINDB"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:4090
+#: sc/inc/scfuncs.hrc:4090
 msgctxt "SC_OPCODE_FINDB"
 msgid "The text in which a search is to be made."
 msgstr "Testun lle fydd y chwilio'n cael ei wneud."
 
-#: scfuncs.hrc:4091
+#: sc/inc/scfuncs.hrc:4091
 msgctxt "SC_OPCODE_FINDB"
 msgid "Position"
 msgstr "Safle"
 
-#: scfuncs.hrc:4092
+#: sc/inc/scfuncs.hrc:4092
 msgctxt "SC_OPCODE_FINDB"
 msgid "The position in the text from which the search starts."
 msgstr "Safle o fewn y testun lle fydd y chwilio'n cychwyn."
 
-#: scfuncs.hrc:4098
+#: sc/inc/scfuncs.hrc:4098
 msgctxt "SC_OPCODE_SEARCHB"
 msgid "Looks for a string of text within another (not case sensitive), using byte positions."
 msgstr "Edrych am linyn o destun o fewn un arall (maint llythrennau dibynnol) gan ddefnyddio safleoedd didau."
 
-#: scfuncs.hrc:4099
+#: sc/inc/scfuncs.hrc:4099
 msgctxt "SC_OPCODE_SEARCHB"
 msgid "Find text"
 msgstr "Canfod testun"
 
-#: scfuncs.hrc:4100
+#: sc/inc/scfuncs.hrc:4100
 msgctxt "SC_OPCODE_SEARCHB"
 msgid "The text to be found."
 msgstr "Y testun i'w ganfod."
 
-#: scfuncs.hrc:4101
+#: sc/inc/scfuncs.hrc:4101
 msgctxt "SC_OPCODE_SEARCHB"
 msgid "Text"
 msgstr "Testun"
 
-#: scfuncs.hrc:4102
+#: sc/inc/scfuncs.hrc:4102
 msgctxt "SC_OPCODE_SEARCHB"
 msgid "The text in which a search is to be made."
 msgstr "Testun lle fydd y chwilio'n cael ei wneud."
 
-#: scfuncs.hrc:4103
+#: sc/inc/scfuncs.hrc:4103
 msgctxt "SC_OPCODE_SEARCHB"
 msgid "Position"
 msgstr "Safle"
 
-#: scfuncs.hrc:4104
+#: sc/inc/scfuncs.hrc:4104
 msgctxt "SC_OPCODE_SEARCHB"
 msgid "The position in the text from which the search starts."
 msgstr "Safle o ferwn y testun lle fydd y chwilio'n cychwyn."
 
-#: scstyles.hrc:29
+#: sc/inc/scstyles.hrc:29
 msgctxt "RID_CELLSTYLEFAMILY"
 msgid "All Styles"
 msgstr "Pob Arddull"
 
-#: scstyles.hrc:30
+#: sc/inc/scstyles.hrc:30
 msgctxt "RID_CELLSTYLEFAMILY"
 msgid "Hidden Styles"
 msgstr "Arddulliau Cudd"
 
-#: scstyles.hrc:31
+#: sc/inc/scstyles.hrc:31
 msgctxt "RID_CELLSTYLEFAMILY"
 msgid "Applied Styles"
 msgstr "Arddulliau Gosodedig"
 
-#: scstyles.hrc:32
+#: sc/inc/scstyles.hrc:32
 msgctxt "RID_CELLSTYLEFAMILY"
 msgid "Custom Styles"
 msgstr "Arddulliau Cyfaddas"
 
-#: scstyles.hrc:38
+#: sc/inc/scstyles.hrc:38
 msgctxt "RID_PAGESTYLEFAMILY"
 msgid "All Styles"
 msgstr "Pob Arddull"
 
-#: scstyles.hrc:39
+#: sc/inc/scstyles.hrc:39
 msgctxt "RID_PAGESTYLEFAMILY"
 msgid "Hidden Styles"
 msgstr "Arddulliau Cudd"
 
-#: scstyles.hrc:40
+#: sc/inc/scstyles.hrc:40
 msgctxt "RID_PAGESTYLEFAMILY"
 msgid "Custom Styles"
 msgstr "Arddull Cyfaddas"
 
 #. Strings for interface names -------------------------------------------
-#: strings.hrc:27
+#: sc/inc/strings.hrc:27
+msgctxt "SCSTR_LONG_SCDOC_NAME"
+msgid "%PRODUCTNAME Spreadsheet format (calc6)"
+msgstr "Fformat Taenlen %PRODUCTNAME (calc6)"
+
+#: sc/inc/strings.hrc:28
 msgctxt "SCSTR_LONG_SCDOC_NAME"
 msgid "%PRODUCTNAME %PRODUCTVERSION Spreadsheet"
 msgstr "Taenlen %PRODUCTNAME %PRODUCTVERSION"
 
-#: strings.hrc:28
+#: sc/inc/strings.hrc:29
 msgctxt "SCSTR_SHORT_SCDOC_NAME"
 msgid "Spreadsheet"
 msgstr "Taenlen"
 
-#: strings.hrc:29
+#: sc/inc/strings.hrc:30
 msgctxt "SCSTR_UNDEFINED"
 msgid "- undefined -"
 msgstr "- anniffiniedig -"
 
-#: strings.hrc:30
+#: sc/inc/strings.hrc:31
 msgctxt "SCSTR_NONE"
 msgid "- none -"
 msgstr "- dim -"
 
-#: strings.hrc:31
+#: sc/inc/strings.hrc:32
 msgctxt "SCSTR_ALL"
 msgid "- all -"
 msgstr "- pob -"
 
-#: strings.hrc:32
+#: sc/inc/strings.hrc:33
 msgctxt "SCSTR_MULTIPLE"
 msgid "- multiple -"
 msgstr "- lluosog -"
 
-#: strings.hrc:33
+#: sc/inc/strings.hrc:34
 msgctxt "SCSTR_STDFILTER"
 msgid "Standard Filter..."
 msgstr "Hidl Safonol..."
 
-#: strings.hrc:34
+#: sc/inc/strings.hrc:35
 msgctxt "SCSTR_TOP10FILTER"
 msgid "Top 10"
 msgstr "10 Uchaf"
 
-#: strings.hrc:35
+#: sc/inc/strings.hrc:36
 msgctxt "SCSTR_FILTER_EMPTY"
 msgid "Empty"
 msgstr "Gwag"
 
-#: strings.hrc:36
+#: sc/inc/strings.hrc:37
 msgctxt "SCSTR_FILTER_NOTEMPTY"
 msgid "Not Empty"
 msgstr "Ddim yn Wag"
 
-#: strings.hrc:37
+#: sc/inc/strings.hrc:38
 msgctxt "SCSTR_NONAME"
 msgid "unnamed"
 msgstr "dienw"
 
 #. "%1 is replaced to column letter, such as 'Column A'"
-#: strings.hrc:39
+#: sc/inc/strings.hrc:40
 msgctxt "SCSTR_COLUMN"
 msgid "Column %1"
 msgstr "Colofn %1"
 
 #. "%1 is replaced to row number, such as 'Row 1'"
-#: strings.hrc:41
+#: sc/inc/strings.hrc:42
 msgctxt "SCSTR_ROW"
 msgid "Row %1"
 msgstr "Rhes %1"
 
-#: strings.hrc:42
+#: sc/inc/strings.hrc:43
 msgctxt "SCSTR_TABLE"
 msgid "Sheet"
 msgstr "Dalen"
 
-#: strings.hrc:43
+#: sc/inc/strings.hrc:44
 msgctxt "SCSTR_NAME"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:44
+#: sc/inc/strings.hrc:45
 msgctxt "SCSTR_APDTABLE"
 msgid "Append Sheet"
 msgstr "Atodi Dalen"
 
-#: strings.hrc:45
+#: sc/inc/strings.hrc:46
 msgctxt "SCSTR_RENAMETAB"
 msgid "Rename Sheet"
 msgstr "Ailenwi Dalen"
 
-#: strings.hrc:46
+#: sc/inc/strings.hrc:47
 msgctxt "SCSTR_SET_TAB_BG_COLOR"
 msgid "Tab Color"
 msgstr "Lliw Tab"
 
-#: strings.hrc:47
+#: sc/inc/strings.hrc:48
 msgctxt "SCSTR_NO_TAB_BG_COLOR"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: strings.hrc:48
+#: sc/inc/strings.hrc:49
 msgctxt "SCSTR_RENAMEOBJECT"
 msgid "Name Object"
 msgstr "Enwi Gwrthrych"
 
-#: strings.hrc:49
+#: sc/inc/strings.hrc:50
 msgctxt "STR_INSERTGRAPHIC"
 msgid "Insert Image"
 msgstr "Mewnosod Delwedd"
 
-#: strings.hrc:50
+#: sc/inc/strings.hrc:51
+msgctxt "STR_QUERYROTATION"
+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?"
+
+#: sc/inc/strings.hrc:52
 msgctxt "SCSTR_TOTAL"
 msgid "%1 results found"
 msgstr "%1 canlyniad wedi'u canfod"
 
-#: strings.hrc:51
+#: sc/inc/strings.hrc:53
 msgctxt "SCSTR_SKIPPED"
 msgid "(only %1 are listed)"
 msgstr "(dim ond %1 sy'n cael eu rhestru)"
 
 #. Attribute
-#: strings.hrc:53
+#: sc/inc/strings.hrc:55
 msgctxt "SCSTR_PROTECTDOC"
 msgid "Protect Document"
 msgstr "Diogelu Dogfen"
 
-#: strings.hrc:54
+#: sc/inc/strings.hrc:56
 msgctxt "SCSTR_UNPROTECTDOC"
 msgid "Unprotect document"
 msgstr "Dad-diogelu dogfen"
 
-#: strings.hrc:55
+#: sc/inc/strings.hrc:57
 msgctxt "SCSTR_UNPROTECTTAB"
 msgid "Unprotect sheet"
 msgstr "Dad-ddiogelu'r ddalen"
 
-#: strings.hrc:56
+#: sc/inc/strings.hrc:58
 msgctxt "SCSTR_CHG_PROTECT"
 msgid "Protect Records"
 msgstr "Diogelu Cofnodion"
 
-#: strings.hrc:57
+#: sc/inc/strings.hrc:59
 msgctxt "SCSTR_CHG_UNPROTECT"
 msgid "Unprotect Records"
 msgstr "Dad-ddiogelu dogfen"
 
-#: strings.hrc:58
+#: sc/inc/strings.hrc:60
 msgctxt "SCSTR_PASSWORD"
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: strings.hrc:59
+#: sc/inc/strings.hrc:61
 msgctxt "SCSTR_PASSWORDOPT"
 msgid "Password (optional):"
 msgstr "Cyfrinair (dewisol):"
 
-#: strings.hrc:60
+#: sc/inc/strings.hrc:62
 msgctxt "SCSTR_WRONGPASSWORD"
 msgid "Incorrect Password"
 msgstr "Cyfrinair Anghywir"
 
-#: strings.hrc:61
+#: sc/inc/strings.hrc:63
 msgctxt "SCSTR_END"
 msgid "~End"
 msgstr "~Diwedd"
 
-#: strings.hrc:62
+#: sc/inc/strings.hrc:64
 msgctxt "SCSTR_UNKNOWN"
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: strings.hrc:63
+#: sc/inc/strings.hrc:65
 msgctxt "SCSTR_VALID_MINIMUM"
 msgid "~Minimum"
 msgstr "~Lleiaf"
 
-#: strings.hrc:64
+#: sc/inc/strings.hrc:66
 msgctxt "SCSTR_VALID_MAXIMUM"
 msgid "~Maximum"
 msgstr "~Mwyaf"
 
-#: strings.hrc:65
+#: sc/inc/strings.hrc:67
 msgctxt "SCSTR_VALID_VALUE"
 msgid "~Value"
 msgstr "~Gwerth"
 
-#: strings.hrc:66
+#: sc/inc/strings.hrc:68
 msgctxt "SCSTR_VALID_RANGE"
 msgid "~Source"
 msgstr "~Ffynhonnell"
 
-#: strings.hrc:67
+#: sc/inc/strings.hrc:69
 msgctxt "SCSTR_VALID_LIST"
 msgid "~Entries"
 msgstr "~Cofnodion"
 
 #. for dialogues:
-#: strings.hrc:69
+#: sc/inc/strings.hrc:71
 msgctxt "SCSTR_CHARSET_USER"
 msgid "System"
 msgstr "System"
 
-#: strings.hrc:70
+#: sc/inc/strings.hrc:72
 msgctxt "SCSTR_COLUMN_USER"
 msgid "Standard;Text;Date (DMY);Date (MDY);Date (YMD);US English;Hide"
 msgstr "Safonol;Testun;Dyddiad (DMB);Dyddiad (MDB);Dyddiad (BMD);US English;Cuddio"
 
-#: strings.hrc:71
+#: sc/inc/strings.hrc:73
 msgctxt "SCSTR_FIELDSEP_TAB"
 msgid "Tab"
 msgstr "Tab"
 
-#: strings.hrc:72
+#: sc/inc/strings.hrc:74
 msgctxt "SCSTR_FIELDSEP_SPACE"
 msgid "space"
 msgstr "bwlch"
 
-#: strings.hrc:73
+#: sc/inc/strings.hrc:75
 msgctxt "SCSTR_FORMULA_AUTOCORRECTION"
 msgid ""
 "%PRODUCTNAME Calc found an error in the formula entered.\n"
@@ -13785,1458 +13750,1476 @@ msgstr ""
 "Hoffech chi dderbyn y cyfeiriad sy'n cael ei gynnig?\n"
 "\n"
 
-#: strings.hrc:74
+#: sc/inc/strings.hrc:76
 msgctxt "SCSTR_UNDO_GRAFFILTER"
 msgid "Image Filter"
 msgstr "Hidl Delwedd"
 
-#: strings.hrc:75
+#: sc/inc/strings.hrc:77
 msgctxt "STR_CAPTION_DEFAULT_TEXT"
 msgid "Text"
 msgstr "Testun"
 
 #. Select tables dialog title
-#: strings.hrc:77
+#: sc/inc/strings.hrc:79
 msgctxt "STR_DLG_SELECTTABLES_TITLE"
 msgid "Select Sheets"
 msgstr "Dewis Dalenni"
 
 #. Select tables dialog listbox
-#: strings.hrc:79
+#: sc/inc/strings.hrc:81
 msgctxt "STR_DLG_SELECTTABLES_LBNAME"
 msgid "~Selected sheets"
 msgstr "~Dalenni dewiswyd"
 
-#: strings.hrc:80
-msgctxt "STR_REPLCELLSWARN"
-msgid ""
-"You are pasting data into cells that already contain data.\n"
-"Do you really want to overwrite the existing data?"
-msgstr ""
-"Rydych yn gludo data mewn celloedd sy'n cynnwys data'n barod.\n"
-"Ydych chi wir am drosysgrifo'r ddata presennol?"
-
-#: strings.hrc:81
+#: sc/inc/strings.hrc:82
 msgctxt "STR_ACC_CSVRULER_NAME"
 msgid "Ruler"
 msgstr "Mesurydd"
 
-#: strings.hrc:82
+#: sc/inc/strings.hrc:83
 msgctxt "STR_ACC_CSVRULER_DESCR"
 msgid "This ruler manages objects at fixed positions."
 msgstr "Mae'r mesurydd yn rheoli gwrthrychau ar bwyntiau gosodedig."
 
-#: strings.hrc:83
+#: sc/inc/strings.hrc:84
 msgctxt "STR_ACC_CSVGRID_NAME"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: strings.hrc:84
+#: sc/inc/strings.hrc:85
 msgctxt "STR_ACC_CSVGRID_DESCR"
 msgid "This sheet shows how the data will be arranged in the document."
 msgstr "Bydd y ddalen yn dangos sut mae'r data'n cael ei drefnu yn y ddogfen."
 
-#: strings.hrc:85
+#: sc/inc/strings.hrc:86
 msgctxt "STR_ACC_DOC_NAME"
 msgid "Document view"
 msgstr "Golwg dogfen"
 
-#: strings.hrc:86
+#: sc/inc/strings.hrc:87
 msgctxt "STR_ACC_TABLE_NAME"
 msgid "Sheet %1"
 msgstr "Dalen %1"
 
-#: strings.hrc:87
+#: sc/inc/strings.hrc:88
 msgctxt "STR_ACC_CELL_NAME"
 msgid "Cell %1"
 msgstr "Cell %1"
 
-#: strings.hrc:88
+#: sc/inc/strings.hrc:89
 msgctxt "STR_ACC_LEFTAREA_NAME"
 msgid "Left area"
 msgstr "Ardal chwith"
 
-#: strings.hrc:89
+#: sc/inc/strings.hrc:90
 msgctxt "STR_ACC_PREVIEWDOC_NAME"
 msgid "Page preview"
 msgstr "Rhagolwg tudalen"
 
-#: strings.hrc:90
+#: sc/inc/strings.hrc:91
 msgctxt "STR_ACC_CENTERAREA_NAME"
 msgid "Center area"
 msgstr "Ardal ganol"
 
-#: strings.hrc:91
+#: sc/inc/strings.hrc:92
 msgctxt "STR_ACC_RIGHTAREA_NAME"
 msgid "Right area"
 msgstr "Ardal dde"
 
-#: strings.hrc:92
+#: sc/inc/strings.hrc:93
 msgctxt "STR_ACC_HEADER_NAME"
 msgid "Header of page %1"
 msgstr "Pennyn tudalen %1"
 
-#: strings.hrc:93
+#: sc/inc/strings.hrc:94
 msgctxt "STR_ACC_FOOTER_NAME"
 msgid "Footer of page %1"
 msgstr "Troedyn tudalen %1"
 
-#: strings.hrc:94
+#: sc/inc/strings.hrc:95
 msgctxt "STR_ACC_EDITLINE_NAME"
 msgid "Input line"
 msgstr "Llinell mewnbwn"
 
-#: strings.hrc:95
+#: sc/inc/strings.hrc:96
 msgctxt "STR_ACC_EDITLINE_DESCR"
 msgid "This is where you enter or edit text, numbers and formulas."
 msgstr "Dyma lle rydych yn rhoi neu olygu testun, rhifau a fformiwlâu."
 
-#: strings.hrc:96
+#: sc/inc/strings.hrc:97
 msgctxt "SCSTR_MEDIASHELL"
 msgid "Media Playback"
 msgstr "Chwarae Cyfrwng"
 
-#: strings.hrc:97
+#: sc/inc/strings.hrc:98
 msgctxt "RID_SCSTR_ONCLICK"
 msgid "Mouse button pressed"
 msgstr "Pwyso botwm llygoden"
 
-#: strings.hrc:98
+#: sc/inc/strings.hrc:99
 msgctxt "STR_ACC_TOOLBAR_FORMULA"
 msgid "Formula Tool Bar"
 msgstr "Bar Offer Fformiwla"
 
-#: strings.hrc:99
+#: sc/inc/strings.hrc:100
 msgctxt "STR_ACC_DOC_SPREADSHEET"
 msgid "%PRODUCTNAME Spreadsheets"
 msgstr "Taenlen %PRODUCTNAME"
 
-#: strings.hrc:100
+#: sc/inc/strings.hrc:101
 msgctxt "STR_ACC_DOC_SPREADSHEET_READONLY"
 msgid "(read-only)"
 msgstr "(darllen yn unig)"
 
-#: strings.hrc:101
+#: sc/inc/strings.hrc:102
 msgctxt "STR_ACC_DOC_PREVIEW_SUFFIX"
 msgid "(Preview mode)"
 msgstr "(Modd rhagolwg)"
 
-#: strings.hrc:102
+#: sc/inc/strings.hrc:103
 msgctxt "SCSTR_PRINTOPT_PAGES"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: strings.hrc:103
+#: sc/inc/strings.hrc:104
 msgctxt "SCSTR_PRINTOPT_SUPPRESSEMPTY"
 msgid "~Suppress output of empty pages"
 msgstr "~Atal allbwn tudalennau gwag"
 
-#: strings.hrc:104
+#: sc/inc/strings.hrc:105
 msgctxt "SCSTR_PRINTOPT_PRNTCONTENT"
 msgid "Print content"
 msgstr "Cynnwys agraffu"
 
-#: strings.hrc:105
+#: sc/inc/strings.hrc:106
 msgctxt "SCSTR_PRINTOPT_ALLSHEETS"
 msgid "~All sheets"
 msgstr "~Pob dalen"
 
-#: strings.hrc:106
+#: sc/inc/strings.hrc:107
 msgctxt "SCSTR_PRINTOPT_SELECTEDSHEETS"
 msgid "~Selected sheets"
 msgstr "~Dalenni â ddewiswyd"
 
-#: strings.hrc:107
+#: sc/inc/strings.hrc:108
 msgctxt "SCSTR_PRINTOPT_SELECTEDCELLS"
 msgid "Selected cells"
 msgstr "Celloedd â ddewiswyd"
 
-#: strings.hrc:108
+#: sc/inc/strings.hrc:109
 msgctxt "SCSTR_PRINTOPT_FROMWHICH"
 msgid "From which print"
 msgstr "O'r hyn i'w argraffu"
 
-#: strings.hrc:109
+#: sc/inc/strings.hrc:110
 msgctxt "SCSTR_PRINTOPT_ALLPAGES"
 msgid "All ~pages"
 msgstr "Pob ~tudalen"
 
-#: strings.hrc:110
+#: sc/inc/strings.hrc:111
 msgctxt "SCSTR_PRINTOPT_PAGES_"
 msgid "Pa~ges"
 msgstr "~Tudalennau"
 
-#: strings.hrc:111
+#: sc/inc/strings.hrc:112
 msgctxt "SCSTR_PRINTOPT_PRODNAME"
 msgid "%PRODUCTNAME %s"
 msgstr "%PRODUCTNAME %s"
 
-#: strings.hrc:112
+#: sc/inc/strings.hrc:113
 msgctxt "SCSTR_WARN_ME_IN_FUTURE_CHECK"
 msgid "Warn me about this in the future."
 msgstr "Rhybuddio am hwn yn y dyfodol."
 
-#: strings.hrc:113
+#: sc/inc/strings.hrc:114
 msgctxt "SCSTR_DDEDOC_NOT_LOADED"
 msgid "The following DDE source could not be updated possibly because the source document was not open. Please launch the source document and try again."
 msgstr "Nid oedd modd diweddaru'r ffynhonnell DDE canlynol o bosibl am nad oedd y ddogfen wreiddiol yn agored. Agorwch y ddogfen wreiddiol a cheisiwch eto."
 
-#: strings.hrc:114
+#: sc/inc/strings.hrc:115
 msgctxt "SCSTR_EXTDOC_NOT_LOADED"
 msgid "The following external file could not be loaded. Data linked from this file did not get updated."
 msgstr "Nid oedd modd llwytho'r ffeil allanol canlynol. Nid yw data cysylltiedig o'r ffeil hon wedi cael ei ddiweddaru."
 
-#: strings.hrc:115
+#: sc/inc/strings.hrc:116
 msgctxt "SCSTR_UPDATE_EXTDOCS"
 msgid "Updating external links."
 msgstr "Diweddaru cysylltiad allanol."
 
-#: strings.hrc:116
+#: sc/inc/strings.hrc:117
 msgctxt "SCSTR_FORMULA_SYNTAX_CALC_A1"
 msgid "Calc A1"
 msgstr "Calc A1"
 
-#: strings.hrc:117
+#: sc/inc/strings.hrc:118
 msgctxt "SCSTR_FORMULA_SYNTAX_XL_A1"
 msgid "Excel A1"
 msgstr "Excel A1"
 
-#: strings.hrc:118
+#: sc/inc/strings.hrc:119
 msgctxt "SCSTR_FORMULA_SYNTAX_XL_R1C1"
 msgid "Excel R1C1"
 msgstr "Excel R1C1"
 
-#: strings.hrc:119
+#: sc/inc/strings.hrc:120
 msgctxt "SCSTR_COL_LABEL"
 msgid "Range contains column la~bels"
 msgstr "Ystod yn cynnwys ~labeli colofn"
 
-#: strings.hrc:120
+#: sc/inc/strings.hrc:121
 msgctxt "SCSTR_ROW_LABEL"
 msgid "Range contains ~row labels"
 msgstr "Ystod yn cynnwys labeli ~rhes"
 
-#: strings.hrc:121
+#: sc/inc/strings.hrc:122
 msgctxt "SCSTR_VALERR"
 msgid "Invalid value"
 msgstr "Gwerth annilys"
 
-#: strings.hrc:122
+#: sc/inc/strings.hrc:123
 msgctxt "STR_NOFORMULASPECIFIED"
 msgid "No formula specified."
 msgstr "Fformiwla heb ei bennu."
 
-#: strings.hrc:123
+#: sc/inc/strings.hrc:124
 msgctxt "STR_NOCOLROW"
 msgid "Neither row or column specified."
 msgstr "Heb bennu rhes na cholofn."
 
-#: strings.hrc:124
+#: sc/inc/strings.hrc:125
 msgctxt "STR_WRONGFORMULA"
 msgid "Undefined name or range."
 msgstr "Enw neu ystod heb ei ddiffinio."
 
-#: strings.hrc:125
+#: sc/inc/strings.hrc:126
 msgctxt "STR_WRONGROWCOL"
 msgid "Undefined name or wrong cell reference."
 msgstr "Enw heb ei ddiffinio neu gyfeiriad cell anghywir."
 
-#: strings.hrc:126
+#: sc/inc/strings.hrc:127
 msgctxt "STR_NOCOLFORMULA"
 msgid "Formulas don't form a column."
 msgstr "Nid yw'r fformiwlâu'n ffurfio colofn."
 
-#: strings.hrc:127
+#: sc/inc/strings.hrc:128
 msgctxt "STR_NOROWFORMULA"
 msgid "Formulas don't form a row."
 msgstr "Nid yw'r fformiwlâu'n ffurfio rhes."
 
-#: strings.hrc:128
+#: sc/inc/strings.hrc:129
 msgctxt "STR_ADD_AUTOFORMAT_TITLE"
 msgid "Add AutoFormat"
 msgstr "Ychwanegu AwtoFformat"
 
-#: strings.hrc:129
+#: sc/inc/strings.hrc:130
 msgctxt "STR_RENAME_AUTOFORMAT_TITLE"
 msgid "Rename AutoFormat"
 msgstr "Ailenwi AwtoFformat"
 
-#: strings.hrc:130
+#: sc/inc/strings.hrc:131
 msgctxt "STR_ADD_AUTOFORMAT_LABEL"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:131
+#: sc/inc/strings.hrc:132
 msgctxt "STR_DEL_AUTOFORMAT_TITLE"
 msgid "Delete AutoFormat"
 msgstr "Dileu AwtoFformat"
 
-#: strings.hrc:132
+#: sc/inc/strings.hrc:133
 msgctxt "STR_DEL_AUTOFORMAT_MSG"
 msgid "Do you really want to delete the # AutoFormat?"
 msgstr "Ydych chi wir eisiau dileu'r # AutoFomat?"
 
-#: strings.hrc:133
+#: sc/inc/strings.hrc:134
 msgctxt "STR_BTN_AUTOFORMAT_CLOSE"
 msgid "~Close"
 msgstr "~Cau"
 
-#: strings.hrc:134
+#: sc/inc/strings.hrc:135
 msgctxt "STR_JAN"
 msgid "Jan"
 msgstr "Ion"
 
-#: strings.hrc:135
+#: sc/inc/strings.hrc:136
 msgctxt "STR_FEB"
 msgid "Feb"
 msgstr "Chw"
 
-#: strings.hrc:136
+#: sc/inc/strings.hrc:137
 msgctxt "STR_MAR"
 msgid "Mar"
 msgstr "Maw"
 
-#: strings.hrc:137
+#: sc/inc/strings.hrc:138
 msgctxt "STR_NORTH"
 msgid "North"
 msgstr "Gogledd"
 
-#: strings.hrc:138
+#: sc/inc/strings.hrc:139
 msgctxt "STR_MID"
 msgid "Mid"
 msgstr "Canol"
 
-#: strings.hrc:139
+#: sc/inc/strings.hrc:140
 msgctxt "STR_SOUTH"
 msgid "South"
 msgstr "De"
 
-#: strings.hrc:140
+#: sc/inc/strings.hrc:141
 msgctxt "STR_SUM"
 msgid "Total"
 msgstr "Cyfanswm"
 
-#: strings.hrc:141
+#: sc/inc/strings.hrc:142
 msgctxt "STR_SHEET"
 msgid "Sheet"
 msgstr "Dalen"
 
-#: strings.hrc:142
+#: sc/inc/strings.hrc:143
 msgctxt "STR_CELL"
 msgid "Cell"
 msgstr "Cell"
 
-#: strings.hrc:143
+#: sc/inc/strings.hrc:144
 msgctxt "STR_CONTENT"
 msgid "Content"
 msgstr "Cynnwys"
 
-#: strings.hrc:144
+#: sc/inc/strings.hrc:145
 msgctxt "SCSTR_UNDO_PAGE_ANCHOR"
 msgid "Page Anchor"
 msgstr "Angor Tudalen"
 
-#: strings.hrc:145
+#: sc/inc/strings.hrc:146
 msgctxt "SCSTR_UNDO_CELL_ANCHOR"
 msgid "Cell Anchor"
 msgstr "Angor Cell"
 
-#: strings.hrc:146
+#: sc/inc/strings.hrc:147
 msgctxt "SCSTR_CONDITION"
 msgid "Condition "
 msgstr "Cyflwr "
 
 #. content description strings are also use        d in ScLinkTargetsObj
-#: strings.hrc:149
+#: sc/inc/strings.hrc:150
 msgctxt "SCSTR_CONTENT_ROOT"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: strings.hrc:150
+#: sc/inc/strings.hrc:151
 msgctxt "SCSTR_CONTENT_TABLE"
 msgid "Sheets"
 msgstr "Dalen"
 
-#: strings.hrc:151
+#: sc/inc/strings.hrc:152
 msgctxt "SCSTR_CONTENT_RANGENAME"
 msgid "Range names"
 msgstr "Enwau ystodau"
 
-#: strings.hrc:152
+#: sc/inc/strings.hrc:153
 msgctxt "SCSTR_CONTENT_DBAREA"
 msgid "Database ranges"
 msgstr "Ystodau cronfa ddata"
 
-#: strings.hrc:153
+#: sc/inc/strings.hrc:154
 msgctxt "SCSTR_CONTENT_GRAPHIC"
 msgid "Images"
 msgstr "Delweddau"
 
-#: strings.hrc:154
+#: sc/inc/strings.hrc:155
 msgctxt "SCSTR_CONTENT_OLEOBJECT"
 msgid "OLE objects"
 msgstr "Gwrthrychau OLE"
 
-#: strings.hrc:155
+#: sc/inc/strings.hrc:156
 msgctxt "SCSTR_CONTENT_NOTE"
 msgid "Comments"
 msgstr "Nodiadau"
 
-#: strings.hrc:156
+#: sc/inc/strings.hrc:157
 msgctxt "SCSTR_CONTENT_AREALINK"
 msgid "Linked areas"
 msgstr "Rhannau cysylltiedig"
 
-#: strings.hrc:157
+#: sc/inc/strings.hrc:158
 msgctxt "SCSTR_CONTENT_DRAWING"
 msgid "Drawing objects"
 msgstr "Gwrthrychau lluniadu"
 
-#: strings.hrc:158
+#: sc/inc/strings.hrc:159
 msgctxt "SCSTR_DRAGMODE"
 msgid "Drag Mode"
 msgstr "Modd Llusgo"
 
-#: strings.hrc:159
+#: sc/inc/strings.hrc:160
 msgctxt "SCSTR_DISPLAY"
 msgid "Display"
 msgstr "Dangos"
 
-#: strings.hrc:160
+#: sc/inc/strings.hrc:161
 msgctxt "SCSTR_ACTIVE"
 msgid "active"
 msgstr "ar waith"
 
-#: strings.hrc:161
+#: sc/inc/strings.hrc:162
 msgctxt "SCSTR_NOTACTIVE"
 msgid "inactive"
 msgstr "anweithredol"
 
-#: strings.hrc:162
+#: sc/inc/strings.hrc:163
 msgctxt "SCSTR_HIDDEN"
 msgid "hidden"
 msgstr "cudd"
 
-#: strings.hrc:163
+#: sc/inc/strings.hrc:164
 msgctxt "SCSTR_ACTIVEWIN"
 msgid "Active Window"
 msgstr "Ffenestr Weithredol"
 
-#: strings.hrc:164
+#: sc/inc/strings.hrc:165
 msgctxt "SCSTR_QHLP_SCEN_LISTBOX"
 msgid "Scenario Name"
 msgstr "Enw Senario"
 
-#: strings.hrc:165
+#: sc/inc/strings.hrc:166
 msgctxt "SCSTR_QHLP_SCEN_COMMENT"
 msgid "Comment"
 msgstr "Sylw"
 
-#: strings.hrc:167
+#: sc/inc/strings.hrc:168
+msgctxt "STR_MENU_AUTOFILTER"
+msgid "AutoFilter"
+msgstr "AwtoHidl"
+
+#: sc/inc/strings.hrc:169
 msgctxt "STR_MENU_SORT_ASC"
 msgid "Sort Ascending"
 msgstr "Trefnu Esgynnol"
 
-#: strings.hrc:168
+#: sc/inc/strings.hrc:170
 msgctxt "STR_MENU_SORT_DESC"
 msgid "Sort Descending"
 msgstr "Trefnu Disgynnol"
 
-#: strings.hrc:169
+#: sc/inc/strings.hrc:171
 msgctxt "STR_MENU_SORT_CUSTOM"
 msgid "Custom Sort"
 msgstr "Trefnu Cyfaddas"
 
-#: strings.hrc:170
+#: sc/inc/strings.hrc:172
 msgctxt "STR_BTN_TOGGLE_ALL"
 msgid "All"
 msgstr "Y Cyfan"
 
-#: strings.hrc:171
+#: sc/inc/strings.hrc:173
 msgctxt "STR_BTN_SELECT_CURRENT"
 msgid "Show only the current item."
 msgstr "Dangos dim ond yr eitemau cyfredol."
 
-#: strings.hrc:172
+#: sc/inc/strings.hrc:174
 msgctxt "STR_BTN_UNSELECT_CURRENT"
 msgid "Hide only the current item."
 msgstr "Cuddio dim ond yr eitem gyfredol."
 
-#: strings.hrc:173
+#: sc/inc/strings.hrc:175
 msgctxt "STR_EDIT_SEARCH_ITEMS"
 msgid "Search items..."
 msgstr "Eitemau chwilio..."
 
-#: strings.hrc:175
+#: sc/inc/strings.hrc:177
 msgctxt "SCSTR_QHELP_POSWND"
 msgid "Name Box"
 msgstr "Blwch Ticio"
 
-#: strings.hrc:176
+#: sc/inc/strings.hrc:178
 msgctxt "SCSTR_QHELP_INPUTWND"
 msgid "Input line"
 msgstr "Llinell mewnbwn"
 
-#: strings.hrc:177
+#: sc/inc/strings.hrc:179
 msgctxt "SCSTR_QHELP_BTNCALC"
 msgid "Function Wizard"
 msgstr "Dewin Cronfa Ddata"
 
-#: strings.hrc:178
+#: sc/inc/strings.hrc:180
 msgctxt "SCSTR_QHELP_BTNOK"
 msgid "Accept"
 msgstr "Derbyn"
 
-#: strings.hrc:179
+#: sc/inc/strings.hrc:181
 msgctxt "SCSTR_QHELP_BTNCANCEL"
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: strings.hrc:180
+#: sc/inc/strings.hrc:182
 msgctxt "SCSTR_QHELP_BTNSUM"
 msgid "Sum"
 msgstr "Swm"
 
-#: strings.hrc:181
+#: sc/inc/strings.hrc:183
 msgctxt "SCSTR_QHELP_BTNEQUAL"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: strings.hrc:182
+#: sc/inc/strings.hrc:184
 msgctxt "SCSTR_QHELP_EXPAND_FORMULA"
 msgid "Expand Formula Bar"
 msgstr "Ymestyn y Bar Fformiwla"
 
-#: strings.hrc:183
+#: sc/inc/strings.hrc:185
 msgctxt "SCSTR_QHELP_COLLAPSE_FORMULA"
 msgid "Collapse Formula Bar"
 msgstr "Crynhoi'r Bar Fformiwla"
 
-#: strings.hrc:185
+#: sc/inc/strings.hrc:187
 msgctxt "STR_TITLE_CONFLICT"
 msgid "Conflict"
 msgstr "Gwrthdaro"
 
-#: strings.hrc:186
+#: sc/inc/strings.hrc:188
 msgctxt "STR_TITLE_AUTHOR"
 msgid "Author"
 msgstr "Awdur"
 
-#: strings.hrc:187
+#: sc/inc/strings.hrc:189
 msgctxt "STR_TITLE_DATE"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: strings.hrc:188
+#: sc/inc/strings.hrc:190
 msgctxt "STR_UNKNOWN_USER_CONFLICT"
 msgid "Unknown User"
 msgstr "Defnyddiwr Anhysbys"
 
-#: strings.hrc:190
+#: sc/inc/strings.hrc:192
 msgctxt "STR_CHG_INSERT_COLS"
 msgid "Column inserted"
 msgstr "Mewnosod colofn"
 
-#: strings.hrc:191
+#: sc/inc/strings.hrc:193
 msgctxt "STR_CHG_INSERT_ROWS"
 msgid "Row inserted "
 msgstr "Mewnosod rhes "
 
-#: strings.hrc:192
+#: sc/inc/strings.hrc:194
 msgctxt "STR_CHG_INSERT_TABS"
 msgid "Sheet inserted "
 msgstr "Mewnosod dalen "
 
-#: strings.hrc:193
+#: sc/inc/strings.hrc:195
 msgctxt "STR_CHG_DELETE_COLS"
 msgid "Column deleted"
 msgstr "Dileu colofn"
 
-#: strings.hrc:194
+#: sc/inc/strings.hrc:196
 msgctxt "STR_CHG_DELETE_ROWS"
 msgid "Row deleted"
 msgstr "Dileu rhes"
 
-#: strings.hrc:195
+#: sc/inc/strings.hrc:197
 msgctxt "STR_CHG_DELETE_TABS"
 msgid "Sheet deleted"
 msgstr "Dileu dalen"
 
-#: strings.hrc:196
+#: sc/inc/strings.hrc:198
 msgctxt "STR_CHG_MOVE"
 msgid "Range moved"
 msgstr "Symud ystod"
 
-#: strings.hrc:197
+#: sc/inc/strings.hrc:199
 msgctxt "STR_CHG_CONTENT"
 msgid "Changed contents"
 msgstr "Cynnwys wedi newid"
 
-#: strings.hrc:198
+#: sc/inc/strings.hrc:200
 msgctxt "STR_CHG_CONTENT_WITH_CHILD"
 msgid "Changed contents"
 msgstr "Cynnwys wedi newid"
 
-#: strings.hrc:199
+#: sc/inc/strings.hrc:201
 msgctxt "STR_CHG_CHILD_CONTENT"
 msgid "Changed to "
 msgstr "Newidiwyd i "
 
-#: strings.hrc:200
+#: sc/inc/strings.hrc:202
 msgctxt "STR_CHG_CHILD_ORGCONTENT"
 msgid "Original"
 msgstr "Gwreiddiol"
 
-#: strings.hrc:201
+#: sc/inc/strings.hrc:203
 msgctxt "STR_CHG_REJECT"
 msgid "Changes rejected"
 msgstr "Gwrthod newidiadau"
 
-#: strings.hrc:202
+#: sc/inc/strings.hrc:204
 msgctxt "STR_CHG_ACCEPTED"
 msgid "Accepted"
 msgstr "Derbyn"
 
-#: strings.hrc:203
+#: sc/inc/strings.hrc:205
 msgctxt "STR_CHG_REJECTED"
 msgid "Rejected"
 msgstr "Gwrthod"
 
-#: strings.hrc:204
+#: sc/inc/strings.hrc:206
 msgctxt "STR_CHG_NO_ENTRY"
 msgid "No Entry"
 msgstr "Dim Mynediad"
 
-#: strings.hrc:205
+#: sc/inc/strings.hrc:207
 msgctxt "STR_CHG_EMPTY"
 msgid "<empty>"
 msgstr "<gwag>"
 
-#: strings.hrc:207
+#: sc/inc/strings.hrc:209
 msgctxt "STR_NOT_PROTECTED"
 msgid "Not protected"
 msgstr "Heb ei ddiogelu"
 
-#: strings.hrc:208
+#: sc/inc/strings.hrc:210
 msgctxt "STR_NOT_PASS_PROTECTED"
 msgid "Not password-protected"
 msgstr "Dim diogelwch cyfrinair"
 
-#: strings.hrc:209
+#: sc/inc/strings.hrc:211
 msgctxt "STR_HASH_BAD"
 msgid "Hash incompatible"
 msgstr "Anghydnaws â hash"
 
-#: strings.hrc:210
+#: sc/inc/strings.hrc:212
 msgctxt "STR_HASH_GOOD"
 msgid "Hash compatible"
 msgstr "Cydnaws â hash"
 
-#: strings.hrc:211
+#: sc/inc/strings.hrc:213
 msgctxt "STR_RETYPE"
 msgid "Re-type"
 msgstr "Ail deipio"
 
 #. MovingAverageDialog
-#: strings.hrc:214
+#: sc/inc/strings.hrc:216
 msgctxt "STR_MOVING_AVERAGE_UNDO_NAME"
 msgid "Moving Average"
 msgstr "Cyfartaledd Newidiol"
 
 #. ExponentialSmoothingDialog
-#: strings.hrc:216
+#: sc/inc/strings.hrc:218
 msgctxt "STR_EXPONENTIAL_SMOOTHING_UNDO_NAME"
 msgid "Exponential Smoothing"
 msgstr "Cynyddiad Esbonyddol"
 
 #. AnalysisOfVarianceDialog
-#: strings.hrc:218
+#: sc/inc/strings.hrc:220
 msgctxt "STR_ANALYSIS_OF_VARIANCE_UNDO_NAME"
 msgid "Analysis of Variance"
 msgstr "Dadansoddiad Amrywiant"
 
-#: strings.hrc:219
+#: sc/inc/strings.hrc:221
 msgctxt "STR_ANOVA_SINGLE_FACTOR_LABEL"
 msgid "ANOVA - Single Factor"
 msgstr "ANOVA - Ffactor Unigol"
 
-#: strings.hrc:220
+#: sc/inc/strings.hrc:222
 msgctxt "STR_ANOVA_TWO_FACTOR_LABEL"
 msgid "ANOVA - Two Factor"
 msgstr "ANOVA - Dwy Ffactor"
 
-#: strings.hrc:221
+#: sc/inc/strings.hrc:223
 msgctxt "STR_ANOVA_LABEL_GROUPS"
 msgid "Groups"
 msgstr "Grwpiau"
 
-#: strings.hrc:222
+#: sc/inc/strings.hrc:224
 msgctxt "STR_ANOVA_LABEL_BETWEEN_GROUPS"
 msgid "Between Groups"
 msgstr "Rhwng Grwpiau"
 
-#: strings.hrc:223
+#: sc/inc/strings.hrc:225
 msgctxt "STR_ANOVA_LABEL_WITHIN_GROUPS"
 msgid "Within Groups"
 msgstr "O Fewn Grwpiau"
 
-#: strings.hrc:224
+#: sc/inc/strings.hrc:226
 msgctxt "STR_ANOVA_LABEL_SOURCE_OF_VARIATION"
 msgid "Source of Variation"
 msgstr "Ffynhonnell Amrywiad"
 
-#: strings.hrc:225
+#: sc/inc/strings.hrc:227
 msgctxt "STR_ANOVA_LABEL_SS"
 msgid "SS"
 msgstr "SS"
 
-#: strings.hrc:226
+#: sc/inc/strings.hrc:228
 msgctxt "STR_ANOVA_LABEL_DF"
 msgid "df"
 msgstr "df"
 
-#: strings.hrc:227
+#: sc/inc/strings.hrc:229
 msgctxt "STR_ANOVA_LABEL_MS"
 msgid "MS"
 msgstr "MS"
 
-#: strings.hrc:228
+#: sc/inc/strings.hrc:230
 msgctxt "STR_ANOVA_LABEL_F"
 msgid "F"
 msgstr "F"
 
-#: strings.hrc:229
+#: sc/inc/strings.hrc:231
 msgctxt "STR_ANOVA_LABEL_P_VALUE"
 msgid "P-value"
 msgstr "Gwerth P"
 
-#: strings.hrc:230
+#: sc/inc/strings.hrc:232
 msgctxt "STR_ANOVA_LABEL_F_CRITICAL"
 msgid "F critical"
 msgstr "F critigol"
 
-#: strings.hrc:231
+#: sc/inc/strings.hrc:233
 msgctxt "STR_ANOVA_LABEL_TOTAL"
 msgid "Total"
 msgstr "Cyfanswm"
 
 #. CorrelationDialog
-#: strings.hrc:233
+#: sc/inc/strings.hrc:235
 msgctxt "STR_CORRELATION_UNDO_NAME"
 msgid "Correlation"
 msgstr "Cydberthynas"
 
-#: strings.hrc:234
+#: sc/inc/strings.hrc:236
 msgctxt "STR_CORRELATION_LABEL"
 msgid "Correlations"
 msgstr "Cydberthnasau"
 
 #. CovarianceDialog
-#: strings.hrc:236
+#: sc/inc/strings.hrc:238
 msgctxt "STR_COVARIANCE_UNDO_NAME"
 msgid "Covariance"
 msgstr "Cydamrywiad"
 
-#: strings.hrc:237
+#: sc/inc/strings.hrc:239
 msgctxt "STR_COVARIANCE_LABEL"
 msgid "Covariances"
 msgstr "Cydamrywiadau"
 
 #. DescriptiveStatisticsDialog
-#: strings.hrc:239
+#: sc/inc/strings.hrc:241
 msgctxt "STR_DESCRIPTIVE_STATISTICS_UNDO_NAME"
 msgid "Descriptive Statistics"
 msgstr "Ystadegau Disgrifiadol"
 
-#: strings.hrc:240
+#: sc/inc/strings.hrc:242
 msgctxt "STRID_CALC_MEAN"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: strings.hrc:241
+#: sc/inc/strings.hrc:243
 msgctxt "STRID_CALC_STD_ERROR"
 msgid "Standard Error"
 msgstr "Gwall Safonol"
 
-#: strings.hrc:242
+#: sc/inc/strings.hrc:244
 msgctxt "STRID_CALC_MODE"
 msgid "Mode"
 msgstr "Modd"
 
-#: strings.hrc:243
+#: sc/inc/strings.hrc:245
 msgctxt "STRID_CALC_MEDIAN"
 msgid "Median"
 msgstr "Cymedr"
 
-#: strings.hrc:244
+#: sc/inc/strings.hrc:246
 msgctxt "STRID_CALC_VARIANCE"
 msgid "Variance"
 msgstr "Amrywiant"
 
-#: strings.hrc:245
+#: sc/inc/strings.hrc:247
 msgctxt "STRID_CALC_STD_DEVIATION"
 msgid "Standard Deviation"
 msgstr "Gwyriad Safonol"
 
-#: strings.hrc:246
+#: sc/inc/strings.hrc:248
 msgctxt "STRID_CALC_KURTOSIS"
 msgid "Kurtosis"
 msgstr "Cwrtosis"
 
-#: strings.hrc:247
+#: sc/inc/strings.hrc:249
 msgctxt "STRID_CALC_SKEWNESS"
 msgid "Skewness"
 msgstr "Sgiwedd"
 
-#: strings.hrc:248
+#: sc/inc/strings.hrc:250
 msgctxt "STRID_CALC_RANGE"
 msgid "Range"
 msgstr "Amrediad"
 
-#: strings.hrc:249
+#: sc/inc/strings.hrc:251
 msgctxt "STRID_CALC_MIN"
 msgid "Minimum"
 msgstr "Lleiafswm"
 
-#: strings.hrc:250
+#: sc/inc/strings.hrc:252
 msgctxt "STRID_CALC_MAX"
 msgid "Maximum"
 msgstr "Uchafswm"
 
-#: strings.hrc:251
+#: sc/inc/strings.hrc:253
 msgctxt "STRID_CALC_SUM"
 msgid "Sum"
 msgstr "Swm"
 
-#: strings.hrc:252
+#: sc/inc/strings.hrc:254
 msgctxt "STRID_CALC_COUNT"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: strings.hrc:253
+#: sc/inc/strings.hrc:255
 msgctxt "STRID_CALC_FIRST_QUARTILE"
 msgid "First Quartile "
 msgstr "Chwartel Cyntaf "
 
-#: strings.hrc:254
+#: sc/inc/strings.hrc:256
 msgctxt "STRID_CALC_THIRD_QUARTILE"
 msgid "Third Quartile"
 msgstr "Trydydd Chwartel"
 
 #. RandomNumberGeneratorDialog
-#: strings.hrc:256
+#: sc/inc/strings.hrc:258
 msgctxt "STR_UNDO_DISTRIBUTION_TEMPLATE"
 msgid "Random ($(DISTRIBUTION))"
 msgstr "Hap ($(DISTRIBUTION))"
 
-#: strings.hrc:257
+#: sc/inc/strings.hrc:259
 msgctxt "STR_DISTRIBUTION_UNIFORM_REAL"
 msgid "Uniform"
 msgstr "Unffurf"
 
-#: strings.hrc:258
+#: sc/inc/strings.hrc:260
 msgctxt "STR_DISTRIBUTION_UNIFORM_INTEGER"
 msgid "Uniform Integer"
 msgstr "Cyfanrif Unffurf"
 
-#: strings.hrc:259
+#: sc/inc/strings.hrc:261
 msgctxt "STR_DISTRIBUTION_NORMAL"
 msgid "Normal"
 msgstr "Arferol"
 
-#: strings.hrc:260
+#: sc/inc/strings.hrc:262
 msgctxt "STR_DISTRIBUTION_CAUCHY"
 msgid "Cauchy"
 msgstr "Cauchy"
 
-#: strings.hrc:261
+#: sc/inc/strings.hrc:263
 msgctxt "STR_DISTRIBUTION_BERNOULLI"
 msgid "Bernoulli"
 msgstr "Bernoulli"
 
-#: strings.hrc:262
+#: sc/inc/strings.hrc:264
 msgctxt "STR_DISTRIBUTION_BINOMIAL"
 msgid "Binomial"
 msgstr "Binomaidd"
 
-#: strings.hrc:263
+#: sc/inc/strings.hrc:265
 msgctxt "STR_DISTRIBUTION_NEGATIVE_BINOMIAL"
 msgid "Negative Binomial"
 msgstr "Binomaidd Negyddol"
 
-#: strings.hrc:264
+#: sc/inc/strings.hrc:266
 msgctxt "STR_DISTRIBUTION_CHI_SQUARED"
 msgid "Chi Squared"
 msgstr "Chi Sgŵar"
 
-#: strings.hrc:265
+#: sc/inc/strings.hrc:267
 msgctxt "STR_DISTRIBUTION_GEOMETRIC"
 msgid "Geometric"
 msgstr "Geometrig"
 
-#: strings.hrc:266
+#: sc/inc/strings.hrc:268
 msgctxt "STR_RNG_PARAMETER_MINIMUM"
 msgid "Minimum"
 msgstr "Lleiafswm"
 
-#: strings.hrc:267
+#: sc/inc/strings.hrc:269
 msgctxt "STR_RNG_PARAMETER_MAXIMUM"
 msgid "Maximum"
 msgstr "Uchafswm"
 
-#: strings.hrc:268
+#: sc/inc/strings.hrc:270
 msgctxt "STR_RNG_PARAMETER_MEAN"
 msgid "Mean"
 msgstr "Cymedr"
 
-#: strings.hrc:269
+#: sc/inc/strings.hrc:271
 msgctxt "STR_RNG_PARAMETER_STANDARD_DEVIATION"
 msgid "Standard Deviation"
 msgstr "Gwyriad Safonol"
 
-#: strings.hrc:270
+#: sc/inc/strings.hrc:272
 msgctxt "STR_RNG_PARAMETER_STANDARD_MEDIAN"
 msgid "Median"
 msgstr "Cymedr"
 
-#: strings.hrc:271
+#: sc/inc/strings.hrc:273
 msgctxt "STR_RNG_PARAMETER_STANDARD_SIGMA"
 msgid "Sigma"
 msgstr "Sigma"
 
-#: strings.hrc:272
+#: sc/inc/strings.hrc:274
 msgctxt "STR_RNG_PARAMETER_STANDARD_PROBABILITY"
 msgid "p Value"
 msgstr "Gwerth p"
 
-#: strings.hrc:273
+#: sc/inc/strings.hrc:275
 msgctxt "STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS"
 msgid "Number of Trials"
 msgstr "Nifer o Geisiadau"
 
-#: strings.hrc:274
+#: sc/inc/strings.hrc:276
 msgctxt "STR_RNG_PARAMETER_STANDARD_NU_VALUE"
 msgid "nu Value"
 msgstr "Gwerth nu"
 
 #. SamplingDialog
-#: strings.hrc:276
+#: sc/inc/strings.hrc:278
 msgctxt "STR_SAMPLING_UNDO_NAME"
 msgid "Sampling"
 msgstr "Samplo"
 
 #. Names of dialogs
-#: strings.hrc:278
+#: sc/inc/strings.hrc:280
 msgctxt "STR_FTEST"
 msgid "F-test"
 msgstr "Prawf F"
 
-#: strings.hrc:279
+#: sc/inc/strings.hrc:281
 msgctxt "STR_FTEST_UNDO_NAME"
 msgid "F-test"
 msgstr "Prawf F"
 
-#: strings.hrc:280
+#: sc/inc/strings.hrc:282
 msgctxt "STR_TTEST"
 msgid "Paired t-test"
 msgstr "Prawf-t wedi ei baru"
 
-#: strings.hrc:281
+#: sc/inc/strings.hrc:283
 msgctxt "STR_TTEST_UNDO_NAME"
 msgid "Paired t-test"
 msgstr "Prawf-t wedi ei baru"
 
-#: strings.hrc:282
+#: sc/inc/strings.hrc:284
 msgctxt "STR_ZTEST"
 msgid "z-test"
 msgstr "Prawf z"
 
-#: strings.hrc:283
+#: sc/inc/strings.hrc:285
 msgctxt "STR_ZTEST_UNDO_NAME"
 msgid "z-test"
 msgstr "prawf z"
 
-#: strings.hrc:284
+#: sc/inc/strings.hrc:286
 msgctxt "STR_CHI_SQUARE_TEST"
 msgid "Test of Independence (Chi-Square)"
 msgstr "Prawf Annibyniaeth (Chi-Sgwâr)"
 
-#: strings.hrc:285
+#: sc/inc/strings.hrc:287
 msgctxt "STR_REGRESSION_UNDO_NAME"
 msgid "Regression"
 msgstr "Atchweliad"
 
-#: strings.hrc:286
+#: sc/inc/strings.hrc:288
 msgctxt "STR_REGRESSION"
 msgid "Regression"
 msgstr "Atchweliad"
 
 #. Common
-#: strings.hrc:288
+#: sc/inc/strings.hrc:290
 msgctxt "STR_COLUMN_LABEL_TEMPLATE"
 msgid "Column %NUMBER%"
 msgstr "Colofn %NUMBER%"
 
-#: strings.hrc:289
+#: sc/inc/strings.hrc:291
 msgctxt "STR_ROW_LABEL_TEMPLATE"
 msgid "Row %NUMBER%"
 msgstr "Rhes %NUMBER%"
 
-#: strings.hrc:290
+#: sc/inc/strings.hrc:292
 msgctxt "STR_LABEL_ALPHA"
 msgid "Alpha"
 msgstr "Alffa"
 
-#: strings.hrc:291
+#: sc/inc/strings.hrc:293
 msgctxt "STR_VARIABLE_1_LABEL"
 msgid "Variable 1"
 msgstr "_Amrywiolyn 1"
 
-#: strings.hrc:292
+#: sc/inc/strings.hrc:294
 msgctxt "STR_VARIABLE_2_LABEL"
 msgid "Variable 2"
 msgstr "Amrywiolyn 2"
 
-#: strings.hrc:293
+#: sc/inc/strings.hrc:295
 msgctxt "STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL"
 msgid "Hypothesized Mean Difference"
 msgstr "Gwahaniaeth Cymedrig Damcaniaethwyd"
 
-#: strings.hrc:294
+#: sc/inc/strings.hrc:296
 msgctxt "STR_OBSERVATIONS_LABEL"
 msgid "Observations"
 msgstr "Arsylwadau"
 
-#: strings.hrc:295
+#: sc/inc/strings.hrc:297
 msgctxt "STR_OBSERVED_MEAN_DIFFERENCE_LABEL"
 msgid "Observed Mean Difference"
 msgstr "Gwahaniaeth Cymedrig Gweladwy"
 
-#: strings.hrc:296
+#: sc/inc/strings.hrc:298
 msgctxt "STR_DEGREES_OF_FREEDOM_LABEL"
 msgid "df"
 msgstr "df"
 
-#: strings.hrc:297
+#: sc/inc/strings.hrc:299
 msgctxt "STR_P_VALUE_LABEL"
 msgid "P-value"
 msgstr "Gwerth P"
 
-#: strings.hrc:298
+#: sc/inc/strings.hrc:300
 msgctxt "STR_CRITICAL_VALUE_LABEL"
 msgid "Critical Value"
 msgstr "Gwerth Critigol"
 
-#: strings.hrc:299
+#: sc/inc/strings.hrc:301
 msgctxt "STR_TEST_STATISTIC_LABEL"
 msgid "Test Statistic"
 msgstr "Ystadegyn Prawf"
 
 #. RegressionDialog
-#: strings.hrc:301
+#: sc/inc/strings.hrc:303
 msgctxt "STR_LABEL_LINEAR"
 msgid "Linear"
 msgstr "Llinol"
 
-#: strings.hrc:302
+#: sc/inc/strings.hrc:304
 msgctxt "STR_LABEL_LOGARITHMIC"
 msgid "Logarithmic"
 msgstr "Logarithmig"
 
-#: strings.hrc:303
+#: sc/inc/strings.hrc:305
 msgctxt "STR_LABEL_POWER"
 msgid "Power"
 msgstr "Pŵer"
 
-#: strings.hrc:304
+#: sc/inc/strings.hrc:306
 msgctxt "STR_LABEL_REGRESSION_MODEL"
 msgid "Regression Model"
 msgstr "Model Atchweliad"
 
-#: strings.hrc:305
+#: sc/inc/strings.hrc:307
 msgctxt "STR_LABEL_RSQUARED"
 msgid "R^2"
 msgstr "R^2"
 
-#: strings.hrc:306
+#: sc/inc/strings.hrc:308
 msgctxt "STR_LABEL_SLOPE"
 msgid "Slope"
 msgstr "Goleddf"
 
-#: strings.hrc:307
+#: sc/inc/strings.hrc:309
 msgctxt "STR_LABEL_INTERCEPT"
 msgid "Intercept"
 msgstr "Rhyngdoriad"
 
 #. F Test
-#: strings.hrc:309
+#: sc/inc/strings.hrc:311
 msgctxt "STR_FTEST_P_RIGHT_TAIL"
 msgid "P (F<=f) right-tail"
 msgstr "P (F<=f) cynffon de"
 
-#: strings.hrc:310
+#: sc/inc/strings.hrc:312
 msgctxt "STR_FTEST_F_CRITICAL_RIGHT_TAIL"
 msgid "F Critical right-tail"
 msgstr "Cynffon de critigol F"
 
-#: strings.hrc:311
+#: sc/inc/strings.hrc:313
 msgctxt "STR_FTEST_P_LEFT_TAIL"
 msgid "P (F<=f) left-tail"
 msgstr "P (F<=f) cynffon chwith"
 
-#: strings.hrc:312
+#: sc/inc/strings.hrc:314
 msgctxt "STR_FTEST_F_CRITICAL_LEFT_TAIL"
 msgid "F Critical left-tail"
 msgstr "Cynffon chwith critigol F"
 
-#: strings.hrc:313
+#: sc/inc/strings.hrc:315
 msgctxt "STR_FTEST_P_TWO_TAIL"
 msgid "P two-tail"
 msgstr "Dwy gynffon P"
 
-#: strings.hrc:314
+#: sc/inc/strings.hrc:316
 msgctxt "STR_FTEST_F_CRITICAL_TWO_TAIL"
 msgid "F Critical two-tail"
 msgstr "Dwy gynffon critigol F"
 
 #. t Test
-#: strings.hrc:316
+#: sc/inc/strings.hrc:318
 msgctxt "STR_TTEST_PEARSON_CORRELATION"
 msgid "Pearson Correlation"
 msgstr "Cydberthyniad Pearson"
 
-#: strings.hrc:317
+#: sc/inc/strings.hrc:319
 msgctxt "STR_TTEST_VARIANCE_OF_THE_DIFFERENCES"
 msgid "Variance of the Differences"
 msgstr "Amrywiant o'r Gwahaniaethau"
 
-#: strings.hrc:318
+#: sc/inc/strings.hrc:320
 msgctxt "STR_TTEST_T_STAT"
 msgid "t Stat"
 msgstr "Stad t"
 
-#: strings.hrc:319
+#: sc/inc/strings.hrc:321
 msgctxt "STR_TTEST_P_ONE_TAIL"
 msgid "P (T<=t) one-tail"
 msgstr "P (T<=t) un cynffon"
 
-#: strings.hrc:320
+#: sc/inc/strings.hrc:322
 msgctxt "STR_TTEST_T_CRITICAL_ONE_TAIL"
 msgid "t Critical one-tail"
 msgstr "t Critigol un cynffon"
 
-#: strings.hrc:321
+#: sc/inc/strings.hrc:323
 msgctxt "STR_TTEST_P_TWO_TAIL"
 msgid "P (T<=t) two-tail"
 msgstr "P (T<=t) dwy gynffon"
 
-#: strings.hrc:322
+#: sc/inc/strings.hrc:324
 msgctxt "STR_TTEST_T_CRITICAL_TWO_TAIL"
 msgid "t Critical two-tail"
 msgstr "Dwy gynffon critigol t"
 
 #. Z Test
-#: strings.hrc:324
+#: sc/inc/strings.hrc:326
 msgctxt "STR_ZTEST_Z_VALUE"
 msgid "z"
 msgstr "z"
 
-#: strings.hrc:325
+#: sc/inc/strings.hrc:327
 msgctxt "STR_ZTEST_KNOWN_VARIANCE"
 msgid "Known Variance"
 msgstr "Amrywiad Hysbys"
 
-#: strings.hrc:326
+#: sc/inc/strings.hrc:328
 msgctxt "STR_ZTEST_P_ONE_TAIL"
 msgid "P (Z<=z) one-tail"
 msgstr "P (T<=z) un cynffon"
 
-#: strings.hrc:327
+#: sc/inc/strings.hrc:329
 msgctxt "STR_ZTEST_Z_CRITICAL_ONE_TAIL"
 msgid "z Critical one-tail"
 msgstr "z Critigol un cynffon"
 
-#: strings.hrc:328
+#: sc/inc/strings.hrc:330
 msgctxt "STR_ZTEST_P_TWO_TAIL"
 msgid "P (Z<=z) two-tail"
 msgstr "P (T<=z) dwy gynffon"
 
-#: strings.hrc:329
+#: sc/inc/strings.hrc:331
 msgctxt "STR_ZTEST_Z_CRITICAL_TWO_TAIL"
 msgid "z Critical two-tail"
 msgstr "z Dwy gynffon critigol"
 
-#: units.hrc:27
+#. infobar for allowing links to update or not
+#: sc/inc/strings.hrc:333
+msgctxt "STR_ENABLE_CONTENT"
+msgid "Enable Content"
+msgstr "Galluogi Cynnwys"
+
+#. Insert image dialog
+#: sc/inc/strings.hrc:335
+msgctxt "STR_ANCHOR_TO_CELL"
+msgid "To cell"
+msgstr "I gell"
+
+#: sc/inc/strings.hrc:336
+msgctxt "STR_ANCHOR_TO_CELL_RESIZE"
+msgid "To cell (resize with cell)"
+msgstr "I Gell (newid maint gyda chell)"
+
+#: sc/inc/strings.hrc:337
+msgctxt "STR_ANCHOR_TO_PAGE"
+msgid "To page"
+msgstr "I dudalen"
+
+#: sc/inc/units.hrc:27
 msgctxt "SCSTR_UNIT"
 msgid "Millimeter"
 msgstr "Milimedr"
 
-#: units.hrc:28
+#: sc/inc/units.hrc:28
 msgctxt "SCSTR_UNIT"
 msgid "Centimeter"
 msgstr "Centimedr"
 
-#: units.hrc:29
+#: sc/inc/units.hrc:29
 msgctxt "SCSTR_UNIT"
 msgid "Meter"
 msgstr "Metr"
 
-#: units.hrc:30
+#: sc/inc/units.hrc:30
 msgctxt "SCSTR_UNIT"
 msgid "Kilometer"
 msgstr "Kilometr"
 
-#: units.hrc:31
+#: sc/inc/units.hrc:31
 msgctxt "SCSTR_UNIT"
 msgid "Inch"
 msgstr "Mod"
 
-#: units.hrc:32
+#: sc/inc/units.hrc:32
 msgctxt "SCSTR_UNIT"
 msgid "Foot"
 msgstr "Troedfedd"
 
-#: units.hrc:33
+#: sc/inc/units.hrc:33
 msgctxt "SCSTR_UNIT"
 msgid "Miles"
 msgstr "Milltiroedd"
 
-#: units.hrc:34
+#: sc/inc/units.hrc:34
 msgctxt "SCSTR_UNIT"
 msgid "Pica"
 msgstr "Pica"
 
-#: units.hrc:35
+#: sc/inc/units.hrc:35
 msgctxt "SCSTR_UNIT"
 msgid "Point"
 msgstr "Pwynt"
 
-#: advancedfilterdialog.ui:9
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:9
 msgctxt "advancedfilterdialog|AdvancedFilterDialog"
 msgid "Advanced Filter"
 msgstr "Hidl Uwch"
 
-#: advancedfilterdialog.ui:151
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:150
 msgctxt "advancedfilterdialog|label1"
 msgid "Read _Filter Criteria From"
 msgstr "_Darllen Meini Prawf Hidlo o"
 
-#: advancedfilterdialog.ui:192
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:191
 msgctxt "advancedfilterdialog|case"
 msgid "_Case sensitive"
 msgstr "_Llythyren fach neu FAWR"
 
-#: advancedfilterdialog.ui:208
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:207
 msgctxt "advancedfilterdialog|header"
 msgid "Range c_ontains column labels"
 msgstr "_Ystod yn cynnwys labeli colofn"
 
-#: advancedfilterdialog.ui:224
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:223
 msgctxt "advancedfilterdialog|regexp"
 msgid "Regular _expressions"
 msgstr "Mynegiad _arferol"
 
-#: advancedfilterdialog.ui:240
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:239
 msgctxt "advancedfilterdialog|unique"
 msgid "_No duplications"
 msgstr "_Dim dyblygu"
 
-#: advancedfilterdialog.ui:256
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:255
 msgctxt "advancedfilterdialog|copyresult"
 msgid "Co_py results to:"
 msgstr "Copïo c­_anlyniadau i:"
 
-#: advancedfilterdialog.ui:276
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:275
 msgctxt "advancedfilterdialog|destpers"
 msgid "_Keep filter criteria"
 msgstr "C_adw meini prawf hidlo"
 
-#: advancedfilterdialog.ui:315
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:314
 msgctxt "advancedfilterdialog|lbcopyarea-atkobject"
 msgid "Copy results to:"
 msgstr "Copïo'r c­anlyniadau i:"
 
-#: advancedfilterdialog.ui:337
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:335
 msgctxt "advancedfilterdialog|edcopyarea-atkobject"
 msgid "Copy results to:"
 msgstr "Copïo'r c­anlyniadau i:"
 
-#: advancedfilterdialog.ui:375
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:373
 msgctxt "advancedfilterdialog|dbarealabel"
 msgid "Data range:"
 msgstr "Ystod data:"
 
-#: advancedfilterdialog.ui:388
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:386
 msgctxt "advancedfilterdialog|dbarea"
 msgid "dummy"
 msgstr "dymi"
 
-#: advancedfilterdialog.ui:408
+#: sc/uiconfig/scalc/ui/advancedfilterdialog.ui:406
 msgctxt "advancedfilterdialog|label2"
 msgid "Op_tions"
 msgstr "D_ewisiadau"
 
-#: allheaderfooterdialog.ui:8
+#: sc/uiconfig/scalc/ui/allheaderfooterdialog.ui:8
 msgctxt "allheaderfooterdialog|AllHeaderFooterDialog"
 msgid "Headers/Footers"
 msgstr "Penynnau/Troedynnau"
 
-#: allheaderfooterdialog.ui:106
+#: sc/uiconfig/scalc/ui/allheaderfooterdialog.ui:106
 msgctxt "allheaderfooterdialog|headerright"
 msgid "Header (right)"
 msgstr "Pennyn (de)"
 
-#: allheaderfooterdialog.ui:128
+#: sc/uiconfig/scalc/ui/allheaderfooterdialog.ui:128
 msgctxt "allheaderfooterdialog|headerleft"
 msgid "Header (left)"
 msgstr "Pennyn (chwith)"
 
-#: allheaderfooterdialog.ui:151
+#: sc/uiconfig/scalc/ui/allheaderfooterdialog.ui:151
 msgctxt "allheaderfooterdialog|footerright"
 msgid "Footer (right)"
 msgstr "Troedyn (de)"
 
-#: allheaderfooterdialog.ui:174
+#: sc/uiconfig/scalc/ui/allheaderfooterdialog.ui:174
 msgctxt "allheaderfooterdialog|footerleft"
 msgid "Footer (left)"
 msgstr "Troedyn (chwith)"
 
-#: analysisofvariancedialog.ui:16
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:16
 msgctxt "analysisofvariancedialog|AnalysisOfVarianceDialog"
 msgid "Analysis of Variance (ANOVA)"
 msgstr "Dadansoddiad Amrywiant (ANOVA)"
 
-#: analysisofvariancedialog.ui:108
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:108
 msgctxt "analysisofvariancedialog|input-range-label"
 msgid "Input range:"
 msgstr "Ystod mewnbwn:"
 
-#: analysisofvariancedialog.ui:122
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:122
 msgctxt "analysisofvariancedialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniad i:"
 
-#: analysisofvariancedialog.ui:189
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:187
 msgctxt "analysisofvariancedialog|label4"
 msgid "Data"
 msgstr "Data"
 
-#: analysisofvariancedialog.ui:224
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:222
 msgctxt "analysisofvariancedialog|radio-single-factor"
 msgid "Single factor"
 msgstr "Ffactor unigol"
 
-#: analysisofvariancedialog.ui:240
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:238
 msgctxt "analysisofvariancedialog|radio-two-factor"
 msgid "Two factor"
 msgstr "Dwy ffactor"
 
-#: analysisofvariancedialog.ui:262
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:260
 msgctxt "analysisofvariancedialog|label3"
 msgid "Type"
 msgstr "Math"
 
-#: analysisofvariancedialog.ui:297
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:295
 msgctxt "analysisofvariancedialog|groupedby-columns-radio"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: analysisofvariancedialog.ui:314
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:312
 msgctxt "analysisofvariancedialog|groupedby-rows-radio"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: analysisofvariancedialog.ui:337
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:335
 msgctxt "analysisofvariancedialog|label2"
 msgid "Grouped by"
 msgstr "Grwpiwyd yn ôl"
 
-#: analysisofvariancedialog.ui:375
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:373
 msgctxt "analysisofvariancedialog|alpha-label"
 msgid "Alpha:"
 msgstr "Alffa:"
 
-#: analysisofvariancedialog.ui:389
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:386
 msgctxt "analysisofvariancedialog|alpha-spin"
 msgid "0,05"
 msgstr "0.05"
 
-#: analysisofvariancedialog.ui:404
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:401
 msgctxt "analysisofvariancedialog|rows-per-sample-label"
 msgid "Rows per sample:"
 msgstr "Rhesi i'r sampl:"
 
-#: analysisofvariancedialog.ui:434
+#: sc/uiconfig/scalc/ui/analysisofvariancedialog.ui:430
 msgctxt "analysisofvariancedialog|label1"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: autoformattable.ui:9
+#: sc/uiconfig/scalc/ui/autoformattable.ui:9
 msgctxt "autoformattable|AutoFormatTableDialog"
 msgid "AutoFormat"
 msgstr "AwtoFformat"
 
-#: autoformattable.ui:94
+#: sc/uiconfig/scalc/ui/autoformattable.ui:94
 msgctxt "autoformattable|rename"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: autoformattable.ui:186
+#: sc/uiconfig/scalc/ui/autoformattable.ui:186
 msgctxt "autoformattable|label1"
 msgid "Format"
 msgstr "Fformat"
 
-#: autoformattable.ui:219
+#: sc/uiconfig/scalc/ui/autoformattable.ui:219
 msgctxt "autoformattable|numformatcb"
 msgid "_Number format"
 msgstr "Fformat _rhif"
 
-#: autoformattable.ui:236
+#: sc/uiconfig/scalc/ui/autoformattable.ui:236
 msgctxt "autoformattable|bordercb"
 msgid "_Borders"
 msgstr "­­_Borderi"
 
-#: autoformattable.ui:253
+#: sc/uiconfig/scalc/ui/autoformattable.ui:253
 msgctxt "autoformattable|fontcb"
 msgid "F_ont"
 msgstr "_Ffont"
 
-#: autoformattable.ui:270
+#: sc/uiconfig/scalc/ui/autoformattable.ui:270
 msgctxt "autoformattable|patterncb"
 msgid "_Pattern"
 msgstr "_Patrwm"
 
-#: autoformattable.ui:287
+#: sc/uiconfig/scalc/ui/autoformattable.ui:287
 msgctxt "autoformattable|alignmentcb"
 msgid "Alignmen_t"
 msgstr "A_liniad"
 
-#: autoformattable.ui:304
+#: sc/uiconfig/scalc/ui/autoformattable.ui:304
 msgctxt "autoformattable|autofitcb"
 msgid "A_utoFit width and height"
 msgstr "_AwtoFfitio lled ac uchder"
 
-#: autoformattable.ui:327
+#: sc/uiconfig/scalc/ui/autoformattable.ui:327
 msgctxt "autoformattable|label2"
 msgid "Formatting"
 msgstr "Fformatio"
 
-#: cellprotectionpage.ui:35
+#: sc/uiconfig/scalc/ui/cellprotectionpage.ui:35
 msgctxt "cellprotectionpage|checkProtected"
 msgid "_Protected"
 msgstr "_Diogel"
 
-#: cellprotectionpage.ui:55
+#: sc/uiconfig/scalc/ui/cellprotectionpage.ui:55
 msgctxt "cellprotectionpage|checkHideFormula"
 msgid "Hide _formula"
 msgstr "Cuddio _fformiwla"
 
-#: cellprotectionpage.ui:74
+#: sc/uiconfig/scalc/ui/cellprotectionpage.ui:74
 msgctxt "cellprotectionpage|checkHideAll"
 msgid "Hide _all"
 msgstr "Cuddio _popeth"
 
-#: cellprotectionpage.ui:99
+#: sc/uiconfig/scalc/ui/cellprotectionpage.ui:99
 msgctxt "cellprotectionpage|label1"
 msgid ""
 "Cell protection is only effective after the current sheet has been protected.\n"
@@ -15247,7652 +15230,7768 @@ msgstr ""
 "\n"
 "Dewiswch 'Diogelu Dogfen' o'r ddewislen 'Offer'."
 
-#: cellprotectionpage.ui:120
+#: sc/uiconfig/scalc/ui/cellprotectionpage.ui:120
 msgctxt "cellprotectionpage|LabelProtection"
 msgid "Protection"
 msgstr "Diogelwch"
 
-#: cellprotectionpage.ui:154
+#: sc/uiconfig/scalc/ui/cellprotectionpage.ui:154
 msgctxt "cellprotectionpage|checkHidePrinting"
 msgid "Hide _when printing"
 msgstr "Cuddio wrth _argraffu"
 
-#: cellprotectionpage.ui:177
+#: sc/uiconfig/scalc/ui/cellprotectionpage.ui:177
 msgctxt "cellprotectionpage|label4"
 msgid "The cells selected will be omitted when printing."
 msgstr "Bydd y celloedd dewiswyd yn cael eu hepgor wrth argraffu."
 
-#: cellprotectionpage.ui:196
+#: sc/uiconfig/scalc/ui/cellprotectionpage.ui:196
 msgctxt "cellprotectionpage|label3"
 msgid "Print"
 msgstr "Argraffu"
 
-#: changesourcedialog.ui:8
+#: sc/uiconfig/scalc/ui/changesourcedialog.ui:8
 msgctxt "changesourcedialog|ChangeSourceDialog"
 msgid "Change Source Data Range"
 msgstr "Newid Ystod Data Ffynhonnell"
 
-#: changesourcedialog.ui:92
+#: sc/uiconfig/scalc/ui/changesourcedialog.ui:92
 msgctxt "changesourcedialog|col"
 msgid "First _column as label"
 msgstr "Colofn _gyntaf fel pennawd"
 
-#: changesourcedialog.ui:107
+#: sc/uiconfig/scalc/ui/changesourcedialog.ui:107
 msgctxt "changesourcedialog|row"
 msgid "First _row as label"
 msgstr "_Rhes gyntaf fel label"
 
-#: changesourcedialog.ui:128
+#: sc/uiconfig/scalc/ui/changesourcedialog.ui:128
 msgctxt "changesourcedialog|label1"
 msgid "Labels"
 msgstr "Labeli"
 
-#: chardialog.ui:8
+#: sc/uiconfig/scalc/ui/chardialog.ui:8
 msgctxt "chardialog|CharDialog"
 msgid "Character"
 msgstr "Nod"
 
-#: chardialog.ui:106
+#: sc/uiconfig/scalc/ui/chardialog.ui:106
 msgctxt "chardialog|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: chardialog.ui:128
+#: sc/uiconfig/scalc/ui/chardialog.ui:128
 msgctxt "chardialog|fonteffects"
 msgid "Font Effects"
 msgstr "Effeithiau Ffontiau"
 
-#: chardialog.ui:151
+#: sc/uiconfig/scalc/ui/chardialog.ui:151
 msgctxt "chardialog|position"
 msgid "Position"
 msgstr "Safle"
 
-#: chisquaretestdialog.ui:9
+#: sc/uiconfig/scalc/ui/checkwarningdialog.ui:11
+msgctxt "checkwarningdialog|CheckWarningDialog"
+msgid "You are pasting data into cells that already contain data."
+msgstr "Rydych yn gludo data i gelloedd sydd eisoes yn cynnwys data."
+
+#: sc/uiconfig/scalc/ui/checkwarningdialog.ui:12
+msgctxt "checkwarningdialog|CheckWarningDialog"
+msgid "Do you really want to overwrite the existing data?"
+msgstr "Ydych chi wir eisiau tros ysgrifennu data cyfredol?"
+
+#: sc/uiconfig/scalc/ui/checkwarningdialog.ui:76
+msgctxt "checkwarningdialog|ask"
+msgid "Warn me about this in the future."
+msgstr "Rhybuddio am hwn yn y dyfodol."
+
+#: sc/uiconfig/scalc/ui/chisquaretestdialog.ui:9
 msgctxt "chisquaretestdialog|ChiSquareTestDialog"
 msgid "Chi Square Test"
 msgstr "Prawf Chi-Sgwâr"
 
-#: chisquaretestdialog.ui:42
+#: sc/uiconfig/scalc/ui/chisquaretestdialog.ui:42
 msgctxt "chisquaretestdialog|input-range-label"
 msgid "Input range:"
 msgstr "Ystod mewnbwn:"
 
-#: chisquaretestdialog.ui:81
+#: sc/uiconfig/scalc/ui/chisquaretestdialog.ui:80
 msgctxt "chisquaretestdialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniad i:"
 
-#: chisquaretestdialog.ui:123
+#: sc/uiconfig/scalc/ui/chisquaretestdialog.ui:121
 msgctxt "chisquaretestdialog|label1"
 msgid "Data"
 msgstr "Data"
 
-#: chisquaretestdialog.ui:217
+#: sc/uiconfig/scalc/ui/chisquaretestdialog.ui:215
 msgctxt "chisquaretestdialog|groupedby-columns-radio"
 msgid "_Columns"
 msgstr "_Colofnau"
 
-#: chisquaretestdialog.ui:233
+#: sc/uiconfig/scalc/ui/chisquaretestdialog.ui:231
 msgctxt "chisquaretestdialog|groupedby-rows-radio"
 msgid "_Rows"
 msgstr "_Rhesi"
 
-#: chisquaretestdialog.ui:255
+#: sc/uiconfig/scalc/ui/chisquaretestdialog.ui:253
 msgctxt "chisquaretestdialog|label2"
 msgid "Grouped by"
 msgstr "Grwpiwyd yn ôl"
 
-#: colorrowdialog.ui:8
+#: sc/uiconfig/scalc/ui/colorrowdialog.ui:8
 msgctxt "colorrowdialog|ColOrRowDialog"
 msgid "Copy List"
 msgstr "Rhestr Copïo"
 
-#: colorrowdialog.ui:93
+#: sc/uiconfig/scalc/ui/colorrowdialog.ui:93
 msgctxt "colorrowdialog|columns"
 msgid "_Columns"
 msgstr "_Colofnau"
 
-#: colorrowdialog.ui:111
+#: sc/uiconfig/scalc/ui/colorrowdialog.ui:111
 msgctxt "colorrowdialog|rows"
 msgid "_Rows"
 msgstr "_Rhesi"
 
-#: colorrowdialog.ui:134
+#: sc/uiconfig/scalc/ui/colorrowdialog.ui:134
 msgctxt "colorrowdialog|label"
 msgid "List From"
 msgstr "Rhestr o"
 
-#: colwidthdialog.ui:8
+#: sc/uiconfig/scalc/ui/colwidthdialog.ui:8
 msgctxt "colwidthdialog|ColWidthDialog"
 msgid "Column Width"
 msgstr "Lled Colofn"
 
-#: colwidthdialog.ui:88
+#: sc/uiconfig/scalc/ui/colwidthdialog.ui:88
 msgctxt "colwidthdialog|label1"
 msgid "Width"
 msgstr "Lled"
 
-#: colwidthdialog.ui:112
+#: sc/uiconfig/scalc/ui/colwidthdialog.ui:111
 msgctxt "colwidthdialog|default"
 msgid "_Default value"
 msgstr "_Gwerth rhagosodedig"
 
-#: condformatmanager.ui:8
+#: sc/uiconfig/scalc/ui/condformatmanager.ui:8
 msgctxt "condformatmanager|CondFormatManager"
 msgid "Manage Conditional Formatting"
 msgstr "Rheoli Fformatio Amodol"
 
-#: condformatmanager.ui:62
+#: sc/uiconfig/scalc/ui/condformatmanager.ui:62
 msgctxt "condformatmanager|add"
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: condformatmanager.ui:76
+#: sc/uiconfig/scalc/ui/condformatmanager.ui:76
 msgctxt "condformatmanager|edit"
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: condformatmanager.ui:90
+#: sc/uiconfig/scalc/ui/condformatmanager.ui:90
 msgctxt "condformatmanager|remove"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: condformatmanager.ui:117
+#: sc/uiconfig/scalc/ui/condformatmanager.ui:117
 msgctxt "condformatmanager|label1"
 msgid "Conditional Formats"
 msgstr "Fformatiau Amodol"
 
-#: conditionalentry.ui:58
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:58
 msgctxt "conditionalentry|type"
 msgid "All Cells"
 msgstr "Pob Cell"
 
-#: conditionalentry.ui:59
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:59
 msgctxt "conditionalentry|type"
 msgid "Cell value is"
 msgstr "Gwerth cell yw"
 
-#: conditionalentry.ui:60
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:60
 msgctxt "conditionalentry|type"
 msgid "Formula is"
 msgstr "Y fformiwla yw"
 
-#: conditionalentry.ui:61
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:61
 msgctxt "conditionalentry|type"
 msgid "Date is"
 msgstr "Y dyddiad yw"
 
-#: conditionalentry.ui:72
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:72
 msgctxt "conditionalentry|styleft"
 msgid "Apply Style:"
 msgstr "Gosod Arddull:"
 
-#: conditionalentry.ui:86
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:86
 msgctxt "conditionalentry|style"
 msgid "New Style..."
 msgstr "Arddull Newydd..."
 
-#: conditionalentry.ui:97
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:97
 msgctxt "conditionalentry|valueft"
 msgid "Enter a value:"
 msgstr "Rhoi gwerth:"
 
-#: conditionalentry.ui:162
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:162
 msgctxt "conditionalentry|options"
 msgid "More Options..."
 msgstr "Rhagor o Ddewisiadau..."
 
-#: conditionalentry.ui:175
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:175
 msgctxt "conditionalentry|colscalemin"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: conditionalentry.ui:176
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:176
 msgctxt "conditionalentry|colscalemin"
 msgid "Min"
 msgstr "Lleiaf"
 
-#: conditionalentry.ui:177
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:177
 msgctxt "conditionalentry|colscalemin"
 msgid "Max"
 msgstr "Uchaf"
 
-#: conditionalentry.ui:178
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:178
 msgctxt "conditionalentry|colscalemin"
 msgid "Percentile"
 msgstr "Canradd"
 
-#: conditionalentry.ui:179
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:179
 msgctxt "conditionalentry|colscalemin"
 msgid "Value"
 msgstr "Gwerth"
 
-#: conditionalentry.ui:180
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:180
 msgctxt "conditionalentry|colscalemin"
 msgid "Percent"
 msgstr "Canran"
 
-#: conditionalentry.ui:181
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:181
 msgctxt "conditionalentry|colscalemin"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: conditionalentry.ui:193
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:193
 msgctxt "conditionalentry|colscalemiddle"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: conditionalentry.ui:194
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:194
 msgctxt "conditionalentry|colscalemiddle"
 msgid "Min"
 msgstr "Lleiaf"
 
-#: conditionalentry.ui:195
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:195
 msgctxt "conditionalentry|colscalemiddle"
 msgid "Max"
 msgstr "Uchaf"
 
-#: conditionalentry.ui:196
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:196
 msgctxt "conditionalentry|colscalemiddle"
 msgid "Percentile"
 msgstr "Canradd"
 
-#: conditionalentry.ui:197
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:197
 msgctxt "conditionalentry|colscalemiddle"
 msgid "Value"
 msgstr "Gwerth"
 
-#: conditionalentry.ui:198
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:198
 msgctxt "conditionalentry|colscalemiddle"
 msgid "Percent"
 msgstr "Canran"
 
-#: conditionalentry.ui:199
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:199
 msgctxt "conditionalentry|colscalemiddle"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: conditionalentry.ui:211
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:211
 msgctxt "conditionalentry|colscalemax"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: conditionalentry.ui:212
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:212
 msgctxt "conditionalentry|colscalemax"
 msgid "Min"
 msgstr "Lleiaf"
 
-#: conditionalentry.ui:213
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:213
 msgctxt "conditionalentry|colscalemax"
 msgid "Max"
 msgstr "Uchaf"
 
-#: conditionalentry.ui:214
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:214
 msgctxt "conditionalentry|colscalemax"
 msgid "Percentile"
 msgstr "Canradd"
 
-#: conditionalentry.ui:215
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:215
 msgctxt "conditionalentry|colscalemax"
 msgid "Value"
 msgstr "Gwerth"
 
-#: conditionalentry.ui:216
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:216
 msgctxt "conditionalentry|colscalemax"
 msgid "Percent"
 msgstr "Canran"
 
-#: conditionalentry.ui:217
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:217
 msgctxt "conditionalentry|colscalemax"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: conditionalentry.ui:228
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:228
 msgctxt "conditionalentry|preview|tooltip_text"
 msgid "Example"
 msgstr "Enghraifft"
 
-#: conditionalentry.ui:251
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:251
 msgctxt "conditionalentry|typeis"
 msgid "equal to"
 msgstr "yn gyfartal â"
 
-#: conditionalentry.ui:252
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:252
 msgctxt "conditionalentry|typeis"
 msgid "less than"
 msgstr "llai na"
 
-#: conditionalentry.ui:253
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:253
 msgctxt "conditionalentry|typeis"
 msgid "greater than"
 msgstr "mwy na"
 
-#: conditionalentry.ui:254
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:254
 msgctxt "conditionalentry|typeis"
 msgid "less than or equal to"
 msgstr "llai na neu gyfartal â"
 
-#: conditionalentry.ui:255
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:255
 msgctxt "conditionalentry|typeis"
 msgid "greater than or equal to"
 msgstr "mwy na neu gydradd â"
 
-#: conditionalentry.ui:256
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:256
 msgctxt "conditionalentry|typeis"
 msgid "not equal to"
 msgstr "heb fod yn hafal â"
 
-#: conditionalentry.ui:257
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:257
 msgctxt "conditionalentry|typeis"
 msgid "between"
 msgstr "rhwng"
 
-#: conditionalentry.ui:258
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:258
 msgctxt "conditionalentry|typeis"
 msgid "not between"
 msgstr "nid rhwng"
 
-#: conditionalentry.ui:259
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:259
 msgctxt "conditionalentry|typeis"
 msgid "duplicate"
 msgstr "dyblyg"
 
-#: conditionalentry.ui:260
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:260
 msgctxt "conditionalentry|typeis"
 msgid "not duplicate"
 msgstr "nid dyblyg"
 
-#: conditionalentry.ui:261
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:261
 msgctxt "conditionalentry|typeis"
 msgid "top 10 elements"
 msgstr "10 elfen uchaf"
 
-#: conditionalentry.ui:262
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:262
 msgctxt "conditionalentry|typeis"
 msgid "bottom 10 elements"
 msgstr "10 elfen isaf"
 
-#: conditionalentry.ui:263
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:263
 msgctxt "conditionalentry|typeis"
 msgid "top 10 percent"
 msgstr "10 canran uchaf"
 
-#: conditionalentry.ui:264
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:264
 msgctxt "conditionalentry|typeis"
 msgid "bottom 10 percent"
 msgstr "10 canran isaf"
 
-#: conditionalentry.ui:265
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:265
 msgctxt "conditionalentry|typeis"
 msgid "above average"
 msgstr "uwchlaw'r cyfartaledd"
 
-#: conditionalentry.ui:266
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:266
 msgctxt "conditionalentry|typeis"
 msgid "below average"
 msgstr "islaw'r cyfartaledd"
 
-#: conditionalentry.ui:267
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:267
 msgctxt "conditionalentry|typeis"
 msgid "above or equal average"
 msgstr "uwchlaw neu gydradd â'r cyfartaledd"
 
-#: conditionalentry.ui:268
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:268
 msgctxt "conditionalentry|typeis"
 msgid "below or equal average"
 msgstr "is neu gydradd â'r cyfartaledd"
 
-#: conditionalentry.ui:269
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:269
 msgctxt "conditionalentry|typeis"
 msgid "Error"
 msgstr "Gwall"
 
-#: conditionalentry.ui:270
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:270
 msgctxt "conditionalentry|typeis"
 msgid "No Error"
 msgstr "Dim Gwall"
 
-#: conditionalentry.ui:271
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:271
 msgctxt "conditionalentry|typeis"
 msgid "Begins with"
 msgstr "Cychwyn gyda"
 
-#: conditionalentry.ui:272
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:272
 msgctxt "conditionalentry|typeis"
 msgid "Ends with"
 msgstr "Gorffen gyda"
 
-#: conditionalentry.ui:273
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:273
 msgctxt "conditionalentry|typeis"
 msgid "Contains"
 msgstr "Yn cynnwys"
 
-#: conditionalentry.ui:274
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:274
 msgctxt "conditionalentry|typeis"
 msgid "Not Contains"
 msgstr "Ddim yn Cynnwys"
 
-#: conditionalentry.ui:287
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:287
 msgctxt "conditionalentry|datetype"
 msgid "Today"
 msgstr "Heddiw"
 
-#: conditionalentry.ui:288
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:288
 msgctxt "conditionalentry|datetype"
 msgid "Yesterday"
 msgstr "Ddoe"
 
-#: conditionalentry.ui:289
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:289
 msgctxt "conditionalentry|datetype"
 msgid "Tomorrow"
 msgstr "Yfory"
 
-#: conditionalentry.ui:290
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:290
 msgctxt "conditionalentry|datetype"
 msgid "Last 7 days"
 msgstr "7 diwrnod diwethaf"
 
-#: conditionalentry.ui:291
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:291
 msgctxt "conditionalentry|datetype"
 msgid "This week"
 msgstr "Yr wythnos hon"
 
-#: conditionalentry.ui:292
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:292
 msgctxt "conditionalentry|datetype"
 msgid "Last week"
 msgstr "Yr wythnos ddiwethaf"
 
-#: conditionalentry.ui:293
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:293
 msgctxt "conditionalentry|datetype"
 msgid "Next week"
 msgstr "Yr wythnos nesaf"
 
-#: conditionalentry.ui:294
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:294
 msgctxt "conditionalentry|datetype"
 msgid "This month"
 msgstr "Y mis yma"
 
-#: conditionalentry.ui:295
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:295
 msgctxt "conditionalentry|datetype"
 msgid "Last month"
 msgstr "Y mis diwethaf"
 
-#: conditionalentry.ui:296
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:296
 msgctxt "conditionalentry|datetype"
 msgid "Next month"
 msgstr "Y mis nesaf"
 
-#: conditionalentry.ui:297
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:297
 msgctxt "conditionalentry|datetype"
 msgid "This year"
 msgstr "Eleni"
 
-#: conditionalentry.ui:298
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:298
 msgctxt "conditionalentry|datetype"
 msgid "Last year"
 msgstr "Y fwyddyn diwethaf"
 
-#: conditionalentry.ui:299
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:299
 msgctxt "conditionalentry|datetype"
 msgid "Next year"
 msgstr "Y flwyddyn nesaf"
 
-#: conditionalentry.ui:312
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:312
 msgctxt "conditionalentry|colorformat"
 msgid "Color Scale (2 Entries)"
 msgstr "Graddfa Lliw (2 Gofnod)"
 
-#: conditionalentry.ui:313
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:313
 msgctxt "conditionalentry|colorformat"
 msgid "Color Scale (3 Entries)"
 msgstr "Graddfa Lliw (3 Cofnod)"
 
-#: conditionalentry.ui:314
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:314
 msgctxt "conditionalentry|colorformat"
 msgid "Data Bar"
 msgstr "Bar Data"
 
-#: conditionalentry.ui:315
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:315
 msgctxt "conditionalentry|colorformat"
 msgid "Icon Set"
 msgstr "Set Eicon"
 
-#: conditionalentry.ui:359
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:359
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Arrows"
 msgstr "3 Saeth"
 
-#: conditionalentry.ui:360
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:360
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Gray Arrows"
 msgstr "3 Saeth Lwyd"
 
-#: conditionalentry.ui:361
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:361
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Flags"
 msgstr "3 Baner"
 
-#: conditionalentry.ui:362
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:362
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Traffic Lights 1"
 msgstr "3 Golau Traffig 1"
 
-#: conditionalentry.ui:363
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:363
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Traffic Lights 2"
 msgstr "3 Golau Traffig 2"
 
-#: conditionalentry.ui:364
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:364
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Signs"
 msgstr "3 Arwydd"
 
-#: conditionalentry.ui:365
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:365
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Symbols 1"
 msgstr "3 Symbol 1"
 
-#: conditionalentry.ui:366
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:366
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Symbols 2"
 msgstr "3 Symbol 2"
 
-#: conditionalentry.ui:367
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:367
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Smileys"
 msgstr "3 Gwenogluniau"
 
-#: conditionalentry.ui:368
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:368
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Stars"
 msgstr "3 Seren"
 
-#: conditionalentry.ui:369
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:369
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Triangles"
 msgstr "3 Triongl"
 
-#: conditionalentry.ui:370
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:370
 msgctxt "conditionalentry|iconsettype"
 msgid "3 Colored Smileys"
 msgstr "3 Gwenogluniau Lliw"
 
-#: conditionalentry.ui:371
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:371
 msgctxt "conditionalentry|iconsettype"
 msgid "4 Arrows"
 msgstr "4 Saeth"
 
-#: conditionalentry.ui:372
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:372
 msgctxt "conditionalentry|iconsettype"
 msgid "4 Gray Arrows"
 msgstr "4 Saeth Lwyd"
 
-#: conditionalentry.ui:373
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:373
 msgctxt "conditionalentry|iconsettype"
 msgid "4 Circles Red to Black"
 msgstr "4 Cylch Coch i Ddu"
 
-#: conditionalentry.ui:374
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:374
 msgctxt "conditionalentry|iconsettype"
 msgid "4 Ratings"
 msgstr "4 Gradd"
 
-#: conditionalentry.ui:375
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:375
 msgctxt "conditionalentry|iconsettype"
 msgid "4 Traffic Lights"
 msgstr "4 Golau Traffig"
 
-#: conditionalentry.ui:376
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:376
 msgctxt "conditionalentry|iconsettype"
 msgid "5 Arrows"
 msgstr "5 Saeth"
 
-#: conditionalentry.ui:377
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:377
 msgctxt "conditionalentry|iconsettype"
 msgid "5 Gray Arrows"
 msgstr "5 Saeth Lwyd"
 
-#: conditionalentry.ui:378
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:378
 msgctxt "conditionalentry|iconsettype"
 msgid "5 Ratings"
 msgstr "5 Gradd"
 
-#: conditionalentry.ui:379
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:379
 msgctxt "conditionalentry|iconsettype"
 msgid "5 Quarters"
 msgstr "5 Chwarter"
 
-#: conditionalentry.ui:380
+#: sc/uiconfig/scalc/ui/conditionalentry.ui:380
 msgctxt "conditionalentry|iconsettype"
 msgid "5 Boxes"
 msgstr "5 Blwch"
 
-#: conditionalformatdialog.ui:8
+#: sc/uiconfig/scalc/ui/conditionalformatdialog.ui:8
 msgctxt "conditionalformatdialog|ConditionalFormatDialog"
 msgid "Conditional Formatting for"
 msgstr "Fformatio Amodol ar gyfer"
 
-#: conditionalformatdialog.ui:128
+#: sc/uiconfig/scalc/ui/conditionalformatdialog.ui:128
 msgctxt "conditionalformatdialog|label1"
 msgid "Conditions"
 msgstr "Amodau"
 
-#: conditionalformatdialog.ui:223
+#: sc/uiconfig/scalc/ui/conditionalformatdialog.ui:223
 msgctxt "conditionalformatdialog|ftassign"
 msgid "Range:"
 msgstr "Ystod:"
 
-#: conditionalformatdialog.ui:268
+#: sc/uiconfig/scalc/ui/conditionalformatdialog.ui:267
 msgctxt "conditionalformatdialog|label2"
 msgid "Cell Range"
 msgstr "Ystod Celloedd"
 
-#: conditionaliconset.ui:20
+#: sc/uiconfig/scalc/ui/conditionaliconset.ui:20
 msgctxt "conditionaliconset|label"
 msgid " >= "
 msgstr " >= "
 
-#: conditionaliconset.ui:43
+#: sc/uiconfig/scalc/ui/conditionaliconset.ui:43
 msgctxt "conditionaliconset|listbox"
 msgid "Value"
 msgstr "Gwerth"
 
-#: conditionaliconset.ui:44
+#: sc/uiconfig/scalc/ui/conditionaliconset.ui:44
 msgctxt "conditionaliconset|listbox"
 msgid "Percent"
 msgstr "Canran"
 
-#: conditionaliconset.ui:45
+#: sc/uiconfig/scalc/ui/conditionaliconset.ui:45
 msgctxt "conditionaliconset|listbox"
 msgid "Percentile"
 msgstr "Canradd"
 
-#: conditionaliconset.ui:46
+#: sc/uiconfig/scalc/ui/conditionaliconset.ui:46
 msgctxt "conditionaliconset|listbox"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: conflictsdialog.ui:8
+#: sc/uiconfig/scalc/ui/conflictsdialog.ui:8
 msgctxt "conflictsdialog|ConflictsDialog"
 msgid "Resolve Conflicts"
 msgstr "Datrys Gwrthdaro"
 
-#: conflictsdialog.ui:22
+#: sc/uiconfig/scalc/ui/conflictsdialog.ui:22
 msgctxt "conflictsdialog|keepallmine"
 msgid "_Keep All Mine"
 msgstr "Cadw fy Rhai i i _Gyd"
 
-#: conflictsdialog.ui:37
+#: sc/uiconfig/scalc/ui/conflictsdialog.ui:37
 msgctxt "conflictsdialog|keepallothers"
 msgid "Keep _All Others"
 msgstr "Cadw Rhai _Eraill i Gyd"
 
-#: conflictsdialog.ui:102
+#: sc/uiconfig/scalc/ui/conflictsdialog.ui:102
 msgctxt "conflictsdialog|label1"
 msgid "There are conflicting changes in this shared spreadsheet. Conflicts must be resolved before saving the spreadsheet. Keep either own or other changes."
 msgstr "Mae newidiadau sy'n gwrthdaro yn y daenlen ranedig hon. Rhaid datrys gwrthdaro cyn cadw'r daenlen. Rhaid cadw un neu'r llall o'r newidiadau."
 
-#: conflictsdialog.ui:137
+#: sc/uiconfig/scalc/ui/conflictsdialog.ui:137
 msgctxt "conflictsdialog|keepmine"
 msgid "Keep _Mine"
 msgstr "Cadw Fy Rhai _i"
 
-#: conflictsdialog.ui:152
+#: sc/uiconfig/scalc/ui/conflictsdialog.ui:152
 msgctxt "conflictsdialog|keepother"
 msgid "Keep _Other"
 msgstr "Cadw _Eraill"
 
-#: consolidatedialog.ui:9
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:9
 msgctxt "consolidatedialog|ConsolidateDialog"
 msgid "Consolidate"
 msgstr "Cyfnerthu"
 
-#: consolidatedialog.ui:91
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:91
 msgctxt "consolidatedialog|label1"
 msgid "_Function:"
 msgstr "_Swyddogaeth:"
 
-#: consolidatedialog.ui:108
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:108
 msgctxt "consolidatedialog|label2"
 msgid "_Consolidation ranges:"
 msgstr "_Cyfnerthu ystodau:"
 
-#: consolidatedialog.ui:125
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:125
 msgctxt "consolidatedialog|func"
 msgid "Sum"
 msgstr "Swm"
 
-#: consolidatedialog.ui:126
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:126
 msgctxt "consolidatedialog|func"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: consolidatedialog.ui:127
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:127
 msgctxt "consolidatedialog|func"
 msgid "Average"
 msgstr "Cyfartaledd"
 
-#: consolidatedialog.ui:128
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:128
 msgctxt "consolidatedialog|func"
 msgid "Max"
 msgstr "Mwyaf"
 
-#: consolidatedialog.ui:129
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:129
 msgctxt "consolidatedialog|func"
 msgid "Min"
 msgstr "Lleiaf"
 
-#: consolidatedialog.ui:130
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:130
 msgctxt "consolidatedialog|func"
 msgid "Product"
 msgstr "Cynnyrch"
 
-#: consolidatedialog.ui:131
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:131
 msgctxt "consolidatedialog|func"
 msgid "Count (numbers only)"
 msgstr "Cyfrif (rhifau'n unig)"
 
-#: consolidatedialog.ui:132
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:132
 msgctxt "consolidatedialog|func"
 msgid "StDev (sample)"
 msgstr "StDev (sampl)"
 
-#: consolidatedialog.ui:133
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:133
 msgctxt "consolidatedialog|func"
 msgid "StDevP (population)"
 msgstr "StDevP (poblogaeth)"
 
-#: consolidatedialog.ui:134
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:134
 msgctxt "consolidatedialog|func"
 msgid "Var (sample)"
 msgstr "Var (sampl)"
 
-#: consolidatedialog.ui:135
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:135
 msgctxt "consolidatedialog|func"
 msgid "VarP (population)"
 msgstr "VarP (poblogaeth)"
 
-#: consolidatedialog.ui:344
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:342
 msgctxt "consolidatedialog|ftdataarea"
 msgid "_Source data ranges:"
 msgstr "_Ystodau ynhonnell data:"
 
-#: consolidatedialog.ui:360
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:358
 msgctxt "consolidatedialog|ftdestarea"
 msgid "Copy results _to:"
 msgstr "Copïo canlyniadau _i:"
 
-#: consolidatedialog.ui:417
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:415
 msgctxt "consolidatedialog|byrow"
 msgid "_Row labels"
 msgstr "Labeli _rhes"
 
-#: consolidatedialog.ui:435
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:433
 msgctxt "consolidatedialog|bycol"
 msgid "C_olumn labels"
 msgstr "Labeli _colofn"
 
-#: consolidatedialog.ui:459
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:457
 msgctxt "consolidatedialog|label3"
 msgid "Consolidate by"
 msgstr "Cyfnerthu gan"
 
-#: consolidatedialog.ui:491
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:489
 msgctxt "consolidatedialog|refs"
 msgid "_Link to source data"
 msgstr "_Cysylltu i ddata ffynhonnell"
 
-#: consolidatedialog.ui:507
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:505
 msgctxt "consolidatedialog|label4"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: consolidatedialog.ui:526
+#: sc/uiconfig/scalc/ui/consolidatedialog.ui:524
 msgctxt "consolidatedialog|more_label"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: correlationdialog.ui:9
+#: sc/uiconfig/scalc/ui/correlationdialog.ui:9
 msgctxt "correlationdialog|CorrelationDialog"
 msgid "Correlation"
 msgstr "Cydberthynas"
 
-#: correlationdialog.ui:100
+#: sc/uiconfig/scalc/ui/correlationdialog.ui:100
 msgctxt "correlationdialog|input-range-label"
 msgid "Input range:"
 msgstr "Ystod mewnbwn:"
 
-#: correlationdialog.ui:114
+#: sc/uiconfig/scalc/ui/correlationdialog.ui:114
 msgctxt "correlationdialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniad i:"
 
-#: correlationdialog.ui:181
+#: sc/uiconfig/scalc/ui/correlationdialog.ui:179
 msgctxt "correlationdialog|label4"
 msgid "Data"
 msgstr "Data"
 
-#: correlationdialog.ui:216
+#: sc/uiconfig/scalc/ui/correlationdialog.ui:214
 msgctxt "correlationdialog|groupedby-columns-radio"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: correlationdialog.ui:231
+#: sc/uiconfig/scalc/ui/correlationdialog.ui:230
 msgctxt "correlationdialog|groupedby-rows-radio"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: correlationdialog.ui:252
+#: sc/uiconfig/scalc/ui/correlationdialog.ui:252
 msgctxt "correlationdialog|label2"
 msgid "Grouped by"
 msgstr "Grwpiwyd yn ôl"
 
-#: covariancedialog.ui:10
+#: sc/uiconfig/scalc/ui/covariancedialog.ui:10
 msgctxt "covariancedialog|CovarianceDialog"
 msgid "Covariance"
 msgstr "Cydamrywiad"
 
-#: covariancedialog.ui:42
+#: sc/uiconfig/scalc/ui/covariancedialog.ui:42
 msgctxt "covariancedialog|input-range-label"
 msgid "Input range:"
 msgstr "Ystod mewnbwn:"
 
-#: covariancedialog.ui:81
+#: sc/uiconfig/scalc/ui/covariancedialog.ui:80
 msgctxt "covariancedialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniad i:"
 
-#: covariancedialog.ui:123
+#: sc/uiconfig/scalc/ui/covariancedialog.ui:121
 msgctxt "covariancedialog|label1"
 msgid "Data"
 msgstr "Data"
 
-#: covariancedialog.ui:217
+#: sc/uiconfig/scalc/ui/covariancedialog.ui:215
 msgctxt "covariancedialog|groupedby-columns-radio"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: covariancedialog.ui:232
+#: sc/uiconfig/scalc/ui/covariancedialog.ui:231
 msgctxt "covariancedialog|groupedby-rows-radio"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: covariancedialog.ui:253
+#: sc/uiconfig/scalc/ui/covariancedialog.ui:253
 msgctxt "covariancedialog|label2"
 msgid "Grouped by"
 msgstr "Grwpiwyd yn ôl"
 
-#: createnamesdialog.ui:8
+#: sc/uiconfig/scalc/ui/createnamesdialog.ui:8
 msgctxt "createnamesdialog|CreateNamesDialog"
 msgid "Create Names"
 msgstr "Creu Enwau"
 
-#: createnamesdialog.ui:96
+#: sc/uiconfig/scalc/ui/createnamesdialog.ui:99
 msgctxt "createnamesdialog|top"
 msgid "_Top row"
 msgstr "_Rhes frig"
 
-#: createnamesdialog.ui:112
+#: sc/uiconfig/scalc/ui/createnamesdialog.ui:115
 msgctxt "createnamesdialog|left"
 msgid "_Left column"
 msgstr "Colofn _chwith"
 
-#: createnamesdialog.ui:128
+#: sc/uiconfig/scalc/ui/createnamesdialog.ui:131
 msgctxt "createnamesdialog|bottom"
 msgid "_Bottom row"
 msgstr "Colofn _waelod"
 
-#: createnamesdialog.ui:146
+#: sc/uiconfig/scalc/ui/createnamesdialog.ui:149
 msgctxt "createnamesdialog|right"
 msgid "_Right column"
 msgstr "Colofn _de"
 
-#: createnamesdialog.ui:169
+#: sc/uiconfig/scalc/ui/createnamesdialog.ui:171
 msgctxt "createnamesdialog|label1"
 msgid "Create Names From"
 msgstr "Creu Enwau o"
 
-#: dapiservicedialog.ui:9
+#: sc/uiconfig/scalc/ui/dapiservicedialog.ui:9
 msgctxt "dapiservicedialog|DapiserviceDialog"
 msgid "External Source"
 msgstr "Ffynhonnell Allanol"
 
-#: dapiservicedialog.ui:108
+#: sc/uiconfig/scalc/ui/dapiservicedialog.ui:108
 msgctxt "dapiservicedialog|label2"
 msgid "_Service"
 msgstr "_Gwasanaeth"
 
-#: dapiservicedialog.ui:124
+#: sc/uiconfig/scalc/ui/dapiservicedialog.ui:124
 msgctxt "dapiservicedialog|label3"
 msgid "So_urce"
 msgstr "_Ffynhonnell"
 
-#: dapiservicedialog.ui:140
+#: sc/uiconfig/scalc/ui/dapiservicedialog.ui:140
 msgctxt "dapiservicedialog|label4"
 msgid "_Name"
 msgstr "_Enw"
 
-#: dapiservicedialog.ui:156
+#: sc/uiconfig/scalc/ui/dapiservicedialog.ui:156
 msgctxt "dapiservicedialog|label5"
 msgid "Us_er"
 msgstr "_Defnyddiwr"
 
-#: dapiservicedialog.ui:172
+#: sc/uiconfig/scalc/ui/dapiservicedialog.ui:172
 msgctxt "dapiservicedialog|label6"
 msgid "_Password"
 msgstr "_Cyfrinair"
 
-#: dapiservicedialog.ui:259
+#: sc/uiconfig/scalc/ui/dapiservicedialog.ui:255
 msgctxt "dapiservicedialog|label1"
 msgid "Selection"
 msgstr "Dewis"
 
-#: databaroptions.ui:9
+#: sc/uiconfig/scalc/ui/databaroptions.ui:9
 msgctxt "databaroptions|DataBarOptions"
 msgid "Data Bar"
 msgstr "Bar Data"
 
-#: databaroptions.ui:89
+#: sc/uiconfig/scalc/ui/databaroptions.ui:89
 msgctxt "databaroptions|label4"
 msgid "Minimum:"
 msgstr "Lleiafswm:"
 
-#: databaroptions.ui:103
+#: sc/uiconfig/scalc/ui/databaroptions.ui:103
 msgctxt "databaroptions|label5"
 msgid "Maximum:"
 msgstr "Mwyaf:"
 
-#: databaroptions.ui:118
+#: sc/uiconfig/scalc/ui/databaroptions.ui:118
 msgctxt "databaroptions|min"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: databaroptions.ui:119
+#: sc/uiconfig/scalc/ui/databaroptions.ui:119
 msgctxt "databaroptions|min"
 msgid "Minimum"
 msgstr "Lleiafswm"
 
-#: databaroptions.ui:120
+#: sc/uiconfig/scalc/ui/databaroptions.ui:120
 msgctxt "databaroptions|min"
 msgid "Maximum"
 msgstr "Mwyaf"
 
-#: databaroptions.ui:121
+#: sc/uiconfig/scalc/ui/databaroptions.ui:121
 msgctxt "databaroptions|min"
 msgid "Percentile"
 msgstr "Canradd"
 
-#: databaroptions.ui:122
+#: sc/uiconfig/scalc/ui/databaroptions.ui:122
 msgctxt "databaroptions|min"
 msgid "Value"
 msgstr "Gwerth"
 
-#: databaroptions.ui:123
+#: sc/uiconfig/scalc/ui/databaroptions.ui:123
 msgctxt "databaroptions|min"
 msgid "Percent"
 msgstr "Y Cant"
 
-#: databaroptions.ui:124
+#: sc/uiconfig/scalc/ui/databaroptions.ui:124
 msgctxt "databaroptions|min"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: databaroptions.ui:138
+#: sc/uiconfig/scalc/ui/databaroptions.ui:138
 msgctxt "databaroptions|max"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: databaroptions.ui:139
+#: sc/uiconfig/scalc/ui/databaroptions.ui:139
 msgctxt "databaroptions|max"
 msgid "Minimum"
 msgstr "Lleiafswm"
 
-#: databaroptions.ui:140
+#: sc/uiconfig/scalc/ui/databaroptions.ui:140
 msgctxt "databaroptions|max"
 msgid "Maximum"
 msgstr "Mwyaf"
 
-#: databaroptions.ui:141
+#: sc/uiconfig/scalc/ui/databaroptions.ui:141
 msgctxt "databaroptions|max"
 msgid "Percentile"
 msgstr "Canradd"
 
-#: databaroptions.ui:142
+#: sc/uiconfig/scalc/ui/databaroptions.ui:142
 msgctxt "databaroptions|max"
 msgid "Value"
 msgstr "Gwerth"
 
-#: databaroptions.ui:143
+#: sc/uiconfig/scalc/ui/databaroptions.ui:143
 msgctxt "databaroptions|max"
 msgid "Percent"
 msgstr "Y Cant"
 
-#: databaroptions.ui:144
+#: sc/uiconfig/scalc/ui/databaroptions.ui:144
 msgctxt "databaroptions|max"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: databaroptions.ui:182
+#: sc/uiconfig/scalc/ui/databaroptions.ui:180
 msgctxt "databaroptions|label1"
 msgid "Entry Values"
 msgstr "Gwerth Cofnod"
 
-#: databaroptions.ui:220
+#: sc/uiconfig/scalc/ui/databaroptions.ui:218
 msgctxt "databaroptions|label6"
 msgid "Positive:"
 msgstr "Positif:"
 
-#: databaroptions.ui:234
+#: sc/uiconfig/scalc/ui/databaroptions.ui:232
 msgctxt "databaroptions|label7"
 msgid "Negative:"
 msgstr "Negyddol:"
 
-#: databaroptions.ui:270
+#: sc/uiconfig/scalc/ui/databaroptions.ui:268
 msgctxt "databaroptions|label10"
 msgid "Fill:"
 msgstr "Llanw:"
 
-#: databaroptions.ui:282
+#: sc/uiconfig/scalc/ui/databaroptions.ui:280
 msgctxt "databaroptions|fill_type"
 msgid "Color"
 msgstr "Lliw"
 
-#: databaroptions.ui:283
+#: sc/uiconfig/scalc/ui/databaroptions.ui:281
 msgctxt "databaroptions|fill_type"
 msgid "Gradient"
 msgstr "Graddiant"
 
-#: databaroptions.ui:299
+#: sc/uiconfig/scalc/ui/databaroptions.ui:297
 msgctxt "databaroptions|label2"
 msgid "Bar Colors"
 msgstr "Bar Lliwiau"
 
-#: databaroptions.ui:337
+#: sc/uiconfig/scalc/ui/databaroptions.ui:335
 msgctxt "databaroptions|label8"
 msgid "Position of vertical axis:"
 msgstr "Lleoliad yr echelin fertigol:"
 
-#: databaroptions.ui:351
+#: sc/uiconfig/scalc/ui/databaroptions.ui:349
 msgctxt "databaroptions|label9"
 msgid "Color of vertical axis:"
 msgstr "Lliw'r echelin fertigol:"
 
-#: databaroptions.ui:366
+#: sc/uiconfig/scalc/ui/databaroptions.ui:364
 msgctxt "databaroptions|axis_pos"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: databaroptions.ui:367
+#: sc/uiconfig/scalc/ui/databaroptions.ui:365
 msgctxt "databaroptions|axis_pos"
 msgid "Middle"
 msgstr "Canol"
 
-#: databaroptions.ui:368
+#: sc/uiconfig/scalc/ui/databaroptions.ui:366
 msgctxt "databaroptions|axis_pos"
 msgid "None"
 msgstr "Dim"
 
-#: databaroptions.ui:395
+#: sc/uiconfig/scalc/ui/databaroptions.ui:393
 msgctxt "databaroptions|label3"
 msgid "Axis"
 msgstr "Echelinau"
 
-#: databaroptions.ui:433
+#: sc/uiconfig/scalc/ui/databaroptions.ui:431
 msgctxt "databaroptions|label12"
 msgid "Minimum bar length (%):"
 msgstr "Lleiafswm hyd bar (%):"
 
-#: databaroptions.ui:447
+#: sc/uiconfig/scalc/ui/databaroptions.ui:445
 msgctxt "databaroptions|label13"
 msgid "Maximum bar length (%):"
 msgstr "Uchafswm hyd bar (%):"
 
-#: databaroptions.ui:486
+#: sc/uiconfig/scalc/ui/databaroptions.ui:482
 msgctxt "databaroptions|label11"
 msgid "Bar Lengths"
 msgstr "Hyd Barrau"
 
-#: databaroptions.ui:501
+#: sc/uiconfig/scalc/ui/databaroptions.ui:497
 msgctxt "databaroptions|only_bar"
 msgid "Display bar only"
 msgstr "Dangos y bar yn unig"
 
-#: databaroptions.ui:518
+#: sc/uiconfig/scalc/ui/databaroptions.ui:515
 msgctxt "databaroptions|str_same_value"
 msgid "The minimum value must be less than the maximum value."
 msgstr "Rhaid i'r isafswm gwerth fod yn llai na'r uchafswm gwerth."
 
-#: datafielddialog.ui:8
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:8
 msgctxt "datafielddialog|DataFieldDialog"
 msgid "Data Field"
 msgstr "Maes Data"
 
-#: datafielddialog.ui:130
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:130
 msgctxt "datafielddialog|label1"
 msgid "Function"
 msgstr "Swyddogaeth"
 
-#: datafielddialog.ui:144
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:144
 msgctxt "datafielddialog|checkbutton1"
 msgid "Show it_ems without data"
 msgstr "Dangos _eitemau heb ddata"
 
-#: datafielddialog.ui:167
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:167
 msgctxt "datafielddialog|label2"
 msgid "Name:"
 msgstr "Enw:"
 
-#: datafielddialog.ui:215
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:215
 msgctxt "datafielddialog|label4"
 msgid "_Type:"
 msgstr "_Math:"
 
-#: datafielddialog.ui:230
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:230
 msgctxt "datafielddialog|basefieldft"
 msgid "_Base field:"
 msgstr "Maes _gwaelod:"
 
-#: datafielddialog.ui:245
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:245
 msgctxt "datafielddialog|baseitemft"
 msgid "Ba_se item:"
 msgstr "_Eitem sail:"
 
-#: datafielddialog.ui:260
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:260
 msgctxt "datafielddialog|type"
 msgid "Normal"
 msgstr "Arferol"
 
-#: datafielddialog.ui:261
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:261
 msgctxt "datafielddialog|type"
 msgid "Difference from"
 msgstr "Gwahaniaeth o"
 
-#: datafielddialog.ui:262
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:262
 msgctxt "datafielddialog|type"
 msgid "% of"
 msgstr "% o"
 
-#: datafielddialog.ui:263
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:263
 msgctxt "datafielddialog|type"
 msgid "% difference from"
 msgstr "% gwahaniaeth o"
 
-#: datafielddialog.ui:264
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:264
 msgctxt "datafielddialog|type"
 msgid "Running total in"
 msgstr "Cyfanswm cynnyddol yn"
 
-#: datafielddialog.ui:265
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:265
 msgctxt "datafielddialog|type"
 msgid "% of row"
 msgstr "% o'r rhes"
 
-#: datafielddialog.ui:266
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:266
 msgctxt "datafielddialog|type"
 msgid "% of column"
 msgstr "% o'r golofn"
 
-#: datafielddialog.ui:267
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:267
 msgctxt "datafielddialog|type"
 msgid "% of total"
 msgstr "% o'r cyfanswm"
 
-#: datafielddialog.ui:268
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:268
 msgctxt "datafielddialog|type"
 msgid "Index"
 msgstr "Mynegai"
 
-#: datafielddialog.ui:291
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:291
 msgctxt "datafielddialog|baseitem"
 msgid "- previous item -"
 msgstr "- eitem flaenorol -"
 
-#: datafielddialog.ui:292
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:292
 msgctxt "datafielddialog|baseitem"
 msgid "- next item -"
 msgstr "- eitem nesaf -"
 
-#: datafielddialog.ui:308
+#: sc/uiconfig/scalc/ui/datafielddialog.ui:308
 msgctxt "datafielddialog|label3"
 msgid "Displayed value"
 msgstr "Gwerth dangoswyd"
 
-#: datafieldoptionsdialog.ui:15
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:15
 msgctxt "datafieldoptionsdialog|DataFieldOptionsDialog"
 msgid "Data Field Options"
 msgstr "Dewisiadau Data Maes"
 
-#: datafieldoptionsdialog.ui:110
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:110
 msgctxt "datafieldoptionsdialog|ascending"
 msgid "_Ascending"
 msgstr "_Esgyn"
 
-#: datafieldoptionsdialog.ui:127
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:127
 msgctxt "datafieldoptionsdialog|descending"
 msgid "_Descending"
 msgstr "_Gostyngol"
 
-#: datafieldoptionsdialog.ui:143
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:143
 msgctxt "datafieldoptionsdialog|manual"
 msgid "_Manual"
 msgstr "_Gyda Llaw"
 
-#: datafieldoptionsdialog.ui:181
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:181
 msgctxt "datafieldoptionsdialog|label1"
 msgid "Sort by"
 msgstr "Trefnu yn ôl"
 
-#: datafieldoptionsdialog.ui:213
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:213
 msgctxt "datafieldoptionsdialog|repeatitemlabels"
 msgid "_Repeat item labels"
 msgstr "_Ailadrodd labeli eitem"
 
-#: datafieldoptionsdialog.ui:229
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:229
 msgctxt "datafieldoptionsdialog|emptyline"
 msgid "_Empty line after each item"
 msgstr "_Llinell wag ar ôl pob eitem"
 
-#: datafieldoptionsdialog.ui:248
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:248
 msgctxt "datafieldoptionsdialog|label3"
 msgid "_Layout:"
 msgstr "_Cynllun:"
 
-#: datafieldoptionsdialog.ui:263
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:263
 msgctxt "datafieldoptionsdialog|layout"
 msgid "Tabular layout"
 msgstr "Cynllun tablaidd"
 
-#: datafieldoptionsdialog.ui:264
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:264
 msgctxt "datafieldoptionsdialog|layout"
 msgid "Outline layout with subtotals at the top"
 msgstr "Amlinell gydag is gyfansymiau ar y brig"
 
-#: datafieldoptionsdialog.ui:265
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:265
 msgctxt "datafieldoptionsdialog|layout"
 msgid "Outline layout with subtotals at the bottom"
 msgstr "Amlinell gydag is gyfansymiau ar y Gaelaidd"
 
-#: datafieldoptionsdialog.ui:281
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:281
 msgctxt "datafieldoptionsdialog|label2"
 msgid "Display Options"
 msgstr "Dewisiadau Dangos"
 
-#: datafieldoptionsdialog.ui:313
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:313
 msgctxt "datafieldoptionsdialog|show"
 msgid "_Show:"
 msgstr "_Dangos:"
 
-#: datafieldoptionsdialog.ui:334
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:334
 msgctxt "datafieldoptionsdialog|showfromft"
 msgid "_From:"
 msgstr "_O:"
 
-#: datafieldoptionsdialog.ui:348
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:348
 msgctxt "datafieldoptionsdialog|usingft"
 msgid "_Using field:"
 msgstr "_Defnyddio maes:"
 
-#: datafieldoptionsdialog.ui:367
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:367
 msgctxt "datafieldoptionsdialog|showft"
 msgid "items"
 msgstr "eitemau"
 
-#: datafieldoptionsdialog.ui:401
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:401
 msgctxt "datafieldoptionsdialog|from"
 msgid "Top"
 msgstr "Brig"
 
-#: datafieldoptionsdialog.ui:402
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:402
 msgctxt "datafieldoptionsdialog|from"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: datafieldoptionsdialog.ui:428
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:428
 msgctxt "datafieldoptionsdialog|label4"
 msgid "Show Automatically"
 msgstr "Dangos yn Awtomatig"
 
-#: datafieldoptionsdialog.ui:473
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:473
 msgctxt "datafieldoptionsdialog|label9"
 msgid "Hide Items"
 msgstr "Cuddio Eitemau"
 
-#: datafieldoptionsdialog.ui:505
+#: sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui:505
 msgctxt "datafieldoptionsdialog|hierarchyft"
 msgid "Hierarch_y:"
 msgstr "_Hierarchaeth:"
 
-#: dataform.ui:8
+#: sc/uiconfig/scalc/ui/dataform.ui:8
 msgctxt "dataform|DataFormDialog"
 msgid "Data Form"
 msgstr "Ffurflen Data"
 
-#: dataform.ui:25
+#: sc/uiconfig/scalc/ui/dataform.ui:25
 msgctxt "dataform|label"
 msgid "New Record"
 msgstr "Cofnod Newydd"
 
-#: dataform.ui:35
+#: sc/uiconfig/scalc/ui/dataform.ui:35
 msgctxt "dataform|new"
 msgid "_New"
 msgstr "_Newydd"
 
-#: dataform.ui:51
+#: sc/uiconfig/scalc/ui/dataform.ui:51
 msgctxt "dataform|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: dataform.ui:65
+#: sc/uiconfig/scalc/ui/dataform.ui:65
 msgctxt "dataform|restore"
 msgid "_Restore"
 msgstr "_Adfer"
 
-#: dataform.ui:79
+#: sc/uiconfig/scalc/ui/dataform.ui:79
 msgctxt "dataform|prev"
 msgid "_Previous Record"
 msgstr "_Cofnod Blaenorol"
 
-#: dataform.ui:94
+#: sc/uiconfig/scalc/ui/dataform.ui:94
 msgctxt "dataform|next"
 msgid "Ne_xt Record"
 msgstr "Cofnod _Nesaf"
 
-#: dataform.ui:124
+#: sc/uiconfig/scalc/ui/dataform.ui:124
 msgctxt "dataform|close"
 msgid "_Close"
 msgstr "_Cau"
 
-#: dataprovider.ui:9
+#: sc/uiconfig/scalc/ui/dataprovider.ui:9
 msgctxt "dataprovider|DataStreamDialog"
 msgid "Live Data Streams"
 msgstr "Ffrydiau Data Byw"
 
-#: dataprovider.ui:107
+#: sc/uiconfig/scalc/ui/dataprovider.ui:107
 msgctxt "dataprovider|label6"
 msgid "URL:"
 msgstr "URL:"
 
-#: dataprovider.ui:120
+#: sc/uiconfig/scalc/ui/dataprovider.ui:120
 msgctxt "dataprovider|url|tooltip_text"
 msgid "Enter the URL of the source document in the local file system or Internet here."
 msgstr "Rhowch URL y ddogfen ffynhonnell yn y system ffeil leol neu Ryngrwyd yma."
 
-#: dataprovider.ui:138
+#: sc/uiconfig/scalc/ui/dataprovider.ui:138
 msgctxt "dataprovider|browse"
 msgid "_Browse..."
 msgstr "_Pori..."
 
-#: dataprovider.ui:165
+#: sc/uiconfig/scalc/ui/dataprovider.ui:165
 msgctxt "dataprovider|label_db"
 msgid "Database Range:"
 msgstr "Ystodau Cronfa Ddata:"
 
-#: dataprovider.ui:199
+#: sc/uiconfig/scalc/ui/dataprovider.ui:199
 msgctxt "dataprovider|label_provider"
 msgid "Data Provider:"
 msgstr "Darparwr Data:"
 
-#: dataprovider.ui:234
+#: sc/uiconfig/scalc/ui/dataprovider.ui:234
 msgctxt "dataprovider|label_search"
 msgid "Search String:"
 msgstr "Llinyn Chwilio:"
 
-#: dataprovider.ui:268
+#: sc/uiconfig/scalc/ui/dataprovider.ui:268
 msgctxt "dataprovider|label"
 msgid "Source Stream"
 msgstr "Ffynhonnell Llif"
 
-#: dataproviderentry.ui:46
+#: sc/uiconfig/scalc/ui/dataproviderentry.ui:46
 msgctxt "dataproviderentry|url"
 msgid "URL:"
 msgstr "URL:"
 
-#: dataproviderentry.ui:57
+#: sc/uiconfig/scalc/ui/dataproviderentry.ui:57
 msgctxt "dataproviderentry|id"
 msgid "ID:"
 msgstr "Enw:"
 
-#: dataproviderentry.ui:68
+#: sc/uiconfig/scalc/ui/dataproviderentry.ui:68
 msgctxt "dataproviderentry|provider"
 msgid "Data Provider:"
 msgstr "Darparwr Data:"
 
-#: datastreams.ui:9
+#: sc/uiconfig/scalc/ui/datastreams.ui:9
 msgctxt "datastreams|DataStreamDialog"
 msgid "Live Data Streams"
 msgstr "Ffrydiau Data Byw"
 
-#: datastreams.ui:50
+#: sc/uiconfig/scalc/ui/datastreams.ui:50
 msgctxt "datastreams|label6"
 msgid "URL:"
 msgstr "URL:"
 
-#: datastreams.ui:63
+#: sc/uiconfig/scalc/ui/datastreams.ui:63
 msgctxt "datastreams|url|tooltip_text"
 msgid "Enter the URL of the source document in the local file system or Internet here."
 msgstr "Rhowch URL y ddogfen ffynhonnell yn y system ffeil leol neu Ryngrwyd yma."
 
-#: datastreams.ui:81
+#: sc/uiconfig/scalc/ui/datastreams.ui:81
 msgctxt "datastreams|browse"
 msgid "_Browse..."
 msgstr "_Pori..."
 
-#: datastreams.ui:120
+#: sc/uiconfig/scalc/ui/datastreams.ui:120
 msgctxt "datastreams|valuesinline"
 msgid "value1,value2,...,valueN, and fill into range:"
 msgstr "value1,value2,...,valueN, a llanw i'r ystod:"
 
-#: datastreams.ui:137
+#: sc/uiconfig/scalc/ui/datastreams.ui:137
 msgctxt "datastreams|addressvalue"
 msgid "address,value"
 msgstr "address,value"
 
-#: datastreams.ui:174
+#: sc/uiconfig/scalc/ui/datastreams.ui:173
 msgctxt "datastreams|label4"
 msgid "Interpret stream data as"
 msgstr "Dehongli llif data fel"
 
-#: datastreams.ui:187
+#: sc/uiconfig/scalc/ui/datastreams.ui:186
 msgctxt "datastreams|refresh_ui"
 msgid "Empty lines trigger UI refresh"
 msgstr "Mae llinellau gwag yn adnewyddu'r rhyngwyneb"
 
-#: datastreams.ui:209
+#: sc/uiconfig/scalc/ui/datastreams.ui:209
 msgctxt "datastreams|label"
 msgid "Source Stream"
 msgstr "Ffynhonnell Llif"
 
-#: datastreams.ui:250
+#: sc/uiconfig/scalc/ui/datastreams.ui:250
 msgctxt "datastreams|datadown"
 msgid "Move existing data down"
 msgstr "Symud y data cyfredol i lawr"
 
-#: datastreams.ui:267
+#: sc/uiconfig/scalc/ui/datastreams.ui:267
 msgctxt "datastreams|rangedown"
 msgid "Move the range down"
 msgstr "Symud yr ystod i lawr"
 
-#: datastreams.ui:285
+#: sc/uiconfig/scalc/ui/datastreams.ui:285
 msgctxt "datastreams|nomove"
 msgid "Overwrite existing data"
 msgstr "Trosysgrifo'r ddata presennol"
 
-#: datastreams.ui:308
+#: sc/uiconfig/scalc/ui/datastreams.ui:308
 msgctxt "datastreams|label2"
 msgid "When New Data Arrives"
 msgstr "Pan fydd Data'n Cyrraedd"
 
-#: datastreams.ui:342
+#: sc/uiconfig/scalc/ui/datastreams.ui:342
 msgctxt "datastreams|maxlimit"
 msgid "Limit to:"
 msgstr "Cyfyngu i:"
 
-#: datastreams.ui:372
+#: sc/uiconfig/scalc/ui/datastreams.ui:371
 msgctxt "datastreams|unlimited"
 msgid "_Unlimited"
 msgstr "_Dim terfyn"
 
-#: datastreams.ui:398
+#: sc/uiconfig/scalc/ui/datastreams.ui:397
 msgctxt "datastreams|label3"
 msgid "Maximal Amount of Rows"
 msgstr "Swm Uchaf Rhesi"
 
-#: definedatabaserangedialog.ui:9
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:9
 msgctxt "definedatabaserangedialog|DefineDatabaseRangeDialog"
 msgid "Define Database Range"
 msgstr "Diffinio Ystod Cronfa Ddata"
 
-#: definedatabaserangedialog.ui:61
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:61
 msgctxt "definedatabaserangedialog|Name"
 msgid "Name"
 msgstr "Enw"
 
-#: definedatabaserangedialog.ui:125
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:125
 msgctxt "definedatabaserangedialog|Range"
 msgid "Range"
 msgstr "Ystod"
 
-#: definedatabaserangedialog.ui:160
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:160
 msgctxt "definedatabaserangedialog|modify"
 msgid "M_odify"
 msgstr "_Newid"
 
-#: definedatabaserangedialog.ui:213
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:213
 msgctxt "definedatabaserangedialog|ContainsColumnLabels"
 msgid "Co_ntains column labels"
 msgstr "_Yn cynnwys labeli colofn"
 
-#: definedatabaserangedialog.ui:229
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:229
 msgctxt "definedatabaserangedialog|ContainsTotalsRow"
 msgid "Contains _totals row"
 msgstr "Cynnwys rhes _cyfanswm"
 
-#: definedatabaserangedialog.ui:245
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:245
 msgctxt "definedatabaserangedialog|InsertOrDeleteCells"
 msgid "Insert or delete _cells"
 msgstr "Mewnosod neu dileu ­_celloedd"
 
-#: definedatabaserangedialog.ui:261
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:261
 msgctxt "definedatabaserangedialog|KeepFormatting"
 msgid "Keep _formatting"
 msgstr "Cadw _fformatio"
 
-#: definedatabaserangedialog.ui:277
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:277
 msgctxt "definedatabaserangedialog|DontSaveImportedData"
 msgid "Don't save _imported data"
 msgstr "_Peidio â chadw data mewnforiwyd"
 
-#: definedatabaserangedialog.ui:296
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:296
 msgctxt "definedatabaserangedialog|Source"
 msgid "Source:"
 msgstr "Ffynhonnell:"
 
-#: definedatabaserangedialog.ui:309
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:309
 msgctxt "definedatabaserangedialog|Operations"
 msgid "Operations:"
 msgstr "Gweithrediadau:"
 
-#: definedatabaserangedialog.ui:322
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:322
 msgctxt "definedatabaserangedialog|invalid"
 msgid "Invalid range"
 msgstr "Ystod annilys"
 
-#: definedatabaserangedialog.ui:338
+#: sc/uiconfig/scalc/ui/definedatabaserangedialog.ui:338
 msgctxt "definedatabaserangedialog|label1"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: definename.ui:9
+#: sc/uiconfig/scalc/ui/definename.ui:9
 msgctxt "definename|DefineNameDialog"
 msgid "Define Name"
 msgstr "Diffinio Enw"
 
-#: definename.ui:89
+#: sc/uiconfig/scalc/ui/definename.ui:89
 msgctxt "definename|label2"
 msgid "Name:"
 msgstr "Enw:"
 
-#: definename.ui:103
+#: sc/uiconfig/scalc/ui/definename.ui:103
 msgctxt "definename|label3"
 msgid "Range or formula expression:"
 msgstr "Mynegiad ystod neu fformiwla:"
 
-#: definename.ui:117
+#: sc/uiconfig/scalc/ui/definename.ui:117
 msgctxt "definename|label4"
 msgid "Scope:"
 msgstr "Cwmpas:"
 
-#: definename.ui:190
+#: sc/uiconfig/scalc/ui/definename.ui:188
 msgctxt "definename|label"
 msgid "Define the name and range or formula expression."
 msgstr "Diffiniwch yr enw ac ystod neu fynegiant fformiwla."
 
-#: definename.ui:220
+#: sc/uiconfig/scalc/ui/definename.ui:218
 msgctxt "definename|printarea"
 msgid "_Print range"
 msgstr "_Ystod argraffu"
 
-#: definename.ui:235
+#: sc/uiconfig/scalc/ui/definename.ui:233
 msgctxt "definename|filter"
 msgid "_Filter"
 msgstr "_Hidl"
 
-#: definename.ui:250
+#: sc/uiconfig/scalc/ui/definename.ui:248
 msgctxt "definename|colheader"
 msgid "Repeat _column"
 msgstr "Ailadrodd _colofn"
 
-#: definename.ui:265
+#: sc/uiconfig/scalc/ui/definename.ui:263
 msgctxt "definename|rowheader"
 msgid "Repeat _row"
 msgstr "Ailadrodd _rhes"
 
-#: definename.ui:284
+#: sc/uiconfig/scalc/ui/definename.ui:282
 msgctxt "definename|label5"
 msgid "Range _Options"
 msgstr "_Dewisiadau Ystod"
 
-#: deletecells.ui:8
+#: sc/uiconfig/scalc/ui/deletecells.ui:8
 msgctxt "deletecells|DeleteCellsDialog"
 msgid "Delete Cells"
 msgstr "Dileu Celloedd"
 
-#: deletecells.ui:93
+#: sc/uiconfig/scalc/ui/deletecells.ui:97
 msgctxt "deletecells|up"
 msgid "Shift cells _up"
 msgstr "Symud celloedd _fyny"
 
-#: deletecells.ui:111
+#: sc/uiconfig/scalc/ui/deletecells.ui:114
 msgctxt "deletecells|left"
 msgid "Shift cells _left"
 msgstr "Symud celloedd i'r _chwith"
 
-#: deletecells.ui:128
+#: sc/uiconfig/scalc/ui/deletecells.ui:131
 msgctxt "deletecells|rows"
 msgid "Delete entire _row(s)"
 msgstr "Dileu _rhes(i) cyfan"
 
-#: deletecells.ui:145
+#: sc/uiconfig/scalc/ui/deletecells.ui:148
 msgctxt "deletecells|cols"
 msgid "Delete entire _column(s)"
 msgstr "Dileu _colofn(nau) cyfan"
 
-#: deletecells.ui:168
+#: sc/uiconfig/scalc/ui/deletecells.ui:171
 msgctxt "deletecells|label1"
 msgid "Selection"
 msgstr "Dewis"
 
-#: deletecontents.ui:8
+#: sc/uiconfig/scalc/ui/deletecolumnentry.ui:21
+msgctxt "deletecolumnentry|name"
+msgid "Delete Columns Action"
+msgstr "Dileu Gweithredoedd Colofnau"
+
+#: sc/uiconfig/scalc/ui/deletecolumnentry.ui:37
+msgctxt "deletecolumnentry|separator"
+msgid "Columns (List of ';' separated columns)"
+msgstr "Colofnau (Rhestr o golofnau wedi eu gwahanu ';')"
+
+#: sc/uiconfig/scalc/ui/deletecontents.ui:8
 msgctxt "deletecontents|DeleteContentsDialog"
 msgid "Delete Contents"
 msgstr "Dileu Cynnwys"
 
-#: deletecontents.ui:93
+#: sc/uiconfig/scalc/ui/deletecontents.ui:96
 msgctxt "deletecontents|deleteall"
 msgid "Delete _all"
 msgstr "Dileu _popeth"
 
-#: deletecontents.ui:116
+#: sc/uiconfig/scalc/ui/deletecontents.ui:119
 msgctxt "deletecontents|text"
 msgid "_Text"
 msgstr "_Testun"
 
-#: deletecontents.ui:131
+#: sc/uiconfig/scalc/ui/deletecontents.ui:134
 msgctxt "deletecontents|numbers"
 msgid "_Numbers"
 msgstr "_Rhifau"
 
-#: deletecontents.ui:146
+#: sc/uiconfig/scalc/ui/deletecontents.ui:149
 msgctxt "deletecontents|datetime"
 msgid "_Date & time"
 msgstr "_Dyddiad ac amser"
 
-#: deletecontents.ui:161
+#: sc/uiconfig/scalc/ui/deletecontents.ui:164
 msgctxt "deletecontents|formulas"
 msgid "_Formulas"
 msgstr "_Fformiwlâu"
 
-#: deletecontents.ui:176
+#: sc/uiconfig/scalc/ui/deletecontents.ui:179
 msgctxt "deletecontents|comments"
 msgid "_Comments"
 msgstr "_Nodiadau"
 
-#: deletecontents.ui:191
+#: sc/uiconfig/scalc/ui/deletecontents.ui:194
 msgctxt "deletecontents|formats"
 msgid "For_mats"
 msgstr "Ffo_rmatau"
 
-#: deletecontents.ui:206
+#: sc/uiconfig/scalc/ui/deletecontents.ui:209
 msgctxt "deletecontents|objects"
 msgid "_Objects"
 msgstr "_Gwrthrychau"
 
-#: deletecontents.ui:237
+#: sc/uiconfig/scalc/ui/deletecontents.ui:240
 msgctxt "deletecontents|label2"
 msgid "Selection"
 msgstr "Dewis"
 
-#: descriptivestatisticsdialog.ui:9
+#: sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui:9
 msgctxt "descriptivestatisticsdialog|DescriptiveStatisticsDialog"
 msgid "Descriptive Statistics"
 msgstr "Ystadegau Disgrifiadol"
 
-#: descriptivestatisticsdialog.ui:42
+#: sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui:42
 msgctxt "descriptivestatisticsdialog|input-range-label"
 msgid "Input range:"
 msgstr "Ystod mewnbwn:"
 
-#: descriptivestatisticsdialog.ui:81
+#: sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui:80
 msgctxt "descriptivestatisticsdialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniad i:"
 
-#: descriptivestatisticsdialog.ui:123
+#: sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui:121
 msgctxt "descriptivestatisticsdialog|label1"
 msgid "Data"
 msgstr "Data"
 
-#: descriptivestatisticsdialog.ui:217
+#: sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui:215
 msgctxt "descriptivestatisticsdialog|groupedby-columns-radio"
 msgid "_Columns"
 msgstr "_Colofnau"
 
-#: descriptivestatisticsdialog.ui:233
+#: sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui:231
 msgctxt "descriptivestatisticsdialog|groupedby-rows-radio"
 msgid "_Rows"
 msgstr "_Rhesi"
 
-#: descriptivestatisticsdialog.ui:255
+#: sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui:253
 msgctxt "descriptivestatisticsdialog|label2"
 msgid "Grouped by"
 msgstr "Grwpiwyd yn ôl"
 
-#: doubledialog.ui:7
+#: sc/uiconfig/scalc/ui/doubledialog.ui:7
 msgctxt "doubledialog|DoubleDialog"
 msgid "Edit Setting"
 msgstr "Gosodiad Golygu"
 
-#: dropmenu.ui:12
+#: sc/uiconfig/scalc/ui/dropmenu.ui:12
 msgctxt "dropmenu|hyperlink"
 msgid "Insert as Hyperlink"
 msgstr "Mewnosod fel Dolen"
 
-#: dropmenu.ui:20
+#: sc/uiconfig/scalc/ui/dropmenu.ui:20
 msgctxt "dropmenu|link"
 msgid "Insert as Link"
 msgstr "Mewnosod fel Cyswllt"
 
-#: dropmenu.ui:28
+#: sc/uiconfig/scalc/ui/dropmenu.ui:28
 msgctxt "dropmenu|copy"
 msgid "Insert as Copy"
 msgstr "Mewnosod fel Copi"
 
-#: erroralerttabpage.ui:14
+#: sc/uiconfig/scalc/ui/erroralerttabpage.ui:14
 msgctxt "erroralerttabpage|tsbshow"
 msgid "Show error _message when invalid values are entered"
 msgstr "Dangos neges _gwall pan fo gwerthoedd annilys yn cael eu rhoi"
 
-#: erroralerttabpage.ui:59
+#: sc/uiconfig/scalc/ui/erroralerttabpage.ui:59
 msgctxt "erroralerttabpage|action_label"
 msgid "_Action:"
 msgstr "_Gweithred:"
 
-#: erroralerttabpage.ui:76
+#: sc/uiconfig/scalc/ui/erroralerttabpage.ui:76
 msgctxt "erroralerttabpage|title_label"
 msgid "_Title:"
 msgstr "_Teitl:"
 
-#: erroralerttabpage.ui:128
+#: sc/uiconfig/scalc/ui/erroralerttabpage.ui:126
 msgctxt "erroralerttabpage|errormsg_label"
 msgid "_Error message:"
 msgstr "_Neges gwall:"
 
-#: erroralerttabpage.ui:141
+#: sc/uiconfig/scalc/ui/erroralerttabpage.ui:139
 msgctxt "erroralerttabpage|browseBtn"
 msgid "_Browse..."
 msgstr "_Pori..."
 
-#: erroralerttabpage.ui:160
+#: sc/uiconfig/scalc/ui/erroralerttabpage.ui:158
 msgctxt "erroralerttabpage|actionCB"
 msgid "Stop"
 msgstr "Atal"
 
-#: erroralerttabpage.ui:161
+#: sc/uiconfig/scalc/ui/erroralerttabpage.ui:159
 msgctxt "erroralerttabpage|actionCB"
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: erroralerttabpage.ui:162
+#: sc/uiconfig/scalc/ui/erroralerttabpage.ui:160
 msgctxt "erroralerttabpage|actionCB"
 msgid "Information"
 msgstr "Gwybodaeth"
 
-#: erroralerttabpage.ui:163
+#: sc/uiconfig/scalc/ui/erroralerttabpage.ui:161
 msgctxt "erroralerttabpage|actionCB"
 msgid "Macro"
 msgstr "Macro"
 
-#: erroralerttabpage.ui:181
+#: sc/uiconfig/scalc/ui/erroralerttabpage.ui:179
 msgctxt "erroralerttabpage|label1"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: exponentialsmoothingdialog.ui:15
+#: sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui:15
 msgctxt "exponentialsmoothingdialog|ExponentialSmoothingDialog"
 msgid "Exponential Smoothing"
 msgstr "Llyfnhau Esbonyddol"
 
-#: exponentialsmoothingdialog.ui:48
+#: sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui:48
 msgctxt "exponentialsmoothingdialog|input-range-label"
 msgid "Input range:"
 msgstr "Ystod mewnbwn:"
 
-#: exponentialsmoothingdialog.ui:87
+#: sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui:86
 msgctxt "exponentialsmoothingdialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniad i:"
 
-#: exponentialsmoothingdialog.ui:129
+#: sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui:127
 msgctxt "exponentialsmoothingdialog|label5"
 msgid "Data"
 msgstr "Data"
 
-#: exponentialsmoothingdialog.ui:223
+#: sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui:221
 msgctxt "exponentialsmoothingdialog|groupedby-columns-radio"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: exponentialsmoothingdialog.ui:239
+#: sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui:237
 msgctxt "exponentialsmoothingdialog|groupedby-rows-radio"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: exponentialsmoothingdialog.ui:261
+#: sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui:259
 msgctxt "exponentialsmoothingdialog|label2"
 msgid "Grouped by"
 msgstr "Grwpiwyd yn ôl"
 
-#: exponentialsmoothingdialog.ui:299
+#: sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui:297
 msgctxt "exponentialsmoothingdialog|smoothing-factor-label"
 msgid "Smoothing factor:"
 msgstr "Ffactor llyfnhau:"
 
-#: exponentialsmoothingdialog.ui:331
+#: sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui:328
 msgctxt "exponentialsmoothingdialog|label1"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: externaldata.ui:16
+#: sc/uiconfig/scalc/ui/externaldata.ui:23
 msgctxt "externaldata|ExternalDataDialog"
 msgid "External Data"
 msgstr "Data Allanol"
 
-#: externaldata.ui:118
+#: sc/uiconfig/scalc/ui/externaldata.ui:129
 msgctxt "externaldata|url|tooltip_text"
 msgid "Enter the URL of the source document in the local file system or Internet here."
 msgstr "Rhowch URL y ddogfen ffynhonnell yn y system ffeil leol neu Ryngrwyd yma."
 
-#: externaldata.ui:136
+#: sc/uiconfig/scalc/ui/externaldata.ui:146
 msgctxt "externaldata|browse"
 msgid "_Browse..."
 msgstr "_Pori..."
 
-#: externaldata.ui:163
+#: sc/uiconfig/scalc/ui/externaldata.ui:173
 msgctxt "externaldata|label1"
 msgid "URL of _External Data Source"
 msgstr "_URL Ffynhonnell Data Allanol"
 
-#: externaldata.ui:233
+#: sc/uiconfig/scalc/ui/externaldata.ui:257
 msgctxt "externaldata|reload"
 msgid "_Update every:"
 msgstr "_Diweddaru pob:"
 
-#: externaldata.ui:275
+#: sc/uiconfig/scalc/ui/externaldata.ui:298
 msgctxt "externaldata|secondsft"
 msgid "_seconds"
 msgstr "_eiliad"
 
-#: externaldata.ui:307
+#: sc/uiconfig/scalc/ui/externaldata.ui:329
 msgctxt "externaldata|label2"
 msgid "_Available Tables/Ranges"
 msgstr "_Tablau/Ystodau ar Gael"
 
-#: filldlg.ui:8
+#: sc/uiconfig/scalc/ui/filldlg.ui:8
 msgctxt "filldlg|FillSeriesDialog"
 msgid "Fill Series"
 msgstr "Cyfres Llanw"
 
-#: filldlg.ui:100
+#: sc/uiconfig/scalc/ui/filldlg.ui:100
 msgctxt "filldlg|down"
 msgid "_Down"
 msgstr "_Lawr"
 
-#: filldlg.ui:118
+#: sc/uiconfig/scalc/ui/filldlg.ui:118
 msgctxt "filldlg|right"
 msgid "_Right"
 msgstr "_De"
 
-#: filldlg.ui:135
+#: sc/uiconfig/scalc/ui/filldlg.ui:135
 msgctxt "filldlg|up"
 msgid "_Up"
 msgstr "_Fyny"
 
-#: filldlg.ui:152
+#: sc/uiconfig/scalc/ui/filldlg.ui:152
 msgctxt "filldlg|left"
 msgid "_Left"
 msgstr "_Chwith"
 
-#: filldlg.ui:176
+#: sc/uiconfig/scalc/ui/filldlg.ui:176
 msgctxt "filldlg|label1"
 msgid "Direction"
 msgstr "Cyfeiriad"
 
-#: filldlg.ui:211
+#: sc/uiconfig/scalc/ui/filldlg.ui:211
 msgctxt "filldlg|linear"
 msgid "Li_near"
 msgstr "_Llinellog"
 
-#: filldlg.ui:229
+#: sc/uiconfig/scalc/ui/filldlg.ui:229
 msgctxt "filldlg|growth"
 msgid "_Growth"
 msgstr "_Twf"
 
-#: filldlg.ui:246
+#: sc/uiconfig/scalc/ui/filldlg.ui:246
 msgctxt "filldlg|date"
 msgid "Da_te"
 msgstr "_Dyddiad"
 
-#: filldlg.ui:263
+#: sc/uiconfig/scalc/ui/filldlg.ui:263
 msgctxt "filldlg|autofill"
 msgid "_AutoFill"
 msgstr "_AwtoLanw"
 
-#: filldlg.ui:287
+#: sc/uiconfig/scalc/ui/filldlg.ui:287
 msgctxt "filldlg|label2"
 msgid "Series Type"
 msgstr "Math Cyfres"
 
-#: filldlg.ui:322
+#: sc/uiconfig/scalc/ui/filldlg.ui:322
 msgctxt "filldlg|day"
 msgid "Da_y"
 msgstr "_Diwrnod"
 
-#: filldlg.ui:340
+#: sc/uiconfig/scalc/ui/filldlg.ui:340
 msgctxt "filldlg|week"
 msgid "_Weekday"
 msgstr "Diwrnod yr _wythnos"
 
-#: filldlg.ui:358
+#: sc/uiconfig/scalc/ui/filldlg.ui:358
 msgctxt "filldlg|month"
 msgid "_Month"
 msgstr "M_is"
 
-#: filldlg.ui:375
+#: sc/uiconfig/scalc/ui/filldlg.ui:375
 msgctxt "filldlg|year"
 msgid "Y_ear"
 msgstr "_Blwyddyn"
 
-#: filldlg.ui:399
+#: sc/uiconfig/scalc/ui/filldlg.ui:399
 msgctxt "filldlg|tuL"
 msgid "Time Unit"
 msgstr "Uned Amser"
 
-#: filldlg.ui:422
+#: sc/uiconfig/scalc/ui/filldlg.ui:422
 msgctxt "filldlg|startL"
 msgid "_Start value:"
 msgstr "_Gwerth cychwyn:"
 
-#: filldlg.ui:436
+#: sc/uiconfig/scalc/ui/filldlg.ui:436
 msgctxt "filldlg|endL"
 msgid "End _value:"
 msgstr "_Gwerth diwedd:"
 
-#: filldlg.ui:450
+#: sc/uiconfig/scalc/ui/filldlg.ui:450
 msgctxt "filldlg|incrementL"
 msgid "In_crement:"
 msgstr "_Cynyddiad:"
 
-#: floatingborderstyle.ui:32
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:32
 msgctxt "floatingborderstyle|none|tooltip_text"
 msgid "No Border"
 msgstr "Dim Border"
 
-#: floatingborderstyle.ui:45
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:45
 msgctxt "floatingborderstyle|all|tooltip_text"
 msgid "All Borders"
 msgstr "Pob Border"
 
-#: floatingborderstyle.ui:58
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:58
 msgctxt "floatingborderstyle|outside|tooltip_text"
 msgid "Outside Borders"
 msgstr "Border Allanol"
 
-#: floatingborderstyle.ui:71
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:71
 msgctxt "floatingborderstyle|thickbox|tooltip_text"
 msgid "Thick Box Border"
 msgstr "Border Blwch Trwm"
 
-#: floatingborderstyle.ui:95
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:95
 msgctxt "floatingborderstyle|thickbottom|tooltip_text"
 msgid "Thick Bottom Border"
 msgstr "Border Gwaelod Trwm"
 
-#: floatingborderstyle.ui:108
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:108
 msgctxt "floatingborderstyle|doublebottom|tooltip_text"
 msgid "Double Bottom Border"
 msgstr "Border Gwaelod Dwbl"
 
-#: floatingborderstyle.ui:121
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:121
 msgctxt "floatingborderstyle|topthickbottom|tooltip_text"
 msgid "Top and Thick Bottom Borders"
 msgstr "Borderi Gwaelod Trwm a Brig"
 
-#: floatingborderstyle.ui:134
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:134
 msgctxt "floatingborderstyle|topdoublebottom|tooltip_text"
 msgid "Top and Double Bottom Borders"
 msgstr "Borderi Gwaelod Dwbl a Brig"
 
-#: floatingborderstyle.ui:158
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:158
 msgctxt "floatingborderstyle|left|tooltip_text"
 msgid "Left Border"
 msgstr "Border Chwith"
 
-#: floatingborderstyle.ui:171
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:171
 msgctxt "floatingborderstyle|right|tooltip_text"
 msgid "Right Border"
 msgstr "Border De"
 
-#: floatingborderstyle.ui:184
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:184
 msgctxt "floatingborderstyle|top|tooltip_text"
 msgid "Top Border"
 msgstr "Border Brig"
 
-#: floatingborderstyle.ui:197
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:197
 msgctxt "floatingborderstyle|bottom|tooltip_text"
 msgid "Bottom Border"
 msgstr "Border Gwaelod"
 
-#: floatingborderstyle.ui:210
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:210
 msgctxt "floatingborderstyle|diagup|tooltip_text"
 msgid "Diagonal Up Border"
 msgstr "Border Croesgornel i Fyny"
 
-#: floatingborderstyle.ui:224
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:224
 msgctxt "floatingborderstyle|diagdown|tooltip_text"
 msgid "Diagonal Down Border"
 msgstr "Border Croesgornel i Lawr"
 
-#: floatingborderstyle.ui:238
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:238
 msgctxt "floatingborderstyle|topbottom|tooltip_text"
 msgid "Top and Bottom Borders"
 msgstr "Borderi Brig a Gwaelod"
 
-#: floatingborderstyle.ui:252
+#: sc/uiconfig/scalc/ui/floatingborderstyle.ui:252
 msgctxt "floatingborderstyle|leftright|tooltip_text"
 msgid "Left and Right Borders"
 msgstr "Borderi De a Chwith"
 
-#: floatinglinestyle.ui:41
+#: sc/uiconfig/scalc/ui/floatinglinestyle.ui:41
 msgctxt "floatinglinestyle|more"
 msgid "_More Options..."
 msgstr "_Rhagor o Ddewisiadau..."
 
-#: footerdialog.ui:8
+#: sc/uiconfig/scalc/ui/footerdialog.ui:8
 msgctxt "footerdialog|FooterDialog"
 msgid "Footers"
 msgstr "Troedynnau"
 
-#: footerdialog.ui:106
+#: sc/uiconfig/scalc/ui/footerdialog.ui:106
 msgctxt "footerdialog|footerright"
 msgid "Footer (right)"
 msgstr "Troedyn (de)"
 
-#: footerdialog.ui:128
+#: sc/uiconfig/scalc/ui/footerdialog.ui:128
 msgctxt "footerdialog|footerleft"
 msgid "Footer (left)"
 msgstr "Troedyn (chwith)"
 
-#: formatcellsdialog.ui:8
+#: sc/uiconfig/scalc/ui/formatcellsdialog.ui:8
 msgctxt "formatcellsdialog|FormatCellsDialog"
 msgid "Format Cells"
 msgstr "Fformatio Celloedd"
 
-#: formatcellsdialog.ui:106
+#: sc/uiconfig/scalc/ui/formatcellsdialog.ui:106
 msgctxt "formatcellsdialog|numbers"
 msgid "Numbers"
 msgstr "Rhifau"
 
-#: formatcellsdialog.ui:128
+#: sc/uiconfig/scalc/ui/formatcellsdialog.ui:128
 msgctxt "formatcellsdialog|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: formatcellsdialog.ui:151
+#: sc/uiconfig/scalc/ui/formatcellsdialog.ui:151
 msgctxt "formatcellsdialog|fonteffects"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: formatcellsdialog.ui:174
+#: sc/uiconfig/scalc/ui/formatcellsdialog.ui:174
 msgctxt "formatcellsdialog|alignment"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: formatcellsdialog.ui:197
+#: sc/uiconfig/scalc/ui/formatcellsdialog.ui:197
 msgctxt "formatcellsdialog|asiantypography"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: formatcellsdialog.ui:220
+#: sc/uiconfig/scalc/ui/formatcellsdialog.ui:220
 msgctxt "formatcellsdialog|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: formatcellsdialog.ui:243
+#: sc/uiconfig/scalc/ui/formatcellsdialog.ui:243
 msgctxt "formatcellsdialog|background"
 msgid "Background"
 msgstr "Cefndir"
 
-#: formatcellsdialog.ui:266
+#: sc/uiconfig/scalc/ui/formatcellsdialog.ui:266
 msgctxt "formatcellsdialog|cellprotection"
 msgid "Cell Protection"
 msgstr "Diogelwch Cell"
 
-#: formulacalculationoptions.ui:16
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:16
 msgctxt "formulacalculationoptions|FormulaCalculationOptions"
 msgid "Detailed Calculation Settings"
 msgstr "Gosodiadau Cyfrifo Manwl"
 
-#: formulacalculationoptions.ui:46
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:46
 msgctxt "formulacalculationoptions|labelConvT2N"
 msgid "Conversion from text to number:"
 msgstr "Trosi rhwng testun a rhifau:"
 
-#: formulacalculationoptions.ui:55
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:55
 msgctxt "formulacalculationoptions|checkEmptyAsZero"
 msgid "Treat _empty string as zero"
 msgstr "Trin llinyn _gwag fel sero"
 
-#: formulacalculationoptions.ui:73
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:73
 msgctxt "formulacalculationoptions|labelSyntaxRef"
 msgid "Reference syntax for string reference:"
 msgstr "Cystrawen cyfeiriad ar gyfer cyfeiriad y llinyn:"
 
-#: formulacalculationoptions.ui:85
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:85
 msgctxt "formulacalculationoptions|comboSyntaxRef"
 msgid "Use formula syntax"
 msgstr "Defnyddio cystrawen fformiwla"
 
-#: formulacalculationoptions.ui:102
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:102
 msgctxt "formulacalculationoptions|comboConversion"
 msgid "Generate #VALUE! error"
 msgstr "Cynhyrchu gwall #VALUE !"
 
-#: formulacalculationoptions.ui:103
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:103
 msgctxt "formulacalculationoptions|comboConversion"
 msgid "Treat as zero"
 msgstr "Trin fel sero"
 
-#: formulacalculationoptions.ui:104
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:104
 msgctxt "formulacalculationoptions|comboConversion"
 msgid "Convert only if unambiguous"
 msgstr "Trosi dim ond os yn ddiamwys"
 
-#: formulacalculationoptions.ui:105
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:105
 msgctxt "formulacalculationoptions|comboConversion"
 msgid "Convert also locale dependent"
 msgstr "Trosi hefyd yn ddibynnol ar y locale"
 
-#: formulacalculationoptions.ui:115
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:115
 msgctxt "formulacalculationoptions|current_doc"
 msgid "Apply those settings to current document only"
 msgstr "Gosod y dewisiadau i'r ddogfen gyfredol yn unig"
 
-#: formulacalculationoptions.ui:136
+#: sc/uiconfig/scalc/ui/formulacalculationoptions.ui:137
 msgctxt "formulacalculationoptions|label3"
 msgid "Contents to Numbers"
 msgstr "Cynnwys i Rifau"
 
-#: functionpanel.ui:45
+#: sc/uiconfig/scalc/ui/functionpanel.ui:45
 msgctxt "functionpanel|insert|tooltip_text"
 msgid "Insert Function into calculation sheet"
 msgstr "Mewnosod Swyddogaeth i ddalen cyfrifo"
 
-#: functionpanel.ui:59
+#: sc/uiconfig/scalc/ui/functionpanel.ui:59
 msgctxt "functionpanel|category"
 msgid "Last Used"
 msgstr "Defnyddiwyd Diwethaf"
 
-#: functionpanel.ui:60
+#: sc/uiconfig/scalc/ui/functionpanel.ui:60
 msgctxt "functionpanel|category"
 msgid "All"
 msgstr "Popeth"
 
-#: functionpanel.ui:61
+#: sc/uiconfig/scalc/ui/functionpanel.ui:61
 msgctxt "functionpanel|category"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: functionpanel.ui:62
+#: sc/uiconfig/scalc/ui/functionpanel.ui:62
 msgctxt "functionpanel|category"
 msgid "Date&Time"
 msgstr "Dyddiad ac Amser"
 
-#: functionpanel.ui:63
+#: sc/uiconfig/scalc/ui/functionpanel.ui:63
 msgctxt "functionpanel|category"
 msgid "Financial"
 msgstr "Cyllid"
 
-#: functionpanel.ui:64
+#: sc/uiconfig/scalc/ui/functionpanel.ui:64
 msgctxt "functionpanel|category"
 msgid "Information"
 msgstr "Manylion"
 
-#: functionpanel.ui:65
+#: sc/uiconfig/scalc/ui/functionpanel.ui:65
 msgctxt "functionpanel|category"
 msgid "Logical"
 msgstr "Rhesymegol"
 
-#: functionpanel.ui:66
+#: sc/uiconfig/scalc/ui/functionpanel.ui:66
 msgctxt "functionpanel|category"
 msgid "Mathematical"
 msgstr "Mathemategol"
 
-#: functionpanel.ui:67
+#: sc/uiconfig/scalc/ui/functionpanel.ui:67
 msgctxt "functionpanel|category"
 msgid "Array"
 msgstr "Arae"
 
-#: functionpanel.ui:68
+#: sc/uiconfig/scalc/ui/functionpanel.ui:68
 msgctxt "functionpanel|category"
 msgid "Statistical"
 msgstr "Ystadegol"
 
-#: functionpanel.ui:69
+#: sc/uiconfig/scalc/ui/functionpanel.ui:69
 msgctxt "functionpanel|category"
 msgid "Spreadsheet"
 msgstr "Taenlen"
 
-#: functionpanel.ui:70
+#: sc/uiconfig/scalc/ui/functionpanel.ui:70
 msgctxt "functionpanel|category"
 msgid "Text"
 msgstr "Testun"
 
-#: functionpanel.ui:71
+#: sc/uiconfig/scalc/ui/functionpanel.ui:71
 msgctxt "functionpanel|category"
 msgid "Add-in"
 msgstr "Ychwanegyn"
 
-#: functionpanel.ui:112
+#: sc/uiconfig/scalc/ui/functionpanel.ui:112
 msgctxt "functionpanel|funcdesc"
 msgid "label"
 msgstr "label"
 
-#: goalseekdlg.ui:9
+#: sc/uiconfig/scalc/ui/goalseekdlg.ui:9
 msgctxt "goalseekdlg|GoalSeekDialog"
 msgid "Goal Seek"
 msgstr "Chwilio Gol"
 
-#: goalseekdlg.ui:97
+#: sc/uiconfig/scalc/ui/goalseekdlg.ui:97
 msgctxt "goalseekdlg|formulatext"
 msgid "_Formula cell:"
 msgstr "Cell _fformiwla:"
 
-#: goalseekdlg.ui:110
+#: sc/uiconfig/scalc/ui/goalseekdlg.ui:110
 msgctxt "goalseekdlg|label3"
 msgid "Target _value:"
 msgstr "Gwerth _targed:"
 
-#: goalseekdlg.ui:123
+#: sc/uiconfig/scalc/ui/goalseekdlg.ui:123
 msgctxt "goalseekdlg|vartext"
 msgid "Variable _cell:"
 msgstr "C_ell newidiol:"
 
-#: goalseekdlg.ui:229
+#: sc/uiconfig/scalc/ui/goalseekdlg.ui:226
 msgctxt "goalseekdlg|label1"
 msgid "Default Settings"
 msgstr "Gosodiadau Rhagosodedig"
 
-#: groupbydate.ui:8
+#: sc/uiconfig/scalc/ui/groupbydate.ui:8
 msgctxt "groupbydate|PivotTableGroupByDate"
 msgid "Grouping"
 msgstr "Grwpio"
 
-#: groupbydate.ui:99
+#: sc/uiconfig/scalc/ui/groupbydate.ui:99
 msgctxt "groupbydate|auto_start"
 msgid "_Automatically"
 msgstr "_Awtomatig"
 
-#: groupbydate.ui:116
+#: sc/uiconfig/scalc/ui/groupbydate.ui:116
 msgctxt "groupbydate|manual_start"
 msgid "_Manually at:"
 msgstr "_Gyda llaw yn:"
 
-#: groupbydate.ui:153
+#: sc/uiconfig/scalc/ui/groupbydate.ui:152
 msgctxt "groupbydate|label1"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: groupbydate.ui:188
+#: sc/uiconfig/scalc/ui/groupbydate.ui:187
 msgctxt "groupbydate|auto_end"
 msgid "A_utomatically"
 msgstr "_Awtomatig"
 
-#: groupbydate.ui:205
+#: sc/uiconfig/scalc/ui/groupbydate.ui:204
 msgctxt "groupbydate|manual_end"
 msgid "Ma_nually at:"
 msgstr "Gyda _llawn yn:"
 
-#: groupbydate.ui:242
+#: sc/uiconfig/scalc/ui/groupbydate.ui:240
 msgctxt "groupbydate|label2"
 msgid "End"
 msgstr "Diwedd"
 
-#: groupbydate.ui:277
+#: sc/uiconfig/scalc/ui/groupbydate.ui:275
 msgctxt "groupbydate|days"
 msgid "Number of _days:"
 msgstr "Nifer y _dyddiau:"
 
-#: groupbydate.ui:294
+#: sc/uiconfig/scalc/ui/groupbydate.ui:292
 msgctxt "groupbydate|intervals"
 msgid "_Intervals:"
 msgstr "_Cyfyngau:"
 
-#: groupbydate.ui:344
+#: sc/uiconfig/scalc/ui/groupbydate.ui:341
 msgctxt "groupbydate|label3"
 msgid "Group by"
 msgstr "Grwpio yn ôl"
 
-#: groupbynumber.ui:9
+#: sc/uiconfig/scalc/ui/groupbynumber.ui:9
 msgctxt "groupbynumber|PivotTableGroupByNumber"
 msgid "Grouping"
 msgstr "Grwpio"
 
-#: groupbynumber.ui:100
+#: sc/uiconfig/scalc/ui/groupbynumber.ui:100
 msgctxt "groupbynumber|auto_start"
 msgid "_Automatically"
 msgstr "_Awtomatig"
 
-#: groupbynumber.ui:117
+#: sc/uiconfig/scalc/ui/groupbynumber.ui:117
 msgctxt "groupbynumber|manual_start"
 msgid "_Manually at:"
 msgstr "_Gyda llawn yn:"
 
-#: groupbynumber.ui:155
+#: sc/uiconfig/scalc/ui/groupbynumber.ui:154
 msgctxt "groupbynumber|label1"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: groupbynumber.ui:190
+#: sc/uiconfig/scalc/ui/groupbynumber.ui:189
 msgctxt "groupbynumber|auto_end"
 msgid "A_utomatically"
 msgstr "_Awtomatig"
 
-#: groupbynumber.ui:207
+#: sc/uiconfig/scalc/ui/groupbynumber.ui:206
 msgctxt "groupbynumber|manual_end"
 msgid "Ma_nually at:"
 msgstr "Gyda _llawn yn:"
 
-#: groupbynumber.ui:245
+#: sc/uiconfig/scalc/ui/groupbynumber.ui:243
 msgctxt "groupbynumber|label2"
 msgid "End"
 msgstr "Diwedd"
 
-#: groupbynumber.ui:283
+#: sc/uiconfig/scalc/ui/groupbynumber.ui:280
 msgctxt "groupbynumber|label3"
 msgid "Group by"
 msgstr "Grwpio gan"
 
-#: groupdialog.ui:8
+#: sc/uiconfig/scalc/ui/groupdialog.ui:8
 msgctxt "groupdialog|GroupDialog"
 msgid "Group"
 msgstr "Grŵp"
 
-#: groupdialog.ui:98
+#: sc/uiconfig/scalc/ui/groupdialog.ui:98
 msgctxt "groupdialog|rows"
 msgid "_Rows"
 msgstr "_Rhesi"
 
-#: groupdialog.ui:116
+#: sc/uiconfig/scalc/ui/groupdialog.ui:116
 msgctxt "groupdialog|cols"
 msgid "_Columns"
 msgstr "_Colofnau"
 
-#: groupdialog.ui:141
+#: sc/uiconfig/scalc/ui/groupdialog.ui:141
 msgctxt "groupdialog|includeLabel"
 msgid "Include"
 msgstr "Cynnwys"
 
-#: headerdialog.ui:8
+#: sc/uiconfig/scalc/ui/headerdialog.ui:8
 msgctxt "headerdialog|HeaderDialog"
 msgid "Headers"
 msgstr "Penynnau"
 
-#: headerdialog.ui:106
+#: sc/uiconfig/scalc/ui/headerdialog.ui:106
 msgctxt "headerdialog|headerright"
 msgid "Header (right)"
 msgstr "Pennyn (de)"
 
-#: headerdialog.ui:128
+#: sc/uiconfig/scalc/ui/headerdialog.ui:128
 msgctxt "headerdialog|headerleft"
 msgid "Header (left)"
 msgstr "Pennyn (chwith)"
 
-#: headerfootercontent.ui:22
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:22
 msgctxt "headerfootercontent|labelFT_LEFT"
 msgid "_Left area"
 msgstr "_Ardal chwith"
 
-#: headerfootercontent.ui:37
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:37
 msgctxt "headerfootercontent|labelFT_CENTER"
 msgid "_Center area"
 msgstr "Ardal _ganol"
 
-#: headerfootercontent.ui:52
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:52
 msgctxt "headerfootercontent|labelFT_RIGHT"
 msgid "R_ight area"
 msgstr "Ardal _dde"
 
-#: headerfootercontent.ui:123
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:123
 msgctxt "headerfootercontent|labelFT_H_DEFINED"
 msgid "_Header"
 msgstr "_Pennyn"
 
-#: headerfootercontent.ui:137
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:137
 msgctxt "headerfootercontent|labelFT_F_DEFINED"
 msgid "_Footer"
 msgstr "_Troedyn"
 
-#: headerfootercontent.ui:164
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:164
 msgctxt "headerfootercontent|labelFT_H_CUSTOM"
 msgid "Custom header"
 msgstr "Pennyn cyfaddas"
 
-#: headerfootercontent.ui:177
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:177
 msgctxt "headerfootercontent|labelFT_F_CUSTOM"
 msgid "Custom footer"
 msgstr "Troedyn cyfaddas"
 
-#: headerfootercontent.ui:204
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:204
 msgctxt "headerfootercontent|buttonBTN_TEXT|tooltip_text"
 msgid "Text Attributes"
 msgstr "Priodoleddau Testun"
 
-#: headerfootercontent.ui:218
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:218
 msgctxt "headerfootercontent|buttonBTN_FILE|tooltip_text"
 msgid "Title"
 msgstr "Teitl"
 
-#: headerfootercontent.ui:233
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:233
 msgctxt "headerfootercontent|buttonBTN_TABLE|tooltip_text"
 msgid "Sheet Name"
 msgstr "Enw Dalen"
 
-#: headerfootercontent.ui:249
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:249
 msgctxt "headerfootercontent|buttonBTN_PAGE|tooltip_text"
 msgid "Page"
 msgstr "Tudalen"
 
-#: headerfootercontent.ui:264
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:264
 msgctxt "headerfootercontent|buttonBTN_PAGES|tooltip_text"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: headerfootercontent.ui:280
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:280
 msgctxt "headerfootercontent|buttonBTN_DATE|tooltip_text"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: headerfootercontent.ui:296
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:296
 msgctxt "headerfootercontent|buttonBTN_TIME|tooltip_text"
 msgid "Time"
 msgstr "Amser"
 
-#: headerfootercontent.ui:349
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:349
 msgctxt "headerfootercontent|label2"
 msgid "Use the buttons to change the font or insert field commands such as date, time, etc."
 msgstr "Defnyddiwch y botymau i newid ffont neu fewnosod gorchmynion maes fel dyddiad, amser, ac ati."
 
-#: headerfootercontent.ui:358
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:358
 msgctxt "headerfootercontent|label1"
 msgid "Note"
 msgstr "Nodyn"
 
-#: headerfootercontent.ui:379
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:379
 msgctxt "headerfootercontent|labelSTR_HF_NONE_IN_BRACKETS"
 msgid "(none)"
 msgstr "(dim)"
 
-#: headerfootercontent.ui:391
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:391
 msgctxt "headerfootercontent|labelSTR_PAGE"
 msgid "Page"
 msgstr "Tudalen"
 
-#: headerfootercontent.ui:403
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:403
 msgctxt "headerfootercontent|labelSTR_HF_OF_QUESTION"
 msgid "of ?"
 msgstr "o ?"
 
-#: headerfootercontent.ui:415
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:415
 msgctxt "headerfootercontent|labelSTR_HF_CONFIDENTIAL"
 msgid "Confidential"
 msgstr "Cyfrinachedd"
 
-#: headerfootercontent.ui:427
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:427
 msgctxt "headerfootercontent|labelSTR_HF_CREATED_BY"
 msgid "Created by"
 msgstr "Crëwyd gan"
 
-#: headerfootercontent.ui:439
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:439
 msgctxt "headerfootercontent|labelSTR_HF_CUSTOMIZED"
 msgid "Customized"
 msgstr "Cyfaddaswyd"
 
-#: headerfootercontent.ui:451
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:451
 msgctxt "headerfootercontent|labelSTR_HF_OF"
 msgid "of"
 msgstr "o"
 
-#: headerfootercontent.ui:509
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:509
 msgctxt "headerfootercontent|title"
 msgid "Title"
 msgstr "Teitl"
 
-#: headerfootercontent.ui:517
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:517
 msgctxt "headerfootercontent|filename"
 msgid "File Name"
 msgstr "Enw Ffeil"
 
-#: headerfootercontent.ui:525
+#: sc/uiconfig/scalc/ui/headerfootercontent.ui:525
 msgctxt "headerfootercontent|pathname"
 msgid "Path/File Name"
 msgstr "Llwybr/Enw Ffeil"
 
-#: headerfooterdialog.ui:8
+#: sc/uiconfig/scalc/ui/headerfooterdialog.ui:8
 msgctxt "headerfooterdialog|HeaderFooterDialog"
 msgid "Headers/Footers"
 msgstr "Penynnau/Troedynnau"
 
-#: headerfooterdialog.ui:106
+#: sc/uiconfig/scalc/ui/headerfooterdialog.ui:106
 msgctxt "headerfooterdialog|header"
 msgid "Header"
 msgstr "Pennyn"
 
-#: headerfooterdialog.ui:128
+#: sc/uiconfig/scalc/ui/headerfooterdialog.ui:128
 msgctxt "headerfooterdialog|footer"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: imoptdialog.ui:9
+#: sc/uiconfig/scalc/ui/imoptdialog.ui:9
 msgctxt "imoptdialog|ImOptDialog"
 msgid "Import File"
 msgstr "Mewnforio Ffeil"
 
-#: imoptdialog.ui:97
+#: sc/uiconfig/scalc/ui/imoptdialog.ui:97
 msgctxt "imoptdialog|charsetft"
 msgid "_Character set:"
 msgstr "_Set nod:"
 
-#: imoptdialog.ui:110
+#: sc/uiconfig/scalc/ui/imoptdialog.ui:110
 msgctxt "imoptdialog|fieldft"
 msgid "_Field delimiter:"
 msgstr "_Amffinydd maes:"
 
-#: imoptdialog.ui:124
+#: sc/uiconfig/scalc/ui/imoptdialog.ui:124
 msgctxt "imoptdialog|textft"
 msgid "Strin_g delimiter:"
 msgstr "Amffinydd l_linyn:"
 
-#: imoptdialog.ui:135
+#: sc/uiconfig/scalc/ui/imoptdialog.ui:135
 msgctxt "imoptdialog|asshown"
 msgid "Save cell content as _shown"
 msgstr "Cadw cynnwys y gell fel y'i ­_dangosir"
 
-#: imoptdialog.ui:151
+#: sc/uiconfig/scalc/ui/imoptdialog.ui:151
 msgctxt "imoptdialog|formulas"
 msgid "Save cell fo_rmulas instead of calculated values"
 msgstr "Cadw _fformiwlâu celloedd yn lle gwerthoedd cyfrifwyd"
 
-#: imoptdialog.ui:167
+#: sc/uiconfig/scalc/ui/imoptdialog.ui:167
 msgctxt "imoptdialog|quoteall"
 msgid "_Quote all text cells"
 msgstr "_Dyfynnu pob cell testun"
 
-#: imoptdialog.ui:183
+#: sc/uiconfig/scalc/ui/imoptdialog.ui:183
 msgctxt "imoptdialog|fixedwidth"
 msgid "Fixed column _width"
 msgstr "Lled colofn _gosodedig"
 
-#: imoptdialog.ui:272
+#: sc/uiconfig/scalc/ui/imoptdialog.ui:272
 msgctxt "imoptdialog|label"
 msgid "Field Options"
 msgstr "Dewisiadau Maes"
 
-#: insertcells.ui:8
+#: sc/uiconfig/scalc/ui/insertcells.ui:8
 msgctxt "insertcells|InsertCellsDialog"
 msgid "Insert Cells"
 msgstr "Mewnosod Celloedd"
 
-#: insertcells.ui:98
+#: sc/uiconfig/scalc/ui/insertcells.ui:100
 msgctxt "insertcells|down"
 msgid "Shift cells _down"
 msgstr "Symud celloedd _lawr"
 
-#: insertcells.ui:117
+#: sc/uiconfig/scalc/ui/insertcells.ui:118
 msgctxt "insertcells|right"
 msgid "Shift cells _right"
 msgstr "Symud celloedd i'r ­_dde"
 
-#: insertcells.ui:135
+#: sc/uiconfig/scalc/ui/insertcells.ui:136
 msgctxt "insertcells|rows"
 msgid "Entire ro_w"
 msgstr "_Rhes gyfan"
 
-#: insertcells.ui:153
+#: sc/uiconfig/scalc/ui/insertcells.ui:154
 msgctxt "insertcells|cols"
 msgid "Entire _column"
 msgstr "C­_olofn gyfan"
 
-#: insertcells.ui:177
+#: sc/uiconfig/scalc/ui/insertcells.ui:178
 msgctxt "insertcells|label1"
 msgid "Selection"
 msgstr "Dewis"
 
-#: insertname.ui:8
+#: sc/uiconfig/scalc/ui/insertname.ui:8
 msgctxt "insertname|InsertNameDialog"
 msgid "Paste Names"
 msgstr "Gludo Enwau"
 
-#: insertname.ui:37
+#: sc/uiconfig/scalc/ui/insertname.ui:37
 msgctxt "insertname|pasteall"
 msgid "_Paste All"
 msgstr "_Gludo Popeth"
 
-#: insertsheet.ui:15
+#: sc/uiconfig/scalc/ui/insertsheet.ui:15
 msgctxt "insertsheet|InsertSheetDialog"
 msgid "Insert Sheet"
 msgstr "Mewnosod Dalen"
 
-#: insertsheet.ui:105
+#: sc/uiconfig/scalc/ui/insertsheet.ui:105
 msgctxt "insertsheet|before"
 msgid "B_efore current sheet"
 msgstr "_Cyn y ddalen bresennol"
 
-#: insertsheet.ui:123
+#: sc/uiconfig/scalc/ui/insertsheet.ui:123
 msgctxt "insertsheet|after"
 msgid "_After current sheet"
 msgstr "_Ar ôl y ddalen bresennol"
 
-#: insertsheet.ui:146
+#: sc/uiconfig/scalc/ui/insertsheet.ui:146
 msgctxt "insertsheet|label1"
 msgid "Position"
 msgstr "Safle"
 
-#: insertsheet.ui:192
+#: sc/uiconfig/scalc/ui/insertsheet.ui:192
 msgctxt "insertsheet|new"
 msgid "_New sheet"
 msgstr "_Dalen newydd"
 
-#: insertsheet.ui:226
+#: sc/uiconfig/scalc/ui/insertsheet.ui:226
 msgctxt "insertsheet|countft"
 msgid "N_o. of sheets:"
 msgstr "N_ifer o ddalennau:"
 
-#: insertsheet.ui:242
+#: sc/uiconfig/scalc/ui/insertsheet.ui:242
 msgctxt "insertsheet|nameft"
 msgid "Na_me:"
 msgstr "_Enw:"
 
-#: insertsheet.ui:275
+#: sc/uiconfig/scalc/ui/insertsheet.ui:273
 msgctxt "insertsheet|nameed"
 msgid "Sheet..."
 msgstr "Dalen..."
 
-#: insertsheet.ui:310
+#: sc/uiconfig/scalc/ui/insertsheet.ui:308
 msgctxt "insertsheet|fromfile"
 msgid "_From file"
 msgstr "_O ffeil"
 
-#: insertsheet.ui:371
+#: sc/uiconfig/scalc/ui/insertsheet.ui:369
 msgctxt "insertsheet|tables-atkobject"
 msgid "Tables in file"
 msgstr "Tablau mewn ffeil"
 
-#: insertsheet.ui:391
+#: sc/uiconfig/scalc/ui/insertsheet.ui:389
 msgctxt "insertsheet|browse"
 msgid "_Browse..."
 msgstr "_Pori..."
 
-#: insertsheet.ui:406
+#: sc/uiconfig/scalc/ui/insertsheet.ui:404
 msgctxt "insertsheet|link"
 msgid "Lin_k"
 msgstr "Cysw_llt"
 
-#: insertsheet.ui:455
+#: sc/uiconfig/scalc/ui/insertsheet.ui:453
 msgctxt "insertsheet|label2"
 msgid "Sheet"
 msgstr "Dalen"
 
-#: integerdialog.ui:14
+#: sc/uiconfig/scalc/ui/integerdialog.ui:14
 msgctxt "integerdialog|IntegerDialog"
 msgid "Edit Setting"
 msgstr "Gosodiad Golygu"
 
-#: leftfooterdialog.ui:8
+#: sc/uiconfig/scalc/ui/leftfooterdialog.ui:8
 msgctxt "leftfooterdialog|LeftFooterDialog"
 msgid "Footer (left)"
 msgstr "Troedyn (chwith)"
 
-#: leftfooterdialog.ui:106
+#: sc/uiconfig/scalc/ui/leftfooterdialog.ui:106
 msgctxt "leftfooterdialog|footerleft"
 msgid "Footer (left)"
 msgstr "Troedyn (chwith)"
 
-#: leftheaderdialog.ui:8
+#: sc/uiconfig/scalc/ui/leftheaderdialog.ui:8
 msgctxt "leftheaderdialog|Left Header"
 msgid "Header (left)"
 msgstr "Pennyn (chwith)"
 
-#: leftheaderdialog.ui:106
+#: sc/uiconfig/scalc/ui/leftheaderdialog.ui:106
 msgctxt "leftheaderdialog|headerleft"
 msgid "Header (left)"
 msgstr "Pennyn (chwith)"
 
-#: managenamesdialog.ui:10
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:10
 msgctxt "managenamesdialog|ManageNamesDialog"
 msgid "Manage Names"
 msgstr "Rheoli Enwau"
 
-#: managenamesdialog.ui:115
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:115
 msgctxt "managenamesdialog|info"
 msgid "Select cells in the document to update the range."
 msgstr "Dewiswch celloedd yn y ddogfen ier mwyn ddiweddaru'r ystod."
 
-#: managenamesdialog.ui:135
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:135
 msgctxt "managenamesdialog|label2"
 msgid "Name:"
 msgstr "Enw:"
 
-#: managenamesdialog.ui:149
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:149
 msgctxt "managenamesdialog|label4"
 msgid "Scope:"
 msgstr "Cwmpas:"
 
-#: managenamesdialog.ui:213
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:212
 msgctxt "managenamesdialog|label3"
 msgid "Range or formula expression:"
 msgstr "Mynegiad ystod neu fformiwla:"
 
-#: managenamesdialog.ui:261
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:259
 msgctxt "managenamesdialog|printrange"
 msgid "_Print range"
 msgstr "_Ystod argraffu"
 
-#: managenamesdialog.ui:276
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:274
 msgctxt "managenamesdialog|filter"
 msgid "_Filter"
 msgstr "_Hidl"
 
-#: managenamesdialog.ui:291
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:289
 msgctxt "managenamesdialog|colheader"
 msgid "Repeat _column"
 msgstr "Ailadrodd _colofn"
 
-#: managenamesdialog.ui:306
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:304
 msgctxt "managenamesdialog|rowheader"
 msgid "Repeat _row"
 msgstr "Ailadrodd _rhes"
 
-#: managenamesdialog.ui:327
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:325
 msgctxt "managenamesdialog|label1"
 msgid "Range _Options"
 msgstr "Dewisiadau _Ystod"
 
-#: managenamesdialog.ui:398
+#: sc/uiconfig/scalc/ui/managenamesdialog.ui:396
 msgctxt "managenamesdialog|treeviewcolumn1"
 msgid "column"
 msgstr "colofn"
 
-#: mergecellsdialog.ui:8
+#: sc/uiconfig/scalc/ui/mergecellsdialog.ui:8
 msgctxt "mergecellsdialog|MergeCellsDialog"
 msgid "Merge Cells"
 msgstr "Cyfuno Celloedd"
 
-#: mergecellsdialog.ui:84
+#: sc/uiconfig/scalc/ui/mergecellsdialog.ui:81
 msgctxt "mergecellsdialog|label"
 msgid "Some cells are not empty."
 msgstr "Nid yw rhai celloedd yn wag."
 
-#: mergecellsdialog.ui:95
+#: sc/uiconfig/scalc/ui/mergecellsdialog.ui:96
 msgctxt "mergecellsdialog|move-cells-radio"
 msgid "Move the contents of the hidden cells into the first cell"
 msgstr "Symud cynnwys y celloedd cudd i’r gell gyntaf"
 
-#: mergecellsdialog.ui:112
+#: sc/uiconfig/scalc/ui/mergecellsdialog.ui:111
+msgctxt "mergecellsdialog|empty-cells-radio"
+msgid "Empty the contents of the hidden cells"
+msgstr "Gwagio cynnwys y celloedd cudd"
+
+#: sc/uiconfig/scalc/ui/mergecellsdialog.ui:126
 msgctxt "mergecellsdialog|keep-content-radio"
 msgid "Keep the contents of the hidden cells"
 msgstr "Cadw cynnwys y celloedd cudd"
 
-#: mergecellsdialog.ui:129
-msgctxt "mergecellsdialog|empty-cells-radio"
-msgid "Empty the contents of the hidden cells"
-msgstr "Gwagio cynnwys y celloedd cudd"
+#: sc/uiconfig/scalc/ui/mergecolumnentry.ui:21
+msgctxt "mergecolumnentry|name"
+msgid "Merge Column Action"
+msgstr "Cyfuno Gweithred Colofn"
 
-#: movecopysheet.ui:8
+#: sc/uiconfig/scalc/ui/mergecolumnentry.ui:37
+msgctxt "mergecolumnentry|separator"
+msgid "Separator:"
+msgstr "Ymwahanydd:"
+
+#: sc/uiconfig/scalc/ui/mergecolumnentry.ui:58
+msgctxt "mergecolumnentry|columns"
+msgid "Columns:"
+msgstr "Colofnau:"
+
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:8
 msgctxt "movecopysheet|MoveCopySheetDialog"
 msgid "Move/Copy Sheet"
 msgstr "Symud/Copïo Dalen"
 
-#: movecopysheet.ui:90
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:90
 msgctxt "movecopysheet|move"
 msgid "_Move"
 msgstr "_Symud"
 
-#: movecopysheet.ui:109
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:109
 msgctxt "movecopysheet|copy"
 msgid "C_opy"
 msgstr "_Copïo"
 
-#: movecopysheet.ui:134
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:134
 msgctxt "movecopysheet|label1"
 msgid "Action"
 msgstr "Gweithred"
 
-#: movecopysheet.ui:184
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:184
 msgctxt "movecopysheet|toDocumentLabel"
 msgid "To _document"
 msgstr "I _ddogfen"
 
-#: movecopysheet.ui:199
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:199
 msgctxt "movecopysheet|toDocument"
 msgid "(current document)"
 msgstr "(dogfen bresennol)"
 
-#: movecopysheet.ui:200
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:200
 msgctxt "movecopysheet|toDocument"
 msgid "- new document -"
 msgstr "- dogfen newydd -"
 
-#: movecopysheet.ui:229
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:229
 msgctxt "movecopysheet|insertBeforeLabel"
 msgid "_Insert before"
 msgstr "_Mewnosod cyn"
 
-#: movecopysheet.ui:279
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:279
 msgctxt "movecopysheet|label2"
 msgid "Location"
 msgstr "Lleoliad"
 
-#: movecopysheet.ui:348
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:347
 msgctxt "movecopysheet|warnunused"
 msgid "This name is already used."
 msgstr "Enw wedi ei ddefnyddio eisoes."
 
-#: movecopysheet.ui:363
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:362
 msgctxt "movecopysheet|warnempty"
 msgid "Name is empty."
 msgstr "Enw yn wag."
 
-#: movecopysheet.ui:378
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:377
 msgctxt "movecopysheet|warninvalid"
 msgid "Name contains one or more invalid characters."
 msgstr "Mae'r enw ffeil yn cynnwys nodau annilys."
 
-#: movecopysheet.ui:403
+#: sc/uiconfig/scalc/ui/movecopysheet.ui:402
 msgctxt "movecopysheet|newNameLabel"
 msgid "New _name"
 msgstr "Enw _newydd"
 
-#: movingaveragedialog.ui:16
+#: sc/uiconfig/scalc/ui/movingaveragedialog.ui:16
 msgctxt "movingaveragedialog|MovingAverageDialog"
 msgid "Moving Average"
 msgstr "Cyfartaledd Newidiol"
 
-#: movingaveragedialog.ui:49
+#: sc/uiconfig/scalc/ui/movingaveragedialog.ui:49
 msgctxt "movingaveragedialog|input-range-label"
 msgid "Input range:"
 msgstr "Ystod mewnbwn:"
 
-#: movingaveragedialog.ui:88
+#: sc/uiconfig/scalc/ui/movingaveragedialog.ui:87
 msgctxt "movingaveragedialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniad i:"
 
-#: movingaveragedialog.ui:130
+#: sc/uiconfig/scalc/ui/movingaveragedialog.ui:128
 msgctxt "movingaveragedialog|label3"
 msgid "Data"
 msgstr "Data"
 
-#: movingaveragedialog.ui:224
+#: sc/uiconfig/scalc/ui/movingaveragedialog.ui:222
 msgctxt "movingaveragedialog|groupedby-columns-radio"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: movingaveragedialog.ui:239
+#: sc/uiconfig/scalc/ui/movingaveragedialog.ui:238
 msgctxt "movingaveragedialog|groupedby-rows-radio"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: movingaveragedialog.ui:260
+#: sc/uiconfig/scalc/ui/movingaveragedialog.ui:260
 msgctxt "movingaveragedialog|label2"
 msgid "Grouped by"
 msgstr "Grwpiwyd yn ôl"
 
-#: movingaveragedialog.ui:298
+#: sc/uiconfig/scalc/ui/movingaveragedialog.ui:298
 msgctxt "movingaveragedialog|interval-label"
 msgid "Interval:"
 msgstr "Cyfwng:"
 
-#: movingaveragedialog.ui:328
+#: sc/uiconfig/scalc/ui/movingaveragedialog.ui:327
 msgctxt "movingaveragedialog|label1"
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: multipleoperationsdialog.ui:9
+#: sc/uiconfig/scalc/ui/multipleoperationsdialog.ui:9
 msgctxt "multipleoperationsdialog|MultipleOperationsDialog"
 msgid "Multiple operations"
 msgstr "Gweithrediadau lluosog"
 
-#: multipleoperationsdialog.ui:42
+#: sc/uiconfig/scalc/ui/multipleoperationsdialog.ui:42
 msgctxt "multipleoperationsdialog|formulasft"
 msgid "_Formulas:"
 msgstr "_Fformiwlâu:"
 
-#: multipleoperationsdialog.ui:56
+#: sc/uiconfig/scalc/ui/multipleoperationsdialog.ui:56
 msgctxt "multipleoperationsdialog|rowft"
 msgid "_Row input cell:"
 msgstr "Cell mewnbwn _rhes:"
 
-#: multipleoperationsdialog.ui:70
+#: sc/uiconfig/scalc/ui/multipleoperationsdialog.ui:70
 msgctxt "multipleoperationsdialog|colft"
 msgid "_Column input cell:"
 msgstr "Cell mewnbwn _colofn:"
 
-#: multipleoperationsdialog.ui:159
+#: sc/uiconfig/scalc/ui/multipleoperationsdialog.ui:156
 msgctxt "multipleoperationsdialog|label1"
 msgid "Default Settings"
 msgstr "Gosodiadau Rhagosodedig"
 
-#: namerangesdialog.ui:9
+#: sc/uiconfig/scalc/ui/namerangesdialog.ui:9
 msgctxt "namerangesdialog|NameRangesDialog"
 msgid "Define Label Range"
 msgstr "Diffinio Ystod Label"
 
-#: namerangesdialog.ui:147
+#: sc/uiconfig/scalc/ui/namerangesdialog.ui:146
 msgctxt "namerangesdialog|colhead"
 msgid "Contains _column labels"
 msgstr "Yn cynnwys labeli ­_colofn"
 
-#: namerangesdialog.ui:165
+#: sc/uiconfig/scalc/ui/namerangesdialog.ui:164
 msgctxt "namerangesdialog|rowhead"
 msgid "Contains _row labels"
 msgstr "Yn cynnwys labeli _rhes"
 
-#: namerangesdialog.ui:192
+#: sc/uiconfig/scalc/ui/namerangesdialog.ui:191
 msgctxt "namerangesdialog|datarange"
 msgid "For _data range"
 msgstr "_Am ystod data"
 
-#: namerangesdialog.ui:303
+#: sc/uiconfig/scalc/ui/namerangesdialog.ui:301
 msgctxt "namerangesdialog|label1"
 msgid "Range"
 msgstr "Ystod"
 
-#: navigatorpanel.ui:30
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:30
 msgctxt "navigatorpanel|label1"
 msgid "Column:"
 msgstr "Colofn:"
 
-#: navigatorpanel.ui:44
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:44
 msgctxt "navigatorpanel|label2"
 msgid "Row:"
 msgstr "Rhes:"
 
-#: navigatorpanel.ui:58
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:58
 msgctxt "navigatorpanel|column|tooltip_text"
 msgid "Column"
 msgstr "Colofn"
 
-#: navigatorpanel.ui:70
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:70
 msgctxt "navigatorpanel|row|tooltip_text"
 msgid "Row"
 msgstr "Rhes"
 
-#: navigatorpanel.ui:86
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:86
 msgctxt "navigatorpanel|datarange|tooltip_text"
 msgid "Data Range"
 msgstr "Ystod Data"
 
-#: navigatorpanel.ui:99
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:99
 msgctxt "navigatorpanel|start|tooltip_text"
 msgid "Start"
 msgstr "Dechrau"
 
-#: navigatorpanel.ui:112
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:112
 msgctxt "navigatorpanel|end|tooltip_text"
 msgid "End"
 msgstr "Diwedd"
 
-#: navigatorpanel.ui:125
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:125
 msgctxt "navigatorpanel|contents|tooltip_text"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: navigatorpanel.ui:138
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:138
 msgctxt "navigatorpanel|toggle|tooltip_text"
 msgid "Toggle"
 msgstr "Toglo"
 
-#: navigatorpanel.ui:151
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:151
 msgctxt "navigatorpanel|scenarios|tooltip_text"
 msgid "Scenarios"
 msgstr "Senarios"
 
-#: navigatorpanel.ui:164
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:164
 msgctxt "navigatorpanel|dragmode|tooltip_text"
 msgid "Drag Mode"
 msgstr "Modd Llusgo"
 
-#: navigatorpanel.ui:190
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:190
 msgctxt "navigatorpanel|documents|tooltip_text"
 msgid "Document"
 msgstr "Dogfen"
 
-#: navigatorpanel.ui:193
+#: sc/uiconfig/scalc/ui/navigatorpanel.ui:193
 msgctxt "navigatorpanel|documents-atkobject"
 msgid "Active Window"
 msgstr "Ffenestr Weithredol"
 
-#: nosolutiondialog.ui:8
+#: sc/uiconfig/scalc/ui/nosolutiondialog.ui:8
 msgctxt "nosolutiondialog|NoSolutionDialog"
 msgid "No Solution"
 msgstr "Dim Ateb"
 
-#: nosolutiondialog.ui:55
+#: sc/uiconfig/scalc/ui/nosolutiondialog.ui:55
 msgctxt "nosolutiondialog|label1"
 msgid "No solution was found."
 msgstr "Heb ganfod ateb."
 
-#: notebookbar.ui:391
+#: sc/uiconfig/scalc/ui/notebookbar.ui:2369
+msgctxt "notebookbar_compact|fileb"
+msgid "_File"
+msgstr "_Ffeil"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:2388
+msgctxt "notebookbar_compact|fileb"
+msgid "_Help"
+msgstr "_Cymorth"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:3187
 msgctxt "notebookbar|FileLabel"
 msgid "File"
 msgstr "Ffeil"
 
-#: notebookbar.ui:468
-msgctxt "notebookbar|FormatPaintbrush"
-msgid "Clone"
-msgstr "Clonio"
-
-#: notebookbar.ui:668
+#: sc/uiconfig/scalc/ui/notebookbar.ui:3575
+#: sc/uiconfig/scalc/ui/notebookbar.ui:6575
 msgctxt "notebookbar|bordertype|tooltip_text"
 msgid "Specify the borders of the selected cells."
 msgstr "Pennu borderi'r celloedd hyn."
 
-#: notebookbar.ui:907
-msgctxt "notebookbar|verticalalignment|tooltip_text"
-msgid "Vertical Alignment"
-msgstr "Alinio Fertigol"
-
-#: notebookbar.ui:1053
-msgctxt "notebookbar|horizontalalignment|tooltip_text"
-msgid "Horizontal Alignment"
-msgstr "Cyfuniad Llorweddol"
-
-#: notebookbar.ui:1116
-msgctxt "notebookbar|indent|tooltip_text"
-msgid "Indent"
-msgstr "Mewnoli"
-
-#: notebookbar.ui:1123
+#: sc/uiconfig/scalc/ui/notebookbar.ui:3850
 msgctxt "notebookbar|increaseindent1|tooltip_text"
 msgid "Increase Indent"
 msgstr "Cynyddu'r Mewnoliad"
 
-#: notebookbar.ui:1139
+#: sc/uiconfig/scalc/ui/notebookbar.ui:3866
 msgctxt "notebookbar|decreaseindent1|tooltip_text"
 msgid "Decrease Indent"
 msgstr "Lleihau'r Mewnoliad"
 
-#: notebookbar.ui:1677
+#: sc/uiconfig/scalc/ui/notebookbar.ui:4857
+msgctxt "notebookbar_compact|menub"
+msgid "_Home"
+msgstr "_Cartref"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:4965
 msgctxt "notebookbar|CalcLabel"
 msgid "Home"
 msgstr "Cartref"
 
-#: notebookbar.ui:1762
-msgctxt "notebookbar|InsertAVMedia|tooltip_text"
-msgid "Insert Audio or Video"
-msgstr "Mewnosod Sain neu Fideo"
+#: sc/uiconfig/scalc/ui/notebookbar.ui:5412
+msgctxt "notebookbar|Field"
+msgid "Fiel_d"
+msgstr "_Maes"
 
-#: notebookbar.ui:1918
-msgctxt "notebookbar|InsertSymbol"
-msgid "Symbol"
-msgstr "Symbol"
+#: sc/uiconfig/scalc/ui/notebookbar.ui:5917
+msgctxt "notebookbar_compact|menub"
+msgid "_Insert"
+msgstr "_Mewnosod"
 
-#: notebookbar.ui:2022
+#: sc/uiconfig/scalc/ui/notebookbar.ui:6002
 msgctxt "notebookbar|InsertLabel"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: notebookbar.ui:2090
-msgctxt "notebookbar|ToggleSheetGrid"
-msgid "Toggle Grid Lines"
-msgstr "Toglo'r Llinellau Grid"
+#: sc/uiconfig/scalc/ui/notebookbar.ui:6031
+msgctxt "notebookbar_compact|reviewb"
+msgid "Pag_e"
+msgstr "_Tudalen"
 
-#: notebookbar.ui:2247
+#: sc/uiconfig/scalc/ui/notebookbar.ui:6759
 msgctxt "notebookbar|PageLayoutLabel"
-msgid "Page Layout"
-msgstr "Cynllun Tudalen"
+msgid "Layout"
+msgstr "Cynllun"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:7660
+msgctxt "notebookbar|Statistics"
+msgid "_Statistics"
+msgstr "_Ystadegau"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:7728
+msgctxt "notebookbar_compact|viewb"
+msgid "_Data"
+msgstr "_Data"
 
-#: notebookbar.ui:2726
+#: sc/uiconfig/scalc/ui/notebookbar.ui:7836
 msgctxt "notebookbar|DataLabel"
 msgid "Data"
 msgstr "Data"
 
-#: notebookbar.ui:2756
-msgctxt "notebookbar|SpellOnline"
-msgid "Auto Spellcheck"
-msgstr "Awto Gwirio Sillafu"
+#: sc/uiconfig/scalc/ui/notebookbar.ui:8459
+msgctxt "notebookbar_compact|reviewR"
+msgid "_Review"
+msgstr "_Adolygu"
 
-#: notebookbar.ui:3041
+#: sc/uiconfig/scalc/ui/notebookbar.ui:8544
 msgctxt "notebookbar|ReviewLabel"
 msgid "Review"
 msgstr "Adolygu"
 
-#: notebookbar.ui:3119
-msgctxt "notebookbar|ToggleSheetGrid2"
-msgid "Toggle Grid Lines"
-msgstr "Toglo'r Llinellau Grid"
+#: sc/uiconfig/scalc/ui/notebookbar.ui:9320
+msgctxt "notebookbar_compact|viewb"
+msgid "_View"
+msgstr "_Golwg"
 
-#: notebookbar.ui:3345
+#: sc/uiconfig/scalc/ui/notebookbar.ui:9405
 msgctxt "notebookbar|ViewLabel"
 msgid "View"
 msgstr "Golwg"
 
-#: notebookbar.ui:3860
+#: sc/uiconfig/scalc/ui/notebookbar.ui:10240
+msgctxt "notebookbar|graphicB"
+msgid "_Graphic"
+msgstr "_Graffig"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:10352
 msgctxt "notebookbar|ImageLabel"
 msgid "Image"
 msgstr "Delwedd"
 
-#: notebookbar_groupedbar_compact.ui:3863
+#: sc/uiconfig/scalc/ui/notebookbar.ui:11636
+msgctxt "notebookbar|drab"
+msgid "D_raw"
+msgstr "_Lluniadu"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:11748
+msgctxt "notebookbar|ShapeLabel"
+msgid "Draw"
+msgstr "Arlunio"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:12402
+msgctxt "notebookbar|frame:MenuDraw"
+msgid "Object"
+msgstr "Gwrthrych"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:12491
+msgctxt "notebookbar|FrameLabel"
+msgid "Object"
+msgstr "Gwrthrych"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:12522
+msgctxt "notebookbar_compact|referenceb"
+msgid "_Tools"
+msgstr "_Offer"
+
+#: sc/uiconfig/scalc/ui/notebookbar.ui:13659
+msgctxt "notebookbar_compact|DevLabel"
+msgid "Tools"
+msgstr "Offer"
+
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3856
 msgctxt "notebookbar_groupedbar_compact|defaultD"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: notebookbar_groupedbar_compact.ui:3877
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3870
 msgctxt "notebookbar_groupedbar_compact|Accent1"
 msgid "Accent 1"
 msgstr "Acen 1"
 
-#: notebookbar_groupedbar_compact.ui:3885
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3878
 msgctxt "notebookbar_groupedbar_compact|Accent2"
 msgid "Accent 2"
 msgstr "Acen 2"
 
-#: notebookbar_groupedbar_compact.ui:3893
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3886
 msgctxt "notebookbar_groupedbar_compact|Accent3"
 msgid "Accent 3"
 msgstr "Acen 3"
 
-#: notebookbar_groupedbar_compact.ui:3907
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3900
 msgctxt "notebookbar_groupedbar_compact|Header1"
 msgid "Header 1"
 msgstr "Ardal Pennawd 1"
 
-#: notebookbar_groupedbar_compact.ui:3915
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3908
 msgctxt "notebookbar_groupedbar_compact|Header2"
 msgid "Header 2"
 msgstr "Ardal Pennawd 2"
 
-#: notebookbar_groupedbar_compact.ui:3929
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3922
 msgctxt "notebookbar_groupedbar_compact|bad"
 msgid "Bad"
 msgstr "Drwg"
 
-#: notebookbar_groupedbar_compact.ui:3937
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3930
 msgctxt "notebookbar_groupedbar_compact|error"
 msgid "Error"
 msgstr "Gwall"
 
-#: notebookbar_groupedbar_compact.ui:3945
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3938
 msgctxt "notebookbar_groupedbar_compact|good"
 msgid "Good"
 msgstr "Da"
 
-#: notebookbar_groupedbar_compact.ui:3953
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3946
 msgctxt "notebookbar_groupedbar_compact|neutral"
 msgid "Neutral"
 msgstr "Niwtral"
 
-#: notebookbar_groupedbar_compact.ui:3961
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3954
 msgctxt "notebookbar_groupedbar_compact|warning"
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: notebookbar_groupedbar_compact.ui:3975
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3968
 msgctxt "notebookbar_groupedbar_compact|footnote"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: notebookbar_groupedbar_compact.ui:3983
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3976
 msgctxt "notebookbar_groupedbar_compact|note"
 msgid "Note"
 msgstr "Nodyn"
 
-#: notebookbar_groupedbar_compact.ui:4643
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4625
+msgctxt "notebookbar_groupedbar_compact|menub"
+msgid "_Menu"
+msgstr "­_Dewislen"
+
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4681
+msgctxt "notebookbar_groupedbar_compact|toolsb"
+msgid "_Tools"
+msgstr "_Offer"
+
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4770
 msgctxt "notebookbar_groupedbar_compact|fileb"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: notebookbar_groupedbar_compact.ui:4782
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4925
 msgctxt "notebookbar_groupedbar_compact|editb"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: notebookbar_groupedbar_compact.ui:4939
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5083
 msgctxt "notebookbar_groupedbar_compact|paragraphstyleb"
 msgid "St_yles"
 msgstr "A_rddulliau"
 
-#: notebookbar_groupedbar_compact.ui:5092
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5240
 msgctxt "notebookbar_groupedbar_compact|formatb"
 msgid "F_ont"
 msgstr "_Ffont"
 
-#: notebookbar_groupedbar_compact.ui:5152
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5301
 msgctxt "notebookbar_groupedbar_compact|bordertype"
 msgid "Specify the borders of the selected cells."
 msgstr "Pennu borderi'r celloedd hyn."
 
-#: notebookbar_groupedbar_compact.ui:5315
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5462
 msgctxt "notebookbar_groupedbar_compact|numberb"
 msgid "_Number"
 msgstr "_Rhifau"
 
-#: notebookbar_groupedbar_compact.ui:5470
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5621
 msgctxt "notebookbar_groupedbar_compact|paragraphb"
 msgid "_Alignment"
 msgstr "_Aliniad"
 
-#: notebookbar_groupedbar_compact.ui:5633
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5788
 msgctxt "notebookbar_groupedbar_compact|cellb"
 msgid "_Cells"
 msgstr "_Celloedd"
 
-#: notebookbar_groupedbar_compact.ui:5772
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5931
 msgctxt "notebookbar_groupedbar_compact|insertb"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_compact.ui:5901
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6064
 msgctxt "notebookbar_groupedbar_compact|datab"
 msgid "_Data"
 msgstr "_Data"
 
-#: notebookbar_groupedbar_compact.ui:6011
-msgctxt "notebookbar_groupedbar_compact|viewb"
-msgid "_View"
-msgstr "_Golwg"
-
-#: notebookbar_groupedbar_compact.ui:6120
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6178
 msgctxt "notebookbar_groupedbar_compact|reviewb"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_groupedbar_compact.ui:6262
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6293
+msgctxt "notebookbar_groupedbar_compact|viewb"
+msgid "_View"
+msgstr "_Golwg"
+
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6434
 msgctxt "notebookbar_groupedbar_compact|graphicB"
 msgid "_Graphic"
 msgstr "_Graffig"
 
-#: notebookbar_groupedbar_compact.ui:6366
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6539
 msgctxt "notebookbar_groupedbar_compact|colorb"
 msgid "C_olor"
 msgstr "_Lliw"
 
-#: notebookbar_groupedbar_compact.ui:6705
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6882
 msgctxt "notebookbar_groupedbar_compact|arrange"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_compact.ui:6865
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7046
 msgctxt "notebookbar_groupedbar_compact|GridB"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_compact.ui:6985
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7173
 msgctxt "notebookbar_groupedbar_compact|languageb"
 msgid "_Language"
 msgstr "_Iaith"
 
-#: notebookbar_groupedbar_compact.ui:7111
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7303
 msgctxt "notebookbar_groupedbar_compact|revieb"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_groupedbar_compact.ui:7261
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7438
 msgctxt "notebookbar_groupedbar_compact|commentsb"
 msgid "_Comments"
 msgstr "_Nodiadau"
 
-#: notebookbar_groupedbar_compact.ui:7361
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7539
 msgctxt "notebookbar_groupedbar_compact|compareb"
 msgid "Com_pare"
 msgstr "_Cymharu"
 
-#: notebookbar_groupedbar_compact.ui:7461
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7643
 msgctxt "notebookbar_groupedbar_compact|viewA"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_compact.ui:7634
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7820
 msgctxt "notebookbar_groupedbar_compact|editdrawb"
 msgid "_Styles"
 msgstr "_Arddulliau"
 
-#: notebookbar_groupedbar_compact.ui:7850
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8037
 msgctxt "notebookbar_groupedbar_compact|drawb"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_groupedbar_compact.ui:8040
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8228
 msgctxt "notebookbar_groupedbar_compact|arrangeD"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_compact.ui:8149
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8341
 msgctxt "notebookbar_groupedbar_compact|Grid"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_compact.ui:8258
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8454
 msgctxt "notebookbar_groupedbar_compact|viewDrawb"
 msgid "Grou_p"
 msgstr "Grŵ_p"
 
-#: notebookbar_groupedbar_compact.ui:8366
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8566
 msgctxt "notebookbar_groupedbar_compact|3Db"
 msgid "3_D"
 msgstr "3_D"
 
-#: notebookbar_groupedbar_compact.ui:8549
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8753
 msgctxt "notebookbar_groupedbar_compact|oleB"
 msgid "F_rame"
 msgstr "_Ffrâm"
 
-#: notebookbar_groupedbar_compact.ui:8756
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8961
 msgctxt "notebookbar_groupedbar_compact|arrangeO"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_compact.ui:8865
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9074
 msgctxt "notebookbar_groupedbar_compact|GridO"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_compact.ui:8975
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9188
 msgctxt "notebookbar_groupedbar_compact|viewO"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_compact.ui:9080
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9297
 msgctxt "notebookbar_groupedbar_compact|paragraphstyles"
 msgid "_Styles"
 msgstr "_Arddulliau"
 
-#: notebookbar_groupedbar_compact.ui:9255
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9473
 msgctxt "notebookbar_groupedbar_compact|formats"
 msgid "F_ormat"
 msgstr "_Fformat"
 
-#: notebookbar_groupedbar_compact.ui:9527
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9749
 msgctxt "notebookbar_groupedbar_compact|paragraphS"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: notebookbar_groupedbar_compact.ui:9685
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9911
 msgctxt "notebookbar_groupedbar_compact|viewS"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_compact.ui:9795
-msgctxt "notebookbar_groupedbar_compact|menub"
-msgid "_Menu"
-msgstr "­_Dewislen"
-
-#: notebookbar_groupedbar_compact.ui:9850
-msgctxt "notebookbar_groupedbar_compact|toolsb"
-msgid "_Tools"
-msgstr "_Offer"
-
-#: notebookbar_groupedbar_full.ui:3663
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3663
 msgctxt "notebookbar_groupedbar_full|menubarD"
 msgid "Menubar"
 msgstr "Bar Dewis"
 
-#: notebookbar_groupedbar_full.ui:3797
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3790
 msgctxt "notebookbar_groupedbar_full|defaultD"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: notebookbar_groupedbar_full.ui:3811
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3804
 msgctxt "notebookbar_groupedbar_full|Accent1"
 msgid "Accent 1"
 msgstr "Acen 1"
 
-#: notebookbar_groupedbar_full.ui:3819
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3812
 msgctxt "notebookbar_groupedbar_full|Accent2"
 msgid "Accent 2"
 msgstr "Acen 2"
 
-#: notebookbar_groupedbar_full.ui:3827
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3820
 msgctxt "notebookbar_groupedbar_full|Accent3"
 msgid "Accent 3"
 msgstr "Acen 3"
 
-#: notebookbar_groupedbar_full.ui:3841
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3834
 msgctxt "notebookbar_groupedbar_full|Header1"
 msgid "Header 1"
 msgstr "Pennawd 1"
 
-#: notebookbar_groupedbar_full.ui:3849
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3842
 msgctxt "notebookbar_groupedbar_full|Header2"
 msgid "Header 2"
 msgstr "Pennawd 2"
 
-#: notebookbar_groupedbar_full.ui:3863
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3856
 msgctxt "notebookbar_groupedbar_full|bad"
 msgid "Bad"
 msgstr "Drwg"
 
-#: notebookbar_groupedbar_full.ui:3871
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3864
 msgctxt "notebookbar_groupedbar_full|error"
 msgid "Error"
 msgstr "Gwall"
 
-#: notebookbar_groupedbar_full.ui:3879
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3872
 msgctxt "notebookbar_groupedbar_full|good"
 msgid "Good"
 msgstr "Da"
 
-#: notebookbar_groupedbar_full.ui:3887
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3880
 msgctxt "notebookbar_groupedbar_full|neutral"
 msgid "Neutral"
 msgstr "Niwtral"
 
-#: notebookbar_groupedbar_full.ui:3895
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3888
 msgctxt "notebookbar_groupedbar_full|warning"
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: notebookbar_groupedbar_full.ui:3909
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3902
 msgctxt "notebookbar_groupedbar_full|footnote"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: notebookbar_groupedbar_full.ui:3917
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:3910
 msgctxt "notebookbar_groupedbar_full|note"
 msgid "Note"
 msgstr "Nodyn"
 
-#: notebookbar_groupedbar_full.ui:4589
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:4564
+msgctxt "notebookbar_groupedbar_full|menub"
+msgid "_Menu"
+msgstr "­_Dewislen"
+
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:4617
+msgctxt "notebookbar_groupedbar_full|toolsb"
+msgid "_Tools"
+msgstr "_Offer"
+
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:4672
+msgctxt "notebookbar_groupedbar_full|helpb"
+msgid "_Help"
+msgstr "_Cymorth"
+
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:4780
 msgctxt "notebookbar_groupedbar_full|fileb"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: notebookbar_groupedbar_full.ui:4811
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:5018
 msgctxt "notebookbar_groupedbar_full|editb"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: notebookbar_groupedbar_full.ui:5007
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:5215
 msgctxt "notebookbar_groupedbar_full|paragraphstyleb"
 msgid "St_yles"
 msgstr "A_rddulliau"
 
-#: notebookbar_groupedbar_full.ui:5278
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:5490
 msgctxt "notebookbar_groupedbar_full|formatb"
 msgid "F_ont"
 msgstr "_Ffont"
 
-#: notebookbar_groupedbar_full.ui:5525
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:5737
 msgctxt "notebookbar_groupedbar_full|numberb"
 msgid "_Number"
 msgstr "_Rhifau"
 
-#: notebookbar_groupedbar_full.ui:5736
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:5952
 msgctxt "notebookbar_groupedbar_full|paragraphb"
 msgid "_Alignment"
 msgstr "_Aliniad"
 
-#: notebookbar_groupedbar_full.ui:5974
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:6194
 msgctxt "notebookbar_groupedbar_full|cellb"
 msgid "_Cells"
 msgstr "_Celloedd"
 
-#: notebookbar_groupedbar_full.ui:6147
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:6371
 msgctxt "notebookbar_groupedbar_full|insertb"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_full.ui:6317
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:6545
 msgctxt "notebookbar_groupedbar_full|datab"
 msgid "_Data"
 msgstr "_Data"
 
-#: notebookbar_groupedbar_full.ui:6500
-msgctxt "notebookbar_groupedbar_full|viewb"
-msgid "_View"
-msgstr "_Golwg"
-
-#: notebookbar_groupedbar_full.ui:6668
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:6717
 msgctxt "notebookbar_groupedbar_full|reviewb"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_groupedbar_full.ui:6889
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:6904
+msgctxt "notebookbar_groupedbar_full|viewb"
+msgid "_View"
+msgstr "_Golwg"
+
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:7129
 msgctxt "notebookbar_groupedbar_full|graphicB"
 msgid "_Graphic"
 msgstr "_Graffig"
 
-#: notebookbar_groupedbar_full.ui:7240
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:7481
 msgctxt "notebookbar_groupedbar_full|arrange"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_full.ui:7389
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:7634
 msgctxt "notebookbar_groupedbar_full|colorb"
 msgid "C_olor"
 msgstr "L_liw"
 
-#: notebookbar_groupedbar_full.ui:7640
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:7889
 msgctxt "notebookbar_groupedbar_full|GridB"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_full.ui:7776
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:8029
 msgctxt "notebookbar_groupedbar_full|languageb"
 msgid "_Language"
 msgstr "_Iaith"
 
-#: notebookbar_groupedbar_full.ui:8001
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:8258
 msgctxt "notebookbar_groupedbar_full|revieb"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_groupedbar_full.ui:8213
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:8471
 msgctxt "notebookbar_groupedbar_full|commentsb"
 msgid "_Comments"
 msgstr "_Nodiadau"
 
-#: notebookbar_groupedbar_full.ui:8415
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:8674
 msgctxt "notebookbar_groupedbar_full|compareb"
 msgid "Com_pare"
 msgstr "_Cymharu"
 
-#: notebookbar_groupedbar_full.ui:8613
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:8876
 msgctxt "notebookbar_groupedbar_full|viewa"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:9055
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:9322
 msgctxt "notebookbar_groupedbar_full|drawb"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_groupedbar_full.ui:9425
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:9693
 msgctxt "notebookbar_groupedbar_full|editdrawb"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: notebookbar_groupedbar_full.ui:9762
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:10034
 msgctxt "notebookbar_groupedbar_full|arrangedrawb"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_full.ui:9926
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:10202
 msgctxt "notebookbar_groupedbar_full|GridDrawB"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:10124
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:10404
 msgctxt "notebookbar_groupedbar_full|viewDrawb"
 msgid "Grou_p"
 msgstr "Grŵ_p"
 
-#: notebookbar_groupedbar_full.ui:10273
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:10557
 msgctxt "notebookbar_groupedbar_full|3Db"
 msgid "3_D"
 msgstr "3_D"
 
-#: notebookbar_groupedbar_full.ui:10580
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:10868
 msgctxt "notebookbar_groupedbar_full|formatd"
 msgid "F_ont"
 msgstr "_Ffont"
 
-#: notebookbar_groupedbar_full.ui:10845
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:11134
 msgctxt "notebookbar_groupedbar_full|paragraphTextb"
 msgid "_Alignment"
 msgstr "_Aliniad"
 
-#: notebookbar_groupedbar_full.ui:11043
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:11336
 msgctxt "notebookbar_groupedbar_full|viewd"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:11193
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:11490
 msgctxt "notebookbar_groupedbar_full|insertTextb"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_full.ui:11334
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:11635
 msgctxt "notebookbar_groupedbar_full|media"
 msgid "_Media"
 msgstr "_Cyfrwng"
 
-#: notebookbar_groupedbar_full.ui:11571
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:11876
 msgctxt "notebookbar_groupedbar_full|oleB"
 msgid "F_rame"
 msgstr "_Ffrâm"
 
-#: notebookbar_groupedbar_full.ui:12001
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:12307
 msgctxt "notebookbar_groupedbar_full|arrageOLE"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_full.ui:12164
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:12474
 msgctxt "notebookbar_groupedbar_full|OleGridB"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_full.ui:12362
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui:12676
 msgctxt "notebookbar_groupedbar_full|viewf"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:12509
-msgctxt "notebookbar_groupedbar_full|menub"
-msgid "_Menu"
-msgstr "­_Dewislen"
-
-#: notebookbar_groupedbar_full.ui:12561
-msgctxt "notebookbar_groupedbar_full|toolsb"
-msgid "_Tools"
-msgstr "_Offer"
-
-#: notebookbar_groupedbar_full.ui:12615
-msgctxt "notebookbar_groupedbar_full|helpb"
-msgid "_Help"
-msgstr "_Cymorth"
-
-#: notebookbar_groups.ui:40
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:40
 msgctxt "notebookbar_groups|hyperlink"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: notebookbar_groups.ui:54
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:54
 msgctxt "notebookbar_groups|footnote"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: notebookbar_groups.ui:63
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:63
 msgctxt "notebookbar_groups|endnote"
 msgid "Endnote"
 msgstr "Diweddnod"
 
-#: notebookbar_groups.ui:78
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:78
 msgctxt "notebookbar_groups|bookmark"
 msgid "Bookmark"
 msgstr "Nod Tudalen"
 
-#: notebookbar_groups.ui:87
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:87
 msgctxt "notebookbar_groups|crossreference"
 msgid "Cross-Reference"
 msgstr "Croesgyfeirio"
 
-#: notebookbar_groups.ui:152
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:152
 msgctxt "notebookbar_groups|stylemenudefault"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: notebookbar_groups.ui:167
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:167
 msgctxt "notebookbar_groups|stylemenuacc1"
 msgid "Accent 1"
 msgstr "Acen 1"
 
-#: notebookbar_groups.ui:176
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:176
 msgctxt "notebookbar_groups|stylemenuacc2"
 msgid "Accent 2"
 msgstr "Acen 2"
 
-#: notebookbar_groups.ui:185
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:185
 msgctxt "notebookbar_groups|stylemenuacc3"
 msgid "Accent 3"
 msgstr "Acen 3"
 
-#: notebookbar_groups.ui:200
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:200
 msgctxt "notebookbar_groups|stylemenuhed1"
 msgid "Heading 1"
 msgstr "Pennyn 1"
 
-#: notebookbar_groups.ui:209
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:209
 msgctxt "notebookbar_groups|stylemenuhed2"
 msgid "Heading 2"
 msgstr "Pennyn 2"
 
-#: notebookbar_groups.ui:224
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:224
 msgctxt "notebookbar_groups|stylemenustatg"
 msgid "Good"
 msgstr "Da"
 
-#: notebookbar_groups.ui:233
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:233
 msgctxt "notebookbar_groups|stylemenustatn"
 msgid "Neutral"
 msgstr "Niwtral"
 
-#: notebookbar_groups.ui:242
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:242
 msgctxt "notebookbar_groups|stylemenustatb"
 msgid "Bad"
 msgstr "Drwg"
 
-#: notebookbar_groups.ui:251
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:251
 msgctxt "notebookbar_groups|stylemenustatw"
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: notebookbar_groups.ui:260
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:260
 msgctxt "notebookbar_groups|stylemenustate"
 msgid "Error"
 msgstr "Gwall"
 
-#: notebookbar_groups.ui:275
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:275
 msgctxt "notebookbar_groups|stylemenutxtn"
 msgid "Note"
 msgstr "Nodyn"
 
-#: notebookbar_groups.ui:284
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:284
 msgctxt "notebookbar_groups|stylemenutxtf"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: notebookbar_groups.ui:296
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:296
 msgctxt "notebookbar_groups|tablestylenone"
 msgid "None"
 msgstr "Dim"
 
-#: notebookbar_groups.ui:304
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:304
 msgctxt "notebookbar_groups|tablestyledefault"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: notebookbar_groups.ui:312
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:312
 msgctxt "notebookbar_groups|tablestyle1"
 msgid "Style 1"
 msgstr "Arddull 1"
 
-#: notebookbar_groups.ui:320
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:320
 msgctxt "notebookbar_groups|tablestyle2"
 msgid "Style 2"
 msgstr "Arddull 2"
 
-#: notebookbar_groups.ui:328
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:328
 msgctxt "notebookbar_groups|tablestyle3"
 msgid "Style 3"
 msgstr "Arddull 3"
 
-#: notebookbar_groups.ui:336
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:336
 msgctxt "notebookbar_groups|tablestyle4"
 msgid "Style 4"
 msgstr "Arddull 4"
 
-#: notebookbar_groups.ui:530
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:535
 msgctxt "notebookbar_groups|filegrouplabel"
 msgid "File"
 msgstr "Ffeil"
 
-#: notebookbar_groups.ui:683
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:691
 msgctxt "notebookbar_groups|clipboardgrouplabel"
 msgid "Clipboard"
 msgstr "Clipfwrdd"
 
-#: notebookbar_groups.ui:729
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:737
 msgctxt "notebookbar_groups|paragraphstyleb"
 msgid "Style"
 msgstr "Arddull"
 
-#: notebookbar_groups.ui:971
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:980
 msgctxt "notebookbar_groups|growb"
 msgid " "
 msgstr " "
 
-#: notebookbar_groups.ui:993
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1003
 msgctxt "notebookbar_groups|shrinkb"
 msgid " "
 msgstr " "
 
-#: notebookbar_groups.ui:1034
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1045
 msgctxt "notebookbar_groups|leftb"
 msgid "Left"
 msgstr "Chwith"
 
-#: notebookbar_groups.ui:1052
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1063
 msgctxt "notebookbar_groups|centerb"
 msgid "Center"
 msgstr "Canoli"
 
-#: notebookbar_groups.ui:1069
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1081
 msgctxt "notebookbar_groups|rightb"
 msgid "Right"
 msgstr "De"
 
-#: notebookbar_groups.ui:1275
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1290
 msgctxt "notebookbar_groups|formatgrouplabel"
 msgid "Text"
 msgstr "Testun"
 
-#: notebookbar_groups.ui:1376
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1393
 msgctxt "notebookbar_groups|mergeb"
 msgid "Merge"
 msgstr "Cyfuno"
 
-#: notebookbar_groups.ui:1394
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1412
 msgctxt "notebookbar_groups|splitb"
 msgid "Split"
 msgstr "Hollti"
 
-#: notebookbar_groups.ui:1457
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1478
 msgctxt "notebookbar_groups|conditionalb"
 msgid "Conditional"
 msgstr "Amodol"
 
-#: notebookbar_groups.ui:1583
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1605
 msgctxt "notebookbar_groups|topb"
 msgid "Top"
 msgstr "Top"
 
-#: notebookbar_groups.ui:1600
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1623
 msgctxt "notebookbar_groups|vcenterb"
 msgid "Center"
 msgstr "Canoli"
 
-#: notebookbar_groups.ui:1617
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1641
 msgctxt "notebookbar_groups|bottomb"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: notebookbar_groups.ui:1663
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1688
 msgctxt "notebookbar_groups|tablegrouplabel"
 msgid "Spreadsheet"
 msgstr "Taenlen"
 
-#: notebookbar_groups.ui:1740
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1765
 msgctxt "notebookbar_groups|shapesb"
 msgid "Shapes"
 msgstr "Siapiau"
 
-#: notebookbar_groups.ui:1756
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1781
 msgctxt "notebookbar_groups|linksb"
 msgid "Links"
 msgstr "Cysylltiadau"
 
-#: notebookbar_groups.ui:1864
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1893
 msgctxt "notebookbar_groups|insertgrouplabel"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: notebookbar_groups.ui:1900
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1929
 msgctxt "notebookbar_groups|imagestyleb"
 msgid "Style"
 msgstr "Arddull"
 
-#: notebookbar_groups.ui:1940
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:1971
 msgctxt "notebookbar_groups|resetb"
 msgid "Reset"
 msgstr "Ailosod"
 
-#: notebookbar_groups.ui:1984
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2017
 msgctxt "notebookbar_groups|wrapb"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: notebookbar_groups.ui:1999
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2033
 msgctxt "notebookbar_groups|lockb"
 msgid "Lock"
 msgstr "Cloi"
 
-#: notebookbar_groups.ui:2043
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2078
 msgctxt "notebookbar_groups|imagegrouplabel"
 msgid "Image"
 msgstr "Delwedd"
 
-#: notebookbar_groups.ui:2099
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2134
 msgctxt "notebookbar_groups|wrapoff"
 msgid "None"
 msgstr "Dim"
 
-#: notebookbar_groups.ui:2108
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2143
 msgctxt "notebookbar_groups|wrapideal"
 msgid "Optimal"
 msgstr "Gorau"
 
-#: notebookbar_groups.ui:2117
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2152
 msgctxt "notebookbar_groups|wrapon"
 msgid "Parallel"
 msgstr "Paralel"
 
-#: notebookbar_groups.ui:2126
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2161
 msgctxt "notebookbar_groups|wrapleft"
 msgid "Before"
 msgstr "Cyn"
 
-#: notebookbar_groups.ui:2135
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2170
 msgctxt "notebookbar_groups|wrapright"
 msgid "After"
 msgstr "Wedi"
 
-#: notebookbar_groups.ui:2144
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2179
 msgctxt "notebookbar_groups|wrapthrough"
 msgid "Through"
 msgstr "Drwy"
 
-#: notebookbar_groups.ui:2159
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2194
 msgctxt "notebookbar_groups|wrapcontour"
 msgid "Contour"
 msgstr "Amlinell"
 
-#: notebookbar_groups.ui:2168
+#: sc/uiconfig/scalc/ui/notebookbar_groups.ui:2203
 msgctxt "notebookbar_groups|contourdialog"
 msgid "Edit Contour"
 msgstr "Golygu Amlinell"
 
-#: optcalculatepage.ui:48
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:48
 msgctxt "optcalculatepage|threadingenabled"
-msgid "Enable multi-threaded calculation: Warning Experimental."
-msgstr "Galluogi cyfrifo trywydd lluosog: Rhybudd Arbrofol"
+msgid "Enable multi-threaded calculation"
+msgstr "Galluogi cyfrifo aml drywydd"
 
-#: optcalculatepage.ui:52
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:52
 msgctxt "optcalculatepage|threadingenabled|tooltip_text"
-msgid "Enable Experimental multi-threaded calculation of formula-groups, this may break your spreadsheet."
-msgstr "Galluogi cyfrifo trywydd lluosog arbrofol grwpio fformiwla, gall hyn dorri eich taenlen."
+msgid "Enable multi-threaded calculation of formula-groups"
+msgstr "Galluogi cyfrifo aml drywydd o grwpiau fformiwla"
 
-#: optcalculatepage.ui:71
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:71
 msgctxt "optcalculatepage|label4"
 msgid "CPU threading settings"
 msgstr "Gosodiadau trywyddu CPU"
 
-#: optcalculatepage.ui:107
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:107
 msgctxt "optcalculatepage|case"
 msgid "Case se_nsitive"
 msgstr "_Ymwybodol maint llythyren"
 
-#: optcalculatepage.ui:111
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:111
 msgctxt "optcalculatepage|case|tooltip_text"
 msgid "Disable case sensitivity for interoperability with Microsoft Excel"
 msgstr "Analluogi sensitifrwydd maint nodau ar gyfer rhyngweithredu gyda Microsoft Excel"
 
-#: optcalculatepage.ui:124
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:124
 msgctxt "optcalculatepage|calc"
 msgid "_Precision as shown"
 msgstr "_Trachywiredd amlwg"
 
-#: optcalculatepage.ui:140
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:140
 msgctxt "optcalculatepage|match"
 msgid "Search criteria = and <> must apply to _whole cells"
 msgstr "Chwilio meni prawf = a <> yn wir i _gelloedd cyfan"
 
-#: optcalculatepage.ui:144
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:144
 msgctxt "optcalculatepage|match|tooltip_text"
 msgid "Enable this for interoperability with Microsoft Excel"
 msgstr "Galluogi hyn ar gyfer rhyngweithredu gyda Microsoft Excel"
 
-#: optcalculatepage.ui:157
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:157
 msgctxt "optcalculatepage|formulawildcards"
 msgid "Enable w_ildcards in formulas"
 msgstr "Galluogi cardiau _gwyllt mewn fformiwlâu"
 
-#: optcalculatepage.ui:161
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:161
 msgctxt "optcalculatepage|formulawildcards|tooltip_text"
 msgid "Enable wildcards for interoperability with Microsoft Excel"
 msgstr "Galluogi cardiau gwyllt ar gyfer rhyngweithredu gyda Microsoft Excel"
 
-#: optcalculatepage.ui:176
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:176
 msgctxt "optcalculatepage|formularegex"
 msgid "Enable r_egular expressions in formulas"
 msgstr "_Galluogi mynegiadau cyson mewn fformiwlâu"
 
-#: optcalculatepage.ui:194
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:194
 msgctxt "optcalculatepage|formulaliteral"
 msgid "No wildcards or regular expressions in formulas"
 msgstr "Dim cardiau gwyllt na mynegiadau rheolaidd mewn fformiwlâu"
 
-#: optcalculatepage.ui:212
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:212
 msgctxt "optcalculatepage|lookup"
 msgid "_Automatically find column and row labels"
 msgstr "_Canfod labeli colofn a rhesi yn awtomatig"
 
-#: optcalculatepage.ui:228
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:228
 msgctxt "optcalculatepage|generalprec"
 msgid "_Limit decimals for general number format"
 msgstr "_Cyfyngu degolion i fformat rhif cyffredin"
 
-#: optcalculatepage.ui:252
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:252
 msgctxt "optcalculatepage|precft"
 msgid "_Decimal places:"
 msgstr "_Llefydd degol:"
 
-#: optcalculatepage.ui:289
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:288
 msgctxt "optcalculatepage|label1"
 msgid "General Calculations"
 msgstr "Cyfrifo Cyffredinol"
 
-#: optcalculatepage.ui:323
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:322
 msgctxt "optcalculatepage|iterate"
 msgid "_Iterations"
 msgstr "_Iteradau"
 
-#: optcalculatepage.ui:343
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:342
 msgctxt "optcalculatepage|stepsft"
 msgid "_Steps:"
 msgstr "_Camau:"
 
-#: optcalculatepage.ui:358
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:357
 msgctxt "optcalculatepage|minchangeft"
 msgid "_Minimum change:"
 msgstr "Lleiafswm _newid:"
 
-#: optcalculatepage.ui:400
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:397
 msgctxt "optcalculatepage|label2"
 msgid "Iterative References"
 msgstr "Cyfeiriadau Iteraidd"
 
-#: optcalculatepage.ui:431
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:428
 msgctxt "optcalculatepage|datestd"
 msgid "12/30/1899 (defa_ult)"
 msgstr "12/30/1899 (_rhagosodiad)"
 
-#: optcalculatepage.ui:435
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:432
 msgctxt "optcalculatepage|datestd|tooltip_text"
 msgid "Value 0 corresponds to 12/30/1899"
 msgstr "Mae gwerth 0 yn cyfateb i 12/30/1899"
 
-#: optcalculatepage.ui:449
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:446
 msgctxt "optcalculatepage|datesc10"
 msgid "01/01/1900 (Star_Calc 1.0)"
 msgstr "01/01/1900 (Star_Calc 1.0)"
 
-#: optcalculatepage.ui:453
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:450
 msgctxt "optcalculatepage|datesc10|tooltip_text"
 msgid "Value 0 corresponds to 01/01/1900"
 msgstr "Mae gwerth 0 yn cyfateb i 01/01/1900"
 
-#: optcalculatepage.ui:466
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:463
 msgctxt "optcalculatepage|date1904"
 msgid "_01/01/1904"
 msgstr "_01/01/1904"
 
-#: optcalculatepage.ui:470
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:467
 msgctxt "optcalculatepage|date1904|tooltip_text"
 msgid "0 corresponds to 01/01/1904"
 msgstr "Mae 0 yn cyfateb i 01/01/1904"
 
-#: optcalculatepage.ui:489
+#: sc/uiconfig/scalc/ui/optcalculatepage.ui:486
 msgctxt "optcalculatepage|label3"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: optchangespage.ui:38
+#: sc/uiconfig/scalc/ui/optchangespage.ui:38
 msgctxt "optchangespage|label2"
 msgid "Chan_ges:"
 msgstr "_Newidiadau:"
 
-#: optchangespage.ui:52
+#: sc/uiconfig/scalc/ui/optchangespage.ui:52
 msgctxt "optchangespage|label3"
 msgid "_Deletions:"
 msgstr "_Dileadau:"
 
-#: optchangespage.ui:66
+#: sc/uiconfig/scalc/ui/optchangespage.ui:66
 msgctxt "optchangespage|label4"
 msgid "_Insertions:"
 msgstr "_Mewnosodiadau:"
 
-#: optchangespage.ui:80
+#: sc/uiconfig/scalc/ui/optchangespage.ui:80
 msgctxt "optchangespage|label5"
 msgid "_Moved entries:"
 msgstr "_Cofnodion symudwyd:"
 
-#: optchangespage.ui:137
+#: sc/uiconfig/scalc/ui/optchangespage.ui:137
 msgctxt "optchangespage|label1"
 msgid "Colors for Changes"
 msgstr "Lliwiau ar gyfer Newidiadau"
 
-#: optcompatibilitypage.ui:43
+#: sc/uiconfig/scalc/ui/optcompatibilitypage.ui:43
 msgctxt "optcompatibilitypage|label2"
 msgid "Select desired _key binding type. Changing the key binding type may overwrite some of the existing key bindings."
 msgstr "Dewiswch y math dymunol o rwymiad _allwedd. Gall newid y math o rwymiad allweddol drosysgrifo rai o rwymiadau presennol allweddol."
 
-#: optcompatibilitypage.ui:62
+#: sc/uiconfig/scalc/ui/optcompatibilitypage.ui:62
 msgctxt "optcompatibilitypage|keybindings"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: optcompatibilitypage.ui:63
+#: sc/uiconfig/scalc/ui/optcompatibilitypage.ui:63
 msgctxt "optcompatibilitypage|keybindings"
 msgid "OpenOffice.org legacy"
 msgstr "OpenOffice.org blaenorol"
 
-#: optcompatibilitypage.ui:81
+#: sc/uiconfig/scalc/ui/optcompatibilitypage.ui:81
 msgctxt "optcompatibilitypage|label1"
 msgid "Key Bindings"
 msgstr "Rhwymiad Allweddol"
 
-#: optdefaultpage.ui:40
+#: sc/uiconfig/scalc/ui/optdefaultpage.ui:40
 msgctxt "optdefaultpage|textsheetsnumber"
 msgid "_Number of worksheets in new document:"
 msgstr "_Nifer o daflenni gwaith yn y ddogfen newydd:"
 
-#: optdefaultpage.ui:54
+#: sc/uiconfig/scalc/ui/optdefaultpage.ui:54
 msgctxt "optdefaultpage|textsheetprefix"
 msgid "_Prefix name for new worksheet:"
 msgstr "_Rhagenw ar gyfer taenlen newydd:"
 
-#: optdefaultpage.ui:98
+#: sc/uiconfig/scalc/ui/optdefaultpage.ui:96
 msgctxt "optdefaultpage|label1"
 msgid "New Spreadsheet"
 msgstr "Taenlen Newydd"
 
-#: optdlg.ui:30
+#: sc/uiconfig/scalc/ui/optdlg.ui:30
 msgctxt "optdlg|suppressCB"
 msgid "_Suppress output of empty pages"
 msgstr "_Atal allbwn tudalennau gwag"
 
-#: optdlg.ui:46
+#: sc/uiconfig/scalc/ui/optdlg.ui:46
 msgctxt "optdlg|forceBreaksCB"
 msgid "_Always apply manual breaks"
 msgstr "_Toriad tudalen llaw"
 
-#: optdlg.ui:68
+#: sc/uiconfig/scalc/ui/optdlg.ui:68
 msgctxt "optdlg|label1"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: optdlg.ui:101
+#: sc/uiconfig/scalc/ui/optdlg.ui:101
 msgctxt "optdlg|printCB"
 msgid "_Print only selected sheets"
 msgstr "­_Argraffu dalennau dethol yn unig"
 
-#: optdlg.ui:124
+#: sc/uiconfig/scalc/ui/optdlg.ui:124
 msgctxt "optdlg|label2"
 msgid "Sheets"
 msgstr "Dalenni"
 
-#: optformula.ui:30
+#: sc/uiconfig/scalc/ui/optformula.ui:30
 msgctxt "optformula|englishfuncname"
 msgid "Use English function names"
 msgstr "Defnyddio enwau swyddogaeth Saesneg"
 
-#: optformula.ui:64
+#: sc/uiconfig/scalc/ui/optformula.ui:64
 msgctxt "optformula|formulasyntaxlabel"
 msgid "Formula _syntax:"
 msgstr "C_ystrawen fformiwla:"
 
-#: optformula.ui:87
+#: sc/uiconfig/scalc/ui/optformula.ui:87
 msgctxt "optformula|label1"
 msgid "Formula Options"
 msgstr "Dewisiadau Fformiwla"
 
-#: optformula.ui:121
+#: sc/uiconfig/scalc/ui/optformula.ui:121
 msgctxt "optformula|label9"
 msgid "Excel 2007 and newer:"
 msgstr "Excel 2007 a mwy diweddar:"
 
-#: optformula.ui:135
+#: sc/uiconfig/scalc/ui/optformula.ui:135
 msgctxt "optformula|label10"
 msgid "ODF spreadsheet (not saved by %PRODUCTNAME):"
 msgstr "Taenlen ODF (heb ei chadw gan %PRODUCTNAME):"
 
-#: optformula.ui:151
+#: sc/uiconfig/scalc/ui/optformula.ui:151
 msgctxt "optformula|ooxmlrecalc"
 msgid "Always recalculate"
 msgstr "Ail-gyfrifo bob tro"
 
-#: optformula.ui:152
+#: sc/uiconfig/scalc/ui/optformula.ui:152
 msgctxt "optformula|ooxmlrecalc"
 msgid "Never recalculate"
 msgstr "Peidio ail-gyfrifo byth"
 
-#: optformula.ui:153
+#: sc/uiconfig/scalc/ui/optformula.ui:153
 msgctxt "optformula|ooxmlrecalc"
 msgid "Prompt user"
 msgstr "Annog defnyddiwr"
 
-#: optformula.ui:167
+#: sc/uiconfig/scalc/ui/optformula.ui:167
 msgctxt "optformula|odfrecalc"
 msgid "Always recalculate"
 msgstr "Ail-gyfrifo bob tro"
 
-#: optformula.ui:168
+#: sc/uiconfig/scalc/ui/optformula.ui:168
 msgctxt "optformula|odfrecalc"
 msgid "Never recalculate"
 msgstr "Peidio ail-gyfrifo byth"
 
-#: optformula.ui:169
+#: sc/uiconfig/scalc/ui/optformula.ui:169
 msgctxt "optformula|odfrecalc"
 msgid "Prompt user"
 msgstr "Annog defnyddiwr"
 
-#: optformula.ui:185
+#: sc/uiconfig/scalc/ui/optformula.ui:185
 msgctxt "optformula|label4"
 msgid "Recalculation on File Load"
 msgstr "Ail-gyfrifo Llwyth y Ffeil"
 
-#: optformula.ui:219
+#: sc/uiconfig/scalc/ui/optformula.ui:219
 msgctxt "optformula|calcdefault"
 msgid "Default settings"
 msgstr "Gosodiadau rhagosodedig"
 
-#: optformula.ui:240
+#: sc/uiconfig/scalc/ui/optformula.ui:240
 msgctxt "optformula|calccustom"
 msgid "Custom (conversion of text to numbers and more):"
 msgstr "Cyfaddas (trosi testun i rifau a rhagor):"
 
-#: optformula.ui:256
+#: sc/uiconfig/scalc/ui/optformula.ui:256
 msgctxt "optformula|details"
 msgid "Details…"
 msgstr "Manylion…"
 
-#: optformula.ui:281
+#: sc/uiconfig/scalc/ui/optformula.ui:281
 msgctxt "optformula|label2"
 msgid "Detailed Calculation Settings"
 msgstr "Gosodiadau Cyfrifo Manwl"
 
-#: optformula.ui:318
+#: sc/uiconfig/scalc/ui/optformula.ui:318
 msgctxt "optformula|label6"
 msgid "_Function:"
 msgstr "_Swyddogaeth:"
 
-#: optformula.ui:332
+#: sc/uiconfig/scalc/ui/optformula.ui:332
 msgctxt "optformula|label7"
 msgid "Array co_lumn:"
 msgstr "_Colofn arae:"
 
-#: optformula.ui:346
+#: sc/uiconfig/scalc/ui/optformula.ui:346
 msgctxt "optformula|label8"
 msgid "Array _row:"
 msgstr "_Rhes arae:"
 
-#: optformula.ui:397
+#: sc/uiconfig/scalc/ui/optformula.ui:394
 msgctxt "optformula|reset"
 msgid "Rese_t Separators Settings"
 msgstr "_Ailosod Gosodiadau Ymwahanyddion"
 
-#: optformula.ui:423
+#: sc/uiconfig/scalc/ui/optformula.ui:420
 msgctxt "optformula|label3"
 msgid "Separators"
 msgstr "Gwahanyddion"
 
-#: optimalcolwidthdialog.ui:8
+#: sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui:8
 msgctxt "optimalcolwidthdialog|OptimalColWidthDialog"
 msgid "Optimal Column Width"
 msgstr "Lled Colofn Gorau"
 
-#: optimalcolwidthdialog.ui:88
+#: sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui:88
 msgctxt "optimalcolwidthdialog|label1"
 msgid "Add:"
 msgstr "Ychwanegu:"
 
-#: optimalcolwidthdialog.ui:112
+#: sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui:111
 msgctxt "optimalcolwidthdialog|default"
 msgid "_Default value"
 msgstr "_Gwerth rhagosodedig"
 
-#: optimalrowheightdialog.ui:8
+#: sc/uiconfig/scalc/ui/optimalrowheightdialog.ui:8
 msgctxt "optimalrowheightdialog|OptimalRowHeightDialog"
 msgid "Optimal Row Height"
 msgstr "Uchder Rhes Gorau"
 
-#: optimalrowheightdialog.ui:88
+#: sc/uiconfig/scalc/ui/optimalrowheightdialog.ui:88
 msgctxt "optimalrowheightdialog|label1"
 msgid "Add:"
 msgstr "Ychwanegu:"
 
-#: optimalrowheightdialog.ui:112
+#: sc/uiconfig/scalc/ui/optimalrowheightdialog.ui:111
 msgctxt "optimalrowheightdialog|default"
 msgid "_Default value"
 msgstr "_Gwerth rhagosodedig"
 
-#: optsortlists.ui:22
+#: sc/uiconfig/scalc/ui/optsortlists.ui:22
 msgctxt "optsortlists|copy"
 msgid "_Copy"
 msgstr "­_Copïo"
 
-#: optsortlists.ui:45
+#: sc/uiconfig/scalc/ui/optsortlists.ui:45
 msgctxt "optsortlists|copyfromlabel"
 msgid "Copy list _from:"
 msgstr "Copïo _rhestr o:"
 
-#: optsortlists.ui:91
+#: sc/uiconfig/scalc/ui/optsortlists.ui:90
 msgctxt "optsortlists|listslabel"
 msgid "_Lists"
 msgstr "_Rhestrau"
 
-#: optsortlists.ui:107
+#: sc/uiconfig/scalc/ui/optsortlists.ui:106
 msgctxt "optsortlists|entrieslabel"
 msgid "_Entries"
 msgstr "_Cofnodion"
 
-#: optsortlists.ui:166
+#: sc/uiconfig/scalc/ui/optsortlists.ui:165
 msgctxt "optsortlists|new"
 msgid "_New"
 msgstr "_Newydd"
 
-#: optsortlists.ui:180
+#: sc/uiconfig/scalc/ui/optsortlists.ui:179
 msgctxt "optsortlists|discard"
 msgid "_Discard"
 msgstr "_Hepgor"
 
-#: optsortlists.ui:194
+#: sc/uiconfig/scalc/ui/optsortlists.ui:193
 msgctxt "optsortlists|add"
 msgid "_Add"
 msgstr "_Ychwanegyn"
 
-#: optsortlists.ui:208
+#: sc/uiconfig/scalc/ui/optsortlists.ui:207
 msgctxt "optsortlists|modify"
 msgid "Modif_y"
 msgstr "_Newid"
 
-#: optsortlists.ui:222
+#: sc/uiconfig/scalc/ui/optsortlists.ui:221
 msgctxt "optsortlists|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: pagetemplatedialog.ui:8
+#: sc/uiconfig/scalc/ui/pagetemplatedialog.ui:8
 msgctxt "pagetemplatedialog|PageTemplateDialog"
 msgid "Page Style"
 msgstr "Arddull Tudalen"
 
-#: pagetemplatedialog.ui:106
+#: sc/uiconfig/scalc/ui/pagetemplatedialog.ui:106
 msgctxt "pagetemplatedialog|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: pagetemplatedialog.ui:128
+#: sc/uiconfig/scalc/ui/pagetemplatedialog.ui:128
 msgctxt "pagetemplatedialog|page"
 msgid "Page"
 msgstr "Tudalen"
 
-#: pagetemplatedialog.ui:151
+#: sc/uiconfig/scalc/ui/pagetemplatedialog.ui:151
 msgctxt "pagetemplatedialog|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: pagetemplatedialog.ui:174
+#: sc/uiconfig/scalc/ui/pagetemplatedialog.ui:174
 msgctxt "pagetemplatedialog|background"
 msgid "Background"
 msgstr "Cefndir"
 
-#: pagetemplatedialog.ui:197
+#: sc/uiconfig/scalc/ui/pagetemplatedialog.ui:197
 msgctxt "pagetemplatedialog|header"
 msgid "Header"
 msgstr "Pennyn"
 
-#: pagetemplatedialog.ui:220
+#: sc/uiconfig/scalc/ui/pagetemplatedialog.ui:220
 msgctxt "pagetemplatedialog|footer"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: pagetemplatedialog.ui:243
+#: sc/uiconfig/scalc/ui/pagetemplatedialog.ui:243
 msgctxt "pagetemplatedialog|sheet"
 msgid "Sheet"
 msgstr "Dalen"
 
-#: paradialog.ui:8
+#: sc/uiconfig/scalc/ui/paradialog.ui:8
 msgctxt "paradialog|ParagraphDialog"
 msgid "Paragraph"
 msgstr "Paragraff"
 
-#: paradialog.ui:106
+#: sc/uiconfig/scalc/ui/paradialog.ui:106
 msgctxt "paradialog|labelTP_PARA_STD"
 msgid "Indents & Spacing"
 msgstr "Mewnoliad a Bylchu"
 
-#: paradialog.ui:128
+#: sc/uiconfig/scalc/ui/paradialog.ui:128
 msgctxt "paradialog|labelTP_PARA_ALIGN"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: paradialog.ui:152
+#: sc/uiconfig/scalc/ui/paradialog.ui:152
 msgctxt "paradialog|labelTP_PARA_ASIAN"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: paradialog.ui:175
+#: sc/uiconfig/scalc/ui/paradialog.ui:175
 msgctxt "paradialog|labelTP_TABULATOR"
 msgid "Tabs"
 msgstr "Tabiau"
 
-#: paratemplatedialog.ui:8
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:8
 msgctxt "paratemplatedialog|ParaTemplateDialog"
 msgid "Cell Style"
 msgstr "Arddull Cell"
 
-#: paratemplatedialog.ui:81
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:81
 msgctxt "paratemplatedialog|standard"
 msgid "_Standard"
 msgstr "_Safonol"
 
-#: paratemplatedialog.ui:120
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:120
 msgctxt "paratemplatedialog|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: paratemplatedialog.ui:142
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:142
 msgctxt "paratemplatedialog|numbers"
 msgid "Numbers"
 msgstr "Rhifau"
 
-#: paratemplatedialog.ui:165
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:165
 msgctxt "paratemplatedialog|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: paratemplatedialog.ui:188
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:188
 msgctxt "paratemplatedialog|fonteffects"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: paratemplatedialog.ui:211
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:211
 msgctxt "paratemplatedialog|alignment"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: paratemplatedialog.ui:234
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:234
 msgctxt "paratemplatedialog|asiantypo"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: paratemplatedialog.ui:257
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:257
 msgctxt "paratemplatedialog|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: paratemplatedialog.ui:280
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:280
 msgctxt "paratemplatedialog|background"
 msgid "Background"
 msgstr "Cefndir"
 
-#: paratemplatedialog.ui:303
+#: sc/uiconfig/scalc/ui/paratemplatedialog.ui:303
 msgctxt "paratemplatedialog|protection"
 msgid "Cell Protection"
 msgstr "Diogelwch Cell"
 
-#: pastespecial.ui:23
+#: sc/uiconfig/scalc/ui/pastespecial.ui:23
 msgctxt "pastespecial|PasteSpecial"
 msgid "Paste Special"
 msgstr "Gludo Arbennig"
 
-#: pastespecial.ui:98
+#: sc/uiconfig/scalc/ui/pastespecial.ui:98
 msgctxt "pastespecial|paste_values_only|tooltip_text"
 msgid "Values Only"
 msgstr "Gwerthoedd yn Unig"
 
-#: pastespecial.ui:113
+#: sc/uiconfig/scalc/ui/pastespecial.ui:113
 msgctxt "pastespecial|paste_values_formats|tooltip_text"
 msgid "Values & Formats"
 msgstr "Gwerthoedd a Fformatau"
 
-#: pastespecial.ui:128
+#: sc/uiconfig/scalc/ui/pastespecial.ui:128
 msgctxt "pastespecial|paste_transpose|tooltip_text"
 msgid "Transpose"
 msgstr "Trawsddodi"
 
-#: pastespecial.ui:172
+#: sc/uiconfig/scalc/ui/pastespecial.ui:172
 msgctxt "pastespecial|paste_all"
 msgid "_Paste all"
 msgstr "_Gludo popeth"
 
-#: pastespecial.ui:189
+#: sc/uiconfig/scalc/ui/pastespecial.ui:189
 msgctxt "pastespecial|text"
 msgid "Te_xt"
 msgstr "_Llinynnau"
 
-#: pastespecial.ui:205
+#: sc/uiconfig/scalc/ui/pastespecial.ui:205
 msgctxt "pastespecial|numbers"
 msgid "_Numbers"
 msgstr "_Rhifau"
 
-#: pastespecial.ui:221
+#: sc/uiconfig/scalc/ui/pastespecial.ui:221
 msgctxt "pastespecial|datetime"
 msgid "_Date & time"
 msgstr "_Dyddiad ac amser"
 
-#: pastespecial.ui:237
+#: sc/uiconfig/scalc/ui/pastespecial.ui:237
 msgctxt "pastespecial|formulas"
 msgid "_Formulas"
 msgstr "_Fformiwlâu"
 
-#: pastespecial.ui:253
+#: sc/uiconfig/scalc/ui/pastespecial.ui:253
 msgctxt "pastespecial|comments"
 msgid "_Comments"
 msgstr "_Sylwadau"
 
-#: pastespecial.ui:269
+#: sc/uiconfig/scalc/ui/pastespecial.ui:269
 msgctxt "pastespecial|formats"
 msgid "For_mats"
 msgstr "Ffo_rmatau"
 
-#: pastespecial.ui:285
+#: sc/uiconfig/scalc/ui/pastespecial.ui:285
 msgctxt "pastespecial|objects"
 msgid "_Objects"
 msgstr "_­Gwrthrychau"
 
-#: pastespecial.ui:307
+#: sc/uiconfig/scalc/ui/pastespecial.ui:307
 msgctxt "pastespecial|label1"
 msgid "Selection"
 msgstr "Dewis"
 
-#: pastespecial.ui:341
+#: sc/uiconfig/scalc/ui/pastespecial.ui:341
 msgctxt "pastespecial|none"
 msgid "Non_e"
 msgstr "Di_m"
 
-#: pastespecial.ui:359
+#: sc/uiconfig/scalc/ui/pastespecial.ui:359
 msgctxt "pastespecial|add"
 msgid "_Add"
 msgstr "_Ychwanegu"
 
-#: pastespecial.ui:377
+#: sc/uiconfig/scalc/ui/pastespecial.ui:377
 msgctxt "pastespecial|subtract"
 msgid "_Subtract"
 msgstr "_Tynnu"
 
-#: pastespecial.ui:395
+#: sc/uiconfig/scalc/ui/pastespecial.ui:395
 msgctxt "pastespecial|multiply"
 msgid "Multipl_y"
 msgstr "_Lluosi"
 
-#: pastespecial.ui:413
+#: sc/uiconfig/scalc/ui/pastespecial.ui:413
 msgctxt "pastespecial|divide"
 msgid "Di_vide"
 msgstr "_Rhannu"
 
-#: pastespecial.ui:437
+#: sc/uiconfig/scalc/ui/pastespecial.ui:437
 msgctxt "pastespecial|label2"
 msgid "Operations"
 msgstr "Gweithrediadau"
 
-#: pastespecial.ui:471
+#: sc/uiconfig/scalc/ui/pastespecial.ui:471
 msgctxt "pastespecial|skip_empty"
 msgid "S_kip empty cells"
 msgstr "_Hepgor celloedd gwag"
 
-#: pastespecial.ui:488
+#: sc/uiconfig/scalc/ui/pastespecial.ui:476
+msgctxt "pastespecial|skip_empty"
+msgid "If enabled, blank cells in source will not override the target."
+msgstr "Os wedi ei alluogi, ni fydd celloedd gwag yn y ffynhonnell yn gwrthwneud y targed."
+
+#: sc/uiconfig/scalc/ui/pastespecial.ui:489
 msgctxt "pastespecial|transpose"
 msgid "_Transpose"
 msgstr "_Trawsddodi"
 
-#: pastespecial.ui:505
+#: sc/uiconfig/scalc/ui/pastespecial.ui:506
 msgctxt "pastespecial|link"
 msgid "_Link"
 msgstr "C_ysylltu"
 
-#: pastespecial.ui:528
+#: sc/uiconfig/scalc/ui/pastespecial.ui:529
 msgctxt "pastespecial|label3"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: pastespecial.ui:562
+#: sc/uiconfig/scalc/ui/pastespecial.ui:563
 msgctxt "pastespecial|no_shift"
 msgid "Don't sh_ift"
 msgstr "_Peidio symud"
 
-#: pastespecial.ui:580
+#: sc/uiconfig/scalc/ui/pastespecial.ui:581
 msgctxt "pastespecial|move_down"
 msgid "Do_wn"
 msgstr "­_Lawr"
 
-#: pastespecial.ui:598
+#: sc/uiconfig/scalc/ui/pastespecial.ui:599
 msgctxt "pastespecial|move_right"
 msgid "_Right"
 msgstr "_De"
 
-#: pastespecial.ui:623
+#: sc/uiconfig/scalc/ui/pastespecial.ui:624
 msgctxt "pastespecial|label4"
 msgid "Shift Cells"
 msgstr "Symud Celloedd"
 
-#: pivotfielddialog.ui:9
+#: sc/uiconfig/scalc/ui/pivotfielddialog.ui:9
 msgctxt "pivotfielddialog|PivotFieldDialog"
 msgid "Data Field"
 msgstr "Maes Data"
 
-#: pivotfielddialog.ui:69
+#: sc/uiconfig/scalc/ui/pivotfielddialog.ui:69
 msgctxt "pivotfielddialog|options"
 msgid "_Options..."
 msgstr "_Dewisiadau..."
 
-#: pivotfielddialog.ui:123
+#: sc/uiconfig/scalc/ui/pivotfielddialog.ui:123
 msgctxt "pivotfielddialog|none"
 msgid "_None"
 msgstr "_Dim"
 
-#: pivotfielddialog.ui:142
+#: sc/uiconfig/scalc/ui/pivotfielddialog.ui:142
 msgctxt "pivotfielddialog|auto"
 msgid "_Automatic"
 msgstr "_Awtomatig"
 
-#: pivotfielddialog.ui:160
+#: sc/uiconfig/scalc/ui/pivotfielddialog.ui:160
 msgctxt "pivotfielddialog|user"
 msgid "_User-defined"
 msgstr "_Defnyddiwr diffiniedig"
 
-#: pivotfielddialog.ui:203
+#: sc/uiconfig/scalc/ui/pivotfielddialog.ui:203
 msgctxt "pivotfielddialog|label1"
 msgid "Subtotals"
 msgstr "Is gyfansymiau"
 
-#: pivotfielddialog.ui:219
+#: sc/uiconfig/scalc/ui/pivotfielddialog.ui:219
 msgctxt "pivotfielddialog|showall"
 msgid "Show it_ems without data"
 msgstr "Dangos _eitemau heb ddata"
 
-#: pivotfielddialog.ui:244
+#: sc/uiconfig/scalc/ui/pivotfielddialog.ui:244
 msgctxt "pivotfielddialog|label2"
 msgid "Name:"
 msgstr "Enw:"
 
-#: pivotfilterdialog.ui:8
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:8
 msgctxt "pivotfilterdialog|PivotFilterDialog"
 msgid "Filter"
 msgstr "Hidl"
 
-#: pivotfilterdialog.ui:104
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:104
 msgctxt "pivotfilterdialog|connect1"
 msgid "AND"
 msgstr "AND"
 
-#: pivotfilterdialog.ui:105
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:105
 msgctxt "pivotfilterdialog|connect1"
 msgid "OR"
 msgstr "OR"
 
-#: pivotfilterdialog.ui:121
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:121
 msgctxt "pivotfilterdialog|connect2"
 msgid "AND"
 msgstr "AND"
 
-#: pivotfilterdialog.ui:122
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:122
 msgctxt "pivotfilterdialog|connect2"
 msgid "OR"
 msgstr "OR"
 
-#: pivotfilterdialog.ui:134
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:134
 msgctxt "pivotfilterdialog|label2"
 msgid "Operator"
 msgstr "Gweithredydd"
 
-#: pivotfilterdialog.ui:145
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:145
 msgctxt "pivotfilterdialog|label3"
 msgid "Field name"
 msgstr "Enw maes"
 
-#: pivotfilterdialog.ui:156
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:156
 msgctxt "pivotfilterdialog|label4"
 msgid "Condition"
 msgstr "Cyflwr"
 
-#: pivotfilterdialog.ui:167
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:167
 msgctxt "pivotfilterdialog|label5"
 msgid "Value"
 msgstr "Gwerth"
 
-#: pivotfilterdialog.ui:347
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:347
 msgctxt "pivotfilterdialog|label1"
 msgid "Filter Criteria"
 msgstr "Maen Prawf Hidl"
 
-#: pivotfilterdialog.ui:385
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:385
 msgctxt "pivotfilterdialog|case"
 msgid "_Case sensitive"
 msgstr "_Llythyren fach neu FAWR"
 
-#: pivotfilterdialog.ui:401
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:401
 msgctxt "pivotfilterdialog|regexp"
 msgid "Regular _expressions"
 msgstr "Mynegiad _rheolaidd"
 
-#: pivotfilterdialog.ui:417
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:417
 msgctxt "pivotfilterdialog|unique"
 msgid "_No duplications"
 msgstr "_Dim dyblygu"
 
-#: pivotfilterdialog.ui:450
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:450
 msgctxt "pivotfilterdialog|dbarealabel"
 msgid "Data range:"
 msgstr "Ystod data:"
 
-#: pivotfilterdialog.ui:463
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:463
 msgctxt "pivotfilterdialog|dbarea"
 msgid "dummy"
 msgstr "dymi"
 
-#: pivotfilterdialog.ui:482
+#: sc/uiconfig/scalc/ui/pivotfilterdialog.ui:482
 msgctxt "pivotfilterdialog|label6"
 msgid "Op_tions"
 msgstr "D_ewisiadau"
 
-#: pivottablelayoutdialog.ui:9
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:9
 msgctxt "pivottablelayoutdialog|PivotTableLayout"
 msgid "Pivot Table Layout"
 msgstr "Cynllun Tabl Colyn"
 
-#: pivottablelayoutdialog.ui:110
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:110
 msgctxt "pivottablelayoutdialog|label3"
 msgid "Column Fields:"
 msgstr "Meysydd Colofn:"
 
-#: pivottablelayoutdialog.ui:162
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:162
 msgctxt "pivottablelayoutdialog|label5"
 msgid "Data Fields:"
 msgstr "Meysydd Data:"
 
-#: pivottablelayoutdialog.ui:214
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:214
 msgctxt "pivottablelayoutdialog|label4"
 msgid "Row Fields:"
 msgstr "Meysydd Rhesi:"
 
-#: pivottablelayoutdialog.ui:265
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:265
 msgctxt "pivottablelayoutdialog|label2"
 msgid "Page Fields:"
 msgstr "Meysydd Tudalen:"
 
-#: pivottablelayoutdialog.ui:326
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:326
 msgctxt "pivottablelayoutdialog|label1"
 msgid "Available Fields:"
 msgstr "Meysydd ar Gael:"
 
-#: pivottablelayoutdialog.ui:376
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:376
 msgctxt "pivottablelayoutdialog|label6"
 msgid "Drag the Items into the Desired Position"
 msgstr "Llusgo'r eitemau i'r Mannau Priodol"
 
-#: pivottablelayoutdialog.ui:401
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:401
 msgctxt "pivottablelayoutdialog|check-ignore-empty-rows"
 msgid "Ignore empty rows"
 msgstr "Anwybyddu'r rhesi gwag"
 
-#: pivottablelayoutdialog.ui:416
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:417
 msgctxt "pivottablelayoutdialog|check-identify-categories"
 msgid "Identify categories"
 msgstr "Adnabod categorïau"
 
-#: pivottablelayoutdialog.ui:431
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:433
 msgctxt "pivottablelayoutdialog|check-total-rows"
 msgid "Total rows"
 msgstr "Cyfanswm rhesi"
 
-#: pivottablelayoutdialog.ui:446
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:449
 msgctxt "pivottablelayoutdialog|check-total-columns"
 msgid "Total columns"
 msgstr "Cyfanswm colofnau"
 
-#: pivottablelayoutdialog.ui:461
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:465
 msgctxt "pivottablelayoutdialog|check-add-filter"
 msgid "Add filter"
 msgstr "Ychwanegu hidl"
 
-#: pivottablelayoutdialog.ui:476
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:481
 msgctxt "pivottablelayoutdialog|check-drill-to-details"
 msgid "Enable drill to details"
 msgstr "Caniatáu tyrchu i'r manylder"
 
-#: pivottablelayoutdialog.ui:495
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:501
 msgctxt "pivottablelayoutdialog|label11"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: pivottablelayoutdialog.ui:546
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:552
 msgctxt "pivottablelayoutdialog|destination-radio-new-sheet"
 msgid "New sheet"
 msgstr "Dalen newydd"
 
-#: pivottablelayoutdialog.ui:562
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:569
 msgctxt "pivottablelayoutdialog|destination-radio-selection"
 msgid "Selection"
 msgstr "Dewis"
 
-#: pivottablelayoutdialog.ui:611
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:618
 msgctxt "pivottablelayoutdialog|destination-radio-named-range"
 msgid "Named range"
 msgstr "Ystod enwyd"
 
-#: pivottablelayoutdialog.ui:632
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:640
 msgctxt "pivottablelayoutdialog|label8"
 msgid "Destination"
 msgstr "Cyrchfan"
 
-#: pivottablelayoutdialog.ui:668
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:676
 msgctxt "pivottablelayoutdialog|source-radio-selection"
 msgid "Selection"
 msgstr "Dewis"
 
-#: pivottablelayoutdialog.ui:706
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:714
 msgctxt "pivottablelayoutdialog|source-radio-named-range"
 msgid "Named range"
 msgstr "Ystod enwyd"
 
-#: pivottablelayoutdialog.ui:738
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:747
 msgctxt "pivottablelayoutdialog|label9"
 msgid "Source"
 msgstr "Ffynhonnell"
 
-#: pivottablelayoutdialog.ui:756
+#: sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui:765
 msgctxt "pivottablelayoutdialog|label7"
 msgid "Source and Destination"
 msgstr "Ffynhonnell a Chyrchfan"
 
-#: printareasdialog.ui:9
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:9
 msgctxt "printareasdialog|PrintAreasDialog"
 msgid "Edit Print Ranges"
 msgstr "Golygu Ystod Argraffu"
 
-#: printareasdialog.ui:134
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:133
 msgctxt "printareasdialog|lbprintarea"
 msgid "- none -"
 msgstr "- dim -"
 
-#: printareasdialog.ui:135
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:134
 msgctxt "printareasdialog|lbprintarea"
 msgid "- entire sheet -"
 msgstr "- dalen gyfan -"
 
-#: printareasdialog.ui:136
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:135
 msgctxt "printareasdialog|lbprintarea"
 msgid "- user defined -"
 msgstr "- defnyddiwr diffiniedig -"
 
-#: printareasdialog.ui:137
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:136
 msgctxt "printareasdialog|lbprintarea"
 msgid "- selection -"
 msgstr "- dewis -"
 
-#: printareasdialog.ui:153
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:152
 msgctxt "printareasdialog|label1"
 msgid "Print Range"
 msgstr "Ystod Argraffu"
 
-#: printareasdialog.ui:219
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:217
 msgctxt "printareasdialog|lbrepeatrow"
 msgid "- none -"
 msgstr "- dim -"
 
-#: printareasdialog.ui:220
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:218
 msgctxt "printareasdialog|lbrepeatrow"
 msgid "- user defined -"
 msgstr "- defnyddiwr diffiniedig -"
 
-#: printareasdialog.ui:236
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:234
 msgctxt "printareasdialog|label2"
 msgid "Rows to Repeat"
 msgstr "Rhesi i'w Hailadrodd"
 
-#: printareasdialog.ui:302
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:299
 msgctxt "printareasdialog|lbrepeatcol"
 msgid "- none -"
 msgstr "- dim -"
 
-#: printareasdialog.ui:303
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:300
 msgctxt "printareasdialog|lbrepeatcol"
 msgid "- user defined -"
 msgstr "- defnyddiwr diffiniedig"
 
-#: printareasdialog.ui:319
+#: sc/uiconfig/scalc/ui/printareasdialog.ui:316
 msgctxt "printareasdialog|label3"
 msgid "Columns to Repeat"
 msgstr "Colofnau i'w Hailadrodd"
 
-#: printeroptions.ui:25
+#: sc/uiconfig/scalc/ui/printeroptions.ui:25
 msgctxt "printeroptions|suppressemptypages"
 msgid "Suppress output of empty pages"
 msgstr "Atal allbwn tudalennau gwag"
 
-#: printeroptions.ui:40
+#: sc/uiconfig/scalc/ui/printeroptions.ui:41
 msgctxt "printeroptions|label6"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: protectsheetdlg.ui:9
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:9
 msgctxt "protectsheetdlg|ProtectSheetDialog"
 msgid "Protect Sheet"
 msgstr "Diogelu dalen"
 
-#: protectsheetdlg.ui:90
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:90
 msgctxt "protectsheetdlg|protect"
 msgid "P_rotect this sheet and the contents of protected cells"
 msgstr "_Diogleu'r daenlen a chynnwys y celloedd diogelwyd"
 
-#: protectsheetdlg.ui:116
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:116
 msgctxt "protectsheetdlg|label1"
 msgid "_Password:"
 msgstr "_Cyfrinair:"
 
-#: protectsheetdlg.ui:131
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:131
 msgctxt "protectsheetdlg|label2"
 msgid "_Confirm:"
 msgstr "_Cadarnhau:"
 
-#: protectsheetdlg.ui:195
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:193
 msgctxt "protectsheetdlg|label4"
 msgid "Allow all users of this sheet to:"
 msgstr "Caniatáu i bob defnyddiwr y daenlen i:"
 
-#: protectsheetdlg.ui:231
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:229
 msgctxt "protectsheetdlg|protected"
 msgid "Select protected cells"
 msgstr "Dewis celloedd diogelwyd"
 
-#: protectsheetdlg.ui:243
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:241
 msgctxt "protectsheetdlg|unprotected"
 msgid "Select unprotected cells"
 msgstr "Dewis celloedd diamddiffyn"
 
-#: protectsheetdlg.ui:255
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:253
 msgctxt "protectsheetdlg|insert-columns"
 msgid "Insert columns"
 msgstr "Mewnosod colofnau"
 
-#: protectsheetdlg.ui:267
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:265
 msgctxt "protectsheetdlg|insert-rows"
 msgid "Insert rows"
 msgstr "Mewnosod rhesi"
 
-#: protectsheetdlg.ui:279
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:277
 msgctxt "protectsheetdlg|delete-columns"
 msgid "Delete columns"
 msgstr "Dileu colofnau"
 
-#: protectsheetdlg.ui:291
+#: sc/uiconfig/scalc/ui/protectsheetdlg.ui:289
 msgctxt "protectsheetdlg|delete-rows"
 msgid "Delete rows"
 msgstr "Dileu rhesi"
 
-#: queryrunstreamscriptdialog.ui:13
+#: sc/uiconfig/scalc/ui/queryrunstreamscriptdialog.ui:13
 msgctxt "queryrunstreamscriptdialog|QueryRunStreamScriptDialog"
 msgid "This data stream is generated by a script. Do you want to execute %URL?"
 msgstr "Mae'r llif data hwn yn cael ei greu gan sgript. Hoffech chi weithredu %URL?"
 
-#: randomnumbergenerator.ui:22
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:22
 msgctxt "randomnumbergenerator|distribution-liststore"
 msgid "Uniform"
 msgstr "Unffurf"
 
-#: randomnumbergenerator.ui:26
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:26
 msgctxt "randomnumbergenerator|distribution-liststore"
 msgid "Uniform Integer"
 msgstr "Cyfanrif Unffurf"
 
-#: randomnumbergenerator.ui:30
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:30
 msgctxt "randomnumbergenerator|distribution-liststore"
 msgid "Normal"
 msgstr "Normal"
 
-#: randomnumbergenerator.ui:34
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:34
 msgctxt "randomnumbergenerator|distribution-liststore"
 msgid "Cauchy"
 msgstr "Cauchy"
 
-#: randomnumbergenerator.ui:38
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:38
 msgctxt "randomnumbergenerator|distribution-liststore"
 msgid "Bernoulli"
 msgstr "Bernoulli"
 
-#: randomnumbergenerator.ui:42
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:42
 msgctxt "randomnumbergenerator|distribution-liststore"
 msgid "Binomial"
 msgstr "Binomaidd"
 
-#: randomnumbergenerator.ui:46
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:46
 msgctxt "randomnumbergenerator|distribution-liststore"
 msgid "Chi Squared"
 msgstr "Chi Sgŵar"
 
-#: randomnumbergenerator.ui:50
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:50
 msgctxt "randomnumbergenerator|distribution-liststore"
 msgid "Geometric"
 msgstr "Geometrig"
 
-#: randomnumbergenerator.ui:54
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:54
 msgctxt "randomnumbergenerator|distribution-liststore"
 msgid "Negative Binomial"
 msgstr "Bbinomaidd Negyddol"
 
-#: randomnumbergenerator.ui:73
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:73
 msgctxt "randomnumbergenerator|RandomNumberGeneratorDialog"
 msgid "Random Number Generator"
 msgstr "Cynhyrchydd Rhif ar Hap"
 
-#: randomnumbergenerator.ui:180
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:180
 msgctxt "randomnumbergenerator|cell-range-label"
 msgid "Cell range:"
 msgstr "Ystod celloedd:"
 
-#: randomnumbergenerator.ui:225
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:224
 msgctxt "randomnumbergenerator|label1"
 msgid "Data"
 msgstr "Data"
 
-#: randomnumbergenerator.ui:263
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:262
 msgctxt "randomnumbergenerator|distribution-label"
 msgid "Distribution:"
 msgstr "Dosbarthiad:"
 
-#: randomnumbergenerator.ui:288
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:287
 msgctxt "randomnumbergenerator|parameter1-label"
 msgid "..."
 msgstr "..."
 
-#: randomnumbergenerator.ui:303
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:302
 msgctxt "randomnumbergenerator|parameter2-label"
 msgid "..."
 msgstr "..."
 
-#: randomnumbergenerator.ui:351
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:348
 msgctxt "randomnumbergenerator|label2"
 msgid "Random Number Generator"
 msgstr "Cynhyrchydd Rhif ar Hap"
 
-#: randomnumbergenerator.ui:386
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:383
 msgctxt "randomnumbergenerator|enable-seed-check"
 msgid "Enable custom seed"
 msgstr "Galluogi had cyfaddas"
 
-#: randomnumbergenerator.ui:406
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:403
 msgctxt "randomnumbergenerator|seed-label"
 msgid "Seed:"
 msgstr "Had:"
 
-#: randomnumbergenerator.ui:429
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:425
 msgctxt "randomnumbergenerator|enable-rounding-check"
 msgid "Enable rounding"
 msgstr "Galluogi crynhoi"
 
-#: randomnumbergenerator.ui:450
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:446
 msgctxt "randomnumbergenerator|decimal-places-label"
 msgid "Decimal places:"
 msgstr "Llefydd degol:"
 
-#: randomnumbergenerator.ui:481
+#: sc/uiconfig/scalc/ui/randomnumbergenerator.ui:476
 msgctxt "randomnumbergenerator|label4"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: regressiondialog.ui:9
+#: sc/uiconfig/scalc/ui/recalcquerydialog.ui:30
+msgctxt "recalcquerydialog|ask"
+msgid "Always perform this without prompt in the future."
+msgstr "Gwneud hyn heb anogaeth yn y dyfodol."
+
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:9
 msgctxt "regressiondialog|RegressionDialog"
 msgid "Regression"
 msgstr "Atchweliad"
 
-#: regressiondialog.ui:99
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:99
 msgctxt "regressiondialog|variable1-range-label"
 msgid "Variable 1 range:"
 msgstr "Ystod Amrywiolyn 1:"
 
-#: regressiondialog.ui:138
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:137
 msgctxt "regressiondialog|variable2-range-label"
 msgid "Variable 2 range:"
 msgstr "Ystod Amrywiolyn 2:"
 
-#: regressiondialog.ui:177
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:175
 msgctxt "regressiondialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniad i:"
 
-#: regressiondialog.ui:220
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:217
 msgctxt "regressiondialog|label1"
 msgid "Data"
 msgstr "Data"
 
-#: regressiondialog.ui:255
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:252
 msgctxt "regressiondialog|groupedby-columns-radio"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: regressiondialog.ui:271
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:268
 msgctxt "regressiondialog|groupedby-rows-radio"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: regressiondialog.ui:293
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:290
 msgctxt "regressiondialog|label2"
 msgid "Grouped by"
 msgstr "Grwpiwyd yn ôl"
 
-#: regressiondialog.ui:328
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:325
 msgctxt "regressiondialog|linear-check"
 msgid "Linear Regression"
 msgstr "Atchweliad Llinol"
 
-#: regressiondialog.ui:343
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:341
 msgctxt "regressiondialog|logarithmic-check"
 msgid "Logarithmic Regression"
 msgstr "Atchweliad Logarithmig"
 
-#: regressiondialog.ui:357
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:356
 msgctxt "regressiondialog|power-check"
 msgid "Power Regression"
 msgstr "Atchweliad Pŵer"
 
-#: regressiondialog.ui:377
+#: sc/uiconfig/scalc/ui/regressiondialog.ui:377
 msgctxt "regressiondialog|label3"
 msgid "Output Regression Types"
 msgstr "Mathau o Allbwn Atchweliad"
 
-#: retypepassdialog.ui:10
+#: sc/uiconfig/scalc/ui/retypepassdialog.ui:10
 msgctxt "retypepassdialog|RetypePass"
 msgid "Re-type Password"
 msgstr "Ail deipio'r Cyfrinair"
 
-#: retypepassdialog.ui:93
+#: sc/uiconfig/scalc/ui/retypepassdialog.ui:93
 msgctxt "retypepassdialog|descLabel"
 msgid "The document you are about to export has one or more protected items with password that cannot be exported. Please re-type your password to be able to export your document."
 msgstr "Mae gan y ddogfen rydych ar fin ei allforio i un neu fwy o eitemau sy'n cael eu diogelu gyda chyfrinair nad oes modd eu hallforio. Ail-deipiwch eich cyfrinair er mwyn gallu allforio eich dogfen."
 
-#: retypepassdialog.ui:124
+#: sc/uiconfig/scalc/ui/retypepassdialog.ui:124
 msgctxt "retypepassdialog|docStatusLabel"
 msgid "Status unknown"
 msgstr "Statws anhysbys"
 
-#: retypepassdialog.ui:134
+#: sc/uiconfig/scalc/ui/retypepassdialog.ui:134
 msgctxt "retypepassdialog|retypeDocButton"
 msgid "_Re-type"
 msgstr "_Ail deipio"
 
-#: retypepassdialog.ui:155
+#: sc/uiconfig/scalc/ui/retypepassdialog.ui:155
 msgctxt "retypepassdialog|label2"
 msgid "Document protection"
 msgstr "Diogelwch dogfen"
 
-#: retypepassdialog.ui:217
+#: sc/uiconfig/scalc/ui/retypepassdialog.ui:217
 msgctxt "retypepassdialog|label3"
 msgid "Sheet protection"
 msgstr "Diogelwch Dalen"
 
-#: retypepassworddialog.ui:8
+#: sc/uiconfig/scalc/ui/retypepassworddialog.ui:8
 msgctxt "retypepassworddialog|RetypePasswordDialog"
 msgid "Re-type Password"
 msgstr "Ail deipio'r Cyfrinair"
 
-#: retypepassworddialog.ui:81
+#: sc/uiconfig/scalc/ui/retypepassworddialog.ui:81
 msgctxt "retypepassworddialog|retypepassword"
 msgid "Re-type password"
 msgstr "Ail deipio'r cyfrinair"
 
-#: retypepassworddialog.ui:140
+#: sc/uiconfig/scalc/ui/retypepassworddialog.ui:140
 msgctxt "retypepassworddialog|label4"
 msgid "Pa_ssword:"
 msgstr "_Cyfrinair:"
 
-#: retypepassworddialog.ui:154
+#: sc/uiconfig/scalc/ui/retypepassworddialog.ui:154
 msgctxt "retypepassworddialog|label5"
 msgid "Confi_rm:"
 msgstr "_Cadarnhau:"
 
-#: retypepassworddialog.ui:165
+#: sc/uiconfig/scalc/ui/retypepassworddialog.ui:165
 msgctxt "retypepassworddialog|mustmatch"
 msgid "New password must match the original password"
 msgstr "Rhaid i'r cyfrinair gydweddu a'r cyfrinair gwreiddiol"
 
-#: retypepassworddialog.ui:190
+#: sc/uiconfig/scalc/ui/retypepassworddialog.ui:190
 msgctxt "retypepassworddialog|removepassword"
 msgid "Remove password from this protected item"
 msgstr "Tynnu cyfrinair oddi ar yr eitem diogelwyd"
 
-#: rightfooterdialog.ui:8
+#: sc/uiconfig/scalc/ui/rightfooterdialog.ui:8
 msgctxt "rightfooterdialog|RightFooterDialog"
 msgid "Footer (right)"
 msgstr "Troedyn (de)"
 
-#: rightfooterdialog.ui:106
+#: sc/uiconfig/scalc/ui/rightfooterdialog.ui:106
 msgctxt "rightfooterdialog|footerright"
 msgid "Footer (right)"
 msgstr "Troedyn (de)"
 
-#: rightheaderdialog.ui:8
+#: sc/uiconfig/scalc/ui/rightheaderdialog.ui:8
 msgctxt "rightheaderdialog|RightHeaderDialog"
 msgid "Header (right)"
 msgstr "Pennyn (de)"
 
-#: rightheaderdialog.ui:106
+#: sc/uiconfig/scalc/ui/rightheaderdialog.ui:106
 msgctxt "rightheaderdialog|headerright"
 msgid "Header (right)"
 msgstr "Pennyn (de)"
 
-#: rowheightdialog.ui:8
+#: sc/uiconfig/scalc/ui/rowheightdialog.ui:8
 msgctxt "rowheightdialog|RowHeightDialog"
 msgid "Row Height"
 msgstr "Uchder Rhes"
 
-#: rowheightdialog.ui:88
+#: sc/uiconfig/scalc/ui/rowheightdialog.ui:88
 msgctxt "rowheightdialog|label1"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: rowheightdialog.ui:112
+#: sc/uiconfig/scalc/ui/rowheightdialog.ui:111
 msgctxt "rowheightdialog|default"
 msgid "_Default value"
 msgstr "Gwerth _rhagosodedig"
 
-#: samplingdialog.ui:21
+#: sc/uiconfig/scalc/ui/samplingdialog.ui:21
 msgctxt "samplingdialog|SamplingDialog"
 msgid "Sampling"
 msgstr "Samplo"
 
-#: samplingdialog.ui:113
+#: sc/uiconfig/scalc/ui/samplingdialog.ui:113
 msgctxt "samplingdialog|input-range-label"
 msgid "Input range:"
 msgstr "Ystod mewnbwn:"
 
-#: samplingdialog.ui:152
+#: sc/uiconfig/scalc/ui/samplingdialog.ui:151
 msgctxt "samplingdialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniadau i:"
 
-#: samplingdialog.ui:194
+#: sc/uiconfig/scalc/ui/samplingdialog.ui:192
 msgctxt "samplingdialog|label4"
 msgid "Data"
 msgstr "Data"
 
-#: samplingdialog.ui:250
+#: sc/uiconfig/scalc/ui/samplingdialog.ui:247
 msgctxt "samplingdialog|label1"
 msgid "Sample size:"
 msgstr "Maint sampl:"
 
-#: samplingdialog.ui:262
+#: sc/uiconfig/scalc/ui/samplingdialog.ui:259
 msgctxt "samplingdialog|random-method-radio"
 msgid "Random"
 msgstr "Ar Hap"
 
-#: samplingdialog.ui:278
+#: sc/uiconfig/scalc/ui/samplingdialog.ui:276
 msgctxt "samplingdialog|periodic-method-radio"
 msgid "Periodic"
 msgstr "Cyfnodol"
 
-#: samplingdialog.ui:315
+#: sc/uiconfig/scalc/ui/samplingdialog.ui:313
 msgctxt "samplingdialog|label3"
 msgid "Period:"
 msgstr "Cyfnod:"
 
-#: samplingdialog.ui:332
+#: sc/uiconfig/scalc/ui/samplingdialog.ui:330
 msgctxt "samplingdialog|label2"
 msgid "Sampling Method"
 msgstr "Dull Samplo"
 
-#: scenariodialog.ui:9
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:9
 msgctxt "scenariodialog|ScenarioDialog"
 msgid "Create Scenario"
 msgstr "Creu Senario"
 
-#: scenariodialog.ui:111
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:111
 msgctxt "scenariodialog|label1"
 msgid "Name of Scenario"
 msgstr "Enw'r Senario"
 
-#: scenariodialog.ui:155
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:155
 msgctxt "scenariodialog|label2"
 msgid "Comment"
 msgstr "Sylw"
 
-#: scenariodialog.ui:189
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:189
 msgctxt "scenariodialog|copyback"
 msgid "Copy _back"
 msgstr "Copïo _nôl"
 
-#: scenariodialog.ui:204
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:204
 msgctxt "scenariodialog|copysheet"
 msgid "Copy _entire sheet"
 msgstr "Copïo dalen _gyfan"
 
-#: scenariodialog.ui:219
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:219
 msgctxt "scenariodialog|preventchanges"
 msgid "_Prevent changes"
 msgstr "_Rhwystro newid"
 
-#: scenariodialog.ui:239
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:239
 msgctxt "scenariodialog|showframe"
 msgid "_Display border"
 msgstr "_Dangos yr ymyl"
 
-#: scenariodialog.ui:264
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:264
 msgctxt "scenariodialog|bordercolor-atkobject"
 msgid "Display border in"
 msgstr "Dangos y border yn"
 
-#: scenariodialog.ui:287
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:287
 msgctxt "scenariodialog|label3"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: scenariodialog.ui:303
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:303
 msgctxt "scenariodialog|alttitle"
 msgid "Edit Scenario"
 msgstr "Golygu Senario"
 
-#: scenariodialog.ui:319
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:319
 msgctxt "scenariodialog|createdft"
 msgid "Created by"
 msgstr "Crëwyd gan"
 
-#: scenariodialog.ui:330
+#: sc/uiconfig/scalc/ui/scenariodialog.ui:330
 msgctxt "scenariodialog|onft"
 msgid "on"
 msgstr "ymlaen"
 
-#: scenariomenu.ui:12
+#: sc/uiconfig/scalc/ui/scenariomenu.ui:12
 msgctxt "scenariomenu|delete"
 msgid "Delete"
 msgstr "Dileu"
 
-#: scenariomenu.ui:20
+#: sc/uiconfig/scalc/ui/scenariomenu.ui:20
 msgctxt "scenariomenu|edit"
 msgid "Properties..."
 msgstr "Priodweddau..."
 
-#: scgeneralpage.ui:48
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:48
 msgctxt "scgeneralpage|label4"
 msgid "Measurement _unit:"
 msgstr "_Uned Fesur:"
 
-#: scgeneralpage.ui:62
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:62
 msgctxt "scgeneralpage|label5"
 msgid "_Tab stops:"
 msgstr "_Stop Tab:"
 
-#: scgeneralpage.ui:102
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:101
 msgctxt "scgeneralpage|label1"
 msgid "Metrics"
 msgstr "Metrigau"
 
-#: scgeneralpage.ui:138
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:137
 msgctxt "scgeneralpage|label6"
 msgid "Update links when opening"
 msgstr "Diweddaru'r cysylltiadau wrth agor"
 
-#: scgeneralpage.ui:157
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:156
 msgctxt "scgeneralpage|alwaysrb"
-msgid "_Always"
-msgstr "_Bob tro"
+msgid "_Always (from trusted locations)"
+msgstr "_Bob tro (o leoliadau dibynadwy)"
 
-#: scgeneralpage.ui:175
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:174
 msgctxt "scgeneralpage|requestrb"
 msgid "_On request"
 msgstr "_Ar gais"
 
-#: scgeneralpage.ui:193
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:192
 msgctxt "scgeneralpage|neverrb"
 msgid "_Never"
 msgstr "_Byth"
 
-#: scgeneralpage.ui:225
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:224
 msgctxt "scgeneralpage|label2"
 msgid "Updating"
 msgstr "Diweddaru"
 
-#: scgeneralpage.ui:265
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:264
 msgctxt "scgeneralpage|editmodecb"
 msgid "Press Enter to switch to _edit mode"
 msgstr "Pwyso Enter i newid i'r _modd golygu"
 
-#: scgeneralpage.ui:281
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:281
 msgctxt "scgeneralpage|formatcb"
 msgid "Expand _formatting"
 msgstr "_Ymestyn fformatio"
 
-#: scgeneralpage.ui:297
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:297
 msgctxt "scgeneralpage|exprefcb"
 msgid "Expand _references when new columns/rows are inserted"
 msgstr "Ymestyn _cyfeiriadau wrth fewnosod colofnau/rhesi newydd"
 
-#: scgeneralpage.ui:318
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:318
 msgctxt "scgeneralpage|alignlb"
 msgid "Down"
 msgstr "Lawr"
 
-#: scgeneralpage.ui:319
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:319
 msgctxt "scgeneralpage|alignlb"
 msgid "Right"
 msgstr "De"
 
-#: scgeneralpage.ui:320
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:320
 msgctxt "scgeneralpage|alignlb"
 msgid "Up"
 msgstr "Fyny"
 
-#: scgeneralpage.ui:321
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:321
 msgctxt "scgeneralpage|alignlb"
 msgid "Left"
 msgstr "Chwith"
 
-#: scgeneralpage.ui:331
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:331
 msgctxt "scgeneralpage|aligncb"
 msgid "Press Enter to _move selection"
 msgstr "Pwyso Enter i symud y _dewis"
 
-#: scgeneralpage.ui:346
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:346
 msgctxt "scgeneralpage|legacy_cell_selection_cb"
 msgid "Use legacy cursor movement behavior when selecting"
 msgstr "Defnyddiwch hen symudiad cyrchwr wrth ddewis"
 
-#: scgeneralpage.ui:361
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:361
 msgctxt "scgeneralpage|replwarncb"
 msgid "Show overwrite _warning when pasting data"
 msgstr "Dangos _rhybudd trosysgrifo wrth ludo data"
 
-#: scgeneralpage.ui:376
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:376
 msgctxt "scgeneralpage|textfmtcb"
 msgid "Use printer metrics for text formatting"
 msgstr "Defnyddio metrics argraffydd ar gyfer fformatio testun"
 
-#: scgeneralpage.ui:390
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:390
 msgctxt "scgeneralpage|markhdrcb"
 msgid "Highlight sele_ction in column/row headers"
 msgstr "Amlygu'r _dewis ym mhenynnau colofn/rhes"
 
-#: scgeneralpage.ui:405
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:405
 msgctxt "scgeneralpage|sortrefupdatecb"
 msgid "Update references when sorting range of cells"
 msgstr "Diweddaru cyfeiriadau wrth drefnu ystod o gelloedd"
 
-#: scgeneralpage.ui:440
+#: sc/uiconfig/scalc/ui/scgeneralpage.ui:440
 msgctxt "scgeneralpage|label3"
 msgid "Input Settings"
 msgstr "Gosodiadau Mewnbwn"
 
-#: searchresults.ui:9
+#: sc/uiconfig/scalc/ui/searchresults.ui:9
 msgctxt "searchresults|SearchResultsDialog"
 msgid "Search Results"
 msgstr "Canlyniadau Chwilio"
 
-#: selectdatasource.ui:8
+#: sc/uiconfig/scalc/ui/selectdatasource.ui:8
 msgctxt "selectdatasource|SelectDataSourceDialog"
 msgid "Select Data Source"
 msgstr "Dewis Ffynhonnell Data"
 
-#: selectdatasource.ui:99
+#: sc/uiconfig/scalc/ui/selectdatasource.ui:99
 msgctxt "selectdatasource|label2"
 msgid "_Database:"
 msgstr "_Cronfa ddata:"
 
-#: selectdatasource.ui:115
+#: sc/uiconfig/scalc/ui/selectdatasource.ui:115
 msgctxt "selectdatasource|label4"
 msgid "_Type:"
 msgstr "_Math:"
 
-#: selectdatasource.ui:145
+#: sc/uiconfig/scalc/ui/selectdatasource.ui:145
 msgctxt "selectdatasource|type"
 msgid "Table"
 msgstr "Tabl"
 
-#: selectdatasource.ui:146
+#: sc/uiconfig/scalc/ui/selectdatasource.ui:146
 msgctxt "selectdatasource|type"
 msgid "Query"
 msgstr "Ymholiad"
 
-#: selectdatasource.ui:147
+#: sc/uiconfig/scalc/ui/selectdatasource.ui:147
 msgctxt "selectdatasource|type"
 msgid "Sql"
 msgstr "Sql"
 
-#: selectdatasource.ui:148
+#: sc/uiconfig/scalc/ui/selectdatasource.ui:148
 msgctxt "selectdatasource|type"
 msgid "Sql [Native]"
 msgstr "Sql [Native]"
 
-#: selectdatasource.ui:163
+#: sc/uiconfig/scalc/ui/selectdatasource.ui:163
 msgctxt "selectdatasource|label3"
 msgid "Data so_urce:"
 msgstr "_Ffynhonnell data:"
 
-#: selectdatasource.ui:201
+#: sc/uiconfig/scalc/ui/selectdatasource.ui:201
 msgctxt "selectdatasource|label1"
 msgid "Selection"
 msgstr "Dewis"
 
-#: selectrange.ui:7
+#: sc/uiconfig/scalc/ui/selectrange.ui:7
 msgctxt "selectrange|SelectRangeDialog"
 msgid "Select Database Range"
 msgstr "Dewis Ystod Cronfa Ddata"
 
-#: selectrange.ui:107
+#: sc/uiconfig/scalc/ui/selectrange.ui:107
 msgctxt "selectrange|label1"
 msgid "Ranges"
 msgstr "Ystodau"
 
-#: selectsource.ui:8
+#: sc/uiconfig/scalc/ui/selectsource.ui:8
 msgctxt "selectsource|SelectSourceDialog"
 msgid "Select Source"
 msgstr "Dewis Ffynhonnell"
 
-#: selectsource.ui:94
+#: sc/uiconfig/scalc/ui/selectsource.ui:94
 msgctxt "selectsource|selection"
 msgid "_Current selection"
 msgstr "_Dewis presennol"
 
-#: selectsource.ui:117
+#: sc/uiconfig/scalc/ui/selectsource.ui:117
 msgctxt "selectsource|namedrange"
 msgid "_Named range:"
 msgstr "_Ystod enwyd:"
 
-#: selectsource.ui:158
+#: sc/uiconfig/scalc/ui/selectsource.ui:158
 msgctxt "selectsource|database"
 msgid "_Data source registered in %PRODUCTNAME"
 msgstr "_Ffynhonnell data wedi ei gofrestru yn %PRODUCTNAME"
 
-#: selectsource.ui:175
+#: sc/uiconfig/scalc/ui/selectsource.ui:175
 msgctxt "selectsource|external"
 msgid "_External source/interface"
 msgstr "Ffynhonnell _allanol/rhyngwyneb"
 
-#: selectsource.ui:198
+#: sc/uiconfig/scalc/ui/selectsource.ui:198
 msgctxt "selectsource|label1"
 msgid "Selection"
 msgstr "Dewis"
 
-#: sharedfooterdialog.ui:8
+#: sc/uiconfig/scalc/ui/sharedfooterdialog.ui:8
 msgctxt "sharedfooterdialog|SharedFooterDialog"
 msgid "Headers/Footers"
 msgstr "Penynnau/Troedynnau"
 
-#: sharedfooterdialog.ui:106
+#: sc/uiconfig/scalc/ui/sharedfooterdialog.ui:106
 msgctxt "sharedfooterdialog|headerright"
 msgid "Header (right)"
 msgstr "Pennyn (de)"
 
-#: sharedfooterdialog.ui:128
+#: sc/uiconfig/scalc/ui/sharedfooterdialog.ui:128
 msgctxt "sharedfooterdialog|headerleft"
 msgid "Header (left)"
 msgstr "Pennyn (chwith)"
 
-#: sharedfooterdialog.ui:151
+#: sc/uiconfig/scalc/ui/sharedfooterdialog.ui:151
 msgctxt "sharedfooterdialog|footer"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: sharedheaderdialog.ui:8
+#: sc/uiconfig/scalc/ui/sharedheaderdialog.ui:8
 msgctxt "sharedheaderdialog|SharedHeaderDialog"
 msgid "Headers/Footers"
 msgstr "Penynnau/Troedynnau"
 
-#: sharedheaderdialog.ui:106
+#: sc/uiconfig/scalc/ui/sharedheaderdialog.ui:106
 msgctxt "sharedheaderdialog|header"
 msgid "Header"
 msgstr "Pennyn"
 
-#: sharedheaderdialog.ui:128
+#: sc/uiconfig/scalc/ui/sharedheaderdialog.ui:128
 msgctxt "sharedheaderdialog|footerright"
 msgid "Footer (right)"
 msgstr "Troedyn (de)"
 
-#: sharedheaderdialog.ui:151
+#: sc/uiconfig/scalc/ui/sharedheaderdialog.ui:151
 msgctxt "sharedheaderdialog|footerleft"
 msgid "Footer (left)"
 msgstr "Troedyn (chwith)"
 
-#: sharedocumentdlg.ui:8
+#: sc/uiconfig/scalc/ui/sharedocumentdlg.ui:8
 msgctxt "sharedocumentdlg|ShareDocumentDialog"
 msgid "Share Document"
 msgstr "Rhannu Dogfen"
 
-#: sharedocumentdlg.ui:90
+#: sc/uiconfig/scalc/ui/sharedocumentdlg.ui:90
 msgctxt "sharedocumentdlg|share"
 msgid "_Share this spreadsheet with other users"
 msgstr "_Rhannu'r daenlen hon ag eraill"
 
-#: sharedocumentdlg.ui:116
+#: sc/uiconfig/scalc/ui/sharedocumentdlg.ui:116
 msgctxt "sharedocumentdlg|warning"
 msgid "Note: Changes to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities."
 msgstr "Nodyn: Ni fydd newidiadau i briodoleddau fel ffontiau, lliwiau a fformatau rhifau yn cael eu newid a bydd rhai swyddogaethau'n cael eu colli ac ni fydd swyddogaethau megis golygu siartiau a lluniadu gwrthrychau ar gael yn y modd rhannu. Diffoddwch y modd rhannu i gael mynediad unigol ar gyfer y newidiadau a'r swyddogaethau hyn."
 
-#: sharedocumentdlg.ui:169
+#: sc/uiconfig/scalc/ui/sharedocumentdlg.ui:169
 msgctxt "sharedocumentdlg|name"
 msgid "Name"
 msgstr "Enw"
 
-#: sharedocumentdlg.ui:181
+#: sc/uiconfig/scalc/ui/sharedocumentdlg.ui:181
 msgctxt "sharedocumentdlg|accessed"
 msgid "Accessed"
 msgstr "Mynediad"
 
-#: sharedocumentdlg.ui:222
+#: sc/uiconfig/scalc/ui/sharedocumentdlg.ui:222
 msgctxt "sharedocumentdlg|nouserdata"
 msgid "No user data available."
 msgstr "Dim data defnyddiwr ar gael."
 
-#: sharedocumentdlg.ui:234
+#: sc/uiconfig/scalc/ui/sharedocumentdlg.ui:234
 msgctxt "sharedocumentdlg|unknownuser"
 msgid "Unknown User"
 msgstr "Defnyddiwr Anhysbys"
 
-#: sharedocumentdlg.ui:246
+#: sc/uiconfig/scalc/ui/sharedocumentdlg.ui:246
 msgctxt "sharedocumentdlg|exclusive"
 msgid "(exclusive access)"
 msgstr "(mynediad cyfyngedig)"
 
-#: sharedocumentdlg.ui:269
+#: sc/uiconfig/scalc/ui/sharedocumentdlg.ui:269
 msgctxt "sharedocumentdlg|label1"
 msgid "Users Currently Accessing This Spreadsheet"
 msgstr "Defnyddwyr sy'n cael Mynediad at y Daenlen Hon"
 
-#: sheetprintpage.ui:63
+#: sc/uiconfig/scalc/ui/sharedwarningdialog.ui:12
+msgctxt "sharedwarningdialog|SharedWarningDialog"
+msgid "The spreadsheet is in shared mode. This allows multiple users to access and edit the spreadsheet at the same time."
+msgstr "Mae'r daenlen yn y modd rhannu. Mae hyn yn caniatáu defnyddwyr lluosog i gael mynediad i a golygu'r daenlen ar yr un pryd."
+
+#: sc/uiconfig/scalc/ui/sharedwarningdialog.ui:13
+msgctxt "sharedwarningdialog|SharedWarningDialog"
+msgid "Changes to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities."
+msgstr "Ni fydd rhai newidiadau i briodoleddau fformatio megis, ffontiau, lliwiau a fformat rhifau yn cael eu cadw ac nid yw rhai swyddogaethau megis golygu siartiau a gwrthrychau lluniadu ar gael yn y modd rhannu. Diffoddwch y modd rhannu i gael mynediad unigol ar gyfer y newidiadau a'r swyddogaethau hynny."
+
+#: sc/uiconfig/scalc/ui/sharedwarningdialog.ui:32
+msgctxt "sharedwarningdialog|ask"
+msgid "Do not show warning again."
+msgstr "Peidio dangos y rhybudd eto."
+
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:63
 msgctxt "sheetprintpage|radioBTN_TOPDOWN"
 msgid "_Top to bottom, then right"
 msgstr "O'r _brig i'r gwaelod, yna i'r dde"
 
-#: sheetprintpage.ui:80
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:80
 msgctxt "sheetprintpage|radioBTN_LEFTRIGHT"
 msgid "_Left to right, then down"
 msgstr "_Chwith i'r dde, yna lawr"
 
-#: sheetprintpage.ui:99
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:99
 msgctxt "sheetprintpage|checkBTN_PAGENO"
 msgid "First _page number:"
 msgstr "Rhif y dudalen _gyntaf:"
 
-#: sheetprintpage.ui:162
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:167
 msgctxt "sheetprintpage|labelPageOrder"
 msgid "Page Order"
 msgstr "Trefn Tudalennau"
 
-#: sheetprintpage.ui:196
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:201
 msgctxt "sheetprintpage|checkBTN_HEADER"
 msgid "_Column and row headers"
 msgstr "_Pennyn colofn a rhes"
 
-#: sheetprintpage.ui:211
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:216
 msgctxt "sheetprintpage|checkBTN_GRID"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: sheetprintpage.ui:227
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:232
 msgctxt "sheetprintpage|checkBTN_NOTES"
 msgid "_Comments"
 msgstr "_Nodiadau"
 
-#: sheetprintpage.ui:242
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:247
 msgctxt "sheetprintpage|checkBTN_OBJECTS"
 msgid "_Objects/Images"
 msgstr "_Gwrthrychau/Delweddau"
 
-#: sheetprintpage.ui:257
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:262
 msgctxt "sheetprintpage|checkBTN_CHARTS"
 msgid "Charts"
 msgstr "Siartiau"
 
-#: sheetprintpage.ui:272
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:277
 msgctxt "sheetprintpage|checkBTN_DRAWINGS"
 msgid "_Drawing objects"
 msgstr "G_wrthrychau lluniadu"
 
-#: sheetprintpage.ui:287
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:292
 msgctxt "sheetprintpage|checkBTN_FORMULAS"
 msgid "_Formulas"
 msgstr "_Fformiwlâu"
 
-#: sheetprintpage.ui:302
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:307
 msgctxt "sheetprintpage|checkBTN_NULLVALS"
 msgid "_Zero values"
 msgstr "_Gwerthoedd sero"
 
-#: sheetprintpage.ui:335
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:340
 msgctxt "sheetprintpage|labelPrint"
 msgid "Print"
 msgstr "Argraffu"
 
-#: sheetprintpage.ui:368
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:373
 msgctxt "sheetprintpage|labelScalingMode"
 msgid "Scaling _mode:"
 msgstr "_Modd graddio:"
 
-#: sheetprintpage.ui:393
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:398
 msgctxt "sheetprintpage|labelSF"
 msgid "_Scaling factor:"
 msgstr "_Ffactor graddio:"
 
-#: sheetprintpage.ui:435
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:439
 msgctxt "sheetprintpage|labelWP"
 msgid "_Width in pages:"
 msgstr "_Lled mewn tudalennau:"
 
-#: sheetprintpage.ui:449
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:457
 msgctxt "sheetprintpage|labelHP"
 msgid "_Height in pages:"
 msgstr "_Uchder mewn tudalennau:"
 
-#: sheetprintpage.ui:486
-msgctxt "sheetprintpage|unsetwidth"
-msgid "Unspecified"
-msgstr "Amhenodol"
-
-#: sheetprintpage.ui:499
-msgctxt "sheetprintpage|unsetheight"
-msgid "Unspecified"
-msgstr "Amhenodol"
-
-#: sheetprintpage.ui:526
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:517
 msgctxt "sheetprintpage|labelNP"
 msgid "N_umber of pages:"
 msgstr "Nifer o _dudalennau:"
 
-#: sheetprintpage.ui:569
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:559
 msgctxt "sheetprintpage|comboLB_SCALEMODE"
 msgid "Reduce/enlarge printout"
 msgstr "Lleihau/ehangu allbrint"
 
-#: sheetprintpage.ui:570
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:560
 msgctxt "sheetprintpage|comboLB_SCALEMODE"
 msgid "Fit print range(s) to width/height"
 msgstr "Ffitio ystod(au) argraffu i led/uchder"
 
-#: sheetprintpage.ui:571
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:561
 msgctxt "sheetprintpage|comboLB_SCALEMODE"
 msgid "Fit print range(s) on number of pages"
 msgstr "Ffitio ystod(au) argraffu'r nifer o dudalennau"
 
-#: sheetprintpage.ui:590
+#: sc/uiconfig/scalc/ui/sheetprintpage.ui:580
 msgctxt "sheetprintpage|labelScale"
 msgid "Scale"
 msgstr "Graddfa"
 
-#: showchangesdialog.ui:9
+#: sc/uiconfig/scalc/ui/showchangesdialog.ui:9
 msgctxt "showchangesdialog|ShowChangesDialog"
 msgid "Show Changes"
 msgstr "Dangos Newidiadau"
 
-#: showchangesdialog.ui:86
+#: sc/uiconfig/scalc/ui/showchangesdialog.ui:86
 msgctxt "showchangesdialog|showchanges"
 msgid "_Show changes in spreadsheet"
 msgstr "_Dangos newid mewn taenlen"
 
-#: showchangesdialog.ui:118
+#: sc/uiconfig/scalc/ui/showchangesdialog.ui:118
 msgctxt "showchangesdialog|showaccepted"
 msgid "Show _accepted changes"
 msgstr "Dangos newidiadau _derbyniwyd"
 
-#: showchangesdialog.ui:133
+#: sc/uiconfig/scalc/ui/showchangesdialog.ui:133
 msgctxt "showchangesdialog|showrejected"
 msgid "Show _rejected changes"
 msgstr "Dangos newidiadau _gwrthodwyd"
 
-#: showchangesdialog.ui:168
+#: sc/uiconfig/scalc/ui/showchangesdialog.ui:168
 msgctxt "showchangesdialog|label1"
 msgid "Filter Settings"
 msgstr "Gosodiadau Hidl"
 
-#: showdetaildialog.ui:10
+#: sc/uiconfig/scalc/ui/showdetaildialog.ui:10
 msgctxt "showdetaildialog|ShowDetail"
 msgid "Show Detail"
 msgstr "Dangos Manylion"
 
-#: showdetaildialog.ui:92
+#: sc/uiconfig/scalc/ui/showdetaildialog.ui:92
 msgctxt "showdetaildialog|label1"
 msgid "_Choose the field containing the detail you want to show"
 msgstr "_Dewis y maes sy'n cynnwys y manylion i'w dangos"
 
-#: showsheetdialog.ui:8
+#: sc/uiconfig/scalc/ui/showsheetdialog.ui:8
 msgctxt "showsheetdialog|ShowSheetDialog"
 msgid "Show Sheet"
 msgstr "Dangos Dalen"
 
-#: showsheetdialog.ui:108
+#: sc/uiconfig/scalc/ui/showsheetdialog.ui:108
 msgctxt "showsheetdialog|label1"
 msgid "Hidden Sheets"
 msgstr "Dalenni Cudd"
 
-#: sidebaralignment.ui:43
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:43
 msgctxt "sidebaralignment|horizontalalignment|tooltip_text"
 msgid "Horizontal Alignment"
 msgstr "Alinio Llorweddol"
 
-#: sidebaralignment.ui:106
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:106
 msgctxt "sidebaralignment|verticalalignment|tooltip_text"
 msgid "Vertical Alignment"
 msgstr "Alinio Fertigol"
 
-#: sidebaralignment.ui:256
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:256
 msgctxt "sidebaralignment|leftindentlabel"
 msgid "_Indent:"
 msgstr "_Mewnoliad:"
 
-#: sidebaralignment.ui:278
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:278
 msgctxt "sidebaralignment|leftindent|tooltip_text"
 msgid "Indents from the left edge."
 msgstr "Mewnoliadau o'r ymyl chwith."
 
-#: sidebaralignment.ui:285
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:284
 msgctxt "sidebaralignment|leftindent-atkobject"
 msgid "Left Indent"
 msgstr "Mewnoliad chwith"
 
-#: sidebaralignment.ui:310
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:309
 msgctxt "sidebaralignment|mergecells"
 msgid "Merge cells"
 msgstr "Cyfuno celloedd"
 
-#: sidebaralignment.ui:315
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:315
 msgctxt "sidebaralignment|mergecells|tooltip_text"
 msgid "Joins the selected cells into one."
 msgstr "Uno'r celloedd dewiswyd yn un."
 
-#: sidebaralignment.ui:329
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:329
 msgctxt "sidebaralignment|wraptext"
 msgid "Wrap text"
 msgstr "Amlapio testun"
 
-#: sidebaralignment.ui:334
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:335
 msgctxt "sidebaralignment|wraptext|tooltip_text"
 msgid "Wrap texts automatically."
 msgstr "Amlapio testunau'n awtomatig."
 
-#: sidebaralignment.ui:369
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:370
 msgctxt "sidebaralignment|orientationlabel"
 msgid "Text _orientation:"
 msgstr "Cyfeiriad _testun:"
 
-#: sidebaralignment.ui:384
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:385
 msgctxt "sidebaralignment|orientationdegrees|tooltip_text"
 msgid "Select the angle for rotation."
 msgstr "Dewis ongl y troi."
 
-#: sidebaralignment.ui:390
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:391
 msgctxt "sidebaralignment|orientationdegrees-atkobject"
 msgid "Text Orientation"
 msgstr "Cyfeiriad Testun"
 
-#: sidebaralignment.ui:411
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:413
 msgctxt "sidebaralignment|bottom|tooltip_text"
 msgid "Text Extension From Lower Cell Border"
 msgstr "Estyniad Testun o Ymyl Isaf Cell"
 
-#: sidebaralignment.ui:429
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:432
 msgctxt "sidebaralignment|top|tooltip_text"
 msgid "Text Extension From Upper Cell Border"
 msgstr "Estyniad Testun o Ymyl Uchaf Cell"
 
-#: sidebaralignment.ui:447
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:451
 msgctxt "sidebaralignment|standard|tooltip_text"
 msgid "Text Extension Inside Cell"
 msgstr "Estyniad Testun o Fewn Cell"
 
-#: sidebaralignment.ui:476
+#: sc/uiconfig/scalc/ui/sidebaralignment.ui:480
 msgctxt "sidebaralignment|stacked"
 msgid "Vertically stacked"
 msgstr "Stacio fertigol"
 
-#: sidebarcellappearance.ui:26
+#: sc/uiconfig/scalc/ui/sidebarcellappearance.ui:26
 msgctxt "sidebarcellappearance|cellbackgroundlabel"
 msgid "_Background:"
 msgstr "_C_efndir:"
 
-#: sidebarcellappearance.ui:42
+#: sc/uiconfig/scalc/ui/sidebarcellappearance.ui:42
 msgctxt "sidebarcellappearance|cellbackgroundcolor|tooltip_text"
 msgid "Select the background color of the selected cells."
 msgstr "Dewiswch lliw cefndir y celloedd hyn."
 
-#: sidebarcellappearance.ui:50
+#: sc/uiconfig/scalc/ui/sidebarcellappearance.ui:50
 msgctxt "sidebarcellappearance|cellbackground|tooltip_text"
 msgid "Select the background color of the selected cells."
 msgstr "Dewiswch lliw cefndir y celloedd hyn."
 
-#: sidebarcellappearance.ui:91
+#: sc/uiconfig/scalc/ui/sidebarcellappearance.ui:91
 msgctxt "sidebarcellappearance|bordertype|tooltip_text"
 msgid "Specify the borders of the selected cells."
 msgstr "Pennu borderi'r celloedd hyn."
 
-#: sidebarcellappearance.ui:126
+#: sc/uiconfig/scalc/ui/sidebarcellappearance.ui:126
 msgctxt "sidebarcellappearance|linestyle|tooltip_text"
 msgid "Select the line style of the borders."
 msgstr "Dewiswch arddull llinell y borderi."
 
-#: sidebarcellappearance.ui:139
+#: sc/uiconfig/scalc/ui/sidebarcellappearance.ui:139
 msgctxt "sidebarcellappearance|borderlinestyle-atkobject"
 msgid "Border Line Style"
 msgstr "Arddull Llinell Border"
 
-#: sidebarcellappearance.ui:154
+#: sc/uiconfig/scalc/ui/sidebarcellappearance.ui:154
 msgctxt "sidebarcellappearance|borderlinecolor|tooltip_text"
 msgid "Select the line color of the borders."
 msgstr "Dewiswch liw llinell y borderi."
 
-#: sidebarcellappearance.ui:162
+#: sc/uiconfig/scalc/ui/sidebarcellappearance.ui:162
 msgctxt "sidebarcellappearance|linecolor|tooltip_text"
 msgid "Select the line color of the borders."
 msgstr "Dewiswch liw llinell y borderi."
 
-#: sidebarcellappearance.ui:175
+#: sc/uiconfig/scalc/ui/sidebarcellappearance.ui:175
 msgctxt "sidebarcellappearance|borderlinecolor-atkobject"
 msgid "Border Line Color"
 msgstr "Lliw Llinell Border"
 
-#: sidebarnumberformat.ui:38
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:38
 msgctxt "sidebarnumberformat|category|tooltip_text"
 msgid "Select a category of contents."
 msgstr "Dewis categori cynnwys."
 
-#: sidebarnumberformat.ui:41
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:41
 msgctxt "sidebarnumberformat|category"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: sidebarnumberformat.ui:42
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:42
 msgctxt "sidebarnumberformat|category"
 msgid "Number"
 msgstr "Rhif"
 
-#: sidebarnumberformat.ui:43
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:43
 msgctxt "sidebarnumberformat|category"
 msgid "Percent"
 msgstr "Canran"
 
-#: sidebarnumberformat.ui:44
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:44
 msgctxt "sidebarnumberformat|category"
 msgid "Currency"
 msgstr "Arian"
 
-#: sidebarnumberformat.ui:45
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:45
 msgctxt "sidebarnumberformat|category"
 msgid "Date "
 msgstr "Dyddiad "
 
-#: sidebarnumberformat.ui:46
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:46
 msgctxt "sidebarnumberformat|category"
 msgid "Time"
 msgstr "Amser"
 
-#: sidebarnumberformat.ui:47
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:47
 msgctxt "sidebarnumberformat|category"
 msgid "Scientific"
 msgstr "Gwyddonol"
 
-#: sidebarnumberformat.ui:48
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:48
 msgctxt "sidebarnumberformat|category"
 msgid "Fraction"
 msgstr "Ffracsiwn"
 
-#: sidebarnumberformat.ui:49
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:49
 msgctxt "sidebarnumberformat|category"
 msgid "Boolean Value"
 msgstr "Gwerth Boole"
 
-#: sidebarnumberformat.ui:50
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:50
 msgctxt "sidebarnumberformat|category"
 msgid "Text"
 msgstr "Testun"
 
-#: sidebarnumberformat.ui:54
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:54
 msgctxt "sidebarnumberformat|category-atkobject"
 msgid "Category"
 msgstr "Categori"
 
-#: sidebarnumberformat.ui:135
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:135
 msgctxt "sidebarnumberformat|decimalplaceslabel"
 msgid "_Decimal places:"
 msgstr "_Llefydd degol:"
 
-#: sidebarnumberformat.ui:150
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:150
 msgctxt "sidebarnumberformat|decimalplaces|tooltip_text"
 msgid "Enter the number of decimal places that you want to display."
 msgstr "Rhowch rif y llefydd degol rydych am eu dangos."
 
-#: sidebarnumberformat.ui:155
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:154
 msgctxt "sidebarnumberformat|decimalplaces-atkobject"
 msgid "Decimal Places"
 msgstr "Llefydd Degol"
 
-#: sidebarnumberformat.ui:169
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:168
 msgctxt "sidebarnumberformat|denominatorplaceslabel"
 msgid "Den_ominator places:"
 msgstr "Llefydd _enwadur:"
 
-#: sidebarnumberformat.ui:184
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:183
 msgctxt "sidebarnumberformat|denominatorplaces|tooltip_text"
 msgid "Enter the number of places for the denominator that you want to display."
 msgstr "Golygu'r nifer o lefydd ar gyfer yr enwadur i'w dangos."
 
-#: sidebarnumberformat.ui:189
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:187
 msgctxt "sidebarnumberformat|denominatorplaces-atkobject"
 msgid "Denominator Places"
 msgstr "Llefydd Enwadyr"
 
-#: sidebarnumberformat.ui:216
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:214
 msgctxt "sidebarnumberformat|leadingzeroeslabel"
 msgid "Leading _zeroes:"
 msgstr "_Seroau arweiniol:"
 
-#: sidebarnumberformat.ui:232
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:230
 msgctxt "sidebarnumberformat|leadingzeroes|tooltip_text"
 msgid "Enter the maximum number of zeroes to display before the decimal point."
 msgstr "Rhowch uchafswm nifer y seroau i'w dangos cyn y pwynt degol."
 
-#: sidebarnumberformat.ui:237
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:234
 msgctxt "sidebarnumberformat|leadingzeroes-atkobject"
 msgid "Leading Zeroes"
 msgstr "Seroau Arweiniol"
 
-#: sidebarnumberformat.ui:264
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:261
 msgctxt "sidebarnumberformat|negativenumbersred"
 msgid "_Negative numbers in red"
 msgstr "_­Rhifau negyddol mewn coch"
 
-#: sidebarnumberformat.ui:270
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:267
 msgctxt "sidebarnumberformat|negativenumbersred|tooltip_text"
 msgid "Changes the font color of negative numbers to red."
 msgstr "Newid lliw ffont y rhifau negyddol i goch."
 
-#: sidebarnumberformat.ui:283
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:280
 msgctxt "sidebarnumberformat|thousandseparator"
 msgid "_Thousands separator"
 msgstr "_Gwahanydd miloedd"
 
-#: sidebarnumberformat.ui:289
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:286
 msgctxt "sidebarnumberformat|thousandseparator|tooltip_text"
 msgid "Inserts a separator between thousands."
 msgstr "Mewnosod gwahanydd rhwng miloedd."
 
-#: sidebarnumberformat.ui:302
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:299
 msgctxt "sidebarnumberformat|engineeringnotation"
 msgid "_Engineering notation"
 msgstr "_Nodiadau peirianyddol"
 
-#: sidebarnumberformat.ui:308
+#: sc/uiconfig/scalc/ui/sidebarnumberformat.ui:305
 msgctxt "sidebarnumberformat|engineeringnotation|tooltip_text"
 msgid "Ensures that exponent is a multiple of 3."
 msgstr "Sicrhau fod yr esbonydd yn luosol o 3."
 
-#: simplerefdialog.ui:9
+#: sc/uiconfig/scalc/ui/simplerefdialog.ui:9
 msgctxt "simplerefdialog|SimpleRefDialog"
 msgid "Set range"
 msgstr "Gosod yr ystod"
 
-#: simplerefdialog.ui:30
+#: sc/uiconfig/scalc/ui/simplerefdialog.ui:30
 msgctxt "simplerefdialog|area"
 msgid "Area:"
 msgstr "Ardal:"
 
-#: solverdlg.ui:9
+#: sc/uiconfig/scalc/ui/solverdlg.ui:9
 msgctxt "solverdlg|SolverDialog"
 msgid "Solver"
 msgstr "Datrysydd"
 
-#: solverdlg.ui:22
+#: sc/uiconfig/scalc/ui/solverdlg.ui:22
 msgctxt "solverdlg|options"
 msgid "O_ptions..."
 msgstr "_Dewisiadau..."
 
-#: solverdlg.ui:65
+#: sc/uiconfig/scalc/ui/solverdlg.ui:65
 msgctxt "solverdlg|solve"
 msgid "_Solve"
 msgstr "_Datrys"
 
-#: solverdlg.ui:107
+#: sc/uiconfig/scalc/ui/solverdlg.ui:107
 msgctxt "solverdlg|targetlabel"
 msgid "_Target cell"
 msgstr "Cell _targed"
 
-#: solverdlg.ui:120
+#: sc/uiconfig/scalc/ui/solverdlg.ui:120
 msgctxt "solverdlg|result"
 msgid "Optimize result to"
 msgstr "Optimeiddio'r canlyniad i"
 
-#: solverdlg.ui:133
+#: sc/uiconfig/scalc/ui/solverdlg.ui:133
 msgctxt "solverdlg|changelabel"
 msgid "_By changing cells"
 msgstr "_Drwy newid celloedd"
 
-#: solverdlg.ui:144
+#: sc/uiconfig/scalc/ui/solverdlg.ui:144
 msgctxt "solverdlg|min"
 msgid "Minim_um"
 msgstr "_Lleiafswm"
 
-#: solverdlg.ui:163
+#: sc/uiconfig/scalc/ui/solverdlg.ui:163
 msgctxt "solverdlg|max"
 msgid "_Maximum"
 msgstr "_Mwyaf"
 
-#: solverdlg.ui:263
+#: sc/uiconfig/scalc/ui/solverdlg.ui:263
 msgctxt "solverdlg|value"
 msgid "_Value of"
 msgstr "_Gwerth"
 
-#: solverdlg.ui:366
+#: sc/uiconfig/scalc/ui/solverdlg.ui:365
 msgctxt "solverdlg|cellreflabel"
 msgid "_Cell reference"
 msgstr "_Cyfeirnod cell"
 
-#: solverdlg.ui:380
+#: sc/uiconfig/scalc/ui/solverdlg.ui:379
 msgctxt "solverdlg|oplabel"
 msgid "_Operator"
 msgstr "_Gweithredydd"
 
-#: solverdlg.ui:394
+#: sc/uiconfig/scalc/ui/solverdlg.ui:393
 msgctxt "solverdlg|constraintlabel"
 msgid "V_alue"
 msgstr "G_werth"
 
-#: solverdlg.ui:413
+#: sc/uiconfig/scalc/ui/solverdlg.ui:411
 msgctxt "solverdlg|ref1edit-atkobject"
 msgid "Cell reference"
 msgstr "Cyfeirnod cell"
 
-#: solverdlg.ui:431
+#: sc/uiconfig/scalc/ui/solverdlg.ui:428
 msgctxt "solverdlg|ref2edit-atkobject"
 msgid "Cell reference"
 msgstr "Cyfeirnod cell"
 
-#: solverdlg.ui:449
+#: sc/uiconfig/scalc/ui/solverdlg.ui:445
 msgctxt "solverdlg|ref3edit-atkobject"
 msgid "Cell reference"
 msgstr "Cyfeirnod cell"
 
-#: solverdlg.ui:467
+#: sc/uiconfig/scalc/ui/solverdlg.ui:462
 msgctxt "solverdlg|ref4edit-atkobject"
 msgid "Cell reference"
 msgstr "Cyfeirnod cell"
 
-#: solverdlg.ui:527
+#: sc/uiconfig/scalc/ui/solverdlg.ui:522
 msgctxt "solverdlg|op1list"
 msgid "<="
 msgstr "<="
 
-#: solverdlg.ui:528
+#: sc/uiconfig/scalc/ui/solverdlg.ui:523
 msgctxt "solverdlg|op1list"
 msgid "="
 msgstr "="
 
-#: solverdlg.ui:529
+#: sc/uiconfig/scalc/ui/solverdlg.ui:524
 msgctxt "solverdlg|op1list"
 msgid "=>"
 msgstr "=>"
 
-#: solverdlg.ui:530
+#: sc/uiconfig/scalc/ui/solverdlg.ui:525
 msgctxt "solverdlg|op1list"
 msgid "Integer"
 msgstr "Cyfanrif"
 
-#: solverdlg.ui:531
+#: sc/uiconfig/scalc/ui/solverdlg.ui:526
 msgctxt "solverdlg|op1list"
 msgid "Binary"
 msgstr "Deuaidd"
 
-#: solverdlg.ui:535
+#: sc/uiconfig/scalc/ui/solverdlg.ui:530
 msgctxt "solverdlg|op1list-atkobject"
 msgid "Operator"
 msgstr "Gweithredwr"
 
-#: solverdlg.ui:551
+#: sc/uiconfig/scalc/ui/solverdlg.ui:546
 msgctxt "solverdlg|op2list"
 msgid "<="
 msgstr "<="
 
-#: solverdlg.ui:552
+#: sc/uiconfig/scalc/ui/solverdlg.ui:547
 msgctxt "solverdlg|op2list"
 msgid "="
 msgstr "="
 
-#: solverdlg.ui:553
+#: sc/uiconfig/scalc/ui/solverdlg.ui:548
 msgctxt "solverdlg|op2list"
 msgid "=>"
 msgstr "=>"
 
-#: solverdlg.ui:554
+#: sc/uiconfig/scalc/ui/solverdlg.ui:549
 msgctxt "solverdlg|op2list"
 msgid "Integer"
 msgstr "Cyfanrif"
 
-#: solverdlg.ui:555
+#: sc/uiconfig/scalc/ui/solverdlg.ui:550
 msgctxt "solverdlg|op2list"
 msgid "Binary"
 msgstr "Deuaidd"
 
-#: solverdlg.ui:559
+#: sc/uiconfig/scalc/ui/solverdlg.ui:554
 msgctxt "solverdlg|op2list-atkobject"
 msgid "Operator"
 msgstr "Gweithredwr"
 
-#: solverdlg.ui:575
+#: sc/uiconfig/scalc/ui/solverdlg.ui:570
 msgctxt "solverdlg|op3list"
 msgid "<="
 msgstr "<="
 
-#: solverdlg.ui:576
+#: sc/uiconfig/scalc/ui/solverdlg.ui:571
 msgctxt "solverdlg|op3list"
 msgid "="
 msgstr "="
 
-#: solverdlg.ui:577
+#: sc/uiconfig/scalc/ui/solverdlg.ui:572
 msgctxt "solverdlg|op3list"
 msgid "=>"
 msgstr "=>"
 
-#: solverdlg.ui:578
+#: sc/uiconfig/scalc/ui/solverdlg.ui:573
 msgctxt "solverdlg|op3list"
 msgid "Integer"
 msgstr "Cyfanrif"
 
-#: solverdlg.ui:579
+#: sc/uiconfig/scalc/ui/solverdlg.ui:574
 msgctxt "solverdlg|op3list"
 msgid "Binary"
 msgstr "Deuaidd"
 
-#: solverdlg.ui:583
+#: sc/uiconfig/scalc/ui/solverdlg.ui:578
 msgctxt "solverdlg|op3list-atkobject"
 msgid "Operator"
 msgstr "Gweithredwr"
 
-#: solverdlg.ui:599
+#: sc/uiconfig/scalc/ui/solverdlg.ui:594
 msgctxt "solverdlg|op4list"
 msgid "<="
 msgstr "<="
 
-#: solverdlg.ui:600
+#: sc/uiconfig/scalc/ui/solverdlg.ui:595
 msgctxt "solverdlg|op4list"
 msgid "="
 msgstr "="
 
-#: solverdlg.ui:601
+#: sc/uiconfig/scalc/ui/solverdlg.ui:596
 msgctxt "solverdlg|op4list"
 msgid "=>"
 msgstr "=>"
 
-#: solverdlg.ui:602
+#: sc/uiconfig/scalc/ui/solverdlg.ui:597
 msgctxt "solverdlg|op4list"
 msgid "Integer"
 msgstr "Cyfanrif"
 
-#: solverdlg.ui:603
+#: sc/uiconfig/scalc/ui/solverdlg.ui:598
 msgctxt "solverdlg|op4list"
 msgid "Binary"
 msgstr "Deuaidd"
 
-#: solverdlg.ui:607
+#: sc/uiconfig/scalc/ui/solverdlg.ui:602
 msgctxt "solverdlg|op4list-atkobject"
 msgid "Operator"
 msgstr "Gweithredwr"
 
-#: solverdlg.ui:626
+#: sc/uiconfig/scalc/ui/solverdlg.ui:620
 msgctxt "solverdlg|val1edit-atkobject"
 msgid "Value"
 msgstr "Gwerth"
 
-#: solverdlg.ui:645
+#: sc/uiconfig/scalc/ui/solverdlg.ui:638
 msgctxt "solverdlg|val2edit-atkobject"
 msgid "Value"
 msgstr "Gwerth"
 
-#: solverdlg.ui:664
+#: sc/uiconfig/scalc/ui/solverdlg.ui:656
 msgctxt "solverdlg|val3edit-atkobject"
 msgid "Value"
 msgstr "Gwerth"
 
-#: solverdlg.ui:683
+#: sc/uiconfig/scalc/ui/solverdlg.ui:674
 msgctxt "solverdlg|val4edit-atkobject"
 msgid "Value"
 msgstr "Gwerth"
 
-#: solverdlg.ui:742
+#: sc/uiconfig/scalc/ui/solverdlg.ui:733
 msgctxt "solverdlg|del2|tooltip_text"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: solverdlg.ui:755
+#: sc/uiconfig/scalc/ui/solverdlg.ui:746
 msgctxt "solverdlg|del1|tooltip_text"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: solverdlg.ui:768
+#: sc/uiconfig/scalc/ui/solverdlg.ui:759
 msgctxt "solverdlg|del3|tooltip_text"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: solverdlg.ui:781
+#: sc/uiconfig/scalc/ui/solverdlg.ui:772
 msgctxt "solverdlg|del4|tooltip_text"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: solverdlg.ui:809
+#: sc/uiconfig/scalc/ui/solverdlg.ui:800
 msgctxt "solverdlg|label1"
 msgid "Limiting Conditions"
 msgstr "Cyfyngu Cyflyrau"
 
-#: solveroptionsdialog.ui:8
+#: sc/uiconfig/scalc/ui/solveroptionsdialog.ui:8
 msgctxt "solveroptionsdialog|SolverOptionsDialog"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: solveroptionsdialog.ui:33
+#: sc/uiconfig/scalc/ui/solveroptionsdialog.ui:33
 msgctxt "solveroptionsdialog|label2"
 msgid "Solver engine:"
 msgstr "Peiriant datrys:"
 
-#: solveroptionsdialog.ui:70
+#: sc/uiconfig/scalc/ui/solveroptionsdialog.ui:70
 msgctxt "solveroptionsdialog|label1"
 msgid "Settings:"
 msgstr "Gosodiadau:"
 
-#: solveroptionsdialog.ui:96
+#: sc/uiconfig/scalc/ui/solveroptionsdialog.ui:96
 msgctxt "solveroptionsdialog|edit"
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: solverprogressdialog.ui:8
+#: sc/uiconfig/scalc/ui/solverprogressdialog.ui:8
 msgctxt "solverprogressdialog|SolverProgressDialog"
 msgid "Solving..."
 msgstr "Datrys..."
 
-#: solverprogressdialog.ui:26
+#: sc/uiconfig/scalc/ui/solverprogressdialog.ui:26
 msgctxt "solverprogressdialog|label2"
 msgid "Solving in progress..."
 msgstr "Wrthi'n datrys..."
 
-#: solverprogressdialog.ui:38
+#: sc/uiconfig/scalc/ui/solverprogressdialog.ui:38
 msgctxt "solverprogressdialog|progress"
 msgid "(time limit # seconds)"
 msgstr "(amser yn weddill # eiliad)"
 
-#: solversuccessdialog.ui:8
+#: sc/uiconfig/scalc/ui/solversuccessdialog.ui:8
 msgctxt "solversuccessdialog|SolverSuccessDialog"
 msgid "Solving Result"
 msgstr "Datrys y Canlyniad"
 
-#: solversuccessdialog.ui:26
+#: sc/uiconfig/scalc/ui/solversuccessdialog.ui:26
 msgctxt "solversuccessdialog|label1"
 msgid "Do you want to keep the result or do you want to restore previous values?"
 msgstr "Ydych am gadw'r canlyniad neu adfer y gwerthoedd blaenorol?"
 
-#: solversuccessdialog.ui:40
+#: sc/uiconfig/scalc/ui/solversuccessdialog.ui:40
 msgctxt "solversuccessdialog|label2"
 msgid "Solving successfully finished."
 msgstr "Cwblhau'r datrys yn llwyddiannus."
 
-#: solversuccessdialog.ui:52
+#: sc/uiconfig/scalc/ui/solversuccessdialog.ui:52
 msgctxt "solversuccessdialog|result"
 msgid "Result:"
 msgstr "Canlyniad:"
 
-#: solversuccessdialog.ui:72
+#: sc/uiconfig/scalc/ui/solversuccessdialog.ui:72
 msgctxt "solversuccessdialog|ok"
 msgid "Keep Result"
 msgstr "Cadw'r Canlyniad"
 
-#: solversuccessdialog.ui:88
+#: sc/uiconfig/scalc/ui/solversuccessdialog.ui:88
 msgctxt "solversuccessdialog|cancel"
 msgid "Restore Previous"
 msgstr "Adfer y Blaenorol"
 
-#: sortdialog.ui:8
+#: sc/uiconfig/scalc/ui/sortdialog.ui:8
 msgctxt "sortdialog|SortDialog"
 msgid "Sort"
 msgstr "Trefnu"
 
-#: sortdialog.ui:106
+#: sc/uiconfig/scalc/ui/sortdialog.ui:106
 msgctxt "sortdialog|criteria"
 msgid "Sort Criteria"
 msgstr "Maen Prawf Trefnu"
 
-#: sortdialog.ui:128
+#: sc/uiconfig/scalc/ui/sortdialog.ui:128
 msgctxt "sortdialog|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: sortkey.ui:38
+#: sc/uiconfig/scalc/ui/sortkey.ui:38
 msgctxt "sortkey|up"
 msgid "_Ascending"
 msgstr "_Esgyn"
 
-#: sortkey.ui:57
+#: sc/uiconfig/scalc/ui/sortkey.ui:57
 msgctxt "sortkey|down"
 msgid "_Descending"
 msgstr "_Gostyngol"
 
-#: sortkey.ui:81
+#: sc/uiconfig/scalc/ui/sortkey.ui:81
 msgctxt "sortkey|sortft"
 msgid "Sort Key "
 msgstr "Allwedd Didoli "
 
-#: sortoptionspage.ui:32
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:32
 msgctxt "sortoptionspage|case"
 msgid "Case _sensitive"
 msgstr "_Ymwybodol o lythrennau bach/mawr"
 
-#: sortoptionspage.ui:47
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:47
 msgctxt "sortoptionspage|header"
 msgid "Range contains..."
 msgstr "Ystod yn cynnwys..."
 
-#: sortoptionspage.ui:61
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:62
 msgctxt "sortoptionspage|formats"
 msgid "Include formats"
 msgstr "Cynnwys fformatau"
 
-#: sortoptionspage.ui:75
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:77
 msgctxt "sortoptionspage|naturalsort"
 msgid "Enable natural sort"
 msgstr "Galluogi didoli naturiol"
 
-#: sortoptionspage.ui:89
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:92
 msgctxt "sortoptionspage|includenotes"
-msgid "Include comments-only boundary column(s)"
-msgstr "Cynnwys colofn(au) ffin sylw'n unig"
+msgid "Include boundary column(s) containing only comments"
+msgstr "Cynnwys colofnau ffiniol sy'n cynnwys dim ond sylwadau"
 
-#: sortoptionspage.ui:103
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:107
+msgctxt "sortoptionspage|includeimages"
+msgid "Include boundary column(s) containing only images"
+msgstr "Cynnwys colofnau ffiniol sy'n cynnwys dim ond delweddau"
+
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:122
 msgctxt "sortoptionspage|copyresult"
 msgid "Copy sort results to:"
 msgstr "Copïo canlyniadau i:"
 
-#: sortoptionspage.ui:129
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:149
 msgctxt "sortoptionspage|outarealb-atkobject"
 msgid "Copy sort results to:"
 msgstr "Copïo canlyniadau trefnu i:"
 
-#: sortoptionspage.ui:149
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:168
 msgctxt "sortoptionspage|outareaed-atkobject"
 msgid "Copy sort results to:"
 msgstr "Copïo canlyniadau i:"
 
-#: sortoptionspage.ui:160
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:179
 msgctxt "sortoptionspage|sortuser"
 msgid "Custom sort order"
 msgstr "Trefn trefnu cyfaddas"
 
-#: sortoptionspage.ui:186
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:206
 msgctxt "sortoptionspage|sortuserlb-atkobject"
 msgid "Custom sort order"
 msgstr "Trefn trefnu cyfaddas"
 
-#: sortoptionspage.ui:201
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:221
 msgctxt "sortoptionspage|label6"
 msgid "Language"
 msgstr "Iaith"
 
-#: sortoptionspage.ui:215
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:235
 msgctxt "sortoptionspage|algorithmft"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: sortoptionspage.ui:270
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:296
 msgctxt "sortoptionspage|label2"
 msgid "Sort Options"
 msgstr "Dewisiadau Trefnu"
 
-#: sortoptionspage.ui:301
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:327
 msgctxt "sortoptionspage|topdown"
 msgid "_Top to bottom (sort rows)"
 msgstr "_Brig i'r gwaelod (trefnu rhesi)"
 
-#: sortoptionspage.ui:318
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:344
 msgctxt "sortoptionspage|leftright"
 msgid "L_eft to right (sort columns)"
 msgstr "_De i chwith (trefnu colofnau)"
 
-#: sortoptionspage.ui:340
+#: sc/uiconfig/scalc/ui/sortoptionspage.ui:366
 msgctxt "sortoptionspage|label1"
 msgid "Direction"
 msgstr "Cyfeiriad"
 
-#: sortwarning.ui:8
+#: sc/uiconfig/scalc/ui/sortwarning.ui:8
 msgctxt "sortwarning|SortWarning"
 msgid "Sort Range"
 msgstr "Ystod Trefnu"
 
-#: sortwarning.ui:35
+#: sc/uiconfig/scalc/ui/sortwarning.ui:35
 msgctxt "sortwarning|sorttext"
 msgid "The cells next to the current selection also contain data. Do you want to extend the sort range to %1, or sort the currently selected range, %2?"
 msgstr "Mae'r celloedd nesaf at y dewis cyfredol hefyd yn cynnwys data. Ydych chi am i ehangu'r ystod trefnu i%1, neu drefnu'r ystod %2?"
 
-#: sortwarning.ui:55
+#: sc/uiconfig/scalc/ui/sortwarning.ui:55
 msgctxt "sortwarning|extend"
 msgid "_Extend selection"
 msgstr "_Estyn y dewis"
 
-#: sortwarning.ui:71
+#: sc/uiconfig/scalc/ui/sortwarning.ui:71
 msgctxt "sortwarning|current"
 msgid "Current selection"
 msgstr "Dewis presennol"
 
-#: sortwarning.ui:115
+#: sc/uiconfig/scalc/ui/sortwarning.ui:115
 msgctxt "sortwarning|sorttip"
 msgid "Tip: The sort range can be detected automatically. Place the cell cursor inside a list and execute sort. The whole range of neighboring non-empty cells will then be sorted."
 msgstr "Cyngor: Mae modd canfod yr ystod trefnu yn awtomatig. Gosodwch y cyrchwr cell o fewn y rhestr a gweithredu trefnu. Bydd yr holl ystod gelloedd cyfagos nad ydynt yn wag yn cael eu trefnu."
 
-#: splitcolumnentry.ui:21
+#: sc/uiconfig/scalc/ui/splitcolumnentry.ui:21
 msgctxt "splitcolumnentry|name"
 msgid "Split Column Action"
 msgstr "Gweithred Colofn Hollt"
 
-#: splitcolumnentry.ui:37
+#: sc/uiconfig/scalc/ui/splitcolumnentry.ui:37
 msgctxt "splitcolumnentry|separator"
 msgid "Separator:"
 msgstr "Gwahanydd:"
 
-#: splitcolumnentry.ui:48
+#: sc/uiconfig/scalc/ui/splitcolumnentry.ui:48
 msgctxt "splitcolumnentry|max_num_columns"
 msgid "Maximum Number of Columns"
 msgstr "Uchafswm NIfer y Colofnau"
 
-#: standardfilterdialog.ui:9
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:9
 msgctxt "standardfilterdialog|StandardFilterDialog"
 msgid "Standard Filter"
 msgstr "Hidl Safonol"
 
-#: standardfilterdialog.ui:119
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:119
 msgctxt "standardfilterdialog|connect1"
 msgid "AND"
 msgstr "AND"
 
-#: standardfilterdialog.ui:120
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:120
 msgctxt "standardfilterdialog|connect1"
 msgid "OR"
 msgstr "OR"
 
-#: standardfilterdialog.ui:127
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:127
 msgctxt "standardfilterdialog|connect1-atkobject"
 msgid "Operator 1"
 msgstr "Gweithredwr 1"
 
-#: standardfilterdialog.ui:141
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:141
 msgctxt "standardfilterdialog|connect2"
 msgid "AND"
 msgstr "AND"
 
-#: standardfilterdialog.ui:142
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:142
 msgctxt "standardfilterdialog|connect2"
 msgid "OR"
 msgstr "OR"
 
-#: standardfilterdialog.ui:149
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:149
 msgctxt "standardfilterdialog|connect2-atkobject"
 msgid "Operator 2"
 msgstr "Gweithredwr 2"
 
-#: standardfilterdialog.ui:163
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:163
 msgctxt "standardfilterdialog|connect3"
 msgid "AND"
 msgstr "AND"
 
-#: standardfilterdialog.ui:164
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:164
 msgctxt "standardfilterdialog|connect3"
 msgid "OR"
 msgstr "OR"
 
-#: standardfilterdialog.ui:168
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:168
 msgctxt "standardfilterdialog|connect3-atkobject"
 msgid "Operator 3"
 msgstr "Gweithredwr 3"
 
-#: standardfilterdialog.ui:182
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:182
 msgctxt "standardfilterdialog|connect4"
 msgid "AND"
 msgstr "AND"
 
-#: standardfilterdialog.ui:183
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:183
 msgctxt "standardfilterdialog|connect4"
 msgid "OR"
 msgstr "OR"
 
-#: standardfilterdialog.ui:187
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:187
 msgctxt "standardfilterdialog|connect4-atkobject"
 msgid "Operator 4"
 msgstr "Gweithredwr 4"
 
-#: standardfilterdialog.ui:200
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:200
 msgctxt "standardfilterdialog|label2"
 msgid "Operator"
 msgstr "Gweithredydd"
 
-#: standardfilterdialog.ui:211
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:211
 msgctxt "standardfilterdialog|label3"
 msgid "Field name"
 msgstr "Enw maes"
 
-#: standardfilterdialog.ui:222
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:222
 msgctxt "standardfilterdialog|label4"
 msgid "Condition"
 msgstr "Cyflwr"
 
-#: standardfilterdialog.ui:233
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:233
 msgctxt "standardfilterdialog|label5"
 msgid "Value"
 msgstr "Gwerth"
 
-#: standardfilterdialog.ui:249
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:249
 msgctxt "standardfilterdialog|field1-atkobject"
 msgid "Field Name 1"
 msgstr "Enw Maes 1"
 
-#: standardfilterdialog.ui:267
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:267
 msgctxt "standardfilterdialog|field2-atkobject"
 msgid "Field Name 2"
 msgstr "Enw Maes 2"
 
-#: standardfilterdialog.ui:285
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:285
 msgctxt "standardfilterdialog|field3-atkobject"
 msgid "Field Name 3"
 msgstr "Gweithredwr 3"
 
-#: standardfilterdialog.ui:300
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:300
 msgctxt "standardfilterdialog|field4-atkobject"
 msgid "Field Name 4"
 msgstr "Gweithredwr 4"
 
-#: standardfilterdialog.ui:320
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:320
 msgctxt "standardfilterdialog|cond1"
 msgid "Largest"
 msgstr "Mwyaf"
 
-#: standardfilterdialog.ui:321
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:321
 msgctxt "standardfilterdialog|cond1"
 msgid "Smallest"
 msgstr "Lleiaf"
 
-#: standardfilterdialog.ui:322
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:322
 msgctxt "standardfilterdialog|cond1"
 msgid "Largest %"
 msgstr "% Mwyaf"
 
-#: standardfilterdialog.ui:323
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:323
 msgctxt "standardfilterdialog|cond1"
 msgid "Smallest %"
 msgstr "% Lleiaf"
 
-#: standardfilterdialog.ui:324
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:324
 msgctxt "standardfilterdialog|cond1"
 msgid "Contains"
 msgstr "Yn cynnwys"
 
-#: standardfilterdialog.ui:325
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:325
 msgctxt "standardfilterdialog|cond1"
 msgid "Does not contain"
 msgstr "Nid yw'n cynnwys"
 
-#: standardfilterdialog.ui:326
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:326
 msgctxt "standardfilterdialog|cond1"
 msgid "Begins with"
 msgstr "Cychwyn gyda"
 
-#: standardfilterdialog.ui:327
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:327
 msgctxt "standardfilterdialog|cond1"
 msgid "Does not begin with"
 msgstr "Ddim yn cychwyn gyda"
 
-#: standardfilterdialog.ui:328
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:328
 msgctxt "standardfilterdialog|cond1"
 msgid "Ends with"
 msgstr "Gorffen gyda"
 
-#: standardfilterdialog.ui:329
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:329
 msgctxt "standardfilterdialog|cond1"
 msgid "Does not end with"
 msgstr "Ddim yn gorffen gyda"
 
-#: standardfilterdialog.ui:336
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:336
 msgctxt "standardfilterdialog|cond1-atkobject"
 msgid "Condition 1"
 msgstr "Amod 1"
 
-#: standardfilterdialog.ui:356
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:356
 msgctxt "standardfilterdialog|cond2"
 msgid "Largest"
 msgstr "Mwyaf"
 
-#: standardfilterdialog.ui:357
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:357
 msgctxt "standardfilterdialog|cond2"
 msgid "Smallest"
 msgstr "Lleiaf"
 
-#: standardfilterdialog.ui:358
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:358
 msgctxt "standardfilterdialog|cond2"
 msgid "Largest %"
 msgstr "% Mwyaf"
 
-#: standardfilterdialog.ui:359
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:359
 msgctxt "standardfilterdialog|cond2"
 msgid "Smallest %"
 msgstr "% Lleiaf"
 
-#: standardfilterdialog.ui:360
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:360
 msgctxt "standardfilterdialog|cond2"
 msgid "Contains"
 msgstr "Cynnwys"
 
-#: standardfilterdialog.ui:361
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:361
 msgctxt "standardfilterdialog|cond2"
 msgid "Does not contain"
 msgstr "Nid yw'n cynnwys"
 
-#: standardfilterdialog.ui:362
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:362
 msgctxt "standardfilterdialog|cond2"
 msgid "Begins with"
 msgstr "Cychwyn gyda"
 
-#: standardfilterdialog.ui:363
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:363
 msgctxt "standardfilterdialog|cond2"
 msgid "Does not begin with"
 msgstr "Ddim yn cychwyn gyda"
 
-#: standardfilterdialog.ui:364
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:364
 msgctxt "standardfilterdialog|cond2"
 msgid "Ends with"
 msgstr "Gorffen gyda"
 
-#: standardfilterdialog.ui:365
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:365
 msgctxt "standardfilterdialog|cond2"
 msgid "Does not end with"
 msgstr "Ddim yn gorffen gyda"
 
-#: standardfilterdialog.ui:372
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:372
 msgctxt "standardfilterdialog|cond2-atkobject"
 msgid "Condition 2"
 msgstr "Cyflwr 2"
 
-#: standardfilterdialog.ui:392
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:392
 msgctxt "standardfilterdialog|cond3"
 msgid "Largest"
 msgstr "Mwyaf"
 
-#: standardfilterdialog.ui:393
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:393
 msgctxt "standardfilterdialog|cond3"
 msgid "Smallest"
 msgstr "Lleiaf"
 
-#: standardfilterdialog.ui:394
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:394
 msgctxt "standardfilterdialog|cond3"
 msgid "Largest %"
 msgstr "% Mwyaf"
 
-#: standardfilterdialog.ui:395
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:395
 msgctxt "standardfilterdialog|cond3"
 msgid "Smallest %"
 msgstr "% Lleiaf"
 
-#: standardfilterdialog.ui:396
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:396
 msgctxt "standardfilterdialog|cond3"
 msgid "Contains"
 msgstr "Cynnwys"
 
-#: standardfilterdialog.ui:397
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:397
 msgctxt "standardfilterdialog|cond3"
 msgid "Does not contain"
 msgstr "Nid yw'n cynnwys"
 
-#: standardfilterdialog.ui:398
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:398
 msgctxt "standardfilterdialog|cond3"
 msgid "Begins with"
 msgstr "Cychwyn gyda"
 
-#: standardfilterdialog.ui:399
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:399
 msgctxt "standardfilterdialog|cond3"
 msgid "Does not begin with"
 msgstr "Ddim yn cychwyn gyda"
 
-#: standardfilterdialog.ui:400
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:400
 msgctxt "standardfilterdialog|cond3"
 msgid "Ends with"
 msgstr "Gorffen gyda"
 
-#: standardfilterdialog.ui:401
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:401
 msgctxt "standardfilterdialog|cond3"
 msgid "Does not end with"
 msgstr "Ddim yn gorffen gyda"
 
-#: standardfilterdialog.ui:408
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:408
 msgctxt "standardfilterdialog|cond3-atkobject"
 msgid "Condition 3"
 msgstr "Amod 3"
 
-#: standardfilterdialog.ui:428
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:428
 msgctxt "standardfilterdialog|cond4"
 msgid "Largest"
 msgstr "Mwyaf"
 
-#: standardfilterdialog.ui:429
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:429
 msgctxt "standardfilterdialog|cond4"
 msgid "Smallest"
 msgstr "Lleiaf"
 
-#: standardfilterdialog.ui:430
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:430
 msgctxt "standardfilterdialog|cond4"
 msgid "Largest %"
 msgstr "% Mwyaf"
 
-#: standardfilterdialog.ui:431
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:431
 msgctxt "standardfilterdialog|cond4"
 msgid "Smallest %"
 msgstr "% Lleiaf"
 
-#: standardfilterdialog.ui:432
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:432
 msgctxt "standardfilterdialog|cond4"
 msgid "Contains"
 msgstr "Cynnwys"
 
-#: standardfilterdialog.ui:433
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:433
 msgctxt "standardfilterdialog|cond4"
 msgid "Does not contain"
 msgstr "Nid yw'n cynnwys"
 
-#: standardfilterdialog.ui:434
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:434
 msgctxt "standardfilterdialog|cond4"
 msgid "Begins with"
 msgstr "Cychwyn gyda"
 
-#: standardfilterdialog.ui:435
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:435
 msgctxt "standardfilterdialog|cond4"
 msgid "Does not begin with"
 msgstr "Ddim yn cychwyn gyda"
 
-#: standardfilterdialog.ui:436
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:436
 msgctxt "standardfilterdialog|cond4"
 msgid "Ends with"
 msgstr "Gorffen gyda"
 
-#: standardfilterdialog.ui:437
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:437
 msgctxt "standardfilterdialog|cond4"
 msgid "Does not end with"
 msgstr "Ddim yn gorffen gyda"
 
-#: standardfilterdialog.ui:441
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:441
 msgctxt "standardfilterdialog|cond4-atkobject"
 msgid "Condition 4"
 msgstr "Amod 4"
 
-#: standardfilterdialog.ui:466
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:466
 msgctxt "standardfilterdialog|val1-atkobject"
 msgid "Value 1"
 msgstr "Gwerth 1"
 
-#: standardfilterdialog.ui:491
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:491
 msgctxt "standardfilterdialog|val2-atkobject"
 msgid "Value 2"
 msgstr "Gwerth 2"
 
-#: standardfilterdialog.ui:516
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:516
 msgctxt "standardfilterdialog|val3-atkobject"
 msgid "Value 3"
 msgstr "Gwerth 3"
 
-#: standardfilterdialog.ui:538
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:538
 msgctxt "standardfilterdialog|val4-atkobject"
 msgid "Value 4"
 msgstr "Gwerth 4"
 
-#: standardfilterdialog.ui:555
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:555
 msgctxt "standardfilterdialog|label1"
 msgid "Filter Criteria"
 msgstr "Maen Prawf Hidl"
 
-#: standardfilterdialog.ui:593
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:593
 msgctxt "standardfilterdialog|case"
 msgid "_Case sensitive"
 msgstr "Llythyren _fach neu FAWR"
 
-#: standardfilterdialog.ui:609
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:609
 msgctxt "standardfilterdialog|header"
 msgid "Range c_ontains column labels"
 msgstr "_Ystod yn cynnwys labeli colofn"
 
-#: standardfilterdialog.ui:625
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:625
 msgctxt "standardfilterdialog|regexp"
 msgid "Regular _expressions"
 msgstr "Mynegiad _arferol"
 
-#: standardfilterdialog.ui:641
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:641
 msgctxt "standardfilterdialog|unique"
 msgid "_No duplications"
 msgstr "_Dim dyblygu"
 
-#: standardfilterdialog.ui:657
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:657
 msgctxt "standardfilterdialog|copyresult"
 msgid "Co_py results to:"
 msgstr "Copïo c­_anlyniadau i:"
 
-#: standardfilterdialog.ui:677
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:677
 msgctxt "standardfilterdialog|destpers"
 msgid "_Keep filter criteria"
 msgstr "C_adw meini prawf hidlo"
 
-#: standardfilterdialog.ui:713
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:713
 msgctxt "standardfilterdialog|lbcopyarea-atkobject"
 msgid "Copy results to"
 msgstr "Copïo canlyniadau i"
 
-#: standardfilterdialog.ui:735
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:734
 msgctxt "standardfilterdialog|edcopyarea-atkobject"
 msgid "Copy results to"
 msgstr "Copïo canlyniadau i"
 
-#: standardfilterdialog.ui:773
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:772
 msgctxt "standardfilterdialog|dbarealabel"
 msgid "Data range:"
 msgstr "Ystod data:"
 
-#: standardfilterdialog.ui:786
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:785
 msgctxt "standardfilterdialog|dbarea"
 msgid "dummy"
 msgstr "dymi"
 
-#: standardfilterdialog.ui:806
+#: sc/uiconfig/scalc/ui/standardfilterdialog.ui:805
 msgctxt "standardfilterdialog|label6"
 msgid "Op_tions"
 msgstr "_Dewisiadau"
 
-#: statisticsinfopage.ui:27
+#: sc/uiconfig/scalc/ui/statisticsinfopage.ui:27
 msgctxt "statisticsinfopage|label6"
 msgid "Pages:"
 msgstr "Tudalennau:"
 
-#: statisticsinfopage.ui:53
+#: sc/uiconfig/scalc/ui/statisticsinfopage.ui:53
 msgctxt "statisticsinfopage|label5"
 msgid "Cells:"
 msgstr "Celloedd:"
 
-#: statisticsinfopage.ui:79
+#: sc/uiconfig/scalc/ui/statisticsinfopage.ui:79
 msgctxt "statisticsinfopage|label2"
 msgid "Sheets:"
 msgstr "Dalenni:"
 
-#: statisticsinfopage.ui:106
+#: sc/uiconfig/scalc/ui/statisticsinfopage.ui:106
 msgctxt "statisticsinfopage|label3"
 msgid "Formula groups:"
 msgstr "Grwpiau fformiwlâu:"
 
-#: statisticsinfopage.ui:136
+#: sc/uiconfig/scalc/ui/statisticsinfopage.ui:136
 msgctxt "statisticsinfopage|label1"
 msgid "Document: "
 msgstr "Dogfen: "
 
-#: subtotaldialog.ui:8
+#: sc/uiconfig/scalc/ui/subtotaldialog.ui:8
 msgctxt "subtotaldialog|SubTotalDialog"
 msgid "Subtotals"
 msgstr "Is gyfansymiau"
 
-#: subtotaldialog.ui:121
+#: sc/uiconfig/scalc/ui/subtotaldialog.ui:121
 msgctxt "subtotaldialog|1stgroup"
 msgid "1st Group"
 msgstr "Grŵp 1af"
 
-#: subtotaldialog.ui:143
+#: sc/uiconfig/scalc/ui/subtotaldialog.ui:143
 msgctxt "subtotaldialog|2ndgroup"
 msgid "2nd Group"
 msgstr "Grŵp 2il"
 
-#: subtotaldialog.ui:166
+#: sc/uiconfig/scalc/ui/subtotaldialog.ui:166
 msgctxt "subtotaldialog|3rdgroup"
 msgid "3rd Group"
 msgstr "Grŵp 3ydd"
 
-#: subtotaldialog.ui:189
+#: sc/uiconfig/scalc/ui/subtotaldialog.ui:189
 msgctxt "subtotaldialog|options"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: subtotalgrppage.ui:12
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:12
 msgctxt "subtotalgrppage|liststore1"
 msgid "Sum"
 msgstr "Swm"
 
-#: subtotalgrppage.ui:15
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:15
 msgctxt "subtotalgrppage|liststore1"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: subtotalgrppage.ui:18
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:18
 msgctxt "subtotalgrppage|liststore1"
 msgid "Average"
 msgstr "Cyfartaledd"
 
-#: subtotalgrppage.ui:21
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:21
 msgctxt "subtotalgrppage|liststore1"
 msgid "Max"
 msgstr "Mwyaf"
 
-#: subtotalgrppage.ui:24
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:24
 msgctxt "subtotalgrppage|liststore1"
 msgid "Min"
 msgstr "Lleiaf"
 
-#: subtotalgrppage.ui:27
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:27
 msgctxt "subtotalgrppage|liststore1"
 msgid "Product"
 msgstr "Cynnyrch"
 
-#: subtotalgrppage.ui:30
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:30
 msgctxt "subtotalgrppage|liststore1"
 msgid "Count (numbers only)"
 msgstr "Cyfrif (rhifau'n unig)"
 
-#: subtotalgrppage.ui:33
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:33
 msgctxt "subtotalgrppage|liststore1"
 msgid "StDev (Sample)"
 msgstr "StDev (Sampl)"
 
-#: subtotalgrppage.ui:36
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:36
 msgctxt "subtotalgrppage|liststore1"
 msgid "StDevP (Population)"
 msgstr "StDevP (Poblogaeth)"
 
-#: subtotalgrppage.ui:39
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:39
 msgctxt "subtotalgrppage|liststore1"
 msgid "Var (Sample)"
 msgstr "Var (Sampl)"
 
-#: subtotalgrppage.ui:42
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:42
 msgctxt "subtotalgrppage|liststore1"
 msgid "VarP (Population)"
 msgstr "VarP (Poblogaeth)"
 
-#: subtotalgrppage.ui:62
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:62
 msgctxt "subtotalgrppage|label1"
 msgid "Group by:"
 msgstr "Grwpio yn ôl:"
 
-#: subtotalgrppage.ui:103
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:103
 msgctxt "subtotalgrppage|label2"
 msgid "Calculate subtotals for:"
 msgstr "Cyfrifo is gyfansymiau ar gyfer:"
 
-#: subtotalgrppage.ui:119
+#: sc/uiconfig/scalc/ui/subtotalgrppage.ui:119
 msgctxt "subtotalgrppage|label3"
 msgid "Use function:"
 msgstr "Defnyddio swyddogaeth:"
 
-#: subtotaloptionspage.ui:35
+#: sc/uiconfig/scalc/ui/subtotaloptionspage.ui:35
 msgctxt "subtotaloptionspage|pagebreak"
 msgid "_Page break between groups"
 msgstr "_Toriad tudalen rhwng grwpiau"
 
-#: subtotaloptionspage.ui:53
+#: sc/uiconfig/scalc/ui/subtotaloptionspage.ui:53
 msgctxt "subtotaloptionspage|case"
 msgid "_Case sensitive"
 msgstr "Ll_ythyren fach neu FAWR"
 
-#: subtotaloptionspage.ui:71
+#: sc/uiconfig/scalc/ui/subtotaloptionspage.ui:71
 msgctxt "subtotaloptionspage|sort"
 msgid "Pre-_sort area according to groups"
 msgstr "R_hagdrefnu ardal yn ôl grwpiau"
 
-#: subtotaloptionspage.ui:95
+#: sc/uiconfig/scalc/ui/subtotaloptionspage.ui:95
 msgctxt "subtotaloptionspage|label1"
 msgid "Groups"
 msgstr "Grwpiau"
 
-#: subtotaloptionspage.ui:133
+#: sc/uiconfig/scalc/ui/subtotaloptionspage.ui:133
 msgctxt "subtotaloptionspage|ascending"
 msgid "_Ascending"
 msgstr "_Esgyn"
 
-#: subtotaloptionspage.ui:153
+#: sc/uiconfig/scalc/ui/subtotaloptionspage.ui:153
 msgctxt "subtotaloptionspage|descending"
 msgid "D_escending"
 msgstr "_Gostwng"
 
-#: subtotaloptionspage.ui:173
+#: sc/uiconfig/scalc/ui/subtotaloptionspage.ui:173
 msgctxt "subtotaloptionspage|formats"
 msgid "I_nclude formats"
 msgstr "C_ynnwys fformatau"
 
-#: subtotaloptionspage.ui:191
+#: sc/uiconfig/scalc/ui/subtotaloptionspage.ui:191
 msgctxt "subtotaloptionspage|btnuserdef"
 msgid "C_ustom sort order"
 msgstr "Trefn trefnu c_yfaddas"
 
-#: subtotaloptionspage.ui:237
+#: sc/uiconfig/scalc/ui/subtotaloptionspage.ui:237
 msgctxt "subtotaloptionspage|label2"
 msgid "Sort"
 msgstr "Trefnu"
 
-#: textimportcsv.ui:16
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:16
 msgctxt "textimportcsv|TextImportCsvDialog"
 msgid "Text Import"
 msgstr "Mewnforio testun"
 
-#: textimportcsv.ui:110
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:110
 msgctxt "textimportcsv|textcharset"
 msgid "Ch_aracter set:"
 msgstr "_Set nod:"
 
-#: textimportcsv.ui:124
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:124
 msgctxt "textimportcsv|textlanguage"
 msgid "_Language:"
 msgstr "_Iaith:"
 
-#: textimportcsv.ui:138
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:138
 msgctxt "textimportcsv|textfromrow"
 msgid "From ro_w:"
 msgstr "_O res:"
 
-#: textimportcsv.ui:189
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:188
 msgctxt "textimportcsv|label1"
 msgid "Import"
 msgstr "Mewnforio"
 
-#: textimportcsv.ui:231
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:230
 msgctxt "textimportcsv|tofixedwidth"
 msgid "_Fixed width"
 msgstr "_Lled osodedig"
 
-#: textimportcsv.ui:248
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:247
 msgctxt "textimportcsv|toseparatedby"
 msgid "_Separated by"
 msgstr "_Ymwahannwyd gan"
 
-#: textimportcsv.ui:286
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:285
 msgctxt "textimportcsv|tab"
 msgid "_Tab"
 msgstr "_Tab"
 
-#: textimportcsv.ui:302
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:301
 msgctxt "textimportcsv|mergedelimiters"
 msgid "Merge _delimiters"
 msgstr "Cyfuno _dadamffinwyr"
 
-#: textimportcsv.ui:320
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:319
+msgctxt "textimportcsv|removespace"
+msgid "Tr_im spaces"
+msgstr "_Tocio bylchau"
+
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:337
 msgctxt "textimportcsv|comma"
 msgid "_Comma"
 msgstr "_Coma"
 
-#: textimportcsv.ui:336
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:353
 msgctxt "textimportcsv|semicolon"
 msgid "S_emicolon"
 msgstr "_Hanner colon"
 
-#: textimportcsv.ui:352
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:369
 msgctxt "textimportcsv|space"
 msgid "S_pace"
 msgstr "_Bwlch"
 
-#: textimportcsv.ui:374
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:391
 msgctxt "textimportcsv|other"
 msgid "Othe_r"
 msgstr "_Arall"
 
-#: textimportcsv.ui:403
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:419
 msgctxt "textimportcsv|inputother-atkobject"
 msgid "Other"
 msgstr "Arall"
 
-#: textimportcsv.ui:428
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:444
 msgctxt "textimportcsv|texttextdelimiter"
 msgid "Strin_g delimiter:"
 msgstr "Amffinydd l_linyn:"
 
-#: textimportcsv.ui:479
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:494
 msgctxt "textimportcsv|separatoroptions"
 msgid "Separator Options"
 msgstr "Dewisiadau Ymwahanydd"
 
-#: textimportcsv.ui:513
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:528
 msgctxt "textimportcsv|quotedfieldastext"
 msgid "F_ormat quoted field as text"
 msgstr "_Fformatio testun dyfynedig fel testun"
 
-#: textimportcsv.ui:529
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:544
 msgctxt "textimportcsv|detectspecialnumbers"
 msgid "Detect special _numbers"
 msgstr "Canfod rhifau _arbennig"
 
-#: textimportcsv.ui:551
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:560
+msgctxt "textimportcsv|skipemptycells"
+msgid "S_kip empty cells"
+msgstr "_Hepgor celloedd gwag"
+
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:564
+msgctxt "textimportcsv|skipemptycells"
+msgid "If enabled, blank cells in source will not override the target."
+msgstr "Os wedi ei alluogi, ni fydd celloedd gwag yn y ffynhonnell yn gwrthwneud y targed."
+
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:583
 msgctxt "textimportcsv|label3"
 msgid "Other Options"
 msgstr "Dewisiadau Eraill"
 
-#: textimportcsv.ui:593
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:625
 msgctxt "textimportcsv|textcolumntype"
 msgid "Column t_ype:"
 msgstr "_Math colofn:"
 
-#: textimportcsv.ui:638
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:670
 msgctxt "textimportcsv|textalttitle"
 msgid "Text to Columns"
 msgstr "Testun i Golofnau"
 
-#: textimportcsv.ui:654
+#: sc/uiconfig/scalc/ui/textimportcsv.ui:686
 msgctxt "textimportcsv|label4"
 msgid "Fields"
 msgstr "Meysydd"
 
-#: textimportoptions.ui:9
+#: sc/uiconfig/scalc/ui/textimportoptions.ui:9
 msgctxt "textimportoptions|TextImportOptionsDialog"
 msgid "Import Options"
 msgstr "Dewisiadau Mewnforio"
 
-#: textimportoptions.ui:98
+#: sc/uiconfig/scalc/ui/textimportoptions.ui:98
 msgctxt "textimportoptions|custom"
 msgid "Custom:"
 msgstr "Cyfaddas:"
 
-#: textimportoptions.ui:113
+#: sc/uiconfig/scalc/ui/textimportoptions.ui:114
 msgctxt "textimportoptions|automatic"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: textimportoptions.ui:145
+#: sc/uiconfig/scalc/ui/textimportoptions.ui:147
 msgctxt "textimportoptions|label2"
 msgid "Select the Language to Use for Import"
 msgstr "Dewis yr Iaith i'w Defnyddio ar gyfer Mewnforio"
 
-#: textimportoptions.ui:172
+#: sc/uiconfig/scalc/ui/textimportoptions.ui:174
 msgctxt "textimportoptions|convertdata"
 msgid "Detect special numbers (such as dates)"
 msgstr "Canfod rhifau arbennig (megis dyddiadau)"
 
-#: textimportoptions.ui:186
+#: sc/uiconfig/scalc/ui/textimportoptions.ui:189
 msgctxt "textimportoptions|label3"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: tpviewpage.ui:37
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:37
 msgctxt "tpviewpage|formula"
 msgid "_Formulas"
 msgstr "_Fformiwlâu"
 
-#: tpviewpage.ui:54
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:54
 msgctxt "tpviewpage|nil"
 msgid "Zero val_ues"
 msgstr "Gwerthoedd _sero"
 
-#: tpviewpage.ui:71
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:71
 msgctxt "tpviewpage|annot"
 msgid "_Comment indicator"
 msgstr "_Dangosydd sylw"
 
-#: tpviewpage.ui:88
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:88
 msgctxt "tpviewpage|value"
 msgid "Value h_ighlighting"
 msgstr "_Amlygu gwerth"
 
-#: tpviewpage.ui:105
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:105
 msgctxt "tpviewpage|anchor"
 msgid "_Anchor"
 msgstr "_Angor"
 
-#: tpviewpage.ui:122
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:122
 msgctxt "tpviewpage|clipmark"
 msgid "Te_xt overflow"
 msgstr "_Gorlif testun"
 
-#: tpviewpage.ui:139
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:139
 msgctxt "tpviewpage|rangefind"
 msgid "_Show references in color"
 msgstr "_Dangos cyfeiriadau mewn lliw"
 
-#: tpviewpage.ui:162
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:162
 msgctxt "tpviewpage|label4"
 msgid "Display"
 msgstr "Dangos"
 
-#: tpviewpage.ui:198
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:198
 msgctxt "tpviewpage|rowcolheader"
 msgid "Colu_mn/row headers"
 msgstr "_Penynnau colofn/rhes"
 
-#: tpviewpage.ui:215
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:215
 msgctxt "tpviewpage|hscroll"
 msgid "Hori_zontal scroll bar"
 msgstr "Bar sgrolio _llorweddol"
 
-#: tpviewpage.ui:232
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:232
 msgctxt "tpviewpage|vscroll"
 msgid "_Vertical scroll bar"
 msgstr "Bar sgrolio _fertigol"
 
-#: tpviewpage.ui:249
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:249
 msgctxt "tpviewpage|tblreg"
 msgid "Sh_eet tabs"
 msgstr "_Tabiau dalen"
 
-#: tpviewpage.ui:266
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:266
 msgctxt "tpviewpage|outline"
 msgid "_Outline symbols"
 msgstr "_Symbolau amlinell"
 
-#: tpviewpage.ui:289
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:289
 msgctxt "tpviewpage|label5"
 msgid "Window"
 msgstr "Ffenestr"
 
-#: tpviewpage.ui:365
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:365
 msgctxt "tpviewpage|grid_label"
 msgid "_Grid lines:"
 msgstr "_Llinellau grid:"
 
-#: tpviewpage.ui:382
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:382
 msgctxt "tpviewpage|color_label"
 msgid "_Color:"
 msgstr "_Lliw:"
 
-#: tpviewpage.ui:399
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:399
 msgctxt "tpviewpage|grid"
 msgid "Show"
 msgstr "Dangos"
 
-#: tpviewpage.ui:400
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:400
 msgctxt "tpviewpage|grid"
 msgid "Show on colored cells"
 msgstr "Dangos ar gelloedd lliw"
 
-#: tpviewpage.ui:401
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:401
 msgctxt "tpviewpage|grid"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: tpviewpage.ui:421
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:421
 msgctxt "tpviewpage|break"
 msgid "_Page breaks"
 msgstr "_Toriad tudalen"
 
-#: tpviewpage.ui:438
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:438
 msgctxt "tpviewpage|guideline"
 msgid "Helplines _while moving"
 msgstr "Llinellau cymorth _wrth symud"
 
-#: tpviewpage.ui:461
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:461
 msgctxt "tpviewpage|label1"
 msgid "Visual Aids"
 msgstr "Cymhorthion Gweledol"
 
-#: tpviewpage.ui:500
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:500
 msgctxt "tpviewpage|objgrf_label"
 msgid "Ob_jects/Images:"
 msgstr "G_wrthrychau/Delweddau:"
 
-#: tpviewpage.ui:516
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:516
 msgctxt "tpviewpage|diagram_label"
 msgid "Cha_rts:"
 msgstr "_Siartiau:"
 
-#: tpviewpage.ui:532
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:532
 msgctxt "tpviewpage|draw_label"
 msgid "_Drawing objects:"
 msgstr "G_wrthrychau lluniadu:"
 
-#: tpviewpage.ui:548
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:548
 msgctxt "tpviewpage|objgrf"
 msgid "Show"
 msgstr "Dangos"
 
-#: tpviewpage.ui:549
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:549
 msgctxt "tpviewpage|objgrf"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: tpviewpage.ui:564
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:564
 msgctxt "tpviewpage|diagram"
 msgid "Show"
 msgstr "Dangos"
 
-#: tpviewpage.ui:565
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:565
 msgctxt "tpviewpage|diagram"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: tpviewpage.ui:580
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:580
 msgctxt "tpviewpage|draw"
 msgid "Show"
 msgstr "Dangos"
 
-#: tpviewpage.ui:581
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:581
 msgctxt "tpviewpage|draw"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: tpviewpage.ui:599
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:599
 msgctxt "tpviewpage|label2"
 msgid "Objects"
 msgstr "Gwrthrychau"
 
-#: tpviewpage.ui:629
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:629
 msgctxt "tpviewpage|synczoom"
 msgid "S_ynchronize sheets"
 msgstr "_Cydweddu dalennau"
 
-#: tpviewpage.ui:644
+#: sc/uiconfig/scalc/ui/tpviewpage.ui:644
 msgctxt "tpviewpage|label3"
 msgid "Zoom"
 msgstr "Chwyddo"
 
-#: ttestdialog.ui:40
+#: sc/uiconfig/scalc/ui/ttestdialog.ui:40
 msgctxt "ttestdialog|variable1-range-label"
 msgid "Variable 1 range:"
 msgstr "Ystod Amrywiolyn 1:"
 
-#: ttestdialog.ui:79
+#: sc/uiconfig/scalc/ui/ttestdialog.ui:78
 msgctxt "ttestdialog|variable2-range-label"
 msgid "Variable 2 range:"
 msgstr "Ystod Amrywiolyn 2:"
 
-#: ttestdialog.ui:118
+#: sc/uiconfig/scalc/ui/ttestdialog.ui:116
 msgctxt "ttestdialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniad i:"
 
-#: ttestdialog.ui:160
+#: sc/uiconfig/scalc/ui/ttestdialog.ui:157
 msgctxt "ttestdialog|label1"
 msgid "Data"
 msgstr "Data"
 
-#: ttestdialog.ui:254
+#: sc/uiconfig/scalc/ui/ttestdialog.ui:251
 msgctxt "ttestdialog|groupedby-columns-radio"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: ttestdialog.ui:270
+#: sc/uiconfig/scalc/ui/ttestdialog.ui:267
 msgctxt "ttestdialog|groupedby-rows-radio"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: ttestdialog.ui:292
+#: sc/uiconfig/scalc/ui/ttestdialog.ui:289
 msgctxt "ttestdialog|label2"
 msgid "Grouped by"
 msgstr "Grwpiwyd yn ôl"
 
-#: ungroupdialog.ui:8
+#: sc/uiconfig/scalc/ui/ungroupdialog.ui:8
 msgctxt "ungroupdialog|UngroupDialog"
 msgid "Ungroup"
 msgstr "Dad-grwpio"
 
-#: ungroupdialog.ui:98
+#: sc/uiconfig/scalc/ui/ungroupdialog.ui:98
 msgctxt "ungroupdialog|rows"
 msgid "_Rows"
 msgstr "_Rhesi"
 
-#: ungroupdialog.ui:116
+#: sc/uiconfig/scalc/ui/ungroupdialog.ui:116
 msgctxt "ungroupdialog|cols"
 msgid "_Columns"
 msgstr "_Colofnau"
 
-#: ungroupdialog.ui:141
+#: sc/uiconfig/scalc/ui/ungroupdialog.ui:141
 msgctxt "ungroupdialog|includeLabel"
 msgid "Deactivate for"
 msgstr "Dadweithredu ar gyfer"
 
-#: validationcriteriapage.ui:15
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:15
 msgctxt "validationcriteriapage|liststore1"
 msgid "All values"
 msgstr "Pob gwerth"
 
-#: validationcriteriapage.ui:19
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:19
 msgctxt "validationcriteriapage|liststore1"
 msgid "Whole Numbers"
 msgstr "Rhifau Cyfan"
 
-#: validationcriteriapage.ui:23
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:23
 msgctxt "validationcriteriapage|liststore1"
 msgid "Decimal"
 msgstr "Degol"
 
-#: validationcriteriapage.ui:27
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:27
 msgctxt "validationcriteriapage|liststore1"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: validationcriteriapage.ui:31
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:31
 msgctxt "validationcriteriapage|liststore1"
 msgid "Time"
 msgstr "Amser"
 
-#: validationcriteriapage.ui:35
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:35
 msgctxt "validationcriteriapage|liststore1"
 msgid "Cell range"
 msgstr "Ystod celloedd"
 
-#: validationcriteriapage.ui:39
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:39
 msgctxt "validationcriteriapage|liststore1"
 msgid "List"
 msgstr "Rhestr"
 
-#: validationcriteriapage.ui:43
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:43
 msgctxt "validationcriteriapage|liststore1"
 msgid "Text length"
 msgstr "Hyd testun"
 
-#: validationcriteriapage.ui:57
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:57
 msgctxt "validationcriteriapage|liststore2"
 msgid "equal"
 msgstr "cydradd"
 
-#: validationcriteriapage.ui:61
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:61
 msgctxt "validationcriteriapage|liststore2"
 msgid "less than"
 msgstr "yn llai na"
 
-#: validationcriteriapage.ui:65
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:65
 msgctxt "validationcriteriapage|liststore2"
 msgid "greater than"
 msgstr "yn fwy na"
 
-#: validationcriteriapage.ui:69
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:69
 msgctxt "validationcriteriapage|liststore2"
 msgid "less than or equal"
 msgstr "llai na neu gyfartal â"
 
-#: validationcriteriapage.ui:73
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:73
 msgctxt "validationcriteriapage|liststore2"
 msgid "greater than or equal to"
 msgstr "mwy na neu gydradd"
 
-#: validationcriteriapage.ui:77
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:77
 msgctxt "validationcriteriapage|liststore2"
 msgid "not equal"
 msgstr "nid cydradd a"
 
-#: validationcriteriapage.ui:81
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:81
 msgctxt "validationcriteriapage|liststore2"
 msgid "valid range"
 msgstr "ystod dilys"
 
-#: validationcriteriapage.ui:85
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:85
 msgctxt "validationcriteriapage|liststore2"
 msgid "invalid range"
 msgstr "ystod annilys"
 
-#: validationcriteriapage.ui:103
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:103
 msgctxt "validationcriteriapage|label1"
 msgid "_Allow:"
 msgstr "_Caniatáu:"
 
-#: validationcriteriapage.ui:117
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:117
 msgctxt "validationcriteriapage|valueft"
 msgid "_Data:"
 msgstr "_Data:"
 
-#: validationcriteriapage.ui:153
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:153
 msgctxt "validationcriteriapage|minft"
 msgid "_Minimum:"
 msgstr "_Lleiafswm:"
 
-#: validationcriteriapage.ui:235
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:235
 msgctxt "validationcriteriapage|maxft"
 msgid "Ma_ximum:"
 msgstr "_Mwyaf:"
 
-#: validationcriteriapage.ui:246
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:246
 msgctxt "validationcriteriapage|allowempty"
 msgid "Allow _empty cells"
 msgstr "Caniatáu celloedd _gwag"
 
-#: validationcriteriapage.ui:261
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:261
 msgctxt "validationcriteriapage|showlist"
 msgid "Show selection _list"
 msgstr "Dangos _rhestr dewis"
 
-#: validationcriteriapage.ui:276
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:276
 msgctxt "validationcriteriapage|sortascend"
 msgid "Sor_t entries ascending"
 msgstr "_Trefnu cofnodion yn esgyn"
 
-#: validationcriteriapage.ui:297
+#: sc/uiconfig/scalc/ui/validationcriteriapage.ui:297
 msgctxt "validationcriteriapage|hintft"
 msgid "A valid source can only consist of a contiguous selection of rows and columns, or a formula that results in an area or array."
 msgstr "Gall ffynhonnell ddilys ddim ond cynnwys dewis cydgyffyrddol o resi a cholofnau, neu fformiwla sy'n arwain ar ardal neu arae."
 
-#: validationdialog.ui:8
+#: sc/uiconfig/scalc/ui/validationdialog.ui:8
 msgctxt "validationdialog|ValidationDialog"
 msgid "Validity"
 msgstr "Dilysrwydd"
 
-#: validationdialog.ui:111
+#: sc/uiconfig/scalc/ui/validationdialog.ui:111
 msgctxt "validationdialog|criteria"
 msgid "Criteria"
 msgstr "Maen prawf"
 
-#: validationdialog.ui:133
+#: sc/uiconfig/scalc/ui/validationdialog.ui:133
 msgctxt "validationdialog|inputhelp"
 msgid "Input Help"
 msgstr "Cymorth Mewnbwn"
 
-#: validationdialog.ui:156
+#: sc/uiconfig/scalc/ui/validationdialog.ui:156
 msgctxt "validationdialog|erroralert"
 msgid "Error Alert"
 msgstr "Rhybudd Gwall"
 
-#: validationhelptabpage.ui:14
+#: sc/uiconfig/scalc/ui/validationhelptabpage.ui:14
 msgctxt "validationhelptabpage|tsbhelp"
 msgid "_Show input help when cell is selected"
 msgstr "_Dangos cymorth mewnbwn pan mae cell yn cael ei ddewis"
 
-#: validationhelptabpage.ui:73
+#: sc/uiconfig/scalc/ui/validationhelptabpage.ui:72
 msgctxt "validationhelptabpage|title_label"
 msgid "_Title:"
 msgstr "_Teitl:"
 
-#: validationhelptabpage.ui:90
+#: sc/uiconfig/scalc/ui/validationhelptabpage.ui:89
 msgctxt "validationhelptabpage|inputhelp_label"
 msgid "_Input help:"
 msgstr "Cymorth _mewnbwn:"
 
-#: validationhelptabpage.ui:132
+#: sc/uiconfig/scalc/ui/validationhelptabpage.ui:131
 msgctxt "validationhelptabpage|label1"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: xmlsourcedialog.ui:14
+#: sc/uiconfig/scalc/ui/xmlsourcedialog.ui:14
 msgctxt "xmlsourcedialog|XMLSourceDialog"
 msgid "XML Source"
 msgstr "Ffynhonnell XML"
 
-#: xmlsourcedialog.ui:47
+#: sc/uiconfig/scalc/ui/xmlsourcedialog.ui:47
 msgctxt "xmlsourcedialog|selectsource|tooltip_text"
 msgid "Browse to set source file."
 msgstr "Pori er mwyn gosod y ffeil ffynhonnell."
 
-#: xmlsourcedialog.ui:61
+#: sc/uiconfig/scalc/ui/xmlsourcedialog.ui:61
 msgctxt "xmlsourcedialog|sourcefile"
 msgid "- not set -"
 msgstr "- heb ei osod -"
 
-#: xmlsourcedialog.ui:76
+#: sc/uiconfig/scalc/ui/xmlsourcedialog.ui:76
 msgctxt "xmlsourcedialog|label1"
 msgid "Source File"
 msgstr "Ffeil Ffynhonnell"
 
-#: xmlsourcedialog.ui:138
+#: sc/uiconfig/scalc/ui/xmlsourcedialog.ui:138
 msgctxt "xmlsourcedialog|label5"
 msgid "Mapped cell:"
 msgstr "Cell wedi ei fapio:"
 
-#: xmlsourcedialog.ui:183
+#: sc/uiconfig/scalc/ui/xmlsourcedialog.ui:183
 msgctxt "xmlsourcedialog|label4"
 msgid "Map to Document"
 msgstr "Mapio i'r Ddogfen"
 
-#: xmlsourcedialog.ui:202
+#: sc/uiconfig/scalc/ui/xmlsourcedialog.ui:202
 msgctxt "xmlsourcedialog|ok"
 msgid "_Import"
 msgstr "_Mewnforio"
 
-#: ztestdialog.ui:40
+#: sc/uiconfig/scalc/ui/ztestdialog.ui:40
 msgctxt "ztestdialog|variable1-range-label"
 msgid "Variable 1 range:"
 msgstr "Ystod Amrywiolyn 1:"
 
-#: ztestdialog.ui:79
+#: sc/uiconfig/scalc/ui/ztestdialog.ui:78
 msgctxt "ztestdialog|variable2-range-label"
 msgid "Variable 2 range:"
 msgstr "Ystod Amrywiolyn 2:"
 
-#: ztestdialog.ui:118
+#: sc/uiconfig/scalc/ui/ztestdialog.ui:116
 msgctxt "ztestdialog|output-range-label"
 msgid "Results to:"
 msgstr "Canlyniad i:"
 
-#: ztestdialog.ui:160
+#: sc/uiconfig/scalc/ui/ztestdialog.ui:157
 msgctxt "ztestdialog|label1"
 msgid "Data"
 msgstr "Data"
 
-#: ztestdialog.ui:254
+#: sc/uiconfig/scalc/ui/ztestdialog.ui:251
 msgctxt "ztestdialog|groupedby-columns-radio"
 msgid "Columns"
 msgstr "Colofnau"
 
-#: ztestdialog.ui:270
+#: sc/uiconfig/scalc/ui/ztestdialog.ui:267
 msgctxt "ztestdialog|groupedby-rows-radio"
 msgid "Rows"
 msgstr "Rhesi"
 
-#: ztestdialog.ui:292
+#: sc/uiconfig/scalc/ui/ztestdialog.ui:289
 msgctxt "ztestdialog|label2"
 msgid "Grouped by"
 msgstr "Grwpiwyd yn ôl"
diff --git a/source/cy/scaddins/messages.po b/source/cy/scaddins/messages.po
index e412d441846..b1f713eb393 100644
--- a/source/cy/scaddins/messages.po
+++ b/source/cy/scaddins/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
+"POT-Creation-Date: 2018-02-27 15:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,102 +13,102 @@ msgstr ""
 "X-Accelerator-Marker: ~\n"
 "X-Generator: LibreOffice\n"
 
-#: analysis.hrc:27
+#: scaddins/inc/analysis.hrc:27
 msgctxt "ANALYSIS_Workday"
 msgid "Returns the serial number of the date before or after a specified number of workdays"
 msgstr "Dychwelyd rhif cyfres y dyddiad cyn neu wedi'r nifer penodol o ddyddiau gwaith"
 
-#: analysis.hrc:28
+#: scaddins/inc/analysis.hrc:28
 msgctxt "ANALYSIS_Workday"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: analysis.hrc:29
+#: scaddins/inc/analysis.hrc:29
 msgctxt "ANALYSIS_Workday"
 msgid "The start date"
 msgstr "Y dyddiad cychwyn"
 
-#: analysis.hrc:30
+#: scaddins/inc/analysis.hrc:30
 msgctxt "ANALYSIS_Workday"
 msgid "Days"
 msgstr "Dyddiau"
 
-#: analysis.hrc:31
+#: scaddins/inc/analysis.hrc:31
 msgctxt "ANALYSIS_Workday"
 msgid "The number of workdays before or after the start date"
 msgstr "Nifer y dyddiau gwaith cyn neu wedi'r dyddiad cychwyn"
 
-#: analysis.hrc:32
+#: scaddins/inc/analysis.hrc:32
 msgctxt "ANALYSIS_Workday"
 msgid "Holidays"
 msgstr "Gwyliau"
 
-#: analysis.hrc:33
+#: scaddins/inc/analysis.hrc:33
 msgctxt "ANALYSIS_Workday"
 msgid "List of date values of days off (vacation, holidays, etc.)"
 msgstr "Rhestr o werthoedd dyddiau i ffwrdd (gwyliau ac ati)"
 
-#: analysis.hrc:38
+#: scaddins/inc/analysis.hrc:38
 msgctxt "ANALYSIS_Yearfrac"
 msgid "Returns the number of years (including fractional part) between two dates"
 msgstr "Dychwelyd y nifer o flynyddoedd (gan gynwys ffractiwn o ran) rhwng dau ddyddiad"
 
-#: analysis.hrc:39
+#: scaddins/inc/analysis.hrc:39
 msgctxt "ANALYSIS_Yearfrac"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: analysis.hrc:40
+#: scaddins/inc/analysis.hrc:40
 msgctxt "ANALYSIS_Yearfrac"
 msgid "The start date"
 msgstr "Y dyddiad cychwyn"
 
-#: analysis.hrc:41
+#: scaddins/inc/analysis.hrc:41
 msgctxt "ANALYSIS_Yearfrac"
 msgid "End date"
 msgstr "Dyddiad olaf"
 
-#: analysis.hrc:42
+#: scaddins/inc/analysis.hrc:42
 msgctxt "ANALYSIS_Yearfrac"
 msgid "The end date"
 msgstr "Y dyddiad olaf"
 
-#: analysis.hrc:43
+#: scaddins/inc/analysis.hrc:43
 msgctxt "ANALYSIS_Yearfrac"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:44
+#: scaddins/inc/analysis.hrc:44
 msgctxt "ANALYSIS_Yearfrac"
 msgid "Basis indicates the day-count convention to use in the calculation"
 msgstr "Sail i ddangos diwrnod cyntaf yr wythnos i'w ddefnyddio wrth gyfrifo"
 
-#: analysis.hrc:49
+#: scaddins/inc/analysis.hrc:49
 msgctxt "ANALYSIS_Edate"
 msgid "Returns the serial number of the date that is a specified number of months before or after the start date"
 msgstr "Dychwelyd rhif cyfresol y dyddiad sydd yn nifer penodol o fisoedd cyn neu ar ôl y dyddiad cychwyn"
 
-#: analysis.hrc:50
+#: scaddins/inc/analysis.hrc:50
 msgctxt "ANALYSIS_Edate"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: analysis.hrc:51
+#: scaddins/inc/analysis.hrc:51
 msgctxt "ANALYSIS_Edate"
 msgid "The start date"
 msgstr "Y dyddiad cychwyn"
 
-#: analysis.hrc:52
+#: scaddins/inc/analysis.hrc:52
 msgctxt "ANALYSIS_Edate"
 msgid "Months"
 msgstr "Misoedd"
 
-#: analysis.hrc:53
+#: scaddins/inc/analysis.hrc:53
 msgctxt "ANALYSIS_Edate"
 msgid "Number of months before or after the start date"
 msgstr "Nifer o fisoedd cyn neu ar ôl y dyddiad cychwyn"
 
-#: analysis.hrc:58
+#: scaddins/inc/analysis.hrc:58
 msgctxt "ANALYSIS_Weeknum"
 msgid ""
 "Returns the number of the calendar week in which the specified date occurs.\n"
@@ -117,52 +117,52 @@ msgstr ""
 "Yn dychwelyd y nifer o wythnosau calendr y mae'r dyddiad penodol yn digwydd.\n"
 "Mae'r swyddogaeth yn digwydd er rhyngweithredu gyda dogfennau Microsoft Excel hŷn, defnyddiwch WEEKNUM gyda dogfennau newydd."
 
-#: analysis.hrc:59
+#: scaddins/inc/analysis.hrc:59
 msgctxt "ANALYSIS_Weeknum"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: analysis.hrc:60
+#: scaddins/inc/analysis.hrc:60
 msgctxt "ANALYSIS_Weeknum"
 msgid "The date or date serial number"
 msgstr "Y dyddiad neu rif cyfresol y dyddiad"
 
-#: analysis.hrc:61
+#: scaddins/inc/analysis.hrc:61
 msgctxt "ANALYSIS_Weeknum"
 msgid "Return type"
 msgstr "Math dychwelyd"
 
-#: analysis.hrc:62
+#: scaddins/inc/analysis.hrc:62
 msgctxt "ANALYSIS_Weeknum"
 msgid "Indicates the first day of the week (1 = Sunday, 2 = Monday)"
 msgstr "Dangos diwrnod cyntaf yr wythnos (1 = Dydd Sul, 2 = Dydd Llun)"
 
-#: analysis.hrc:67
+#: scaddins/inc/analysis.hrc:67
 msgctxt "ANALYSIS_Eomonth"
 msgid "Returns the serial number of the last day of the month that comes a certain number of months before or after the start date"
 msgstr "Dychwelyd rhif cyfresol diwrnod ola'r mis sy'n dod nifer penodol o weithiau o fisoedd cyn neu ar ôl yr wythnos cychwyn"
 
-#: analysis.hrc:68
+#: scaddins/inc/analysis.hrc:68
 msgctxt "ANALYSIS_Eomonth"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: analysis.hrc:69
+#: scaddins/inc/analysis.hrc:69
 msgctxt "ANALYSIS_Eomonth"
 msgid "The start date"
 msgstr "Y dyddiad cychwyn"
 
-#: analysis.hrc:70
+#: scaddins/inc/analysis.hrc:70
 msgctxt "ANALYSIS_Eomonth"
 msgid "Months"
 msgstr "Misoedd"
 
-#: analysis.hrc:71
+#: scaddins/inc/analysis.hrc:71
 msgctxt "ANALYSIS_Eomonth"
 msgid "Number of months before or after the start date"
 msgstr "Nifer o fisoedd cyn neu ar ôl y dyddiad cychwyn"
 
-#: analysis.hrc:76
+#: scaddins/inc/analysis.hrc:76
 msgctxt "ANALYSIS_Networkdays"
 msgid ""
 "Returns the number of workdays between two dates.\n"
@@ -171,217 +171,217 @@ msgstr ""
 "Dychwelyd y nifer o ddyddiau gwaith rhwng dau ddyddiad.\n"
 "Mae'r swyddogaeth yn digwydd er rhyngweithredu gyda dogfennau Microsoft Excel hŷn, defnyddiwch NETWORKDAYS yn lle hynny."
 
-#: analysis.hrc:77
+#: scaddins/inc/analysis.hrc:77
 msgctxt "ANALYSIS_Networkdays"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: analysis.hrc:78
+#: scaddins/inc/analysis.hrc:78
 msgctxt "ANALYSIS_Networkdays"
 msgid "The start date"
 msgstr "Y dyddiad cychwyn"
 
-#: analysis.hrc:79
+#: scaddins/inc/analysis.hrc:79
 msgctxt "ANALYSIS_Networkdays"
 msgid "End date"
 msgstr "Dyddiad olaf"
 
-#: analysis.hrc:80
+#: scaddins/inc/analysis.hrc:80
 msgctxt "ANALYSIS_Networkdays"
 msgid "The end date"
 msgstr "Y dyddiad olaf"
 
-#: analysis.hrc:81
+#: scaddins/inc/analysis.hrc:81
 msgctxt "ANALYSIS_Networkdays"
 msgid "Holidays"
 msgstr "Gwyliau"
 
-#: analysis.hrc:82
+#: scaddins/inc/analysis.hrc:82
 msgctxt "ANALYSIS_Networkdays"
 msgid "List of date values representing days off (vacation, holidays, etc.)"
 msgstr "Rhestr werthoedd dyddiad yn cynrychioli diwrnod rhydd (gwyliau, ac ati.)"
 
-#: analysis.hrc:87
+#: scaddins/inc/analysis.hrc:87
 msgctxt "ANALYSIS_Iseven"
 msgid "Returns the value 'true' if the number is even"
 msgstr "Dychwelyd y gwerth 'true' os yw'r rhif yn eilrif"
 
-#: analysis.hrc:88
+#: scaddins/inc/analysis.hrc:88
 msgctxt "ANALYSIS_Iseven"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:89
+#: scaddins/inc/analysis.hrc:89
 msgctxt "ANALYSIS_Iseven"
 msgid "The number"
 msgstr "Y rhif"
 
-#: analysis.hrc:94
+#: scaddins/inc/analysis.hrc:94
 msgctxt "ANALYSIS_Isodd"
 msgid "Returns the value 'true' if the number is odd"
 msgstr "Dychwelyd y gwerth 'true' os yw'r rhif yn odrif"
 
-#: analysis.hrc:95
+#: scaddins/inc/analysis.hrc:95
 msgctxt "ANALYSIS_Isodd"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:96
+#: scaddins/inc/analysis.hrc:96
 msgctxt "ANALYSIS_Isodd"
 msgid "The number"
 msgstr "Y rhif"
 
-#: analysis.hrc:101
+#: scaddins/inc/analysis.hrc:101
 msgctxt "ANALYSIS_Multinomial"
 msgid "Returns the multinomial coefficient of a set of numbers"
 msgstr "Dychwelyd y cyfernod llusnomaidd o set o rifau"
 
-#: analysis.hrc:102
+#: scaddins/inc/analysis.hrc:102
 msgctxt "ANALYSIS_Multinomial"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:103
+#: scaddins/inc/analysis.hrc:103
 msgctxt "ANALYSIS_Multinomial"
 msgid "Number or list of numbers for which you want the multinomial coefficient"
 msgstr "Cyfernod llusnomaidd ar gyfer rhif neu restr o rifau"
 
-#: analysis.hrc:108
+#: scaddins/inc/analysis.hrc:108
 msgctxt "ANALYSIS_Seriessum"
 msgid "Returns the sum of a power series"
 msgstr "Dychwelyd swm cyfres p?er"
 
-#: analysis.hrc:109
+#: scaddins/inc/analysis.hrc:109
 msgctxt "ANALYSIS_Seriessum"
 msgid "X"
 msgstr "X"
 
-#: analysis.hrc:110
+#: scaddins/inc/analysis.hrc:110
 msgctxt "ANALYSIS_Seriessum"
 msgid "The independent variable of the power series"
 msgstr "Amrywiolyn annibynnol cyfres p?er"
 
-#: analysis.hrc:111
+#: scaddins/inc/analysis.hrc:111
 msgctxt "ANALYSIS_Seriessum"
 msgid "N"
 msgstr "N"
 
-#: analysis.hrc:112
+#: scaddins/inc/analysis.hrc:112
 msgctxt "ANALYSIS_Seriessum"
 msgid "The initial power to which x is to be raised"
 msgstr "P?er cychwynnol i'r hyn bydd x yn cael ei godi"
 
-#: analysis.hrc:113
+#: scaddins/inc/analysis.hrc:113
 msgctxt "ANALYSIS_Seriessum"
 msgid "M"
 msgstr "M"
 
-#: analysis.hrc:114
+#: scaddins/inc/analysis.hrc:114
 msgctxt "ANALYSIS_Seriessum"
 msgid "The increment by which to increase n for each term in the series"
 msgstr "Y cynyddiad i gynyddu pob term yn y gyfres"
 
-#: analysis.hrc:115
+#: scaddins/inc/analysis.hrc:115
 msgctxt "ANALYSIS_Seriessum"
 msgid "Coefficients"
 msgstr "Cyfernodau"
 
-#: analysis.hrc:116
+#: scaddins/inc/analysis.hrc:116
 msgctxt "ANALYSIS_Seriessum"
 msgid "Set of coefficients by which each successive power of the variable x is multiplied"
 msgstr "Set o gyfernodau y mae pob p?er olynol yr amrywiolyn x yn cael ei luosi"
 
-#: analysis.hrc:121
+#: scaddins/inc/analysis.hrc:121
 msgctxt "ANALYSIS_Quotient"
 msgid "Returns the integer portion of a division"
 msgstr "Dychwelyd cyfran cyfanrif rhaniad"
 
-#: analysis.hrc:122
+#: scaddins/inc/analysis.hrc:122
 msgctxt "ANALYSIS_Quotient"
 msgid "Numerator"
 msgstr "Rhifiadur"
 
-#: analysis.hrc:123
+#: scaddins/inc/analysis.hrc:123
 msgctxt "ANALYSIS_Quotient"
 msgid "The dividend"
 msgstr "Y rhannyn"
 
-#: analysis.hrc:124
+#: scaddins/inc/analysis.hrc:124
 msgctxt "ANALYSIS_Quotient"
 msgid "Denominator"
 msgstr "Enwadur"
 
-#: analysis.hrc:125
+#: scaddins/inc/analysis.hrc:125
 msgctxt "ANALYSIS_Quotient"
 msgid "The divisor"
 msgstr "Y rhannydd"
 
-#: analysis.hrc:130
+#: scaddins/inc/analysis.hrc:130
 msgctxt "ANALYSIS_Mround"
 msgid "Returns a number rounded to a specified multiple"
 msgstr "Dychwelyd rhif wedi ei grynhoi i luosogyn penodol"
 
-#: analysis.hrc:131
+#: scaddins/inc/analysis.hrc:131
 msgctxt "ANALYSIS_Mround"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:132
+#: scaddins/inc/analysis.hrc:132
 msgctxt "ANALYSIS_Mround"
 msgid "The number to round off"
 msgstr "Rhif i'w grynhoi"
 
-#: analysis.hrc:133
+#: scaddins/inc/analysis.hrc:133
 msgctxt "ANALYSIS_Mround"
 msgid "Multiple"
 msgstr "Lluosog"
 
-#: analysis.hrc:134
+#: scaddins/inc/analysis.hrc:134
 msgctxt "ANALYSIS_Mround"
 msgid "The multiple to which you want to round number"
 msgstr "Y lluosog i'r hwn mae angen crynhoi rhif"
 
-#: analysis.hrc:139
+#: scaddins/inc/analysis.hrc:139
 msgctxt "ANALYSIS_Sqrtpi"
 msgid "Returns the square root of a number which has been multiplied by pi"
 msgstr "Dychwelyd ail isradd rhif sydd wedi ei luosogi gyda pi"
 
-#: analysis.hrc:140
+#: scaddins/inc/analysis.hrc:140
 msgctxt "ANALYSIS_Sqrtpi"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:141
+#: scaddins/inc/analysis.hrc:141
 msgctxt "ANALYSIS_Sqrtpi"
 msgid "The number by which pi is multiplied"
 msgstr "Y rhif sydd wedi ei luosogi gyda pi"
 
-#: analysis.hrc:146
+#: scaddins/inc/analysis.hrc:146
 msgctxt "ANALYSIS_Randbetween"
 msgid "Returns a random integer between the numbers you specify"
 msgstr "Dychwelyd rhwng cyfanrif hap rhwng rhifau rydych yn eu henwi"
 
-#: analysis.hrc:147
+#: scaddins/inc/analysis.hrc:147
 msgctxt "ANALYSIS_Randbetween"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: analysis.hrc:148
+#: scaddins/inc/analysis.hrc:148
 msgctxt "ANALYSIS_Randbetween"
 msgid "The smallest integer returned"
 msgstr "Dychwelwyd y cyfanrif lleiaf"
 
-#: analysis.hrc:149
+#: scaddins/inc/analysis.hrc:149
 msgctxt "ANALYSIS_Randbetween"
 msgid "Top"
 msgstr "Brig"
 
-#: analysis.hrc:150
+#: scaddins/inc/analysis.hrc:150
 msgctxt "ANALYSIS_Randbetween"
 msgid "The largest integer returned"
 msgstr "Dychwelwyd y cyfanrif mwyaf"
 
-#: analysis.hrc:155
+#: scaddins/inc/analysis.hrc:155
 msgctxt "ANALYSIS_Gcd"
 msgid ""
 "Returns the greatest common divisor.\n"
@@ -390,17 +390,17 @@ msgstr ""
 "Dychwelyd y rhannydd mwyaf cyffredin.\n"
 "Mae'r swyddogaeth yn digwydd er rhyngweithredu gyda dogfennau Microsoft Excel hŷn, defnyddiwch GCD yn lle hynny."
 
-#: analysis.hrc:156
+#: scaddins/inc/analysis.hrc:156
 msgctxt "ANALYSIS_Gcd"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:157
+#: scaddins/inc/analysis.hrc:157
 msgctxt "ANALYSIS_Gcd"
 msgid "Number or list of numbers"
 msgstr "Rhif neu restr o rifau"
 
-#: analysis.hrc:162
+#: scaddins/inc/analysis.hrc:162
 msgctxt "ANALYSIS_Lcm"
 msgid ""
 "Returns the least common multiple.\n"
@@ -409,4128 +409,4128 @@ msgstr ""
 "Dychwelyd y lluosog mwyaf cyffredin.\n"
 "Mae'r swyddogaeth yn digwydd er rhyngweithredu gyda dogfennau Microsoft Excel hŷn, defnyddiwch LCM yn lle hynny."
 
-#: analysis.hrc:163
+#: scaddins/inc/analysis.hrc:163
 msgctxt "ANALYSIS_Lcm"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:164
+#: scaddins/inc/analysis.hrc:164
 msgctxt "ANALYSIS_Lcm"
 msgid "Number or list of numbers"
 msgstr "Rhif neu restr o rifau"
 
-#: analysis.hrc:169
+#: scaddins/inc/analysis.hrc:169
 msgctxt "ANALYSIS_Besseli"
 msgid "Returns the modified Bessel function In(x)"
 msgstr "Dychwelyd y swyddogaeth Bassel newidiwyd yn(x)"
 
-#: analysis.hrc:170
+#: scaddins/inc/analysis.hrc:170
 msgctxt "ANALYSIS_Besseli"
 msgid "X"
 msgstr "X"
 
-#: analysis.hrc:171
+#: scaddins/inc/analysis.hrc:171
 msgctxt "ANALYSIS_Besseli"
 msgid "The value at which the function is to be evaluated"
 msgstr "Y gwerth y mae'r swyddogaeth i'w werthuso"
 
-#: analysis.hrc:172
+#: scaddins/inc/analysis.hrc:172
 msgctxt "ANALYSIS_Besseli"
 msgid "N"
 msgstr "N"
 
-#: analysis.hrc:173
+#: scaddins/inc/analysis.hrc:173
 msgctxt "ANALYSIS_Besseli"
 msgid "The order of the Bessel function"
 msgstr "Trefn swyddogaeth Bessel"
 
-#: analysis.hrc:178
+#: scaddins/inc/analysis.hrc:178
 msgctxt "ANALYSIS_Besselj"
 msgid "Returns the Bessel function Jn(x)"
 msgstr "Dychwelyd swyddogaeth Bessel Jn(x)"
 
-#: analysis.hrc:179
+#: scaddins/inc/analysis.hrc:179
 msgctxt "ANALYSIS_Besselj"
 msgid "X"
 msgstr "X"
 
-#: analysis.hrc:180
+#: scaddins/inc/analysis.hrc:180
 msgctxt "ANALYSIS_Besselj"
 msgid "The value at which the function is to be evaluated"
 msgstr "Y gwerth y mae'r swyddogaeth i'w werthuso"
 
-#: analysis.hrc:181
+#: scaddins/inc/analysis.hrc:181
 msgctxt "ANALYSIS_Besselj"
 msgid "N"
 msgstr "N"
 
-#: analysis.hrc:182
+#: scaddins/inc/analysis.hrc:182
 msgctxt "ANALYSIS_Besselj"
 msgid "The order of the Bessel function"
 msgstr "Trefn swyddogaeth Bessel"
 
-#: analysis.hrc:187
+#: scaddins/inc/analysis.hrc:187
 msgctxt "ANALYSIS_Besselk"
 msgid "Returns the Bessel function Kn(x)"
 msgstr "Dychwelyd swyddogaeth Bessel Kn(x)"
 
-#: analysis.hrc:188
+#: scaddins/inc/analysis.hrc:188
 msgctxt "ANALYSIS_Besselk"
 msgid "X"
 msgstr "X"
 
-#: analysis.hrc:189
+#: scaddins/inc/analysis.hrc:189
 msgctxt "ANALYSIS_Besselk"
 msgid "The value at which the function is to be evaluated"
 msgstr "Y gwerth y mae'r swyddogaeth i'w werthuso"
 
-#: analysis.hrc:190
+#: scaddins/inc/analysis.hrc:190
 msgctxt "ANALYSIS_Besselk"
 msgid "N"
 msgstr "N"
 
-#: analysis.hrc:191
+#: scaddins/inc/analysis.hrc:191
 msgctxt "ANALYSIS_Besselk"
 msgid "The order of the Bessel function"
 msgstr "Trefn swyddogaeth Bessel"
 
-#: analysis.hrc:196
+#: scaddins/inc/analysis.hrc:196
 msgctxt "ANALYSIS_Bessely"
 msgid "Returns the Bessel function Yn(x)"
 msgstr "Dychwelyd swyddogaeth Bessel Yn(x)"
 
-#: analysis.hrc:197
+#: scaddins/inc/analysis.hrc:197
 msgctxt "ANALYSIS_Bessely"
 msgid "X"
 msgstr "X"
 
-#: analysis.hrc:198
+#: scaddins/inc/analysis.hrc:198
 msgctxt "ANALYSIS_Bessely"
 msgid "The value at which the function is to be evaluated"
 msgstr "Y gwerth y mae'r swyddogaeth i'w werthuso"
 
-#: analysis.hrc:199
+#: scaddins/inc/analysis.hrc:199
 msgctxt "ANALYSIS_Bessely"
 msgid "N"
 msgstr "N"
 
-#: analysis.hrc:200
+#: scaddins/inc/analysis.hrc:200
 msgctxt "ANALYSIS_Bessely"
 msgid "The order of the Bessel function"
 msgstr "Trefn swyddogaeth Bessel"
 
-#: analysis.hrc:205
+#: scaddins/inc/analysis.hrc:205
 msgctxt "ANALYSIS_Bin2Oct"
 msgid "Converts a binary number to an octal number"
 msgstr "Trosi rhif deuaidd i rif wythol"
 
-#: analysis.hrc:206
+#: scaddins/inc/analysis.hrc:206
 msgctxt "ANALYSIS_Bin2Oct"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:207
+#: scaddins/inc/analysis.hrc:207
 msgctxt "ANALYSIS_Bin2Oct"
 msgid "The binary number to be converted (as text)"
 msgstr "Rhif deuaidd i'w drosi (fel testun)"
 
-#: analysis.hrc:208
+#: scaddins/inc/analysis.hrc:208
 msgctxt "ANALYSIS_Bin2Oct"
 msgid "Places"
 msgstr "Mannau"
 
-#: analysis.hrc:209
+#: scaddins/inc/analysis.hrc:209
 msgctxt "ANALYSIS_Bin2Oct"
 msgid "Number of places used"
 msgstr "Nifer o fannau defnyddiwyd"
 
-#: analysis.hrc:214
+#: scaddins/inc/analysis.hrc:214
 msgctxt "ANALYSIS_Bin2Dec"
 msgid "Converts a binary number to a decimal number"
 msgstr "Trosi rhif deuaidd yn rhif degol"
 
-#: analysis.hrc:215
+#: scaddins/inc/analysis.hrc:215
 msgctxt "ANALYSIS_Bin2Dec"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:216
+#: scaddins/inc/analysis.hrc:216
 msgctxt "ANALYSIS_Bin2Dec"
 msgid "The binary number to be converted (as text)"
 msgstr "Rhif deuaidd i'w drosi (fel testun)"
 
-#: analysis.hrc:221
+#: scaddins/inc/analysis.hrc:221
 msgctxt "ANALYSIS_Bin2Hex"
 msgid "Converts a binary number to a hexadecimal number"
 msgstr "Trosi rhif deuaidd i rif hecsadegol"
 
-#: analysis.hrc:222
+#: scaddins/inc/analysis.hrc:222
 msgctxt "ANALYSIS_Bin2Hex"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:223
+#: scaddins/inc/analysis.hrc:223
 msgctxt "ANALYSIS_Bin2Hex"
 msgid "The binary number to be converted (as text)"
 msgstr "Rhif deuaidd i'w drosi (fel testun)"
 
-#: analysis.hrc:224
+#: scaddins/inc/analysis.hrc:224
 msgctxt "ANALYSIS_Bin2Hex"
 msgid "Places"
 msgstr "Mannau"
 
-#: analysis.hrc:225
+#: scaddins/inc/analysis.hrc:225
 msgctxt "ANALYSIS_Bin2Hex"
 msgid "Number of places used."
 msgstr "Nifer o fannau i'w defnyddio."
 
-#: analysis.hrc:230
+#: scaddins/inc/analysis.hrc:230
 msgctxt "ANALYSIS_Oct2Bin"
 msgid "Converts an octal number to a binary number"
 msgstr "Trosi rhif wythol i rif deuaidd"
 
-#: analysis.hrc:231
+#: scaddins/inc/analysis.hrc:231
 msgctxt "ANALYSIS_Oct2Bin"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:232
+#: scaddins/inc/analysis.hrc:232
 msgctxt "ANALYSIS_Oct2Bin"
 msgid "The octal number to be converted (as text)"
 msgstr "Y rhif wythol i'w drosi (fel testun)"
 
-#: analysis.hrc:233
+#: scaddins/inc/analysis.hrc:233
 msgctxt "ANALYSIS_Oct2Bin"
 msgid "Places"
 msgstr "Mannau"
 
-#: analysis.hrc:234
+#: scaddins/inc/analysis.hrc:234
 msgctxt "ANALYSIS_Oct2Bin"
 msgid "Number of places used"
 msgstr "Nifer o fannau defnyddiwyd"
 
-#: analysis.hrc:239
+#: scaddins/inc/analysis.hrc:239
 msgctxt "ANALYSIS_Oct2Dec"
 msgid "Converts an octal number to a decimal number"
 msgstr "Trosi rhif wythol yn rhif degol"
 
-#: analysis.hrc:240
+#: scaddins/inc/analysis.hrc:240
 msgctxt "ANALYSIS_Oct2Dec"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:241
+#: scaddins/inc/analysis.hrc:241
 msgctxt "ANALYSIS_Oct2Dec"
 msgid "The octal number to be converted (as text)"
 msgstr "Y rhif wythol i'w drosi (fel testun)"
 
-#: analysis.hrc:246
+#: scaddins/inc/analysis.hrc:246
 msgctxt "ANALYSIS_Oct2Hex"
 msgid "Converts an octal number to a hexadecimal number"
 msgstr "Trosi rhif wythol i rif hecsadegol"
 
-#: analysis.hrc:247
+#: scaddins/inc/analysis.hrc:247
 msgctxt "ANALYSIS_Oct2Hex"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:248
+#: scaddins/inc/analysis.hrc:248
 msgctxt "ANALYSIS_Oct2Hex"
 msgid "The octal number to be converted (as text)"
 msgstr "Y rhif wythol i'w drosi (fel testun)"
 
-#: analysis.hrc:249
+#: scaddins/inc/analysis.hrc:249
 msgctxt "ANALYSIS_Oct2Hex"
 msgid "Places"
 msgstr "Mannau"
 
-#: analysis.hrc:250
+#: scaddins/inc/analysis.hrc:250
 msgctxt "ANALYSIS_Oct2Hex"
 msgid "Number of places used"
 msgstr "Nifer o fannau defnyddiwyd"
 
-#: analysis.hrc:255
+#: scaddins/inc/analysis.hrc:255
 msgctxt "ANALYSIS_Dec2Bin"
 msgid "Converts a decimal number to a binary number"
 msgstr "Trosi rhif degol i rif deuaidd"
 
-#: analysis.hrc:256
+#: scaddins/inc/analysis.hrc:256
 msgctxt "ANALYSIS_Dec2Bin"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:257
+#: scaddins/inc/analysis.hrc:257
 msgctxt "ANALYSIS_Dec2Bin"
 msgid "The decimal integer to be converted"
 msgstr "Y cyfanrif degol i'w drosi"
 
-#: analysis.hrc:258
+#: scaddins/inc/analysis.hrc:258
 msgctxt "ANALYSIS_Dec2Bin"
 msgid "Places"
 msgstr "Mannau"
 
-#: analysis.hrc:259
+#: scaddins/inc/analysis.hrc:259
 msgctxt "ANALYSIS_Dec2Bin"
 msgid "Number of places used"
 msgstr "Nifer o fannau defnyddiwyd"
 
-#: analysis.hrc:264
+#: scaddins/inc/analysis.hrc:264
 msgctxt "ANALYSIS_Dec2Hex"
 msgid "Converts a decimal number to a hexadecimal number"
 msgstr "Trosi rhif degol i rif hecsadegol"
 
-#: analysis.hrc:265
+#: scaddins/inc/analysis.hrc:265
 msgctxt "ANALYSIS_Dec2Hex"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:266
+#: scaddins/inc/analysis.hrc:266
 msgctxt "ANALYSIS_Dec2Hex"
 msgid "The decimal integer to be converted"
 msgstr "Y cyfanrif degol i'w drosi"
 
-#: analysis.hrc:267
+#: scaddins/inc/analysis.hrc:267
 msgctxt "ANALYSIS_Dec2Hex"
 msgid "Places"
 msgstr "Mannau"
 
-#: analysis.hrc:268
+#: scaddins/inc/analysis.hrc:268
 msgctxt "ANALYSIS_Dec2Hex"
 msgid "Number of places used"
 msgstr "Nifer o fannau defnyddiwyd"
 
-#: analysis.hrc:273
+#: scaddins/inc/analysis.hrc:273
 msgctxt "ANALYSIS_Dec2Oct"
 msgid "Converts a decimal number into an octal number"
 msgstr "Trosi rhif degol i rif wythol"
 
-#: analysis.hrc:274
+#: scaddins/inc/analysis.hrc:274
 msgctxt "ANALYSIS_Dec2Oct"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:275
+#: scaddins/inc/analysis.hrc:275
 msgctxt "ANALYSIS_Dec2Oct"
 msgid "The decimal number"
 msgstr "Y rhif degol"
 
-#: analysis.hrc:276
+#: scaddins/inc/analysis.hrc:276
 msgctxt "ANALYSIS_Dec2Oct"
 msgid "Places"
 msgstr "Mannau"
 
-#: analysis.hrc:277
+#: scaddins/inc/analysis.hrc:277
 msgctxt "ANALYSIS_Dec2Oct"
 msgid "Number of places used"
 msgstr "Nifer o fannau defnyddiwyd"
 
-#: analysis.hrc:282
+#: scaddins/inc/analysis.hrc:282
 msgctxt "ANALYSIS_Hex2Bin"
 msgid "Converts a hexadecimal number to a binary number"
 msgstr "Trosi rhif hecsadegol i rif deuaidd"
 
-#: analysis.hrc:283
+#: scaddins/inc/analysis.hrc:283
 msgctxt "ANALYSIS_Hex2Bin"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:284
+#: scaddins/inc/analysis.hrc:284
 msgctxt "ANALYSIS_Hex2Bin"
 msgid "The hexadecimal number to be converted (as text)"
 msgstr "Y rhif hecsadegol i'w drosi (fel testun)"
 
-#: analysis.hrc:285
+#: scaddins/inc/analysis.hrc:285
 msgctxt "ANALYSIS_Hex2Bin"
 msgid "Places"
 msgstr "Mannau"
 
-#: analysis.hrc:286
+#: scaddins/inc/analysis.hrc:286
 msgctxt "ANALYSIS_Hex2Bin"
 msgid "Number of places used"
 msgstr "Nifer o fannau defnyddiwyd"
 
-#: analysis.hrc:291
+#: scaddins/inc/analysis.hrc:291
 msgctxt "ANALYSIS_Hex2Dec"
 msgid "Converts a hexadecimal number to a decimal number"
 msgstr "Trosi rhif hecsadegol i rif degoli"
 
-#: analysis.hrc:292
+#: scaddins/inc/analysis.hrc:292
 msgctxt "ANALYSIS_Hex2Dec"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:293
+#: scaddins/inc/analysis.hrc:293
 msgctxt "ANALYSIS_Hex2Dec"
 msgid "The hexadecimal number to be converted (as text)"
 msgstr "Y rhif hecsadegol i'w drosi (fel testun)"
 
-#: analysis.hrc:298
+#: scaddins/inc/analysis.hrc:298
 msgctxt "ANALYSIS_Hex2Oct"
 msgid "Converts a hexadecimal number to an octal number"
 msgstr "Trosi rhif hecsadegol i rif wythol"
 
-#: analysis.hrc:299
+#: scaddins/inc/analysis.hrc:299
 msgctxt "ANALYSIS_Hex2Oct"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:300
+#: scaddins/inc/analysis.hrc:300
 msgctxt "ANALYSIS_Hex2Oct"
 msgid "The hexadecimal number to be converted (as text)"
 msgstr "Y rhif hecsadegol i'w drosi (fel testun)"
 
-#: analysis.hrc:301
+#: scaddins/inc/analysis.hrc:301
 msgctxt "ANALYSIS_Hex2Oct"
 msgid "Places"
 msgstr "Mannau"
 
-#: analysis.hrc:302
+#: scaddins/inc/analysis.hrc:302
 msgctxt "ANALYSIS_Hex2Oct"
 msgid "Number of places used"
 msgstr "Nifer o fannau defnyddiwyd"
 
-#: analysis.hrc:307
+#: scaddins/inc/analysis.hrc:307
 msgctxt "ANALYSIS_Delta"
 msgid "Tests whether two values are equal"
 msgstr "Profi p'un ai yw dau werth yn gydradd"
 
-#: analysis.hrc:308
+#: scaddins/inc/analysis.hrc:308
 msgctxt "ANALYSIS_Delta"
 msgid "Number 1"
 msgstr "Rhif 1"
 
-#: analysis.hrc:309
+#: scaddins/inc/analysis.hrc:309
 msgctxt "ANALYSIS_Delta"
 msgid "The first number"
 msgstr "Y rhif cyntaf"
 
-#: analysis.hrc:310
+#: scaddins/inc/analysis.hrc:310
 msgctxt "ANALYSIS_Delta"
 msgid "Number 2"
 msgstr "Rhif 2"
 
-#: analysis.hrc:311
+#: scaddins/inc/analysis.hrc:311
 msgctxt "ANALYSIS_Delta"
 msgid "The second number"
 msgstr "Yr ail rif"
 
-#: analysis.hrc:316
+#: scaddins/inc/analysis.hrc:316
 msgctxt "ANALYSIS_Erf"
 msgid "Returns the error function"
 msgstr "Dychwelyd swyddogaeth gwall"
 
-#: analysis.hrc:317
+#: scaddins/inc/analysis.hrc:317
 msgctxt "ANALYSIS_Erf"
 msgid "Lower limit"
 msgstr "Terfyn isaf"
 
-#: analysis.hrc:318
+#: scaddins/inc/analysis.hrc:318
 msgctxt "ANALYSIS_Erf"
 msgid "The lower limit for integration"
 msgstr "Terfyn isaf ar gyfer integreiddiad"
 
-#: analysis.hrc:319
+#: scaddins/inc/analysis.hrc:319
 msgctxt "ANALYSIS_Erf"
 msgid "Upper limit"
 msgstr "Terfyn uchaf"
 
-#: analysis.hrc:320
+#: scaddins/inc/analysis.hrc:320
 msgctxt "ANALYSIS_Erf"
 msgid "The upper limit for integration"
 msgstr "Terfyn uchaf ar gyfer integreiddiad"
 
-#: analysis.hrc:325
+#: scaddins/inc/analysis.hrc:325
 msgctxt "ANALYSIS_Erfc"
 msgid "Returns the complementary error function"
 msgstr "Dychwelyd swyddogaeth gwall cyflenwol"
 
-#: analysis.hrc:326
+#: scaddins/inc/analysis.hrc:326
 msgctxt "ANALYSIS_Erfc"
 msgid "Lower limit"
 msgstr "Terfyn isaf"
 
-#: analysis.hrc:327
+#: scaddins/inc/analysis.hrc:327
 msgctxt "ANALYSIS_Erfc"
 msgid "The lower limit for integration"
 msgstr "Terfyn isaf ar gyfer integreiddiad"
 
-#: analysis.hrc:332
+#: scaddins/inc/analysis.hrc:332
 msgctxt "ANALYSIS_Gestep"
 msgid "Tests whether a number is greater than a threshold value"
 msgstr "Profi p'un ai yw rhif yn fwy na gwerth trothwy"
 
-#: analysis.hrc:333
+#: scaddins/inc/analysis.hrc:333
 msgctxt "ANALYSIS_Gestep"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:334
+#: scaddins/inc/analysis.hrc:334
 msgctxt "ANALYSIS_Gestep"
 msgid "The value to test against step"
 msgstr "Y gwerth i'w brofi yn erbyn cam"
 
-#: analysis.hrc:335
+#: scaddins/inc/analysis.hrc:335
 msgctxt "ANALYSIS_Gestep"
 msgid "Step"
 msgstr "Cam"
 
-#: analysis.hrc:336
+#: scaddins/inc/analysis.hrc:336
 msgctxt "ANALYSIS_Gestep"
 msgid "The threshold value"
 msgstr "Y gwerth trothwy"
 
-#: analysis.hrc:341
+#: scaddins/inc/analysis.hrc:341
 msgctxt "ANALYSIS_Factdouble"
 msgid "Returns the double factorial of Number"
 msgstr "Dychwelyd ffactorial dwbl Rhif"
 
-#: analysis.hrc:342
+#: scaddins/inc/analysis.hrc:342
 msgctxt "ANALYSIS_Factdouble"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:343
+#: scaddins/inc/analysis.hrc:343
 msgctxt "ANALYSIS_Factdouble"
 msgid "The number"
 msgstr "Y rhif"
 
-#: analysis.hrc:348
+#: scaddins/inc/analysis.hrc:348
 msgctxt "ANALYSIS_Imabs"
 msgid "Returns the absolute value (modulus) of a complex number"
 msgstr "Dychwelyd gwerth absoliwt (modulus) o rif cymhleth"
 
-#: analysis.hrc:349
+#: scaddins/inc/analysis.hrc:349
 msgctxt "ANALYSIS_Imabs"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:350
+#: scaddins/inc/analysis.hrc:350
 msgctxt "ANALYSIS_Imabs"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:355
+#: scaddins/inc/analysis.hrc:355
 msgctxt "ANALYSIS_Imaginary"
 msgid "Returns the imaginary coefficient of a complex number"
 msgstr "Dychwelyd cyfernod dychmygol rhif cymhleth"
 
-#: analysis.hrc:356
+#: scaddins/inc/analysis.hrc:356
 msgctxt "ANALYSIS_Imaginary"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:357
+#: scaddins/inc/analysis.hrc:357
 msgctxt "ANALYSIS_Imaginary"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:362
+#: scaddins/inc/analysis.hrc:362
 msgctxt "ANALYSIS_Impower"
 msgid "Returns a complex number raised to a real power"
 msgstr "Dychwelyd rhif cymhleth godwyd i bwer real"
 
-#: analysis.hrc:363
+#: scaddins/inc/analysis.hrc:363
 msgctxt "ANALYSIS_Impower"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:364
+#: scaddins/inc/analysis.hrc:364
 msgctxt "ANALYSIS_Impower"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:365
+#: scaddins/inc/analysis.hrc:365
 msgctxt "ANALYSIS_Impower"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:366
+#: scaddins/inc/analysis.hrc:366
 msgctxt "ANALYSIS_Impower"
 msgid "Power to which the complex number is raised"
 msgstr "P?er i'r hyn fydd y rhif cymhleth yn cael ei godi"
 
-#: analysis.hrc:371
+#: scaddins/inc/analysis.hrc:371
 msgctxt "ANALYSIS_Imargument"
 msgid "Returns the argument theta, an angle expressed in radians"
 msgstr "Dychwelyd ymresymiad theta, ongl wedi ei fynegi mewn radianau"
 
-#: analysis.hrc:372
+#: scaddins/inc/analysis.hrc:372
 msgctxt "ANALYSIS_Imargument"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:373
+#: scaddins/inc/analysis.hrc:373
 msgctxt "ANALYSIS_Imargument"
 msgid "A complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:378
+#: scaddins/inc/analysis.hrc:378
 msgctxt "ANALYSIS_Imcos"
 msgid "Returns the cosine of a complex number"
 msgstr "Dychwelyd cosin o rif cymhleth"
 
-#: analysis.hrc:379
+#: scaddins/inc/analysis.hrc:379
 msgctxt "ANALYSIS_Imcos"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:380
+#: scaddins/inc/analysis.hrc:380
 msgctxt "ANALYSIS_Imcos"
 msgid "A complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:385
+#: scaddins/inc/analysis.hrc:385
 msgctxt "ANALYSIS_Imdiv"
 msgid "Returns the quotient of two complex numbers"
 msgstr "Dychwelyd cyniferydd o ddau rif cymhleth"
 
-#: analysis.hrc:386
+#: scaddins/inc/analysis.hrc:386
 msgctxt "ANALYSIS_Imdiv"
 msgid "Numerator"
 msgstr "Rhifiadur"
 
-#: analysis.hrc:387
+#: scaddins/inc/analysis.hrc:387
 msgctxt "ANALYSIS_Imdiv"
 msgid "The dividend"
 msgstr "Y rhannyn"
 
-#: analysis.hrc:388
+#: scaddins/inc/analysis.hrc:388
 msgctxt "ANALYSIS_Imdiv"
 msgid "Denominator"
 msgstr "Enwadur"
 
-#: analysis.hrc:389
+#: scaddins/inc/analysis.hrc:389
 msgctxt "ANALYSIS_Imdiv"
 msgid "The divisor"
 msgstr "Y rhannydd"
 
-#: analysis.hrc:394
+#: scaddins/inc/analysis.hrc:394
 msgctxt "ANALYSIS_Imexp"
 msgid "Returns the algebraic form of the exponential of a complex number"
 msgstr "Dychwelyd ffurf algebraidd o'r rhif cymhleth esbonyddol"
 
-#: analysis.hrc:395
+#: scaddins/inc/analysis.hrc:395
 msgctxt "ANALYSIS_Imexp"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:396
+#: scaddins/inc/analysis.hrc:396
 msgctxt "ANALYSIS_Imexp"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:401
+#: scaddins/inc/analysis.hrc:401
 msgctxt "ANALYSIS_Imconjugate"
 msgid "Returns the complex conjugate of a complex number"
 msgstr "Dychwelyd cyfiau cymhleth rhif cymhleth"
 
-#: analysis.hrc:402
+#: scaddins/inc/analysis.hrc:402
 msgctxt "ANALYSIS_Imconjugate"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:403
+#: scaddins/inc/analysis.hrc:403
 msgctxt "ANALYSIS_Imconjugate"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:408
+#: scaddins/inc/analysis.hrc:408
 msgctxt "ANALYSIS_Imln"
 msgid "Returns the natural logarithm of a complex number"
 msgstr "Dychwelyd logarithm naturiol rhif cymhleth"
 
-#: analysis.hrc:409
+#: scaddins/inc/analysis.hrc:409
 msgctxt "ANALYSIS_Imln"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:410
+#: scaddins/inc/analysis.hrc:410
 msgctxt "ANALYSIS_Imln"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:415
+#: scaddins/inc/analysis.hrc:415
 msgctxt "ANALYSIS_Imlog10"
 msgid "Returns the base-10 logarithm of a complex number"
 msgstr "Dychwelyd logarithm base-10 rhif cymhleth"
 
-#: analysis.hrc:416
+#: scaddins/inc/analysis.hrc:416
 msgctxt "ANALYSIS_Imlog10"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:417
+#: scaddins/inc/analysis.hrc:417
 msgctxt "ANALYSIS_Imlog10"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:422
+#: scaddins/inc/analysis.hrc:422
 msgctxt "ANALYSIS_Imlog2"
 msgid "Returns the base-2 logarithm of a complex number"
 msgstr "Dychwelyd logarithm base-2 rhif cymhleth"
 
-#: analysis.hrc:423
+#: scaddins/inc/analysis.hrc:423
 msgctxt "ANALYSIS_Imlog2"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:424
+#: scaddins/inc/analysis.hrc:424
 msgctxt "ANALYSIS_Imlog2"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:429
+#: scaddins/inc/analysis.hrc:429
 msgctxt "ANALYSIS_Improduct"
 msgid "Returns the product of several complex numbers"
 msgstr "Dychwelyd cynnyrch nifer i rifau cymhleth"
 
-#: analysis.hrc:430 /home/cl/vc/git/libo-core/scaddins/inc/analysis.hrc:432
+#: scaddins/inc/analysis.hrc:430 scaddins/inc/analysis.hrc:432
 msgctxt "ANALYSIS_Improduct"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:431
+#: scaddins/inc/analysis.hrc:431
 msgctxt "ANALYSIS_Improduct"
 msgid "The first complex number"
 msgstr "Y rhif cymhleth cyntaf"
 
-#: analysis.hrc:433
+#: scaddins/inc/analysis.hrc:433
 msgctxt "ANALYSIS_Improduct"
 msgid "Another complex number"
 msgstr "Rhif cymhleth arall"
 
-#: analysis.hrc:438
+#: scaddins/inc/analysis.hrc:438
 msgctxt "ANALYSIS_Imreal"
 msgid "Returns the real coefficient of a complex number"
 msgstr "Dychwelyd y cyfernod real o rif cymhleth"
 
-#: analysis.hrc:439
+#: scaddins/inc/analysis.hrc:439
 msgctxt "ANALYSIS_Imreal"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:440
+#: scaddins/inc/analysis.hrc:440
 msgctxt "ANALYSIS_Imreal"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:445
+#: scaddins/inc/analysis.hrc:445
 msgctxt "ANALYSIS_Imsin"
 msgid "Returns the sine of a complex number"
 msgstr "Dychwelyd sin rhif cymhleth"
 
-#: analysis.hrc:446
+#: scaddins/inc/analysis.hrc:446
 msgctxt "ANALYSIS_Imsin"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:447
+#: scaddins/inc/analysis.hrc:447
 msgctxt "ANALYSIS_Imsin"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:452
+#: scaddins/inc/analysis.hrc:452
 msgctxt "ANALYSIS_Imsub"
 msgid "Returns the difference of two complex numbers"
 msgstr "Dychwelyd y gwahaniaeth o ddau rif cymhleth"
 
-#: analysis.hrc:453 /home/cl/vc/git/libo-core/scaddins/inc/analysis.hrc:454
+#: scaddins/inc/analysis.hrc:453 scaddins/inc/analysis.hrc:454
 msgctxt "ANALYSIS_Imsub"
 msgid "Complex number 1"
 msgstr "Rhif cymhleth 1"
 
-#: analysis.hrc:455 /home/cl/vc/git/libo-core/scaddins/inc/analysis.hrc:456
+#: scaddins/inc/analysis.hrc:455 scaddins/inc/analysis.hrc:456
 msgctxt "ANALYSIS_Imsub"
 msgid "Complex number 2"
 msgstr "Rhif cymhleth 2"
 
-#: analysis.hrc:461
+#: scaddins/inc/analysis.hrc:461
 msgctxt "ANALYSIS_Imsqrt"
 msgid "Returns the square root of a complex number"
 msgstr "Dychwelyd yr ail isradd o rif cymhleth"
 
-#: analysis.hrc:462
+#: scaddins/inc/analysis.hrc:462
 msgctxt "ANALYSIS_Imsqrt"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:463
+#: scaddins/inc/analysis.hrc:463
 msgctxt "ANALYSIS_Imsqrt"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:468
+#: scaddins/inc/analysis.hrc:468
 msgctxt "ANALYSIS_Imsum"
 msgid "Returns the sum of complex numbers"
 msgstr "Dychwelyd swm y rhifau cymhleth"
 
-#: analysis.hrc:469
+#: scaddins/inc/analysis.hrc:469
 msgctxt "ANALYSIS_Imsum"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:470
+#: scaddins/inc/analysis.hrc:470
 msgctxt "ANALYSIS_Imsum"
 msgid "The complex number"
 msgstr "Y rhif cymhleth"
 
-#: analysis.hrc:475
+#: scaddins/inc/analysis.hrc:475
 msgctxt "ANALYSIS_Imtan"
 msgid "Returns the tangent of a complex number"
 msgstr "Dychwelyd tangiad rhif cymhleth"
 
-#: analysis.hrc:476
+#: scaddins/inc/analysis.hrc:476
 msgctxt "ANALYSIS_Imtan"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:477
+#: scaddins/inc/analysis.hrc:477
 msgctxt "ANALYSIS_Imtan"
 msgid "A complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:482
+#: scaddins/inc/analysis.hrc:482
 msgctxt "ANALYSIS_Imsec"
 msgid "Returns the secant of a complex number"
 msgstr "Dychwelyd secant rhif cymhleth"
 
-#: analysis.hrc:483
+#: scaddins/inc/analysis.hrc:483
 msgctxt "ANALYSIS_Imsec"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:484
+#: scaddins/inc/analysis.hrc:484
 msgctxt "ANALYSIS_Imsec"
 msgid "A complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:489
+#: scaddins/inc/analysis.hrc:489
 msgctxt "ANALYSIS_Imcsc"
 msgid "Returns the cosecant of a complex number"
 msgstr "Dychwelyd cosecant rhif cymhleth"
 
-#: analysis.hrc:490
+#: scaddins/inc/analysis.hrc:490
 msgctxt "ANALYSIS_Imcsc"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:491
+#: scaddins/inc/analysis.hrc:491
 msgctxt "ANALYSIS_Imcsc"
 msgid "A complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:496
+#: scaddins/inc/analysis.hrc:496
 msgctxt "ANALYSIS_Imcot"
 msgid "Returns the cotangent of a complex number"
 msgstr "Dychwelyd cotangiad rhif cymhleth"
 
-#: analysis.hrc:497
+#: scaddins/inc/analysis.hrc:497
 msgctxt "ANALYSIS_Imcot"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:498
+#: scaddins/inc/analysis.hrc:498
 msgctxt "ANALYSIS_Imcot"
 msgid "A complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:503
+#: scaddins/inc/analysis.hrc:503
 msgctxt "ANALYSIS_Imsinh"
 msgid "Returns the hyperbolic sine of a complex number"
 msgstr "Dychwelyd sin hyperbolig rhif cymhleth"
 
-#: analysis.hrc:504
+#: scaddins/inc/analysis.hrc:504
 msgctxt "ANALYSIS_Imsinh"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:505
+#: scaddins/inc/analysis.hrc:505
 msgctxt "ANALYSIS_Imsinh"
 msgid "A complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:510
+#: scaddins/inc/analysis.hrc:510
 msgctxt "ANALYSIS_Imcosh"
 msgid "Returns the hyperbolic cosine of a complex number"
 msgstr "Dychwelyd cosin hyperbolig rhif cymhleth"
 
-#: analysis.hrc:511
+#: scaddins/inc/analysis.hrc:511
 msgctxt "ANALYSIS_Imcosh"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:512
+#: scaddins/inc/analysis.hrc:512
 msgctxt "ANALYSIS_Imcosh"
 msgid "A complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:517
+#: scaddins/inc/analysis.hrc:517
 msgctxt "ANALYSIS_Imsech"
 msgid "Returns the hyperbolic secant of a complex number"
 msgstr "Dychwelyd secant hyperbolig rhif cymhleth"
 
-#: analysis.hrc:518
+#: scaddins/inc/analysis.hrc:518
 msgctxt "ANALYSIS_Imsech"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:519
+#: scaddins/inc/analysis.hrc:519
 msgctxt "ANALYSIS_Imsech"
 msgid "A complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:524
+#: scaddins/inc/analysis.hrc:524
 msgctxt "ANALYSIS_Imcsch"
 msgid "Returns the hyperbolic cosecant of a complex number"
 msgstr "Dychwelyd cosecant hyperbolig rhif cymhleth"
 
-#: analysis.hrc:525
+#: scaddins/inc/analysis.hrc:525
 msgctxt "ANALYSIS_Imcsch"
 msgid "Complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:526
+#: scaddins/inc/analysis.hrc:526
 msgctxt "ANALYSIS_Imcsch"
 msgid "A complex number"
 msgstr "Rhif cymhleth"
 
-#: analysis.hrc:531
+#: scaddins/inc/analysis.hrc:531
 msgctxt "ANALYSIS_Complex"
 msgid "Converts real and imaginary coefficients into a complex number"
 msgstr "Trosi cyfeirnodau real a dychmygol i rif cymhleth"
 
-#: analysis.hrc:532
+#: scaddins/inc/analysis.hrc:532
 msgctxt "ANALYSIS_Complex"
 msgid "Real num"
 msgstr "Num real"
 
-#: analysis.hrc:533
+#: scaddins/inc/analysis.hrc:533
 msgctxt "ANALYSIS_Complex"
 msgid "The real coefficient"
 msgstr "Cyfeirnod real"
 
-#: analysis.hrc:534
+#: scaddins/inc/analysis.hrc:534
 msgctxt "ANALYSIS_Complex"
 msgid "I num"
 msgstr "I num"
 
-#: analysis.hrc:535
+#: scaddins/inc/analysis.hrc:535
 msgctxt "ANALYSIS_Complex"
 msgid "The imaginary coefficient"
 msgstr "Cyfernod dychmygol"
 
-#: analysis.hrc:536
+#: scaddins/inc/analysis.hrc:536
 msgctxt "ANALYSIS_Complex"
 msgid "Suffix"
 msgstr "Olddodiad"
 
-#: analysis.hrc:537
+#: scaddins/inc/analysis.hrc:537
 msgctxt "ANALYSIS_Complex"
 msgid "The suffix"
 msgstr "Yr olddodiad"
 
-#: analysis.hrc:542
+#: scaddins/inc/analysis.hrc:542
 msgctxt "ANALYSIS_Convert"
 msgid "Converts a number from one measurement system to another"
 msgstr "Trosi rhif o un system fesur i un arall"
 
-#: analysis.hrc:543
+#: scaddins/inc/analysis.hrc:543
 msgctxt "ANALYSIS_Convert"
 msgid "Number"
 msgstr "Rhif"
 
-#: analysis.hrc:544
+#: scaddins/inc/analysis.hrc:544
 msgctxt "ANALYSIS_Convert"
 msgid "The number"
 msgstr "Y rhif"
 
-#: analysis.hrc:545
+#: scaddins/inc/analysis.hrc:545
 msgctxt "ANALYSIS_Convert"
 msgid "From unit"
 msgstr "O uned"
 
-#: analysis.hrc:546
+#: scaddins/inc/analysis.hrc:546
 msgctxt "ANALYSIS_Convert"
 msgid "Unit of measure for number"
 msgstr "Uned fesur ar gyfer rhif"
 
-#: analysis.hrc:547
+#: scaddins/inc/analysis.hrc:547
 msgctxt "ANALYSIS_Convert"
 msgid "To unit"
 msgstr "I uned"
 
-#: analysis.hrc:548
+#: scaddins/inc/analysis.hrc:548
 msgctxt "ANALYSIS_Convert"
 msgid "Unit of measure for the result"
 msgstr "Uned fesur ar gyfer y canlyniad"
 
-#: analysis.hrc:553
+#: scaddins/inc/analysis.hrc:553
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Returns the prorated linear depreciation of an asset for each accounting period"
 msgstr "Dychwelyd dibrisiad llinol cyfraddio ased ar gyfer pob cyfnod cyfrifo"
 
-#: analysis.hrc:554
+#: scaddins/inc/analysis.hrc:554
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Cost"
 msgstr "Cost"
 
-#: analysis.hrc:555
+#: scaddins/inc/analysis.hrc:555
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Cost of the asset"
 msgstr "Cost yr ased"
 
-#: analysis.hrc:556
+#: scaddins/inc/analysis.hrc:556
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Date purchased"
 msgstr "Dyddiad prynwyd"
 
-#: analysis.hrc:557
+#: scaddins/inc/analysis.hrc:557
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Purchase date of the asset"
 msgstr "Dyddiad prynu'r ased"
 
-#: analysis.hrc:558
+#: scaddins/inc/analysis.hrc:558
 msgctxt "ANALYSIS_Amordegrc"
 msgid "First period"
 msgstr "Cyfnod cyntaf"
 
-#: analysis.hrc:559
+#: scaddins/inc/analysis.hrc:559
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Date the first period ends"
 msgstr "Dyddiad diwedd y cyfnod cyntaf"
 
-#: analysis.hrc:560
+#: scaddins/inc/analysis.hrc:560
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Salvage"
 msgstr "Achubiad"
 
-#: analysis.hrc:561
+#: scaddins/inc/analysis.hrc:561
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Salvage value of an asset at the end of its life"
 msgstr "Gwerth achubiad ased ar ddiwedd ei oes"
 
-#: analysis.hrc:562
+#: scaddins/inc/analysis.hrc:562
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Period"
 msgstr "Cyfnod"
 
-#: analysis.hrc:563
+#: scaddins/inc/analysis.hrc:563
 msgctxt "ANALYSIS_Amordegrc"
 msgid "The period"
 msgstr "Y cyfnod"
 
-#: analysis.hrc:564
+#: scaddins/inc/analysis.hrc:564
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:565
+#: scaddins/inc/analysis.hrc:565
 msgctxt "ANALYSIS_Amordegrc"
 msgid "The rate of depreciation"
 msgstr "Cyfradd dibrisio"
 
-#: analysis.hrc:566
+#: scaddins/inc/analysis.hrc:566
 msgctxt "ANALYSIS_Amordegrc"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:567
+#: scaddins/inc/analysis.hrc:567
 msgctxt "ANALYSIS_Amordegrc"
 msgid "The year basis to be used"
 msgstr "Y sail blwyddyn i'w ddefnyddio"
 
-#: analysis.hrc:572
+#: scaddins/inc/analysis.hrc:572
 msgctxt "ANALYSIS_Amorlinc"
 msgid "Returns the prorated linear depreciation of an asset for each accounting period"
 msgstr "Dychwelyd dibrisiad llinol cyfraddio ased ar gyfer pob cyfnod cyfrifo"
 
-#: analysis.hrc:573
+#: scaddins/inc/analysis.hrc:573
 msgctxt "ANALYSIS_Amorlinc"
 msgid "Cost"
 msgstr "Cost"
 
-#: analysis.hrc:574
+#: scaddins/inc/analysis.hrc:574
 msgctxt "ANALYSIS_Amorlinc"
 msgid "Cost of the asset"
 msgstr "Cost yr ased"
 
-#: analysis.hrc:575
+#: scaddins/inc/analysis.hrc:575
 msgctxt "ANALYSIS_Amorlinc"
 msgid "Date purchased"
 msgstr "Dyddiad prynwyd"
 
-#: analysis.hrc:576
+#: scaddins/inc/analysis.hrc:576
 msgctxt "ANALYSIS_Amorlinc"
 msgid "Purchase date of the asset"
 msgstr "Dyddiad prynu'r ased"
 
-#: analysis.hrc:577
+#: scaddins/inc/analysis.hrc:577
 msgctxt "ANALYSIS_Amorlinc"
 msgid "First period"
 msgstr "Cyfnod cyntaf"
 
-#: analysis.hrc:578
+#: scaddins/inc/analysis.hrc:578
 msgctxt "ANALYSIS_Amorlinc"
 msgid "The date the first period ends"
 msgstr "Dyddiad diwedd y cyfnod cyntaf"
 
-#: analysis.hrc:579
+#: scaddins/inc/analysis.hrc:579
 msgctxt "ANALYSIS_Amorlinc"
 msgid "Salvage"
 msgstr "Achubiad"
 
-#: analysis.hrc:580
+#: scaddins/inc/analysis.hrc:580
 msgctxt "ANALYSIS_Amorlinc"
 msgid "The salvage value of an asset at the end of its life"
 msgstr "Gwerth achubiad ased ar ddiwedd ei oes"
 
-#: analysis.hrc:581
+#: scaddins/inc/analysis.hrc:581
 msgctxt "ANALYSIS_Amorlinc"
 msgid "Period"
 msgstr "Cyfnod"
 
-#: analysis.hrc:582
+#: scaddins/inc/analysis.hrc:582
 msgctxt "ANALYSIS_Amorlinc"
 msgid "The period"
 msgstr "Y cyfnod"
 
-#: analysis.hrc:583
+#: scaddins/inc/analysis.hrc:583
 msgctxt "ANALYSIS_Amorlinc"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:584
+#: scaddins/inc/analysis.hrc:584
 msgctxt "ANALYSIS_Amorlinc"
 msgid "The rate of depreciation"
 msgstr "Cyfradd dibrisio"
 
-#: analysis.hrc:585
+#: scaddins/inc/analysis.hrc:585
 msgctxt "ANALYSIS_Amorlinc"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:586
+#: scaddins/inc/analysis.hrc:586
 msgctxt "ANALYSIS_Amorlinc"
 msgid "The year basis to be used"
 msgstr "Y sail blwyddyn i'w ddefnyddio"
 
-#: analysis.hrc:591
+#: scaddins/inc/analysis.hrc:591
 msgctxt "ANALYSIS_Accrint"
 msgid "Returns the accrued interest for a security that pays periodic interest"
 msgstr "Dychwelyd y llog cronni am warant sy'n talu llog cyfnodol"
 
-#: analysis.hrc:592
+#: scaddins/inc/analysis.hrc:592
 msgctxt "ANALYSIS_Accrint"
 msgid "Issue"
 msgstr "Cyhoeddi"
 
-#: analysis.hrc:593
+#: scaddins/inc/analysis.hrc:593
 msgctxt "ANALYSIS_Accrint"
 msgid "Issue date of the security"
 msgstr "Dyddiad cyhoeddi'r warant"
 
-#: analysis.hrc:594
+#: scaddins/inc/analysis.hrc:594
 msgctxt "ANALYSIS_Accrint"
 msgid "First interest"
 msgstr "Llog cyntaf"
 
-#: analysis.hrc:595
+#: scaddins/inc/analysis.hrc:595
 msgctxt "ANALYSIS_Accrint"
 msgid "First interest date of the security"
 msgstr "Dyddiad cyntaf llog y warant"
 
-#: analysis.hrc:596
+#: scaddins/inc/analysis.hrc:596
 msgctxt "ANALYSIS_Accrint"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:597
+#: scaddins/inc/analysis.hrc:597
 msgctxt "ANALYSIS_Accrint"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:598
+#: scaddins/inc/analysis.hrc:598
 msgctxt "ANALYSIS_Accrint"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:599
+#: scaddins/inc/analysis.hrc:599
 msgctxt "ANALYSIS_Accrint"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:600
+#: scaddins/inc/analysis.hrc:600
 msgctxt "ANALYSIS_Accrint"
 msgid "Par"
 msgstr "Llawn werth"
 
-#: analysis.hrc:601
+#: scaddins/inc/analysis.hrc:601
 msgctxt "ANALYSIS_Accrint"
 msgid "The par value"
 msgstr "Gwerth llawn werth"
 
-#: analysis.hrc:602
+#: scaddins/inc/analysis.hrc:602
 msgctxt "ANALYSIS_Accrint"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:603
+#: scaddins/inc/analysis.hrc:603
 msgctxt "ANALYSIS_Accrint"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:604
+#: scaddins/inc/analysis.hrc:604
 msgctxt "ANALYSIS_Accrint"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:605
+#: scaddins/inc/analysis.hrc:605
 msgctxt "ANALYSIS_Accrint"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:610
+#: scaddins/inc/analysis.hrc:610
 msgctxt "ANALYSIS_Accrintm"
 msgid "Returns the accrued interest for a security that pays interest at maturity"
 msgstr "Dychwelyd y llog cronni am warant sy'n talu llog wedi aeddfedu"
 
-#: analysis.hrc:611
+#: scaddins/inc/analysis.hrc:611
 msgctxt "ANALYSIS_Accrintm"
 msgid "Issue"
 msgstr "Cyhoeddi"
 
-#: analysis.hrc:612
+#: scaddins/inc/analysis.hrc:612
 msgctxt "ANALYSIS_Accrintm"
 msgid "The issue date"
 msgstr "Dyddiad y cyhoeddiad"
 
-#: analysis.hrc:613
+#: scaddins/inc/analysis.hrc:613
 msgctxt "ANALYSIS_Accrintm"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:614
+#: scaddins/inc/analysis.hrc:614
 msgctxt "ANALYSIS_Accrintm"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:615
+#: scaddins/inc/analysis.hrc:615
 msgctxt "ANALYSIS_Accrintm"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:616
+#: scaddins/inc/analysis.hrc:616
 msgctxt "ANALYSIS_Accrintm"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:617
+#: scaddins/inc/analysis.hrc:617
 msgctxt "ANALYSIS_Accrintm"
 msgid "Par"
 msgstr "Llawn werth"
 
-#: analysis.hrc:618
+#: scaddins/inc/analysis.hrc:618
 msgctxt "ANALYSIS_Accrintm"
 msgid "The par value"
 msgstr "Gwerth llawn werth"
 
-#: analysis.hrc:619
+#: scaddins/inc/analysis.hrc:619
 msgctxt "ANALYSIS_Accrintm"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:620
+#: scaddins/inc/analysis.hrc:620
 msgctxt "ANALYSIS_Accrintm"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:625
+#: scaddins/inc/analysis.hrc:625
 msgctxt "ANALYSIS_Received"
 msgid "Returns the amount paid out at maturity for a fully invested security"
 msgstr "Dychwelyd y swm talwyd ar aeddfedrwydd am warant buddsoddiad llawn"
 
-#: analysis.hrc:626
+#: scaddins/inc/analysis.hrc:626
 msgctxt "ANALYSIS_Received"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:627
+#: scaddins/inc/analysis.hrc:627
 msgctxt "ANALYSIS_Received"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:628
+#: scaddins/inc/analysis.hrc:628
 msgctxt "ANALYSIS_Received"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:629
+#: scaddins/inc/analysis.hrc:629
 msgctxt "ANALYSIS_Received"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:630
+#: scaddins/inc/analysis.hrc:630
 msgctxt "ANALYSIS_Received"
 msgid "Investment"
 msgstr "Buddsoddiad"
 
-#: analysis.hrc:631
+#: scaddins/inc/analysis.hrc:631
 msgctxt "ANALYSIS_Received"
 msgid "The investment"
 msgstr "Y buddsoddiad"
 
-#: analysis.hrc:632
+#: scaddins/inc/analysis.hrc:632
 msgctxt "ANALYSIS_Received"
 msgid "Discount"
 msgstr "Disgownt"
 
-#: analysis.hrc:633
+#: scaddins/inc/analysis.hrc:633
 msgctxt "ANALYSIS_Received"
 msgid "The discount"
 msgstr "Y disgownt"
 
-#: analysis.hrc:634
+#: scaddins/inc/analysis.hrc:634
 msgctxt "ANALYSIS_Received"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:635
+#: scaddins/inc/analysis.hrc:635
 msgctxt "ANALYSIS_Received"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:640
+#: scaddins/inc/analysis.hrc:640
 msgctxt "ANALYSIS_Disc"
 msgid "Returns the discount rate for a security"
 msgstr "Dychwelyd cyfradd disgownt ar gyfer y warant"
 
-#: analysis.hrc:641
+#: scaddins/inc/analysis.hrc:641
 msgctxt "ANALYSIS_Disc"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:642
+#: scaddins/inc/analysis.hrc:642
 msgctxt "ANALYSIS_Disc"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:643
+#: scaddins/inc/analysis.hrc:643
 msgctxt "ANALYSIS_Disc"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:644
+#: scaddins/inc/analysis.hrc:644
 msgctxt "ANALYSIS_Disc"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:645
+#: scaddins/inc/analysis.hrc:645
 msgctxt "ANALYSIS_Disc"
 msgid "Price"
 msgstr "Pris"
 
-#: analysis.hrc:646
+#: scaddins/inc/analysis.hrc:646
 msgctxt "ANALYSIS_Disc"
 msgid "The price"
 msgstr "Y pris"
 
-#: analysis.hrc:647
+#: scaddins/inc/analysis.hrc:647
 msgctxt "ANALYSIS_Disc"
 msgid "Redemption"
 msgstr "Adbryniant"
 
-#: analysis.hrc:648
+#: scaddins/inc/analysis.hrc:648
 msgctxt "ANALYSIS_Disc"
 msgid "The redemption value"
 msgstr "Y gwerth adbryniant"
 
-#: analysis.hrc:649
+#: scaddins/inc/analysis.hrc:649
 msgctxt "ANALYSIS_Disc"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:650
+#: scaddins/inc/analysis.hrc:650
 msgctxt "ANALYSIS_Disc"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:655
+#: scaddins/inc/analysis.hrc:655
 msgctxt "ANALYSIS_Duration"
 msgid "Returns the annual Macaulay duration of a security with periodic interest payments"
 msgstr "Dychwelyd gwarant parhad Macaulay blynyddol gyda thaliadau llog cyfnodol"
 
-#: analysis.hrc:656
+#: scaddins/inc/analysis.hrc:656
 msgctxt "ANALYSIS_Duration"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:657
+#: scaddins/inc/analysis.hrc:657
 msgctxt "ANALYSIS_Duration"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:658
+#: scaddins/inc/analysis.hrc:658
 msgctxt "ANALYSIS_Duration"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:659
+#: scaddins/inc/analysis.hrc:659
 msgctxt "ANALYSIS_Duration"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:660
+#: scaddins/inc/analysis.hrc:660
 msgctxt "ANALYSIS_Duration"
 msgid "Coupon"
 msgstr "Cwpon"
 
-#: analysis.hrc:661
+#: scaddins/inc/analysis.hrc:661
 msgctxt "ANALYSIS_Duration"
 msgid "The coupon rate"
 msgstr "Cyfradd cwpon"
 
-#: analysis.hrc:662
+#: scaddins/inc/analysis.hrc:662
 msgctxt "ANALYSIS_Duration"
 msgid "Yield"
 msgstr "Cynnyrch"
 
-#: analysis.hrc:663
+#: scaddins/inc/analysis.hrc:663
 msgctxt "ANALYSIS_Duration"
 msgid "The yield"
 msgstr "Y cynnyrch"
 
-#: analysis.hrc:664
+#: scaddins/inc/analysis.hrc:664
 msgctxt "ANALYSIS_Duration"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:665
+#: scaddins/inc/analysis.hrc:665
 msgctxt "ANALYSIS_Duration"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:666
+#: scaddins/inc/analysis.hrc:666
 msgctxt "ANALYSIS_Duration"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:667
+#: scaddins/inc/analysis.hrc:667
 msgctxt "ANALYSIS_Duration"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:672
+#: scaddins/inc/analysis.hrc:672
 msgctxt "ANALYSIS_Effect"
 msgid "Returns the effective annual interest rate"
 msgstr "Dychwelyd gyfradd llog blynyddol effeithiol"
 
-#: analysis.hrc:673
+#: scaddins/inc/analysis.hrc:673
 msgctxt "ANALYSIS_Effect"
 msgid "Nominal rate"
 msgstr "Cyfradd enwol"
 
-#: analysis.hrc:674
+#: scaddins/inc/analysis.hrc:674
 msgctxt "ANALYSIS_Effect"
 msgid "The nominal rate"
 msgstr "Y raddfa enwol"
 
-#: analysis.hrc:675
+#: scaddins/inc/analysis.hrc:675
 msgctxt "ANALYSIS_Effect"
 msgid "Npery"
 msgstr "Npery"
 
-#: analysis.hrc:676
+#: scaddins/inc/analysis.hrc:676
 msgctxt "ANALYSIS_Effect"
 msgid "The periods"
 msgstr "Y cyfnodau"
 
-#: analysis.hrc:681
+#: scaddins/inc/analysis.hrc:681
 msgctxt "ANALYSIS_Cumprinc"
 msgid "Returns the cumulative principal on a loan to be paid between two periods"
 msgstr "Dychwelyd y prifswm cronnus ar fenthyciad i'w dalu rhwng dau gyfnod"
 
-#: analysis.hrc:682
+#: scaddins/inc/analysis.hrc:682
 msgctxt "ANALYSIS_Cumprinc"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:683
+#: scaddins/inc/analysis.hrc:683
 msgctxt "ANALYSIS_Cumprinc"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:684
+#: scaddins/inc/analysis.hrc:684
 msgctxt "ANALYSIS_Cumprinc"
 msgid "Nper"
 msgstr "Nper"
 
-#: analysis.hrc:685
+#: scaddins/inc/analysis.hrc:685
 msgctxt "ANALYSIS_Cumprinc"
 msgid "Number of payment periods"
 msgstr "Nifer y cyfnodau talu"
 
-#: analysis.hrc:686
+#: scaddins/inc/analysis.hrc:686
 msgctxt "ANALYSIS_Cumprinc"
 msgid "Pv"
 msgstr "Pv"
 
-#: analysis.hrc:687
+#: scaddins/inc/analysis.hrc:687
 msgctxt "ANALYSIS_Cumprinc"
 msgid "The present value"
 msgstr "Y gwerth presennol"
 
-#: analysis.hrc:688
+#: scaddins/inc/analysis.hrc:688
 msgctxt "ANALYSIS_Cumprinc"
 msgid "Start period"
 msgstr "Cyfnod cychwyn"
 
-#: analysis.hrc:689
+#: scaddins/inc/analysis.hrc:689
 msgctxt "ANALYSIS_Cumprinc"
 msgid "The start period"
 msgstr "Y cyfnod cychwyn"
 
-#: analysis.hrc:690
+#: scaddins/inc/analysis.hrc:690
 msgctxt "ANALYSIS_Cumprinc"
 msgid "End period"
 msgstr "Cyfnod diweddu"
 
-#: analysis.hrc:691
+#: scaddins/inc/analysis.hrc:691
 msgctxt "ANALYSIS_Cumprinc"
 msgid "The end period"
 msgstr "Y cyfnod diweddu"
 
-#: analysis.hrc:692
+#: scaddins/inc/analysis.hrc:692
 msgctxt "ANALYSIS_Cumprinc"
 msgid "Type"
 msgstr "Math"
 
-#: analysis.hrc:693
+#: scaddins/inc/analysis.hrc:693
 msgctxt "ANALYSIS_Cumprinc"
 msgid "The type of maturity"
 msgstr "Math o aeddfedrwydd"
 
-#: analysis.hrc:698
+#: scaddins/inc/analysis.hrc:698
 msgctxt "ANALYSIS_Cumipmt"
 msgid "Returns the cumulative interest to be paid between two periods"
 msgstr "Dychwelyd llog cronnus i'w dalu rhwng dau gyfnod"
 
-#: analysis.hrc:699
+#: scaddins/inc/analysis.hrc:699
 msgctxt "ANALYSIS_Cumipmt"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:700
+#: scaddins/inc/analysis.hrc:700
 msgctxt "ANALYSIS_Cumipmt"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:701
+#: scaddins/inc/analysis.hrc:701
 msgctxt "ANALYSIS_Cumipmt"
 msgid "Nper"
 msgstr "Nper"
 
-#: analysis.hrc:702
+#: scaddins/inc/analysis.hrc:702
 msgctxt "ANALYSIS_Cumipmt"
 msgid "Number of payment periods"
 msgstr "Nifer y cyfnodau talu"
 
-#: analysis.hrc:703
+#: scaddins/inc/analysis.hrc:703
 msgctxt "ANALYSIS_Cumipmt"
 msgid "Pv"
 msgstr "Pv"
 
-#: analysis.hrc:704
+#: scaddins/inc/analysis.hrc:704
 msgctxt "ANALYSIS_Cumipmt"
 msgid "The present value"
 msgstr "Y gwerth presennol"
 
-#: analysis.hrc:705
+#: scaddins/inc/analysis.hrc:705
 msgctxt "ANALYSIS_Cumipmt"
 msgid "Start period"
 msgstr "Cyfnod cychwyn"
 
-#: analysis.hrc:706
+#: scaddins/inc/analysis.hrc:706
 msgctxt "ANALYSIS_Cumipmt"
 msgid "The start period"
 msgstr "Y cyfnod cychwyn"
 
-#: analysis.hrc:707
+#: scaddins/inc/analysis.hrc:707
 msgctxt "ANALYSIS_Cumipmt"
 msgid "End period"
 msgstr "Cyfnod diweddu"
 
-#: analysis.hrc:708
+#: scaddins/inc/analysis.hrc:708
 msgctxt "ANALYSIS_Cumipmt"
 msgid "The end period"
 msgstr "Y cyfnod diweddu"
 
-#: analysis.hrc:709
+#: scaddins/inc/analysis.hrc:709
 msgctxt "ANALYSIS_Cumipmt"
 msgid "Type"
 msgstr "Math"
 
-#: analysis.hrc:710
+#: scaddins/inc/analysis.hrc:710
 msgctxt "ANALYSIS_Cumipmt"
 msgid "The type of maturity"
 msgstr "Math o aeddfedrwydd"
 
-#: analysis.hrc:715
+#: scaddins/inc/analysis.hrc:715
 msgctxt "ANALYSIS_Price"
 msgid "Returns the price per 100 currency units face value of a security that pays periodic interest"
 msgstr "Dychwelyd pris wynebwerth 100 uned arian am warant sy'n talu llog cyfnodol"
 
-#: analysis.hrc:716
+#: scaddins/inc/analysis.hrc:716
 msgctxt "ANALYSIS_Price"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:717
+#: scaddins/inc/analysis.hrc:717
 msgctxt "ANALYSIS_Price"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:718
+#: scaddins/inc/analysis.hrc:718
 msgctxt "ANALYSIS_Price"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:719
+#: scaddins/inc/analysis.hrc:719
 msgctxt "ANALYSIS_Price"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:720
+#: scaddins/inc/analysis.hrc:720
 msgctxt "ANALYSIS_Price"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:721
+#: scaddins/inc/analysis.hrc:721
 msgctxt "ANALYSIS_Price"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:722
+#: scaddins/inc/analysis.hrc:722
 msgctxt "ANALYSIS_Price"
 msgid "Yield"
 msgstr "Cynnyrch"
 
-#: analysis.hrc:723
+#: scaddins/inc/analysis.hrc:723
 msgctxt "ANALYSIS_Price"
 msgid "The yield"
 msgstr "Y cynnyrch"
 
-#: analysis.hrc:724
+#: scaddins/inc/analysis.hrc:724
 msgctxt "ANALYSIS_Price"
 msgid "Redemption"
 msgstr "Adbryniant"
 
-#: analysis.hrc:725
+#: scaddins/inc/analysis.hrc:725
 msgctxt "ANALYSIS_Price"
 msgid "The redemption value"
 msgstr "Y gwerth adbryniant"
 
-#: analysis.hrc:726
+#: scaddins/inc/analysis.hrc:726
 msgctxt "ANALYSIS_Price"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:727
+#: scaddins/inc/analysis.hrc:727
 msgctxt "ANALYSIS_Price"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:728
+#: scaddins/inc/analysis.hrc:728
 msgctxt "ANALYSIS_Price"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:729
+#: scaddins/inc/analysis.hrc:729
 msgctxt "ANALYSIS_Price"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:734
+#: scaddins/inc/analysis.hrc:734
 msgctxt "ANALYSIS_Pricedisc"
 msgid "Returns the price per 100 currency units face value of a discounted security"
 msgstr "Dychwelyd pris wynebwerth uned 100 arian o warant wedi cael disgownt"
 
-#: analysis.hrc:735
+#: scaddins/inc/analysis.hrc:735
 msgctxt "ANALYSIS_Pricedisc"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:736
+#: scaddins/inc/analysis.hrc:736
 msgctxt "ANALYSIS_Pricedisc"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:737
+#: scaddins/inc/analysis.hrc:737
 msgctxt "ANALYSIS_Pricedisc"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:738
+#: scaddins/inc/analysis.hrc:738
 msgctxt "ANALYSIS_Pricedisc"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:739
+#: scaddins/inc/analysis.hrc:739
 msgctxt "ANALYSIS_Pricedisc"
 msgid "Discount"
 msgstr "Disgownt"
 
-#: analysis.hrc:740
+#: scaddins/inc/analysis.hrc:740
 msgctxt "ANALYSIS_Pricedisc"
 msgid "The discount"
 msgstr "Y disgownt"
 
-#: analysis.hrc:741
+#: scaddins/inc/analysis.hrc:741
 msgctxt "ANALYSIS_Pricedisc"
 msgid "Redemption"
 msgstr "Adbryniant"
 
-#: analysis.hrc:742
+#: scaddins/inc/analysis.hrc:742
 msgctxt "ANALYSIS_Pricedisc"
 msgid "The redemption value"
 msgstr "Y gwerth adbryniant"
 
-#: analysis.hrc:743
+#: scaddins/inc/analysis.hrc:743
 msgctxt "ANALYSIS_Pricedisc"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:744
+#: scaddins/inc/analysis.hrc:744
 msgctxt "ANALYSIS_Pricedisc"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:749
+#: scaddins/inc/analysis.hrc:749
 msgctxt "ANALYSIS_Pricemat"
 msgid "Returns the price per 100 currency units face value of a security that pays interest at maturity"
 msgstr "Dychwelyd pris wynebwerth 100 uned arian am warant sy'n talu llog wedi aeddfedu"
 
-#: analysis.hrc:750
+#: scaddins/inc/analysis.hrc:750
 msgctxt "ANALYSIS_Pricemat"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:751
+#: scaddins/inc/analysis.hrc:751
 msgctxt "ANALYSIS_Pricemat"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:752
+#: scaddins/inc/analysis.hrc:752
 msgctxt "ANALYSIS_Pricemat"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:753
+#: scaddins/inc/analysis.hrc:753
 msgctxt "ANALYSIS_Pricemat"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:754
+#: scaddins/inc/analysis.hrc:754
 msgctxt "ANALYSIS_Pricemat"
 msgid "Issue"
 msgstr "Cyhoeddi"
 
-#: analysis.hrc:755
+#: scaddins/inc/analysis.hrc:755
 msgctxt "ANALYSIS_Pricemat"
 msgid "The issue date"
 msgstr "Dyddiad y cyhoeddiad"
 
-#: analysis.hrc:756
+#: scaddins/inc/analysis.hrc:756
 msgctxt "ANALYSIS_Pricemat"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:757
+#: scaddins/inc/analysis.hrc:757
 msgctxt "ANALYSIS_Pricemat"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:758
+#: scaddins/inc/analysis.hrc:758
 msgctxt "ANALYSIS_Pricemat"
 msgid "Yield"
 msgstr "Cynnyrch"
 
-#: analysis.hrc:759
+#: scaddins/inc/analysis.hrc:759
 msgctxt "ANALYSIS_Pricemat"
 msgid "The yield"
 msgstr "Y cynnyrch"
 
-#: analysis.hrc:760
+#: scaddins/inc/analysis.hrc:760
 msgctxt "ANALYSIS_Pricemat"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:761
+#: scaddins/inc/analysis.hrc:761
 msgctxt "ANALYSIS_Pricemat"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:766
+#: scaddins/inc/analysis.hrc:766
 msgctxt "ANALYSIS_Mduration"
 msgid "Returns the Macaulay modified duration for a security with an assumed par value of 100 currency units"
 msgstr "Dychwelyd parhad addasiad Macauley am warant gyda gwerth llawn tybiedig o 100 uned arian"
 
-#: analysis.hrc:767
+#: scaddins/inc/analysis.hrc:767
 msgctxt "ANALYSIS_Mduration"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:768
+#: scaddins/inc/analysis.hrc:768
 msgctxt "ANALYSIS_Mduration"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:769
+#: scaddins/inc/analysis.hrc:769
 msgctxt "ANALYSIS_Mduration"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:770
+#: scaddins/inc/analysis.hrc:770
 msgctxt "ANALYSIS_Mduration"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:771
+#: scaddins/inc/analysis.hrc:771
 msgctxt "ANALYSIS_Mduration"
 msgid "Coupon"
 msgstr "Cwpon"
 
-#: analysis.hrc:772
+#: scaddins/inc/analysis.hrc:772
 msgctxt "ANALYSIS_Mduration"
 msgid "The coupon rate"
 msgstr "Cyfradd cwpon"
 
-#: analysis.hrc:773
+#: scaddins/inc/analysis.hrc:773
 msgctxt "ANALYSIS_Mduration"
 msgid "Yield"
 msgstr "Cynnyrch"
 
-#: analysis.hrc:774
+#: scaddins/inc/analysis.hrc:774
 msgctxt "ANALYSIS_Mduration"
 msgid "The yield"
 msgstr "Y cynnyrch"
 
-#: analysis.hrc:775
+#: scaddins/inc/analysis.hrc:775
 msgctxt "ANALYSIS_Mduration"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:776
+#: scaddins/inc/analysis.hrc:776
 msgctxt "ANALYSIS_Mduration"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:777
+#: scaddins/inc/analysis.hrc:777
 msgctxt "ANALYSIS_Mduration"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:778
+#: scaddins/inc/analysis.hrc:778
 msgctxt "ANALYSIS_Mduration"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:783
+#: scaddins/inc/analysis.hrc:783
 msgctxt "ANALYSIS_Nominal"
 msgid "Returns the annual nominal interest rate"
 msgstr "Dychwelyd graddfa llog blynyddol effeithiol"
 
-#: analysis.hrc:784
+#: scaddins/inc/analysis.hrc:784
 msgctxt "ANALYSIS_Nominal"
 msgid "Effective rate"
 msgstr "Graddfa effeithiol"
 
-#: analysis.hrc:785
+#: scaddins/inc/analysis.hrc:785
 msgctxt "ANALYSIS_Nominal"
 msgid "The effective interest rate"
 msgstr "Y raddfa llog real"
 
-#: analysis.hrc:786
+#: scaddins/inc/analysis.hrc:786
 msgctxt "ANALYSIS_Nominal"
 msgid "Npery"
 msgstr "Npery"
 
-#: analysis.hrc:787
+#: scaddins/inc/analysis.hrc:787
 msgctxt "ANALYSIS_Nominal"
 msgid "The periods"
 msgstr "Y cyfnodau"
 
-#: analysis.hrc:792
+#: scaddins/inc/analysis.hrc:792
 msgctxt "ANALYSIS_Dollarfr"
 msgid "Converts a price expressed as a decimal into a price expressed as a fraction"
 msgstr "Trosi pris wedi ei fynegi fel degol i bris wedi ei fynegi fel ffracsiwn"
 
-#: analysis.hrc:793
+#: scaddins/inc/analysis.hrc:793
 msgctxt "ANALYSIS_Dollarfr"
 msgid "Decimal dollar"
 msgstr "Dollar degol"
 
-#: analysis.hrc:794
+#: scaddins/inc/analysis.hrc:794
 msgctxt "ANALYSIS_Dollarfr"
 msgid "The decimal number"
 msgstr "Y rhif degol"
 
-#: analysis.hrc:795
+#: scaddins/inc/analysis.hrc:795
 msgctxt "ANALYSIS_Dollarfr"
 msgid "Fraction"
 msgstr "Ffracsiwn"
 
-#: analysis.hrc:796
+#: scaddins/inc/analysis.hrc:796
 msgctxt "ANALYSIS_Dollarfr"
 msgid "The divisor"
 msgstr "Y rhannydd"
 
-#: analysis.hrc:801
+#: scaddins/inc/analysis.hrc:801
 msgctxt "ANALYSIS_Dollarde"
 msgid "Converts a price expressed as a fraction into a price expressed as a decimal"
 msgstr "Trosi pris wedi ei fynegi fel ffracsiwn i bris wedi ei fynegi fel degol"
 
-#: analysis.hrc:802
+#: scaddins/inc/analysis.hrc:802
 msgctxt "ANALYSIS_Dollarde"
 msgid "Fractional dollar"
 msgstr "Doller ffracsiynol"
 
-#: analysis.hrc:803
+#: scaddins/inc/analysis.hrc:803
 msgctxt "ANALYSIS_Dollarde"
 msgid "The number as a fraction"
 msgstr "Rhif fel ffracsiwn"
 
-#: analysis.hrc:804
+#: scaddins/inc/analysis.hrc:804
 msgctxt "ANALYSIS_Dollarde"
 msgid "Fraction"
 msgstr "Ffracsiwn"
 
-#: analysis.hrc:805
+#: scaddins/inc/analysis.hrc:805
 msgctxt "ANALYSIS_Dollarde"
 msgid "The divisor"
 msgstr "Y rhannydd"
 
-#: analysis.hrc:810
+#: scaddins/inc/analysis.hrc:810
 msgctxt "ANALYSIS_Yield"
 msgid "Returns the yield on a security that pays periodic interest"
 msgstr "Dychwelyd cynnyrch ar warant sy'n talu llog cyfnodol"
 
-#: analysis.hrc:811
+#: scaddins/inc/analysis.hrc:811
 msgctxt "ANALYSIS_Yield"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:812
+#: scaddins/inc/analysis.hrc:812
 msgctxt "ANALYSIS_Yield"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:813
+#: scaddins/inc/analysis.hrc:813
 msgctxt "ANALYSIS_Yield"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:814
+#: scaddins/inc/analysis.hrc:814
 msgctxt "ANALYSIS_Yield"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:815
+#: scaddins/inc/analysis.hrc:815
 msgctxt "ANALYSIS_Yield"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:816
+#: scaddins/inc/analysis.hrc:816
 msgctxt "ANALYSIS_Yield"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:817
+#: scaddins/inc/analysis.hrc:817
 msgctxt "ANALYSIS_Yield"
 msgid "Price"
 msgstr "Pris"
 
-#: analysis.hrc:818
+#: scaddins/inc/analysis.hrc:818
 msgctxt "ANALYSIS_Yield"
 msgid "The price"
 msgstr "Y pris"
 
-#: analysis.hrc:819
+#: scaddins/inc/analysis.hrc:819
 msgctxt "ANALYSIS_Yield"
 msgid "Redemption"
 msgstr "Adbryniant"
 
-#: analysis.hrc:820
+#: scaddins/inc/analysis.hrc:820
 msgctxt "ANALYSIS_Yield"
 msgid "The redemption value"
 msgstr "Y gwerth adbryniant"
 
-#: analysis.hrc:821
+#: scaddins/inc/analysis.hrc:821
 msgctxt "ANALYSIS_Yield"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:822
+#: scaddins/inc/analysis.hrc:822
 msgctxt "ANALYSIS_Yield"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:823
+#: scaddins/inc/analysis.hrc:823
 msgctxt "ANALYSIS_Yield"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:824
+#: scaddins/inc/analysis.hrc:824
 msgctxt "ANALYSIS_Yield"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:829
+#: scaddins/inc/analysis.hrc:829
 msgctxt "ANALYSIS_Yielddisc"
 msgid "Returns the annual yield for a discounted security"
 msgstr "Dychwelyd y cynnyrch blynyddol ar gyfer gwarant â disgownt"
 
-#: analysis.hrc:830
+#: scaddins/inc/analysis.hrc:830
 msgctxt "ANALYSIS_Yielddisc"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:831
+#: scaddins/inc/analysis.hrc:831
 msgctxt "ANALYSIS_Yielddisc"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:832
+#: scaddins/inc/analysis.hrc:832
 msgctxt "ANALYSIS_Yielddisc"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:833
+#: scaddins/inc/analysis.hrc:833
 msgctxt "ANALYSIS_Yielddisc"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:834
+#: scaddins/inc/analysis.hrc:834
 msgctxt "ANALYSIS_Yielddisc"
 msgid "Price"
 msgstr "Pris"
 
-#: analysis.hrc:835
+#: scaddins/inc/analysis.hrc:835
 msgctxt "ANALYSIS_Yielddisc"
 msgid "The price"
 msgstr "Y pris"
 
-#: analysis.hrc:836
+#: scaddins/inc/analysis.hrc:836
 msgctxt "ANALYSIS_Yielddisc"
 msgid "Redemption"
 msgstr "Adbryniant"
 
-#: analysis.hrc:837
+#: scaddins/inc/analysis.hrc:837
 msgctxt "ANALYSIS_Yielddisc"
 msgid "The redemption value"
 msgstr "Y gwerth adbryniant"
 
-#: analysis.hrc:838
+#: scaddins/inc/analysis.hrc:838
 msgctxt "ANALYSIS_Yielddisc"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:839
+#: scaddins/inc/analysis.hrc:839
 msgctxt "ANALYSIS_Yielddisc"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:844
+#: scaddins/inc/analysis.hrc:844
 msgctxt "ANALYSIS_Yieldmat"
 msgid "Returns the annual yield of a security that pays interest at maturity"
 msgstr "Dychwelyd y cynnyrch blynyddol o warant sy'n talu llog wedi aeddfedu"
 
-#: analysis.hrc:845
+#: scaddins/inc/analysis.hrc:845
 msgctxt "ANALYSIS_Yieldmat"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:846
+#: scaddins/inc/analysis.hrc:846
 msgctxt "ANALYSIS_Yieldmat"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:847
+#: scaddins/inc/analysis.hrc:847
 msgctxt "ANALYSIS_Yieldmat"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:848
+#: scaddins/inc/analysis.hrc:848
 msgctxt "ANALYSIS_Yieldmat"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:849
+#: scaddins/inc/analysis.hrc:849
 msgctxt "ANALYSIS_Yieldmat"
 msgid "Issue"
 msgstr "Cyhoeddi"
 
-#: analysis.hrc:850
+#: scaddins/inc/analysis.hrc:850
 msgctxt "ANALYSIS_Yieldmat"
 msgid "The issue date"
 msgstr "Dyddiad y cyhoeddiad"
 
-#: analysis.hrc:851
+#: scaddins/inc/analysis.hrc:851
 msgctxt "ANALYSIS_Yieldmat"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:852
+#: scaddins/inc/analysis.hrc:852
 msgctxt "ANALYSIS_Yieldmat"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:853
+#: scaddins/inc/analysis.hrc:853
 msgctxt "ANALYSIS_Yieldmat"
 msgid "Price"
 msgstr "Pris"
 
-#: analysis.hrc:854
+#: scaddins/inc/analysis.hrc:854
 msgctxt "ANALYSIS_Yieldmat"
 msgid "The price"
 msgstr "Y pris"
 
-#: analysis.hrc:855
+#: scaddins/inc/analysis.hrc:855
 msgctxt "ANALYSIS_Yieldmat"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:856
+#: scaddins/inc/analysis.hrc:856
 msgctxt "ANALYSIS_Yieldmat"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:861
+#: scaddins/inc/analysis.hrc:861
 msgctxt "ANALYSIS_Tbilleq"
 msgid "Returns the bond-equivalent yield for a treasury bill"
 msgstr "Dychwelyd cynnyrch yn cyfateb i fond ar gyfer bill o'r Trysorlys"
 
-#: analysis.hrc:862
+#: scaddins/inc/analysis.hrc:862
 msgctxt "ANALYSIS_Tbilleq"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:863
+#: scaddins/inc/analysis.hrc:863
 msgctxt "ANALYSIS_Tbilleq"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:864
+#: scaddins/inc/analysis.hrc:864
 msgctxt "ANALYSIS_Tbilleq"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:865
+#: scaddins/inc/analysis.hrc:865
 msgctxt "ANALYSIS_Tbilleq"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:866
+#: scaddins/inc/analysis.hrc:866
 msgctxt "ANALYSIS_Tbilleq"
 msgid "Discount"
 msgstr "Disgownt"
 
-#: analysis.hrc:867
+#: scaddins/inc/analysis.hrc:867
 msgctxt "ANALYSIS_Tbilleq"
 msgid "The discount rate"
 msgstr "Y gyfradd ddisgownt"
 
-#: analysis.hrc:872
+#: scaddins/inc/analysis.hrc:872
 msgctxt "ANALYSIS_Tbillprice"
 msgid "Returns the price of 100 currency units face value for a treasury bill"
 msgstr "Dychwelyd pris wynebwerth 100 uned arian am fil y Trysorlys"
 
-#: analysis.hrc:873
+#: scaddins/inc/analysis.hrc:873
 msgctxt "ANALYSIS_Tbillprice"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:874
+#: scaddins/inc/analysis.hrc:874
 msgctxt "ANALYSIS_Tbillprice"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:875
+#: scaddins/inc/analysis.hrc:875
 msgctxt "ANALYSIS_Tbillprice"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:876
+#: scaddins/inc/analysis.hrc:876
 msgctxt "ANALYSIS_Tbillprice"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:877
+#: scaddins/inc/analysis.hrc:877
 msgctxt "ANALYSIS_Tbillprice"
 msgid "Discount"
 msgstr "Disgownt"
 
-#: analysis.hrc:878
+#: scaddins/inc/analysis.hrc:878
 msgctxt "ANALYSIS_Tbillprice"
 msgid "The discount rate"
 msgstr "Y gyfradd ddisgownt"
 
-#: analysis.hrc:883
+#: scaddins/inc/analysis.hrc:883
 msgctxt "ANALYSIS_Tbillyield"
 msgid "Returns the yield for a treasury bill"
 msgstr "Dychwelyd cynnyrch am fil o'r Trysorlys"
 
-#: analysis.hrc:884
+#: scaddins/inc/analysis.hrc:884
 msgctxt "ANALYSIS_Tbillyield"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:885
+#: scaddins/inc/analysis.hrc:885
 msgctxt "ANALYSIS_Tbillyield"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:886
+#: scaddins/inc/analysis.hrc:886
 msgctxt "ANALYSIS_Tbillyield"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:887
+#: scaddins/inc/analysis.hrc:887
 msgctxt "ANALYSIS_Tbillyield"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:888
+#: scaddins/inc/analysis.hrc:888
 msgctxt "ANALYSIS_Tbillyield"
 msgid "Price"
 msgstr "Pris"
 
-#: analysis.hrc:889
+#: scaddins/inc/analysis.hrc:889
 msgctxt "ANALYSIS_Tbillyield"
 msgid "The price"
 msgstr "Y pris"
 
-#: analysis.hrc:894
+#: scaddins/inc/analysis.hrc:894
 msgctxt "ANALYSIS_Oddfprice"
 msgid "Returns the price per $100 face value of a security with an odd first period"
 msgstr "Dychwelyd gwerth wynebwerth $100 o warant gyda'r cyfnod odrif cyntaf"
 
-#: analysis.hrc:895
+#: scaddins/inc/analysis.hrc:895
 msgctxt "ANALYSIS_Oddfprice"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:896
+#: scaddins/inc/analysis.hrc:896
 msgctxt "ANALYSIS_Oddfprice"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:897
+#: scaddins/inc/analysis.hrc:897
 msgctxt "ANALYSIS_Oddfprice"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:898
+#: scaddins/inc/analysis.hrc:898
 msgctxt "ANALYSIS_Oddfprice"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:899
+#: scaddins/inc/analysis.hrc:899
 msgctxt "ANALYSIS_Oddfprice"
 msgid "Issue"
 msgstr "Cyhoeddi"
 
-#: analysis.hrc:900
+#: scaddins/inc/analysis.hrc:900
 msgctxt "ANALYSIS_Oddfprice"
 msgid "The issue date"
 msgstr "Dyddiad y cyhoeddiad"
 
-#: analysis.hrc:901
+#: scaddins/inc/analysis.hrc:901
 msgctxt "ANALYSIS_Oddfprice"
 msgid "First coupon"
 msgstr "Graddfa cwpon"
 
-#: analysis.hrc:902
+#: scaddins/inc/analysis.hrc:902
 msgctxt "ANALYSIS_Oddfprice"
 msgid "The first coupon date"
 msgstr "Dyddiad y cwpon cyntaf"
 
-#: analysis.hrc:903
+#: scaddins/inc/analysis.hrc:903
 msgctxt "ANALYSIS_Oddfprice"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:904
+#: scaddins/inc/analysis.hrc:904
 msgctxt "ANALYSIS_Oddfprice"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:905
+#: scaddins/inc/analysis.hrc:905
 msgctxt "ANALYSIS_Oddfprice"
 msgid "Yield"
 msgstr "Cynnyrch"
 
-#: analysis.hrc:906
+#: scaddins/inc/analysis.hrc:906
 msgctxt "ANALYSIS_Oddfprice"
 msgid "The yield"
 msgstr "Y cynnyrch"
 
-#: analysis.hrc:907
+#: scaddins/inc/analysis.hrc:907
 msgctxt "ANALYSIS_Oddfprice"
 msgid "Redemption"
 msgstr "Adbryniant"
 
-#: analysis.hrc:908
+#: scaddins/inc/analysis.hrc:908
 msgctxt "ANALYSIS_Oddfprice"
 msgid "The redemption value"
 msgstr "Y gwerth adbryniant"
 
-#: analysis.hrc:909
+#: scaddins/inc/analysis.hrc:909
 msgctxt "ANALYSIS_Oddfprice"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:910
+#: scaddins/inc/analysis.hrc:910
 msgctxt "ANALYSIS_Oddfprice"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:911
+#: scaddins/inc/analysis.hrc:911
 msgctxt "ANALYSIS_Oddfprice"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:912
+#: scaddins/inc/analysis.hrc:912
 msgctxt "ANALYSIS_Oddfprice"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:917
+#: scaddins/inc/analysis.hrc:917
 msgctxt "ANALYSIS_Oddfyield"
 msgid "Returns the yield of a security with an odd first period"
 msgstr "Dychwelyd cynnyrch gwarant gyda chyfnod odrif cyntaf"
 
-#: analysis.hrc:918
+#: scaddins/inc/analysis.hrc:918
 msgctxt "ANALYSIS_Oddfyield"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:919
+#: scaddins/inc/analysis.hrc:919
 msgctxt "ANALYSIS_Oddfyield"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:920
+#: scaddins/inc/analysis.hrc:920
 msgctxt "ANALYSIS_Oddfyield"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:921
+#: scaddins/inc/analysis.hrc:921
 msgctxt "ANALYSIS_Oddfyield"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:922
+#: scaddins/inc/analysis.hrc:922
 msgctxt "ANALYSIS_Oddfyield"
 msgid "Issue"
 msgstr "Cyhoeddi"
 
-#: analysis.hrc:923
+#: scaddins/inc/analysis.hrc:923
 msgctxt "ANALYSIS_Oddfyield"
 msgid "The issue date"
 msgstr "Dyddiad y cyhoeddiad"
 
-#: analysis.hrc:924
+#: scaddins/inc/analysis.hrc:924
 msgctxt "ANALYSIS_Oddfyield"
 msgid "First coupon"
 msgstr "Graddfa cwpon"
 
-#: analysis.hrc:925
+#: scaddins/inc/analysis.hrc:925
 msgctxt "ANALYSIS_Oddfyield"
 msgid "The first coupon date"
 msgstr "Dyddiad y cwpon cyntaf"
 
-#: analysis.hrc:926
+#: scaddins/inc/analysis.hrc:926
 msgctxt "ANALYSIS_Oddfyield"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:927
+#: scaddins/inc/analysis.hrc:927
 msgctxt "ANALYSIS_Oddfyield"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:928
+#: scaddins/inc/analysis.hrc:928
 msgctxt "ANALYSIS_Oddfyield"
 msgid "Price"
 msgstr "Pris"
 
-#: analysis.hrc:929
+#: scaddins/inc/analysis.hrc:929
 msgctxt "ANALYSIS_Oddfyield"
 msgid "The price"
 msgstr "Y pris"
 
-#: analysis.hrc:930
+#: scaddins/inc/analysis.hrc:930
 msgctxt "ANALYSIS_Oddfyield"
 msgid "Redemption"
 msgstr "Adbryniant"
 
-#: analysis.hrc:931
+#: scaddins/inc/analysis.hrc:931
 msgctxt "ANALYSIS_Oddfyield"
 msgid "The redemption value"
 msgstr "Y gwerth adbryniant"
 
-#: analysis.hrc:932
+#: scaddins/inc/analysis.hrc:932
 msgctxt "ANALYSIS_Oddfyield"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:933
+#: scaddins/inc/analysis.hrc:933
 msgctxt "ANALYSIS_Oddfyield"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:934
+#: scaddins/inc/analysis.hrc:934
 msgctxt "ANALYSIS_Oddfyield"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:935
+#: scaddins/inc/analysis.hrc:935
 msgctxt "ANALYSIS_Oddfyield"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:940
+#: scaddins/inc/analysis.hrc:940
 msgctxt "ANALYSIS_Oddlprice"
 msgid "Returns the price per $100 face value of a security with an odd last period"
 msgstr "Dychwelyd gwerth wynebwerth $100 o warant gyda'r cyfnod odrif olaf"
 
-#: analysis.hrc:941
+#: scaddins/inc/analysis.hrc:941
 msgctxt "ANALYSIS_Oddlprice"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:942
+#: scaddins/inc/analysis.hrc:942
 msgctxt "ANALYSIS_Oddlprice"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:943
+#: scaddins/inc/analysis.hrc:943
 msgctxt "ANALYSIS_Oddlprice"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:944
+#: scaddins/inc/analysis.hrc:944
 msgctxt "ANALYSIS_Oddlprice"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:945
+#: scaddins/inc/analysis.hrc:945
 msgctxt "ANALYSIS_Oddlprice"
 msgid "Last interest"
 msgstr "Llog diwethaf"
 
-#: analysis.hrc:946
+#: scaddins/inc/analysis.hrc:946
 msgctxt "ANALYSIS_Oddlprice"
 msgid "The last interest date"
 msgstr "Dyddiad y llog diwethaf"
 
-#: analysis.hrc:947
+#: scaddins/inc/analysis.hrc:947
 msgctxt "ANALYSIS_Oddlprice"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:948
+#: scaddins/inc/analysis.hrc:948
 msgctxt "ANALYSIS_Oddlprice"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:949
+#: scaddins/inc/analysis.hrc:949
 msgctxt "ANALYSIS_Oddlprice"
 msgid "Yield"
 msgstr "Cynnyrch"
 
-#: analysis.hrc:950
+#: scaddins/inc/analysis.hrc:950
 msgctxt "ANALYSIS_Oddlprice"
 msgid "The yield"
 msgstr "Y cynnyrch"
 
-#: analysis.hrc:951
+#: scaddins/inc/analysis.hrc:951
 msgctxt "ANALYSIS_Oddlprice"
 msgid "Redemption"
 msgstr "Adbryniant"
 
-#: analysis.hrc:952
+#: scaddins/inc/analysis.hrc:952
 msgctxt "ANALYSIS_Oddlprice"
 msgid "The redemption value"
 msgstr "Y gwerth adbryniant"
 
-#: analysis.hrc:953
+#: scaddins/inc/analysis.hrc:953
 msgctxt "ANALYSIS_Oddlprice"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:954
+#: scaddins/inc/analysis.hrc:954
 msgctxt "ANALYSIS_Oddlprice"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:955
+#: scaddins/inc/analysis.hrc:955
 msgctxt "ANALYSIS_Oddlprice"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:956
+#: scaddins/inc/analysis.hrc:956
 msgctxt "ANALYSIS_Oddlprice"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:961
+#: scaddins/inc/analysis.hrc:961
 msgctxt "ANALYSIS_Oddlyield"
 msgid "Returns the yield of a security with an odd last period"
 msgstr "Dychwelyd cynnyrch gwarant gyda'r cyfnod odrif diwethaf cyntaf"
 
-#: analysis.hrc:962
+#: scaddins/inc/analysis.hrc:962
 msgctxt "ANALYSIS_Oddlyield"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:963
+#: scaddins/inc/analysis.hrc:963
 msgctxt "ANALYSIS_Oddlyield"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:964
+#: scaddins/inc/analysis.hrc:964
 msgctxt "ANALYSIS_Oddlyield"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:965
+#: scaddins/inc/analysis.hrc:965
 msgctxt "ANALYSIS_Oddlyield"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:966
+#: scaddins/inc/analysis.hrc:966
 msgctxt "ANALYSIS_Oddlyield"
 msgid "Last interest"
 msgstr "Llog diwethaf"
 
-#: analysis.hrc:967
+#: scaddins/inc/analysis.hrc:967
 msgctxt "ANALYSIS_Oddlyield"
 msgid "The last interest date"
 msgstr "Dyddiad y llog diwethaf"
 
-#: analysis.hrc:968
+#: scaddins/inc/analysis.hrc:968
 msgctxt "ANALYSIS_Oddlyield"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:969
+#: scaddins/inc/analysis.hrc:969
 msgctxt "ANALYSIS_Oddlyield"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:970
+#: scaddins/inc/analysis.hrc:970
 msgctxt "ANALYSIS_Oddlyield"
 msgid "Price"
 msgstr "Pris"
 
-#: analysis.hrc:971
+#: scaddins/inc/analysis.hrc:971
 msgctxt "ANALYSIS_Oddlyield"
 msgid "The price"
 msgstr "Y pris"
 
-#: analysis.hrc:972
+#: scaddins/inc/analysis.hrc:972
 msgctxt "ANALYSIS_Oddlyield"
 msgid "Redemption"
 msgstr "Adbryniant"
 
-#: analysis.hrc:973
+#: scaddins/inc/analysis.hrc:973
 msgctxt "ANALYSIS_Oddlyield"
 msgid "The redemption value"
 msgstr "Y gwerth adbryniant"
 
-#: analysis.hrc:974
+#: scaddins/inc/analysis.hrc:974
 msgctxt "ANALYSIS_Oddlyield"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:975
+#: scaddins/inc/analysis.hrc:975
 msgctxt "ANALYSIS_Oddlyield"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:976
+#: scaddins/inc/analysis.hrc:976
 msgctxt "ANALYSIS_Oddlyield"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:977
+#: scaddins/inc/analysis.hrc:977
 msgctxt "ANALYSIS_Oddlyield"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:982
+#: scaddins/inc/analysis.hrc:982
 msgctxt "ANALYSIS_Xirr"
 msgid "Returns the internal rate of return for a non-periodic schedule of payments"
 msgstr "Dychwelyd cyfradd fewnol dychweliad am amserlen o daliadau anghyfnodol"
 
-#: analysis.hrc:983
+#: scaddins/inc/analysis.hrc:983
 msgctxt "ANALYSIS_Xirr"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: analysis.hrc:984
+#: scaddins/inc/analysis.hrc:984
 msgctxt "ANALYSIS_Xirr"
 msgid "The values"
 msgstr "Y gwerthoedd"
 
-#: analysis.hrc:985
+#: scaddins/inc/analysis.hrc:985
 msgctxt "ANALYSIS_Xirr"
 msgid "Dates"
 msgstr "Dyddiadau"
 
-#: analysis.hrc:986
+#: scaddins/inc/analysis.hrc:986
 msgctxt "ANALYSIS_Xirr"
 msgid "The dates"
 msgstr "Y dyddiadau"
 
-#: analysis.hrc:987
+#: scaddins/inc/analysis.hrc:987
 msgctxt "ANALYSIS_Xirr"
 msgid "Guess"
 msgstr "Dyfaliad"
 
-#: analysis.hrc:988
+#: scaddins/inc/analysis.hrc:988
 msgctxt "ANALYSIS_Xirr"
 msgid "The guess"
 msgstr "Y dyfaliad"
 
-#: analysis.hrc:993
+#: scaddins/inc/analysis.hrc:993
 msgctxt "ANALYSIS_Xnpv"
 msgid "Returns the net present value for a non-periodic schedule of payments"
 msgstr "Dychwelyd gwerth presennol net am raglen o daliadau anghyfnodol"
 
-#: analysis.hrc:994
+#: scaddins/inc/analysis.hrc:994
 msgctxt "ANALYSIS_Xnpv"
 msgid "Rate"
 msgstr "Cyfradd"
 
-#: analysis.hrc:995
+#: scaddins/inc/analysis.hrc:995
 msgctxt "ANALYSIS_Xnpv"
 msgid "The rate"
 msgstr "Y gyfradd"
 
-#: analysis.hrc:996
+#: scaddins/inc/analysis.hrc:996
 msgctxt "ANALYSIS_Xnpv"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: analysis.hrc:997
+#: scaddins/inc/analysis.hrc:997
 msgctxt "ANALYSIS_Xnpv"
 msgid "The values"
 msgstr "Y gwerthoedd"
 
-#: analysis.hrc:998
+#: scaddins/inc/analysis.hrc:998
 msgctxt "ANALYSIS_Xnpv"
 msgid "Dates"
 msgstr "Dyddiadau"
 
-#: analysis.hrc:999
+#: scaddins/inc/analysis.hrc:999
 msgctxt "ANALYSIS_Xnpv"
 msgid "The dates"
 msgstr "Y dyddiadau"
 
-#: analysis.hrc:1004
+#: scaddins/inc/analysis.hrc:1004
 msgctxt "ANALYSIS_Intrate"
 msgid "Returns the interest rate for a fully invested security"
 msgstr "Dychwelyd cyfradd llog ar gyfer gwarant buddsoddiad llawn"
 
-#: analysis.hrc:1005
+#: scaddins/inc/analysis.hrc:1005
 msgctxt "ANALYSIS_Intrate"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:1006
+#: scaddins/inc/analysis.hrc:1006
 msgctxt "ANALYSIS_Intrate"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:1007
+#: scaddins/inc/analysis.hrc:1007
 msgctxt "ANALYSIS_Intrate"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:1008
+#: scaddins/inc/analysis.hrc:1008
 msgctxt "ANALYSIS_Intrate"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:1009
+#: scaddins/inc/analysis.hrc:1009
 msgctxt "ANALYSIS_Intrate"
 msgid "Investment"
 msgstr "Buddsoddiad"
 
-#: analysis.hrc:1010
+#: scaddins/inc/analysis.hrc:1010
 msgctxt "ANALYSIS_Intrate"
 msgid "The investment"
 msgstr "Y buddsoddiad"
 
-#: analysis.hrc:1011
+#: scaddins/inc/analysis.hrc:1011
 msgctxt "ANALYSIS_Intrate"
 msgid "Redemption"
 msgstr "Adbryniant"
 
-#: analysis.hrc:1012
+#: scaddins/inc/analysis.hrc:1012
 msgctxt "ANALYSIS_Intrate"
 msgid "The redemption value"
 msgstr "Y gwerth adbryniant"
 
-#: analysis.hrc:1013
+#: scaddins/inc/analysis.hrc:1013
 msgctxt "ANALYSIS_Intrate"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:1014
+#: scaddins/inc/analysis.hrc:1014
 msgctxt "ANALYSIS_Intrate"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:1019
+#: scaddins/inc/analysis.hrc:1019
 msgctxt "ANALYSIS_Coupncd"
 msgid "Returns the first coupon date after the settlement date"
 msgstr "Dychwelyd dyddiad y cwpon cyntaf ar ôl y dyddiad terfynu"
 
-#: analysis.hrc:1020
+#: scaddins/inc/analysis.hrc:1020
 msgctxt "ANALYSIS_Coupncd"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:1021
+#: scaddins/inc/analysis.hrc:1021
 msgctxt "ANALYSIS_Coupncd"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:1022
+#: scaddins/inc/analysis.hrc:1022
 msgctxt "ANALYSIS_Coupncd"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:1023
+#: scaddins/inc/analysis.hrc:1023
 msgctxt "ANALYSIS_Coupncd"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:1024
+#: scaddins/inc/analysis.hrc:1024
 msgctxt "ANALYSIS_Coupncd"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:1025
+#: scaddins/inc/analysis.hrc:1025
 msgctxt "ANALYSIS_Coupncd"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:1026
+#: scaddins/inc/analysis.hrc:1026
 msgctxt "ANALYSIS_Coupncd"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:1027
+#: scaddins/inc/analysis.hrc:1027
 msgctxt "ANALYSIS_Coupncd"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:1032
+#: scaddins/inc/analysis.hrc:1032
 msgctxt "ANALYSIS_Coupdays"
 msgid "Returns the number of days in the coupon period containing the settlement date"
 msgstr "Dychwelyd y nifer o ddyddiau yng nghyfnod y cwpon sy'n cynnwys dyddiad yr ardrefniant"
 
-#: analysis.hrc:1033
+#: scaddins/inc/analysis.hrc:1033
 msgctxt "ANALYSIS_Coupdays"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:1034
+#: scaddins/inc/analysis.hrc:1034
 msgctxt "ANALYSIS_Coupdays"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:1035
+#: scaddins/inc/analysis.hrc:1035
 msgctxt "ANALYSIS_Coupdays"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:1036
+#: scaddins/inc/analysis.hrc:1036
 msgctxt "ANALYSIS_Coupdays"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:1037
+#: scaddins/inc/analysis.hrc:1037
 msgctxt "ANALYSIS_Coupdays"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:1038
+#: scaddins/inc/analysis.hrc:1038
 msgctxt "ANALYSIS_Coupdays"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:1039
+#: scaddins/inc/analysis.hrc:1039
 msgctxt "ANALYSIS_Coupdays"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:1040
+#: scaddins/inc/analysis.hrc:1040
 msgctxt "ANALYSIS_Coupdays"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:1045
+#: scaddins/inc/analysis.hrc:1045
 msgctxt "ANALYSIS_Coupdaysnc"
 msgid "Returns the number of days from the settlement date to the next coupon date"
 msgstr "Dychwelyd y nifer o ddyddiau o'r dyddiad ardrefniant i ddyddiad nesaf y cwpon"
 
-#: analysis.hrc:1046
+#: scaddins/inc/analysis.hrc:1046
 msgctxt "ANALYSIS_Coupdaysnc"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:1047
+#: scaddins/inc/analysis.hrc:1047
 msgctxt "ANALYSIS_Coupdaysnc"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:1048
+#: scaddins/inc/analysis.hrc:1048
 msgctxt "ANALYSIS_Coupdaysnc"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:1049
+#: scaddins/inc/analysis.hrc:1049
 msgctxt "ANALYSIS_Coupdaysnc"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:1050
+#: scaddins/inc/analysis.hrc:1050
 msgctxt "ANALYSIS_Coupdaysnc"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:1051
+#: scaddins/inc/analysis.hrc:1051
 msgctxt "ANALYSIS_Coupdaysnc"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:1052
+#: scaddins/inc/analysis.hrc:1052
 msgctxt "ANALYSIS_Coupdaysnc"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:1053
+#: scaddins/inc/analysis.hrc:1053
 msgctxt "ANALYSIS_Coupdaysnc"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:1058
+#: scaddins/inc/analysis.hrc:1058
 msgctxt "ANALYSIS_Coupdaybs"
 msgid "Returns the number of days from the beginning of the coupon period to the settlement date"
 msgstr "Dychwelyd y nifer o ddyddiau o gychwyn y cyfnod cwpon i'r dyddiad ardrefniant"
 
-#: analysis.hrc:1059
+#: scaddins/inc/analysis.hrc:1059
 msgctxt "ANALYSIS_Coupdaybs"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:1060
+#: scaddins/inc/analysis.hrc:1060
 msgctxt "ANALYSIS_Coupdaybs"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:1061
+#: scaddins/inc/analysis.hrc:1061
 msgctxt "ANALYSIS_Coupdaybs"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:1062
+#: scaddins/inc/analysis.hrc:1062
 msgctxt "ANALYSIS_Coupdaybs"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:1063
+#: scaddins/inc/analysis.hrc:1063
 msgctxt "ANALYSIS_Coupdaybs"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:1064
+#: scaddins/inc/analysis.hrc:1064
 msgctxt "ANALYSIS_Coupdaybs"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:1065
+#: scaddins/inc/analysis.hrc:1065
 msgctxt "ANALYSIS_Coupdaybs"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:1066
+#: scaddins/inc/analysis.hrc:1066
 msgctxt "ANALYSIS_Coupdaybs"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:1071
+#: scaddins/inc/analysis.hrc:1071
 msgctxt "ANALYSIS_Couppcd"
 msgid "Returns the last coupon date preceding the settlement date"
 msgstr "Dychwelyd dyddiad y cwpon olaf ar ôl y dyddiad terfynu"
 
-#: analysis.hrc:1072
+#: scaddins/inc/analysis.hrc:1072
 msgctxt "ANALYSIS_Couppcd"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:1073
+#: scaddins/inc/analysis.hrc:1073
 msgctxt "ANALYSIS_Couppcd"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:1074
+#: scaddins/inc/analysis.hrc:1074
 msgctxt "ANALYSIS_Couppcd"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:1075
+#: scaddins/inc/analysis.hrc:1075
 msgctxt "ANALYSIS_Couppcd"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:1076
+#: scaddins/inc/analysis.hrc:1076
 msgctxt "ANALYSIS_Couppcd"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:1077
+#: scaddins/inc/analysis.hrc:1077
 msgctxt "ANALYSIS_Couppcd"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:1078
+#: scaddins/inc/analysis.hrc:1078
 msgctxt "ANALYSIS_Couppcd"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:1079
+#: scaddins/inc/analysis.hrc:1079
 msgctxt "ANALYSIS_Couppcd"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:1084
+#: scaddins/inc/analysis.hrc:1084
 msgctxt "ANALYSIS_Coupnum"
 msgid "Returns the number of coupons payable between the settlement and maturity dates"
 msgstr "Dychwelyd y nifer o gwponau taladwy wedi dyddiad trefniant ac aeddfedrwydd"
 
-#: analysis.hrc:1085
+#: scaddins/inc/analysis.hrc:1085
 msgctxt "ANALYSIS_Coupnum"
 msgid "Settlement"
 msgstr "Trefniant"
 
-#: analysis.hrc:1086
+#: scaddins/inc/analysis.hrc:1086
 msgctxt "ANALYSIS_Coupnum"
 msgid "The settlement"
 msgstr "Y trefniant"
 
-#: analysis.hrc:1087
+#: scaddins/inc/analysis.hrc:1087
 msgctxt "ANALYSIS_Coupnum"
 msgid "Maturity"
 msgstr "Aeddfedrwydd"
 
-#: analysis.hrc:1088
+#: scaddins/inc/analysis.hrc:1088
 msgctxt "ANALYSIS_Coupnum"
 msgid "The maturity"
 msgstr "Yr aeddfedrwydd"
 
-#: analysis.hrc:1089
+#: scaddins/inc/analysis.hrc:1089
 msgctxt "ANALYSIS_Coupnum"
 msgid "Frequency"
 msgstr "Amlder"
 
-#: analysis.hrc:1090
+#: scaddins/inc/analysis.hrc:1090
 msgctxt "ANALYSIS_Coupnum"
 msgid "The frequency"
 msgstr "Yr amlder"
 
-#: analysis.hrc:1091
+#: scaddins/inc/analysis.hrc:1091
 msgctxt "ANALYSIS_Coupnum"
 msgid "Basis"
 msgstr "Sail"
 
-#: analysis.hrc:1092
+#: scaddins/inc/analysis.hrc:1092
 msgctxt "ANALYSIS_Coupnum"
 msgid "The basis"
 msgstr "Y sail"
 
-#: analysis.hrc:1097
+#: scaddins/inc/analysis.hrc:1097
 msgctxt "ANALYSIS_Fvschedule"
 msgid "Returns the future value of the initial principal after a series of compound interest rates are applied"
 msgstr "Dychwelyd gwerth y dyfodol o'r prifswm cyntaf wedi gosod cyfred o gyfraddau llog cyfansawdd"
 
-#: analysis.hrc:1098
+#: scaddins/inc/analysis.hrc:1098
 msgctxt "ANALYSIS_Fvschedule"
 msgid "Principal"
 msgstr "Prifswm"
 
-#: analysis.hrc:1099
+#: scaddins/inc/analysis.hrc:1099
 msgctxt "ANALYSIS_Fvschedule"
 msgid "The principal"
 msgstr "Y prifswm"
 
-#: analysis.hrc:1100
+#: scaddins/inc/analysis.hrc:1100
 msgctxt "ANALYSIS_Fvschedule"
 msgid "Schedule"
 msgstr "Atodlen"
 
-#: analysis.hrc:1101
+#: scaddins/inc/analysis.hrc:1101
 msgctxt "ANALYSIS_Fvschedule"
 msgid "The schedule"
 msgstr "Yr atodlen"
 
-#: datefunc.hrc:27
+#: scaddins/inc/datefunc.hrc:27
 msgctxt "DATE_FUNCDESC_DiffWeeks"
 msgid "Calculates the number of weeks in a specific period"
 msgstr "Cyfrifo'r nifer o wythnosau mewn cyfnod penodol"
 
-#: datefunc.hrc:28
+#: scaddins/inc/datefunc.hrc:28
 msgctxt "DATE_FUNCDESC_DiffWeeks"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: datefunc.hrc:29
+#: scaddins/inc/datefunc.hrc:29
 msgctxt "DATE_FUNCDESC_DiffWeeks"
 msgid "First day of the period"
 msgstr "Diwrnod cyntaf y cyfnod"
 
-#: datefunc.hrc:30
+#: scaddins/inc/datefunc.hrc:30
 msgctxt "DATE_FUNCDESC_DiffWeeks"
 msgid "End date"
 msgstr "Dyddiad olaf"
 
-#: datefunc.hrc:31
+#: scaddins/inc/datefunc.hrc:31
 msgctxt "DATE_FUNCDESC_DiffWeeks"
 msgid "Last day of the period"
 msgstr "Dyddiad olaf y cyfnod"
 
-#: datefunc.hrc:32
+#: scaddins/inc/datefunc.hrc:32
 msgctxt "DATE_FUNCDESC_DiffWeeks"
 msgid "Type"
 msgstr "Math"
 
-#: datefunc.hrc:33
+#: scaddins/inc/datefunc.hrc:33
 msgctxt "DATE_FUNCDESC_DiffWeeks"
 msgid "Type of calculation: Type=0 means the time interval, Type=1 means calendar weeks."
 msgstr "Math o gyfrifo: Math=0 yn golygu'r ysbaid, Math=1 yn golygu misoedd calendr."
 
-#: datefunc.hrc:38
+#: scaddins/inc/datefunc.hrc:38
 msgctxt "DATE_FUNCDESC_DiffMonths"
 msgid "Determines the number of months in a specific period."
 msgstr "Pennu'r nifer o fisoedd mewn cyfnod penodol."
 
-#: datefunc.hrc:39
+#: scaddins/inc/datefunc.hrc:39
 msgctxt "DATE_FUNCDESC_DiffMonths"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: datefunc.hrc:40
+#: scaddins/inc/datefunc.hrc:40
 msgctxt "DATE_FUNCDESC_DiffMonths"
 msgid "First day of the period."
 msgstr "Dyddiad cyntaf y cyfnod."
 
-#: datefunc.hrc:41
+#: scaddins/inc/datefunc.hrc:41
 msgctxt "DATE_FUNCDESC_DiffMonths"
 msgid "End date"
 msgstr "Dyddiad olaf"
 
-#: datefunc.hrc:42
+#: scaddins/inc/datefunc.hrc:42
 msgctxt "DATE_FUNCDESC_DiffMonths"
 msgid "Last day of the period."
 msgstr "Diwrnod olaf y cyfnod."
 
-#: datefunc.hrc:43
+#: scaddins/inc/datefunc.hrc:43
 msgctxt "DATE_FUNCDESC_DiffMonths"
 msgid "Type"
 msgstr "Math"
 
-#: datefunc.hrc:44
+#: scaddins/inc/datefunc.hrc:44
 msgctxt "DATE_FUNCDESC_DiffMonths"
 msgid "Type of calculation: Type=0 means the time interval, Type=1 means calendar months."
 msgstr "Math o gyfrifo: Math=0 yn golygu'r egwyl, Math=1 yn golygu'r misoedd calendr."
 
-#: datefunc.hrc:49
+#: scaddins/inc/datefunc.hrc:49
 msgctxt "DATE_FUNCDESC_DiffYears"
 msgid "Calculates the number of years in a specific period."
 msgstr "Cyfrifo'r nifer o flynyddoedd mewn cyfnod penodol."
 
-#: datefunc.hrc:50
+#: scaddins/inc/datefunc.hrc:50
 msgctxt "DATE_FUNCDESC_DiffYears"
 msgid "Start date"
 msgstr "Dyddiad cychwyn"
 
-#: datefunc.hrc:51
+#: scaddins/inc/datefunc.hrc:51
 msgctxt "DATE_FUNCDESC_DiffYears"
 msgid "First day of the period"
 msgstr "Diwrnod cyntaf y cyfnod"
 
-#: datefunc.hrc:52
+#: scaddins/inc/datefunc.hrc:52
 msgctxt "DATE_FUNCDESC_DiffYears"
 msgid "End date"
 msgstr "Dyddiad olaf"
 
-#: datefunc.hrc:53
+#: scaddins/inc/datefunc.hrc:53
 msgctxt "DATE_FUNCDESC_DiffYears"
 msgid "Last day of the period"
 msgstr "Dyddiad olaf y cyfnod"
 
-#: datefunc.hrc:54
+#: scaddins/inc/datefunc.hrc:54
 msgctxt "DATE_FUNCDESC_DiffYears"
 msgid "Type"
 msgstr "Math"
 
-#: datefunc.hrc:55
+#: scaddins/inc/datefunc.hrc:55
 msgctxt "DATE_FUNCDESC_DiffYears"
 msgid "Type of calculation: Type=0 means the time interval, Type=1 means calendar years."
 msgstr "Math o gyfrifo: Math=0 yn golygu'r egwyl, Math=1 yn golygu'r misoedd calendr."
 
-#: datefunc.hrc:60
+#: scaddins/inc/datefunc.hrc:60
 msgctxt "DATE_FUNCDESC_IsLeapYear"
 msgid "Returns 1 (TRUE) if the date is a day of a leap year, otherwise 0 (FALSE)."
 msgstr "Dychwelyd 1 (TRUE) os yw'r dyddiad yn ddiwrnod blwyddyn naid, fel arall 0 (FALSE)."
 
-#: datefunc.hrc:61
+#: scaddins/inc/datefunc.hrc:61
 msgctxt "DATE_FUNCDESC_IsLeapYear"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: datefunc.hrc:62
+#: scaddins/inc/datefunc.hrc:62
 msgctxt "DATE_FUNCDESC_IsLeapYear"
 msgid "Any day in the desired year"
 msgstr "Unrhyw ddiwrnod yn y flwyddyn benodol"
 
-#: datefunc.hrc:67
+#: scaddins/inc/datefunc.hrc:67
 msgctxt "DATE_FUNCDESC_DaysInMonth"
 msgid "Returns the number of days of the month in which the date entered occurs"
 msgstr "Dychwelyd y nifer o ddyddiau'r mis y mae'r dyddiad yn digwydd"
 
-#: datefunc.hrc:68
+#: scaddins/inc/datefunc.hrc:68
 msgctxt "DATE_FUNCDESC_DaysInMonth"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: datefunc.hrc:69
+#: scaddins/inc/datefunc.hrc:69
 msgctxt "DATE_FUNCDESC_DaysInMonth"
 msgid "Any day in the desired month"
 msgstr "Unrhyw ddiwrnod yn y mis penodol"
 
-#: datefunc.hrc:74
+#: scaddins/inc/datefunc.hrc:74
 msgctxt "DATE_FUNCDESC_DaysInYear"
 msgid "Returns the number of days of the year in which the date entered occurs."
 msgstr "Dychwelyd y nifer o ddyddiau'r flwyddyn y mae'r dyddiad yn digwydd."
 
-#: datefunc.hrc:75
+#: scaddins/inc/datefunc.hrc:75
 msgctxt "DATE_FUNCDESC_DaysInYear"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: datefunc.hrc:76
+#: scaddins/inc/datefunc.hrc:76
 msgctxt "DATE_FUNCDESC_DaysInYear"
 msgid "Any day in the desired year"
 msgstr "Unrhyw ddiwrnod yn y flwyddyn benodol"
 
-#: datefunc.hrc:81
+#: scaddins/inc/datefunc.hrc:81
 msgctxt "DATE_FUNCDESC_WeeksInYear"
 msgid "Returns the number of weeks of the year in which the date entered occurs"
 msgstr "Dychwelyd y nifer o wythnosau'r flwyddyn y mae'r dyddiad yn digwydd"
 
-#: datefunc.hrc:82
+#: scaddins/inc/datefunc.hrc:82
 msgctxt "DATE_FUNCDESC_WeeksInYear"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: datefunc.hrc:83
+#: scaddins/inc/datefunc.hrc:83
 msgctxt "DATE_FUNCDESC_WeeksInYear"
 msgid "Any day in the desired year"
 msgstr "Unrhyw ddiwrnod yn y flwyddyn benodol"
 
-#: datefunc.hrc:88
+#: scaddins/inc/datefunc.hrc:88
 msgctxt "DATE_FUNCDESC_Rot13"
 msgid "Encrypts or decrypts a text using the ROT13 algorithm"
 msgstr "Amgryptio neu ddadamgryptio testun gan ddefnyddio algorithm ROT13"
 
-#: datefunc.hrc:89
+#: scaddins/inc/datefunc.hrc:89
 msgctxt "DATE_FUNCDESC_Rot13"
 msgid "Text"
 msgstr "Testun"
 
-#: datefunc.hrc:90
+#: scaddins/inc/datefunc.hrc:90
 msgctxt "DATE_FUNCDESC_Rot13"
 msgid "Text to be encrypted or text already encrypted"
 msgstr "Testun i'w amgryptio neu destun wedi ei amgryptio eisoes"
 
-#: pricing.hrc:28
+#: scaddins/inc/pricing.hrc:28
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Pricing of a barrier option"
 msgstr "Prisio dewis terfyn"
 
-#: pricing.hrc:29
+#: scaddins/inc/pricing.hrc:29
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "spot"
 msgstr "sbot"
 
-#: pricing.hrc:30
+#: scaddins/inc/pricing.hrc:30
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Price/value of the underlying asset"
 msgstr "Pris/gwerth ased gwaelodol"
 
-#: pricing.hrc:31
+#: scaddins/inc/pricing.hrc:31
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "vol"
 msgstr "cyf"
 
-#: pricing.hrc:32
+#: scaddins/inc/pricing.hrc:32
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Annual volatility of the underlying asset"
 msgstr "Anweddolrwydd blynyddol yr ased gwaelodol"
 
-#: pricing.hrc:33
+#: scaddins/inc/pricing.hrc:33
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "r"
 msgstr "r"
 
-#: pricing.hrc:34
+#: scaddins/inc/pricing.hrc:34
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Interest rate (continuously compounded)"
 msgstr "Graddfa log (cyfansawdd parhaus)"
 
-#: pricing.hrc:35
+#: scaddins/inc/pricing.hrc:35
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "rf"
 msgstr "rf"
 
-#: pricing.hrc:36
+#: scaddins/inc/pricing.hrc:36
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Foreign interest rate (continuously compounded)"
 msgstr "Graddfa log estron (cyfansawdd parhaus)"
 
-#: pricing.hrc:37
+#: scaddins/inc/pricing.hrc:37
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "T"
 msgstr "T"
 
-#: pricing.hrc:38
+#: scaddins/inc/pricing.hrc:38
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Time to maturity of the option in years"
 msgstr "Cyfnod i aeddfedrwydd y dewis mewn blynyddoedd"
 
-#: pricing.hrc:39
+#: scaddins/inc/pricing.hrc:39
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "strike"
 msgstr "pris yr ymarferiad"
 
-#: pricing.hrc:40
+#: scaddins/inc/pricing.hrc:40
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Strike level of the option"
 msgstr "Lefel trawiad y dewis"
 
-#: pricing.hrc:41
+#: scaddins/inc/pricing.hrc:41
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "barrier_low"
 msgstr "terfyn_isel"
 
-#: pricing.hrc:42
+#: scaddins/inc/pricing.hrc:42
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Lower barrier (set to 0 for no lower barrier)"
 msgstr "Terfyn is (gosod 0 fel dim rhwystr)"
 
-#: pricing.hrc:43
+#: scaddins/inc/pricing.hrc:43
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "barrier_up"
 msgstr "terfyn_i fyny"
 
-#: pricing.hrc:44
+#: scaddins/inc/pricing.hrc:44
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Upper barrier (set to 0 for no upper barrier)"
 msgstr "Terfyn uchaf (gosod 0 fel y rhwystr uchaf)"
 
-#: pricing.hrc:45
+#: scaddins/inc/pricing.hrc:45
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "rebate"
 msgstr "ad-daliad"
 
-#: pricing.hrc:46
+#: scaddins/inc/pricing.hrc:46
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Amount of money paid at maturity if barrier was hit"
 msgstr "Maint yr arian dalwyd wrth aeddfedu os yw'r terfyn yn cael eu daro"
 
-#: pricing.hrc:47
+#: scaddins/inc/pricing.hrc:47
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "put/call"
 msgstr "gwerthu/prynu"
 
-#: pricing.hrc:48
+#: scaddins/inc/pricing.hrc:48
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "String to define if the option is a (p)ut or a (c)all"
 msgstr "Llinyn er mwyn diffinio os yw'r dewis yn gwerthu (p) neu yn prynu (c)"
 
-#: pricing.hrc:49
+#: scaddins/inc/pricing.hrc:49
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "knock in/out"
 msgstr "gweithredu/dadweithredu"
 
-#: pricing.hrc:50
+#: scaddins/inc/pricing.hrc:50
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "String to define if the option is of type knock-(i)n or knock-(o)ut"
 msgstr "Llinyn er mwyn diffinio os yw'r dewis yn gweithredu (p) neu yn ddadweithredu (c)"
 
-#: pricing.hrc:51
+#: scaddins/inc/pricing.hrc:51
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "barrier_type"
 msgstr "terfyn_i fyny"
 
-#: pricing.hrc:52
+#: scaddins/inc/pricing.hrc:52
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "String to define whether the barrier is observed (c)ontinuously or only at the (e)nd/maturity"
 msgstr "Llinyn er mwyn diffinio os yw'r rhwystr yn cael ei ddilyn yn barhaus (c) neu ddim ond ar y diwedd (e)"
 
-#: pricing.hrc:53
+#: scaddins/inc/pricing.hrc:53
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "greek"
 msgstr "groegaidd"
 
-#: pricing.hrc:54
+#: scaddins/inc/pricing.hrc:54
 msgctxt "PRICING_FUNCDESC_OptBarrier"
 msgid "Optional parameter, if left out then the function simply returns the option price; if set, the function returns price sensitivities (Greeks) to one of the input parameters; possible values are (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)"
 msgstr "Paramedrau dewisol, os yw'n cael ei hepgor yna mae'r swyddogaethy yn dychwelyd y pris dewis; os wedi ei osod, mae'r swyddogaeth yn dychwelyd sensitifrwyddiadau pris (Groegaidd) i un o'r paramedrau mewnbwn; gwerthoedd posib yw (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)"
 
-#: pricing.hrc:59
+#: scaddins/inc/pricing.hrc:59
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "Pricing of a touch/no-touch option"
 msgstr "Prisiau dewis touch/no-touch"
 
-#: pricing.hrc:60
+#: scaddins/inc/pricing.hrc:60
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "spot"
 msgstr "sbot"
 
-#: pricing.hrc:61
+#: scaddins/inc/pricing.hrc:61
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "Price/value of the underlying asset"
 msgstr "Pris/gwerth ased gwaelodol"
 
-#: pricing.hrc:62
+#: scaddins/inc/pricing.hrc:62
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "vol"
 msgstr "anwedd"
 
-#: pricing.hrc:63
+#: scaddins/inc/pricing.hrc:63
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "Annual volatility of the underlying asset"
 msgstr "Anweddolrwydd blynyddol yr ased gwaelodol"
 
-#: pricing.hrc:64
+#: scaddins/inc/pricing.hrc:64
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "r"
 msgstr "r"
 
-#: pricing.hrc:65
+#: scaddins/inc/pricing.hrc:65
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "Interest rate (continuously compounded)"
 msgstr "Graddfa log (cyfansawdd parhaus)"
 
-#: pricing.hrc:66
+#: scaddins/inc/pricing.hrc:66
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "rf"
 msgstr "rf"
 
-#: pricing.hrc:67
+#: scaddins/inc/pricing.hrc:67
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "Foreign interest rate (continuously compounded)"
 msgstr "Graddfa log estron (cyfansawdd parhaus)"
 
-#: pricing.hrc:68
+#: scaddins/inc/pricing.hrc:68
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "T"
 msgstr "T"
 
-#: pricing.hrc:69
+#: scaddins/inc/pricing.hrc:69
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "Time to maturity of the option in years"
 msgstr "Cyfnod i aeddfedrwydd y dewis mewn blynyddoedd"
 
-#: pricing.hrc:70
+#: scaddins/inc/pricing.hrc:70
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "barrier_low"
 msgstr "terfyn_isel"
 
-#: pricing.hrc:71
+#: scaddins/inc/pricing.hrc:71
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "Lower barrier (set to 0 for no lower barrier)"
 msgstr "Terfyn is (gosod 0 fel dim rhwystr)"
 
-#: pricing.hrc:72
+#: scaddins/inc/pricing.hrc:72
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "barrier_up"
 msgstr "terfyn_i fyny"
 
-#: pricing.hrc:73
+#: scaddins/inc/pricing.hrc:73
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "Upper barrier (set to 0 for no upper barrier)"
 msgstr "Terfyn uchaf (gosod 0 fel y rhwystr uchaf)"
 
-#: pricing.hrc:74
+#: scaddins/inc/pricing.hrc:74
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "foreign/domestic"
 msgstr "tramor/domestig"
 
-#: pricing.hrc:75
+#: scaddins/inc/pricing.hrc:75
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "String to define if the option pays one unit of (d)omestic currency (cash or nothing) or (f)oreign currency (asset or nothing)"
 msgstr "Llinyn i ddiffinio os yw'r dewis yn talu un uned o arian domestig (d) (arian parod neu ddim) neu arian tramor (f) (ased neu ddim)"
 
-#: pricing.hrc:76
+#: scaddins/inc/pricing.hrc:76
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "knock in/out"
 msgstr "gweithredu/dadweithredu"
 
-#: pricing.hrc:77
+#: scaddins/inc/pricing.hrc:77
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "String to define if the option is of type knock-(i)n (touch) or knock-(o)ut (no-touch)"
 msgstr "Llinyn er mwyn diffinio os yw'r dewis o fath gweithredu (i)(touch) neu ddadweithredu (o) (no-touch)"
 
-#: pricing.hrc:78
+#: scaddins/inc/pricing.hrc:78
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "barrier_type"
 msgstr "terfyn_i fyny"
 
-#: pricing.hrc:79
+#: scaddins/inc/pricing.hrc:79
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "String to define whether the barrier is observed (c)ontinuously or only at the (e)nd/maturity"
 msgstr "Llinyn er mwyn diffinio os yw'r rhwystr yn cael ei ddilyn yn barhaus (c) neu ddim ond ar y diwedd (e)"
 
-#: pricing.hrc:80
+#: scaddins/inc/pricing.hrc:80
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "greek"
 msgstr "groegaidd"
 
-#: pricing.hrc:81
+#: scaddins/inc/pricing.hrc:81
 msgctxt "PRICING_FUNCDESC_OptTouch"
 msgid "Optional parameter, if left out then the function simply returns the option price; if set, the function returns price sensitivities (Greeks) to one of the input parameters; possible values are (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)"
 msgstr "Paramedrau dewisol, os yw'n cael ei hepgor yna mae'r swyddogaethy yn dychwelyd y pris dewis; os wedi ei osod, mae'r swyddogaeth yn dychwelyd sensitifrwyddiadau pris (Groegaidd) i un o'r paramedrau mewnbwn; gwerthoedd posib yw (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)"
 
-#: pricing.hrc:86
+#: scaddins/inc/pricing.hrc:86
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "Probability that an asset hits a barrier assuming it follows dS/S = mu dt + vol dW"
 msgstr "Tebygolrwydd fod yr ased yn taro'r terfyn ar y dybiaeth ei fod yn dilyn dS/S = mu dt + vol dW"
 
-#: pricing.hrc:87
+#: scaddins/inc/pricing.hrc:87
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "spot"
 msgstr "sbot"
 
-#: pricing.hrc:88
+#: scaddins/inc/pricing.hrc:88
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "Price/value S of the underlying asset"
 msgstr "Pris/gwerth yr ased gwaelodol"
 
-#: pricing.hrc:89
+#: scaddins/inc/pricing.hrc:89
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "vol"
 msgstr "anwedd"
 
-#: pricing.hrc:90
+#: scaddins/inc/pricing.hrc:90
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "Annual volatility of the underlying asset"
 msgstr "Anweddolrwydd blynyddol yr ased gwaelodol"
 
-#: pricing.hrc:91
+#: scaddins/inc/pricing.hrc:91
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "drift"
 msgstr "drifft"
 
-#: pricing.hrc:92
+#: scaddins/inc/pricing.hrc:92
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "Parameter mu in dS/S = mu dt + vol dW"
 msgstr "Paramedr mu in dS/S = mu dt + vol dW"
 
-#: pricing.hrc:93
+#: scaddins/inc/pricing.hrc:93
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "T"
 msgstr "T"
 
-#: pricing.hrc:94
+#: scaddins/inc/pricing.hrc:94
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "Time to maturity"
 msgstr "Cyfnod tan aeddfedrwydd"
 
-#: pricing.hrc:95
+#: scaddins/inc/pricing.hrc:95
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "barrier_low"
 msgstr "terfyn_isel"
 
-#: pricing.hrc:96
+#: scaddins/inc/pricing.hrc:96
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "Lower barrier (set to 0 for no lower barrier)"
 msgstr "Terfyn is (gosod 0 fel dim rhwystr is)"
 
-#: pricing.hrc:97
+#: scaddins/inc/pricing.hrc:97
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "barrier_up"
 msgstr "terfyn_i fyny"
 
-#: pricing.hrc:98
+#: scaddins/inc/pricing.hrc:98
 msgctxt "PRICING_FUNCDESC_OptProbHit"
 msgid "Upper barrier (set to 0 for no upper barrier)"
 msgstr "Terfyn uchaf (gosod 0 fel y rhwystr uchaf)"
 
-#: pricing.hrc:103
+#: scaddins/inc/pricing.hrc:103
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "Probability that an asset will at maturity end up between two barrier levels, assuming it follows dS/S = mu dt + vol dW (if the last two optional parameters (strike, put/call) are specified, the probability of S_T in [strike, upper barrier] for a call and S_T in [lower barrier, strike] for a put will be returned)"
 msgstr "Tebygolrwydd y bydd ased yn aeddfedu rhwng dau lefel terfyn, gan gymryd y bydd yn dilyn dS/S = mu dt + vol dW (os yw'r ddau baramedr dewisol diwethaf (pris yr ymarferiad, gwerthu/prynu) yn cael eu henwi, tebygolrwydd o S_T [pris yr ymarferiad, terfyn uchaf] am werthu ac S_T yn [rhwystr isaf, gwerthu] y bydd gwerthiant yn cael ei ddychwelyd)"
 
-#: pricing.hrc:104
+#: scaddins/inc/pricing.hrc:104
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "spot"
 msgstr "sbot"
 
-#: pricing.hrc:105
+#: scaddins/inc/pricing.hrc:105
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "Price/value of the asset"
 msgstr "Pris/gwerth ased gwaelodol"
 
-#: pricing.hrc:106
+#: scaddins/inc/pricing.hrc:106
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "vol"
 msgstr "anwedd"
 
-#: pricing.hrc:107
+#: scaddins/inc/pricing.hrc:107
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "Annual volatility of the asset"
 msgstr "Anweddolrwydd blynyddol yr ased gwaelodol"
 
-#: pricing.hrc:108
+#: scaddins/inc/pricing.hrc:108
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "drift"
 msgstr "drifft"
 
-#: pricing.hrc:109
+#: scaddins/inc/pricing.hrc:109
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "Parameter mu from dS/S = mu dt + vol dW"
 msgstr "Paramedr mu in dS/S = mu dt + vol dW"
 
-#: pricing.hrc:110
+#: scaddins/inc/pricing.hrc:110
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "T"
 msgstr "T"
 
-#: pricing.hrc:111
+#: scaddins/inc/pricing.hrc:111
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "Time to maturity in years"
 msgstr "Cyfnod i aeddfedrwydd y dewis mewn blynyddoedd"
 
-#: pricing.hrc:112
+#: scaddins/inc/pricing.hrc:112
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "barrier_low"
 msgstr "terfyn_isel"
 
-#: pricing.hrc:113
+#: scaddins/inc/pricing.hrc:113
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "Lower barrier (set to 0 for no lower barrier)"
 msgstr "Terfyn is (gosod 0 fel dim rhwystr)"
 
-#: pricing.hrc:114
+#: scaddins/inc/pricing.hrc:114
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "barrier_up"
 msgstr "terfyn_i fyny"
 
-#: pricing.hrc:115
+#: scaddins/inc/pricing.hrc:115
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "Upper barrier (set to 0 for no upper barrier)"
 msgstr "Terfyn uchaf (gosod 0 fel y rhwystr uchaf)"
 
-#: pricing.hrc:116
+#: scaddins/inc/pricing.hrc:116
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "put/call"
 msgstr "gwerthu/prynu"
 
-#: pricing.hrc:117
+#: scaddins/inc/pricing.hrc:117
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "Optional (p)ut/(c)all indicator"
 msgstr "Dangosydd (p)/gwerthu(c) dewisol"
 
-#: pricing.hrc:118
+#: scaddins/inc/pricing.hrc:118
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "strike"
 msgstr "pris yr ymarferiad"
 
-#: pricing.hrc:119
+#: scaddins/inc/pricing.hrc:119
 msgctxt "PRICING_FUNCDESC_OptProbInMoney"
 msgid "Optional strike level"
 msgstr "Lefel pris yr ymarferias dewisol"
 
 #. function names as accessible from cells
-#: strings.hrc:26
+#: scaddins/inc/strings.hrc:26
 msgctxt "PRICING_FUNCNAME_OptBarrier"
 msgid "OPT_BARRIER"
 msgstr "OPT_BARRIER"
 
-#: strings.hrc:27
+#: scaddins/inc/strings.hrc:27
 msgctxt "PRICING_FUNCNAME_OptTouch"
 msgid "OPT_TOUCH"
 msgstr "OPT_TOUCH"
 
-#: strings.hrc:28
+#: scaddins/inc/strings.hrc:28
 msgctxt "PRICING_FUNCNAME_OptProbHit"
 msgid "OPT_PROB_HIT"
 msgstr "OPT_PROB_HIT"
 
-#: strings.hrc:29
+#: scaddins/inc/strings.hrc:29
 msgctxt "PRICING_FUNCNAME_OptProbInMoney"
 msgid "OPT_PROB_INMONEY"
 msgstr "OPT_PROB_INMONEY"
 
-#: strings.hrc:31
+#: scaddins/inc/strings.hrc:31
 msgctxt "DATE_FUNCNAME_DiffWeeks"
 msgid "WEEKS"
 msgstr "WEEKS"
 
-#: strings.hrc:32
+#: scaddins/inc/strings.hrc:32
 msgctxt "DATE_FUNCNAME_DiffMonths"
 msgid "MONTHS"
 msgstr "MONTHS"
 
-#: strings.hrc:33
+#: scaddins/inc/strings.hrc:33
 msgctxt "DATE_FUNCNAME_DiffYears"
 msgid "YEARS"
 msgstr "YEARS"
 
-#: strings.hrc:34
+#: scaddins/inc/strings.hrc:34
 msgctxt "DATE_FUNCNAME_IsLeapYear"
 msgid "ISLEAPYEAR"
 msgstr "ISLEAPYEAR"
 
-#: strings.hrc:35
+#: scaddins/inc/strings.hrc:35
 msgctxt "DATE_FUNCNAME_DaysInMonth"
 msgid "DAYSINMONTH"
 msgstr "DAYSINMONTH"
 
-#: strings.hrc:36
+#: scaddins/inc/strings.hrc:36
 msgctxt "DATE_FUNCNAME_DaysInYear"
 msgid "DAYSINYEAR"
 msgstr "DAYSINYEAR"
 
-#: strings.hrc:37
+#: scaddins/inc/strings.hrc:37
 msgctxt "DATE_FUNCNAME_WeeksInYear"
 msgid "WEEKSINYEAR"
 msgstr "WEEKSINYEAR"
 
-#: strings.hrc:38
+#: scaddins/inc/strings.hrc:38
 msgctxt "DATE_FUNCNAME_Rot13"
 msgid "ROT13"
 msgstr "ROT13"
 
-#: strings.hrc:40
+#: scaddins/inc/strings.hrc:40
 msgctxt "ANALYSIS_FUNCNAME_Workday"
 msgid "WORKDAY"
 msgstr "WORKDAY"
 
-#: strings.hrc:41
+#: scaddins/inc/strings.hrc:41
 msgctxt "ANALYSIS_FUNCNAME_Yearfrac"
 msgid "YEARFRAC"
 msgstr "YEARFRAC"
 
-#: strings.hrc:42
+#: scaddins/inc/strings.hrc:42
 msgctxt "ANALYSIS_FUNCNAME_Edate"
 msgid "EDATE"
 msgstr "EDATE"
 
-#: strings.hrc:43
+#: scaddins/inc/strings.hrc:43
 msgctxt "ANALYSIS_FUNCNAME_Weeknum"
 msgid "WEEKNUM"
 msgstr "WEEKNUM"
 
-#: strings.hrc:44
+#: scaddins/inc/strings.hrc:44
 msgctxt "ANALYSIS_FUNCNAME_Eomonth"
 msgid "EOMONTH"
 msgstr "EOMONTH"
 
-#: strings.hrc:45
+#: scaddins/inc/strings.hrc:45
 msgctxt "ANALYSIS_FUNCNAME_Networkdays"
 msgid "NETWORKDAYS"
 msgstr "NETWORKDAYS"
 
-#: strings.hrc:46
+#: scaddins/inc/strings.hrc:46
 msgctxt "ANALYSIS_FUNCNAME_Amordegrc"
 msgid "AMORDEGRC"
 msgstr "AMORDEGRC"
 
-#: strings.hrc:47
+#: scaddins/inc/strings.hrc:47
 msgctxt "ANALYSIS_FUNCNAME_Amorlinc"
 msgid "AMORLINC"
 msgstr "AMORLINC"
 
-#: strings.hrc:48
+#: scaddins/inc/strings.hrc:48
 msgctxt "ANALYSIS_FUNCNAME_Accrint"
 msgid "ACCRINT"
 msgstr "ACCRINT"
 
-#: strings.hrc:49
+#: scaddins/inc/strings.hrc:49
 msgctxt "ANALYSIS_FUNCNAME_Accrintm"
 msgid "ACCRINTM"
 msgstr "ACCRINTM"
 
-#: strings.hrc:50
+#: scaddins/inc/strings.hrc:50
 msgctxt "ANALYSIS_FUNCNAME_Received"
 msgid "RECEIVED"
 msgstr "RECEIVED"
 
-#: strings.hrc:51
+#: scaddins/inc/strings.hrc:51
 msgctxt "ANALYSIS_FUNCNAME_Disc"
 msgid "DISC"
 msgstr "DISC"
 
-#: strings.hrc:52
+#: scaddins/inc/strings.hrc:52
 msgctxt "ANALYSIS_FUNCNAME_Duration"
 msgid "DURATION"
 msgstr "DURATION"
 
-#: strings.hrc:53
+#: scaddins/inc/strings.hrc:53
 msgctxt "ANALYSIS_FUNCNAME_Effect"
 msgid "EFFECT"
 msgstr "EFFECT"
 
-#: strings.hrc:54
+#: scaddins/inc/strings.hrc:54
 msgctxt "ANALYSIS_FUNCNAME_Cumprinc"
 msgid "CUMPRINC"
 msgstr "CUMPRINC"
 
-#: strings.hrc:55
+#: scaddins/inc/strings.hrc:55
 msgctxt "ANALYSIS_FUNCNAME_Cumipmt"
 msgid "CUMIPMT"
 msgstr "CUMIPMT"
 
-#: strings.hrc:56
+#: scaddins/inc/strings.hrc:56
 msgctxt "ANALYSIS_FUNCNAME_Price"
 msgid "PRICE"
 msgstr "PRICE"
 
-#: strings.hrc:57
+#: scaddins/inc/strings.hrc:57
 msgctxt "ANALYSIS_FUNCNAME_Pricedisc"
 msgid "PRICEDISC"
 msgstr "PRICEDISC"
 
-#: strings.hrc:58
+#: scaddins/inc/strings.hrc:58
 msgctxt "ANALYSIS_FUNCNAME_Pricemat"
 msgid "PRICEMAT"
 msgstr "PRICEMAT"
 
-#: strings.hrc:59
+#: scaddins/inc/strings.hrc:59
 msgctxt "ANALYSIS_FUNCNAME_Mduration"
 msgid "MDURATION"
 msgstr "MDURATION"
 
-#: strings.hrc:60
+#: scaddins/inc/strings.hrc:60
 msgctxt "ANALYSIS_FUNCNAME_Nominal"
 msgid "NOMINAL"
 msgstr "NOMINAL"
 
-#: strings.hrc:61
+#: scaddins/inc/strings.hrc:61
 msgctxt "ANALYSIS_FUNCNAME_Dollarfr"
 msgid "DOLLARFR"
 msgstr "DOLLARFR"
 
-#: strings.hrc:62
+#: scaddins/inc/strings.hrc:62
 msgctxt "ANALYSIS_FUNCNAME_Dollarde"
 msgid "DOLLARDE"
 msgstr "DOLLARDE"
 
-#: strings.hrc:63
+#: scaddins/inc/strings.hrc:63
 msgctxt "ANALYSIS_FUNCNAME_Yield"
 msgid "YIELD"
 msgstr "YIELD"
 
-#: strings.hrc:64
+#: scaddins/inc/strings.hrc:64
 msgctxt "ANALYSIS_FUNCNAME_Yielddisc"
 msgid "YIELDDISC"
 msgstr "YIELDDISC"
 
-#: strings.hrc:65
+#: scaddins/inc/strings.hrc:65
 msgctxt "ANALYSIS_FUNCNAME_Yieldmat"
 msgid "YIELDMAT"
 msgstr "YIELDMAT"
 
-#: strings.hrc:66
+#: scaddins/inc/strings.hrc:66
 msgctxt "ANALYSIS_FUNCNAME_Tbilleq"
 msgid "TBILLEQ"
 msgstr "TBILLEQ"
 
-#: strings.hrc:67
+#: scaddins/inc/strings.hrc:67
 msgctxt "ANALYSIS_FUNCNAME_Tbillprice"
 msgid "TBILLPRICE"
 msgstr "TBILLPRICE"
 
-#: strings.hrc:68
+#: scaddins/inc/strings.hrc:68
 msgctxt "ANALYSIS_FUNCNAME_Tbillyield"
 msgid "TBILLYIELD"
 msgstr "TBILLYIELD"
 
-#: strings.hrc:69
+#: scaddins/inc/strings.hrc:69
 msgctxt "ANALYSIS_FUNCNAME_Oddfprice"
 msgid "ODDFPRICE"
 msgstr "ODDFPRICE"
 
-#: strings.hrc:70
+#: scaddins/inc/strings.hrc:70
 msgctxt "ANALYSIS_FUNCNAME_Oddfyield"
 msgid "ODDFYIELD"
 msgstr "ODDFYIELD"
 
-#: strings.hrc:71
+#: scaddins/inc/strings.hrc:71
 msgctxt "ANALYSIS_FUNCNAME_Oddlprice"
 msgid "ODDLPRICE"
 msgstr "ODDLPRICE"
 
-#: strings.hrc:72
+#: scaddins/inc/strings.hrc:72
 msgctxt "ANALYSIS_FUNCNAME_Oddlyield"
 msgid "ODDLYIELD"
 msgstr "ODDLYIELD"
 
-#: strings.hrc:73
+#: scaddins/inc/strings.hrc:73
 msgctxt "ANALYSIS_FUNCNAME_Xirr"
 msgid "XIRR"
 msgstr "XIRR"
 
-#: strings.hrc:74
+#: scaddins/inc/strings.hrc:74
 msgctxt "ANALYSIS_FUNCNAME_Xnpv"
 msgid "XNPV"
 msgstr "XNPV"
 
-#: strings.hrc:75
+#: scaddins/inc/strings.hrc:75
 msgctxt "ANALYSIS_FUNCNAME_Intrate"
 msgid "INTRATE"
 msgstr "INTRATE"
 
-#: strings.hrc:76
+#: scaddins/inc/strings.hrc:76
 msgctxt "ANALYSIS_FUNCNAME_Coupncd"
 msgid "COUPNCD"
 msgstr "COUPNCD"
 
-#: strings.hrc:77
+#: scaddins/inc/strings.hrc:77
 msgctxt "ANALYSIS_FUNCNAME_Coupdays"
 msgid "COUPDAYS"
 msgstr "COUPDAYS"
 
-#: strings.hrc:78
+#: scaddins/inc/strings.hrc:78
 msgctxt "ANALYSIS_FUNCNAME_Coupdaysnc"
 msgid "COUPDAYSNC"
 msgstr "COUPDAYSNC"
 
-#: strings.hrc:79
+#: scaddins/inc/strings.hrc:79
 msgctxt "ANALYSIS_FUNCNAME_Coupdaybs"
 msgid "COUPDAYBS"
 msgstr "COUPDAYBS"
 
-#: strings.hrc:80
+#: scaddins/inc/strings.hrc:80
 msgctxt "ANALYSIS_FUNCNAME_Couppcd"
 msgid "COUPPCD"
 msgstr "COUPPCD"
 
-#: strings.hrc:81
+#: scaddins/inc/strings.hrc:81
 msgctxt "ANALYSIS_FUNCNAME_Coupnum"
 msgid "COUPNUM"
 msgstr "COUPNUM"
 
-#: strings.hrc:82
+#: scaddins/inc/strings.hrc:82
 msgctxt "ANALYSIS_FUNCNAME_Fvschedule"
 msgid "FVSCHEDULE"
 msgstr "FVSCHEDULE"
 
-#: strings.hrc:83
+#: scaddins/inc/strings.hrc:83
 msgctxt "ANALYSIS_FUNCNAME_Iseven"
 msgid "ISEVEN"
 msgstr "ISEVEN"
 
-#: strings.hrc:84
+#: scaddins/inc/strings.hrc:84
 msgctxt "ANALYSIS_FUNCNAME_Isodd"
 msgid "ISODD"
 msgstr "ISODD"
 
-#: strings.hrc:85
+#: scaddins/inc/strings.hrc:85
 msgctxt "ANALYSIS_FUNCNAME_Gcd"
 msgid "GCD"
 msgstr "GCD"
 
-#: strings.hrc:86
+#: scaddins/inc/strings.hrc:86
 msgctxt "ANALYSIS_FUNCNAME_Lcm"
 msgid "LCM"
 msgstr "LCM"
 
-#: strings.hrc:87
+#: scaddins/inc/strings.hrc:87
 msgctxt "ANALYSIS_FUNCNAME_Multinomial"
 msgid "MULTINOMIAL"
 msgstr "MULTINOMIAL"
 
-#: strings.hrc:88
+#: scaddins/inc/strings.hrc:88
 msgctxt "ANALYSIS_FUNCNAME_Seriessum"
 msgid "SERIESSUM"
 msgstr "SERIESSUM"
 
-#: strings.hrc:89
+#: scaddins/inc/strings.hrc:89
 msgctxt "ANALYSIS_FUNCNAME_Quotient"
 msgid "QUOTIENT"
 msgstr "QUOTIENT"
 
-#: strings.hrc:90
+#: scaddins/inc/strings.hrc:90
 msgctxt "ANALYSIS_FUNCNAME_Mround"
 msgid "MROUND"
 msgstr "MROUND"
 
-#: strings.hrc:91
+#: scaddins/inc/strings.hrc:91
 msgctxt "ANALYSIS_FUNCNAME_Sqrtpi"
 msgid "SQRTPI"
 msgstr "SQRTPI"
 
-#: strings.hrc:92
+#: scaddins/inc/strings.hrc:92
 msgctxt "ANALYSIS_FUNCNAME_Randbetween"
 msgid "RANDBETWEEN"
 msgstr "RANDBETWEEN"
 
-#: strings.hrc:93
+#: scaddins/inc/strings.hrc:93
 msgctxt "ANALYSIS_FUNCNAME_Besseli"
 msgid "BESSELI"
 msgstr "BESSELI"
 
-#: strings.hrc:94
+#: scaddins/inc/strings.hrc:94
 msgctxt "ANALYSIS_FUNCNAME_Besselj"
 msgid "BESSELJ"
 msgstr "BESSELJ"
 
-#: strings.hrc:95
+#: scaddins/inc/strings.hrc:95
 msgctxt "ANALYSIS_FUNCNAME_Besselk"
 msgid "BESSELK"
 msgstr "BESSELK"
 
-#: strings.hrc:96
+#: scaddins/inc/strings.hrc:96
 msgctxt "ANALYSIS_FUNCNAME_Bessely"
 msgid "BESSELY"
 msgstr "BESSELY"
 
-#: strings.hrc:97
+#: scaddins/inc/strings.hrc:97
 msgctxt "ANALYSIS_FUNCNAME_Bin2Dec"
 msgid "BIN2DEC"
 msgstr "BIN2DEC"
 
-#: strings.hrc:98
+#: scaddins/inc/strings.hrc:98
 msgctxt "ANALYSIS_FUNCNAME_Bin2Hex"
 msgid "BIN2HEX"
 msgstr "BIN2HEX"
 
-#: strings.hrc:99
+#: scaddins/inc/strings.hrc:99
 msgctxt "ANALYSIS_FUNCNAME_Bin2Oct"
 msgid "BIN2OCT"
 msgstr "BIN2OCT"
 
-#: strings.hrc:100
+#: scaddins/inc/strings.hrc:100
 msgctxt "ANALYSIS_FUNCNAME_Delta"
 msgid "DELTA"
 msgstr "DELTA"
 
-#: strings.hrc:101
+#: scaddins/inc/strings.hrc:101
 msgctxt "ANALYSIS_FUNCNAME_Dec2Bin"
 msgid "DEC2BIN"
 msgstr "DEC2BIN"
 
-#: strings.hrc:102
+#: scaddins/inc/strings.hrc:102
 msgctxt "ANALYSIS_FUNCNAME_Dec2Hex"
 msgid "DEC2HEX"
 msgstr "DEC2HEX"
 
-#: strings.hrc:103
+#: scaddins/inc/strings.hrc:103
 msgctxt "ANALYSIS_FUNCNAME_Dec2Oct"
 msgid "DEC2OCT"
 msgstr "DEC2OCT"
 
-#: strings.hrc:104
+#: scaddins/inc/strings.hrc:104
 msgctxt "ANALYSIS_FUNCNAME_Erf"
 msgid "ERF"
 msgstr "ERF"
 
-#: strings.hrc:105
+#: scaddins/inc/strings.hrc:105
 msgctxt "ANALYSIS_FUNCNAME_Erfc"
 msgid "ERFC"
 msgstr "ERFC"
 
-#: strings.hrc:106
+#: scaddins/inc/strings.hrc:106
 msgctxt "ANALYSIS_FUNCNAME_Gestep"
 msgid "GESTEP"
 msgstr "GESTEP"
 
-#: strings.hrc:107
+#: scaddins/inc/strings.hrc:107
 msgctxt "ANALYSIS_FUNCNAME_Hex2Bin"
 msgid "HEX2BIN"
 msgstr "HEX2BIN"
 
-#: strings.hrc:108
+#: scaddins/inc/strings.hrc:108
 msgctxt "ANALYSIS_FUNCNAME_Hex2Dec"
 msgid "HEX2DEC"
 msgstr "HEX2DEC"
 
-#: strings.hrc:109
+#: scaddins/inc/strings.hrc:109
 msgctxt "ANALYSIS_FUNCNAME_Hex2Oct"
 msgid "HEX2OCT"
 msgstr "HEX2OCT"
 
-#: strings.hrc:110
+#: scaddins/inc/strings.hrc:110
 msgctxt "ANALYSIS_FUNCNAME_Imabs"
 msgid "IMABS"
 msgstr "IMABS"
 
-#: strings.hrc:111
+#: scaddins/inc/strings.hrc:111
 msgctxt "ANALYSIS_FUNCNAME_Imaginary"
 msgid "IMAGINARY"
 msgstr "IMAGINARY"
 
-#: strings.hrc:112
+#: scaddins/inc/strings.hrc:112
 msgctxt "ANALYSIS_FUNCNAME_Impower"
 msgid "IMPOWER"
 msgstr "IMPOWER"
 
-#: strings.hrc:113
+#: scaddins/inc/strings.hrc:113
 msgctxt "ANALYSIS_FUNCNAME_Imargument"
 msgid "IMARGUMENT"
 msgstr "IMARGUMENT"
 
-#: strings.hrc:114
+#: scaddins/inc/strings.hrc:114
 msgctxt "ANALYSIS_FUNCNAME_Imcos"
 msgid "IMCOS"
 msgstr "IMCOS"
 
-#: strings.hrc:115
+#: scaddins/inc/strings.hrc:115
 msgctxt "ANALYSIS_FUNCNAME_Imdiv"
 msgid "IMDIV"
 msgstr "IMDIV"
 
-#: strings.hrc:116
+#: scaddins/inc/strings.hrc:116
 msgctxt "ANALYSIS_FUNCNAME_Imexp"
 msgid "IMEXP"
 msgstr "IMEXP"
 
-#: strings.hrc:117
+#: scaddins/inc/strings.hrc:117
 msgctxt "ANALYSIS_FUNCNAME_Imconjugate"
 msgid "IMCONJUGATE"
 msgstr "IMCONJUGATE"
 
-#: strings.hrc:118
+#: scaddins/inc/strings.hrc:118
 msgctxt "ANALYSIS_FUNCNAME_Imln"
 msgid "IMLN"
 msgstr "IMLN"
 
-#: strings.hrc:119
+#: scaddins/inc/strings.hrc:119
 msgctxt "ANALYSIS_FUNCNAME_Imlog10"
 msgid "IMLOG10"
 msgstr "IMLOG10"
 
-#: strings.hrc:120
+#: scaddins/inc/strings.hrc:120
 msgctxt "ANALYSIS_FUNCNAME_Imlog2"
 msgid "IMLOG2"
 msgstr "IMLOG2"
 
-#: strings.hrc:121
+#: scaddins/inc/strings.hrc:121
 msgctxt "ANALYSIS_FUNCNAME_Improduct"
 msgid "IMPRODUCT"
 msgstr "IMPRODUCT"
 
-#: strings.hrc:122
+#: scaddins/inc/strings.hrc:122
 msgctxt "ANALYSIS_FUNCNAME_Imreal"
 msgid "IMREAL"
 msgstr "IMREAL"
 
-#: strings.hrc:123
+#: scaddins/inc/strings.hrc:123
 msgctxt "ANALYSIS_FUNCNAME_Imsin"
 msgid "IMSIN"
 msgstr "IMSIN"
 
-#: strings.hrc:124
+#: scaddins/inc/strings.hrc:124
 msgctxt "ANALYSIS_FUNCNAME_Imsub"
 msgid "IMSUB"
 msgstr "IMSUB"
 
-#: strings.hrc:125
+#: scaddins/inc/strings.hrc:125
 msgctxt "ANALYSIS_FUNCNAME_Imsum"
 msgid "IMSUM"
 msgstr "IMSUM"
 
-#: strings.hrc:126
+#: scaddins/inc/strings.hrc:126
 msgctxt "ANALYSIS_FUNCNAME_Imsqrt"
 msgid "IMSQRT"
 msgstr "IMSQRT"
 
-#: strings.hrc:127
+#: scaddins/inc/strings.hrc:127
 msgctxt "ANALYSIS_FUNCNAME_Imtan"
 msgid "IMTAN"
 msgstr "IMTAN"
 
-#: strings.hrc:128
+#: scaddins/inc/strings.hrc:128
 msgctxt "ANALYSIS_FUNCNAME_Imsec"
 msgid "IMSEC"
 msgstr "IMSEC"
 
-#: strings.hrc:129
+#: scaddins/inc/strings.hrc:129
 msgctxt "ANALYSIS_FUNCNAME_Imcsc"
 msgid "IMCSC"
 msgstr "IMCSC"
 
-#: strings.hrc:130
+#: scaddins/inc/strings.hrc:130
 msgctxt "ANALYSIS_FUNCNAME_Imcot"
 msgid "IMCOT"
 msgstr "IMCOT"
 
-#: strings.hrc:131
+#: scaddins/inc/strings.hrc:131
 msgctxt "ANALYSIS_FUNCNAME_Imsinh"
 msgid "IMSINH"
 msgstr "IMSINH"
 
-#: strings.hrc:132
+#: scaddins/inc/strings.hrc:132
 msgctxt "ANALYSIS_FUNCNAME_Imcosh"
 msgid "IMCOSH"
 msgstr "IMCOSH"
 
-#: strings.hrc:133
+#: scaddins/inc/strings.hrc:133
 msgctxt "ANALYSIS_FUNCNAME_Imsech"
 msgid "IMSECH"
 msgstr "IMSECH"
 
-#: strings.hrc:134
+#: scaddins/inc/strings.hrc:134
 msgctxt "ANALYSIS_FUNCNAME_Imcsch"
 msgid "IMCSCH"
 msgstr "IMCSCH"
 
-#: strings.hrc:135
+#: scaddins/inc/strings.hrc:135
 msgctxt "ANALYSIS_FUNCNAME_Complex"
 msgid "COMPLEX"
 msgstr "COMPLEX"
 
-#: strings.hrc:136
+#: scaddins/inc/strings.hrc:136
 msgctxt "ANALYSIS_FUNCNAME_Oct2Bin"
 msgid "OCT2BIN"
 msgstr "OCT2BIN"
 
-#: strings.hrc:137
+#: scaddins/inc/strings.hrc:137
 msgctxt "ANALYSIS_FUNCNAME_Oct2Dec"
 msgid "OCT2DEC"
 msgstr "OCT2DEC"
 
-#: strings.hrc:138
+#: scaddins/inc/strings.hrc:138
 msgctxt "ANALYSIS_FUNCNAME_Oct2Hex"
 msgid "OCT2HEX"
 msgstr "OCT2HEX"
 
-#: strings.hrc:139
+#: scaddins/inc/strings.hrc:139
 msgctxt "ANALYSIS_FUNCNAME_Convert"
 msgid "CONVERT"
 msgstr "CONVERT"
 
-#: strings.hrc:140
+#: scaddins/inc/strings.hrc:140
 msgctxt "ANALYSIS_FUNCNAME_Factdouble"
 msgid "FACTDOUBLE"
 msgstr "FACTDOUBLE"
diff --git a/source/cy/sccomp/messages.po b/source/cy/sccomp/messages.po
index bd6c315a1f0..576e6c96f42 100644
--- a/source/cy/sccomp/messages.po
+++ b/source/cy/sccomp/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-11-22 13:53+0100\n"
+"POT-Creation-Date: 2018-02-27 13:56+0100\n"
 "PO-Revision-Date: 2017-12-22 17:25+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,75 +13,75 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1513963534.000000\n"
 
-#: strings.hrc:25
+#: sccomp/inc/strings.hrc:25
 msgctxt "RID_SOLVER_COMPONENT"
 msgid "%PRODUCTNAME Linear Solver"
 msgstr "Datrysydd Llinellol %PRODUCTNAME"
 
-#: strings.hrc:26
+#: sccomp/inc/strings.hrc:26
 msgctxt "RID_COINMP_SOLVER_COMPONENT"
 msgid "%PRODUCTNAME CoinMP Linear Solver"
 msgstr "Datrysydd Llinellol CoinMP %PRODUCTNAME"
 
-#: strings.hrc:27
+#: sccomp/inc/strings.hrc:27
 msgctxt "RID_SWARM_SOLVER_COMPONENT"
 msgid "%PRODUCTNAME Swarm Non-Linear Solver (experimental)"
 msgstr "Datrysydd an Llinynnol Swarm %PRODUCTNAME (arbrofol)"
 
-#: strings.hrc:28
+#: sccomp/inc/strings.hrc:28
 msgctxt "RID_PROPERTY_NONNEGATIVE"
 msgid "Assume variables as non-negative"
 msgstr "Tybio fod yr amrywiolion yn annegyddol"
 
-#: strings.hrc:29
+#: sccomp/inc/strings.hrc:29
 msgctxt "RID_PROPERTY_INTEGER"
 msgid "Assume variables as integer"
 msgstr "Tybio amrywiolion fel cyfanrif"
 
-#: strings.hrc:30
+#: sccomp/inc/strings.hrc:30
 msgctxt "RID_PROPERTY_TIMEOUT"
 msgid "Solving time limit (seconds)"
 msgstr "Datrys terfyn amser (eiliad)"
 
-#: strings.hrc:31
+#: sccomp/inc/strings.hrc:31
 msgctxt "RID_PROPERTY_EPSILONLEVEL"
 msgid "Epsilon level (0-3)"
 msgstr "Lefel epsilon (0-3)"
 
-#: strings.hrc:32
+#: sccomp/inc/strings.hrc:32
 msgctxt "RID_PROPERTY_LIMITBBDEPTH"
 msgid "Limit branch-and-bound depth"
 msgstr "Cyfyngu ar derfyn rannu a rhwymo"
 
-#: strings.hrc:33
+#: sccomp/inc/strings.hrc:33
 msgctxt "RID_PROPERTY_ALGORITHM"
 msgid "Swarm algorithm (0 - Differential Evolution, 1 - Particle Swarm Optimization)"
 msgstr "Algorithm Swarm (0 - Esblygiad Gwahaniaethol, 1 - Gwella Gronynnau Swarm)"
 
-#: strings.hrc:34
+#: sccomp/inc/strings.hrc:34
 msgctxt "RID_ERROR_NONLINEAR"
 msgid "The model is not linear."
 msgstr "Nid yw'r model yn llinellol."
 
-#: strings.hrc:35
+#: sccomp/inc/strings.hrc:35
 msgctxt "RID_ERROR_EPSILONLEVEL"
 msgid "The epsilon level is invalid."
 msgstr "Mae'r lefel epsilon yn annilys."
 
-#: strings.hrc:36
+#: sccomp/inc/strings.hrc:36
 msgctxt "RID_ERROR_INFEASIBLE"
 msgid "The model is infeasible. Check limiting conditions."
 msgstr "Mae'r model yn annichonadwy. Gwirio cyflyrau cyfyngu."
 
-#: strings.hrc:37
+#: sccomp/inc/strings.hrc:37
 msgctxt "RID_ERROR_UNBOUNDED"
 msgid "The model is unbounded."
 msgstr "Mae'r model yn ddiderfyn."
 
-#: strings.hrc:38
+#: sccomp/inc/strings.hrc:38
 msgctxt "RID_ERROR_TIMEOUT"
 msgid "The time limit was reached."
 msgstr "Wedi cyrraedd terfyn amser."
diff --git a/source/cy/sd/messages.po b/source/cy/sd/messages.po
index 1e7fca63d76..ec41175ef5d 100644
--- a/source/cy/sd/messages.po
+++ b/source/cy/sd/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: 2017-12-29 15:01+0000\n"
+"POT-Creation-Date: 2018-04-24 12:21+0200\n"
+"PO-Revision-Date: 2018-04-18 08:41+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,439 +14,444 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: LibreOffice\n"
-"X-POOTLE-MTIME: 1514559672.000000\n"
+"X-POOTLE-MTIME: 1524040860.000000\n"
 
-#: DocumentRenderer.hrc:29
+#: sd/inc/DocumentRenderer.hrc:29
 msgctxt "STR_IMPRESS_PRINT_UI_CONTENT_CHOICES"
 msgid "Slides"
 msgstr "Sleidiau"
 
-#: DocumentRenderer.hrc:30
+#: sd/inc/DocumentRenderer.hrc:30
 msgctxt "STR_IMPRESS_PRINT_UI_CONTENT_CHOICES"
 msgid "Handouts"
 msgstr "Taflenni"
 
-#: DocumentRenderer.hrc:31
+#: sd/inc/DocumentRenderer.hrc:31
 msgctxt "STR_IMPRESS_PRINT_UI_CONTENT_CHOICES"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: DocumentRenderer.hrc:32
+#: sd/inc/DocumentRenderer.hrc:32
 msgctxt "STR_IMPRESS_PRINT_UI_CONTENT_CHOICES"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: DocumentRenderer.hrc:37
+#: sd/inc/DocumentRenderer.hrc:37
 msgctxt "STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES"
 msgid "According to layout"
 msgstr "Yn ôl y cynllun"
 
-#: DocumentRenderer.hrc:38
+#: sd/inc/DocumentRenderer.hrc:38
 msgctxt "STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES"
 msgid "1"
 msgstr "1"
 
-#: DocumentRenderer.hrc:39
+#: sd/inc/DocumentRenderer.hrc:39
 msgctxt "STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES"
 msgid "2"
 msgstr "2"
 
-#: DocumentRenderer.hrc:40
+#: sd/inc/DocumentRenderer.hrc:40
 msgctxt "STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES"
 msgid "3"
 msgstr "3"
 
-#: DocumentRenderer.hrc:41
+#: sd/inc/DocumentRenderer.hrc:41
 msgctxt "STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES"
 msgid "4"
 msgstr "4"
 
-#: DocumentRenderer.hrc:42
+#: sd/inc/DocumentRenderer.hrc:42
 msgctxt "STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES"
 msgid "6"
 msgstr "6"
 
-#: DocumentRenderer.hrc:43
+#: sd/inc/DocumentRenderer.hrc:43
 msgctxt "STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES"
 msgid "9"
 msgstr "9"
 
-#: DocumentRenderer.hrc:48
+#: sd/inc/DocumentRenderer.hrc:48
 msgctxt "STR_IMPRESS_PRINT_UI_ORDER_CHOICES"
 msgid "Left to right, then down"
 msgstr "Chwith i'r dde, ac yna i lawr"
 
-#: DocumentRenderer.hrc:49
+#: sd/inc/DocumentRenderer.hrc:49
 msgctxt "STR_IMPRESS_PRINT_UI_ORDER_CHOICES"
 msgid "Top to bottom, then right"
 msgstr "Brig i'r gwaelod, ac yna i'r dde"
 
-#: DocumentRenderer.hrc:54
+#: sd/inc/DocumentRenderer.hrc:54
 msgctxt "STR_IMPRESS_PRINT_UI_QUALITY_CHOICES"
 msgid "Original colors"
 msgstr "Lliwiau gwreiddiol"
 
-#: DocumentRenderer.hrc:55
+#: sd/inc/DocumentRenderer.hrc:55
 msgctxt "STR_IMPRESS_PRINT_UI_QUALITY_CHOICES"
 msgid "Grayscale"
 msgstr "Graddlwyd"
 
-#: DocumentRenderer.hrc:56
+#: sd/inc/DocumentRenderer.hrc:56
 msgctxt "STR_IMPRESS_PRINT_UI_QUALITY_CHOICES"
 msgid "Black & white"
 msgstr "Du a gwyn"
 
-#: DocumentRenderer.hrc:61
+#: sd/inc/DocumentRenderer.hrc:61
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES"
 msgid "Original size"
 msgstr "Maint gwreiddiol"
 
-#: DocumentRenderer.hrc:62
+#: sd/inc/DocumentRenderer.hrc:62
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES"
 msgid "Fit to printable page"
 msgstr "Ffitio i'r dudalen argraffadwy"
 
-#: DocumentRenderer.hrc:63
+#: sd/inc/DocumentRenderer.hrc:63
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES"
 msgid "Distribute on multiple sheets of paper"
 msgstr "Dosbarthu ar ddalennau lluosog o bapur"
 
-#: DocumentRenderer.hrc:64
+#: sd/inc/DocumentRenderer.hrc:64
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES"
 msgid "Tile sheet of paper with repeated slides"
 msgstr "Teilo dalennau o bapur gyda sleidiau'n ailadrodd"
 
-#: DocumentRenderer.hrc:69
+#: sd/inc/DocumentRenderer.hrc:69
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW"
 msgid "Original size"
 msgstr "Maint gwreiddiol"
 
-#: DocumentRenderer.hrc:70
+#: sd/inc/DocumentRenderer.hrc:70
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW"
 msgid "Fit to printable page"
 msgstr "Ffitio i'r dudalen argraffadwy"
 
-#: DocumentRenderer.hrc:71
+#: sd/inc/DocumentRenderer.hrc:71
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW"
 msgid "Distribute on multiple sheets of paper"
 msgstr "Dosbarthu ar ddalennau lluosog o bapur"
 
-#: DocumentRenderer.hrc:72
+#: sd/inc/DocumentRenderer.hrc:72
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW"
 msgid "Tile sheet of paper with repeated pages"
 msgstr "Teilsio dalen o bapur ar dudalennau sy'n ailadrodd"
 
-#: DocumentRenderer.hrc:77
+#: sd/inc/DocumentRenderer.hrc:77
 msgctxt "STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST"
 msgid "All pages"
 msgstr "Pob tudalen"
 
-#: DocumentRenderer.hrc:78
+#: sd/inc/DocumentRenderer.hrc:78
 msgctxt "STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST"
 msgid "Front sides / right pages"
 msgstr "Ochrau blaen / tudalennau de"
 
-#: DocumentRenderer.hrc:79
+#: sd/inc/DocumentRenderer.hrc:79
 msgctxt "STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST"
 msgid "Back sides / left pages"
 msgstr "Ochrau cefn / tudalennau chwith"
 
-#: DocumentRenderer.hrc:84
+#: sd/inc/DocumentRenderer.hrc:84
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE"
 msgid "~All slides"
 msgstr "~Pob sleid"
 
-#: DocumentRenderer.hrc:85
+#: sd/inc/DocumentRenderer.hrc:85
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE"
 msgid "~Slides"
 msgstr "~Sleidiau"
 
-#: DocumentRenderer.hrc:86
+#: sd/inc/DocumentRenderer.hrc:86
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE"
 msgid "Se~lection"
 msgstr "~Dewis"
 
-#: DocumentRenderer.hrc:91
+#: sd/inc/DocumentRenderer.hrc:91
 msgctxt "STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE"
 msgid "~All pages"
 msgstr "~Pob tudalen"
 
-#: DocumentRenderer.hrc:92
+#: sd/inc/DocumentRenderer.hrc:92
 msgctxt "STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE"
 msgid "Pa~ges"
 msgstr "~Tudalennau"
 
-#: DocumentRenderer.hrc:93
+#: sd/inc/DocumentRenderer.hrc:93
 msgctxt "STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE"
 msgid "Se~lection"
 msgstr "~Dewis"
 
-#: errhdl.hrc:29
+#: sd/inc/errhdl.hrc:29
 msgctxt "RID_SD_ERRHDL"
 msgid "File format error found at $(ARG1)(row,col)."
 msgstr "Gwall fformatio wedi ei ganfod yn $(ARG1)(rhes,col)."
 
-#: errhdl.hrc:31 /home/cl/vc/git/libo-core/sd/inc/errhdl.hrc:33
+#: sd/inc/errhdl.hrc:31 sd/inc/errhdl.hrc:33
 msgctxt "RID_SD_ERRHDL"
 msgid "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col)."
 msgstr "Gwall fformatio wedi ei ganfod yn y ffeil yn is ddogfen $(ARG1) yn safle $(ARG2)(rhes,col)."
 
-#: family.hrc:29
+#: sd/inc/family.hrc:29
 msgctxt "RID_GRAPHICSTYLEFAMILY"
 msgid "All Styles"
 msgstr "Pob Arddull"
 
-#: family.hrc:30
+#: sd/inc/family.hrc:30
 msgctxt "RID_GRAPHICSTYLEFAMILY"
 msgid "Hidden Styles"
 msgstr "Arddulliau Cudd"
 
-#: family.hrc:31
+#: sd/inc/family.hrc:31
 msgctxt "RID_GRAPHICSTYLEFAMILY"
 msgid "Applied Styles"
 msgstr "Arddulliau wedi eu Gosod"
 
-#: family.hrc:32
+#: sd/inc/family.hrc:32
 msgctxt "RID_GRAPHICSTYLEFAMILY"
 msgid "Custom Styles"
 msgstr "Arddulliau Cyfaddas"
 
-#: family.hrc:38
+#: sd/inc/family.hrc:38
 msgctxt "RID_PRESENTATIONSTYLEFAMILY"
 msgid "All Styles"
 msgstr "Pob Arddull"
 
-#: family.hrc:39
+#: sd/inc/family.hrc:39
 msgctxt "RID_PRESENTATIONSTYLEFAMILY"
 msgid "Hidden Styles"
 msgstr "Arddulliau Cudd"
 
-#: strings.hrc:25
+#: sd/inc/strings.hrc:25
 msgctxt "STR_NULL"
 msgid "None"
 msgstr "Dim"
 
-#: strings.hrc:26
+#: sd/inc/strings.hrc:26
 msgctxt "STR_INSERTPAGE"
 msgid "Insert Slide"
 msgstr "Mewnosod Sleid"
 
-#: strings.hrc:27
+#: sd/inc/strings.hrc:27
 msgctxt "STR_INSERTLAYER"
 msgid "Insert Layer"
 msgstr "Mewnosod Haen"
 
-#: strings.hrc:28
+#: sd/inc/strings.hrc:28
 msgctxt "STR_MODIFYLAYER"
 msgid "Modify Layer"
 msgstr "Newid Haen"
 
-#: strings.hrc:29
+#: sd/inc/strings.hrc:29
 msgctxt "STR_UNDO_SLIDE_PARAMS"
 msgid "Slide parameter"
 msgstr "Paramedr sleid"
 
-#: strings.hrc:30
+#: sd/inc/strings.hrc:30
 msgctxt "STR_UNDO_CUT"
 msgid "Cut"
 msgstr "Torri"
 
-#: strings.hrc:31
+#: sd/inc/strings.hrc:31
 msgctxt "STR_UNDO_REPLACE"
 msgid "Replace"
 msgstr "Newid"
 
-#: strings.hrc:32
+#: sd/inc/strings.hrc:32
 msgctxt "STR_UNDO_DRAGDROP"
 msgid "Drag and Drop"
 msgstr "Llusgo a Gollwng"
 
-#: strings.hrc:33
+#: sd/inc/strings.hrc:33
 msgctxt "STR_INSERTGRAPHIC"
 msgid "Insert Image"
 msgstr "Mewnosod Delwedd"
 
-#: strings.hrc:34
+#: sd/inc/strings.hrc:34
+msgctxt "STR_QUERYROTATION"
+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?"
+
+#: sd/inc/strings.hrc:35
 msgctxt "STR_UNDO_BEZCLOSE"
 msgid "Close Polygon"
 msgstr "Cau Polygon"
 
-#: strings.hrc:35
+#: sd/inc/strings.hrc:36
 msgctxt "STR_SLIDE_SORTER_MODE"
 msgid "Slide Sorter"
 msgstr "Trefnu Sleidiau"
 
-#: strings.hrc:36
+#: sd/inc/strings.hrc:37
 msgctxt "STR_NORMAL_MODE"
 msgid "Normal"
 msgstr "Normal"
 
-#: strings.hrc:37
+#: sd/inc/strings.hrc:38
 msgctxt "STR_SLIDE_MASTER_MODE"
 msgid "Master Slide"
 msgstr "Prif Sleid"
 
-#: strings.hrc:38
+#: sd/inc/strings.hrc:39
 msgctxt "STR_OUTLINE_MODE"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: strings.hrc:39
+#: sd/inc/strings.hrc:40
 msgctxt "STR_NOTES_MODE"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: strings.hrc:40
+#: sd/inc/strings.hrc:41
 msgctxt "STR_NOTES_MASTER_MODE"
 msgid "Master Notes"
 msgstr "Prif Nodiadau"
 
-#: strings.hrc:41
+#: sd/inc/strings.hrc:42
 msgctxt "STR_HANDOUT_MASTER_MODE"
 msgid "Master Handout"
 msgstr "Prif Daflen"
 
-#: strings.hrc:42
+#: sd/inc/strings.hrc:43
 msgctxt "STR_AUTOLAYOUT_NONE"
 msgid "Blank Slide"
 msgstr "Sleid Wag"
 
-#: strings.hrc:43
+#: sd/inc/strings.hrc:44
 msgctxt "STR_AUTOLAYOUT_ONLY_TITLE"
 msgid "Title Only"
 msgstr "Teitl yn Unig"
 
-#: strings.hrc:44
+#: sd/inc/strings.hrc:45
 msgctxt "STR_AUTOLAYOUT_ONLY_TEXT"
 msgid "Centered Text"
 msgstr "Testun wedi ei Ganoli"
 
-#: strings.hrc:45
+#: sd/inc/strings.hrc:46
 msgctxt "STR_AUTOLAYOUT_TITLE"
 msgid "Title Slide"
 msgstr "Teitl Sleid"
 
-#: strings.hrc:46
+#: sd/inc/strings.hrc:47
 msgctxt "STR_AUTOLAYOUT_CONTENT"
 msgid "Title, Content"
 msgstr "Teitl, Cynnwys"
 
-#: strings.hrc:47
+#: sd/inc/strings.hrc:48
 msgctxt "STR_AUTOLAYOUT_2CONTENT"
 msgid "Title and 2 Content"
 msgstr "Teitl a 2 Gynnwys"
 
-#: strings.hrc:48
+#: sd/inc/strings.hrc:49
 msgctxt "STR_AUTOLAYOUT_CONTENT_2CONTENT"
 msgid "Title, Content and 2 Content"
 msgstr "Teitl, Cynnwys a 2 Gynnwys"
 
-#: strings.hrc:49
+#: sd/inc/strings.hrc:50
 msgctxt "STR_AUTOLAYOUT_2CONTENT_CONTENT"
 msgid "Title, 2 Content and Content"
 msgstr "Teitl, 2 Cynnwys a Chynnwys"
 
-#: strings.hrc:50
+#: sd/inc/strings.hrc:51
 msgctxt "STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT"
 msgid "Title, 2 Content over Content"
 msgstr "Teitl, 2 Cynnwys dros Cynnwys"
 
-#: strings.hrc:51
+#: sd/inc/strings.hrc:52
 msgctxt "STR_AUTOLAYOUT_CONTENT_OVER_CONTENT"
 msgid "Title, Content over Content"
 msgstr "Teitl, Cynnwys dros Gynnwys"
 
-#: strings.hrc:52
+#: sd/inc/strings.hrc:53
 msgctxt "STR_AUTOLAYOUT_4CONTENT"
 msgid "Title, 4 Content"
 msgstr "Teitl, 4 Cynnwys"
 
-#: strings.hrc:53
+#: sd/inc/strings.hrc:54
 msgctxt "STR_AUTOLAYOUT_6CONTENT"
 msgid "Title, 6 Content"
 msgstr "Teitl 6 Cynnwys"
 
-#: strings.hrc:54
+#: sd/inc/strings.hrc:55
 msgctxt "STR_AL_TITLE_VERT_OUTLINE"
 msgid "Title, Vertical Text"
 msgstr "Teitl, Testun Fertigol"
 
-#: strings.hrc:55
+#: sd/inc/strings.hrc:56
 msgctxt "STR_AL_TITLE_VERT_OUTLINE_CLIPART"
 msgid "Title, Vertical Text, Clipart"
 msgstr "Teitl, Testun Fertigol, ClipGelf"
 
-#: strings.hrc:56
+#: sd/inc/strings.hrc:57
 msgctxt "STR_AL_VERT_TITLE_TEXT_CHART"
 msgid "Vertical Title, Text, Chart"
 msgstr "Teitl Fertigol, Testun, Siart"
 
-#: strings.hrc:57
+#: sd/inc/strings.hrc:58
 msgctxt "STR_AL_VERT_TITLE_VERT_OUTLINE"
 msgid "Vertical Title, Vertical Text"
 msgstr "Teitl Fertigol, Testun Fertigol"
 
-#: strings.hrc:58
+#: sd/inc/strings.hrc:59
 msgctxt "STR_AUTOLAYOUT_HANDOUT1"
 msgid "One Slide"
 msgstr "Un Sleid"
 
-#: strings.hrc:59
+#: sd/inc/strings.hrc:60
 msgctxt "STR_AUTOLAYOUT_HANDOUT2"
 msgid "Two Slides"
 msgstr "Dwy Sleid"
 
-#: strings.hrc:60
+#: sd/inc/strings.hrc:61
 msgctxt "STR_AUTOLAYOUT_HANDOUT3"
 msgid "Three Slides"
 msgstr "Tair Sleid"
 
-#: strings.hrc:61
+#: sd/inc/strings.hrc:62
 msgctxt "STR_AUTOLAYOUT_HANDOUT4"
 msgid "Four Slides"
 msgstr "Pedair Sleid"
 
-#: strings.hrc:62
+#: sd/inc/strings.hrc:63
 msgctxt "STR_AUTOLAYOUT_HANDOUT6"
 msgid "Six Slides"
 msgstr "Chwe Sleid"
 
-#: strings.hrc:63
+#: sd/inc/strings.hrc:64
 msgctxt "STR_AUTOLAYOUT_HANDOUT9"
 msgid "Nine Slides"
 msgstr "Naw Sleid"
 
-#: strings.hrc:64
+#: sd/inc/strings.hrc:65
 msgctxt "STR_DISPLAYMODE_EDITMODES"
 msgid "Edit Modes"
 msgstr "Moddau Golygu"
 
-#: strings.hrc:65
+#: sd/inc/strings.hrc:66
 msgctxt "STR_DISPLAYMODE_MASTERMODES"
 msgid "Master Modes"
 msgstr "Prif Foddau"
 
-#: strings.hrc:66
+#: sd/inc/strings.hrc:67
 msgctxt "STR_AUTOLAYOUT_NOTES"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: strings.hrc:67
+#: sd/inc/strings.hrc:68
 msgctxt "STR_TRANSFORM"
 msgid "Transform"
 msgstr "Trawsnewid"
 
-#: strings.hrc:68
+#: sd/inc/strings.hrc:69
 msgctxt "STR_LINEEND"
 msgid "Line Ends"
 msgstr "Diwedd Llinell"
 
-#: strings.hrc:69
+#: sd/inc/strings.hrc:70
 msgctxt "STR_DESC_LINEEND"
 msgid "Please enter a name for the new arrowhead:"
 msgstr "Rhowch enw i'r pen saeth newydd:"
 
-#: strings.hrc:70
+#: sd/inc/strings.hrc:71
 msgctxt "STR_WARN_NAME_DUPLICATE"
 msgid ""
 "The name chosen already exists. \n"
@@ -455,87 +460,82 @@ msgstr ""
 "Mae'r enw'n bod yn barod. \n"
 "Rhowch enw arall."
 
-#: strings.hrc:71
+#: sd/inc/strings.hrc:72
 msgctxt "STR_UNDO_ANIMATION"
 msgid "Animation parameters"
 msgstr "Paramedrau animeiddio"
 
-#: strings.hrc:72
-msgctxt "STR_EXPORT_HTML_NAME"
-msgid "Web Page"
-msgstr "Tudalen Gwe"
-
-#: strings.hrc:73
+#: sd/inc/strings.hrc:73
 msgctxt "STR_UNDO_COPYOBJECTS"
 msgid "Duplicate"
 msgstr "Dyblyg"
 
-#: strings.hrc:74
+#: sd/inc/strings.hrc:74
 msgctxt "STR_TITLE_NAMEGROUP"
 msgid "Name Object"
 msgstr "Enwi Gwrthrych"
 
-#: strings.hrc:75
+#: sd/inc/strings.hrc:75
 msgctxt "STR_DESC_NAMEGROUP"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:76
+#: sd/inc/strings.hrc:76
 msgctxt "STR_WARN_PAGE_EXISTS"
 msgid "The slide name already exists or is invalid. Please enter another name."
 msgstr "Mae'r enw sleid yn bod yn barod neu mae'n annilys. Cynnigwch enw arall."
 
-#: strings.hrc:77
+#: sd/inc/strings.hrc:77
 msgctxt "STR_SNAPDLG_SETLINE"
 msgid "Edit Snap Line"
 msgstr "Golygu Llinell Snap"
 
-#: strings.hrc:78
+#: sd/inc/strings.hrc:78
 msgctxt "STR_SNAPDLG_SETPOINT"
 msgid "Edit Snap Point"
 msgstr "Golygu Pwynt Snap"
 
-#: strings.hrc:79
+#: sd/inc/strings.hrc:79
 msgctxt "STR_POPUP_EDIT_SNAPLINE"
 msgid "Edit Snap Line..."
 msgstr "Golygu Llinell Snap..."
 
-#: strings.hrc:80
+#: sd/inc/strings.hrc:80
 msgctxt "STR_POPUP_EDIT_SNAPPOINT"
 msgid "Edit Snap Point..."
 msgstr "Golygu Pwynt Snap..."
 
-#: strings.hrc:81
+#: sd/inc/strings.hrc:81
 msgctxt "STR_POPUP_DELETE_SNAPLINE"
 msgid "Delete Snap Line"
 msgstr "Dileu Llinell Snap"
 
-#: strings.hrc:82
+#: sd/inc/strings.hrc:82
 msgctxt "STR_POPUP_DELETE_SNAPPOINT"
 msgid "Delete Snap Point"
 msgstr "Dileu Pwynt Snap"
 
-#: strings.hrc:83
+#: sd/inc/strings.hrc:83
 msgctxt "STR_IMPRESS"
 msgid "StarImpress 4.0"
 msgstr "StarImpress 4.0"
 
-#: strings.hrc:84
+#: sd/inc/strings.hrc:84
 msgctxt "STR_LAYER"
 msgid "Layer"
 msgstr "Haen"
 
-#: strings.hrc:85
+#: sd/inc/strings.hrc:85
 msgctxt "STR_UNDO_DELETEPAGES"
 msgid "Delete slides"
 msgstr "Dileu sleidiau"
 
-#: strings.hrc:86
+#: sd/inc/strings.hrc:86
 msgctxt "STR_UNDO_INSERTPAGES"
 msgid "Insert slides"
 msgstr "Mewnosod sleidiau"
 
-#: strings.hrc:87
+#: sd/inc/strings.hrc:87
 msgctxt "STR_ASK_DELETE_LAYER"
 msgid ""
 "Are you sure you want to delete the level \"$\"?\n"
@@ -544,77 +544,77 @@ msgstr ""
 "Ydych chi'n siŵr eich bod am ddileu lefel \"$\"?\n"
 "Sylwch: Bydd pob gwrthrych ar y lefel yn cael ei ddileu!"
 
-#: strings.hrc:88
+#: sd/inc/strings.hrc:88
 msgctxt "STR_ASK_DELETE_ALL_PICTURES"
 msgid "Do you really want to delete all images?"
 msgstr "Ydych chi am ddileu'r holl ddelweddau?"
 
-#: strings.hrc:89
+#: sd/inc/strings.hrc:89
 msgctxt "STR_UNDO_CHANGE_TITLE_AND_LAYOUT"
 msgid "Modify title and outline"
 msgstr "Newid teitl ac amlinelliad"
 
-#: strings.hrc:90
+#: sd/inc/strings.hrc:90
 msgctxt "STR_WAV_FILE"
 msgid "Audio"
 msgstr "Sain"
 
-#: strings.hrc:91
+#: sd/inc/strings.hrc:91
 msgctxt "STR_MIDI_FILE"
 msgid "MIDI"
 msgstr "MIDI"
 
-#: strings.hrc:92
+#: sd/inc/strings.hrc:92
 msgctxt "STR_AU_FILE"
 msgid "Sun/NeXT Audio"
 msgstr "Sun/NeXT Audio"
 
-#: strings.hrc:93
+#: sd/inc/strings.hrc:93
 msgctxt "STR_VOC_FILE"
 msgid "Creative Labs Audio"
 msgstr "Creative Labs Audio"
 
-#: strings.hrc:94
+#: sd/inc/strings.hrc:94
 msgctxt "STR_AIFF_FILE"
 msgid "Apple/SGI Audio"
 msgstr "Apple/SGI Audio"
 
-#: strings.hrc:95
+#: sd/inc/strings.hrc:95
 msgctxt "STR_SVX_FILE"
 msgid "Amiga SVX Audio"
 msgstr "Amiga SVX Audio"
 
-#: strings.hrc:96
+#: sd/inc/strings.hrc:96
 msgctxt "STR_SD_PAGE"
 msgid "Slide"
 msgstr "Sleid"
 
-#: strings.hrc:97
+#: sd/inc/strings.hrc:97
 msgctxt "STR_SD_PAGE_COUNT"
 msgid "Slide %1 of %2"
 msgstr "Sleid %1 o %2"
 
-#: strings.hrc:98
+#: sd/inc/strings.hrc:98
 msgctxt "STR_SD_PAGE_COUNT_CUSTOM"
 msgid "Slide %1 of %2 (%3)"
 msgstr "Sleid %1 o %2 (%3)"
 
-#: strings.hrc:99
+#: sd/inc/strings.hrc:99
 msgctxt "STR_ALL_SUPPORTED_FORMATS"
 msgid "All supported formats"
 msgstr "Pob fformat sy'n cael ei gynnal"
 
-#: strings.hrc:100
+#: sd/inc/strings.hrc:100
 msgctxt "STR_ALL_FILES"
 msgid "All files"
 msgstr "Pob ffeil"
 
-#: strings.hrc:101
+#: sd/inc/strings.hrc:101
 msgctxt "STR_UNDO_INSERT_TEXTFRAME"
 msgid "Insert text frame"
 msgstr "Mewnosod ffrâm testun"
 
-#: strings.hrc:102
+#: sd/inc/strings.hrc:102
 msgctxt "STR_ACTION_NOTPOSSIBLE"
 msgid ""
 "This function cannot be run \n"
@@ -623,17 +623,17 @@ msgstr ""
 "Methu rhedeg y swyddogaeth hon\n"
 "o'r gwrthrychau hyn."
 
-#: strings.hrc:103
+#: sd/inc/strings.hrc:103
 msgctxt "STR_DLG_INSERT_PAGES_FROM_FILE"
 msgid "Insert File"
 msgstr "Mewnosod Ffeil"
 
-#: strings.hrc:104
+#: sd/inc/strings.hrc:104
 msgctxt "STR_READ_DATA_ERROR"
 msgid "The file could not be loaded!"
 msgstr "Methu llwytho'r ffeil!"
 
-#: strings.hrc:105
+#: sd/inc/strings.hrc:105
 msgctxt "STR_SCALE_OBJECTS"
 msgid ""
 "The page size of the target document is different than the source document.\n"
@@ -644,127 +644,127 @@ msgstr ""
 "\n"
 "Hoffech chi raddio'r gwrthrychau i'w copïo i ffitio'r maint papur newydd?"
 
-#: strings.hrc:106
+#: sd/inc/strings.hrc:106
 msgctxt "STR_CREATE_PAGES"
 msgid "Create Slides"
 msgstr "Creu Sleidiau"
 
-#: strings.hrc:107
+#: sd/inc/strings.hrc:107
 msgctxt "STR_UNDO_CHANGE_PAGEFORMAT"
 msgid "Modify page format"
 msgstr "Newid fformat tudalen"
 
-#: strings.hrc:108
+#: sd/inc/strings.hrc:108
 msgctxt "STR_UNDO_CHANGE_PAGEBORDER"
 msgid "Modify page margins"
 msgstr "Newid ymyl tudalen"
 
-#: strings.hrc:109
+#: sd/inc/strings.hrc:109
 msgctxt "STR_EDIT_OBJ"
 msgid "~Edit"
 msgstr "~Golygu"
 
-#: strings.hrc:110
+#: sd/inc/strings.hrc:110
 msgctxt "STR_DELETE_PAGES"
 msgid "Delete Slides"
 msgstr "Dileu Sleidiau"
 
-#: strings.hrc:111
+#: sd/inc/strings.hrc:111
 msgctxt "STR_WARN_PRINTFORMAT_FAILURE"
 msgid "The document format could not be set on the specified printer."
 msgstr "Methu gosod fformat y ddogfen yn yr argraffydd hwn."
 
-#: strings.hrc:112
+#: sd/inc/strings.hrc:112
 msgctxt "STR_IMPORT_GRFILTER_OPENERROR"
 msgid "Image file cannot be opened"
 msgstr "Methu agor y ffeil delwedd"
 
-#: strings.hrc:113
+#: sd/inc/strings.hrc:113
 msgctxt "STR_IMPORT_GRFILTER_IOERROR"
 msgid "Image file cannot be read"
 msgstr "Methu darllen y ffeil delwedd"
 
-#: strings.hrc:114
+#: sd/inc/strings.hrc:114
 msgctxt "STR_IMPORT_GRFILTER_FORMATERROR"
 msgid "Unknown image format"
 msgstr "Fformat delwedd anhysbys"
 
-#: strings.hrc:115
+#: sd/inc/strings.hrc:115
 msgctxt "STR_IMPORT_GRFILTER_VERSIONERROR"
 msgid "This image file version is not supported"
 msgstr "Nid yw'r fersiwn ffeil delwedd hon yn cael ei chynnal"
 
-#: strings.hrc:116
+#: sd/inc/strings.hrc:116
 msgctxt "STR_IMPORT_GRFILTER_FILTERERROR"
 msgid "Image filter not found"
 msgstr "Heb ganfod hidl delwedd"
 
-#: strings.hrc:117
+#: sd/inc/strings.hrc:117
 msgctxt "STR_IMPORT_GRFILTER_TOOBIG"
 msgid "Not enough memory to import image"
 msgstr "Dim digon o gof i fewnosod graffigau"
 
-#: strings.hrc:118
+#: sd/inc/strings.hrc:118
 msgctxt "STR_OBJECTS"
 msgid "Objects"
 msgstr "Gwrthrychau"
 
-#: strings.hrc:119
+#: sd/inc/strings.hrc:119
 msgctxt "STR_END_SPELLING"
 msgid "Spellcheck of entire document has been completed."
 msgstr "Mae gwirio sillafu'r ddogfen gyfan wedi ei gwblhau."
 
-#: strings.hrc:120
+#: sd/inc/strings.hrc:120
 msgctxt "STR_END_SPELLING_OBJ"
 msgid "The spellcheck for the selected objects has been completed."
 msgstr "Mae gwirio sillafu'r adrannau hyn wedi ei gwblhau."
 
-#: strings.hrc:121
+#: sd/inc/strings.hrc:121
 msgctxt "STR_ASK_FOR_CONVERT_TO_BEZIER"
 msgid "Convert selected object to curve?"
 msgstr "Trosi'r gwrthrych yn gromlin?"
 
-#: strings.hrc:122
+#: sd/inc/strings.hrc:122
 msgctxt "STR_UNDO_CHANGE_PRES_OBJECT"
 msgid "Modify presentation object '$'"
 msgstr "Newid gwrthrych cyflwyno '$'"
 
-#: strings.hrc:123
+#: sd/inc/strings.hrc:123
 msgctxt "STR_UNDO_MODIFY_PAGE"
 msgid "Slide layout"
 msgstr "Cynllun sleidiau"
 
-#: strings.hrc:124
+#: sd/inc/strings.hrc:124
 msgctxt "STR_UNDO_INSERT_FILE"
 msgid "Insert file"
 msgstr "Mewnosod ffeil"
 
-#: strings.hrc:125
+#: sd/inc/strings.hrc:125
 msgctxt "STR_UNDO_INSERT_SPECCHAR"
 msgid "Insert special character"
 msgstr "Mewnosod nod arbennig"
 
-#: strings.hrc:126
+#: sd/inc/strings.hrc:126
 msgctxt "STR_UNDO_SET_PRESLAYOUT"
 msgid "Apply presentation layout"
 msgstr "Gosod cynllun cyflwyniad"
 
-#: strings.hrc:127
+#: sd/inc/strings.hrc:127
 msgctxt "STR_PLAY"
 msgid "~Play"
 msgstr "~Chwarae"
 
-#: strings.hrc:128
+#: sd/inc/strings.hrc:128
 msgctxt "STR_STOP"
 msgid "Sto~p"
 msgstr "~Atal"
 
-#: strings.hrc:129
+#: sd/inc/strings.hrc:129
 msgctxt "STR_UNDO_ORIGINALSIZE"
 msgid "Original Size"
 msgstr "Maint Gwreiddiol"
 
-#: strings.hrc:130
+#: sd/inc/strings.hrc:130
 msgctxt "STR_WARN_SCALE_FAIL"
 msgid ""
 "The specified scale is invalid.\n"
@@ -773,339 +773,344 @@ msgstr ""
 "Mae'r raddfa hon yn annilys.\n"
 "Hoffech chi osod un newydd?"
 
-#: strings.hrc:131
+#: sd/inc/strings.hrc:131
 msgctxt "STR_CLICK_ACTION_NONE"
 msgid "No action"
 msgstr "Dim gweithred"
 
-#: strings.hrc:132
+#: sd/inc/strings.hrc:132
 msgctxt "STR_CLICK_ACTION_PREVPAGE"
 msgid "Go to previous slide"
 msgstr "Mynd i'r sleid flaenorol"
 
-#: strings.hrc:133
+#: sd/inc/strings.hrc:133
 msgctxt "STR_CLICK_ACTION_NEXTPAGE"
 msgid "Go to next slide"
 msgstr "Mynd i'r sleid nesaf"
 
-#: strings.hrc:134
+#: sd/inc/strings.hrc:134
 msgctxt "STR_CLICK_ACTION_FIRSTPAGE"
 msgid "Go to first slide"
 msgstr "Mynd i'r sleid gyntaf"
 
-#: strings.hrc:135
+#: sd/inc/strings.hrc:135
 msgctxt "STR_CLICK_ACTION_LASTPAGE"
 msgid "Go to last slide"
 msgstr "Mynd i'r sleid olaf"
 
-#: strings.hrc:136
+#: sd/inc/strings.hrc:136
 msgctxt "STR_CLICK_ACTION_BOOKMARK"
 msgid "Go to page or object"
 msgstr "Mynd i dudalen neu wrthrych"
 
-#: strings.hrc:137
+#: sd/inc/strings.hrc:137
 msgctxt "STR_CLICK_ACTION_DOCUMENT"
 msgid "Go to document"
 msgstr "Mynd i ddogfen"
 
-#: strings.hrc:138
+#: sd/inc/strings.hrc:138
 msgctxt "STR_CLICK_ACTION_SOUND"
 msgid "Play audio"
 msgstr "Chwarae sain"
 
-#: strings.hrc:139
+#: sd/inc/strings.hrc:139
 msgctxt "STR_CLICK_ACTION_VERB"
 msgid "Start object action"
 msgstr "Cychwyn gweithred gwrthrych"
 
-#: strings.hrc:140
+#: sd/inc/strings.hrc:140
 msgctxt "STR_CLICK_ACTION_PROGRAM"
 msgid "Run program"
 msgstr "Rhedeg rhaglen"
 
-#: strings.hrc:141
+#: sd/inc/strings.hrc:141
 msgctxt "STR_CLICK_ACTION_MACRO"
 msgid "Run macro"
 msgstr "Rhedeg macro"
 
-#: strings.hrc:142
+#: sd/inc/strings.hrc:142
 msgctxt "STR_CLICK_ACTION_STOPPRESENTATION"
 msgid "Exit presentation"
 msgstr "Gadael cyflwyniad"
 
-#: strings.hrc:143
+#: sd/inc/strings.hrc:143
 msgctxt "STR_EFFECTDLG_JUMP"
 msgid "Target"
 msgstr "Targed"
 
-#: strings.hrc:144
+#: sd/inc/strings.hrc:144
 msgctxt "STR_EFFECTDLG_ACTION"
 msgid "Act~ion"
 msgstr "~Gweithred"
 
-#: strings.hrc:145
+#: sd/inc/strings.hrc:145
 msgctxt "STR_EFFECTDLG_SOUND"
 msgid "Audio"
 msgstr "Sain"
 
-#: strings.hrc:146
+#: sd/inc/strings.hrc:146
 msgctxt "STR_EFFECTDLG_PAGE_OBJECT"
 msgid "Slide / Object"
 msgstr "Sleid / Gwrthrych"
 
-#: strings.hrc:147
+#: sd/inc/strings.hrc:147
 msgctxt "STR_EFFECTDLG_DOCUMENT"
 msgid "Document"
 msgstr "Dogfen"
 
-#: strings.hrc:148
+#: sd/inc/strings.hrc:148
 msgctxt "STR_EFFECTDLG_PROGRAM"
 msgid "Program"
 msgstr "Rhaglen"
 
-#: strings.hrc:149
+#: sd/inc/strings.hrc:149
 msgctxt "STR_EFFECTDLG_MACRO"
 msgid "Macro"
 msgstr "Macro"
 
 #. Strings for animation effects
-#: strings.hrc:151
+#: sd/inc/strings.hrc:151
 msgctxt "STR_INSERT_TEXT"
 msgid "Insert Text"
 msgstr "Mewnosod Testun"
 
-#: strings.hrc:152
+#: sd/inc/strings.hrc:152
 msgctxt "STR_SLIDE_SINGULAR"
 msgid " Slide"
 msgstr " Sleid"
 
-#: strings.hrc:153
+#: sd/inc/strings.hrc:153
 msgctxt "STR_SLIDE_PLURAL"
 msgid " Slides"
 msgstr " Sleids"
 
-#: strings.hrc:154
+#: sd/inc/strings.hrc:154
 msgctxt "STR_LOAD_PRESENTATION_LAYOUT"
 msgid "Load Slide Design"
 msgstr "Llwytho Cynllun Sleidiau"
 
-#: strings.hrc:155
+#: sd/inc/strings.hrc:155
 msgctxt "STR_DRAGTYPE_URL"
 msgid "Insert as Hyperlink"
 msgstr "Mewnosod fel Dolen"
 
-#: strings.hrc:156
+#: sd/inc/strings.hrc:156
 msgctxt "STR_DRAGTYPE_EMBEDDED"
 msgid "Insert as Copy"
 msgstr "Mewnosod fel Copi"
 
-#: strings.hrc:157
+#: sd/inc/strings.hrc:157
 msgctxt "STR_DRAGTYPE_LINK"
 msgid "Insert as Link"
 msgstr "Mewnosod fel Cysylltiad"
 
-#: strings.hrc:158
+#: sd/inc/strings.hrc:158
 msgctxt "STR_GLUE_ESCDIR_SMART"
 msgid "Smart"
 msgstr "Smart"
 
-#: strings.hrc:159
+#: sd/inc/strings.hrc:159
 msgctxt "STR_GLUE_ESCDIR_LEFT"
 msgid "Left"
 msgstr "Chwith"
 
-#: strings.hrc:160
+#: sd/inc/strings.hrc:160
 msgctxt "STR_GLUE_ESCDIR_RIGHT"
 msgid "Right"
 msgstr "De"
 
-#: strings.hrc:161
+#: sd/inc/strings.hrc:161
 msgctxt "STR_GLUE_ESCDIR_TOP"
 msgid "Top"
 msgstr "Brig"
 
-#: strings.hrc:162
+#: sd/inc/strings.hrc:162
 msgctxt "STR_GLUE_ESCDIR_BOTTOM"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: strings.hrc:163
+#: sd/inc/strings.hrc:163
 msgctxt "STR_GLUE_ESCDIR_LO"
 msgid "Top Left?"
 msgstr "Brig Chwith?"
 
-#: strings.hrc:164
+#: sd/inc/strings.hrc:164
 msgctxt "STR_GLUE_ESCDIR_LU"
 msgid "Bottom Left?"
 msgstr "Gwaelod Chwith?"
 
-#: strings.hrc:165
+#: sd/inc/strings.hrc:165
 msgctxt "STR_GLUE_ESCDIR_RO"
 msgid "Top Right?"
 msgstr "Brig De?"
 
-#: strings.hrc:166
+#: sd/inc/strings.hrc:166
 msgctxt "STR_GLUE_ESCDIR_RU"
 msgid "Bottom Right?"
 msgstr "Gwaelod De?"
 
-#: strings.hrc:167
+#: sd/inc/strings.hrc:167
 msgctxt "STR_GLUE_ESCDIR_HORZ"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: strings.hrc:168
+#: sd/inc/strings.hrc:168
 msgctxt "STR_GLUE_ESCDIR_VERT"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: strings.hrc:169
+#: sd/inc/strings.hrc:169
 msgctxt "STR_GLUE_ESCDIR_ALL"
 msgid "All?"
 msgstr "Popeth?"
 
-#: strings.hrc:170
+#: sd/inc/strings.hrc:170
 msgctxt "STR_CANT_PERFORM_IN_LIVEMODE"
 msgid "This action can't be run in the live mode."
 msgstr "Methu rhedeg y weithred ym modd byw."
 
-#: strings.hrc:171
+#: sd/inc/strings.hrc:171
 msgctxt "STR_PUBLISH_BACK"
 msgid "Back"
 msgstr "Nôl"
 
-#: strings.hrc:172
+#: sd/inc/strings.hrc:172
 msgctxt "STR_PUBLISH_NEXT"
 msgid "Continue"
 msgstr "Parhau"
 
-#: strings.hrc:173
+#: sd/inc/strings.hrc:173
 msgctxt "STR_PUBLISH_OUTLINE"
 msgid "Overview"
 msgstr "Trosolwg"
 
-#: strings.hrc:174
+#: sd/inc/strings.hrc:174
 msgctxt "STR_EYEDROPPER"
 msgid "Color Replacer"
 msgstr "Goddefiad Lliw"
 
-#: strings.hrc:175
+#: sd/inc/strings.hrc:175
 msgctxt "STR_UNDO_MORPHING"
 msgid "Cross-fading"
 msgstr "Trawsbylu"
 
-#: strings.hrc:176
-msgctxt "STR_UNDO_COLORRESOLUTION"
-msgid "Color resolution"
-msgstr "Cydraniad lliw"
-
-#: strings.hrc:177
+#: sd/inc/strings.hrc:176
 msgctxt "STR_UNDO_EXPAND_PAGE"
 msgid "Expand Slide"
 msgstr "Ymestyn Sleid"
 
-#: strings.hrc:178
+#: sd/inc/strings.hrc:177
 msgctxt "STR_UNDO_SUMMARY_PAGE"
 msgid "Table of Contents Slide"
 msgstr "Sleid Tabl Cynnwys"
 
-#: strings.hrc:179
+#: sd/inc/strings.hrc:178
 msgctxt "STR_TWAIN_NO_SOURCE_UNX"
 msgid "No SANE source is available at the moment."
 msgstr "Dim ffynhonnell SANE ar gael ar hyn o bryd."
 
-#: strings.hrc:180
+#: sd/inc/strings.hrc:179
 msgctxt "STR_TWAIN_NO_SOURCE"
 msgid "At present, no TWAIN source is available."
 msgstr "Ar hyn o bryd, nid oes ffynhonnell TWAIN ar gael."
 
-#: strings.hrc:181
+#: sd/inc/strings.hrc:180
 msgctxt "STR_FIX"
 msgid "Fixed"
 msgstr "Sefydlog"
 
-#: strings.hrc:182
+#: sd/inc/strings.hrc:181
 msgctxt "STR_VAR"
 msgid "Variable"
 msgstr "Newidyn"
 
-#: strings.hrc:183
+#: sd/inc/strings.hrc:182
 msgctxt "STR_STANDARD_NORMAL"
 msgid "Standard"
 msgstr "Safonol"
 
-#: strings.hrc:184
+#: sd/inc/strings.hrc:183
 msgctxt "STR_STANDARD_SMALL"
 msgid "Standard (short)"
 msgstr "Safonol (byr)"
 
-#: strings.hrc:185
+#: sd/inc/strings.hrc:184
 msgctxt "STR_STANDARD_BIG"
 msgid "Standard (long)"
 msgstr "Safonol (hir)"
 
-#: strings.hrc:186
+#: sd/inc/strings.hrc:185
 msgctxt "STR_FILEFORMAT_NAME_EXT"
 msgid "File name"
 msgstr "Enw ffeil"
 
-#: strings.hrc:187
+#: sd/inc/strings.hrc:186
 msgctxt "STR_FILEFORMAT_FULLPATH"
 msgid "Path/File name"
 msgstr "Enw Llwybr/Ffeil"
 
-#: strings.hrc:188
+#: sd/inc/strings.hrc:187
 msgctxt "STR_FILEFORMAT_PATH"
 msgid "Path"
 msgstr "Llwybr"
 
-#: strings.hrc:189
+#: sd/inc/strings.hrc:188
 msgctxt "STR_FILEFORMAT_NAME"
 msgid "File name without extension"
 msgstr "Enw ffeil heb estyniad"
 
-#: strings.hrc:190
+#: sd/inc/strings.hrc:189
 msgctxt "STR_NEW_CUSTOMSHOW"
 msgid "New Custom Slide Show"
 msgstr "Sioe Sleidiau Cyfaddas Newydd"
 
-#: strings.hrc:191
+#: sd/inc/strings.hrc:190
 msgctxt "STR_COPY_CUSTOMSHOW"
 msgid "Copy "
 msgstr "Copïo "
 
-#: strings.hrc:192
+#: sd/inc/strings.hrc:191
 msgctxt "STR_IMPRESS_DOCUMENT"
 msgid "Presentation"
 msgstr "Cyflwyniad"
 
-#: strings.hrc:193
+#: sd/inc/strings.hrc:192
 msgctxt "STR_IMPRESS_DOCUMENT_FULLTYPE_60"
-msgid "%PRODUCTNAME %PRODUCTVERSION Presentation"
-msgstr "Cyflwyniad %PRODUCTNAME %PRODUCTVERSION"
+msgid "%PRODUCTNAME Presentation format (Impress 6)"
+msgstr "Fformat Cyflwyno %PRODUCTNAME Impress 6)"
 
-#: strings.hrc:194
+#: sd/inc/strings.hrc:193
 msgctxt "STR_GRAPHIC_DOCUMENT"
 msgid "Drawing"
 msgstr "Lluniadu"
 
-#: strings.hrc:195
+#: sd/inc/strings.hrc:194
 msgctxt "STR_GRAPHIC_DOCUMENT_FULLTYPE_60"
-msgid "%PRODUCTNAME %PRODUCTVERSION Drawing"
-msgstr "Lluniadu %PRODUCTNAME %PRODUCTVERSION"
+msgid "%PRODUCTNAME Drawing format (Draw 6)"
+msgstr "Fformat Lluniadu %PRODUCTNAME (Draw 6)"
 
-#: strings.hrc:196
+#: sd/inc/strings.hrc:195
 msgctxt "STR_BREAK_METAFILE"
 msgid "Ungroup Metafile(s)..."
 msgstr "Dad-grwpio Metaffeil(iau)..."
 
-#: strings.hrc:197
+#: sd/inc/strings.hrc:196
 msgctxt "STR_BREAK_FAIL"
 msgid "It was not possible to ungroup all drawing objects."
 msgstr "Methu dadgrwpio'r holl wrthrychau lluniadu."
 
+#: sd/inc/strings.hrc:197
+msgctxt "STR_IMPRESS_DOCUMENT_FULLTYPE_80"
+msgid "%PRODUCTNAME %PRODUCTVERSION Presentation"
+msgstr "Cyflwyniad %PRODUCTNAME %PRODUCTVERSION"
+
+#: sd/inc/strings.hrc:198
+msgctxt "STR_GRAPHIC_DOCUMENT_FULLTYPE_80"
+msgid "%PRODUCTNAME %PRODUCTVERSION Drawing"
+msgstr "Lluniadu %PRODUCTNAME %PRODUCTVERSION"
+
 #. HtmlExport
-#: strings.hrc:199
+#: sd/inc/strings.hrc:201
 msgctxt "STR_PUBDLG_SAMENAME"
 msgid ""
 "A design already exists with this name.\n"
@@ -1114,132 +1119,132 @@ msgstr ""
 "Mae cynllun yn bodoli gyda'r enw yma.\n"
 "Hoffech chi ei newid?"
 
-#: strings.hrc:200
+#: sd/inc/strings.hrc:202
 msgctxt "STR_HTMLATTR_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:201
+#: sd/inc/strings.hrc:203
 msgctxt "STR_HTMLATTR_LINK"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: strings.hrc:202
+#: sd/inc/strings.hrc:204
 msgctxt "STR_HTMLATTR_VLINK"
 msgid "Visited link"
 msgstr "Cysylltiad ymwelwyd ag ef"
 
-#: strings.hrc:203
+#: sd/inc/strings.hrc:205
 msgctxt "STR_HTMLATTR_ALINK"
 msgid "Active link"
 msgstr "Cysylltiad gweithredol"
 
-#: strings.hrc:204
+#: sd/inc/strings.hrc:206
 msgctxt "STR_HTMLEXP_NOTES"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: strings.hrc:205
+#: sd/inc/strings.hrc:207
 msgctxt "STR_HTMLEXP_CONTENTS"
 msgid "Table of contents"
 msgstr "Tabl cynnwys"
 
-#: strings.hrc:206
+#: sd/inc/strings.hrc:208
 msgctxt "STR_HTMLEXP_CLICKSTART"
 msgid "Click here to start"
 msgstr "Clicio i gychwyn"
 
-#: strings.hrc:207
+#: sd/inc/strings.hrc:209
 msgctxt "STR_HTMLEXP_AUTHOR"
 msgid "Author"
 msgstr "Awdur"
 
-#: strings.hrc:208
+#: sd/inc/strings.hrc:210
 msgctxt "STR_HTMLEXP_EMAIL"
 msgid "E-mail"
 msgstr "E-bost"
 
-#: strings.hrc:209
+#: sd/inc/strings.hrc:211
 msgctxt "STR_HTMLEXP_HOMEPAGE"
 msgid "Homepage"
 msgstr "Tudalen Cartref"
 
-#: strings.hrc:210
+#: sd/inc/strings.hrc:212
 msgctxt "STR_HTMLEXP_INFO"
 msgid "Further information"
 msgstr "Gwybodaeth bellach"
 
-#: strings.hrc:211
+#: sd/inc/strings.hrc:213
 msgctxt "STR_HTMLEXP_DOWNLOAD"
 msgid "Download presentation"
 msgstr "Llwytho cyflwyniad i lawr"
 
-#: strings.hrc:212
+#: sd/inc/strings.hrc:214
 msgctxt "STR_HTMLEXP_NOFRAMES"
 msgid "Unfortunately your browser does not support floating frames."
 msgstr "Yn anffodus nid yw eich porwr yn cynnal fframiau'n arnofio."
 
-#: strings.hrc:213
+#: sd/inc/strings.hrc:215
 msgctxt "STR_HTMLEXP_FIRSTPAGE"
 msgid "First page"
 msgstr "Tudalen gyntaf"
 
-#: strings.hrc:214
+#: sd/inc/strings.hrc:216
 msgctxt "STR_HTMLEXP_LASTPAGE"
 msgid "Last page"
 msgstr "Tudalen olaf"
 
-#: strings.hrc:215
+#: sd/inc/strings.hrc:217
 msgctxt "STR_HTMLEXP_SETTEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:216
+#: sd/inc/strings.hrc:218
 msgctxt "STR_HTMLEXP_SETGRAPHIC"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:217
+#: sd/inc/strings.hrc:219
 msgctxt "STR_HTMLEXP_OUTLINE"
 msgid "With contents"
 msgstr "Gyda chynnwys"
 
-#: strings.hrc:218
+#: sd/inc/strings.hrc:220
 msgctxt "STR_HTMLEXP_NOOUTLINE"
 msgid "Without contents"
 msgstr "Heb gynnwys"
 
-#: strings.hrc:219
+#: sd/inc/strings.hrc:221
 msgctxt "STR_WEBVIEW_SAVE"
 msgid "To given page"
 msgstr "I dudalen"
 
-#: strings.hrc:220
+#: sd/inc/strings.hrc:222
 msgctxt "STR_UNDO_VECTORIZE"
 msgid "Convert bitmap to polygon"
 msgstr "Trosi didfap yn bolygon"
 
-#: strings.hrc:221
+#: sd/inc/strings.hrc:223
 msgctxt "STR_PRES_SOFTEND"
 msgid "Click to exit presentation..."
 msgstr "Clicio i adael y cyflwyniad..."
 
-#: strings.hrc:222
+#: sd/inc/strings.hrc:224
 msgctxt "STR_PRES_PAUSE"
 msgid "Pause..."
 msgstr "Oedi..."
 
-#: strings.hrc:223
+#: sd/inc/strings.hrc:225
 msgctxt "STR_UNDO_APPLY_3D_FAVOURITE"
 msgid "Apply 3D favorite"
 msgstr "Gosod ffefryn 3D"
 
-#: strings.hrc:224
+#: sd/inc/strings.hrc:226
 msgctxt "STR_UNDO_GRAFFILTER"
 msgid "Image filter"
 msgstr "Hidl Delwedd"
 
-#: strings.hrc:225
+#: sd/inc/strings.hrc:227
 msgctxt "STR_WARNING_NOSOUNDFILE"
 msgid ""
 "The file %\n"
@@ -1248,4938 +1253,4965 @@ msgstr ""
 "Nid yw ffeil %\n"
 "yn yn ffeil sain ddilys !"
 
-#: strings.hrc:226
+#: sd/inc/strings.hrc:228
 msgctxt "STR_UNDO_CONVERT_TO_METAFILE"
 msgid "Convert to metafile"
 msgstr "Trosi i metaffeil"
 
-#: strings.hrc:227
+#: sd/inc/strings.hrc:229
 msgctxt "STR_UNDO_CONVERT_TO_BITMAP"
 msgid "Convert to bitmap"
 msgstr "Trosi i didfap"
 
-#: strings.hrc:228
+#: sd/inc/strings.hrc:230
 msgctxt "STR_HTMLEXP_ERROR_CREATE_FILE"
 msgid "Cannot create the file $(URL1)."
 msgstr "Methu creu ffeil $(URL1)."
 
-#: strings.hrc:229
+#: sd/inc/strings.hrc:231
 msgctxt "STR_HTMLEXP_ERROR_OPEN_FILE"
 msgid "Could not open the file $(URL1)."
 msgstr "Methu agor ffeil $(URL1)."
 
-#: strings.hrc:230
+#: sd/inc/strings.hrc:232
 msgctxt "STR_HTMLEXP_ERROR_COPY_FILE"
 msgid "The file $(URL1) could not be copied to $(URL2)"
 msgstr "Methu copïo ffeil $(URL1) i $(URL2)"
 
-#: strings.hrc:231
+#: sd/inc/strings.hrc:233
 msgctxt "STR_STATUSBAR_MASTERPAGE"
 msgid "Slide Master name. Right-click for list and double-click for dialog."
 msgstr "Enw'r Brif Sleid. Cliciwch i'r dde am y rhestr a chlicio'n ddwbl am y ddeialog."
 
-#: strings.hrc:232
+#: sd/inc/strings.hrc:234
 msgctxt "STR_TITLE_RENAMESLIDE"
 msgid "Rename Slide"
 msgstr "Ailenwi Sleid"
 
-#: strings.hrc:233
+#: sd/inc/strings.hrc:235
 msgctxt "STR_DESC_RENAMESLIDE"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:234
+#: sd/inc/strings.hrc:236
 msgctxt "STR_TITLE_RENAMEMASTER"
 msgid "Rename Master Slide"
 msgstr "Ailenwi Prif Sleid"
 
-#: strings.hrc:235
+#: sd/inc/strings.hrc:237
 msgctxt "STR_PLACEHOLDER_DESCRIPTION_TITLE"
 msgid "Title Area for AutoLayouts"
 msgstr "Teitl Ardal ar gyfer"
 
-#: strings.hrc:236
+#: sd/inc/strings.hrc:238
 msgctxt "STR_PLACEHOLDER_DESCRIPTION_OUTLINE"
 msgid "Object Area for AutoLayouts"
 msgstr "Gwrthrych Ardal ar gyfer"
 
-#: strings.hrc:237
+#: sd/inc/strings.hrc:239
 msgctxt "STR_PLACEHOLDER_DESCRIPTION_FOOTER"
 msgid "Footer Area"
 msgstr "Troedyn Ardal"
 
-#: strings.hrc:238
+#: sd/inc/strings.hrc:240
 msgctxt "STR_PLACEHOLDER_DESCRIPTION_HEADER"
 msgid "Header Area"
 msgstr "Ardal Pennyn"
 
-#: strings.hrc:239
+#: sd/inc/strings.hrc:241
 msgctxt "STR_PLACEHOLDER_DESCRIPTION_DATETIME"
 msgid "Date Area"
 msgstr "Dyddiad Ardal"
 
-#: strings.hrc:240
+#: sd/inc/strings.hrc:242
 msgctxt "STR_PLACEHOLDER_DESCRIPTION_SLIDE"
 msgid "Slide Number Area"
 msgstr "Sleid Rhif Ardal"
 
-#: strings.hrc:241
+#: sd/inc/strings.hrc:243
 msgctxt "STR_PLACEHOLDER_DESCRIPTION_NUMBER"
 msgid "Page Number Area"
 msgstr "Tudalen Rhif Ardal"
 
-#: strings.hrc:242
+#: sd/inc/strings.hrc:244
 msgctxt "STR_FIELD_PLACEHOLDER_HEADER"
 msgid "<header>"
 msgstr "<pennyn>"
 
-#: strings.hrc:243
+#: sd/inc/strings.hrc:245
 msgctxt "STR_FIELD_PLACEHOLDER_FOOTER"
 msgid "<footer>"
 msgstr "<troedyn>"
 
-#: strings.hrc:244
+#: sd/inc/strings.hrc:246
 msgctxt "STR_FIELD_PLACEHOLDER_DATETIME"
 msgid "<date/time>"
 msgstr "<dyddiad/amser>"
 
-#: strings.hrc:245
+#: sd/inc/strings.hrc:247
 msgctxt "STR_FIELD_PLACEHOLDER_NUMBER"
 msgid "<number>"
 msgstr "<rhif>"
 
-#: strings.hrc:246
+#: sd/inc/strings.hrc:248
 msgctxt "STR_FIELD_PLACEHOLDER_COUNT"
 msgid "<count>"
 msgstr "<count>"
 
-#: strings.hrc:247
+#: sd/inc/strings.hrc:249
 msgctxt "STR_FIELD_PLACEHOLDER_SLIDENAME"
 msgid "<slide-name>"
 msgstr "<slide-name>"
 
-#: strings.hrc:248
+#: sd/inc/strings.hrc:250
 msgctxt "STR_FIELD_PLACEHOLDER_PAGENAME"
 msgid "<page-name>"
 msgstr "<page-name>"
 
-#: strings.hrc:249
+#: sd/inc/strings.hrc:251
 msgctxt "STR_PLACEHOLDER_DESCRIPTION_NOTES"
 msgid "Notes Area"
 msgstr "Nodiadau Ardal"
 
-#: strings.hrc:250
+#: sd/inc/strings.hrc:252
 msgctxt "STR_UNDO_HANGULHANJACONVERSION"
 msgid "Hangul/Hanja Conversion"
 msgstr "Trosi Hangul/Hanja"
 
-#: strings.hrc:251
+#: sd/inc/strings.hrc:253
 msgctxt "STR_LEFT_PANE_IMPRESS_TITLE"
 msgid "Slides"
 msgstr "Sleidiau"
 
-#: strings.hrc:252
+#: sd/inc/strings.hrc:254
 msgctxt "STR_LEFT_PANE_DRAW_TITLE"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: strings.hrc:253
+#: sd/inc/strings.hrc:255
 msgctxt "STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION"
 msgid "Preview not available"
 msgstr "Dim rhagolwg ar gael"
 
-#: strings.hrc:254
+#: sd/inc/strings.hrc:256
 msgctxt "STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION"
 msgid "Preparing preview"
 msgstr "Paratoi rhagolwg"
 
-#: strings.hrc:255
+#: sd/inc/strings.hrc:257
 msgctxt "STR_TASKPANEL_LAYOUT_MENU_TITLE"
 msgid "Layouts"
 msgstr "Cynlluniau"
 
-#: strings.hrc:256
+#: sd/inc/strings.hrc:258
 msgctxt "STR_GRAPHICS_STYLE_FAMILY"
 msgid "Drawing Styles"
 msgstr "Arddulliau Lluniadu"
 
-#: strings.hrc:257
+#: sd/inc/strings.hrc:259
 msgctxt "STR_PRESENTATIONS_STYLE_FAMILY"
 msgid "Presentation Styles"
 msgstr "Arddulliau Cyflwyno"
 
-#: strings.hrc:258
+#: sd/inc/strings.hrc:260
 msgctxt "STR_CELL_STYLE_FAMILY"
 msgid "Cell Styles"
 msgstr "Arddulliau Cell"
 
-#: strings.hrc:259
+#: sd/inc/strings.hrc:261
 msgctxt "STR_NAVIGATOR_SHOW_NAMED_SHAPES"
 msgid "Named shapes"
 msgstr "Siapiau ag enwau"
 
-#: strings.hrc:260
+#: sd/inc/strings.hrc:262
 msgctxt "STR_NAVIGATOR_SHOW_ALL_SHAPES"
 msgid "All shapes"
 msgstr "Pob siâp"
 
-#: strings.hrc:261
+#: sd/inc/strings.hrc:263
 msgctxt "STR_NAVIGATOR_SHAPE_BASE_NAME"
 msgid "Shape %1"
 msgstr "Siâp %1"
 
-#: strings.hrc:262
+#: sd/inc/strings.hrc:264
 msgctxt "STR_SET_BACKGROUND_PICTURE"
 msgid "Set Background Image for Slide ..."
 msgstr "Gosod Llun Cefndir ar gyfer Sleid ..."
 
-#: strings.hrc:263
+#: sd/inc/strings.hrc:265
 msgctxt "RID_ANNOTATIONS_START"
 msgid "Comments"
 msgstr "Sylwadau"
 
-#: strings.hrc:264
+#: sd/inc/strings.hrc:266
 msgctxt "STR_RESET_LAYOUT"
 msgid "Reset Slide Layout"
 msgstr "Ailosod Cynllun Sleidiau"
 
-#: strings.hrc:265
+#: sd/inc/strings.hrc:267
 msgctxt "STR_INSERT_TABLE"
 msgid "Insert Table"
 msgstr "Mewnosod Tab"
 
-#: strings.hrc:266
+#: sd/inc/strings.hrc:268
 msgctxt "STR_INSERT_CHART"
 msgid "Insert Chart"
 msgstr "Mewnosod Siart"
 
-#: strings.hrc:267
+#: sd/inc/strings.hrc:269
 msgctxt "STR_INSERT_PICTURE"
 msgid "Insert Image"
 msgstr "Mewnosod Delwedd"
 
-#: strings.hrc:268
+#: sd/inc/strings.hrc:270
 msgctxt "STR_INSERT_MOVIE"
 msgid "Insert Audio or Video"
 msgstr "Mewnosod Sain neu Fideo"
 
-#: strings.hrc:269
+#: sd/inc/strings.hrc:271
 msgctxt "STRING_DRAG_AND_DROP_PAGES"
 msgid "Drag and Drop Pages"
 msgstr "Llusgo a Gollwng Tudalennau"
 
-#: strings.hrc:270
+#: sd/inc/strings.hrc:272
 msgctxt "STRING_DRAG_AND_DROP_SLIDES"
 msgid "Drag and Drop Slides"
 msgstr "Llusgo a Gollwng Sleidiau"
 
-#: strings.hrc:271
+#: sd/inc/strings.hrc:273
 msgctxt "STR_PHOTO_ALBUM_EMPTY_WARNING"
 msgid "Please add Images to the Album."
 msgstr "Ychwanegwch Ddelweddau i'r Albwm."
 
-#: strings.hrc:272
+#: sd/inc/strings.hrc:274
 msgctxt "STR_PHOTO_ALBUM_TEXTBOX"
 msgid "Text Slide"
 msgstr "Sleid Testun"
 
-#: strings.hrc:273
-msgctxt "STR_INSERT_3D_MODEL_TITLE"
-msgid "Insert 3D Model"
-msgstr "Mewnosod Model 3D"
-
-#: strings.hrc:274
-msgctxt "STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS"
-msgid "All supported formats"
-msgstr "Pob fformat sy'n cael ei gynnal"
-
-#: strings.hrc:275
+#: sd/inc/strings.hrc:275
 msgctxt "STR_OBJECTS_TREE"
 msgid "Page Tree"
 msgstr "Coeden y Dudalen"
 
-#: strings.hrc:276
+#: sd/inc/strings.hrc:276
 #, c-format
 msgctxt "STR_OVERWRITE_WARNING"
 msgid "The local target directory '%FILENAME' is not empty. Some files might be overwritten. Do you want to continue?"
 msgstr "Nid yw cyfeiriadur targed lleol '%FILENAME' yn wag. Bydd rhai ffeiliau yn cael eu hysgrifennu trostynt. Parhau?"
 
-#: strings.hrc:278
+#: sd/inc/strings.hrc:278
 msgctxt "STR_LAYER_BCKGRND"
 msgid "Background"
 msgstr "Cefndir"
 
-#: strings.hrc:279
+#: sd/inc/strings.hrc:279
 msgctxt "STR_LAYER_BCKGRNDOBJ"
 msgid "Background objects"
 msgstr "Gwrthrych cefndir"
 
-#: strings.hrc:280
+#: sd/inc/strings.hrc:280
 msgctxt "STR_LAYER_LAYOUT"
 msgid "Layout"
 msgstr "Cynllun"
 
-#: strings.hrc:281
+#: sd/inc/strings.hrc:281
 msgctxt "STR_LAYER_CONTROLS"
 msgid "Controls"
 msgstr "Rheolydd"
 
-#: strings.hrc:282
+#: sd/inc/strings.hrc:282
 msgctxt "STR_LAYER_MEASURELINES"
 msgid "Dimension Lines"
 msgstr "Llinellau Dimensiwn"
 
-#: strings.hrc:283
+#: sd/inc/strings.hrc:283
 msgctxt "STR_PAGE"
 msgid "Slide"
 msgstr "Sleid"
 
-#: strings.hrc:284
+#: sd/inc/strings.hrc:284
 msgctxt "STR_PAGE_NAME"
 msgid "Page"
 msgstr "Tudalen"
 
-#: strings.hrc:285
+#: sd/inc/strings.hrc:285
 msgctxt "STR_SLIDE_NAME"
 msgid "Slide"
 msgstr "Sleid"
 
-#: strings.hrc:286
+#: sd/inc/strings.hrc:286
 msgctxt "STR_MASTERSLIDE_NAME"
 msgid "Master Slide"
 msgstr "Prif Sleid"
 
-#: strings.hrc:287
+#: sd/inc/strings.hrc:287
 msgctxt "STR_MASTERSLIDE_LABEL"
 msgid "Master Slide:"
 msgstr "Prif Sleid:"
 
-#: strings.hrc:288
+#: sd/inc/strings.hrc:288
 msgctxt "STR_MASTERPAGE_NAME"
 msgid "Master Page"
 msgstr "Prif Dudalen"
 
-#: strings.hrc:289
+#: sd/inc/strings.hrc:289
 msgctxt "STR_MASTERPAGE_LABEL"
 msgid "Master Page:"
 msgstr "Prif Dudalen:"
 
-#: strings.hrc:290
+#: sd/inc/strings.hrc:290
 msgctxt "STR_NOTES"
 msgid "(Notes)"
 msgstr "(Nodiadau)"
 
-#: strings.hrc:291
+#: sd/inc/strings.hrc:291
 msgctxt "STR_HANDOUT"
 msgid "Handouts"
 msgstr "Taflenni"
 
-#: strings.hrc:292
+#: sd/inc/strings.hrc:292
 msgctxt "STR_PRESOBJ_MPTITLE"
 msgid "Click to edit the title text format"
 msgstr "Clicio i olygu fformat testun y teitl"
 
-#: strings.hrc:293
+#: sd/inc/strings.hrc:293
 msgctxt "STR_PRESOBJ_MPOUTLINE"
 msgid "Click to edit the outline text format"
 msgstr "Clicio i olygu fformat y testun amlinell"
 
-#: strings.hrc:294
+#: sd/inc/strings.hrc:294
 msgctxt "STR_PRESOBJ_MPOUTLLAYER2"
 msgid "Second Outline Level"
 msgstr "Lefel Ail Amlinell"
 
-#: strings.hrc:295
+#: sd/inc/strings.hrc:295
 msgctxt "STR_PRESOBJ_MPOUTLLAYER3"
 msgid "Third Outline Level"
 msgstr "Lefel y Drydedd Amlinell"
 
-#: strings.hrc:296
+#: sd/inc/strings.hrc:296
 msgctxt "STR_PRESOBJ_MPOUTLLAYER4"
 msgid "Fourth Outline Level"
 msgstr "Lefel y Bedwaredd Amlinell"
 
-#: strings.hrc:297
+#: sd/inc/strings.hrc:297
 msgctxt "STR_PRESOBJ_MPOUTLLAYER5"
 msgid "Fifth Outline Level"
 msgstr "Lefel y Bumed Amlinell"
 
-#: strings.hrc:298
+#: sd/inc/strings.hrc:298
 msgctxt "STR_PRESOBJ_MPOUTLLAYER6"
 msgid "Sixth Outline Level"
 msgstr "Lefel y Chweched Amlinell"
 
-#: strings.hrc:299
+#: sd/inc/strings.hrc:299
 msgctxt "STR_PRESOBJ_MPOUTLLAYER7"
 msgid "Seventh Outline Level"
 msgstr "Lefel y Seithfed Amlinell"
 
-#: strings.hrc:300
+#: sd/inc/strings.hrc:300
 msgctxt "STR_PRESOBJ_MPNOTESTITLE"
 msgid "Click to move the slide"
 msgstr "Clicio i symud y sleid"
 
-#: strings.hrc:301
+#: sd/inc/strings.hrc:301
 msgctxt "STR_PRESOBJ_MPNOTESTEXT"
 msgid "Click to edit the notes format"
 msgstr "Clicio i olygu fformat y nodiadau"
 
-#: strings.hrc:302
+#: sd/inc/strings.hrc:302
 msgctxt "STR_PRESOBJ_TITLE"
 msgid "Click to add Title"
 msgstr "Cliciwch i ychwanegu Teitl"
 
-#: strings.hrc:303
+#: sd/inc/strings.hrc:303
 msgctxt "STR_PRESOBJ_OUTLINE"
 msgid "Click to add Text"
 msgstr "Cliciwch i ychwanegu Testun"
 
-#: strings.hrc:304
+#: sd/inc/strings.hrc:304
 msgctxt "STR_PRESOBJ_TEXT"
 msgid "Click to add Text"
 msgstr "Cliciwch i ychwanegu Testun"
 
-#: strings.hrc:305
+#: sd/inc/strings.hrc:305
 msgctxt "STR_PRESOBJ_NOTESTEXT"
 msgid "Click to add Notes"
 msgstr "Cliciwch i ychwanegu Nodiadau"
 
-#: strings.hrc:306
+#: sd/inc/strings.hrc:306
 msgctxt "STR_PRESOBJ_GRAPHIC"
 msgid "Double-click to add an Image"
 msgstr "Clic dwbl i ychwanegu Delwedd"
 
-#: strings.hrc:307
+#: sd/inc/strings.hrc:307
 msgctxt "STR_PRESOBJ_OBJECT"
 msgid "Double-click to add an Object"
 msgstr "Clic dwbl i ychwanegu Delwedd"
 
-#: strings.hrc:308
+#: sd/inc/strings.hrc:308
 msgctxt "STR_PRESOBJ_CHART"
 msgid "Double-click to add a Chart"
 msgstr "Clic dwbl i ychwanegu Siart"
 
-#: strings.hrc:309
+#: sd/inc/strings.hrc:309
 msgctxt "STR_PRESOBJ_ORGCHART"
 msgid "Double-click to add an Organization Chart"
 msgstr "Clic dwbl i ychwanegu Siart Trefniadol"
 
-#: strings.hrc:310
+#: sd/inc/strings.hrc:310
 msgctxt "STR_PRESOBJ_TABLE"
 msgid "Double-click to add a Spreadsheet"
 msgstr "Clic dwbl i ychwanegu Taenlen"
 
-#: strings.hrc:311
+#: sd/inc/strings.hrc:311
 msgctxt "STR_LAYOUT_DEFAULT_NAME"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: strings.hrc:312
+#: sd/inc/strings.hrc:312
 msgctxt "STR_LAYOUT_DEFAULT_TITLE_NAME"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:313
+#: sd/inc/strings.hrc:313
 msgctxt "STR_STANDARD_STYLESHEET_NAME"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: strings.hrc:314
+#: sd/inc/strings.hrc:314
 msgctxt "STR_UNDO_MOVEPAGES"
 msgid "Move slides"
 msgstr "Symud sleidiau"
 
-#: strings.hrc:315
+#: sd/inc/strings.hrc:315
 msgctxt "STR_POOLSHEET_MEASURE"
 msgid "Dimension Line"
 msgstr "Llinell Dimensiwn"
 
-#: strings.hrc:316
+#: sd/inc/strings.hrc:316
 msgctxt "STR_POOLSHEET_OBJNOLINENOFILL"
 msgid "Object with no fill and no line"
 msgstr "Gwrthrych heb lanw na llinell"
 
-#: strings.hrc:317
+#: sd/inc/strings.hrc:317
 msgctxt "STR_POOLSHEET_OBJWITHARROW"
 msgid "Object with arrow"
 msgstr "Gwrthrych gyda saeth"
 
-#: strings.hrc:318
+#: sd/inc/strings.hrc:318
 msgctxt "STR_POOLSHEET_OBJWITHSHADOW"
 msgid "Object with shadow"
 msgstr "Gwrthrych gyda chysgod"
 
-#: strings.hrc:319
+#: sd/inc/strings.hrc:319
 msgctxt "STR_POOLSHEET_OBJWITHOUTFILL"
 msgid "Object without fill"
 msgstr "Gwrthrych heb lenwad"
 
-#: strings.hrc:320
+#: sd/inc/strings.hrc:320
 msgctxt "STR_POOLSHEET_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:321
+#: sd/inc/strings.hrc:321
 msgctxt "STR_POOLSHEET_TEXTBODY"
 msgid "Text body"
 msgstr "Corff testun"
 
-#: strings.hrc:322
+#: sd/inc/strings.hrc:322
 msgctxt "STR_POOLSHEET_TEXTBODY_JUSTIFY"
 msgid "Text body justified"
 msgstr "Testun"
 
-#: strings.hrc:323
+#: sd/inc/strings.hrc:323
 msgctxt "STR_POOLSHEET_TEXTBODY_INDENT"
 msgid "First line indent"
 msgstr "Mewnoliad y llinell gyntaf"
 
-#: strings.hrc:324
+#: sd/inc/strings.hrc:324
 msgctxt "STR_POOLSHEET_TITLE"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:325
+#: sd/inc/strings.hrc:325
 msgctxt "STR_POOLSHEET_TITLE1"
 msgid "Title1"
 msgstr "Teitl1"
 
-#: strings.hrc:326
+#: sd/inc/strings.hrc:326
 msgctxt "STR_POOLSHEET_TITLE2"
 msgid "Title2"
 msgstr "Teitl2"
 
-#: strings.hrc:327
+#: sd/inc/strings.hrc:327
 msgctxt "STR_POOLSHEET_HEADLINE"
 msgid "Heading"
 msgstr "Pennawd"
 
-#: strings.hrc:328
+#: sd/inc/strings.hrc:328
 msgctxt "STR_POOLSHEET_HEADLINE1"
 msgid "Heading1"
 msgstr "Pennawd1"
 
-#: strings.hrc:329
+#: sd/inc/strings.hrc:329
 msgctxt "STR_POOLSHEET_HEADLINE2"
 msgid "Heading2"
 msgstr "Pennawd2"
 
-#: strings.hrc:330
+#: sd/inc/strings.hrc:330
 msgctxt "STR_PSEUDOSHEET_TITLE"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:331
+#: sd/inc/strings.hrc:331
 msgctxt "STR_PSEUDOSHEET_SUBTITLE"
 msgid "Subtitle"
 msgstr "Is deitl"
 
-#: strings.hrc:332
+#: sd/inc/strings.hrc:332
 msgctxt "STR_PSEUDOSHEET_OUTLINE"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: strings.hrc:333
+#: sd/inc/strings.hrc:333
 msgctxt "STR_PSEUDOSHEET_BACKGROUNDOBJECTS"
 msgid "Background objects"
 msgstr "Gwrthrych cefndir"
 
-#: strings.hrc:334
+#: sd/inc/strings.hrc:334
 msgctxt "STR_PSEUDOSHEET_BACKGROUND"
 msgid "Background"
 msgstr "Cefndir"
 
-#: strings.hrc:335
+#: sd/inc/strings.hrc:335
 msgctxt "STR_PSEUDOSHEET_NOTES"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: strings.hrc:336
+#: sd/inc/strings.hrc:336
 msgctxt "STR_POWERPOINT_IMPORT"
 msgid "PowerPoint Import"
 msgstr "Mewnforio o PowerPoint"
 
-#: strings.hrc:337
+#: sd/inc/strings.hrc:337
 msgctxt "STR_SAVE_DOC"
 msgid "Save Document"
 msgstr "Cadw Dogfen"
 
-#: strings.hrc:338
+#: sd/inc/strings.hrc:338
 msgctxt "STR_POOLSHEET_BANDED_CELL"
 msgid "Banding cell"
 msgstr "Cell bandio"
 
-#: strings.hrc:339
+#: sd/inc/strings.hrc:339
 msgctxt "STR_POOLSHEET_HEADER"
 msgid "Header"
 msgstr "Pennyn"
 
-#: strings.hrc:340
+#: sd/inc/strings.hrc:340
 msgctxt "STR_POOLSHEET_TOTAL"
 msgid "Total line"
 msgstr "Llinell gyfanswm"
 
-#: strings.hrc:341
+#: sd/inc/strings.hrc:341
 msgctxt "STR_POOLSHEET_FIRST_COLUMN"
 msgid "First column"
 msgstr "Colofn gyntaf"
 
-#: strings.hrc:342
+#: sd/inc/strings.hrc:342
 msgctxt "STR_POOLSHEET_LAST_COLUMN"
 msgid "Last column"
 msgstr "Colofn olaf"
 
-#: strings.hrc:343
+#: sd/inc/strings.hrc:343
 msgctxt "STR_ENTER_PIN"
 msgid "Enter PIN:"
 msgstr "Rhoi PIN:"
 
-#: strings.hrc:344
+#: sd/inc/strings.hrc:344
 msgctxt "STR_DEAUTHORISE_CLIENT"
 msgid "Remove client authorisation"
 msgstr "Tynnu dilysiad cleient"
 
-#: strings.hrc:345
+#: sd/inc/strings.hrc:345
 msgctxt "STR_SHRINK_FONT_SIZE"
 msgid "Shrink font size"
 msgstr "Lleihau maint ffont"
 
-#: strings.hrc:346
+#: sd/inc/strings.hrc:346
 msgctxt "STR_GROW_FONT_SIZE"
 msgid "Grow font size"
 msgstr "Cynyddu maint ffont"
 
 #. Names and descriptions of the Draw/Impress accessibility views
 #. ==============================================================
-#: strings.hrc:351
+#: sd/inc/strings.hrc:351
 msgctxt "SID_SD_A11Y_D_DRAWVIEW_N"
 msgid "Drawing View"
 msgstr "Golwg Lluniadu"
 
-#: strings.hrc:352
+#: sd/inc/strings.hrc:352
 msgctxt "SID_SD_A11Y_D_DRAWVIEW_D"
 msgid "This is where you create and edit drawings."
 msgstr "Dyma lle rydych yn creu a golygu lluniau."
 
-#: strings.hrc:353
+#: sd/inc/strings.hrc:353
 msgctxt "SID_SD_A11Y_I_DRAWVIEW_N"
 msgid "Drawing View"
 msgstr "Golwg Lluniadu"
 
-#: strings.hrc:354
+#: sd/inc/strings.hrc:354
 msgctxt "SID_SD_A11Y_I_DRAWVIEW_D"
 msgid "This is where you create and edit slides."
 msgstr "Dyma lle rydych yn creu a golygu sleidiau."
 
-#: strings.hrc:355
+#: sd/inc/strings.hrc:355
 msgctxt "SID_SD_A11Y_I_OUTLINEVIEW_N"
 msgid "Outline View"
 msgstr "Golwg Amlinell"
 
-#: strings.hrc:356
+#: sd/inc/strings.hrc:356
 msgctxt "SID_SD_A11Y_I_OUTLINEVIEW_D"
 msgid "This is where you enter or edit text in list form."
 msgstr "Dyma lle rydych yn gosod neu golygu testun mewn ffurflen rhestr."
 
-#: strings.hrc:357
+#: sd/inc/strings.hrc:357
 msgctxt "SID_SD_A11Y_I_SLIDEVIEW_N"
 msgid "Slides View"
 msgstr "Golwg Sleidiau"
 
-#: strings.hrc:358
+#: sd/inc/strings.hrc:358
 msgctxt "SID_SD_A11Y_I_SLIDEVIEW_D"
 msgid "This is where you sort slides."
 msgstr "Dyma lle rhydych yn trefnu sleidiau."
 
-#: strings.hrc:359
+#: sd/inc/strings.hrc:359
 msgctxt "SID_SD_A11Y_I_NOTESVIEW_N"
 msgid "Notes View"
 msgstr "Golwg Nodiadau"
 
-#: strings.hrc:360
+#: sd/inc/strings.hrc:360
 msgctxt "SID_SD_A11Y_I_NOTESVIEW_D"
 msgid "This is where you enter and view notes."
 msgstr "Dyma lle rydych yn gosod a darllen nodiadau."
 
-#: strings.hrc:361
+#: sd/inc/strings.hrc:361
 msgctxt "SID_SD_A11Y_I_HANDOUTVIEW_N"
 msgid "Handout View"
 msgstr "Golwg Taflen"
 
-#: strings.hrc:362
+#: sd/inc/strings.hrc:362
 msgctxt "SID_SD_A11Y_I_HANDOUTVIEW_D"
 msgid "This is where you decide on the layout for handouts."
 msgstr "Dyma lle rydych yn penderfynu ar gynllun ar gyfer taflenni."
 
-#: strings.hrc:363
+#: sd/inc/strings.hrc:363
 msgctxt "SID_SD_A11Y_P_TITLE_N"
 msgid "PresentationTitle"
 msgstr "TeitlCyflwyniad"
 
-#: strings.hrc:364
+#: sd/inc/strings.hrc:364
 msgctxt "SID_SD_A11Y_P_OUTLINER_N"
 msgid "PresentationOutliner"
 msgstr "AmlinellwrCyflwyniad"
 
-#: strings.hrc:365
+#: sd/inc/strings.hrc:365
 msgctxt "SID_SD_A11Y_P_SUBTITLE_N"
 msgid "PresentationSubtitle"
 msgstr "IsdeitlCyflwyniad"
 
-#: strings.hrc:366
+#: sd/inc/strings.hrc:366
 msgctxt "SID_SD_A11Y_P_PAGE_N"
 msgid "PresentationPage"
 msgstr "TudalenCyflwyniad"
 
-#: strings.hrc:367
+#: sd/inc/strings.hrc:367
 msgctxt "SID_SD_A11Y_P_NOTES_N"
 msgid "PresentationNotes"
 msgstr "NodiadauCyflwyniad"
 
-#: strings.hrc:368
+#: sd/inc/strings.hrc:368
 msgctxt "SID_SD_A11Y_P_HANDOUT_N"
 msgid "Handout"
 msgstr "Taflen"
 
-#: strings.hrc:369
+#: sd/inc/strings.hrc:369
 msgctxt "SID_SD_A11Y_P_UNKNOWN_N"
 msgid "UnknownAccessiblePresentationShape"
 msgstr "SiâpCyflwyniadHygyrchAnhysbys"
 
-#: strings.hrc:370
+#: sd/inc/strings.hrc:370
 msgctxt "SID_SD_A11Y_P_TITLE_D"
 msgid "PresentationTitleShape"
 msgstr "SiâpTeitlCyflwyniad"
 
-#: strings.hrc:371
+#: sd/inc/strings.hrc:371
 msgctxt "SID_SD_A11Y_P_OUTLINER_D"
 msgid "PresentationOutlinerShape"
 msgstr "SiâpAmlinellwrCyflwyniad"
 
-#: strings.hrc:372
+#: sd/inc/strings.hrc:372
 msgctxt "SID_SD_A11Y_P_SUBTITLE_D"
 msgid "PresentationSubtitleShape"
 msgstr "SiâpIsdeitlCyflwyno"
 
-#: strings.hrc:373
+#: sd/inc/strings.hrc:373
 msgctxt "SID_SD_A11Y_P_PAGE_D"
 msgid "PresentationPageShape"
 msgstr "SiâpTudalenCyflwyniad"
 
-#: strings.hrc:374
+#: sd/inc/strings.hrc:374
 msgctxt "SID_SD_A11Y_P_NOTES_D"
 msgid "PresentationNotesShape"
 msgstr "SiâpNodiadauCyflwyniad"
 
-#: strings.hrc:375
+#: sd/inc/strings.hrc:375
 msgctxt "SID_SD_A11Y_P_HANDOUT_D"
 msgid "PresentationHandoutShape"
 msgstr "SiâpTaflenCyflwyniad"
 
-#: strings.hrc:376
+#: sd/inc/strings.hrc:376
 msgctxt "SID_SD_A11Y_P_UNKNOWN_D"
 msgid "Unknown accessible presentation shape"
 msgstr "Siâp cyflwyniad mynediad anhysbys"
 
-#: strings.hrc:377
+#: sd/inc/strings.hrc:377
 msgctxt "SID_SD_A11Y_P_FOOTER_N"
 msgid "PresentationFooter"
 msgstr "TroedynCyflwyniad"
 
-#: strings.hrc:378
+#: sd/inc/strings.hrc:378
 msgctxt "SID_SD_A11Y_P_FOOTER_D"
 msgid "PresentationFooterShape"
 msgstr "SiâpTroedynCyflwyniad"
 
-#: strings.hrc:379
+#: sd/inc/strings.hrc:379
 msgctxt "SID_SD_A11Y_P_HEADER_N"
 msgid "PresentationHeader"
 msgstr "PennynCyflwyniad"
 
-#: strings.hrc:380
+#: sd/inc/strings.hrc:380
 msgctxt "SID_SD_A11Y_P_HEADER_D"
 msgid "PresentationHeaderShape"
 msgstr "SiâpPennynCyflwyniad"
 
-#: strings.hrc:381
+#: sd/inc/strings.hrc:381
 msgctxt "SID_SD_A11Y_P_DATE_N"
 msgid "PresentationDateAndTime"
 msgstr "DyddiadAcAmserCyflwyniad"
 
-#: strings.hrc:382
+#: sd/inc/strings.hrc:382
 msgctxt "SID_SD_A11Y_P_DATE_D"
 msgid "PresentationDateAndTimeShape"
 msgstr "SiâpDyddiadAcAmserCyflwyniad"
 
-#: strings.hrc:383
+#: sd/inc/strings.hrc:383
 msgctxt "SID_SD_A11Y_P_NUMBER_N"
 msgid "PresentationPageNumber"
 msgstr "RhifTudalenCyflwyniad"
 
-#: strings.hrc:384
+#: sd/inc/strings.hrc:384
 msgctxt "SID_SD_A11Y_P_NUMBER_D"
 msgid "PresentationPageNumberShape"
 msgstr "SiâpRhifTudalenCyflwyniad"
 
-#: strings.hrc:385
+#: sd/inc/strings.hrc:385
 msgctxt "SID_SD_A11Y_D_PRESENTATION"
 msgid "%PRODUCTNAME Presentation"
 msgstr "Cyflwyniad %PRODUCTNAME"
 
-#: strings.hrc:386
+#: sd/inc/strings.hrc:386
 msgctxt "SID_SD_A11Y_P_TITLE_N_STYLE"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:387
+#: sd/inc/strings.hrc:387
 msgctxt "SID_SD_A11Y_P_OUTLINER_N_STYLE"
 msgid "Outliner"
 msgstr "Amlinellu"
 
-#: strings.hrc:388
+#: sd/inc/strings.hrc:388
 msgctxt "SID_SD_A11Y_P_SUBTITLE_N_STYLE"
 msgid "Subtitle"
 msgstr "Is Deitl"
 
-#: strings.hrc:389
+#: sd/inc/strings.hrc:389
 msgctxt "SID_SD_A11Y_P_PAGE_N_STYLE"
 msgid "Page"
 msgstr "Tudalen"
 
-#: strings.hrc:390
+#: sd/inc/strings.hrc:390
 msgctxt "SID_SD_A11Y_P_NOTES_N_STYLE"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: strings.hrc:391
+#: sd/inc/strings.hrc:391
 msgctxt "SID_SD_A11Y_P_HANDOUT_N_STYLE"
 msgid "Handout"
 msgstr "Taflen"
 
-#: strings.hrc:392
+#: sd/inc/strings.hrc:392
 msgctxt "SID_SD_A11Y_P_UNKNOWN_N_STYLE"
 msgid "Unknown Accessible Presentation Shape"
 msgstr "Siap Cyflwniad Hygyrchedd Anhysbys"
 
-#: strings.hrc:393
+#: sd/inc/strings.hrc:393
 msgctxt "SID_SD_A11Y_P_FOOTER_N_STYLE"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: strings.hrc:394
+#: sd/inc/strings.hrc:394
 msgctxt "SID_SD_A11Y_P_HEADER_N_STYLE"
 msgid "Header"
 msgstr "Pennyn"
 
-#: strings.hrc:395
+#: sd/inc/strings.hrc:395
 msgctxt "SID_SD_A11Y_P_DATE_N_STYLE"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: strings.hrc:396
+#: sd/inc/strings.hrc:396
 msgctxt "SID_SD_A11Y_P_NUMBER_N_STYLE"
 msgid "Number"
 msgstr "Rhif"
 
-#: strings.hrc:397
+#: sd/inc/strings.hrc:397
 msgctxt "SID_SD_A11Y_D_PRESENTATION_READONLY"
 msgid "(read-only)"
 msgstr "(darllen yn unig)"
 
-#: strings.hrc:399
+#: sd/inc/strings.hrc:399
 msgctxt "STR_CUSTOMANIMATION_REPEAT_NONE"
 msgid "none"
 msgstr "dim"
 
-#: strings.hrc:400
+#: sd/inc/strings.hrc:400
 msgctxt "STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK"
 msgid "Until next click"
 msgstr "Tan y clic nesaf"
 
-#: strings.hrc:401
+#: sd/inc/strings.hrc:401
 msgctxt "STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE"
 msgid "Until end of slide"
 msgstr "Tan ddiwedd y sleid"
 
-#: strings.hrc:402
+#: sd/inc/strings.hrc:402
 msgctxt "STR_CUSTOMANIMATION_DIRECTION_PROPERTY"
 msgid "Direction:"
 msgstr "Cyfeiriad:"
 
-#: strings.hrc:403
+#: sd/inc/strings.hrc:403
 msgctxt "STR_CUSTOMANIMATION_ZOOM_PROPERTY"
 msgid "Zoom:"
 msgstr "Chwyddo:"
 
-#: strings.hrc:404
+#: sd/inc/strings.hrc:404
 msgctxt "STR_CUSTOMANIMATION_SPOKES_PROPERTY"
 msgid "Spokes:"
 msgstr "Sbocau:"
 
-#: strings.hrc:405
+#: sd/inc/strings.hrc:405
 msgctxt "STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY"
 msgid "First color:"
 msgstr "Lliw cyntaf:"
 
-#: strings.hrc:406
+#: sd/inc/strings.hrc:406
 msgctxt "STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY"
 msgid "Second color:"
 msgstr "Ail liw:"
 
-#: strings.hrc:407
+#: sd/inc/strings.hrc:407
 msgctxt "STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY"
 msgid "Fill color:"
 msgstr "Lliw llanw:"
 
-#: strings.hrc:408
+#: sd/inc/strings.hrc:408
 msgctxt "STR_CUSTOMANIMATION_STYLE_PROPERTY"
 msgid "Style:"
 msgstr "Arddull:"
 
-#: strings.hrc:409
+#: sd/inc/strings.hrc:409
 msgctxt "STR_CUSTOMANIMATION_FONT_PROPERTY"
 msgid "Font:"
 msgstr "Ffont:"
 
-#: strings.hrc:410
+#: sd/inc/strings.hrc:410
 msgctxt "STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY"
 msgid "Font color:"
 msgstr "Lliw ffont:"
 
-#: strings.hrc:411
+#: sd/inc/strings.hrc:411
 msgctxt "STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY"
 msgid "Style:"
 msgstr "Arddull:"
 
-#: strings.hrc:412
+#: sd/inc/strings.hrc:412
 msgctxt "STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY"
 msgid "Typeface:"
 msgstr "Ffurf-deip:"
 
-#: strings.hrc:413
+#: sd/inc/strings.hrc:413
 msgctxt "STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY"
 msgid "Line color:"
 msgstr "Lliw llinell:"
 
-#: strings.hrc:414
+#: sd/inc/strings.hrc:414
 msgctxt "STR_CUSTOMANIMATION_SIZE_PROPERTY"
 msgid "Font size:"
 msgstr "Maint ffont:"
 
-#: strings.hrc:415
+#: sd/inc/strings.hrc:415
 msgctxt "STR_CUSTOMANIMATION_SCALE_PROPERTY"
 msgid "Size:"
 msgstr "Maint:"
 
-#: strings.hrc:416
+#: sd/inc/strings.hrc:416
 msgctxt "STR_CUSTOMANIMATION_AMOUNT_PROPERTY"
 msgid "Amount:"
 msgstr "Swm:"
 
-#: strings.hrc:417
+#: sd/inc/strings.hrc:417
 msgctxt "STR_CUSTOMANIMATION_COLOR_PROPERTY"
 msgid "Color:"
 msgstr "Lliw:"
 
-#: strings.hrc:418
+#: sd/inc/strings.hrc:418
 msgctxt "STR_CUSTOMANIMATION_NO_SOUND"
 msgid "(No sound)"
 msgstr "(Dim sain)"
 
-#: strings.hrc:419
+#: sd/inc/strings.hrc:419
 msgctxt "STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND"
 msgid "(Stop previous sound)"
 msgstr "(Atal y sain blaenorol)"
 
-#: strings.hrc:420
+#: sd/inc/strings.hrc:420
 msgctxt "STR_CUSTOMANIMATION_BROWSE_SOUND"
 msgid "Other sound..."
 msgstr "Sain arall..."
 
-#: strings.hrc:421
+#: sd/inc/strings.hrc:421
 msgctxt "STR_CUSTOMANIMATION_SAMPLE"
 msgid "Sample"
 msgstr "Sampl"
 
-#: strings.hrc:422
+#: sd/inc/strings.hrc:422
 msgctxt "STR_CUSTOMANIMATION_TRIGGER"
 msgid "Trigger"
 msgstr "Trigyr"
 
-#: strings.hrc:423
+#: sd/inc/strings.hrc:423
 msgctxt "STR_CUSTOMANIMATION_LIST_HELPTEXT"
 msgid "First select the slide element and then click 'Add...' to add an animation effect."
 msgstr "Dewiswch yn gyntaf yr elfen llithro a chlicio 'Ychwanegu...' i ychwanegu elfen animeiddio."
 
-#: strings.hrc:424
+#: sd/inc/strings.hrc:424
 msgctxt "STR_CUSTOMANIMATION_USERPATH"
 msgid "User paths"
 msgstr "Llwybrau defnyddwyr"
 
-#: strings.hrc:425
+#: sd/inc/strings.hrc:425
 msgctxt "STR_CUSTOMANIMATION_ENTRANCE"
 msgid "Entrance: %1"
 msgstr "Mynedfa: %1"
 
-#: strings.hrc:426
+#: sd/inc/strings.hrc:426
 msgctxt "STR_CUSTOMANIMATION_EMPHASIS"
 msgid "Emphasis: %1"
 msgstr "Pwyslais: %1"
 
-#: strings.hrc:427
+#: sd/inc/strings.hrc:427
 msgctxt "STR_CUSTOMANIMATION_EXIT"
 msgid "Exit: %1"
 msgstr "Gadael: %1"
 
-#: strings.hrc:428
+#: sd/inc/strings.hrc:428
 msgctxt "STR_CUSTOMANIMATION_MOTION_PATHS"
 msgid "Motion Paths: %1"
 msgstr "Llwybrau Mudiant: %1"
 
-#: strings.hrc:429
+#: sd/inc/strings.hrc:429
 msgctxt "STR_SLIDETRANSITION_NONE"
 msgid "None"
 msgstr "Dim"
 
-#: strings.hrc:431
+#: sd/inc/strings.hrc:431
 msgctxt "STR_ANNOTATION_TODAY"
 msgid "Today,"
 msgstr "Heddiw,"
 
-#: strings.hrc:432
+#: sd/inc/strings.hrc:432
 msgctxt "STR_ANNOTATION_YESTERDAY"
 msgid "Yesterday,"
 msgstr "Ddoe,"
 
-#: strings.hrc:433
+#: sd/inc/strings.hrc:433
 msgctxt "STR_ANNOTATION_NOAUTHOR"
 msgid "(no author)"
 msgstr "(dim awdur)"
 
-#: strings.hrc:434
+#: sd/inc/strings.hrc:434
 msgctxt "STR_ANNOTATION_WRAP_FORWARD"
 msgid "%PRODUCTNAME Impress reached the end of the presentation. Do you want to continue at the beginning?"
 msgstr "Mae %PRODUCTNAME Impress wedi cyrraedd diwedd y cyflwyniad. Hoffech chi barhau o'r cychwyn?"
 
-#: strings.hrc:435
+#: sd/inc/strings.hrc:435
 msgctxt "STR_ANNOTATION_WRAP_BACKWARD"
 msgid "%PRODUCTNAME Impress reached the beginning of the presentation. Do you want to continue at the end?"
 msgstr "Mae %PRODUCTNAME Impress wedi cyrraedd diwedd y cyflwyniad. Hoffech chi barhau o'r diwedd?"
 
-#: strings.hrc:436
+#: sd/inc/strings.hrc:436
 msgctxt "STR_ANNOTATION_WRAP_FORWARD_DRAW"
 msgid "%PRODUCTNAME Draw reached the end of the document. Do you want to continue at the beginning?"
 msgstr "Mae %PRODUCTNAME Draw wedi cyrraedd diwedd y ddogfen. Hoffech chi barhau o'r cychwyn?"
 
-#: strings.hrc:437
+#: sd/inc/strings.hrc:437
 msgctxt "STR_ANNOTATION_WRAP_BACKWARD_DRAW"
 msgid "%PRODUCTNAME Draw reached the beginning of the document. Do you want to continue at the end?"
 msgstr "Mae %PRODUCTNAME Draw wedi cyrraedd dechrau'r ddogfen. Hoffech chi barhau o'r diwedd?"
 
-#: strings.hrc:438
+#: sd/inc/strings.hrc:438
 msgctxt "STR_ANNOTATION_UNDO_INSERT"
 msgid "Insert Comment"
 msgstr "Mewnosod Sylw"
 
-#: strings.hrc:439
+#: sd/inc/strings.hrc:439
 msgctxt "STR_ANNOTATION_UNDO_DELETE"
 msgid "Delete Comment(s)"
 msgstr "Dileu Sylw(adau)"
 
-#: strings.hrc:440
+#: sd/inc/strings.hrc:440
 msgctxt "STR_ANNOTATION_UNDO_MOVE"
 msgid "Move Comment"
 msgstr "Symud Sylwadau"
 
-#: strings.hrc:441
+#: sd/inc/strings.hrc:441
 msgctxt "STR_ANNOTATION_UNDO_EDIT"
 msgid "Edit Comment"
 msgstr "Golygu Nodyn"
 
-#: strings.hrc:442
+#: sd/inc/strings.hrc:442
 msgctxt "STR_ANNOTATION_REPLY"
 msgid "Reply to %1"
 msgstr "Ateb i %1"
 
-#: strings.hrc:444
+#: sd/inc/strings.hrc:444
 msgctxt "RID_DRAW_MEDIA_TOOLBOX"
 msgid "Media Playback"
 msgstr "Ailchwarae'r Cyfrwng"
 
-#: strings.hrc:445
+#: sd/inc/strings.hrc:445
 msgctxt "RID_DRAW_TABLE_TOOLBOX"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:447
+#: sd/inc/strings.hrc:447
 msgctxt "STR_IMPRESS_PRINT_UI_GROUP_NAME"
 msgid "%PRODUCTNAME %s"
 msgstr "%PRODUCTNAME %s"
 
-#: strings.hrc:448
+#: sd/inc/strings.hrc:448
 msgctxt "STR_IMPRESS_PRINT_UI_PRINT_GROUP"
 msgid "Print"
 msgstr "Argraffu"
 
-#: strings.hrc:449
+#: sd/inc/strings.hrc:449
 msgctxt "STR_IMPRESS_PRINT_UI_CONTENT"
 msgid "Document"
 msgstr "Dogfen"
 
-#: strings.hrc:450
+#: sd/inc/strings.hrc:450
 msgctxt "STR_IMPRESS_PRINT_UI_SLIDESPERPAGE"
 msgid "Slides per page"
 msgstr "Sleidiau i'r dudalen"
 
-#: strings.hrc:451
+#: sd/inc/strings.hrc:451
 msgctxt "STR_IMPRESS_PRINT_UI_ORDER"
 msgid "Order"
 msgstr "Trefn"
 
-#: strings.hrc:452
+#: sd/inc/strings.hrc:452
 msgctxt "STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT"
 msgid "~Contents"
 msgstr "~Cynnwys"
 
-#: strings.hrc:453
+#: sd/inc/strings.hrc:453
 msgctxt "STR_IMPRESS_PRINT_UI_IS_PRINT_NAME"
 msgid "~Slide name"
 msgstr "~Enw sleid"
 
-#: strings.hrc:454
+#: sd/inc/strings.hrc:454
 msgctxt "STR_DRAW_PRINT_UI_IS_PRINT_NAME"
 msgid "P~age name"
 msgstr "~Enw tudalen"
 
-#: strings.hrc:455
+#: sd/inc/strings.hrc:455
 msgctxt "STR_IMPRESS_PRINT_UI_IS_PRINT_DATE"
 msgid "~Date and time"
 msgstr "~Dyddiad ac amser"
 
-#: strings.hrc:456
+#: sd/inc/strings.hrc:456
 msgctxt "STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN"
 msgid "Hidden pages"
 msgstr "Tudalennau cudd"
 
-#: strings.hrc:457
+#: sd/inc/strings.hrc:457
 msgctxt "STR_IMPRESS_PRINT_UI_QUALITY"
 msgid "Color"
 msgstr "Lliw"
 
-#: strings.hrc:458
+#: sd/inc/strings.hrc:458
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_OPTIONS"
 msgid "~Size"
 msgstr "~Maint"
 
-#: strings.hrc:459
+#: sd/inc/strings.hrc:459
 msgctxt "STR_IMPRESS_PRINT_UI_BROCHURE"
 msgid "Brochure"
 msgstr "Llyfryn"
 
-#: strings.hrc:460
+#: sd/inc/strings.hrc:460
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_SIDES"
 msgid "Page sides"
 msgstr "Dalennau"
 
-#: strings.hrc:461
+#: sd/inc/strings.hrc:461
 msgctxt "STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE"
 msgid "Include"
 msgstr "Cynnwys"
 
-#: strings.hrc:462
+#: sd/inc/strings.hrc:462
 msgctxt "STR_IMPRESS_PRINT_UI_PAPER_TRAY"
 msgid "~Use only paper tray from printer preferences"
 msgstr "~Defnyddio dim ond y drôr papur o'r dewisiadau argraffu"
 
-#: strings.hrc:463
+#: sd/inc/strings.hrc:463
 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_RANGE"
 msgid "Print range"
 msgstr "Ystod argraffu"
 
-#: strings.hrc:465
+#: sd/inc/strings.hrc:465
 msgctxt "STR_SAR_WRAP_FORWARD"
 msgid "%PRODUCTNAME Impress has searched to the end of the presentation. Do you want to continue at the beginning?"
 msgstr "Mae %PRODUCTNAME Impress wedi chwilio i ddiwedd y cyflwyniad. Hoffech chi barhau i'r diwedd?"
 
-#: strings.hrc:466
+#: sd/inc/strings.hrc:466
 msgctxt "STR_SAR_WRAP_BACKWARD"
 msgid "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?"
 msgstr "Mae %PRODUCTNAME Impress wedi chwilio i gychwyn y cyflwyniad. Hoffech chi barhau i'r diwedd?"
 
-#: strings.hrc:467
+#: sd/inc/strings.hrc:467
 msgctxt "STR_SAR_WRAP_FORWARD_DRAW"
 msgid "%PRODUCTNAME Draw has searched to the end of the document. Do you want to continue at the beginning?"
 msgstr "Mae %PRODUCTNAME Draw wedi chwilio i ddiwedd y ddogfen. Hoffech chi barhau o'r cychwyn?"
 
-#: strings.hrc:468
+#: sd/inc/strings.hrc:468
 msgctxt "STR_SAR_WRAP_BACKWARD_DRAW"
 msgid "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?"
 msgstr "Mae %PRODUCTNAME Draw wedi chwilio i gychwyn y ddogfen. Hoffech chi barhau o'r diwedd?"
 
-#: strings.hrc:470
+#: sd/inc/strings.hrc:470
 msgctxt "STR_SD_NONE"
 msgid "- None -"
 msgstr "- Dim -"
 
-#: annotationmenu.ui:13
+#: sd/inc/strings.hrc:472
+#, c-format
+msgctxt "STR_CTRLCLICKHYPERLINK"
+msgid "%s-click to follow hyperlink: "
+msgstr "Cliciwch %s i ddilyn y ddolen:"
+
+#: sd/inc/strings.hrc:473
+msgctxt "STR_CLICKHYPERLINK"
+msgid "Click to open hyperlink: "
+msgstr "Cliciwch i agor dolen:"
+
+#: sd/uiconfig/simpress/ui/annotationmenu.ui:13
 msgctxt "annotationmenu|reply"
 msgid "_Reply"
 msgstr "_Ateb"
 
-#: annotationmenu.ui:28
+#: sd/uiconfig/simpress/ui/annotationmenu.ui:28
 msgctxt "annotationmenu|bold"
 msgid "_Bold"
 msgstr "_Trwm"
 
-#: annotationmenu.ui:37
+#: sd/uiconfig/simpress/ui/annotationmenu.ui:37
 msgctxt "annotationmenu|italic"
 msgid "_Italic"
 msgstr "_Italig"
 
-#: annotationmenu.ui:46
+#: sd/uiconfig/simpress/ui/annotationmenu.ui:46
 msgctxt "annotationmenu|underline"
 msgid "_Underline"
 msgstr "_Tanlinellu"
 
-#: annotationmenu.ui:55
+#: sd/uiconfig/simpress/ui/annotationmenu.ui:55
 msgctxt "annotationmenu|strike"
 msgid "_Strikethrough"
 msgstr "_Taro Drwodd"
 
-#: annotationmenu.ui:70
+#: sd/uiconfig/simpress/ui/annotationmenu.ui:70
 msgctxt "annotationmenu|copy"
 msgid "_Copy"
 msgstr "­_Copïo"
 
-#: annotationmenu.ui:79
+#: sd/uiconfig/simpress/ui/annotationmenu.ui:79
 msgctxt "annotationmenu|paste"
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: annotationmenu.ui:94
+#: sd/uiconfig/simpress/ui/annotationmenu.ui:94
 msgctxt "annotationmenu|delete"
 msgid "_Delete Comment"
 msgstr "Dileu _Sylw"
 
-#: annotationmenu.ui:103
+#: sd/uiconfig/simpress/ui/annotationmenu.ui:103
 msgctxt "annotationmenu|deleteby"
 msgid "Delete All Comments b_y %1"
 msgstr "Dileu _Pob Sylw gan %1"
 
-#: annotationmenu.ui:112
+#: sd/uiconfig/simpress/ui/annotationmenu.ui:112
 msgctxt "annotationmenu|deleteall"
 msgid "Delete _All Comments"
 msgstr "Dileu Pob _Sylw"
 
-#: annotationtagmenu.ui:12
+#: sd/uiconfig/simpress/ui/annotationtagmenu.ui:12
 msgctxt "annotationtagmenu|reply"
 msgid "_Reply"
 msgstr "_Ateb"
 
-#: annotationtagmenu.ui:26
+#: sd/uiconfig/simpress/ui/annotationtagmenu.ui:26
 msgctxt "annotationtagmenu|delete"
 msgid "_Delete Comment"
 msgstr "Dileu _Sylw"
 
-#: annotationtagmenu.ui:34
+#: sd/uiconfig/simpress/ui/annotationtagmenu.ui:34
 msgctxt "annotationtagmenu|deleteby"
 msgid "Delete All Comments b_y %1"
 msgstr "Dileu _Pob Sylw gan %1"
 
-#: annotationtagmenu.ui:42
+#: sd/uiconfig/simpress/ui/annotationtagmenu.ui:42
 msgctxt "annotationtagmenu|deleteall"
 msgid "Delete _All Comments"
 msgstr "Dileu Pob _Sylw"
 
-#: currentmastermenu.ui:12
+#: sd/uiconfig/simpress/ui/currentmastermenu.ui:12
 msgctxt "currentmastermenu|applyall"
 msgid "_Apply to All Slides"
 msgstr "_Gosod i Bob Sleid"
 
-#: currentmastermenu.ui:20
+#: sd/uiconfig/simpress/ui/currentmastermenu.ui:20
 msgctxt "currentmastermenu|applyselect"
 msgid "Apply to _Selected Slides"
 msgstr "Gosod i Sleidiau _Penodol"
 
-#: currentmastermenu.ui:34
+#: sd/uiconfig/simpress/ui/currentmastermenu.ui:34
 msgctxt "currentmastermenu|edit"
 msgid "_Edit Master..."
 msgstr "_Golygu'r Prif Sleid..."
 
-#: currentmastermenu.ui:42
+#: sd/uiconfig/simpress/ui/currentmastermenu.ui:42
 msgctxt "currentmastermenu|delete"
 msgid "D_elete Master"
 msgstr "_Dileu'r Prif Sleid"
 
-#: currentmastermenu.ui:56
+#: sd/uiconfig/simpress/ui/currentmastermenu.ui:56
 msgctxt "currentmastermenu|large"
 msgid "Show _Large Preview"
 msgstr "Dangos Rhagolwg _Mawr"
 
-#: currentmastermenu.ui:63
+#: sd/uiconfig/simpress/ui/currentmastermenu.ui:63
 msgctxt "currentmastermenu|small"
 msgid "Show S_mall Preview"
 msgstr "Dangos Rhagolwg _Bach"
 
-#: customanimationeffecttab.ui:44
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:44
 msgctxt "customanimationeffecttab|prop_label1"
 msgid "_Direction:"
 msgstr "_Cyfeiriad:"
 
-#: customanimationeffecttab.ui:90
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:90
 msgctxt "customanimationeffecttab|smooth_start"
 msgid "Accelerated start"
 msgstr "Cychwyn cyflym"
 
-#: customanimationeffecttab.ui:104
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:105
 msgctxt "customanimationeffecttab|smooth_end"
 msgid "Decelerated end"
 msgstr "Diwedd araf"
 
-#: customanimationeffecttab.ui:131
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:133
 msgctxt "customanimationeffecttab|label3"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: customanimationeffecttab.ui:169
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:171
 msgctxt "customanimationeffecttab|aeffect_label"
 msgid "A_fter animation:"
 msgstr "_Wedi animeiddio:"
 
-#: customanimationeffecttab.ui:183
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:185
 msgctxt "customanimationeffecttab|sound_label"
 msgid "_Sound:"
 msgstr "_Sain:"
 
-#: customanimationeffecttab.ui:197
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:199
 msgctxt "customanimationeffecttab|text_animation_label"
 msgid "_Text animation:"
 msgstr "_Animeiddio testun:"
 
-#: customanimationeffecttab.ui:211
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:213
 msgctxt "customanimationeffecttab|dim_color_label"
 msgid "Di_m color:"
 msgstr "_Pyli lliw:"
 
-#: customanimationeffecttab.ui:288
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:289
 msgctxt "customanimationeffecttab|text_delay_label"
 msgid "delay between characters"
 msgstr "oedi rhwng nodau"
 
-#: customanimationeffecttab.ui:307
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:308
 msgctxt "customanimationeffecttab|aeffect_list"
 msgid "Don't dim"
 msgstr "Peidio pylu"
 
-#: customanimationeffecttab.ui:308
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:309
 msgctxt "customanimationeffecttab|aeffect_list"
 msgid "Dim with color"
 msgstr "Pylu'r lliw"
 
-#: customanimationeffecttab.ui:309
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:310
 msgctxt "customanimationeffecttab|aeffect_list"
 msgid "Hide after animation"
 msgstr "Cuddio wedi animeiddio"
 
-#: customanimationeffecttab.ui:310
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:311
 msgctxt "customanimationeffecttab|aeffect_list"
 msgid "Hide on next animation"
 msgstr "Cuddio ar yr animeiddio nesaf"
 
-#: customanimationeffecttab.ui:323
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:324
 msgctxt "customanimationeffecttab|text_animation_list"
 msgid "All at once"
 msgstr "Popeth ar unwaith"
 
-#: customanimationeffecttab.ui:324
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:325
 msgctxt "customanimationeffecttab|text_animation_list"
 msgid "Word by word"
 msgstr "Gair wrth air"
 
-#: customanimationeffecttab.ui:325
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:326
 msgctxt "customanimationeffecttab|text_animation_list"
 msgid "Letter by letter"
 msgstr "Nod wrth nod"
 
-#: customanimationeffecttab.ui:344
+#: sd/uiconfig/simpress/ui/customanimationeffecttab.ui:345
 msgctxt "customanimationeffecttab|label4"
 msgid "Enhancement"
 msgstr "Gwella"
 
-#: customanimationproperties.ui:8
+#: sd/uiconfig/simpress/ui/customanimationproperties.ui:8
 msgctxt "customanimationproperties|CustomAnimationProperties"
 msgid "Effect Options"
 msgstr "Dewisiadau Effaith"
 
-#: customanimationproperties.ui:91
+#: sd/uiconfig/simpress/ui/customanimationproperties.ui:91
 msgctxt "customanimationproperties|effect"
 msgid "Effect"
 msgstr "Effaith"
 
-#: customanimationproperties.ui:113
+#: sd/uiconfig/simpress/ui/customanimationproperties.ui:113
 msgctxt "customanimationproperties|timing"
 msgid "Timing"
 msgstr "Amseru"
 
-#: customanimationproperties.ui:136
+#: sd/uiconfig/simpress/ui/customanimationproperties.ui:136
 msgctxt "customanimationproperties|textanim"
 msgid "Text Animation"
 msgstr "Animeiddio Testun"
 
-#: customanimationspanel.ui:91
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:91
 msgctxt "customanimationspanel|add_effect|tooltip_text"
 msgid "Add Effect"
 msgstr "Ychwanegu Effaith"
 
-#: customanimationspanel.ui:106
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:106
 msgctxt "customanimationspanel|remove_effect|tooltip_text"
 msgid "Remove Effect"
 msgstr "Tynnu Effaith"
 
-#: customanimationspanel.ui:121
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:121
 msgctxt "customanimationspanel|move_up|tooltip_text"
 msgid "Move Up"
 msgstr "Symud Fyny"
 
-#: customanimationspanel.ui:136
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:136
 msgctxt "customanimationspanel|move_down|tooltip_text"
 msgid "Move Down"
 msgstr "Symud Lawr"
 
-#: customanimationspanel.ui:164
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:164
 msgctxt "customanimationspanel|categorylabel"
 msgid "Category:"
 msgstr "Categori:"
 
-#: customanimationspanel.ui:178
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:178
 msgctxt "customanimationspanel|effectlabel"
 msgid "Effect:"
 msgstr "Effaith:"
 
-#: customanimationspanel.ui:193
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:193
 msgctxt "customanimationspanel|categorylb"
 msgid "Entrance"
 msgstr "Mynedfa"
 
-#: customanimationspanel.ui:194
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:194
 msgctxt "customanimationspanel|categorylb"
 msgid "Emphasis"
 msgstr "Pwyslais"
 
-#: customanimationspanel.ui:195
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:195
 msgctxt "customanimationspanel|categorylb"
 msgid "Exit"
 msgstr "Gadael"
 
-#: customanimationspanel.ui:196
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:196
 msgctxt "customanimationspanel|categorylb"
 msgid "Motion Paths"
 msgstr "Llwybrau Mudiant"
 
-#: customanimationspanel.ui:197
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:197
 msgctxt "customanimationspanel|categorylb"
 msgid "Misc Effects"
 msgstr "Effeithiau Amrywiol"
 
-#: customanimationspanel.ui:242
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:242
 msgctxt "customanimationspanel|start_effect"
 msgid "_Start:"
 msgstr "_Cychwyn:"
 
-#: customanimationspanel.ui:256
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:256
 msgctxt "customanimationspanel|effect_property"
 msgid "_Direction:"
 msgstr "_Cyfeiriad:"
 
-#: customanimationspanel.ui:270
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:270
 msgctxt "customanimationspanel|effect_duration"
 msgid "D_uration:"
 msgstr "_Hyd:"
 
-#: customanimationspanel.ui:285
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:285
 msgctxt "customanimationspanel|start_effect_list"
 msgid "On click"
 msgstr "Clic ymlaen"
 
-#: customanimationspanel.ui:286
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:286
 msgctxt "customanimationspanel|start_effect_list"
 msgid "With previous"
 msgstr "Gyda'r blaenorol"
 
-#: customanimationspanel.ui:287
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:287
 msgctxt "customanimationspanel|start_effect_list"
 msgid "After previous"
 msgstr "Wedi'r blaenorol"
 
-#: customanimationspanel.ui:324
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:324
 msgctxt "customanimationspanel|more_properties|tooltip_text"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: customanimationspanel.ui:350
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:350
 msgctxt "customanimationspanel|delay_label"
 msgid "_Delay:"
 msgstr "_Oediad:"
 
-#: customanimationspanel.ui:387
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:387
 msgctxt "customanimationspanel|effect_label"
 msgid "Effect"
 msgstr "Effaith"
 
-#: customanimationspanel.ui:429
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:429
 msgctxt "customanimationspanel|auto_preview"
 msgid "Automatic Preview"
 msgstr "Rhagolwg Awtomatig"
 
-#: customanimationspanel.ui:446
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:446
 msgctxt "customanimationspanel|play"
 msgid "Play"
 msgstr "Chwarae"
 
-#: customanimationspanel.ui:451
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:451
 msgctxt "customanimationspanel|play|tooltip_text"
 msgid "Preview Effect"
 msgstr "Rhagolwg o Effaith"
 
-#: customanimationspanel.ui:479
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:479
 msgctxt "customanimationspanel|box1_label"
 msgid "Animation Deck"
 msgstr "Dec Animeiddio"
 
-#: customanimationspanel.ui:492
+#: sd/uiconfig/simpress/ui/customanimationspanel.ui:492
 msgctxt "customanimationspanel|custom_animation_list_label"
 msgid "Animation List"
 msgstr "Rhestr Animeiddio"
 
-#: customanimationspanelhorizontal.ui:96
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:96
 msgctxt "customanimationspanelhorizontal|add_effect|tooltip_text"
 msgid "Add Effect"
 msgstr "Ychwanegu Effaith"
 
-#: customanimationspanelhorizontal.ui:110
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:110
 msgctxt "customanimationspanelhorizontal|remove_effect|tooltip_text"
 msgid "Remove Effect"
 msgstr "Tynnu Effaith"
 
-#: customanimationspanelhorizontal.ui:124
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:124
 msgctxt "customanimationspanelhorizontal|move_up|tooltip_text"
 msgid "Move Up"
 msgstr "Symud i Fyny"
 
-#: customanimationspanelhorizontal.ui:138
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:138
 msgctxt "customanimationspanelhorizontal|move_down|tooltip_text"
 msgid "Move Down"
 msgstr "Symud i Lawr"
 
-#: customanimationspanelhorizontal.ui:166
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:166
 msgctxt "customanimationspanelhorizontal|start_effect"
 msgid "_Start:"
 msgstr "_Cychwyn:"
 
-#: customanimationspanelhorizontal.ui:179
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:179
 msgctxt "customanimationspanelhorizontal|effect_property"
 msgid "_Direction:"
 msgstr "_Cyfeiriad:"
 
-#: customanimationspanelhorizontal.ui:193
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:193
 msgctxt "customanimationspanelhorizontal|start_effect_list"
 msgid "On click"
 msgstr "Clic ymlaen"
 
-#: customanimationspanelhorizontal.ui:194
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:194
 msgctxt "customanimationspanelhorizontal|start_effect_list"
 msgid "With previous"
 msgstr "Gyda'r blaenorol"
 
-#: customanimationspanelhorizontal.ui:195
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:195
 msgctxt "customanimationspanelhorizontal|start_effect_list"
 msgid "After previous"
 msgstr "Wedi'r blaenorol"
 
-#: customanimationspanelhorizontal.ui:247
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:247
 msgctxt "customanimationspanelhorizontal|categorylabel"
 msgid "Category:"
 msgstr "Categori:"
 
-#: customanimationspanelhorizontal.ui:260
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:260
 msgctxt "customanimationspanelhorizontal|categorylb"
 msgid "Entrance"
 msgstr "Mynedfa"
 
-#: customanimationspanelhorizontal.ui:261
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:261
 msgctxt "customanimationspanelhorizontal|categorylb"
 msgid "Emphasis"
 msgstr "Pwyslais"
 
-#: customanimationspanelhorizontal.ui:262
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:262
 msgctxt "customanimationspanelhorizontal|categorylb"
 msgid "Exit"
 msgstr "Gadael"
 
-#: customanimationspanelhorizontal.ui:263
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:263
 msgctxt "customanimationspanelhorizontal|categorylb"
 msgid "Motion Paths"
 msgstr "Taflwybrau"
 
-#: customanimationspanelhorizontal.ui:264
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:264
 msgctxt "customanimationspanelhorizontal|categorylb"
 msgid "Misc Effects"
 msgstr "Effeithiau Amrywiol"
 
-#: customanimationspanelhorizontal.ui:277
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:277
 msgctxt "customanimationspanelhorizontal|effect_duration"
 msgid "D_uration:"
 msgstr "H_yd:"
 
-#: customanimationspanelhorizontal.ui:290
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:290
 msgctxt "customanimationspanelhorizontal|anim_duration|tooltip_text"
 msgid "Select the speed of the Animation."
 msgstr "Dewis cyflymder yr Animeiddio."
 
-#: customanimationspanelhorizontal.ui:302
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:302
 msgctxt "customanimationspanelhorizontal|delay_label"
 msgid "_Delay:"
 msgstr "_Oediad:"
 
-#: customanimationspanelhorizontal.ui:340
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:340
 msgctxt "customanimationspanelhorizontal|effectlabel"
 msgid "Effect:"
 msgstr "Effaith:"
 
-#: customanimationspanelhorizontal.ui:378
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:378
 msgctxt "customanimationspanelhorizontal|auto_preview"
 msgid "Automatic Preview"
 msgstr "Rhagolwg Awtomatig"
 
-#: customanimationspanelhorizontal.ui:407
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:407
 msgctxt "customanimationspanelhorizontal|play"
 msgid "Play"
 msgstr "Chwarae"
 
-#: customanimationspanelhorizontal.ui:412
+#: sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui:412
 msgctxt "customanimationspanelhorizontal|play|tooltip_text"
 msgid "Preview Effect"
 msgstr "Effaith y Rhagolwg"
 
-#: customanimationtexttab.ui:26
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:26
 msgctxt "customanimationtexttab|group_text_label"
 msgid "_Group text:"
 msgstr "_Testun grŵp:"
 
-#: customanimationtexttab.ui:56
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:55
 msgctxt "customanimationtexttab|auto_after"
 msgid "_Automatically after:"
 msgstr "_Awtomatig wedi:"
 
-#: customanimationtexttab.ui:78
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:77
 msgctxt "customanimationtexttab|group_text_list"
 msgid "As one object"
 msgstr "Fel un gwrthrych"
 
-#: customanimationtexttab.ui:79
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:78
 msgctxt "customanimationtexttab|group_text_list"
 msgid "All paragraphs at once"
 msgstr "Pob paragraff ar unwaith"
 
-#: customanimationtexttab.ui:80
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:79
 msgctxt "customanimationtexttab|group_text_list"
 msgid "By 1st level paragraphs"
 msgstr "Yn ôl paragraffau lefel 1af"
 
-#: customanimationtexttab.ui:81
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:80
 msgctxt "customanimationtexttab|group_text_list"
 msgid "By 2nd level paragraphs"
 msgstr "Yn ôl paragraffau lefel 2"
 
-#: customanimationtexttab.ui:82
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:81
 msgctxt "customanimationtexttab|group_text_list"
 msgid "By 3rd level paragraphs"
 msgstr "Yn ôl paragraffau lefel 3"
 
-#: customanimationtexttab.ui:83
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:82
 msgctxt "customanimationtexttab|group_text_list"
 msgid "By 4th level paragraphs"
 msgstr "Yn ôl paragraffau lefel 4"
 
-#: customanimationtexttab.ui:84
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:83
 msgctxt "customanimationtexttab|group_text_list"
 msgid "By 5th level paragraphs"
 msgstr "Yn ôl paragraffau lefel 5"
 
-#: customanimationtexttab.ui:103
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:102
 msgctxt "customanimationtexttab|animate_shape"
 msgid "Animate attached _shape"
 msgstr "Animeiddio'r ­_siâp ynghlwm"
 
-#: customanimationtexttab.ui:119
+#: sd/uiconfig/simpress/ui/customanimationtexttab.ui:118
 msgctxt "customanimationtexttab|reverse_order"
 msgid "_In reverse order"
 msgstr "­­­_Trefn tu chwith"
 
-#: customanimationtimingtab.ui:29
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:29
 msgctxt "customanimationtimingtab|start_label"
 msgid "_Start:"
 msgstr "_Cychwyn:"
 
-#: customanimationtimingtab.ui:42
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:42
 msgctxt "customanimationtimingtab|delay_label"
 msgid "_Delay:"
 msgstr "_Oediad:"
 
-#: customanimationtimingtab.ui:55
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:55
 msgctxt "customanimationtimingtab|duration_label"
 msgid "D_uration:"
 msgstr "_Hyd:"
 
-#: customanimationtimingtab.ui:68
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:68
 msgctxt "customanimationtimingtab|repeat_label"
 msgid "_Repeat:"
 msgstr "_Ailadrodd:"
 
-#: customanimationtimingtab.ui:82
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:82
 msgctxt "customanimationtimingtab|start_list"
 msgid "On click"
 msgstr "Clic ymlaen"
 
-#: customanimationtimingtab.ui:83
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:83
 msgctxt "customanimationtimingtab|start_list"
 msgid "With previous"
 msgstr "Gyda'r blaenorol"
 
-#: customanimationtimingtab.ui:84
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:84
 msgctxt "customanimationtimingtab|start_list"
 msgid "After previous"
 msgstr "Wedi'r blaenorol"
 
-#: customanimationtimingtab.ui:111
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:111
 msgctxt "customanimationtimingtab|anim_duration|tooltip_text"
 msgid "Select the speed of the Animation."
 msgstr "Dewis cyflymder yr Animeiddio."
 
-#: customanimationtimingtab.ui:133
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:133
 msgctxt "customanimationtimingtab|rewind"
 msgid "Rewind _when done playing"
 msgstr "Ailddirwyn _wedi gorffen chwarae"
 
-#: customanimationtimingtab.ui:174
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:174
 msgctxt "customanimationtimingtab|rb_click_sequence"
 msgid "_Animate as part of click sequence"
 msgstr "_Animeiddio fel rhan o'r dilyniant clic"
 
-#: customanimationtimingtab.ui:192
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:192
 msgctxt "customanimationtimingtab|rb_interactive"
 msgid "Start _effect on click of:"
 msgstr "Cychwyn _effaith wrth glicio:"
 
-#: customanimationtimingtab.ui:228
+#: sd/uiconfig/simpress/ui/customanimationtimingtab.ui:228
 msgctxt "customanimationtimingtab|label11"
 msgid "Trigger"
 msgstr "Trigyr"
 
-#: customslideshows.ui:8
+#: sd/uiconfig/simpress/ui/customslideshows.ui:8
 msgctxt "customslideshows|CustomSlideShows"
 msgid "Custom Slide Shows"
 msgstr "Sioeau Sleidiau Cyfaddas"
 
-#: customslideshows.ui:37
+#: sd/uiconfig/simpress/ui/customslideshows.ui:37
 msgctxt "customslideshows|startshow"
 msgid "_Start"
 msgstr "_Cychwyn"
 
-#: customslideshows.ui:103
+#: sd/uiconfig/simpress/ui/customslideshows.ui:103
 msgctxt "customslideshows|usecustomshows"
 msgid "_Use custom slide show"
 msgstr "_Defnyddiwch sioe sleidiau cyfaddas"
 
-#: customslideshows.ui:165
+#: sd/uiconfig/simpress/ui/customslideshows.ui:165
 msgctxt "customslideshows|copy"
 msgid "Cop_y"
 msgstr "Copï_o"
 
-#: definecustomslideshow.ui:9
+#: sd/uiconfig/simpress/ui/definecustomslideshow.ui:9
 msgctxt "definecustomslideshow|DefineCustomSlideShow"
 msgid "Define Custom Slide Show"
 msgstr "Diffinio Sioe Sleidiau Cyfaddas"
 
-#: definecustomslideshow.ui:91
+#: sd/uiconfig/simpress/ui/definecustomslideshow.ui:91
 msgctxt "definecustomslideshow|label1"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: definecustomslideshow.ui:134
+#: sd/uiconfig/simpress/ui/definecustomslideshow.ui:133
 msgctxt "definecustomslideshow|label2"
 msgid "_Existing slides:"
 msgstr "Sleidiadu _cyfredol:"
 
-#: definecustomslideshow.ui:148
+#: sd/uiconfig/simpress/ui/definecustomslideshow.ui:147
 msgctxt "definecustomslideshow|label3"
 msgid "_Selected slides:"
 msgstr "Sleidiau _dewiswyd:"
 
-#: definecustomslideshow.ui:198
+#: sd/uiconfig/simpress/ui/definecustomslideshow.ui:197
 msgctxt "definecustomslideshow|add"
 msgid ">>"
 msgstr ">>"
 
-#: definecustomslideshow.ui:211
+#: sd/uiconfig/simpress/ui/definecustomslideshow.ui:210
 msgctxt "definecustomslideshow|remove"
 msgid "<<"
 msgstr "<<"
 
-#: dlgfield.ui:9
+#: sd/uiconfig/simpress/ui/dlgfield.ui:9
 msgctxt "dlgfield|EditFieldsDialog"
 msgid "Edit Field"
 msgstr "Maes Golygu"
 
-#: dlgfield.ui:100
+#: sd/uiconfig/simpress/ui/dlgfield.ui:100
 msgctxt "dlgfield|fixedRB"
 msgid "_Fixed"
 msgstr "_Sefydlog"
 
-#: dlgfield.ui:118
+#: sd/uiconfig/simpress/ui/dlgfield.ui:118
 msgctxt "dlgfield|varRB"
 msgid "_Variable"
 msgstr "_Amrywiolyn"
 
-#: dlgfield.ui:142
+#: sd/uiconfig/simpress/ui/dlgfield.ui:142
 msgctxt "dlgfield|label1"
 msgid "Field Type"
 msgstr "Math o Faes"
 
-#: dlgfield.ui:164
+#: sd/uiconfig/simpress/ui/dlgfield.ui:164
 msgctxt "dlgfield|label2"
 msgid "_Language:"
 msgstr "_Iaith:"
 
-#: dlgfield.ui:216
+#: sd/uiconfig/simpress/ui/dlgfield.ui:216
 msgctxt "dlgfield|label3"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: dockinganimation.ui:62
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:62
 msgctxt "dockinganimation|DockingAnimation"
 msgid "Animation"
 msgstr "Animeiddio"
 
-#: dockinganimation.ui:90
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:90
 msgctxt "dockinganimation|box|tooltip_text"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: dockinganimation.ui:115
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:115
 msgctxt "dockinganimation|loopcount|tooltip_text"
 msgid "Loop Count"
 msgstr "Cyfrif Cylch"
 
-#: dockinganimation.ui:135
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:135
 msgctxt "dockinganimation|loopcount"
 msgid "Max."
 msgstr "Uchaf."
 
-#: dockinganimation.ui:149
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:149
 msgctxt "dockinganimation|duration|tooltip_text"
 msgid "Duration"
 msgstr "Hyd"
 
-#: dockinganimation.ui:163
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:163
 msgctxt "dockinganimation|numbitmap|tooltip_text"
 msgid "Image Number"
 msgstr "Rhif Delwedd"
 
-#: dockinganimation.ui:186
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:186
 msgctxt "dockinganimation|first|tooltip_text"
 msgid "First Image"
 msgstr "Delwedd Gyntaf"
 
-#: dockinganimation.ui:201
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:201
 msgctxt "dockinganimation|prev|tooltip_text"
 msgid "Backwards"
 msgstr "Nôl"
 
-#: dockinganimation.ui:216
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:216
 msgctxt "dockinganimation|stop|tooltip_text"
 msgid "Stop"
 msgstr "Atal"
 
-#: dockinganimation.ui:231
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:231
 msgctxt "dockinganimation|next|tooltip_text"
 msgid "Play"
 msgstr "Chwarae"
 
-#: dockinganimation.ui:246
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:246
 msgctxt "dockinganimation|last|tooltip_text"
 msgid "Last Image"
 msgstr "Delwedd Olaf"
 
-#: dockinganimation.ui:299
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:299
 msgctxt "dockinganimation|group"
 msgid "Group object"
 msgstr "Grwpio gwrthrych"
 
-#: dockinganimation.ui:317
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:318
 msgctxt "dockinganimation|bitmap"
 msgid "Bitmap object"
 msgstr "Gwrthrych didfap"
 
-#: dockinganimation.ui:340
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:342
 msgctxt "dockinganimation|alignmentft"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: dockinganimation.ui:355
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:357
 msgctxt "dockinganimation|alignment"
 msgid "Top Left"
 msgstr "Chwith Uchaf"
 
-#: dockinganimation.ui:356
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:358
 msgctxt "dockinganimation|alignment"
 msgid "Left"
 msgstr "Chwith"
 
-#: dockinganimation.ui:357
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:359
 msgctxt "dockinganimation|alignment"
 msgid "Bottom Left"
 msgstr "Chwith Gwaelod"
 
-#: dockinganimation.ui:358
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:360
 msgctxt "dockinganimation|alignment"
 msgid "Top"
 msgstr "Brig"
 
-#: dockinganimation.ui:359
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:361
 msgctxt "dockinganimation|alignment"
 msgid "Centered"
 msgstr "Canolwyd"
 
-#: dockinganimation.ui:360
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:362
 msgctxt "dockinganimation|alignment"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: dockinganimation.ui:361
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:363
 msgctxt "dockinganimation|alignment"
 msgid "Top Right"
 msgstr "De Uchaf"
 
-#: dockinganimation.ui:362
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:364
 msgctxt "dockinganimation|alignment"
 msgid "Right"
 msgstr "De"
 
-#: dockinganimation.ui:363
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:365
 msgctxt "dockinganimation|alignment"
 msgid "Bottom Right"
 msgstr "De Gwaelod"
 
-#: dockinganimation.ui:389
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:391
 msgctxt "dockinganimation|label1"
 msgid "Animation group"
 msgstr "Grŵp animeiddio"
 
-#: dockinganimation.ui:433
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:435
 msgctxt "dockinganimation|getone|tooltip_text"
 msgid "Apply Object"
 msgstr "Gosod y Gwrthrych"
 
-#: dockinganimation.ui:448
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:450
 msgctxt "dockinganimation|getall|tooltip_text"
 msgid "Apply Objects Individually"
 msgstr "Gosod Gwrthrychau'n Unigol"
 
-#: dockinganimation.ui:478
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:480
 msgctxt "dockinganimation|label3"
 msgid "Number"
 msgstr "Rhif"
 
-#: dockinganimation.ui:521
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:523
 msgctxt "dockinganimation|delone|tooltip_text"
 msgid "Delete Current Image"
 msgstr "Dileu'r Ddelwedd Bresennol"
 
-#: dockinganimation.ui:536
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:538
 msgctxt "dockinganimation|delall|tooltip_text"
 msgid "Delete All Images"
 msgstr "Dileu Pob Delwedd"
 
-#: dockinganimation.ui:562
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:564
 msgctxt "dockinganimation|label2"
 msgid "Image"
 msgstr "Delwedd"
 
-#: dockinganimation.ui:605
+#: sd/uiconfig/simpress/ui/dockinganimation.ui:607
 msgctxt "dockinganimation|create"
 msgid "Create"
 msgstr "Creu"
 
-#: effectmenu.ui:12
+#: sd/uiconfig/simpress/ui/effectmenu.ui:12
 msgctxt "effectmenu|onclick"
 msgid "Start On _Click"
 msgstr "Cychwyn wrth _Glicio"
 
-#: effectmenu.ui:20
+#: sd/uiconfig/simpress/ui/effectmenu.ui:20
 msgctxt "effectmenu|withprev"
 msgid "Start _With Previous"
 msgstr "Cychwyn gyda'r _Blaenorol"
 
-#: effectmenu.ui:28
+#: sd/uiconfig/simpress/ui/effectmenu.ui:28
 msgctxt "effectmenu|afterprev"
 msgid "Start _After Previous"
 msgstr "Cychwyn Wedi'r _Blaenorol"
 
-#: effectmenu.ui:41
+#: sd/uiconfig/simpress/ui/effectmenu.ui:41
 msgctxt "effectmenu|options"
 msgid "_Effect Options..."
 msgstr "_Dewisiadau Effaith..."
 
-#: effectmenu.ui:49
+#: sd/uiconfig/simpress/ui/effectmenu.ui:49
 msgctxt "effectmenu|timing"
 msgid "_Timing..."
 msgstr "_Amseru..."
 
-#: effectmenu.ui:57
+#: sd/uiconfig/simpress/ui/effectmenu.ui:57
 msgctxt "effectmenu|remove"
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: fontsizemenu.ui:12
+#: sd/uiconfig/simpress/ui/fontsizemenu.ui:12
 msgctxt "fontsizemenu|25"
 msgid "Tiny"
 msgstr "Bach"
 
-#: fontsizemenu.ui:20
+#: sd/uiconfig/simpress/ui/fontsizemenu.ui:20
 msgctxt "fontsizemenu|50"
 msgid "Smaller"
 msgstr "Llai"
 
-#: fontsizemenu.ui:28
+#: sd/uiconfig/simpress/ui/fontsizemenu.ui:28
 msgctxt "fontsizemenu|150"
 msgid "Larger"
 msgstr "Mwy"
 
-#: fontsizemenu.ui:36
+#: sd/uiconfig/simpress/ui/fontsizemenu.ui:36
 msgctxt "fontsizemenu|400"
 msgid "Extra Large"
 msgstr "Mawr Iawn"
 
-#: fontstylemenu.ui:12
+#: sd/uiconfig/simpress/ui/fontstylemenu.ui:12
 msgctxt "fontstylemenu|bold"
 msgid "Bold"
 msgstr "Bras"
 
-#: fontstylemenu.ui:20
+#: sd/uiconfig/simpress/ui/fontstylemenu.ui:20
 msgctxt "fontstylemenu|italic"
 msgid "Italic"
 msgstr "Italig"
 
-#: fontstylemenu.ui:28
+#: sd/uiconfig/simpress/ui/fontstylemenu.ui:28
 msgctxt "fontstylemenu|underline"
 msgid "Underlined"
 msgstr "Tanlinellwyd"
 
-#: headerfooterdialog.ui:8
+#: sd/uiconfig/simpress/ui/headerfooterdialog.ui:8
 msgctxt "headerfooterdialog|HeaderFooterDialog"
 msgid "Header and Footer"
 msgstr "Pennyn a Throedyn"
 
-#: headerfooterdialog.ui:21
+#: sd/uiconfig/simpress/ui/headerfooterdialog.ui:21
 msgctxt "headerfooterdialog|apply_all"
 msgid "Appl_y to All"
 msgstr "_Gosod i'r Cyfan"
 
-#: headerfooterdialog.ui:106
+#: sd/uiconfig/simpress/ui/headerfooterdialog.ui:106
 msgctxt "headerfooterdialog|slides"
 msgid "Slides"
 msgstr "Sleidiau"
 
-#: headerfooterdialog.ui:128
+#: sd/uiconfig/simpress/ui/headerfooterdialog.ui:128
 msgctxt "headerfooterdialog|notes"
 msgid "Notes and Handouts"
 msgstr "Nodiadau a Thaflenni"
 
-#: headerfootertab.ui:40
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:40
 msgctxt "headerfootertab|header_cb"
 msgid "Heade_r"
 msgstr "_Pennyn"
 
-#: headerfootertab.ui:67
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:67
 msgctxt "headerfootertab|header_label"
 msgid "Header _text:"
 msgstr "Testun _pennyn:"
 
-#: headerfootertab.ui:101
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:100
 msgctxt "headerfootertab|datetime_cb"
 msgid "_Date and time"
 msgstr "_Dyddiad ac amser"
 
-#: headerfootertab.ui:132
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:131
 msgctxt "headerfootertab|rb_fixed"
 msgid "Fi_xed"
 msgstr "S_efydlog"
 
-#: headerfootertab.ui:180
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:178
 msgctxt "headerfootertab|rb_auto"
 msgid "_Variable"
 msgstr "_Amrywiolyn"
 
-#: headerfootertab.ui:223
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:221
 msgctxt "headerfootertab|language_label"
 msgid "_Language:"
 msgstr "_Iaith:"
 
-#: headerfootertab.ui:247
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:245
 msgctxt "headerfootertab|language_label1"
 msgid "_Format:"
 msgstr "_Fformat:"
 
-#: headerfootertab.ui:292
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:290
 msgctxt "headerfootertab|footer_cb"
 msgid "_Footer"
 msgstr "_Troedyn"
 
-#: headerfootertab.ui:319
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:317
 msgctxt "headerfootertab|footer_label"
 msgid "F_ooter text:"
 msgstr "_Testun troedyn:"
 
-#: headerfootertab.ui:360
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:357
 msgctxt "headerfootertab|slide_number"
 msgid "_Slide number"
 msgstr "Rhif _sleid"
 
-#: headerfootertab.ui:382
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:379
 msgctxt "headerfootertab|include_label"
 msgid "Include on Slide"
 msgstr "Cynnwys ar y Sleid"
 
-#: headerfootertab.ui:397
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:394
 msgctxt "headerfootertab|not_on_title"
 msgid "Do _not show on the first slide"
 msgstr "Peidio _dangos ar y sleid gyntaf"
 
-#: headerfootertab.ui:416
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:413
 msgctxt "headerfootertab|replacement_a"
 msgid "_Page Number"
 msgstr "_Rhif Tudalen"
 
-#: headerfootertab.ui:430
+#: sd/uiconfig/simpress/ui/headerfootertab.ui:427
 msgctxt "headerfootertab|replacement_b"
 msgid "Include on page"
 msgstr "Cynnwys ar y dudalen"
 
-#: impressprinteroptions.ui:32
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:32
 msgctxt "impressprinteroptions|printname"
 msgid "Slide name"
 msgstr "Enw sleid"
 
-#: impressprinteroptions.ui:48
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:49
 msgctxt "impressprinteroptions|printdatetime"
 msgid "Date and time"
 msgstr "Dyddiad ac amser"
 
-#: impressprinteroptions.ui:64
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:66
 msgctxt "impressprinteroptions|printhidden"
 msgid "Hidden pages"
 msgstr "Tudalennau cudd"
 
-#: impressprinteroptions.ui:86
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:89
 msgctxt "impressprinteroptions|label4"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: impressprinteroptions.ui:119
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:122
 msgctxt "impressprinteroptions|originalcolors"
 msgid "Original size"
 msgstr "Maint gwreiddiol"
 
-#: impressprinteroptions.ui:137
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:141
 msgctxt "impressprinteroptions|grayscale"
 msgid "Grayscale"
 msgstr "Graddlwyd"
 
-#: impressprinteroptions.ui:155
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:160
 msgctxt "impressprinteroptions|blackandwhite"
 msgid "Black & white"
 msgstr "Du a gwyn"
 
-#: impressprinteroptions.ui:179
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:185
 msgctxt "impressprinteroptions|label5"
 msgid "Color"
 msgstr "Lliw"
 
-#: impressprinteroptions.ui:212
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:218
 msgctxt "impressprinteroptions|originalsize"
 msgid "Original size"
 msgstr "Maint gwreiddiol"
 
-#: impressprinteroptions.ui:230
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:237
 msgctxt "impressprinteroptions|fittoprintable"
 msgid "Fit to printable page"
 msgstr "Ffitio i'r dudalen argraffadwy"
 
-#: impressprinteroptions.ui:248
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:256
 msgctxt "impressprinteroptions|distributeonmultiple"
 msgid "Distribute on multiple sheets of paper"
 msgstr "Dosbarthu ar ddalennau lluosog o bapur"
 
-#: impressprinteroptions.ui:266
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:275
 msgctxt "impressprinteroptions|tilesheet"
 msgid "Tile sheet of paper with repeated slides"
 msgstr "Teilo dalennau o bapur gyda sleidiau'n ailadrodd"
 
-#: impressprinteroptions.ui:290
+#: sd/uiconfig/simpress/ui/impressprinteroptions.ui:300
 msgctxt "impressprinteroptions|label6"
 msgid "Size"
 msgstr "Maint"
 
-#: insertslides.ui:8
+#: sd/uiconfig/simpress/ui/insertslides.ui:8
 msgctxt "insertslides|InsertSlidesDialog"
 msgid "Insert Slides"
 msgstr "Mewnosod Sleidiau"
 
-#: insertslides.ui:92
+#: sd/uiconfig/simpress/ui/insertslides.ui:92
 msgctxt "insertslides|before"
 msgid "_Before"
 msgstr "_Cynt"
 
-#: insertslides.ui:111
+#: sd/uiconfig/simpress/ui/insertslides.ui:111
 msgctxt "insertslides|after"
 msgid "A_fter"
 msgstr "_Wedi"
 
-#: insertslides.ui:137
+#: sd/uiconfig/simpress/ui/insertslides.ui:137
 msgctxt "insertslides|label1"
 msgid "Position"
 msgstr "Safle"
 
-#: interactiondialog.ui:8
+#: sd/uiconfig/simpress/ui/interactiondialog.ui:8
 msgctxt "interactiondialog|InteractionDialog"
 msgid "Interaction"
 msgstr "Rhyngweithiad"
 
-#: interactionpage.ui:40
+#: sd/uiconfig/simpress/ui/interactionpage.ui:40
 msgctxt "interactionpage|label2"
 msgid "Action at mouse click:"
 msgstr "Gweithred yn ôl clic llygoden:"
 
-#: interactionpage.ui:65
+#: sd/uiconfig/simpress/ui/interactionpage.ui:65
 msgctxt "interactionpage|fttree"
 msgid "Target:"
 msgstr "Targed:"
 
-#: interactionpage.ui:143
+#: sd/uiconfig/simpress/ui/interactionpage.ui:143
 msgctxt "interactionpage|label1"
 msgid "Interaction"
 msgstr "Rhyngweithiad"
 
-#: interactionpage.ui:183
+#: sd/uiconfig/simpress/ui/interactionpage.ui:183
 msgctxt "interactionpage|browse"
 msgid "_Browse..."
 msgstr "_Pori..."
 
-#: interactionpage.ui:197
+#: sd/uiconfig/simpress/ui/interactionpage.ui:197
 msgctxt "interactionpage|find"
 msgid "_Find"
 msgstr "­_Canfod"
 
-#: interactionpage.ui:229
+#: sd/uiconfig/simpress/ui/interactionpage.ui:228
 msgctxt "interactionpage|sound-atkobject"
 msgid "Path Name"
 msgstr "Enw Llwybr"
 
-#: layoutmenu.ui:12
+#: sd/uiconfig/simpress/ui/layoutmenu.ui:12
 msgctxt "layoutmenu|apply"
 msgid "Apply to _Selected Slides"
 msgstr "Gosod i Sleidiau _Penodol"
 
-#: layoutmenu.ui:26
+#: sd/uiconfig/simpress/ui/layoutmenu.ui:26
 msgctxt "layoutmenu|insert"
 msgid "_Insert Slide"
 msgstr "Mewnosod _Sleid"
 
-#: masterlayoutdlg.ui:8
+#: sd/uiconfig/simpress/ui/masterlayoutdlg.ui:8
 msgctxt "masterlayoutdlg|MasterLayoutDialog"
 msgid "Master Elements"
 msgstr "Prif Elfennau"
 
-#: masterlayoutdlg.ui:92
+#: sd/uiconfig/simpress/ui/masterlayoutdlg.ui:92
 msgctxt "masterlayoutdlg|header"
 msgid "_Header"
 msgstr "_Pennyn"
 
-#: masterlayoutdlg.ui:108
+#: sd/uiconfig/simpress/ui/masterlayoutdlg.ui:108
 msgctxt "masterlayoutdlg|datetime"
 msgid "_Date/time"
 msgstr "_Dyddiad/amser"
 
-#: masterlayoutdlg.ui:124
+#: sd/uiconfig/simpress/ui/masterlayoutdlg.ui:124
 msgctxt "masterlayoutdlg|footer"
 msgid "_Footer"
 msgstr "_Troedyn"
 
-#: masterlayoutdlg.ui:140
+#: sd/uiconfig/simpress/ui/masterlayoutdlg.ui:140
 msgctxt "masterlayoutdlg|pagenumber"
 msgid "_Page number"
 msgstr "_Rhif tudalen"
 
-#: masterlayoutdlg.ui:156
+#: sd/uiconfig/simpress/ui/masterlayoutdlg.ui:156
 msgctxt "masterlayoutdlg|slidenumber"
 msgid "_Slide number"
 msgstr "_Rhif sleid"
 
-#: masterlayoutdlg.ui:178
+#: sd/uiconfig/simpress/ui/masterlayoutdlg.ui:178
 msgctxt "masterlayoutdlg|Placeholders"
 msgid "Placeholders"
 msgstr "Dalfannau"
 
-#: mastermenu.ui:12
+#: sd/uiconfig/simpress/ui/mastermenu.ui:12
 msgctxt "mastermenu|applyall"
 msgid "_Apply to All Slides"
 msgstr "_Gosod i Bob Sleid"
 
-#: mastermenu.ui:20
+#: sd/uiconfig/simpress/ui/mastermenu.ui:20
 msgctxt "mastermenu|applyselect"
 msgid "Apply to _Selected Slides"
 msgstr "Gosod i Sleidiau _Penodol"
 
-#: mastermenu.ui:34
+#: sd/uiconfig/simpress/ui/mastermenu.ui:34
 msgctxt "mastermenu|large"
 msgid "Show _Large Preview"
 msgstr "Dangos Rhagolwg _Mawr"
 
-#: mastermenu.ui:42
+#: sd/uiconfig/simpress/ui/mastermenu.ui:42
 msgctxt "mastermenu|small"
 msgid "Show S_mall Preview"
 msgstr "Dangos Rhagolwg _Bach"
 
-#: navigatorpanel.ui:22
+#: sd/uiconfig/simpress/ui/navigatorpanel.ui:22
 msgctxt "navigatorpanel|documents|tooltip_text"
 msgid "Document"
 msgstr "Dogfen"
 
-#: navigatorpanel.ui:25
+#: sd/uiconfig/simpress/ui/navigatorpanel.ui:25
 msgctxt "navigatorpanel|documents-atkobject"
 msgid "Active Window"
 msgstr "Ffenestr Weithredol"
 
-#: navigatorpanel.ui:58
+#: sd/uiconfig/simpress/ui/navigatorpanel.ui:58
 msgctxt "navigatorpanel|first|tooltip_text"
 msgid "First Slide"
 msgstr "Sleid Gyntaf"
 
-#: navigatorpanel.ui:71
+#: sd/uiconfig/simpress/ui/navigatorpanel.ui:71
 msgctxt "navigatorpanel|previous|tooltip_text"
 msgid "Previous Slide"
 msgstr "Sleid Flaenorol"
 
-#: navigatorpanel.ui:84
+#: sd/uiconfig/simpress/ui/navigatorpanel.ui:84
 msgctxt "navigatorpanel|next|tooltip_text"
 msgid "Next Slide"
 msgstr "Sleid Nesaf"
 
-#: navigatorpanel.ui:97
+#: sd/uiconfig/simpress/ui/navigatorpanel.ui:97
 msgctxt "navigatorpanel|last|tooltip_text"
 msgid "Last Slide"
 msgstr "Sleid Olaf"
 
-#: navigatorpanel.ui:120
+#: sd/uiconfig/simpress/ui/navigatorpanel.ui:120
 msgctxt "navigatorpanel|dragmode|tooltip_text"
 msgid "Drag Mode"
 msgstr "Modd Llusgo"
 
-#: navigatorpanel.ui:133
+#: sd/uiconfig/simpress/ui/navigatorpanel.ui:133
 msgctxt "navigatorpanel|shapes|tooltip_text"
 msgid "Show Shapes"
 msgstr "Dangos Siapiau"
 
-#: notebookbar.ui:340
-msgctxt "notebookbar|FileLabel"
-msgid "File"
-msgstr "Ffeil"
-
-#: notebookbar.ui:421
-msgctxt "notebookbar|FormatPaintbrush"
-msgid "Clone"
-msgstr "Clonio"
-
-#: notebookbar.ui:921
-msgctxt "notebookbar|numberbullet|tooltip_text"
-msgid "Bullets and Numbering"
-msgstr "Bwledi a Rhifo"
-
-#: notebookbar.ui:961
-msgctxt "notebookbar|indent|tooltip_text"
-msgid "Indent"
-msgstr "Mewnoli"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:2313
+msgctxt "notebookbar_compact|fileb"
+msgid "_File"
+msgstr ""
 
-#: notebookbar.ui:968
-msgctxt "notebookbar|increaseindent|tooltip_text"
-msgid "Increase Indent"
-msgstr "Cynyddu Mewnoliad"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:2332
+msgctxt "notebookbar_compact|fileb"
+msgid "_Help"
+msgstr ""
 
-#: notebookbar.ui:984
-msgctxt "notebookbar|decreaseindent|tooltip_text"
-msgid "Decrease Indent"
-msgstr "Lleihau Mewnoliad"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:3122
+msgctxt "notebookbar_compact|FileLabel"
+msgid "File"
+msgstr ""
 
-#: notebookbar.ui:1018
-msgctxt "notebookbar|horizontalalignment|tooltip_text"
-msgid "Horizontal Alignment"
-msgstr "Cyfuniad Llorweddol"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:3281
+msgctxt "notebookbar_compact|menub"
+msgid "_Home"
+msgstr ""
 
-#: notebookbar.ui:1497
-msgctxt "notebookbar|ImpressLabel"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:4566
+msgctxt "notebookbar_compact|HomeLabel"
 msgid "Home"
-msgstr "Cartref"
+msgstr ""
 
-#: notebookbar.ui:1618
-msgctxt "notebookbar|InsertAVMedia|tooltip_text"
-msgid "Insert Audio or Video"
-msgstr "Mewnosod Sain neu Fideo"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:5024
+msgctxt "notebookbar|Field"
+msgid "Fiel_d"
+msgstr ""
 
-#: notebookbar.ui:1935
-msgctxt "notebookbar|InsertSymbol"
-msgid "Symbol"
-msgstr "Symbol"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:5529
+msgctxt "notebookbar_compact|menub"
+msgid "_Insert"
+msgstr ""
 
-#: notebookbar.ui:2011
-msgctxt "notebookbar|InsertLabel"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:5613
+msgctxt "notebookbar_compact|InsertLabel"
 msgid "Insert"
-msgstr "Mewnosod"
+msgstr ""
 
-#: notebookbar.ui:2033
-msgctxt "notebookbar|TransitionsLabel"
-msgid "Transitions"
-msgstr "Trawsnewid"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:5642
+msgctxt "notebookbar_compact|reviewb"
+msgid "Pag_e"
+msgstr ""
 
-#: notebookbar.ui:2053
-msgctxt "notebookbar|AnimationLabel"
-msgid "Animation"
-msgstr "Animeiddiad"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:6377
+msgctxt "notebookbar_compact|LayoutLabel"
+msgid "Layout"
+msgstr ""
 
-#: notebookbar.ui:2218
-msgctxt "notebookbar|SlideShowLabel"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:6408
+msgctxt "notebookbar|slideshowb"
+msgid "_Slide Show"
+msgstr ""
+
+#: sd/uiconfig/simpress/ui/notebookbar.ui:7003
+msgctxt "notebookbar_compact|ReferencesLabel"
 msgid "Slide Show"
-msgstr "Sioe Sleidiau"
+msgstr ""
 
-#: notebookbar.ui:2252
-msgctxt "notebookbar|SpellOnline"
-msgid "Auto Spellcheck"
-msgstr "Awto Gwirio Sillafu"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:7031
+msgctxt "notebookbar|reviewb"
+msgid "_Review"
+msgstr ""
 
-#: notebookbar.ui:2354
-msgctxt "notebookbar|ReviewLabel"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:7460
+msgctxt "notebookbar_compact|ReviewLabel"
 msgid "Review"
-msgstr "Adolygu"
+msgstr ""
 
-#: notebookbar.ui:2547
-msgctxt "notebookbar|GridVisible"
-msgid "Grid"
-msgstr "Grid"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:7488
+msgctxt "notebookbar_compact|viewb"
+msgid "_View"
+msgstr ""
 
-#: notebookbar.ui:2737
-msgctxt "notebookbar|ViewLabel"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:8389
+msgctxt "notebookbar_compact|ViewLabel"
 msgid "View"
-msgstr "Golwg"
+msgstr ""
 
-#: notebookbar.ui:2757
-msgctxt "notebookbar|TableLabel"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:9180
+msgctxt "notebookbar_compact|tableT"
+msgid "T_able"
+msgstr ""
+
+#: sd/uiconfig/simpress/ui/notebookbar.ui:9264
+msgctxt "notebookbar_compact|TableLabel"
 msgid "Table"
-msgstr "Tabl"
+msgstr ""
 
-#: notebookbar.ui:3275
-msgctxt "notebookbar|ImageLabel"
+#: sd/uiconfig/simpress/ui/notebookbar.ui:9644
+#: sd/uiconfig/simpress/ui/notebookbar.ui:10702
+msgctxt "notebookbar|Field"
+msgid "Convert"
+msgstr ""
+
+#: sd/uiconfig/simpress/ui/notebookbar.ui:9926
+msgctxt "notebookbar_compact|graphicB"
+msgid "_Graphic"
+msgstr ""
+
+#: sd/uiconfig/simpress/ui/notebookbar.ui:10038
+msgctxt "notebookbar_compact|ImageLabel"
 msgid "Image"
-msgstr "Delwedd"
+msgstr ""
+
+#: sd/uiconfig/simpress/ui/notebookbar.ui:11231
+msgctxt "notebookbar_compact|drab"
+msgid "D_raw"
+msgstr ""
+
+#: sd/uiconfig/simpress/ui/notebookbar.ui:11345
+msgctxt "notebookbar_compact|ShapeLabel"
+msgid "Draw"
+msgstr ""
+
+#: sd/uiconfig/simpress/ui/notebookbar.ui:11377
+msgctxt "notebookbar_compact|referenceb"
+msgid "_Tools"
+msgstr ""
+
+#: sd/uiconfig/simpress/ui/notebookbar.ui:12331
+msgctxt "notebookbar_compact|DevLabel"
+msgid "Tools"
+msgstr ""
 
-#: notebookbar_groupedbar_compact.ui:466
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:541
 msgctxt "notebookbar_groupedbar_compact|menubarD1"
 msgid "Menubar"
 msgstr "Bar Dewis"
 
-#: notebookbar_groupedbar_compact.ui:1884
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:2195
 msgctxt "notebookbar_groupedbar_compact|menubarD"
 msgid "Menubar"
 msgstr "Bar Dewis"
 
-#: notebookbar_groupedbar_compact.ui:2575
-msgctxt "notebookbar_groupedbar_compact|fileb"
-msgid "_File"
-msgstr "_Ffeil"
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:2973
+msgctxt "notebookbar_groupedbar_compact|menub"
+msgid "_Menu"
+msgstr "­_Dewislen"
+
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3029
+msgctxt "notebookbar_groupedbar_compact|toolsb"
+msgid "_Tools"
+msgstr "_Offer"
 
-#: notebookbar_groupedbar_compact.ui:2714
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3141
 msgctxt "notebookbar_groupedbar_compact|editb"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: notebookbar_groupedbar_compact.ui:2884
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3284
+msgctxt "notebookbar_groupedbar_compact|fileb"
+msgid "_File"
+msgstr "_Ffeil"
+
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3444
 msgctxt "notebookbar_groupedbar_compact|reviewb"
 msgid "_Slide Show"
 msgstr "_Sioe Sleidiau"
 
-#: notebookbar_groupedbar_compact.ui:3012
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3573
 msgctxt "notebookbar_groupedbar_compact|paragraphstylet"
 msgid "S_lide"
 msgstr "S_leid"
 
-#: notebookbar_groupedbar_compact.ui:3163
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3725
 msgctxt "notebookbar_groupedbar_compact|insertText"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_compact.ui:3332
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3898
 msgctxt "notebookbar_groupedbar_compact|draw"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_groupedbar_compact.ui:3616
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4189
 msgctxt "notebookbar_groupedbar_compact|viewb"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_compact.ui:3767
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4777
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4344
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5372
 msgctxt "notebookbar_groupedbar_compact|reviewb"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_groupedbar_compact.ui:3906
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4487
 msgctxt "notebookbar_groupedbar_compact|slideshowf"
 msgid "_Slide Show"
 msgstr "_Sioe Sleidiau"
 
-#: notebookbar_groupedbar_compact.ui:4071
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5079
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4653
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5679
 msgctxt "notebookbar_groupedbar_compact|formatt"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: notebookbar_groupedbar_compact.ui:4321
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5329
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4904
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5930
 msgctxt "notebookbar_groupedbar_compact|paragrapht"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: notebookbar_groupedbar_compact.ui:4492
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5079
 msgctxt "notebookbar_groupedbar_compact|insertTextO"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_compact.ui:4626
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5217
 msgctxt "notebookbar_groupedbar_compact|viewT"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_compact.ui:4914
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5513
 msgctxt "notebookbar_groupedbar_compact|slideshowb"
 msgid "_Slide Show"
 msgstr "_Sioe Sleidiau"
 
-#: notebookbar_groupedbar_compact.ui:5479
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6084
 msgctxt "notebookbar_groupedbar_compact|rowscolumnst"
 msgid "R_ows"
 msgstr "_Rhesi"
 
-#: notebookbar_groupedbar_compact.ui:5795
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6407
 msgctxt "notebookbar_groupedbar_compact|calculatet"
 msgid "_Calc"
 msgstr "_Calc"
 
-#: notebookbar_groupedbar_compact.ui:5987
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6603
 msgctxt "notebookbar_groupedbar_compact|editdrawb"
 msgid "St_yles"
 msgstr "_Arddulliau"
 
-#: notebookbar_groupedbar_compact.ui:6214
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6831
 msgctxt "notebookbar_groupedbar_compact|drawb"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_groupedbar_compact.ui:6585
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7206
 msgctxt "notebookbar_groupedbar_compact|viewDrawb"
 msgid "Grou_p"
 msgstr "Grŵ_p"
 
-#: notebookbar_groupedbar_compact.ui:6694
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7319
 msgctxt "notebookbar_groupedbar_compact|GridO"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_compact.ui:6836
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7465
 msgctxt "notebookbar_groupedbar_compact|3Db"
 msgid "3_D"
 msgstr "3_D"
 
-#: notebookbar_groupedbar_compact.ui:7008
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7641
 msgctxt "notebookbar_groupedbar_compact|graphicB"
 msgid "_Graphic"
 msgstr "_Graffig"
 
-#: notebookbar_groupedbar_compact.ui:7123
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7757
 msgctxt "notebookbar_groupedbar_compact|colorb"
 msgid "C_olor"
 msgstr "L_liw"
 
-#: notebookbar_groupedbar_compact.ui:7596
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8350
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8237
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9003
 msgctxt "notebookbar_groupedbar_compact|GridB"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_compact.ui:7732
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8377
 msgctxt "notebookbar_groupedbar_compact|slideshowOLE"
 msgid "_Slide Show"
 msgstr "_Sioe Sleidiau"
 
-#: notebookbar_groupedbar_compact.ui:7957
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8603
 msgctxt "notebookbar_groupedbar_compact|oleB"
 msgid "F_rame"
 msgstr "_Ffrâm"
 
-#: notebookbar_groupedbar_compact.ui:8484
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9141
 msgctxt "notebookbar_groupedbar_compact|viewOLE"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_compact.ui:8663
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9324
 msgctxt "notebookbar_groupedbar_compact|oleB"
 msgid "_Master Page"
 msgstr "_Prif Dudalen"
 
-#: notebookbar_groupedbar_compact.ui:8808
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9470
 msgctxt "notebookbar_groupedbar_compact|insertTextb"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_compact.ui:9016
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9682
 msgctxt "notebookbar_groupedbar_compact|drawMaster"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_groupedbar_compact.ui:9391
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:10064
 msgctxt "notebookbar_groupedbar_compact|viewMaster"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_compact.ui:9526
-msgctxt "notebookbar_groupedbar_compact|menub"
-msgid "_Menu"
-msgstr "­_Dewislen"
-
-#: notebookbar_groupedbar_compact.ui:9581
-msgctxt "notebookbar_groupedbar_compact|toolsb"
-msgid "_Tools"
-msgstr "_Offer"
-
-#: notebookbar_groupedbar_full.ui:2372
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:2372
 msgctxt "notebookbar_groupedbar_full|menubarD"
 msgid "Menubar"
 msgstr "Bar Dewis"
 
-#: notebookbar_groupedbar_full.ui:2541
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:2534
 msgctxt "notebookbar_groupedbar_full|Quotation2"
 msgid "Quotation"
 msgstr "Dyfynnu"
 
-#: notebookbar_groupedbar_full.ui:3227
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:3202
+msgctxt "notebookbar_groupedbar_full|menub"
+msgid "_Menu"
+msgstr "­_Dewislen"
+
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:3255
+msgctxt "notebookbar_groupedbar_full|toolsb"
+msgid "_Tools"
+msgstr "_Offer"
+
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:3310
+msgctxt "notebookbar_groupedbar_full|helpb"
+msgid "_Help"
+msgstr "_Cymorth"
+
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:3418
 msgctxt "notebookbar_groupedbar_full|fileb"
 msgid "_File"
 msgstr "_Ffeil"
 
-#: notebookbar_groupedbar_full.ui:3449
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:3656
 msgctxt "notebookbar_groupedbar_full|editb"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: notebookbar_groupedbar_full.ui:3608
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:3816
 msgctxt "notebookbar_groupedbar_full|slideshowb"
 msgid "_Slide Show"
 msgstr "_Sioe Sleidiau"
 
-#: notebookbar_groupedbar_full.ui:3805
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:4014
 msgctxt "notebookbar_groupedbar_full|paragraphstylet"
 msgid "S_lide"
 msgstr "_Sleid"
 
-#: notebookbar_groupedbar_full.ui:3956
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:4166
 msgctxt "notebookbar_groupedbar_full|insertText"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_full.ui:4302
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:4516
 msgctxt "notebookbar_groupedbar_full|draw"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_groupedbar_full.ui:4486
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:4704
 msgctxt "notebookbar_groupedbar_full|viewb"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:4632
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:6202
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:4854
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:6446
 msgctxt "notebookbar_groupedbar_full|reviewb"
 msgid "_Review"
 msgstr "_Adolygu"
 
-#: notebookbar_groupedbar_full.ui:4920
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:8526
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:9790
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:11217
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:12467
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:5146
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:8797
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:10082
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:11526
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:12797
 msgctxt "notebookbar_groupedbar_full|arrangedrawb"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: notebookbar_groupedbar_full.ui:5075
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:5305
 msgctxt "notebookbar_groupedbar_full|slideshowt"
 msgid "_Slide Show"
 msgstr "_Sioe Sleidiau"
 
-#: notebookbar_groupedbar_full.ui:5327
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:6592
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:5558
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:6841
 msgctxt "notebookbar_groupedbar_full|formatd"
 msgid "F_ormat"
 msgstr "Ff_ormat"
 
-#: notebookbar_groupedbar_full.ui:5651
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:6918
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:5883
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:7168
 msgctxt "notebookbar_groupedbar_full|paragraphTextb"
 msgid "_Paragraph"
 msgstr "_Paragraff"
 
-#: notebookbar_groupedbar_full.ui:5894
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:6130
 msgctxt "notebookbar_groupedbar_full|insertTextt"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_full.ui:6056
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:6296
 msgctxt "notebookbar_groupedbar_full|viewt"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:6339
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:6587
 msgctxt "notebookbar_groupedbar_full|slideshowtt"
 msgid "_Slide Show"
 msgstr "_Sioe Sleidiau"
 
-#: notebookbar_groupedbar_full.ui:7097
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:7351
 msgctxt "notebookbar_groupedbar_full|tabled"
 msgid "T_able"
 msgstr "_Tabl"
 
-#: notebookbar_groupedbar_full.ui:7362
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:7620
 msgctxt "notebookbar_groupedbar_full|rowscolumnst"
 msgid "R_ows"
 msgstr "_Rhesi"
 
-#: notebookbar_groupedbar_full.ui:7482
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:7744
 msgctxt "notebookbar_groupedbar_full|calculatet"
 msgid "_Calc"
 msgstr "_Calc"
 
-#: notebookbar_groupedbar_full.ui:7818
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:8084
 msgctxt "notebookbar_groupedbar_full|drawb"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_groupedbar_full.ui:8114
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:8381
 msgctxt "notebookbar_groupedbar_full|editdrawb"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: notebookbar_groupedbar_full.ui:8677
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:9941
-#: /home/cl/vc/git/libo-core/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:11368
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:8952
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:10237
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:11681
 msgctxt "notebookbar_groupedbar_full|GridDrawB"
 msgid "_Grid"
 msgstr "_Grid"
 
-#: notebookbar_groupedbar_full.ui:8819
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:9098
 msgctxt "notebookbar_groupedbar_full|viewDrawb"
 msgid "Grou_p"
 msgstr "Grŵ_p"
 
-#: notebookbar_groupedbar_full.ui:8958
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:9241
 msgctxt "notebookbar_groupedbar_full|3Db"
 msgid "3_D"
 msgstr "3_D"
 
-#: notebookbar_groupedbar_full.ui:9216
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:9503
 msgctxt "notebookbar_groupedbar_full|graphicB"
 msgid "_Graphic"
 msgstr "_Graffig"
 
-#: notebookbar_groupedbar_full.ui:9387
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:9675
 msgctxt "notebookbar_groupedbar_full|colorb"
 msgid "C_olor"
 msgstr "_Lliw"
 
-#: notebookbar_groupedbar_full.ui:10344
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:10644
 msgctxt "notebookbar_groupedbar_full|media"
 msgid "_Media"
 msgstr "_Cyfrwng"
 
-#: notebookbar_groupedbar_full.ui:10520
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:10824
 msgctxt "notebookbar_groupedbar_full|slideshowOLE"
 msgid "_Slide Show"
 msgstr "_Sioe Sleidiau"
 
-#: notebookbar_groupedbar_full.ui:10805
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:11110
 msgctxt "notebookbar_groupedbar_full|editdrawb"
 msgid "F_rame"
 msgstr "_Ffrâm"
 
-#: notebookbar_groupedbar_full.ui:11514
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:11831
 msgctxt "notebookbar_groupedbar_full|viewtOLE"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:11674
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:11995
 msgctxt "notebookbar_groupedbar_full|oleB"
 msgid "_Master Page"
 msgstr "_Prif Dudalen"
 
-#: notebookbar_groupedbar_full.ui:11912
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:12234
 msgctxt "notebookbar_groupedbar_full|insertTextm"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: notebookbar_groupedbar_full.ui:12141
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:12467
 msgctxt "notebookbar_groupedbar_full|drawm"
 msgid "D_raw"
 msgstr "_Lluniadu"
 
-#: notebookbar_groupedbar_full.ui:12629
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui:12963
 msgctxt "notebookbar_groupedbar_full|masterviewm"
 msgid "_View"
 msgstr "_Golwg"
 
-#: notebookbar_groupedbar_full.ui:12749
-msgctxt "notebookbar_groupedbar_full|menub"
-msgid "_Menu"
-msgstr "­_Dewislen"
-
-#: notebookbar_groupedbar_full.ui:12801
-msgctxt "notebookbar_groupedbar_full|toolsb"
-msgid "_Tools"
-msgstr "_Offer"
-
-#: notebookbar_groupedbar_full.ui:12855
-msgctxt "notebookbar_groupedbar_full|helpb"
-msgid "_Help"
-msgstr "_Cymorth"
-
-#: notebookbar_groups.ui:49
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:49
 msgctxt "notebookbar_groups|layout01"
 msgid "Blank"
 msgstr "Gwag"
 
-#: notebookbar_groups.ui:57
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:57
 msgctxt "notebookbar_groups|layout02"
 msgid "Title Slide"
 msgstr "Teitl Sleid"
 
-#: notebookbar_groups.ui:65
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:65
 msgctxt "notebookbar_groups|layout03"
 msgid "Title, Text"
 msgstr "Teitl, Testun"
 
-#: notebookbar_groups.ui:73
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:73
 msgctxt "notebookbar_groups|layout04"
 msgid "Title, Content"
 msgstr "Teitl, Cynnwys"
 
-#: notebookbar_groups.ui:81
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:81
 msgctxt "notebookbar_groups|layout05"
 msgid "Centered Text"
 msgstr "Testun wedi ei Ganoli"
 
-#: notebookbar_groups.ui:104
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:104
 msgctxt "notebookbar_groups|hyperlink"
 msgid "Hyperlink"
 msgstr "Dolen"
 
-#: notebookbar_groups.ui:118
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:118
 msgctxt "notebookbar_groups|footnote"
 msgid "Footnote"
 msgstr "Troednodyn"
 
-#: notebookbar_groups.ui:127
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:127
 msgctxt "notebookbar_groups|endnote"
 msgid "Endnote"
 msgstr "Diweddnod"
 
-#: notebookbar_groups.ui:142
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:142
 msgctxt "notebookbar_groups|bookmark"
 msgid "Bookmark"
 msgstr "Nod Tudalen"
 
-#: notebookbar_groups.ui:151
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:151
 msgctxt "notebookbar_groups|crossreference"
 msgid "Cross-Reference"
 msgstr "Croes Gyfeirio"
 
-#: notebookbar_groups.ui:168
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:168
 msgctxt "notebookbar_groups|master01"
 msgid "Master 1"
 msgstr "Meistr 1"
 
-#: notebookbar_groups.ui:177
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:177
 msgctxt "notebookbar_groups|master02"
 msgid "Master 2"
 msgstr "Meistr 2"
 
-#: notebookbar_groups.ui:257
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:257
 msgctxt "notebookbar_groups|shapestyledefault"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: notebookbar_groups.ui:265
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:265
 msgctxt "notebookbar_groups|shapestylenofill"
 msgid "No Fill"
 msgstr "Dim Llanw"
 
-#: notebookbar_groups.ui:273
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:273
 msgctxt "notebookbar_groups|shapestyleshadow"
 msgid "With Shadow"
 msgstr "Gyda Chysgod"
 
-#: notebookbar_groups.ui:287
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:287
 msgctxt "notebookbar_groups|shapestyletitle1"
 msgid "Title 1"
 msgstr "Teitl 1"
 
-#: notebookbar_groups.ui:295
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:295
 msgctxt "notebookbar_groups|shapestyletitle2"
 msgid "Title 2"
 msgstr "Teitl 2"
 
-#: notebookbar_groups.ui:489
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:494
 msgctxt "notebookbar_groups|filegrouplabel"
 msgid "File"
 msgstr "Ffeil"
 
-#: notebookbar_groups.ui:642
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:650
 msgctxt "notebookbar_groups|clipboardgrouplabel"
 msgid "Clipboard"
 msgstr "Clipfwrdd"
 
-#: notebookbar_groups.ui:688
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:696
 msgctxt "notebookbar_groups|shapestyleb"
 msgid "Style"
 msgstr "Arddull"
 
-#: notebookbar_groups.ui:849
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:858
 msgctxt "notebookbar_groups|growb"
 msgid " "
 msgstr " "
 
-#: notebookbar_groups.ui:871
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:881
 msgctxt "notebookbar_groups|shrinkb"
 msgid " "
 msgstr " "
 
-#: notebookbar_groups.ui:1201
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1218
 msgctxt "notebookbar_groups|formatgrouplabel"
 msgid "Text"
 msgstr "Testun"
 
-#: notebookbar_groups.ui:1251
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1268
 msgctxt "notebookbar_groups|startshowb"
 msgid "Start"
 msgstr "Cychwyn"
 
-#: notebookbar_groups.ui:1275
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1293
 msgctxt "notebookbar_groups|masterb"
 msgid "Master"
 msgstr "Meistr"
 
-#: notebookbar_groups.ui:1293
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1312
 msgctxt "notebookbar_groups|layoutb"
 msgid "Layout"
 msgstr "Cynllun"
 
-#: notebookbar_groups.ui:1323
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1343
 msgctxt "notebookbar_groups|animationb"
 msgid "Animation"
 msgstr "Animeiddiad"
 
-#: notebookbar_groups.ui:1340
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1361
 msgctxt "notebookbar_groups|transitionb"
 msgid "Transition"
 msgstr "Trawsnewid"
 
-#: notebookbar_groups.ui:1386
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1408
 msgctxt "notebookbar_groups|slidegrouplabel"
 msgid "Slide"
 msgstr "Sleid"
 
-#: notebookbar_groups.ui:1460
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1482
 msgctxt "notebookbar_groups|shapesb"
 msgid "Shapes"
 msgstr "Siapiau"
 
-#: notebookbar_groups.ui:1476
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1498
 msgctxt "notebookbar_groups|linksb"
 msgid "Links"
 msgstr "Cysylltiadau"
 
-#: notebookbar_groups.ui:1584
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1610
 msgctxt "notebookbar_groups|insertgrouplabel"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: notebookbar_groups.ui:1620
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1646
 msgctxt "notebookbar_groups|imagestyleb"
 msgid "Style"
 msgstr "Arddull"
 
-#: notebookbar_groups.ui:1659
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1687
 msgctxt "notebookbar_groups|resetb"
 msgid "Reset"
 msgstr "Ailosod"
 
-#: notebookbar_groups.ui:1703
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1733
 msgctxt "notebookbar_groups|wrapb"
 msgid "Wrap"
 msgstr "Amlapio"
 
-#: notebookbar_groups.ui:1718
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1749
 msgctxt "notebookbar_groups|lockb"
 msgid "Lock"
 msgstr "Cloi"
 
-#: notebookbar_groups.ui:1762
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1794
 msgctxt "notebookbar_groups|imagegrouplabel"
 msgid "Image"
 msgstr "Delwedd"
 
-#: notebookbar_groups.ui:1818
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1850
 msgctxt "notebookbar_groups|wrapoff"
 msgid "None"
 msgstr "Dim"
 
-#: notebookbar_groups.ui:1827
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1859
 msgctxt "notebookbar_groups|wrapideal"
 msgid "Optimal"
 msgstr "Gorau"
 
-#: notebookbar_groups.ui:1836
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1868
 msgctxt "notebookbar_groups|wrapon"
 msgid "Parallel"
 msgstr "Paralel"
 
-#: notebookbar_groups.ui:1845
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1877
 msgctxt "notebookbar_groups|wrapleft"
 msgid "Before"
 msgstr "Cynt"
 
-#: notebookbar_groups.ui:1854
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1886
 msgctxt "notebookbar_groups|wrapright"
 msgid "After"
 msgstr "Wedi"
 
-#: notebookbar_groups.ui:1863
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1895
 msgctxt "notebookbar_groups|wrapthrough"
 msgid "Through"
 msgstr "Parhau"
 
-#: notebookbar_groups.ui:1878
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1910
 msgctxt "notebookbar_groups|wrapcontour"
 msgid "Contour"
 msgstr "Amlinell"
 
-#: notebookbar_groups.ui:1887
+#: sd/uiconfig/simpress/ui/notebookbar_groups.ui:1919
 msgctxt "notebookbar_groups|contourdialog"
 msgid "Edit Contour"
 msgstr "Golygu'r Amlinell"
 
-#: optimpressgeneralpage.ui:40
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:40
 msgctxt "optimpressgeneralpage|qickedit"
 msgid "Allow quick editing"
 msgstr "Caniatáu golygu cyflym"
 
-#: optimpressgeneralpage.ui:56
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:56
 msgctxt "optimpressgeneralpage|textselected"
-msgid "Only text area selected"
-msgstr "Dim ond ardal testun wedi eu dewis"
+msgid "Only text area selectable"
+msgstr "Dim ond yr ardal testun y mae modd ei ddewis"
 
-#: optimpressgeneralpage.ui:79
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:79
 msgctxt "optimpressgeneralpage|label2"
 msgid "Text Objects"
 msgstr "Gwrthrychau Testun"
 
-#: optimpressgeneralpage.ui:113
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:113
 msgctxt "optimpressgeneralpage|startwithwizard"
 msgid "Start with _Template Selection"
 msgstr "Cychwyn gyda Dewis _Templed"
 
-#: optimpressgeneralpage.ui:134
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:134
 msgctxt "optimpressgeneralpage|newdoclbl"
 msgid "New Document"
 msgstr "Dogfen Newydd"
 
-#: optimpressgeneralpage.ui:170
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:170
 msgctxt "optimpressgeneralpage|copywhenmove"
 msgid "Copy when moving"
 msgstr "Copïo wrth symud"
 
-#: optimpressgeneralpage.ui:193
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:193
 msgctxt "optimpressgeneralpage|label6"
 msgid "Unit of _measurement:"
 msgstr "Uned _mesur:"
 
-#: optimpressgeneralpage.ui:230
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:230
 msgctxt "optimpressgeneralpage|tapstoplabel"
 msgid "Ta_b stops:"
 msgstr "Stopiau _tab:"
 
-#: optimpressgeneralpage.ui:262
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:261
 msgctxt "optimpressgeneralpage|objalwymov"
 msgid "Objects always moveable"
 msgstr "Gwrthrychau'n symudol bob tro"
 
-#: optimpressgeneralpage.ui:277
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:276
 msgctxt "optimpressgeneralpage|distrotcb"
 msgid "Do not distort objects in curve"
 msgstr "Peidio aflunio gwrthrychau mewn cromlin"
 
-#: optimpressgeneralpage.ui:293
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:292
 msgctxt "optimpressgeneralpage|backgroundback"
 msgid "Use background cache"
 msgstr "Defnyddio storfa gefndir"
 
-#: optimpressgeneralpage.ui:315
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:314
 msgctxt "optimpressgeneralpage|label4"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: optimpressgeneralpage.ui:350
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:349
 msgctxt "optimpressgeneralpage|enremotcont"
 msgid "Enable remote control"
 msgstr "Galluogi rheolaeth bell"
 
-#: optimpressgeneralpage.ui:365
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:364
 msgctxt "optimpressgeneralpage|enprsntcons"
 msgid "Enable Presenter Console"
 msgstr "Galluogi'r Consol Cyflwyno"
 
-#: optimpressgeneralpage.ui:386
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:385
 msgctxt "optimpressgeneralpage|label7"
 msgid "Presentation"
 msgstr "Cyflwyniad"
 
-#: optimpressgeneralpage.ui:425
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:424
 msgctxt "optimpressgeneralpage|label8"
 msgid "_Drawing scale:"
 msgstr "_Graddfa lluniadu:"
 
-#: optimpressgeneralpage.ui:439
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:438
 msgctxt "optimpressgeneralpage|widthlbl"
 msgid "Page _width:"
 msgstr "_Lled tudalen:"
 
-#: optimpressgeneralpage.ui:453
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:452
 msgctxt "optimpressgeneralpage|heightlbl"
 msgid "Page _height:"
 msgstr "_Uchder tudalen:"
 
-#: optimpressgeneralpage.ui:575
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:569
 msgctxt "optimpressgeneralpage|label5"
 msgid "Scale"
 msgstr "Graddfa"
 
-#: optimpressgeneralpage.ui:607
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:601
 msgctxt "optimpressgeneralpage|printermetrics"
 msgid "Us_e printer metrics for document formatting"
 msgstr "_Defnyddio metrics yr argraffydd i fformatio'r ddogfen"
 
-#: optimpressgeneralpage.ui:622
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:616
 msgctxt "optimpressgeneralpage|cbCompatibility"
 msgid "Add _spacing between paragraphs and tables"
 msgstr "Ychwanegu _bylchu rhwng paragraffau a thablau"
 
-#: optimpressgeneralpage.ui:645
+#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:639
 msgctxt "optimpressgeneralpage|label1"
 msgid "Compatibility"
 msgstr "Cydweddiad"
 
-#: photoalbum.ui:18
+#: sd/uiconfig/simpress/ui/photoalbum.ui:18
 msgctxt "photoalbum|liststore2"
 msgid "1 Image"
 msgstr "1 Delwedd"
 
-#: photoalbum.ui:21
+#: sd/uiconfig/simpress/ui/photoalbum.ui:21
 msgctxt "photoalbum|liststore2"
 msgid "2 Images"
 msgstr "2 Ddelwedd"
 
-#: photoalbum.ui:24
+#: sd/uiconfig/simpress/ui/photoalbum.ui:24
 msgctxt "photoalbum|liststore2"
 msgid "4 Images"
 msgstr "4 Ddelwedd"
 
-#: photoalbum.ui:31
+#: sd/uiconfig/simpress/ui/photoalbum.ui:31
 msgctxt "photoalbum|PhotoAlbumCreatorDialog"
 msgid "Create Photo Album"
 msgstr "Creu Albwm Lluniau"
 
-#: photoalbum.ui:60
+#: sd/uiconfig/simpress/ui/photoalbum.ui:60
 msgctxt "photoalbum|create_btn"
 msgid "Insert Slides"
 msgstr "Mewnosod Sleidiau"
 
-#: photoalbum.ui:169
+#: sd/uiconfig/simpress/ui/photoalbum.ui:169
 msgctxt "photoalbum|rem_btn|tooltip_text"
 msgid "Remove Image from List"
 msgstr "Tynnu Delwedd o'r Rhestr"
 
-#: photoalbum.ui:185
+#: sd/uiconfig/simpress/ui/photoalbum.ui:185
 msgctxt "photoalbum|up_btn|tooltip_text"
 msgid "Move Image Up"
 msgstr "Symud Delwedd i Fyny"
 
-#: photoalbum.ui:201
+#: sd/uiconfig/simpress/ui/photoalbum.ui:201
 msgctxt "photoalbum|down_btn|tooltip_text"
 msgid "Move Image Down"
 msgstr "Symud Delwedd i Lawr"
 
-#: photoalbum.ui:277
+#: sd/uiconfig/simpress/ui/photoalbum.ui:277
 msgctxt "photoalbum|label2"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: photoalbum.ui:306
+#: sd/uiconfig/simpress/ui/photoalbum.ui:306
 msgctxt "photoalbum|label7"
 msgid "Slide layout:"
 msgstr "Cynllun sleid:"
 
-#: photoalbum.ui:344
+#: sd/uiconfig/simpress/ui/photoalbum.ui:344
 msgctxt "photoalbum|cap_check"
 msgid "Add caption to each slide"
 msgstr "Ychwanegu egluryn i bob sleid"
 
-#: photoalbum.ui:359
+#: sd/uiconfig/simpress/ui/photoalbum.ui:360
 msgctxt "photoalbum|asr_check"
 msgid "Keep aspect ratio"
 msgstr "Cadw cymhareb agwedd"
 
-#: photoalbum.ui:375
+#: sd/uiconfig/simpress/ui/photoalbum.ui:377
 msgctxt "photoalbum|asr_check_crop"
 msgid "Fill Screen"
 msgstr "Llenwi'r Sgrin"
 
-#: photoalbum.ui:390
+#: sd/uiconfig/simpress/ui/photoalbum.ui:393
 msgctxt "photoalbum|insert_as_link_check"
 msgid "Link images"
 msgstr "Cysylltu delweddau"
 
-#: presentationdialog.ui:8
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:8
 msgctxt "presentationdialog|PresentationDialog"
 msgid "Slide Show Settings"
 msgstr "Gosodiadau Sioe Tryloywder"
 
-#: presentationdialog.ui:49
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:49
 msgctxt "presentationdialog|from"
 msgid "_From:"
 msgstr "_O:"
 
-#: presentationdialog.ui:76
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:76
 msgctxt "presentationdialog|from_cb-atkobject"
 msgid "Starting slide"
 msgstr "Sleid Gychwynnol"
 
-#: presentationdialog.ui:93
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:93
 msgctxt "presentationdialog|allslides"
 msgid "All _slides"
 msgstr "_Pob sleid"
 
-#: presentationdialog.ui:110
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:110
 msgctxt "presentationdialog|customslideshow"
 msgid "_Custom slide show:"
 msgstr "Sioe sleidiau c_yfaddas:"
 
-#: presentationdialog.ui:150
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:150
 msgctxt "presentationdialog|label1"
 msgid "Range"
 msgstr "Ystod"
 
-#: presentationdialog.ui:205
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:205
 msgctxt "presentationdialog|presdisplay_label"
 msgid "P_resentation display:"
 msgstr "_Arddangos cyflwyniad:"
 
-#: presentationdialog.ui:226
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:226
 msgctxt "presentationdialog|externalmonitor_str"
 msgid "Display %1 (external)"
 msgstr "Dangosydd %1 (allanol)"
 
-#: presentationdialog.ui:236
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:236
 msgctxt "presentationdialog|monitor_str"
 msgid "Display %1"
 msgstr "Dangos %1"
 
-#: presentationdialog.ui:246
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:246
 msgctxt "presentationdialog|allmonitors_str"
 msgid "All displays"
 msgstr "Pob dangosydd"
 
-#: presentationdialog.ui:256
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:256
 msgctxt "presentationdialog|external_str"
 msgid "Auto External (Display %1)"
 msgstr "Awto Allannol (Dangosydd %1)"
 
-#: presentationdialog.ui:277
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:277
 msgctxt "presentationdialog|label3"
 msgid "Multiple Displays"
 msgstr "Dangosyddion Lluosog"
 
-#: presentationdialog.ui:317
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:317
 msgctxt "presentationdialog|default"
 msgid "F_ull screen"
 msgstr "_Sgrin Lawn"
 
-#: presentationdialog.ui:334
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:334
 msgctxt "presentationdialog|window"
 msgid "In a _window"
 msgstr "Mewn _ffenestr"
 
-#: presentationdialog.ui:350
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:350
 msgctxt "presentationdialog|auto"
 msgid "_Loop and repeat after:"
 msgstr "C_ylchdroi ac ailadrodd ar ôl:"
 
-#: presentationdialog.ui:369
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:369
 msgctxt "presentationdialog|showlogo"
 msgid "Show _logo"
 msgstr "Dangos _logo"
 
-#: presentationdialog.ui:388
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:388
 msgctxt "presentationdialog|pauseduration|tooltip_text"
 msgid "Duration of pause"
 msgstr "Hyd yr oedi"
 
-#: presentationdialog.ui:395
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:395
 msgctxt "presentationdialog|pauseduration-atkobject"
 msgid "Pause Duration"
 msgstr "Cyfnod Oedi"
 
-#: presentationdialog.ui:412
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:412
 msgctxt "presentationdialog|label2"
 msgid "Presentation Mode"
 msgstr "Modd Cyflwyno"
 
-#: presentationdialog.ui:447
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:447
 msgctxt "presentationdialog|manualslides"
 msgid "Change slides _manually"
 msgstr "_Newid sleidiau gyda llaw"
 
-#: presentationdialog.ui:462
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:462
 msgctxt "presentationdialog|pointervisible"
 msgid "Mouse pointer _visible"
 msgstr "Pwyntiwr llygoden yn _weladwy"
 
-#: presentationdialog.ui:477
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:477
 msgctxt "presentationdialog|pointeraspen"
 msgid "Mouse pointer as _pen"
 msgstr "Pwyntiwr llygoden fel _ysgrifbin"
 
-#: presentationdialog.ui:492
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:492
 msgctxt "presentationdialog|animationsallowed"
 msgid "_Animations allowed"
 msgstr "_Caniatáu animeiddio"
 
-#: presentationdialog.ui:507
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:507
 msgctxt "presentationdialog|changeslidesbyclick"
 msgid "Change slides by clic_king on background"
 msgstr "_Newid sleidiau drwy glicio ar y cefndir"
 
-#: presentationdialog.ui:522
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:522
 msgctxt "presentationdialog|alwaysontop"
 msgid "Presentation always _on top"
 msgstr "Cyflwyniad ar y _brig"
 
-#: presentationdialog.ui:543
+#: sd/uiconfig/simpress/ui/presentationdialog.ui:543
 msgctxt "presentationdialog|label4"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: prntopts.ui:37
+#: sd/uiconfig/simpress/ui/prntopts.ui:37
 msgctxt "prntopts|pagenmcb"
 msgid "_Page name"
 msgstr "_Enw tudalen"
 
-#: prntopts.ui:54
+#: sd/uiconfig/simpress/ui/prntopts.ui:54
 msgctxt "prntopts|datecb"
 msgid "D_ate"
 msgstr "_Dyddiad"
 
-#: prntopts.ui:71
+#: sd/uiconfig/simpress/ui/prntopts.ui:71
 msgctxt "prntopts|timecb"
 msgid "Ti_me"
 msgstr "_Amser"
 
-#: prntopts.ui:88
+#: sd/uiconfig/simpress/ui/prntopts.ui:88
 msgctxt "prntopts|hiddenpgcb"
 msgid "H_idden pages"
 msgstr "_Tudalennau cudd"
 
-#: prntopts.ui:111
+#: sd/uiconfig/simpress/ui/prntopts.ui:111
 msgctxt "prntopts|printlbl"
 msgid "Print"
 msgstr "Argraffu"
 
-#: prntopts.ui:145
+#: sd/uiconfig/simpress/ui/prntopts.ui:145
 msgctxt "prntopts|pagedefaultrb"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: prntopts.ui:163
+#: sd/uiconfig/simpress/ui/prntopts.ui:164
 msgctxt "prntopts|fittopgrb"
 msgid "_Fit to page"
 msgstr "_Ffitio i'r dudalen"
 
-#: prntopts.ui:181
+#: sd/uiconfig/simpress/ui/prntopts.ui:182
 msgctxt "prntopts|tilepgrb"
 msgid "_Tile pages"
 msgstr "_Teilio tudalennau"
 
-#: prntopts.ui:199
+#: sd/uiconfig/simpress/ui/prntopts.ui:200
 msgctxt "prntopts|brouchrb"
 msgid "B_rochure"
 msgstr "_Llyfryn"
 
-#: prntopts.ui:217
+#: sd/uiconfig/simpress/ui/prntopts.ui:218
 msgctxt "prntopts|papertryfrmprntrcb"
 msgid "Paper tray from printer s_ettings"
 msgstr "Blwch papur o _osodiadau'r argraffydd"
 
-#: prntopts.ui:240
+#: sd/uiconfig/simpress/ui/prntopts.ui:241
 msgctxt "prntopts|frontcb"
 msgid "Fr_ont"
 msgstr "_Blaen"
 
-#: prntopts.ui:259
+#: sd/uiconfig/simpress/ui/prntopts.ui:260
 msgctxt "prntopts|backcb"
 msgid "Ba_ck"
 msgstr "_Cefn"
 
-#: prntopts.ui:293
+#: sd/uiconfig/simpress/ui/prntopts.ui:294
 msgctxt "prntopts|label3"
 msgid "Page Options"
 msgstr "Dewisiadau Tudalen"
 
-#: prntopts.ui:339
+#: sd/uiconfig/simpress/ui/prntopts.ui:340
 msgctxt "prntopts|drawingcb"
 msgid "Drawing"
 msgstr "Lluniadu"
 
-#: prntopts.ui:355
+#: sd/uiconfig/simpress/ui/prntopts.ui:357
 msgctxt "prntopts|notecb"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: prntopts.ui:371
+#: sd/uiconfig/simpress/ui/prntopts.ui:374
 msgctxt "prntopts|handoutcb"
 msgid "Handouts"
 msgstr "Taflenni"
 
-#: prntopts.ui:387
+#: sd/uiconfig/simpress/ui/prntopts.ui:391
 msgctxt "prntopts|outlinecb"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: prntopts.ui:409
+#: sd/uiconfig/simpress/ui/prntopts.ui:414
 msgctxt "prntopts|contentlbl"
 msgid "Content"
 msgstr "Cynnwys"
 
-#: prntopts.ui:442
+#: sd/uiconfig/simpress/ui/prntopts.ui:447
 msgctxt "prntopts|defaultrb"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: prntopts.ui:459
+#: sd/uiconfig/simpress/ui/prntopts.ui:465
 msgctxt "prntopts|grayscalerb"
 msgid "Gra_yscale"
 msgstr "_Graddlwyd"
 
-#: prntopts.ui:477
+#: sd/uiconfig/simpress/ui/prntopts.ui:483
 msgctxt "prntopts|blackwhiterb"
 msgid "Black & _white"
 msgstr "Du a _gwyn"
 
-#: prntopts.ui:501
+#: sd/uiconfig/simpress/ui/prntopts.ui:507
 msgctxt "prntopts|label2"
 msgid "Quality"
 msgstr "Ansawdd"
 
-#: publishingdialog.ui:9
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:9
 msgctxt "publishingdialog|PublishingDialog"
 msgid "HTML Export"
 msgstr "Allforio HTML"
 
-#: publishingdialog.ui:42
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:42
 msgctxt "publishingdialog|newDesignRadiobutton"
 msgid "New _design"
 msgstr "Cynllun _newydd"
 
-#: publishingdialog.ui:61
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:61
 msgctxt "publishingdialog|oldDesignRadiobutton"
 msgid "Existing design"
 msgstr "Cynllun presennol"
 
-#: publishingdialog.ui:109
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:110
 msgctxt "publishingdialog|delDesingButton"
 msgid "Delete Selected Design"
 msgstr "Dileu'r Cynllun Yma"
 
-#: publishingdialog.ui:136
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:137
 msgctxt "publishingdialog|descLabel"
 msgid "Select an existing design or create a new one"
 msgstr "Dewiswch gynllun presennol neu greu un newydd"
 
-#: publishingdialog.ui:155
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:156
 msgctxt "publishingdialog|assignLabel"
 msgid "Assign Design"
 msgstr "Neilltuo Cynllun"
 
-#: publishingdialog.ui:200
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:201
 msgctxt "publishingdialog|ASPRadiobutton"
 msgid "_Active Server Pages (ASP)"
 msgstr "_Tudalennau Gweinydd Gweithredol (ASP)"
 
-#: publishingdialog.ui:218
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:219
 msgctxt "publishingdialog|perlRadiobutton"
 msgid "Perl"
 msgstr "Perl"
 
-#: publishingdialog.ui:250
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:252
 msgctxt "publishingdialog|indexTxtLabel"
 msgid "_URL for listeners:"
 msgstr "_URL ar gyfer gwrandawyr:"
 
-#: publishingdialog.ui:276
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:278
 msgctxt "publishingdialog|URLTxtLabel"
 msgid "URL for _presentation:"
 msgstr "URL ar gyfer _cyflwyniad:"
 
-#: publishingdialog.ui:302
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:304
 msgctxt "publishingdialog|CGITxtLabel"
 msgid "URL for _Perl scripts:"
 msgstr "URL ar gyfer sgriptiau _Perl:"
 
-#: publishingdialog.ui:341
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:343
 msgctxt "publishingdialog|webCastLabel"
 msgid "Webcast"
 msgstr "GweLedu"
 
-#: publishingdialog.ui:376
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:378
 msgctxt "publishingdialog|chgDefaultRadiobutton"
 msgid "_As stated in document"
 msgstr "_Fel nodwyd yn y ddogfen"
 
-#: publishingdialog.ui:394
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:396
 msgctxt "publishingdialog|chgAutoRadiobutton"
 msgid "_Automatic"
 msgstr "_Awtomatig"
 
-#: publishingdialog.ui:431
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:433
 msgctxt "publishingdialog|durationTxtLabel"
 msgid "_Slide view time:"
 msgstr "_Amser gweld sleidiau:"
 
-#: publishingdialog.ui:461
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:463
 msgctxt "publishingdialog|endlessCheckbutton"
 msgid "_Endless"
 msgstr "_Diddiwedd"
 
-#: publishingdialog.ui:494
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:496
 msgctxt "publishingdialog|kioskLabel"
 msgid "Advance Slides"
 msgstr "Sleid Ymlaen"
 
-#: publishingdialog.ui:532
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:534
 msgctxt "publishingdialog|contentCheckbutton"
 msgid "Create title page"
 msgstr "Creu tudalen teitl"
 
-#: publishingdialog.ui:549
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:552
 msgctxt "publishingdialog|notesCheckbutton"
 msgid "Show notes"
 msgstr "Dangos nodiadau"
 
-#: publishingdialog.ui:572
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:576
 msgctxt "publishingdialog|htmlOptionsLabel"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: publishingdialog.ui:663
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:667
 msgctxt "publishingdialog|webCastRadiobutton"
 msgid "_WebCast"
 msgstr "_GweLedu"
 
-#: publishingdialog.ui:680
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:684
 msgctxt "publishingdialog|kioskRadiobutton"
 msgid "_Automatic"
 msgstr "_Awtomatig"
 
-#: publishingdialog.ui:697
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:701
 msgctxt "publishingdialog|singleDocumentRadiobutton"
 msgid "_Single-document HTML"
 msgstr "HTML _dogfen sengl"
 
-#: publishingdialog.ui:714
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:718
 msgctxt "publishingdialog|framesRadiobutton"
 msgid "Standard HTML with _frames"
 msgstr "HTML safonol gyda _fframiau"
 
-#: publishingdialog.ui:731
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:735
 msgctxt "publishingdialog|standardRadiobutton"
 msgid "Standard H_TML format"
 msgstr "Fformat H_TML safonol"
 
-#: publishingdialog.ui:754
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:758
 msgctxt "publishingdialog|publicationLabel"
 msgid "Publication Type"
 msgstr "Math o Gyhoeddiad"
 
-#: publishingdialog.ui:812
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:816
 msgctxt "publishingdialog|pngRadiobutton"
 msgid "_PNG"
 msgstr "_PNG"
 
-#: publishingdialog.ui:831
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:835
 msgctxt "publishingdialog|gifRadiobutton"
 msgid "_GIF"
 msgstr "_GIF"
 
-#: publishingdialog.ui:849
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:853
 msgctxt "publishingdialog|jpgRadiobutton"
 msgid "_JPG"
 msgstr "_JPG"
 
-#: publishingdialog.ui:876
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:880
 msgctxt "publishingdialog|qualityTxtLabel"
 msgid "_Quality:"
 msgstr "_Ansawdd:"
 
-#: publishingdialog.ui:918
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:922
 msgctxt "publishingdialog|saveImgAsLabel"
 msgid "Save Images As"
 msgstr "Cadw'r Ddelweddau Fel"
 
-#: publishingdialog.ui:953
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:957
 msgctxt "publishingdialog|resolution1Radiobutton"
 msgid "Low (_640 × 480 pixels)"
 msgstr "Isel (_640 × 480 picsel)"
 
-#: publishingdialog.ui:972
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:976
 msgctxt "publishingdialog|resolution2Radiobutton"
 msgid "Medium (_800 × 600 pixels)"
 msgstr "Canolig (_800 × 600 picsel)"
 
-#: publishingdialog.ui:990
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:994
 msgctxt "publishingdialog|resolution3Radiobutton"
 msgid "High (_1024 × 768 pixels)"
 msgstr "Uchel (_1024 × 768 picsel)"
 
-#: publishingdialog.ui:1015
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1019
 msgctxt "publishingdialog|monitorResolutionLabel"
 msgid "Monitor Resolution"
 msgstr "Cydraniad Dangosydd"
 
-#: publishingdialog.ui:1055
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1059
 msgctxt "publishingdialog|sldSoundCheckbutton"
 msgid "_Export sounds when slide advances"
 msgstr "_Allforio seiniau pan fydd y sleid yn symud ymlaen"
 
-#: publishingdialog.ui:1073
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1077
 msgctxt "publishingdialog|hiddenSlidesCheckbutton"
 msgid "Export _hidden slides"
 msgstr "Allforio sleidiau _cudd"
 
-#: publishingdialog.ui:1096
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1100
 msgctxt "publishingdialog|effectsLabel"
 msgid "Effects"
 msgstr "Effaith"
 
-#: publishingdialog.ui:1144
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1148
 msgctxt "publishingdialog|authorTxtLabel"
 msgid "_Author:"
 msgstr "_Awdur:"
 
-#: publishingdialog.ui:1169
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1173
 msgctxt "publishingdialog|emailTxtLabel"
 msgid "E-_mail address:"
 msgstr "Cyfeiriad E-_bost:"
 
-#: publishingdialog.ui:1183
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1187
 msgctxt "publishingdialog|wwwTxtLabel"
 msgid "Your hom_epage:"
 msgstr "Eich _tudalen cartref:"
 
-#: publishingdialog.ui:1198
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1202
 msgctxt "publishingdialog|addInformLabel"
 msgid "Additional _information:"
 msgstr "Gwybodaeth _ychwanegol:"
 
-#: publishingdialog.ui:1243
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1247
 msgctxt "publishingdialog|downloadCheckbutton"
 msgid "Link to a copy of the _original presentation"
 msgstr "Cysylltu â chopi o'r cyflwyniad _gwreiddiol"
 
-#: publishingdialog.ui:1266
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1270
 msgctxt "publishingdialog|infTitlePageLabel"
 msgid "Information for the Title Page"
 msgstr "Gwybodaeth ar gyfer y Dudalen Deitl"
 
-#: publishingdialog.ui:1304
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1308
 msgctxt "publishingdialog|textOnlyCheckbutton"
 msgid "_Text only"
 msgstr "_Testun yn unig"
 
-#: publishingdialog.ui:1343
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1347
 msgctxt "publishingdialog|buttonStyleLabel"
 msgid "Select Button Style"
 msgstr "Dewis Botwm Arddull"
 
-#: publishingdialog.ui:1381
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1385
 msgctxt "publishingdialog|docColorsRadiobutton"
 msgid "_Apply color scheme from document"
 msgstr "_Gosod cynllun lliw o ddogfen"
 
-#: publishingdialog.ui:1400
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1404
 msgctxt "publishingdialog|defaultRadiobutton"
 msgid "Use _browser colors"
 msgstr "Defnyddio _lliwiau'r porwr"
 
-#: publishingdialog.ui:1418
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1422
 msgctxt "publishingdialog|userRadiobutton"
 msgid "_Use custom color scheme"
 msgstr "_Defnyddiwch gynllun lliw cyfaddas"
 
-#: publishingdialog.ui:1453
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1457
 msgctxt "publishingdialog|vLinkButton"
 msgid "_Visited Link"
 msgstr "_Cysylltiad Ymwelwyd ag Ef"
 
-#: publishingdialog.ui:1467
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1471
 msgctxt "publishingdialog|aLinkButton"
 msgid "Active Li_nk"
 msgstr "Cyswllt _Gweithredol"
 
-#: publishingdialog.ui:1481
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1485
 msgctxt "publishingdialog|linkButton"
 msgid "Hyper_link"
 msgstr "_Dolen"
 
-#: publishingdialog.ui:1495
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1499
 msgctxt "publishingdialog|textButton"
 msgid "Text"
 msgstr "Testun"
 
-#: publishingdialog.ui:1528
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1532
 msgctxt "publishingdialog|backButton"
 msgid "Bac_kground"
 msgstr "C_efndir"
 
-#: publishingdialog.ui:1559
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1563
 msgctxt "publishingdialog|selectColorLabel"
 msgid "Select Color Scheme"
 msgstr "Dewis Cynllun Lliw"
 
-#: publishingdialog.ui:1607
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1611
 msgctxt "publishingdialog|lastPageButton"
 msgid "< Back"
 msgstr "< Nôl"
 
-#: publishingdialog.ui:1621
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1625
 msgctxt "publishingdialog|nextPageButton"
 msgid "Ne_xt >"
 msgstr "_Nesaf >>"
 
-#: publishingdialog.ui:1638
+#: sd/uiconfig/simpress/ui/publishingdialog.ui:1642
 msgctxt "publishingdialog|finishButton"
 msgid "_Create"
 msgstr "_Creu"
 
-#: remotedialog.ui:9
+#: sd/uiconfig/simpress/ui/remotedialog.ui:9
 msgctxt "remotedialog|RemoteDialog"
 msgid "Impress Remote"
 msgstr "Impress Pell"
 
-#: remotedialog.ui:102
+#: sd/uiconfig/simpress/ui/remotedialog.ui:102
 msgctxt "remotedialog|label1"
 msgid "Connections"
 msgstr "Cysylltiadau"
 
-#: rotatemenu.ui:12
+#: sd/uiconfig/simpress/ui/rotatemenu.ui:12
 msgctxt "rotatemenu|90"
 msgid "Quarter Spin"
 msgstr "Troilli Chwarter"
 
-#: rotatemenu.ui:20
+#: sd/uiconfig/simpress/ui/rotatemenu.ui:20
 msgctxt "rotatemenu|180"
 msgid "Half Spin"
 msgstr "Troilli Hanner"
 
-#: rotatemenu.ui:28
+#: sd/uiconfig/simpress/ui/rotatemenu.ui:28
 msgctxt "rotatemenu|360"
 msgid "Full Spin"
 msgstr "Troilli Cyflawn"
 
-#: rotatemenu.ui:36
+#: sd/uiconfig/simpress/ui/rotatemenu.ui:36
 msgctxt "rotatemenu|720"
 msgid "Two Spins"
 msgstr "Dau Droad"
 
-#: rotatemenu.ui:50
+#: sd/uiconfig/simpress/ui/rotatemenu.ui:50
 msgctxt "rotatemenu|clockwise"
 msgid "Clockwise"
 msgstr "Clocwedd"
 
-#: rotatemenu.ui:58
+#: sd/uiconfig/simpress/ui/rotatemenu.ui:58
 msgctxt "rotatemenu|counterclock"
 msgid "Counter-clockwise"
 msgstr "Gwrth-glocwedd"
 
-#: scalemenu.ui:12
+#: sd/uiconfig/simpress/ui/scalemenu.ui:12
 msgctxt "scalemenu|25"
 msgid "Tiny"
 msgstr "Bach"
 
-#: scalemenu.ui:20
+#: sd/uiconfig/simpress/ui/scalemenu.ui:20
 msgctxt "scalemenu|50"
 msgid "Smaller"
 msgstr "Llai"
 
-#: scalemenu.ui:28
+#: sd/uiconfig/simpress/ui/scalemenu.ui:28
 msgctxt "scalemenu|150"
 msgid "Larger"
 msgstr "Mwy"
 
-#: scalemenu.ui:36
+#: sd/uiconfig/simpress/ui/scalemenu.ui:36
 msgctxt "scalemenu|400"
 msgid "Extra Large"
 msgstr "Mawr Iawn"
 
-#: scalemenu.ui:50
+#: sd/uiconfig/simpress/ui/scalemenu.ui:50
 msgctxt "scalemenu|hori"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: scalemenu.ui:58
+#: sd/uiconfig/simpress/ui/scalemenu.ui:58
 msgctxt "scalemenu|vert"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: scalemenu.ui:66
+#: sd/uiconfig/simpress/ui/scalemenu.ui:66
 msgctxt "scalemenu|both"
 msgid "Both"
 msgstr "Y Ddau"
 
-#: sdviewpage.ui:26
+#: sd/uiconfig/simpress/ui/sdviewpage.ui:26
 msgctxt "sdviewpage|ruler"
 msgid "_Rulers visible"
 msgstr "_Mesuryddion gweladwy"
 
-#: sdviewpage.ui:42
+#: sd/uiconfig/simpress/ui/sdviewpage.ui:42
 msgctxt "sdviewpage|dragstripes"
 msgid "_Helplines while moving"
 msgstr "Llinellau cymorth _wrth symud"
 
-#: sdviewpage.ui:58
+#: sd/uiconfig/simpress/ui/sdviewpage.ui:58
 msgctxt "sdviewpage|handlesbezier"
 msgid "_All control points in Bézier editor"
 msgstr "_Pob pwynt rheoli yng ngolygydd Bézier"
 
-#: sdviewpage.ui:74
+#: sd/uiconfig/simpress/ui/sdviewpage.ui:74
 msgctxt "sdviewpage|moveoutline"
 msgid "_Contour of each individual object"
 msgstr "_Amlinell pob gwrthrych unigol"
 
-#: sdviewpage.ui:96
+#: sd/uiconfig/simpress/ui/sdviewpage.ui:96
 msgctxt "sdviewpage|label1"
 msgid "Display"
 msgstr "Dangos"
 
-#: sidebarslidebackground.ui:26
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:26
 msgctxt "sidebarslidebackground|label2"
 msgid "_Format:"
 msgstr "_Fformat:"
 
-#: sidebarslidebackground.ui:39
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:39
 msgctxt "sidebarslidebackground|label3"
 msgid "Background:"
 msgstr "Cefndir:"
 
-#: sidebarslidebackground.ui:52
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:52
 msgctxt "sidebarslidebackground|orientation"
 msgid "Landscape"
 msgstr "Tirlun"
 
-#: sidebarslidebackground.ui:53
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:53
 msgctxt "sidebarslidebackground|orientation"
 msgid "Portrait"
 msgstr "Portread"
 
-#: sidebarslidebackground.ui:86
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:86
 msgctxt "sidebarslidebackground|displaymasterobjects"
 msgid "Master Objects"
 msgstr "Prif Wrthrychau"
 
-#: sidebarslidebackground.ui:125
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:126
 msgctxt "sidebarslidebackground|button2"
 msgid "Insert Image"
 msgstr "Mewnosod Delwedd"
 
-#: sidebarslidebackground.ui:163
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:164
 msgctxt "sidebarslidebackground|displaymasterbackground"
 msgid "Master Background"
 msgstr "Prif Gefndir"
 
-#: sidebarslidebackground.ui:192
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:194
 msgctxt "sidebarslidebackground|label4"
 msgid "Orientation:"
 msgstr "Cyfeiriadaeth:"
 
-#: sidebarslidebackground.ui:207
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:209
 msgctxt "sidebarslidebackground|masterslidebutton"
 msgid "Master View"
 msgstr "Prif Olwg"
 
-#: sidebarslidebackground.ui:221
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:223
 msgctxt "sidebarslidebackground|closemasterslide"
 msgid "Close Master View"
 msgstr "Cau Golwg y Prif Sleid"
 
-#: sidebarslidebackground.ui:243
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:245
 msgctxt "sidebarslidebackground|marginLB"
 msgid "None"
 msgstr "Dim"
 
-#: sidebarslidebackground.ui:244
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:246
 msgctxt "sidebarslidebackground|marginLB"
 msgid "Narrow"
 msgstr "Cul"
 
-#: sidebarslidebackground.ui:245
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:247
 msgctxt "sidebarslidebackground|marginLB"
 msgid "Moderate"
 msgstr "Cymedrol"
 
-#: sidebarslidebackground.ui:246
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:248
 msgctxt "sidebarslidebackground|marginLB"
 msgid "Normal 0.75\""
 msgstr "Normal 0.75\""
 
-#: sidebarslidebackground.ui:247
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:249
 msgctxt "sidebarslidebackground|marginLB"
 msgid "Normal 1\""
 msgstr "Normal 1\""
 
-#: sidebarslidebackground.ui:248
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:250
 msgctxt "sidebarslidebackground|marginLB"
 msgid "Normal 1.25\""
 msgstr "Normal 1.25\""
 
-#: sidebarslidebackground.ui:249
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:251
 msgctxt "sidebarslidebackground|marginLB"
 msgid "Wide"
 msgstr "Lled"
 
-#: sidebarslidebackground.ui:262
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:264
 msgctxt "sidebarslidebackground|labelmargin"
 msgid "Margin:"
 msgstr "Ymyl:"
 
-#: sidebarslidebackground.ui:272
+#: sd/uiconfig/simpress/ui/sidebarslidebackground.ui:274
 msgctxt "sidebarslidebackground|customlabel"
 msgid "Custom"
 msgstr "Cyfaddasu"
 
-#: slidecontextmenu.ui:12
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:12
 msgctxt "slidecontextmenu|next"
 msgid "_Next"
 msgstr "_Nesaf"
 
-#: slidecontextmenu.ui:20
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:20
 msgctxt "slidecontextmenu|prev"
 msgid "_Previous"
 msgstr "_Blaenorol"
 
-#: slidecontextmenu.ui:28
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:28
 msgctxt "slidecontextmenu|goto"
 msgid "_Go to Slide"
 msgstr "_Mynd i Sleid"
 
-#: slidecontextmenu.ui:38
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:38
 msgctxt "slidecontextmenu|first"
 msgid "_First Slide"
 msgstr "Sleid _Gyntaf"
 
-#: slidecontextmenu.ui:46
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:46
 msgctxt "slidecontextmenu|last"
 msgid "_Last Slide"
 msgstr "Sleid _Olaf"
 
-#: slidecontextmenu.ui:70
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:70
 msgctxt "slidecontextmenu|pen"
 msgid "Mouse Pointer as ~Pen"
 msgstr "Pwyntiwr llygoden fel ~Ysgrifbin"
 
-#: slidecontextmenu.ui:78
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:78
 msgctxt "slidecontextmenu|width"
 msgid "_Pen Width"
 msgstr "_Lled Ysgrifbin"
 
-#: slidecontextmenu.ui:88
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:88
 msgctxt "slidecontextmenu|4"
 msgid "_Very Thin"
 msgstr "_Tenau Iawn"
 
-#: slidecontextmenu.ui:96
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:96
 msgctxt "slidecontextmenu|100"
 msgid "_Thin"
 msgstr "_Tenau"
 
-#: slidecontextmenu.ui:104
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:104
 msgctxt "slidecontextmenu|150"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: slidecontextmenu.ui:112
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:112
 msgctxt "slidecontextmenu|200"
 msgid "_Thick"
 msgstr "T_rwchus"
 
-#: slidecontextmenu.ui:120
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:120
 msgctxt "slidecontextmenu|400"
 msgid "_Very Thick"
 msgstr "Trwchus I_awn"
 
-#: slidecontextmenu.ui:132
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:132
 msgctxt "slidecontextmenu|color"
 msgid "_Change Pen Color..."
 msgstr "Newid _Lliw'r Ysgrifbin..."
 
-#: slidecontextmenu.ui:140
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:140
 msgctxt "slidecontextmenu|erase"
 msgid "_Erase All Ink on Slide"
 msgstr "_Dileu'r Holl Inc ar y Sleid"
 
-#: slidecontextmenu.ui:154
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:154
 msgctxt "slidecontextmenu|screen"
 msgid "_Screen"
 msgstr "_Sgrin"
 
-#: slidecontextmenu.ui:164
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:164
 msgctxt "slidecontextmenu|black"
 msgid "_Black"
 msgstr "D_u"
 
-#: slidecontextmenu.ui:172
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:172
 msgctxt "slidecontextmenu|white"
 msgid "_White"
 msgstr "G_wyn"
 
-#: slidecontextmenu.ui:184
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:184
 msgctxt "slidecontextmenu|edit"
 msgid "E_dit Presentation"
 msgstr "_Golygu Cyflwyniad"
 
-#: slidecontextmenu.ui:192
+#: sd/uiconfig/simpress/ui/slidecontextmenu.ui:192
 msgctxt "slidecontextmenu|end"
 msgid "_End Show"
 msgstr "_Diwedd Sioe"
 
-#: slidedesigndialog.ui:9
+#: sd/uiconfig/simpress/ui/slidedesigndialog.ui:9
 msgctxt "slidedesigndialog|SlideDesignDialog"
 msgid "Slide Design"
 msgstr "Cynllun Sleid"
 
-#: slidedesigndialog.ui:69
+#: sd/uiconfig/simpress/ui/slidedesigndialog.ui:69
 msgctxt "slidedesigndialog|load"
 msgid "_Load..."
 msgstr "_Llwytho..."
 
-#: slidedesigndialog.ui:110
+#: sd/uiconfig/simpress/ui/slidedesigndialog.ui:110
 msgctxt "slidedesigndialog|masterpage"
 msgid "_Exchange background page"
 msgstr "_Newid tudalen cefndir"
 
-#: slidedesigndialog.ui:125
+#: sd/uiconfig/simpress/ui/slidedesigndialog.ui:125
 msgctxt "slidedesigndialog|checkmasters"
 msgid "_Delete unused backgrounds"
 msgstr "_Dileu cefndiroedd heb eu defnyddio"
 
-#: slidedesigndialog.ui:158
+#: sd/uiconfig/simpress/ui/slidedesigndialog.ui:158
 msgctxt "slidedesigndialog|label1"
 msgid "Select a Slide Design"
 msgstr "Dewis Cynllun Sleid"
 
-#: slidetransitionspanel.ui:77
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:77
 msgctxt "slidetransitionspanel|duration_label"
 msgid "Duration:"
 msgstr "Hyd:"
 
-#: slidetransitionspanel.ui:92
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:92
 msgctxt "slidetransitionspanel|transition_duration|tooltip_text"
 msgid "Select the speed of Slide Transition."
 msgstr "Dewis cyflymder Trawsnewid Sleid."
 
-#: slidetransitionspanel.ui:105
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:105
 msgctxt "slidetransitionspanel|sound_label"
 msgid "Sound:"
 msgstr "Sain:"
 
-#: slidetransitionspanel.ui:120
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:120
 msgctxt "slidetransitionspanel|sound_list"
 msgid "No sound"
 msgstr "Dim sain"
 
-#: slidetransitionspanel.ui:121
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:121
 msgctxt "slidetransitionspanel|sound_list"
 msgid "Stop previous sound"
 msgstr "Atal sain blaenorol"
 
-#: slidetransitionspanel.ui:122
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:122
 msgctxt "slidetransitionspanel|sound_list"
 msgid "Other sound..."
 msgstr "Sain arall..."
 
-#: slidetransitionspanel.ui:132
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:132
 msgctxt "slidetransitionspanel|loop_sound"
 msgid "Loop until next sound"
 msgstr "Cylchu tan y sain nesaf"
 
-#: slidetransitionspanel.ui:149
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:150
 msgctxt "slidetransitionspanel|variant_label"
 msgid "Variant:"
 msgstr "Amrywiolyn:"
 
-#: slidetransitionspanel.ui:179
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:180
 msgctxt "slidetransitionspanel|label1"
 msgid "Modify Transition"
 msgstr "Newid Trawsnewidiad"
 
-#: slidetransitionspanel.ui:212
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:213
 msgctxt "slidetransitionspanel|rb_mouse_click"
 msgid "On mouse click"
 msgstr "Wrth glic y llygoden"
 
-#: slidetransitionspanel.ui:228
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:230
 msgctxt "slidetransitionspanel|rb_auto_after"
 msgid "Automatically after:"
 msgstr "Yn awtomatig ar ôl:"
 
-#: slidetransitionspanel.ui:261
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:263
 msgctxt "slidetransitionspanel|label2"
 msgid "Advance Slide"
 msgstr "Sleid Ymlaen"
 
-#: slidetransitionspanel.ui:286
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:288
 msgctxt "slidetransitionspanel|apply_to_all"
 msgid "Apply Transition to All Slides"
 msgstr "Gosod Trawsnewid i Bob Sleid"
 
-#: slidetransitionspanel.ui:324
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:326
 msgctxt "slidetransitionspanel|auto_preview"
 msgid "Automatic Preview"
 msgstr "Rhagolwg Awtomatig"
 
-#: slidetransitionspanel.ui:339
+#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:342
 msgctxt "slidetransitionspanel|play"
 msgid "Play"
 msgstr "Chwarae"
 
-#: slidetransitionspanelhorizontal.ui:56
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:56
 msgctxt "slidetransitionspanelhorizontal|duration_label"
 msgid "Duration:"
 msgstr "Hyd:"
 
-#: slidetransitionspanelhorizontal.ui:69
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:69
 msgctxt "slidetransitionspanelhorizontal|transition_duration|tooltip_text"
 msgid "Select the speed of Slide Transition."
 msgstr "Dewis cyflymder Trawsnewid Sleid."
 
-#: slidetransitionspanelhorizontal.ui:81
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:81
 msgctxt "slidetransitionspanelhorizontal|variant_label"
 msgid "Variant:"
 msgstr "Amrywiad:"
 
-#: slidetransitionspanelhorizontal.ui:103
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:103
 msgctxt "slidetransitionspanelhorizontal|sound_label"
 msgid "Sound:"
 msgstr "Sain:"
 
-#: slidetransitionspanelhorizontal.ui:116
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:116
 msgctxt "slidetransitionspanelhorizontal|sound_list"
 msgid "No sound"
 msgstr "Dim sain"
 
-#: slidetransitionspanelhorizontal.ui:117
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:117
 msgctxt "slidetransitionspanelhorizontal|sound_list"
 msgid "Stop previous sound"
 msgstr "Atal y sain blaenorol"
 
-#: slidetransitionspanelhorizontal.ui:118
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:118
 msgctxt "slidetransitionspanelhorizontal|sound_list"
 msgid "Other sound..."
 msgstr "Sain arall..."
 
-#: slidetransitionspanelhorizontal.ui:128
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:128
 msgctxt "slidetransitionspanelhorizontal|loop_sound"
 msgid "Loop until next sound"
 msgstr "Cylchu tan y sain nesaf"
 
-#: slidetransitionspanelhorizontal.ui:142
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:143
 msgctxt "slidetransitionspanelhorizontal|rb_mouse_click"
 msgid "On mouse click"
 msgstr "Ar glic y llygoden"
 
-#: slidetransitionspanelhorizontal.ui:159
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:161
 msgctxt "slidetransitionspanelhorizontal|rb_auto_after"
 msgid "Automatically after:"
 msgstr "Yn awtomatig wedi:"
 
-#: slidetransitionspanelhorizontal.ui:186
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:188
 msgctxt "slidetransitionspanelhorizontal|auto_preview"
 msgid "Automatic Preview"
 msgstr "Rhagolwg Awtomatig"
 
-#: slidetransitionspanelhorizontal.ui:205
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:208
 msgctxt "slidetransitionspanelhorizontal|apply_to_all"
 msgid "Apply Transition to All Slides"
 msgstr "Gosod y Trawsnewid i'r Holl Sleidiau"
 
-#: slidetransitionspanelhorizontal.ui:226
+#: sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui:229
 msgctxt "slidetransitionspanelhorizontal|play"
 msgid "Play"
 msgstr "Chwarae"
 
-#: tabledesignpanel.ui:22
+#: sd/uiconfig/simpress/ui/tabledesignpanel.ui:22
 msgctxt "tabledesignpanel|UseFirstRowStyle"
 msgid "_Header row"
 msgstr "_Rhes pennyn"
 
-#: tabledesignpanel.ui:37
+#: sd/uiconfig/simpress/ui/tabledesignpanel.ui:37
 msgctxt "tabledesignpanel|UseLastRowStyle"
 msgid "Tot_al row"
 msgstr "_Rhes cyfanswm"
 
-#: tabledesignpanel.ui:52
+#: sd/uiconfig/simpress/ui/tabledesignpanel.ui:52
 msgctxt "tabledesignpanel|UseBandingRowStyle"
 msgid "_Banded rows"
 msgstr "Rhes _bandiog"
 
-#: tabledesignpanel.ui:67
+#: sd/uiconfig/simpress/ui/tabledesignpanel.ui:67
 msgctxt "tabledesignpanel|UseFirstColumnStyle"
 msgid "Fi_rst column"
 msgstr "Colofn _gyntaf"
 
-#: tabledesignpanel.ui:82
+#: sd/uiconfig/simpress/ui/tabledesignpanel.ui:82
 msgctxt "tabledesignpanel|UseLastColumnStyle"
 msgid "_Last column"
 msgstr "Colofn _olaf"
 
-#: tabledesignpanel.ui:97
+#: sd/uiconfig/simpress/ui/tabledesignpanel.ui:97
 msgctxt "tabledesignpanel|UseBandingColumnStyle"
 msgid "Ba_nded columns"
 msgstr "Colofnau b_andiog"
 
-#: tabledesignpanelhorizontal.ui:39
+#: sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui:39
 msgctxt "tabledesignpanelhorizontal|UseFirstRowStyle"
 msgid "_Header row"
 msgstr "_Rhes pennyn"
 
-#: tabledesignpanelhorizontal.ui:54
+#: sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui:54
 msgctxt "tabledesignpanelhorizontal|UseLastRowStyle"
 msgid "Tot_al row"
 msgstr "Rhes _gyfan"
 
-#: tabledesignpanelhorizontal.ui:69
+#: sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui:69
 msgctxt "tabledesignpanelhorizontal|UseBandingRowStyle"
 msgid "_Banded rows"
 msgstr "_Rhesi bandiog"
 
-#: tabledesignpanelhorizontal.ui:84
+#: sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui:84
 msgctxt "tabledesignpanelhorizontal|UseBandingColumnStyle"
 msgid "Ba_nded columns"
 msgstr "_Colofnau bandiog"
 
-#: tabledesignpanelhorizontal.ui:99
+#: sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui:99
 msgctxt "tabledesignpanelhorizontal|UseFirstColumnStyle"
 msgid "Fi_rst column"
 msgstr "Colofn _gyntaf"
 
-#: tabledesignpanelhorizontal.ui:114
+#: sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui:114
 msgctxt "tabledesignpanelhorizontal|UseLastColumnStyle"
 msgid "_Last column"
 msgstr "Colofn _olaf"
 
-#: templatedialog.ui:8
+#: sd/uiconfig/simpress/ui/templatedialog.ui:8
 msgctxt "templatedialog|TemplateDialog"
 msgid "Graphic Styles"
 msgstr "Arddull Graffigau"
 
-#: templatedialog.ui:80
+#: sd/uiconfig/simpress/ui/templatedialog.ui:80
 msgctxt "templatedialog|standard"
 msgid "_Standard"
 msgstr "_Safonol"
 
-#: templatedialog.ui:119
+#: sd/uiconfig/simpress/ui/templatedialog.ui:119
 msgctxt "templatedialog|organizer"
 msgid "Organizer"
 msgstr "Trefnydd"
 
-#: templatedialog.ui:141
+#: sd/uiconfig/simpress/ui/templatedialog.ui:141
 msgctxt "templatedialog|line"
 msgid "Line"
 msgstr "Llinell"
 
-#: templatedialog.ui:164
+#: sd/uiconfig/simpress/ui/templatedialog.ui:164
 msgctxt "templatedialog|area"
 msgid "Area"
 msgstr "Ardal"
 
-#: templatedialog.ui:187
+#: sd/uiconfig/simpress/ui/templatedialog.ui:187
 msgctxt "templatedialog|shadowing"
 msgid "Shadowing"
 msgstr "Cysgodi"
 
-#: templatedialog.ui:210
+#: sd/uiconfig/simpress/ui/templatedialog.ui:210
 msgctxt "templatedialog|transparency"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: templatedialog.ui:233
+#: sd/uiconfig/simpress/ui/templatedialog.ui:233
 msgctxt "templatedialog|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: templatedialog.ui:256
+#: sd/uiconfig/simpress/ui/templatedialog.ui:256
 msgctxt "templatedialog|fonteffect"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: templatedialog.ui:279
+#: sd/uiconfig/simpress/ui/templatedialog.ui:279
 msgctxt "templatedialog|indents"
 msgid "Indents & Spacing"
 msgstr "Mewnoliad a Bylchu"
 
-#: templatedialog.ui:302
+#: sd/uiconfig/simpress/ui/templatedialog.ui:302
 msgctxt "templatedialog|text"
 msgid "Text"
 msgstr "Testun"
 
-#: templatedialog.ui:325
+#: sd/uiconfig/simpress/ui/templatedialog.ui:325
 msgctxt "templatedialog|animation"
 msgid "Text Animation"
 msgstr "Animeiddio Testun"
 
-#: templatedialog.ui:348
+#: sd/uiconfig/simpress/ui/templatedialog.ui:348
 msgctxt "templatedialog|dimensioning"
 msgid "Dimensioning"
 msgstr "UDimensiynu"
 
-#: templatedialog.ui:371
+#: sd/uiconfig/simpress/ui/templatedialog.ui:371
 msgctxt "templatedialog|connector"
 msgid "Connector"
 msgstr "Cysylltydd"
 
-#: templatedialog.ui:394
+#: sd/uiconfig/simpress/ui/templatedialog.ui:394
 msgctxt "templatedialog|alignment"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: templatedialog.ui:417
+#: sd/uiconfig/simpress/ui/templatedialog.ui:417
 msgctxt "templatedialog|asiantypo"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: templatedialog.ui:440
+#: sd/uiconfig/simpress/ui/templatedialog.ui:440
 msgctxt "templatedialog|tabs"
 msgid "Tabs"
 msgstr "Tabiau"
 
-#: templatedialog.ui:463
+#: sd/uiconfig/simpress/ui/templatedialog.ui:463
 msgctxt "templatedialog|background"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: breakdialog.ui:7
+#: sd/uiconfig/sdraw/ui/breakdialog.ui:8
 msgctxt "breakdialog|BreakDialog"
 msgid "Break"
 msgstr "Toriad"
 
-#: breakdialog.ui:51
+#: sd/uiconfig/sdraw/ui/breakdialog.ui:54
 msgctxt "breakdialog|label1"
 msgid "Processing metafile:"
 msgstr "Prosesu'r metaffeil:"
 
-#: breakdialog.ui:65
+#: sd/uiconfig/sdraw/ui/breakdialog.ui:66
 msgctxt "breakdialog|label2"
 msgid "Broken down metaobjects:"
 msgstr "Metagwrthrychau wedi torri:"
 
-#: breakdialog.ui:79
+#: sd/uiconfig/sdraw/ui/breakdialog.ui:78
 msgctxt "breakdialog|label3"
 msgid "Inserted drawing objects:"
 msgstr "Mewnosodwyd gwrthrychau lluniadu:"
 
-#: bulletsandnumbering.ui:8
+#: sd/uiconfig/sdraw/ui/bulletsandnumbering.ui:8
 msgctxt "bulletsandnumbering|BulletsAndNumberingDialog"
 msgid "Bullets and Numbering"
 msgstr "Bwledi a Rhifo"
 
-#: bulletsandnumbering.ui:67
+#: sd/uiconfig/sdraw/ui/bulletsandnumbering.ui:67
 msgctxt "bulletsandnumbering|reset"
 msgid "Reset"
 msgstr "Ailosod"
 
-#: bulletsandnumbering.ui:105
+#: sd/uiconfig/sdraw/ui/bulletsandnumbering.ui:105
 msgctxt "bulletsandnumbering|bullets"
 msgid "Bullets"
 msgstr "Bwledi"
 
-#: bulletsandnumbering.ui:127
+#: sd/uiconfig/sdraw/ui/bulletsandnumbering.ui:127
 msgctxt "bulletsandnumbering|singlenum"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: bulletsandnumbering.ui:150
+#: sd/uiconfig/sdraw/ui/bulletsandnumbering.ui:150
 msgctxt "bulletsandnumbering|graphics"
 msgid "Image"
 msgstr "Delwedd"
 
-#: bulletsandnumbering.ui:173
+#: sd/uiconfig/sdraw/ui/bulletsandnumbering.ui:173
 msgctxt "bulletsandnumbering|position"
 msgid "Position"
 msgstr "Safle"
 
-#: bulletsandnumbering.ui:196
+#: sd/uiconfig/sdraw/ui/bulletsandnumbering.ui:196
 msgctxt "bulletsandnumbering|customize"
 msgid "Customize"
 msgstr "Cyfaddasu"
 
-#: copydlg.ui:33
+#: sd/uiconfig/sdraw/ui/copydlg.ui:33
 msgctxt "copydlg|DuplicateDialog"
 msgid "Duplicate"
 msgstr "Dyblyg"
 
-#: copydlg.ui:76
+#: sd/uiconfig/sdraw/ui/copydlg.ui:76
 msgctxt "copydlg|default"
 msgid "_Default"
 msgstr "_Rhagosodedig"
 
-#: copydlg.ui:128
+#: sd/uiconfig/sdraw/ui/copydlg.ui:128
 msgctxt "copydlg|label4"
 msgid "Number of _copies:"
 msgstr "Nifer o _gopïau:"
 
-#: copydlg.ui:158
+#: sd/uiconfig/sdraw/ui/copydlg.ui:157
 msgctxt "copydlg|viewdata|tooltip_text"
 msgid "Values from Selection"
 msgstr "Gwerthoedd o'r Dewis"
 
-#: copydlg.ui:162
+#: sd/uiconfig/sdraw/ui/copydlg.ui:161
 msgctxt "copydlg|viewdata-atkobject"
 msgid "Values from Selection"
 msgstr "Gwerthoedd o'r Dewis"
 
-#: copydlg.ui:204
+#: sd/uiconfig/sdraw/ui/copydlg.ui:203
 msgctxt "copydlg|label5"
 msgid "_X axis:"
 msgstr "Echelin _X:"
 
-#: copydlg.ui:218
+#: sd/uiconfig/sdraw/ui/copydlg.ui:217
 msgctxt "copydlg|label6"
 msgid "_Y axis:"
 msgstr "Echelin _Y:"
 
-#: copydlg.ui:232
+#: sd/uiconfig/sdraw/ui/copydlg.ui:231
 msgctxt "copydlg|label7"
 msgid "_Angle:"
 msgstr "_Ongl:"
 
-#: copydlg.ui:292
+#: sd/uiconfig/sdraw/ui/copydlg.ui:288
 msgctxt "copydlg|label1"
 msgid "Placement"
 msgstr "Gosodiad"
 
-#: copydlg.ui:330
+#: sd/uiconfig/sdraw/ui/copydlg.ui:326
 msgctxt "copydlg|label8"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: copydlg.ui:344
+#: sd/uiconfig/sdraw/ui/copydlg.ui:340
 msgctxt "copydlg|label9"
 msgid "_Height:"
 msgstr "_Uchder:"
 
-#: copydlg.ui:390
+#: sd/uiconfig/sdraw/ui/copydlg.ui:384
 msgctxt "copydlg|label2"
 msgid "Enlargement"
 msgstr "Helaethu"
 
-#: copydlg.ui:428
+#: sd/uiconfig/sdraw/ui/copydlg.ui:422
 msgctxt "copydlg|label10"
 msgid "_Start:"
 msgstr "_Cychwyn:"
 
-#: copydlg.ui:442
+#: sd/uiconfig/sdraw/ui/copydlg.ui:436
 msgctxt "copydlg|endlabel"
 msgid "_End:"
 msgstr "_Diwedd:"
 
-#: copydlg.ui:482
+#: sd/uiconfig/sdraw/ui/copydlg.ui:476
 msgctxt "copydlg|label3"
 msgid "Colors"
 msgstr "Lliwiau"
 
-#: crossfadedialog.ui:15
+#: sd/uiconfig/sdraw/ui/crossfadedialog.ui:15
 msgctxt "crossfadedialog|CrossFadeDialog"
 msgid "Cross-fading"
 msgstr "Croes bylu"
 
-#: crossfadedialog.ui:102
+#: sd/uiconfig/sdraw/ui/crossfadedialog.ui:102
 msgctxt "crossfadedialog|orientation"
 msgid "Same orientation"
 msgstr "Yr un cyfeiriadedd"
 
-#: crossfadedialog.ui:118
+#: sd/uiconfig/sdraw/ui/crossfadedialog.ui:118
 msgctxt "crossfadedialog|attributes"
 msgid "Cross-fade attributes"
 msgstr "Priodoleddau croes-bylu"
 
-#: crossfadedialog.ui:137
+#: sd/uiconfig/sdraw/ui/crossfadedialog.ui:137
 msgctxt "crossfadedialog|label2"
 msgid "Increments:"
 msgstr "Cynyddiad:"
 
-#: crossfadedialog.ui:166
+#: sd/uiconfig/sdraw/ui/crossfadedialog.ui:165
 msgctxt "crossfadedialog|label1"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: dlgsnap.ui:35
+#: sd/uiconfig/sdraw/ui/dlgsnap.ui:35
 msgctxt "dlgsnap|SnapObjectDialog"
 msgid "New Snap Object"
 msgstr "Gwrthrych Snapio Newydd"
 
-#: dlgsnap.ui:170
+#: sd/uiconfig/sdraw/ui/dlgsnap.ui:168
 msgctxt "dlgsnap|xlabel"
 msgid "_X:"
 msgstr "_X:"
 
-#: dlgsnap.ui:183
+#: sd/uiconfig/sdraw/ui/dlgsnap.ui:181
 msgctxt "dlgsnap|ylabel"
 msgid "_Y:"
 msgstr "_Y:"
 
-#: dlgsnap.ui:200
+#: sd/uiconfig/sdraw/ui/dlgsnap.ui:198
 msgctxt "dlgsnap|label1"
 msgid "Position"
 msgstr "Safle"
 
-#: dlgsnap.ui:233
+#: sd/uiconfig/sdraw/ui/dlgsnap.ui:231
 msgctxt "dlgsnap|point"
 msgid "_Point"
 msgstr "_Pwynt"
 
-#: dlgsnap.ui:252
+#: sd/uiconfig/sdraw/ui/dlgsnap.ui:250
 msgctxt "dlgsnap|vert"
 msgid "_Vertical"
 msgstr "_Fertigol"
 
-#: dlgsnap.ui:270
+#: sd/uiconfig/sdraw/ui/dlgsnap.ui:268
 msgctxt "dlgsnap|horz"
 msgid "Hori_zontal"
 msgstr "Llo_rweddol"
 
-#: dlgsnap.ui:294
+#: sd/uiconfig/sdraw/ui/dlgsnap.ui:292
 msgctxt "dlgsnap|label2"
 msgid "Type"
 msgstr "Math"
 
-#: drawchardialog.ui:8
+#: sd/uiconfig/sdraw/ui/drawchardialog.ui:8
 msgctxt "drawchardialog|DrawCharDialog"
 msgid "Character"
 msgstr "Nod"
 
-#: drawchardialog.ui:105
+#: sd/uiconfig/sdraw/ui/drawchardialog.ui:105
 msgctxt "drawchardialog|RID_SVXPAGE_CHAR_NAME"
 msgid "Fonts"
 msgstr "Ffontiau"
 
-#: drawchardialog.ui:127
+#: sd/uiconfig/sdraw/ui/drawchardialog.ui:127
 msgctxt "drawchardialog|RID_SVXPAGE_CHAR_EFFECTS"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: drawchardialog.ui:150
+#: sd/uiconfig/sdraw/ui/drawchardialog.ui:150
 msgctxt "drawchardialog|RID_SVXPAGE_CHAR_POSITION"
 msgid "Position"
 msgstr "Safle"
 
-#: drawchardialog.ui:173
+#: sd/uiconfig/sdraw/ui/drawchardialog.ui:173
 msgctxt "drawchardialog|RID_SVXPAGE_BACKGROUND"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: drawpagedialog.ui:8
+#: sd/uiconfig/sdraw/ui/drawpagedialog.ui:8
 msgctxt "drawpagedialog|DrawPageDialog"
 msgid "Page Setup"
 msgstr "Gosodiad Tudalen"
 
-#: drawpagedialog.ui:105
+#: sd/uiconfig/sdraw/ui/drawpagedialog.ui:105
 msgctxt "drawpagedialog|RID_SVXPAGE_PAGE"
 msgid "Page"
 msgstr "Tudalen"
 
-#: drawpagedialog.ui:127
+#: sd/uiconfig/sdraw/ui/drawpagedialog.ui:127
 msgctxt "drawpagedialog|RID_SVXPAGE_AREA"
 msgid "Background"
 msgstr "Cefndir"
 
-#: drawpagedialog.ui:150
+#: sd/uiconfig/sdraw/ui/drawpagedialog.ui:150
 msgctxt "drawpagedialog|RID_SVXPAGE_TRANSPARENCE"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: drawparadialog.ui:8
+#: sd/uiconfig/sdraw/ui/drawparadialog.ui:8
 msgctxt "drawparadialog|DrawParagraphPropertiesDialog"
 msgid "Paragraph"
 msgstr "Paragraff"
 
-#: drawparadialog.ui:105
+#: sd/uiconfig/sdraw/ui/drawparadialog.ui:105
 msgctxt "drawparadialog|labelTP_PARA_STD"
 msgid "Indents & Spacing"
 msgstr "Mewnoliad a Bylchu"
 
-#: drawparadialog.ui:127
+#: sd/uiconfig/sdraw/ui/drawparadialog.ui:127
 msgctxt "drawparadialog|labelTP_PARA_ASIAN"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: drawparadialog.ui:150
+#: sd/uiconfig/sdraw/ui/drawparadialog.ui:150
 msgctxt "drawparadialog|labelTP_TABULATOR"
 msgid "Tabs"
 msgstr "Tabiau"
 
-#: drawparadialog.ui:173
+#: sd/uiconfig/sdraw/ui/drawparadialog.ui:173
 msgctxt "drawparadialog|labelTP_PARA_ALIGN"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: drawparadialog.ui:197
+#: sd/uiconfig/sdraw/ui/drawparadialog.ui:197
 msgctxt "drawparadialog|labelNUMBERING"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: drawprinteroptions.ui:32
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:32
 msgctxt "drawprinteroptions|printname"
 msgid "Page name"
 msgstr "Enw tudalen"
 
-#: drawprinteroptions.ui:48
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:49
 msgctxt "drawprinteroptions|printdatetime"
 msgid "Date and time"
 msgstr "Dyddiad ac amser"
 
-#: drawprinteroptions.ui:70
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:72
 msgctxt "drawprinteroptions|label4"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: drawprinteroptions.ui:103
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:105
 msgctxt "drawprinteroptions|originalcolors"
 msgid "Original size"
 msgstr "Maint gwreiddiol"
 
-#: drawprinteroptions.ui:121
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:124
 msgctxt "drawprinteroptions|grayscale"
 msgid "Grayscale"
 msgstr "Graddlwyd"
 
-#: drawprinteroptions.ui:139
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:143
 msgctxt "drawprinteroptions|blackandwhite"
 msgid "Black & white"
 msgstr "Du a gwyn"
 
-#: drawprinteroptions.ui:163
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:168
 msgctxt "drawprinteroptions|label5"
 msgid "Color"
 msgstr "Lliw"
 
-#: drawprinteroptions.ui:196
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:201
 msgctxt "drawprinteroptions|originalsize"
 msgid "Original size"
 msgstr "Maint gwreiddiol"
 
-#: drawprinteroptions.ui:214
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:220
 msgctxt "drawprinteroptions|fittoprintable"
 msgid "Fit to printable page"
 msgstr "Ffitio i'r dudalen argraffadwy"
 
-#: drawprinteroptions.ui:232
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:239
 msgctxt "drawprinteroptions|distributeonmultiple"
 msgid "Distribute on multiple sheets of paper"
 msgstr "Dosbarthu ar ddalennau lluosog o bapur"
 
-#: drawprinteroptions.ui:250
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:258
 msgctxt "drawprinteroptions|tilesheet"
 msgid "Tile sheet of paper with repeated pages"
 msgstr "Teilsio dalen o bapur ar dudalennau sy'n ailadrodd"
 
-#: drawprinteroptions.ui:274
+#: sd/uiconfig/sdraw/ui/drawprinteroptions.ui:283
 msgctxt "drawprinteroptions|label6"
 msgid "Size"
 msgstr "Maint"
 
-#: drawprtldialog.ui:8
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:8
 msgctxt "drawprtldialog|DrawPRTLDialog"
 msgid "Presentation Layout"
 msgstr "Cynllun Cyflwyniad"
 
-#: drawprtldialog.ui:105
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:105
 msgctxt "drawprtldialog|RID_SVXPAGE_LINE"
 msgid "Line"
 msgstr "Llinell"
 
-#: drawprtldialog.ui:127
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:127
 msgctxt "drawprtldialog|RID_SVXPAGE_AREA"
 msgid "Area"
 msgstr "Ardal"
 
-#: drawprtldialog.ui:150
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:150
 msgctxt "drawprtldialog|RID_SVXPAGE_SHADOW"
 msgid "Shadow"
 msgstr "Cysgod"
 
-#: drawprtldialog.ui:173
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:173
 msgctxt "drawprtldialog|RID_SVXPAGE_TRANSPARENCE"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: drawprtldialog.ui:196
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:196
 msgctxt "drawprtldialog|RID_SVXPAGE_CHAR_NAME"
 msgid "Font"
 msgstr "Ffont"
 
-#: drawprtldialog.ui:219
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:219
 msgctxt "drawprtldialog|RID_SVXPAGE_CHAR_EFFECTS"
 msgid "Font Effects"
 msgstr "Effeithiau Ffont"
 
-#: drawprtldialog.ui:242
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:242
 msgctxt "drawprtldialog|RID_SVXPAGE_STD_PARAGRAPH"
 msgid "Indents & Spacing"
 msgstr "Mewnoliad a Bylchu"
 
-#: drawprtldialog.ui:265
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:265
 msgctxt "drawprtldialog|RID_SVXPAGE_TEXTATTR"
 msgid "Text"
 msgstr "Testun"
 
-#: drawprtldialog.ui:288
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:288
 msgctxt "drawprtldialog|RID_SVXPAGE_PICK_BULLET"
 msgid "Bullets"
 msgstr "Bwledi"
 
-#: drawprtldialog.ui:311
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:311
 msgctxt "drawprtldialog|RID_SVXPAGE_PICK_SINGLE_NUM"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: drawprtldialog.ui:334
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:334
 msgctxt "drawprtldialog|RID_SVXPAGE_PICK_BMP"
 msgid "Image"
 msgstr "Delwedd"
 
-#: drawprtldialog.ui:357
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:357
 msgctxt "drawprtldialog|RID_SVXPAGE_NUM_OPTIONS"
 msgid "Customize"
 msgstr "Cyfaddasu"
 
-#: drawprtldialog.ui:380
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:380
 msgctxt "drawprtldialog|RID_SVXPAGE_ALIGN_PARAGRAPH"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: drawprtldialog.ui:403
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:403
 msgctxt "drawprtldialog|RID_SVXPAGE_PARA_ASIAN"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: drawprtldialog.ui:426
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:426
 msgctxt "drawprtldialog|RID_SVXPAGE_TABULATOR"
 msgid "Tabs"
 msgstr "Tabiau"
 
-#: drawprtldialog.ui:449
+#: sd/uiconfig/sdraw/ui/drawprtldialog.ui:449
 msgctxt "drawprtldialog|RID_SVXPAGE_BACKGROUND"
 msgid "Highlighting"
 msgstr "Amlygu"
 
-#: insertlayer.ui:8
+#: sd/uiconfig/sdraw/ui/insertlayer.ui:8
 msgctxt "insertlayer|InsertLayerDialog"
 msgid "Insert Layer"
 msgstr "Mewnosod Haen"
 
-#: insertlayer.ui:106
+#: sd/uiconfig/sdraw/ui/insertlayer.ui:105
 msgctxt "insertlayer|label4"
 msgid "_Name"
 msgstr "_Enw"
 
-#: insertlayer.ui:146
+#: sd/uiconfig/sdraw/ui/insertlayer.ui:144
 msgctxt "insertlayer|label5"
 msgid "_Title"
 msgstr "_Teitl"
 
-#: insertlayer.ui:197
+#: sd/uiconfig/sdraw/ui/insertlayer.ui:195
 msgctxt "insertlayer|description"
 msgid "_Description"
 msgstr "_Disgrifiad"
 
-#: insertlayer.ui:213
+#: sd/uiconfig/sdraw/ui/insertlayer.ui:211
 msgctxt "insertlayer|visible"
 msgid "_Visible"
 msgstr "_Gweladwy"
 
-#: insertlayer.ui:229
+#: sd/uiconfig/sdraw/ui/insertlayer.ui:227
 msgctxt "insertlayer|printable"
 msgid "_Printable"
 msgstr "_Argraffadwy"
 
-#: insertlayer.ui:245
+#: sd/uiconfig/sdraw/ui/insertlayer.ui:243
 msgctxt "insertlayer|locked"
 msgid "_Locked"
 msgstr "_Clowyd"
 
-#: insertslidesdialog.ui:9
+#: sd/uiconfig/sdraw/ui/insertslidesdialog.ui:9
 msgctxt "insertslidesdialog|InsertSlidesDialog"
 msgid "Insert Slides/Objects"
 msgstr "Mewnosod Sleidiau/Gwrthrychau"
 
-#: insertslidesdialog.ui:83
+#: sd/uiconfig/sdraw/ui/insertslidesdialog.ui:83
 msgctxt "insertslidesdialog|backgrounds"
 msgid "Delete unused backg_rounds"
 msgstr "_Dileu cefndiroedd heb eu defnyddio"
 
-#: insertslidesdialog.ui:98
+#: sd/uiconfig/sdraw/ui/insertslidesdialog.ui:98
 msgctxt "insertslidesdialog|links"
 msgid "_Link"
 msgstr "C_ysylltiad"
 
-#: namedesign.ui:8
+#: sd/uiconfig/sdraw/ui/namedesign.ui:8
 msgctxt "namedesign|NameDesignDialog"
 msgid "Name HTML Design"
 msgstr "Enw Cynllun HTML"
 
-#: paranumberingtab.ui:30
+#: sd/uiconfig/sdraw/ui/paranumberingtab.ui:30
 msgctxt "paranumberingtab|checkbuttonCB_NEW_START"
 msgid "R_estart at this paragraph"
 msgstr "A_ilgychwyn yn y paragraff hwn"
 
-#: paranumberingtab.ui:60
+#: sd/uiconfig/sdraw/ui/paranumberingtab.ui:59
 msgctxt "paranumberingtab|checkbuttonCB_NUMBER_NEW_START"
 msgid "S_tart with:"
 msgstr "C_ychwyn gyda:"
 
-#: paranumberingtab.ui:85
+#: sd/uiconfig/sdraw/ui/paranumberingtab.ui:84
 msgctxt "paranumberingtab|label1"
 msgid "Paragraph Numbering"
 msgstr "Rhifo Paragraff"
 
-#: queryunlinkimagedialog.ui:8
+#: sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui:7
 msgctxt "queryunlinkimagedialog|QueryUnlinkImageDialog"
 msgid "Release image's link?"
 msgstr "Ryddhau delwedd y cysylltiad?"
 
-#: queryunlinkimagedialog.ui:14
+#: sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui:14
 msgctxt "queryunlinkimagedialog|QueryUnlinkImageDialog"
 msgid "This image is linked to a document."
 msgstr "Mae'r ddelwedd wedi ei chysylltu â dogfen."
 
-#: queryunlinkimagedialog.ui:15
+#: sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui:15
 msgctxt "queryunlinkimagedialog|QueryUnlinkImageDialog"
 msgid "Do you want to unlink the image in order to edit it?"
 msgstr "Hoffech chi ddatgysylltu'r ddelwedd er mwyn ei golygu?"
 
-#: tabledesigndialog.ui:9
+#: sd/uiconfig/sdraw/ui/tabledesigndialog.ui:9
 msgctxt "tabledesigndialog|TableDesignDialog"
 msgid "Table Design"
 msgstr "Cynllun Tabl"
 
-#: tabledesigndialog.ui:85
+#: sd/uiconfig/sdraw/ui/tabledesigndialog.ui:85
 msgctxt "tabledesigndialog|UseFirstRowStyle"
 msgid "_Header row"
 msgstr "_Rhes pennyn"
 
-#: tabledesigndialog.ui:100
+#: sd/uiconfig/sdraw/ui/tabledesigndialog.ui:100
 msgctxt "tabledesigndialog|UseLastRowStyle"
 msgid "Tot_al row"
 msgstr "_Rhes cyfanswm"
 
-#: tabledesigndialog.ui:115
+#: sd/uiconfig/sdraw/ui/tabledesigndialog.ui:115
 msgctxt "tabledesigndialog|UseBandingRowStyle"
 msgid "_Banded rows"
 msgstr "Rhes _bandiog"
 
-#: tabledesigndialog.ui:130
+#: sd/uiconfig/sdraw/ui/tabledesigndialog.ui:130
 msgctxt "tabledesigndialog|UseFirstColumnStyle"
 msgid "Fi_rst column"
 msgstr "Colofn _gyntaf"
 
-#: tabledesigndialog.ui:145
+#: sd/uiconfig/sdraw/ui/tabledesigndialog.ui:145
 msgctxt "tabledesigndialog|UseLastColumnStyle"
 msgid "_Last column"
 msgstr "Colofn _olaf"
 
-#: tabledesigndialog.ui:160
+#: sd/uiconfig/sdraw/ui/tabledesigndialog.ui:160
 msgctxt "tabledesigndialog|UseBandingColumnStyle"
 msgid "Ba_nded columns"
 msgstr "Colofnau b_andiog"
 
-#: vectorize.ui:27
+#: sd/uiconfig/sdraw/ui/vectorize.ui:27
 msgctxt "vectorize|VectorizeDialog"
 msgid "Convert to Polygon"
 msgstr "Trosi i Bolygon"
 
-#: vectorize.ui:72
+#: sd/uiconfig/sdraw/ui/vectorize.ui:72
 msgctxt "vectorize|preview"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: vectorize.ui:118
+#: sd/uiconfig/sdraw/ui/vectorize.ui:118
 msgctxt "vectorize|label2"
 msgid "Number of colors:"
 msgstr "Nifer o liwiau:"
 
-#: vectorize.ui:144
+#: sd/uiconfig/sdraw/ui/vectorize.ui:143
 msgctxt "vectorize|label3"
 msgid "Point reduction:"
 msgstr "Lleihad pwynt:"
 
-#: vectorize.ui:172
+#: sd/uiconfig/sdraw/ui/vectorize.ui:170
 msgctxt "vectorize|tilesft"
 msgid "Tile size:"
 msgstr "Maint teil:"
 
-#: vectorize.ui:195
+#: sd/uiconfig/sdraw/ui/vectorize.ui:192
 msgctxt "vectorize|fillholes"
 msgid "_Fill holes"
 msgstr "_Llanw tyllau"
 
-#: vectorize.ui:229
+#: sd/uiconfig/sdraw/ui/vectorize.ui:226
 msgctxt "vectorize|label5"
 msgid "Source image:"
 msgstr "Delwedd:"
 
-#: vectorize.ui:243
+#: sd/uiconfig/sdraw/ui/vectorize.ui:240
 msgctxt "vectorize|label6"
 msgid "Vectorized image:"
 msgstr "Delwedd fectoreiddiwyd:"
diff --git a/source/cy/sfx2/messages.po b/source/cy/sfx2/messages.po
index 69380006af7..2d176bcb3be 100644
--- a/source/cy/sfx2/messages.po
+++ b/source/cy/sfx2/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: 2017-12-18 12:31+0100\n"
-"PO-Revision-Date: 2017-12-29 15:01+0000\n"
+"POT-Creation-Date: 2018-04-24 12:21+0200\n"
+"PO-Revision-Date: 2018-04-09 16:17+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,75 +13,75 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1514559680.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1523290650.000000\n"
 
-#: strings.hrc:25
+#: include/sfx2/strings.hrc:25
 msgctxt "STR_TEMPLATE_FILTER"
 msgid "Templates"
 msgstr "Templedi"
 
-#: strings.hrc:26
+#: include/sfx2/strings.hrc:26
 msgctxt "STR_SAVEDOC"
 msgid "~Save"
 msgstr "C~adw"
 
-#: strings.hrc:27
+#: include/sfx2/strings.hrc:27
 msgctxt "STR_SAVEASDOC"
 msgid "Save ~As..."
 msgstr "Cadw ~Fel..."
 
-#: strings.hrc:28
+#: include/sfx2/strings.hrc:28
 msgctxt "STR_SAVEACOPY"
 msgid "Save a Copy..."
 msgstr "Cadw Copi..."
 
-#: strings.hrc:29
+#: include/sfx2/strings.hrc:29
 msgctxt "STR_CLOSEDOC"
 msgid "~Close"
 msgstr "~Cau"
 
-#: strings.hrc:30
+#: include/sfx2/strings.hrc:30
 msgctxt "STR_OPEN"
 msgid "Open"
 msgstr "Agor"
 
-#: strings.hrc:31
+#: include/sfx2/strings.hrc:31
 msgctxt "STR_EDIT_TEMPLATE"
 msgid "Edit"
 msgstr "Golygu"
 
-#: strings.hrc:32
+#: include/sfx2/strings.hrc:32
 msgctxt "STR_DEFAULT_TEMPLATE"
 msgid "Set As Default"
 msgstr "Gosod fel y Rhagosodedig"
 
-#: strings.hrc:33
+#: include/sfx2/strings.hrc:33
 msgctxt "STR_RESET_DEFAULT"
 msgid "Reset Default"
 msgstr "Ailosod y Rhagosodiad"
 
-#: strings.hrc:34
+#: include/sfx2/strings.hrc:34
 msgctxt "STR_DELETE"
 msgid "Delete"
 msgstr "Dileu"
 
-#: strings.hrc:35
+#: include/sfx2/strings.hrc:35
 msgctxt "STR_RENAME"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: strings.hrc:36
+#: include/sfx2/strings.hrc:36
 msgctxt "STR_CATEGORY_RENAME"
 msgid "Rename Category"
 msgstr "Ailenwi Categori"
 
-#: strings.hrc:37
+#: include/sfx2/strings.hrc:37
 msgctxt "STR_RENAME_TEMPLATE"
 msgid "Enter New Name: "
 msgstr "Rhowch Enw Newydd: "
 
-#: strings.hrc:38
+#: include/sfx2/strings.hrc:38
 msgctxt "STR_TEMPLATE_TOOLTIP"
 msgid ""
 "Title: $1\n"
@@ -90,27 +90,27 @@ msgstr ""
 "Teitl: $1\n"
 "Categori: $2"
 
-#: strings.hrc:39
+#: include/sfx2/strings.hrc:39
 msgctxt "STR_TEMPLATE_SELECTION"
 msgid "Select a Template"
 msgstr "Dewis Templed"
 
-#: strings.hrc:40
+#: include/sfx2/strings.hrc:40
 msgctxt "STR_AUTOMATICVERSION"
 msgid "Automatically saved version"
 msgstr "Fersiwn wedi ei gadw'n awtomatig"
 
-#: strings.hrc:41
+#: include/sfx2/strings.hrc:41
 msgctxt "STR_EXPORTBUTTON"
 msgid "Export"
 msgstr "Allforio"
 
-#: strings.hrc:42
+#: include/sfx2/strings.hrc:42
 msgctxt "STR_LABEL_FILEFORMAT"
 msgid "File format:"
 msgstr "Fformat ffeil:"
 
-#: strings.hrc:43
+#: include/sfx2/strings.hrc:43
 msgctxt "STR_HIDDENINFO_CONTAINS"
 msgid ""
 "This document contains:\n"
@@ -119,58 +119,58 @@ msgstr ""
 "Mae'r ddogfen yn cynnwys:\n"
 "\n"
 
-#: strings.hrc:44
+#: include/sfx2/strings.hrc:44
 msgctxt "STR_HIDDENINFO_RECORDCHANGES"
 msgid "Recorded changes"
 msgstr "Newidiadau recordiwyd"
 
-#: strings.hrc:45
+#: include/sfx2/strings.hrc:45
 msgctxt "STR_HIDDENINFO_NOTES"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: strings.hrc:46
+#: include/sfx2/strings.hrc:46
 msgctxt "STR_HIDDENINFO_DOCVERSIONS"
 msgid "Document versions"
 msgstr "Fersiwn dogfen"
 
-#: strings.hrc:47
+#: include/sfx2/strings.hrc:47
 msgctxt "STR_HIDDENINFO_CONTINUE_SAVING"
 msgid "Do you want to continue saving the document?"
 msgstr "Hoffech chi barhau i gadw'r ddogfen?"
 
-#: strings.hrc:48
+#: include/sfx2/strings.hrc:48
 msgctxt "STR_HIDDENINFO_CONTINUE_PRINTING"
 msgid "Do you want to continue printing the document?"
 msgstr "Hoffech chi barhau i argraffu'r ddogfen?"
 
-#: strings.hrc:49
+#: include/sfx2/strings.hrc:49
 msgctxt "STR_HIDDENINFO_CONTINUE_SIGNING"
 msgid "Do you want to continue signing the document?"
 msgstr "Hoffech chi barhau i lofnodi'r ddogfen?"
 
-#: strings.hrc:50
+#: include/sfx2/strings.hrc:50
 msgctxt "STR_HIDDENINFO_CONTINUE_CREATEPDF"
 msgid "Do you want to continue creating a PDF file?"
 msgstr "Hoffech chi barhau i greu ffeil PDF?"
 
-#: strings.hrc:51
+#: include/sfx2/strings.hrc:51
 msgctxt "STR_NEW_FILENAME_SAVE"
 msgid "If you do not want to overwrite the original document, you should save your work under a new filename."
 msgstr "Os nad ydych am drosysgrifo'r ddogfen wreiddiol, dylech gadw eich gwaith o dan enw ffeil newydd."
 
 #. Used in the title of a shared document.
-#: strings.hrc:53
+#: include/sfx2/strings.hrc:53
 msgctxt "STR_SHARED"
 msgid " (shared)"
 msgstr " (rhanedig)"
 
-#: strings.hrc:54
+#: include/sfx2/strings.hrc:54
 msgctxt "STR_XMLSEC_ODF12_EXPECTED"
 msgid "The document format version is set to ODF 1.1 (OpenOffice.org 2.x) in Tools-Options-Load/Save-General. Signing documents requires ODF 1.2 (OpenOffice.org 3.x)."
 msgstr "Mae fersiwn fformat y ddogfen wedi ei gosod i ODF 1.1 (OpenOffice.org 2.x) yn Offer-Dewisiada-Llwytho/Cadw-Cyffredinol. Mae llofnodi dogfennau'n gofyn am ODF 1.2 (OpenOffice.org 3.x)."
 
-#: strings.hrc:55
+#: include/sfx2/strings.hrc:55
 msgctxt "STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN"
 msgid ""
 "The document has to be saved before it can be signed. Saving the document removes all present signatures.\n"
@@ -179,73 +179,73 @@ msgstr ""
 "Mae'n rhaid cadw'r ddogfen hon cyn ei llofnodi. Bydd cadw'r ddogfen yn tynnu'r holl lofnodion presennol.\n"
 "Hoffech chi gadw'r ddogfen hon?"
 
-#: strings.hrc:56
+#: include/sfx2/strings.hrc:56
 msgctxt "STR_QRYTEMPL_MESSAGE"
 msgid "The template '$(ARG1)' on which this document is based, has been modified. Do you want to update style based formatting according to the modified template?"
 msgstr "Mae templed '$(ARG1)' y mae'r ddogfen hon wedi ei seilio arni, wedi ei newid. Hoffech chi ddiweddaru'r fformat sy'n seiliedig ar fformatio yn ôl y templed diwygiedig?"
 
-#: strings.hrc:57
+#: include/sfx2/strings.hrc:57
 msgctxt "STR_QRYTEMPL_UPDATE_BTN"
 msgid "~Update Styles"
 msgstr "~Diweddaru Arddull"
 
-#: strings.hrc:58
+#: include/sfx2/strings.hrc:58
 msgctxt "STR_QRYTEMPL_KEEP_BTN"
 msgid "~Keep Old Styles"
 msgstr "~Cadw'r Hen Arddull"
 
-#: strings.hrc:59
+#: include/sfx2/strings.hrc:59
 msgctxt "STR_ACTION_REFRESH"
 msgid "Refresh"
 msgstr "Adnewyddu"
 
 #. leave ending space
-#: strings.hrc:61
+#: include/sfx2/strings.hrc:61
 msgctxt "STR_ACTION_DEFAULT"
 msgid "Reset Default Template "
 msgstr "Ailosod y Templed Rhagosodedig "
 
-#: strings.hrc:62
+#: include/sfx2/strings.hrc:62
 msgctxt "STR_CATEGORY_NEW"
 msgid "New Category"
 msgstr "Categori Newydd"
 
-#: strings.hrc:63
+#: include/sfx2/strings.hrc:63
 msgctxt "STR_CATEGORY_DELETE"
 msgid "Delete Category"
 msgstr "Dileu Categori"
 
-#: strings.hrc:64
+#: include/sfx2/strings.hrc:64
 msgctxt "STR_CATEGORY_SELECT"
 msgid "Select Category"
 msgstr "Dewis Categori"
 
-#: strings.hrc:65
+#: include/sfx2/strings.hrc:65
 msgctxt "STR_MSG_EXPORT_SUCCESS"
 msgid "$1 templates successfully exported."
 msgstr "$1 templed wedi eu hallforio'n llwyddiannus."
 
-#: strings.hrc:66
+#: include/sfx2/strings.hrc:66
 msgctxt "STR_MSG_QUERY_COPY"
 msgid "$1 could not be moved to the category \"$2\". Do you want to copy the template instead?"
 msgstr "Nid oedd modd symud $1 i gategori \"$2\". Hoffech chi gopïo'r templed yn lle hynny?"
 
-#: strings.hrc:67
+#: include/sfx2/strings.hrc:67
 msgctxt "STR_CREATE_ERROR"
 msgid "Cannot create category: $1"
 msgstr "Methu creu categori: $1"
 
-#: strings.hrc:68
+#: include/sfx2/strings.hrc:68
 msgctxt "STR_ERROR_SAVEAS"
 msgid "Cannot save template: $1"
 msgstr "Methu cadw templed: $1"
 
-#: strings.hrc:69
+#: include/sfx2/strings.hrc:69
 msgctxt "STR_INPUT_NEW"
 msgid "Enter category name:"
 msgstr "Rhowch enw categori:"
 
-#: strings.hrc:70
+#: include/sfx2/strings.hrc:70
 msgctxt "STR_MSG_ERROR_LOCAL_MOVE"
 msgid ""
 "Error moving the following templates to $1.\n"
@@ -254,7 +254,7 @@ msgstr ""
 "Gwall wrth symud y templedi canlynol i $1.\n"
 "$2"
 
-#: strings.hrc:71
+#: include/sfx2/strings.hrc:71
 msgctxt "STR_MSG_ERROR_EXPORT"
 msgid ""
 "Error exporting the following templates:\n"
@@ -263,7 +263,7 @@ msgstr ""
 "Gwall wrth allforio'r templedi canlynol:\n"
 "$1"
 
-#: strings.hrc:72
+#: include/sfx2/strings.hrc:72
 msgctxt "STR_MSG_ERROR_IMPORT"
 msgid ""
 "Error importing the following templates to $1:\n"
@@ -272,7 +272,7 @@ msgstr ""
 "Gwall wrth fewnforio'r templedi canlynol i $1:\n"
 "$2"
 
-#: strings.hrc:73
+#: include/sfx2/strings.hrc:73
 msgctxt "STR_MSG_ERROR_DELETE_TEMPLATE"
 msgid ""
 "The following templates cannot be deleted:\n"
@@ -281,7 +281,7 @@ msgstr ""
 "Nid oes modd dileu'r templedi canlynol:\n"
 "$1"
 
-#: strings.hrc:74
+#: include/sfx2/strings.hrc:74
 msgctxt "STR_MSG_ERROR_DELETE_FOLDER"
 msgid ""
 "The following folders cannot be deleted:\n"
@@ -290,32 +290,32 @@ msgstr ""
 "Nid oes modd dileu'r ffolderi canlynol:\n"
 "$1"
 
-#: strings.hrc:75
+#: include/sfx2/strings.hrc:75
 msgctxt "STR_QMSG_SEL_FOLDER_DELETE"
 msgid "Do you want to delete the selected folders?"
 msgstr "Hoffech chi ddileu'r ffolderi hyn?"
 
-#: strings.hrc:76
+#: include/sfx2/strings.hrc:76
 msgctxt "STR_QMSG_TEMPLATE_OVERWRITE"
 msgid "A template named $1 already exist in $2. Do you want to overwrite it?"
 msgstr "Mae templed o'r enw $1 yn bodoli eisoes $2. Ydych chi am ei throsysgrifo?"
 
-#: strings.hrc:77
+#: include/sfx2/strings.hrc:77
 msgctxt "STR_QMSG_SEL_TEMPLATE_DELETE"
 msgid "Do you want to delete the selected templates?"
 msgstr "Hoffech chi ddileu'r templedi hyn?"
 
-#: strings.hrc:78
+#: include/sfx2/strings.hrc:78
 msgctxt "STR_QMSG_ERROR_OPENING_FILE"
 msgid "An error occurred during opening the file. This may be caused by incorrect file contents.\n"
 msgstr "Digwyddodd gwall wrth agor y ffeil. Gall hyn fod oherwydd cynnwys ffeil anghywir.\n"
 
-#: strings.hrc:79
+#: include/sfx2/strings.hrc:79
 msgctxt "STR_QMSG_ERROR_OPENING_FILE_DETAILS"
 msgid "The error details are:\n"
 msgstr "Manylion y gwall yw:\n"
 
-#: strings.hrc:80
+#: include/sfx2/strings.hrc:80
 msgctxt "STR_QMSG_ERROR_OPENING_FILE_CONTINUE"
 msgid ""
 "\n"
@@ -328,117 +328,117 @@ msgstr ""
 "\n"
 "Ydych chi am anwybyddu'r gwall a cheisio i barhau i lwytho'r ffeil?"
 
-#: strings.hrc:82
+#: include/sfx2/strings.hrc:82
 msgctxt "STR_HELP_WINDOW_TITLE"
 msgid "%PRODUCTNAME Help"
 msgstr "Cymorth %PRODUCTNAME"
 
-#: strings.hrc:83
+#: include/sfx2/strings.hrc:83
 msgctxt "STR_HELP_BUTTON_INDEX_ON"
 msgid "Show Navigation Pane"
 msgstr "Dangos Paen Dewisydd"
 
-#: strings.hrc:84
+#: include/sfx2/strings.hrc:84
 msgctxt "STR_HELP_BUTTON_INDEX_OFF"
 msgid "Hide Navigation Pane"
 msgstr "Cuddio Paen Dewis"
 
-#: strings.hrc:85
+#: include/sfx2/strings.hrc:85
 msgctxt "STR_HELP_BUTTON_START"
 msgid "First Page"
 msgstr "Tudalen Gyntaf"
 
-#: strings.hrc:86
+#: include/sfx2/strings.hrc:86
 msgctxt "STR_HELP_BUTTON_PREV"
 msgid "Previous Page"
 msgstr "Tudalen Flaenorol"
 
-#: strings.hrc:87
+#: include/sfx2/strings.hrc:87
 msgctxt "STR_HELP_BUTTON_NEXT"
 msgid "Next Page"
 msgstr "Tudalen Nesaf"
 
-#: strings.hrc:88
+#: include/sfx2/strings.hrc:88
 msgctxt "STR_HELP_BUTTON_PRINT"
 msgid "Print..."
 msgstr "Argraffu..."
 
-#: strings.hrc:89
+#: include/sfx2/strings.hrc:89
 msgctxt "STR_HELP_BUTTON_ADDBOOKMARK"
 msgid "Add to Bookmarks..."
 msgstr "Ychwanegu i Nodau Tudalen..."
 
-#: strings.hrc:90
+#: include/sfx2/strings.hrc:90
 msgctxt "STR_HELP_BUTTON_SEARCHDIALOG"
 msgid "Find on this Page..."
 msgstr "Canfod ar y Dudalen..."
 
-#: strings.hrc:91
+#: include/sfx2/strings.hrc:91
 msgctxt "STR_HELP_BUTTON_SOURCEVIEW"
 msgid "HTML Source"
 msgstr "Ffynhonnell HTML"
 
-#: strings.hrc:92
+#: include/sfx2/strings.hrc:92
 msgctxt "STR_HELP_MENU_TEXT_SELECTION_MODE"
 msgid "Select Text"
 msgstr "Dewis Testun"
 
-#: strings.hrc:93
+#: include/sfx2/strings.hrc:93
 msgctxt "STR_HELP_MENU_TEXT_COPY"
 msgid "~Copy"
 msgstr "~Copïo"
 
-#: strings.hrc:94
+#: include/sfx2/strings.hrc:94
 msgctxt "STR_INFO_NOSEARCHRESULTS"
 msgid "No topics found."
 msgstr "Heb ganfod pynciau."
 
-#: strings.hrc:95
+#: include/sfx2/strings.hrc:95
 msgctxt "STR_INFO_NOSEARCHTEXTFOUND"
 msgid "The text you entered was not found."
 msgstr "Nid rhestr elfennau'r testun rhoddwyd gennych."
 
-#: strings.hrc:96
+#: include/sfx2/strings.hrc:96
 msgctxt "RID_HELP_ONSTARTUP_TEXT"
 msgid "~Display %PRODUCTNAME %MODULENAME Help at Startup"
 msgstr "~Dangos Cymorth %PRODUCTNAME %MODULENAME wrth Gychwyn"
 
-#: strings.hrc:98
+#: include/sfx2/strings.hrc:98
 msgctxt "STR_NONAME"
 msgid "Untitled"
 msgstr "Dideitl"
 
-#: strings.hrc:99
+#: include/sfx2/strings.hrc:99
 msgctxt "STR_STANDARD_SHORTCUT"
 msgid "Standard"
 msgstr "Safonol"
 
-#: strings.hrc:100
+#: include/sfx2/strings.hrc:100
 msgctxt "STR_BYTES"
 msgid "Bytes"
 msgstr "Beitiau"
 
-#: strings.hrc:101
+#: include/sfx2/strings.hrc:101
 msgctxt "STR_KB"
 msgid "KB"
 msgstr "KB"
 
-#: strings.hrc:102
+#: include/sfx2/strings.hrc:102
 msgctxt "STR_MB"
 msgid "MB"
 msgstr "MB"
 
-#: strings.hrc:103
+#: include/sfx2/strings.hrc:103
 msgctxt "STR_GB"
 msgid "GB"
 msgstr "GB"
 
-#: strings.hrc:104
+#: include/sfx2/strings.hrc:104
 msgctxt "STR_QUERY_LASTVERSION"
 msgid "Cancel all changes?"
 msgstr "Diddymu pob newid?"
 
-#: strings.hrc:105
+#: include/sfx2/strings.hrc:105
 msgctxt "STR_NO_WEBBROWSER_FOUND"
 msgid ""
 "Opening \"$(ARG1)\" failed with error code $(ARG2) and message: \"$(ARG3)\"\n"
@@ -447,207 +447,207 @@ msgstr ""
 "Methwyd agor \"$(ARG1)\" gan adael cod gwall $(ARG2) a neges: \"$(ARG3)\"\n"
 "Efallai nad oedd modd canfod porwr gwe aer eich system. Os felly, gwiriwch eich Dewisiadau Bwrdd gwaith neu osod porwr gwe (e.e., Firefox) yn y lleoliad rhagosodedig wrth osod y porwr."
 
-#: strings.hrc:106
+#: include/sfx2/strings.hrc:106
 msgctxt "STR_NO_ABS_URI_REF"
 msgid "\"$(ARG1)\" is not an absolute URL that can be passed to an external application to open it."
 msgstr "Nid yw \"$(ARG1)\" yn URL absoliwt y mae modd ei basio i raglen allanol i'w agor."
 
-#: strings.hrc:107
+#: include/sfx2/strings.hrc:107
 msgctxt "STR_GID_INTERN"
 msgid "Internal"
 msgstr "Mewnol"
 
-#: strings.hrc:108
+#: include/sfx2/strings.hrc:108
 msgctxt "STR_GID_APPLICATION"
 msgid "Application"
 msgstr "Rhaglen"
 
-#: strings.hrc:109
+#: include/sfx2/strings.hrc:109
 msgctxt "STR_GID_VIEW"
 msgid "View"
 msgstr "Golwg"
 
-#: strings.hrc:110
+#: include/sfx2/strings.hrc:110
 msgctxt "STR_GID_DOCUMENT"
 msgid "Documents"
 msgstr "Dogfennau"
 
-#: strings.hrc:111
+#: include/sfx2/strings.hrc:111
 msgctxt "STR_GID_EDIT"
 msgid "Edit"
 msgstr "Golygu"
 
-#: strings.hrc:112
+#: include/sfx2/strings.hrc:112
 msgctxt "STR_GID_MACRO"
 msgid "BASIC"
 msgstr "BASIC"
 
-#: strings.hrc:113
+#: include/sfx2/strings.hrc:113
 msgctxt "STR_GID_OPTIONS"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: strings.hrc:114
+#: include/sfx2/strings.hrc:114
 msgctxt "STR_GID_MATH"
 msgid "Math"
 msgstr "Math"
 
-#: strings.hrc:115
+#: include/sfx2/strings.hrc:115
 msgctxt "STR_GID_NAVIGATOR"
 msgid "Navigate"
 msgstr "Llywio"
 
-#: strings.hrc:116
+#: include/sfx2/strings.hrc:116
 msgctxt "STR_GID_INSERT"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: strings.hrc:117
+#: include/sfx2/strings.hrc:117
 msgctxt "STR_GID_FORMAT"
 msgid "Format"
 msgstr "Fformat"
 
-#: strings.hrc:118
+#: include/sfx2/strings.hrc:118
 msgctxt "STR_GID_TEMPLATE"
 msgid "Templates"
 msgstr "Templedi"
 
-#: strings.hrc:119
+#: include/sfx2/strings.hrc:119
 msgctxt "STR_GID_TEXT"
 msgid "Text"
 msgstr "Testun"
 
-#: strings.hrc:120
+#: include/sfx2/strings.hrc:120
 msgctxt "STR_GID_FRAME"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: strings.hrc:121
+#: include/sfx2/strings.hrc:121
 msgctxt "STR_GID_GRAPHIC"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:122
+#: include/sfx2/strings.hrc:122
 msgctxt "STR_GID_TABLE"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:123
+#: include/sfx2/strings.hrc:123
 msgctxt "STR_GID_ENUMERATION"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: strings.hrc:124
+#: include/sfx2/strings.hrc:124
 msgctxt "STR_GID_DATA"
 msgid "Data"
 msgstr "Data"
 
-#: strings.hrc:125
+#: include/sfx2/strings.hrc:125
 msgctxt "STR_GID_SPECIAL"
 msgid "Special Functions"
 msgstr "Swyddogaethau Arbennig"
 
-#: strings.hrc:126
+#: include/sfx2/strings.hrc:126
 msgctxt "STR_GID_IMAGE"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:127
+#: include/sfx2/strings.hrc:127
 msgctxt "STR_GID_CHART"
 msgid "Chart"
 msgstr "Siart"
 
-#: strings.hrc:128
+#: include/sfx2/strings.hrc:128
 msgctxt "STR_GID_EXPLORER"
 msgid "Explorer"
 msgstr "Explorer"
 
-#: strings.hrc:129
+#: include/sfx2/strings.hrc:129
 msgctxt "STR_GID_CONNECTOR"
 msgid "Connector"
 msgstr "Cysylltydd"
 
-#: strings.hrc:130
+#: include/sfx2/strings.hrc:130
 msgctxt "STR_GID_MODIFY"
 msgid "Modify"
 msgstr "Newid"
 
-#: strings.hrc:131
+#: include/sfx2/strings.hrc:131
 msgctxt "STR_GID_DRAWING"
 msgid "Drawing"
 msgstr "Lluniadu"
 
-#: strings.hrc:132
+#: include/sfx2/strings.hrc:132
 msgctxt "STR_GID_CONTROLS"
 msgid "Controls"
 msgstr "Rheolydd"
 
-#: strings.hrc:133
+#: include/sfx2/strings.hrc:133
 msgctxt "STR_QUITAPP"
 msgid "E~xit %PRODUCTNAME"
 msgstr "~Gadael %PRODUCTNAME"
 
-#: strings.hrc:134
+#: include/sfx2/strings.hrc:134
 msgctxt "RID_STR_HELP"
 msgid "Help"
 msgstr "Cymorth"
 
-#: strings.hrc:135
+#: include/sfx2/strings.hrc:135
 msgctxt "RID_STR_HLPFILENOTEXIST"
 msgid "The help file for this topic is not installed."
 msgstr "Nid yw'r ffeil cymorth ar gyfer y pwnc wedi ei osod."
 
-#: strings.hrc:136
+#: include/sfx2/strings.hrc:136
 msgctxt "STR_QUICKSTART_EXIT"
 msgid "Exit Quickstarter"
 msgstr "Gadael Cychwyn Cyflym"
 
-#: strings.hrc:137
+#: include/sfx2/strings.hrc:137
 msgctxt "STR_QUICKSTART_TIP"
 msgid "%PRODUCTNAME %PRODUCTVERSION Quickstarter"
 msgstr "Cychwyn Cyflym %PRODUCTNAME %PRODUCTVERSION"
 
-#: strings.hrc:138
+#: include/sfx2/strings.hrc:138
 msgctxt "STR_QUICKSTART_FILEOPEN"
 msgid "Open Document..."
 msgstr "Agor Dogfen..."
 
-#: strings.hrc:139
+#: include/sfx2/strings.hrc:139
 msgctxt "STR_QUICKSTART_FROMTEMPLATE"
 msgid "From Template..."
 msgstr "O Dempled..."
 
-#: strings.hrc:140
+#: include/sfx2/strings.hrc:140
 msgctxt "STR_QUICKSTART_PRELAUNCH"
 msgid "Load %PRODUCTNAME During System Start-Up"
 msgstr "Llwytho %PRODUCTNAME Wrth Gychwyn y System"
 
-#: strings.hrc:141
+#: include/sfx2/strings.hrc:141
 msgctxt "STR_QUICKSTART_PRELAUNCH_UNX"
 msgid "Disable systray Quickstarter"
 msgstr "Atal Cychwyn Cyflym systray"
 
-#: strings.hrc:142
+#: include/sfx2/strings.hrc:142
 msgctxt "STR_QUICKSTART_LNKNAME"
 msgid "%PRODUCTNAME %PRODUCTVERSION"
 msgstr "%PRODUCTNAME %PRODUCTVERSION"
 
-#: strings.hrc:143
+#: include/sfx2/strings.hrc:143
 msgctxt "STR_QUICKSTART_FILE"
 msgid "File"
 msgstr "Ffeil"
 
-#: strings.hrc:144
+#: include/sfx2/strings.hrc:144
 msgctxt "STR_QUICKSTART_STARTCENTER"
 msgid "Startcenter"
 msgstr "CanolfanCychwyn"
 
-#: strings.hrc:145
+#: include/sfx2/strings.hrc:145
 msgctxt "STR_QUICKSTART_RECENTDOC"
 msgid "Recent Documents"
 msgstr "Dogfennau Diweddar"
 
-#: strings.hrc:146
+#: include/sfx2/strings.hrc:146
 msgctxt "STR_QUERY_UPDATE_LINKS"
 msgid ""
 "This document contains one or more links to external data.\n"
@@ -660,12 +660,12 @@ msgstr ""
 "Hoffech chi newid y ddogfen, a diweddaru pob cysylltiad\n"
 "i estyn y data mwyaf diweddar?"
 
-#: strings.hrc:147
+#: include/sfx2/strings.hrc:147
 msgctxt "STR_DDE_ERROR"
 msgid "DDE link to %1 for %2 area %3 are not available."
 msgstr "Nid yw'r cysylltiad DDE i %1 ar gyfer ardal %2 %3 ar gael."
 
-#: strings.hrc:148
+#: include/sfx2/strings.hrc:148
 msgctxt "STR_SECURITY_WARNING_NO_HYPERLINKS"
 msgid ""
 "For security reasons, the hyperlink cannot be executed.\n"
@@ -674,12 +674,12 @@ msgstr ""
 "Am resymau diogelwch, nid oes modd gweithredu'r ddolen.\n"
 "Ni fydd y cyfeiriad hwn yn cael ei agor."
 
-#: strings.hrc:149
+#: include/sfx2/strings.hrc:149
 msgctxt "RID_SECURITY_WARNING_TITLE"
 msgid "Security Warning"
 msgstr "Rhybudd Diogelwch"
 
-#: strings.hrc:150
+#: include/sfx2/strings.hrc:150
 msgctxt "RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE"
 msgid ""
 "Saving will remove all existing signatures.\n"
@@ -688,7 +688,7 @@ msgstr ""
 "Bydd cadw yn tynnu'r holl lofnodion presennol.\n"
 "Ydych am barhau i gadw'r ddogfen?"
 
-#: strings.hrc:151
+#: include/sfx2/strings.hrc:151
 msgctxt "RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN"
 msgid ""
 "The document has to be saved before it can be signed.\n"
@@ -697,7 +697,7 @@ msgstr ""
 "Rhaid cadw'r ddogfen cyn ei llofnodi.\n"
 "Hoffech chi gadw'r ddogfen?"
 
-#: strings.hrc:152
+#: include/sfx2/strings.hrc:152
 msgctxt "STR_QUERY_CANCELCHECKOUT"
 msgid ""
 "This will discard all changes on the server since check-out.\n"
@@ -706,58 +706,58 @@ msgstr ""
 "Bydd hyn yn hepgor pob newid ar y gweinydd ers allgofnodi.\n"
 "Parhau?"
 
-#: strings.hrc:153
+#: include/sfx2/strings.hrc:153
 msgctxt "STR_INFO_WRONGDOCFORMAT"
 msgid "This document must be saved in OpenDocument file format before it can be digitally signed."
 msgstr "Rhaid cadw'r ddogfen yn fformat ffeil OpenDocument cyn bod modd iddi gael ei llofnodi'n ddigidol."
 
-#: strings.hrc:154
+#: include/sfx2/strings.hrc:154
 msgctxt "RID_XMLSEC_DOCUMENTSIGNED"
 msgid " (Signed)"
 msgstr " (Llofnodwyd)"
 
-#: strings.hrc:155
+#: include/sfx2/strings.hrc:155
 msgctxt "STR_EMBEDDED_TITLE"
 msgid " (Embedded document)"
 msgstr " (Dogfen wedi ei mewnblannu)"
 
-#: strings.hrc:156
+#: include/sfx2/strings.hrc:156
 msgctxt "STR_STANDARD"
 msgid "Standard"
 msgstr "Safonol"
 
-#: strings.hrc:157
+#: include/sfx2/strings.hrc:157
 msgctxt "RID_SVXSTR_FILELINK"
 msgid "Document"
 msgstr "Dogfen"
 
-#: strings.hrc:158
+#: include/sfx2/strings.hrc:158
 msgctxt "STR_NONE"
 msgid "- None -"
 msgstr "- Dim -"
 
-#: strings.hrc:159
+#: include/sfx2/strings.hrc:159
 msgctxt "RID_SVXSTR_GRAFIKLINK"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:160
+#: include/sfx2/strings.hrc:160
 msgctxt "STR_SFX_FILTERNAME_ALL"
 msgid "All files"
 msgstr "Pob ffeil"
 
-#: strings.hrc:161
+#: include/sfx2/strings.hrc:161
 msgctxt "STR_SFX_FILTERNAME_PDF"
 msgid "PDF files"
 msgstr "Ffeiliau PDF"
 
-#: strings.hrc:162
+#: include/sfx2/strings.hrc:162
 msgctxt "RID_SVXSTR_EDITGRFLINK"
 msgid "Link Image"
 msgstr "Cysylltu Delwedd"
 
 #. i66948 used in project scripting
-#: strings.hrc:164
+#: include/sfx2/strings.hrc:164
 msgctxt "STR_ERRUNOEVENTBINDUNG"
 msgid ""
 "An appropriate component method %1\n"
@@ -770,32 +770,32 @@ msgstr ""
 "\n"
 "Gwiriwch sillafu enw'r dull."
 
-#: strings.hrc:165
+#: include/sfx2/strings.hrc:165
 msgctxt "RID_SVXSTR_GRFILTER_OPENERROR"
 msgid "Image file cannot be opened"
 msgstr "Methu agor y ffeil delwedd"
 
-#: strings.hrc:166
+#: include/sfx2/strings.hrc:166
 msgctxt "RID_SVXSTR_GRFILTER_IOERROR"
 msgid "Image file cannot be read"
 msgstr "Methu darllen y ffeil delwedd"
 
-#: strings.hrc:167
+#: include/sfx2/strings.hrc:167
 msgctxt "RID_SVXSTR_GRFILTER_FORMATERROR"
 msgid "Unknown image format"
 msgstr "Fformat delwedd anhysbys"
 
-#: strings.hrc:168
+#: include/sfx2/strings.hrc:168
 msgctxt "RID_SVXSTR_GRFILTER_VERSIONERROR"
 msgid "This version of the image file is not supported"
 msgstr "Nid yw'r fersiwn ffeil delwedd hon yn cael ei chynnal"
 
-#: strings.hrc:169
+#: include/sfx2/strings.hrc:169
 msgctxt "RID_SVXSTR_GRFILTER_FILTERERROR"
 msgid "Image filter not found"
 msgstr "Heb ganfod hidl delwedd"
 
-#: strings.hrc:170
+#: include/sfx2/strings.hrc:170
 msgctxt "RID_SVXSTR_END_REDLINING_WARNING"
 msgid ""
 "This action will exit the change recording mode.\n"
@@ -810,37 +810,37 @@ msgstr ""
 " Gadael modd recordio newid?\n"
 "\n"
 
-#: strings.hrc:171
+#: include/sfx2/strings.hrc:171
 msgctxt "RID_SVXSTR_INCORRECT_PASSWORD"
 msgid "Incorrect password"
 msgstr "Cyfrinair anghywir"
 
-#: strings.hrc:172
+#: include/sfx2/strings.hrc:172
 msgctxt "RID_SVXSTR_GPG_ENCRYPT_FAILURE"
 msgid "OpenPGP key not trusted, damaged, or encryption failure. Please try again."
 msgstr "NId yw'r allwedd OpenPGP yn ddibynadwy, mae wedi ei ddifrodi neu wall amgryptio. Ceisiwch eto."
 
-#: strings.hrc:174
+#: include/sfx2/strings.hrc:174
 msgctxt "STR_PASSWD_MIN_LEN"
 msgid "(Minimum $(MINLEN) characters)"
 msgstr "(Isafswm $(MINLEN) nod)"
 
-#: strings.hrc:175
+#: include/sfx2/strings.hrc:175
 msgctxt "STR_PASSWD_MIN_LEN1"
 msgid "(Minimum 1 character)"
 msgstr "(Lleiafswm o 1 nod)"
 
-#: strings.hrc:176
+#: include/sfx2/strings.hrc:176
 msgctxt "STR_PASSWD_EMPTY"
 msgid "(The password can be empty)"
 msgstr "(Gall y cyfrinair fod yn wag)"
 
-#: strings.hrc:177
+#: include/sfx2/strings.hrc:177
 msgctxt "STR_MODULENOTINSTALLED"
 msgid "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed."
 msgstr "Methu gweithredu'r weithred. Nid yw'r modiwl rhaglen %PRODUCTNAME angenrheidiol ar gyfer y weithred wedi ei osod."
 
-#: strings.hrc:179
+#: include/sfx2/strings.hrc:179
 msgctxt "STR_FILTER_NOT_INSTALLED"
 msgid ""
 "The selected filter $(FILTER) has not been installed.\n"
@@ -849,7 +849,7 @@ msgstr ""
 "Nid yw'r hid yma $(FILTER) wedi ei osod.\n"
 "Hoffech chi wneud hyn?"
 
-#: strings.hrc:180
+#: include/sfx2/strings.hrc:180
 msgctxt "STR_FILTER_CONSULT_SERVICE"
 msgid ""
 "The selected filter $(FILTER) is not included in your edition.\n"
@@ -858,72 +858,72 @@ msgstr ""
 "Nid yw'r hidl $(FILTER) wedi ei gynnwys yn eich rhifyn.\n"
 "Mae gwybodaeth am archebion i'w cael ar eich tudalen cartref."
 
-#: strings.hrc:182
+#: include/sfx2/strings.hrc:182
 msgctxt "STR_WELCOME_LINE1"
 msgid "Welcome to %PRODUCTNAME."
 msgstr "Croeso i %PRODUCTNAME."
 
-#: strings.hrc:183
+#: include/sfx2/strings.hrc:183
 msgctxt "STR_WELCOME_LINE2"
 msgid "Drop a document here or pick an app from the left side to create one."
 msgstr "Gollyngwch ddogfen yma neu ddewis ap o'r ochr chwith i greu un."
 
-#: strings.hrc:185
+#: include/sfx2/strings.hrc:185
 msgctxt "STR_SFX_FILEDLG_ACTUALVERSION"
 msgid "Current version"
 msgstr "Fersiwn presennol"
 
-#: strings.hrc:186
+#: include/sfx2/strings.hrc:186
 msgctxt "STR_SFX_EXPLORERFILE_EXPORT"
 msgid "Export"
 msgstr "Allforio"
 
-#: strings.hrc:187
+#: include/sfx2/strings.hrc:187
 msgctxt "STR_SFX_EXPLORERFILE_INSERT"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: strings.hrc:188
+#: include/sfx2/strings.hrc:188
 msgctxt "STR_SFX_EXPLORERFILE_BUTTONINSERT"
 msgid "~Insert"
 msgstr "~Mewnosod"
 
-#: strings.hrc:189
+#: include/sfx2/strings.hrc:189
 msgctxt "STR_SFX_IMPORT_ALL"
 msgid "<All formats>"
 msgstr "<Pob fformat>"
 
-#: strings.hrc:190
+#: include/sfx2/strings.hrc:190
 msgctxt "STR_PB_SAVEACOPY"
 msgid "Save a Copy"
 msgstr "Cadw Copi"
 
-#: strings.hrc:191
+#: include/sfx2/strings.hrc:191
 msgctxt "STR_PB_COMPAREDOC"
 msgid "Compare to"
 msgstr "Cymharu â"
 
-#: strings.hrc:192
+#: include/sfx2/strings.hrc:192
 msgctxt "STR_PB_MERGEDOC"
 msgid "Merge with"
 msgstr "Uno gyda"
 
-#: strings.hrc:194
+#: include/sfx2/strings.hrc:194
 msgctxt "STR_SFX_NEWOFFICEDOC"
 msgid "%PRODUCTNAME document"
 msgstr "Dogfen %PRODUCTNAME"
 
-#: strings.hrc:195
+#: include/sfx2/strings.hrc:195
 msgctxt "SFX_ST_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:196
+#: include/sfx2/strings.hrc:196
 msgctxt "STR_SFX_REMOVE_PROPERTY"
 msgid "Remove Property"
 msgstr "Tynnu'r Priodwedd"
 
-#: strings.hrc:197
+#: include/sfx2/strings.hrc:197
 msgctxt "STR_SFX_QUERY_WRONG_TYPE"
 msgid ""
 "The value entered does not match the specified type.\n"
@@ -932,27 +932,27 @@ msgstr ""
 "Nid yw'r gwerth rhoddwyd yn cyd-fynd a'r math a benodwyd.\n"
 "Bydd y gwerth yn cael ei gadw fel testun."
 
-#: strings.hrc:199
+#: include/sfx2/strings.hrc:199
 msgctxt "STR_QUERY_OVERWRITE"
 msgid "Style already exists. Overwrite?"
 msgstr "Mae'r Arddull yn bodoli eisoes. Trosysgrifo?"
 
-#: strings.hrc:201
+#: include/sfx2/strings.hrc:201
 msgctxt "STR_RESET"
 msgid "~Reset"
 msgstr "~Ailosod"
 
-#: strings.hrc:202
+#: include/sfx2/strings.hrc:202
 msgctxt "STR_TABPAGE_INVALIDNAME"
 msgid "This name is already in use."
 msgstr "Mae'r enw'n cael ei ddefnyddio eisoes."
 
-#: strings.hrc:203
+#: include/sfx2/strings.hrc:203
 msgctxt "STR_TABPAGE_INVALIDSTYLE"
 msgid "This Style does not exist."
 msgstr "Nid yw'r Arddull yn bodoli."
 
-#: strings.hrc:204
+#: include/sfx2/strings.hrc:204
 msgctxt "STR_TABPAGE_INVALIDPARENT"
 msgid ""
 "This Style cannot be used as a base Style,\n"
@@ -961,7 +961,7 @@ msgstr ""
 "Nid oes modd defnyddio'r Arddull fel yr Arddull sail;\n"
 "gan y byddai'n arwain at gyfeiriad ailadroddus."
 
-#: strings.hrc:205
+#: include/sfx2/strings.hrc:205
 msgctxt "STR_POOL_STYLE_NAME"
 msgid ""
 "Name already exists as a default Style.\n"
@@ -970,7 +970,7 @@ msgstr ""
 "Mae'r enw'n bodoli fel Arddull rhagosodedig eisoes.\n"
 "Dewiswch enw arall."
 
-#: strings.hrc:206
+#: include/sfx2/strings.hrc:206
 msgctxt "STR_DELETE_STYLE_USED"
 msgid ""
 "One or more of the selected styles is in use in this document.\n"
@@ -981,92 +981,87 @@ msgstr ""
 "hon. Os fyddwch yn dileu'r arddulliau hyn, bydd y testun yn dychwelyd\n"
 "i'r arddull rhiant. Hoffech chi ddileu'r arddulliau hyn?\n"
 
-#: strings.hrc:207
+#: include/sfx2/strings.hrc:207
 msgctxt "STR_DELETE_STYLE"
 msgid "Styles in use: "
 msgstr "Arddulliau ar waith: "
 
-#: strings.hrc:208
+#: include/sfx2/strings.hrc:208
 msgctxt "STR_SID_NAVIGATOR"
 msgid "Navigator"
 msgstr "Dewisydd"
 
-#: strings.hrc:209
-msgctxt "STR_SID_SIDEBAR"
-msgid "Sidebar"
-msgstr "Bar Ochr"
-
-#: strings.hrc:210
+#: include/sfx2/strings.hrc:209
 msgctxt "STR_ERROR_WRONG_CONFIRM"
 msgid "Faulty password confirmation"
 msgstr "Cadarnhad cyfrinair gwallus"
 
-#: strings.hrc:211
+#: include/sfx2/strings.hrc:210
 msgctxt "STR_PDF_EXPORT_SEND"
 msgid "Send"
 msgstr "Anfon"
 
-#: strings.hrc:212
+#: include/sfx2/strings.hrc:211
 msgctxt "STR_FONT_TABPAGE"
 msgid "Font"
 msgstr "Ffont"
 
-#: strings.hrc:213
+#: include/sfx2/strings.hrc:212
 msgctxt "STR_PREVIEW_CHECKBOX"
 msgid "Show Previews"
 msgstr "Dangos Rhagolwg"
 
-#: strings.hrc:215
+#: include/sfx2/strings.hrc:214
 msgctxt "STR_VIEWVERSIONCOMMENT"
 msgid "View Version Comment"
 msgstr "Mewnosod Sylwadau'r Fersiwn"
 
-#: strings.hrc:216
+#: include/sfx2/strings.hrc:215
 msgctxt "STR_NO_NAME_SET"
 msgid "(no name set)"
 msgstr "(dim enw wedi ei osod)"
 
-#: strings.hrc:218
+#: include/sfx2/strings.hrc:217
 msgctxt "STR_STYLE_ELEMTLIST"
 msgid "Style List"
 msgstr "Rhestr Arddulliau"
 
-#: strings.hrc:219
+#: include/sfx2/strings.hrc:218
 msgctxt "STR_STYLE_FILTER_HIERARCHICAL"
 msgid "Hierarchical"
 msgstr "Hierarchaidd"
 
-#: strings.hrc:220
+#: include/sfx2/strings.hrc:219
 msgctxt "STR_STYLE_FILL_FORMAT_MODE"
 msgid "Fill Format Mode"
 msgstr "Modd Fformat Llanw"
 
-#: strings.hrc:221
+#: include/sfx2/strings.hrc:220
 msgctxt "STR_STYLE_NEW_STYLE_FROM_SELECTION"
 msgid "New Style from Selection"
 msgstr "Arddull Newydd o'r Dewis"
 
-#: strings.hrc:222
+#: include/sfx2/strings.hrc:221
 msgctxt "STR_STYLE_UPDATE_STYLE"
 msgid "Update Style"
 msgstr "Diweddaru Arddull"
 
-#: strings.hrc:224
+#: include/sfx2/strings.hrc:223
 msgctxt "STR_MACRO_LOSS"
 msgid "Do you really want to cancel the recording? Any steps recorded up to this point will be lost."
 msgstr "Ydych wir am diddymu'r recordio? Bydd unrhyw gamau wedi eu recordio hyd yma yn cael eu colli."
 
-#: strings.hrc:225
+#: include/sfx2/strings.hrc:224
 msgctxt "STR_CANCEL_RECORDING"
 msgid "Cancel Recording"
 msgstr "Diddymu Recordio"
 
-#: strings.hrc:227
+#: include/sfx2/strings.hrc:226
 msgctxt "RID_CNT_STR_WAITING"
 msgid "The templates are being initialized for first-time usage."
 msgstr "Mae'r templedi'n cael eu cychwyn ar gyfer defnydd cyntaf."
 
-#: strings.hrc:229
+#: include/sfx2/strings.hrc:228
 msgctxt "STR_NODEFPRINTER"
 msgid ""
 "No default printer found.\n"
@@ -1075,7 +1070,7 @@ msgstr ""
 "Heb ganfod argraffydd rhagosodedig.\n"
 "Dewiswch argraffydd a cheisiwch eto."
 
-#: strings.hrc:230
+#: include/sfx2/strings.hrc:229
 msgctxt "STR_NOSTARTPRINTER"
 msgid ""
 "Could not start printer.\n"
@@ -1084,17 +1079,17 @@ msgstr ""
 "Methu cychwyn yr argraffydd.\n"
 "Gwiriwch ffurfweddiad eich argraffydd."
 
-#: strings.hrc:231
+#: include/sfx2/strings.hrc:230
 msgctxt "STR_ERROR_PRINTER_BUSY"
 msgid "Printer busy"
 msgstr "Argraffydd yn brysur"
 
-#: strings.hrc:232
+#: include/sfx2/strings.hrc:231
 msgctxt "STR_READONLY"
 msgid " (read-only)"
 msgstr " (darllen yn unig)"
 
-#: strings.hrc:233
+#: include/sfx2/strings.hrc:232
 msgctxt "STR_PRINT_NEWORI"
 msgid ""
 "The page size and orientation have been modified.\n"
@@ -1105,7 +1100,7 @@ msgstr ""
 "A ddylai'r gosodiadau newydd gael eu cadw\n"
 "yn y ddogfen bresennol?"
 
-#: strings.hrc:234
+#: include/sfx2/strings.hrc:233
 msgctxt "STR_PRINT_NEWSIZE"
 msgid ""
 "The page size has been modified.\n"
@@ -1116,7 +1111,7 @@ msgstr ""
 "A ddylai'r gosodiadau newydd gael eu cadw\n"
 "yn y ddogfen bresennol?"
 
-#: strings.hrc:235
+#: include/sfx2/strings.hrc:234
 msgctxt "STR_PRINT_NEWORISIZE"
 msgid ""
 "The page size and orientation have been modified.\n"
@@ -1127,7 +1122,7 @@ msgstr ""
 "A ddylai'r gosodiadau newydd gael eu cadw\n"
 "yn y ddogfen bresennol?"
 
-#: strings.hrc:236
+#: include/sfx2/strings.hrc:235
 msgctxt "STR_CANT_CLOSE"
 msgid ""
 "The document cannot be closed because a\n"
@@ -1136,7 +1131,7 @@ msgstr ""
 "Nid oes modd cau'r ddogfen gan fod gwaith\n"
 "argraffu'n digwydd."
 
-#: strings.hrc:237
+#: include/sfx2/strings.hrc:236
 msgctxt "STR_ERROR_SEND_MAIL"
 msgid ""
 "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\n"
@@ -1145,1029 +1140,1087 @@ msgstr ""
 "Digwyddodd gwall wrth anfon neges. Gall fod oherwydd cyfrif defnyddiwr coll neu osodiad diffygiol.\n"
 "Gwiriwch osodiadau %PRODUCTNAME neu osodiadau eich rhaglen e-bost."
 
-#: strings.hrc:238
+#. Error codes look like "MAPI_E_FAILURE" or "1234"
+#: include/sfx2/strings.hrc:238
+msgctxt "STR_ERROR_SEND_MAIL_CODE"
+msgid ""
+"An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\n"
+"\n"
+"Error code is $1"
+msgstr ""
+"Digwyddodd gwall wrth anfon y neges. Gall gwallau posib fod yn gyfrif defnyddiwr coll neu osodiad anghywir.\n"
+"\n"
+"Cod gwall yw $1"
+
+#: include/sfx2/strings.hrc:239
+msgctxt "STR_ERROR_SEND_MAIL_HEADER"
+msgid "Error sending mail"
+msgstr "Gwall anfon e-bost"
+
+#: include/sfx2/strings.hrc:240
 msgctxt "STR_QUERY_OPENASTEMPLATE"
 msgid "This document cannot be edited, possibly due to missing access rights. Do you want to edit a copy of the document?"
 msgstr "Nid oes modd golygu'r ddogfen, efallai oherwydd hawl mynediad coll. Hoffech chi olygu copi o'r ddogfen?"
 
-#: strings.hrc:239
+#: include/sfx2/strings.hrc:241
+msgctxt "STR_QUERY_OPENASTEMPLATE_ALLOW_IGNORE"
+msgid ""
+"This document cannot be edited, because it is locked in another session. Do you want to edit a copy of the document?\n"
+"\n"
+"You can also try to ignore the lock and open the file for editing."
+msgstr ""
+"Nid oes modd golygu'r ddogfen hon, gan ei bod wedi ei chloi mewn sesiwn arall. Hoffech chi olygu copi o'r ddogfen?\n"
+"\n"
+"Gallwch hefyd geisio anwybyddu'r clo ac agor y ffeil i'w golygu."
+
+#: include/sfx2/strings.hrc:242
+msgctxt "STR_QUERY_OPENASTEMPLATE_OPENCOPY_BTN"
+msgid "Open ~Copy"
+msgstr "Agor ~Copi"
+
+#: include/sfx2/strings.hrc:243
+msgctxt "STR_QUERY_OPENASTEMPLATE_OPEN_BTN"
+msgid "~Open"
+msgstr "~Agor"
+
+#: include/sfx2/strings.hrc:244
 msgctxt "STR_REPAIREDDOCUMENT"
 msgid " (repaired document)"
 msgstr " (dogfen wedi ei thrwsio)"
 
-#: strings.hrc:240
+#: include/sfx2/strings.hrc:245
 msgctxt "STR_NONCHECKEDOUT_DOCUMENT"
 msgid "This document is not checked out on the server."
 msgstr "Nid yw'r ddogfen wedi ei ryddhau o'r gweinydd."
 
-#: strings.hrc:241
+#: include/sfx2/strings.hrc:246
 msgctxt "STR_READONLY_DOCUMENT"
 msgid "This document is open in read-only mode."
 msgstr "Dogfen wedi ei hagor yn y modd darllen yn unig."
 
-#: strings.hrc:242
+#: include/sfx2/strings.hrc:247
 msgctxt "STR_READONLY_PDF"
 msgid "This PDF is open in read-only mode to allow signing the existing file."
 msgstr "Mae'r PDF hwn ar agor yn y modd darllen yn unig er mwyn caniatau llofnodi'r ffeil gyfredol."
 
-#: strings.hrc:243
+#: include/sfx2/strings.hrc:248
 msgctxt "STR_CLASSIFIED_DOCUMENT"
 msgid "The classification label of this document is %1."
 msgstr "Label dosbarthiad y ddogfen yw %1."
 
-#: strings.hrc:244
+#: include/sfx2/strings.hrc:249
 msgctxt "STR_TARGET_DOC_NOT_CLASSIFIED"
 msgid "This document must be classified before the clipboard can be pasted."
 msgstr "Rhaid i'r ddogfen gael dosbarthiad cyn fod modd gludo'r clipfwrdd."
 
-#: strings.hrc:245
+#: include/sfx2/strings.hrc:250
 msgctxt "STR_DOC_CLASSIFICATION_TOO_LOW"
 msgid "This document has a lower classification level than the clipboard."
 msgstr "Mae gan y ddogfen lefel dosbarthiad is na'r clipfwrdd."
 
-#: strings.hrc:246
+#: include/sfx2/strings.hrc:251
 msgctxt "STR_CLASSIFIED_INTELLECTUAL_PROPERTY"
-msgid "Intellectual Property:"
-msgstr "Eiddo Deallusol:"
+msgid "Level"
+msgstr "Lefel"
 
-#: strings.hrc:247
+#: include/sfx2/strings.hrc:252
 msgctxt "STR_CLASSIFIED_NATIONAL_SECURITY"
 msgid "National Security:"
 msgstr "Diogelwch Gwladol:"
 
-#: strings.hrc:248
+#: include/sfx2/strings.hrc:253
 msgctxt "STR_CLASSIFIED_EXPORT_CONTROL"
 msgid "Export Control:"
 msgstr "Rheoli Allforio:"
 
-#: strings.hrc:249
+#: include/sfx2/strings.hrc:254
 msgctxt "STR_CHECKOUT"
 msgid "Check Out"
 msgstr "Gadael"
 
-#: strings.hrc:250
+#: include/sfx2/strings.hrc:255
 msgctxt "STR_READONLY_EDIT"
 msgid "Edit Document"
 msgstr "Golygu Dogfen"
 
-#: strings.hrc:251
+#: include/sfx2/strings.hrc:256
 msgctxt "STR_READONLY_SIGN"
 msgid "Sign Document"
 msgstr "Llofnodi Dogfen"
 
-#: strings.hrc:252
+#: include/sfx2/strings.hrc:257
 msgctxt "STR_SIGNATURE_BROKEN"
 msgid "This document has an invalid signature."
 msgstr "Mae gan y ddogfen hon lofnod annilys."
 
-#: strings.hrc:253
+#: include/sfx2/strings.hrc:258
 msgctxt "STR_SIGNATURE_INVALID"
 msgid "The signature was valid, but the document has been modified"
 msgstr "Roedd y llofnod y ddilys, ond mae'r ddogfen wedi ei newid"
 
-#: strings.hrc:254
+#: include/sfx2/strings.hrc:259
 msgctxt "STR_SIGNATURE_NOTVALIDATED"
 msgid "The signature is OK, but the certificate could not be validated."
 msgstr "Mae'r llofnod yn iawn, ond nid oedd modd dilysu'r dystysgrif."
 
-#: strings.hrc:255
+#: include/sfx2/strings.hrc:260
 msgctxt "STR_SIGNATURE_PARTIAL_OK"
 msgid "The signature is OK, but the document is only partially signed."
 msgstr "Mae'r llofnod yn iawn, ond dim ond yn rhannol mae'r ddogfen wedi ei llofnodi."
 
-#: strings.hrc:256
+#: include/sfx2/strings.hrc:261
 msgctxt "STR_SIGNATURE_OK"
 msgid "This document is digitally signed and the signature is valid."
 msgstr "Mae'r ddogfen wedi ei llofnodi'n ddigidol ac mae'r lofnod yn ddilys."
 
-#: strings.hrc:257
+#: include/sfx2/strings.hrc:262
 msgctxt "STR_SIGNATURE_SHOW"
 msgid "Show Signatures"
 msgstr "Dangos Llofnodion"
 
-#: strings.hrc:259
+#: include/sfx2/strings.hrc:264
 msgctxt "STR_CLOSE_PANE"
 msgid "Close Pane"
 msgstr "Cau'r Paen"
 
-#: strings.hrc:260
+#: include/sfx2/strings.hrc:265
 msgctxt "STR_SFX_DOCK"
 msgid "Dock"
 msgstr "Doc"
 
-#: strings.hrc:261
+#: include/sfx2/strings.hrc:266
 msgctxt "STR_SFX_UNDOCK"
 msgid "Undock"
 msgstr "Dad-ddocio"
 
-#: strings.hrc:263
+#: include/sfx2/strings.hrc:268
 msgctxt "SFX_STR_SIDEBAR_MORE_OPTIONS"
 msgid "More Options"
 msgstr "Rhagor o Ddewis"
 
-#: strings.hrc:264
+#: include/sfx2/strings.hrc:269
 msgctxt "SFX_STR_SIDEBAR_CLOSE_DECK"
 msgid "Close Sidebar Deck"
 msgstr "Cau'r Bar Ochr"
 
-#: strings.hrc:265
+#: include/sfx2/strings.hrc:270
 msgctxt "SFX_STR_SIDEBAR_SETTINGS"
 msgid "Sidebar Settings"
 msgstr "Gosodiadau'r Bar Ochr"
 
-#: strings.hrc:266
+#: include/sfx2/strings.hrc:271
 msgctxt "SFX_STR_SIDEBAR_CUSTOMIZATION"
 msgid "Customization"
 msgstr "Cyfaddasu"
 
-#: strings.hrc:267
+#: include/sfx2/strings.hrc:272
 msgctxt "SFX_STR_SIDEBAR_RESTORE"
 msgid "Restore Default"
 msgstr "Adfer y Rhagosodiad"
 
-#: strings.hrc:268
+#: include/sfx2/strings.hrc:273
 msgctxt "SFX_STR_SIDEBAR_HIDE_SIDEBAR"
 msgid "Close Sidebar"
 msgstr "Cau'r Bar Ochr"
 
 #. Translators: default Impress template names
-#: strings.hrc:271
+#: include/sfx2/strings.hrc:276
 msgctxt "STR_TEMPLATE_NAME1"
 msgid "Alizarin"
 msgstr "Alizarin"
 
-#: strings.hrc:272
+#: include/sfx2/strings.hrc:277
 msgctxt "STR_TEMPLATE_NAME2"
 msgid "Beehive"
 msgstr "Cwch Gwenyn"
 
-#: strings.hrc:273
+#: include/sfx2/strings.hrc:278
 msgctxt "STR_TEMPLATE_NAME3"
 msgid "Blue Curve"
 msgstr "Cromlin Las"
 
-#: strings.hrc:274
+#: include/sfx2/strings.hrc:279
 msgctxt "STR_TEMPLATE_NAME4"
 msgid "Blueprint Plans"
 msgstr "Cynlluniau Glasbrint"
 
-#: strings.hrc:275
+#: include/sfx2/strings.hrc:280
 msgctxt "STR_TEMPLATE_NAME5"
 msgid "Bright Blue"
 msgstr "Glas Llachar"
 
-#: strings.hrc:276
+#: include/sfx2/strings.hrc:281
 msgctxt "STR_TEMPLATE_NAME6"
 msgid "Classy Red"
 msgstr "Coch Clasurol"
 
-#: strings.hrc:277
+#: include/sfx2/strings.hrc:282
 msgctxt "STR_TEMPLATE_NAME7"
 msgid "DNA"
 msgstr "DNA"
 
-#: strings.hrc:278
+#: include/sfx2/strings.hrc:283
 msgctxt "STR_TEMPLATE_NAME8"
 msgid "Focus"
 msgstr "Canolbwynt"
 
-#: strings.hrc:279
+#: include/sfx2/strings.hrc:284
 msgctxt "STR_TEMPLATE_NAME9"
 msgid "Forestbird"
 msgstr "Aderyn y Goedwig"
 
-#: strings.hrc:280
+#: include/sfx2/strings.hrc:285
 msgctxt "STR_TEMPLATE_NAME10"
 msgid "Impress"
 msgstr "Argraff"
 
-#: strings.hrc:281
+#: include/sfx2/strings.hrc:286
 msgctxt "STR_TEMPLATE_NAME11"
 msgid "Inspiration"
 msgstr "Ysbrydoliaeth"
 
-#: strings.hrc:282
+#: include/sfx2/strings.hrc:287
 msgctxt "STR_TEMPLATE_NAME12"
 msgid "Lights"
 msgstr "Goleuadau"
 
-#: strings.hrc:283
+#: include/sfx2/strings.hrc:288
 msgctxt "STR_TEMPLATE_NAME13"
 msgid "Lush Green"
 msgstr "Gwyrdd Dwfn"
 
-#: strings.hrc:284
+#: include/sfx2/strings.hrc:289
 msgctxt "STR_TEMPLATE_NAME14"
 msgid "Metropolis"
 msgstr "Metropolis"
 
-#: strings.hrc:285
+#: include/sfx2/strings.hrc:290
 msgctxt "STR_TEMPLATE_NAME15"
 msgid "Midnightblue"
 msgstr "Glas y Nos"
 
-#: strings.hrc:286
+#: include/sfx2/strings.hrc:291
 msgctxt "STR_TEMPLATE_NAME16"
 msgid "Nature Illustration"
 msgstr "Darlun o Natur"
 
-#: strings.hrc:287
+#: include/sfx2/strings.hrc:292
 msgctxt "STR_TEMPLATE_NAME17"
 msgid "Pencil"
 msgstr "Pensil"
 
-#: strings.hrc:288
+#: include/sfx2/strings.hrc:293
 msgctxt "STR_TEMPLATE_NAME18"
 msgid "Piano"
 msgstr "Piano"
 
-#: strings.hrc:289
+#: include/sfx2/strings.hrc:294
 msgctxt "STR_TEMPLATE_NAME19"
 msgid "Portfolio"
 msgstr "Portffolio"
 
-#: strings.hrc:290
+#: include/sfx2/strings.hrc:295
 msgctxt "STR_TEMPLATE_NAME20"
 msgid "Progress"
 msgstr "Cynnydd"
 
-#: strings.hrc:291
+#: include/sfx2/strings.hrc:296
 msgctxt "STR_TEMPLATE_NAME21"
 msgid "Sunset"
 msgstr "Machlud Haul"
 
-#: strings.hrc:292
+#: include/sfx2/strings.hrc:297
 msgctxt "STR_TEMPLATE_NAME22"
 msgid "Vintage"
 msgstr "Hynafol"
 
-#: strings.hrc:293
+#: include/sfx2/strings.hrc:298
 msgctxt "STR_TEMPLATE_NAME23"
 msgid "Vivid"
 msgstr "Llachar"
 
 #. Translators: default Writer template names
-#: strings.hrc:295
+#: include/sfx2/strings.hrc:300
 msgctxt "STR_TEMPLATE_NAME24"
 msgid "CV"
 msgstr "CV"
 
-#: strings.hrc:296
+#: include/sfx2/strings.hrc:301
 msgctxt "STR_TEMPLATE_NAME25"
 msgid "Resume"
 msgstr "Ail-ddechrau"
 
-#: strings.hrc:297
+#: include/sfx2/strings.hrc:302
 msgctxt "STR_TEMPLATE_NAME26"
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: strings.hrc:298
+#: include/sfx2/strings.hrc:303
 msgctxt "STR_TEMPLATE_NAME27"
 msgid "Modern"
 msgstr "Modern"
 
-#: strings.hrc:299
+#: include/sfx2/strings.hrc:304
 msgctxt "STR_TEMPLATE_NAME28"
 msgid "Modern business letter sans-serif"
 msgstr "Llythyr busnes modern sans-serif"
 
-#: strings.hrc:300
+#: include/sfx2/strings.hrc:305
 msgctxt "STR_TEMPLATE_NAME29"
 msgid "Modern business letter serif"
 msgstr "Llythyr busnes modern serif"
 
-#: strings.hrc:301
+#: include/sfx2/strings.hrc:306
 msgctxt "STR_TEMPLATE_NAME30"
 msgid "Businesscard with logo"
 msgstr "Cerdyn busnes gyda logo"
 
-#: strings.hrc:303
+#: include/sfx2/strings.hrc:308
 msgctxt "STR_CLEAR_CHAR"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: strings.hrc:304
+#: include/sfx2/strings.hrc:309
 msgctxt "STR_CLEAR_ALL_CHAR"
 msgid "Clear All"
 msgstr "Clirio Pob Un"
 
-#: dinfdlg.hrc:27
+#: include/sfx2/strings.hrc:311
+msgctxt "STR_PASSWORD_LEN"
+msgid "Password length"
+msgstr "Hyd cyfrinair"
+
+#: include/sfx2/strings.hrc:312
+msgctxt "STR_PASSWORD_WARNING"
+msgid "The password you have entered causes interoperability issues. Please enter a password that is shorter than 52 bytes, or longer than 55 bytes."
+msgstr "Mae'r cyfrinair rydych wedi ei gynnig yn achosi anawsterau rhyngweithio. Rhowch gyfrinair sy'n llai na 52 did neu hirach na 55 did."
+
+#: sfx2/inc/dinfdlg.hrc:27
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Checked by"
 msgstr "Gwiriwyd gan"
 
-#: dinfdlg.hrc:28
+#: sfx2/inc/dinfdlg.hrc:28
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Client"
 msgstr "Cleient"
 
-#: dinfdlg.hrc:29
+#: sfx2/inc/dinfdlg.hrc:29
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Date completed"
 msgstr "Dyddiad cwblhawyd"
 
-#: dinfdlg.hrc:30
+#: sfx2/inc/dinfdlg.hrc:30
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Department"
 msgstr "Adran"
 
-#: dinfdlg.hrc:31
+#: sfx2/inc/dinfdlg.hrc:31
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Destinations"
 msgstr "Cyrchfannau"
 
-#: dinfdlg.hrc:32
+#: sfx2/inc/dinfdlg.hrc:32
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Disposition"
 msgstr "Tueddiad"
 
-#: dinfdlg.hrc:33
+#: sfx2/inc/dinfdlg.hrc:33
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Division"
 msgstr "Rhannu"
 
-#: dinfdlg.hrc:34
+#: sfx2/inc/dinfdlg.hrc:34
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Document number"
 msgstr "Rhif y ddogfen"
 
-#: dinfdlg.hrc:35
+#: sfx2/inc/dinfdlg.hrc:35
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Editor"
 msgstr "Golygydd"
 
-#: dinfdlg.hrc:36
+#: sfx2/inc/dinfdlg.hrc:36
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "E-Mail"
 msgstr "E-bost"
 
-#: dinfdlg.hrc:37
+#: sfx2/inc/dinfdlg.hrc:37
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Forward to"
 msgstr "Ymlaen at"
 
-#: dinfdlg.hrc:38
+#: sfx2/inc/dinfdlg.hrc:38
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Group"
 msgstr "Grŵp"
 
-#: dinfdlg.hrc:39
+#: sfx2/inc/dinfdlg.hrc:39
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Info"
 msgstr "Manylion"
 
-#: dinfdlg.hrc:40
+#: sfx2/inc/dinfdlg.hrc:40
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Language"
 msgstr "Iaith"
 
-#: dinfdlg.hrc:41
+#: sfx2/inc/dinfdlg.hrc:41
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: dinfdlg.hrc:42
+#: sfx2/inc/dinfdlg.hrc:42
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Matter"
 msgstr "Pwnc"
 
-#: dinfdlg.hrc:43
+#: sfx2/inc/dinfdlg.hrc:43
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Office"
 msgstr "Swyddfa"
 
-#: dinfdlg.hrc:44
+#: sfx2/inc/dinfdlg.hrc:44
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Owner"
 msgstr "Perchennog"
 
-#: dinfdlg.hrc:45
+#: sfx2/inc/dinfdlg.hrc:45
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Project"
 msgstr "Project"
 
-#: dinfdlg.hrc:46
+#: sfx2/inc/dinfdlg.hrc:46
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Publisher"
 msgstr "Cyhoeddwr"
 
-#: dinfdlg.hrc:47
+#: sfx2/inc/dinfdlg.hrc:47
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Purpose"
 msgstr "Pwrpas"
 
-#: dinfdlg.hrc:48
+#: sfx2/inc/dinfdlg.hrc:48
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Received from"
 msgstr "Derbyniwyd gan"
 
-#: dinfdlg.hrc:49
+#: sfx2/inc/dinfdlg.hrc:49
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Recorded by"
 msgstr "Cofnodwyd gan"
 
-#: dinfdlg.hrc:50
+#: sfx2/inc/dinfdlg.hrc:50
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Recorded date"
 msgstr "Dyddiad cofnodi"
 
-#: dinfdlg.hrc:51
+#: sfx2/inc/dinfdlg.hrc:51
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: dinfdlg.hrc:52
+#: sfx2/inc/dinfdlg.hrc:52
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Source"
 msgstr "Ffynhonnell"
 
-#: dinfdlg.hrc:53
+#: sfx2/inc/dinfdlg.hrc:53
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Status"
 msgstr "Statws"
 
-#: dinfdlg.hrc:54
+#: sfx2/inc/dinfdlg.hrc:54
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Telephone number"
 msgstr "Rhif ffôn"
 
-#: dinfdlg.hrc:55
+#: sfx2/inc/dinfdlg.hrc:55
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Typist"
 msgstr "Teipydd"
 
-#: dinfdlg.hrc:56
+#: sfx2/inc/dinfdlg.hrc:56
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "URL"
 msgstr "URL"
 
-#: dinfdlg.hrc:69
+#: sfx2/inc/dinfdlg.hrc:69
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Text"
 msgstr "Testun"
 
-#: dinfdlg.hrc:70
+#: sfx2/inc/dinfdlg.hrc:70
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "DateTime"
 msgstr "Dyddiad ac Awr"
 
-#: dinfdlg.hrc:71
+#: sfx2/inc/dinfdlg.hrc:71
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: dinfdlg.hrc:72
+#: sfx2/inc/dinfdlg.hrc:72
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Duration"
 msgstr "Hyd"
 
-#: dinfdlg.hrc:73
+#: sfx2/inc/dinfdlg.hrc:73
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Number"
 msgstr "Rhif"
 
-#: dinfdlg.hrc:74
+#: sfx2/inc/dinfdlg.hrc:74
 msgctxt "SFX_CB_PROPERTY_STRINGARRAY"
 msgid "Yes or no"
 msgstr "Iawn neu na"
 
-#: doctempl.hrc:27
+#: sfx2/inc/doctempl.hrc:27
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "My Templates"
 msgstr "Templedi"
 
-#: doctempl.hrc:28
+#: sfx2/inc/doctempl.hrc:28
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Business Correspondence"
 msgstr "Gohebiaeth Busnes"
 
-#: doctempl.hrc:29
+#: sfx2/inc/doctempl.hrc:29
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Other Business Documents"
 msgstr "Dogfennau Busnes Eraill"
 
-#: doctempl.hrc:30
+#: sfx2/inc/doctempl.hrc:30
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Personal Correspondence and Documents"
 msgstr "Gohebiaeth a Dogfennau Personol"
 
-#: doctempl.hrc:31
+#: sfx2/inc/doctempl.hrc:31
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Forms and Contracts"
 msgstr "Ffurflenni a Chontractau"
 
-#: doctempl.hrc:32
+#: sfx2/inc/doctempl.hrc:32
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Finances"
 msgstr "Cyllid"
 
-#: doctempl.hrc:33
+#: sfx2/inc/doctempl.hrc:33
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Education"
 msgstr "Addysg"
 
-#: doctempl.hrc:34
+#: sfx2/inc/doctempl.hrc:34
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Presentation Backgrounds"
 msgstr "Cefndir Cyflwyniadau"
 
-#: doctempl.hrc:35
+#: sfx2/inc/doctempl.hrc:35
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Presentations"
 msgstr "Cyflwyniadau"
 
-#: doctempl.hrc:36
+#: sfx2/inc/doctempl.hrc:36
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Miscellaneous"
 msgstr "Amrywiol"
 
-#: doctempl.hrc:37
+#: sfx2/inc/doctempl.hrc:37
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Labels"
 msgstr "Labeli"
 
-#: doctempl.hrc:38
+#: sfx2/inc/doctempl.hrc:38
 msgctxt "TEMPLATE_LONG_NAMES_ARY"
 msgid "Styles"
 msgstr "Arddulliau"
 
-#: alienwarndialog.ui:8
+#: sfx2/uiconfig/ui/alienwarndialog.ui:7
 msgctxt "alienwarndialog|AlienWarnDialog"
 msgid "Confirm File Format"
 msgstr "Cadarnhau Fformat Ffeil"
 
-#: alienwarndialog.ui:14
+#: sfx2/uiconfig/ui/alienwarndialog.ui:13
 msgctxt "alienwarndialog|AlienWarnDialog"
 msgid "This document may contain formatting or content that cannot be saved in the currently selected file format “%FORMATNAME”."
 msgstr "Gall y ddogfen gynnwys fformatio neu gynnwys nad oes modd eu cadw yn y fformat sydd wedi ei ddewis “%FORMATNAME”."
 
-#: alienwarndialog.ui:15
+#: sfx2/uiconfig/ui/alienwarndialog.ui:14
 msgctxt "alienwarndialog|AlienWarnDialog"
 msgid "Use the default ODF file format to be sure that the document is saved correctly."
 msgstr "Defnyddiwch y fformat ffeil ODF rhagosodedig i fod yn siŵr fod y ddogfen yn cael ei chadw´n gywir."
 
-#: alienwarndialog.ui:27
+#: sfx2/uiconfig/ui/alienwarndialog.ui:25
 msgctxt "alienwarndialog|cancel"
 msgid "Use %DEFAULTEXTENSION _Format"
 msgstr "Defnyddiwch _Fformat %DEFAULTEXTENSION"
 
-#: alienwarndialog.ui:43
+#: sfx2/uiconfig/ui/alienwarndialog.ui:41
 msgctxt "alienwarndialog|save"
 msgid "_Use %FORMATNAME Format"
 msgstr "­_Defnyddio Fformat %FORMATNAME"
 
-#: alienwarndialog.ui:68
+#: sfx2/uiconfig/ui/alienwarndialog.ui:66
 msgctxt "alienwarndialog|ask"
 msgid "_Ask when not saving in ODF or default format"
 msgstr "_Gofyn pan nad yn cadw i fformat ODF neu'r rhagosodedig"
 
-#: bookmarkdialog.ui:7
+#: sfx2/uiconfig/ui/bookmarkdialog.ui:8
 msgctxt "bookmarkdialog|BookmarkDialog"
 msgid "Add to Bookmarks"
 msgstr "Ychwanegu i Nodau Tudalen"
 
-#: bookmarkdialog.ui:18
+#: sfx2/uiconfig/ui/bookmarkdialog.ui:80
 msgctxt "bookmarkdialog|alttitle"
 msgid "Rename Bookmark"
 msgstr "Ailenwi Nod Tudalen"
 
-#: bookmarkdialog.ui:97
+#: sfx2/uiconfig/ui/bookmarkdialog.ui:99
 msgctxt "bookmarkdialog|label2"
 msgid "Bookmark:"
 msgstr "Nod Tudalen:"
 
-#: bookmarkmenu.ui:12
+#: sfx2/uiconfig/ui/bookmarkmenu.ui:12
 msgctxt "bookmarkmenu|display"
 msgid "Display"
 msgstr "Dangos"
 
-#: bookmarkmenu.ui:26
+#: sfx2/uiconfig/ui/bookmarkmenu.ui:26
 msgctxt "bookmarkmenu|rename"
 msgid "Rename..."
 msgstr "Ailenwi..."
 
-#: bookmarkmenu.ui:34
+#: sfx2/uiconfig/ui/bookmarkmenu.ui:34
 msgctxt "bookmarkmenu|delete"
 msgid "Delete"
 msgstr "Dileu"
 
-#: charmapcontrol.ui:27
+#: sfx2/uiconfig/ui/charmapcontrol.ui:27
 msgctxt "charmapcontrol|label1"
 msgid "Favorites"
 msgstr "Ffefrynnau"
 
-#: charmapcontrol.ui:248
+#: sfx2/uiconfig/ui/charmapcontrol.ui:248
 msgctxt "charmapcontrol|label2"
 msgid "Recent"
 msgstr "Diweddar"
 
-#: charmapcontrol.ui:469
+#: sfx2/uiconfig/ui/charmapcontrol.ui:469
 msgctxt "charmapcontrol|specialchardlg"
 msgid "More Characters…"
 msgstr "Rhagor o Nodau…"
 
-#: checkin.ui:8
+#: sfx2/uiconfig/ui/charviewmenu.ui:12
+msgctxt "charviewmenu|clearchar"
+msgid "Remove"
+msgstr "Tynnu"
+
+#: sfx2/uiconfig/ui/charviewmenu.ui:20
+msgctxt "charviewmenu|clearallchar"
+msgid "Clear All"
+msgstr "Clirio Pob Un"
+
+#: sfx2/uiconfig/ui/checkin.ui:8
 msgctxt "checkin|CheckinDialog"
 msgid "Check-In"
 msgstr "Mewngyflwyno"
 
-#: checkin.ui:84
+#: sfx2/uiconfig/ui/checkin.ui:84
 msgctxt "checkin|MajorVersion"
 msgid "New major version"
 msgstr "Fersiwn sylweddol newydd"
 
-#: checkin.ui:114
+#: sfx2/uiconfig/ui/checkin.ui:115
 msgctxt "checkin|label2"
 msgid "Version comment:"
 msgstr "Sylwadau'r fersiwn:"
 
-#: cmisinfopage.ui:54
+#: sfx2/uiconfig/ui/cmisinfopage.ui:54
 msgctxt "cmisinfopage|name"
 msgid "Name"
 msgstr "Enw"
 
-#: cmisinfopage.ui:66
+#: sfx2/uiconfig/ui/cmisinfopage.ui:66
 msgctxt "cmisinfopage|type"
 msgid "Type"
 msgstr "Math"
 
-#: cmisinfopage.ui:78
+#: sfx2/uiconfig/ui/cmisinfopage.ui:78
 msgctxt "cmisinfopage|value"
 msgid "Value"
 msgstr "Gwerth"
 
-#: cmisline.ui:46
+#: sfx2/uiconfig/ui/cmisline.ui:46
 msgctxt "cmisline|type"
 msgid "Type"
 msgstr "Math"
 
-#: cmisline.ui:61
+#: sfx2/uiconfig/ui/cmisline.ui:61
 msgctxt "cmisline|yes"
 msgid "Yes"
 msgstr "Iawn"
 
-#: cmisline.ui:82
+#: sfx2/uiconfig/ui/cmisline.ui:82
 msgctxt "cmisline|no"
 msgid "No"
 msgstr "Na"
 
-#: custominfopage.ui:14
+#: sfx2/uiconfig/ui/custominfopage.ui:14
 msgctxt "custominfopage|add"
 msgid "Add _Property"
 msgstr "Ychwanegu _Priodwedd"
 
-#: custominfopage.ui:49
+#: sfx2/uiconfig/ui/custominfopage.ui:49
 msgctxt "custominfopage|name"
 msgid "Name"
 msgstr "Enw"
 
-#: custominfopage.ui:61
+#: sfx2/uiconfig/ui/custominfopage.ui:61
 msgctxt "custominfopage|type"
 msgid "Type"
 msgstr "Math"
 
-#: custominfopage.ui:73
+#: sfx2/uiconfig/ui/custominfopage.ui:73
 msgctxt "custominfopage|value"
 msgid "Value"
 msgstr "Gwerth"
 
-#: descriptioninfopage.ui:18
+#: sfx2/uiconfig/ui/descriptioninfopage.ui:18
 msgctxt "descriptioninfopage|label27"
 msgid "_Title:"
 msgstr "_Teitl:"
 
-#: descriptioninfopage.ui:32
+#: sfx2/uiconfig/ui/descriptioninfopage.ui:32
 msgctxt "descriptioninfopage|label28"
 msgid "_Subject:"
 msgstr "_Pwnc:"
 
-#: descriptioninfopage.ui:46
+#: sfx2/uiconfig/ui/descriptioninfopage.ui:46
 msgctxt "descriptioninfopage|label29"
 msgid "_Keywords:"
 msgstr "_Allweddeiriau:"
 
-#: descriptioninfopage.ui:61
+#: sfx2/uiconfig/ui/descriptioninfopage.ui:61
 msgctxt "descriptioninfopage|label30"
 msgid "_Comments:"
 msgstr "_Nodiadau:"
 
-#: documentfontspage.ui:25
+#: sfx2/uiconfig/ui/documentfontspage.ui:25
 msgctxt "documentfontspage|embedFonts"
 msgid "_Embed fonts in the document"
 msgstr "_Mewnblannu ffontiau yn y ddogfen"
 
-#: documentfontspage.ui:40
+#: sfx2/uiconfig/ui/documentfontspage.ui:40
 msgctxt "documentfontspage|fontEmbeddingLabel"
 msgid "Font Embedding"
 msgstr "Mewnblannu Ffontiau"
 
-#: documentinfopage.ui:18
+#: sfx2/uiconfig/ui/documentinfopage.ui:18
 msgctxt "documentinfopage|label13"
 msgid "_Created:"
 msgstr "_Crëwyd:"
 
-#: documentinfopage.ui:32
+#: sfx2/uiconfig/ui/documentinfopage.ui:32
 msgctxt "documentinfopage|label14"
 msgid "_Modified:"
 msgstr "_Newidiwyd:"
 
-#: documentinfopage.ui:46
+#: sfx2/uiconfig/ui/documentinfopage.ui:46
 msgctxt "documentinfopage|label15"
 msgid "_Digitally signed:"
 msgstr "_Llofnodwyd yn Ddigidol:"
 
-#: documentinfopage.ui:60
+#: sfx2/uiconfig/ui/documentinfopage.ui:60
 msgctxt "documentinfopage|label16"
 msgid "Last pri_nted:"
 msgstr "_Argraffwyd diwethaf:"
 
-#: documentinfopage.ui:74
+#: sfx2/uiconfig/ui/documentinfopage.ui:74
 msgctxt "documentinfopage|label17"
 msgid "Total _editing time:"
 msgstr "C_yfanswm cyfnod golygu:"
 
-#: documentinfopage.ui:88
+#: sfx2/uiconfig/ui/documentinfopage.ui:88
 msgctxt "documentinfopage|label18"
 msgid "Re_vision number:"
 msgstr "Rhif _adolygu:"
 
-#: documentinfopage.ui:131
+#: sfx2/uiconfig/ui/documentinfopage.ui:131
 msgctxt "documentinfopage|showsigned"
 msgid "Multiply signed document"
 msgstr "Dogfen llofnod lluosog"
 
-#: documentinfopage.ui:183
+#: sfx2/uiconfig/ui/documentinfopage.ui:183
 msgctxt "documentinfopage|userdatacb"
 msgid "_Apply user data"
 msgstr "_Rhowch ddata defnyddiwr"
 
-#: documentinfopage.ui:200
+#: sfx2/uiconfig/ui/documentinfopage.ui:200
 msgctxt "documentinfopage|thumbnailsavecb"
 msgid "Save preview image with this document"
 msgstr "Cadw llun rhagolwg gyda'r ddogfen hon"
 
-#: documentinfopage.ui:217
+#: sfx2/uiconfig/ui/documentinfopage.ui:217
 msgctxt "documentinfopage|reset"
 msgid "Reset Properties"
 msgstr "Ailosod Priodweddau"
 
-#: documentinfopage.ui:231
+#: sfx2/uiconfig/ui/documentinfopage.ui:231
 msgctxt "documentinfopage|signature"
 msgid "Di_gital Signatures..."
 msgstr "_Llofnodion Digidol..."
 
-#: documentinfopage.ui:250
+#: sfx2/uiconfig/ui/documentinfopage.ui:250
 msgctxt "documentinfopage|label11"
 msgid "_Size:"
 msgstr "_Maint:"
 
-#: documentinfopage.ui:264
+#: sfx2/uiconfig/ui/documentinfopage.ui:264
 msgctxt "documentinfopage|showsize"
 msgid "unknown"
 msgstr "anhysbys"
 
-#: documentinfopage.ui:278
+#: sfx2/uiconfig/ui/documentinfopage.ui:278
 msgctxt "documentinfopage|label8"
 msgid "_Location:"
 msgstr "_Lleoliad:"
 
-#: documentinfopage.ui:308
+#: sfx2/uiconfig/ui/documentinfopage.ui:308
 msgctxt "documentinfopage|label7"
 msgid "_Type:"
 msgstr "_Math:"
 
-#: documentinfopage.ui:332
+#: sfx2/uiconfig/ui/documentinfopage.ui:332
 msgctxt "documentinfopage|changepass"
 msgid "Change _Password"
 msgstr "_Newid Cyfrinair"
 
-#: documentinfopage.ui:350
+#: sfx2/uiconfig/ui/documentinfopage.ui:350
 msgctxt "documentinfopage|templateft"
 msgid "Template:"
 msgstr "Templed:"
 
-#: documentpropertiesdialog.ui:8
+#: sfx2/uiconfig/ui/documentpropertiesdialog.ui:8
 msgctxt "documentpropertiesdialog|DocumentPropertiesDialog"
 msgid "Properties of “%1”"
 msgstr "Priodweddau “%1”"
 
-#: documentpropertiesdialog.ui:103
+#: sfx2/uiconfig/ui/documentpropertiesdialog.ui:103
 msgctxt "documentpropertiesdialog|general"
 msgid "General "
 msgstr "Cyffredinol "
 
-#: documentpropertiesdialog.ui:125
+#: sfx2/uiconfig/ui/documentpropertiesdialog.ui:125
 msgctxt "documentpropertiesdialog|description"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: documentpropertiesdialog.ui:148
+#: sfx2/uiconfig/ui/documentpropertiesdialog.ui:148
 msgctxt "documentpropertiesdialog|customprops"
 msgid "Custom Properties"
 msgstr "Priodweddau Cyfaddas"
 
-#: documentpropertiesdialog.ui:171
+#: sfx2/uiconfig/ui/documentpropertiesdialog.ui:171
 msgctxt "documentpropertiesdialog|cmisprops"
 msgid "CMIS Properties"
 msgstr "Priodweddau CMIS"
 
-#: documentpropertiesdialog.ui:194
+#: sfx2/uiconfig/ui/documentpropertiesdialog.ui:194
 msgctxt "documentpropertiesdialog|security"
 msgid "Security"
 msgstr "Security"
 
-#: editdocumentdialog.ui:8
+#: sfx2/uiconfig/ui/editdocumentdialog.ui:7
 msgctxt "editdocumentdialog|EditDocumentDialog"
 msgid "Confirm editing of document"
 msgstr "Cadarnhau golygu'r ddogfen"
 
-#: editdocumentdialog.ui:14
+#: sfx2/uiconfig/ui/editdocumentdialog.ui:13
 msgctxt "editdocumentdialog|EditDocumentDialog"
 msgid "Are you sure you want to edit the document?"
 msgstr "Ydych yn siŵr eich bod am olygu'r ddogfen?"
 
-#: editdocumentdialog.ui:15
+#: sfx2/uiconfig/ui/editdocumentdialog.ui:14
 msgctxt "editdocumentdialog|EditDocumentDialog"
 msgid "The original file can be signed without editing the document. Existing signatures on the document will be lost in case of saving an edited version."
 msgstr "Mae modd llofnodi'r ddogfen wreiddiol heb olygu'r ddogfen. Bydd y llofnodion cyfredol ar y ddogfen yn cael eu colli os fyddwch yn cadw fersiwn sydd wedi ei olygu."
 
-#: editdocumentdialog.ui:27
+#: sfx2/uiconfig/ui/editdocumentdialog.ui:25
 msgctxt "editdocumentdialog|edit"
 msgid "Edit Document"
 msgstr "Golygu Dogfen"
 
-#: editdocumentdialog.ui:44
+#: sfx2/uiconfig/ui/editdocumentdialog.ui:42
 msgctxt "editdocumentdialog|cancel"
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: editdurationdialog.ui:8
+#: sfx2/uiconfig/ui/editdurationdialog.ui:43
 msgctxt "editdurationdialog|EditDurationDialog"
 msgid "Edit Duration"
 msgstr "Golygu'r Hyd"
 
-#: editdurationdialog.ui:97
+#: sfx2/uiconfig/ui/editdurationdialog.ui:135
 msgctxt "editdurationdialog|negative"
 msgid "_Negative"
 msgstr "_Negyddol"
 
-#: editdurationdialog.ui:116
+#: sfx2/uiconfig/ui/editdurationdialog.ui:153
 msgctxt "editdurationdialog|label1"
 msgid "_Years:"
 msgstr "_Blwyddyn:"
 
-#: editdurationdialog.ui:130
+#: sfx2/uiconfig/ui/editdurationdialog.ui:167
 msgctxt "editdurationdialog|label"
 msgid "_Months:"
 msgstr "_Misoedd:"
 
-#: editdurationdialog.ui:144
+#: sfx2/uiconfig/ui/editdurationdialog.ui:181
 msgctxt "editdurationdialog|label3"
 msgid "_Days:"
 msgstr "_Diwrnod:"
 
-#: editdurationdialog.ui:158
+#: sfx2/uiconfig/ui/editdurationdialog.ui:195
 msgctxt "editdurationdialog|label4"
 msgid "H_ours:"
 msgstr "_Awr:"
 
-#: editdurationdialog.ui:172
+#: sfx2/uiconfig/ui/editdurationdialog.ui:209
 msgctxt "editdurationdialog|label5"
 msgid "Min_utes:"
 msgstr "M_unud:"
 
-#: editdurationdialog.ui:186
+#: sfx2/uiconfig/ui/editdurationdialog.ui:223
 msgctxt "editdurationdialog|label6"
 msgid "_Seconds:"
 msgstr "_Eiliad:"
 
-#: editdurationdialog.ui:200
+#: sfx2/uiconfig/ui/editdurationdialog.ui:237
 msgctxt "editdurationdialog|label7"
 msgid "Millise_conds:"
 msgstr "_Milfedeiliad:"
 
-#: editdurationdialog.ui:287
+#: sfx2/uiconfig/ui/editdurationdialog.ui:339
 msgctxt "editdurationdialog|label2"
 msgid "Duration"
 msgstr "Hyd"
 
-#: errorfindemaildialog.ui:8
+#: sfx2/uiconfig/ui/errorfindemaildialog.ui:7
 msgctxt "errorfindemaildialog|ErrorFindEmailDialog"
 msgid "No e-mail configuration"
 msgstr "Dim ffurfweddiad e-bost"
 
-#: errorfindemaildialog.ui:14
+#: sfx2/uiconfig/ui/errorfindemaildialog.ui:14
 msgctxt "errorfindemaildialog|ErrorFindEmailDialog"
 msgid "%PRODUCTNAME was unable to find a working e-mail configuration."
 msgstr "Mae %PRODUCTNAME yn methu canfod ffurfweddiad e-bost sy'n gweithio."
 
-#: errorfindemaildialog.ui:15
+#: sfx2/uiconfig/ui/errorfindemaildialog.ui:15
 msgctxt "errorfindemaildialog|ErrorFindEmailDialog"
 msgid "Please save this document locally instead and attach it from within your e-mail client."
 msgstr "Cadwch y ddogfen yn lleol a'i cysylltwch o fewn eich rhaglen e-bost."
 
-#: floatingrecord.ui:9
+#: sfx2/uiconfig/ui/floatingrecord.ui:9
 msgctxt "floatingrecord|FloatingRecord"
 msgid "Record Macro"
 msgstr "Recordio Macro"
 
-#: helpbookmarkpage.ui:22
+#: sfx2/uiconfig/ui/helpbookmarkpage.ui:22
 msgctxt "helpbookmarkpage|display"
 msgid "_Display"
 msgstr "_Dangoswr"
 
-#: helpbookmarkpage.ui:41
+#: sfx2/uiconfig/ui/helpbookmarkpage.ui:41
 msgctxt "helpbookmarkpage|label1"
 msgid "_Bookmarks"
 msgstr "_Nodau Tudalen"
 
-#: helpcontrol.ui:49
+#: sfx2/uiconfig/ui/helpcontrol.ui:49
 msgctxt "helpcontrol|contents"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: helpcontrol.ui:71
+#: sfx2/uiconfig/ui/helpcontrol.ui:71
 msgctxt "helpcontrol|index"
 msgid "Index"
 msgstr "Mynegai"
 
-#: helpcontrol.ui:94
+#: sfx2/uiconfig/ui/helpcontrol.ui:94
 msgctxt "helpcontrol|find"
 msgid "Find"
 msgstr "Canfod"
 
-#: helpcontrol.ui:117
+#: sfx2/uiconfig/ui/helpcontrol.ui:117
 msgctxt "helpcontrol|bookmarks"
 msgid "Bookmarks"
 msgstr "Nodau Tudalen"
 
-#: helpindexpage.ui:22
+#: sfx2/uiconfig/ui/helpindexpage.ui:22
 msgctxt "helpindexpage|display"
 msgid "_Display"
 msgstr "_Dangoswr"
 
-#: helpindexpage.ui:41
+#: sfx2/uiconfig/ui/helpindexpage.ui:41
 msgctxt "helpindexpage|label1"
 msgid "_Search term"
 msgstr "_Term chwilio"
 
-#: helpmanual.ui:8
+#: sfx2/uiconfig/ui/helpmanual.ui:7
 msgctxt "helpmanual|onlinehelpmanual"
 msgid "%PRODUCTNAME Help Not Installed"
 msgstr "NId yw Cymorth %PRODUCTNAME wedi ei Osod"
 
-#: helpmanual.ui:12
+#: sfx2/uiconfig/ui/helpmanual.ui:12
 msgctxt "helpmanual|onlinehelpmanual"
-msgid "The %PRODUCTNAME built-in help is not installed on your computer."
-msgstr "Nid yw cymorth %PRODUCTNAME wedi ei osod ar eich cyfrifiadur."
+msgid "The %PRODUCTNAME built-in help for current UI language ($UILOCALE) is not installed on your computer."
+msgstr "Nid yw cymorth mewnol %PRODUCTNAME ar gyfer iaith y rhyngwyneb ($UILOCALE) wedi ei osod ar eich cyfrifiadur."
 
-#: helpmanual.ui:13
+#: sfx2/uiconfig/ui/helpmanual.ui:13
 msgctxt "helpmanual|onlinehelpmanual"
 msgid "You may either install it from our website or your system’s repositories, or read an online version."
 msgstr "Mae modd i chi ei osod un ai o'n gwefan neu ystorfeydd eich cyfrifiadur, neu ddarllen y fersiwn ar-lein."
 
-#: helpmanual.ui:26
+#: sfx2/uiconfig/ui/helpmanual.ui:23
 msgctxt "helpmanual|website"
 msgid "Read Help Online"
 msgstr "Darllen Cymorth Ar-lein"
 
-#: helpsearchpage.ui:22
+#: sfx2/uiconfig/ui/helpsearchpage.ui:22
 msgctxt "helpsearchpage|display"
 msgid "_Display"
 msgstr "_Dangoswr"
 
-#: helpsearchpage.ui:41
+#: sfx2/uiconfig/ui/helpsearchpage.ui:41
 msgctxt "helpsearchpage|label1"
 msgid "_Search term"
 msgstr "_Term chwilio"
 
-#: helpsearchpage.ui:116
+#: sfx2/uiconfig/ui/helpsearchpage.ui:116
 msgctxt "helpsearchpage|completewords"
 msgid "_Complete words only"
 msgstr "_Geiriau cyfan yn unig"
 
-#: helpsearchpage.ui:133
+#: sfx2/uiconfig/ui/helpsearchpage.ui:133
 msgctxt "helpsearchpage|headings"
 msgid "Find in _headings only"
 msgstr "C_anfod mewn penawdau'n unig"
 
-#: inputdialog.ui:83
+#: sfx2/uiconfig/ui/inputdialog.ui:86
 msgctxt "inputdialog|label"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: licensedialog.ui:8
+#: sfx2/uiconfig/ui/licensedialog.ui:8
 msgctxt "licensedialog|LicenseDialog"
 msgid "Licensing and Legal information"
 msgstr "Gwybodaeth trwyddedu a chyfreithiol"
 
-#: licensedialog.ui:22
+#: sfx2/uiconfig/ui/licensedialog.ui:25
 msgctxt "licensedialog|show"
 msgid "_Show License"
 msgstr "_Dangos y Drwydded"
 
-#: licensedialog.ui:63
+#: sfx2/uiconfig/ui/licensedialog.ui:68
 msgctxt "licensedialog|label"
 msgid ""
 "%PRODUCTNAME is made available subject to the terms of the Mozilla Public License, v. 2.0. A copy of the MPL can be obtained at http://mozilla.org/MPL/2.0/.\n"
@@ -2176,7 +2229,7 @@ msgid ""
 "\n"
 "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n"
 "\n"
-"Copyright © 2000–2017 LibreOffice contributors. All rights reserved.\n"
+"Copyright © 2000–2018 LibreOffice contributors. All rights reserved.\n"
 "\n"
 "This product was created by %OOOVENDOR, based on OpenOffice.org, which is Copyright 2000, 2011 Oracle and/or its affiliates. %OOOVENDOR acknowledges all community members, please see http://www.libreoffice.org/ for more details."
 msgstr ""
@@ -2186,811 +2239,811 @@ msgstr ""
 "\n"
 "Eiddo eu perchnogion yw'r holl nodau masnach a nodau masnach cofrestredig nodir yma.\n"
 "\n"
-"Hawlfraint © 2000–2017 cyfranwyr LibreOffice a'u cysylltiadau. Diogelir pob hawl.\n"
+"Hawlfraint © 2000, 2018 cyfranwyr LibreOffice a'u cysylltiadau. Diogelir pob hawl.\n"
 "\n"
 "Crëwyd y cynnyrch hwn gan %OOOVENDOR, ar sail OpenOffice.org, Hawlfraint 2000, 2011 Oracle a/neu ei gysylltiadau. Mae %OOOVENDOR yn cydnabod pob aelod cymunedol, gweler http://www.libreoffice.org/ am wybodaeth bellach."
 
-#: linkeditdialog.ui:100
+#: sfx2/uiconfig/ui/linkeditdialog.ui:105
 msgctxt "linkeditdialog|label2"
 msgid "_Application:"
 msgstr "_Rhaglen:"
 
-#: linkeditdialog.ui:114
+#: sfx2/uiconfig/ui/linkeditdialog.ui:119
 msgctxt "linkeditdialog|label3"
 msgid "_File:"
 msgstr "_Ffeil:"
 
-#: linkeditdialog.ui:128
+#: sfx2/uiconfig/ui/linkeditdialog.ui:133
 msgctxt "linkeditdialog|label4"
 msgid "_Category:"
 msgstr "_Categori:"
 
-#: linkeditdialog.ui:181
+#: sfx2/uiconfig/ui/linkeditdialog.ui:183
 msgctxt "linkeditdialog|label1"
 msgid "Modify Link"
 msgstr "Newid Cysylltiad"
 
-#: loadtemplatedialog.ui:9
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:20
 msgctxt "loadtemplatedialog|LoadTemplateDialog"
 msgid "New"
 msgstr "Newydd"
 
-#: loadtemplatedialog.ui:70
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:35
 msgctxt "loadtemplatedialog|fromfile"
 msgid "From File..."
 msgstr "O Ffeil..."
 
-#: loadtemplatedialog.ui:128
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:164
 msgctxt "loadtemplatedialog|label1"
 msgid "Categories"
 msgstr "Categorïau"
 
-#: loadtemplatedialog.ui:172
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:231
 msgctxt "loadtemplatedialog|label2"
 msgid "Templates"
 msgstr "Templedi"
 
-#: loadtemplatedialog.ui:195
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:252
 msgctxt "loadtemplatedialog|text"
 msgid "Te_xt"
 msgstr "_Testun"
 
-#: loadtemplatedialog.ui:212
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:267
 msgctxt "loadtemplatedialog|frame"
 msgid "_Frame"
 msgstr "_Ffrâmio"
 
-#: loadtemplatedialog.ui:229
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:282
 msgctxt "loadtemplatedialog|pages"
 msgid "_Pages"
 msgstr "_Tudalennau"
 
-#: loadtemplatedialog.ui:246
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:297
 msgctxt "loadtemplatedialog|numbering"
 msgid "N_umbering"
 msgstr "_Rhifo"
 
-#: loadtemplatedialog.ui:263
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:312
 msgctxt "loadtemplatedialog|overwrite"
 msgid "_Overwrite"
 msgstr "_Trosysgrifo"
 
-#: loadtemplatedialog.ui:293
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:339
 msgctxt "loadtemplatedialog|alttitle"
 msgid "Load Styles"
 msgstr "Arddulliau Llwytho"
 
-#: loadtemplatedialog.ui:331
+#: sfx2/uiconfig/ui/loadtemplatedialog.ui:375
 msgctxt "loadtemplatedialog|label3"
 msgid "Pre_view"
 msgstr "_Rhagolwg"
 
-#: managestylepage.ui:38
+#: sfx2/uiconfig/ui/managestylepage.ui:38
 msgctxt "managestylepage|nameft"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: managestylepage.ui:52
+#: sfx2/uiconfig/ui/managestylepage.ui:52
 msgctxt "managestylepage|nextstyleft"
 msgid "Ne_xt style:"
 msgstr "Arddull _Nesaf:"
 
-#: managestylepage.ui:66
+#: sfx2/uiconfig/ui/managestylepage.ui:66
 msgctxt "managestylepage|linkedwithft"
 msgid "Inherit from:"
 msgstr "Etifeddwyd gan:"
 
-#: managestylepage.ui:80
+#: sfx2/uiconfig/ui/managestylepage.ui:80
 msgctxt "managestylepage|categoryft"
 msgid "_Category:"
 msgstr "_Categori:"
 
-#: managestylepage.ui:103
+#: sfx2/uiconfig/ui/managestylepage.ui:103
 msgctxt "managestylepage|editstyle"
 msgid "Edit Style"
 msgstr "Golygu Arddull"
 
-#: managestylepage.ui:126
+#: sfx2/uiconfig/ui/managestylepage.ui:126
 msgctxt "managestylepage|editlinkstyle"
 msgid "Edit Style"
 msgstr "Golygu Arddull"
 
-#: managestylepage.ui:188
+#: sfx2/uiconfig/ui/managestylepage.ui:187
 msgctxt "managestylepage|autoupdate"
 msgid "_AutoUpdate"
 msgstr "_AwtoDiweddaru"
 
-#: managestylepage.ui:212
+#: sfx2/uiconfig/ui/managestylepage.ui:211
 msgctxt "managestylepage|label1"
 msgid "Style"
 msgstr "Arddull"
 
-#: managestylepage.ui:253
+#: sfx2/uiconfig/ui/managestylepage.ui:252
 msgctxt "managestylepage|label2"
 msgid "Contains"
 msgstr "Yn cynnwys"
 
-#: newstyle.ui:9
+#: sfx2/uiconfig/ui/newstyle.ui:9
 msgctxt "newstyle|CreateStyleDialog"
 msgid "Create Style"
 msgstr "Creu Arddull"
 
-#: newstyle.ui:108
+#: sfx2/uiconfig/ui/newstyle.ui:108
 msgctxt "newstyle|stylename-atkobject"
 msgid "Style Name"
 msgstr "Enw'r Arddull"
 
-#: newstyle.ui:119
+#: sfx2/uiconfig/ui/newstyle.ui:119
 msgctxt "newstyle|label1"
 msgid "Style Name"
 msgstr "Enw'r Arddull"
 
-#: notebookbar.ui:73
+#: sfx2/uiconfig/ui/notebookbar.ui:73
 msgctxt "notebookbar|label9"
 msgid "File"
 msgstr "Ffeil"
 
-#: optprintpage.ui:43
+#: sfx2/uiconfig/ui/optprintpage.ui:43
 msgctxt "optprintpage|printer"
 msgid "_Printer"
 msgstr "_Argraffydd"
 
-#: optprintpage.ui:60
+#: sfx2/uiconfig/ui/optprintpage.ui:60
 msgctxt "optprintpage|file"
 msgid "Print to _file"
 msgstr "Argraffu i _ffeil"
 
-#: optprintpage.ui:79
+#: sfx2/uiconfig/ui/optprintpage.ui:79
 msgctxt "optprintpage|label4"
 msgid "Settings for:"
 msgstr "Gosodiadau:"
 
-#: optprintpage.ui:107
+#: sfx2/uiconfig/ui/optprintpage.ui:107
 msgctxt "optprintpage|reducetrans"
 msgid "_Reduce transparency"
 msgstr "_Lleihau tryloywder"
 
-#: optprintpage.ui:122
+#: sfx2/uiconfig/ui/optprintpage.ui:122
 msgctxt "optprintpage|reducegrad"
 msgid "Reduce _gradient"
 msgstr "Lleihau _graddiant"
 
-#: optprintpage.ui:137
+#: sfx2/uiconfig/ui/optprintpage.ui:137
 msgctxt "optprintpage|converttogray"
 msgid "Con_vert colors to grayscale"
 msgstr "_Trosi lliwiau i graddlwyd"
 
-#: optprintpage.ui:162
+#: sfx2/uiconfig/ui/optprintpage.ui:162
 msgctxt "optprintpage|reducetransauto"
 msgid "Auto_matically"
 msgstr "_Yn awtomatig"
 
-#: optprintpage.ui:179
+#: sfx2/uiconfig/ui/optprintpage.ui:179
 msgctxt "optprintpage|reducetransnone"
 msgid "_No transparency"
 msgstr "_Dim tryloywder"
 
-#: optprintpage.ui:218
+#: sfx2/uiconfig/ui/optprintpage.ui:218
 msgctxt "optprintpage|reducegradstripes"
 msgid "Gradient _stripes:"
 msgstr "_Stribedi graddiant:"
 
-#: optprintpage.ui:253
+#: sfx2/uiconfig/ui/optprintpage.ui:252
 msgctxt "optprintpage|reducegradcolor"
 msgid "Intermediate _color"
 msgstr "Lliw _rhyngol"
 
-#: optprintpage.ui:287
+#: sfx2/uiconfig/ui/optprintpage.ui:286
 msgctxt "optprintpage|reducebitmapoptimal"
 msgid "_High print quality"
 msgstr "A_rgraffiad ansawdd uchel"
 
-#: optprintpage.ui:304
+#: sfx2/uiconfig/ui/optprintpage.ui:303
 msgctxt "optprintpage|reducebitmapnormal"
 msgid "N_ormal print quality"
 msgstr "Ar_graffiad ansawdd arferol"
 
-#: optprintpage.ui:325
+#: sfx2/uiconfig/ui/optprintpage.ui:324
 msgctxt "optprintpage|reducebitmapresol"
 msgid "Reso_lution:"
 msgstr "_Cydraniad:"
 
-#: optprintpage.ui:344
+#: sfx2/uiconfig/ui/optprintpage.ui:343
 msgctxt "optprintpage|reducebitmapdpi"
 msgid "72 DPI"
 msgstr "72 DPI"
 
-#: optprintpage.ui:345
+#: sfx2/uiconfig/ui/optprintpage.ui:344
 msgctxt "optprintpage|reducebitmapdpi"
 msgid "96 DPI"
 msgstr "96 DPI"
 
-#: optprintpage.ui:346
+#: sfx2/uiconfig/ui/optprintpage.ui:345
 msgctxt "optprintpage|reducebitmapdpi"
 msgid "150 DPI (Fax)"
 msgstr "150 DPI (Ffacs)"
 
-#: optprintpage.ui:347
+#: sfx2/uiconfig/ui/optprintpage.ui:346
 msgctxt "optprintpage|reducebitmapdpi"
 msgid "200 DPI (default)"
 msgstr "200 DPI (rhagosodedig)"
 
-#: optprintpage.ui:348
+#: sfx2/uiconfig/ui/optprintpage.ui:347
 msgctxt "optprintpage|reducebitmapdpi"
 msgid "300 DPI"
 msgstr "300 DPI"
 
-#: optprintpage.ui:349
+#: sfx2/uiconfig/ui/optprintpage.ui:348
 msgctxt "optprintpage|reducebitmapdpi"
 msgid "600 DPI"
 msgstr "600 DPI"
 
-#: optprintpage.ui:365
+#: sfx2/uiconfig/ui/optprintpage.ui:364
 msgctxt "optprintpage|reducebitmaptrans"
 msgid "Include transparent objects"
 msgstr "Cynnwys gwrthrychau tryloyw"
 
-#: optprintpage.ui:388
+#: sfx2/uiconfig/ui/optprintpage.ui:388
 msgctxt "optprintpage|reducebitmap"
 msgid "Reduce _bitmaps"
 msgstr "Lleihau _didfapiau"
 
-#: optprintpage.ui:403
+#: sfx2/uiconfig/ui/optprintpage.ui:403
 msgctxt "optprintpage|pdf"
 msgid "_PDF as standard print job format"
 msgstr "_PDF fel fformat tasg argraffu safonol"
 
-#: optprintpage.ui:433
+#: sfx2/uiconfig/ui/optprintpage.ui:433
 msgctxt "optprintpage|label1"
 msgid "Reduce Print Data"
 msgstr "Lleihau'r Data Argraffu"
 
-#: optprintpage.ui:466
+#: sfx2/uiconfig/ui/optprintpage.ui:466
 msgctxt "optprintpage|papersize"
 msgid "P_aper size"
 msgstr "_Maint papur"
 
-#: optprintpage.ui:481
+#: sfx2/uiconfig/ui/optprintpage.ui:481
 msgctxt "optprintpage|paperorient"
 msgid "Pap_er orientation"
 msgstr "Cyfeiriadedd _papur"
 
-#: optprintpage.ui:497
+#: sfx2/uiconfig/ui/optprintpage.ui:497
 msgctxt "optprintpage|trans"
 msgid "_Transparency"
 msgstr "_Tryloywder"
 
-#: optprintpage.ui:518
+#: sfx2/uiconfig/ui/optprintpage.ui:518
 msgctxt "optprintpage|label2"
 msgid "Printer Warnings"
 msgstr "Rhybuddion Argraffu"
 
-#: password.ui:8
+#: sfx2/uiconfig/ui/password.ui:8
 msgctxt "password|PasswordDialog"
 msgid "Enter Password"
 msgstr "Rhowch Gyfrinair"
 
-#: password.ui:100
+#: sfx2/uiconfig/ui/password.ui:104
 msgctxt "password|userft"
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: password.ui:114
+#: sfx2/uiconfig/ui/password.ui:118
 msgctxt "password|pass1ft"
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: password.ui:128
+#: sfx2/uiconfig/ui/password.ui:132
 msgctxt "password|confirm1ft"
 msgid "Confirm:"
 msgstr "Cadarnhau:"
 
-#: password.ui:158
+#: sfx2/uiconfig/ui/password.ui:164
 msgctxt "password|pass1ed-atkobject"
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: password.ui:188
+#: sfx2/uiconfig/ui/password.ui:195
 msgctxt "password|label1"
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: password.ui:223
+#: sfx2/uiconfig/ui/password.ui:230
 msgctxt "password|pass2ft"
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: password.ui:237
+#: sfx2/uiconfig/ui/password.ui:244
 msgctxt "password|confirm2ft"
 msgid "Confirm:"
 msgstr "Cadarnhau:"
 
-#: password.ui:281
+#: sfx2/uiconfig/ui/password.ui:290
 msgctxt "password|label2"
 msgid "Second Password"
 msgstr "Ail Gyfrinair"
 
-#: printeroptionsdialog.ui:8
+#: sfx2/uiconfig/ui/printeroptionsdialog.ui:8
 msgctxt "printeroptionsdialog|PrinterOptionsDialog"
 msgid "Printer Options"
 msgstr "Dewisiadau Argraffydd"
 
-#: querysavedialog.ui:8
+#: sfx2/uiconfig/ui/querysavedialog.ui:7
 msgctxt "querysavedialog|QuerySaveDialog"
 msgid "Save Document?"
 msgstr "Cadw'r Ddogfen?"
 
-#: querysavedialog.ui:13
+#: sfx2/uiconfig/ui/querysavedialog.ui:13
 msgctxt "querysavedialog|QuerySaveDialog"
 msgid "Save changes to document “$(DOC)” before closing?"
 msgstr "Cadw newidiadau i ddogfen “$(DOC)” cyn cau?"
 
-#: querysavedialog.ui:14
+#: sfx2/uiconfig/ui/querysavedialog.ui:14
 msgctxt "querysavedialog|QuerySaveDialog"
 msgid "Your changes will be lost if you don’t save them."
 msgstr "Bydd eich newidiadau'n cael eu colli os nad ydych yn eu cadw."
 
-#: querysavedialog.ui:26
+#: sfx2/uiconfig/ui/querysavedialog.ui:25
 msgctxt "querysavedialog|discard"
 msgid "_Don’t Save"
 msgstr "_Peidio â Chadw"
 
-#: safemodequerydialog.ui:8
+#: sfx2/uiconfig/ui/safemodequerydialog.ui:7
 msgctxt "safemodequerydialog|SafeModeQueryDialog"
 msgid "Enter Safe Mode"
 msgstr "Mynd i'r Modd Diogel"
 
-#: safemodequerydialog.ui:39
-msgctxt "safemodequerydialog|restart"
-msgid "_Restart"
-msgstr "_Ail-gychwyn"
-
-#: safemodequerydialog.ui:63
+#: sfx2/uiconfig/ui/safemodequerydialog.ui:12
 msgctxt "safemodequerydialog|label"
 msgid "Are you sure you want to restart %PRODUCTNAME and enter safe mode?"
 msgstr "Ydych chi'n siŵr eich bod am ailgychwyn %PRODUCTNAME a mynd i'r modd diogel?"
 
-#: saveastemplatedlg.ui:13
+#: sfx2/uiconfig/ui/safemodequerydialog.ui:41
+msgctxt "safemodequerydialog|restart"
+msgid "_Restart"
+msgstr "_Ail-gychwyn"
+
+#: sfx2/uiconfig/ui/saveastemplatedlg.ui:12
 msgctxt "saveastemplatedlg|categorylist"
 msgid "None"
 msgstr "Dim"
 
-#: saveastemplatedlg.ui:20
+#: sfx2/uiconfig/ui/saveastemplatedlg.ui:19
 msgctxt "saveastemplatedlg|SaveAsTemplateDialog"
 msgid "Save As Template"
 msgstr "Cadw fel Templed"
 
-#: saveastemplatedlg.ui:103
+#: sfx2/uiconfig/ui/saveastemplatedlg.ui:106
 msgctxt "saveastemplatedlg|create_label"
 msgid "Template _Name"
 msgstr "Enw'r _Templed"
 
-#: saveastemplatedlg.ui:145
+#: sfx2/uiconfig/ui/saveastemplatedlg.ui:151
 msgctxt "saveastemplatedlg|select_label"
 msgid "Template _Category"
 msgstr "_Categori'r Templed"
 
-#: saveastemplatedlg.ui:184
+#: sfx2/uiconfig/ui/saveastemplatedlg.ui:213
 msgctxt "saveastemplatedlg|defaultcb"
 msgid "_Set as default template"
 msgstr "_Gosod fel y templed ragosodedig"
 
-#: searchdialog.ui:8
+#: sfx2/uiconfig/ui/searchdialog.ui:8
 msgctxt "searchdialog|SearchDialog"
 msgid "Find on this Page"
 msgstr "Canfod yn y dudalen"
 
-#: searchdialog.ui:21
+#: sfx2/uiconfig/ui/searchdialog.ui:21
 msgctxt "searchdialog|search"
 msgid "_Find"
 msgstr "_Canfod"
 
-#: searchdialog.ui:93
+#: sfx2/uiconfig/ui/searchdialog.ui:93
 msgctxt "searchdialog|label1"
 msgid "_Search for:"
 msgstr "_Chwilio am:"
 
-#: searchdialog.ui:117
+#: sfx2/uiconfig/ui/searchdialog.ui:117
 msgctxt "searchdialog|matchcase"
 msgid "Ma_tch case"
 msgstr "Cydweddu _maint"
 
-#: searchdialog.ui:132
+#: sfx2/uiconfig/ui/searchdialog.ui:132
 msgctxt "searchdialog|wholewords"
 msgid "Whole wor_ds only"
 msgstr "_Geiriau cyfan yn unig"
 
-#: searchdialog.ui:147
+#: sfx2/uiconfig/ui/searchdialog.ui:147
 msgctxt "searchdialog|backwards"
 msgid "Bac_kwards"
 msgstr "_Nôl"
 
-#: searchdialog.ui:162
+#: sfx2/uiconfig/ui/searchdialog.ui:162
 msgctxt "searchdialog|wrap"
 msgid "Wrap _around"
 msgstr "_Amlapio"
 
-#: securityinfopage.ui:31
+#: sfx2/uiconfig/ui/securityinfopage.ui:31
 msgctxt "securityinfopage|readonly"
 msgid "_Open file read-only"
 msgstr "_Agor ffeil darllen yn unig"
 
-#: securityinfopage.ui:50
+#: sfx2/uiconfig/ui/securityinfopage.ui:50
 msgctxt "securityinfopage|recordchanges"
 msgid "Record _changes"
 msgstr "Cofnodi _newidiadau"
 
-#: securityinfopage.ui:73
+#: sfx2/uiconfig/ui/securityinfopage.ui:73
 msgctxt "securityinfopage|protect"
 msgid "Protect..."
 msgstr "Diogelu..."
 
-#: securityinfopage.ui:87
+#: sfx2/uiconfig/ui/securityinfopage.ui:87
 msgctxt "securityinfopage|unprotect"
 msgid "_Unprotect..."
 msgstr "_Peidio amddiffyn..."
 
-#: securityinfopage.ui:119
+#: sfx2/uiconfig/ui/securityinfopage.ui:119
 msgctxt "securityinfopage|label47"
 msgid "File Sharing Options"
 msgstr "Dewisiadau Rhannu Ffeil"
 
-#: startcenter.ui:18
+#: sfx2/uiconfig/ui/startcenter.ui:18
 msgctxt "startcenter|clear_all"
 msgid "Clear Recent Documents"
 msgstr "Clirio'r Dogfennau Diweddar"
 
-#: startcenter.ui:39
+#: sfx2/uiconfig/ui/startcenter.ui:39
 msgctxt "startcenter|filter_writer"
 msgid "Writer Templates"
 msgstr "Templedi Writer"
 
-#: startcenter.ui:46
+#: sfx2/uiconfig/ui/startcenter.ui:46
 msgctxt "startcenter|filter_calc"
 msgid "Calc Templates"
 msgstr "Templedi Calc"
 
-#: startcenter.ui:53
+#: sfx2/uiconfig/ui/startcenter.ui:53
 msgctxt "startcenter|filter_impress"
 msgid "Impress Templates"
 msgstr "Templedi Impress"
 
-#: startcenter.ui:60
+#: sfx2/uiconfig/ui/startcenter.ui:60
 msgctxt "startcenter|filter_draw"
 msgid "Draw Templates"
 msgstr "Templedi Draw"
 
-#: startcenter.ui:73
+#: sfx2/uiconfig/ui/startcenter.ui:73
 msgctxt "startcenter|manage"
 msgid "Manage Templates"
 msgstr "Rheoli Tempedi"
 
-#: startcenter.ui:146
+#: sfx2/uiconfig/ui/startcenter.ui:146
 msgctxt "startcenter|open_all"
 msgid "_Open File"
 msgstr "_Agor Ffeil"
 
-#: startcenter.ui:166
+#: sfx2/uiconfig/ui/startcenter.ui:166
 msgctxt "startcenter|open_remote"
 msgid "Remote File_s"
 msgstr "Ffeiliau _Pell"
 
-#: startcenter.ui:198
+#: sfx2/uiconfig/ui/startcenter.ui:198
 msgctxt "startcenter|open_recent"
 msgid "_Recent Files"
 msgstr "Ffeiliau _Diweddar"
 
-#: startcenter.ui:217
+#: sfx2/uiconfig/ui/startcenter.ui:217
 msgctxt "startcenter|templates_all"
 msgid "T_emplates"
 msgstr "_Templedi"
 
-#: startcenter.ui:253
+#: sfx2/uiconfig/ui/startcenter.ui:253
 msgctxt "startcenter|create_label"
 msgid "Create:"
 msgstr "Creu:"
 
-#: startcenter.ui:264
+#: sfx2/uiconfig/ui/startcenter.ui:264
 msgctxt "startcenter|writer_all"
 msgid "_Writer Document"
 msgstr "Dogfen _Writer"
 
-#: startcenter.ui:284
+#: sfx2/uiconfig/ui/startcenter.ui:284
 msgctxt "startcenter|calc_all"
 msgid "_Calc Spreadsheet"
 msgstr "Taenlen _Calc"
 
-#: startcenter.ui:304
+#: sfx2/uiconfig/ui/startcenter.ui:304
 msgctxt "startcenter|impress_all"
 msgid "_Impress Presentation"
 msgstr "Cyflwyniad _Impress"
 
-#: startcenter.ui:324
+#: sfx2/uiconfig/ui/startcenter.ui:324
 msgctxt "startcenter|draw_all"
 msgid "_Draw Drawing"
 msgstr "_Lluniad Draw"
 
-#: startcenter.ui:344
+#: sfx2/uiconfig/ui/startcenter.ui:344
 msgctxt "startcenter|math_all"
 msgid "_Math Formula"
 msgstr "_Fformiwla Math"
 
-#: startcenter.ui:364
+#: sfx2/uiconfig/ui/startcenter.ui:364
 msgctxt "startcenter|database_all"
 msgid "_Base Database"
 msgstr "C_ronfa Ddata Base"
 
-#: startcenter.ui:397
+#: sfx2/uiconfig/ui/startcenter.ui:397
 msgctxt "startcenter|althelplabel"
 msgid "He_lp"
 msgstr "C_ymorth"
 
-#: startcenter.ui:454
+#: sfx2/uiconfig/ui/startcenter.ui:454
 msgctxt "startcenter|extensions"
 msgid "E_xtensions"
 msgstr "_Estyniadau"
 
-#: startcenter.ui:482
+#: sfx2/uiconfig/ui/startcenter.ui:482
 msgctxt "startcenter|label1"
 msgid "Application"
 msgstr "Rhaglen"
 
-#: startcenter.ui:500
+#: sfx2/uiconfig/ui/startcenter.ui:500
 msgctxt "startcenter|all_recent_label"
 msgid "Recent Files List"
 msgstr "Rhestr y Ffeiliau Diweddar"
 
-#: startcenter.ui:513
+#: sfx2/uiconfig/ui/startcenter.ui:513
 msgctxt "startcenter|local_view_label"
 msgid "Templates List"
 msgstr "Rhestr Templedi"
 
-#: stylecontextmenu.ui:12
+#: sfx2/uiconfig/ui/stylecontextmenu.ui:12
 msgctxt "stylecontextmenu|new"
 msgid "New..."
 msgstr "Newydd..."
 
-#: stylecontextmenu.ui:20
+#: sfx2/uiconfig/ui/stylecontextmenu.ui:20
 msgctxt "stylecontextmenu|edit"
 msgid "Modify..."
 msgstr "Addasu..."
 
-#: stylecontextmenu.ui:28
+#: sfx2/uiconfig/ui/stylecontextmenu.ui:28
 msgctxt "stylecontextmenu|hide"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: stylecontextmenu.ui:36
+#: sfx2/uiconfig/ui/stylecontextmenu.ui:36
 msgctxt "stylecontextmenu|show"
 msgid "Show"
 msgstr "Dangos"
 
-#: stylecontextmenu.ui:44
+#: sfx2/uiconfig/ui/stylecontextmenu.ui:44
 msgctxt "stylecontextmenu|delete"
 msgid "Delete..."
 msgstr "Dileu..."
 
-#: templatecategorydlg.ui:13
+#: sfx2/uiconfig/ui/templatecategorydlg.ui:14
 msgctxt "templatecategorydlg|categorylist"
 msgid "None"
 msgstr "Dim"
 
-#: templatecategorydlg.ui:20
+#: sfx2/uiconfig/ui/templatecategorydlg.ui:21
 msgctxt "templatecategorydlg|TemplatesCategoryDialog"
 msgid "Select Category"
 msgstr "Dewis Categori"
 
-#: templatecategorydlg.ui:103
+#: sfx2/uiconfig/ui/templatecategorydlg.ui:109
 msgctxt "templatecategorydlg|select_label"
 msgid "Select from Existing Category"
 msgstr "Dewis o'r Categori Cyfredol"
 
-#: templatecategorydlg.ui:149
+#: sfx2/uiconfig/ui/templatecategorydlg.ui:177
 msgctxt "templatecategorydlg|create_label"
 msgid "or Create a New Category"
 msgstr "neu Greu Categori Newydd"
 
-#: templatedlg.ui:13
+#: sfx2/uiconfig/ui/templatedlg.ui:13
 msgctxt "templatedlg|applist"
 msgid "All Applications"
 msgstr "Pob Rhaglen"
 
-#: templatedlg.ui:16
+#: sfx2/uiconfig/ui/templatedlg.ui:16
 msgctxt "templatedlg|applist"
 msgid "Documents"
 msgstr "Dogfennau"
 
-#: templatedlg.ui:19
+#: sfx2/uiconfig/ui/templatedlg.ui:19
 msgctxt "templatedlg|applist"
 msgid "Spreadsheets"
 msgstr "Taenlenni"
 
-#: templatedlg.ui:22
+#: sfx2/uiconfig/ui/templatedlg.ui:22
 msgctxt "templatedlg|applist"
 msgid "Presentations"
 msgstr "Cyflwyniadau"
 
-#: templatedlg.ui:25
+#: sfx2/uiconfig/ui/templatedlg.ui:25
 msgctxt "templatedlg|applist"
 msgid "Drawings"
 msgstr "Lluniadau"
 
-#: templatedlg.ui:36
+#: sfx2/uiconfig/ui/templatedlg.ui:36
 msgctxt "templatedlg|folderlist"
 msgid "All Categories"
 msgstr "Pob Categori"
 
-#: templatedlg.ui:65
+#: sfx2/uiconfig/ui/templatedlg.ui:65
 msgctxt "templatedlg|TemplateDialog"
 msgid "Templates"
 msgstr "Templedi"
 
-#: templatedlg.ui:146
+#: sfx2/uiconfig/ui/templatedlg.ui:146
 msgctxt "templatedlg|search_filter|tooltip_text"
 msgid "Search"
 msgstr "Chwilio"
 
-#: templatedlg.ui:147
+#: sfx2/uiconfig/ui/templatedlg.ui:147
 msgctxt "templatedlg|search_filter"
 msgid "Search..."
 msgstr "Chwilio..."
 
-#: templatedlg.ui:169
+#: sfx2/uiconfig/ui/templatedlg.ui:169
 msgctxt "templatedlg|filter_application|tooltip_text"
 msgid "Filter by Application"
 msgstr "Hidlo yn erbyn Rhaglenni"
 
-#: templatedlg.ui:184
+#: sfx2/uiconfig/ui/templatedlg.ui:184
 msgctxt "templatedlg|filter_folder|tooltip_text"
 msgid "Filter by Category"
 msgstr "Hidlo yn ôl Categori"
 
-#: templatedlg.ui:205
+#: sfx2/uiconfig/ui/templatedlg.ui:205
 msgctxt "templatedlg|label1"
 msgid "Filter"
 msgstr "Hidl"
 
-#: templatedlg.ui:282
+#: sfx2/uiconfig/ui/templatedlg.ui:282
 msgctxt "templatedlg|thumbnailviewlabel"
 msgid "Template List"
 msgstr "Rhestr Templedi"
 
-#: templatedlg.ui:312
+#: sfx2/uiconfig/ui/templatedlg.ui:312
 msgctxt "templatedlg|action_menu|tooltip_text"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: templatedlg.ui:333
+#: sfx2/uiconfig/ui/templatedlg.ui:333
 msgctxt "templatedlg|online_link|tooltip_text"
 msgid "Browse online templates"
 msgstr "Pori templedi ar-lein"
 
-#: templatedlg.ui:347
+#: sfx2/uiconfig/ui/templatedlg.ui:347
 msgctxt "templatedlg|hidedialogcb"
 msgid "Show this dialog at startup"
 msgstr "Dangos y ddeialog hon wrth gychwyn"
 
-#: templatedlg.ui:373
+#: sfx2/uiconfig/ui/templatedlg.ui:374
 msgctxt "templatedlg|move_btn"
 msgid "Move"
 msgstr "Symud"
 
-#: templatedlg.ui:377
+#: sfx2/uiconfig/ui/templatedlg.ui:378
 msgctxt "templatedlg|move_btn|tooltip_text"
 msgid "Move Templates"
 msgstr "Symud Tempedi"
 
-#: templatedlg.ui:391
+#: sfx2/uiconfig/ui/templatedlg.ui:392
 msgctxt "templatedlg|export_btn"
 msgid "Export"
 msgstr "Allforio"
 
-#: templatedlg.ui:395
+#: sfx2/uiconfig/ui/templatedlg.ui:396
 msgctxt "templatedlg|export_btn|tooltip_text"
 msgid "Export Templates"
 msgstr "Allforio Templedi"
 
-#: templatedlg.ui:408
+#: sfx2/uiconfig/ui/templatedlg.ui:409
 msgctxt "templatedlg|import_btn"
 msgid "Import"
 msgstr "Mewnforio"
 
-#: templatedlg.ui:412
+#: sfx2/uiconfig/ui/templatedlg.ui:413
 msgctxt "templatedlg|import_btn|tooltip_text"
 msgid "Import Templates"
 msgstr "Mewnforio Templedi"
 
-#: versioncommentdialog.ui:8
+#: sfx2/uiconfig/ui/versioncommentdialog.ui:8
 msgctxt "versioncommentdialog|VersionCommentDialog"
 msgid "Insert Version Comment"
 msgstr "Mewnosod Sylwadau'r Fersiwn"
 
-#: versioncommentdialog.ui:101
+#: sfx2/uiconfig/ui/versioncommentdialog.ui:103
 msgctxt "versioncommentdialog|timestamp"
 msgid "Date and time: "
 msgstr "Dyddiad ac amser: "
 
-#: versioncommentdialog.ui:113
+#: sfx2/uiconfig/ui/versioncommentdialog.ui:115
 msgctxt "versioncommentdialog|author"
 msgid "Saved by: "
 msgstr "Cadwyd gan: "
 
-#: versionscmis.ui:52
+#: sfx2/uiconfig/ui/versionscmis.ui:52
 msgctxt "versionscmis|show"
 msgid "_Show..."
 msgstr "_Dangos..."
 
-#: versionscmis.ui:83
+#: sfx2/uiconfig/ui/versionscmis.ui:83
 msgctxt "versionscmis|compare"
 msgid "_Compare"
 msgstr "_Cymharu"
 
-#: versionscmis.ui:160
+#: sfx2/uiconfig/ui/versionscmis.ui:160
 msgctxt "versionscmis|datetime"
 msgid "Date and time"
 msgstr "Dyddiad ac amser"
 
-#: versionscmis.ui:172
+#: sfx2/uiconfig/ui/versionscmis.ui:172
 msgctxt "versionscmis|savedby"
 msgid "Saved by"
 msgstr "Cadwyd gan"
 
-#: versionscmis.ui:184
+#: sfx2/uiconfig/ui/versionscmis.ui:184
 msgctxt "versionscmis|comments"
 msgid "Comments"
 msgstr "Sylwadau"
 
-#: versionscmis.ui:221
+#: sfx2/uiconfig/ui/versionscmis.ui:221
 msgctxt "versionscmis|label2"
 msgid "Existing Versions"
 msgstr "Fersiynau Cyfredol"
 
-#: versionsofdialog.ui:51
+#: sfx2/uiconfig/ui/versionsofdialog.ui:51
 msgctxt "versionsofdialog|show"
 msgid "_Show..."
 msgstr "_Dangos..."
 
-#: versionsofdialog.ui:80
+#: sfx2/uiconfig/ui/versionsofdialog.ui:80
 msgctxt "versionsofdialog|compare"
 msgid "_Compare"
 msgstr "C_ymharu"
 
-#: versionsofdialog.ui:94
+#: sfx2/uiconfig/ui/versionsofdialog.ui:94
 msgctxt "versionsofdialog|cmis"
 msgid "CMIS"
 msgstr "CMIS"
 
-#: versionsofdialog.ui:155
+#: sfx2/uiconfig/ui/versionsofdialog.ui:155
 msgctxt "versionsofdialog|save"
 msgid "Save _New Version"
 msgstr "Cadw Fersiwn _Newydd"
 
-#: versionsofdialog.ui:168
+#: sfx2/uiconfig/ui/versionsofdialog.ui:168
 msgctxt "versionsofdialog|always"
 msgid "_Always save a new version on closing"
 msgstr "Cadw fersiwn newydd bob tro wrth _gau"
 
-#: versionsofdialog.ui:189
+#: sfx2/uiconfig/ui/versionsofdialog.ui:189
 msgctxt "versionsofdialog|label1"
 msgid "New Versions"
 msgstr "Fersiynau Newydd"
 
-#: versionsofdialog.ui:234
+#: sfx2/uiconfig/ui/versionsofdialog.ui:234
 msgctxt "versionsofdialog|datetime"
 msgid "Date and time"
 msgstr "Dyddiad ac amser"
 
-#: versionsofdialog.ui:246
+#: sfx2/uiconfig/ui/versionsofdialog.ui:246
 msgctxt "versionsofdialog|savedby"
 msgid "Saved by"
 msgstr "Cadwyd gan"
 
-#: versionsofdialog.ui:258
+#: sfx2/uiconfig/ui/versionsofdialog.ui:258
 msgctxt "versionsofdialog|comments"
 msgid "Comments"
 msgstr "Sylwadau"
 
-#: versionsofdialog.ui:295
+#: sfx2/uiconfig/ui/versionsofdialog.ui:295
 msgctxt "versionsofdialog|label2"
 msgid "Existing Versions"
 msgstr "Fersiynau Cyfredol"
diff --git a/source/cy/starmath/messages.po b/source/cy/starmath/messages.po
index 0d6d83e9bcf..8bae2d1ab92 100644
--- a/source/cy/starmath/messages.po
+++ b/source/cy/starmath/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-11-22 13:53+0100\n"
+"POT-Creation-Date: 2018-04-24 12:21+0200\n"
 "PO-Revision-Date: 2017-12-29 14:39+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,2535 +13,2535 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1514558372.000000\n"
 
-#: smmod.hrc:16
+#: starmath/inc/smmod.hrc:16
 msgctxt "RID_UI_SYMBOLSET_NAMES"
 msgid "Greek"
 msgstr "Groeg"
 
-#: smmod.hrc:17
+#: starmath/inc/smmod.hrc:17
 msgctxt "RID_UI_SYMBOLSET_NAMES"
 msgid "Special"
 msgstr "Arbennig"
 
-#: smmod.hrc:22
+#: starmath/inc/smmod.hrc:22
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "alpha"
 msgstr "alffa"
 
-#: smmod.hrc:23
+#: starmath/inc/smmod.hrc:23
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "ALPHA"
 msgstr "ALPHA"
 
-#: smmod.hrc:24
+#: starmath/inc/smmod.hrc:24
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "beta"
 msgstr "beta"
 
-#: smmod.hrc:25
+#: starmath/inc/smmod.hrc:25
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "BETA"
 msgstr "BETA"
 
-#: smmod.hrc:26
+#: starmath/inc/smmod.hrc:26
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "gamma"
 msgstr "gamma"
 
-#: smmod.hrc:27
+#: starmath/inc/smmod.hrc:27
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "GAMMA"
 msgstr "GAMMA"
 
-#: smmod.hrc:28
+#: starmath/inc/smmod.hrc:28
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "delta"
 msgstr "delta"
 
-#: smmod.hrc:29
+#: starmath/inc/smmod.hrc:29
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "DELTA"
 msgstr "DELTA"
 
-#: smmod.hrc:30
+#: starmath/inc/smmod.hrc:30
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "epsilon"
 msgstr "epsilon"
 
-#: smmod.hrc:31
+#: starmath/inc/smmod.hrc:31
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "EPSILON"
 msgstr "EPSILON"
 
-#: smmod.hrc:32
+#: starmath/inc/smmod.hrc:32
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "zeta"
 msgstr "zeta"
 
-#: smmod.hrc:33
+#: starmath/inc/smmod.hrc:33
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "ZETA"
 msgstr "ZETA"
 
-#: smmod.hrc:34
+#: starmath/inc/smmod.hrc:34
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "eta"
 msgstr "eta"
 
-#: smmod.hrc:35
+#: starmath/inc/smmod.hrc:35
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "ETA"
 msgstr "ETA"
 
-#: smmod.hrc:36
+#: starmath/inc/smmod.hrc:36
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "theta"
 msgstr "theta"
 
-#: smmod.hrc:37
+#: starmath/inc/smmod.hrc:37
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "THETA"
 msgstr "THETA"
 
-#: smmod.hrc:38
+#: starmath/inc/smmod.hrc:38
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "iota"
 msgstr "iota"
 
-#: smmod.hrc:39
+#: starmath/inc/smmod.hrc:39
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "IOTA"
 msgstr "IOTA"
 
-#: smmod.hrc:40
+#: starmath/inc/smmod.hrc:40
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "kappa"
 msgstr "kappa"
 
-#: smmod.hrc:41
+#: starmath/inc/smmod.hrc:41
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "KAPPA"
 msgstr "KAPPA"
 
-#: smmod.hrc:42
+#: starmath/inc/smmod.hrc:42
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "lambda"
 msgstr "lambda"
 
-#: smmod.hrc:43
+#: starmath/inc/smmod.hrc:43
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "LAMBDA"
 msgstr "LAMBDA"
 
-#: smmod.hrc:44
+#: starmath/inc/smmod.hrc:44
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "mu"
 msgstr "mu"
 
-#: smmod.hrc:45
+#: starmath/inc/smmod.hrc:45
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "MU"
 msgstr "MU"
 
-#: smmod.hrc:46
+#: starmath/inc/smmod.hrc:46
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "nu"
 msgstr "nu"
 
-#: smmod.hrc:47
+#: starmath/inc/smmod.hrc:47
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "NU"
 msgstr "NU"
 
-#: smmod.hrc:48
+#: starmath/inc/smmod.hrc:48
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "xi"
 msgstr "xi"
 
-#: smmod.hrc:49
+#: starmath/inc/smmod.hrc:49
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "XI"
 msgstr "XI"
 
-#: smmod.hrc:50
+#: starmath/inc/smmod.hrc:50
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "omicron"
 msgstr "omicron"
 
-#: smmod.hrc:51
+#: starmath/inc/smmod.hrc:51
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "OMICRON"
 msgstr "OMICRON"
 
-#: smmod.hrc:52
+#: starmath/inc/smmod.hrc:52
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "pi"
 msgstr "pi"
 
-#: smmod.hrc:53
+#: starmath/inc/smmod.hrc:53
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "PI"
 msgstr "PI"
 
-#: smmod.hrc:54
+#: starmath/inc/smmod.hrc:54
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "rho"
 msgstr "rho"
 
-#: smmod.hrc:55
+#: starmath/inc/smmod.hrc:55
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "RHO"
 msgstr "RHO"
 
-#: smmod.hrc:56
+#: starmath/inc/smmod.hrc:56
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "sigma"
 msgstr "sigma"
 
-#: smmod.hrc:57
+#: starmath/inc/smmod.hrc:57
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "SIGMA"
 msgstr "SIGMA"
 
-#: smmod.hrc:58
+#: starmath/inc/smmod.hrc:58
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "tau"
 msgstr "tau"
 
-#: smmod.hrc:59
+#: starmath/inc/smmod.hrc:59
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "TAU"
 msgstr "TAU"
 
-#: smmod.hrc:60
+#: starmath/inc/smmod.hrc:60
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "upsilon"
 msgstr "upsilon"
 
-#: smmod.hrc:61
+#: starmath/inc/smmod.hrc:61
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "UPSILON"
 msgstr "UPSILON"
 
-#: smmod.hrc:62
+#: starmath/inc/smmod.hrc:62
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "phi"
 msgstr "phi"
 
-#: smmod.hrc:63
+#: starmath/inc/smmod.hrc:63
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "PHI"
 msgstr "PHI"
 
-#: smmod.hrc:64
+#: starmath/inc/smmod.hrc:64
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "chi"
 msgstr "chi"
 
-#: smmod.hrc:65
+#: starmath/inc/smmod.hrc:65
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "CHI"
 msgstr "CHI"
 
-#: smmod.hrc:66
+#: starmath/inc/smmod.hrc:66
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "psi"
 msgstr "psi"
 
-#: smmod.hrc:67
+#: starmath/inc/smmod.hrc:67
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "PSI"
 msgstr "PSI"
 
-#: smmod.hrc:68
+#: starmath/inc/smmod.hrc:68
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "omega"
 msgstr "omega"
 
-#: smmod.hrc:69
+#: starmath/inc/smmod.hrc:69
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "OMEGA"
 msgstr "OMEGA"
 
-#: smmod.hrc:70
+#: starmath/inc/smmod.hrc:70
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "varepsilon"
 msgstr "varepsilon"
 
-#: smmod.hrc:71
+#: starmath/inc/smmod.hrc:71
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "vartheta"
 msgstr "vartheta"
 
-#: smmod.hrc:72
+#: starmath/inc/smmod.hrc:72
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "varpi"
 msgstr "varpi"
 
-#: smmod.hrc:73
+#: starmath/inc/smmod.hrc:73
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "varrho"
 msgstr "varrho"
 
-#: smmod.hrc:74
+#: starmath/inc/smmod.hrc:74
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "varsigma"
 msgstr "varsigma"
 
-#: smmod.hrc:75
+#: starmath/inc/smmod.hrc:75
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "varphi"
 msgstr "varphi"
 
-#: smmod.hrc:76
+#: starmath/inc/smmod.hrc:76
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "element"
 msgstr "elfen"
 
-#: smmod.hrc:77
+#: starmath/inc/smmod.hrc:77
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "noelement"
 msgstr "dimelfen"
 
-#: smmod.hrc:78
+#: starmath/inc/smmod.hrc:78
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "strictlylessthan"
 msgstr "llainacaeth"
 
-#: smmod.hrc:79
+#: starmath/inc/smmod.hrc:79
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "strictlygreaterthan"
 msgstr "mwynacaeth"
 
-#: smmod.hrc:80
+#: starmath/inc/smmod.hrc:80
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "notequal"
 msgstr "anhafal"
 
-#: smmod.hrc:81
+#: starmath/inc/smmod.hrc:81
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "identical"
 msgstr "unfath"
 
-#: smmod.hrc:82
+#: starmath/inc/smmod.hrc:82
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "tendto"
 msgstr "tueddi"
 
-#: smmod.hrc:83
+#: starmath/inc/smmod.hrc:83
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "infinite"
 msgstr "anfeidraidd"
 
-#: smmod.hrc:84
+#: starmath/inc/smmod.hrc:84
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "angle"
 msgstr "ongl"
 
-#: smmod.hrc:85
+#: starmath/inc/smmod.hrc:85
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "perthousand"
 msgstr "yfil"
 
-#: smmod.hrc:86
+#: starmath/inc/smmod.hrc:86
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "and"
 msgstr "a"
 
-#: smmod.hrc:87
+#: starmath/inc/smmod.hrc:87
 msgctxt "RID_UI_SYMBOL_NAMES"
 msgid "or"
 msgstr "neu"
 
-#: strings.hrc:25
+#: starmath/inc/strings.hrc:25
 msgctxt "RID_PLUSX_HELP"
 msgid "+ Sign"
 msgstr "Arwydd +"
 
-#: strings.hrc:26
+#: starmath/inc/strings.hrc:26
 msgctxt "RID_MINUSX_HELP"
 msgid "- Sign"
 msgstr "Arwydd -"
 
-#: strings.hrc:27
+#: starmath/inc/strings.hrc:27
 msgctxt "RID_PLUSMINUSX_HELP"
 msgid "+- Sign"
 msgstr "Arwydd +-"
 
-#: strings.hrc:28
+#: starmath/inc/strings.hrc:28
 msgctxt "RID_MINUSPLUSX_HELP"
 msgid "-+ Sign"
 msgstr "Arwydd -+"
 
-#: strings.hrc:29
+#: starmath/inc/strings.hrc:29
 msgctxt "RID_NEGX_HELP"
 msgid "Boolean NOT"
 msgstr "NOT Boole"
 
-#: strings.hrc:30
+#: starmath/inc/strings.hrc:30
 msgctxt "RID_XPLUSY_HELP"
 msgid "Addition +"
 msgstr "Adiad +"
 
-#: strings.hrc:31
+#: starmath/inc/strings.hrc:31
 msgctxt "RID_XMINUSY_HELP"
 msgid "Subtraction -"
 msgstr "Tynnu -"
 
-#: strings.hrc:32
+#: starmath/inc/strings.hrc:32
 msgctxt "RID_XCDOTY_HELP"
 msgid "Multiplication (Dot)"
 msgstr "Lluosogi (Dot)"
 
-#: strings.hrc:33
+#: starmath/inc/strings.hrc:33
 msgctxt "RID_XTIMESY_HELP"
 msgid "Multiplication (x)"
 msgstr "Lluosiad (x)"
 
-#: strings.hrc:34
+#: starmath/inc/strings.hrc:34
 msgctxt "RID_XSYMTIMESY_HELP"
 msgid "Multiplication (*)"
 msgstr "Lluosiad (*)"
 
-#: strings.hrc:35
+#: starmath/inc/strings.hrc:35
 msgctxt "RID_XSYMDIVIDEY_HELP"
 msgid "Division (Slash)"
 msgstr "Rhannu (/)"
 
-#: strings.hrc:36
+#: starmath/inc/strings.hrc:36
 msgctxt "RID_XDIVY_HELP"
 msgid "Division (÷)"
 msgstr "Rhannu (÷)"
 
-#: strings.hrc:37
+#: starmath/inc/strings.hrc:37
 msgctxt "RID_XOVERY_HELP"
 msgid "Division (Fraction)"
 msgstr "Rhannu (Ffracsiwn)"
 
-#: strings.hrc:38
+#: starmath/inc/strings.hrc:38
 msgctxt "RID_XODIVIDEY_HELP"
 msgid "Circled Slash"
 msgstr "Slaes Cylchog"
 
-#: strings.hrc:39
+#: starmath/inc/strings.hrc:39
 msgctxt "RID_XODOTY_HELP"
 msgid "Circled Dot"
 msgstr "Dot Cylchog"
 
-#: strings.hrc:40
+#: starmath/inc/strings.hrc:40
 msgctxt "RID_XOMINUSY_HELP"
 msgid "Circled Minus"
 msgstr "Minws Cylchog"
 
-#: strings.hrc:41
+#: starmath/inc/strings.hrc:41
 msgctxt "RID_XOPLUSY_HELP"
 msgid "Circled Plus"
 msgstr "Plws Cylchog"
 
-#: strings.hrc:42
+#: starmath/inc/strings.hrc:42
 msgctxt "RID_XOTIMESY_HELP"
 msgid "Tensor Product"
 msgstr "Cynnyrch Tensor"
 
-#: strings.hrc:43
+#: starmath/inc/strings.hrc:43
 msgctxt "RID_XANDY_HELP"
 msgid "Boolean AND"
 msgstr "AND Boole"
 
-#: strings.hrc:44
+#: starmath/inc/strings.hrc:44
 msgctxt "RID_XORY_HELP"
 msgid "Boolean OR"
 msgstr "OR Boole"
 
-#: strings.hrc:45
+#: starmath/inc/strings.hrc:45
 msgctxt "RID_XEQY_HELP"
 msgid "Is Equal"
 msgstr "Yn Hafal"
 
-#: strings.hrc:46
+#: starmath/inc/strings.hrc:46
 msgctxt "RID_XNEQY_HELP"
 msgid "Is Not Equal"
 msgstr "Nid Yw'n Hafal"
 
-#: strings.hrc:47
+#: starmath/inc/strings.hrc:47
 msgctxt "RID_XLTY_HELP"
 msgid "Is Less Than"
 msgstr "Yn Llai Na"
 
-#: strings.hrc:48
+#: starmath/inc/strings.hrc:48
 msgctxt "RID_XGTY_HELP"
 msgid "Is Greater Than"
 msgstr "Yn Fwy Na"
 
-#: strings.hrc:49
+#: starmath/inc/strings.hrc:49
 msgctxt "RID_XLEY_HELP"
 msgid "Is Less Than Or Equal To"
 msgstr "Yn Llai na Neu Hafal â"
 
-#: strings.hrc:50
+#: starmath/inc/strings.hrc:50
 msgctxt "RID_XGEY_HELP"
 msgid "Is Greater Than Or Equal To"
 msgstr "Yn Fwy na Neu Hafal a"
 
-#: strings.hrc:51
+#: starmath/inc/strings.hrc:51
 msgctxt "RID_XLESLANTY_HELP"
 msgid "Is Less Than Or Equal To"
 msgstr "Yn Llai na neu Hafal â"
 
-#: strings.hrc:52
+#: starmath/inc/strings.hrc:52
 msgctxt "RID_XGESLANTY_HELP"
 msgid "Is Greater Than Or Equal To"
 msgstr "Mwy na Neu Hafal a"
 
-#: strings.hrc:53
+#: starmath/inc/strings.hrc:53
 msgctxt "RID_XLLY_HELP"
 msgid "Is Much Less Than"
 msgstr "Llawer Llai Na"
 
-#: strings.hrc:54
+#: starmath/inc/strings.hrc:54
 msgctxt "RID_XGGY_HELP"
 msgid "Is Much Greater Than"
 msgstr "Llawer Mwy Na"
 
-#: strings.hrc:55
+#: starmath/inc/strings.hrc:55
 msgctxt "RID_XDEFY_HELP"
 msgid "Is Defined As"
 msgstr "Wedi ei Ddiffinio Fel"
 
-#: strings.hrc:56
+#: starmath/inc/strings.hrc:56
 msgctxt "RID_XEQUIVY_HELP"
 msgid "Is Congruent To"
 msgstr "Yn Gyfath I"
 
-#: strings.hrc:57
+#: starmath/inc/strings.hrc:57
 msgctxt "RID_XAPPROXY_HELP"
 msgid "Is Approximately Equal"
 msgstr "Tua Hafal"
 
-#: strings.hrc:58
+#: starmath/inc/strings.hrc:58
 msgctxt "RID_XSIMY_HELP"
 msgid "Is Similar To"
 msgstr "Yn Debyg I"
 
-#: strings.hrc:59
+#: starmath/inc/strings.hrc:59
 msgctxt "RID_XSIMEQY_HELP"
 msgid "Is Similar Or Equal"
 msgstr "Yn Debyg Neu Hafal â"
 
-#: strings.hrc:60
+#: starmath/inc/strings.hrc:60
 msgctxt "RID_XPROPY_HELP"
 msgid "Is Proportional To"
 msgstr "Yn Gyfranneddol I"
 
-#: strings.hrc:61
+#: starmath/inc/strings.hrc:61
 msgctxt "RID_XORTHOY_HELP"
 msgid "Is Orthogonal To"
 msgstr "Yn Orthogonal I"
 
-#: strings.hrc:62
+#: starmath/inc/strings.hrc:62
 msgctxt "RID_XPARALLELY_HELP"
 msgid "Is Parallel To"
 msgstr "Yn Baralel I"
 
-#: strings.hrc:63
+#: starmath/inc/strings.hrc:63
 msgctxt "RID_XTOWARDY_HELP"
 msgid "Toward"
 msgstr "Tuag At"
 
-#: strings.hrc:64
+#: starmath/inc/strings.hrc:64
 msgctxt "RID_XTRANSLY_HELP"
 msgid "Corresponds To (Left)"
 msgstr "Yn Cyfateb i (Chwith)"
 
-#: strings.hrc:65
+#: starmath/inc/strings.hrc:65
 msgctxt "RID_XTRANSRY_HELP"
 msgid "Corresponds To (Right)"
 msgstr "Yn Cyfateb i (De)"
 
-#: strings.hrc:66
+#: starmath/inc/strings.hrc:66
 msgctxt "RID_XINY_HELP"
 msgid "Is In"
 msgstr "O Fewn"
 
-#: strings.hrc:67
+#: starmath/inc/strings.hrc:67
 msgctxt "RID_XNOTINY_HELP"
 msgid "Is Not In"
 msgstr "Nid o Fewn"
 
-#: strings.hrc:68
+#: starmath/inc/strings.hrc:68
 msgctxt "RID_XOWNSY_HELP"
 msgid "Owns"
 msgstr "Perchenogi"
 
-#: strings.hrc:69
+#: starmath/inc/strings.hrc:69
 msgctxt "RID_XUNIONY_HELP"
 msgid "Union"
 msgstr "Unedig"
 
-#: strings.hrc:70
+#: starmath/inc/strings.hrc:70
 msgctxt "RID_XINTERSECTIONY_HELP"
 msgid "Intersection"
 msgstr "Croestoriad"
 
-#: strings.hrc:71
+#: starmath/inc/strings.hrc:71
 msgctxt "RID_XSETMINUSY_HELP"
 msgid "Difference"
 msgstr "Gwahaniaeth"
 
-#: strings.hrc:72
+#: starmath/inc/strings.hrc:72
 msgctxt "RID_XSLASHY_HELP"
 msgid "Quotient Set"
 msgstr "Set Cyniferydd"
 
-#: strings.hrc:73
+#: starmath/inc/strings.hrc:73
 msgctxt "RID_XSUBSETY_HELP"
 msgid "Subset"
 msgstr "Is-set"
 
-#: strings.hrc:74
+#: starmath/inc/strings.hrc:74
 msgctxt "RID_XSUBSETEQY_HELP"
 msgid "Subset Or Equal To"
 msgstr "Is -set Neu Hafal â"
 
-#: strings.hrc:75
+#: starmath/inc/strings.hrc:75
 msgctxt "RID_XSUPSETY_HELP"
 msgid "Superset"
 msgstr "Uwch Set"
 
-#: strings.hrc:76
+#: starmath/inc/strings.hrc:76
 msgctxt "RID_XSUPSETEQY_HELP"
 msgid "Superset Or Equal To"
 msgstr "Uwchset Neu Hafal â"
 
-#: strings.hrc:77
+#: starmath/inc/strings.hrc:77
 msgctxt "RID_XNSUBSETY_HELP"
 msgid "Not Subset"
 msgstr "Is-set"
 
-#: strings.hrc:78
+#: starmath/inc/strings.hrc:78
 msgctxt "RID_XNSUBSETEQY_HELP"
 msgid "Not Subset Or Equal"
 msgstr "Is -set Neu Hafal â"
 
-#: strings.hrc:79
+#: starmath/inc/strings.hrc:79
 msgctxt "RID_XNSUPSETY_HELP"
 msgid "Not Superset"
 msgstr "Nid Uwch Set"
 
-#: strings.hrc:80
+#: starmath/inc/strings.hrc:80
 msgctxt "RID_XNSUPSETEQY_HELP"
 msgid "Not Superset Or Equal"
 msgstr "Uwchset Neu Hafal â"
 
-#: strings.hrc:81
+#: starmath/inc/strings.hrc:81
 msgctxt "RID_ABSX_HELP"
 msgid "Absolute Value"
 msgstr "Gwerth Absoliwt"
 
-#: strings.hrc:82
+#: starmath/inc/strings.hrc:82
 msgctxt "RID_FACTX_HELP"
 msgid "Factorial"
 msgstr "Ffactoraidd"
 
-#: strings.hrc:83
+#: starmath/inc/strings.hrc:83
 msgctxt "RID_SQRTX_HELP"
 msgid "Square Root"
 msgstr "Ail Isradd"
 
-#: strings.hrc:84
+#: starmath/inc/strings.hrc:84
 msgctxt "RID_NROOTXY_HELP"
 msgid "N-th Root"
 msgstr "Isradd N"
 
-#: strings.hrc:85
+#: starmath/inc/strings.hrc:85
 msgctxt "RID_EX_HELP"
 msgid "Exponential Function"
 msgstr "Swyddogaeth Esbonyddol"
 
-#: strings.hrc:86
+#: starmath/inc/strings.hrc:86
 msgctxt "RID_EXPX_HELP"
 msgid "Exponential Function"
 msgstr "Swyddogaeth Esbonyddol"
 
-#: strings.hrc:87
+#: starmath/inc/strings.hrc:87
 msgctxt "RID_LNX_HELP"
 msgid "Natural Logarithm"
 msgstr "Logarithm Naturiol"
 
-#: strings.hrc:88
+#: starmath/inc/strings.hrc:88
 msgctxt "RID_LOGX_HELP"
 msgid "Logarithm"
 msgstr "Logarithm"
 
-#: strings.hrc:89
+#: starmath/inc/strings.hrc:89
 msgctxt "RID_SINX_HELP"
 msgid "Sine"
 msgstr "Sin"
 
-#: strings.hrc:90
+#: starmath/inc/strings.hrc:90
 msgctxt "RID_COSX_HELP"
 msgid "Cosine"
 msgstr "Cosin"
 
-#: strings.hrc:91
+#: starmath/inc/strings.hrc:91
 msgctxt "RID_TANX_HELP"
 msgid "Tangent"
 msgstr "Tangiad"
 
-#: strings.hrc:92
+#: starmath/inc/strings.hrc:92
 msgctxt "RID_COTX_HELP"
 msgid "Cotangent"
 msgstr "Cotangiad"
 
-#: strings.hrc:93
+#: starmath/inc/strings.hrc:93
 msgctxt "RID_ARCSINX_HELP"
 msgid "Arcsine"
 msgstr "Arcsin"
 
-#: strings.hrc:94
+#: starmath/inc/strings.hrc:94
 msgctxt "RID_ARCCOSX_HELP"
 msgid "Arccosine"
 msgstr "Arccosine"
 
-#: strings.hrc:95
+#: starmath/inc/strings.hrc:95
 msgctxt "RID_ARCTANX_HELP"
 msgid "Arctangent"
 msgstr "Arctangiad"
 
-#: strings.hrc:96
+#: starmath/inc/strings.hrc:96
 msgctxt "RID_ARCCOTX_HELP"
 msgid "Arccotangent"
 msgstr "Arccotangiad"
 
-#: strings.hrc:97
+#: starmath/inc/strings.hrc:97
 msgctxt "RID_SINHX_HELP"
 msgid "Hyperbolic Sine"
 msgstr "Sin Hyperbolig"
 
-#: strings.hrc:98
+#: starmath/inc/strings.hrc:98
 msgctxt "RID_COSHX_HELP"
 msgid "Hyperbolic Cosine"
 msgstr "Sosin Hyperbolig"
 
-#: strings.hrc:99
+#: starmath/inc/strings.hrc:99
 msgctxt "RID_TANHX_HELP"
 msgid "Hyperbolic Tangent"
 msgstr "Tangiad Hyperbolig"
 
-#: strings.hrc:100
+#: starmath/inc/strings.hrc:100
 msgctxt "RID_COTHX_HELP"
 msgid "Hyperbolic Cotangent"
 msgstr "Cotangiad Hyperbolig"
 
-#: strings.hrc:101
+#: starmath/inc/strings.hrc:101
 msgctxt "RID_ARSINHX_HELP"
 msgid "Area Hyperbolic Sine"
 msgstr "Ardal Sin Hyperblig"
 
-#: strings.hrc:102
+#: starmath/inc/strings.hrc:102
 msgctxt "RID_ARCOSHX_HELP"
 msgid "Area Hyperbolic Cosine"
 msgstr "Ardal Cosin Hyperbolig"
 
-#: strings.hrc:103
+#: starmath/inc/strings.hrc:103
 msgctxt "RID_ARTANHX_HELP"
 msgid "Area Hyperbolic Tangent"
 msgstr "Ardal Tangiad Hyperbolig"
 
-#: strings.hrc:104
+#: starmath/inc/strings.hrc:104
 msgctxt "RID_ARCOTHX_HELP"
 msgid "Area Hyperbolic Cotangent"
 msgstr "Ardal Cotangiad Hyperbolig"
 
-#: strings.hrc:105
+#: starmath/inc/strings.hrc:105
 msgctxt "RID_SUMX_HELP"
 msgid "Sum"
 msgstr "Swm"
 
-#: strings.hrc:106
+#: starmath/inc/strings.hrc:106
 msgctxt "RID_SUM_FROMX_HELP"
 msgid "Sum Subscript Bottom"
 msgstr "Isysgrif Gwaelod Swm"
 
-#: strings.hrc:107
+#: starmath/inc/strings.hrc:107
 msgctxt "RID_SUM_TOX_HELP"
 msgid "Sum Superscript Top"
 msgstr "Uwchysgrif Brig Swm"
 
-#: strings.hrc:108
+#: starmath/inc/strings.hrc:108
 msgctxt "RID_SUM_FROMTOX_HELP"
 msgid "Sum Sup/Sub script"
 msgstr "Sgript Swm Uwch/Is"
 
-#: strings.hrc:109
+#: starmath/inc/strings.hrc:109
 msgctxt "RID_PRODX_HELP"
 msgid "Product"
 msgstr "Cynnyrch"
 
-#: strings.hrc:110
+#: starmath/inc/strings.hrc:110
 msgctxt "RID_PROD_FROMX_HELP"
 msgid "Product Subscript Bottom"
 msgstr "Isysgrif Gwaelod Cynnyrch"
 
-#: strings.hrc:111
+#: starmath/inc/strings.hrc:111
 msgctxt "RID_PROD_TOX_HELP"
 msgid "Product Superscript Top"
 msgstr "Uwchysgrif Brig Cynnyrch"
 
-#: strings.hrc:112
+#: starmath/inc/strings.hrc:112
 msgctxt "RID_PROD_FROMTOX_HELP"
 msgid "Product Sup/Sub script"
 msgstr "Sbripr cynnych Uwch/Is"
 
-#: strings.hrc:113
+#: starmath/inc/strings.hrc:113
 msgctxt "RID_COPRODX_HELP"
 msgid "Coproduct"
 msgstr "Cydgynnyrch"
 
-#: strings.hrc:114
+#: starmath/inc/strings.hrc:114
 msgctxt "RID_COPROD_FROMX_HELP"
 msgid "Coproduct Subscript Bottom"
 msgstr "Isysgrif Gwaelod Cydgynnyrch"
 
-#: strings.hrc:115
+#: starmath/inc/strings.hrc:115
 msgctxt "RID_COPROD_TOX_HELP"
 msgid "Coproduct Superscript Top"
 msgstr "Uwchysgrif Brig Cydgynnyrch"
 
-#: strings.hrc:116
+#: starmath/inc/strings.hrc:116
 msgctxt "RID_COPROD_FROMTOX_HELP"
 msgid "Coproduct Sup/Sub script"
 msgstr "Cydgynnyrch sgript Uwch/Is"
 
-#: strings.hrc:117
+#: starmath/inc/strings.hrc:117
 msgctxt "RID_LIMX_HELP"
 msgid "Limes"
 msgstr "Limes"
 
-#: strings.hrc:118
+#: starmath/inc/strings.hrc:118
 msgctxt "RID_LIM_FROMX_HELP"
 msgid "Limes Subscript Bottom"
 msgstr "Isysgrif Gwaelod Limes"
 
-#: strings.hrc:119
+#: starmath/inc/strings.hrc:119
 msgctxt "RID_LIM_TOX_HELP"
 msgid "Limes Superscript Top"
 msgstr "Uwchysgrif Brig Limes"
 
-#: strings.hrc:120
+#: starmath/inc/strings.hrc:120
 msgctxt "RID_LIM_FROMTOX_HELP"
 msgid "Limes Sup/Sub script"
 msgstr "Sgript Limes Uwch/Is"
 
-#: strings.hrc:121
+#: starmath/inc/strings.hrc:121
 msgctxt "RID_LIMINFX_HELP"
 msgid "Limit Inferior"
 msgstr "Cyfyngu'r Israddol"
 
-#: strings.hrc:122
+#: starmath/inc/strings.hrc:122
 msgctxt "RID_LIMINF_FROMX_HELP"
 msgid "Limit Inferior Subscript Bottom"
 msgstr "Cyfyngu Gwaelod Isysgrif Israddol"
 
-#: strings.hrc:123
+#: starmath/inc/strings.hrc:123
 msgctxt "RID_LIMINF_TOX_HELP"
 msgid "Limit Inferior Superscript Top"
 msgstr "Cyfyngu Brig Uwchysgrif Israddol"
 
-#: strings.hrc:124
+#: starmath/inc/strings.hrc:124
 msgctxt "RID_LIMINF_FROMTOX_HELP"
 msgid "Limit Inferior Sup/Sub script"
 msgstr "Cyfyngu sgript Israddol Uwch/Is"
 
-#: strings.hrc:125
+#: starmath/inc/strings.hrc:125
 msgctxt "RID_LIMSUPX_HELP"
 msgid "Limit Superior"
 msgstr "Cyfyngu Uwchraddol"
 
-#: strings.hrc:126
+#: starmath/inc/strings.hrc:126
 msgctxt "RID_LIMSUP_FROMX_HELP"
 msgid "Limit Superior Subscript Bottom"
 msgstr "Cyfyngu Gwaelod Uwchysgrif Uwchraddol"
 
-#: strings.hrc:127
+#: starmath/inc/strings.hrc:127
 msgctxt "RID_LIMSUP_TOX_HELP"
 msgid "Limit Superior Superscript Top"
 msgstr "Cyfyngu Brig Uwchysgrif Uwchraddol"
 
-#: strings.hrc:128
+#: starmath/inc/strings.hrc:128
 msgctxt "RID_LIMSUP_FROMTOX_HELP"
 msgid "Limit Superior Sup/Sub script"
 msgstr "Cyfyngu sgript Uwchraddol Uwch/Is"
 
-#: strings.hrc:129
+#: starmath/inc/strings.hrc:129
 msgctxt "RID_EXISTS_HELP"
 msgid "There Exists"
 msgstr "Yn Bodoli"
 
-#: strings.hrc:130
+#: starmath/inc/strings.hrc:130
 msgctxt "RID_NOTEXISTS_HELP"
 msgid "There Not Exists"
 msgstr "Ddim Yn Bodoli"
 
-#: strings.hrc:131
+#: starmath/inc/strings.hrc:131
 msgctxt "RID_FORALL_HELP"
 msgid "For all"
 msgstr "Ar bopeth"
 
-#: strings.hrc:132
+#: starmath/inc/strings.hrc:132
 msgctxt "RID_INTX_HELP"
 msgid "Integral"
 msgstr "Cyfannol"
 
-#: strings.hrc:133
+#: starmath/inc/strings.hrc:133
 msgctxt "RID_INT_FROMX_HELP"
 msgid "Integral Subscript Bottom"
 msgstr "Isysgrif Gwaelod Integrol"
 
-#: strings.hrc:134
+#: starmath/inc/strings.hrc:134
 msgctxt "RID_INT_TOX_HELP"
 msgid "Integral Superscript Top"
 msgstr "Uwchysgrif Brig Integrol"
 
-#: strings.hrc:135
+#: starmath/inc/strings.hrc:135
 msgctxt "RID_INT_FROMTOX_HELP"
 msgid "Integral Sup/Sub script"
 msgstr "Sgript integrol Uwch/Is"
 
-#: strings.hrc:136
+#: starmath/inc/strings.hrc:136
 msgctxt "RID_IINTX_HELP"
 msgid "Double Integral"
 msgstr "Integrol Dwbl"
 
-#: strings.hrc:137
+#: starmath/inc/strings.hrc:137
 msgctxt "RID_IINT_FROMX_HELP"
 msgid "Double Integral Subscript Bottom"
 msgstr "Integrol Isysgrif Dwbl Gwaelod"
 
-#: strings.hrc:138
+#: starmath/inc/strings.hrc:138
 msgctxt "RID_IINT_TOX_HELP"
 msgid "Double Integral Superscript Top"
 msgstr "Integryn Dwbl Isysgrif Brig"
 
-#: strings.hrc:139
+#: starmath/inc/strings.hrc:139
 msgctxt "RID_IINT_FROMTOX_HELP"
 msgid "Double Integral Sup/Sub script"
 msgstr "Sgript Uwch/IsIntegrol Dwbl"
 
-#: strings.hrc:140
+#: starmath/inc/strings.hrc:140
 msgctxt "RID_IIINTX_HELP"
 msgid "Triple Integral"
 msgstr "Integrol Tryphlyg"
 
-#: strings.hrc:141
+#: starmath/inc/strings.hrc:141
 msgctxt "RID_IIINT_FROMX_HELP"
 msgid "Triple Integral Subscript Bottom"
 msgstr "Integryn Tryphlyg Isysgrif Gwaelod"
 
-#: strings.hrc:142
+#: starmath/inc/strings.hrc:142
 msgctxt "RID_IIINT_TOX_HELP"
 msgid "Triple Integral Superscript Top"
 msgstr "Integryn Tryphlyg Isysgrif Brig"
 
-#: strings.hrc:143
+#: starmath/inc/strings.hrc:143
 msgctxt "RID_IIINT_FROMTOX_HELP"
 msgid "Triple Integral Sup/Sub script"
 msgstr "Sgript Uwch/IsIntegrol Triphlyg"
 
-#: strings.hrc:144
+#: starmath/inc/strings.hrc:144
 msgctxt "RID_LINTX_HELP"
 msgid "Curve Integral"
 msgstr "Integrol Cromlin"
 
-#: strings.hrc:145
+#: starmath/inc/strings.hrc:145
 msgctxt "RID_LINT_FROMX_HELP"
 msgid "Curve Integral Subscript Bottom"
 msgstr "Integrol Cromlin Isysgrif Gwaelod"
 
-#: strings.hrc:146
+#: starmath/inc/strings.hrc:146
 msgctxt "RID_LINT_TOX_HELP"
 msgid "Curve Integral Superscript Top"
 msgstr "Integrol Cromlin Isysgrif Gwaelod"
 
-#: strings.hrc:147
+#: starmath/inc/strings.hrc:147
 msgctxt "RID_LINT_FROMTOX_HELP"
 msgid "Curve Integral Sup/Sub script"
 msgstr "Sgript Uwch/Is Integrol Cromlin"
 
-#: strings.hrc:148
+#: starmath/inc/strings.hrc:148
 msgctxt "RID_LLINTX_HELP"
 msgid "Double Curve Integral"
 msgstr "Integrol Cromlin Dwbl"
 
-#: strings.hrc:149
+#: starmath/inc/strings.hrc:149
 msgctxt "RID_LLINT_FROMX_HELP"
 msgid "Double Curve Integral Subscript Bottom"
 msgstr "Integrol Cromlin Dwbl Isysgrif Gwaelod"
 
-#: strings.hrc:150
+#: starmath/inc/strings.hrc:150
 msgctxt "RID_LLINT_TOX_HELP"
 msgid "Double Curve Integral Superscript Top"
 msgstr "Integryn Cromlin Dwbl Isysgrif Brig"
 
-#: strings.hrc:151
+#: starmath/inc/strings.hrc:151
 msgctxt "RID_LLINT_FROMTOX_HELP"
 msgid "Double Curve Integral Sup/Sub script"
 msgstr "Sgript Uwch/Is Integrol Cromlin Dwbl"
 
-#: strings.hrc:152
+#: starmath/inc/strings.hrc:152
 msgctxt "RID_LLLINTX_HELP"
 msgid "Triple Curve Integral"
 msgstr "Integrol Cromlin Tryphlyg"
 
-#: strings.hrc:153
+#: starmath/inc/strings.hrc:153
 msgctxt "RID_LLLINT_FROMX_HELP"
 msgid "Triple Curve Integral Subscript Bottom"
 msgstr "Integrol Cromlin Tryphlyg Isysgrif Gwaelod"
 
-#: strings.hrc:154
+#: starmath/inc/strings.hrc:154
 msgctxt "RID_LLLINT_TOX_HELP"
 msgid "Triple Curve Integral Superscript Top"
 msgstr "Integrol Cromlin Tryphlyg Isysgrif Brig"
 
-#: strings.hrc:155
+#: starmath/inc/strings.hrc:155
 msgctxt "RID_LLLINT_FROMTOX_HELP"
 msgid "Triple Curve Integral Sup/Sub script"
 msgstr "Sgript Uwch/Is Integrol Cromlin Triphlyg"
 
-#: strings.hrc:156
+#: starmath/inc/strings.hrc:156
 msgctxt "RID_ACUTEX_HELP"
 msgid "Acute Accent"
 msgstr "Acen Lem"
 
-#: strings.hrc:157
+#: starmath/inc/strings.hrc:157
 msgctxt "RID_BARX_HELP"
 msgid "Line Above"
 msgstr "Llinell Uwchlaw"
 
-#: strings.hrc:158
+#: starmath/inc/strings.hrc:158
 msgctxt "RID_BREVEX_HELP"
 msgid "Breve"
 msgstr "Brif"
 
-#: strings.hrc:159
+#: starmath/inc/strings.hrc:159
 msgctxt "RID_CHECKX_HELP"
 msgid "Reverse Circumflex"
 msgstr "Acen Grom Gwrth-droi"
 
-#: strings.hrc:160
+#: starmath/inc/strings.hrc:160
 msgctxt "RID_CIRCLEX_HELP"
 msgid "Circle"
 msgstr "Cylch"
 
-#: strings.hrc:161
+#: starmath/inc/strings.hrc:161
 msgctxt "RID_DOTX_HELP"
 msgid "Dot"
 msgstr "Dot"
 
-#: strings.hrc:162
+#: starmath/inc/strings.hrc:162
 msgctxt "RID_DDOTX_HELP"
 msgid "Double Dot"
 msgstr "Dot Dwbl"
 
-#: strings.hrc:163
+#: starmath/inc/strings.hrc:163
 msgctxt "RID_DDDOTX_HELP"
 msgid "Triple Dot"
 msgstr "Dot Tryphlyg"
 
-#: strings.hrc:164
+#: starmath/inc/strings.hrc:164
 msgctxt "RID_GRAVEX_HELP"
 msgid "Grave Accent"
 msgstr "Acen Drom"
 
-#: strings.hrc:165
+#: starmath/inc/strings.hrc:165
 msgctxt "RID_HATX_HELP"
 msgid "Circumflex"
 msgstr "Acen grom"
 
-#: strings.hrc:166
+#: starmath/inc/strings.hrc:166
 msgctxt "RID_TILDEX_HELP"
 msgid "Tilde"
 msgstr "Tilde"
 
-#: strings.hrc:167
+#: starmath/inc/strings.hrc:167
 msgctxt "RID_VECX_HELP"
 msgid "Vector Arrow"
 msgstr "Saeth Fector"
 
-#: strings.hrc:168
+#: starmath/inc/strings.hrc:168
 msgctxt "RID_UNDERLINEX_HELP"
 msgid "Line Below"
 msgstr "I'r Linell Islaw"
 
-#: strings.hrc:169
+#: starmath/inc/strings.hrc:169
 msgctxt "RID_OVERLINEX_HELP"
 msgid "Line Over"
 msgstr "Llinell Drosodd"
 
-#: strings.hrc:170
+#: starmath/inc/strings.hrc:170
 msgctxt "RID_OVERSTRIKEX_HELP"
 msgid "Line Through"
 msgstr "Llinell Drwy"
 
-#: strings.hrc:171
+#: starmath/inc/strings.hrc:171
 msgctxt "RID_PHANTOMX_HELP"
 msgid "Transparent"
 msgstr "Tryloyw"
 
-#: strings.hrc:172
+#: starmath/inc/strings.hrc:172
 msgctxt "RID_BOLDX_HELP"
 msgid "Bold Font"
 msgstr "Ffont Drom"
 
-#: strings.hrc:173
+#: starmath/inc/strings.hrc:173
 msgctxt "RID_ITALX_HELP"
 msgid "Italic Font"
 msgstr "Ffont Italig"
 
-#: strings.hrc:174
+#: starmath/inc/strings.hrc:174
 msgctxt "RID_SIZEXY_HELP"
 msgid "Resize"
 msgstr "Newid maint"
 
-#: strings.hrc:175
+#: starmath/inc/strings.hrc:175
 msgctxt "RID_FONTXY_HELP"
 msgid "Change Font"
 msgstr "Newid Ffont"
 
-#: strings.hrc:176
+#: starmath/inc/strings.hrc:176
 msgctxt "RID_COLORX_BLACK_HELP"
 msgid "Color Black"
 msgstr "Lliw Du"
 
-#: strings.hrc:177
+#: starmath/inc/strings.hrc:177
 msgctxt "RID_COLORX_BLUE_HELP"
 msgid "Color Blue"
 msgstr "Lliw Glas"
 
-#: strings.hrc:178
+#: starmath/inc/strings.hrc:178
 msgctxt "RID_COLORX_GREEN_HELP"
 msgid "Color Green"
 msgstr "Lliw Gwyrdd"
 
-#: strings.hrc:179
+#: starmath/inc/strings.hrc:179
 msgctxt "RID_COLORX_RED_HELP"
 msgid "Color Red"
 msgstr "Lliw Coch"
 
-#: strings.hrc:180
+#: starmath/inc/strings.hrc:180
 msgctxt "RID_COLORX_CYAN_HELP"
 msgid "Color Cyan"
 msgstr "Lliw Gwyrddlas"
 
-#: strings.hrc:181
+#: starmath/inc/strings.hrc:181
 msgctxt "RID_COLORX_MAGENTA_HELP"
 msgid "Color Magenta"
 msgstr "Lliw Magenta"
 
-#: strings.hrc:182
+#: starmath/inc/strings.hrc:182
 msgctxt "RID_COLORX_GRAY_HELP"
 msgid "Color Gray"
 msgstr "Lliw Llwyd"
 
-#: strings.hrc:183
+#: starmath/inc/strings.hrc:183
 msgctxt "RID_COLORX_LIME_HELP"
 msgid "Color Lime"
 msgstr "Lliw Leim"
 
-#: strings.hrc:184
+#: starmath/inc/strings.hrc:184
 msgctxt "RID_COLORX_MAROON_HELP"
 msgid "Color Maroon"
 msgstr "Lliw Marŵn"
 
-#: strings.hrc:185
+#: starmath/inc/strings.hrc:185
 msgctxt "RID_COLORX_NAVY_HELP"
 msgid "Color Navy"
 msgstr "Lliw Glas Tywyll"
 
-#: strings.hrc:186
+#: starmath/inc/strings.hrc:186
 msgctxt "RID_COLORX_OLIVE_HELP"
 msgid "Color Olive"
 msgstr "Lliw Olewydden"
 
-#: strings.hrc:187
+#: starmath/inc/strings.hrc:187
 msgctxt "RID_COLORX_PURPLE_HELP"
 msgid "Color Purple"
 msgstr "Lliw Porffor"
 
-#: strings.hrc:188
+#: starmath/inc/strings.hrc:188
 msgctxt "RID_COLORX_SILVER_HELP"
 msgid "Color Silver"
 msgstr "Lliw Arian"
 
-#: strings.hrc:189
+#: starmath/inc/strings.hrc:189
 msgctxt "RID_COLORX_TEAL_HELP"
 msgid "Color Teal"
 msgstr "Lliw Glaswyrdd"
 
-#: strings.hrc:190
+#: starmath/inc/strings.hrc:190
 msgctxt "RID_COLORX_YELLOW_HELP"
 msgid "Color Yellow"
 msgstr "Lliw Melyn"
 
-#: strings.hrc:191
+#: starmath/inc/strings.hrc:191
 msgctxt "RID_LRGROUPX_HELP"
 msgid "Group Brackets"
 msgstr "Bracedi Grŵp"
 
-#: strings.hrc:192
+#: starmath/inc/strings.hrc:192
 msgctxt "RID_LRPARENTX_HELP"
 msgid "Round Brackets"
 msgstr "Bracedi Crwn"
 
-#: strings.hrc:193
+#: starmath/inc/strings.hrc:193
 msgctxt "RID_LRBRACKETX_HELP"
 msgid "Square Brackets"
 msgstr "Bracedi Sgwâr"
 
-#: strings.hrc:194
+#: starmath/inc/strings.hrc:194
 msgctxt "RID_LRDBRACKETX_HELP"
 msgid "Double Square Brackets"
 msgstr "Bracedi Sgwâr Dwbl"
 
-#: strings.hrc:195
+#: starmath/inc/strings.hrc:195
 msgctxt "RID_LRBRACEX_HELP"
 msgid "Braces"
 msgstr "Braces"
 
-#: strings.hrc:196
+#: starmath/inc/strings.hrc:196
 msgctxt "RID_LRANGLEX_HELP"
 msgid "Angle Brackets"
 msgstr "Bracedi Onglog"
 
-#: strings.hrc:197
+#: starmath/inc/strings.hrc:197
 msgctxt "RID_LRCEILX_HELP"
 msgid "Upper Ceil"
 msgstr "Cell Uchaf"
 
-#: strings.hrc:198
+#: starmath/inc/strings.hrc:198
 msgctxt "RID_LRFLOORX_HELP"
 msgid "Floor"
 msgstr "Llawr"
 
-#: strings.hrc:199
+#: starmath/inc/strings.hrc:199
 msgctxt "RID_LRLINEX_HELP"
 msgid "Single Lines"
 msgstr "Llinellau Sengl"
 
-#: strings.hrc:200
+#: starmath/inc/strings.hrc:200
 msgctxt "RID_LRDLINEX_HELP"
 msgid "Double Lines"
 msgstr "Llinellau Dwbl"
 
-#: strings.hrc:201
+#: starmath/inc/strings.hrc:201
 msgctxt "RID_LMRANGLEXY_HELP"
 msgid "Operator Brackets"
 msgstr "Bracedi Gweithredydd"
 
-#: strings.hrc:202
+#: starmath/inc/strings.hrc:202
 msgctxt "RID_SLRPARENTX_HELP"
 msgid "Round Brackets (Scalable)"
 msgstr "Bracedi Crwn (Graddadwy)"
 
-#: strings.hrc:203
+#: starmath/inc/strings.hrc:203
 msgctxt "RID_SLRBRACKETX_HELP"
 msgid "Square Brackets (Scalable)"
 msgstr "Bracedi Sgwâr (Graddadwy)"
 
-#: strings.hrc:204
+#: starmath/inc/strings.hrc:204
 msgctxt "RID_SLRDBRACKETX_HELP"
 msgid "Double Square Brackets (Scalable)"
 msgstr "Bracedi Sgwâr Dwbl (Graddadwy)"
 
-#: strings.hrc:205
+#: starmath/inc/strings.hrc:205
 msgctxt "RID_SLRBRACEX_HELP"
 msgid "Braces (Scalable)"
 msgstr "Braces (Graddadwy)"
 
-#: strings.hrc:206
+#: starmath/inc/strings.hrc:206
 msgctxt "RID_SLRANGLEX_HELP"
 msgid "Angle Brackets (Scalable)"
 msgstr "Bracedi Onglog (Graddadwy)"
 
-#: strings.hrc:207
+#: starmath/inc/strings.hrc:207
 msgctxt "RID_SLRCEILX_HELP"
 msgid "Ceiling (Scalable)"
 msgstr "Nenfwd (Graddadwy)"
 
-#: strings.hrc:208
+#: starmath/inc/strings.hrc:208
 msgctxt "RID_SLRFLOORX_HELP"
 msgid "Floor (Scalable)"
 msgstr "Llawr (Graddadwy)"
 
-#: strings.hrc:209
+#: starmath/inc/strings.hrc:209
 msgctxt "RID_SLRLINEX_HELP"
 msgid "Single Lines (Scalable)"
 msgstr "Llinellau Sengl (Graddadwy)"
 
-#: strings.hrc:210
+#: starmath/inc/strings.hrc:210
 msgctxt "RID_SLRDLINEX_HELP"
 msgid "Double Lines (Scalable)"
 msgstr "Llinellau Dwbl (Graddadwy)"
 
-#: strings.hrc:211
+#: starmath/inc/strings.hrc:211
 msgctxt "RID_SLMRANGLEXY_HELP"
 msgid "Operator Brackets (Scalable)"
 msgstr "Bracedi Gweithredydd (Graddadwy)"
 
-#: strings.hrc:212
+#: starmath/inc/strings.hrc:212
 msgctxt "RID_XEVALUATEDATY_HELP"
 msgid "Evaluated At"
 msgstr "Gwerthuswyd ar"
 
-#: strings.hrc:213
+#: starmath/inc/strings.hrc:213
 msgctxt "RID_XOVERBRACEY_HELP"
 msgid "Braces Top (Scalable)"
 msgstr "Braces Brig (Graddadwy)"
 
-#: strings.hrc:214
+#: starmath/inc/strings.hrc:214
 msgctxt "RID_XUNDERBRACEY_HELP"
 msgid "Braces Bottom (Scalable)"
 msgstr "Braces Gwaelod (Graddadwy)"
 
-#: strings.hrc:215
+#: starmath/inc/strings.hrc:215
 msgctxt "RID_RSUBX_HELP"
 msgid "Subscript Right"
 msgstr "Isysgrif De"
 
-#: strings.hrc:216
+#: starmath/inc/strings.hrc:216
 msgctxt "RID_RSUPX_HELP"
 msgid "Power"
 msgstr "Pŵer"
 
-#: strings.hrc:217
+#: starmath/inc/strings.hrc:217
 msgctxt "RID_LSUBX_HELP"
 msgid "Subscript Left"
 msgstr "Isysgrif Chwith"
 
-#: strings.hrc:218
+#: starmath/inc/strings.hrc:218
 msgctxt "RID_LSUPX_HELP"
 msgid "Superscript Left"
 msgstr "Uwchysgrif Chwith"
 
-#: strings.hrc:219
+#: starmath/inc/strings.hrc:219
 msgctxt "RID_CSUBX_HELP"
 msgid "Subscript Bottom"
 msgstr "Isysgrif Gwaelod"
 
-#: strings.hrc:220
+#: starmath/inc/strings.hrc:220
 msgctxt "RID_CSUPX_HELP"
 msgid "Superscript Top"
 msgstr "Uwchysgrif Brig"
 
-#: strings.hrc:221
+#: starmath/inc/strings.hrc:221
 msgctxt "RID_SBLANK_HELP"
 msgid "Small Gap"
 msgstr "Bwlch Bach"
 
-#: strings.hrc:222
+#: starmath/inc/strings.hrc:222
 msgctxt "RID_BLANK_HELP"
 msgid "Blank"
 msgstr "Gwag"
 
-#: strings.hrc:223
+#: starmath/inc/strings.hrc:223
 msgctxt "RID_NEWLINE_HELP"
 msgid "New Line"
 msgstr "Llinell Newydd"
 
-#: strings.hrc:224
+#: starmath/inc/strings.hrc:224
 msgctxt "RID_BINOMXY_HELP"
 msgid "Vertical Stack (2 Elements)"
 msgstr "Stac Fertigol (2 Elfen)"
 
-#: strings.hrc:225
+#: starmath/inc/strings.hrc:225
 msgctxt "RID_STACK_HELP"
 msgid "Vertical Stack"
 msgstr "Stac Fertigol"
 
-#: strings.hrc:226
+#: starmath/inc/strings.hrc:226
 msgctxt "RID_MATRIX_HELP"
 msgid "Matrix Stack"
 msgstr "Stac Matrics"
 
-#: strings.hrc:227
+#: starmath/inc/strings.hrc:227
 msgctxt "RID_ALIGNLX_HELP"
 msgid "Align Left"
 msgstr "Alinio i'r Chwith"
 
-#: strings.hrc:228
+#: starmath/inc/strings.hrc:228
 msgctxt "RID_ALIGNCX_HELP"
 msgid "Align Center"
 msgstr "Alinio'r Canol"
 
-#: strings.hrc:229
+#: starmath/inc/strings.hrc:229
 msgctxt "RID_ALIGNRX_HELP"
 msgid "Align Right"
 msgstr "Alinio De"
 
-#: strings.hrc:230
+#: starmath/inc/strings.hrc:230
 msgctxt "RID_ALEPH_HELP"
 msgid "Aleph"
 msgstr "Aleph"
 
-#: strings.hrc:231
+#: starmath/inc/strings.hrc:231
 msgctxt "RID_EMPTYSET_HELP"
 msgid "Empty Set"
 msgstr "Set Wag"
 
-#: strings.hrc:232
+#: starmath/inc/strings.hrc:232
 msgctxt "RID_RE_HELP"
 msgid "Real Part"
 msgstr "Rhan Real"
 
-#: strings.hrc:233
+#: starmath/inc/strings.hrc:233
 msgctxt "RID_IM_HELP"
 msgid "Imaginary Part"
 msgstr "Rhan Dychmygol"
 
-#: strings.hrc:234
+#: starmath/inc/strings.hrc:234
 msgctxt "RID_INFINITY_HELP"
 msgid "Infinity"
 msgstr "Anfeidredd"
 
-#: strings.hrc:235
+#: starmath/inc/strings.hrc:235
 msgctxt "RID_PARTIAL_HELP"
 msgid "Partial"
 msgstr "Rhannol"
 
-#: strings.hrc:236
+#: starmath/inc/strings.hrc:236
 msgctxt "RID_NABLA_HELP"
 msgid "Nabla"
 msgstr "Nabla"
 
-#: strings.hrc:237
+#: starmath/inc/strings.hrc:237
 msgctxt "RID_WP_HELP"
 msgid "Weierstrass p"
 msgstr "Weierstrass p"
 
-#: strings.hrc:238
+#: starmath/inc/strings.hrc:238
 msgctxt "RID_DOTSAXIS_HELP"
 msgid "Dots In Middle"
 msgstr "Dotiau yn y Canol"
 
-#: strings.hrc:239
+#: starmath/inc/strings.hrc:239
 msgctxt "RID_DOTSUP_HELP"
 msgid "Dots To Top"
 msgstr "Dotiau i'r Brig"
 
-#: strings.hrc:240
+#: starmath/inc/strings.hrc:240
 msgctxt "RID_DOTSDOWN_HELP"
 msgid "Dots To Bottom"
 msgstr "Dotiau i'r Gwaelod"
 
-#: strings.hrc:241
+#: starmath/inc/strings.hrc:241
 msgctxt "RID_DOTSLOW_HELP"
 msgid "Dots At Bottom"
 msgstr "Dotiau ar y Gwaelod"
 
-#: strings.hrc:242
+#: starmath/inc/strings.hrc:242
 msgctxt "RID_DOTSVERT_HELP"
 msgid "Dots Vertically"
 msgstr "Dotiau Fertigol"
 
-#: strings.hrc:243
+#: starmath/inc/strings.hrc:243
 msgctxt "RID_XCIRCY_HELP"
 msgid "Concatenate"
 msgstr "Cydgadwyno"
 
-#: strings.hrc:244
+#: starmath/inc/strings.hrc:244
 msgctxt "RID_XWIDESLASHY_HELP"
 msgid "Division (wideslash)"
 msgstr "Rhannu (slaes lydan)"
 
-#: strings.hrc:245
+#: starmath/inc/strings.hrc:245
 msgctxt "RID_XWIDEBSLASHY_HELP"
 msgid "Division (counter wideslash)"
 msgstr "Rhannu (slaes lydan)"
 
-#: strings.hrc:246
+#: starmath/inc/strings.hrc:246
 msgctxt "RID_XDIVIDESY_HELP"
 msgid "Divides"
 msgstr "Rhannu"
 
-#: strings.hrc:247
+#: starmath/inc/strings.hrc:247
 msgctxt "RID_XNDIVIDESY_HELP"
 msgid "Does Not Divide"
 msgstr "Nid yw'n Rhannu"
 
-#: strings.hrc:248
+#: starmath/inc/strings.hrc:248
 msgctxt "RID_DLARROW_HELP"
 msgid "Double Arrow Left"
 msgstr "Saeth Ddwbl Chwith"
 
-#: strings.hrc:249
+#: starmath/inc/strings.hrc:249
 msgctxt "RID_DLRARROW_HELP"
 msgid "Double Arrow Left And Right"
 msgstr "Saeth Ddwbl Chwith a De"
 
-#: strings.hrc:250
+#: starmath/inc/strings.hrc:250
 msgctxt "RID_DRARROW_HELP"
 msgid "Double Arrow Right"
 msgstr "Saeth Ddwbl De"
 
-#: strings.hrc:251
+#: starmath/inc/strings.hrc:251
 msgctxt "RID_SETN_HELP"
 msgid "Natural Numbers Set"
 msgstr "Set Rhifau Naturiol"
 
-#: strings.hrc:252
+#: starmath/inc/strings.hrc:252
 msgctxt "RID_SETZ_HELP"
 msgid "Integers Set"
 msgstr "Set Cyfanrifau"
 
-#: strings.hrc:253
+#: starmath/inc/strings.hrc:253
 msgctxt "RID_SETQ_HELP"
 msgid "Set of Rational Numbers"
 msgstr "Set o Rifau Rhesymol"
 
-#: strings.hrc:254
+#: starmath/inc/strings.hrc:254
 msgctxt "RID_SETR_HELP"
 msgid "Real Numbers Set"
 msgstr "Set Rhifau Real"
 
-#: strings.hrc:255
+#: starmath/inc/strings.hrc:255
 msgctxt "RID_SETC_HELP"
 msgid "Complex Numbers Set"
 msgstr "Set Rhifau Cymhleth"
 
-#: strings.hrc:256
+#: starmath/inc/strings.hrc:256
 msgctxt "RID_WIDEHATX_HELP"
 msgid "Large Circumflex"
 msgstr "Acen Grom Fawr"
 
-#: strings.hrc:257
+#: starmath/inc/strings.hrc:257
 msgctxt "RID_WIDETILDEX_HELP"
 msgid "Large Tilde"
 msgstr "Tilde Mawr"
 
-#: strings.hrc:258
+#: starmath/inc/strings.hrc:258
 msgctxt "RID_WIDEVECX_HELP"
 msgid "Large Vector Arrow"
 msgstr "Saeth Fector Fawr"
 
-#: strings.hrc:259
+#: starmath/inc/strings.hrc:259
 msgctxt "RID_HBAR_HELP"
 msgid "h Bar"
 msgstr "Bar h"
 
-#: strings.hrc:260
+#: starmath/inc/strings.hrc:260
 msgctxt "RID_LAMBDABAR_HELP"
 msgid "Lambda Bar"
 msgstr "Bar Lambda"
 
-#: strings.hrc:261
+#: starmath/inc/strings.hrc:261
 msgctxt "RID_LEFTARROW_HELP"
 msgid "Left Arrow"
 msgstr "Saeth Chwith"
 
-#: strings.hrc:262
+#: starmath/inc/strings.hrc:262
 msgctxt "RID_RIGHTARROW_HELP"
 msgid "Right Arrow"
 msgstr "Saeth Dde"
 
-#: strings.hrc:263
+#: starmath/inc/strings.hrc:263
 msgctxt "RID_UPARROW_HELP"
 msgid "Up Arrow"
 msgstr "Saeth i Fyny"
 
-#: strings.hrc:264
+#: starmath/inc/strings.hrc:264
 msgctxt "RID_DOWNARROW_HELP"
 msgid "Down Arrow"
 msgstr "Saeth i Lawr"
 
-#: strings.hrc:265
+#: starmath/inc/strings.hrc:265
 msgctxt "RID_NOSPACE_HELP"
 msgid "No space"
 msgstr "Dim bwlch"
 
-#: strings.hrc:266
+#: starmath/inc/strings.hrc:266
 msgctxt "RID_XPRECEDESY_HELP"
 msgid "Precedes"
 msgstr "Rhagflaenu"
 
-#: strings.hrc:267
+#: starmath/inc/strings.hrc:267
 msgctxt "RID_XPRECEDESEQUALY_HELP"
 msgid "Precedes or equal to"
 msgstr "Rhagflaenu neu gydradd â"
 
-#: strings.hrc:268
+#: starmath/inc/strings.hrc:268
 msgctxt "RID_XPRECEDESEQUIVY_HELP"
 msgid "Precedes or equivalent to"
 msgstr "Rhagflaenu neu gydradd â"
 
-#: strings.hrc:269
+#: starmath/inc/strings.hrc:269
 msgctxt "RID_XSUCCEEDSY_HELP"
 msgid "Succeeds"
 msgstr "Olynu"
 
-#: strings.hrc:270
+#: starmath/inc/strings.hrc:270
 msgctxt "RID_XSUCCEEDSEQUALY_HELP"
 msgid "Succeeds or equal to"
 msgstr "Olynu neu gydradd a"
 
-#: strings.hrc:271
+#: starmath/inc/strings.hrc:271
 msgctxt "RID_XSUCCEEDSEQUIVY_HELP"
 msgid "Succeeds or equivalent to"
 msgstr "Olynu neu gydradd â"
 
-#: strings.hrc:272
+#: starmath/inc/strings.hrc:272
 msgctxt "RID_XNOTPRECEDESY_HELP"
 msgid "Not precedes"
 msgstr "Ddim yn rhagflaenu"
 
-#: strings.hrc:273
+#: starmath/inc/strings.hrc:273
 msgctxt "RID_XNOTSUCCEEDSY_HELP"
 msgid "Not succeeds"
 msgstr "Dim yn olynu"
 
-#: strings.hrc:274
+#: starmath/inc/strings.hrc:274
 msgctxt "RID_CATEGORY_UNARY_BINARY_OPERATORS"
 msgid "Unary/Binary Operators"
 msgstr "Gweithredydd Unaidd/Deuaidd"
 
-#: strings.hrc:275
+#: starmath/inc/strings.hrc:275
 msgctxt "RID_CATEGORY_RELATIONS"
 msgid "Relations"
 msgstr "Cydberthynas"
 
-#: strings.hrc:276
+#: starmath/inc/strings.hrc:276
 msgctxt "RID_CATEGORY_SET_OPERATIONS"
 msgid "Set Operations"
 msgstr "Set Gweithredyddion"
 
-#: strings.hrc:277
+#: starmath/inc/strings.hrc:277
 msgctxt "RID_CATEGORY_FUNCTIONS"
 msgid "Functions"
 msgstr "Swyddogaethau"
 
-#: strings.hrc:278
+#: starmath/inc/strings.hrc:278
 msgctxt "RID_CATEGORY_OPERATORS"
 msgid "Operators"
 msgstr "Gweithredyddion"
 
-#: strings.hrc:279
+#: starmath/inc/strings.hrc:279
 msgctxt "RID_CATEGORY_ATTRIBUTES"
 msgid "Attributes"
 msgstr "Priodoleddau"
 
-#: strings.hrc:280
+#: starmath/inc/strings.hrc:280
 msgctxt "RID_CATEGORY_BRACKETS"
 msgid "Brackets"
 msgstr "Bracedi"
 
-#: strings.hrc:281
+#: starmath/inc/strings.hrc:281
 msgctxt "RID_CATEGORY_FORMATS"
 msgid "Formats"
 msgstr "Fformatau"
 
-#: strings.hrc:282
+#: starmath/inc/strings.hrc:282
 msgctxt "RID_CATEGORY_OTHERS"
 msgid "Others"
 msgstr "Eraill"
 
-#: strings.hrc:283
+#: starmath/inc/strings.hrc:283
 msgctxt "RID_CATEGORY_EXAMPLES"
 msgid "Examples"
 msgstr "Esiamplau"
 
-#: strings.hrc:285
+#: starmath/inc/strings.hrc:285
 msgctxt "RID_FONTREGULAR"
 msgid "Standard"
 msgstr "Safonol"
 
-#: strings.hrc:286
+#: starmath/inc/strings.hrc:286
 msgctxt "RID_FONTITALIC"
 msgid "Italic"
 msgstr "Italig"
 
-#: strings.hrc:287
+#: starmath/inc/strings.hrc:287
 msgctxt "RID_FONTBOLD"
 msgid "Bold"
 msgstr "Trwm"
 
-#: strings.hrc:288
+#: starmath/inc/strings.hrc:288
 msgctxt "STR_BLACK"
 msgid "black"
 msgstr "du"
 
-#: strings.hrc:289
+#: starmath/inc/strings.hrc:289
 msgctxt "STR_BLUE"
 msgid "blue"
 msgstr "glas"
 
-#: strings.hrc:290
+#: starmath/inc/strings.hrc:290
 msgctxt "STR_GREEN"
 msgid "green"
 msgstr "gwyrdd"
 
-#: strings.hrc:291
+#: starmath/inc/strings.hrc:291
 msgctxt "STR_RED"
 msgid "red"
 msgstr "coch"
 
-#: strings.hrc:292
+#: starmath/inc/strings.hrc:292
 msgctxt "STR_CYAN"
 msgid "cyan"
 msgstr "cyan"
 
-#: strings.hrc:293
+#: starmath/inc/strings.hrc:293
 msgctxt "STR_MAGENTA"
 msgid "magenta"
 msgstr "magenta"
 
-#: strings.hrc:294
+#: starmath/inc/strings.hrc:294
 msgctxt "STR_GRAY"
 msgid "gray"
 msgstr "llwyd"
 
-#: strings.hrc:295
+#: starmath/inc/strings.hrc:295
 msgctxt "STR_LIME"
 msgid "lime"
 msgstr "leim"
 
-#: strings.hrc:296
+#: starmath/inc/strings.hrc:296
 msgctxt "STR_MAROON"
 msgid "maroon"
 msgstr "marŵn"
 
-#: strings.hrc:297
+#: starmath/inc/strings.hrc:297
 msgctxt "STR_NAVY"
 msgid "navy"
 msgstr "glas tywyll"
 
-#: strings.hrc:298
+#: starmath/inc/strings.hrc:298
 msgctxt "STR_OLIVE"
 msgid "olive"
 msgstr "gwyrdd olewydd"
 
-#: strings.hrc:299
+#: starmath/inc/strings.hrc:299
 msgctxt "STR_PURPLE"
 msgid "purple"
 msgstr "porffor"
 
-#: strings.hrc:300
+#: starmath/inc/strings.hrc:300
 msgctxt "STR_SILVER"
 msgid "silver"
 msgstr "arian"
 
-#: strings.hrc:301
+#: starmath/inc/strings.hrc:301
 msgctxt "STR_TEAL"
 msgid "teal"
 msgstr "gwyrddlas"
 
-#: strings.hrc:302
+#: starmath/inc/strings.hrc:302
 msgctxt "STR_YELLOW"
 msgid "yellow"
 msgstr "melyn"
 
-#: strings.hrc:303
+#: starmath/inc/strings.hrc:303
 msgctxt "STR_HIDE"
 msgid "hide"
 msgstr "cuddio"
 
-#: strings.hrc:304
+#: starmath/inc/strings.hrc:304
 msgctxt "STR_SIZE"
 msgid "size"
 msgstr "maint"
 
-#: strings.hrc:305
+#: starmath/inc/strings.hrc:305
 msgctxt "STR_FONT"
 msgid "font"
 msgstr "ffont"
 
-#: strings.hrc:306
+#: starmath/inc/strings.hrc:306
 msgctxt "STR_ALIGN_LEFT"
 msgid "left"
 msgstr "chwith"
 
-#: strings.hrc:307
+#: starmath/inc/strings.hrc:307
 msgctxt "STR_ALIGN_CENTER"
 msgid "center"
 msgstr "canoli"
 
-#: strings.hrc:308
+#: starmath/inc/strings.hrc:308
 msgctxt "STR_ALIGN_RIGHT"
 msgid "right"
 msgstr "de"
 
-#: strings.hrc:309
+#: starmath/inc/strings.hrc:309
 msgctxt "STR_CMDBOXWINDOW"
 msgid "Commands"
 msgstr "Gorchmynion"
 
-#: strings.hrc:310
+#: starmath/inc/strings.hrc:310
 msgctxt "RID_DOCUMENTSTR"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: strings.hrc:311
+#: starmath/inc/strings.hrc:311
 msgctxt "STR_STATSTR_WRITING"
 msgid "Saving document..."
 msgstr "Cadw dogfen..."
 
-#: strings.hrc:312
+#: starmath/inc/strings.hrc:312
 msgctxt "STR_MATH_DOCUMENT_FULLTYPE_CURRENT"
 msgid "%PRODUCTNAME %PRODUCTVERSION Formula"
 msgstr "Fformiwla %PRODUCTNAME %PRODUCTVERSION"
 
-#: strings.hrc:313
+#: starmath/inc/strings.hrc:313
 msgctxt "RID_ERR_IDENT"
 msgid "ERROR : "
 msgstr "ERROR : "
 
-#: strings.hrc:314
+#: starmath/inc/strings.hrc:314
 msgctxt "RID_ERR_UNEXPECTEDCHARACTER"
 msgid "Unexpected character"
 msgstr "Nod annisgwyl"
 
-#: strings.hrc:315
+#: starmath/inc/strings.hrc:315
 msgctxt "RID_ERR_UNEXPECTEDTOKEN"
 msgid "Unexpected token"
 msgstr "Tocyn annisgwyl"
 
-#: strings.hrc:316
+#: starmath/inc/strings.hrc:316
 msgctxt "RID_ERR_LGROUPEXPECTED"
 msgid "'{' expected"
 msgstr "Disgwyl '{'"
 
-#: strings.hrc:317
+#: starmath/inc/strings.hrc:317
 msgctxt "RID_ERR_RGROUPEXPECTED"
 msgid "'}' expected"
 msgstr "Disgwyl '}'"
 
-#: strings.hrc:318
+#: starmath/inc/strings.hrc:318
 msgctxt "RID_ERR_LBRACEEXPECTED"
 msgid "'(' expected"
 msgstr "Disgwyl '('"
 
-#: strings.hrc:319
+#: starmath/inc/strings.hrc:319
 msgctxt "RID_ERR_RBRACEEXPECTED"
 msgid "')' expected"
 msgstr "Disgwyl ')'"
 
-#: strings.hrc:320
+#: starmath/inc/strings.hrc:320
 msgctxt "RID_ERR_PARENTMISMATCH"
 msgid "Left and right symbols mismatched"
 msgstr "Nid yw'r symbolau de a chwith yn cyd-fynd"
 
-#: strings.hrc:321
+#: starmath/inc/strings.hrc:321
 msgctxt "RID_ERR_FONTEXPECTED"
 msgid "'fixed', 'sans', or 'serif' expected"
 msgstr "Yn disgwyl 'fixed', 'sans', or 'serif'"
 
-#: strings.hrc:322
+#: starmath/inc/strings.hrc:322
 msgctxt "RID_ERR_SIZEEXPECTED"
 msgid "'size' followed by an unexpected token"
 msgstr "'size' yn cael ei ddilyn gan docyn annisgwyl"
 
-#: strings.hrc:323
+#: starmath/inc/strings.hrc:323
 msgctxt "RID_ERR_DOUBLEALIGN"
 msgid "Double aligning is not allowed"
 msgstr "Nid yw alinio dwbl yn cael ei ganiatáu"
 
-#: strings.hrc:324
+#: starmath/inc/strings.hrc:324
 msgctxt "RID_ERR_DOUBLESUBSUPSCRIPT"
 msgid "Double sub/superscripts is not allowed"
 msgstr "Nid yw is/uwchsgriptiau yn cael eu caniatáu"
 
-#: strings.hrc:325
+#: starmath/inc/strings.hrc:325
 msgctxt "RID_ERR_POUNDEXPECTED"
 msgid "'#' expected"
 msgstr "Disgwyl '#'"
 
-#: strings.hrc:326
+#: starmath/inc/strings.hrc:326
 msgctxt "RID_ERR_COLOREXPECTED"
 msgid "Color required"
 msgstr "Angen lliw"
 
-#: strings.hrc:327
+#: starmath/inc/strings.hrc:327
 msgctxt "RID_ERR_RIGHTEXPECTED"
 msgid "'RIGHT' expected"
 msgstr "disgwyl 'RIGHT'"
 
-#: strings.hrc:328
+#: starmath/inc/strings.hrc:328
 msgctxt "RID_PRINTUIOPT_PRODNAME"
 msgid "%PRODUCTNAME %s"
 msgstr "%PRODUCTNAME %s"
 
-#: strings.hrc:329
+#: starmath/inc/strings.hrc:329
 msgctxt "RID_PRINTUIOPT_CONTENTS"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: strings.hrc:330
+#: starmath/inc/strings.hrc:330
 msgctxt "RID_PRINTUIOPT_TITLE"
 msgid "~Title"
 msgstr "~Teitl"
 
-#: strings.hrc:331
+#: starmath/inc/strings.hrc:331
 msgctxt "RID_PRINTUIOPT_FRMLTXT"
 msgid "~Formula text"
 msgstr "Testun ~fformiwla"
 
-#: strings.hrc:332
+#: starmath/inc/strings.hrc:332
 msgctxt "RID_PRINTUIOPT_BORDERS"
 msgid "B~orders"
 msgstr "~Borderi"
 
-#: strings.hrc:333
+#: starmath/inc/strings.hrc:333
 msgctxt "RID_PRINTUIOPT_SIZE"
 msgid "Size"
 msgstr "Maint"
 
-#: strings.hrc:334
+#: starmath/inc/strings.hrc:334
 msgctxt "RID_PRINTUIOPT_ORIGSIZE"
 msgid "O~riginal size"
 msgstr "Maint ~gwreiddiol"
 
-#: strings.hrc:335
+#: starmath/inc/strings.hrc:335
 msgctxt "RID_PRINTUIOPT_FITTOPAGE"
 msgid "Fit to ~page"
 msgstr "­Ffitio i'r ~dudalen"
 
-#: strings.hrc:336
+#: starmath/inc/strings.hrc:336
 msgctxt "RID_PRINTUIOPT_SCALING"
 msgid "~Scaling"
 msgstr "~Graddio"
 
-#: alignmentdialog.ui:8
+#: starmath/uiconfig/smath/ui/alignmentdialog.ui:8
 msgctxt "alignmentdialog|AlignmentDialog"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: alignmentdialog.ui:67
+#: starmath/uiconfig/smath/ui/alignmentdialog.ui:23
 msgctxt "alignmentdialog|default"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: alignmentdialog.ui:111
+#: starmath/uiconfig/smath/ui/alignmentdialog.ui:112
 msgctxt "alignmentdialog|left"
 msgid "_Left"
 msgstr "_Chwith"
 
-#: alignmentdialog.ui:128
+#: starmath/uiconfig/smath/ui/alignmentdialog.ui:129
 msgctxt "alignmentdialog|center"
 msgid "_Centered"
 msgstr "_Canoli"
 
-#: alignmentdialog.ui:146
+#: starmath/uiconfig/smath/ui/alignmentdialog.ui:146
 msgctxt "alignmentdialog|right"
 msgid "_Right"
 msgstr "_De"
 
-#: alignmentdialog.ui:169
+#: starmath/uiconfig/smath/ui/alignmentdialog.ui:169
 msgctxt "alignmentdialog|label1"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: catalogdialog.ui:9
+#: starmath/uiconfig/smath/ui/catalogdialog.ui:9
 msgctxt "catalogdialog|CatalogDialog"
 msgid "Symbols"
 msgstr "Symbolau"
 
-#: catalogdialog.ui:24
+#: starmath/uiconfig/smath/ui/catalogdialog.ui:24
 msgctxt "catalogdialog|insert"
 msgid "_Insert"
 msgstr "_Mewnoliad"
 
-#: catalogdialog.ui:55
+#: starmath/uiconfig/smath/ui/catalogdialog.ui:55
 msgctxt "catalogdialog|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: catalogdialog.ui:102
+#: starmath/uiconfig/smath/ui/catalogdialog.ui:102
 msgctxt "catalogdialog|label1"
 msgid "_Symbol set:"
 msgstr "_Set symbolau:"
 
-#: catalogdialog.ui:123
+#: starmath/uiconfig/smath/ui/catalogdialog.ui:123
 msgctxt "catalogdialog|symbolsetdisplay"
 msgid "button"
 msgstr "botwm"
 
-#: catalogdialog.ui:152
+#: starmath/uiconfig/smath/ui/catalogdialog.ui:152
 msgctxt "catalogdialog|symbolname"
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: dockingelements.ui:10
+#: starmath/uiconfig/smath/ui/dockingelements.ui:10
 msgctxt "dockingelements|DockingElements"
 msgid "Elements"
 msgstr "Elfennau"
 
-#: fontdialog.ui:9
+#: starmath/uiconfig/smath/ui/fontdialog.ui:9
 msgctxt "fontdialog|FontDialog"
 msgid "Fonts"
 msgstr "Ffontiau"
 
-#: fontdialog.ui:115
+#: starmath/uiconfig/smath/ui/fontdialog.ui:115
 msgctxt "fontdialog|formulaL"
 msgid "Font"
 msgstr "Ffont"
 
-#: fontdialog.ui:150
+#: starmath/uiconfig/smath/ui/fontdialog.ui:150
 msgctxt "fontdialog|bold"
 msgid "_Bold"
 msgstr "_Trwm"
 
-#: fontdialog.ui:165
+#: starmath/uiconfig/smath/ui/fontdialog.ui:165
 msgctxt "fontdialog|italic"
 msgid "_Italic"
 msgstr "_Italig"
 
-#: fontdialog.ui:187
+#: starmath/uiconfig/smath/ui/fontdialog.ui:187
 msgctxt "fontdialog|formulaL1"
 msgid "Attributes"
 msgstr "Priodoleddau"
 
-#: fontsizedialog.ui:20
+#: starmath/uiconfig/smath/ui/fontsizedialog.ui:44
 msgctxt "fontsizedialog|FontSizeDialog"
 msgid "Font Sizes"
 msgstr "Maint Ffont"
 
-#: fontsizedialog.ui:35
+#: starmath/uiconfig/smath/ui/fontsizedialog.ui:61
 msgctxt "fontsizedialog|default"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: fontsizedialog.ui:122
+#: starmath/uiconfig/smath/ui/fontsizedialog.ui:148
 msgctxt "fontsizedialog|label4"
 msgid "Base _size:"
 msgstr "Maint _sail:"
 
-#: fontsizedialog.ui:194
+#: starmath/uiconfig/smath/ui/fontsizedialog.ui:220
 msgctxt "fontsizedialog|label2"
 msgid "_Operators:"
 msgstr "_Gweithredwyr:"
 
-#: fontsizedialog.ui:208
+#: starmath/uiconfig/smath/ui/fontsizedialog.ui:234
 msgctxt "fontsizedialog|label3"
 msgid "_Limits:"
 msgstr "_Terfynau:"
 
-#: fontsizedialog.ui:248
+#: starmath/uiconfig/smath/ui/fontsizedialog.ui:274
 msgctxt "fontsizedialog|label5"
 msgid "_Text:"
 msgstr "_Testun:"
 
-#: fontsizedialog.ui:262
+#: starmath/uiconfig/smath/ui/fontsizedialog.ui:288
 msgctxt "fontsizedialog|label7"
 msgid "_Functions:"
 msgstr "_Swyddogaethau:"
 
-#: fontsizedialog.ui:276
+#: starmath/uiconfig/smath/ui/fontsizedialog.ui:302
 msgctxt "fontsizedialog|label6"
 msgid "_Indexes:"
 msgstr "_Mynegeion:"
 
-#: fontsizedialog.ui:320
+#: starmath/uiconfig/smath/ui/fontsizedialog.ui:346
 msgctxt "fontsizedialog|label1"
 msgid "Relative Sizes"
 msgstr "Maint Cymharol"
 
-#: fonttypedialog.ui:9
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:9
 msgctxt "fonttypedialog|FontsDialog"
 msgid "Fonts"
 msgstr "Ffontiau"
 
-#: fonttypedialog.ui:24
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:24
 msgctxt "fonttypedialog|modify"
 msgid "_Modify"
 msgstr "_Newid"
 
-#: fonttypedialog.ui:53
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:53
 msgctxt "fonttypedialog|default"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: fonttypedialog.ui:135
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:135
 msgctxt "fonttypedialog|label1"
 msgid "_Variables:"
 msgstr "_Newidiolion:"
 
-#: fonttypedialog.ui:152
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:152
 msgctxt "fonttypedialog|label2"
 msgid "_Functions:"
 msgstr "_Swyddogaethau:"
 
-#: fonttypedialog.ui:169
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:169
 msgctxt "fonttypedialog|label3"
 msgid "_Numbers:"
 msgstr "_Rhifau:"
 
-#: fonttypedialog.ui:186
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:186
 msgctxt "fonttypedialog|label4"
 msgid "_Text:"
 msgstr "_Testun:"
 
-#: fonttypedialog.ui:251
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:251
 msgctxt "fonttypedialog|formulaL"
 msgid "Formula Fonts"
 msgstr "Ffontiau Fformiwla"
 
-#: fonttypedialog.ui:288
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:288
 msgctxt "fonttypedialog|label5"
 msgid "_Serif:"
 msgstr "_Serif:"
 
-#: fonttypedialog.ui:305
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:305
 msgctxt "fonttypedialog|label6"
 msgid "S_ans-serif:"
 msgstr "S_ans-serif:"
 
-#: fonttypedialog.ui:322
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:322
 msgctxt "fonttypedialog|label7"
 msgid "F_ixed-width:"
 msgstr "_Lled gosodedig:"
 
-#: fonttypedialog.ui:376
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:376
 msgctxt "fonttypedialog|customL"
 msgid "Custom Fonts"
 msgstr "Ffontiau Cyfaddas"
 
-#: fonttypedialog.ui:424
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:424
 msgctxt "fonttypedialog|menuitem1"
 msgid "_Variables"
 msgstr "_Newidolion"
 
-#: fonttypedialog.ui:432
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:432
 msgctxt "fonttypedialog|menuitem2"
 msgid "_Functions"
 msgstr "_Swyddogaethau"
 
-#: fonttypedialog.ui:440
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:440
 msgctxt "fonttypedialog|menuitem3"
 msgid "_Numbers"
 msgstr "_Rhifau"
 
-#: fonttypedialog.ui:448
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:448
 msgctxt "fonttypedialog|menuitem4"
 msgid "_Text"
 msgstr "_Testun"
 
-#: fonttypedialog.ui:456
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:456
 msgctxt "fonttypedialog|menuitem5"
 msgid "_Serif"
 msgstr "_Serif"
 
-#: fonttypedialog.ui:464
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:464
 msgctxt "fonttypedialog|menuitem6"
 msgid "S_ans-serif"
 msgstr "S_ans-serif"
 
-#: fonttypedialog.ui:472
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:472
 msgctxt "fonttypedialog|menuitem7"
 msgid "Fixe_d-width"
 msgstr "Lled _penodol"
 
-#: printeroptions.ui:32
+#: starmath/uiconfig/smath/ui/printeroptions.ui:32
 msgctxt "printeroptions|title"
 msgid "Title"
 msgstr "Teitl"
 
-#: printeroptions.ui:48
+#: starmath/uiconfig/smath/ui/printeroptions.ui:49
 msgctxt "printeroptions|formulatext"
 msgid "Formula text"
 msgstr "Testun fformiwla"
 
-#: printeroptions.ui:64
+#: starmath/uiconfig/smath/ui/printeroptions.ui:66
 msgctxt "printeroptions|borders"
 msgid "Borders"
 msgstr "Borderi"
 
-#: printeroptions.ui:86
+#: starmath/uiconfig/smath/ui/printeroptions.ui:89
 msgctxt "printeroptions|label4"
 msgid "Contents"
 msgstr "Cynnwys"
 
-#: printeroptions.ui:119
+#: starmath/uiconfig/smath/ui/printeroptions.ui:122
 msgctxt "printeroptions|originalsize"
 msgid "Original size"
 msgstr "Maint gwreiddiol"
 
-#: printeroptions.ui:137
+#: starmath/uiconfig/smath/ui/printeroptions.ui:141
 msgctxt "printeroptions|fittopage"
 msgid "Fit to page"
 msgstr "Ffitio i'r dudalen"
 
-#: printeroptions.ui:159
+#: starmath/uiconfig/smath/ui/printeroptions.ui:164
 msgctxt "printeroptions|scaling"
 msgid "Scaling:"
 msgstr "Graddio:"
 
-#: printeroptions.ui:201
+#: starmath/uiconfig/smath/ui/printeroptions.ui:206
 msgctxt "printeroptions|label5"
 msgid "Size"
 msgstr "Maint"
 
-#: savedefaultsdialog.ui:8
+#: starmath/uiconfig/smath/ui/savedefaultsdialog.ui:7
 msgctxt "savedefaultsdialog|SaveDefaultsDialog"
 msgid "Save defaults?"
 msgstr "Cadw'r rhagosodedig?"
 
-#: savedefaultsdialog.ui:15
+#: starmath/uiconfig/smath/ui/savedefaultsdialog.ui:14
 msgctxt "savedefaultsdialog|SaveDefaultsDialog"
 msgid "Should the changes be saved as defaults?"
 msgstr "A ddylai'r newidiadau gael eu cadw fel y rhagosodedig?"
 
-#: savedefaultsdialog.ui:16
+#: starmath/uiconfig/smath/ui/savedefaultsdialog.ui:15
 msgctxt "savedefaultsdialog|SaveDefaultsDialog"
 msgid "These changes will apply for all new formulas."
 msgstr "Bydd y newidiadau'n digwydd i bob fformiwla newydd."
 
-#: smathsettings.ui:39
+#: starmath/uiconfig/smath/ui/smathsettings.ui:39
 msgctxt "smathsettings|title"
 msgid "_Title row"
 msgstr "_Rhes teitl"
 
-#: smathsettings.ui:55
+#: starmath/uiconfig/smath/ui/smathsettings.ui:55
 msgctxt "smathsettings|text"
 msgid "_Formula text"
 msgstr "Testun _fformiwla"
 
-#: smathsettings.ui:71
+#: starmath/uiconfig/smath/ui/smathsettings.ui:71
 msgctxt "smathsettings|frame"
 msgid "B_order"
 msgstr "_Border"
 
-#: smathsettings.ui:93
+#: starmath/uiconfig/smath/ui/smathsettings.ui:93
 msgctxt "smathsettings|label4"
 msgid "Print Options"
 msgstr "Dewisiadau Argraffu"
 
-#: smathsettings.ui:127
+#: starmath/uiconfig/smath/ui/smathsettings.ui:127
 msgctxt "smathsettings|sizenormal"
 msgid "O_riginal size"
 msgstr "Maint _gwreiddiol"
 
-#: smathsettings.ui:145
+#: starmath/uiconfig/smath/ui/smathsettings.ui:144
 msgctxt "smathsettings|sizescaled"
 msgid "Fit to _page"
 msgstr "­Ffitio i'r _dudalen"
 
-#: smathsettings.ui:167
+#: starmath/uiconfig/smath/ui/smathsettings.ui:166
 msgctxt "smathsettings|sizezoomed"
 msgid "_Scaling:"
 msgstr "_Graddio:"
 
-#: smathsettings.ui:210
+#: starmath/uiconfig/smath/ui/smathsettings.ui:209
 msgctxt "smathsettings|label5"
 msgid "Print Format"
 msgstr "Fformat Argraffu"
 
-#: smathsettings.ui:243
+#: starmath/uiconfig/smath/ui/smathsettings.ui:242
 msgctxt "smathsettings|norightspaces"
 msgid "Ig_nore ~~ and ' at the end of the line"
 msgstr "_Anwybyddu ~~ a ' ar ddiwedd llinell"
 
-#: smathsettings.ui:259
+#: starmath/uiconfig/smath/ui/smathsettings.ui:258
 msgctxt "smathsettings|saveonlyusedsymbols"
 msgid "Embed only used symbols (smaller file size)"
 msgstr "Mewnblannu ar gyfer symbolau defnyddiwyd (maint ffeil llai)"
 
-#: smathsettings.ui:275
+#: starmath/uiconfig/smath/ui/smathsettings.ui:274
 msgctxt "smathsettings|autoclosebrackets"
 msgid "Auto close brackets, parentheses and braces"
 msgstr "Awto gau bracedi, cromfachau a bresys"
 
-#: smathsettings.ui:297
+#: starmath/uiconfig/smath/ui/smathsettings.ui:296
 msgctxt "smathsettings|label1"
 msgid "Miscellaneous Options"
 msgstr "Dewisiadau Amrywiol"
 
-#: spacingdialog.ui:8
-msgctxt "spacingdialog|SpacingDialog"
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:28
+msgctxt "spacingdialog|menuitem1"
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: spacingdialog.ui:53
-msgctxt "spacingdialog|category"
-msgid "_Category"
-msgstr "_Categori"
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:38
+msgctxt "spacingdialog|menuitem2"
+msgid "Indexes"
+msgstr "Mynegeion"
+
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:48
+msgctxt "spacingdialog|menuitem3"
+msgid "Fractions"
+msgstr "Ffracsiynau"
+
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:58
+msgctxt "spacingdialog|menuitem4"
+msgid "Fraction Bars"
+msgstr "Barrau Ffracsiwn"
+
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:68
+msgctxt "spacingdialog|menuitem5"
+msgid "Limits"
+msgstr "Terfynau"
+
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:78
+msgctxt "spacingdialog|menuitem6"
+msgid "Brackets"
+msgstr "Bracedi"
 
-#: spacingdialog.ui:68
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:88
+msgctxt "spacingdialog|menuitem7"
+msgid "Matrices"
+msgstr "Matricsau"
+
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:98
+msgctxt "spacingdialog|menuitem8"
+msgid "Symbols"
+msgstr "Symbolau"
+
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:108
+msgctxt "spacingdialog|menuitem9"
+msgid "Operators"
+msgstr "Gweithredwyr"
+
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:118
+msgctxt "spacingdialog|menuitem10"
+msgid "Borders"
+msgstr "Borderi"
+
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:128
+msgctxt "spacingdialog|SpacingDialog"
+msgid "Spacing"
+msgstr "Bylchu"
+
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:145
 msgctxt "spacingdialog|default"
 msgid "_Default"
 msgstr "_Rhagosodiad"
 
-#: spacingdialog.ui:250
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:159
+msgctxt "spacingdialog|category"
+msgid "_Category"
+msgstr "_Categori"
+
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:376
 msgctxt "spacingdialog|checkbutton"
 msgid "Scale all brackets"
 msgstr "Graddio pob braced"
 
-#: spacingdialog.ui:310
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:717
 msgctxt "spacingdialog|title"
 msgid "Title"
 msgstr "Teitl"
 
-#: spacingdialog.ui:365
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:772
 msgctxt "spacingdialog|1label1"
 msgid "_Spacing:"
 msgstr "_Bylchu:"
 
-#: spacingdialog.ui:378
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:785
 msgctxt "spacingdialog|1label2"
 msgid "_Line spacing:"
 msgstr "_Bylchu llinell:"
 
-#: spacingdialog.ui:391
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:798
 msgctxt "spacingdialog|1label3"
 msgid "_Root spacing:"
 msgstr "_Bylchu gwraidd:"
 
-#: spacingdialog.ui:469
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:829
 msgctxt "spacingdialog|1title"
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: spacingdialog.ui:524
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:883
 msgctxt "spacingdialog|2label1"
 msgid "_Superscript:"
 msgstr "_Uwchysgrif:"
 
-#: spacingdialog.ui:537
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:896
 msgctxt "spacingdialog|2label2"
 msgid "S_ubscript:"
 msgstr "_Isysgrif:"
 
-#: spacingdialog.ui:603
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:927
 msgctxt "spacingdialog|2title"
 msgid "Indexes"
 msgstr "Mynegeion"
 
-#: spacingdialog.ui:658
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:981
 msgctxt "spacingdialog|3label1"
 msgid "_Numerator:"
 msgstr "_Rhifiadur:"
 
-#: spacingdialog.ui:671
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:994
 msgctxt "spacingdialog|3label2"
 msgid "_Denominator:"
 msgstr "_Enwadur:"
 
-#: spacingdialog.ui:737
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1025
 msgctxt "spacingdialog|3title"
 msgid "Fractions"
 msgstr "Ffracsiynau"
 
-#: spacingdialog.ui:792
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1079
 msgctxt "spacingdialog|4label1"
 msgid "_Excess length:"
 msgstr "_Hyd gormodol:"
 
-#: spacingdialog.ui:805
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1092
 msgctxt "spacingdialog|4label2"
 msgid "_Weight:"
 msgstr "_Pwysau:"
 
-#: spacingdialog.ui:871
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1123
 msgctxt "spacingdialog|4title"
 msgid "Fraction Bar"
 msgstr "Bar Ffracsiwn"
 
-#: spacingdialog.ui:926
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1177
 msgctxt "spacingdialog|5label1"
 msgid "_Upper limit:"
 msgstr "_Terfyn uchaf:"
 
-#: spacingdialog.ui:939
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1190
 msgctxt "spacingdialog|5label2"
 msgid "_Lower limit:"
 msgstr "_Terfyn isaf:"
 
-#: spacingdialog.ui:1005
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1221
 msgctxt "spacingdialog|5title"
 msgid "Limits"
 msgstr "Terfynau"
 
-#: spacingdialog.ui:1060
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1275
 msgctxt "spacingdialog|6label1"
 msgid "_Excess size (left/right):"
 msgstr "_Maint gormodol (chwith/de):"
 
-#: spacingdialog.ui:1073
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1288
 msgctxt "spacingdialog|6label2"
 msgid "_Spacing:"
 msgstr "_Bylchu:"
 
-#: spacingdialog.ui:1086
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1301
 msgctxt "spacingdialog|6label4"
 msgid "_Excess size:"
 msgstr "_Maint gormodol:"
 
-#: spacingdialog.ui:1164
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1332
 msgctxt "spacingdialog|6title"
 msgid "Brackets"
 msgstr "Bracedi"
 
-#: spacingdialog.ui:1219
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1386
 msgctxt "spacingdialog|7label1"
 msgid "_Line spacing:"
 msgstr "_Bylchu llinell:"
 
-#: spacingdialog.ui:1232
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1399
 msgctxt "spacingdialog|7label2"
 msgid "_Column spacing:"
 msgstr "_Bylchu colofn:"
 
-#: spacingdialog.ui:1298
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1430
 msgctxt "spacingdialog|7title"
 msgid "Matrix"
 msgstr "Matrics"
 
-#: spacingdialog.ui:1353
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1484
 msgctxt "spacingdialog|8label1"
 msgid "_Primary height:"
 msgstr "_Uchder cynradd:"
 
-#: spacingdialog.ui:1366
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1497
 msgctxt "spacingdialog|8label2"
 msgid "_Minimum spacing:"
 msgstr "_Bylchu lleiaf:"
 
-#: spacingdialog.ui:1432
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1528
 msgctxt "spacingdialog|8title"
 msgid "Symbols"
 msgstr "Symbolau"
 
-#: spacingdialog.ui:1487
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1582
 msgctxt "spacingdialog|9label1"
 msgid "_Excess size:"
 msgstr "_Maint gormodol:"
 
-#: spacingdialog.ui:1500
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1595
 msgctxt "spacingdialog|9label2"
 msgid "_Spacing:"
 msgstr "_Bylchu:"
 
-#: spacingdialog.ui:1566
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1626
 msgctxt "spacingdialog|9title"
 msgid "Operators"
 msgstr "Gweithredwyr"
 
-#: spacingdialog.ui:1621
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1680
 msgctxt "spacingdialog|10label1"
 msgid "_Left:"
 msgstr "_Chwith:"
 
-#: spacingdialog.ui:1634
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1693
 msgctxt "spacingdialog|10label2"
 msgid "_Right:"
 msgstr "_De:"
 
-#: spacingdialog.ui:1647
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1706
 msgctxt "spacingdialog|10label3"
 msgid "_Top:"
 msgstr "_Brig:"
 
-#: spacingdialog.ui:1660
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1719
 msgctxt "spacingdialog|10label4"
 msgid "_Bottom:"
 msgstr "_Gwaelod:"
 
-#: spacingdialog.ui:1750
+#: starmath/uiconfig/smath/ui/spacingdialog.ui:1750
 msgctxt "spacingdialog|10title"
 msgid "Borders"
 msgstr "Borderi"
 
-#: spacingdialog.ui:1865
-msgctxt "spacingdialog|menuitem1"
-msgid "Spacing"
-msgstr "Bylchu"
-
-#: spacingdialog.ui:1873
-msgctxt "spacingdialog|menuitem2"
-msgid "Indexes"
-msgstr "Mynegeion"
-
-#: spacingdialog.ui:1881
-msgctxt "spacingdialog|menuitem3"
-msgid "Fractions"
-msgstr "Ffracsiynau"
-
-#: spacingdialog.ui:1889
-msgctxt "spacingdialog|menuitem4"
-msgid "Fraction Bars"
-msgstr "Barrau Ffracsiwn"
-
-#: spacingdialog.ui:1897
-msgctxt "spacingdialog|menuitem5"
-msgid "Limits"
-msgstr "Terfynau"
-
-#: spacingdialog.ui:1905
-msgctxt "spacingdialog|menuitem6"
-msgid "Brackets"
-msgstr "Bracedi"
-
-#: spacingdialog.ui:1913
-msgctxt "spacingdialog|menuitem7"
-msgid "Matrices"
-msgstr "Matricsau"
-
-#: spacingdialog.ui:1921
-msgctxt "spacingdialog|menuitem8"
-msgid "Symbols"
-msgstr "Symbolau"
-
-#: spacingdialog.ui:1929
-msgctxt "spacingdialog|menuitem9"
-msgid "Operators"
-msgstr "Gweithredwyr"
-
-#: spacingdialog.ui:1937
-msgctxt "spacingdialog|menuitem10"
-msgid "Borders"
-msgstr "Borderi"
-
-#: symdefinedialog.ui:9
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:8
 msgctxt "symdefinedialog|EditSymbols"
 msgid "Edit Symbols"
 msgstr "Golygu Symbolau"
 
-#: symdefinedialog.ui:41
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:101
 msgctxt "symdefinedialog|oldSymbolSetText"
 msgid "O_ld symbol set:"
 msgstr "Set _h­en symbol:"
 
-#: symdefinedialog.ui:86
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:146
 msgctxt "symdefinedialog|oldSymbolText"
 msgid "_Old symbol:"
 msgstr "_Hen symbol:"
 
-#: symdefinedialog.ui:157
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:244
+msgctxt "symdefinedialog|modify"
+msgid "_Modify"
+msgstr "_Newid"
+
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:299
 msgctxt "symdefinedialog|symbolText"
 msgid "_Symbol:"
 msgstr "_Symbol:"
 
-#: symdefinedialog.ui:171
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:313
 msgctxt "symdefinedialog|symbolSetText"
 msgid "Symbol s_et:"
 msgstr "_Set symbolau:"
 
-#: symdefinedialog.ui:185
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:327
 msgctxt "symdefinedialog|fontText"
 msgid "_Font:"
 msgstr "_Ffont:"
 
-#: symdefinedialog.ui:199
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:341
 msgctxt "symdefinedialog|styleText"
 msgid "S_tyle:"
 msgstr "_Arddull:"
 
-#: symdefinedialog.ui:213
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:355
 msgctxt "symdefinedialog|fontsSubsetFT"
 msgid "S_ubset:"
 msgstr "_Is-set:"
-
-#: symdefinedialog.ui:387
-msgctxt "symdefinedialog|modify"
-msgid "_Modify"
-msgstr "_Newid"
diff --git a/source/cy/svl/messages.po b/source/cy/svl/messages.po
index b63b42ceda9..9d53b322f25 100644
--- a/source/cy/svl/messages.po
+++ b/source/cy/svl/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-10-04 11:48+0200\n"
+"POT-Creation-Date: 2018-02-27 13:56+0100\n"
 "PO-Revision-Date: 2017-12-28 12:31+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,361 +13,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1514464315.000000\n"
 
 #. Internet Media Type Presentations
-#: svl.hrc:26
-msgctxt "STR_SVT_MIMETYPE_APP_OCTSTREAM"
-msgid "Binary file"
-msgstr "Ffeil ddeuaidd"
-
-#: svl.hrc:27
-msgctxt "STR_SVT_MIMETYPE_APP_PDF"
-msgid "PDF file"
-msgstr "Ffeil PDF"
-
-#: svl.hrc:28
-msgctxt "STR_SVT_MIMETYPE_APP_RTF"
-msgid "RTF File"
-msgstr "Ffeil RTF"
-
-#: svl.hrc:29
-msgctxt "STR_SVT_MIMETYPE_APP_MSWORD"
-msgid "MS-Word document"
-msgstr "Dogfen MS Word"
-
-#: svl.hrc:30
-msgctxt "STR_SVT_MIMETYPE_APP_STARCALC"
-msgid "%PRODUCTNAME Spreadsheet"
-msgstr "Taenlen %PRODUCTNAME"
-
-#: svl.hrc:31
-msgctxt "STR_SVT_MIMETYPE_APP_STARCHART"
-msgid "%PRODUCTNAME Chart"
-msgstr "Siart %PRODUCTNAME"
-
-#: svl.hrc:32
-msgctxt "STR_SVT_MIMETYPE_APP_STARDRAW"
-msgid "%PRODUCTNAME Drawing"
-msgstr "Lluniadu %PRODUCTNAME"
-
-#: svl.hrc:33
-msgctxt "STR_SVT_MIMETYPE_APP_STARIMAGE"
-msgid "%PRODUCTNAME Image"
-msgstr "Delwedd %PRODUCTNAME"
-
-#: svl.hrc:34
-msgctxt "STR_SVT_MIMETYPE_APP_STARMATH"
-msgid "%PRODUCTNAME Formula"
-msgstr "Fformiwla %PRODUCTNAME"
-
-#: svl.hrc:35
-msgctxt "STR_SVT_MIMETYPE_APP_STARWRITER"
-msgid "%PRODUCTNAME Text"
-msgstr "Testun %PRODUCTNAME"
-
-#: svl.hrc:36
-msgctxt "STR_SVT_MIMETYPE_APP_ZIP"
-msgid "ZIP file"
-msgstr "Ffeil ZIP"
-
-#: svl.hrc:37
-msgctxt "STR_SVT_MIMETYPE_APP_JAR"
-msgid "JAR file"
-msgstr "Ffeil JAR"
-
-#: svl.hrc:38
-msgctxt "STR_SVT_MIMETYPE_AUDIO_AIFF"
-msgid "Audio file"
-msgstr "Ffeil sain"
-
-#: svl.hrc:39
-msgctxt "STR_SVT_MIMETYPE_AUDIO_BASIC"
-msgid "Audio file"
-msgstr "Ffeil sain"
-
-#: svl.hrc:40
-msgctxt "STR_SVT_MIMETYPE_AUDIO_MIDI"
-msgid "Audio file"
-msgstr "Ffeil sain"
-
-#: svl.hrc:41
-msgctxt "STR_SVT_MIMETYPE_AUDIO_VORBIS"
-msgid "Audio file"
-msgstr "Ffeil sain"
-
-#: svl.hrc:42
-msgctxt "STR_SVT_MIMETYPE_AUDIO_WAV"
-msgid "Audio file"
-msgstr "Ffeil sain"
-
-#: svl.hrc:43
-msgctxt "STR_SVT_MIMETYPE_AUDIO_WEBM"
-msgid "Audio file"
-msgstr "Ffeil sain"
-
-#: svl.hrc:44
-msgctxt "STR_SVT_MIMETYPE_IMAGE_GIF"
-msgid "Image"
-msgstr "Delwedd"
-
-#: svl.hrc:45
-msgctxt "STR_SVT_MIMETYPE_IMAGE_PNG"
-msgid "Image"
-msgstr "Delwedd"
-
-#: svl.hrc:46
-msgctxt "STR_SVT_MIMETYPE_IMAGE_TIFF"
-msgid "Image"
-msgstr "Delwedd"
-
-#: svl.hrc:47
-msgctxt "STR_SVT_MIMETYPE_IMAGE_JPEG"
-msgid "Image"
-msgstr "Delwedd"
-
-#: svl.hrc:48
-msgctxt "STR_SVT_MIMETYPE_IMAGE_PCX"
-msgid "Image"
-msgstr "Delwedd"
-
-#: svl.hrc:49
-msgctxt "STR_SVT_MIMETYPE_IMAGE_BMP"
-msgid "Bitmap"
-msgstr "Didfap"
-
-#: svl.hrc:50
-msgctxt "STR_SVT_MIMETYPE_TEXT_HTML"
-msgid "HTML document"
-msgstr "Dogfen HTML"
-
-#: svl.hrc:51
-msgctxt "STR_SVT_MIMETYPE_TEXT_PLAIN"
-msgid "Text file"
-msgstr "Ffeil testun"
-
-#: svl.hrc:52
-msgctxt "STR_SVT_MIMETYPE_TEXT_URL"
-msgid "Bookmark"
-msgstr "Nod Tudalen"
-
-#: svl.hrc:53
-msgctxt "STR_SVT_MIMETYPE_TEXT_VCARD"
-msgid "vCard file"
-msgstr "Ffeil vCard"
-
-#: svl.hrc:54
-msgctxt "STR_SVT_MIMETYPE_VIDEO_MSVIDEO"
-msgid "Video file"
-msgstr "Ffeil fideo"
-
-#: svl.hrc:55
-msgctxt "STR_SVT_MIMETYPE_VIDEO_THEORA"
-msgid "Video file"
-msgstr "Ffeil fideo"
-
-#: svl.hrc:56
-msgctxt "STR_SVT_MIMETYPE_VIDEO_VDO"
-msgid "Video file"
-msgstr "Ffeil fideo"
-
-#: svl.hrc:57
-msgctxt "STR_SVT_MIMETYPE_VIDEO_WEBM"
-msgid "Video file"
-msgstr "Ffeil fideo"
-
-#: svl.hrc:58
-msgctxt "STR_SVT_MIMETYPE_X_STARMAIL"
-msgid "Message"
-msgstr "Message"
-
-#: svl.hrc:59
-msgctxt "STR_SVT_MIMETYPE_X_VRML"
-msgid "VRML file"
-msgstr "Ffeil VRML"
-
-#: svl.hrc:60
-msgctxt "STR_SVT_MIMETYPE_APP_STARIMPRESS"
-msgid "%PRODUCTNAME Presentation"
-msgstr "Cyflwyniad %PRODUCTNAME"
-
-#: svl.hrc:61
-msgctxt "STR_SVT_MIMETYPE_APP_IMPRESSPACKED"
-msgid "%PRODUCTNAME Presentation (packed)"
-msgstr "Cyflwyniad (paciwyd) %PRODUCTNAME"
-
-#: svl.hrc:62
-msgctxt "STR_SVT_MIMETYPE_APP_STARHELP"
-msgid "%PRODUCTNAME Help"
-msgstr "Cymorth %PRODUCTNAME"
-
-#: svl.hrc:63
+#: include/svl/svl.hrc:26
 msgctxt "STR_SVT_MIMETYPE_CNT_FSYSBOX"
 msgid "Workplace"
 msgstr "Man Gwaith"
-
-#: svl.hrc:64
-msgctxt "STR_SVT_MIMETYPE_CNT_FSYSFLD"
-msgid "Folder"
-msgstr "Ffolder"
-
-#: svl.hrc:65
-msgctxt "STR_SVT_MIMETYPE_APP_GAL"
-msgid "Gallery"
-msgstr "Oriel"
-
-#: svl.hrc:66
-msgctxt "STR_SVT_MIMETYPE_APP_GAL_THEME"
-msgid "Gallery theme"
-msgstr "Thema oriel"
-
-#: svl.hrc:67
-msgctxt "STR_SVT_MIMETYPE_APP_STARW_GLOB"
-msgid "%PRODUCTNAME Master Document"
-msgstr "Prif Ddogfen %PRODUCTNAME"
-
-#: svl.hrc:68
-msgctxt "STR_SVT_MIMETYPE_APP_SDM"
-msgid "Message"
-msgstr "Message"
-
-#: svl.hrc:69
-msgctxt "STR_SVT_MIMETYPE_APP_SMD"
-msgid "Message"
-msgstr "Message"
-
-#: svl.hrc:70
-msgctxt "STR_SVT_MIMETYPE_APP_STARW_WEB"
-msgid "%PRODUCTNAME Writer/Web"
-msgstr "Writer/Web %PRODUCTNAME"
-
-#: svl.hrc:71
-msgctxt "STR_SVT_MIMETYPE_FRAMESET"
-msgid "Frameset Document"
-msgstr "Dogfen Fframset"
-
-#: svl.hrc:72
-msgctxt "STR_SVT_MIMETYPE_MACRO"
-msgid "Macro file"
-msgstr "Ffeil macro"
-
-#: svl.hrc:73
-msgctxt "STR_SVT_MIMETYPE_CNT_SFSYSFOLDER"
-msgid "System folder"
-msgstr "Ffolder system"
-
-#: svl.hrc:74
-msgctxt "STR_SVT_MIMETYPE_APP_TEMPLATE"
-msgid "%PRODUCTNAME Template"
-msgstr "Templed %PRODUCTNAME"
-
-#: svl.hrc:75
-msgctxt "STR_SVT_MIMETYPE_IMAGE_GENERIC"
-msgid "Image"
-msgstr "Delwedd"
-
-#: svl.hrc:76
-msgctxt "STR_SVT_MIMETYPE_APP_MSEXCEL"
-msgid "MS Excel document"
-msgstr "Dogfen MS Excel"
-
-#: svl.hrc:77
-msgctxt "STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL"
-msgid "MS Excel Template"
-msgstr "Templed MS Excel"
-
-#: svl.hrc:78
-msgctxt "STR_SVT_MIMETYPE_APP_MSPPOINT"
-msgid "MS PowerPoint document"
-msgstr "Dogfen MS PowerPoint"
-
-#: svl.hrc:79
-msgctxt "STR_SVT_MIMETYPE_TEXT_VCALENDAR"
-msgid "vCalendar-file"
-msgstr "vCalendar-file"
-
-#: svl.hrc:80
-msgctxt "STR_SVT_MIMETYPE_TEXT_ICALENDAR"
-msgid "iCalendar-File"
-msgstr "iCalendar-File"
-
-#: svl.hrc:81
-msgctxt "STR_SVT_MIMETYPE_TEXT_XMLICALENDAR"
-msgid "XML-iCalendar-File"
-msgstr "XML-iCalendar-File"
-
-#: svl.hrc:82
-msgctxt "STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP"
-msgid "CDE-Calendar-File"
-msgstr "CDE-Calendar-File"
-
-#: svl.hrc:83
-msgctxt "STR_SVT_MIMETYPE_INET_MSG_RFC822"
-msgid "message/rfc822"
-msgstr "message/rfc822"
-
-#: svl.hrc:84
-msgctxt "STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE"
-msgid "multipart/alternative"
-msgstr "multipart/alternative"
-
-#: svl.hrc:85
-msgctxt "STR_SVT_MIMETYPE_INET_MULTI_DIGEST"
-msgid "multipart/digest"
-msgstr "multipart/digest"
-
-#: svl.hrc:86
-msgctxt "STR_SVT_MIMETYPE_INET_MULTI_PARALLEL"
-msgid "multipart/parallel"
-msgstr "multipart/parallel"
-
-#: svl.hrc:87
-msgctxt "STR_SVT_MIMETYPE_INET_MULTI_RELATED"
-msgid "multipart/related"
-msgstr "multipart/related"
-
-#: svl.hrc:88
-msgctxt "STR_SVT_MIMETYPE_INET_MULTI_MIXED"
-msgid "multipart/mixed"
-msgstr "multipart/mixed"
-
-#: svl.hrc:89
-msgctxt "STR_SVT_MIMETYPE_APP_SXCALC"
-msgid "OpenOffice.org 1.0 Spreadsheet"
-msgstr "Taenlen OpenOffice.org 1.0"
-
-#: svl.hrc:90
-msgctxt "STR_SVT_MIMETYPE_APP_SXCHART"
-msgid "OpenOffice.org 1.0 Chart"
-msgstr "Siart OpenOffice.org 1.0"
-
-#: svl.hrc:91
-msgctxt "STR_SVT_MIMETYPE_APP_SXDRAW"
-msgid "OpenOffice.org 1.0 Drawing"
-msgstr "Lluniadu OpenOffice.org 1.0"
-
-#: svl.hrc:92
-msgctxt "STR_SVT_MIMETYPE_APP_SXMATH"
-msgid "OpenOffice.org 1.0 Formula"
-msgstr "Fformiwla OpenOffice.org 1.0"
-
-#: svl.hrc:93
-msgctxt "STR_SVT_MIMETYPE_APP_SXWRITER"
-msgid "OpenOffice.org 1.0 Text Document"
-msgstr "Dogfen Testun OpenOffice.org 1.0"
-
-#: svl.hrc:94
-msgctxt "STR_SVT_MIMETYPE_APP_SXIMPRESS"
-msgid "OpenOffice.org 1.0 Presentation"
-msgstr "Cyflwyniad OpenOffice.org 1.0"
-
-#: svl.hrc:95
-msgctxt "STR_SVT_MIMETYPE_APP_SXGLOBAL"
-msgid "OpenOffice.org 1.0 Master Document"
-msgstr "Prif Ddogfen OpenOffice.org 1.0"
-
-#: svl.hrc:96
-msgctxt "STR_SVT_MIMETYPE_APP_SXIPACKED"
-msgid "OpenOffice.org 1.0 Presentation (packed)"
-msgstr "Cyflwyniad OpenOffice.org 1.0 (wedi ei bacio)"
diff --git a/source/cy/svtools/messages.po b/source/cy/svtools/messages.po
index ecab6225c2e..2f2864119f3 100644
--- a/source/cy/svtools/messages.po
+++ b/source/cy/svtools/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: 2017-12-06 15:58+0100\n"
-"PO-Revision-Date: 2017-12-29 15:02+0000\n"
+"POT-Creation-Date: 2018-04-24 12:21+0200\n"
+"PO-Revision-Date: 2018-04-18 08:49+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,205 +13,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1514559737.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1524041382.000000\n"
 
-#: errtxt.hrc:30
+#: svtools/inc/errtxt.hrc:30
 msgctxt "RID_ERRCTX"
 msgid "Error"
 msgstr "Gwall"
 
-#: errtxt.hrc:31
+#: svtools/inc/errtxt.hrc:31
 msgctxt "RID_ERRCTX"
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: errtxt.hrc:32
+#: svtools/inc/errtxt.hrc:32
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) loading the template $(ARG1)"
 msgstr "$(ERR) llwytho templed $(ARG1)"
 
-#: errtxt.hrc:33 /home/cl/vc/git/libo-core/svtools/inc/errtxt.hrc:34
+#: svtools/inc/errtxt.hrc:33 svtools/inc/errtxt.hrc:34
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) saving the document $(ARG1)"
 msgstr "$(ERR) cadw dogfen $(ARG1)"
 
-#: errtxt.hrc:35
+#: svtools/inc/errtxt.hrc:35
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) displaying doc. information for document $(ARG1)"
 msgstr "$(ERR) dangos manylion y ddogfen $(ARG1)"
 
-#: errtxt.hrc:36
+#: svtools/inc/errtxt.hrc:36
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) writing document $(ARG1) as template"
 msgstr "$(ERR) ysgrifennu dogfen $(ARG1) fel templed"
 
-#: errtxt.hrc:37
+#: svtools/inc/errtxt.hrc:37
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) copying or moving document contents"
 msgstr "$(ERR) copïo neu symud cynnwys dogfen"
 
-#: errtxt.hrc:38
+#: svtools/inc/errtxt.hrc:38
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) starting the Document Manager"
 msgstr "$(ERR) cychwyn y Rheolwr Dogfennau"
 
-#: errtxt.hrc:39
+#: svtools/inc/errtxt.hrc:39
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) loading document $(ARG1)"
 msgstr "$(ERR) llwytho dogfen $(ARG1)"
 
-#: errtxt.hrc:40 /home/cl/vc/git/libo-core/svtools/inc/errtxt.hrc:41
+#: svtools/inc/errtxt.hrc:40 svtools/inc/errtxt.hrc:41
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) creating a new document"
 msgstr "$(ERR) creu dogfen newydd"
 
-#: errtxt.hrc:42
+#: svtools/inc/errtxt.hrc:42
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) expanding entry"
 msgstr "$(ERR) ehangu cofnod"
 
-#: errtxt.hrc:43
+#: svtools/inc/errtxt.hrc:43
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) loading BASIC of document $(ARG1)"
 msgstr "$(ERR) llwytho BASIC dogfen $(ARG1)"
 
-#: errtxt.hrc:44
+#: svtools/inc/errtxt.hrc:44
 msgctxt "RID_ERRCTX"
 msgid "$(ERR) searching for an address"
 msgstr "$(ERR) chwilio am gyfeiriad"
 
-#: errtxt.hrc:50
+#: svtools/inc/errtxt.hrc:50
 msgctxt "RID_ERRHDL"
 msgid "Abort"
 msgstr "Atal"
 
-#: errtxt.hrc:51
+#: svtools/inc/errtxt.hrc:51
 msgctxt "RID_ERRHDL"
 msgid "Nonexistent object"
 msgstr "Gwrthrych nad yw'n bod"
 
-#: errtxt.hrc:52
+#: svtools/inc/errtxt.hrc:52
 msgctxt "RID_ERRHDL"
 msgid "Object already exists"
 msgstr "Gwrthrych yn bodoli eisoes"
 
-#: errtxt.hrc:53
+#: svtools/inc/errtxt.hrc:53
 msgctxt "RID_ERRHDL"
 msgid "Object not accessible"
 msgstr "Dim mynediad at y gwrthrych"
 
-#: errtxt.hrc:54
+#: svtools/inc/errtxt.hrc:54
 msgctxt "RID_ERRHDL"
 msgid "Inadmissible path"
 msgstr "Llwybr annerbyniadwy"
 
-#: errtxt.hrc:55
+#: svtools/inc/errtxt.hrc:55
 msgctxt "RID_ERRHDL"
 msgid "Locking problem"
 msgstr "Problem cloi"
 
-#: errtxt.hrc:56
+#: svtools/inc/errtxt.hrc:56
 msgctxt "RID_ERRHDL"
 msgid "Wrong parameter"
 msgstr "Paramedrau anghywir"
 
-#: errtxt.hrc:57
+#: svtools/inc/errtxt.hrc:57
 msgctxt "RID_ERRHDL"
 msgid "Resource exhausted"
 msgstr "Adnoddau wedi gorffen"
 
-#: errtxt.hrc:58
+#: svtools/inc/errtxt.hrc:58
 msgctxt "RID_ERRHDL"
 msgid "Action not supported"
 msgstr "Nid yw'r weithred yn cael ei gynnal"
 
-#: errtxt.hrc:59
+#: svtools/inc/errtxt.hrc:59
 msgctxt "RID_ERRHDL"
 msgid "Read Error"
 msgstr "Gwall Wrth Ddarllen"
 
-#: errtxt.hrc:60
+#: svtools/inc/errtxt.hrc:60
 msgctxt "RID_ERRHDL"
 msgid "Write Error"
 msgstr "Gwall Ysgrifennu"
 
-#: errtxt.hrc:61
+#: svtools/inc/errtxt.hrc:61
 msgctxt "RID_ERRHDL"
 msgid "unknown"
 msgstr "anhysbys"
 
-#: errtxt.hrc:62
+#: svtools/inc/errtxt.hrc:62
 msgctxt "RID_ERRHDL"
 msgid "Version Incompatibility"
 msgstr "Anghydweddiad Fersiynau"
 
-#: errtxt.hrc:63 /home/cl/vc/git/libo-core/svtools/inc/errtxt.hrc:74
+#: svtools/inc/errtxt.hrc:63 svtools/inc/errtxt.hrc:74
 msgctxt "RID_ERRHDL"
 msgid "General Error"
 msgstr "Gwall Cyffredinol"
 
-#: errtxt.hrc:64
+#: svtools/inc/errtxt.hrc:64
 msgctxt "RID_ERRHDL"
 msgid "Incorrect format"
 msgstr "Fformat anghywir"
 
-#: errtxt.hrc:65
+#: svtools/inc/errtxt.hrc:65
 msgctxt "RID_ERRHDL"
 msgid "Error creating object"
 msgstr "Gwall wrth greu gwrthrych"
 
-#: errtxt.hrc:66
+#: svtools/inc/errtxt.hrc:66
 msgctxt "RID_ERRHDL"
 msgid "Inadmissible value or data type"
 msgstr "Gwerth neu fath o ddata annerbyniol"
 
-#: errtxt.hrc:67
+#: svtools/inc/errtxt.hrc:67
 msgctxt "RID_ERRHDL"
 msgid "BASIC runtime error"
 msgstr "Gwall amser rhedeg BASIC"
 
-#: errtxt.hrc:68
+#: svtools/inc/errtxt.hrc:68
 msgctxt "RID_ERRHDL"
 msgid "BASIC syntax error"
 msgstr "Gwall cystrawen BASIC"
 
-#: errtxt.hrc:75
+#: svtools/inc/errtxt.hrc:75
 msgctxt "RID_ERRHDL"
 msgid "General input/output error."
 msgstr "Gwall mewnbwn/allbwn cyffredinol."
 
-#: errtxt.hrc:76
+#: svtools/inc/errtxt.hrc:76
 msgctxt "RID_ERRHDL"
 msgid "Invalid file name."
 msgstr "Enw ffeil annilys."
 
-#: errtxt.hrc:77
+#: svtools/inc/errtxt.hrc:77
 msgctxt "RID_ERRHDL"
 msgid "Nonexistent file."
 msgstr "Ffeil nad yw'n bod."
 
-#: errtxt.hrc:78
+#: svtools/inc/errtxt.hrc:78
 msgctxt "RID_ERRHDL"
 msgid "File already exists."
 msgstr "Mae'r ffeil yn bodoli eisoes."
 
-#: errtxt.hrc:79
+#: svtools/inc/errtxt.hrc:79
 msgctxt "RID_ERRHDL"
 msgid "The object is not a directory."
 msgstr "Nid yw'r gwrthrych yn gyfeiriadur."
 
-#: errtxt.hrc:80
+#: svtools/inc/errtxt.hrc:80
 msgctxt "RID_ERRHDL"
 msgid "The object is not a file."
 msgstr "Nid yw'r gwrthrych yn ffeil."
 
-#: errtxt.hrc:81
+#: svtools/inc/errtxt.hrc:81
 msgctxt "RID_ERRHDL"
 msgid "The specified device is invalid."
 msgstr "Mae'r ddyfais hon yn annilys."
 
-#: errtxt.hrc:82
+#: svtools/inc/errtxt.hrc:82
 msgctxt "RID_ERRHDL"
 msgid ""
 "The object cannot be accessed\n"
@@ -220,17 +220,17 @@ msgstr ""
 "Methu cael mynediad i'r gwrthrych\n"
 "oherwydd hawl defnyddiwr annigonol."
 
-#: errtxt.hrc:83
+#: svtools/inc/errtxt.hrc:83
 msgctxt "RID_ERRHDL"
 msgid "Sharing violation while accessing the object."
 msgstr "Trosedd rhannu wrth gael mynediad i wrthrych."
 
-#: errtxt.hrc:84
+#: svtools/inc/errtxt.hrc:84
 msgctxt "RID_ERRHDL"
 msgid "No more space on device."
 msgstr "Dim rhagor o le ar y ddyfais."
 
-#: errtxt.hrc:85
+#: svtools/inc/errtxt.hrc:85
 msgctxt "RID_ERRHDL"
 msgid ""
 "This operation cannot be run on\n"
@@ -239,137 +239,137 @@ msgstr ""
 "Methu rhedeg y weithred ar\n"
 "ffeiliau'n cynnwys wildcards."
 
-#: errtxt.hrc:86
+#: svtools/inc/errtxt.hrc:86
 msgctxt "RID_ERRHDL"
 msgid "This operation is not supported on this operating system."
 msgstr "Nid yw'r weithred yn cael ei gynnal ar y system weithredu hon."
 
-#: errtxt.hrc:87
+#: svtools/inc/errtxt.hrc:87
 msgctxt "RID_ERRHDL"
 msgid "There are too many files open."
 msgstr "Mae gormod o ffeiliau ar agor."
 
-#: errtxt.hrc:88
+#: svtools/inc/errtxt.hrc:88
 msgctxt "RID_ERRHDL"
 msgid "Data could not be read from the file."
 msgstr "Methu darllen data o'r ffeil."
 
-#: errtxt.hrc:89
+#: svtools/inc/errtxt.hrc:89
 msgctxt "RID_ERRHDL"
 msgid "The file could not be written."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: errtxt.hrc:90
+#: svtools/inc/errtxt.hrc:90
 msgctxt "RID_ERRHDL"
 msgid "The operation could not be run due to insufficient memory."
 msgstr "Methu rhedeg y weithred oherwydd diffyg cof."
 
-#: errtxt.hrc:91
+#: svtools/inc/errtxt.hrc:91
 msgctxt "RID_ERRHDL"
 msgid "The seek operation could not be run."
 msgstr "Methu rhedeg y weithred chwilio."
 
-#: errtxt.hrc:92
+#: svtools/inc/errtxt.hrc:92
 msgctxt "RID_ERRHDL"
 msgid "The tell operation could not be run."
 msgstr "Methu rhedeg y weithred dweud."
 
-#: errtxt.hrc:93
+#: svtools/inc/errtxt.hrc:93
 msgctxt "RID_ERRHDL"
 msgid "Incorrect file version."
 msgstr "Fersiwn ffeil anghywir."
 
-#: errtxt.hrc:94
+#: svtools/inc/errtxt.hrc:94
 msgctxt "RID_ERRHDL"
 msgid "Incorrect file format."
 msgstr "Fformat ffeil anghywir."
 
-#: errtxt.hrc:95
+#: svtools/inc/errtxt.hrc:95
 msgctxt "RID_ERRHDL"
 msgid "The file name contains invalid characters."
 msgstr "Mae'r enw ffeil yn cynnwys nodau annilys."
 
-#: errtxt.hrc:96
+#: svtools/inc/errtxt.hrc:96
 msgctxt "RID_ERRHDL"
 msgid "An unknown I/O error has occurred."
 msgstr "Mae gwall I/O anhysbys wedi digwydd."
 
-#: errtxt.hrc:97
+#: svtools/inc/errtxt.hrc:97
 msgctxt "RID_ERRHDL"
 msgid "An invalid attempt was made to access the file."
 msgstr "Gwnaed ymgais annilys i gael mynediad i'r ffeil."
 
-#: errtxt.hrc:98
+#: svtools/inc/errtxt.hrc:98
 msgctxt "RID_ERRHDL"
 msgid "The file could not be created."
 msgstr "Methu creu'r ffeil."
 
-#: errtxt.hrc:99
+#: svtools/inc/errtxt.hrc:99
 msgctxt "RID_ERRHDL"
 msgid "The operation was started under an invalid parameter."
 msgstr "Cychwynnwyd gweithred o fewn paramedr annilys."
 
-#: errtxt.hrc:100
+#: svtools/inc/errtxt.hrc:100
 msgctxt "RID_ERRHDL"
 msgid "The operation on the file was aborted."
 msgstr "Ataliwyd gweithred ar y ffeil."
 
-#: errtxt.hrc:101
+#: svtools/inc/errtxt.hrc:101
 msgctxt "RID_ERRHDL"
 msgid "Path to the file does not exist."
 msgstr "Nid yw'r llwybr i'r ffeil yn bodoli."
 
-#: errtxt.hrc:102
+#: svtools/inc/errtxt.hrc:102
 msgctxt "RID_ERRHDL"
 msgid "An object cannot be copied into itself."
 msgstr "Methu copïo'r gwrthrych iddo'i hun."
 
-#: errtxt.hrc:103
+#: svtools/inc/errtxt.hrc:103
 msgctxt "RID_ERRHDL"
 msgid "The specified template could not be found."
 msgstr "Methu canfod y templed hwn."
 
-#: errtxt.hrc:104
+#: svtools/inc/errtxt.hrc:104
 msgctxt "RID_ERRHDL"
 msgid "The file cannot be used as template."
 msgstr "Methu defnyddio'r ffeil fel templed."
 
-#: errtxt.hrc:105
+#: svtools/inc/errtxt.hrc:105
 msgctxt "RID_ERRHDL"
 msgid "This document has already been opened for editing."
 msgstr "Mae'r ddogfen eisoes wedi ei hagor i'w golygu."
 
-#: errtxt.hrc:106
+#: svtools/inc/errtxt.hrc:106
 msgctxt "RID_ERRHDL"
 msgid "The wrong password has been entered."
 msgstr "Wedi cynnig y cyfrinair anghywir."
 
-#: errtxt.hrc:107
+#: svtools/inc/errtxt.hrc:107
 msgctxt "RID_ERRHDL"
 msgid "Error reading file."
 msgstr "Gwall darllen ffeil."
 
-#: errtxt.hrc:108
+#: svtools/inc/errtxt.hrc:108
 msgctxt "RID_ERRHDL"
 msgid "The document was opened as read-only."
 msgstr "Agorwyd y ddogfen fel darllen-yn-unig."
 
-#: errtxt.hrc:109
+#: svtools/inc/errtxt.hrc:109
 msgctxt "RID_ERRHDL"
 msgid "General OLE Error."
 msgstr "Gwall cyffredinol OLE."
 
-#: errtxt.hrc:110
+#: svtools/inc/errtxt.hrc:110
 msgctxt "RID_ERRHDL"
 msgid "The host name $(ARG1) could not be resolved."
 msgstr "Methu cydgysylltu enw'r gwesteiwr $(ARG1)."
 
-#: errtxt.hrc:111
+#: svtools/inc/errtxt.hrc:111
 msgctxt "RID_ERRHDL"
 msgid "Could not establish Internet connection to $(ARG1)."
 msgstr "Methu creu cyswllt Rhyngrwyd i $(ARG1)."
 
-#: errtxt.hrc:112
+#: svtools/inc/errtxt.hrc:112
 msgctxt "RID_ERRHDL"
 msgid ""
 "Error reading data from the Internet.\n"
@@ -378,7 +378,7 @@ msgstr ""
 "Gwall darllen data o'r Rhyngrwyd.\n"
 "Neges gwall gweinydd: $(ARG1)."
 
-#: errtxt.hrc:113
+#: svtools/inc/errtxt.hrc:113
 msgctxt "RID_ERRHDL"
 msgid ""
 "Error transferring data to the Internet.\n"
@@ -387,32 +387,32 @@ msgstr ""
 "Gwall trosglwyddo data i'r Rhyngrwyd.\n"
 "Neges gwall gweinydd: $(ARG1)."
 
-#: errtxt.hrc:114
+#: svtools/inc/errtxt.hrc:114
 msgctxt "RID_ERRHDL"
 msgid "General Internet error has occurred."
 msgstr "Gwall Rhyngrwyd cyffredinol wedi digwydd."
 
-#: errtxt.hrc:115
+#: svtools/inc/errtxt.hrc:115
 msgctxt "RID_ERRHDL"
 msgid "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated."
 msgstr "Nid yw'r wybodaeth o'r Rhyngrwyd ar gael yn y storfa ac nid oes modd ei drosglwyddo am nad ydych wedi mynd Ar-lein."
 
-#: errtxt.hrc:116
+#: svtools/inc/errtxt.hrc:116
 msgctxt "RID_ERRHDL"
 msgid "The contents could not be created."
 msgstr "Methu creu'r cynnwys."
 
-#: errtxt.hrc:117
+#: svtools/inc/errtxt.hrc:117
 msgctxt "RID_ERRHDL"
 msgid "The file name is too long for the target file system."
 msgstr "Mae'r enw ffeil yn rhy hir ar gyfer y system ffeilio targed."
 
-#: errtxt.hrc:118
+#: svtools/inc/errtxt.hrc:118
 msgctxt "RID_ERRHDL"
 msgid "The input syntax is invalid."
 msgstr "Mae'r gystrawen mewnbwn yn annilys."
 
-#: errtxt.hrc:119
+#: svtools/inc/errtxt.hrc:119
 msgctxt "RID_ERRHDL"
 msgid ""
 "This document contains attributes that cannot be saved in the selected format.\n"
@@ -421,17 +421,17 @@ msgstr ""
 "Mae'r ddogfen yn cynnwys priodoleddau nad oes modd eu cadw o fewn y fformat â ddewiswyd.\n"
 "Cadwch y ddogfen yn fformat ffeil %PRODUCTNAME %PRODUCTVERSION."
 
-#: errtxt.hrc:120
+#: svtools/inc/errtxt.hrc:120
 msgctxt "RID_ERRHDL"
 msgid "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."
 msgstr "Rydych wedi cyrraedd uchafswm y dogfennau mae modd eu hagor ar yr un pryd. Rhaid cau un neu fwy o ddogfennau cyn agor dogfen newydd."
 
-#: errtxt.hrc:121
+#: svtools/inc/errtxt.hrc:121
 msgctxt "RID_ERRHDL"
 msgid "Could not create backup copy."
 msgstr "Methu creu'r ffolder wrth gefn."
 
-#: errtxt.hrc:122
+#: svtools/inc/errtxt.hrc:122
 msgctxt "RID_ERRHDL"
 msgid ""
 "An attempt was made to execute a macro.\n"
@@ -440,7 +440,7 @@ msgstr ""
 "Gwnaed ymgais i weithredu macro.\n"
 "Am resymau diogelwch, mae cefnogaeth i facros wedi ei analluogi."
 
-#: errtxt.hrc:123
+#: svtools/inc/errtxt.hrc:123
 msgctxt "RID_ERRHDL"
 msgid ""
 "This document contains macros.\n"
@@ -455,7 +455,7 @@ msgstr ""
 "\n"
 "Felly, efallai nad yw'r holl swyddogaethau ar gael."
 
-#: errtxt.hrc:124
+#: svtools/inc/errtxt.hrc:124
 msgctxt "RID_ERRHDL"
 msgid ""
 "This document contains macros.\n"
@@ -470,7 +470,7 @@ msgstr ""
 "\n"
 "Felly, efallai nad yw'r holl swyddogaethau ar gael."
 
-#: errtxt.hrc:125
+#: svtools/inc/errtxt.hrc:125
 msgctxt "RID_ERRHDL"
 msgid ""
 "The encrypted document contains unexpected non-encrypted streams.\n"
@@ -489,37 +489,37 @@ msgstr ""
 "Mae gweithredu macros yn y ddogfen hon wedi ei analluogi.\n"
 " "
 
-#: errtxt.hrc:126
+#: svtools/inc/errtxt.hrc:126
 msgctxt "RID_ERRHDL"
 msgid "Invalid data length."
 msgstr "Hyd data annilys."
 
-#: errtxt.hrc:127
+#: svtools/inc/errtxt.hrc:127
 msgctxt "RID_ERRHDL"
 msgid "Function not possible: path contains current directory."
 msgstr "Gweithred amhosibl: mae'r llwybr yn cynnwys y cyfeiriadur presennol."
 
-#: errtxt.hrc:128
+#: svtools/inc/errtxt.hrc:128
 msgctxt "RID_ERRHDL"
 msgid "Function not possible: device (drive) not identical."
 msgstr "Swyddogaeth amhosibl: nid yw'r (gyrrwr) dyfais yr un peth."
 
-#: errtxt.hrc:129
+#: svtools/inc/errtxt.hrc:129
 msgctxt "RID_ERRHDL"
 msgid "Device (drive) not ready."
 msgstr "Dyfais (gyrrwr) ddim yn barod."
 
-#: errtxt.hrc:130
+#: svtools/inc/errtxt.hrc:130
 msgctxt "RID_ERRHDL"
 msgid "Wrong checksum."
 msgstr "Checksum anghywir."
 
-#: errtxt.hrc:131
+#: svtools/inc/errtxt.hrc:131
 msgctxt "RID_ERRHDL"
 msgid "Function not possible: write protected."
 msgstr "Swyddogaeth amhosibl: amddiffyn rhag ysgrifennu."
 
-#: errtxt.hrc:132
+#: svtools/inc/errtxt.hrc:132
 msgctxt "RID_ERRHDL"
 msgid ""
 "The password of a shared spreadsheet cannot be set or changed.\n"
@@ -528,3979 +528,4008 @@ msgstr ""
 "Nid oes modd gosod na newid cyfrinair taenlen wedi ei rhannu.\n"
 "Atal y modd rhannu yn gyntaf."
 
-#: errtxt.hrc:138
+#: svtools/inc/errtxt.hrc:133
+msgctxt "RID_ERRHDL"
+msgid "File format error found at $(ARG1)(row,col)."
+msgstr "Gwall fformat ffeil yn ffeil $(ARG1)(rhes,col)."
+
+#: svtools/inc/errtxt.hrc:134
+msgctxt "RID_ERRHDL"
+msgid "The filter for this file format is disabled in configuration. Please contact your systems administrator."
+msgstr "Mae hidl y fformat ffeil wedi ei analluogi yn y ffurfweddiad. Cysylltwch â'ch gweinyddwr systemau."
+
+#: svtools/inc/errtxt.hrc:140
 msgctxt "RID_ERRHDL"
 msgid "General OLE error."
 msgstr "Gwall cyffredinol OLE."
 
-#: errtxt.hrc:140
+#: svtools/inc/errtxt.hrc:142
 msgctxt "RID_ERRHDL"
 msgid "The action cannot be executed in the object's current state."
 msgstr "Methu cyflawni'r weithred yng nghyflwr presennol y gwrthrych."
 
-#: errtxt.hrc:142
+#: svtools/inc/errtxt.hrc:144
 msgctxt "RID_ERRHDL"
 msgid "The object does not support any actions."
 msgstr "Nid yw'r gwrthrych yn cynnal unrhyw weithred."
 
-#: errtxt.hrc:144
+#: svtools/inc/errtxt.hrc:146
 msgctxt "RID_ERRHDL"
 msgid "Object does not support this action."
 msgstr "Nid yw'r gwrthrych yn cynnal y weithred."
 
-#: errtxt.hrc:151
+#: svtools/inc/errtxt.hrc:153
 msgctxt "RID_ERRHDL"
 msgid "$(ERR) activating object"
 msgstr "$(ERR) yn gweithredu gwrthrych"
 
-#: langtab.hrc:29
+#: svtools/inc/langtab.hrc:29
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "[None]"
 msgstr "[None]"
 
-#: langtab.hrc:30
+#: svtools/inc/langtab.hrc:30
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: langtab.hrc:31 /home/cl/vc/git/libo-core/svtools/inc/langtab.hrc:32
+#: svtools/inc/langtab.hrc:31 svtools/inc/langtab.hrc:32
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: langtab.hrc:33
+#: svtools/inc/langtab.hrc:33
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Afrikaans (South Africa)"
 msgstr "Afrikaans (De Africa)"
 
-#: langtab.hrc:34
+#: svtools/inc/langtab.hrc:34
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Albanian"
 msgstr "Albaneg"
 
-#: langtab.hrc:35
+#: svtools/inc/langtab.hrc:35
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic"
 msgstr "Arabeg"
 
-#: langtab.hrc:36
+#: svtools/inc/langtab.hrc:36
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Algeria)"
 msgstr "Arabeg (Algeria)"
 
-#: langtab.hrc:37
+#: svtools/inc/langtab.hrc:37
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Bahrain)"
 msgstr "Arabeg (Bahrain)"
 
-#: langtab.hrc:38
+#: svtools/inc/langtab.hrc:38
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Chad)"
 msgstr "Arabeg (Chad)"
 
-#: langtab.hrc:39
+#: svtools/inc/langtab.hrc:39
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Comoros)"
 msgstr "Arabeg (Comoros)"
 
-#: langtab.hrc:40
+#: svtools/inc/langtab.hrc:40
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Djibouti)"
 msgstr "Arabeg (Djibouti)"
 
-#: langtab.hrc:41
+#: svtools/inc/langtab.hrc:41
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Egypt)"
 msgstr "Arabeg (Yr Aifft)"
 
-#: langtab.hrc:42
+#: svtools/inc/langtab.hrc:42
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Eritrea)"
 msgstr "Arabeg (Eritrea)"
 
-#: langtab.hrc:43
+#: svtools/inc/langtab.hrc:43
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Iraq)"
 msgstr "Arabeg (Irac)"
 
-#: langtab.hrc:44
+#: svtools/inc/langtab.hrc:44
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Israel)"
 msgstr "Arabeg (Israel)"
 
-#: langtab.hrc:45
+#: svtools/inc/langtab.hrc:45
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Jordan)"
 msgstr "Arabeg (Yr Iorddonen)"
 
-#: langtab.hrc:46
+#: svtools/inc/langtab.hrc:46
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Kuwait)"
 msgstr "Arabeg (Kuwait)"
 
-#: langtab.hrc:47
+#: svtools/inc/langtab.hrc:47
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Lebanon)"
 msgstr "Arabeg (Libanus)"
 
-#: langtab.hrc:48
+#: svtools/inc/langtab.hrc:48
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Libya)"
 msgstr "Arabeg (Libya)"
 
-#: langtab.hrc:49
+#: svtools/inc/langtab.hrc:49
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Mauritania)"
 msgstr "Arabeg (Mauritania)"
 
-#: langtab.hrc:50
+#: svtools/inc/langtab.hrc:50
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Morocco)"
 msgstr "Arabeg (Morocco)"
 
-#: langtab.hrc:51
+#: svtools/inc/langtab.hrc:51
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Oman)"
 msgstr "Arabeg (Oman)"
 
-#: langtab.hrc:52
+#: svtools/inc/langtab.hrc:52
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Palestine)"
 msgstr "Arabeg (Palesteina)"
 
-#: langtab.hrc:53
+#: svtools/inc/langtab.hrc:53
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Qatar)"
 msgstr "Arabeg (Qatar)"
 
-#: langtab.hrc:54
+#: svtools/inc/langtab.hrc:54
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Saudi Arabia)"
 msgstr "Arabeg (Saudi Arabia)"
 
-#: langtab.hrc:55
+#: svtools/inc/langtab.hrc:55
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Somalia)"
 msgstr "Arabeg (Somalia)"
 
-#: langtab.hrc:56
+#: svtools/inc/langtab.hrc:56
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Sudan)"
 msgstr "Arabeg (Swdan)"
 
-#: langtab.hrc:57
+#: svtools/inc/langtab.hrc:57
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Syria)"
 msgstr "Arabeg (Syria)"
 
-#: langtab.hrc:58
+#: svtools/inc/langtab.hrc:58
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Tunisia)"
 msgstr "Arabeg (Tunisia)"
 
-#: langtab.hrc:59
+#: svtools/inc/langtab.hrc:59
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (UAE)"
 msgstr "Arabeg (UAE)"
 
-#: langtab.hrc:60
+#: svtools/inc/langtab.hrc:60
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arabic (Yemen)"
 msgstr "Arabeg (Yemen)"
 
-#: langtab.hrc:61
+#: svtools/inc/langtab.hrc:61
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Aragonese"
 msgstr "Aragoneg"
 
-#: langtab.hrc:62
+#: svtools/inc/langtab.hrc:62
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
-msgid "Armenian"
-msgstr "Armeneg"
+msgid "Armenian, Eastern (Armenia)"
+msgstr "Armeneg, Dwyrain (Armenia)"
 
-#: langtab.hrc:63
+#: svtools/inc/langtab.hrc:63
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Assamese"
 msgstr "Assameg"
 
-#: langtab.hrc:64
+#: svtools/inc/langtab.hrc:64
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Azerbaijani Latin"
 msgstr "Lladin Azerbaijani"
 
-#: langtab.hrc:65
+#: svtools/inc/langtab.hrc:65
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Azerbaijani Cyrillic"
 msgstr "Cyrilig Aserbaijan"
 
-#: langtab.hrc:66
+#: svtools/inc/langtab.hrc:66
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Basque"
 msgstr "Basg"
 
-#: langtab.hrc:67
+#: svtools/inc/langtab.hrc:67
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Bengali (India)"
 msgstr "Bengali (India)"
 
-#: langtab.hrc:68
+#: svtools/inc/langtab.hrc:68
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Bulgarian"
 msgstr "Bwlgareg"
 
-#: langtab.hrc:69
+#: svtools/inc/langtab.hrc:69
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Belarusian"
 msgstr "Byelorwsieg"
 
-#: langtab.hrc:70
+#: svtools/inc/langtab.hrc:70
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Catalan"
 msgstr "Catalaneg"
 
-#: langtab.hrc:71
+#: svtools/inc/langtab.hrc:71
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Catalan (Valencian)"
 msgstr "Catalaneg (Valencia)"
 
-#: langtab.hrc:72
+#: svtools/inc/langtab.hrc:72
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Chinese (traditional)"
 msgstr "Tsieineeg (traddodiadol)"
 
-#: langtab.hrc:73
+#: svtools/inc/langtab.hrc:73
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Chinese (simplified)"
 msgstr "Tsieineeg (symledig)"
 
-#: langtab.hrc:74
+#: svtools/inc/langtab.hrc:74
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Chinese (Hong Kong)"
 msgstr "Tsieineeg (Hong Kong)"
 
-#: langtab.hrc:75
+#: svtools/inc/langtab.hrc:75
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Chinese (Singapore)"
 msgstr "Tsieineeg (Singapore)"
 
-#: langtab.hrc:76
+#: svtools/inc/langtab.hrc:76
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Chinese (Macau)"
 msgstr "Tsieineeg (Macau)"
 
-#: langtab.hrc:77
+#: svtools/inc/langtab.hrc:77
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Church Slavic"
 msgstr "Slafeg Eglwysig"
 
-#: langtab.hrc:78
+#: svtools/inc/langtab.hrc:78
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Croatian"
 msgstr "Croatieg"
 
-#: langtab.hrc:79
+#: svtools/inc/langtab.hrc:79
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Czech"
 msgstr "Tsiec"
 
-#: langtab.hrc:80
+#: svtools/inc/langtab.hrc:80
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Danish"
 msgstr "Daneg"
 
-#: langtab.hrc:81
+#: svtools/inc/langtab.hrc:81
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Dutch (Netherlands)"
 msgstr "Iseldireg (Iseldiroedd)"
 
-#: langtab.hrc:82
+#: svtools/inc/langtab.hrc:82
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Dutch (Belgium)"
 msgstr "Iseldireg (Gwlad Belg)"
 
-#: langtab.hrc:83
+#: svtools/inc/langtab.hrc:83
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (USA)"
 msgstr "Saesneg (UDA)"
 
-#: langtab.hrc:84
+#: svtools/inc/langtab.hrc:84
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (UK)"
 msgstr "Saesneg (DU)"
 
-#: langtab.hrc:85
+#: svtools/inc/langtab.hrc:85
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English, OED spelling (UK)"
 msgstr "Sillafu Saesneg OED (DU)"
 
-#: langtab.hrc:86
+#: svtools/inc/langtab.hrc:86
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Australia)"
 msgstr "Saesneg (Awstralia)"
 
-#: langtab.hrc:87
+#: svtools/inc/langtab.hrc:87
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Canada)"
 msgstr "Saesneg (Canada)"
 
-#: langtab.hrc:88
+#: svtools/inc/langtab.hrc:88
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (New Zealand)"
 msgstr "Saesneg (Seland Newydd)"
 
-#: langtab.hrc:89
+#: svtools/inc/langtab.hrc:89
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Ireland)"
 msgstr "Saesneg (Iwerddon)"
 
-#: langtab.hrc:90
+#: svtools/inc/langtab.hrc:90
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (South Africa)"
 msgstr "Saesneg (De Affrica)"
 
-#: langtab.hrc:91
+#: svtools/inc/langtab.hrc:91
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Jamaica)"
 msgstr "Saesneg (Jamaica)"
 
-#: langtab.hrc:92
+#: svtools/inc/langtab.hrc:92
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Caribbean)"
 msgstr "Saesneg (Caribi)"
 
-#: langtab.hrc:93
+#: svtools/inc/langtab.hrc:93
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Belize)"
 msgstr "Saesneg (Belize)"
 
-#: langtab.hrc:94
+#: svtools/inc/langtab.hrc:94
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Trinidad)"
 msgstr "Saesneg (Trinidad)"
 
-#: langtab.hrc:95
+#: svtools/inc/langtab.hrc:95
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Zimbabwe)"
 msgstr "Saesneg (Zimbabwe)"
 
-#: langtab.hrc:96
+#: svtools/inc/langtab.hrc:96
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Philippines)"
 msgstr "Saesneg (Philippines)"
 
-#: langtab.hrc:97
+#: svtools/inc/langtab.hrc:97
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (India)"
 msgstr "Saesneg (India)"
 
-#: langtab.hrc:98
+#: svtools/inc/langtab.hrc:98
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Estonian"
 msgstr "Estoneg"
 
-#: langtab.hrc:99
+#: svtools/inc/langtab.hrc:99
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Finnish"
 msgstr "Ffineg"
 
-#: langtab.hrc:100
+#: svtools/inc/langtab.hrc:100
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Faroese"
 msgstr "Ffaroeg"
 
-#: langtab.hrc:101
+#: svtools/inc/langtab.hrc:101
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Persian"
 msgstr "Persieg"
 
-#: langtab.hrc:102
+#: svtools/inc/langtab.hrc:102
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (France)"
 msgstr "Ffrangeg (Ffrainc)"
 
-#: langtab.hrc:103
+#: svtools/inc/langtab.hrc:103
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Belgium)"
 msgstr "Ffrangeg (Belg)"
 
-#: langtab.hrc:104
+#: svtools/inc/langtab.hrc:104
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Canada)"
 msgstr "Ffrangeg (Canada)"
 
-#: langtab.hrc:105
+#: svtools/inc/langtab.hrc:105
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Switzerland)"
 msgstr "Ffrangeg (Y Swistir)"
 
-#: langtab.hrc:106
+#: svtools/inc/langtab.hrc:106
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Luxembourg)"
 msgstr "Ffrangeg (Luxembourg)"
 
-#: langtab.hrc:107
+#: svtools/inc/langtab.hrc:107
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Monaco)"
 msgstr "Ffrangeg (Monaco)"
 
-#: langtab.hrc:108
+#: svtools/inc/langtab.hrc:108
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Gascon"
 msgstr "Gascon"
 
-#: langtab.hrc:109
+#: svtools/inc/langtab.hrc:109
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "German (Germany)"
 msgstr "Almaeneg (Yr Almaen)"
 
-#: langtab.hrc:110
+#: svtools/inc/langtab.hrc:110
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "German (Switzerland)"
 msgstr "Almaeneg (Y Swistir)"
 
-#: langtab.hrc:111
+#: svtools/inc/langtab.hrc:111
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "German (Austria)"
 msgstr "Almaeneg (Awstria)"
 
-#: langtab.hrc:112
+#: svtools/inc/langtab.hrc:112
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "German (Luxembourg)"
 msgstr "Almaeneg (Luxembourg)"
 
-#: langtab.hrc:113
+#: svtools/inc/langtab.hrc:113
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "German (Liechtenstein)"
 msgstr "Almaeneg (Liechtenstein)"
 
-#: langtab.hrc:114
+#: svtools/inc/langtab.hrc:114
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Greek"
 msgstr "Groeg"
 
-#: langtab.hrc:115
+#: svtools/inc/langtab.hrc:115
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: langtab.hrc:116
+#: svtools/inc/langtab.hrc:116
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Hebrew"
 msgstr "Hebraeg"
 
-#: langtab.hrc:117
+#: svtools/inc/langtab.hrc:117
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Hindi"
 msgstr "Hindi"
 
-#: langtab.hrc:118
+#: svtools/inc/langtab.hrc:118
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Hungarian"
 msgstr "Hwngareg"
 
-#: langtab.hrc:119
+#: svtools/inc/langtab.hrc:119
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Icelandic"
 msgstr "Eislandeg"
 
-#: langtab.hrc:120
+#: svtools/inc/langtab.hrc:120
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Indonesian"
 msgstr "Indoneseg"
 
-#: langtab.hrc:121
+#: svtools/inc/langtab.hrc:121
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Italian (Italy)"
 msgstr "Eidaleg (Yr Eidal)"
 
-#: langtab.hrc:122
+#: svtools/inc/langtab.hrc:122
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Italian (Switzerland)"
 msgstr "Eidaleg (Y Swistir)"
 
-#: langtab.hrc:123
+#: svtools/inc/langtab.hrc:123
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Japanese"
 msgstr "Japaneeg"
 
-#: langtab.hrc:124
+#: svtools/inc/langtab.hrc:124
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kannada"
 msgstr "Kannada"
 
-#: langtab.hrc:125
+#: svtools/inc/langtab.hrc:125
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kashmiri (Kashmir)"
 msgstr "Kashmiri (Kashmir)"
 
-#: langtab.hrc:126
+#: svtools/inc/langtab.hrc:126
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kashmiri (India)"
 msgstr "Kashmiri (India)"
 
-#: langtab.hrc:127
+#: svtools/inc/langtab.hrc:127
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kazakh"
 msgstr "Kazakh"
 
-#: langtab.hrc:128
+#: svtools/inc/langtab.hrc:128
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Konkani"
 msgstr "Konkani"
 
-#: langtab.hrc:129
+#: svtools/inc/langtab.hrc:129
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Korean (RoK)"
 msgstr "Korean (RoK)"
 
-#: langtab.hrc:130
+#: svtools/inc/langtab.hrc:130
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Latvian"
 msgstr "Latfieg"
 
-#: langtab.hrc:131
+#: svtools/inc/langtab.hrc:131
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Lithuanian"
 msgstr "Lithwaneg"
 
-#: langtab.hrc:132
+#: svtools/inc/langtab.hrc:132
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Macedonian"
 msgstr "Macedoneg"
 
-#: langtab.hrc:133
+#: svtools/inc/langtab.hrc:133
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Malay (Malaysia)"
 msgstr "Malay (Malaysia)"
 
-#: langtab.hrc:134
+#: svtools/inc/langtab.hrc:134
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Malay (Brunei Darussalam)"
 msgstr "Malay (Brunei Darusalam)"
 
-#: langtab.hrc:135
+#: svtools/inc/langtab.hrc:135
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: langtab.hrc:136
+#: svtools/inc/langtab.hrc:136
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Manipuri"
 msgstr "Manipuri"
 
-#: langtab.hrc:137
+#: svtools/inc/langtab.hrc:137
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Marathi"
 msgstr "Marathi"
 
-#: langtab.hrc:138
+#: svtools/inc/langtab.hrc:138
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Nepali (Nepal)"
 msgstr "Nepali (Nepal)"
 
-#: langtab.hrc:139
+#: svtools/inc/langtab.hrc:139
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Nepali (India)"
 msgstr "Nepali (India)"
 
-#: langtab.hrc:140
+#: svtools/inc/langtab.hrc:140
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Norwegian, Bokmål"
 msgstr "Norwyeg, Bokmål"
 
-#: langtab.hrc:141
+#: svtools/inc/langtab.hrc:141
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Norwegian, Nynorsk"
 msgstr "Norwyeg, Nynorsk"
 
-#: langtab.hrc:142
+#: svtools/inc/langtab.hrc:142
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Odia"
 msgstr "Odia"
 
-#: langtab.hrc:143
+#: svtools/inc/langtab.hrc:143
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Polish"
 msgstr "Pwyleg"
 
-#: langtab.hrc:144
+#: svtools/inc/langtab.hrc:144
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Portuguese (Angola)"
 msgstr "Portiwgaleg (Angola)"
 
-#: langtab.hrc:145
+#: svtools/inc/langtab.hrc:145
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Portuguese (Portugal)"
 msgstr "Portiwgaleg (Portiwgal)"
 
-#: langtab.hrc:146
+#: svtools/inc/langtab.hrc:146
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Portuguese (Brazil)"
 msgstr "Portiwgaleg (Brasil)"
 
-#: langtab.hrc:147
+#: svtools/inc/langtab.hrc:147
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: langtab.hrc:148
+#: svtools/inc/langtab.hrc:148
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Rhaeto-Romance"
 msgstr "Rhaeto-Romance"
 
-#: langtab.hrc:149
+#: svtools/inc/langtab.hrc:149
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Romanian (Romania)"
 msgstr "Rwmaneg (Rwmania)"
 
-#: langtab.hrc:150
+#: svtools/inc/langtab.hrc:150
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Romanian (Moldova)"
 msgstr "Rwmaneg (Moldova)"
 
-#: langtab.hrc:151
+#: svtools/inc/langtab.hrc:151
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Russian"
 msgstr "Rwsieg"
 
-#: langtab.hrc:152
+#: svtools/inc/langtab.hrc:152
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sanskrit"
 msgstr "Sanskrit"
 
-#: langtab.hrc:153
+#: svtools/inc/langtab.hrc:153
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Serbian Cyrillic (Serbia and Montenegro)"
 msgstr "Syrilig Serbeg (Serbia a Montenegro)"
 
-#: langtab.hrc:154
+#: svtools/inc/langtab.hrc:154
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Serbian Latin (Serbia and Montenegro)"
 msgstr "Lladin Serbeg (Serbia a Montenegro)"
 
-#: langtab.hrc:155
+#: svtools/inc/langtab.hrc:155
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Serbian Cyrillic (Serbia)"
 msgstr "Cyrilig Serbia (Serbia)"
 
-#: langtab.hrc:156
+#: svtools/inc/langtab.hrc:156
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Serbian Latin (Serbia)"
 msgstr "Lladin Serbia (Serbia)"
 
-#: langtab.hrc:157
+#: svtools/inc/langtab.hrc:157
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Serbian Cyrillic (Montenegro)"
 msgstr "Cyrilig Serbia (Montenegro)"
 
-#: langtab.hrc:158
+#: svtools/inc/langtab.hrc:158
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Serbian Latin (Montenegro)"
 msgstr "Lladin Serbia (Montenegro)"
 
-#: langtab.hrc:159
+#: svtools/inc/langtab.hrc:159
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Serbian Latin"
 msgstr "Lladin Serbieg"
 
-#: langtab.hrc:160
+#: svtools/inc/langtab.hrc:160
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sidama"
 msgstr "Sidama"
 
-#: langtab.hrc:161
+#: svtools/inc/langtab.hrc:161
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sindhi"
 msgstr "Sindhi"
 
-#: langtab.hrc:162
+#: svtools/inc/langtab.hrc:162
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Slovak"
 msgstr "Slofac"
 
-#: langtab.hrc:163
+#: svtools/inc/langtab.hrc:163
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Slovenian"
 msgstr "Slofeneg"
 
-#: langtab.hrc:164
+#: svtools/inc/langtab.hrc:164
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Spain)"
 msgstr "Sbaeneg (Sbaen)"
 
-#: langtab.hrc:165
+#: svtools/inc/langtab.hrc:165
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Mexico)"
 msgstr "Sbaeneg (Mecsico)"
 
-#: langtab.hrc:166
+#: svtools/inc/langtab.hrc:166
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Guatemala)"
 msgstr "Sbaeneg (Guatemala)"
 
-#: langtab.hrc:167
+#: svtools/inc/langtab.hrc:167
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Costa Rica)"
 msgstr "Sbaeneg (Costa Rica)"
 
-#: langtab.hrc:168
+#: svtools/inc/langtab.hrc:168
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Panama)"
 msgstr "Sbaeneg (Panama)"
 
-#: langtab.hrc:169
+#: svtools/inc/langtab.hrc:169
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Dom. Rep.)"
 msgstr "Sbaeneg (Dom. Rep.)"
 
-#: langtab.hrc:170
+#: svtools/inc/langtab.hrc:170
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Venezuela)"
 msgstr "Sbaeneg (Venezuela)"
 
-#: langtab.hrc:171
+#: svtools/inc/langtab.hrc:171
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Colombia)"
 msgstr "Sbaeneg (Colombia)"
 
-#: langtab.hrc:172
+#: svtools/inc/langtab.hrc:172
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Peru)"
 msgstr "Sbaeneg (Periw)"
 
-#: langtab.hrc:173
+#: svtools/inc/langtab.hrc:173
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Argentina)"
 msgstr "Sbaeneg (Yr Ariannin)"
 
-#: langtab.hrc:174
+#: svtools/inc/langtab.hrc:174
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Ecuador)"
 msgstr "Sbaeneg (Ecwador)"
 
-#: langtab.hrc:175
+#: svtools/inc/langtab.hrc:175
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Chile)"
 msgstr "Sbaeneg (Chile)"
 
-#: langtab.hrc:176
+#: svtools/inc/langtab.hrc:176
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Uruguay)"
 msgstr "Sbaeneg (Uruguay)"
 
-#: langtab.hrc:177
+#: svtools/inc/langtab.hrc:177
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Paraguay)"
 msgstr "Sbaeneg (Paraguay)"
 
-#: langtab.hrc:178
+#: svtools/inc/langtab.hrc:178
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Bolivia)"
 msgstr "Sbaeneg (Bolivia)"
 
-#: langtab.hrc:179
+#: svtools/inc/langtab.hrc:179
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (El Salvador)"
 msgstr "Sbaeneg (El Salvador)"
 
-#: langtab.hrc:180
+#: svtools/inc/langtab.hrc:180
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Honduras)"
 msgstr "Sbaeneg (Honduras)"
 
-#: langtab.hrc:181
+#: svtools/inc/langtab.hrc:181
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Nicaragua)"
 msgstr "Sbaeneg (Nicaragua)"
 
-#: langtab.hrc:182
+#: svtools/inc/langtab.hrc:182
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Puerto Rico)"
 msgstr "Sbaeneg (Puerto Rico)"
 
-#: langtab.hrc:183
+#: svtools/inc/langtab.hrc:183
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Swahili (Kenya)"
 msgstr "Swahili (Kenya)"
 
-#: langtab.hrc:184
+#: svtools/inc/langtab.hrc:184
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Swedish (Sweden)"
 msgstr "Swedeg (Sweden)"
 
-#: langtab.hrc:185
+#: svtools/inc/langtab.hrc:185
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Swedish (Finland)"
 msgstr "Swedeg (Ffindir)"
 
-#: langtab.hrc:186
+#: svtools/inc/langtab.hrc:186
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tajik"
 msgstr "Tajik"
 
-#: langtab.hrc:187
+#: svtools/inc/langtab.hrc:187
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tamil"
 msgstr "Tamil"
 
-#: langtab.hrc:188
+#: svtools/inc/langtab.hrc:188
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tatar"
 msgstr "Tatar"
 
-#: langtab.hrc:189
+#: svtools/inc/langtab.hrc:189
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Telugu"
 msgstr "Telugu"
 
-#: langtab.hrc:190
+#: svtools/inc/langtab.hrc:190
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Thai"
 msgstr "Thai"
 
-#: langtab.hrc:191
+#: svtools/inc/langtab.hrc:191
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Turkish"
 msgstr "Twrceg"
 
-#: langtab.hrc:192
+#: svtools/inc/langtab.hrc:192
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakistan)"
 
-#: langtab.hrc:193
+#: svtools/inc/langtab.hrc:193
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Urdu (India)"
 msgstr "Urdu (India)"
 
-#: langtab.hrc:194
+#: svtools/inc/langtab.hrc:194
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Ukrainian"
 msgstr "Wcraneg"
 
-#: langtab.hrc:195
+#: svtools/inc/langtab.hrc:195
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Uzbek Latin"
 msgstr "Uzbek Lladin"
 
-#: langtab.hrc:196
+#: svtools/inc/langtab.hrc:196
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Uzbek Cyrillic"
 msgstr "Syrilig Uzbek"
 
-#: langtab.hrc:197
+#: svtools/inc/langtab.hrc:197
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Welsh"
 msgstr "Cymraeg"
 
-#: langtab.hrc:198
+#: svtools/inc/langtab.hrc:198
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Latin"
 msgstr "Lladin"
 
-#: langtab.hrc:199
+#: svtools/inc/langtab.hrc:199
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: langtab.hrc:200
+#: svtools/inc/langtab.hrc:200
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kinyarwanda (Rwanda)"
 msgstr "Kinyarwanda (Rwanda)"
 
-#: langtab.hrc:201
+#: svtools/inc/langtab.hrc:201
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Maori"
 msgstr "Maori"
 
-#: langtab.hrc:202
+#: svtools/inc/langtab.hrc:202
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Galician"
 msgstr "Galisieg"
 
-#: langtab.hrc:203
+#: svtools/inc/langtab.hrc:203
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Dhivehi"
 msgstr "Dhivehi"
 
-#: langtab.hrc:204
+#: svtools/inc/langtab.hrc:204
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Northern Sotho"
 msgstr "Northern Sotho"
 
-#: langtab.hrc:205
+#: svtools/inc/langtab.hrc:205
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Gaelic (Scotland)"
 msgstr "Gaeleg (Yr Alban)"
 
-#: langtab.hrc:206
+#: svtools/inc/langtab.hrc:206
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Mongolian Cyrillic"
 msgstr "Syrilig Mongolieg"
 
-#: langtab.hrc:207
+#: svtools/inc/langtab.hrc:207
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Mongolian Mongolian"
 msgstr "Mongolieg"
 
-#: langtab.hrc:208
+#: svtools/inc/langtab.hrc:208
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Interlingua"
 msgstr "Interlingua"
 
-#: langtab.hrc:209
+#: svtools/inc/langtab.hrc:209
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Bosnian"
 msgstr "Bosnieg"
 
-#: langtab.hrc:210
+#: svtools/inc/langtab.hrc:210
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Bengali (Bangladesh)"
 msgstr "Bengali (Bangladesh)"
 
-#: langtab.hrc:211
+#: svtools/inc/langtab.hrc:211
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Occitan"
 msgstr "Occitaneg"
 
-#: langtab.hrc:212
+#: svtools/inc/langtab.hrc:212
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Khmer"
 msgstr "Khmer"
 
-#: langtab.hrc:213
+#: svtools/inc/langtab.hrc:213
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kurdish, Northern (Turkey)"
 msgstr "Cwrdeg, Gogleddol (Twrci)"
 
-#: langtab.hrc:214
+#: svtools/inc/langtab.hrc:214
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kurdish, Northern (Syria)"
 msgstr "Cwrdeg, Gogleddol (Syria)"
 
-#: langtab.hrc:215
+#: svtools/inc/langtab.hrc:215
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kurdish, Central (Iraq)"
 msgstr "Cwrdeg, Canol (Iraq)"
 
-#: langtab.hrc:216
+#: svtools/inc/langtab.hrc:216
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kurdish, Central (Iran)"
 msgstr "Cwrdeg, Canol (Iran)"
 
-#: langtab.hrc:217
+#: svtools/inc/langtab.hrc:217
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kurdish, Southern (Iran)"
 msgstr "Cwrdeg, De (Iran)"
 
-#: langtab.hrc:218
+#: svtools/inc/langtab.hrc:218
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kurdish, Southern (Iraq)"
 msgstr "Cwrdeg, Deheuol (Iraq)"
 
-#: langtab.hrc:219
+#: svtools/inc/langtab.hrc:219
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sardinian"
 msgstr "Sardinieg"
 
-#: langtab.hrc:220
+#: svtools/inc/langtab.hrc:220
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: langtab.hrc:221
+#: svtools/inc/langtab.hrc:221
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Swahili (Tanzania)"
 msgstr "Swahili (Tanzania)"
 
-#: langtab.hrc:222
+#: svtools/inc/langtab.hrc:222
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Lao"
 msgstr "Lao"
 
-#: langtab.hrc:223
+#: svtools/inc/langtab.hrc:223
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Irish"
 msgstr "Gwyddeleg"
 
-#: langtab.hrc:224
+#: svtools/inc/langtab.hrc:224
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tibetan (PR China)"
 msgstr "Tibeteg (GP Tsieina)"
 
-#: langtab.hrc:225
+#: svtools/inc/langtab.hrc:225
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Georgian"
 msgstr "Georgiaidd"
 
-#: langtab.hrc:226
+#: svtools/inc/langtab.hrc:226
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Frisian"
 msgstr "Ffrisieg"
 
-#: langtab.hrc:227
+#: svtools/inc/langtab.hrc:227
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tswana (South Africa)"
 msgstr "Tswana (De Affrica)"
 
-#: langtab.hrc:228
+#: svtools/inc/langtab.hrc:228
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Zulu"
 msgstr "Zulu"
 
-#: langtab.hrc:229
+#: svtools/inc/langtab.hrc:229
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Vietnamese"
 msgstr "Fietnamaidd"
 
-#: langtab.hrc:230
+#: svtools/inc/langtab.hrc:230
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Breton"
 msgstr "Llydaweg"
 
-#: langtab.hrc:231
+#: svtools/inc/langtab.hrc:231
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kalaallisut"
 msgstr "Kalaallisut"
 
-#: langtab.hrc:232
+#: svtools/inc/langtab.hrc:232
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Ndebele, South"
 msgstr "Ndebele, De"
 
-#: langtab.hrc:233
+#: svtools/inc/langtab.hrc:233
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Southern Sotho"
 msgstr "Sotho Deheuol"
 
-#: langtab.hrc:234
+#: svtools/inc/langtab.hrc:234
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Swazi"
 msgstr "Swazi"
 
-#: langtab.hrc:235
+#: svtools/inc/langtab.hrc:235
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tsonga"
 msgstr "Tsonga"
 
-#: langtab.hrc:236
+#: svtools/inc/langtab.hrc:236
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Venda"
 msgstr "Venda"
 
-#: langtab.hrc:237
+#: svtools/inc/langtab.hrc:237
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tswana (Botswana)"
 msgstr "Tswana (Botswana)"
 
-#: langtab.hrc:238
+#: svtools/inc/langtab.hrc:238
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Xhosa"
 msgstr "Xhosa"
 
-#: langtab.hrc:239
+#: svtools/inc/langtab.hrc:239
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sinhala"
 msgstr "Sinhala"
 
-#: langtab.hrc:240
+#: svtools/inc/langtab.hrc:240
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Moore"
 msgstr "Moore"
 
-#: langtab.hrc:241
+#: svtools/inc/langtab.hrc:241
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Bambara"
 msgstr "Bambara"
 
-#: langtab.hrc:242
+#: svtools/inc/langtab.hrc:242
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Akan"
 msgstr "Akan"
 
-#: langtab.hrc:243
+#: svtools/inc/langtab.hrc:243
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Luxembourgish"
 msgstr "Lwcsembwrgeg"
 
-#: langtab.hrc:244
+#: svtools/inc/langtab.hrc:244
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Friulian"
 msgstr "Friulian"
 
-#: langtab.hrc:245
+#: svtools/inc/langtab.hrc:245
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Fijian"
 msgstr "Fijieg"
 
-#: langtab.hrc:246
+#: svtools/inc/langtab.hrc:246
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Afrikaans (Namibia)"
 msgstr "Afrikaans (Namibia)"
 
-#: langtab.hrc:247
+#: svtools/inc/langtab.hrc:247
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Namibia)"
 msgstr "Saesneg (Namibia)"
 
-#: langtab.hrc:248
+#: svtools/inc/langtab.hrc:248
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Walloon"
 msgstr "Walloon"
 
-#: langtab.hrc:249
+#: svtools/inc/langtab.hrc:249
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Coptic"
 msgstr "Copteg"
 
-#: langtab.hrc:250
+#: svtools/inc/langtab.hrc:250
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tigrigna (Eritrea)"
 msgstr "Tigrigna (Eritrea)"
 
-#: langtab.hrc:251
+#: svtools/inc/langtab.hrc:251
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tigrigna (Ethiopia)"
 msgstr "Tigrigna (Ethiopia)"
 
-#: langtab.hrc:252
+#: svtools/inc/langtab.hrc:252
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Amharic"
 msgstr "Amharic"
 
-#: langtab.hrc:253
+#: svtools/inc/langtab.hrc:253
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kirghiz"
 msgstr "Kirghiz"
 
-#: langtab.hrc:254
+#: svtools/inc/langtab.hrc:254
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "German (Belgium)"
 msgstr "Almaeneg (Gwlad Belg)"
 
-#: langtab.hrc:255
+#: svtools/inc/langtab.hrc:255
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Chuvash"
 msgstr "Chuvash"
 
-#: langtab.hrc:256
+#: svtools/inc/langtab.hrc:256
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Burmese"
 msgstr "Burmese"
 
-#: langtab.hrc:257
+#: svtools/inc/langtab.hrc:257
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Hausa (Nigeria)"
 msgstr "Hausa (Nigeria)"
 
-#: langtab.hrc:258
+#: svtools/inc/langtab.hrc:258
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Hausa (Ghana)"
 msgstr "Hausa (Ghana)"
 
-#: langtab.hrc:259
+#: svtools/inc/langtab.hrc:259
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Éwé"
 msgstr "Éwé"
 
-#: langtab.hrc:260
+#: svtools/inc/langtab.hrc:260
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Ghana)"
 msgstr "Saesneg (Ghana)"
 
-#: langtab.hrc:261
+#: svtools/inc/langtab.hrc:261
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sango"
 msgstr "Sango"
 
-#: langtab.hrc:262
+#: svtools/inc/langtab.hrc:262
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tagalog"
 msgstr "Tagalog"
 
-#: langtab.hrc:263
+#: svtools/inc/langtab.hrc:263
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Ganda"
 msgstr "Ganda"
 
-#: langtab.hrc:264
+#: svtools/inc/langtab.hrc:264
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Lingala"
 msgstr "Lingala"
 
-#: langtab.hrc:265
+#: svtools/inc/langtab.hrc:265
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Low German"
 msgstr "Almaeneg Isel"
 
-#: langtab.hrc:266
+#: svtools/inc/langtab.hrc:266
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Hiligaynon"
 msgstr "Hiligaynon"
 
-#: langtab.hrc:267
+#: svtools/inc/langtab.hrc:267
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Nyanja"
 msgstr "Nyanja"
 
-#: langtab.hrc:268
+#: svtools/inc/langtab.hrc:268
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kashubian"
 msgstr "Kashubian"
 
-#: langtab.hrc:269
+#: svtools/inc/langtab.hrc:269
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Spanish (Cuba)"
 msgstr "Sbaebeg (Ciwba)"
 
-#: langtab.hrc:270
+#: svtools/inc/langtab.hrc:270
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tetun (Indonesia)"
 msgstr "Tetun (Indonesia)"
 
-#: langtab.hrc:271
+#: svtools/inc/langtab.hrc:271
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Quechua (Bolivia, North)"
 msgstr "Quechua (Bolivia, Gogledd)"
 
-#: langtab.hrc:272
+#: svtools/inc/langtab.hrc:272
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Quechua (Bolivia, South)"
 msgstr "Quechua (Bolivia, De)"
 
-#: langtab.hrc:273
+#: svtools/inc/langtab.hrc:273
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Somali"
 msgstr "Somali"
 
-#: langtab.hrc:274
+#: svtools/inc/langtab.hrc:274
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Inari (Finland)"
 msgstr "Sami, Inari (Finland)"
 
-#: langtab.hrc:275
+#: svtools/inc/langtab.hrc:275
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Lule (Norway)"
 msgstr "Sami, Lule (Norway)"
 
-#: langtab.hrc:276
+#: svtools/inc/langtab.hrc:276
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Lule (Sweden)"
 msgstr "Sami, Lule (Sweden)"
 
-#: langtab.hrc:277
+#: svtools/inc/langtab.hrc:277
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Northern (Finland)"
 msgstr "Sami, Northern (Finland)"
 
-#: langtab.hrc:278
+#: svtools/inc/langtab.hrc:278
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Northern (Norway)"
 msgstr "Sami, Northern (Norway)"
 
-#: langtab.hrc:279
+#: svtools/inc/langtab.hrc:279
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Northern (Sweden)"
 msgstr "Sami, Northern (Sweden)"
 
-#: langtab.hrc:280
+#: svtools/inc/langtab.hrc:280
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Skolt (Finland)"
 msgstr "Sami, Skolt (Finland)"
 
-#: langtab.hrc:281
+#: svtools/inc/langtab.hrc:281
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Southern (Norway)"
 msgstr "Sami, Southern (Norway)"
 
-#: langtab.hrc:282
+#: svtools/inc/langtab.hrc:282
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Southern (Sweden)"
 msgstr "Sami, Southern (Sweden)"
 
-#: langtab.hrc:283
+#: svtools/inc/langtab.hrc:283
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Kildin (Russia)"
 msgstr "Sami, Kildin (Rwsia)"
 
-#: langtab.hrc:284
+#: svtools/inc/langtab.hrc:284
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Guarani (Paraguay)"
 msgstr "Guarani (Paraguay)"
 
-#: langtab.hrc:285
+#: svtools/inc/langtab.hrc:285
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Bodo"
 msgstr "Bodo"
 
-#: langtab.hrc:286
+#: svtools/inc/langtab.hrc:286
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Dogri"
 msgstr "Dogri"
 
-#: langtab.hrc:287
+#: svtools/inc/langtab.hrc:287
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Maithili"
 msgstr "Maithili"
 
-#: langtab.hrc:288
+#: svtools/inc/langtab.hrc:288
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Santali"
 msgstr "Santali"
 
-#: langtab.hrc:289
+#: svtools/inc/langtab.hrc:289
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tetun (Timor-Leste)"
 msgstr "Tetun (Timor-Leste)"
 
-#: langtab.hrc:290
+#: svtools/inc/langtab.hrc:290
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Turkmen"
 msgstr "Turkmen"
 
-#: langtab.hrc:291
+#: svtools/inc/langtab.hrc:291
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Maltese"
 msgstr "Malteg"
 
-#: langtab.hrc:292
+#: svtools/inc/langtab.hrc:292
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tok Pisin"
 msgstr "Tok Pisin"
 
-#: langtab.hrc:293
+#: svtools/inc/langtab.hrc:293
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Shuswap"
 msgstr "Shuswap"
 
-#: langtab.hrc:294
+#: svtools/inc/langtab.hrc:294
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Oromo"
 msgstr "Oromo"
 
-#: langtab.hrc:295
+#: svtools/inc/langtab.hrc:295
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Greek, Ancient"
 msgstr "Groeg, Hen"
 
-#: langtab.hrc:296
+#: svtools/inc/langtab.hrc:296
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Yiddish (Israel)"
 msgstr "Yiddeg (Israel)"
 
-#: langtab.hrc:297
+#: svtools/inc/langtab.hrc:297
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Quechua (Ecuador)"
 msgstr "Quechua (Ecuador)"
 
-#: langtab.hrc:298
+#: svtools/inc/langtab.hrc:298
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Uyghur"
 msgstr "Uyghur"
 
-#: langtab.hrc:299
+#: svtools/inc/langtab.hrc:299
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Asturian"
 msgstr "Asturieg"
 
-#: langtab.hrc:300
+#: svtools/inc/langtab.hrc:300
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sorbian, Upper"
 msgstr "Sorbieg, Uwch"
 
-#: langtab.hrc:301
+#: svtools/inc/langtab.hrc:301
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sorbian, Lower"
 msgstr "Sorbieg, Is"
 
-#: langtab.hrc:302
+#: svtools/inc/langtab.hrc:302
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Latgalian"
 msgstr "Latgalieg"
 
-#: langtab.hrc:303
+#: svtools/inc/langtab.hrc:303
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Maore"
 msgstr "Maore"
 
-#: langtab.hrc:304
+#: svtools/inc/langtab.hrc:304
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Bushi"
 msgstr "Bushi"
 
-#: langtab.hrc:305
+#: svtools/inc/langtab.hrc:305
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tahitian"
 msgstr "Tahiteg"
 
-#: langtab.hrc:306
+#: svtools/inc/langtab.hrc:306
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Malagasy, Plateau"
 msgstr "Malagasy, Plateau"
 
-#: langtab.hrc:307
+#: svtools/inc/langtab.hrc:307
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Papiamentu (Netherlands Antilles)"
 msgstr "Papiamentu (Antilles Iseldiroedd)"
 
-#: langtab.hrc:308
+#: svtools/inc/langtab.hrc:308
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Papiamento (Aruba)"
 msgstr "Papiamento (Aruba)"
 
-#: langtab.hrc:309
+#: svtools/inc/langtab.hrc:309
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sardinian, Campidanese"
 msgstr "Sardinieg, Campidanese"
 
-#: langtab.hrc:310
+#: svtools/inc/langtab.hrc:310
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sardinian, Gallurese"
 msgstr "Sardinieg, Gallurese"
 
-#: langtab.hrc:311
+#: svtools/inc/langtab.hrc:311
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sardinian, Logudorese"
 msgstr "Sardinieg, Logudorese"
 
-#: langtab.hrc:312
+#: svtools/inc/langtab.hrc:312
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sardinian, Sassarese"
 msgstr "Sardinieg, Sassarese"
 
-#: langtab.hrc:313
+#: svtools/inc/langtab.hrc:313
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Bafia"
 msgstr "Bafia"
 
-#: langtab.hrc:314
+#: svtools/inc/langtab.hrc:314
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Gikuyu"
 msgstr "Gikuyu"
 
-#: langtab.hrc:315
+#: svtools/inc/langtab.hrc:315
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Yoruba"
 msgstr "Yoruba"
 
-#: langtab.hrc:316
+#: svtools/inc/langtab.hrc:316
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Rusyn (Ukraine)"
 msgstr "Rusyn (Wcrain)"
 
-#: langtab.hrc:317
+#: svtools/inc/langtab.hrc:317
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Rusyn (Slovakia)"
 msgstr "Rusyn (Slofacia)"
 
-#: langtab.hrc:318
+#: svtools/inc/langtab.hrc:318
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kabyle Latin"
 msgstr "Kabyle Lladin"
 
-#: langtab.hrc:319
+#: svtools/inc/langtab.hrc:319
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Yiddish (USA)"
 msgstr "Yideg (UDA)"
 
-#: langtab.hrc:320
+#: svtools/inc/langtab.hrc:320
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Hawaiian"
 msgstr "Hawaiieg"
 
-#: langtab.hrc:321
+#: svtools/inc/langtab.hrc:321
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Limbu"
 msgstr "Limbu"
 
-#: langtab.hrc:322
+#: svtools/inc/langtab.hrc:322
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Lojban"
 msgstr "Lojban"
 
-#: langtab.hrc:323
+#: svtools/inc/langtab.hrc:323
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Haitian"
 msgstr "Haitiieg"
 
-#: langtab.hrc:324
+#: svtools/inc/langtab.hrc:324
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Beembe"
 msgstr "Beembe"
 
-#: langtab.hrc:325
+#: svtools/inc/langtab.hrc:325
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Bekwel"
 msgstr "Bekwel"
 
-#: langtab.hrc:326
+#: svtools/inc/langtab.hrc:326
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kituba (Congo)"
 msgstr "Kituba (Congo)"
 
-#: langtab.hrc:327
+#: svtools/inc/langtab.hrc:327
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Lari"
 msgstr "Lari"
 
-#: langtab.hrc:328
+#: svtools/inc/langtab.hrc:328
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Mbochi"
 msgstr "Mbochi"
 
-#: langtab.hrc:329
+#: svtools/inc/langtab.hrc:329
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Teke-Eboo"
 msgstr "Teke-Eboo"
 
-#: langtab.hrc:330
+#: svtools/inc/langtab.hrc:330
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Teke-Ibali"
 msgstr "Teke-Ibali"
 
-#: langtab.hrc:331
+#: svtools/inc/langtab.hrc:331
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Teke-Tyee"
 msgstr "Teke-Tyee"
 
-#: langtab.hrc:332
+#: svtools/inc/langtab.hrc:332
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Vili"
 msgstr "Vili"
 
-#: langtab.hrc:333
+#: svtools/inc/langtab.hrc:333
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "KeyID"
 msgstr "Enw Allweddol"
 
-#: langtab.hrc:334
+#: svtools/inc/langtab.hrc:334
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Pali Latin"
 msgstr "Lladin Pali"
 
-#: langtab.hrc:335
+#: svtools/inc/langtab.hrc:335
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kyrgyz (China)"
 msgstr "Kyrgyz (Tsieina)"
 
-#: langtab.hrc:336
+#: svtools/inc/langtab.hrc:336
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Komi-Zyrian"
 msgstr "Komi-Zyrian"
 
-#: langtab.hrc:337
+#: svtools/inc/langtab.hrc:337
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Komi-Permyak"
 msgstr "Komi-Permyak"
 
-#: langtab.hrc:338
+#: svtools/inc/langtab.hrc:338
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Pitjantjatjara"
 msgstr "Pitjantjatjara"
 
-#: langtab.hrc:339
+#: svtools/inc/langtab.hrc:339
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Malawi)"
 msgstr "Saesneg (Malawi)"
 
-#: langtab.hrc:340
+#: svtools/inc/langtab.hrc:340
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Erzya"
 msgstr "Erzya"
 
-#: langtab.hrc:341
+#: svtools/inc/langtab.hrc:341
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Mari, Meadow"
 msgstr "Mari, Meadow"
 
-#: langtab.hrc:342
+#: svtools/inc/langtab.hrc:342
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Papiamento (Curaçao)"
 msgstr "Papiamento (Curaçao)"
 
-#: langtab.hrc:343
+#: svtools/inc/langtab.hrc:343
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Papiamento (Bonaire)"
 msgstr "Papiamento (Bonaire)"
 
-#: langtab.hrc:344
+#: svtools/inc/langtab.hrc:344
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Khanty"
 msgstr "Khanty"
 
-#: langtab.hrc:345
+#: svtools/inc/langtab.hrc:345
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Livonian"
 msgstr "Livonieg"
 
-#: langtab.hrc:346
+#: svtools/inc/langtab.hrc:346
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Moksha"
 msgstr "Moksha"
 
-#: langtab.hrc:347
+#: svtools/inc/langtab.hrc:347
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Mari, Hill"
 msgstr "Mari, Hill"
 
-#: langtab.hrc:348
+#: svtools/inc/langtab.hrc:348
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Nganasan"
 msgstr "Nganasan"
 
-#: langtab.hrc:349
+#: svtools/inc/langtab.hrc:349
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Olonets"
 msgstr "Olonets"
 
-#: langtab.hrc:350
+#: svtools/inc/langtab.hrc:350
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Veps"
 msgstr "Veps"
 
-#: langtab.hrc:351
+#: svtools/inc/langtab.hrc:351
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Võro"
 msgstr "Võro"
 
-#: langtab.hrc:352
+#: svtools/inc/langtab.hrc:352
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Nenets"
 msgstr "Nenets"
 
-#: langtab.hrc:353
+#: svtools/inc/langtab.hrc:353
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Aka (Congo)"
 msgstr "Aka (Congo)"
 
-#: langtab.hrc:354
+#: svtools/inc/langtab.hrc:354
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Dibole"
 msgstr "Dibole"
 
-#: langtab.hrc:355
+#: svtools/inc/langtab.hrc:355
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Doondo"
 msgstr "Doondo"
 
-#: langtab.hrc:356
+#: svtools/inc/langtab.hrc:356
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kaamba"
 msgstr "Kaamba"
 
-#: langtab.hrc:357
+#: svtools/inc/langtab.hrc:357
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Koongo (Congo)"
 msgstr "Koongo (Congo)"
 
-#: langtab.hrc:358
+#: svtools/inc/langtab.hrc:358
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kunyi"
 msgstr "Kunyi"
 
-#: langtab.hrc:359
+#: svtools/inc/langtab.hrc:359
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Ngungwel"
 msgstr "Ngungwel"
 
-#: langtab.hrc:360
+#: svtools/inc/langtab.hrc:360
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Njyem (Congo)"
 msgstr "Njyem (Congo)"
 
-#: langtab.hrc:361
+#: svtools/inc/langtab.hrc:361
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Punu"
 msgstr "Punu"
 
-#: langtab.hrc:362
+#: svtools/inc/langtab.hrc:362
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Suundi"
 msgstr "Suundi"
 
-#: langtab.hrc:363
+#: svtools/inc/langtab.hrc:363
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Teke-Kukuya"
 msgstr "Teke-Kukuya"
 
-#: langtab.hrc:364
+#: svtools/inc/langtab.hrc:364
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tsaangi"
 msgstr "Tsaangi"
 
-#: langtab.hrc:365
+#: svtools/inc/langtab.hrc:365
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Yaka"
 msgstr "Yaka"
 
-#: langtab.hrc:366
+#: svtools/inc/langtab.hrc:366
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Yombe (Congo)"
 msgstr "Yombe (Congo)"
 
-#: langtab.hrc:367
+#: svtools/inc/langtab.hrc:367
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "N'ko"
 msgstr "N'ko"
 
-#: langtab.hrc:368
+#: svtools/inc/langtab.hrc:368
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Udmurt"
 msgstr "Udmurt"
 
-#: langtab.hrc:369
+#: svtools/inc/langtab.hrc:369
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Tibetan (India)"
 msgstr "Tibeteg (India)"
 
-#: langtab.hrc:370
+#: svtools/inc/langtab.hrc:370
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Cornish"
 msgstr "Cernyweg"
 
-#: langtab.hrc:371
+#: svtools/inc/langtab.hrc:371
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Sami, Pite (Sweden)"
 msgstr "Sami, Pite (Sweden)"
 
-#: langtab.hrc:372
+#: svtools/inc/langtab.hrc:372
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Ngäbere"
 msgstr "Ngäbere"
 
-#: langtab.hrc:373
+#: svtools/inc/langtab.hrc:373
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kumyk"
 msgstr "Kumyk"
 
-#: langtab.hrc:374
+#: svtools/inc/langtab.hrc:374
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Nogai"
 msgstr "Nogai"
 
-#: langtab.hrc:375
+#: svtools/inc/langtab.hrc:375
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Karakalpak Latin"
 msgstr "Lladin Karakalpak"
 
-#: langtab.hrc:376
+#: svtools/inc/langtab.hrc:376
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Ladin"
 msgstr "Lladin"
 
-#: langtab.hrc:377
+#: svtools/inc/langtab.hrc:377
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Burkina Faso)"
 msgstr "Ffrangeg (Burkina Faso)"
 
-#: langtab.hrc:378
+#: svtools/inc/langtab.hrc:378
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Puinave"
 msgstr "Puinave"
 
-#: langtab.hrc:379
+#: svtools/inc/langtab.hrc:379
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Maninkakan, Eastern, Latin"
 msgstr "Maninkakan, Dwyreiniol, Lladin"
 
-#: langtab.hrc:380
+#: svtools/inc/langtab.hrc:380
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Avar"
 msgstr "Avar"
 
-#: langtab.hrc:381
+#: svtools/inc/langtab.hrc:381
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Cree, Plains, Latin"
 msgstr "Cree, Gwastadeddau, Lladin"
 
-#: langtab.hrc:382
+#: svtools/inc/langtab.hrc:382
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Cree, Plains, Syllabics"
 msgstr "Cree, Gwstadeddau, Syllafwyddor"
 
-#: langtab.hrc:383
+#: svtools/inc/langtab.hrc:383
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Lengo"
 msgstr "Lengo"
 
-#: langtab.hrc:384
+#: svtools/inc/langtab.hrc:384
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Côte d'Ivoire)"
 msgstr "Ffrangeg (Côte d'Ivoire)"
 
-#: langtab.hrc:385
+#: svtools/inc/langtab.hrc:385
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Mali)"
 msgstr "Ffrangeg (Mali)"
 
-#: langtab.hrc:386
+#: svtools/inc/langtab.hrc:386
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Senegal)"
 msgstr "Ffrangeg (Senegal)"
 
-#: langtab.hrc:387
+#: svtools/inc/langtab.hrc:387
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Benin)"
 msgstr "Ffrangeg (Benin)"
 
-#: langtab.hrc:388
+#: svtools/inc/langtab.hrc:388
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Niger)"
 msgstr "Ffrangeg (Niger)"
 
-#: langtab.hrc:389
+#: svtools/inc/langtab.hrc:389
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Togo)"
 msgstr "Ffrangeg (Togo)"
 
-#: langtab.hrc:390
+#: svtools/inc/langtab.hrc:390
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kven Finnish"
 msgstr "Ffinneg Kven"
 
-#: langtab.hrc:391
+#: svtools/inc/langtab.hrc:391
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Venetian"
 msgstr "Fenisaidd"
 
-#: langtab.hrc:392
+#: svtools/inc/langtab.hrc:392
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Gambia)"
 msgstr "Saesneg (Gambia)"
 
-#: langtab.hrc:393
+#: svtools/inc/langtab.hrc:393
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Aranese"
 msgstr "Aragoneg"
 
-#: langtab.hrc:394
+#: svtools/inc/langtab.hrc:394
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arpitan (France)"
 msgstr "Arptieg (Ffrainc)"
 
-#: langtab.hrc:395
+#: svtools/inc/langtab.hrc:395
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arpitan (Italy)"
 msgstr "Arptieg (Yr Eidal)"
 
-#: langtab.hrc:396
+#: svtools/inc/langtab.hrc:396
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Arpitan (Switzerland)"
 msgstr "Arptieg (Y Swistir)"
 
-#: langtab.hrc:397
+#: svtools/inc/langtab.hrc:397
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Botswana)"
 msgstr "Saesneg (Botswana)"
 
-#: langtab.hrc:398
+#: svtools/inc/langtab.hrc:398
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Interlingue Occidental"
 msgstr "Interlingue Occidental"
 
-#: langtab.hrc:399
+#: svtools/inc/langtab.hrc:399
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Apatani"
 msgstr "Apatani"
 
-#: langtab.hrc:400
+#: svtools/inc/langtab.hrc:400
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Mauritius)"
 msgstr "Saesneg (Mauritius)"
 
-#: langtab.hrc:401
+#: svtools/inc/langtab.hrc:401
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "French (Mauritius)"
 msgstr "Ffrangeg (Mauritius)"
 
-#: langtab.hrc:402
+#: svtools/inc/langtab.hrc:402
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Silesian"
 msgstr "Silesaidd"
 
-#: langtab.hrc:403
+#: svtools/inc/langtab.hrc:403
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Hungarian (Szekely-Hungarian Rovas)"
 msgstr "Hwngareg (Szekely-Hungarian Rovas)"
 
-#: langtab.hrc:404
+#: svtools/inc/langtab.hrc:404
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "English (Malaysia)"
 msgstr "Saesneg, (Malaysia)"
 
-#: langtab.hrc:405
+#: svtools/inc/langtab.hrc:405
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Manchu"
 msgstr "Manchu"
 
-#: langtab.hrc:406
+#: svtools/inc/langtab.hrc:406
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Xibe"
 msgstr "Xibe"
 
-#: langtab.hrc:407
+#: svtools/inc/langtab.hrc:407
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Kituba (Democratic Republic of the Congo)"
 msgstr "Kituba (Gweriniaeth Ddemocratig y Congo)"
 
-#: langtab.hrc:408
+#: svtools/inc/langtab.hrc:408
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Fon"
 msgstr "Ffont"
 
-#: langtab.hrc:409
+#: svtools/inc/langtab.hrc:409
 msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
 msgid "Plautdietsch"
 msgstr "Plautdietsch"
 
-#: templwin.hrc:42
+#: svtools/inc/langtab.hrc:410
+msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
+msgid "Armenian, Eastern (Russia)"
+msgstr "Armenieg, Dwyrain (Rwsia)"
+
+#: svtools/inc/langtab.hrc:411
+msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
+msgid "Armenian, Eastern (Iran)"
+msgstr "Armenieg, Dwyrain (Iran)"
+
+#: svtools/inc/langtab.hrc:412
+msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
+msgid "Armenian, Western (Armenia)"
+msgstr "Armeneg, Gorllewin (Armenia)"
+
+#: svtools/inc/langtab.hrc:413
+msgctxt "STR_ARR_SVT_LANGUAGE_TABLE"
+msgid "Armenian, Classic (Armenia)"
+msgstr "Armeneg, Clasurol (Armenia)"
+
+#: svtools/inc/templwin.hrc:42
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Title"
 msgstr "Teitl"
 
-#: templwin.hrc:43
+#: svtools/inc/templwin.hrc:43
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "By"
 msgstr "Gan"
 
-#: templwin.hrc:44
+#: svtools/inc/templwin.hrc:44
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: templwin.hrc:45
+#: svtools/inc/templwin.hrc:45
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Keywords"
 msgstr "Allweddeiriau"
 
-#: templwin.hrc:46
+#: svtools/inc/templwin.hrc:46
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: templwin.hrc:47
+#: svtools/inc/templwin.hrc:47
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Type"
 msgstr "Math"
 
-#: templwin.hrc:48
+#: svtools/inc/templwin.hrc:48
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Modified on"
 msgstr "Newidiwyd ar"
 
-#: templwin.hrc:49
+#: svtools/inc/templwin.hrc:49
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Modified by"
 msgstr "Newidiwyd gan"
 
-#: templwin.hrc:50
+#: svtools/inc/templwin.hrc:50
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Printed on"
 msgstr "Argraffwyd ar"
 
-#: templwin.hrc:51
+#: svtools/inc/templwin.hrc:51
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Printed by"
 msgstr "Argraffwyd gan"
 
-#: templwin.hrc:52
+#: svtools/inc/templwin.hrc:52
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Subject"
 msgstr "Pwnc"
 
-#: templwin.hrc:53
+#: svtools/inc/templwin.hrc:53
 msgctxt "STRARY_SVT_DOCINFO"
 msgid "Size"
 msgstr "Maint"
 
-#: addresstemplatedialog.ui:9
+#: svtools/uiconfig/ui/addresstemplatedialog.ui:9
 msgctxt "addresstemplatedialog|AddressTemplateDialog"
 msgid "Templates: Address Book Assignment"
 msgstr "Templedi: Aseiniad Llyfr Cyfeiriadau"
 
-#: addresstemplatedialog.ui:104
+#: svtools/uiconfig/ui/addresstemplatedialog.ui:104
 msgctxt "addresstemplatedialog|label33"
 msgid "Data source:"
 msgstr "Ffynhonnell data:"
 
-#: addresstemplatedialog.ui:118
+#: svtools/uiconfig/ui/addresstemplatedialog.ui:118
 msgctxt "addresstemplatedialog|label43"
 msgid "Table:"
 msgstr "Tabl:"
 
-#: addresstemplatedialog.ui:165
+#: svtools/uiconfig/ui/addresstemplatedialog.ui:163
 msgctxt "addresstemplatedialog|admin"
 msgid "_Address Data Source..."
 msgstr "_Gweinyddu..."
 
-#: addresstemplatedialog.ui:187
+#: svtools/uiconfig/ui/addresstemplatedialog.ui:185
 msgctxt "addresstemplatedialog|label100"
 msgid "Address Book Source"
 msgstr "Ffynhonnell Llyfr Cyfeiriadau"
 
-#: addresstemplatedialog.ui:522
+#: svtools/uiconfig/ui/addresstemplatedialog.ui:520
 msgctxt "addresstemplatedialog|label23"
 msgid "Field Assignment"
 msgstr "Aseiniad Maes"
 
-#: fileviewmenu.ui:12
+#: svtools/uiconfig/ui/fileviewmenu.ui:12
 msgctxt "fileviewmenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: fileviewmenu.ui:20
+#: svtools/uiconfig/ui/fileviewmenu.ui:20
 msgctxt "fileviewmenu|rename"
 msgid "_Rename"
 msgstr "_Ailenwi"
 
-#: graphicexport.ui:31
+#: svtools/uiconfig/ui/graphicexport.ui:31
 msgctxt "graphicexport|liststore1"
 msgid "pixels/cm"
 msgstr "picseli/cm"
 
-#: graphicexport.ui:34
+#: svtools/uiconfig/ui/graphicexport.ui:34
 msgctxt "graphicexport|liststore1"
 msgid "pixels/inch"
 msgstr "picseli/modfedd"
 
-#: graphicexport.ui:37
+#: svtools/uiconfig/ui/graphicexport.ui:37
 msgctxt "graphicexport|liststore1"
 msgid "pixels/meter"
 msgstr "picseli/meter"
 
-#: graphicexport.ui:48
+#: svtools/uiconfig/ui/graphicexport.ui:48
 msgctxt "graphicexport|liststore2"
 msgid "inches"
 msgstr "modfedd"
 
-#: graphicexport.ui:51
+#: svtools/uiconfig/ui/graphicexport.ui:51
 msgctxt "graphicexport|liststore2"
 msgid "cm"
 msgstr "cm"
 
-#: graphicexport.ui:54
+#: svtools/uiconfig/ui/graphicexport.ui:54
 msgctxt "graphicexport|liststore2"
 msgid "mm"
 msgstr "mm"
 
-#: graphicexport.ui:57
+#: svtools/uiconfig/ui/graphicexport.ui:57
 msgctxt "graphicexport|liststore2"
 msgid "points"
 msgstr "pwyntiau"
 
-#: graphicexport.ui:60
+#: svtools/uiconfig/ui/graphicexport.ui:60
 msgctxt "graphicexport|liststore2"
 msgid "pixels"
 msgstr "picseli"
 
-#: graphicexport.ui:67
+#: svtools/uiconfig/ui/graphicexport.ui:67
 msgctxt "graphicexport|GraphicExportDialog"
 msgid "%1 Options"
 msgstr "%1 Dewisiadau"
 
-#: graphicexport.ui:159
+#: svtools/uiconfig/ui/graphicexport.ui:159
 msgctxt "graphicexport|label5"
 msgid "Width:"
 msgstr "Lled:"
 
-#: graphicexport.ui:173
+#: svtools/uiconfig/ui/graphicexport.ui:173
 msgctxt "graphicexport|label6"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: graphicexport.ui:187
+#: svtools/uiconfig/ui/graphicexport.ui:187
 msgctxt "graphicexport|resolutionft"
 msgid "Resolution:"
 msgstr "Cydraniad:"
 
-#: graphicexport.ui:271
+#: svtools/uiconfig/ui/graphicexport.ui:268
 msgctxt "graphicexport|label1"
 msgid "Size"
 msgstr "Maint"
 
-#: graphicexport.ui:307
+#: svtools/uiconfig/ui/graphicexport.ui:304
 msgctxt "graphicexport|label2"
 msgid "Color Depth"
 msgstr "Dyfnder Lliw"
 
-#: graphicexport.ui:370
+#: svtools/uiconfig/ui/graphicexport.ui:366
 msgctxt "graphicexport|label9"
 msgid "Quality"
 msgstr "Ansawdd"
 
-#: graphicexport.ui:433
+#: svtools/uiconfig/ui/graphicexport.ui:428
 msgctxt "graphicexport|label"
 msgid "Compression"
 msgstr "Cywasgiad"
 
-#: graphicexport.ui:459
+#: svtools/uiconfig/ui/graphicexport.ui:454
 msgctxt "graphicexport|rlecb"
 msgid "RLE encoding"
 msgstr "Amgodio RLE"
 
-#: graphicexport.ui:474
+#: svtools/uiconfig/ui/graphicexport.ui:470
 msgctxt "graphicexport|label3"
 msgid "Compression"
 msgstr "Cywasgiad"
 
-#: graphicexport.ui:500
+#: svtools/uiconfig/ui/graphicexport.ui:496
 msgctxt "graphicexport|interlacedcb"
 msgid "Interlaced"
 msgstr "Rhyngweddu"
 
-#: graphicexport.ui:515
+#: svtools/uiconfig/ui/graphicexport.ui:512
 msgctxt "graphicexport|label12"
 msgid "Mode"
 msgstr "Modd"
 
-#: graphicexport.ui:541
+#: svtools/uiconfig/ui/graphicexport.ui:538
 msgctxt "graphicexport|savetransparencycb"
 msgid "Save transparency"
 msgstr "Cadw tryloywder"
 
-#: graphicexport.ui:556
+#: svtools/uiconfig/ui/graphicexport.ui:554
 msgctxt "graphicexport|labe"
 msgid "Drawing Objects"
 msgstr "Gwrthrychau Lluniadu"
 
-#: graphicexport.ui:586
+#: svtools/uiconfig/ui/graphicexport.ui:584
 msgctxt "graphicexport|binarycb"
 msgid "Binary"
 msgstr "Deuaidd"
 
-#: graphicexport.ui:601
+#: svtools/uiconfig/ui/graphicexport.ui:600
 msgctxt "graphicexport|textcb"
 msgid "Text"
 msgstr "Testun"
 
-#: graphicexport.ui:623
+#: svtools/uiconfig/ui/graphicexport.ui:623
 msgctxt "graphicexport|label16"
 msgid "Encoding"
 msgstr "Amgodio"
 
-#: graphicexport.ui:657
+#: svtools/uiconfig/ui/graphicexport.ui:657
 msgctxt "graphicexport|tiffpreviewcb"
 msgid "Image preview (TIFF)"
 msgstr "Rhagolwg delwedd (TIFF)"
 
-#: graphicexport.ui:672
+#: svtools/uiconfig/ui/graphicexport.ui:673
 msgctxt "graphicexport|epsipreviewcb"
 msgid "Interchange (EPSI)"
 msgstr "Ymgyfnewid (EPSI)"
 
-#: graphicexport.ui:692
+#: svtools/uiconfig/ui/graphicexport.ui:694
 msgctxt "graphicexport|label17"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: graphicexport.ui:722
+#: svtools/uiconfig/ui/graphicexport.ui:724
 msgctxt "graphicexport|color1rb"
 msgid "Color"
 msgstr "Lliw"
 
-#: graphicexport.ui:737
+#: svtools/uiconfig/ui/graphicexport.ui:740
 msgctxt "graphicexport|color2rb"
 msgid "Grayscale"
 msgstr "Graddlwyd"
 
-#: graphicexport.ui:759
+#: svtools/uiconfig/ui/graphicexport.ui:763
 msgctxt "graphicexport|label18"
 msgid "Color Format"
 msgstr "Fformat Lliw"
 
-#: graphicexport.ui:789
+#: svtools/uiconfig/ui/graphicexport.ui:793
 msgctxt "graphicexport|level1rb"
 msgid "Level 1"
 msgstr "Lefel 1"
 
-#: graphicexport.ui:804
+#: svtools/uiconfig/ui/graphicexport.ui:809
 msgctxt "graphicexport|level2rb"
 msgid "Level 2"
 msgstr "Lefel 2"
 
-#: graphicexport.ui:826
+#: svtools/uiconfig/ui/graphicexport.ui:832
 msgctxt "graphicexport|label19"
 msgid "Version"
 msgstr "Fersiwn"
 
-#: graphicexport.ui:856
+#: svtools/uiconfig/ui/graphicexport.ui:862
 msgctxt "graphicexport|compresslzw"
 msgid "LZW encoding"
 msgstr "Amgodio LZW"
 
-#: graphicexport.ui:871
+#: svtools/uiconfig/ui/graphicexport.ui:878
 msgctxt "graphicexport|compressnone"
 msgid "None"
 msgstr "Dim"
 
-#: graphicexport.ui:893
+#: svtools/uiconfig/ui/graphicexport.ui:901
 msgctxt "graphicexport|label20"
 msgid "Compression"
 msgstr "Cywasgiad"
 
-#: graphicexport.ui:939
+#: svtools/uiconfig/ui/graphicexport.ui:947
 msgctxt "graphicexport|label4"
 msgid "Information"
 msgstr "Gwybodaeth"
 
-#: javadisableddialog.ui:8
+#: svtools/uiconfig/ui/javadisableddialog.ui:7
 msgctxt "javadisableddialog|JavaDisabledDialog"
 msgid "Enable JRE?"
 msgstr "Galluogi JRE?"
 
-#: javadisableddialog.ui:13
+#: svtools/uiconfig/ui/javadisableddialog.ui:13
 msgctxt "javadisableddialog|JavaDisabledDialog"
 msgid "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. However, use of a JRE has been disabled. Do you want to enable the use of a JRE now?"
 msgstr "Mae %PRODUCTNAME angen Java runtime environment (JRE) i wneud y dasg hon. Mae defnydd JRE wedi ei analluogi. Hoffech chi alluogi'r JRE?"
 
-#: placeedit.ui:22
+#: svtools/uiconfig/ui/placeedit.ui:18
+msgctxt "placeedit|PlaceEditDialog"
+msgid "File Services"
+msgstr "Gwasanaethau Ffeiliau"
+
+#: svtools/uiconfig/ui/placeedit.ui:111
+msgctxt "placeedit|typeLabel"
+msgid "Type:"
+msgstr "Math:"
+
+#: svtools/uiconfig/ui/placeedit.ui:127
 msgctxt "placeedit|liststore1"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: placeedit.ui:25
+#: svtools/uiconfig/ui/placeedit.ui:128
 msgctxt "placeedit|liststore1"
 msgid "FTP"
 msgstr "FTP"
 
-#: placeedit.ui:28
+#: svtools/uiconfig/ui/placeedit.ui:129
 msgctxt "placeedit|liststore1"
 msgid "SSH"
 msgstr "SSH"
 
-#: placeedit.ui:31
+#: svtools/uiconfig/ui/placeedit.ui:130
 msgctxt "placeedit|liststore1"
 msgid "Windows Share"
 msgstr "Rhaniad Windows"
 
-#: placeedit.ui:39
-msgctxt "placeedit|PlaceEditDialog"
-msgid "File Services"
-msgstr "Gwasanaethau Ffeiliau"
-
-#: placeedit.ui:130
-msgctxt "placeedit|typeLabel"
-msgid "Type:"
-msgstr "Math:"
-
-#: placeedit.ui:175
+#: svtools/uiconfig/ui/placeedit.ui:155
 msgctxt "placeedit|hostLabel"
 msgid "Host:"
 msgstr "Gwesteiwr:"
 
-#: placeedit.ui:189
+#: svtools/uiconfig/ui/placeedit.ui:169
 msgctxt "placeedit|pathLabel"
 msgid "Root:"
 msgstr "Gwraidd:"
 
-#: placeedit.ui:215
+#: svtools/uiconfig/ui/placeedit.ui:195
 msgctxt "placeedit|shareLabel"
 msgid "Share:"
 msgstr "Rhannu:"
 
-#: placeedit.ui:241
+#: svtools/uiconfig/ui/placeedit.ui:221
 msgctxt "placeedit|repositoryLabel"
 msgid "Repository:"
 msgstr "Storfa:"
 
-#: placeedit.ui:252
+#: svtools/uiconfig/ui/placeedit.ui:233
 msgctxt "placeedit|webdavs"
 msgid "Secure connection"
 msgstr "Cysylltiad diogel"
 
-#: placeedit.ui:269
+#: svtools/uiconfig/ui/placeedit.ui:250
 msgctxt "placeedit|loginLabel"
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: placeedit.ui:295
+#: svtools/uiconfig/ui/placeedit.ui:276
 msgctxt "placeedit|nameLabel"
 msgid "Label:"
 msgstr "Label:"
 
-#: placeedit.ui:339
+#: svtools/uiconfig/ui/placeedit.ui:320
 msgctxt "placeedit|portLabel"
 msgid "Port:"
 msgstr "Porth:"
 
-#: placeedit.ui:414
+#: svtools/uiconfig/ui/placeedit.ui:392
 msgctxt "placeedit|passwordLabel"
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: placeedit.ui:436
+#: svtools/uiconfig/ui/placeedit.ui:415
 msgctxt "placeedit|rememberPassword"
 msgid "Remember password"
 msgstr "Cofio cyfrinair"
 
-#: printersetupdialog.ui:8
+#: svtools/uiconfig/ui/printersetupdialog.ui:8
 msgctxt "printersetupdialog|PrinterSetupDialog"
 msgid "Printer Setup"
 msgstr "Gosodiad Argraffydd"
 
-#: printersetupdialog.ui:37
+#: svtools/uiconfig/ui/printersetupdialog.ui:40
 msgctxt "printersetupdialog|options"
 msgid "Options..."
 msgstr "Dewisiadau..."
 
-#: printersetupdialog.ui:111
+#: svtools/uiconfig/ui/printersetupdialog.ui:112
 msgctxt "printersetupdialog|label2"
 msgid "Name:"
 msgstr "Enw:"
 
-#: printersetupdialog.ui:125
+#: svtools/uiconfig/ui/printersetupdialog.ui:126
 msgctxt "printersetupdialog|label3"
 msgid "Status:"
 msgstr "Statws:"
 
-#: printersetupdialog.ui:137
+#: svtools/uiconfig/ui/printersetupdialog.ui:138
 msgctxt "printersetupdialog|label4"
 msgid "Type:"
 msgstr "Math:"
 
-#: printersetupdialog.ui:149
+#: svtools/uiconfig/ui/printersetupdialog.ui:150
 msgctxt "printersetupdialog|label5"
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: printersetupdialog.ui:161
+#: svtools/uiconfig/ui/printersetupdialog.ui:162
 msgctxt "printersetupdialog|label6"
 msgid "Comment:"
 msgstr "Sylw:"
 
-#: printersetupdialog.ui:218
+#: svtools/uiconfig/ui/printersetupdialog.ui:220
 msgctxt "printersetupdialog|properties"
 msgid "Properties..."
 msgstr "Priodweddau..."
 
-#: printersetupdialog.ui:247
+#: svtools/uiconfig/ui/printersetupdialog.ui:249
 msgctxt "printersetupdialog|label1"
 msgid "Printer"
 msgstr "Argraffydd"
 
-#: querydeletedialog.ui:8
+#: svtools/uiconfig/ui/querydeletedialog.ui:7
 msgctxt "querydeletedialog|QueryDeleteDialog"
 msgid "Confirm Delete"
 msgstr "Cadarnhau Dileu"
 
-#: querydeletedialog.ui:13
+#: svtools/uiconfig/ui/querydeletedialog.ui:13
 msgctxt "querydeletedialog|QueryDeleteDialog"
 msgid "Are you sure you want to delete the selected data?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r data yma?"
 
-#: querydeletedialog.ui:14
+#: svtools/uiconfig/ui/querydeletedialog.ui:14
 msgctxt "querydeletedialog|QueryDeleteDialog"
 msgid "Entry: %s"
 msgstr "Cofnod: %s"
 
-#: querydeletedialog.ui:26
+#: svtools/uiconfig/ui/querydeletedialog.ui:25
 msgctxt "querydeletedialog|yes"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: querydeletedialog.ui:42
+#: svtools/uiconfig/ui/querydeletedialog.ui:41
 msgctxt "querydeletedialog|all"
 msgid "Delete _All"
 msgstr "_Dileu Popeth"
 
-#: querydeletedialog.ui:57
+#: svtools/uiconfig/ui/querydeletedialog.ui:56
 msgctxt "querydeletedialog|no"
 msgid "Do _Not Delete"
 msgstr "_Peidio Dileu"
 
-#: restartdialog.ui:8
+#: svtools/uiconfig/ui/restartdialog.ui:8
 msgctxt "restartdialog|RestartDialog"
 msgid "Restart %PRODUCTNAME"
 msgstr "Ailgychwyn %PRODUCTNAME"
 
-#: restartdialog.ui:23
+#: svtools/uiconfig/ui/restartdialog.ui:26
 msgctxt "restartdialog|yes"
 msgid "Restart Now"
 msgstr "Ailgychwyn Nawr"
 
-#: restartdialog.ui:38
+#: svtools/uiconfig/ui/restartdialog.ui:41
 msgctxt "restartdialog|no"
 msgid "Restart Later"
 msgstr "Ailgychwyn Eto"
 
-#: restartdialog.ui:67
+#: svtools/uiconfig/ui/restartdialog.ui:70
 msgctxt "restartdialog|reason_java"
 msgid "For the selected Java runtime environment to work properly, %PRODUCTNAME must be restarted."
 msgstr "I'r Java runtime environment yma i weithio'n iawn raid i %PRODUCTNAME gael ei ailgychwyn."
 
-#: restartdialog.ui:82
+#: svtools/uiconfig/ui/restartdialog.ui:85
 msgctxt "restartdialog|reason_mailmerge_install"
 msgid "For mail merge to work properly, %PRODUCTNAME must be restarted."
 msgstr "Er mwyn i'r cyfuno post weithio'n iawn, rhaid i %PRODUCTNAME gael ei ailgychwyn."
 
-#: restartdialog.ui:97
+#: svtools/uiconfig/ui/restartdialog.ui:100
 msgctxt "restartdialog|reason_pdf"
 msgid "For the modified default print job format to take effect, %PRODUCTNAME must be restarted."
 msgstr "Rhaid ailgychwyn %PRODUCTNAME i'r fformat gwaith argraffu ragosodedig a newidiwyd ddod i rym."
 
-#: restartdialog.ui:112
+#: svtools/uiconfig/ui/restartdialog.ui:115
 msgctxt "restartdialog|reason_bibliography_install"
 msgid "For the bibliography to work properly, %PRODUCTNAME must be restarted."
 msgstr "Er mwyn i'r llyfryddiaeth weithio'n iawn, rhaid i %PRODUCTNAME gael ei ailgychwyn."
 
-#: restartdialog.ui:127
+#: svtools/uiconfig/ui/restartdialog.ui:130
 msgctxt "restartdialog|reason_assigning_folders"
 msgid "For the assigned folders and archives to take effect, %PRODUCTNAME must be restarted."
 msgstr "Er mwyn rhoi'r ffolderi penodol a'r archifau ar waith, rhaid i %PRODUCTNAME gael ei ailgychwyn."
 
-#: restartdialog.ui:142
+#: svtools/uiconfig/ui/restartdialog.ui:145
 msgctxt "restartdialog|reason_assigning_javaparameters"
 msgid "For the assigned Java parameters to take effect, %PRODUCTNAME must be restarted."
 msgstr "Rhaid ailgychwyn %PRODUCTNAME i baramedrau penodol Java ddod i rym."
 
-#: restartdialog.ui:157
+#: svtools/uiconfig/ui/restartdialog.ui:160
 msgctxt "restartdialog|reason_adding_path"
 msgid "For the added path to take effect, %PRODUCTNAME must be restarted."
 msgstr "Rhaid ailgychwyn %PRODUCTNAME i'r llwybr ychwanegol ddod i rym."
 
-#: restartdialog.ui:172
+#: svtools/uiconfig/ui/restartdialog.ui:175
 msgctxt "restartdialog|reason_language_change"
 msgid "For the updated language settings to take effect, %PRODUCTNAME must be restarted."
 msgstr "Er mwyn rhoi'r gosodiadau iaith diweddaraf ar waith, rhaid i %PRODUCTNAME gael ei ailgychwyn."
 
-#: restartdialog.ui:187
+#: svtools/uiconfig/ui/restartdialog.ui:190
 msgctxt "restartdialog|reason_exp_features"
 msgid "For the modified experimental features to take effect, %PRODUCTNAME must be restarted."
 msgstr "Rhaid ailgychwyn %PRODUCTNAME i'r nodweddion arbrofol a newidiwyd ddod i rym."
 
-#: restartdialog.ui:202
+#: svtools/uiconfig/ui/restartdialog.ui:205
 msgctxt "restartdialog|reason_extension_install"
 msgid "For the extension to work properly, %PRODUCTNAME must be restarted."
 msgstr "I'r estyniad weithio'n iawn, rhaid ailgychwyn %PRODUCTNAME."
 
-#: restartdialog.ui:217
+#: svtools/uiconfig/ui/restartdialog.ui:220
 msgctxt "restartdialog|reason_opengl"
 msgid "For the OpenGL changes to take effect, %PRODUCTNAME must be restarted."
 msgstr "I newidiadau OpenGL weithio, rhaid ailgychwyn %PRODUCTNAME."
 
-#: restartdialog.ui:232
+#: svtools/uiconfig/ui/restartdialog.ui:235
 msgctxt "restartdialog|label"
 msgid "Do you want to restart %PRODUCTNAME now?"
 msgstr "Hoffech chi ailgychwyn %PRODUCTNAME nawr?"
 
-#: strings.hrc:25
+#: include/svtools/strings.hrc:25
 msgctxt "STR_UNDO"
 msgid "Undo: "
 msgstr "Dadwneud: "
 
-#: strings.hrc:26
+#: include/svtools/strings.hrc:26
 msgctxt "STR_REDO"
 msgid "Re~do: "
 msgstr "~Ail-wneud: "
 
-#: strings.hrc:27
+#: include/svtools/strings.hrc:27
 msgctxt "STR_REPEAT"
 msgid "~Repeat: "
 msgstr "A~iladrodd: "
 
-#: strings.hrc:29
+#: include/svtools/strings.hrc:29
 msgctxt "STR_FORMAT_STRING"
 msgid "Unformatted text"
 msgstr "Testun difformat"
 
-#: strings.hrc:30
+#: include/svtools/strings.hrc:30
 msgctxt "STR_FORMAT_ID_STRING_TSVC"
-msgid "Unformatted text [TSV-Calc]"
+msgid "Unformatted text (TSV-Calc)"
 msgstr "Testun heb ei fformatio [TSV-Calc]"
 
-#: strings.hrc:31
+#: include/svtools/strings.hrc:31
 msgctxt "STR_FORMAT_BITMAP"
-msgid "Bitmap"
-msgstr "Didfap"
+msgid "Bitmap Image (BMP)"
+msgstr "Delwedd Didfap (BMP)"
 
-#: strings.hrc:32
+#: include/svtools/strings.hrc:32
 msgctxt "STR_FORMAT_GDIMETAFILE"
-msgid "GDI metafile"
-msgstr "Metaffeil GDI"
+msgid "Graphics Device Interface metafile (GDI)"
+msgstr "Meta ffeil Rhyngwyneb Dyfais Graffigol (GDI)"
 
-#: strings.hrc:33
+#: include/svtools/strings.hrc:33
 msgctxt "STR_FORMAT_RTF"
-msgid "Formatted text [RTF]"
-msgstr "Testun fformatiwyd [RTF]"
+msgid "Rich text formatting (RTF)"
+msgstr "Fformatio testun cyfoethog (RTF)"
 
-#: strings.hrc:34
+#: include/svtools/strings.hrc:34
 msgctxt "STR_FORMAT_ID_RICHTEXT"
-msgid "Formatted text [Richtext]"
-msgstr "Testun fformatiwyd [Richtext]"
+msgid "Rich text formatting (Richtext)"
+msgstr "Fformatio testun cyfoethog (Richtext)"
 
-#: strings.hrc:35
+#: include/svtools/strings.hrc:35
 msgctxt "STR_FORMAT_ID_DRAWING"
-msgid "Drawing format"
-msgstr "Fformat lluniadu"
+msgid "%PRODUCTNAME drawing format"
+msgstr "Fformat lluniadu %PRODUCTNAME"
 
-#: strings.hrc:36
+#: include/svtools/strings.hrc:36
 msgctxt "STR_FORMAT_ID_SVXB"
-msgid "SVXB (StarView bitmap/animation)"
-msgstr "SVXB (didfap/animeiddio StarView)"
+msgid "StarView bitmap/animation (SVXB)"
+msgstr "Animeiddio/didfap Starview (SVXB)"
 
-#: strings.hrc:37
+#: include/svtools/strings.hrc:37
 msgctxt "STR_FORMAT_ID_INTERNALLINK_STATE"
 msgid "Status Info from Svx Internal Link"
 msgstr "Statws Gwybodaeth o Gysylltiad Mewnol Svx"
 
-#: strings.hrc:38
+#: include/svtools/strings.hrc:38
 msgctxt "STR_FORMAT_ID_SOLK"
-msgid "SOLK (%PRODUCTNAME Link)"
-msgstr "SOLK (Cysylltiad %PRODUCTNAME)"
+msgid "%PRODUCTNAME Link (SOLK)"
+msgstr "%PRODUCTNAME Link (SOLK)"
 
-#: strings.hrc:39
+#: include/svtools/strings.hrc:39
 msgctxt "STR_FORMAT_ID_NETSCAPE_BOOKMARK"
 msgid "Netscape Bookmark"
 msgstr "Nod Tudalen Netscape"
 
-#: strings.hrc:40
+#: include/svtools/strings.hrc:40
 msgctxt "STR_FORMAT_ID_STARSERVER"
 msgid "Star server format"
 msgstr "Fformat gweinydd Star"
 
-#: strings.hrc:41
+#: include/svtools/strings.hrc:41
 msgctxt "STR_FORMAT_ID_STAROBJECT"
 msgid "Star object format"
 msgstr "Fformat gwrthrych Star"
 
-#: strings.hrc:42
+#: include/svtools/strings.hrc:42
 msgctxt "STR_FORMAT_ID_APPLETOBJECT"
 msgid "Applet object"
 msgstr "Gwrthrych rhaglennig"
 
-#: strings.hrc:43
+#: include/svtools/strings.hrc:43
 msgctxt "STR_FORMAT_ID_PLUGIN_OBJECT"
 msgid "Plug-in object"
 msgstr "Gwrthrych ategyn"
 
-#: strings.hrc:44
+#: include/svtools/strings.hrc:44
 msgctxt "STR_FORMAT_ID_STARWRITER_30"
 msgid "StarWriter 3.0 object"
 msgstr "Gwrthrych StarWriter 3.0"
 
-#: strings.hrc:45
+#: include/svtools/strings.hrc:45
 msgctxt "STR_FORMAT_ID_STARWRITER_40"
 msgid "StarWriter 4.0 object"
 msgstr "Gwrthrych StarWriter 4.0"
 
-#: strings.hrc:46
+#: include/svtools/strings.hrc:46
 msgctxt "STR_FORMAT_ID_STARWRITER_50"
 msgid "StarWriter 5.0 object"
 msgstr "Gwrthrych StarWriter 5.0"
 
-#: strings.hrc:47
+#: include/svtools/strings.hrc:47
 msgctxt "STR_FORMAT_ID_STARWRITERWEB_40"
 msgid "StarWriter/Web 4.0 object"
 msgstr "Gwrthrych StarWriter/Web 4.0"
 
-#: strings.hrc:48
+#: include/svtools/strings.hrc:48
 msgctxt "STR_FORMAT_ID_STARWRITERWEB_50"
 msgid "StarWriter/Web 5.0 object"
 msgstr "Gwrthrych StarWriter/Web 5.0"
 
-#: strings.hrc:49
+#: include/svtools/strings.hrc:49
 msgctxt "STR_FORMAT_ID_STARWRITERGLOB_40"
 msgid "StarWriter/Master 4.0 object"
 msgstr "Gwrthrych StarWriter/Master 4.0"
 
-#: strings.hrc:50
+#: include/svtools/strings.hrc:50
 msgctxt "STR_FORMAT_ID_STARWRITERGLOB_50"
 msgid "StarWriter/Master 5.0 object"
 msgstr "Gwrthrych StarWriter/Master 5.0"
 
-#: strings.hrc:51
+#: include/svtools/strings.hrc:51
 msgctxt "STR_FORMAT_ID_STARDRAW"
 msgid "StarDraw object"
 msgstr "Gwrthrych StarDraw"
 
-#: strings.hrc:52
+#: include/svtools/strings.hrc:52
 msgctxt "STR_FORMAT_ID_STARDRAW_40"
 msgid "StarDraw 4.0 object"
 msgstr "Gwrthrych StarDraw 4.0"
 
-#: strings.hrc:53
+#: include/svtools/strings.hrc:53
 msgctxt "STR_FORMAT_ID_STARIMPRESS_50"
 msgid "StarImpress 5.0 object"
 msgstr "Gwrthrych StarImpress 5.0"
 
-#: strings.hrc:54
+#: include/svtools/strings.hrc:54
 msgctxt "STR_FORMAT_ID_STARDRAW_50"
 msgid "StarDraw 5.0 object"
 msgstr "Gwrthrych StarDraw 5.0"
 
-#: strings.hrc:55
+#: include/svtools/strings.hrc:55
 msgctxt "STR_FORMAT_ID_STARCALC"
 msgid "StarCalc object"
 msgstr "Gwrthrych StarCalc"
 
-#: strings.hrc:56
+#: include/svtools/strings.hrc:56
 msgctxt "STR_FORMAT_ID_STARCALC_40"
 msgid "StarCalc  4.0 object"
 msgstr "Gwrthrych StarCalc  4.0"
 
-#: strings.hrc:57
+#: include/svtools/strings.hrc:57
 msgctxt "STR_FORMAT_ID_STARCALC_50"
 msgid "StarCalc 5.0 object"
 msgstr "Gwrthrych StarCalc 5.0"
 
-#: strings.hrc:58
+#: include/svtools/strings.hrc:58
 msgctxt "STR_FORMAT_ID_STARCHART"
 msgid "StarChart object"
 msgstr "Gwrthrych StarChart"
 
-#: strings.hrc:59
+#: include/svtools/strings.hrc:59
 msgctxt "STR_FORMAT_ID_STARCHART_40"
 msgid "StarChart 4.0 object"
 msgstr "Gwrthrych StarChart 4.0"
 
-#: strings.hrc:60
+#: include/svtools/strings.hrc:60
 msgctxt "STR_FORMAT_ID_STARCHART_50"
 msgid "StarChart 5.0 object"
 msgstr "Gwrthrych StarChart 5.0"
 
-#: strings.hrc:61
+#: include/svtools/strings.hrc:61
 msgctxt "STR_FORMAT_ID_STARIMAGE"
 msgid "StarImage object"
 msgstr "Gwrthrych StarImage"
 
-#: strings.hrc:62
+#: include/svtools/strings.hrc:62
 msgctxt "STR_FORMAT_ID_STARIMAGE_40"
 msgid "StarImage 4.0 object"
 msgstr "Gwrthrych StarImage 4.0"
 
-#: strings.hrc:63
+#: include/svtools/strings.hrc:63
 msgctxt "STR_FORMAT_ID_STARIMAGE_50"
 msgid "StarImage 5.0 object"
 msgstr "Gwrthrych StarImage 5.0"
 
-#: strings.hrc:64
+#: include/svtools/strings.hrc:64
 msgctxt "STR_FORMAT_ID_STARMATH"
 msgid "StarMath object"
 msgstr "Gwrthrych StarMath"
 
-#: strings.hrc:65
+#: include/svtools/strings.hrc:65
 msgctxt "STR_FORMAT_ID_STARMATH_40"
 msgid "StarMath 4.0 object"
 msgstr "Gwrthrych StarMath 4.0"
 
-#: strings.hrc:66
+#: include/svtools/strings.hrc:66
 msgctxt "STR_FORMAT_ID_STARMATH_50"
 msgid "StarMath 5.0 object"
 msgstr "Gwrthrych StarMath 5.0"
 
-#: strings.hrc:67
+#: include/svtools/strings.hrc:67
 msgctxt "STR_FORMAT_ID_STAROBJECT_PAINTDOC"
 msgid "StarObject Paint object"
 msgstr "Gwrthrych StarObject Paint"
 
-#: strings.hrc:68
+#: include/svtools/strings.hrc:68
 msgctxt "STR_FORMAT_ID_HTML"
-msgid "HTML (HyperText Markup Language)"
-msgstr "HTML (HyperText Markup Language)"
+msgid "HyperText Markup Language (HTML)"
+msgstr "HyperText Markup Language (HTML)"
 
-#: strings.hrc:69
+#: include/svtools/strings.hrc:69
 msgctxt "STR_FORMAT_ID_HTML_SIMPLE"
-msgid "HTML format"
-msgstr "Fformat HTML"
+msgid "Stripped HyperText Markup Language (Simple HTML)"
+msgstr "Stripped HyperText Markup Language (Simple HTML)"
 
-#: strings.hrc:70
+#: include/svtools/strings.hrc:70
 msgctxt "STR_FORMAT_ID_BIFF_5"
-msgid "Biff5 (Microsoft Excel 5.0/95)"
-msgstr "Biff5 (Microsoft Excel 5.0/95)"
+msgid "Microsoft Excel Binary Interchange Format 5.0/95 (Biff5)"
+msgstr "Microsoft Excel Binary Interchange Format 5.0/95 (Biff5)"
 
-#: strings.hrc:71
+#: include/svtools/strings.hrc:71
 msgctxt "STR_FORMAT_ID_BIFF_8"
-msgid "Biff8 (Microsoft Excel 97/2000/XP/2003)"
-msgstr "Biff8 (Microsoft Excel 97/2000/XP/2003)"
+msgid "Microsoft Excel Binary Interchange Format 97/2000/XP/2003 (Biff8)"
+msgstr "Microsoft Excel Binary Interchange Format 97/2000/XP/2003 (Biff8)"
 
-#: strings.hrc:72
+#: include/svtools/strings.hrc:72
 msgctxt "STR_FORMAT_ID_SYLK"
 msgid "Sylk"
 msgstr "Sylk"
 
-#: strings.hrc:73
+#: include/svtools/strings.hrc:73
 msgctxt "STR_FORMAT_ID_LINK"
-msgid "DDE link"
-msgstr "Cysylltiad DDE"
+msgid "Dynamic Data Exchange (DDE link)"
+msgstr "Dynamic Data Exchange (DDE link)"
 
-#: strings.hrc:74
+#: include/svtools/strings.hrc:74
 msgctxt "STR_FORMAT_ID_DIF"
-msgid "DIF"
-msgstr "DIF"
+msgid "Data Interchange Format (DIF)"
+msgstr "Data Interchange Format (DIF)"
 
-#: strings.hrc:75
+#: include/svtools/strings.hrc:75
 msgctxt "STR_FORMAT_ID_MSWORD_DOC"
 msgid "Microsoft Word object"
 msgstr "Gwrthrych Microsoft Word"
 
-#: strings.hrc:76
+#: include/svtools/strings.hrc:76
 msgctxt "STR_FORMAT_ID_STAR_FRAMESET_DOC"
 msgid "StarFrameSet object"
 msgstr "Gwrthrych StarFrameSet"
 
-#: strings.hrc:77
+#: include/svtools/strings.hrc:77
 msgctxt "STR_FORMAT_ID_OFFICE_DOC"
 msgid "Office document object"
 msgstr "Gwrthrych dogfen Swyddfa"
 
-#: strings.hrc:78
+#: include/svtools/strings.hrc:78
 msgctxt "STR_FORMAT_ID_NOTES_DOCINFO"
 msgid "Notes document info"
 msgstr "Nodiadau gwybodaeth dogfen"
 
-#: strings.hrc:79
+#: include/svtools/strings.hrc:79
 msgctxt "STR_FORMAT_ID_SFX_DOC"
 msgid "Sfx document"
 msgstr "Dogfen sfx"
 
-#: strings.hrc:80
+#: include/svtools/strings.hrc:80
 msgctxt "STR_FORMAT_ID_STARCHARTDOCUMENT_50"
 msgid "StarChart 5.0 object"
 msgstr "Gwrthrych StarChart 5.0"
 
-#: strings.hrc:81
+#: include/svtools/strings.hrc:81
 msgctxt "STR_FORMAT_ID_GRAPHOBJ"
 msgid "Graphic object"
 msgstr "Gwrthrych graffig"
 
-#: strings.hrc:82
+#: include/svtools/strings.hrc:82
 msgctxt "STR_FORMAT_ID_STARWRITER_60"
 msgid "OpenOffice.org 1.0 Writer object"
 msgstr "Gwrthrych Writer OpenOffice.org 1.0"
 
-#: strings.hrc:83
+#: include/svtools/strings.hrc:83
 msgctxt "STR_FORMAT_ID_STARWRITERWEB_60"
 msgid "OpenOffice.org 1.0 Writer/Web object"
 msgstr "Gwrthrych Writer OpenOffice.org 1.0"
 
-#: strings.hrc:84
+#: include/svtools/strings.hrc:84
 msgctxt "STR_FORMAT_ID_STARWRITERGLOB_60"
 msgid "OpenOffice.org 1.0 Writer/Master object"
 msgstr "Prif Wrthrych/Dogfen OpenOffice.org 1.0"
 
-#: strings.hrc:85
+#: include/svtools/strings.hrc:85
 msgctxt "STR_FORMAT_ID_STARDRAW_60"
 msgid "OpenOffice.org 1.0 Draw object"
 msgstr "Gwrthrych Lluniadu OpenOffice.org 1.0"
 
-#: strings.hrc:86
+#: include/svtools/strings.hrc:86
 msgctxt "STR_FORMAT_ID_STARIMPRESS_60"
 msgid "OpenOffice.org 1.0 Impress object"
 msgstr "Gwrthrych Impress OpenOffice.org 1.0"
 
-#: strings.hrc:87
+#: include/svtools/strings.hrc:87
 msgctxt "STR_FORMAT_ID_STARCALC_60"
 msgid "OpenOffice.org 1.0 Calc object"
 msgstr "Gwrthrych Calc OpenOffice.org 1.0"
 
-#: strings.hrc:88
+#: include/svtools/strings.hrc:88
 msgctxt "STR_FORMAT_ID_STARCHART_60"
 msgid "OpenOffice.org 1.0 Chart object"
 msgstr "Gwrthtych Siart OpenOffice.org 1.0"
 
-#: strings.hrc:89
+#: include/svtools/strings.hrc:89
 msgctxt "STR_FORMAT_ID_STARMATH_60"
 msgid "OpenOffice.org 1.0 Math object"
 msgstr "Gwrthrych Math Adroddiad OpenOffice.org 1.0"
 
-#: strings.hrc:90
+#: include/svtools/strings.hrc:90
 msgctxt "STR_FORMAT_ID_WMF"
 msgid "Windows metafile"
 msgstr "Metaffeil Windows"
 
-#: strings.hrc:91
+#: include/svtools/strings.hrc:91
 msgctxt "STR_FORMAT_ID_DBACCESS_QUERY"
 msgid "Data source object"
 msgstr "Gwrthrych ffynhonnell data"
 
-#: strings.hrc:92
+#: include/svtools/strings.hrc:92
 msgctxt "STR_FORMAT_ID_DBACCESS_TABLE"
 msgid "Data source table"
 msgstr "Tabl ffynhonnell data"
 
-#: strings.hrc:93
+#: include/svtools/strings.hrc:93
 msgctxt "STR_FORMAT_ID_DBACCESS_COMMAND"
 msgid "SQL query"
 msgstr "Ymholiad SQL"
 
-#: strings.hrc:94
+#: include/svtools/strings.hrc:94
 msgctxt "STR_FORMAT_ID_DIALOG_60"
 msgid "OpenOffice.org 1.0 dialog"
 msgstr "Deialog OpenOffice.org 1.0"
 
-#: strings.hrc:95
+#: include/svtools/strings.hrc:95
 msgctxt "STR_FORMAT_ID_FILEGRPDESCRIPTOR"
 msgid "Link"
 msgstr "Cysylltiad"
 
-#: strings.hrc:96
+#: include/svtools/strings.hrc:96
 msgctxt "STR_FORMAT_ID_HTML_NO_COMMENT"
 msgid "HTML format without comments"
 msgstr "Fformat HTML heb sylwadau"
 
-#: strings.hrc:97
+#: include/svtools/strings.hrc:97
 msgctxt "STR_FORMAT_ID_PNG_BITMAP"
-msgid "PNG Bitmap"
-msgstr "Didfap PNG"
+msgid "Portable Network Graphic (PNG)"
+msgstr "Portable Network Graphic (PNG)"
 
-#: strings.hrc:99
+#: include/svtools/strings.hrc:99
 #, c-format
 msgctxt "STR_ERROR_OBJNOCREATE"
 msgid "Object % could not be inserted."
 msgstr "Methu mewnosod gwrthrych %."
 
-#: strings.hrc:100
+#: include/svtools/strings.hrc:100
 #, c-format
 msgctxt "STR_ERROR_OBJNOCREATE_FROM_FILE"
 msgid "Object from file % could not be inserted."
 msgstr "Methu mewnosod gwrthrych o ffeil %."
 
-#: strings.hrc:101
-#, c-format
-msgctxt "STR_ERROR_OBJNOCREATE_PLUGIN"
-msgid "Plug-in from document % could not be inserted."
-msgstr "Wedi methu mewnosod ategyn o ddogfen %."
-
-#: strings.hrc:102
+#: include/svtools/strings.hrc:101
 msgctxt "STR_FURTHER_OBJECT"
 msgid "Further objects"
 msgstr "Gwrthrychau eraill"
 
-#: strings.hrc:103
+#: include/svtools/strings.hrc:102
 msgctxt "STR_UNKNOWN_SOURCE"
 msgid "Unknown source"
 msgstr "Ffynhonnell anhysbys"
 
-#: strings.hrc:105
+#: include/svtools/strings.hrc:104
 msgctxt "STR_SVT_FILEVIEW_COLUMN_TITLE"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:106
+#: include/svtools/strings.hrc:105
 msgctxt "STR_SVT_FILEVIEW_COLUMN_SIZE"
 msgid "Size"
 msgstr "Maint"
 
-#: strings.hrc:107
+#: include/svtools/strings.hrc:106
 msgctxt "STR_SVT_FILEVIEW_COLUMN_DATE"
 msgid "Date modified"
 msgstr "Dyddiad newidiwyd"
 
-#: strings.hrc:108
+#: include/svtools/strings.hrc:107
 msgctxt "STR_SVT_FILEVIEW_COLUMN_TYPE"
 msgid "Type"
 msgstr "Math"
 
-#: strings.hrc:109
+#: include/svtools/strings.hrc:108
 msgctxt "STR_SVT_BYTES"
 msgid "Bytes"
 msgstr "Beitiau"
 
-#: strings.hrc:110
+#: include/svtools/strings.hrc:109
 msgctxt "STR_SVT_KB"
 msgid "KB"
 msgstr "KB"
 
-#: strings.hrc:111
+#: include/svtools/strings.hrc:110
 msgctxt "STR_SVT_MB"
 msgid "MB"
 msgstr "MB"
 
-#: strings.hrc:112
+#: include/svtools/strings.hrc:111
 msgctxt "STR_SVT_GB"
 msgid "GB"
 msgstr "GB"
 
 #. descriptions of accessible objects
-#: strings.hrc:115
+#: include/svtools/strings.hrc:114
 msgctxt "STR_SVT_ACC_DESC_TABLISTBOX"
 msgid "Row: %1, Column: %2"
 msgstr "Rhes: %1, Colofn: %2"
 
-#: strings.hrc:116
+#: include/svtools/strings.hrc:115
 msgctxt "STR_SVT_ACC_DESC_FILEVIEW"
 msgid ", Type: %1, URL: %2"
 msgstr ", Math: %1, URL: %2"
 
-#: strings.hrc:117
+#: include/svtools/strings.hrc:116
 msgctxt "STR_SVT_ACC_DESC_FOLDER"
 msgid "Folder"
 msgstr "Ffolder"
 
-#: strings.hrc:118
+#: include/svtools/strings.hrc:117
 msgctxt "STR_SVT_ACC_DESC_FILE"
 msgid "File"
 msgstr "Ffeil"
 
-#: strings.hrc:119
+#: include/svtools/strings.hrc:118
 msgctxt "STR_SVT_ACC_EMPTY_FIELD"
 msgid "Empty Field"
 msgstr "Maes Gwag"
 
 #. * resources for CollatorResource / CollatorResourceData resp.
 #. alphanumeric sorting algorithm
-#: strings.hrc:125
+#: include/svtools/strings.hrc:124
 msgctxt "STR_SVT_COLLATE_ALPHANUMERIC"
 msgid "Alphanumeric"
 msgstr "Alffaniwmerig"
 
 #. default or normal sorting algorithm
-#: strings.hrc:127
+#: include/svtools/strings.hrc:126
 msgctxt "STR_SVT_COLLATE_NORMAL"
 msgid "Normal"
 msgstr "Normal"
 
 #. default or normal sorting algorithm
-#: strings.hrc:129
+#: include/svtools/strings.hrc:128
 msgctxt "STR_SVT_COLLATE_CHARSET"
 msgid "Character set"
 msgstr "Set nod"
 
 #. german dictionary word order / sorting
-#: strings.hrc:131
+#: include/svtools/strings.hrc:130
 msgctxt "STR_SVT_COLLATE_DICTIONARY"
 msgid "Dictionary"
 msgstr "Geiriadur"
 
 #. chinese sorting algorithm
-#: strings.hrc:133
+#: include/svtools/strings.hrc:132
 msgctxt "STR_SVT_COLLATE_PINYIN"
 msgid "Pinyin"
 msgstr "Pinyin"
 
 #. chinese sorting algorithm
-#: strings.hrc:135
+#: include/svtools/strings.hrc:134
 msgctxt "STR_SVT_COLLATE_STROKE"
 msgid "Stroke"
 msgstr "Trawiad"
 
 #. chinese sorting algorithm
-#: strings.hrc:137
+#: include/svtools/strings.hrc:136
 msgctxt "STR_SVT_COLLATE_RADICAL"
 msgid "Radical"
 msgstr "Radical"
 
 #. sorting according to the unicode code point of the character
-#: strings.hrc:139
+#: include/svtools/strings.hrc:138
 msgctxt "STR_SVT_COLLATE_UNICODE"
 msgid "Unicode"
 msgstr "Unicode"
 
 #. chinese sorting algorithm
-#: strings.hrc:141
+#: include/svtools/strings.hrc:140
 msgctxt "STR_SVT_COLLATE_ZHUYIN"
 msgid "Zhuyin"
 msgstr "Zhuyin"
 
 #. phone book sorting algorithm. e.g. German
-#: strings.hrc:143
+#: include/svtools/strings.hrc:142
 msgctxt "STR_SVT_COLLATE_PHONEBOOK"
 msgid "Phone book"
 msgstr "Llyfr ffôn"
 
-#: strings.hrc:144
+#: include/svtools/strings.hrc:143
 msgctxt "STR_SVT_COLLATE_PHONETIC_F"
 msgid "Phonetic (alphanumeric first)"
 msgstr "Seinegol (alffaniwmerig gyntaf)"
 
-#: strings.hrc:145
+#: include/svtools/strings.hrc:144
 msgctxt "STR_SVT_COLLATE_PHONETIC_L"
 msgid "Phonetic (alphanumeric last)"
 msgstr "Seinegol (alffaniwmerig olaf)"
 
 #. alphanumeric indexentry algorithm
-#: strings.hrc:147
+#: include/svtools/strings.hrc:146
 msgctxt "STR_SVT_INDEXENTRY_ALPHANUMERIC"
 msgid "Alphanumeric"
 msgstr "Alffaniwmerig"
 
 #. korean dictionary indexentry algorithm
-#: strings.hrc:149
+#: include/svtools/strings.hrc:148
 msgctxt "STR_SVT_INDEXENTRY_DICTIONARY"
 msgid "Dictionary"
 msgstr "Geiriadur"
 
 #. chinese sorting algorithm
-#: strings.hrc:151
+#: include/svtools/strings.hrc:150
 msgctxt "STR_SVT_INDEXENTRY_PINYIN"
 msgid "Pinyin"
 msgstr "Pinyin"
 
 #. chinese indexentry algorithm
-#: strings.hrc:153
+#: include/svtools/strings.hrc:152
 msgctxt "STR_SVT_INDEXENTRY_RADICAL"
 msgid "Radical"
 msgstr "Radical"
 
 #. chinese indexentry algorithm
-#: strings.hrc:155
+#: include/svtools/strings.hrc:154
 msgctxt "STR_SVT_INDEXENTRY_STROKE"
 msgid "Stroke"
 msgstr "Trawiad"
 
 #. chinese indexentry algorithm
-#: strings.hrc:157
+#: include/svtools/strings.hrc:156
 msgctxt "STR_SVT_INDEXENTRY_ZHUYIN"
 msgid "Zhuyin"
 msgstr "Zhuyin"
 
-#: strings.hrc:158
+#: include/svtools/strings.hrc:157
 msgctxt "STR_SVT_INDEXENTRY_PHONETIC_FS"
 msgid "Phonetic (alphanumeric first, grouped by syllables)"
 msgstr "Seinegol (alffaniwmerig gyntaf, grwpio yn ôl sillaf)"
 
-#: strings.hrc:159
+#: include/svtools/strings.hrc:158
 msgctxt "STR_SVT_INDEXENTRY_PHONETIC_FC"
 msgid "Phonetic (alphanumeric first, grouped by consonants)"
 msgstr "Seinegol (alffaniwmerig gyntaf, grwpio yn ôl cytseiniaid)"
 
-#: strings.hrc:160
+#: include/svtools/strings.hrc:159
 msgctxt "STR_SVT_INDEXENTRY_PHONETIC_LS"
 msgid "Phonetic (alphanumeric last, grouped by syllables)"
 msgstr "Seinegol (alffaniwmerig olaf, grwpio yn ôl sillafau)"
 
-#: strings.hrc:161
+#: include/svtools/strings.hrc:160
 msgctxt "STR_SVT_INDEXENTRY_PHONETIC_LC"
 msgid "Phonetic (alphanumeric last, grouped by consonants)"
 msgstr "Seinegol (alffaniwmerig gyntaf, grwpio yn ôl cytseiniaid)"
 
-#: strings.hrc:163
+#: include/svtools/strings.hrc:162
 msgctxt "STR_SVT_CALENDAR_DAY"
 msgid "Day"
 msgstr "Diwrnod"
 
-#: strings.hrc:164
+#: include/svtools/strings.hrc:163
 msgctxt "STR_SVT_CALENDAR_WEEK"
 msgid "Week"
 msgstr "Wythnos"
 
-#: strings.hrc:165
+#: include/svtools/strings.hrc:164
 msgctxt "STR_SVT_CALENDAR_TODAY"
 msgid "Today"
 msgstr "Heddiw"
 
-#: strings.hrc:166
+#: include/svtools/strings.hrc:165
 msgctxt "STR_SVT_CALENDAR_NONE"
 msgid "None"
 msgstr "Dim"
 
-#: strings.hrc:168
+#: include/svtools/strings.hrc:167
 msgctxt "STR_SVT_STYLE_LIGHT"
 msgid "Light"
 msgstr "Ysgafn"
 
-#: strings.hrc:169
+#: include/svtools/strings.hrc:168
 msgctxt "STR_SVT_STYLE_LIGHT_ITALIC"
 msgid "Light Italic"
 msgstr "Italig Ysgafn"
 
-#: strings.hrc:170
+#: include/svtools/strings.hrc:169
 msgctxt "STR_SVT_STYLE_NORMAL"
 msgid "Regular"
 msgstr "Arferol"
 
-#: strings.hrc:171
+#: include/svtools/strings.hrc:170
 msgctxt "STR_SVT_STYLE_NORMAL_ITALIC"
 msgid "Italic"
 msgstr "Italig"
 
-#: strings.hrc:172
+#: include/svtools/strings.hrc:171
 msgctxt "STR_SVT_STYLE_BOLD"
 msgid "Bold"
 msgstr "Trwm"
 
-#: strings.hrc:173
+#: include/svtools/strings.hrc:172
 msgctxt "STR_SVT_STYLE_BOLD_ITALIC"
 msgid "Bold Italic"
 msgstr "Italig Trwm"
 
-#: strings.hrc:174
+#: include/svtools/strings.hrc:173
 msgctxt "STR_SVT_STYLE_BLACK"
 msgid "Black"
 msgstr "Du"
 
-#: strings.hrc:175
+#: include/svtools/strings.hrc:174
 msgctxt "STR_SVT_STYLE_BLACK_ITALIC"
 msgid "Black Italic"
 msgstr "Italig Du"
 
-#: strings.hrc:176
+#: include/svtools/strings.hrc:175
 msgctxt "STR_SVT_STYLE_BOOK"
 msgid "Book"
 msgstr "Llyfr"
 
-#: strings.hrc:177
+#: include/svtools/strings.hrc:176
 msgctxt "STR_SVT_STYLE_BOLD_OBLIQUE"
 msgid "Bold Oblique"
 msgstr "Trwm Arosgo"
 
-#: strings.hrc:178
+#: include/svtools/strings.hrc:177
 msgctxt "STR_SVT_STYLE_CONDENSED"
 msgid "Condensed"
 msgstr "Cywasgedig"
 
-#: strings.hrc:179
+#: include/svtools/strings.hrc:178
 msgctxt "STR_SVT_STYLE_CONDENSED_BOLD"
 msgid "Condensed Bold"
 msgstr "Cywasgedig Trwm"
 
-#: strings.hrc:180
+#: include/svtools/strings.hrc:179
 msgctxt "STR_SVT_STYLE_CONDENSED_BOLD_ITALIC"
 msgid "Condensed Bold Italic"
 msgstr "Italig Trwm Cywasgedig"
 
-#: strings.hrc:181
+#: include/svtools/strings.hrc:180
 msgctxt "STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE"
 msgid "Condensed Bold Oblique"
 msgstr "Arosgo Trwm Cywasgedig"
 
-#: strings.hrc:182
+#: include/svtools/strings.hrc:181
 msgctxt "STR_SVT_STYLE_CONDENSED_ITALIC"
 msgid "Condensed Italic"
 msgstr "Italig Cywasgedig"
 
-#: strings.hrc:183
+#: include/svtools/strings.hrc:182
 msgctxt "STR_SVT_STYLE_CONDENSED_OBLIQUE"
 msgid "Condensed Oblique"
 msgstr "Arosgo Cywasgedig"
 
-#: strings.hrc:184
+#: include/svtools/strings.hrc:183
 msgctxt "STR_SVT_STYLE_EXTRALIGHT"
 msgid "ExtraLight"
 msgstr "Ysgafn Iawn"
 
-#: strings.hrc:185
+#: include/svtools/strings.hrc:184
 msgctxt "STR_SVT_STYLE_EXTRALIGHT_ITALIC"
 msgid "ExtraLight Italic"
 msgstr "Italig Ysgafn Iawn"
 
-#: strings.hrc:186
+#: include/svtools/strings.hrc:185
 msgctxt "STR_SVT_STYLE_OBLIQUE"
 msgid "Oblique"
 msgstr "Arosgo"
 
-#: strings.hrc:187
+#: include/svtools/strings.hrc:186
 msgctxt "STR_SVT_STYLE_SEMIBOLD"
 msgid "Semibold"
 msgstr "Hanner Trwm"
 
-#: strings.hrc:188
+#: include/svtools/strings.hrc:187
 msgctxt "STR_SVT_STYLE_SEMIBOLD_ITALIC"
 msgid "Semibold Italic"
 msgstr "Italig Hanner Trwm"
 
-#: strings.hrc:189
+#: include/svtools/strings.hrc:188
 msgctxt "STR_SVT_FONTMAP_BOTH"
 msgid "The same font will be used on both your printer and your screen."
 msgstr "Bydd yr un ffont yn cael ei ddefnyddio yn eich argraffydd a'ch sgrin."
 
-#: strings.hrc:190
+#: include/svtools/strings.hrc:189
 msgctxt "STR_SVT_FONTMAP_PRINTERONLY"
 msgid "This is a printer font. The screen image may differ."
 msgstr "Dyma ffont yr argraffydd. Efallai bydd y ddelwedd ar y sgrin yn wahanol."
 
-#: strings.hrc:191
+#: include/svtools/strings.hrc:190
 msgctxt "STR_SVT_FONTMAP_STYLENOTAVAILABLE"
 msgid "This font style will be simulated or the closest matching style will be used."
 msgstr "Bydd arddull y ffont yn cael ei efelychu neu bydd yr arddull ffont agosaf yn cael ei ddefnyddio."
 
-#: strings.hrc:192
+#: include/svtools/strings.hrc:191
 msgctxt "STR_SVT_FONTMAP_NOTAVAILABLE"
 msgid "This font has not been installed. The closest available font will be used."
 msgstr "Nid yw'r ffont wedi ei osod. Bydd yr agosaf yn cael ei ddefnyddio."
 
-#: strings.hrc:194
+#: include/svtools/strings.hrc:193
 msgctxt "STR_FILECTRL_BUTTONTEXT"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: strings.hrc:195
+#: include/svtools/strings.hrc:194
 msgctxt "STR_TABBAR_PUSHBUTTON_MOVET0HOME"
 msgid "Move To Home"
 msgstr "Symud i Cartref"
 
-#: strings.hrc:196
+#: include/svtools/strings.hrc:195
 msgctxt "STR_TABBAR_PUSHBUTTON_MOVELEFT"
 msgid "Move Left"
 msgstr "Symud i'r Chwith"
 
-#: strings.hrc:197
+#: include/svtools/strings.hrc:196
 msgctxt "STR_TABBAR_PUSHBUTTON_MOVERIGHT"
 msgid "Move Right"
 msgstr "Symud i'r Dde"
 
-#: strings.hrc:198
+#: include/svtools/strings.hrc:197
 msgctxt "STR_TABBAR_PUSHBUTTON_MOVETOEND"
 msgid "Move To End"
 msgstr "Symud i'r Diwedd"
 
-#: strings.hrc:199
+#: include/svtools/strings.hrc:198
 msgctxt "STR_TABBAR_PUSHBUTTON_ADDTAB"
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: strings.hrc:201
+#: include/svtools/strings.hrc:200
 msgctxt "STR_SVT_ACC_RULER_HORZ_NAME"
 msgid "Horizontal Ruler"
 msgstr "Mesurydd Llorweddol"
 
-#: strings.hrc:202
+#: include/svtools/strings.hrc:201
 msgctxt "STR_SVT_ACC_RULER_VERT_NAME"
 msgid "Vertical Ruler"
 msgstr "Mesurydd Fertigol"
 
-#: strings.hrc:204
+#: include/svtools/strings.hrc:203
 msgctxt "STR_SVT_1BIT_THRESHOLD"
 msgid "1 bit threshold"
 msgstr "Trothwy 1 did"
 
-#: strings.hrc:205
+#: include/svtools/strings.hrc:204
 msgctxt "STR_SVT_1BIT_DITHERED"
 msgid "1 bit dithered"
 msgstr "Diddrwyd 1 did"
 
-#: strings.hrc:206
+#: include/svtools/strings.hrc:205
 msgctxt "STR_SVT_4BIT_GRAYSCALE"
 msgid "4 bit grayscale"
 msgstr "Graddlwyd 4 did"
 
-#: strings.hrc:207
+#: include/svtools/strings.hrc:206
 msgctxt "STR_SVT_4BIT_COLOR_PALETTE"
 msgid "4 bit color"
 msgstr "4 did lliw"
 
-#: strings.hrc:208
+#: include/svtools/strings.hrc:207
 msgctxt "STR_SVT_8BIT_GRAYSCALE"
 msgid "8 bit grayscale"
 msgstr "Graddlwyd 8 did"
 
-#: strings.hrc:209
+#: include/svtools/strings.hrc:208
 msgctxt "STR_SVT_8BIT_COLOR_PALETTE"
 msgid "8 bit color"
 msgstr "8 did lliw"
 
-#: strings.hrc:210
+#: include/svtools/strings.hrc:209
 msgctxt "STR_SVT_24BIT_TRUE_COLOR"
 msgid "24 bit true color"
 msgstr "Gwir liw 24 did"
 
-#: strings.hrc:211
+#: include/svtools/strings.hrc:210
 msgctxt "STR_SVT_ESTIMATED_SIZE_PIX_1"
 msgid "The image needs about %1 KB of memory."
 msgstr "Mae'r ddelwedd angen %1 KB o gof."
 
-#: strings.hrc:212
+#: include/svtools/strings.hrc:211
 msgctxt "STR_SVT_ESTIMATED_SIZE_PIX_2"
 msgid "The image needs about %1 KB of memory, the file size is %2 KB."
 msgstr "Mae'r ddelwedd angen tua %1 KB o gof, mae'r ffeil yn %2 KB o faint."
 
-#: strings.hrc:213
+#: include/svtools/strings.hrc:212
 msgctxt "STR_SVT_ESTIMATED_SIZE_VEC"
 msgid "The file size is %1 KB."
 msgstr "Maint ffeil yw %1 KB."
 
-#: strings.hrc:214
+#: include/svtools/strings.hrc:213
 msgctxt "STR_SVT_HOST"
 msgid "host"
 msgstr "gwesteiwr"
 
-#: strings.hrc:215
+#: include/svtools/strings.hrc:214
 msgctxt "STR_SVT_PORT"
 msgid "port"
 msgstr "porth"
 
-#: strings.hrc:216
+#: include/svtools/strings.hrc:215
 msgctxt "STR_SVT_OTHER_CMIS"
 msgid "Other CMIS"
 msgstr "CMIS arall"
 
-#: strings.hrc:217
+#: include/svtools/strings.hrc:216
 msgctxt "STR_SVT_PRNDLG_READY"
 msgid "Ready"
 msgstr "Parod"
 
-#: strings.hrc:218
+#: include/svtools/strings.hrc:217
 msgctxt "STR_SVT_PRNDLG_PAUSED"
 msgid "Paused"
 msgstr "Oedi"
 
-#: strings.hrc:219
+#: include/svtools/strings.hrc:218
 msgctxt "STR_SVT_PRNDLG_PENDING"
 msgid "Pending deletion"
 msgstr "Disgwyl dileu"
 
-#: strings.hrc:220
+#: include/svtools/strings.hrc:219
 msgctxt "STR_SVT_PRNDLG_BUSY"
 msgid "Busy"
 msgstr "Prysur"
 
-#: strings.hrc:221
+#: include/svtools/strings.hrc:220
 msgctxt "STR_SVT_PRNDLG_INITIALIZING"
 msgid "Initializing"
 msgstr "Cychwyn"
 
-#: strings.hrc:222
+#: include/svtools/strings.hrc:221
 msgctxt "STR_SVT_PRNDLG_WAITING"
 msgid "Waiting"
 msgstr "Disgwyl"
 
-#: strings.hrc:223
+#: include/svtools/strings.hrc:222
 msgctxt "STR_SVT_PRNDLG_WARMING_UP"
 msgid "Warming up"
 msgstr "Cynhesu"
 
-#: strings.hrc:224
+#: include/svtools/strings.hrc:223
 msgctxt "STR_SVT_PRNDLG_PROCESSING"
 msgid "Processing"
 msgstr "Prosesu"
 
-#: strings.hrc:225
+#: include/svtools/strings.hrc:224
 msgctxt "STR_SVT_PRNDLG_PRINTING"
 msgid "Printing"
 msgstr "Argraffu"
 
-#: strings.hrc:226
+#: include/svtools/strings.hrc:225
 msgctxt "STR_SVT_PRNDLG_OFFLINE"
 msgid "Offline"
 msgstr "All-lein"
 
-#: strings.hrc:227
+#: include/svtools/strings.hrc:226
 msgctxt "STR_SVT_PRNDLG_ERROR"
 msgid "Error"
 msgstr "Gwall"
 
-#: strings.hrc:228
+#: include/svtools/strings.hrc:227
 msgctxt "STR_SVT_PRNDLG_SERVER_UNKNOWN"
 msgid "Unknown Server"
 msgstr "Gweinyddwr anhysbys"
 
-#: strings.hrc:229
+#: include/svtools/strings.hrc:228
 msgctxt "STR_SVT_PRNDLG_PAPER_JAM"
 msgid "Paper jam"
 msgstr "Tagfa papur"
 
-#: strings.hrc:230
+#: include/svtools/strings.hrc:229
 msgctxt "STR_SVT_PRNDLG_PAPER_OUT"
 msgid "Not enough paper"
 msgstr "Dim digon o bapur"
 
-#: strings.hrc:231
+#: include/svtools/strings.hrc:230
 msgctxt "STR_SVT_PRNDLG_MANUAL_FEED"
 msgid "Manual feed"
 msgstr "Bwydo gyda llaw"
 
-#: strings.hrc:232
+#: include/svtools/strings.hrc:231
 msgctxt "STR_SVT_PRNDLG_PAPER_PROBLEM"
 msgid "Paper problem"
 msgstr "Problem papur"
 
-#: strings.hrc:233
+#: include/svtools/strings.hrc:232
 msgctxt "STR_SVT_PRNDLG_IO_ACTIVE"
 msgid "I/O active"
 msgstr "I/O'n weithredol"
 
-#: strings.hrc:234
+#: include/svtools/strings.hrc:233
 msgctxt "STR_SVT_PRNDLG_OUTPUT_BIN_FULL"
 msgid "Output bin full"
 msgstr "Bin allbwn yn llawn"
 
-#: strings.hrc:235
+#: include/svtools/strings.hrc:234
 msgctxt "STR_SVT_PRNDLG_TONER_LOW"
 msgid "Toner low"
 msgstr "Toner yn isel"
 
-#: strings.hrc:236
+#: include/svtools/strings.hrc:235
 msgctxt "STR_SVT_PRNDLG_NO_TONER"
 msgid "No toner"
 msgstr "Dim toner"
 
-#: strings.hrc:237
+#: include/svtools/strings.hrc:236
 msgctxt "STR_SVT_PRNDLG_PAGE_PUNT"
 msgid "Delete Page"
 msgstr "Dileu tudalen"
 
-#: strings.hrc:238
+#: include/svtools/strings.hrc:237
 msgctxt "STR_SVT_PRNDLG_USER_INTERVENTION"
 msgid "User intervention necessary"
 msgstr "Defnyddio ymyrraeth os oes angen"
 
-#: strings.hrc:239
+#: include/svtools/strings.hrc:238
 msgctxt "STR_SVT_PRNDLG_OUT_OF_MEMORY"
 msgid "Insufficient memory"
 msgstr "Dim digon o gof"
 
-#: strings.hrc:240
+#: include/svtools/strings.hrc:239
 msgctxt "STR_SVT_PRNDLG_DOOR_OPEN"
 msgid "Cover open"
 msgstr "Clawr ar agor"
 
-#: strings.hrc:241
+#: include/svtools/strings.hrc:240
 msgctxt "STR_SVT_PRNDLG_POWER_SAVE"
 msgid "Power save mode"
 msgstr "Modd arbed ynni"
 
-#: strings.hrc:242
+#: include/svtools/strings.hrc:241
 msgctxt "STR_SVT_PRNDLG_DEFPRINTER"
 msgid "Default printer"
 msgstr "Argraffydd rhagosodedig"
 
-#: strings.hrc:243
+#: include/svtools/strings.hrc:242
 #, c-format
 msgctxt "STR_SVT_PRNDLG_JOBCOUNT"
 msgid "%d documents"
 msgstr "%d dogfen"
 
-#: strings.hrc:245
+#: include/svtools/strings.hrc:244
 msgctxt "STR_WIZDLG_FINISH"
 msgid "~Finish"
 msgstr "~Gorffen"
 
-#: strings.hrc:246
+#: include/svtools/strings.hrc:245
 msgctxt "STR_WIZDLG_NEXT"
 msgid "~Next >"
 msgstr "~Nesaf >"
 
-#: strings.hrc:247
+#: include/svtools/strings.hrc:246
 msgctxt "STR_WIZDLG_PREVIOUS"
 msgid "< Bac~k"
 msgstr "<~Nôl"
 
-#: strings.hrc:248
+#: include/svtools/strings.hrc:247
 msgctxt "STR_WIZDLG_ROADMAP_TITLE"
 msgid "Steps"
 msgstr "Camau"
 
-#: strings.hrc:250
+#: include/svtools/strings.hrc:249
 msgctxt "STR_NO_FIELD_SELECTION"
 msgid "<none>"
 msgstr "<dim>"
 
-#: strings.hrc:251
+#: include/svtools/strings.hrc:250
 msgctxt "STR_FIELD_COMPANY"
 msgid "Company"
 msgstr "Cwmni"
 
-#: strings.hrc:252
+#: include/svtools/strings.hrc:251
 msgctxt "STR_FIELD_DEPARTMENT"
 msgid "Department"
 msgstr "Adran"
 
-#: strings.hrc:253
+#: include/svtools/strings.hrc:252
 msgctxt "STR_FIELD_FIRSTNAME"
 msgid "First name"
 msgstr "Enw cyntaf"
 
-#: strings.hrc:254
+#: include/svtools/strings.hrc:253
 msgctxt "STR_FIELD_LASTNAME"
 msgid "Last name"
 msgstr "Enw olaf"
 
-#: strings.hrc:255
+#: include/svtools/strings.hrc:254
 msgctxt "STR_FIELD_STREET"
 msgid "Street"
 msgstr "Stryd"
 
-#: strings.hrc:256
+#: include/svtools/strings.hrc:255
 msgctxt "STR_FIELD_COUNTRY"
 msgid "Country"
 msgstr "Gwlad"
 
-#: strings.hrc:257
+#: include/svtools/strings.hrc:256
 msgctxt "STR_FIELD_ZIPCODE"
 msgid "ZIP Code"
 msgstr "Cod Post/ZIP"
 
-#: strings.hrc:258
+#: include/svtools/strings.hrc:257
 msgctxt "STR_FIELD_CITY"
 msgid "City"
 msgstr "Tref/Dinas"
 
-#: strings.hrc:259
+#: include/svtools/strings.hrc:258
 msgctxt "STR_FIELD_TITLE"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:260
+#: include/svtools/strings.hrc:259
 msgctxt "STR_FIELD_POSITION"
 msgid "Position"
 msgstr "Safle"
 
-#: strings.hrc:261
+#: include/svtools/strings.hrc:260
 msgctxt "STR_FIELD_ADDRFORM"
 msgid "Addr. Form"
 msgstr "Ffurflen Cyfeiriad"
 
-#: strings.hrc:262
+#: include/svtools/strings.hrc:261
 msgctxt "STR_FIELD_INITIALS"
 msgid "Initials"
 msgstr "Llythrennau Blaen"
 
-#: strings.hrc:263
+#: include/svtools/strings.hrc:262
 msgctxt "STR_FIELD_SALUTATION"
 msgid "Complimentary close"
 msgstr "Cyfarchion i gloi"
 
-#: strings.hrc:264
+#: include/svtools/strings.hrc:263
 msgctxt "STR_FIELD_HOMETEL"
 msgid "Tel: Home"
 msgstr "Ffôn Cartref"
 
-#: strings.hrc:265
+#: include/svtools/strings.hrc:264
 msgctxt "STR_FIELD_WORKTEL"
 msgid "Tel: Work"
 msgstr "Ffôn Gwaith"
 
-#: strings.hrc:266
+#: include/svtools/strings.hrc:265
 msgctxt "STR_FIELD_FAX"
 msgid "FAX"
 msgstr "FAX"
 
-#: strings.hrc:267
+#: include/svtools/strings.hrc:266
 msgctxt "STR_FIELD_EMAIL"
 msgid "E-mail"
 msgstr "E-bost"
 
-#: strings.hrc:268
+#: include/svtools/strings.hrc:267
 msgctxt "STR_FIELD_URL"
 msgid "URL"
 msgstr "URL"
 
-#: strings.hrc:269
+#: include/svtools/strings.hrc:268
 msgctxt "STR_FIELD_NOTE"
 msgid "Note"
 msgstr "Nodyn"
 
-#: strings.hrc:270
+#: include/svtools/strings.hrc:269
 msgctxt "STR_FIELD_USER1"
 msgid "User 1"
 msgstr "Defnyddiwr 1"
 
-#: strings.hrc:271
+#: include/svtools/strings.hrc:270
 msgctxt "STR_FIELD_USER2"
 msgid "User 2"
 msgstr "Defnyddiwr 2"
 
-#: strings.hrc:272
+#: include/svtools/strings.hrc:271
 msgctxt "STR_FIELD_USER3"
 msgid "User 3"
 msgstr "Defnyddiwr 3"
 
-#: strings.hrc:273
+#: include/svtools/strings.hrc:272
 msgctxt "STR_FIELD_USER4"
 msgid "User 4"
 msgstr "Defnyddiwr 4"
 
-#: strings.hrc:274
+#: include/svtools/strings.hrc:273
 msgctxt "STR_FIELD_ID"
 msgid "ID"
 msgstr "Enw"
 
-#: strings.hrc:275
+#: include/svtools/strings.hrc:274
 msgctxt "STR_FIELD_STATE"
 msgid "State"
 msgstr "Sir/Talaith"
 
-#: strings.hrc:276
+#: include/svtools/strings.hrc:275
 msgctxt "STR_FIELD_OFFICETEL"
 msgid "Tel: Office"
 msgstr "Ffôn Swyddfa"
 
-#: strings.hrc:277
+#: include/svtools/strings.hrc:276
 msgctxt "STR_FIELD_PAGER"
 msgid "Pager"
 msgstr "Swnyn"
 
-#: strings.hrc:278
+#: include/svtools/strings.hrc:277
 msgctxt "STR_FIELD_MOBILE"
 msgid "Mobile"
 msgstr "Symudol"
 
-#: strings.hrc:279
+#: include/svtools/strings.hrc:278
 msgctxt "STR_FIELD_TELOTHER"
 msgid "Tel: Other"
 msgstr "Ffôn Arall"
 
-#: strings.hrc:280
+#: include/svtools/strings.hrc:279
 msgctxt "STR_FIELD_CALENDAR"
 msgid "Calendar"
 msgstr "Calendr"
 
-#: strings.hrc:281
+#: include/svtools/strings.hrc:280
 msgctxt "STR_FIELD_INVITE"
 msgid "Invite"
 msgstr "Gwahoddiad"
 
-#: strings.hrc:283
+#: include/svtools/strings.hrc:282
 msgctxt "STR_SVT_DEFAULT_SERVICE_LABEL"
 msgid "$user$'s $service$"
 msgstr "$user$'s $service$"
 
-#: strings.hrc:285
+#: include/svtools/strings.hrc:284
 msgctxt "STR_WARNING_JAVANOTFOUND"
 msgid "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME."
 msgstr "Mae %PRODUCTNAME angen Java runtime environment (JRE) i gyflawni'r dasg. Gosodwch JRE ac ailgychwyn %PRODUCTNAME."
 
-#: strings.hrc:286
+#: include/svtools/strings.hrc:285
+msgctxt "STR_WARNING_JAVANOTFOUND_WIN"
+msgid "%PRODUCTNAME requires a %BITNESS-bit Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME."
+msgstr "Mae %PRODUCTNAME angen Java runtime environment (JRE) %BITNESS-bit i gyflawni'r dasg. Gosodwch JRE ac ailgychwyn %PRODUCTNAME."
+
+#: include/svtools/strings.hrc:286
 msgctxt "STR_WARNING_JAVANOTFOUND_MAC"
 msgid "%PRODUCTNAME requires Oracle's Java Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please install them and restart %PRODUCTNAME."
 msgstr "Mae %PRODUCTNAME angen Java Development Kit (JDK), Oracle ar Mac OS X 10.10 neu well er mwyn cyflawni'r dasg yma. Gosodwch y rhain ac ailgychwyn %PRODUCTNAME."
 
-#: strings.hrc:287
+#: include/svtools/strings.hrc:287
 msgctxt "STR_WARNING_INVALIDJAVASETTINGS_MAC"
 msgid "The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME."
 msgstr "Mae ffurfweddiad %PRODUCTNAME wedi newid. O dan %PRODUCTNAME - Dewisiadau - %PRODUCTNAME - Uwch, dewiswch yr amgylchedd rhedeg Java rydych am i %PRODUCTNAME ei ddefnyddio."
 
-#: strings.hrc:288
+#: include/svtools/strings.hrc:288
 msgctxt "STR_WARNING_INVALIDJAVASETTINGS"
 msgid "The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME."
 msgstr "Mae ffurfweddiad %PRODUCTNAME wedi newid. O dan Offer - Dewisiadau - %PRODUCTNAME - Uwch, dewiswch yr amgylchedd rhedeg Java rydych am i %PRODUCTNAME ei ddefnyddio."
 
-#: strings.hrc:289
+#: include/svtools/strings.hrc:289
 msgctxt "STR_ERROR_JVMCREATIONFAILED_MAC"
 msgid "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced."
 msgstr "Mae angen amgylchedd rhedeg Java (JRE) ar %PRODUCTNAME i gyflawni hyn. Mae'r JRE yma'n ddiffygiol. Dewiswch fersiwn arall neu osod JRE newydd a'i ddewis o dan %PRODUCTNAME - Dewisiadau - %PRODUCTNAME - Uwch."
 
-#: strings.hrc:290
+#: include/svtools/strings.hrc:290
 msgctxt "STR_ERROR_JVMCREATIONFAILED"
 msgid "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced."
 msgstr "Mae angen amgylchedd rhedeg Java (JRE) ar %PRODUCTNAME i gyflawni hyn. Mae'r JRE yma'n ddiffygiol. Dewiswch fersiwn arall neu osod JRE newydd a'i ddewis o dan Offer - Dewisiadau - %PRODUCTNAME - Uwch."
 
-#: strings.hrc:291
+#: include/svtools/strings.hrc:291
 msgctxt "STR_WARNING_JAVANOTFOUND_TITLE"
 msgid "JRE Required"
 msgstr "Mae angen JRE"
 
-#: strings.hrc:292
+#: include/svtools/strings.hrc:292
 msgctxt "STR_WARNING_INVALIDJAVASETTINGS_TITLE"
 msgid "Select JRE"
 msgstr "Dewiswch JRE"
 
-#: strings.hrc:293
+#: include/svtools/strings.hrc:293
 msgctxt "STR_ERROR_JVMCREATIONFAILED_TITLE"
 msgid "JRE is Defective"
 msgstr "JRE Diffygiol"
 
-#: strings.hrc:295
+#: include/svtools/strings.hrc:295
 msgctxt "STR_DESCRIPTION_SOURCEFILE"
 msgid "Source code"
 msgstr "Cod ffynhonnell"
 
-#: strings.hrc:296
+#: include/svtools/strings.hrc:296
 msgctxt "STR_DESCRIPTION_BOOKMARKFILE"
 msgid "Bookmark file"
 msgstr "Ffeil nod tudalen"
 
-#: strings.hrc:297
+#: include/svtools/strings.hrc:297
 msgctxt "STR_DESCRIPTION_GRAPHIC_DOC"
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: strings.hrc:298
+#: include/svtools/strings.hrc:298
 msgctxt "STR_DESCRIPTION_CFGFILE"
 msgid "Configuration file"
 msgstr "Ffeil ffurfweddiad"
 
-#: strings.hrc:299
+#: include/svtools/strings.hrc:299
 msgctxt "STR_DESCRIPTION_APPLICATION"
 msgid "Application"
 msgstr "Rhaglen"
 
-#: strings.hrc:300
+#: include/svtools/strings.hrc:300
 msgctxt "STR_DESCRIPTION_DATABASE_TABLE"
 msgid "Database table"
 msgstr "Cronfa Ddata"
 
-#: strings.hrc:301
+#: include/svtools/strings.hrc:301
 msgctxt "STR_DESCRIPTION_SYSFILE"
 msgid "System file"
 msgstr "Ffeil system"
 
-#: strings.hrc:302
+#: include/svtools/strings.hrc:302
 msgctxt "STR_DESCRIPTION_WORD_DOC"
 msgid "MS Word document"
 msgstr "Dogfen MS Word"
 
-#: strings.hrc:303
+#: include/svtools/strings.hrc:303
 msgctxt "STR_DESCRIPTION_HELP_DOC"
 msgid "Help file"
 msgstr "Ffeil Cymorth"
 
-#: strings.hrc:304
+#: include/svtools/strings.hrc:304
 msgctxt "STR_DESCRIPTION_HTMLFILE"
 msgid "HTML document"
 msgstr "Dogfen HTML"
 
-#: strings.hrc:305
+#: include/svtools/strings.hrc:305
 msgctxt "STR_DESCRIPTION_ARCHIVFILE"
 msgid "Archive file"
 msgstr "Ffeil archif"
 
-#: strings.hrc:306
+#: include/svtools/strings.hrc:306
 msgctxt "STR_DESCRIPTION_LOGFILE"
 msgid "Log file"
 msgstr "Ffeil cofnod"
 
-#: strings.hrc:307
+#: include/svtools/strings.hrc:307
 msgctxt "STR_DESCRIPTION_SDATABASE_DOC"
 msgid "StarOffice Database"
 msgstr "Cronfa Ddata StarOffice"
 
-#: strings.hrc:308
+#: include/svtools/strings.hrc:308
 msgctxt "STR_DESCRIPTION_GLOBALDOC"
 msgid "StarWriter 4.0 / 5.0 Master Document"
 msgstr "Prif Ddogfen StarWriter 4.0 / 5.0"
 
-#: strings.hrc:309
+#: include/svtools/strings.hrc:309
 msgctxt "STR_DESCRIPTION_SIMAGE_DOC"
 msgid "StarOffice Image"
 msgstr "Delwedd StarOffice"
 
-#: strings.hrc:310
+#: include/svtools/strings.hrc:310
 msgctxt "STR_DESCRIPTION_TEXTFILE"
 msgid "Text file"
 msgstr "Ffeil testun"
 
-#: strings.hrc:311
+#: include/svtools/strings.hrc:311
 msgctxt "STR_DESCRIPTION_LINK"
 msgid "Link"
 msgstr "Cysylltiad"
 
-#: strings.hrc:312
+#: include/svtools/strings.hrc:312
 msgctxt "STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC"
 msgid "StarOffice 3.0 - 5.0 Template"
 msgstr "Templed StarOffice 3.0 - 5.0"
 
-#: strings.hrc:313
+#: include/svtools/strings.hrc:313
 msgctxt "STR_DESCRIPTION_EXCEL_DOC"
 msgid "MS Excel document"
 msgstr "Dogfen MS Excel"
 
-#: strings.hrc:314
+#: include/svtools/strings.hrc:314
 msgctxt "STR_DESCRIPTION_EXCEL_TEMPLATE_DOC"
 msgid "MS Excel template"
 msgstr "Templed MS Excel"
 
-#: strings.hrc:315
+#: include/svtools/strings.hrc:315
 msgctxt "STR_DESCRIPTION_BATCHFILE"
 msgid "Batch file"
 msgstr "Ffeil swp"
 
-#: strings.hrc:316
+#: include/svtools/strings.hrc:316
 msgctxt "STR_DESCRIPTION_FILE"
 msgid "File"
 msgstr "Ffeil"
 
-#: strings.hrc:317
+#: include/svtools/strings.hrc:317
 msgctxt "STR_DESCRIPTION_FOLDER"
 msgid "Folder"
 msgstr "Ffolder"
 
-#: strings.hrc:318
+#: include/svtools/strings.hrc:318
 msgctxt "STR_DESCRIPTION_FACTORY_WRITER"
 msgid "Text Document"
 msgstr "Dogfen Testun"
 
-#: strings.hrc:319
+#: include/svtools/strings.hrc:319
 msgctxt "STR_DESCRIPTION_FACTORY_CALC"
 msgid "Spreadsheet"
 msgstr "Taenlen"
 
-#: strings.hrc:320
+#: include/svtools/strings.hrc:320
 msgctxt "STR_DESCRIPTION_FACTORY_IMPRESS"
 msgid "Presentation"
 msgstr "Cyflwyniad"
 
-#: strings.hrc:321
+#: include/svtools/strings.hrc:321
 msgctxt "STR_DESCRIPTION_FACTORY_DRAW"
 msgid "Drawing"
 msgstr "Lluniadu"
 
-#: strings.hrc:322
+#: include/svtools/strings.hrc:322
 msgctxt "STR_DESCRIPTION_FACTORY_WRITERWEB"
 msgid "HTML document"
 msgstr "Dogfen HTML"
 
-#: strings.hrc:323
+#: include/svtools/strings.hrc:323
 msgctxt "STR_DESCRIPTION_FACTORY_GLOBALDOC"
 msgid "Master document"
 msgstr "Prif ddogfen"
 
-#: strings.hrc:324
+#: include/svtools/strings.hrc:324
 msgctxt "STR_DESCRIPTION_FACTORY_MATH"
 msgid "Formula"
 msgstr "Fformiwla"
 
-#: strings.hrc:325
+#: include/svtools/strings.hrc:325
 msgctxt "STR_DESCRIPTION_FACTORY_DATABASE"
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: strings.hrc:326
+#: include/svtools/strings.hrc:326
 msgctxt "STR_DESCRIPTION_CALC_TEMPLATE"
 msgid "OpenOffice.org 1.0 Spreadsheet Template"
 msgstr "Templed Taenlen OpenOffice.org 1.0"
 
-#: strings.hrc:327
+#: include/svtools/strings.hrc:327
 msgctxt "STR_DESCRIPTION_DRAW_TEMPLATE"
 msgid "OpenOffice.org 1.0 Drawing Template"
 msgstr "Templed Lluniadu OpenOffice.org 1.0"
 
-#: strings.hrc:328
+#: include/svtools/strings.hrc:328
 msgctxt "STR_DESCRIPTION_IMPRESS_TEMPLATE"
 msgid "OpenOffice.org 1.0 Presentation Template"
 msgstr "Templed Cyflwyniad OpenOffice.org 1.0"
 
-#: strings.hrc:329
+#: include/svtools/strings.hrc:329
 msgctxt "STR_DESCRIPTION_WRITER_TEMPLATE"
 msgid "OpenOffice.org 1.0 Text Document Template"
 msgstr "Templed Dogfen Testun OpenOffice.org 1.0"
 
-#: strings.hrc:330
+#: include/svtools/strings.hrc:330
 msgctxt "STR_DESCRIPTION_LOCALE_VOLUME"
 msgid "Local drive"
 msgstr "Disg lleol"
 
-#: strings.hrc:331
+#: include/svtools/strings.hrc:331
 msgctxt "STR_DESCRIPTION_FLOPPY_VOLUME"
 msgid "Disk drive"
 msgstr "Gyrrwr disg"
 
-#: strings.hrc:332
+#: include/svtools/strings.hrc:332
 msgctxt "STR_DESCRIPTION_CDROM_VOLUME"
 msgid "CD-ROM drive"
 msgstr "Gyrrwr CD-ROM"
 
-#: strings.hrc:333
+#: include/svtools/strings.hrc:333
 msgctxt "STR_DESCRIPTION_REMOTE_VOLUME"
 msgid "Network connection"
 msgstr "Cysylltiad rhwydwaith"
 
-#: strings.hrc:334
+#: include/svtools/strings.hrc:334
 msgctxt "STR_DESCRIPTION_POWERPOINT"
 msgid "MS PowerPoint Document"
 msgstr "Dogfen MS PowerPoint"
 
-#: strings.hrc:335
+#: include/svtools/strings.hrc:335
 msgctxt "STR_DESCRIPTION_POWERPOINT_TEMPLATE"
 msgid "MS PowerPoint Template"
 msgstr "Templed MS PowerPoint"
 
-#: strings.hrc:336
+#: include/svtools/strings.hrc:336
 msgctxt "STR_DESCRIPTION_POWERPOINT_SHOW"
 msgid "MS PowerPoint Show"
 msgstr "Sioe MS PowerPoint"
 
-#: strings.hrc:337
+#: include/svtools/strings.hrc:337
 msgctxt "STR_DESCRIPTION_SXMATH_DOC"
 msgid "OpenOffice.org 1.0 Formula"
 msgstr "Fformiwla OpenOffice.org 1.0"
 
-#: strings.hrc:338
+#: include/svtools/strings.hrc:338
 msgctxt "STR_DESCRIPTION_SXCHART_DOC"
 msgid "OpenOffice.org 1.0 Chart"
 msgstr "Siart OpenOffice.org 1.0"
 
-#: strings.hrc:339
+#: include/svtools/strings.hrc:339
 msgctxt "STR_DESCRIPTION_SXDRAW_DOC"
 msgid "OpenOffice.org 1.0 Drawing"
 msgstr "Lluniadu OpenOffice.org 1.0"
 
-#: strings.hrc:340
+#: include/svtools/strings.hrc:340
 msgctxt "STR_DESCRIPTION_SXCALC_DOC"
 msgid "OpenOffice.org 1.0 Spreadsheet"
 msgstr "Taenlen OpenOffice.org 1.0"
 
-#: strings.hrc:341
+#: include/svtools/strings.hrc:341
 msgctxt "STR_DESCRIPTION_SXIMPRESS_DOC"
 msgid "OpenOffice.org 1.0 Presentation"
 msgstr "Cyflwyniad OpenOffice.org 1.0"
 
-#: strings.hrc:342
+#: include/svtools/strings.hrc:342
 msgctxt "STR_DESCRIPTION_SXWRITER_DOC"
 msgid "OpenOffice.org 1.0 Text Document"
 msgstr "Dogfen Testun OpenOffice.org 1.0"
 
-#: strings.hrc:343
+#: include/svtools/strings.hrc:343
 msgctxt "STR_DESCRIPTION_SXGLOBAL_DOC"
 msgid "OpenOffice.org 1.0 Master Document"
 msgstr "Prif Ddogfen OpenOffice.org 1.0"
 
-#: strings.hrc:344
+#: include/svtools/strings.hrc:344
 msgctxt "STR_DESCRIPTION_MATHML_DOC"
 msgid "MathML Document"
 msgstr "Dogfen MathML"
 
-#: strings.hrc:345
+#: include/svtools/strings.hrc:345
 msgctxt "STR_DESCRIPTION_OO_DATABASE_DOC"
 msgid "OpenDocument Database"
 msgstr "Cronfa Ddata OpenDocument"
 
-#: strings.hrc:346
+#: include/svtools/strings.hrc:346
 msgctxt "STR_DESCRIPTION_OO_DRAW_DOC"
 msgid "OpenDocument Drawing"
 msgstr "Lluniadu OpenDocument"
 
-#: strings.hrc:347
+#: include/svtools/strings.hrc:347
 msgctxt "STR_DESCRIPTION_OO_MATH_DOC"
 msgid "OpenDocument Formula"
 msgstr "Fformiwla OpenDocument"
 
-#: strings.hrc:348
+#: include/svtools/strings.hrc:348
 msgctxt "STR_DESCRIPTION_OO_GLOBAL_DOC"
 msgid "OpenDocument Master Document"
 msgstr "Dogfen OpenDocument"
 
-#: strings.hrc:349
+#: include/svtools/strings.hrc:349
 msgctxt "STR_DESCRIPTION_OO_IMPRESS_DOC"
 msgid "OpenDocument Presentation"
 msgstr "Cyflwyniad OpenDocument"
 
-#: strings.hrc:350
+#: include/svtools/strings.hrc:350
 msgctxt "STR_DESCRIPTION_OO_CALC_DOC"
 msgid "OpenDocument Spreadsheet"
 msgstr "Taenlen OpenDocument"
 
-#: strings.hrc:351
+#: include/svtools/strings.hrc:351
 msgctxt "STR_DESCRIPTION_OO_WRITER_DOC"
 msgid "OpenDocument Text"
 msgstr "Testun OpenDocument"
 
-#: strings.hrc:352
+#: include/svtools/strings.hrc:352
 msgctxt "STR_DESCRIPTION_OO_CALC_TEMPLATE"
 msgid "OpenDocument Spreadsheet Template"
 msgstr "Templed Taenlen OpenDocument"
 
-#: strings.hrc:353
+#: include/svtools/strings.hrc:353
 msgctxt "STR_DESCRIPTION_OO_DRAW_TEMPLATE"
 msgid "OpenDocument Drawing Template"
 msgstr "Templed Lluniadu OpenDocument"
 
-#: strings.hrc:354
+#: include/svtools/strings.hrc:354
 msgctxt "STR_DESCRIPTION_OO_IMPRESS_TEMPLATE"
 msgid "OpenDocument Presentation Template"
 msgstr "Templed Cyflwyniad OpenDocument"
 
-#: strings.hrc:355
+#: include/svtools/strings.hrc:355
 msgctxt "STR_DESCRIPTION_OO_WRITER_TEMPLATE"
 msgid "OpenDocument Text Template"
 msgstr "Templed Testun OpenDocument"
 
-#: strings.hrc:356
+#: include/svtools/strings.hrc:356
 msgctxt "STR_DESCRIPTION_EXTENSION"
 msgid "%PRODUCTNAME Extension"
 msgstr "Estyniad %PRODUCTNAME"
 
-#: strings.hrc:358
+#: include/svtools/strings.hrc:358
 msgctxt "STR_DESCRIPTION_HUNSPELL"
 msgid "Hunspell SpellChecker"
 msgstr "Gwirydd Sillafu Hunspell"
 
-#: strings.hrc:359
+#: include/svtools/strings.hrc:359
 msgctxt "STR_DESCRIPTION_LIBHYPHEN"
 msgid "Libhyphen Hyphenator"
 msgstr "Cysylltnodwr Libhyphen"
 
-#: strings.hrc:360
+#: include/svtools/strings.hrc:360
 msgctxt "STR_DESCRIPTION_MYTHES"
 msgid "Mythes Thesaurus"
 msgstr "Thesawrws Mythes"
diff --git a/source/cy/svx/messages.po b/source/cy/svx/messages.po
index 1abe6d3b8ec..0ab5908620f 100644
--- a/source/cy/svx/messages.po
+++ b/source/cy/svx/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: 2017-12-29 15:06+0000\n"
+"POT-Creation-Date: 2018-04-24 12:21+0200\n"
+"PO-Revision-Date: 2018-04-18 08:50+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,531 +14,549 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: LibreOffice\n"
-"X-POOTLE-MTIME: 1514559960.000000\n"
+"X-POOTLE-MTIME: 1524041424.000000\n"
 
-#: fieldunit.hrc:30
+#: svx/inc/fieldunit.hrc:30
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Millimeter"
 msgstr "Milimedr"
 
-#: fieldunit.hrc:31
+#: svx/inc/fieldunit.hrc:31
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Centimeter"
 msgstr "Centimedr"
 
-#: fieldunit.hrc:32
+#: svx/inc/fieldunit.hrc:32
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Meter"
 msgstr "Metr"
 
-#: fieldunit.hrc:33
+#: svx/inc/fieldunit.hrc:33
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Kilometer"
 msgstr "Kilometr"
 
-#: fieldunit.hrc:34
+#: svx/inc/fieldunit.hrc:34
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Inch"
 msgstr "Modfedd"
 
-#: fieldunit.hrc:35
+#: svx/inc/fieldunit.hrc:35
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Foot"
 msgstr "Troedfedd"
 
-#: fieldunit.hrc:36
+#: svx/inc/fieldunit.hrc:36
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Miles"
 msgstr "Milltiroedd"
 
-#: fieldunit.hrc:37
+#: svx/inc/fieldunit.hrc:37
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Pica"
 msgstr "Pica"
 
-#: fieldunit.hrc:38
+#: svx/inc/fieldunit.hrc:38
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Point"
 msgstr "Pwynt"
 
-#: fieldunit.hrc:39
+#: svx/inc/fieldunit.hrc:39
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Char"
 msgstr "Nod"
 
-#: fieldunit.hrc:40
+#: svx/inc/fieldunit.hrc:40
 msgctxt "RID_SVXSTR_FIELDUNIT_TABLE"
 msgid "Line"
 msgstr "Llinell"
 
-#: fmstring.hrc:27
+#: svx/inc/fmstring.hrc:27
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "LIKE"
 msgstr "LIKE"
 
-#: fmstring.hrc:28
+#: svx/inc/fmstring.hrc:28
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "NOT"
 msgstr "NOT"
 
-#: fmstring.hrc:29
+#: svx/inc/fmstring.hrc:29
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "EMPTY"
 msgstr "EMPTY"
 
-#: fmstring.hrc:30
+#: svx/inc/fmstring.hrc:30
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "TRUE"
 msgstr "TRUE"
 
-#: fmstring.hrc:31
+#: svx/inc/fmstring.hrc:31
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "FALSE"
 msgstr "FALSE"
 
-#: fmstring.hrc:32
+#: svx/inc/fmstring.hrc:32
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "IS"
 msgstr "IS"
 
-#: fmstring.hrc:33
+#: svx/inc/fmstring.hrc:33
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "BETWEEN"
 msgstr "BETWEEN"
 
-#: fmstring.hrc:34
+#: svx/inc/fmstring.hrc:34
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "OR"
 msgstr "OR"
 
-#: fmstring.hrc:35
+#: svx/inc/fmstring.hrc:35
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "AND"
 msgstr "AND"
 
-#: fmstring.hrc:36
+#: svx/inc/fmstring.hrc:36
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Average"
 msgstr "Cyfartaledd"
 
-#: fmstring.hrc:37
+#: svx/inc/fmstring.hrc:37
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: fmstring.hrc:38
+#: svx/inc/fmstring.hrc:38
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Maximum"
 msgstr "Uchafswm"
 
-#: fmstring.hrc:39
+#: svx/inc/fmstring.hrc:39
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Minimum"
 msgstr "Lleiafswm"
 
-#: fmstring.hrc:40
+#: svx/inc/fmstring.hrc:40
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Sum"
 msgstr "Swm"
 
-#: fmstring.hrc:41
+#: svx/inc/fmstring.hrc:41
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Every"
 msgstr "Pob"
 
-#: fmstring.hrc:42
+#: svx/inc/fmstring.hrc:42
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Any"
 msgstr "Unrhyw"
 
-#: fmstring.hrc:43
+#: svx/inc/fmstring.hrc:43
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Some"
 msgstr "Rhai"
 
-#: fmstring.hrc:44
+#: svx/inc/fmstring.hrc:44
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "STDDEV_POP"
 msgstr "STDDEV_POP"
 
-#: fmstring.hrc:45
+#: svx/inc/fmstring.hrc:45
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "STDDEV_SAMP"
 msgstr "STDDEV_SAMP"
 
-#: fmstring.hrc:46
+#: svx/inc/fmstring.hrc:46
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "VAR_SAMP"
 msgstr "VAR_SAMP"
 
-#: fmstring.hrc:47
+#: svx/inc/fmstring.hrc:47
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "VAR_POP"
 msgstr "VAR_POP"
 
-#: fmstring.hrc:48
+#: svx/inc/fmstring.hrc:48
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Collect"
 msgstr "Casglu"
 
-#: fmstring.hrc:49
+#: svx/inc/fmstring.hrc:49
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Fusion"
 msgstr "Ymdoddi"
 
-#: fmstring.hrc:50
+#: svx/inc/fmstring.hrc:50
 msgctxt "RID_RSC_SQL_INTERNATIONAL"
 msgid "Intersection"
 msgstr "Croestoriad"
 
-#: frmsel.hrc:29
+#: svx/inc/frmsel.hrc:29
 msgctxt "RID_SVXSTR_FRMSEL_TEXTS"
 msgid "Border setting"
 msgstr "Gosodiad border"
 
-#: frmsel.hrc:30
+#: svx/inc/frmsel.hrc:30
 msgctxt "RID_SVXSTR_FRMSEL_TEXTS"
 msgid "Left border line"
 msgstr "Llinell border chwith"
 
-#: frmsel.hrc:31
+#: svx/inc/frmsel.hrc:31
 msgctxt "RID_SVXSTR_FRMSEL_TEXTS"
 msgid "Right border line"
 msgstr "Llinell border de"
 
-#: frmsel.hrc:32
+#: svx/inc/frmsel.hrc:32
 msgctxt "RID_SVXSTR_FRMSEL_TEXTS"
 msgid "Top border line"
 msgstr "Llinell border brig"
 
-#: frmsel.hrc:33
+#: svx/inc/frmsel.hrc:33
 msgctxt "RID_SVXSTR_FRMSEL_TEXTS"
 msgid "Bottom border line"
 msgstr "Llinell border gwaelod"
 
-#: frmsel.hrc:34
+#: svx/inc/frmsel.hrc:34
 msgctxt "RID_SVXSTR_FRMSEL_TEXTS"
 msgid "Horizontal border line"
 msgstr "Llinell border llorweddol"
 
-#: frmsel.hrc:35
+#: svx/inc/frmsel.hrc:35
 msgctxt "RID_SVXSTR_FRMSEL_TEXTS"
 msgid "Vertical border line"
 msgstr "Llinell border fertigol"
 
-#: frmsel.hrc:36
+#: svx/inc/frmsel.hrc:36
 msgctxt "RID_SVXSTR_FRMSEL_TEXTS"
 msgid "Diagonal border line from top left to bottom right"
 msgstr "Llinell border croesgornel o'r brig chwith i'r dde gwaelod"
 
-#: frmsel.hrc:37
+#: svx/inc/frmsel.hrc:37
 msgctxt "RID_SVXSTR_FRMSEL_TEXTS"
 msgid "Diagonal border line from bottom left to top right"
 msgstr "Llinell border croesgornel o'r gwaelod chwith i'r dde brig"
 
-#: frmsel.hrc:42
+#: svx/inc/frmsel.hrc:42
 msgctxt "RID_SVXSTR_FRMSEL_DESCRIPTIONS"
 msgid "Border setting"
 msgstr "Gosodiad border"
 
-#: frmsel.hrc:43
+#: svx/inc/frmsel.hrc:43
 msgctxt "RID_SVXSTR_FRMSEL_DESCRIPTIONS"
 msgid "Left border line"
 msgstr "Llinell border chwith"
 
-#: frmsel.hrc:44
+#: svx/inc/frmsel.hrc:44
 msgctxt "RID_SVXSTR_FRMSEL_DESCRIPTIONS"
 msgid "Right border line"
 msgstr "Llinell border de"
 
-#: frmsel.hrc:45
+#: svx/inc/frmsel.hrc:45
 msgctxt "RID_SVXSTR_FRMSEL_DESCRIPTIONS"
 msgid "Top border line"
 msgstr "Llinell border brig"
 
-#: frmsel.hrc:46
+#: svx/inc/frmsel.hrc:46
 msgctxt "RID_SVXSTR_FRMSEL_DESCRIPTIONS"
 msgid "Bottom border line"
 msgstr "Llinell border gwaelod"
 
-#: frmsel.hrc:47
+#: svx/inc/frmsel.hrc:47
 msgctxt "RID_SVXSTR_FRMSEL_DESCRIPTIONS"
 msgid "Horizontal border line"
 msgstr "Llinell border llorweddol"
 
-#: frmsel.hrc:48
+#: svx/inc/frmsel.hrc:48
 msgctxt "RID_SVXSTR_FRMSEL_DESCRIPTIONS"
 msgid "Vertical border line"
 msgstr "Llinell border fertigol"
 
-#: frmsel.hrc:49
+#: svx/inc/frmsel.hrc:49
 msgctxt "RID_SVXSTR_FRMSEL_DESCRIPTIONS"
 msgid "Diagonal border line from top left to bottom right"
 msgstr "Llinell border croesgornel o'r brig chwith i'r dde gwaelod"
 
-#: frmsel.hrc:50
+#: svx/inc/frmsel.hrc:50
 msgctxt "RID_SVXSTR_FRMSEL_DESCRIPTIONS"
 msgid "Diagonal border line from bottom left to top right"
 msgstr "Llinell border croesgornel o'r gwaelod chwith i'r dde brig"
 
-#: numberingtype.hrc:29
+#: svx/inc/numberingtype.hrc:29
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "None"
 msgstr "Dim"
 
 #. SVX_NUM_NUMBER_NONE
-#: numberingtype.hrc:30
+#: svx/inc/numberingtype.hrc:30
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "Bullet"
 msgstr "Bwledi"
 
 #. SVX_NUM_CHAR_SPECIAL
-#: numberingtype.hrc:31
+#: svx/inc/numberingtype.hrc:31
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "Graphics"
 msgstr "Graffeg"
 
 #. SVX_NUM_BITMAP
-#: numberingtype.hrc:32
+#: svx/inc/numberingtype.hrc:32
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "Linked graphics"
 msgstr "Graffigau cysylltiedig"
 
 #. SVX_NUM_BITMAP|0x80
-#: numberingtype.hrc:33
+#: svx/inc/numberingtype.hrc:33
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "1, 2, 3, ..."
 msgstr "1, 2, 3, ..."
 
 #. SVX_NUM_ARABIC
-#: numberingtype.hrc:34
+#: svx/inc/numberingtype.hrc:34
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "A, B, C, ..."
 msgstr "A, B, C, ..."
 
 #. SVX_NUM_CHARS_UPPER_LETTER
-#: numberingtype.hrc:35
+#: svx/inc/numberingtype.hrc:35
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "a, b, c, ..."
 msgstr "a, b, c, ..."
 
 #. SVX_NUM_CHARS_LOWER_LETTER
-#: numberingtype.hrc:36
+#: svx/inc/numberingtype.hrc:36
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "I, II, III, ..."
 msgstr "I, II, III, ..."
 
 #. SVX_NUM_ROMAN_UPPER
-#: numberingtype.hrc:37
+#: svx/inc/numberingtype.hrc:37
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "i, ii, iii, ..."
 msgstr "i, ii, iii, ..."
 
 #. SVX_NUM_ROMAN_LOWER
-#: numberingtype.hrc:38
+#: svx/inc/numberingtype.hrc:38
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "A, .., AA, .., AAA, ..."
 msgstr "A, .., AA, .., AAA, ..."
 
 #. SVX_NUM_CHARS_UPPER_LETTER_N
-#: numberingtype.hrc:39
+#: svx/inc/numberingtype.hrc:39
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "a, .., aa, .., aaa, ..."
 msgstr "a, .., aa, .., aaa, ..."
 
 #. SVX_NUM_CHARS_LOWER_LETTER_N
-#: numberingtype.hrc:40
+#: svx/inc/numberingtype.hrc:40
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "Native Numbering"
 msgstr "Rhifo Cynhenid"
 
 #. NATIVE_NUMBERING
-#: numberingtype.hrc:41
+#: svx/inc/numberingtype.hrc:41
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "А, Б, .., Аа, Аб, ... (Bulgarian)"
 msgstr "А, Б, .., Аа, Аб, ... (Bwlgaraidd)"
 
 #. CHARS_CYRILLIC_UPPER_LETTER_BG
-#: numberingtype.hrc:42
+#: svx/inc/numberingtype.hrc:42
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "а, б, .., аа, аб, ... (Bulgarian)"
 msgstr "а, б, .., аа, аб, ... (Bwlgaraidd)"
 
 #. CHARS_CYRILLIC_LOWER_LETTER_BG
-#: numberingtype.hrc:43
+#: svx/inc/numberingtype.hrc:43
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "А, Б, .., Аа, Бб, ... (Bulgarian)"
 msgstr "А, Б, .., Аа, Бб, ... (Bwlgaraidd)"
 
 #. CHARS_CYRILLIC_UPPER_LETTER_N_BG
-#: numberingtype.hrc:44
+#: svx/inc/numberingtype.hrc:44
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "а, б, .., аа, бб, ... (Bulgarian)"
 msgstr "а, б, .., аа, бб, ... (Bwlgaraidd)"
 
 #. CHARS_CYRILLIC_LOWER_LETTER_N_BG
-#: numberingtype.hrc:45
+#: svx/inc/numberingtype.hrc:45
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "А, Б, .., Аа, Аб, ... (Russian)"
 msgstr "А, Б, .., Аа, Аб, ... (Rwsiaidd)"
 
 #. CHARS_CYRILLIC_UPPER_LETTER_RU
-#: numberingtype.hrc:46
+#: svx/inc/numberingtype.hrc:46
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "а, б, .., аа, аб, ... (Russian)"
 msgstr "а, б, .., аа, аб, ... (Rwsiaidd)"
 
 #. CHARS_CYRILLIC_LOWER_LETTER_RU
-#: numberingtype.hrc:47
+#: svx/inc/numberingtype.hrc:47
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "А, Б, .., Аа, Бб, ... (Russian)"
 msgstr "А, Б, .., Аа, Бб, ... (Rwsiaidd)"
 
 #. CHARS_CYRILLIC_UPPER_LETTER_N_RU
-#: numberingtype.hrc:48
+#: svx/inc/numberingtype.hrc:48
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "а, б, .., аа, бб, ... (Russian)"
 msgstr "а, б, .., аа, бб, ... (Rwsiaidd)"
 
 #. CHARS_CYRILLIC_LOWER_LETTER_N_RU
-#: numberingtype.hrc:49
+#: svx/inc/numberingtype.hrc:49
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "А, Б, .., Аа, Аб, ... (Serbian)"
 msgstr "А, Б, .., Аа, Аб, ... (Serbaidd)"
 
 #. CHARS_CYRILLIC_UPPER_LETTER_SR
-#: numberingtype.hrc:50
+#: svx/inc/numberingtype.hrc:50
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "а, б, .., аа, аб, ... (Serbian)"
 msgstr "а, б, .., аа, аб, ... (Serbaidd)"
 
 #. CHARS_CYRILLIC_LOWER_LETTER_SR
-#: numberingtype.hrc:51
+#: svx/inc/numberingtype.hrc:51
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "А, Б, .., Аа, Бб, ... (Serbian)"
 msgstr "А, Б, .., Аа, Бб, ... (Serbaidd)"
 
 #. CHARS_CYRILLIC_UPPER_LETTER_N_SR
-#: numberingtype.hrc:52
+#: svx/inc/numberingtype.hrc:52
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "а, б, .., аа, бб, ... (Serbian)"
 msgstr "а, б, .., аа, бб, ... (Serbaidd)"
 
 #. CHARS_CYRILLIC_LOWER_LETTER_N_SR
-#: numberingtype.hrc:53
+#: svx/inc/numberingtype.hrc:53
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "Α, Β, Γ, ... (Greek Upper Letter)"
 msgstr "Α, Β, Γ, ... (Nodau Mawr Groeg)"
 
 #. CHARS_GREEK_UPPER_LETTER
-#: numberingtype.hrc:54
+#: svx/inc/numberingtype.hrc:54
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "α, β, γ, ... (Greek Lower Letter)"
 msgstr "α, β, γ, ... (Nodau Bach Groeg)"
 
 #. CHARS_GREEK_LOWER_LETTER
-#: numberingtype.hrc:55
+#: svx/inc/numberingtype.hrc:55
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "א...י, יא...כ, ..."
 msgstr "א...י, יא...כ, ..."
 
 #. NUMBER_HEBREW
-#: numberingtype.hrc:56
+#: svx/inc/numberingtype.hrc:56
 msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
 msgid "א...ת, אא...תת, ..."
 msgstr "א...ת, אא...תת, ..."
 
-#: samecontent.hrc:18
+#. CHARS_HEBREW
+#: svx/inc/numberingtype.hrc:57
+msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
+msgid "١, ٢, ٣, ٤, ... (Arabic)"
+msgstr "١, ٢, ٣, ٤, ... (Arabeg)"
+
+#. NUMBER_ARABIC_INDIC
+#: svx/inc/numberingtype.hrc:58
+msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
+msgid "۱, ۲, ۳, ۴, ... (Farsi)"
+msgstr "۱, ۲, ۳, ۴, ... (Farsi)"
+
+#. NUMBER_EAST_ARABIC_INDIC
+#: svx/inc/numberingtype.hrc:59
+msgctxt "RID_SVXSTRARY_NUMBERINGTYPE"
+msgid "१, २, ३, ..."
+msgstr "१, २, ३, ..."
+
+#: svx/inc/samecontent.hrc:18
 msgctxt "RID_SVXSTRARY_SAMECONTENT"
 msgid "All Pages"
 msgstr "Pob Tudalen"
 
-#: samecontent.hrc:19
+#: svx/inc/samecontent.hrc:19
 msgctxt "RID_SVXSTRARY_SAMECONTENT"
 msgid "First Page"
 msgstr "Tudalen Gyntaf"
 
-#: samecontent.hrc:20
+#: svx/inc/samecontent.hrc:20
 msgctxt "RID_SVXSTRARY_SAMECONTENT"
 msgid "Left and Right Pages"
 msgstr "Tudalennau Chwith a De"
 
-#: samecontent.hrc:21
+#: svx/inc/samecontent.hrc:21
 msgctxt "RID_SVXSTRARY_SAMECONTENT"
 msgid "First, Left and Right Pages"
 msgstr "Tudalen Gyntaf, Chwith a De"
 
-#: spacing.hrc:18
+#: svx/inc/spacing.hrc:18
 msgctxt "RID_SVXSTRARY_SPACING"
 msgid "None"
 msgstr "Dim"
 
-#: spacing.hrc:19
+#: svx/inc/spacing.hrc:19
 msgctxt "RID_SVXSTRARY_SPACING"
 msgid "Extra Small (1/16\")"
 msgstr "Bach Iawn (1/16\")"
 
-#: spacing.hrc:20
+#: svx/inc/spacing.hrc:20
 msgctxt "RID_SVXSTRARY_SPACING"
 msgid "Small (1/8\")"
 msgstr "Bach (1/8\")"
 
-#: spacing.hrc:21
+#: svx/inc/spacing.hrc:21
 msgctxt "RID_SVXSTRARY_SPACING"
 msgid "Small Medium (1/4\")"
 msgstr "Bach Canolig (1/4\")"
 
-#: spacing.hrc:22
+#: svx/inc/spacing.hrc:22
 msgctxt "RID_SVXSTRARY_SPACING"
 msgid "Medium (3/8\")"
 msgstr "Canolig (3/8\")"
 
-#: spacing.hrc:23
+#: svx/inc/spacing.hrc:23
 msgctxt "RID_SVXSTRARY_SPACING"
 msgid "Medium Large (1/2\")"
 msgstr "Canolig Mawr (1/2\")"
 
-#: spacing.hrc:24
+#: svx/inc/spacing.hrc:24
 msgctxt "RID_SVXSTRARY_SPACING"
 msgid "Large (3/4\")"
 msgstr "Mawr (3/4\")"
 
-#: spacing.hrc:25
+#: svx/inc/spacing.hrc:25
 msgctxt "RID_SVXSTRARY_SPACING"
 msgid "Extra Large (1\")"
 msgstr "Mawr Iawn (1\")"
 
-#: svxerr.hrc:33
+#: svx/inc/svxerr.hrc:33
 msgctxt "RID_SVXERRCTX"
 msgid "$(ERR) executing the thesaurus."
 msgstr "$(ERR) cychwyn y thesawrws."
 
-#: svxerr.hrc:35
+#: svx/inc/svxerr.hrc:35
 msgctxt "RID_SVXERRCTX"
 msgid "$(ERR) executing the spellcheck."
 msgstr "$(ERR) cychwyn y gwirydd sillafu."
 
-#: svxerr.hrc:37
+#: svx/inc/svxerr.hrc:37
 msgctxt "RID_SVXERRCTX"
 msgid "$(ERR) executing the hyphenation."
 msgstr "$(ERR) cychwyn y cysylltnodydd."
 
-#: svxerr.hrc:39
+#: svx/inc/svxerr.hrc:39
 msgctxt "RID_SVXERRCTX"
 msgid "$(ERR) creating a dictionary."
 msgstr "$(ERR) creu'r geiriadur."
 
-#: svxerr.hrc:41
+#: svx/inc/svxerr.hrc:41
 msgctxt "RID_SVXERRCTX"
 msgid "$(ERR) setting background attribute."
 msgstr "$(ERR) gosod priodoledd cefndir."
 
-#: svxerr.hrc:43
+#: svx/inc/svxerr.hrc:43
 msgctxt "RID_SVXERRCTX"
 msgid "$(ERR) loading the graphics."
 msgstr "$(ERR) llwytho graffigau."
 
-#: svxerr.hrc:51
+#: svx/inc/svxerr.hrc:51
 msgctxt "RID_SVXERRCODE"
 msgid ""
 "$(ARG1) is not supported by the spellcheck function or is not presently active.\n"
@@ -549,57 +567,57 @@ msgstr ""
 "Gwiriwch eich gosodiad ac os oes angen gosodwch y modiwl iaith angenrheidiol\n"
 " neu ei gychwyn drwy 'Offer - Dewisiadau - Gosodiadau Iaith - Cymhorthion Ysgrifennu'."
 
-#: svxerr.hrc:53
+#: svx/inc/svxerr.hrc:53
 msgctxt "RID_SVXERRCODE"
 msgid "Spellcheck is not available."
 msgstr "Nid yw'r gwirydd sillafu ar gael."
 
-#: svxerr.hrc:55
+#: svx/inc/svxerr.hrc:55
 msgctxt "RID_SVXERRCODE"
 msgid "The custom dictionary $(ARG1) cannot be created."
 msgstr "Methu creu'r geiriadur cyfaddas $(ARG1)."
 
-#: svxerr.hrc:57
+#: svx/inc/svxerr.hrc:57
 msgctxt "RID_SVXERRCODE"
 msgid "The graphic $(ARG1) could not be found."
 msgstr "Methu canfod y graffig $(ARG1)."
 
-#: svxerr.hrc:59
+#: svx/inc/svxerr.hrc:59
 msgctxt "RID_SVXERRCODE"
 msgid "An unlinked graphic could not be loaded."
 msgstr "Methu llwytho graffig digyswllt."
 
-#: svxerr.hrc:61
+#: svx/inc/svxerr.hrc:61
 msgctxt "RID_SVXERRCODE"
 msgid "A language has not been fixed for the selected term."
 msgstr "Nid oes iaith wedi ei osod ar gyfer y term hwn."
 
-#: svxerr.hrc:63
+#: svx/inc/svxerr.hrc:63
 msgctxt "RID_SVXERRCODE"
 msgid "All changes to the Basic Code are lost. The original VBA Macro Code is saved instead."
 msgstr "Mae pob newid i'r Basic Code wedi ei golli. Cafodd y VBA Macro Code gwreiddiol ei gadw yn ei le."
 
-#: svxerr.hrc:65
+#: svx/inc/svxerr.hrc:65
 msgctxt "RID_SVXERRCODE"
 msgid "The original VBA Basic Code contained in the document will not be saved."
 msgstr "Ni fydd y VBA Basic Code gwreiddiol sydd o fewn y ddogfen yn cael ei gadw."
 
-#: svxerr.hrc:67
+#: svx/inc/svxerr.hrc:67
 msgctxt "RID_SVXERRCODE"
 msgid "The password is incorrect. The document cannot be opened."
 msgstr "Mae'r cyfrinair yn anghywir. Nid oes modd agor y ddogfen."
 
-#: svxerr.hrc:69
+#: svx/inc/svxerr.hrc:69
 msgctxt "RID_SVXERRCODE"
 msgid "The encryption method used in this document is not supported. Only Microsoft Office 97/2000 compatible password encryption is supported."
 msgstr "Nid yw'r dull o amgryptio sy'n cael ei ddefnyddio yn y ddogfen yn cael ei gynnal. Dim ond amgryptiad cyfrinair Microsoft Office 97/2000 cydweddus sy'n cael ei gynnal."
 
-#: svxerr.hrc:71
+#: svx/inc/svxerr.hrc:71
 msgctxt "RID_SVXERRCODE"
 msgid "The loading of password-encrypted Microsoft PowerPoint presentations is not supported."
 msgstr "Nid yw llwytho cyflwyniadau Microsoft PowerPoint gyda chyfrinair amgryptiedig yn cael ei gynnal."
 
-#: svxerr.hrc:73
+#: svx/inc/svxerr.hrc:73
 msgctxt "RID_SVXERRCODE"
 msgid ""
 "Password protection is not supported when documents are saved in a Microsoft Office format.\n"
@@ -608,1954 +626,1977 @@ msgstr ""
 "Nid yw diogelu cyfrinair yn cael ei gynnal pan fo dogfennau'n cael eu cadw yn fformat Microsoft Office.\n"
 "Hoffech chi gadw'r ddogfen heb ddiogelwch cyfrinair?"
 
-#: swframeposstrings.hrc:28
+#: svx/inc/swframeposstrings.hrc:28
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Left"
 msgstr "Chwith"
 
-#: swframeposstrings.hrc:29
+#: svx/inc/swframeposstrings.hrc:29
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Right"
 msgstr "De"
 
-#: swframeposstrings.hrc:30
+#: svx/inc/swframeposstrings.hrc:30
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "From left"
 msgstr "O'r chwith"
 
-#: swframeposstrings.hrc:31
+#: svx/inc/swframeposstrings.hrc:31
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Inside"
 msgstr "Mewn"
 
-#: swframeposstrings.hrc:32
+#: svx/inc/swframeposstrings.hrc:32
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Outside"
 msgstr "Allan"
 
-#: swframeposstrings.hrc:33
+#: svx/inc/swframeposstrings.hrc:33
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "From inside"
 msgstr "Oddi fewn"
 
-#: swframeposstrings.hrc:34
+#: svx/inc/swframeposstrings.hrc:34
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Paragraph area"
 msgstr "Ardal paragraff"
 
-#: swframeposstrings.hrc:35
-#: /home/cl/vc/git/libo-core/svx/inc/swframeposstrings.hrc:50
+#: svx/inc/swframeposstrings.hrc:35 svx/inc/swframeposstrings.hrc:50
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Paragraph text area"
 msgstr "Ardal testun paragraff"
 
-#: swframeposstrings.hrc:36
+#: svx/inc/swframeposstrings.hrc:36
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Left page border"
 msgstr "Border tudalen chwith"
 
-#: swframeposstrings.hrc:37
+#: svx/inc/swframeposstrings.hrc:37
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Right page border"
 msgstr "Border tudalen de"
 
-#: swframeposstrings.hrc:38
+#: svx/inc/swframeposstrings.hrc:38
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Left paragraph border"
 msgstr "Border paragraff chwith"
 
-#: swframeposstrings.hrc:39
+#: svx/inc/swframeposstrings.hrc:39
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Right paragraph border"
 msgstr "Border paragraff de"
 
-#: swframeposstrings.hrc:40
+#: svx/inc/swframeposstrings.hrc:40
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Inner page border"
 msgstr "Border ffrâm fewnol"
 
-#: swframeposstrings.hrc:41
+#: svx/inc/swframeposstrings.hrc:41
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Outer page border"
 msgstr "Border tudalen allanol"
 
-#: swframeposstrings.hrc:42
+#: svx/inc/swframeposstrings.hrc:42
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Inner paragraph border"
 msgstr "Border paragraff mewnol"
 
-#: swframeposstrings.hrc:43
+#: svx/inc/swframeposstrings.hrc:43
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Outer paragraph border"
 msgstr "Border paragraff allanol"
 
-#: swframeposstrings.hrc:44
+#: svx/inc/swframeposstrings.hrc:44
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Entire page"
 msgstr "Tudalen gyfan"
 
-#: swframeposstrings.hrc:45
+#: svx/inc/swframeposstrings.hrc:45
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Page text area"
 msgstr "Ardal testun tudalen"
 
-#: swframeposstrings.hrc:46
+#: svx/inc/swframeposstrings.hrc:46
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Base line"
 msgstr "Llinell sail"
 
-#: swframeposstrings.hrc:47
+#: svx/inc/swframeposstrings.hrc:47
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Character"
 msgstr "Nod"
 
-#: swframeposstrings.hrc:48
+#: svx/inc/swframeposstrings.hrc:48
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Row"
 msgstr "Rhes"
 
-#: swframeposstrings.hrc:49
+#: svx/inc/swframeposstrings.hrc:49
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Margin"
 msgstr "Ymyl"
 
-#: swframeposstrings.hrc:51
+#: svx/inc/swframeposstrings.hrc:51
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Left frame border"
 msgstr "Border ffrâm chwith"
 
-#: swframeposstrings.hrc:52
+#: svx/inc/swframeposstrings.hrc:52
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Right frame border"
 msgstr "Border ffrâm de"
 
-#: swframeposstrings.hrc:53
+#: svx/inc/swframeposstrings.hrc:53
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Entire frame"
 msgstr "Ffrâm gyfan"
 
-#: swframeposstrings.hrc:54
+#: svx/inc/swframeposstrings.hrc:54
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Frame text area"
 msgstr "Ardal testun ffrâm"
 
-#: swframeposstrings.hrc:55
+#: svx/inc/swframeposstrings.hrc:55
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Inner frame border"
 msgstr "Border ffrâm fewnol"
 
-#: swframeposstrings.hrc:56
+#: svx/inc/swframeposstrings.hrc:56
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Outer frame border"
 msgstr "Border ffrâm allanol"
 
-#: swframeposstrings.hrc:57
+#: svx/inc/swframeposstrings.hrc:57
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Top"
 msgstr "Brig"
 
-#: swframeposstrings.hrc:58
+#: svx/inc/swframeposstrings.hrc:58
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: swframeposstrings.hrc:59
-#: /home/cl/vc/git/libo-core/svx/inc/swframeposstrings.hrc:60
+#: svx/inc/swframeposstrings.hrc:59 svx/inc/swframeposstrings.hrc:60
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Center"
 msgstr "Canol"
 
-#: swframeposstrings.hrc:61
+#: svx/inc/swframeposstrings.hrc:61
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "From top"
 msgstr "O'r brig"
 
-#: swframeposstrings.hrc:62
+#: svx/inc/swframeposstrings.hrc:62
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "From bottom"
 msgstr "O'r gwaelod"
 
-#: swframeposstrings.hrc:63
+#: svx/inc/swframeposstrings.hrc:63
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Below"
 msgstr "Islaw"
 
-#: swframeposstrings.hrc:64
+#: svx/inc/swframeposstrings.hrc:64
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "From right"
 msgstr "O'r dde"
 
-#: swframeposstrings.hrc:65
+#: svx/inc/swframeposstrings.hrc:65
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Top page border"
 msgstr "Border tudalen brig"
 
-#: swframeposstrings.hrc:66
+#: svx/inc/swframeposstrings.hrc:66
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Bottom page border"
 msgstr "Border tudalen gwaelod"
 
-#: swframeposstrings.hrc:67
+#: svx/inc/swframeposstrings.hrc:67
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Top paragraph border"
 msgstr "Border paragraff brig"
 
-#: swframeposstrings.hrc:68
+#: svx/inc/swframeposstrings.hrc:68
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Bottom paragraph border"
 msgstr "Border paragraff gwaelod"
 
-#: swframeposstrings.hrc:69
+#: svx/inc/swframeposstrings.hrc:69
 msgctxt "RID_SVXSW_FRAMEPOSITIONS"
 msgid "Line of text"
 msgstr "Llinell o testun"
 
-#: tabwin.hrc:27
+#: svx/inc/tabwin.hrc:27
 msgctxt "RID_RSC_TABWIN_PREFIX"
 msgid "Table"
 msgstr "Tabl"
 
-#: tabwin.hrc:28
+#: svx/inc/tabwin.hrc:28
 msgctxt "RID_RSC_TABWIN_PREFIX"
 msgid "Query"
 msgstr "Ymholiad"
 
-#: tabwin.hrc:29
+#: svx/inc/tabwin.hrc:29
 msgctxt "RID_RSC_TABWIN_PREFIX"
 msgid "SQL"
 msgstr "SQL"
 
-#: txenctab.hrc:32
+#: svx/inc/txenctab.hrc:32
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (Windows-1252/WinLatin 1)"
 msgstr "Gorllewin Ewrop (Windows-1252/WinLatin 1)"
 
-#: txenctab.hrc:33
+#: svx/inc/txenctab.hrc:33
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (Apple Macintosh)"
 msgstr "Gorllewin Ewrop (Apple Macintosh)"
 
-#: txenctab.hrc:34
+#: svx/inc/txenctab.hrc:34
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (DOS/OS2-850/International)"
 msgstr "Gorllewin Ewrop (DOS/OS2-850/Rhyngwladol)"
 
-#: txenctab.hrc:35
+#: svx/inc/txenctab.hrc:35
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (DOS/OS2-437/US)"
 msgstr "Gorllewin Ewrop (DOS/OS2-437/US)"
 
-#: txenctab.hrc:36
+#: svx/inc/txenctab.hrc:36
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (DOS/OS2-860/Portuguese)"
 msgstr "Gorllewin Ewrop (DOS/OS2-860/Portiwgaleg)"
 
-#: txenctab.hrc:37
+#: svx/inc/txenctab.hrc:37
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (DOS/OS2-861/Icelandic)"
 msgstr "Gorllewin Ewrop (DOS/OS2-861/Eislandeg)"
 
-#: txenctab.hrc:38
+#: svx/inc/txenctab.hrc:38
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (DOS/OS2-863/French (Can.))"
 msgstr "Gorllewin Ewrop (DOS/OS2-863/Ffrangeg (Can.))"
 
-#: txenctab.hrc:39
+#: svx/inc/txenctab.hrc:39
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (DOS/OS2-865/Nordic)"
 msgstr "Gorllewin Ewrop (DOS/OS2-865/Llychlyn)"
 
-#: txenctab.hrc:40
+#: svx/inc/txenctab.hrc:40
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (ASCII/US)"
 msgstr "Gorllewin Ewrop (ASCII/US)"
 
-#: txenctab.hrc:41
+#: svx/inc/txenctab.hrc:41
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (ISO-8859-1)"
 msgstr "Gorllewin Ewrop (ISO-8859-1)"
 
-#: txenctab.hrc:42
+#: svx/inc/txenctab.hrc:42
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Eastern Europe (ISO-8859-2)"
 msgstr "Dwyrain Ewrop (ISO-8859-2)"
 
-#: txenctab.hrc:43
+#: svx/inc/txenctab.hrc:43
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Latin 3 (ISO-8859-3)"
 msgstr "Lladin 3 (ISO-8859-3)"
 
-#: txenctab.hrc:44
+#: svx/inc/txenctab.hrc:44
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balteg (ISO-8859-4)"
 
-#: txenctab.hrc:45
+#: svx/inc/txenctab.hrc:45
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilig (ISO-8859-5)"
 
-#: txenctab.hrc:46
+#: svx/inc/txenctab.hrc:46
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabeg (ISO-8859-6)"
 
-#: txenctab.hrc:47
+#: svx/inc/txenctab.hrc:47
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Greek (ISO-8859-7)"
 msgstr "Groeg (ISO-8859-7)"
 
-#: txenctab.hrc:48
+#: svx/inc/txenctab.hrc:48
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebraeg (ISO-8859-8)"
 
-#: txenctab.hrc:49
+#: svx/inc/txenctab.hrc:49
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Turkish (ISO-8859-9)"
 msgstr "Twrceg (ISO-8859-9)"
 
-#: txenctab.hrc:50
+#: svx/inc/txenctab.hrc:50
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (ISO-8859-14)"
 msgstr "Gorllewin Ewrop (ISO-8859-14)"
 
-#: txenctab.hrc:51
+#: svx/inc/txenctab.hrc:51
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (ISO-8859-15/EURO)"
 msgstr "Gorllewin Ewrop (ISO-8859-15/EURO)"
 
-#: txenctab.hrc:52
+#: svx/inc/txenctab.hrc:52
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Greek (DOS/OS2-737)"
 msgstr "Groeg (DOS/OS2-737)"
 
-#: txenctab.hrc:53
+#: svx/inc/txenctab.hrc:53
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Baltic (DOS/OS2-775)"
 msgstr "Baltig (DOS/OS2-775)"
 
-#: txenctab.hrc:54
+#: svx/inc/txenctab.hrc:54
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Eastern Europe (DOS/OS2-852)"
 msgstr "Dwyrain Ewrop (DOS/OS2-852)"
 
-#: txenctab.hrc:55
+#: svx/inc/txenctab.hrc:55
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Cyrillic (DOS/OS2-855)"
 msgstr "Cyrilig (DOS/OS2-855)"
 
-#: txenctab.hrc:56
+#: svx/inc/txenctab.hrc:56
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Turkish (DOS/OS2-857)"
 msgstr "Twrceg (DOS/OS2-857)"
 
-#: txenctab.hrc:57
+#: svx/inc/txenctab.hrc:57
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Hebrew (DOS/OS2-862)"
 msgstr "Hebraeg (DOS/OS2-862)"
 
-#: txenctab.hrc:58
+#: svx/inc/txenctab.hrc:58
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Arabic (DOS/OS2-864)"
 msgstr "Arabeg (DOS/OS2-864)"
 
-#: txenctab.hrc:59
+#: svx/inc/txenctab.hrc:59
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Cyrillic (DOS/OS2-866/Russian)"
 msgstr "Cyrilig (DOS/OS2-866/Russian)"
 
-#: txenctab.hrc:60
+#: svx/inc/txenctab.hrc:60
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Greek (DOS/OS2-869/Modern)"
 msgstr "Groeg (DOS/OS2-869/Modern)"
 
-#: txenctab.hrc:61
+#: svx/inc/txenctab.hrc:61
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Eastern Europe (Windows-1250/WinLatin 2)"
 msgstr "Dwyrain Ewrop (Windows-1250/WinLatin 2)"
 
-#: txenctab.hrc:62
+#: svx/inc/txenctab.hrc:62
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilig (Windows-1251)"
 
-#: txenctab.hrc:63
+#: svx/inc/txenctab.hrc:63
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Greek (Windows-1253)"
 msgstr "Groeg (Windows-1253)"
 
-#: txenctab.hrc:64
+#: svx/inc/txenctab.hrc:64
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Turkish (Windows-1254)"
 msgstr "Twrceg (Windows-1254)"
 
-#: txenctab.hrc:65
+#: svx/inc/txenctab.hrc:65
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebraeg (Windows-1255)"
 
-#: txenctab.hrc:66
+#: svx/inc/txenctab.hrc:66
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Arabic (Windows-1256)"
 msgstr "Arabeg (Windows-1256)"
 
-#: txenctab.hrc:67
+#: svx/inc/txenctab.hrc:67
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Baltic (Windows-1257)"
 msgstr "Baltig (Windows-1257)"
 
-#: txenctab.hrc:68
+#: svx/inc/txenctab.hrc:68
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Vietnamese (Windows-1258)"
 msgstr "Fietnameg (Windows-1258)"
 
-#: txenctab.hrc:69
+#: svx/inc/txenctab.hrc:69
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Eastern Europe (Apple Macintosh)"
 msgstr "Dwyrain Ewrop (Apple Macintosh)"
 
-#: txenctab.hrc:70
+#: svx/inc/txenctab.hrc:70
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Eastern Europe (Apple Macintosh/Croatian)"
 msgstr "Dwyrain Ewrop (Apple Macintosh/Croatieg)"
 
-#: txenctab.hrc:71
+#: svx/inc/txenctab.hrc:71
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Cyrillic (Apple Macintosh)"
 msgstr "Cyrilig (Apple Macintosh)"
 
-#: txenctab.hrc:72
+#: svx/inc/txenctab.hrc:72
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Greek (Apple Macintosh)"
 msgstr "Groeg (Apple Macintosh)"
 
-#: txenctab.hrc:73
+#: svx/inc/txenctab.hrc:73
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Western Europe (Apple Macintosh/Icelandic)"
 msgstr "Gorllewin Ewrop (Apple Macintosh/Eislandeg)"
 
-#: txenctab.hrc:74
+#: svx/inc/txenctab.hrc:74
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Eastern Europe (Apple Macintosh/Romanian)"
 msgstr "Dwyrain Ewrop (Apple Macintosh/Rwmaneg)"
 
-#: txenctab.hrc:75
+#: svx/inc/txenctab.hrc:75
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Turkish (Apple Macintosh)"
 msgstr "Twrceg (Apple Macintosh)"
 
-#: txenctab.hrc:76
+#: svx/inc/txenctab.hrc:76
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Cyrillic (Apple Macintosh/Ukrainian)"
 msgstr "Cyrilig (Apple Macintosh/Wcraneg)"
 
-#: txenctab.hrc:77
+#: svx/inc/txenctab.hrc:77
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese simplified (Apple Macintosh)"
 msgstr "Tsieineeg Symledig (Apple Macintosh)"
 
-#: txenctab.hrc:78
+#: svx/inc/txenctab.hrc:78
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese traditional (Apple Macintosh)"
 msgstr "Tsieineeg traddodiadol (Apple Macintosh)"
 
-#: txenctab.hrc:79
+#: svx/inc/txenctab.hrc:79
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Japanese (Apple Macintosh)"
 msgstr "Japaneeg (Apple Macintosh)"
 
-#: txenctab.hrc:80
+#: svx/inc/txenctab.hrc:80
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Korean (Apple Macintosh)"
 msgstr "Coreeg (Apple Macintosh)"
 
-#: txenctab.hrc:81
+#: svx/inc/txenctab.hrc:81
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Japanese (Windows-932)"
 msgstr "Japaneeg (Windows-932)"
 
-#: txenctab.hrc:82
+#: svx/inc/txenctab.hrc:82
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese simplified (Windows-936)"
 msgstr "Tsieineeg symledig (Windows-936)"
 
-#: txenctab.hrc:83
+#: svx/inc/txenctab.hrc:83
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Korean (Windows-949)"
 msgstr "Coreeg (Windows-949)"
 
-#: txenctab.hrc:84
+#: svx/inc/txenctab.hrc:84
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese traditional (Windows-950)"
 msgstr "Tsieineeg traddodiadol (Windows-950)"
 
-#: txenctab.hrc:85
+#: svx/inc/txenctab.hrc:85
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Japanese (Shift-JIS)"
 msgstr "Japaneeg (Shift-JIS)"
 
-#: txenctab.hrc:86
+#: svx/inc/txenctab.hrc:86
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese simplified (GB-2312)"
 msgstr "Tsieineeg symledig (GB-2312)"
 
-#: txenctab.hrc:87
+#: svx/inc/txenctab.hrc:87
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese simplified (GB-18030)"
 msgstr "Tsieineeg symledig (GB-18030)"
 
-#: txenctab.hrc:88
+#: svx/inc/txenctab.hrc:88
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese traditional (GBT-12345)"
 msgstr "Tsieineeg traddodiadol (GBT-12345)"
 
-#: txenctab.hrc:89
+#: svx/inc/txenctab.hrc:89
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese simplified (GBK/GB-2312-80)"
 msgstr "Tsieineeg symledig (GBK/GB-2312-80)"
 
-#: txenctab.hrc:90
+#: svx/inc/txenctab.hrc:90
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese traditional (Big5)"
 msgstr "Tsieineeg traddodiadol (Big5)"
 
-#: txenctab.hrc:91
+#: svx/inc/txenctab.hrc:91
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese traditional (BIG5-HKSCS)"
 msgstr "Tsieineeg traddodiadol (BIG5-HKSCS)"
 
-#: txenctab.hrc:92
+#: svx/inc/txenctab.hrc:92
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Japanese (EUC-JP)"
 msgstr "Japaneeg (EUC-JP)"
 
-#: txenctab.hrc:93
+#: svx/inc/txenctab.hrc:93
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese simplified (EUC-CN)"
 msgstr "Tsieineeg symledig (EUC-CN)"
 
-#: txenctab.hrc:94
+#: svx/inc/txenctab.hrc:94
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese traditional (EUC-TW)"
 msgstr "Tsieineeg traddodiadol (EUC-TW)"
 
-#: txenctab.hrc:95
+#: svx/inc/txenctab.hrc:95
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japaneeg (ISO-2022-JP)"
 
-#: txenctab.hrc:96
+#: svx/inc/txenctab.hrc:96
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Chinese simplified (ISO-2022-CN)"
 msgstr "Tsieineeg symledig (ISO-2022-CN)"
 
-#: txenctab.hrc:97
+#: svx/inc/txenctab.hrc:97
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilig (KOI8-R)"
 
-#: txenctab.hrc:98
+#: svx/inc/txenctab.hrc:98
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Unicode (UTF-7)"
 msgstr "Unicode (UTF-7)"
 
-#: txenctab.hrc:99
+#: svx/inc/txenctab.hrc:99
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: txenctab.hrc:100
+#: svx/inc/txenctab.hrc:100
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Eastern Europe (ISO-8859-10)"
 msgstr "Dwyrain Ewrop (ISO-8859-10)"
 
-#: txenctab.hrc:101
+#: svx/inc/txenctab.hrc:101
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Eastern Europe (ISO-8859-13)"
 msgstr "Dwyrain Ewrop (ISO-8859-13)"
 
-#: txenctab.hrc:102
+#: svx/inc/txenctab.hrc:102
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Korean (EUC-KR)"
 msgstr "Coreeg (EUC-KR)"
 
-#: txenctab.hrc:103
+#: svx/inc/txenctab.hrc:103
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Korean (ISO-2022-KR)"
 msgstr "Coreeg (ISO-2022-KR)"
 
-#: txenctab.hrc:104
+#: svx/inc/txenctab.hrc:104
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Korean (Windows-Johab-1361)"
 msgstr "Coreeg (Windows-Johab-1361)"
 
-#: txenctab.hrc:105
+#: svx/inc/txenctab.hrc:105
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Unicode (UTF-16)"
 msgstr "Unicode (UTF-16)"
 
-#: txenctab.hrc:106
+#: svx/inc/txenctab.hrc:106
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Thai (ISO-8859-11/TIS-620)"
 msgstr "Thai (ISO-8859-11/TIS-620)"
 
-#: txenctab.hrc:107
+#: svx/inc/txenctab.hrc:107
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: txenctab.hrc:108
+#: svx/inc/txenctab.hrc:108
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilig (KOI8-U)"
 
-#: txenctab.hrc:109
+#: svx/inc/txenctab.hrc:109
 msgctxt "RID_SVXSTR_TEXTENCODING_TABLE"
 msgid "Cyrillic (PT154)"
 msgstr "Cyrilig (PT154)"
 
-#: page.hrc:30
+#: svx/source/dialog/page.hrc:30
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "A6"
 msgstr "A6"
 
-#: page.hrc:31
+#: svx/source/dialog/page.hrc:31
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "A5"
 msgstr "A5"
 
-#: page.hrc:32
+#: svx/source/dialog/page.hrc:32
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "A4"
 msgstr "A4"
 
-#: page.hrc:33
+#: svx/source/dialog/page.hrc:33
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "A3"
 msgstr "A3"
 
-#: page.hrc:34
+#: svx/source/dialog/page.hrc:34
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "B6 (ISO)"
 msgstr "B6 (ISO)"
 
-#: page.hrc:35
+#: svx/source/dialog/page.hrc:35
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "B5 (ISO)"
 msgstr "B5 (ISO)"
 
-#: page.hrc:36
+#: svx/source/dialog/page.hrc:36
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "B4 (ISO)"
 msgstr "B4 (ISO)"
 
-#: page.hrc:37
+#: svx/source/dialog/page.hrc:37
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "Letter"
 msgstr "Letter"
 
-#: page.hrc:38
+#: svx/source/dialog/page.hrc:38
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "Legal"
 msgstr "Legal"
 
-#: page.hrc:39
+#: svx/source/dialog/page.hrc:39
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "Long Bond"
 msgstr "Long Bond"
 
-#: page.hrc:40
+#: svx/source/dialog/page.hrc:40
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: page.hrc:41
+#: svx/source/dialog/page.hrc:41
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "B6 (JIS)"
 msgstr "B6 (JIS)"
 
-#: page.hrc:42
+#: svx/source/dialog/page.hrc:42
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "B5 (JIS)"
 msgstr "B5 (JIS)"
 
-#: page.hrc:43
+#: svx/source/dialog/page.hrc:43
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "B4 (JIS)"
 msgstr "B4 (JIS)"
 
-#: page.hrc:44
+#: svx/source/dialog/page.hrc:44
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "16 Kai"
 msgstr "16 Kai"
 
-#: page.hrc:45
+#: svx/source/dialog/page.hrc:45
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "32 Kai"
 msgstr "32 Kai"
 
-#: page.hrc:46
+#: svx/source/dialog/page.hrc:46
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "Big 32 Kai"
 msgstr "Big 32 Kai"
 
-#: page.hrc:47
+#: svx/source/dialog/page.hrc:47
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "User"
 msgstr "Defnyddiwr"
 
-#: page.hrc:48
+#: svx/source/dialog/page.hrc:48
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "DL Envelope"
 msgstr "Amlen DL"
 
-#: page.hrc:49
+#: svx/source/dialog/page.hrc:49
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "C6 Envelope"
 msgstr "Amlen C6"
 
-#: page.hrc:50
+#: svx/source/dialog/page.hrc:50
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "C6/5 Envelope"
 msgstr "Amlen C6/5"
 
-#: page.hrc:51
+#: svx/source/dialog/page.hrc:51
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "C5 Envelope"
 msgstr "Amlen C5"
 
-#: page.hrc:52
+#: svx/source/dialog/page.hrc:52
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "C4 Envelope"
 msgstr "Amlen C4"
 
-#: page.hrc:53
+#: svx/source/dialog/page.hrc:53
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "#6¾ Envelope"
 msgstr "Amlen #6¾"
 
-#: page.hrc:54
+#: svx/source/dialog/page.hrc:54
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "#7¾ (Monarch) Envelope"
 msgstr "Amlen #7¾ (Monarch)"
 
-#: page.hrc:55
+#: svx/source/dialog/page.hrc:55
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "#9 Envelope"
 msgstr "Amlen #9"
 
-#: page.hrc:56
+#: svx/source/dialog/page.hrc:56
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "#10 Envelope"
 msgstr "Amlen #10"
 
-#: page.hrc:57
+#: svx/source/dialog/page.hrc:57
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "#11 Envelope"
 msgstr "Amlen #11"
 
-#: page.hrc:58
+#: svx/source/dialog/page.hrc:58
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "#12 Envelope"
 msgstr "Amlen #12"
 
-#: page.hrc:59
+#: svx/source/dialog/page.hrc:59
 msgctxt "RID_SVXSTRARY_PAPERSIZE_STD"
 msgid "Japanese Postcard"
 msgstr "Cerdyn Post Japaneaidd"
 
-#: page.hrc:64
+#: svx/source/dialog/page.hrc:64
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "A6"
 msgstr "A6"
 
-#: page.hrc:65
+#: svx/source/dialog/page.hrc:65
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "A5"
 msgstr "A5"
 
-#: page.hrc:66
+#: svx/source/dialog/page.hrc:66
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "A4"
 msgstr "A4"
 
-#: page.hrc:67
+#: svx/source/dialog/page.hrc:67
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "A3"
 msgstr "A3"
 
-#: page.hrc:68
+#: svx/source/dialog/page.hrc:68
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "A2"
 msgstr "A2"
 
-#: page.hrc:69
+#: svx/source/dialog/page.hrc:69
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "A1"
 msgstr "A1"
 
-#: page.hrc:70
+#: svx/source/dialog/page.hrc:70
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "A0"
 msgstr "A0"
 
-#: page.hrc:71
+#: svx/source/dialog/page.hrc:71
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "B6 (ISO)"
 msgstr "B6 (ISO)"
 
-#: page.hrc:72
+#: svx/source/dialog/page.hrc:72
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "B5 (ISO)"
 msgstr "B5 (ISO)"
 
-#: page.hrc:73
+#: svx/source/dialog/page.hrc:73
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "B4 (ISO)"
 msgstr "B4 (ISO)"
 
-#: page.hrc:74
+#: svx/source/dialog/page.hrc:74
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "Letter"
 msgstr "Llythyr"
 
-#: page.hrc:75
+#: svx/source/dialog/page.hrc:75
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "Legal"
 msgstr "Legal"
 
-#: page.hrc:76
+#: svx/source/dialog/page.hrc:76
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "Long Bond"
 msgstr "Long Bond"
 
-#: page.hrc:77
+#: svx/source/dialog/page.hrc:77
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: page.hrc:78
+#: svx/source/dialog/page.hrc:78
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "B6 (JIS)"
 msgstr "B6 (JIS)"
 
-#: page.hrc:79
+#: svx/source/dialog/page.hrc:79
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "B5 (JIS)"
 msgstr "B5 (JIS)"
 
-#: page.hrc:80
+#: svx/source/dialog/page.hrc:80
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "B4 (JIS)"
 msgstr "B4 (JIS)"
 
-#: page.hrc:81
+#: svx/source/dialog/page.hrc:81
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "16 Kai"
 msgstr "16 Kai"
 
-#: page.hrc:82
+#: svx/source/dialog/page.hrc:82
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "32 Kai"
 msgstr "32 Kai"
 
-#: page.hrc:83
+#: svx/source/dialog/page.hrc:83
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "Big 32 Kai"
 msgstr "Big 32 Kai"
 
-#: page.hrc:84
+#: svx/source/dialog/page.hrc:84
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "User"
 msgstr "Defnyddiwr"
 
-#: page.hrc:85
+#: svx/source/dialog/page.hrc:85
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "DL Envelope"
 msgstr "Amlen DL"
 
-#: page.hrc:86
+#: svx/source/dialog/page.hrc:86
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "C6 Envelope"
 msgstr "Amlen C6"
 
-#: page.hrc:87
+#: svx/source/dialog/page.hrc:87
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "C6/5 Envelope"
 msgstr "Amlen C6/5"
 
-#: page.hrc:88
+#: svx/source/dialog/page.hrc:88
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "C5 Envelope"
 msgstr "Amlen C5"
 
-#: page.hrc:89
+#: svx/source/dialog/page.hrc:89
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "C4 Envelope"
 msgstr "Amlen C4"
 
-#: page.hrc:90
+#: svx/source/dialog/page.hrc:90
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "Dia Slide"
 msgstr "Dia Slide"
 
-#: page.hrc:91
+#: svx/source/dialog/page.hrc:91
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "Screen 4:3"
 msgstr "Sgrin 4:3"
 
-#: page.hrc:92
+#: svx/source/dialog/page.hrc:92
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "Screen 16:9"
 msgstr "Sgrin 16:9"
 
-#: page.hrc:93
+#: svx/source/dialog/page.hrc:93
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "Screen 16:10"
 msgstr "Sgrin 16:10"
 
-#: page.hrc:94
+#: svx/source/dialog/page.hrc:94
 msgctxt "RID_SVXSTRARY_PAPERSIZE_DRAW"
 msgid "Japanese Postcard"
 msgstr "Cerdyn Post Japaneaidd"
 
-#: acceptrejectchangesdialog.ui:8
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:8
 msgctxt "acceptrejectchangesdialog|AcceptRejectChangesDialog"
 msgid "Manage Changes"
 msgstr "Rheoli Newidiadau"
 
-#: acceptrejectchangesdialog.ui:21
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:21
 msgctxt "acceptrejectchangesdialog|accept"
 msgid "_Accept"
 msgstr "_Derbyn"
 
-#: acceptrejectchangesdialog.ui:35
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:35
 msgctxt "acceptrejectchangesdialog|reject"
 msgid "_Reject"
 msgstr "_Gwrthod"
 
-#: acceptrejectchangesdialog.ui:49
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:49
 msgctxt "acceptrejectchangesdialog|acceptall"
 msgid "A_ccept All"
 msgstr "_Derbyn Popeth"
 
-#: acceptrejectchangesdialog.ui:63
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:63
 msgctxt "acceptrejectchangesdialog|rejectall"
 msgid "R_eject All"
 msgstr "_Gwrthod Popeth"
 
-#: acceptrejectchangesdialog.ui:134
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:134
 msgctxt "acceptrejectchangesdialog|calcedit"
 msgid "Edit Comment..."
 msgstr "Golygu Sylw..."
 
-#: acceptrejectchangesdialog.ui:141
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:141
 msgctxt "acceptrejectchangesdialog|calcsort"
 msgid "Sorting"
 msgstr "Didoli"
 
-#: acceptrejectchangesdialog.ui:151
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:151
 msgctxt "acceptrejectchangesdialog|calcaction"
 msgid "Action"
 msgstr "Gweithred"
 
-#: acceptrejectchangesdialog.ui:159
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:159
 msgctxt "acceptrejectchangesdialog|calcposition"
 msgid "Position"
 msgstr "Safle"
 
-#: acceptrejectchangesdialog.ui:167
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:167
 msgctxt "acceptrejectchangesdialog|calcauthor"
 msgid "Author"
 msgstr "Awdur"
 
-#: acceptrejectchangesdialog.ui:175
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:175
 msgctxt "acceptrejectchangesdialog|calcdate"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: acceptrejectchangesdialog.ui:183
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:183
 msgctxt "acceptrejectchangesdialog|calcdesc"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: acceptrejectchangesdialog.ui:199
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:199
 msgctxt "acceptrejectchangesdialog|writeredit"
 msgid "Edit Comment..."
 msgstr "Golygu Sylw..."
 
-#: acceptrejectchangesdialog.ui:206
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:206
 msgctxt "acceptrejectchangesdialog|writersort"
 msgid "Sort By"
 msgstr "Trefnu yn ôl"
 
-#: acceptrejectchangesdialog.ui:216
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:216
 msgctxt "acceptrejectchangesdialog|writeraction"
 msgid "Action"
 msgstr "Gweithred"
 
-#: acceptrejectchangesdialog.ui:224
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:224
 msgctxt "acceptrejectchangesdialog|writerauthor"
 msgid "Author"
 msgstr "Awdur"
 
-#: acceptrejectchangesdialog.ui:232
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:232
 msgctxt "acceptrejectchangesdialog|writerdate"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: acceptrejectchangesdialog.ui:240
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:240
 msgctxt "acceptrejectchangesdialog|writerdesc"
 msgid "Comment"
 msgstr "Sylw"
 
-#: acceptrejectchangesdialog.ui:248
+#: svx/uiconfig/ui/acceptrejectchangesdialog.ui:248
 msgctxt "acceptrejectchangesdialog|writerposition"
 msgid "Document Position"
 msgstr "Safle Dogfen"
 
-#: addconditiondialog.ui:8
+#: svx/uiconfig/ui/addconditiondialog.ui:8
 msgctxt "addconditiondialog|AddConditionDialog"
 msgid "Add Condition"
 msgstr "Ychwanegu Amod"
 
-#: addconditiondialog.ui:28
+#: svx/uiconfig/ui/addconditiondialog.ui:28
 msgctxt "addconditiondialog|label1"
 msgid "_Condition:"
 msgstr "_Amod:"
 
-#: addconditiondialog.ui:69
+#: svx/uiconfig/ui/addconditiondialog.ui:69
 msgctxt "addconditiondialog|label2"
 msgid "_Result:"
 msgstr "_Canlyniad:"
 
-#: addconditiondialog.ui:94
+#: svx/uiconfig/ui/addconditiondialog.ui:94
 msgctxt "addconditiondialog|edit"
 msgid "_Edit Namespaces..."
 msgstr "_Golygu Gofodenwau..."
 
-#: adddataitemdialog.ui:52
+#: svx/uiconfig/ui/adddataitemdialog.ui:51
 msgctxt "adddataitemdialog|nameft"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: adddataitemdialog.ui:66
+#: svx/uiconfig/ui/adddataitemdialog.ui:65
 msgctxt "adddataitemdialog|valueft"
 msgid "_Default value:"
 msgstr "_Gwerth rhagosodedig:"
 
-#: adddataitemdialog.ui:77
+#: svx/uiconfig/ui/adddataitemdialog.ui:76
 msgctxt "adddataitemdialog|browse"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: adddataitemdialog.ui:110
+#: svx/uiconfig/ui/adddataitemdialog.ui:108
 msgctxt "adddataitemdialog|label1"
 msgid "Item"
 msgstr "Eitem"
 
-#: adddataitemdialog.ui:148
+#: svx/uiconfig/ui/adddataitemdialog.ui:146
 msgctxt "adddataitemdialog|datatypeft"
 msgid "_Data type:"
 msgstr "Math o _ddata:"
 
-#: adddataitemdialog.ui:171
+#: svx/uiconfig/ui/adddataitemdialog.ui:169
 msgctxt "adddataitemdialog|required"
 msgid "_Required"
 msgstr "_Angenrheidiol"
 
-#: adddataitemdialog.ui:186
+#: svx/uiconfig/ui/adddataitemdialog.ui:184
 msgctxt "adddataitemdialog|requiredcond"
 msgid "Condition"
 msgstr "Amod"
 
-#: adddataitemdialog.ui:200
+#: svx/uiconfig/ui/adddataitemdialog.ui:198
 msgctxt "adddataitemdialog|relevant"
 msgid "R_elevant"
 msgstr "_Perthnasol"
 
-#: adddataitemdialog.ui:215
+#: svx/uiconfig/ui/adddataitemdialog.ui:213
 msgctxt "adddataitemdialog|relevantcond"
 msgid "Condition"
 msgstr "Amod"
 
-#: adddataitemdialog.ui:229
+#: svx/uiconfig/ui/adddataitemdialog.ui:227
 msgctxt "adddataitemdialog|constraint"
 msgid "_Constraint"
 msgstr "_Cyfyngiad"
 
-#: adddataitemdialog.ui:244
+#: svx/uiconfig/ui/adddataitemdialog.ui:242
 msgctxt "adddataitemdialog|readonly"
 msgid "Read-_only"
 msgstr "Darllen yn _unig"
 
-#: adddataitemdialog.ui:259
+#: svx/uiconfig/ui/adddataitemdialog.ui:257
 msgctxt "adddataitemdialog|calculate"
 msgid "Calc_ulate"
 msgstr "_Cyfrifo"
 
-#: adddataitemdialog.ui:274
+#: svx/uiconfig/ui/adddataitemdialog.ui:272
 msgctxt "adddataitemdialog|constraintcond"
 msgid "Condition"
 msgstr "Amod"
 
-#: adddataitemdialog.ui:288
+#: svx/uiconfig/ui/adddataitemdialog.ui:286
 msgctxt "adddataitemdialog|readonlycond"
 msgid "Condition"
 msgstr "Amod"
 
-#: adddataitemdialog.ui:302
+#: svx/uiconfig/ui/adddataitemdialog.ui:300
 msgctxt "adddataitemdialog|calculatecond"
 msgid "Condition"
 msgstr "Amod"
 
-#: adddataitemdialog.ui:322
+#: svx/uiconfig/ui/adddataitemdialog.ui:320
 msgctxt "adddataitemdialog|label4"
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: addinstancedialog.ui:9
+#: svx/uiconfig/ui/addinstancedialog.ui:9
 msgctxt "addinstancedialog|AddInstanceDialog"
 msgid "Add Instance"
 msgstr "Ychwanegu Enghraifft"
 
-#: addinstancedialog.ui:98
+#: svx/uiconfig/ui/addinstancedialog.ui:97
 msgctxt "addinstancedialog|label2"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: addinstancedialog.ui:111
+#: svx/uiconfig/ui/addinstancedialog.ui:110
 msgctxt "addinstancedialog|alttitle"
 msgid "Edit Instance"
 msgstr "Golygu'r Enghraifft"
 
-#: addinstancedialog.ui:124
+#: svx/uiconfig/ui/addinstancedialog.ui:123
 msgctxt "addinstancedialog|urlft"
 msgid "_URL:"
 msgstr "_URL:"
 
-#: addinstancedialog.ui:146
+#: svx/uiconfig/ui/addinstancedialog.ui:145
 msgctxt "addinstancedialog|browse"
 msgid "_Browse..."
 msgstr "_Pori..."
 
-#: addinstancedialog.ui:159
+#: svx/uiconfig/ui/addinstancedialog.ui:158
 msgctxt "addinstancedialog|link"
 msgid "_Link instance"
 msgstr "_Cysylltu enghraifft"
 
-#: addmodeldialog.ui:8
+#: svx/uiconfig/ui/addmodeldialog.ui:8
 msgctxt "addmodeldialog|AddModelDialog"
 msgid "Add Model"
 msgstr "Ychwanegu Model"
 
-#: addmodeldialog.ui:81
+#: svx/uiconfig/ui/addmodeldialog.ui:81
 msgctxt "addmodeldialog|modify"
 msgid "Model data updates change document's modification status"
 msgstr "Mae diweddariadau data model yn newid statws newid dogfen"
 
-#: addmodeldialog.ui:112
+#: svx/uiconfig/ui/addmodeldialog.ui:111
 msgctxt "addmodeldialog|label2"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: addmodeldialog.ui:125
+#: svx/uiconfig/ui/addmodeldialog.ui:124
 msgctxt "addmodeldialog|alttitle"
 msgid "Edit Model"
 msgstr "Ailenwi Model"
 
-#: addnamespacedialog.ui:8
+#: svx/uiconfig/ui/addnamespacedialog.ui:8
 msgctxt "addnamespacedialog|AddNamespaceDialog"
 msgid "Add Namespace"
 msgstr "Ychwanegu Gofod Enw"
 
-#: addnamespacedialog.ui:85
+#: svx/uiconfig/ui/addnamespacedialog.ui:85
 msgctxt "addnamespacedialog|label1"
 msgid "_Prefix:"
 msgstr "_Rhagddodiad:"
 
-#: addnamespacedialog.ui:125
+#: svx/uiconfig/ui/addnamespacedialog.ui:123
 msgctxt "addnamespacedialog|label2"
 msgid "_URL:"
 msgstr "_URL:"
 
-#: addnamespacedialog.ui:138
+#: svx/uiconfig/ui/addnamespacedialog.ui:136
 msgctxt "addnamespacedialog|alttitle"
 msgid "Edit Namespace"
 msgstr "Golygu Gofod Enw"
 
-#: addsubmissiondialog.ui:8
+#: svx/uiconfig/ui/addsubmissiondialog.ui:8
 msgctxt "addsubmissiondialog|AddSubmissionDialog"
 msgid "Add Submission"
 msgstr "Ychwanegu Argymhelliad"
 
-#: addsubmissiondialog.ui:98
+#: svx/uiconfig/ui/addsubmissiondialog.ui:97
 msgctxt "addsubmissiondialog|label2"
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: addsubmissiondialog.ui:112
+#: svx/uiconfig/ui/addsubmissiondialog.ui:111
 msgctxt "addsubmissiondialog|urlft"
 msgid "Binding e_xpression:"
 msgstr "Mynegiant _rhwymo:"
 
-#: addsubmissiondialog.ui:123
+#: svx/uiconfig/ui/addsubmissiondialog.ui:122
 msgctxt "addsubmissiondialog|browse"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: addsubmissiondialog.ui:140
+#: svx/uiconfig/ui/addsubmissiondialog.ui:139
 msgctxt "addsubmissiondialog|label3"
 msgid "_Action:"
 msgstr "_Gweithred:"
 
-#: addsubmissiondialog.ui:168
+#: svx/uiconfig/ui/addsubmissiondialog.ui:166
 msgctxt "addsubmissiondialog|label4"
 msgid "_Method:"
 msgstr "_Dull:"
 
-#: addsubmissiondialog.ui:207
+#: svx/uiconfig/ui/addsubmissiondialog.ui:204
 msgctxt "addsubmissiondialog|label5"
 msgid "_Binding:"
 msgstr "_Rhwymiad:"
 
-#: addsubmissiondialog.ui:221
+#: svx/uiconfig/ui/addsubmissiondialog.ui:218
 msgctxt "addsubmissiondialog|label6"
 msgid "_Replace:"
 msgstr "_Newid:"
 
-#: asianphoneticguidedialog.ui:9
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:9
 msgctxt "asianphoneticguidedialog|AsianPhoneticGuideDialog"
 msgid "Asian Phonetic Guide"
 msgstr "Asiaidd"
 
-#: asianphoneticguidedialog.ui:89
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:89
 msgctxt "asianphoneticguidedialog|basetextft"
 msgid "Base text"
 msgstr "Testun sail"
 
-#: asianphoneticguidedialog.ui:101
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:101
 msgctxt "asianphoneticguidedialog|rubytextft"
 msgid "Ruby text"
 msgstr "Testun Ruby"
 
-#: asianphoneticguidedialog.ui:141
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:141
 msgctxt "asianphoneticguidedialog|Left2ED-atkobject"
 msgid "Base text"
 msgstr "Testun sail"
 
-#: asianphoneticguidedialog.ui:177
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:177
 msgctxt "asianphoneticguidedialog|Right2ED-atkobject"
 msgid "Ruby text"
 msgstr "Testun Ruby"
 
-#: asianphoneticguidedialog.ui:192
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:192
 msgctxt "asianphoneticguidedialog|Left3ED-atkobject"
 msgid "Base text"
 msgstr "Testun sail"
 
-#: asianphoneticguidedialog.ui:207
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:207
 msgctxt "asianphoneticguidedialog|Right3ED-atkobject"
 msgid "Ruby text"
 msgstr "Testun Ruby"
 
-#: asianphoneticguidedialog.ui:222
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:222
 msgctxt "asianphoneticguidedialog|Right4ED-atkobject"
 msgid "Ruby text"
 msgstr "Testun Ruby"
 
-#: asianphoneticguidedialog.ui:237
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:237
 msgctxt "asianphoneticguidedialog|Left4ED-atkobject"
 msgid "Base text"
 msgstr "Testun sail"
 
-#: asianphoneticguidedialog.ui:268
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:268
 msgctxt "asianphoneticguidedialog|label4"
 msgid "Alignment:"
 msgstr "Aliniad:"
 
-#: asianphoneticguidedialog.ui:282
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:282
 msgctxt "asianphoneticguidedialog|label5"
 msgid "Position:"
 msgstr "Safle:"
 
-#: asianphoneticguidedialog.ui:296
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:296
 msgctxt "asianphoneticguidedialog|styleft"
 msgid "Character style for ruby text:"
 msgstr "Nod Arddull ar gyfer testun ruby:"
 
-#: asianphoneticguidedialog.ui:319
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:319
 msgctxt "asianphoneticguidedialog|styles"
 msgid "Styles"
 msgstr "Arddulliau"
 
-#: asianphoneticguidedialog.ui:335
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:335
 msgctxt "asianphoneticguidedialog|adjustlb"
 msgid "Left"
 msgstr "Chwith"
 
-#: asianphoneticguidedialog.ui:336
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:336
 msgctxt "asianphoneticguidedialog|adjustlb"
 msgid "Center"
 msgstr "Canol"
 
-#: asianphoneticguidedialog.ui:337
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:337
 msgctxt "asianphoneticguidedialog|adjustlb"
 msgid "Right"
 msgstr "De"
 
-#: asianphoneticguidedialog.ui:338
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:338
 msgctxt "asianphoneticguidedialog|adjustlb"
 msgid "0 1 0"
 msgstr "0 1 0"
 
-#: asianphoneticguidedialog.ui:339
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:339
 msgctxt "asianphoneticguidedialog|adjustlb"
 msgid "1 2 1"
 msgstr "1 2 1"
 
-#: asianphoneticguidedialog.ui:352
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:352
 msgctxt "asianphoneticguidedialog|positionlb"
 msgid "Top"
 msgstr "Brig"
 
-#: asianphoneticguidedialog.ui:353
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:353
 msgctxt "asianphoneticguidedialog|positionlb"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: asianphoneticguidedialog.ui:376
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:354
+msgctxt "asianphoneticguidedialog|positionlb"
+msgid "Right"
+msgstr "De"
+
+#: svx/uiconfig/ui/asianphoneticguidedialog.ui:377
 msgctxt "asianphoneticguidedialog|label1"
 msgid "Preview:"
 msgstr "Rhagolwg:"
 
-#: cellmenu.ui:12
+#: svx/uiconfig/ui/cellmenu.ui:12
 msgctxt "cellmenu|copy"
 msgid "_Copy"
 msgstr "­_Copïo"
 
-#: chineseconversiondialog.ui:8
+#: svx/uiconfig/ui/charsetmenu.ui:12
+msgctxt "charviewmenu|STR_CLEAR_CHAR"
+msgid "Insert into document"
+msgstr "Mewnosod i ddogfen"
+
+#: svx/uiconfig/ui/charsetmenu.ui:20
+msgctxt "charviewmenu|STR_CLEAR_ALL_CHAR"
+msgid "Add to favorites"
+msgstr "Ychwanegu i'r ffefrynnau"
+
+#: svx/uiconfig/ui/charsetmenu.ui:28
+msgctxt "charviewmenu|STR_CLEAR_ALL_CHAR"
+msgid "Remove from favorites"
+msgstr "Tynnu o'r Ffefrynnau"
+
+#: svx/uiconfig/ui/charsetmenu.ui:36
+msgctxt "charviewmenu|STR_CLEAR_ALL_CHAR"
+msgid "Copy to clipboard"
+msgstr "Copïo i'r clipfwrdd"
+
+#: svx/uiconfig/ui/chineseconversiondialog.ui:8
 msgctxt "chineseconversiondialog|ChineseConversionDialog"
 msgid "Chinese Conversion"
 msgstr "Cyfieithiad Tsieineeg"
 
-#: chineseconversiondialog.ui:103
+#: svx/uiconfig/ui/chineseconversiondialog.ui:103
 msgctxt "chineseconversiondialog|tosimplified"
 msgid "_Traditional Chinese to simplified Chinese"
 msgstr "Tsieineeg _traddodiadol i Tsieineeg symledig"
 
-#: chineseconversiondialog.ui:120
+#: svx/uiconfig/ui/chineseconversiondialog.ui:120
 msgctxt "chineseconversiondialog|totraditional"
 msgid "_Simplified Chinese to traditional Chinese"
 msgstr "Tsieineeg _symledig i Tsieineeg traddodiadol"
 
-#: chineseconversiondialog.ui:142
+#: svx/uiconfig/ui/chineseconversiondialog.ui:142
 msgctxt "chineseconversiondialog|label1"
 msgid "Conversion Direction"
 msgstr "Cyfeiriad Trosi"
 
-#: chineseconversiondialog.ui:179
+#: svx/uiconfig/ui/chineseconversiondialog.ui:179
 msgctxt "chineseconversiondialog|commonterms"
 msgid "Translate _common terms"
 msgstr "Cyfieithu _termau cyffredin"
 
-#: chineseconversiondialog.ui:195
+#: svx/uiconfig/ui/chineseconversiondialog.ui:195
 msgctxt "chineseconversiondialog|editterms"
 msgid "_Edit Terms..."
 msgstr "_Golygu Termau..."
 
-#: chineseconversiondialog.ui:214
+#: svx/uiconfig/ui/chineseconversiondialog.ui:214
 msgctxt "chineseconversiondialog|label2"
 msgid "Common Terms"
 msgstr "Termau Cyffredin"
 
-#: chinesedictionary.ui:9
+#: svx/uiconfig/ui/chinesedictionary.ui:9
 msgctxt "chinesedictionary|ChineseDictionaryDialog"
 msgid "Edit Dictionary"
 msgstr "Golygu Geiriadur"
 
-#: chinesedictionary.ui:87
+#: svx/uiconfig/ui/chinesedictionary.ui:87
 msgctxt "chinesedictionary|tradtosimple"
 msgid "_Traditional Chinese to simplified Chinese"
 msgstr "Tsieineeg _traddodiadol i Tsieineeg symledig"
 
-#: chinesedictionary.ui:104
+#: svx/uiconfig/ui/chinesedictionary.ui:104
 msgctxt "chinesedictionary|simpletotrad"
 msgid "_Simplified Chinese to traditional Chinese"
 msgstr "Tsieineeg _symledig i Tsieineeg traddodiadol"
 
-#: chinesedictionary.ui:120
+#: svx/uiconfig/ui/chinesedictionary.ui:120
 msgctxt "chinesedictionary|reverse"
 msgid "Reverse mapping"
 msgstr "Mapio gwrth-droi"
 
-#: chinesedictionary.ui:151
+#: svx/uiconfig/ui/chinesedictionary.ui:152
 msgctxt "chinesedictionary|termft"
 msgid "Term"
 msgstr "Term"
 
-#: chinesedictionary.ui:175
+#: svx/uiconfig/ui/chinesedictionary.ui:176
 msgctxt "chinesedictionary|mappingft"
 msgid "Mapping"
 msgstr "Mapio"
 
-#: chinesedictionary.ui:199
+#: svx/uiconfig/ui/chinesedictionary.ui:200
 msgctxt "chinesedictionary|propertyft"
 msgid "Property"
 msgstr "Priodwedd"
 
-#: chinesedictionary.ui:212
+#: svx/uiconfig/ui/chinesedictionary.ui:213
 msgctxt "chinesedictionary|property"
 msgid "Other"
 msgstr "Arall"
 
-#: chinesedictionary.ui:213
+#: svx/uiconfig/ui/chinesedictionary.ui:214
 msgctxt "chinesedictionary|property"
 msgid "Foreign"
 msgstr "Estron"
 
-#: chinesedictionary.ui:214
+#: svx/uiconfig/ui/chinesedictionary.ui:215
 msgctxt "chinesedictionary|property"
 msgid "First name"
 msgstr "Enw cyntaf"
 
-#: chinesedictionary.ui:215
+#: svx/uiconfig/ui/chinesedictionary.ui:216
 msgctxt "chinesedictionary|property"
 msgid "Last name"
 msgstr "Cyfenw"
 
-#: chinesedictionary.ui:216
+#: svx/uiconfig/ui/chinesedictionary.ui:217
 msgctxt "chinesedictionary|property"
 msgid "Title"
 msgstr "Teitl"
 
-#: chinesedictionary.ui:217
+#: svx/uiconfig/ui/chinesedictionary.ui:218
 msgctxt "chinesedictionary|property"
 msgid "Status"
 msgstr "Statws"
 
-#: chinesedictionary.ui:218
+#: svx/uiconfig/ui/chinesedictionary.ui:219
 msgctxt "chinesedictionary|property"
 msgid "Place name"
 msgstr "Enw lle"
 
-#: chinesedictionary.ui:219
+#: svx/uiconfig/ui/chinesedictionary.ui:220
 msgctxt "chinesedictionary|property"
 msgid "Business"
 msgstr "Busnes"
 
-#: chinesedictionary.ui:220
+#: svx/uiconfig/ui/chinesedictionary.ui:221
 msgctxt "chinesedictionary|property"
 msgid "Adjective"
 msgstr "Ansoddair"
 
-#: chinesedictionary.ui:221
+#: svx/uiconfig/ui/chinesedictionary.ui:222
 msgctxt "chinesedictionary|property"
 msgid "Idiom"
 msgstr "Idiom"
 
-#: chinesedictionary.ui:222
+#: svx/uiconfig/ui/chinesedictionary.ui:223
 msgctxt "chinesedictionary|property"
 msgid "Abbreviation"
 msgstr "Byrfodd"
 
-#: chinesedictionary.ui:223
+#: svx/uiconfig/ui/chinesedictionary.ui:224
 msgctxt "chinesedictionary|property"
 msgid "Numerical"
 msgstr "Rhifiadol"
 
-#: chinesedictionary.ui:224
+#: svx/uiconfig/ui/chinesedictionary.ui:225
 msgctxt "chinesedictionary|property"
 msgid "Noun"
 msgstr "Enw"
 
-#: chinesedictionary.ui:225
+#: svx/uiconfig/ui/chinesedictionary.ui:226
 msgctxt "chinesedictionary|property"
 msgid "Verb"
 msgstr "Berf"
 
-#: chinesedictionary.ui:226
+#: svx/uiconfig/ui/chinesedictionary.ui:227
 msgctxt "chinesedictionary|property"
 msgid "Brand name"
 msgstr "Enw masnachol"
 
-#: chinesedictionary.ui:257
+#: svx/uiconfig/ui/chinesedictionary.ui:258
 msgctxt "chinesedictionary|modify"
 msgid "_Modify"
 msgstr "_Newid"
 
-#: classificationdialog.ui:9
+#: svx/uiconfig/ui/classificationdialog.ui:9
 msgctxt "classificationdialog|dialogname"
-msgid "Classification Dialog"
-msgstr "Deialog Dosbarthiad"
+msgid "Classification"
+msgstr "Dosbarthiad"
 
-#: classificationdialog.ui:89
+#: svx/uiconfig/ui/classificationdialog.ui:89
 msgctxt "classificationdialog|label-Classification"
 msgid "Classification:"
 msgstr "Dosbarthiad:"
 
-#: classificationdialog.ui:101
+#: svx/uiconfig/ui/classificationdialog.ui:101
 msgctxt "classificationdialog|label-InternationalClassification"
 msgid "International:"
 msgstr "Rhyngwladol:"
 
-#: classificationdialog.ui:134
+#: svx/uiconfig/ui/classificationdialog.ui:134
 msgctxt "classificationdialog|label-Marking"
 msgid "Marking:"
 msgstr "Ymylon:"
 
-#: classificationdialog.ui:158
+#: svx/uiconfig/ui/classificationdialog.ui:158
 msgctxt "classificationdialog|label-Classification"
 msgid "Recently Used:"
 msgstr "Defnyddiwyd yn Ddiweddar:"
 
-#: classificationdialog.ui:198
+#: svx/uiconfig/ui/classificationdialog.ui:198
 msgctxt "classificationdialog|label-Content"
 msgid "Content"
 msgstr "Cynnwys"
 
-#: classificationdialog.ui:221
+#: svx/uiconfig/ui/classificationdialog.ui:221
 msgctxt "classificationdialog|boldButton"
 msgid "Bold"
 msgstr "Trwm"
 
-#: classificationdialog.ui:239
+#: svx/uiconfig/ui/classificationdialog.ui:239
 msgctxt "classificationdialog|signButton"
 msgid "Sign Paragraph"
 msgstr "Paragraff Cudd"
 
-#: classificationdialog.ui:288
+#: svx/uiconfig/ui/classificationdialog.ui:288
 msgctxt "classificationdialog|label-PartNumber"
 msgid "Part Number:"
 msgstr "Rhif Darn:"
 
-#: classificationdialog.ui:310
+#: svx/uiconfig/ui/classificationdialog.ui:310
 msgctxt "classificationdialog|intellectualPropertyPartAddButton"
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: classificationdialog.ui:326
+#: svx/uiconfig/ui/classificationdialog.ui:326
 msgctxt "classificationdialog|label-PartNumber"
-msgid "Part:"
-msgstr "Darn:"
+msgid "License:"
+msgstr "Trwydded:"
 
-#: classificationdialog.ui:373
+#: svx/uiconfig/ui/classificationdialog.ui:373
 msgctxt "classificationdialog|label-IntellectualProperty"
 msgid "Intellectual Property"
 msgstr "Eiddo Deallusol"
 
-#: colorwindow.ui:59
+#: svx/uiconfig/ui/colorwindow.ui:59
 msgctxt "colorwindow|none_color_button"
 msgid "None"
 msgstr "Dim"
 
-#: colorwindow.ui:128
+#: svx/uiconfig/ui/colorwindow.ui:128
 msgctxt "colorwindow|label1"
 msgid "Recent"
 msgstr "Diweddar"
 
-#: colorwindow.ui:162
+#: svx/uiconfig/ui/colorwindow.ui:162
 msgctxt "colorwindow|color_picker_button"
 msgid "Custom Color…"
 msgstr "Lliw Cyfaddas…"
 
-#: colsmenu.ui:12
+#: svx/uiconfig/ui/colsmenu.ui:12
 msgctxt "colsmenu|insert"
 msgid "Insert _Column"
 msgstr "Mewnosod _Colofn"
 
-#: colsmenu.ui:22
+#: svx/uiconfig/ui/colsmenu.ui:22
 msgctxt "colsmenu|TextField"
 msgid "Text Box"
 msgstr "Blwch Testun"
 
-#: colsmenu.ui:30
+#: svx/uiconfig/ui/colsmenu.ui:30
 msgctxt "colsmenu|CheckBox"
 msgid "Check Box"
 msgstr "Blwch Ticio"
 
-#: colsmenu.ui:38
+#: svx/uiconfig/ui/colsmenu.ui:38
 msgctxt "colsmenu|ComboBox"
 msgid "Combo Box"
 msgstr "Blwch Cyfun"
 
-#: colsmenu.ui:46
+#: svx/uiconfig/ui/colsmenu.ui:46
 msgctxt "colsmenu|ListBox"
 msgid "List Box"
 msgstr "Blwch Rhestr"
 
-#: colsmenu.ui:54
+#: svx/uiconfig/ui/colsmenu.ui:54
 msgctxt "colsmenu|DateField"
 msgid "Date Field"
 msgstr "Maes Dyddiad"
 
-#: colsmenu.ui:62
+#: svx/uiconfig/ui/colsmenu.ui:62
 msgctxt "colsmenu|TimeField"
 msgid "Time Field"
 msgstr "Maes Amser"
 
-#: colsmenu.ui:69
+#: svx/uiconfig/ui/colsmenu.ui:69
 msgctxt "colsmenu|NumericField"
 msgid "Numeric Field"
 msgstr "Maes Rhifol"
 
-#: colsmenu.ui:76
+#: svx/uiconfig/ui/colsmenu.ui:76
 msgctxt "colsmenu|CurrencyField"
 msgid "Currency Field"
 msgstr "Maes Arian"
 
-#: colsmenu.ui:84
+#: svx/uiconfig/ui/colsmenu.ui:84
 msgctxt "colsmenu|PatternField"
 msgid "Pattern Field"
 msgstr "Maes Patrwm"
 
-#: colsmenu.ui:92
+#: svx/uiconfig/ui/colsmenu.ui:92
 msgctxt "colsmenu|FormattedField"
 msgid "Formatted Field"
 msgstr "Maes wedi ei Fformatio"
 
-#: colsmenu.ui:100
+#: svx/uiconfig/ui/colsmenu.ui:100
 msgctxt "colsmenu|dateandtimefield"
 msgid "Date and Time Field"
 msgstr "Maes Dyddiad ac Amser"
 
-#: colsmenu.ui:113
+#: svx/uiconfig/ui/colsmenu.ui:113
 msgctxt "colsmenu|change"
 msgid "_Replace with"
 msgstr "_Newid gyda"
 
-#: colsmenu.ui:123
+#: svx/uiconfig/ui/colsmenu.ui:123
 msgctxt "colsmenu|TextField1"
 msgid "Text Box"
 msgstr "Blwch Testun"
 
-#: colsmenu.ui:131
+#: svx/uiconfig/ui/colsmenu.ui:131
 msgctxt "colsmenu|CheckBox1"
 msgid "Check Box"
 msgstr "Blwch Ticio"
 
-#: colsmenu.ui:139
+#: svx/uiconfig/ui/colsmenu.ui:139
 msgctxt "colsmenu|ComboBox1"
 msgid "Combo Box"
 msgstr "Blwch Cyfun"
 
-#: colsmenu.ui:147
+#: svx/uiconfig/ui/colsmenu.ui:147
 msgctxt "colsmenu|ListBox1"
 msgid "List Box"
 msgstr "Blwch Rhestr"
 
-#: colsmenu.ui:155
+#: svx/uiconfig/ui/colsmenu.ui:155
 msgctxt "colsmenu|DateField1"
 msgid "Date Field"
 msgstr "Maes Dyddiad"
 
-#: colsmenu.ui:163
+#: svx/uiconfig/ui/colsmenu.ui:163
 msgctxt "colsmenu|TimeField1"
 msgid "Time Field"
 msgstr "Maes Amser"
 
-#: colsmenu.ui:171
+#: svx/uiconfig/ui/colsmenu.ui:171
 msgctxt "colsmenu|NumericField1"
 msgid "Numeric Field"
 msgstr "Maes Rhifol"
 
-#: colsmenu.ui:179
+#: svx/uiconfig/ui/colsmenu.ui:179
 msgctxt "colsmenu|CurrencyField1"
 msgid "Currency Field"
 msgstr "Maes Arian"
 
-#: colsmenu.ui:187
+#: svx/uiconfig/ui/colsmenu.ui:187
 msgctxt "colsmenu|PatternField1"
 msgid "Pattern Field"
 msgstr "Maes Patrwm"
 
-#: colsmenu.ui:195
+#: svx/uiconfig/ui/colsmenu.ui:195
 msgctxt "colsmenu|FormattedField1"
 msgid "Formatted Field"
 msgstr "Maes wedi ei Fformatio"
 
-#: colsmenu.ui:203
+#: svx/uiconfig/ui/colsmenu.ui:203
 msgctxt "colsmenu|dateandtimefield1"
 msgid "Date and Time Field"
 msgstr "Maes Dyddiad ac Amser"
 
-#: colsmenu.ui:216
+#: svx/uiconfig/ui/colsmenu.ui:216
 msgctxt "colsmenu|delete"
 msgid "Delete column"
 msgstr "Dileu colofn"
 
-#: colsmenu.ui:224
+#: svx/uiconfig/ui/colsmenu.ui:224
 msgctxt "colsmenu|hide"
 msgid "_Hide Column"
 msgstr "_Cuddio Colofn"
 
-#: colsmenu.ui:232
+#: svx/uiconfig/ui/colsmenu.ui:232
 msgctxt "colsmenu|show"
 msgid "_Show Columns"
 msgstr "_Dangos Colofnau"
 
-#: colsmenu.ui:242
+#: svx/uiconfig/ui/colsmenu.ui:242
 msgctxt "colsmenu|more"
 msgid "_More..."
 msgstr "_Rhagor..."
 
-#: colsmenu.ui:255
+#: svx/uiconfig/ui/colsmenu.ui:255
 msgctxt "colsmenu|all"
 msgid "_All"
 msgstr "_Popeth"
 
-#: colsmenu.ui:266
+#: svx/uiconfig/ui/colsmenu.ui:266
 msgctxt "colsmenu|column"
 msgid "Column..."
 msgstr "Colofn..."
 
-#: compressgraphicdialog.ui:26
-msgctxt "compressgraphicdialog|interpolation-method-store"
-msgid "None"
-msgstr "Dim"
-
-#: compressgraphicdialog.ui:29
-msgctxt "compressgraphicdialog|interpolation-method-store"
-msgid "Bilinear"
-msgstr "Deulinol"
-
-#: compressgraphicdialog.ui:32
-msgctxt "compressgraphicdialog|interpolation-method-store"
-msgid "Bicubic"
-msgstr "Deugiwbig"
-
-#: compressgraphicdialog.ui:35
-msgctxt "compressgraphicdialog|interpolation-method-store"
-msgid "Lanczos"
-msgstr "Lanczos"
-
-#: compressgraphicdialog.ui:56
+#: svx/uiconfig/ui/compressgraphicdialog.ui:36
 msgctxt "compressgraphicdialog|CompressGraphicDialog"
 msgid "Compress Image"
 msgstr "Cywasgu Delwedd"
 
-#: compressgraphicdialog.ui:150
+#: svx/uiconfig/ui/compressgraphicdialog.ui:132
 msgctxt "compressgraphicdialog|radio-jpeg"
 msgid "JPEG Quality"
 msgstr "Ansawdd JPEG"
 
-#: compressgraphicdialog.ui:154
+#: svx/uiconfig/ui/compressgraphicdialog.ui:136
 msgctxt "compressgraphicdialog|radio-jpeg|tooltip_text"
 msgid "Lossy compression"
 msgstr "Cywasgiad colladwy"
 
-#: compressgraphicdialog.ui:166
+#: svx/uiconfig/ui/compressgraphicdialog.ui:149
 msgctxt "compressgraphicdialog|radio-lossless"
 msgid "PNG Compression"
 msgstr "Cywasgiad PNG"
 
-#: compressgraphicdialog.ui:170
+#: svx/uiconfig/ui/compressgraphicdialog.ui:153
 msgctxt "compressgraphicdialog|radio-lossless|tooltip_text"
 msgid "Lossless compression"
 msgstr "Cywasgiad colladwy"
 
-#: compressgraphicdialog.ui:285
+#: svx/uiconfig/ui/compressgraphicdialog.ui:269
 msgctxt "compressgraphicdialog|label2"
 msgid "Compression"
 msgstr "Cywasgiad"
 
-#: compressgraphicdialog.ui:318
+#: svx/uiconfig/ui/compressgraphicdialog.ui:302
 msgctxt "compressgraphicdialog|checkbox-reduce-resolution"
 msgid "Reduce image resolution"
 msgstr "Lleihau cydraniad delwedd"
 
-#: compressgraphicdialog.ui:335
+#: svx/uiconfig/ui/compressgraphicdialog.ui:320
 msgctxt "compressgraphicdialog|label3"
 msgid "Width:"
 msgstr "Lled:"
 
-#: compressgraphicdialog.ui:350
+#: svx/uiconfig/ui/compressgraphicdialog.ui:335
 msgctxt "compressgraphicdialog|label4"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: compressgraphicdialog.ui:365
+#: svx/uiconfig/ui/compressgraphicdialog.ui:350
 msgctxt "compressgraphicdialog|label5"
 msgid "Resolution:"
 msgstr "Cydraniad:"
 
-#: compressgraphicdialog.ui:380
+#: svx/uiconfig/ui/compressgraphicdialog.ui:365
 msgctxt "compressgraphicdialog|label12"
 msgid "Interpolation:"
 msgstr "Rhyngosodiad:"
 
-#: compressgraphicdialog.ui:459
+#: svx/uiconfig/ui/compressgraphicdialog.ui:437
+msgctxt "compressgraphicdialog|interpolation-method-store"
+msgid "None"
+msgstr "Dim"
+
+#: svx/uiconfig/ui/compressgraphicdialog.ui:438
+msgctxt "compressgraphicdialog|interpolation-method-store"
+msgid "Bilinear"
+msgstr "Deulinol"
+
+#: svx/uiconfig/ui/compressgraphicdialog.ui:439
+msgctxt "compressgraphicdialog|interpolation-method-store"
+msgid "Bicubic"
+msgstr "Deugiwbig"
+
+#: svx/uiconfig/ui/compressgraphicdialog.ui:440
+msgctxt "compressgraphicdialog|interpolation-method-store"
+msgid "Lanczos"
+msgstr "Lanczos"
+
+#: svx/uiconfig/ui/compressgraphicdialog.ui:452
 msgctxt "compressgraphicdialog|label13"
 msgid "px"
 msgstr "px"
 
-#: compressgraphicdialog.ui:471
+#: svx/uiconfig/ui/compressgraphicdialog.ui:464
 msgctxt "compressgraphicdialog|label14"
 msgid "px"
 msgstr "px"
 
-#: compressgraphicdialog.ui:483
+#: svx/uiconfig/ui/compressgraphicdialog.ui:476
 msgctxt "compressgraphicdialog|label16"
 msgid "DPI"
 msgstr "DPI"
 
-#: compressgraphicdialog.ui:502
+#: svx/uiconfig/ui/compressgraphicdialog.ui:495
 msgctxt "compressgraphicdialog|label22"
 msgid "Resolution"
 msgstr "Cydraniad"
 
-#: compressgraphicdialog.ui:537
+#: svx/uiconfig/ui/compressgraphicdialog.ui:530
 msgctxt "compressgraphicdialog|label7"
 msgid "Actual dimensions:"
 msgstr "Gwir ddimensiynau:"
 
-#: compressgraphicdialog.ui:563
+#: svx/uiconfig/ui/compressgraphicdialog.ui:556
 msgctxt "compressgraphicdialog|label8"
 msgid "Apparent dimensions:"
 msgstr "Dimensiynau ymddangosiadol:"
 
-#: compressgraphicdialog.ui:575
+#: svx/uiconfig/ui/compressgraphicdialog.ui:568
 msgctxt "compressgraphicdialog|label9"
 msgid "Image size:"
 msgstr "Maint delwedd:"
 
-#: compressgraphicdialog.ui:626
+#: svx/uiconfig/ui/compressgraphicdialog.ui:619
 msgctxt "compressgraphicdialog|label15"
 msgid "Type:"
 msgstr "Math:"
 
-#: compressgraphicdialog.ui:650
+#: svx/uiconfig/ui/compressgraphicdialog.ui:643
 msgctxt "compressgraphicdialog|calculate"
 msgid "Calculate New Size:"
 msgstr "Cyfrifo'r Maint Newydd:"
 
-#: compressgraphicdialog.ui:669
+#: svx/uiconfig/ui/compressgraphicdialog.ui:662
 msgctxt "compressgraphicdialog|label1"
 msgid "Image Information"
 msgstr "Gwybodaeth Delwedd"
 
-#: convertmenu.ui:13
+#: svx/uiconfig/ui/convertmenu.ui:13
 msgctxt "convertmenu|ConvertToEdit"
 msgid "_Text Box"
 msgstr "Blwch _Testun"
 
-#: convertmenu.ui:22
+#: svx/uiconfig/ui/convertmenu.ui:22
 msgctxt "convertmenu|ConvertToButton"
 msgid "_Button"
 msgstr "_Botwm"
 
-#: convertmenu.ui:31
+#: svx/uiconfig/ui/convertmenu.ui:31
 msgctxt "convertmenu|ConvertToFixed"
 msgid "La_bel field"
 msgstr "_Maes Label"
 
-#: convertmenu.ui:40
+#: svx/uiconfig/ui/convertmenu.ui:40
 msgctxt "convertmenu|ConvertToGroup"
 msgid "G_roup Box"
 msgstr "Blwch _Grŵp"
 
-#: convertmenu.ui:49
+#: svx/uiconfig/ui/convertmenu.ui:49
 msgctxt "convertmenu|ConvertToList"
 msgid "L_ist Box"
 msgstr "Blwch _Rhestr"
 
-#: convertmenu.ui:58
+#: svx/uiconfig/ui/convertmenu.ui:58
 msgctxt "convertmenu|ConvertToCheckBox"
 msgid "_Check Box"
 msgstr "Blwch _Ticio"
 
-#: convertmenu.ui:67
+#: svx/uiconfig/ui/convertmenu.ui:67
 msgctxt "convertmenu|ConvertToRadio"
 msgid "_Radio Button"
 msgstr "Botwm _Radio"
 
-#: convertmenu.ui:76
+#: svx/uiconfig/ui/convertmenu.ui:76
 msgctxt "convertmenu|ConvertToCombo"
 msgid "Combo Bo_x"
 msgstr "Blwch C_yfun"
 
-#: convertmenu.ui:85
+#: svx/uiconfig/ui/convertmenu.ui:85
 msgctxt "convertmenu|ConvertToImageBtn"
 msgid "I_mage Button"
 msgstr "Botwm _Delwedd"
 
-#: convertmenu.ui:94
+#: svx/uiconfig/ui/convertmenu.ui:94
 msgctxt "convertmenu|ConvertToFileControl"
 msgid "_File Selection"
 msgstr "_Dewis Ffeil"
 
-#: convertmenu.ui:103
+#: svx/uiconfig/ui/convertmenu.ui:103
 msgctxt "convertmenu|ConvertToDate"
 msgid "_Date Field"
 msgstr "Maes _Dyddiad"
 
-#: convertmenu.ui:112
+#: svx/uiconfig/ui/convertmenu.ui:112
 msgctxt "convertmenu|ConvertToTime"
 msgid "Tim_e Field"
 msgstr "Maes _Amser"
 
-#: convertmenu.ui:120
+#: svx/uiconfig/ui/convertmenu.ui:120
 msgctxt "convertmenu|ConvertToNumeric"
 msgid "_Numerical Field"
 msgstr "Maes _Rhifiadol"
 
-#: convertmenu.ui:128
+#: svx/uiconfig/ui/convertmenu.ui:128
 msgctxt "convertmenu|ConvertToCurrency"
 msgid "C_urrency Field"
 msgstr "Maes A_rian"
 
-#: convertmenu.ui:137
+#: svx/uiconfig/ui/convertmenu.ui:137
 msgctxt "convertmenu|ConvertToPattern"
 msgid "_Pattern Field"
 msgstr "Maes _Patrwm"
 
-#: convertmenu.ui:146
+#: svx/uiconfig/ui/convertmenu.ui:146
 msgctxt "convertmenu|ConvertToImageControl"
 msgid "Ima_ge Control"
 msgstr "_Rheoli Delwedd"
 
-#: convertmenu.ui:155
+#: svx/uiconfig/ui/convertmenu.ui:155
 msgctxt "convertmenu|ConvertToFormatted"
 msgid "Fo_rmatted Field"
 msgstr "_Maes wedi ei Fformatio"
 
-#: convertmenu.ui:164
+#: svx/uiconfig/ui/convertmenu.ui:164
 msgctxt "convertmenu|ConvertToScrollBar"
 msgid "Scroll bar"
 msgstr "Bar sgrolio"
 
-#: convertmenu.ui:173
+#: svx/uiconfig/ui/convertmenu.ui:173
 msgctxt "convertmenu|ConvertToSpinButton"
 msgid "Spin Button"
 msgstr "Botwm Troi"
 
-#: convertmenu.ui:182
+#: svx/uiconfig/ui/convertmenu.ui:182
 msgctxt "convertmenu|ConvertToNavigationBar"
 msgid "Navigation Bar"
 msgstr "Bar Dewis"
 
-#: crashreportdlg.ui:8
+#: svx/uiconfig/ui/crashreportdlg.ui:8
 msgctxt "crashreportdlg|CrashReportDialog"
 msgid "Crash Report"
 msgstr "Adroddiad Chwalu"
 
-#: crashreportdlg.ui:22
+#: svx/uiconfig/ui/crashreportdlg.ui:22
 msgctxt "crashreportdlg|btn_send"
 msgid "_Send Crash Report"
 msgstr "_Anfon Adroddiad Chwalu"
 
-#: crashreportdlg.ui:37
+#: svx/uiconfig/ui/crashreportdlg.ui:37
 msgctxt "crashreportdlg|btn_cancel"
 msgid "_Don’t Send"
 msgstr "_Peidio Anfon"
 
-#: crashreportdlg.ui:51
+#: svx/uiconfig/ui/crashreportdlg.ui:51
 msgctxt "crashreportdlg|btn_close"
 msgid "Close"
 msgstr "Cau"
 
-#: crashreportdlg.ui:72
+#: svx/uiconfig/ui/crashreportdlg.ui:72
 msgctxt "crashreportdlg|ed_pre"
 msgid ""
 "Unfortunately it seems that %PRODUCTNAME crashed when it was last run.\n"
@@ -2566,7 +2607,7 @@ msgstr ""
 "\n"
 "Gallwch ein cynorthwyo i ddatrys yr anhawster drwy anfon adroddiad chwalu dienw i weinydd adrodd ar chwalu %PRODUCTNAME."
 
-#: crashreportdlg.ui:88
+#: svx/uiconfig/ui/crashreportdlg.ui:88
 msgctxt "crashreportdlg|ed_post"
 msgid ""
 "The crash report was successfully uploaded.\n"
@@ -2577,7 +2618,7 @@ msgstr ""
 "Bydd yr adroddiad ar gael yn:\n"
 "crashreport.libreoffice.org/stats/crash_details/%CRASHID"
 
-#: crashreportdlg.ui:103
+#: svx/uiconfig/ui/crashreportdlg.ui:103
 msgctxt "crashreportdlg|ed_bugreport"
 msgid ""
 "Please check the report and if no bug report is connected to the crash report yet, open a new bug report at bugs.documentfoundation.org.\n"
@@ -2588,801 +2629,801 @@ msgstr ""
 "Ychwanegwch fanylion llawen ar sut i ail-greu'r chwalu a dangos ID chwalu i'r maes adroddiad chwalu.\n"
 "Diolch am eich cymorth i wella %PRODUCTNAME."
 
-#: crashreportdlg.ui:116
+#: svx/uiconfig/ui/crashreportdlg.ui:116
 msgctxt "crashreportdlg|check_safemode"
 msgid "Restart %PRODUCTNAME to enter safe mode"
 msgstr "Ailgychwyn %PRODUCTNAME i fynd i'r modd diogel"
 
-#: datanavigator.ui:37
+#: svx/uiconfig/ui/datanavigator.ui:37
 msgctxt "datanavigator|modelsbutton"
 msgid "_Models"
 msgstr "_Modelau"
 
-#: datanavigator.ui:75
+#: svx/uiconfig/ui/datanavigator.ui:75
 msgctxt "datanavigator|instance"
 msgid "Instance"
 msgstr "Enghraifft"
 
-#: datanavigator.ui:97
+#: svx/uiconfig/ui/datanavigator.ui:97
 msgctxt "datanavigator|submissions"
 msgid "Submissions"
 msgstr "Cyflwyniadau"
 
-#: datanavigator.ui:120
+#: svx/uiconfig/ui/datanavigator.ui:120
 msgctxt "datanavigator|bindings"
 msgid "Bindings"
 msgstr "Rhwymiadau"
 
-#: datanavigator.ui:136
+#: svx/uiconfig/ui/datanavigator.ui:136
 msgctxt "datanavigator|instances"
 msgid "_Instances"
 msgstr "_Enghreifftiau"
 
-#: datanavigator.ui:164
+#: svx/uiconfig/ui/datanavigator.ui:164
 msgctxt "datanavigator|instancesadd"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: datanavigator.ui:171
+#: svx/uiconfig/ui/datanavigator.ui:171
 msgctxt "datanavigator|instancesedit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: datanavigator.ui:178
+#: svx/uiconfig/ui/datanavigator.ui:178
 msgctxt "datanavigator|instancesremove"
 msgid "_Remove..."
 msgstr "_Tynnu..."
 
-#: datanavigator.ui:191
+#: svx/uiconfig/ui/datanavigator.ui:191
 msgctxt "datanavigator|instancesdetails"
 msgid "_Show Details"
 msgstr "Dangos _Manylion"
 
-#: datanavigator.ui:203
+#: svx/uiconfig/ui/datanavigator.ui:203
 msgctxt "datanavigator|modelsadd"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: datanavigator.ui:211
+#: svx/uiconfig/ui/datanavigator.ui:211
 msgctxt "datanavigator|modelsedit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: datanavigator.ui:219
+#: svx/uiconfig/ui/datanavigator.ui:219
 msgctxt "datanavigator|modelsremove"
 msgid "_Remove"
 msgstr "_Tynnu"
 
-#: defaultshapespanel.ui:58
+#: svx/uiconfig/ui/defaultshapespanel.ui:58
 msgctxt "defaultshapespanel|label1"
 msgid "Lines & Arrows"
 msgstr "Llinellau a Saethau"
 
-#: defaultshapespanel.ui:95
+#: svx/uiconfig/ui/defaultshapespanel.ui:95
 msgctxt "defaultshapespanel|label2"
 msgid "Curve"
 msgstr "Cromlin"
 
-#: defaultshapespanel.ui:132
+#: svx/uiconfig/ui/defaultshapespanel.ui:132
 msgctxt "defaultshapespanel|label3"
 msgid "Connectors"
 msgstr "Cysylltyddion"
 
-#: defaultshapespanel.ui:169
+#: svx/uiconfig/ui/defaultshapespanel.ui:169
 msgctxt "defaultshapespanel|label4"
 msgid "Basic Shapes"
 msgstr "Siapiau Sylfaenol"
 
-#: defaultshapespanel.ui:206
+#: svx/uiconfig/ui/defaultshapespanel.ui:206
 msgctxt "defaultshapespanel|label5"
 msgid "Symbols"
 msgstr "Symbolau"
 
-#: defaultshapespanel.ui:243
+#: svx/uiconfig/ui/defaultshapespanel.ui:243
 msgctxt "defaultshapespanel|label6"
 msgid "Block Arrows"
 msgstr "Saethau Bloc"
 
-#: defaultshapespanel.ui:280
+#: svx/uiconfig/ui/defaultshapespanel.ui:280
 msgctxt "defaultshapespanel|label7"
 msgid "Flowchart"
 msgstr "Siart Llif"
 
-#: defaultshapespanel.ui:317
+#: svx/uiconfig/ui/defaultshapespanel.ui:317
 msgctxt "defaultshapespanel|label8"
 msgid "Callouts"
 msgstr "Amlygyn"
 
-#: defaultshapespanel.ui:354
+#: svx/uiconfig/ui/defaultshapespanel.ui:354
 msgctxt "defaultshapespanel|label9"
 msgid "Stars"
 msgstr "Sêr"
 
-#: defaultshapespanel.ui:391
+#: svx/uiconfig/ui/defaultshapespanel.ui:391
 msgctxt "defaultshapespanel|label10"
 msgid "3D Objects"
 msgstr "Gwrthrychau 3D"
 
-#: deletefooterdialog.ui:8
+#: svx/uiconfig/ui/deletefooterdialog.ui:7
 msgctxt "deletefooterdialog|DeleteFooterDialog"
 msgid "Delete footer?"
 msgstr "Dileu troedyn?"
 
-#: deletefooterdialog.ui:14
+#: svx/uiconfig/ui/deletefooterdialog.ui:14
 msgctxt "deletefooterdialog|DeleteFooterDialog"
 msgid "Are you sure you want to delete the footer?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r data hwn?"
 
-#: deletefooterdialog.ui:15
+#: svx/uiconfig/ui/deletefooterdialog.ui:15
 msgctxt "deletefooterdialog|DeleteFooterDialog"
 msgid "All contents of the footer will be deleted and can not be restored."
 msgstr "Bydd cynnwys y troedyn yn cael ei ddileu ac nid oes modd ei adfer."
 
-#: deleteheaderdialog.ui:8
+#: svx/uiconfig/ui/deleteheaderdialog.ui:7
 msgctxt "deleteheaderdialog|DeleteHeaderDialog"
 msgid "Delete header?"
 msgstr "Dileu pennyn?"
 
-#: deleteheaderdialog.ui:14
+#: svx/uiconfig/ui/deleteheaderdialog.ui:14
 msgctxt "deleteheaderdialog|DeleteHeaderDialog"
 msgid "Are you sure you want to delete the header?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r pennyn?"
 
-#: deleteheaderdialog.ui:15
+#: svx/uiconfig/ui/deleteheaderdialog.ui:15
 msgctxt "deleteheaderdialog|DeleteHeaderDialog"
 msgid "All contents of the header will be deleted and can not be restored."
 msgstr "Bydd cynnwys y pennyn yn cael ei ddileu ac nid oes modd ei adfer."
 
-#: docking3deffects.ui:263
+#: svx/uiconfig/ui/docking3deffects.ui:263
 msgctxt "docking3deffects|Docking3DEffects"
 msgid "3D Effects"
 msgstr "Effeithiau 3D"
 
-#: docking3deffects.ui:293
+#: svx/uiconfig/ui/docking3deffects.ui:293
 msgctxt "docking3deffects|diagonalft"
 msgid "R_ounded edges"
 msgstr "_Ymylon crwn"
 
-#: docking3deffects.ui:307
+#: svx/uiconfig/ui/docking3deffects.ui:307
 msgctxt "docking3deffects|scaleddepthft"
 msgid "_Scaled depth"
 msgstr "_Dyfnder graddedig"
 
-#: docking3deffects.ui:321
+#: svx/uiconfig/ui/docking3deffects.ui:321
 msgctxt "docking3deffects|angleft"
 msgid "_Rotation angle"
 msgstr "_Ongl cylchdro"
 
-#: docking3deffects.ui:335
+#: svx/uiconfig/ui/docking3deffects.ui:335
 msgctxt "docking3deffects|depthft"
 msgid "_Depth"
 msgstr "_Dyfnder"
 
-#: docking3deffects.ui:401
+#: svx/uiconfig/ui/docking3deffects.ui:401
 msgctxt "docking3deffects|label1"
 msgid "Geometry"
 msgstr "Geometreg"
 
-#: docking3deffects.ui:443
+#: svx/uiconfig/ui/docking3deffects.ui:443
 msgctxt "docking3deffects|label6"
 msgid "_Horizontal"
 msgstr "_Llorweddol"
 
-#: docking3deffects.ui:482
+#: svx/uiconfig/ui/docking3deffects.ui:482
 msgctxt "docking3deffects|label7"
 msgid "_Vertical"
 msgstr "_Fertigol"
 
-#: docking3deffects.ui:517
+#: svx/uiconfig/ui/docking3deffects.ui:517
 msgctxt "docking3deffects|label10"
 msgid "Segments"
 msgstr "Segmentau"
 
-#: docking3deffects.ui:569
+#: svx/uiconfig/ui/docking3deffects.ui:569
 msgctxt "docking3deffects|objspecific|tooltip_text"
 msgid "Object-Specific"
 msgstr "Gwrthrych Benodol"
 
-#: docking3deffects.ui:583
+#: svx/uiconfig/ui/docking3deffects.ui:583
 msgctxt "docking3deffects|flat|tooltip_text"
 msgid "Flat"
 msgstr "Gwastad"
 
-#: docking3deffects.ui:597
+#: svx/uiconfig/ui/docking3deffects.ui:597
 msgctxt "docking3deffects|spherical|tooltip_text"
 msgid "Spherical"
 msgstr "Sfferaidd"
 
-#: docking3deffects.ui:611
+#: svx/uiconfig/ui/docking3deffects.ui:611
 msgctxt "docking3deffects|invertnormals|tooltip_text"
 msgid "Invert Normals"
 msgstr "Gwrth-droi Normalau"
 
-#: docking3deffects.ui:625
+#: svx/uiconfig/ui/docking3deffects.ui:625
 msgctxt "docking3deffects|doublesidedillum|tooltip_text"
 msgid "Double-Sided Illumination"
 msgstr "Goliwiad Dwy Ochr"
 
-#: docking3deffects.ui:639
+#: svx/uiconfig/ui/docking3deffects.ui:639
 msgctxt "docking3deffects|doublesided|tooltip_text"
 msgid "Double-Sided"
 msgstr "Dwy Ochrog"
 
-#: docking3deffects.ui:665
+#: svx/uiconfig/ui/docking3deffects.ui:665
 msgctxt "docking3deffects|label11"
 msgid "Normals"
 msgstr "Normalau"
 
-#: docking3deffects.ui:697
+#: svx/uiconfig/ui/docking3deffects.ui:697
 msgctxt "docking3deffects|to3d|tooltip_text"
 msgid "Convert to 3D"
 msgstr "Trosi i 3D"
 
-#: docking3deffects.ui:710
+#: svx/uiconfig/ui/docking3deffects.ui:710
 msgctxt "docking3deffects|tolathe|tooltip_text"
 msgid "Convert to Rotation Object"
 msgstr "Trosi i Wrthrych Cylchdro"
 
-#: docking3deffects.ui:723
+#: svx/uiconfig/ui/docking3deffects.ui:723
 msgctxt "docking3deffects|perspective|tooltip_text"
 msgid "Perspective On/Off"
 msgstr "Perspectf Ymlaen/Diffodd"
 
-#: docking3deffects.ui:762
+#: svx/uiconfig/ui/docking3deffects.ui:762
 msgctxt "docking3deffects|preview-atkobject"
 msgid "3D Preview"
 msgstr "Rhagolwg 3D"
 
-#: docking3deffects.ui:782
+#: svx/uiconfig/ui/docking3deffects.ui:782
 msgctxt "docking3deffects|lightpreview-atkobject"
 msgid "Color Light Preview"
 msgstr "Rhagolwg Golau Lliw"
 
-#: docking3deffects.ui:828
+#: svx/uiconfig/ui/docking3deffects.ui:828
 msgctxt "docking3deffects|label8"
 msgid "_Mode"
 msgstr "_Modd"
 
-#: docking3deffects.ui:842
+#: svx/uiconfig/ui/docking3deffects.ui:842
 msgctxt "docking3deffects|mode"
 msgid "Flat"
 msgstr "Gwastad"
 
-#: docking3deffects.ui:843
+#: svx/uiconfig/ui/docking3deffects.ui:843
 msgctxt "docking3deffects|mode"
 msgid "Phong"
 msgstr "Phong"
 
-#: docking3deffects.ui:844
+#: svx/uiconfig/ui/docking3deffects.ui:844
 msgctxt "docking3deffects|mode"
 msgid "Gouraud"
 msgstr "Gourand"
 
-#: docking3deffects.ui:860
+#: svx/uiconfig/ui/docking3deffects.ui:860
 msgctxt "docking3deffects|label12"
 msgid "Shading"
 msgstr "Cysgodi"
 
-#: docking3deffects.ui:897
+#: svx/uiconfig/ui/docking3deffects.ui:897
 msgctxt "docking3deffects|slantft"
 msgid "S_urface angle"
 msgstr "_Ongl wyneb"
 
-#: docking3deffects.ui:923
+#: svx/uiconfig/ui/docking3deffects.ui:923
 msgctxt "docking3deffects|shadow|tooltip_text"
 msgid "3D Shadowing On/Off"
 msgstr "Cysgodi 3D Ymlaen/Diffodd"
 
-#: docking3deffects.ui:939
+#: svx/uiconfig/ui/docking3deffects.ui:939
 msgctxt "docking3deffects|label13"
 msgid "Shadow"
 msgstr "Cysgod"
 
-#: docking3deffects.ui:1001
+#: svx/uiconfig/ui/docking3deffects.ui:1001
 msgctxt "docking3deffects|label15"
 msgid "_Focal length"
 msgstr "Hyd _ffocal"
 
-#: docking3deffects.ui:1015
+#: svx/uiconfig/ui/docking3deffects.ui:1015
 msgctxt "docking3deffects|label14"
 msgid "_Distance"
 msgstr "_Pellter"
 
-#: docking3deffects.ui:1032
+#: svx/uiconfig/ui/docking3deffects.ui:1032
 msgctxt "docking3deffects|label16"
 msgid "Camera"
 msgstr "Camera"
 
-#: docking3deffects.ui:1067
+#: svx/uiconfig/ui/docking3deffects.ui:1067
 msgctxt "docking3deffects|label17"
 msgid "_Light source"
 msgstr "_Ffynhonnell golau"
 
-#: docking3deffects.ui:1081
+#: svx/uiconfig/ui/docking3deffects.ui:1081
 msgctxt "docking3deffects|colorbutton1|tooltip_text"
 msgid "Colors Dialog"
 msgstr "Deialog Lliwiau"
 
-#: docking3deffects.ui:1107
+#: svx/uiconfig/ui/docking3deffects.ui:1107
 msgctxt "docking3deffects|colorbutton2|tooltip_text"
 msgid "Colors Dialog"
 msgstr "Deialog Lliwiau"
 
-#: docking3deffects.ui:1121
+#: svx/uiconfig/ui/docking3deffects.ui:1121
 msgctxt "docking3deffects|label18"
 msgid "_Ambient light"
 msgstr "_Golau naturiol"
 
-#: docking3deffects.ui:1141
+#: svx/uiconfig/ui/docking3deffects.ui:1141
 msgctxt "docking3deffects|light1|tooltip_text"
 msgid "Light Source 1"
 msgstr "Ffynhonnell Golau 1"
 
-#: docking3deffects.ui:1154
+#: svx/uiconfig/ui/docking3deffects.ui:1154
 msgctxt "docking3deffects|light2|tooltip_text"
 msgid "Light Source 2"
 msgstr "Ffynhonnell Golau 2"
 
-#: docking3deffects.ui:1167
+#: svx/uiconfig/ui/docking3deffects.ui:1167
 msgctxt "docking3deffects|light3|tooltip_text"
 msgid "Light Source 3"
 msgstr "Ffynhonnell Golau 3"
 
-#: docking3deffects.ui:1180
+#: svx/uiconfig/ui/docking3deffects.ui:1180
 msgctxt "docking3deffects|light4|tooltip_text"
 msgid "Light Source 4"
 msgstr "Ffynhonnell Golau 4"
 
-#: docking3deffects.ui:1193
+#: svx/uiconfig/ui/docking3deffects.ui:1193
 msgctxt "docking3deffects|light5|tooltip_text"
 msgid "Light Source 5"
 msgstr "Ffynhonnell Golau 5"
 
-#: docking3deffects.ui:1206
+#: svx/uiconfig/ui/docking3deffects.ui:1206
 msgctxt "docking3deffects|light6|tooltip_text"
 msgid "Light Source 6"
 msgstr "Ffynhonnell Golau 6"
 
-#: docking3deffects.ui:1219
+#: svx/uiconfig/ui/docking3deffects.ui:1219
 msgctxt "docking3deffects|light7|tooltip_text"
 msgid "Light Source 7"
 msgstr "Ffynhonnell Golau 7"
 
-#: docking3deffects.ui:1232
+#: svx/uiconfig/ui/docking3deffects.ui:1232
 msgctxt "docking3deffects|light8|tooltip_text"
 msgid "Light Source 8"
 msgstr "Ffynhonnell Golau 8"
 
-#: docking3deffects.ui:1369
+#: svx/uiconfig/ui/docking3deffects.ui:1369
 msgctxt "docking3deffects|label19"
 msgid "Illumination"
 msgstr "Goliwiad"
 
-#: docking3deffects.ui:1404
+#: svx/uiconfig/ui/docking3deffects.ui:1404
 msgctxt "docking3deffects|label20"
 msgid "_Type"
 msgstr "_Math"
 
-#: docking3deffects.ui:1417
+#: svx/uiconfig/ui/docking3deffects.ui:1417
 msgctxt "docking3deffects|label22"
 msgid "_Mode"
 msgstr "_Modd"
 
-#: docking3deffects.ui:1430
+#: svx/uiconfig/ui/docking3deffects.ui:1430
 msgctxt "docking3deffects|label23"
 msgid "_Projection X"
 msgstr "_Tafluniad X"
 
-#: docking3deffects.ui:1443
+#: svx/uiconfig/ui/docking3deffects.ui:1443
 msgctxt "docking3deffects|label24"
 msgid "P_rojection Y"
 msgstr "Tafluniad _Y"
 
-#: docking3deffects.ui:1456
+#: svx/uiconfig/ui/docking3deffects.ui:1456
 msgctxt "docking3deffects|label25"
 msgid "_Filtering"
 msgstr "_Hidlo"
 
-#: docking3deffects.ui:1469
+#: svx/uiconfig/ui/docking3deffects.ui:1469
 msgctxt "docking3deffects|textype|tooltip_text"
 msgid "Black & White"
 msgstr "Du a Gwyn"
 
-#: docking3deffects.ui:1483
+#: svx/uiconfig/ui/docking3deffects.ui:1483
 msgctxt "docking3deffects|texcolor|tooltip_text"
 msgid "Color"
 msgstr "Lliw"
 
-#: docking3deffects.ui:1497
+#: svx/uiconfig/ui/docking3deffects.ui:1497
 msgctxt "docking3deffects|texreplace|tooltip_text"
 msgid "Only Texture"
 msgstr "Gwead yn Unig"
 
-#: docking3deffects.ui:1511
+#: svx/uiconfig/ui/docking3deffects.ui:1511
 msgctxt "docking3deffects|texmodulate|tooltip_text"
 msgid "Texture and Shading"
 msgstr "Gwead a Chysgodi"
 
-#: docking3deffects.ui:1525
+#: svx/uiconfig/ui/docking3deffects.ui:1525
 msgctxt "docking3deffects|texobjx|tooltip_text"
 msgid "Object-Specific"
 msgstr "Gwrthrych Benodol"
 
-#: docking3deffects.ui:1539
+#: svx/uiconfig/ui/docking3deffects.ui:1539
 msgctxt "docking3deffects|texparallelx|tooltip_text"
 msgid "Parallel"
 msgstr "Paralel"
 
-#: docking3deffects.ui:1553
+#: svx/uiconfig/ui/docking3deffects.ui:1553
 msgctxt "docking3deffects|texcirclex|tooltip_text"
 msgid "Circular"
 msgstr "Cylchol"
 
-#: docking3deffects.ui:1568
+#: svx/uiconfig/ui/docking3deffects.ui:1568
 msgctxt "docking3deffects|texobjy|tooltip_text"
 msgid "Object-Specific"
 msgstr "Gwrthrych Benodol"
 
-#: docking3deffects.ui:1582
+#: svx/uiconfig/ui/docking3deffects.ui:1582
 msgctxt "docking3deffects|texparallely|tooltip_text"
 msgid "Parallel"
 msgstr "Paralel"
 
-#: docking3deffects.ui:1596
+#: svx/uiconfig/ui/docking3deffects.ui:1596
 msgctxt "docking3deffects|texcircley|tooltip_text"
 msgid "Circular"
 msgstr "Cylchol"
 
-#: docking3deffects.ui:1610
+#: svx/uiconfig/ui/docking3deffects.ui:1610
 msgctxt "docking3deffects|texfilter|tooltip_text"
 msgid "Filtering On/Off"
 msgstr "Hidlo Ymlaen/Diffodd"
 
-#: docking3deffects.ui:1624
+#: svx/uiconfig/ui/docking3deffects.ui:1624
 msgctxt "docking3deffects|texblend|tooltip_text"
 msgid "Texture, Shadow and Color"
 msgstr "Gwead, Cysgodi a Lliw"
 
-#: docking3deffects.ui:1651
+#: svx/uiconfig/ui/docking3deffects.ui:1651
 msgctxt "docking3deffects|label21"
 msgid "Textures"
 msgstr "Gwead"
 
-#: docking3deffects.ui:1686
+#: svx/uiconfig/ui/docking3deffects.ui:1686
 msgctxt "docking3deffects|label26"
 msgid "_Favorites"
 msgstr "_Ffefrynnau"
 
-#: docking3deffects.ui:1699
+#: svx/uiconfig/ui/docking3deffects.ui:1699
 msgctxt "docking3deffects|label27"
 msgid "_Object color"
 msgstr "Lliw _gwrthrych"
 
-#: docking3deffects.ui:1713
+#: svx/uiconfig/ui/docking3deffects.ui:1713
 msgctxt "docking3deffects|label29"
 msgid "_Illumination color"
 msgstr "Lliw _goliwiad"
 
-#: docking3deffects.ui:1751
+#: svx/uiconfig/ui/docking3deffects.ui:1751
 msgctxt "docking3deffects|favorites"
 msgid "User-defined"
 msgstr "Defnyddiwr diffiniedig"
 
-#: docking3deffects.ui:1752
+#: svx/uiconfig/ui/docking3deffects.ui:1752
 msgctxt "docking3deffects|favorites"
 msgid "Metal"
 msgstr "Metal"
 
-#: docking3deffects.ui:1753
+#: svx/uiconfig/ui/docking3deffects.ui:1753
 msgctxt "docking3deffects|favorites"
 msgid "Gold"
 msgstr "Aur"
 
-#: docking3deffects.ui:1754
+#: svx/uiconfig/ui/docking3deffects.ui:1754
 msgctxt "docking3deffects|favorites"
 msgid "Chrome"
 msgstr "Chrome"
 
-#: docking3deffects.ui:1755
+#: svx/uiconfig/ui/docking3deffects.ui:1755
 msgctxt "docking3deffects|favorites"
 msgid "Plastic"
 msgstr "Plastig"
 
-#: docking3deffects.ui:1756
+#: svx/uiconfig/ui/docking3deffects.ui:1756
 msgctxt "docking3deffects|favorites"
 msgid "Wood"
 msgstr "Pren"
 
-#: docking3deffects.ui:1770
+#: svx/uiconfig/ui/docking3deffects.ui:1770
 msgctxt "docking3deffects|colorbutton3|tooltip_text"
 msgid "Colors Dialog"
 msgstr "Deialog Lliwiau"
 
-#: docking3deffects.ui:1783
+#: svx/uiconfig/ui/docking3deffects.ui:1783
 msgctxt "docking3deffects|colorbutton4|tooltip_text"
 msgid "Colors Dialog"
 msgstr "Deialog Lliwiau"
 
-#: docking3deffects.ui:1799
+#: svx/uiconfig/ui/docking3deffects.ui:1799
 msgctxt "docking3deffects|label28"
 msgid "Material"
 msgstr "Defnydd"
 
-#: docking3deffects.ui:1834
+#: svx/uiconfig/ui/docking3deffects.ui:1834
 msgctxt "docking3deffects|label30"
 msgid "_Color"
 msgstr "_Lliw"
 
-#: docking3deffects.ui:1848
+#: svx/uiconfig/ui/docking3deffects.ui:1848
 msgctxt "docking3deffects|label31"
 msgid "I_ntensity"
 msgstr "_Dwysedd"
 
-#: docking3deffects.ui:1874
+#: svx/uiconfig/ui/docking3deffects.ui:1874
 msgctxt "docking3deffects|colorbutton5|tooltip_text"
 msgid "Colors Dialog"
 msgstr "Deialog Lliwiau"
 
-#: docking3deffects.ui:1902
+#: svx/uiconfig/ui/docking3deffects.ui:1902
 msgctxt "docking3deffects|label32"
 msgid "Specular"
 msgstr "Adlewyrchol"
 
-#: docking3deffects.ui:1924
+#: svx/uiconfig/ui/docking3deffects.ui:1924
 msgctxt "docking3deffects|assign|tooltip_text"
 msgid "Assign"
 msgstr "Neulltio"
 
-#: docking3deffects.ui:1937
+#: svx/uiconfig/ui/docking3deffects.ui:1937
 msgctxt "docking3deffects|update|tooltip_text"
 msgid "Update"
 msgstr "Diweddaru"
 
-#: docking3deffects.ui:1952
+#: svx/uiconfig/ui/docking3deffects.ui:1952
 msgctxt "docking3deffects|material|tooltip_text"
 msgid "Material"
 msgstr "Defnydd"
 
-#: docking3deffects.ui:1965
+#: svx/uiconfig/ui/docking3deffects.ui:1965
 msgctxt "docking3deffects|texture|tooltip_text"
 msgid "Textures"
 msgstr "Gwead"
 
-#: docking3deffects.ui:1978
+#: svx/uiconfig/ui/docking3deffects.ui:1978
 msgctxt "docking3deffects|light|tooltip_text"
 msgid "Illumination"
 msgstr "Goliwiad"
 
-#: docking3deffects.ui:1991
+#: svx/uiconfig/ui/docking3deffects.ui:1991
 msgctxt "docking3deffects|representation|tooltip_text"
 msgid "Shading"
 msgstr "Cysgodi"
 
-#: docking3deffects.ui:2004
+#: svx/uiconfig/ui/docking3deffects.ui:2004
 msgctxt "docking3deffects|geometry|tooltip_text"
 msgid "Geometry"
 msgstr "Geometreg"
 
-#: dockingcolorreplace.ui:17
+#: svx/uiconfig/ui/dockingcolorreplace.ui:17
 msgctxt "dockingcolorreplace|DockingColorReplace"
 msgid "Color Replacer"
 msgstr "Newidydd Lliw"
 
-#: dockingcolorreplace.ui:51
+#: svx/uiconfig/ui/dockingcolorreplace.ui:51
 msgctxt "dockingcolorreplace|label2"
 msgid "Source color"
 msgstr "Lliw'r ffynhonnell"
 
-#: dockingcolorreplace.ui:64
+#: svx/uiconfig/ui/dockingcolorreplace.ui:64
 msgctxt "dockingcolorreplace|label3"
 msgid "Tolerance"
 msgstr "Goddefiant"
 
-#: dockingcolorreplace.ui:76
+#: svx/uiconfig/ui/dockingcolorreplace.ui:76
 msgctxt "dockingcolorreplace|label4"
 msgid "Replace with..."
 msgstr "Newid gyda..."
 
 #. This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.
-#: dockingcolorreplace.ui:93
+#: svx/uiconfig/ui/dockingcolorreplace.ui:94
 msgctxt "dockingcolorreplace|cbx2-atkobject"
 msgid "Source Color 2"
 msgstr "Lliw Ffynhonnell 2"
 
 #. This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.
-#: dockingcolorreplace.ui:111
+#: svx/uiconfig/ui/dockingcolorreplace.ui:113
 msgctxt "dockingcolorreplace|cbx3-atkobject"
 msgid "Source Color 3"
 msgstr "Lliw Ffynhonnell 3"
 
 #. This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.
-#: dockingcolorreplace.ui:129
+#: svx/uiconfig/ui/dockingcolorreplace.ui:132
 msgctxt "dockingcolorreplace|cbx4-atkobject"
 msgid "Source Color 4"
 msgstr "Lliw Ffynhonnell 4"
 
 #. This string is used by the eyedropper dialog to denote a color in an image that will be replaced by another color.
-#: dockingcolorreplace.ui:147
+#: svx/uiconfig/ui/dockingcolorreplace.ui:151
 msgctxt "dockingcolorreplace|cbx1-atkobject"
 msgid "Source Color 1"
 msgstr "Lliw Ffynhonnell 1"
 
-#: dockingcolorreplace.ui:158
+#: svx/uiconfig/ui/dockingcolorreplace.ui:162
 msgctxt "dockingcolorreplace|cbx5"
 msgid "Tr_ansparency"
 msgstr "_Tryloywder"
 
-#: dockingcolorreplace.ui:179
+#: svx/uiconfig/ui/dockingcolorreplace.ui:184
 msgctxt "dockingcolorreplace|tol1-atkobject"
 msgid "Tolerance 1"
 msgstr "Goddefiant 1"
 
-#: dockingcolorreplace.ui:197
+#: svx/uiconfig/ui/dockingcolorreplace.ui:202
 msgctxt "dockingcolorreplace|tol2-atkobject"
 msgid "Tolerance 2"
 msgstr "Goddefiant 2"
 
-#: dockingcolorreplace.ui:215
+#: svx/uiconfig/ui/dockingcolorreplace.ui:220
 msgctxt "dockingcolorreplace|tol3-atkobject"
 msgid "Tolerance 3"
 msgstr "Goddefiant 3"
 
-#: dockingcolorreplace.ui:233
+#: svx/uiconfig/ui/dockingcolorreplace.ui:238
 msgctxt "dockingcolorreplace|tol4-atkobject"
 msgid "Tolerance 4"
 msgstr "Goddefiant 4"
 
-#: dockingcolorreplace.ui:249
+#: svx/uiconfig/ui/dockingcolorreplace.ui:254
 msgctxt "dockingcolorreplace|color1-atkobject"
 msgid "Replace with 1"
 msgstr "Newid gyda 1"
 
-#: dockingcolorreplace.ui:265
+#: svx/uiconfig/ui/dockingcolorreplace.ui:270
 msgctxt "dockingcolorreplace|color2-atkobject"
 msgid "Replace with 2"
 msgstr "Newid gyda 2"
 
-#: dockingcolorreplace.ui:281
+#: svx/uiconfig/ui/dockingcolorreplace.ui:286
 msgctxt "dockingcolorreplace|color3-atkobject"
 msgid "Replace with 3"
 msgstr "Newid gyda 3"
 
-#: dockingcolorreplace.ui:297
+#: svx/uiconfig/ui/dockingcolorreplace.ui:302
 msgctxt "dockingcolorreplace|color4-atkobject"
 msgid "Replace with 4"
 msgstr "Newid gyda 4"
 
-#: dockingcolorreplace.ui:336
+#: svx/uiconfig/ui/dockingcolorreplace.ui:341
 msgctxt "dockingcolorreplace|label1"
 msgid "Colors"
 msgstr "Lliwiau"
 
-#: dockingcolorreplace.ui:356
+#: svx/uiconfig/ui/dockingcolorreplace.ui:361
 msgctxt "dockingcolorreplace|replace"
 msgid "_Replace"
 msgstr "_Newid"
 
-#: dockingcolorreplace.ui:387
+#: svx/uiconfig/ui/dockingcolorreplace.ui:392
 msgctxt "dockingcolorreplace|pipette"
 msgid "Pipette"
 msgstr "Piped"
 
-#: dockingfontwork.ui:17
+#: svx/uiconfig/ui/dockingfontwork.ui:17
 msgctxt "dockingfontwork|DockingFontwork"
 msgid "Fontwork"
 msgstr "Fontwork"
 
-#: dockingfontwork.ui:32
+#: svx/uiconfig/ui/dockingfontwork.ui:32
 msgctxt "dockingfontwork|off|tooltip_text"
 msgid "Off"
 msgstr "Diffodd"
 
-#: dockingfontwork.ui:55
+#: svx/uiconfig/ui/dockingfontwork.ui:55
 msgctxt "dockingfontwork|rotate|tooltip_text"
 msgid "Rotate"
 msgstr "Cylchdroi"
 
-#: dockingfontwork.ui:68
+#: svx/uiconfig/ui/dockingfontwork.ui:68
 msgctxt "dockingfontwork|upright|tooltip_text"
 msgid "Upright"
 msgstr "Unionsyth"
 
-#: dockingfontwork.ui:82
+#: svx/uiconfig/ui/dockingfontwork.ui:82
 msgctxt "dockingfontwork|hori|tooltip_text"
 msgid "Slant Horizontal"
 msgstr "Goleddf Llorweddol"
 
-#: dockingfontwork.ui:96
+#: svx/uiconfig/ui/dockingfontwork.ui:96
 msgctxt "dockingfontwork|vert|tooltip_text"
 msgid "Slant Vertical"
 msgstr "Goleddf Fertigol"
 
-#: dockingfontwork.ui:120
+#: svx/uiconfig/ui/dockingfontwork.ui:120
 msgctxt "dockingfontwork|orientation|tooltip_text"
 msgid "Orientation"
 msgstr "Gogwydd"
 
-#: dockingfontwork.ui:143
+#: svx/uiconfig/ui/dockingfontwork.ui:143
 msgctxt "dockingfontwork|left|tooltip_text"
 msgid "Align Left"
 msgstr "Alinio i'r Chwith"
 
-#: dockingfontwork.ui:156
+#: svx/uiconfig/ui/dockingfontwork.ui:156
 msgctxt "dockingfontwork|center|tooltip_text"
 msgid "Center"
 msgstr "Canol"
 
-#: dockingfontwork.ui:170
+#: svx/uiconfig/ui/dockingfontwork.ui:170
 msgctxt "dockingfontwork|right|tooltip_text"
 msgid "Align Right"
 msgstr "Alinio i'r Dde"
 
-#: dockingfontwork.ui:184
+#: svx/uiconfig/ui/dockingfontwork.ui:184
 msgctxt "dockingfontwork|autosize|tooltip_text"
 msgid "AutoSize Text"
 msgstr "AwtoMaint Testun"
 
-#: dockingfontwork.ui:222
+#: svx/uiconfig/ui/dockingfontwork.ui:222
 msgctxt "dockingfontwork|distance|tooltip_text"
 msgid "Distance"
 msgstr "Pellter"
 
-#: dockingfontwork.ui:259
+#: svx/uiconfig/ui/dockingfontwork.ui:259
 msgctxt "dockingfontwork|indent|tooltip_text"
 msgid "Indent"
 msgstr "Mewnoliad"
 
-#: dockingfontwork.ui:283
+#: svx/uiconfig/ui/dockingfontwork.ui:283
 msgctxt "dockingfontwork|contour|tooltip_text"
 msgid "Contour"
 msgstr "Amlinell"
 
-#: dockingfontwork.ui:296
+#: svx/uiconfig/ui/dockingfontwork.ui:296
 msgctxt "dockingfontwork|textcontour|tooltip_text"
 msgid "Text Contour"
 msgstr "Amlinell Testun"
 
-#: dockingfontwork.ui:319
+#: svx/uiconfig/ui/dockingfontwork.ui:319
 msgctxt "dockingfontwork|noshadow|tooltip_text"
 msgid "No Shadow"
 msgstr "Dim Cysgod"
 
-#: dockingfontwork.ui:332
+#: svx/uiconfig/ui/dockingfontwork.ui:332
 msgctxt "dockingfontwork|vertical|tooltip_text"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: dockingfontwork.ui:346
+#: svx/uiconfig/ui/dockingfontwork.ui:346
 msgctxt "dockingfontwork|slant|tooltip_text"
 msgid "Slant"
 msgstr "Goleddf"
 
-#: dockingfontwork.ui:384
+#: svx/uiconfig/ui/dockingfontwork.ui:384
 msgctxt "dockingfontwork|distancex|tooltip_text"
 msgid "Distance X"
 msgstr "Pellter X"
 
-#: dockingfontwork.ui:422
+#: svx/uiconfig/ui/dockingfontwork.ui:422
 msgctxt "dockingfontwork|distancey|tooltip_text"
 msgid "Distance Y"
 msgstr "Pellter Y"
 
-#: dockingfontwork.ui:442
+#: svx/uiconfig/ui/dockingfontwork.ui:442
 msgctxt "dockingfontwork|color|tooltip_text"
 msgid "Shadow Color"
 msgstr "Lliw Cysgodi"
 
-#: docrecoverybrokendialog.ui:8
+#: svx/uiconfig/ui/docrecoverybrokendialog.ui:8
 msgctxt "docrecoverybrokendialog|DocRecoveryBrokenDialog"
 msgid "%PRODUCTNAME Document Recovery"
 msgstr "Adfer Dogfen %PRODUCTNAME"
 
-#: docrecoverybrokendialog.ui:21
+#: svx/uiconfig/ui/docrecoverybrokendialog.ui:21
 msgctxt "docrecoverybrokendialog|save"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: docrecoverybrokendialog.ui:74
+#: svx/uiconfig/ui/docrecoverybrokendialog.ui:74
 msgctxt "docrecoverybrokendialog|label1"
 msgid ""
 "The automatic recovery process was interrupted.\n"
@@ -3393,517 +3434,517 @@ msgstr ""
 "\n"
 "Bydd y dogfennau rhestrir isod yn cael eu cadw yn y ffolder enwyd isod drwy glicio 'Cadw'. Cliciwch 'Diddymu' i gau'r dewin heb gadw'r dogfennau."
 
-#: docrecoverybrokendialog.ui:91
+#: svx/uiconfig/ui/docrecoverybrokendialog.ui:91
 msgctxt "docrecoverybrokendialog|label3"
 msgid "Documents:"
 msgstr "Dogfennau:"
 
-#: docrecoverybrokendialog.ui:124
+#: svx/uiconfig/ui/docrecoverybrokendialog.ui:124
 msgctxt "docrecoverybrokendialog|label4"
 msgid "_Save to:"
 msgstr "_Cadw i:"
 
-#: docrecoverybrokendialog.ui:155
+#: svx/uiconfig/ui/docrecoverybrokendialog.ui:154
 msgctxt "docrecoverybrokendialog|change"
 msgid "Chan_ge..."
 msgstr "_Newid..."
 
-#: docrecoveryprogressdialog.ui:8
+#: svx/uiconfig/ui/docrecoveryprogressdialog.ui:8
 msgctxt "docrecoveryprogressdialog|DocRecoveryProgressDialog"
 msgid "Documents Are Being Saved"
 msgstr "Mae'r Dogfennau'n Cael eu Cadw"
 
-#: docrecoveryprogressdialog.ui:42
+#: svx/uiconfig/ui/docrecoveryprogressdialog.ui:42
 msgctxt "docrecoveryprogressdialog|label2"
 msgid "Progress of saving:"
 msgstr "Cynnydd cadw:"
 
-#: docrecoveryrecoverdialog.ui:9
+#: svx/uiconfig/ui/docrecoveryrecoverdialog.ui:9
 msgctxt "docrecoveryrecoverdialog|DocRecoveryRecoverDialog"
 msgid "%PRODUCTNAME %PRODUCTVERSION Document Recovery"
 msgstr "Adfer Dogfen %PRODUCTNAME %PRODUCTVERSION"
 
-#: docrecoveryrecoverdialog.ui:22
+#: svx/uiconfig/ui/docrecoveryrecoverdialog.ui:22
 msgctxt "docrecoveryrecoverdialog|cancel"
 msgid "_Discard"
 msgstr "_Hepgor"
 
-#: docrecoveryrecoverdialog.ui:37
+#: svx/uiconfig/ui/docrecoveryrecoverdialog.ui:37
 msgctxt "docrecoveryrecoverdialog|next"
 msgid "_Start"
 msgstr "_Cychwyn"
 
-#: docrecoveryrecoverdialog.ui:77
+#: svx/uiconfig/ui/docrecoveryrecoverdialog.ui:77
 msgctxt "docrecoveryrecoverdialog|desc"
 msgid "%PRODUCTNAME will attempt to recover the state of the files you were working on before it crashed. Click 'Start' to begin the process, or click 'Discard' to cancel the recovery."
 msgstr "Bydd %PRODUCTNAME yn ceisio adfer cyflwr y ffeiliau roeddech y gweithio arnyn nhw cyn iddo chwalu. Cliciwch 'Cychwyn' i gychwyn y broses neu cliciwch 'Hepgor' i ddiddymu'r adfer."
 
-#: docrecoveryrecoverdialog.ui:98
+#: svx/uiconfig/ui/docrecoveryrecoverdialog.ui:98
 msgctxt "docrecoveryrecoverdialog|label2"
 msgid "Status of recovered documents:"
 msgstr "Statws dogfennau wedi eu hadfer:"
 
-#: docrecoveryrecoverdialog.ui:135
+#: svx/uiconfig/ui/docrecoveryrecoverdialog.ui:135
 msgctxt "docrecoveryrecoverdialog|nameft"
 msgid "Document Name"
 msgstr "Enw Dogfen"
 
-#: docrecoveryrecoverdialog.ui:147
+#: svx/uiconfig/ui/docrecoveryrecoverdialog.ui:147
 msgctxt "docrecoveryrecoverdialog|statusft"
 msgid "Status"
 msgstr "Statws"
 
-#: docrecoverysavedialog.ui:8
+#: svx/uiconfig/ui/docrecoverysavedialog.ui:8
 msgctxt "docrecoverysavedialog|DocRecoverySaveDialog"
 msgid "%PRODUCTNAME %PRODUCTVERSION Document Recovery"
 msgstr "Adfer Dogfen %PRODUCTNAME %PRODUCTVERSION"
 
-#: docrecoverysavedialog.ui:59
+#: svx/uiconfig/ui/docrecoverysavedialog.ui:59
 msgctxt "docrecoverysavedialog|label1"
 msgid "Due to an unexpected error, %PRODUCTNAME crashed. All the files you were working on will now be saved. The next time %PRODUCTNAME is launched, your files will be recovered automatically."
 msgstr "Oherwydd gwall annisgwyl chwalodd %PRODUCTNAME. Bydd yr holl ffeiliau roeddech yn gweithio arnynt yn cael eu cadw. Y tro nesaf byddwch yn cychwyn %PRODUCTNAME bydd eich ffeiliau wedi eu hadfer yn awtomatig."
 
-#: docrecoverysavedialog.ui:80
+#: svx/uiconfig/ui/docrecoverysavedialog.ui:80
 msgctxt "docrecoverysavedialog|label2"
 msgid "The following files will be recovered:"
 msgstr "Bydd y ffeiliau canlynol yn cael eu hadfer:"
 
-#: extrustiondepthdialog.ui:12
+#: svx/uiconfig/ui/extrustiondepthdialog.ui:12
 msgctxt "extrustiondepthdialog|ExtrustionDepthDialog"
 msgid "Extrusion Depth"
 msgstr "Dyfnder Allwthiad"
 
-#: extrustiondepthdialog.ui:116
+#: svx/uiconfig/ui/extrustiondepthdialog.ui:115
 msgctxt "extrustiondepthdialog|label1"
 msgid "_Value"
 msgstr "_Gwerth"
 
-#: extrustiondepthdialog.ui:135
+#: svx/uiconfig/ui/extrustiondepthdialog.ui:134
 msgctxt "extrustiondepthdialog|label2"
 msgid "Depth"
 msgstr "Dyfnder"
 
-#: filtermenu.ui:12
+#: svx/uiconfig/ui/filtermenu.ui:12
 msgctxt "filtermenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: filtermenu.ui:20
+#: svx/uiconfig/ui/filtermenu.ui:20
 msgctxt "filtermenu|edit"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: filtermenu.ui:28
+#: svx/uiconfig/ui/filtermenu.ui:28
 msgctxt "filtermenu|isnull"
 msgid "_Is Null"
 msgstr "_Yn Nwl"
 
-#: filtermenu.ui:36
+#: svx/uiconfig/ui/filtermenu.ui:36
 msgctxt "filtermenu|isnotnull"
 msgid "I_s not Null"
 msgstr "_Nid yw'n Nwl"
 
-#: findreplacedialog.ui:8
+#: svx/uiconfig/ui/findreplacedialog.ui:8
 msgctxt "findreplacedialog|FindReplaceDialog"
 msgid "Find & Replace"
 msgstr "Canfod a Newid"
 
-#: findreplacedialog.ui:135
+#: svx/uiconfig/ui/findreplacedialog.ui:135
 msgctxt "findreplacedialog|label4"
 msgid "_Find:"
 msgstr "_Chwilio:"
 
-#: findreplacedialog.ui:183
+#: svx/uiconfig/ui/findreplacedialog.ui:183
 msgctxt "findreplacedialog|matchcase"
 msgid "Ma_tch case"
 msgstr "Cydweddu _maint"
 
-#: findreplacedialog.ui:199
+#: svx/uiconfig/ui/findreplacedialog.ui:199
 msgctxt "findreplacedialog|searchformatted"
 msgid "For_matted display"
 msgstr "Dangosydd a fformatiwyd"
 
-#: findreplacedialog.ui:218
+#: svx/uiconfig/ui/findreplacedialog.ui:219
 msgctxt "findreplacedialog|wholewords"
 msgid "Whole wor_ds only"
 msgstr "_Geiriau cyfan yn unig"
 
-#: findreplacedialog.ui:236
+#: svx/uiconfig/ui/findreplacedialog.ui:237
 msgctxt "findreplacedialog|entirecells"
 msgid "_Entire cells"
 msgstr "_Celloedd cyfan"
 
-#: findreplacedialog.ui:254
+#: svx/uiconfig/ui/findreplacedialog.ui:255
 msgctxt "findreplacedialog|allsheets"
 msgid "All _sheets"
 msgstr "Pob _dalen"
 
-#: findreplacedialog.ui:281
+#: svx/uiconfig/ui/findreplacedialog.ui:282
 msgctxt "findreplacedialog|label1"
 msgid "_Search For"
 msgstr "_Chwilio Am"
 
-#: findreplacedialog.ui:365
+#: svx/uiconfig/ui/findreplacedialog.ui:366
 msgctxt "findreplacedialog|label5"
 msgid "Re_place:"
 msgstr "_Newid:"
 
-#: findreplacedialog.ui:398
+#: svx/uiconfig/ui/findreplacedialog.ui:399
 msgctxt "findreplacedialog|label2"
 msgid "Re_place With"
 msgstr "_Newid Gyda"
 
-#: findreplacedialog.ui:424
+#: svx/uiconfig/ui/findreplacedialog.ui:425
 msgctxt "findreplacedialog|searchall"
 msgid "Find _All"
 msgstr "Canfod _Popeth"
 
-#: findreplacedialog.ui:438
+#: svx/uiconfig/ui/findreplacedialog.ui:439
 msgctxt "findreplacedialog|backsearch"
 msgid "Find Pre_vious"
 msgstr "Canfod y _Flaenorol"
 
-#: findreplacedialog.ui:452
+#: svx/uiconfig/ui/findreplacedialog.ui:453
 msgctxt "findreplacedialog|search"
 msgid "Find Ne_xt"
 msgstr "Canfod y _Nesaf"
 
-#: findreplacedialog.ui:468
+#: svx/uiconfig/ui/findreplacedialog.ui:469
 msgctxt "findreplacedialog|replace"
 msgid "_Replace"
 msgstr "_Newid"
 
-#: findreplacedialog.ui:482
+#: svx/uiconfig/ui/findreplacedialog.ui:483
 msgctxt "findreplacedialog|replaceall"
 msgid "Replace A_ll"
 msgstr "Newid P_opeth"
 
-#: findreplacedialog.ui:633
+#: svx/uiconfig/ui/findreplacedialog.ui:634
 msgctxt "findreplacedialog|selection"
 msgid "C_urrent selection only"
 msgstr "_Dewis presennol yn unig"
 
-#: findreplacedialog.ui:648
+#: svx/uiconfig/ui/findreplacedialog.ui:649
 msgctxt "findreplacedialog|regexp"
 msgid "Re_gular expressions"
 msgstr "Mynegiadau _rheolaidd"
 
-#: findreplacedialog.ui:670
+#: svx/uiconfig/ui/findreplacedialog.ui:671
 msgctxt "findreplacedialog|attributes"
 msgid "Attribut_es..."
 msgstr "_Priodweddau..."
 
-#: findreplacedialog.ui:684
+#: svx/uiconfig/ui/findreplacedialog.ui:685
 msgctxt "findreplacedialog|format"
 msgid "For_mat..."
 msgstr "Ffor_mat..."
 
-#: findreplacedialog.ui:698
+#: svx/uiconfig/ui/findreplacedialog.ui:699
 msgctxt "findreplacedialog|noformat"
 msgid "_No Format"
 msgstr "_Dim Fformat"
 
-#: findreplacedialog.ui:719
+#: svx/uiconfig/ui/findreplacedialog.ui:720
 msgctxt "findreplacedialog|layout"
 msgid "Search for st_yles"
 msgstr "Chwilio am _arddulliau"
 
-#: findreplacedialog.ui:734
+#: svx/uiconfig/ui/findreplacedialog.ui:735
 msgctxt "findreplacedialog|includediacritics"
 msgid "Diac_ritic-sensitive"
 msgstr "Sensitif i'r _deiacritig"
 
-#: findreplacedialog.ui:749
+#: svx/uiconfig/ui/findreplacedialog.ui:750
 msgctxt "findreplacedialog|includekashida"
 msgid "_Kashida-sensitive"
 msgstr "Sensitif i _Kashida"
 
-#: findreplacedialog.ui:764
+#: svx/uiconfig/ui/findreplacedialog.ui:765
 msgctxt "findreplacedialog|matchcharwidth"
 msgid "Match character _width"
 msgstr "Cydweddu _lled nod"
 
-#: findreplacedialog.ui:784
+#: svx/uiconfig/ui/findreplacedialog.ui:785
 msgctxt "findreplacedialog|similarity"
 msgid "S_imilarity search"
 msgstr "Chwilio _tebygrwydd"
 
-#: findreplacedialog.ui:800
+#: svx/uiconfig/ui/findreplacedialog.ui:801
 msgctxt "findreplacedialog|similaritybtn"
 msgid "Similarities..."
 msgstr "Tebygolrwydd..."
 
-#: findreplacedialog.ui:827
+#: svx/uiconfig/ui/findreplacedialog.ui:828
 msgctxt "findreplacedialog|soundslike"
 msgid "Sounds like (_Japanese)"
 msgstr "I'w glywed fel (_Japanëeg)"
 
-#: findreplacedialog.ui:843
+#: svx/uiconfig/ui/findreplacedialog.ui:844
 msgctxt "findreplacedialog|soundslikebtn"
 msgid "Sounds..."
 msgstr "Seiniau..."
 
-#: findreplacedialog.ui:869
+#: svx/uiconfig/ui/findreplacedialog.ui:870
 msgctxt "findreplacedialog|wildcard"
 msgid "Wil_dcards"
 msgstr "Cardiau _Gwyllt"
 
-#: findreplacedialog.ui:885
+#: svx/uiconfig/ui/findreplacedialog.ui:886
 msgctxt "findreplacedialog|notes"
 msgid "_Comments"
 msgstr "_Sylwadau"
 
-#: findreplacedialog.ui:907
+#: svx/uiconfig/ui/findreplacedialog.ui:908
 msgctxt "findreplacedialog|replace_backwards"
 msgid "Replace _backwards"
 msgstr "Newid _nôl"
 
-#: findreplacedialog.ui:943
+#: svx/uiconfig/ui/findreplacedialog.ui:944
 msgctxt "findreplacedialog|searchinlabel"
 msgid "Search i_n:"
 msgstr "_Chwilio yn:"
 
-#: findreplacedialog.ui:958
+#: svx/uiconfig/ui/findreplacedialog.ui:959
 msgctxt "findreplacedialog|calcsearchin"
 msgid "Formulas"
 msgstr "Fformiwlâu"
 
-#: findreplacedialog.ui:959
+#: svx/uiconfig/ui/findreplacedialog.ui:960
 msgctxt "findreplacedialog|calcsearchin"
 msgid "Values"
 msgstr "Gwerthoedd"
 
-#: findreplacedialog.ui:960
+#: svx/uiconfig/ui/findreplacedialog.ui:961
 msgctxt "findreplacedialog|calcsearchin"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: findreplacedialog.ui:985
+#: svx/uiconfig/ui/findreplacedialog.ui:986
 msgctxt "findreplacedialog|searchdir"
 msgid "Direction:"
 msgstr "Cyfeiriad:"
 
-#: findreplacedialog.ui:1002
+#: svx/uiconfig/ui/findreplacedialog.ui:1003
 msgctxt "findreplacedialog|rows"
 msgid "Ro_ws"
 msgstr "_Rhesi"
 
-#: findreplacedialog.ui:1022
+#: svx/uiconfig/ui/findreplacedialog.ui:1023
 msgctxt "findreplacedialog|cols"
 msgid "Colum_ns"
 msgstr "_Colofnau"
 
-#: findreplacedialog.ui:1068
+#: svx/uiconfig/ui/findreplacedialog.ui:1069
 msgctxt "findreplacedialog|label3"
 msgid "Other _options"
 msgstr "_Dewisiadau eraill"
 
-#: floatingareastyle.ui:43
+#: svx/uiconfig/ui/floatingareastyle.ui:43
 msgctxt "floatingareastyle|label1"
 msgid "_Angle:"
 msgstr "_Ongl:"
 
-#: floatingareastyle.ui:62
+#: svx/uiconfig/ui/floatingareastyle.ui:62
 msgctxt "floatingareastyle|angle|tooltip_text"
 msgid "Specify the angle of rotation for the gradient shading style."
 msgstr "Pennu ongl troi yr arddull arlliwio graddiant."
 
-#: floatingareastyle.ui:82
+#: svx/uiconfig/ui/floatingareastyle.ui:82
 msgctxt "floatingareastyle|left|tooltip_text"
 msgid "Rotate counterclockwise by 45 degrees."
 msgstr "Cylchdroi gwrthglocwedd 45 gradd."
 
-#: floatingareastyle.ui:104
+#: svx/uiconfig/ui/floatingareastyle.ui:104
 msgctxt "floatingareastyle|right|tooltip_text"
 msgid "Rotate clockwise by 45 degrees."
 msgstr "Cylchdroi clocwedd 45 gradd."
 
-#: floatingareastyle.ui:147
+#: svx/uiconfig/ui/floatingareastyle.ui:147
 msgctxt "floatingareastyle|label4"
 msgid "_Start value:"
 msgstr "Gwerth _cychwyn:"
 
-#: floatingareastyle.ui:161
+#: svx/uiconfig/ui/floatingareastyle.ui:161
 msgctxt "floatingareastyle|label5"
 msgid "_End value:"
 msgstr "Gwerth _diwedd:"
 
-#: floatingareastyle.ui:174
+#: svx/uiconfig/ui/floatingareastyle.ui:174
 msgctxt "floatingareastyle|start|tooltip_text"
 msgid "Enter a transparency value for the beginning point of the gradient, where 0% is fully opaque and 100% is fully transparent."
 msgstr "Rhoi gwerth tryloywder ar gyfer pwynt cychwyn y graddiant, lle mae 0% yn gwbl ddi-draidd a 100% yn gwbl dryloyw."
 
-#: floatingareastyle.ui:186
+#: svx/uiconfig/ui/floatingareastyle.ui:186
 msgctxt "floatingareastyle|end|tooltip_text"
 msgid "Enter a transparency value for the endpoint of the gradient, where 0% is fully opaque and 100% is fully transparent."
 msgstr "Rhoi gwerth tryloywder ar gyfer pwynt diwedd y graddiant, lle mae 0% yn gwbl ddi-draidd a 100% yn gwbl dryloyw."
 
-#: floatingareastyle.ui:210
+#: svx/uiconfig/ui/floatingareastyle.ui:210
 msgctxt "floatingareastyle|label6"
 msgid "_Border:"
 msgstr "_Border:"
 
-#: floatingareastyle.ui:223
+#: svx/uiconfig/ui/floatingareastyle.ui:223
 msgctxt "floatingareastyle|border|tooltip_text"
 msgid "Specify the border value of gradient transparency."
 msgstr "Pennu gwerth tryloywder graddiant y border."
 
-#: floatingareastyle.ui:248
+#: svx/uiconfig/ui/floatingareastyle.ui:248
 msgctxt "floatingareastyle|label2"
 msgid "Center _X:"
 msgstr "Canol _X:"
 
-#: floatingareastyle.ui:262
+#: svx/uiconfig/ui/floatingareastyle.ui:262
 msgctxt "floatingareastyle|label3"
 msgid "Center _Y:"
 msgstr "Canol _Y:"
 
-#: floatingareastyle.ui:275
+#: svx/uiconfig/ui/floatingareastyle.ui:275
 msgctxt "floatingareastyle|centerx|tooltip_text"
 msgid "Specify the horizontal offset percentage from the center for the gradient shading style. 50% is the horizontal center."
 msgstr "Pennu canran atred llorweddol o'r canol ar gyfer arddull arlliwio'r graddiant. 50% yw canol y llorweddol."
 
-#: floatingareastyle.ui:287
+#: svx/uiconfig/ui/floatingareastyle.ui:287
 msgctxt "floatingareastyle|centery|tooltip_text"
 msgid "Specify the vertical offset percentage from the center for the gradient shading style.  50% is the vertical center."
 msgstr "Pennu canran atred fertigol o'r canol ar gyfer arddull cysgodi'r graddiant.  50% yw canol y fertigol."
 
-#: floatingcontour.ui:17
+#: svx/uiconfig/ui/floatingcontour.ui:17
 msgctxt "floatingcontour|FloatingContour"
 msgid "Contour Editor"
 msgstr "Golygydd Amlinell"
 
-#: floatingcontour.ui:46
+#: svx/uiconfig/ui/floatingcontour.ui:46
 msgctxt "floatingcontour|TBI_APPLY"
 msgid "Apply"
 msgstr "Gosod"
 
-#: floatingcontour.ui:71
+#: svx/uiconfig/ui/floatingcontour.ui:71
 msgctxt "floatingcontour|TBI_WORKPLACE"
 msgid "Workspace"
 msgstr "Man gwaith"
 
-#: floatingcontour.ui:96
+#: svx/uiconfig/ui/floatingcontour.ui:96
 msgctxt "floatingcontour|TBI_SELECT"
 msgid "Select"
 msgstr "Dewis"
 
-#: floatingcontour.ui:111
+#: svx/uiconfig/ui/floatingcontour.ui:111
 msgctxt "floatingcontour|TBI_RECT"
 msgid "Rectangle"
 msgstr "Petryal"
 
-#: floatingcontour.ui:126
+#: svx/uiconfig/ui/floatingcontour.ui:126
 msgctxt "floatingcontour|TBI_CIRCLE"
 msgid "Ellipse"
 msgstr "Elips"
 
-#: floatingcontour.ui:141
+#: svx/uiconfig/ui/floatingcontour.ui:141
 msgctxt "floatingcontour|TBI_POLY"
 msgid "Polygon"
 msgstr "Polygon"
 
-#: floatingcontour.ui:166
+#: svx/uiconfig/ui/floatingcontour.ui:166
 msgctxt "floatingcontour|TBI_POLYEDIT"
 msgid "Edit Points"
 msgstr "Pwyntiau Golygu"
 
-#: floatingcontour.ui:181
+#: svx/uiconfig/ui/floatingcontour.ui:181
 msgctxt "floatingcontour|TBI_POLYMOVE"
 msgid "Move Points"
 msgstr "Pwyntiau Symud"
 
-#: floatingcontour.ui:196
+#: svx/uiconfig/ui/floatingcontour.ui:196
 msgctxt "floatingcontour|TBI_POLYINSERT"
 msgid "Insert Points"
 msgstr "Pwyntiau Mewnosod"
 
-#: floatingcontour.ui:211
+#: svx/uiconfig/ui/floatingcontour.ui:211
 msgctxt "floatingcontour|TBI_POLYDELETE"
 msgid "Delete Points"
 msgstr "Pwyntiau Dileu"
 
-#: floatingcontour.ui:234
+#: svx/uiconfig/ui/floatingcontour.ui:234
 msgctxt "floatingcontour|TBI_AUTOCONTOUR"
 msgid "AutoContour"
 msgstr "AwtoAmlinell"
 
-#: floatingcontour.ui:260
+#: svx/uiconfig/ui/floatingcontour.ui:260
 msgctxt "floatingcontour|TBI_UNDO"
 msgid "Undo "
 msgstr "Dadwneud "
 
-#: floatingcontour.ui:275
+#: svx/uiconfig/ui/floatingcontour.ui:275
 msgctxt "floatingcontour|TBI_REDO"
 msgid "Redo"
 msgstr "Ail-wneud"
 
-#: floatingcontour.ui:290
+#: svx/uiconfig/ui/floatingcontour.ui:290
 msgctxt "floatingcontour|TBI_PIPETTE"
 msgid "Pipette"
 msgstr "Piped"
 
-#: floatingcontour.ui:310
+#: svx/uiconfig/ui/floatingcontour.ui:310
 msgctxt "floatingcontour|spinbutton|tooltip_text"
 msgid "Color Tolerance"
 msgstr "Goddefiad Lliw"
 
-#: floatinglineproperty.ui:53
+#: svx/uiconfig/ui/floatinglineproperty.ui:53
 msgctxt "floatinglineproperty|label1"
 msgid "Custom Line Width:"
 msgstr "Lled Llinell Cyfaddas:"
 
-#: fontworkgallerydialog.ui:9
+#: svx/uiconfig/ui/fontworkgallerydialog.ui:9
 msgctxt "fontworkgallerydialog|FontworkGalleryDialog"
 msgid "Fontwork Gallery"
 msgstr "Oriel Fontwork"
 
-#: fontworkgallerydialog.ui:87
+#: svx/uiconfig/ui/fontworkgallerydialog.ui:87
 msgctxt "fontworkgallerydialog|label1"
 msgid "Select a Fontwork style:"
 msgstr "Dewis arddull Fontwork:"
 
-#: fontworkspacingdialog.ui:13
+#: svx/uiconfig/ui/fontworkspacingdialog.ui:13
 msgctxt "fontworkspacingdialog|FontworkSpacingDialog"
 msgid "Fontwork Character Spacing"
 msgstr "Gosod Bylchu Nod Fontwork"
 
-#: fontworkspacingdialog.ui:32
+#: svx/uiconfig/ui/fontworkspacingdialog.ui:32
 msgctxt "fontworkspacingdialog|label2"
 msgid "_Value:"
 msgstr "_Gwerth:"
 
-#: formdatamenu.ui:12
+#: svx/uiconfig/ui/formdatamenu.ui:12
 msgctxt "formdatamenu|additem"
 msgid "Add Item"
 msgstr "Ychwanegu Eitem"
 
-#: formdatamenu.ui:20
+#: svx/uiconfig/ui/formdatamenu.ui:20
 msgctxt "formdatamenu|addelement"
 msgid "Add Element"
 msgstr "Ychwanegu Elfen"
 
-#: formdatamenu.ui:28
+#: svx/uiconfig/ui/formdatamenu.ui:28
 msgctxt "formdatamenu|addattribute"
 msgid "Add Attribute"
 msgstr "Ychwanegu Priodoledd"
 
-#: formdatamenu.ui:36
+#: svx/uiconfig/ui/formdatamenu.ui:36
 msgctxt "formdatamenu|edit"
 msgid "Edit"
 msgstr "Golygu"
 
-#: formdatamenu.ui:50
+#: svx/uiconfig/ui/formdatamenu.ui:50
 msgctxt "formdatamenu|delete"
 msgid "Delete"
 msgstr "Dileu"
 
-#: formlinkwarndialog.ui:12
+#: svx/uiconfig/ui/formlinkwarndialog.ui:12
 msgctxt "formlinkwarndialog|FormLinkWarnDialog"
 msgid "This instance is linked with the form."
 msgstr "Mae'r enghraifft yma wedi ei gysylltu â'r ffurflen."
 
-#: formlinkwarndialog.ui:13
+#: svx/uiconfig/ui/formlinkwarndialog.ui:13
 msgctxt "formlinkwarndialog|FormLinkWarnDialog"
 msgid ""
 "The changes you make to this instance will be lost when the form is reloaded.\n"
@@ -3914,762 +3955,762 @@ msgstr ""
 "\n"
 "Sut hoffech chi barhau?"
 
-#: formlinkwarndialog.ui:27
+#: svx/uiconfig/ui/formlinkwarndialog.ui:26
 msgctxt "formlinkwarndialog|ok"
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: formnavimenu.ui:12
+#: svx/uiconfig/ui/formnavimenu.ui:12
 msgctxt "formnavimenu|new"
 msgid "_New"
 msgstr "_Newydd"
 
-#: formnavimenu.ui:22
+#: svx/uiconfig/ui/formnavimenu.ui:22
 msgctxt "formnavimenu|form"
 msgid "Form"
 msgstr "Ffurflen"
 
-#: formnavimenu.ui:30
+#: svx/uiconfig/ui/formnavimenu.ui:30
 msgctxt "formnavimenu|hidden"
 msgid "Hidden Control"
 msgstr "Rheolaeth Gudd"
 
-#: formnavimenu.ui:42
+#: svx/uiconfig/ui/formnavimenu.ui:42
 msgctxt "formnavimenu|change"
 msgid "Replace with"
 msgstr "Newid gyda"
 
-#: formnavimenu.ui:50
+#: svx/uiconfig/ui/formnavimenu.ui:50
 msgctxt "formnavimenu|cut"
 msgid "Cu_t"
 msgstr "_Torri"
 
-#: formnavimenu.ui:58
+#: svx/uiconfig/ui/formnavimenu.ui:58
 msgctxt "formnavimenu|copy"
 msgid "_Copy"
 msgstr "­_Copïo"
 
-#: formnavimenu.ui:66
+#: svx/uiconfig/ui/formnavimenu.ui:66
 msgctxt "formnavimenu|paste"
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: formnavimenu.ui:74
+#: svx/uiconfig/ui/formnavimenu.ui:74
 msgctxt "formnavimenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: formnavimenu.ui:82
+#: svx/uiconfig/ui/formnavimenu.ui:82
 msgctxt "formnavimenu|taborder"
 msgid "Tab Order..."
 msgstr "Trefn Tab..."
 
-#: formnavimenu.ui:90
+#: svx/uiconfig/ui/formnavimenu.ui:90
 msgctxt "formnavimenu|rename"
 msgid "_Rename"
 msgstr "_Ailenwi"
 
-#: formnavimenu.ui:98
+#: svx/uiconfig/ui/formnavimenu.ui:98
 msgctxt "formnavimenu|props"
 msgid "Propert_ies"
 msgstr "_Priodweddau"
 
-#: formnavimenu.ui:106
+#: svx/uiconfig/ui/formnavimenu.ui:106
 msgctxt "formnavimenu|designmode"
 msgid "Open in Design Mode"
 msgstr "Agor ym Modd Cynllunio"
 
-#: formnavimenu.ui:114
+#: svx/uiconfig/ui/formnavimenu.ui:114
 msgctxt "formnavimenu|controlfocus"
 msgid "Automatic Control Focus"
 msgstr "Canolbwynt Rheoli Awtomatig"
 
-#: functionmenu.ui:12
+#: svx/uiconfig/ui/functionmenu.ui:12
 msgctxt "functionmenu|avg"
 msgid "Average"
 msgstr "Cyfartaledd"
 
-#: functionmenu.ui:20
+#: svx/uiconfig/ui/functionmenu.ui:20
 msgctxt "functionmenu|counta"
 msgid "CountA"
 msgstr "CountA"
 
-#: functionmenu.ui:27
+#: svx/uiconfig/ui/functionmenu.ui:27
 msgctxt "functionmenu|count"
 msgid "Count"
 msgstr "Cyfrif"
 
-#: functionmenu.ui:34
+#: svx/uiconfig/ui/functionmenu.ui:34
 msgctxt "functionmenu|max"
 msgid "Maximum"
 msgstr "Uchafswm"
 
-#: functionmenu.ui:41
+#: svx/uiconfig/ui/functionmenu.ui:41
 msgctxt "functionmenu|min"
 msgid "Minimum"
 msgstr "Lleiafswm"
 
-#: functionmenu.ui:48
+#: svx/uiconfig/ui/functionmenu.ui:48
 msgctxt "functionmenu|sum"
 msgid "Sum"
 msgstr "Swm"
 
-#: functionmenu.ui:55
+#: svx/uiconfig/ui/functionmenu.ui:55
 msgctxt "functionmenu|selection"
 msgid "Selection count"
 msgstr "Cyfrif y dewis"
 
-#: functionmenu.ui:62
+#: svx/uiconfig/ui/functionmenu.ui:62
 msgctxt "functionmenu|none"
 msgid "None"
 msgstr "Dim"
 
-#: gallerymenu1.ui:12
+#: svx/uiconfig/ui/gallerymenu1.ui:12
 msgctxt "gallerymenu1|update"
 msgid "Update"
 msgstr "Diweddaru"
 
-#: gallerymenu1.ui:26
+#: svx/uiconfig/ui/gallerymenu1.ui:26
 msgctxt "gallerymenu1|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: gallerymenu1.ui:33
+#: svx/uiconfig/ui/gallerymenu1.ui:33
 msgctxt "gallerymenu1|rename"
 msgid "_Rename"
 msgstr "_Ailenwi"
 
-#: gallerymenu1.ui:46
+#: svx/uiconfig/ui/gallerymenu1.ui:46
 msgctxt "gallerymenu1|assign"
 msgid "Assign _ID"
 msgstr "Gosod _Enw"
 
-#: gallerymenu1.ui:59
+#: svx/uiconfig/ui/gallerymenu1.ui:59
 msgctxt "gallerymenu1|properties"
 msgid "Propert_ies..."
 msgstr "_Priodweddau..."
 
-#: gallerymenu2.ui:12
+#: svx/uiconfig/ui/gallerymenu2.ui:12
 msgctxt "gallerymenu2|add"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: gallerymenu2.ui:20
+#: svx/uiconfig/ui/gallerymenu2.ui:20
 msgctxt "gallerymenu2|background"
 msgid "Insert as Bac_kground"
 msgstr "Mewnosod fel _Cefndir"
 
-#: gallerymenu2.ui:34
+#: svx/uiconfig/ui/gallerymenu2.ui:34
 msgctxt "gallerymenu2|preview"
 msgid "_Preview"
 msgstr "_Rhagolwg"
 
-#: gallerymenu2.ui:48
+#: svx/uiconfig/ui/gallerymenu2.ui:48
 msgctxt "gallerymenu2|title"
 msgid "_Title"
 msgstr "_Teitl"
 
-#: gallerymenu2.ui:61
+#: svx/uiconfig/ui/gallerymenu2.ui:61
 msgctxt "gallerymenu2|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: gallerymenu2.ui:74
+#: svx/uiconfig/ui/gallerymenu2.ui:74
 msgctxt "gallerymenu2|copy"
 msgid "_Copy"
 msgstr "­_Copïo"
 
-#: gallerymenu2.ui:82
+#: svx/uiconfig/ui/gallerymenu2.ui:82
 msgctxt "gallerymenu2|paste"
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: headfootformatpage.ui:58
+#: svx/uiconfig/ui/headfootformatpage.ui:58
 msgctxt "headfootformatpage|checkHeaderOn"
 msgid "Hea_der on"
 msgstr "_Pennyn ymlaen"
 
-#: headfootformatpage.ui:75
+#: svx/uiconfig/ui/headfootformatpage.ui:75
 msgctxt "headfootformatpage|checkFooterOn"
 msgid "_Footer on"
 msgstr "_Troedyn ymlaen"
 
-#: headfootformatpage.ui:113
+#: svx/uiconfig/ui/headfootformatpage.ui:113
 msgctxt "headfootformatpage|checkSameLR"
 msgid "Same _content on left and right pages"
 msgstr "Yr _un cynnwys ar y tudalen dde a'r chwith"
 
-#: headfootformatpage.ui:131
+#: svx/uiconfig/ui/headfootformatpage.ui:131
 msgctxt "headfootformatpage|checkSameFP"
 msgid "Same content on first page"
 msgstr "Yr un cynnwys ar y dudalen gyntaf"
 
-#: headfootformatpage.ui:152
+#: svx/uiconfig/ui/headfootformatpage.ui:153
 msgctxt "headfootformatpage|labelLeftMarg"
 msgid "_Left margin:"
 msgstr "Ymyl _chwith:"
 
-#: headfootformatpage.ui:186
+#: svx/uiconfig/ui/headfootformatpage.ui:185
 msgctxt "headfootformatpage|labelRightMarg"
 msgid "R_ight margin:"
 msgstr "Ymyl _de:"
 
-#: headfootformatpage.ui:220
+#: svx/uiconfig/ui/headfootformatpage.ui:217
 msgctxt "headfootformatpage|labelSpacing"
 msgid "_Spacing:"
 msgstr "_Bylchu:"
 
-#: headfootformatpage.ui:250
+#: svx/uiconfig/ui/headfootformatpage.ui:245
 msgctxt "headfootformatpage|checkDynSpacing"
 msgid "Use d_ynamic spacing"
 msgstr "_Defnyddio bylchu deinamig"
 
-#: headfootformatpage.ui:271
+#: svx/uiconfig/ui/headfootformatpage.ui:266
 msgctxt "headfootformatpage|labelHeight"
 msgid "_Height:"
 msgstr "_Uchder:"
 
-#: headfootformatpage.ui:302
+#: svx/uiconfig/ui/headfootformatpage.ui:295
 msgctxt "headfootformatpage|checkAutofit"
 msgid "_AutoFit height"
 msgstr "_AwtoFfitio uchder"
 
-#: headfootformatpage.ui:326
+#: svx/uiconfig/ui/headfootformatpage.ui:319
 msgctxt "headfootformatpage|buttonMore"
 msgid "More..."
 msgstr "Rhagor..."
 
-#: headfootformatpage.ui:339
+#: svx/uiconfig/ui/headfootformatpage.ui:332
 msgctxt "headfootformatpage|buttonEdit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: headfootformatpage.ui:383
+#: svx/uiconfig/ui/headfootformatpage.ui:376
 msgctxt "headfootformatpage|labelHeaderFormat"
 msgid "Header"
 msgstr "Pennyn"
 
-#: headfootformatpage.ui:399
+#: svx/uiconfig/ui/headfootformatpage.ui:392
 msgctxt "headfootformatpage|labelFooterFormat"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: imapdialog.ui:11
+#: svx/uiconfig/ui/imapdialog.ui:11
 msgctxt "imapdialog|ImapDialog"
 msgid "ImageMap Editor"
 msgstr "Golygydd ImageMap"
 
-#: imapdialog.ui:32
+#: svx/uiconfig/ui/imapdialog.ui:32
 msgctxt "imapdialog|TBI_APPLY"
 msgid "Apply"
 msgstr "Gosod"
 
-#: imapdialog.ui:47
+#: svx/uiconfig/ui/imapdialog.ui:47
 msgctxt "imapdialog|TBI_OPEN"
 msgid "Open..."
 msgstr "Agor..."
 
-#: imapdialog.ui:62
+#: svx/uiconfig/ui/imapdialog.ui:62
 msgctxt "imapdialog|TBI_SAVEAS"
 msgid "Save..."
 msgstr "Cadw..."
 
-#: imapdialog.ui:77
+#: svx/uiconfig/ui/imapdialog.ui:77
 msgctxt "imapdialog|TBI_CLOSE"
 msgid "Close"
 msgstr "Cau"
 
-#: imapdialog.ui:91
+#: svx/uiconfig/ui/imapdialog.ui:91
 msgctxt "imapdialog|TBI_SELECT"
 msgid "Select"
 msgstr "Dewis"
 
-#: imapdialog.ui:106
+#: svx/uiconfig/ui/imapdialog.ui:106
 msgctxt "imapdialog|TBI_RECT"
 msgid "Rectangle"
 msgstr "Petryal"
 
-#: imapdialog.ui:121
+#: svx/uiconfig/ui/imapdialog.ui:121
 msgctxt "imapdialog|TBI_CIRCLE"
 msgid "Ellipse"
 msgstr "Elips"
 
-#: imapdialog.ui:136
+#: svx/uiconfig/ui/imapdialog.ui:136
 msgctxt "imapdialog|TBI_POLY"
 msgid "Polygon"
 msgstr "Polygon"
 
-#: imapdialog.ui:151
+#: svx/uiconfig/ui/imapdialog.ui:151
 msgctxt "imapdialog|TBI_FREEPOLY"
 msgid "Freeform Polygon"
 msgstr "Polygon Rhyddffurf"
 
-#: imapdialog.ui:166
+#: svx/uiconfig/ui/imapdialog.ui:166
 msgctxt "imapdialog|TBI_POLYEDIT"
 msgid "Edit Points"
 msgstr "Pwyntiau Golygu"
 
-#: imapdialog.ui:181
+#: svx/uiconfig/ui/imapdialog.ui:181
 msgctxt "imapdialog|TBI_POLYMOVE"
 msgid "Move Points"
 msgstr "Pwyntiau Symud"
 
-#: imapdialog.ui:196
+#: svx/uiconfig/ui/imapdialog.ui:196
 msgctxt "imapdialog|TBI_POLYINSERT"
 msgid "Insert Points"
 msgstr "Pwyntiau Mewnosod"
 
-#: imapdialog.ui:211
+#: svx/uiconfig/ui/imapdialog.ui:211
 msgctxt "imapdialog|TBI_POLYDELETE"
 msgid "Delete Points"
 msgstr "Pwyntiau Dileu"
 
-#: imapdialog.ui:226
+#: svx/uiconfig/ui/imapdialog.ui:226
 msgctxt "imapdialog|TBI_UNDO"
 msgid "Undo "
 msgstr "Dadwneud "
 
-#: imapdialog.ui:241
+#: svx/uiconfig/ui/imapdialog.ui:241
 msgctxt "imapdialog|TBI_REDO"
 msgid "Redo"
 msgstr "Ail-wneud"
 
-#: imapdialog.ui:256
+#: svx/uiconfig/ui/imapdialog.ui:256
 msgctxt "imapdialog|TBI_ACTIVE"
 msgid "Active"
 msgstr "Gweithredol"
 
-#: imapdialog.ui:271
+#: svx/uiconfig/ui/imapdialog.ui:271
 msgctxt "imapdialog|TBI_MACRO"
 msgid "Macro..."
 msgstr "Macro..."
 
-#: imapdialog.ui:286
+#: svx/uiconfig/ui/imapdialog.ui:286
 msgctxt "imapdialog|TBI_PROPERTY"
 msgid "Properties..."
 msgstr "Priodweddau..."
 
-#: imapdialog.ui:312
+#: svx/uiconfig/ui/imapdialog.ui:312
 msgctxt "imapdialog|urlft"
 msgid "Address:"
 msgstr "Cyfeiriad:"
 
-#: imapdialog.ui:347
+#: svx/uiconfig/ui/imapdialog.ui:347
 msgctxt "imapdialog|targetft"
 msgid "Frame:"
 msgstr "Ffrâm:"
 
-#: imapdialog.ui:402
+#: svx/uiconfig/ui/imapdialog.ui:402
 msgctxt "imapdialog|textft"
 msgid "Text:"
 msgstr "Testun:"
 
-#: imapmenu.ui:12
+#: svx/uiconfig/ui/imapmenu.ui:12
 msgctxt "imapmenu|url"
 msgid "Description..."
 msgstr "Disgrifiad..."
 
-#: imapmenu.ui:20
+#: svx/uiconfig/ui/imapmenu.ui:20
 msgctxt "imapmenu|macro"
 msgid "_Macro..."
 msgstr "_Macro..."
 
-#: imapmenu.ui:28
+#: svx/uiconfig/ui/imapmenu.ui:28
 msgctxt "imapmenu|active"
 msgid "Active"
 msgstr "Gweithredol"
 
-#: imapmenu.ui:42
+#: svx/uiconfig/ui/imapmenu.ui:42
 msgctxt "imapmenu|arrange"
 msgid "_Arrange"
 msgstr "_Trefnu"
 
-#: imapmenu.ui:52
+#: svx/uiconfig/ui/imapmenu.ui:52
 msgctxt "imapmenu|front"
 msgid "Bring to Front"
 msgstr "Dwyn i'r Blaen"
 
-#: imapmenu.ui:60
+#: svx/uiconfig/ui/imapmenu.ui:60
 msgctxt "imapmenu|forward"
 msgid "Bring _Forward"
 msgstr "Dwyn _Ymlaen"
 
-#: imapmenu.ui:68
+#: svx/uiconfig/ui/imapmenu.ui:68
 msgctxt "imapmenu|backward"
 msgid "Send Back_ward"
 msgstr "Anfon _Nôl"
 
-#: imapmenu.ui:76
+#: svx/uiconfig/ui/imapmenu.ui:76
 msgctxt "imapmenu|back"
 msgid "_Send to Back"
 msgstr "Anfon i'r _Cefn"
 
-#: imapmenu.ui:94
+#: svx/uiconfig/ui/imapmenu.ui:94
 msgctxt "imapmenu|selectall"
 msgid "Select _All"
 msgstr "Dewis _Popeth"
 
-#: imapmenu.ui:102
+#: svx/uiconfig/ui/imapmenu.ui:102
 msgctxt "imapmenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: linkwarndialog.ui:8
+#: svx/uiconfig/ui/linkwarndialog.ui:7
 msgctxt "linkwarndialog|LinkWarnDialog"
 msgid "Confirm Linked Graphic"
 msgstr "Cadarnhau Graffig Cysylltiedig"
 
-#: linkwarndialog.ui:14
+#: svx/uiconfig/ui/linkwarndialog.ui:13
 msgctxt "linkwarndialog|LinkWarnDialog"
 msgid "The file %FILENAME will not be stored along with your document, but only referenced as a link."
 msgstr "Ni fydd y ffeil %FILENAME yn cael ei chadw ynghyd â'ch dogfen, ond wedi ei chyfeirio fel delwedd cysylltiedig gwag."
 
-#: linkwarndialog.ui:15
+#: svx/uiconfig/ui/linkwarndialog.ui:14
 msgctxt "linkwarndialog|LinkWarnDialog"
 msgid "This is dangerous if you move and/or rename the files. Do you want to embed the graphic instead?"
 msgstr "Mae'n beryglus os ydych yn symud a/neu ailenwi'r ffeiliau. Hoffech chi fewnblannu'r graffig yn lle hynny?"
 
-#: linkwarndialog.ui:27
+#: svx/uiconfig/ui/linkwarndialog.ui:25
 msgctxt "linkwarndialog|ok"
 msgid "_Keep Link"
 msgstr "_Cadw Cysylltiad"
 
-#: linkwarndialog.ui:43
+#: svx/uiconfig/ui/linkwarndialog.ui:41
 msgctxt "linkwarndialog|cancel"
 msgid "_Embed Graphic"
 msgstr "_Mewnosod Graffeg"
 
-#: linkwarndialog.ui:69
+#: svx/uiconfig/ui/linkwarndialog.ui:67
 msgctxt "linkwarndialog|ask"
 msgid "_Ask when linking a graphic"
 msgstr "_Gofynnwch wrth gysylltu â graffig"
 
-#: mediaplayback.ui:22
+#: svx/uiconfig/ui/mediaplayback.ui:22
 msgctxt "mediaplayback|label1"
 msgid "Playback:"
 msgstr "Chwarae:"
 
-#: mediaplayback.ui:36
+#: svx/uiconfig/ui/mediaplayback.ui:36
 msgctxt "mediaplayback|label2"
 msgid "Seek:"
 msgstr "Chwilio:"
 
-#: mediaplayback.ui:50
+#: svx/uiconfig/ui/mediaplayback.ui:50
 msgctxt "mediaplayback|label3"
 msgid "Volume:"
 msgstr "Lefel sain:"
 
-#: mediaplayback.ui:79
+#: svx/uiconfig/ui/mediaplayback.ui:79
 msgctxt "mediaplayback|zoombox|tooltip_text"
 msgid "View"
 msgstr "Golwg"
 
-#: namespacedialog.ui:9
+#: svx/uiconfig/ui/namespacedialog.ui:9
 msgctxt "namespacedialog|NamespaceDialog"
 msgid "Namespaces for Forms"
 msgstr "Gofod Enwau Ffurflenni"
 
-#: namespacedialog.ui:106
+#: svx/uiconfig/ui/namespacedialog.ui:106
 msgctxt "namespacedialog|add"
 msgid "_Add..."
 msgstr "_Ychwanegu..."
 
-#: namespacedialog.ui:120
+#: svx/uiconfig/ui/namespacedialog.ui:120
 msgctxt "namespacedialog|edit"
 msgid "_Edit..."
 msgstr "_Golygu..."
 
-#: namespacedialog.ui:168
+#: svx/uiconfig/ui/namespacedialog.ui:168
 msgctxt "namespacedialog|prefix"
 msgid "Prefix"
 msgstr "Rhagddodiad"
 
-#: namespacedialog.ui:179
+#: svx/uiconfig/ui/namespacedialog.ui:179
 msgctxt "namespacedialog|url"
 msgid "URL"
 msgstr "URL"
 
-#: namespacedialog.ui:221
+#: svx/uiconfig/ui/namespacedialog.ui:221
 msgctxt "namespacedialog|label1"
 msgid "Namespaces"
 msgstr "Gofod enw"
 
-#: optgridpage.ui:63
+#: svx/uiconfig/ui/optgridpage.ui:63
 msgctxt "optgridpage|usegridsnap"
 msgid "_Snap to grid"
 msgstr "_Snapio i'r grid"
 
-#: optgridpage.ui:78
+#: svx/uiconfig/ui/optgridpage.ui:78
 msgctxt "optgridpage|gridvisible"
 msgid "_Visible grid"
 msgstr "Grid _gweladwy"
 
-#: optgridpage.ui:99
+#: svx/uiconfig/ui/optgridpage.ui:99
 msgctxt "optgridpage|label1"
 msgid "Grid"
 msgstr "Grid"
 
-#: optgridpage.ui:171
+#: svx/uiconfig/ui/optgridpage.ui:169
 msgctxt "optgridpage|flddrawx"
 msgid "H_orizontal:"
 msgstr "_Llorweddol:"
 
-#: optgridpage.ui:185
+#: svx/uiconfig/ui/optgridpage.ui:183
 msgctxt "optgridpage|flddrawy"
 msgid "_Vertical:"
 msgstr "_Fertigol:"
 
-#: optgridpage.ui:196
+#: svx/uiconfig/ui/optgridpage.ui:194
 msgctxt "optgridpage|synchronize"
 msgid "Synchronize a_xes"
 msgstr "Cydamseru _echelau"
 
-#: optgridpage.ui:219
+#: svx/uiconfig/ui/optgridpage.ui:217
 msgctxt "optgridpage|label2"
 msgid "Resolution"
 msgstr "Cydraniad"
 
-#: optgridpage.ui:277
+#: svx/uiconfig/ui/optgridpage.ui:274
 msgctxt "optgridpage|label4"
 msgid "space(s)"
 msgstr "bylch(au)"
 
-#: optgridpage.ui:312
+#: svx/uiconfig/ui/optgridpage.ui:308
 msgctxt "optgridpage|label5"
 msgid "space(s)"
 msgstr "bylch(au)"
 
-#: optgridpage.ui:330
+#: svx/uiconfig/ui/optgridpage.ui:326
 msgctxt "optgridpage|divisionx"
 msgid "Horizont_al:"
 msgstr "_Llorweddol:"
 
-#: optgridpage.ui:344
+#: svx/uiconfig/ui/optgridpage.ui:340
 msgctxt "optgridpage|divisiony"
 msgid "V_ertical:"
 msgstr "F_ertigol:"
 
-#: optgridpage.ui:361
+#: svx/uiconfig/ui/optgridpage.ui:357
 msgctxt "optgridpage|label3"
 msgid "Subdivision"
 msgstr "Israniad"
 
-#: optgridpage.ui:406
+#: svx/uiconfig/ui/optgridpage.ui:402
 msgctxt "optgridpage|snaphelplines"
 msgid "To snap lines"
 msgstr "I linellau snapio"
 
-#: optgridpage.ui:420
+#: svx/uiconfig/ui/optgridpage.ui:417
 msgctxt "optgridpage|snapborder"
 msgid "To the _page margins"
 msgstr "I _ymylon y dudalen"
 
-#: optgridpage.ui:435
+#: svx/uiconfig/ui/optgridpage.ui:432
 msgctxt "optgridpage|snapframe"
 msgid "To object _frame"
 msgstr "I _ffrâm y gwrthrych"
 
-#: optgridpage.ui:450
+#: svx/uiconfig/ui/optgridpage.ui:447
 msgctxt "optgridpage|snappoints"
 msgid "To obje_ct points"
 msgstr "I _bwyntiau'r gwrthrych"
 
-#: optgridpage.ui:485
+#: svx/uiconfig/ui/optgridpage.ui:481
 msgctxt "optgridpage|label7"
 msgid "_Snap range:"
 msgstr "_Ystod snapio:"
 
-#: optgridpage.ui:508
+#: svx/uiconfig/ui/optgridpage.ui:504
 msgctxt "optgridpage|label6"
 msgid "Snap"
 msgstr "Snap"
 
-#: optgridpage.ui:542
+#: svx/uiconfig/ui/optgridpage.ui:538
 msgctxt "optgridpage|ortho"
 msgid "_When creating or moving objects"
 msgstr "_Wrth greu neu symud gwrthrychau"
 
-#: optgridpage.ui:557
+#: svx/uiconfig/ui/optgridpage.ui:553
 msgctxt "optgridpage|bigortho"
 msgid "_Extend edges"
 msgstr "_Ymylon estynedig"
 
-#: optgridpage.ui:594
+#: svx/uiconfig/ui/optgridpage.ui:589
 msgctxt "optgridpage|rotate"
 msgid "When ro_tating:"
 msgstr "Wrth _droi:"
 
-#: optgridpage.ui:628
+#: svx/uiconfig/ui/optgridpage.ui:622
 msgctxt "optgridpage|label9"
 msgid "Point reducti_on:"
 msgstr "_Lleihad pwynt:"
 
-#: optgridpage.ui:651
+#: svx/uiconfig/ui/optgridpage.ui:645
 msgctxt "optgridpage|label8"
 msgid "Constrain Objects"
 msgstr "Gorfodi Gwrthrychau"
 
-#: paralinespacingcontrol.ui:66
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:66
 msgctxt "paralinespacingcontrol|spacing_1"
 msgid "Spacing: 1"
 msgstr "Bylchu: 1"
 
-#: paralinespacingcontrol.ui:84
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:84
 msgctxt "paralinespacingcontrol|spacing_115"
 msgid "Spacing: 1.15"
 msgstr "Bylchu: 1.15"
 
-#: paralinespacingcontrol.ui:102
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:102
 msgctxt "paralinespacingcontrol|spacing_15"
 msgid "Spacing: 1.5"
 msgstr "Bylchu: 1.5"
 
-#: paralinespacingcontrol.ui:120
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:120
 msgctxt "paralinespacingcontrol|spacing_2"
 msgid "Spacing: 2"
 msgstr "Bylchu: 2"
 
-#: paralinespacingcontrol.ui:163
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:163
 msgctxt "paralinespacingcontrol|label3"
 msgid "Line Spacing:"
 msgstr "Bylchu Llinell:"
 
-#: paralinespacingcontrol.ui:182
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:182
 msgctxt "paralinespacingcontrol|line_dist"
 msgid "Single"
 msgstr "Sengl"
 
-#: paralinespacingcontrol.ui:183
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:183
 msgctxt "paralinespacingcontrol|line_dist"
 msgid "1.15 Lines"
 msgstr "1.15 Llinell"
 
-#: paralinespacingcontrol.ui:184
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:184
 msgctxt "paralinespacingcontrol|line_dist"
 msgid "1.5 Lines"
 msgstr "1.5 Llinell"
 
-#: paralinespacingcontrol.ui:185
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:185
 msgctxt "paralinespacingcontrol|line_dist"
 msgid "Double"
 msgstr "Dwbl"
 
-#: paralinespacingcontrol.ui:186
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:186
 msgctxt "paralinespacingcontrol|line_dist"
 msgid "Proportional"
 msgstr "Cymesur"
 
-#: paralinespacingcontrol.ui:187
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:187
 msgctxt "paralinespacingcontrol|line_dist"
 msgid "At least"
 msgstr "O leiaf"
 
-#: paralinespacingcontrol.ui:188
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:188
 msgctxt "paralinespacingcontrol|line_dist"
 msgid "Leading"
 msgstr "Arwain"
 
-#: paralinespacingcontrol.ui:189
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:189
 msgctxt "paralinespacingcontrol|line_dist"
 msgid "Fixed"
 msgstr "Gosodedig"
 
-#: paralinespacingcontrol.ui:204
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:204
 msgctxt "paralinespacingcontrol|value_label"
 msgid "Value:"
 msgstr "Gwerth:"
 
-#: paralinespacingcontrol.ui:269
+#: svx/uiconfig/ui/paralinespacingcontrol.ui:265
 msgctxt "paralinespacingcontrol|label2"
 msgid "Custom Value"
 msgstr "Gwerth Cyfaddas"
 
-#: paralrspacing.ui:37
+#: svx/uiconfig/ui/paralrspacing.ui:37
 msgctxt "paralrspacing|beforetextindent|tooltip_text"
 msgid "Before Text Indent"
 msgstr "Cyn Mewnoliad Testun"
 
-#: paralrspacing.ui:77
+#: svx/uiconfig/ui/paralrspacing.ui:76
 msgctxt "paralrspacing|aftertextindent|tooltip_text"
 msgid "After Text Indent"
 msgstr "Wedi Mewnoliad Testun"
 
-#: paralrspacing.ui:115
+#: svx/uiconfig/ui/paralrspacing.ui:113
 msgctxt "paralrspacing|firstlineindent|tooltip_text"
 msgid "First Line Indent"
 msgstr "Mewnoliad Llinell Gyntaf"
 
-#: paraulspacing.ui:45
+#: svx/uiconfig/ui/paraulspacing.ui:45
 msgctxt "paraulspacing|aboveparaspacing|tooltip_text"
 msgid "Above Paragraph Spacing"
 msgstr "Bylchu Uwchlaw Paragraff"
 
-#: paraulspacing.ui:86
+#: svx/uiconfig/ui/paraulspacing.ui:85
 msgctxt "paraulspacing|belowparaspacing|tooltip_text"
 msgid "Below Paragraph Spacing"
 msgstr "Bylchu Islaw Paragraff"
 
-#: passwd.ui:8
+#: svx/uiconfig/ui/passwd.ui:8
 msgctxt "passwd|PasswordDialog"
 msgid "Change Password"
 msgstr "Newid Cyfrinair"
 
-#: passwd.ui:104
+#: svx/uiconfig/ui/passwd.ui:106
 msgctxt "passwd|oldpassL"
 msgid "_Password:"
 msgstr "C_yfrinair:"
 
-#: passwd.ui:135
+#: svx/uiconfig/ui/passwd.ui:140
 msgctxt "passwd|oldpass"
 msgid "Old Password"
 msgstr "Hen Gyfrinair"
 
-#: passwd.ui:198
+#: svx/uiconfig/ui/passwd.ui:206
 msgctxt "passwd|label4"
 msgid "Pa_ssword:"
 msgstr "C_yfrinair:"
 
-#: passwd.ui:212
+#: svx/uiconfig/ui/passwd.ui:220
 msgctxt "passwd|label5"
 msgid "Confi_rm:"
 msgstr "C_adarnhau:"
 
-#: passwd.ui:229
+#: svx/uiconfig/ui/passwd.ui:238
 msgctxt "passwd|label2"
 msgid "New Password"
 msgstr "Cyfrinair Newydd"
 
-#: presetmenu.ui:12
+#: svx/uiconfig/ui/presetmenu.ui:12
 msgctxt "presetmenu|rename"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: presetmenu.ui:20
+#: svx/uiconfig/ui/presetmenu.ui:20
 msgctxt "presetmenu|delete"
 msgid "Delete"
 msgstr "Dileu"
 
-#: profileexporteddialog.ui:8
+#: svx/uiconfig/ui/profileexporteddialog.ui:8
 msgctxt "profileexporteddialog|ProfileExportedDialog"
 msgid "Profile exported"
 msgstr "Proffil wedi ei allforio"
 
-#: profileexporteddialog.ui:40
+#: svx/uiconfig/ui/profileexporteddialog.ui:40
 msgctxt "profileexporteddialog|openfolder"
 msgid "Open Containing _Folder"
 msgstr "Agor _Ffolder Cynnwys"
 
-#: profileexporteddialog.ui:64
+#: svx/uiconfig/ui/profileexporteddialog.ui:64
 msgctxt "profileexporteddialog|label"
 msgid "Your user profile has been exported as “libreoffice-profile.zip”."
 msgstr "Mae eich proffil defnyddiwr wedi ei allforio fel “libreoffice-profile.zip”."
 
-#: querydeletecontourdialog.ui:8
+#: svx/uiconfig/ui/querydeletecontourdialog.ui:7
 msgctxt "querydeletecontourdialog|QueryDeleteContourDialog"
 msgid "Delete the contour?"
 msgstr "Dileu'r amlinell?"
 
-#: querydeletecontourdialog.ui:14
+#: svx/uiconfig/ui/querydeletecontourdialog.ui:14
 msgctxt "querydeletecontourdialog|QueryDeleteContourDialog"
 msgid ""
 "Setting a new workspace will\n"
@@ -4678,352 +4719,352 @@ msgstr ""
 "Bydd gosod y man gwaith newydd\n"
 "yn achosi i'r amlinell gael ei ddileu."
 
-#: querydeletecontourdialog.ui:16
+#: svx/uiconfig/ui/querydeletecontourdialog.ui:16
 msgctxt "querydeletecontourdialog|QueryDeleteContourDialog"
 msgid "Are you sure you want to continue?"
 msgstr "Ydych chi'n siŵr eich bod am barhau?"
 
-#: querydeleteobjectdialog.ui:8
+#: svx/uiconfig/ui/querydeleteobjectdialog.ui:7
 msgctxt "querydeleteobjectdialog|QueryDeleteObjectDialog"
 msgid "Delete this object?"
 msgstr "Dileu'r gwrthrych?"
 
-#: querydeleteobjectdialog.ui:14
+#: svx/uiconfig/ui/querydeleteobjectdialog.ui:14
 msgctxt "querydeleteobjectdialog|QueryDeleteObjectDialog"
 msgid "Do you really want to delete this object?"
 msgstr "Ydych chi wir am ddileu'r gwrthrych?"
 
-#: querydeletethemedialog.ui:8
+#: svx/uiconfig/ui/querydeletethemedialog.ui:7
 msgctxt "querydeletethemedialog|QueryDeleteThemeDialog"
 msgid "Delete this theme?"
 msgstr "Dileu'r thema?"
 
-#: querydeletethemedialog.ui:14
+#: svx/uiconfig/ui/querydeletethemedialog.ui:14
 msgctxt "querydeletethemedialog|QueryDeleteThemeDialog"
 msgid "Do you really want to delete this theme?"
 msgstr "Ydych chi wir am ddileu'r thema?"
 
-#: querymodifyimagemapchangesdialog.ui:8
+#: svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui:7
 msgctxt "querymodifyimagemapchangesdialog|QueryModifyImageMapChangesDialog"
 msgid "Save ImageMap changes?"
 msgstr "Cadw newidiadau ImageMap?"
 
-#: querymodifyimagemapchangesdialog.ui:14
+#: svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui:14
 msgctxt "querymodifyimagemapchangesdialog|QueryModifyImageMapChangesDialog"
 msgid "The ImageMap has been modified."
 msgstr "Mae'r ImageMap wedi newid."
 
-#: querymodifyimagemapchangesdialog.ui:15
+#: svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui:15
 msgctxt "querymodifyimagemapchangesdialog|QueryModifyImageMapChangesDialog"
 msgid "Do you want to save the changes?"
 msgstr "Hoffech chi gadw'r newid?"
 
-#: querynewcontourdialog.ui:8
+#: svx/uiconfig/ui/querynewcontourdialog.ui:7
 msgctxt "querynewcontourdialog|QueryNewContourDialog"
 msgid "Create a new contour?"
 msgstr "Creu amlinell newydd?"
 
-#: querynewcontourdialog.ui:14
+#: svx/uiconfig/ui/querynewcontourdialog.ui:14
 msgctxt "querynewcontourdialog|QueryNewContourDialog"
 msgid "Do you want to create a new contour?"
 msgstr "Creu amlinell newydd?"
 
-#: querysavecontchangesdialog.ui:8
+#: svx/uiconfig/ui/querysavecontchangesdialog.ui:7
 msgctxt "querysavecontchangesdialog|QuerySaveContourChangesDialog"
 msgid "Save contour changes?"
 msgstr "Cadw newidiadau'r amlinell?"
 
-#: querysavecontchangesdialog.ui:14
+#: svx/uiconfig/ui/querysavecontchangesdialog.ui:14
 msgctxt "querysavecontchangesdialog|QuerySaveContourChangesDialog"
 msgid "The contour has been modified."
 msgstr "Mae'r amlinell wedi newid."
 
-#: querysavecontchangesdialog.ui:15
+#: svx/uiconfig/ui/querysavecontchangesdialog.ui:15
 msgctxt "querysavecontchangesdialog|QuerySaveContourChangesDialog"
 msgid "Do you want to save the changes?"
 msgstr "Hoffech chi gadw'r newid?"
 
-#: querysaveimagemapchangesdialog.ui:8
+#: svx/uiconfig/ui/querysaveimagemapchangesdialog.ui:7
 msgctxt "querysaveimagemapchangesdialog|QuerySaveImageMapChangesDialog"
 msgid "Save ImageMap changes?"
 msgstr "Cadw newidiadau ImageMap?"
 
-#: querysaveimagemapchangesdialog.ui:14
+#: svx/uiconfig/ui/querysaveimagemapchangesdialog.ui:14
 msgctxt "querysaveimagemapchangesdialog|QuerySaveImageMapChangesDialog"
 msgid "The ImageMap has been modified."
 msgstr "Mae'r ImageMap wedi newid."
 
-#: querysaveimagemapchangesdialog.ui:15
+#: svx/uiconfig/ui/querysaveimagemapchangesdialog.ui:15
 msgctxt "querysaveimagemapchangesdialog|QuerySaveImageMapChangesDialog"
 msgid "Do you want to save the changes?"
 msgstr "Hoffech chi gadw'r newid?"
 
-#: queryunlinkgraphicsdialog.ui:8
+#: svx/uiconfig/ui/queryunlinkgraphicsdialog.ui:7
 msgctxt "queryunlinkgraphicsdialog|QueryUnlinkGraphicsDialog"
 msgid "Unlink the graphics?"
 msgstr "Datgysylltu'r graffig?"
 
-#: queryunlinkgraphicsdialog.ui:14
+#: svx/uiconfig/ui/queryunlinkgraphicsdialog.ui:14
 msgctxt "queryunlinkgraphicsdialog|QueryUnlinkGraphicsDialog"
 msgid "This graphic object is linked to the document."
 msgstr "Mae'r gwrthrych graffig hwn wedi ei gysylltu â'r ddogfen."
 
-#: queryunlinkgraphicsdialog.ui:15
+#: svx/uiconfig/ui/queryunlinkgraphicsdialog.ui:15
 msgctxt "queryunlinkgraphicsdialog|QueryUnlinkGraphicsDialog"
 msgid "Do you want to unlink the graphics in order to edit it?"
 msgstr "Hoffech chi ddatgysylltu'r graffig er mwyn ei olygu?"
 
-#: redlinecontrol.ui:23
+#: svx/uiconfig/ui/redlinecontrol.ui:23
 msgctxt "redlinecontrol|view"
 msgid "List"
 msgstr "Rhestr"
 
-#: redlinecontrol.ui:45
+#: svx/uiconfig/ui/redlinecontrol.ui:45
 msgctxt "redlinecontrol|filter"
 msgid "Filter"
 msgstr "Hidl"
 
-#: redlinefilterpage.ui:31
+#: svx/uiconfig/ui/redlinefilterpage.ui:31
 msgctxt "redlinefilterpage|date"
 msgid "_Date:"
 msgstr "_Dyddiad:"
 
-#: redlinefilterpage.ui:46
+#: svx/uiconfig/ui/redlinefilterpage.ui:46
 msgctxt "redlinefilterpage|author"
 msgid "_Author:"
 msgstr "_Awdur:"
 
-#: redlinefilterpage.ui:61
+#: svx/uiconfig/ui/redlinefilterpage.ui:61
 msgctxt "redlinefilterpage|comment"
 msgid "C_omment:"
 msgstr "_Sylw:"
 
-#: redlinefilterpage.ui:87
+#: svx/uiconfig/ui/redlinefilterpage.ui:86
 msgctxt "redlinefilterpage|commentedit-atkobject"
 msgid "Comment"
 msgstr "Sylw"
 
-#: redlinefilterpage.ui:98
+#: svx/uiconfig/ui/redlinefilterpage.ui:97
 msgctxt "redlinefilterpage|range"
 msgid "_Range:"
 msgstr "_Ystod:"
 
-#: redlinefilterpage.ui:123
+#: svx/uiconfig/ui/redlinefilterpage.ui:122
 msgctxt "redlinefilterpage|actionlist-atkobject"
 msgid "Action"
 msgstr "Gweithred"
 
-#: redlinefilterpage.ui:134
+#: svx/uiconfig/ui/redlinefilterpage.ui:133
 msgctxt "redlinefilterpage|action"
 msgid "A_ction:"
 msgstr "_Gweithred:"
 
-#: redlinefilterpage.ui:159
+#: svx/uiconfig/ui/redlinefilterpage.ui:158
 msgctxt "redlinefilterpage|authorlist-atkobject"
 msgid "Author"
 msgstr "Awdur"
 
-#: redlinefilterpage.ui:186
+#: svx/uiconfig/ui/redlinefilterpage.ui:184
 msgctxt "redlinefilterpage|rangeedit-atkobject"
 msgid "Range"
 msgstr "Ystod"
 
-#: redlinefilterpage.ui:204
+#: svx/uiconfig/ui/redlinefilterpage.ui:202
 msgctxt "redlinefilterpage|dotdotdot|tooltip_text"
 msgid "Set reference"
 msgstr "Gosod cyfeirnod"
 
-#: redlinefilterpage.ui:232
+#: svx/uiconfig/ui/redlinefilterpage.ui:230
 msgctxt "redlinefilterpage|datecond"
 msgid "earlier than"
 msgstr "cyn"
 
-#: redlinefilterpage.ui:233
+#: svx/uiconfig/ui/redlinefilterpage.ui:231
 msgctxt "redlinefilterpage|datecond"
 msgid "since"
 msgstr "ers"
 
-#: redlinefilterpage.ui:234
+#: svx/uiconfig/ui/redlinefilterpage.ui:232
 msgctxt "redlinefilterpage|datecond"
 msgid "equal to"
 msgstr "yn gyfartal â"
 
-#: redlinefilterpage.ui:235
+#: svx/uiconfig/ui/redlinefilterpage.ui:233
 msgctxt "redlinefilterpage|datecond"
 msgid "not equal to"
 msgstr "heb fod yn hafal â"
 
-#: redlinefilterpage.ui:236
+#: svx/uiconfig/ui/redlinefilterpage.ui:234
 msgctxt "redlinefilterpage|datecond"
 msgid "between"
 msgstr "rhwng"
 
-#: redlinefilterpage.ui:237
+#: svx/uiconfig/ui/redlinefilterpage.ui:235
 msgctxt "redlinefilterpage|datecond"
 msgid "since saving"
 msgstr "ers cadw"
 
-#: redlinefilterpage.ui:244
+#: svx/uiconfig/ui/redlinefilterpage.ui:242
 msgctxt "redlinefilterpage|datecond-atkobject"
 msgid "Date Condition"
 msgstr "Cyflwr Dyddiad"
 
-#: redlinefilterpage.ui:266
+#: svx/uiconfig/ui/redlinefilterpage.ui:264
 msgctxt "redlinefilterpage|and"
 msgid "a_nd"
 msgstr "_a"
 
-#: redlinefilterpage.ui:287
+#: svx/uiconfig/ui/redlinefilterpage.ui:284
 msgctxt "redlinefilterpage|startdate-atkobject"
 msgid "Start Date"
 msgstr "Dyddiad Cychwyn"
 
-#: redlinefilterpage.ui:306
+#: svx/uiconfig/ui/redlinefilterpage.ui:302
 msgctxt "redlinefilterpage|starttime-atkobject"
 msgid "Start Time"
 msgstr "Amser Cychwyn"
 
-#: redlinefilterpage.ui:322
+#: svx/uiconfig/ui/redlinefilterpage.ui:318
 msgctxt "redlinefilterpage|startclock|tooltip_text"
 msgid "Set current time and date"
 msgstr "Gosod y dyddiad a'r amser cyfredol"
 
-#: redlinefilterpage.ui:341
+#: svx/uiconfig/ui/redlinefilterpage.ui:336
 msgctxt "redlinefilterpage|enddate-atkobject"
 msgid "End Date"
 msgstr "Dyddiad Gorffen"
 
-#: redlinefilterpage.ui:360
+#: svx/uiconfig/ui/redlinefilterpage.ui:354
 msgctxt "redlinefilterpage|endtime-atkobject"
 msgid "End Time"
 msgstr "Amser Gorffen"
 
-#: redlinefilterpage.ui:376
+#: svx/uiconfig/ui/redlinefilterpage.ui:370
 msgctxt "redlinefilterpage|endclock|tooltip_text"
 msgid "Set current time and date"
 msgstr "Gosod y dyddiad a'r amser cyfredol"
 
-#: redlineviewpage.ui:21
+#: svx/uiconfig/ui/redlineviewpage.ui:21
 msgctxt "redlineviewpage|action"
 msgid "Action"
 msgstr "Gweithred"
 
-#: redlineviewpage.ui:33
+#: svx/uiconfig/ui/redlineviewpage.ui:33
 msgctxt "redlineviewpage|position"
 msgid "Position"
 msgstr "Safle"
 
-#: redlineviewpage.ui:45
+#: svx/uiconfig/ui/redlineviewpage.ui:45
 msgctxt "redlineviewpage|author"
 msgid "Author"
 msgstr "Awdur"
 
-#: redlineviewpage.ui:57
+#: svx/uiconfig/ui/redlineviewpage.ui:57
 msgctxt "redlineviewpage|date"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: redlineviewpage.ui:69
+#: svx/uiconfig/ui/redlineviewpage.ui:69
 msgctxt "redlineviewpage|comment"
 msgid "Comment"
 msgstr "Nodyn"
 
-#: redlineviewpage.ui:92
+#: svx/uiconfig/ui/redlineviewpage.ui:92
 msgctxt "redlineviewpage|changes-atkobject"
 msgid "Changes"
 msgstr "Newidiadau"
 
-#: rowsmenu.ui:12
+#: svx/uiconfig/ui/rowsmenu.ui:12
 msgctxt "rowsmenu|delete"
 msgid "Delete Rows"
 msgstr "Dileu Rhesi"
 
-#: rowsmenu.ui:19
+#: svx/uiconfig/ui/rowsmenu.ui:19
 msgctxt "rowsmenu|save"
 msgid "Save Record"
 msgstr "Cadw Cofnod"
 
-#: rowsmenu.ui:26
+#: svx/uiconfig/ui/rowsmenu.ui:26
 msgctxt "rowsmenu|undo"
 msgid "Undo: Data entry"
 msgstr "Dadwneud: Cynnwys cofnod"
 
-#: rulermenu.ui:12
+#: svx/uiconfig/ui/rulermenu.ui:12
 msgctxt "rulermenu|mm"
 msgid "Millimeter"
 msgstr "Milimedr"
 
-#: rulermenu.ui:20
+#: svx/uiconfig/ui/rulermenu.ui:20
 msgctxt "rulermenu|cm"
 msgid "Centimeter"
 msgstr "Centimedr"
 
-#: rulermenu.ui:28
+#: svx/uiconfig/ui/rulermenu.ui:28
 msgctxt "rulermenu|m"
 msgid "Meter"
 msgstr "Metr"
 
-#: rulermenu.ui:36
+#: svx/uiconfig/ui/rulermenu.ui:36
 msgctxt "rulermenu|km"
 msgid "Kilometer"
 msgstr "Kilometr"
 
-#: rulermenu.ui:44
+#: svx/uiconfig/ui/rulermenu.ui:44
 msgctxt "rulermenu|in"
 msgid "Inch"
 msgstr "Modfedd"
 
-#: rulermenu.ui:52
+#: svx/uiconfig/ui/rulermenu.ui:52
 msgctxt "rulermenu|ft"
 msgid "Foot"
 msgstr "Troedfedd"
 
-#: rulermenu.ui:60
+#: svx/uiconfig/ui/rulermenu.ui:60
 msgctxt "rulermenu|mile"
 msgid "Miles"
 msgstr "Milltiroedd"
 
-#: rulermenu.ui:68
+#: svx/uiconfig/ui/rulermenu.ui:68
 msgctxt "rulermenu|pt"
 msgid "Point"
 msgstr "Pwynt"
 
-#: rulermenu.ui:76
+#: svx/uiconfig/ui/rulermenu.ui:76
 msgctxt "rulermenu|pc"
 msgid "Pica"
 msgstr "Pica"
 
-#: rulermenu.ui:84
+#: svx/uiconfig/ui/rulermenu.ui:84
 msgctxt "rulermenu|ch"
 msgid "Char"
 msgstr "Nod"
 
-#: rulermenu.ui:92
+#: svx/uiconfig/ui/rulermenu.ui:92
 msgctxt "rulermenu|line"
 msgid "Line"
 msgstr "Llinell"
 
-#: safemodedialog.ui:8
+#: svx/uiconfig/ui/safemodedialog.ui:8
 msgctxt "safemodedialog|SafeModeDialog"
 msgid "Safe Mode"
 msgstr "Modd Diogel"
 
-#: safemodedialog.ui:37
+#: svx/uiconfig/ui/safemodedialog.ui:37
 msgctxt "safemodedialog|btn_continue"
 msgid "_Continue in Safe Mode"
 msgstr "_Parhau yn y Modd Diogel"
 
-#: safemodedialog.ui:52
+#: svx/uiconfig/ui/safemodedialog.ui:52
 msgctxt "safemodedialog|btn_restart"
 msgid "_Restart in Normal Mode"
 msgstr "_Ail gychwyn yn y Modd Arferol"
 
-#: safemodedialog.ui:66
+#: svx/uiconfig/ui/safemodedialog.ui:66
 msgctxt "safemodedialog|btn_apply"
 msgid "_Apply Changes and Restart"
 msgstr "_Gosod Newidiadau ac Ail-gychwyn"
 
-#: safemodedialog.ui:90
+#: svx/uiconfig/ui/safemodedialog.ui:90
 msgctxt "safemodedialog|label1"
 msgid ""
 "%PRODUCTNAME is now running in safe mode which temporarily disables your user configuration and extensions.\n"
@@ -5038,6332 +5079,6262 @@ msgstr ""
 "\n"
 "Mae'r newidiadau sy'n cael eu hawgrymu yn mynd yn fwy llym o'r brig i'r gwaelod, felly, rydym yn argymell eich bod yn rhoi cynnig arnyn nhw yn eu trefn, fesul un."
 
-#: safemodedialog.ui:112
+#: svx/uiconfig/ui/safemodedialog.ui:112
 msgctxt "safemodedialog|radio_restore"
 msgid "Restore from backup"
 msgstr "Adfer o'r copi wrth gefn"
 
-#: safemodedialog.ui:136
+#: svx/uiconfig/ui/safemodedialog.ui:136
 msgctxt "safemodedialog|check_profilesafe_config"
 msgid "Restore user configuration to the last known working state"
 msgstr "Adfer eich ffurfweddiad defnyddiwr i'r cyflwr gweithio diwethaf"
 
-#: safemodedialog.ui:151
+#: svx/uiconfig/ui/safemodedialog.ui:151
 msgctxt "safemodedialog|check_profilesafe_extensions"
 msgid "Restore state of installed user extensions to the last known working state"
 msgstr "Adfer ffurfweddiad eich estyniadau i'r cyflwr gweithio diwethaf"
 
-#: safemodedialog.ui:173
+#: svx/uiconfig/ui/safemodedialog.ui:173
 msgctxt "safemodedialog|radio_configure"
 msgid "Configure"
 msgstr "Ffurfweddu"
 
-#: safemodedialog.ui:197
+#: svx/uiconfig/ui/safemodedialog.ui:197
 msgctxt "safemodedialog|check_disable_all_extensions"
 msgid "Disable all user extensions"
 msgstr "Analluogi pob estyniad defnyddiwr"
 
-#: safemodedialog.ui:212
+#: svx/uiconfig/ui/safemodedialog.ui:212
 msgctxt "safemodedialog|check_disable_hw_acceleration"
 msgid "Disable hardware acceleration (OpenGL, OpenCL)"
 msgstr "Analluogi cyflymu caledwedd (OpenGL, OpenCL)"
 
-#: safemodedialog.ui:234
+#: svx/uiconfig/ui/safemodedialog.ui:234
 msgctxt "safemodedialog|radio_extensions"
 msgid "Extensions"
 msgstr "Estyniadau"
 
-#: safemodedialog.ui:257
+#: svx/uiconfig/ui/safemodedialog.ui:257
 msgctxt "safemodedialog|check_deinstall_user_extensions"
 msgid "Uninstall all user extensions"
 msgstr "Dadosod holl estyniadau'r defnyddiwr"
 
-#: safemodedialog.ui:272
+#: svx/uiconfig/ui/safemodedialog.ui:272
 msgctxt "safemodedialog|check_reset_shared_extensions"
 msgid "Reset state of shared extensions"
 msgstr "Ailosod cyflwr estyniadau sy'n cael eu rhannu"
 
-#: safemodedialog.ui:287
+#: svx/uiconfig/ui/safemodedialog.ui:287
 msgctxt "safemodedialog|check_reset_bundled_extensions"
 msgid "Reset state of bundled extensions"
 msgstr "Ailosod cyflwr yr estyniadau cynwysiedig"
 
-#: safemodedialog.ui:309
+#: svx/uiconfig/ui/safemodedialog.ui:309
 msgctxt "safemodedialog|radio_reset"
 msgid "Reset to factory settings"
 msgstr "Ailosod i osodiadau'r ffatri"
 
-#: safemodedialog.ui:332
+#: svx/uiconfig/ui/safemodedialog.ui:332
 msgctxt "safemodedialog|check_reset_customizations"
 msgid "Reset settings and user interface modifications"
 msgstr "Ailosod y gosodiadau a newidiadau rhyngwyneb y defnyddiwr"
 
-#: safemodedialog.ui:347
+#: svx/uiconfig/ui/safemodedialog.ui:347
 msgctxt "safemodedialog|check_reset_whole_userprofile"
 msgid "Reset entire user profile"
 msgstr "Ailosod y proffil defnyddiwr cyfan"
 
-#: safemodedialog.ui:389
+#: svx/uiconfig/ui/safemodedialog.ui:389
 msgctxt "safemodedialog|label3"
 msgid "If you experience problems that are not resolved by using safe mode, visit the following link to get help or report a bug."
 msgstr "Os ydych yn profi anawsterau nad ydynt wedi eu datrys gan ddefnyddio'r modd diogel, ewch i'r ddolen ganlynol i gael cymorth neu adrodd ar wall."
 
-#: safemodedialog.ui:400
+#: svx/uiconfig/ui/safemodedialog.ui:400
 msgctxt "safemodedialog|linkbutton_bugs"
 msgid "Get Help"
 msgstr "Derbyn Cymorth"
 
-#: safemodedialog.ui:416
+#: svx/uiconfig/ui/safemodedialog.ui:416
 msgctxt "safemodedialog|label4"
 msgid "You can also include relevant parts of your user profile in the bugreport (be aware it might contain personal data)."
 msgstr "Gallwch hefyd gynnwys ddarnau perthnasol o'ch profi defnyddiwr yn yr adroddiad gwall (cofiwch y gall gynnwys manylion personol)."
 
-#: safemodedialog.ui:432
+#: svx/uiconfig/ui/safemodedialog.ui:432
 msgctxt "safemodedialog|btn_create_zip"
 msgid "Create Zip Archive from User Profile"
 msgstr "Creu Archif Zip o'r Proffil Defnyddiwr"
 
-#: safemodedialog.ui:445
+#: svx/uiconfig/ui/safemodedialog.ui:445
 msgctxt "safemodedialog|linkbutton_profile"
 msgid "Show User Profile"
 msgstr "Dangos Proffil y Defnyddiwr"
 
-#: safemodedialog.ui:471
+#: svx/uiconfig/ui/safemodedialog.ui:471
 msgctxt "safemodedialog|label2"
 msgid "Advanced"
 msgstr "Uwch"
 
-#: savemodifieddialog.ui:12
+#: svx/uiconfig/ui/savemodifieddialog.ui:12
 msgctxt "savemodifieddialog|SaveModifiedDialog"
 msgid "Do you want to save your changes?"
 msgstr "Hoffech chi gadw eich newidiadau?"
 
-#: savemodifieddialog.ui:13
+#: svx/uiconfig/ui/savemodifieddialog.ui:13
 msgctxt "savemodifieddialog|SaveModifiedDialog"
 msgid "The content of the current form has been modified."
 msgstr "Mae cynnwys y ffurflen gyfredol wedi ei newid."
 
-#: selectionmenu.ui:12
+#: svx/uiconfig/ui/selectionmenu.ui:12
 msgctxt "selectionmenu|standard"
 msgid "Standard selection"
 msgstr "Dewis safonol"
 
-#: selectionmenu.ui:20
+#: svx/uiconfig/ui/selectionmenu.ui:20
 msgctxt "selectionmenu|extending"
 msgid "Extending selection"
 msgstr "Dewis estynedig"
 
-#: selectionmenu.ui:28
+#: svx/uiconfig/ui/selectionmenu.ui:28
 msgctxt "selectionmenu|adding"
 msgid "Adding selection"
 msgstr "Ychwanegu dewis"
 
-#: selectionmenu.ui:36
+#: svx/uiconfig/ui/selectionmenu.ui:36
 msgctxt "selectionmenu|block"
 msgid "Block selection"
 msgstr "Rhwystro dewis"
 
-#: sidebararea.ui:40
+#: svx/uiconfig/ui/sidebararea.ui:40
 msgctxt "sidebararea|filllabel|tooltip_text"
 msgid "Fill:"
 msgstr "Llanw:"
 
-#: sidebararea.ui:42
+#: svx/uiconfig/ui/sidebararea.ui:42
 msgctxt "sidebararea|filllabel"
 msgid "_Fill:"
 msgstr "_Llanw:"
 
-#: sidebararea.ui:66
+#: svx/uiconfig/ui/sidebararea.ui:66
 msgctxt "sidebararea|color|tooltip_text"
 msgid "Select the color to apply."
 msgstr "Dewis y lliw i'w osod."
 
-#: sidebararea.ui:86
+#: svx/uiconfig/ui/sidebararea.ui:86
 msgctxt "sidebararea|fillattr|tooltip_text"
 msgid "Select the effect to apply."
 msgstr "Dewis yr effaith i'w osod."
 
-#: sidebararea.ui:92
+#: svx/uiconfig/ui/sidebararea.ui:92
 msgctxt "sidebararea|fillattr-atkobject"
 msgid "Hatching/Bitmap"
 msgstr "Croesliniogi/Didfap"
 
-#: sidebararea.ui:106
+#: svx/uiconfig/ui/sidebararea.ui:106
 msgctxt "sidebararea|fillgrad1|tooltip_text"
 msgid "Fill gradient from."
 msgstr "Llanw'r graddiant o."
 
-#: sidebararea.ui:127
+#: svx/uiconfig/ui/sidebararea.ui:127
 msgctxt "sidebararea|fillstyle|tooltip_text"
 msgid "Select the fill type to apply."
 msgstr "Dewis y math o lawn i'w osod."
 
-#: sidebararea.ui:135
+#: svx/uiconfig/ui/sidebararea.ui:135
 msgctxt "sidebararea|fillstyle-atkobject"
 msgid "Fill Type"
 msgstr "Math o Llanw"
 
-#: sidebararea.ui:150
+#: svx/uiconfig/ui/sidebararea.ui:150
 msgctxt "sidebararea|fillgrad2|tooltip_text"
 msgid "Fill gradient to."
 msgstr "Llanw'r graddiant i."
 
-#: sidebararea.ui:167
+#: svx/uiconfig/ui/sidebararea.ui:167
 msgctxt "sidebararea|gradientstyle|tooltip_text"
 msgid "Select the gradient style."
 msgstr "Dewis arddull y graddiant."
 
-#: sidebararea.ui:169
+#: svx/uiconfig/ui/sidebararea.ui:169
 msgctxt "sidebararea|gradientstyle"
 msgid "Linear"
 msgstr "Llinol"
 
-#: sidebararea.ui:170
+#: svx/uiconfig/ui/sidebararea.ui:170
 msgctxt "sidebararea|gradientstyle"
 msgid "Axial"
 msgstr "Echelinol"
 
-#: sidebararea.ui:171
+#: svx/uiconfig/ui/sidebararea.ui:171
 msgctxt "sidebararea|gradientstyle"
 msgid "Radial"
 msgstr "Rheiddiol"
 
-#: sidebararea.ui:172
+#: svx/uiconfig/ui/sidebararea.ui:172
 msgctxt "sidebararea|gradientstyle"
 msgid "Ellipsoid"
 msgstr "Elipsoid"
 
-#: sidebararea.ui:173
+#: svx/uiconfig/ui/sidebararea.ui:173
 msgctxt "sidebararea|gradientstyle"
 msgid "Quadratic"
 msgstr "Cwadratig"
 
-#: sidebararea.ui:174
+#: svx/uiconfig/ui/sidebararea.ui:174
 msgctxt "sidebararea|gradientstyle"
 msgid "Square"
 msgstr "Sgwâr"
 
-#: sidebararea.ui:178
+#: svx/uiconfig/ui/sidebararea.ui:178
 msgctxt "sidebararea|gradientstyle-atkobject"
 msgid "Gradient Type"
 msgstr "Math o Raddiant"
 
-#: sidebararea.ui:190
+#: svx/uiconfig/ui/sidebararea.ui:190
 msgctxt "sidebararea|bmpimport"
 msgid "_Import"
 msgstr "_Mewnforio"
 
-#: sidebararea.ui:212
+#: svx/uiconfig/ui/sidebararea.ui:212
 msgctxt "sidebararea|gradangle|tooltip_text"
 msgid "Select the gradient angle."
 msgstr "Dewis yr ongl graddiant."
 
-#: sidebararea.ui:216
+#: svx/uiconfig/ui/sidebararea.ui:216
 msgctxt "sidebararea|gradangle-atkobject"
 msgid "Gradient angle"
 msgstr "Ongl graddiant"
 
-#: sidebararea.ui:232
+#: svx/uiconfig/ui/sidebararea.ui:232
 msgctxt "sidebararea|transparencylabel|tooltip_text"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: sidebararea.ui:234
+#: svx/uiconfig/ui/sidebararea.ui:234
 msgctxt "sidebararea|transparencylabel"
 msgid "_Transparency:"
 msgstr "_Tryloywder:"
 
-#: sidebararea.ui:249
+#: svx/uiconfig/ui/sidebararea.ui:249
 msgctxt "sidebararea|transtype|tooltip_text"
 msgid "Select the type of transparency to apply."
 msgstr "Dewis y math o dryloywder i'w osod."
 
-#: sidebararea.ui:251
+#: svx/uiconfig/ui/sidebararea.ui:251
 msgctxt "sidebararea|transtype"
 msgid "None"
 msgstr "Dim"
 
-#: sidebararea.ui:252
+#: svx/uiconfig/ui/sidebararea.ui:252
 msgctxt "sidebararea|transtype"
 msgid "Solid"
 msgstr "Solet"
 
-#: sidebararea.ui:253
+#: svx/uiconfig/ui/sidebararea.ui:253
 msgctxt "sidebararea|transtype"
 msgid "Linear"
 msgstr "Llinol"
 
-#: sidebararea.ui:254
+#: svx/uiconfig/ui/sidebararea.ui:254
 msgctxt "sidebararea|transtype"
 msgid "Axial"
 msgstr "Echelinol"
 
-#: sidebararea.ui:255
+#: svx/uiconfig/ui/sidebararea.ui:255
 msgctxt "sidebararea|transtype"
 msgid "Radial"
 msgstr "Rheiddiol"
 
-#: sidebararea.ui:256
+#: svx/uiconfig/ui/sidebararea.ui:256
 msgctxt "sidebararea|transtype"
 msgid "Ellipsoid"
 msgstr "Elipsoid"
 
-#: sidebararea.ui:257
+#: svx/uiconfig/ui/sidebararea.ui:257
 msgctxt "sidebararea|transtype"
 msgid "Quadratic"
 msgstr "Cwadratig"
 
-#: sidebararea.ui:258
+#: svx/uiconfig/ui/sidebararea.ui:258
 msgctxt "sidebararea|transtype"
 msgid "Square"
 msgstr "Sgwâr"
 
-#: sidebararea.ui:262
+#: svx/uiconfig/ui/sidebararea.ui:262
 msgctxt "sidebararea|transtype-atkobject"
 msgid "Transparency Type"
 msgstr "Math o Dryloywder"
 
-#: sidebararea.ui:283
+#: svx/uiconfig/ui/sidebararea.ui:283
 msgctxt "sidebararea|gradient|tooltip_text"
 msgid "Specify the variation of gradient transparency."
 msgstr "Pennu amrywiad tryloywder graddiant."
 
-#: sidebararea.ui:320
+#: svx/uiconfig/ui/sidebararea.ui:320
 msgctxt "sidebararea|transparencyslider|tooltip_text"
 msgid "Specify 0% for fully opaque through 100% for fully transparent."
 msgstr "Pennu 0% ar gyfer di-draidd llawn i 100% ar gyfer tryloywder llawn."
 
-#: sidebararea.ui:337
+#: svx/uiconfig/ui/sidebararea.ui:337
 msgctxt "sidebararea|settransparency|tooltip_text"
 msgid "Specify 0% for fully opaque through 100% for fully transparent."
 msgstr "Pennu 0% ar gyfer di-draidd llawn i 100% ar gyfer tryloywder llawn."
 
-#: sidebararea.ui:346
+#: svx/uiconfig/ui/sidebararea.ui:345
 msgctxt "sidebararea|settransparency-atkobject"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: sidebargraphic.ui:46
+#: svx/uiconfig/ui/sidebargraphic.ui:46
 msgctxt "sidebargraphic|brightnesslabel"
 msgid "_Brightness:"
 msgstr "_Disgleirdeb:"
 
-#: sidebargraphic.ui:61
+#: svx/uiconfig/ui/sidebargraphic.ui:61
 msgctxt "sidebargraphic|setbrightness|tooltip_text"
 msgid "Specify the luminance of the graphic."
 msgstr "Pennu disgleirdeb y graffig."
 
-#: sidebargraphic.ui:70
+#: svx/uiconfig/ui/sidebargraphic.ui:69
 msgctxt "sidebargraphic|setbrightness-atkobject"
 msgid "Brightness"
 msgstr "Disgleirdeb"
 
-#: sidebargraphic.ui:83
+#: svx/uiconfig/ui/sidebargraphic.ui:82
 msgctxt "sidebargraphic|contrastlabel"
 msgid "_Contrast:"
 msgstr "_Cyferbyniad:"
 
-#: sidebargraphic.ui:98
+#: svx/uiconfig/ui/sidebargraphic.ui:97
 msgctxt "sidebargraphic|setcontrast|tooltip_text"
 msgid "Specify the degree of difference between the lightest and darkest parts of the graphic."
 msgstr "Pennu maint y gwahaniaeth rhwng rhannau golau a thywyll y graffig."
 
-#: sidebargraphic.ui:107
+#: svx/uiconfig/ui/sidebargraphic.ui:105
 msgctxt "sidebargraphic|setcontrast-atkobject"
 msgid "Contrast"
 msgstr "Cyferbyniad"
 
-#: sidebargraphic.ui:120
+#: svx/uiconfig/ui/sidebargraphic.ui:118
 msgctxt "sidebargraphic|colorlmodelabel"
 msgid "Color _mode:"
 msgstr "_Modd lliw:"
 
-#: sidebargraphic.ui:139
+#: svx/uiconfig/ui/sidebargraphic.ui:137
 msgctxt "sidebargraphic|setcolormode-atkobject"
 msgid "Color mode"
 msgstr "Modd lliw"
 
-#: sidebargraphic.ui:152
+#: svx/uiconfig/ui/sidebargraphic.ui:150
 msgctxt "sidebargraphic|transparencylabel"
 msgid "_Transparency:"
 msgstr "_Dim tryloywder:"
 
-#: sidebargraphic.ui:167
+#: svx/uiconfig/ui/sidebargraphic.ui:165
 msgctxt "sidebargraphic|settransparency|tooltip_text"
 msgid "Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent."
 msgstr "Pennu canran y tryloywder; 0% di-draidd llawn a 100% yn gwbl dryloyw."
 
-#: sidebargraphic.ui:176
+#: svx/uiconfig/ui/sidebargraphic.ui:173
 msgctxt "sidebargraphic|settransparency-atkobject"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: sidebargraphic.ui:209
+#: svx/uiconfig/ui/sidebargraphic.ui:206
 msgctxt "sidebargraphic|setred|tooltip_text"
 msgid "Red"
 msgstr "Coch"
 
-#: sidebargraphic.ui:215
+#: svx/uiconfig/ui/sidebargraphic.ui:211
 msgctxt "sidebargraphic|setred-atkobject"
 msgid "Red"
 msgstr "Coch"
 
-#: sidebargraphic.ui:255
+#: svx/uiconfig/ui/sidebargraphic.ui:251
 msgctxt "sidebargraphic|setgreen|tooltip_text"
 msgid "Green"
 msgstr "Gwyrdd"
 
-#: sidebargraphic.ui:261
+#: svx/uiconfig/ui/sidebargraphic.ui:256
 msgctxt "sidebargraphic|setgreen-atkobject"
 msgid "Green"
 msgstr "Gwyrdd"
 
-#: sidebargraphic.ui:302
+#: svx/uiconfig/ui/sidebargraphic.ui:297
 msgctxt "sidebargraphic|setblue|tooltip_text"
 msgid "Blue"
 msgstr "Glas"
 
-#: sidebargraphic.ui:308
+#: svx/uiconfig/ui/sidebargraphic.ui:302
 msgctxt "sidebargraphic|setblue-atkobject"
 msgid "Blue"
 msgstr "Glas"
 
-#: sidebargraphic.ui:348
+#: svx/uiconfig/ui/sidebargraphic.ui:342
 msgctxt "sidebargraphic|setgamma|tooltip_text"
 msgid "Specify the gamma value that affects the brightness of the midtone values."
 msgstr "Pennu gwerth y gamma sy'n effeithio ar ddisgleirdeb gwerthoedd y tôn canolig."
 
-#: sidebargraphic.ui:358
+#: svx/uiconfig/ui/sidebargraphic.ui:351
 msgctxt "sidebargraphic|setgamma-atkobject"
 msgid "Gamma value"
 msgstr "Gwerth gamma"
 
-#: sidebarline.ui:40
+#: svx/uiconfig/ui/sidebarline.ui:40
 msgctxt "sidebarline|beginarrowstyle|tooltip_text"
 msgid "Select the style of the beginning arrowhead."
 msgstr "Dewis arddull blaen pen y saeth."
 
-#: sidebarline.ui:44
+#: svx/uiconfig/ui/sidebarline.ui:44
 msgctxt "sidebarline|beginarrowstyle-atkobject"
 msgid "Beginning Style"
 msgstr "Arddull Cychwyn"
 
-#: sidebarline.ui:60
+#: svx/uiconfig/ui/sidebarline.ui:60
 msgctxt "sidebarline|linestyle|tooltip_text"
 msgid "Select the style of the line."
 msgstr "Dewis arddull y llinell."
 
-#: sidebarline.ui:64
+#: svx/uiconfig/ui/sidebarline.ui:64
 msgctxt "sidebarline|linestyle-atkobject"
 msgid "Style"
 msgstr "Arddull"
 
-#: sidebarline.ui:80
+#: svx/uiconfig/ui/sidebarline.ui:80
 msgctxt "sidebarline|endarrowstyle|tooltip_text"
 msgid "Select the style of the ending arrowhead."
 msgstr "Dewis arddull diwedd pen y saeth."
 
-#: sidebarline.ui:85
+#: svx/uiconfig/ui/sidebarline.ui:85
 msgctxt "sidebarline|endarrowstyle-atkobject"
 msgid "Ending Style"
 msgstr "Arddull Diwedd"
 
-#: sidebarline.ui:113
+#: svx/uiconfig/ui/sidebarline.ui:113
 msgctxt "sidebarline|widthlabel"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: sidebarline.ui:130
+#: svx/uiconfig/ui/sidebarline.ui:130
 msgctxt "sidebarline|width|tooltip_text"
 msgid "Select the width of the line."
 msgstr "Dewis lled y llinell."
 
-#: sidebarline.ui:159
+#: svx/uiconfig/ui/sidebarline.ui:159
 msgctxt "sidebarline|colorlabel"
 msgid "_Color:"
 msgstr "_Lliw:"
 
-#: sidebarline.ui:175
+#: svx/uiconfig/ui/sidebarline.ui:175
 msgctxt "sidebarline|color|tooltip_text"
 msgid "Select the color of the line."
 msgstr "Dewis lliw'r llinell."
 
-#: sidebarline.ui:182
+#: svx/uiconfig/ui/sidebarline.ui:182
 msgctxt "sidebarline|setcolor|tooltip_text"
 msgid "Select the color of the line."
 msgstr "Dewis lliw'r llinell."
 
-#: sidebarline.ui:204
+#: svx/uiconfig/ui/sidebarline.ui:204
 msgctxt "sidebarline|translabel"
 msgid "_Transparency:"
 msgstr "_Tryloywder:"
 
-#: sidebarline.ui:220
+#: svx/uiconfig/ui/sidebarline.ui:220
 msgctxt "sidebarline|linetransparency|tooltip_text"
 msgid "Specify the transparency of the line."
 msgstr "Pennu tryloywder y llinell."
 
-#: sidebarline.ui:230
+#: svx/uiconfig/ui/sidebarline.ui:229
 msgctxt "sidebarline|linetransparency-atkobject"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: sidebarline.ui:262
+#: svx/uiconfig/ui/sidebarline.ui:261
 msgctxt "sidebarline|cornerlabel"
 msgid "_Corner style:"
 msgstr "_­Arddull cornel:"
 
-#: sidebarline.ui:279
+#: svx/uiconfig/ui/sidebarline.ui:278
 msgctxt "sidebarline|edgestyle|tooltip_text"
 msgid "Select the style of the edge connections."
 msgstr "Dewis arddull cysylltiadau ymylol."
 
-#: sidebarline.ui:281
+#: svx/uiconfig/ui/sidebarline.ui:280
 msgctxt "sidebarline|edgestyle"
 msgid "Rounded"
 msgstr "Crwn"
 
-#: sidebarline.ui:282
+#: svx/uiconfig/ui/sidebarline.ui:281
 msgctxt "sidebarline|edgestyle"
 msgid "- none -"
 msgstr "- dim -"
 
-#: sidebarline.ui:283
+#: svx/uiconfig/ui/sidebarline.ui:282
 msgctxt "sidebarline|edgestyle"
 msgid "Mitered"
 msgstr "Meitro"
 
-#: sidebarline.ui:284
+#: svx/uiconfig/ui/sidebarline.ui:283
 msgctxt "sidebarline|edgestyle"
 msgid "Beveled"
 msgstr "Befelu"
 
-#: sidebarline.ui:288
+#: svx/uiconfig/ui/sidebarline.ui:287
 msgctxt "sidebarline|edgestyle-atkobject"
 msgid "Corner Style"
 msgstr "Arddull Cornel"
 
-#: sidebarline.ui:303
+#: svx/uiconfig/ui/sidebarline.ui:302
 msgctxt "sidebarline|caplabel"
 msgid "Ca_p style:"
 msgstr "A_rddull cap:"
 
-#: sidebarline.ui:320
+#: svx/uiconfig/ui/sidebarline.ui:319
 msgctxt "sidebarline|linecapstyle|tooltip_text"
 msgid "Select the style of the line caps."
 msgstr "Dewis arddull cap llinell."
 
-#: sidebarline.ui:322
+#: svx/uiconfig/ui/sidebarline.ui:321
 msgctxt "sidebarline|linecapstyle"
 msgid "Flat"
 msgstr "Gwastad"
 
-#: sidebarline.ui:323
+#: svx/uiconfig/ui/sidebarline.ui:322
 msgctxt "sidebarline|linecapstyle"
 msgid "Round"
 msgstr "Crwn"
 
-#: sidebarline.ui:324
+#: svx/uiconfig/ui/sidebarline.ui:323
 msgctxt "sidebarline|linecapstyle"
 msgid "Square"
 msgstr "Sgwâr"
 
-#: sidebarline.ui:328
+#: svx/uiconfig/ui/sidebarline.ui:327
 msgctxt "sidebarline|linecapstyle-atkobject"
 msgid "Cap Style"
 msgstr "Arddull Cap"
 
-#: sidebarparagraph.ui:26
+#: svx/uiconfig/ui/sidebarparagraph.ui:26
 msgctxt "sidebarparagraph|numberbullet|tooltip_text"
 msgid "Bullets and Numbering"
 msgstr "Bwledi a Rhifo"
 
-#: sidebarparagraph.ui:71
+#: svx/uiconfig/ui/sidebarparagraph.ui:71
 msgctxt "sidebarparagraph|horizontalalignment|tooltip_text"
 msgid "Horizontal Alignment"
 msgstr "Alinio Llorweddol"
 
-#: sidebarparagraph.ui:172
+#: svx/uiconfig/ui/sidebarparagraph.ui:172
 msgctxt "sidebarparagraph|verticalalignment|tooltip_text"
 msgid "Vertical Alignment"
 msgstr "Aliniad Fertigol"
 
-#: sidebarparagraph.ui:238
+#: svx/uiconfig/ui/sidebarparagraph.ui:238
 msgctxt "sidebarparagraph|spacinglabel"
 msgid "_Spacing:"
 msgstr "_Bylchu:"
 
-#: sidebarparagraph.ui:254
+#: svx/uiconfig/ui/sidebarparagraph.ui:254
 msgctxt "sidebarparagraph|paraspacing|tooltip_text"
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: sidebarparagraph.ui:313
+#: svx/uiconfig/ui/sidebarparagraph.ui:313
 msgctxt "sidebarparagraph|aboveparaspacing|tooltip_text"
 msgid "Above Paragraph Spacing"
 msgstr "Bylchu Uwchlaw Paragraff"
 
-#: sidebarparagraph.ui:320
+#: svx/uiconfig/ui/sidebarparagraph.ui:319
 msgctxt "sidebarparagraph|aboveparaspacing-atkobject"
 msgid "Above Paragraph Spacing"
 msgstr "Bylchu Uwchlaw Paragraff"
 
-#: sidebarparagraph.ui:363
+#: svx/uiconfig/ui/sidebarparagraph.ui:362
 msgctxt "sidebarparagraph|belowparaspacing|tooltip_text"
 msgid "Below Paragraph Spacing"
 msgstr "Bylchu Islaw Paragraff"
 
-#: sidebarparagraph.ui:370
+#: svx/uiconfig/ui/sidebarparagraph.ui:368
 msgctxt "sidebarparagraph|belowparaspacing-atkobject"
 msgid "Below Paragraph Spacing"
 msgstr "Bylchu Islaw Paragraff"
 
-#: sidebarparagraph.ui:399
+#: svx/uiconfig/ui/sidebarparagraph.ui:397
 msgctxt "sidebarparagraph|setlinespacing|tooltip_text"
 msgid "Line Spacing"
 msgstr "Bylchu Llinell"
 
-#: sidebarparagraph.ui:432
+#: svx/uiconfig/ui/sidebarparagraph.ui:430
 msgctxt "sidebarparagraph|indentlabel"
 msgid "_Indent:"
 msgstr "_Mewnoliad:"
 
-#: sidebarparagraph.ui:448
+#: svx/uiconfig/ui/sidebarparagraph.ui:446
 msgctxt "sidebarparagraph|indent|tooltip_text"
 msgid "Indent"
 msgstr "Mewnoliad"
 
-#: sidebarparagraph.ui:455
+#: svx/uiconfig/ui/sidebarparagraph.ui:453
 msgctxt "sidebarparagraph|increaseindent|tooltip_text"
 msgid "Increase Indent"
 msgstr "Cynyddu'r Mewnoliad"
 
-#: sidebarparagraph.ui:469
+#: svx/uiconfig/ui/sidebarparagraph.ui:467
 msgctxt "sidebarparagraph|decreaseindent|tooltip_text"
 msgid "Decrease Indent"
 msgstr "Lleihau'r Mewnoliad"
 
-#: sidebarparagraph.ui:483
+#: svx/uiconfig/ui/sidebarparagraph.ui:481
 msgctxt "sidebarparagraph|hangingindent|tooltip_text"
 msgid "Switch to Hanging Indent"
 msgstr "Newid i Fewnoliad Crog"
 
-#: sidebarparagraph.ui:524
+#: svx/uiconfig/ui/sidebarparagraph.ui:522
 msgctxt "sidebarparagraph|beforetextindent|tooltip_text"
 msgid "Before Text Indent"
 msgstr "Cyn Mewnoliad Testun"
 
-#: sidebarparagraph.ui:531
+#: svx/uiconfig/ui/sidebarparagraph.ui:528
 msgctxt "sidebarparagraph|beforetextindent-atkobject"
 msgid "Before Text Indent"
 msgstr "Mewnoliad Cyn y Testun"
 
-#: sidebarparagraph.ui:573
+#: svx/uiconfig/ui/sidebarparagraph.ui:570
 msgctxt "sidebarparagraph|aftertextindent|tooltip_text"
 msgid "After Text Indent"
 msgstr "Wedi Mewnoliad Testun"
 
-#: sidebarparagraph.ui:580
+#: svx/uiconfig/ui/sidebarparagraph.ui:576
 msgctxt "sidebarparagraph|aftertextindent-atkobject"
 msgid "After Text Indent"
 msgstr "Mewnoliad Wedi'r Testun"
 
-#: sidebarparagraph.ui:622
+#: svx/uiconfig/ui/sidebarparagraph.ui:618
 msgctxt "sidebarparagraph|firstlineindent|tooltip_text"
 msgid "First Line Indent"
 msgstr "Mewnoliad Llinell Gyntaf"
 
-#: sidebarparagraph.ui:629
+#: svx/uiconfig/ui/sidebarparagraph.ui:624
 msgctxt "sidebarparagraph|firstlineindent-atkobject"
 msgid "First Line Indent"
 msgstr "Mewnoliad Llinell Gyntaf"
 
-#: sidebarparagraph.ui:661
+#: svx/uiconfig/ui/sidebarparagraph.ui:656
 msgctxt "sidebarparagraph|backgroundcolor|tooltip_text"
 msgid "Paragraph Background Color"
 msgstr "Lliw Cefndir Paragraff"
 
-#: sidebarpossize.ui:42
+#: svx/uiconfig/ui/sidebarpossize.ui:42
 msgctxt "sidebarpossize|horizontallabel"
 msgid "Position _X:"
 msgstr "Safle _X:"
 
-#: sidebarpossize.ui:57
+#: svx/uiconfig/ui/sidebarpossize.ui:57
 msgctxt "sidebarpossize|horizontalpos|tooltip_text"
 msgid "Enter the value for the horizontal position."
 msgstr "Rhowch werth y safle llorweddol."
 
-#: sidebarpossize.ui:65
+#: svx/uiconfig/ui/sidebarpossize.ui:63
 msgctxt "sidebarpossize|horizontalpos-atkobject"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: sidebarpossize.ui:82
+#: svx/uiconfig/ui/sidebarpossize.ui:80
 msgctxt "sidebarpossize|verticallabel"
 msgid "Position _Y:"
 msgstr "Safle _Y:"
 
-#: sidebarpossize.ui:97
+#: svx/uiconfig/ui/sidebarpossize.ui:95
 msgctxt "sidebarpossize|verticalpos|tooltip_text"
 msgid "Enter the value for the vertical position."
 msgstr "Rhowch werth y safle fertigol."
 
-#: sidebarpossize.ui:105
+#: svx/uiconfig/ui/sidebarpossize.ui:101
 msgctxt "sidebarpossize|verticalpos-atkobject"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: sidebarpossize.ui:122
+#: svx/uiconfig/ui/sidebarpossize.ui:118
 msgctxt "sidebarpossize|widthlabel"
 msgid "_Width:"
 msgstr "_Lled:"
 
-#: sidebarpossize.ui:138
+#: svx/uiconfig/ui/sidebarpossize.ui:134
 msgctxt "sidebarpossize|selectwidth|tooltip_text"
 msgid "Enter a width for the selected object."
 msgstr "Rhowch led ar gyfer y gwrthrych hwn."
 
-#: sidebarpossize.ui:146
+#: svx/uiconfig/ui/sidebarpossize.ui:140
 msgctxt "sidebarpossize|selectwidth-atkobject"
 msgid "Width"
 msgstr "Lled"
 
-#: sidebarpossize.ui:163
+#: svx/uiconfig/ui/sidebarpossize.ui:157
 msgctxt "sidebarpossize|heightlabel"
 msgid "H_eight:"
 msgstr "_Uchder:"
 
-#: sidebarpossize.ui:179
+#: svx/uiconfig/ui/sidebarpossize.ui:173
 msgctxt "sidebarpossize|selectheight|tooltip_text"
 msgid "Enter a height for the selected object."
 msgstr "Rhowch uchder ar gyfer y gwrthrych hwn."
 
-#: sidebarpossize.ui:187
+#: svx/uiconfig/ui/sidebarpossize.ui:179
 msgctxt "sidebarpossize|selectheight-atkobject"
 msgid "Height"
 msgstr "Uchder"
 
-#: sidebarpossize.ui:207
+#: svx/uiconfig/ui/sidebarpossize.ui:199
 msgctxt "sidebarpossize|ratio"
 msgid "_Keep ratio"
 msgstr "_Cadw cymhareb"
 
-#: sidebarpossize.ui:212
+#: svx/uiconfig/ui/sidebarpossize.ui:204
 msgctxt "sidebarpossize|ratio|tooltip_text"
 msgid "Maintain proportions when you resize the selected object."
 msgstr "Cadw cyfrannau wrth newid maint y gwrthrych hwn."
 
-#: sidebarpossize.ui:228
+#: svx/uiconfig/ui/sidebarpossize.ui:220
 msgctxt "sidebarpossize|rotationlabel"
 msgid "_Rotation:"
 msgstr "_Troi:"
 
-#: sidebarpossize.ui:254
+#: svx/uiconfig/ui/sidebarpossize.ui:246
 msgctxt "sidebarpossize|orientationcontrol-atkobject"
 msgid "Rotation"
 msgstr "Cylchdroi"
 
-#: sidebarpossize.ui:276
+#: svx/uiconfig/ui/sidebarpossize.ui:268
 msgctxt "sidebarpossize|rotation|tooltip_text"
 msgid "Select the angle for rotation."
 msgstr "Dewis ongl y troi."
 
-#: sidebarpossize.ui:297
+#: svx/uiconfig/ui/sidebarpossize.ui:289
 msgctxt "sidebarpossize|fliplabel"
 msgid "_Flip:"
 msgstr "_Gwrthdroi:"
 
-#: sidebarpossize.ui:320
+#: svx/uiconfig/ui/sidebarpossize.ui:312
 msgctxt "sidebarpossize|flipvertical|tooltip_text"
 msgid "Flip the selected object vertically."
 msgstr "Gwrthdroi'r gwrthrych yn fertigol."
 
-#: sidebarpossize.ui:334
+#: svx/uiconfig/ui/sidebarpossize.ui:326
 msgctxt "sidebarpossize|fliphorizontal|tooltip_text"
 msgid "Flip the selected object horizontally."
 msgstr "Gwrthdroi’r gwrthrych yn llorweddol."
 
-#: sidebarshadow.ui:34
+#: svx/uiconfig/ui/sidebarshadow.ui:34
 msgctxt "sidebarshadow|SHOW_SHADOW"
 msgid "Enable"
 msgstr "Galluogi"
 
-#: sidebarshadow.ui:58
+#: svx/uiconfig/ui/sidebarshadow.ui:59
 msgctxt "sidebarshadow|angle"
 msgid "Angle"
 msgstr "Ongl"
 
-#: sidebarshadow.ui:69
+#: svx/uiconfig/ui/sidebarshadow.ui:70
 msgctxt "sidebarshadow|distance"
 msgid "Distance"
 msgstr "Pellter"
 
-#: sidebarshadow.ui:116
+#: svx/uiconfig/ui/sidebarshadow.ui:117
 msgctxt "sidebarshadow|transparency_label"
 msgid "Transparency:"
 msgstr "Tryloywder:"
 
-#: sidebarshadow.ui:179
+#: svx/uiconfig/ui/sidebarshadow.ui:180
 msgctxt "sidebarshadow|color"
 msgid "Color:"
 msgstr "Lliw:"
 
-#: stylemenu.ui:12
+#: svx/uiconfig/ui/stylemenu.ui:12
 msgctxt "stylemenu|update"
 msgid "Update to Match Selection"
 msgstr "Diweddaru i Gydweddu'r Dewis"
 
-#: stylemenu.ui:20
+#: svx/uiconfig/ui/stylemenu.ui:20
 msgctxt "stylemenu|edit"
 msgid "Edit Style..."
 msgstr "Golygu Arddull..."
 
-#: textcharacterspacingcontrol.ui:73
+#: svx/uiconfig/ui/textcharacterspacingcontrol.ui:73
 msgctxt "textcharacterspacingcontrol|very_tight"
 msgid "Very Tight"
 msgstr "Tynn Iawn"
 
-#: textcharacterspacingcontrol.ui:89
+#: svx/uiconfig/ui/textcharacterspacingcontrol.ui:89
 msgctxt "textcharacterspacingcontrol|tight"
 msgid "Tight"
 msgstr "Tynn"
 
-#: textcharacterspacingcontrol.ui:105
+#: svx/uiconfig/ui/textcharacterspacingcontrol.ui:105
 msgctxt "textcharacterspacingcontrol|normal"
 msgid "Normal"
 msgstr "Normal"
 
-#: textcharacterspacingcontrol.ui:121
+#: svx/uiconfig/ui/textcharacterspacingcontrol.ui:121
 msgctxt "textcharacterspacingcontrol|loose"
 msgid "Loose"
 msgstr "Rhydd"
 
-#: textcharacterspacingcontrol.ui:137
+#: svx/uiconfig/ui/textcharacterspacingcontrol.ui:137
 msgctxt "textcharacterspacingcontrol|very_loose"
 msgid "Very Loose"
 msgstr "Rhydd Iawn"
 
-#: textcharacterspacingcontrol.ui:153
+#: svx/uiconfig/ui/textcharacterspacingcontrol.ui:153
 msgctxt "textcharacterspacingcontrol|last_custom"
 msgid "Last Custom Value"
 msgstr "Gwerth Cyfaddas Diwethaf"
 
-#: textcharacterspacingcontrol.ui:190
+#: svx/uiconfig/ui/textcharacterspacingcontrol.ui:189
 msgctxt "textcharacterspacingcontrol|kerning"
 msgid "0,0"
 msgstr "0,0"
 
-#: textcharacterspacingcontrol.ui:201
+#: svx/uiconfig/ui/textcharacterspacingcontrol.ui:200
 msgctxt "textcharacterspacingcontrol|label2"
 msgid "Custom Value"
 msgstr "Gwerth Cyfaddas"
 
-#: textcontrolchardialog.ui:8
+#: svx/uiconfig/ui/textcontrolchardialog.ui:8
 msgctxt "textcontrolchardialog|TextControlCharacterPropertiesDialog"
 msgid "Character"
 msgstr "Nod"
 
-#: textcontrolchardialog.ui:106
+#: svx/uiconfig/ui/textcontrolchardialog.ui:106
 msgctxt "textcontrolchardialog|font"
 msgid "Font"
 msgstr "Ffont"
 
-#: textcontrolchardialog.ui:128
+#: svx/uiconfig/ui/textcontrolchardialog.ui:128
 msgctxt "textcontrolchardialog|fonteffects"
 msgid "Font Effects"
 msgstr "Effeithiau Ffontiau"
 
-#: textcontrolchardialog.ui:151
+#: svx/uiconfig/ui/textcontrolchardialog.ui:151
 msgctxt "textcontrolchardialog|position"
 msgid "Position"
 msgstr "Safle"
 
-#: textcontrolparadialog.ui:8
+#: svx/uiconfig/ui/textcontrolparadialog.ui:8
 msgctxt "textcontrolparadialog|TextControlParagraphPropertiesDialog"
 msgid "Paragraph"
 msgstr "Paragraff"
 
-#: textcontrolparadialog.ui:106
+#: svx/uiconfig/ui/textcontrolparadialog.ui:106
 msgctxt "textcontrolparadialog|labelTP_PARA_STD"
 msgid "Indents & Spacing"
 msgstr "Mewnoliad a Bylchu"
 
-#: textcontrolparadialog.ui:128
+#: svx/uiconfig/ui/textcontrolparadialog.ui:128
 msgctxt "textcontrolparadialog|labelTP_PARA_ALIGN"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: textcontrolparadialog.ui:152
+#: svx/uiconfig/ui/textcontrolparadialog.ui:152
 msgctxt "textcontrolparadialog|labelTP_PARA_ASIAN"
 msgid "Asian Typography"
 msgstr "Typograffeg Asiaidd"
 
-#: textcontrolparadialog.ui:175
+#: svx/uiconfig/ui/textcontrolparadialog.ui:175
 msgctxt "textcontrolparadialog|labelTP_TABULATOR"
 msgid "Tabs"
 msgstr "Tabiau"
 
-#: textunderlinecontrol.ui:26
+#: svx/uiconfig/ui/textunderlinecontrol.ui:26
 msgctxt "textunderlinecontrol|none"
 msgid "(Without)"
 msgstr "(Heb)"
 
-#: textunderlinecontrol.ui:44
+#: svx/uiconfig/ui/textunderlinecontrol.ui:44
 msgctxt "textunderlinecontrol|single|tooltip_text"
 msgid "Single"
 msgstr "Sengl"
 
-#: textunderlinecontrol.ui:61
+#: svx/uiconfig/ui/textunderlinecontrol.ui:61
 msgctxt "textunderlinecontrol|double|tooltip_text"
 msgid "Double"
 msgstr "Dwbl"
 
-#: textunderlinecontrol.ui:78
+#: svx/uiconfig/ui/textunderlinecontrol.ui:78
 msgctxt "textunderlinecontrol|bold|tooltip_text"
 msgid "Bold"
 msgstr "Trwm"
 
-#: textunderlinecontrol.ui:95
+#: svx/uiconfig/ui/textunderlinecontrol.ui:95
 msgctxt "textunderlinecontrol|dot|tooltip_text"
 msgid "Dotted"
 msgstr "Dotiog"
 
-#: textunderlinecontrol.ui:112
+#: svx/uiconfig/ui/textunderlinecontrol.ui:112
 msgctxt "textunderlinecontrol|dotbold|tooltip_text"
 msgid "Dotted (Bold)"
 msgstr "Dotiog (Trwm)"
 
-#: textunderlinecontrol.ui:129
+#: svx/uiconfig/ui/textunderlinecontrol.ui:129
 msgctxt "textunderlinecontrol|dash|tooltip_text"
 msgid "Dash"
 msgstr "Llinell Doriad"
 
-#: textunderlinecontrol.ui:146
+#: svx/uiconfig/ui/textunderlinecontrol.ui:146
 msgctxt "textunderlinecontrol|dashlong|tooltip_text"
 msgid "Long Dash"
 msgstr "Llinell Doriad Hir"
 
-#: textunderlinecontrol.ui:163
+#: svx/uiconfig/ui/textunderlinecontrol.ui:163
 msgctxt "textunderlinecontrol|dashdot|tooltip_text"
 msgid "Dot Dash"
 msgstr "Dot Llinell Doriad"
 
-#: textunderlinecontrol.ui:180
+#: svx/uiconfig/ui/textunderlinecontrol.ui:180
 msgctxt "textunderlinecontrol|dashdotdot|tooltip_text"
 msgid "Dot Dot Dash"
 msgstr "Dot Dot Llinell Doriad"
 
-#: textunderlinecontrol.ui:197
+#: svx/uiconfig/ui/textunderlinecontrol.ui:197
 msgctxt "textunderlinecontrol|wave|tooltip_text"
 msgid "Wave"
 msgstr "Ton"
 
-#: textunderlinecontrol.ui:211
+#: svx/uiconfig/ui/textunderlinecontrol.ui:211
 msgctxt "textunderlinecontrol|moreoptions"
 msgid "_More Options..."
 msgstr "_Rhagor o Ddewisiadau..."
 
-#: xformspage.ui:26
+#: svx/uiconfig/ui/xformspage.ui:26
 msgctxt "xformspage|TBI_ITEM_ADD"
 msgid "Add Item"
 msgstr "Ychwanegu Eitem"
 
-#: xformspage.ui:40
+#: svx/uiconfig/ui/xformspage.ui:40
 msgctxt "xformspage|TBI_ITEM_ADD_ELEMENT"
 msgid "Add Element"
 msgstr "Ychwanegu Elfen"
 
-#: xformspage.ui:54
+#: svx/uiconfig/ui/xformspage.ui:54
 msgctxt "xformspage|TBI_ITEM_ADD_ATTRIBUTE"
 msgid "Add Attribute"
 msgstr "Ychwanegu Priodoledd"
 
-#: xformspage.ui:68
+#: svx/uiconfig/ui/xformspage.ui:68
 msgctxt "xformspage|TBI_ITEM_EDIT"
 msgid "Edit"
 msgstr "Golygu"
 
-#: xformspage.ui:82
+#: svx/uiconfig/ui/xformspage.ui:82
 msgctxt "xformspage|TBI_ITEM_REMOVE"
 msgid "Delete"
 msgstr "Dileu"
 
-#: xmlsecstatmenu.ui:12
+#: svx/uiconfig/ui/xmlsecstatmenu.ui:12
 msgctxt "xmlsecstatmenu|signatures"
 msgid "Digital Signatures..."
 msgstr "Llofnodion Digidol..."
 
-#: zoommenu.ui:12
+#: svx/uiconfig/ui/zoommenu.ui:12
 msgctxt "zoommenu|page"
 msgid "Entire Page"
 msgstr "Tudalen Gyfan"
 
-#: zoommenu.ui:20
+#: svx/uiconfig/ui/zoommenu.ui:20
 msgctxt "zoommenu|width"
 msgid "Page Width"
 msgstr "Lled Tudalen"
 
-#: zoommenu.ui:28
+#: svx/uiconfig/ui/zoommenu.ui:28
 msgctxt "zoommenu|optimal"
 msgid "Optimal View"
 msgstr "Golwg Orau"
 
-#: zoommenu.ui:36
+#: svx/uiconfig/ui/zoommenu.ui:36
 msgctxt "zoommenu|50"
 msgid "50%"
 msgstr "50%"
 
-#: zoommenu.ui:44
+#: svx/uiconfig/ui/zoommenu.ui:44
 msgctxt "zoommenu|75"
 msgid "75%"
 msgstr "75%"
 
-#: zoommenu.ui:52
+#: svx/uiconfig/ui/zoommenu.ui:52
 msgctxt "zoommenu|100"
 msgid "100%"
 msgstr "100%"
 
-#: zoommenu.ui:60
+#: svx/uiconfig/ui/zoommenu.ui:60
 msgctxt "zoommenu|150"
 msgid "150%"
 msgstr "150%"
 
-#: zoommenu.ui:68
+#: svx/uiconfig/ui/zoommenu.ui:68
 msgctxt "zoommenu|200"
 msgid "200%"
 msgstr "200%"
 
-#: strings.hrc:25
+#: include/svx/strings.hrc:25
 msgctxt "STR_ObjNameSingulNONE"
 msgid "Drawing object"
 msgstr "Gwrthrych lluniadu"
 
-#: strings.hrc:26
+#: include/svx/strings.hrc:26
 msgctxt "STR_ObjNamePluralNONE"
 msgid "Drawing objects"
 msgstr "Gwrthrychau lluniadu"
 
-#: strings.hrc:27
+#: include/svx/strings.hrc:27
 msgctxt "STR_ObjNameSingulGRUP"
 msgid "Group object"
 msgstr "Gwrthrych grŵp"
 
-#: strings.hrc:28
+#: include/svx/strings.hrc:28
 msgctxt "STR_ObjNamePluralGRUP"
 msgid "Group objects"
 msgstr "Gwrthrychau grŵp"
 
-#: strings.hrc:29
+#: include/svx/strings.hrc:29
 msgctxt "STR_ObjNameSingulGRUPEMPTY"
 msgid "Blank group object"
 msgstr "Gwrthrych grŵp gwag"
 
-#: strings.hrc:30
+#: include/svx/strings.hrc:30
 msgctxt "STR_ObjNamePluralGRUPEMPTY"
 msgid "Blank group objects"
 msgstr "Gwrthrych grŵp gwag"
 
-#: strings.hrc:31
+#: include/svx/strings.hrc:31
 msgctxt "STR_ObjNameSingulLINE"
 msgid "Line"
 msgstr "Llinell"
 
-#: strings.hrc:32
+#: include/svx/strings.hrc:32
 msgctxt "STR_ObjNameSingulLINE_Hori"
 msgid "Horizontal line"
 msgstr "Llinell llorweddol"
 
-#: strings.hrc:33
+#: include/svx/strings.hrc:33
 msgctxt "STR_ObjNameSingulLINE_Vert"
 msgid "Vertical line"
 msgstr "Llinell fertigol"
 
-#: strings.hrc:34
+#: include/svx/strings.hrc:34
 msgctxt "STR_ObjNameSingulLINE_Diag"
 msgid "Diagonal line"
 msgstr "Llinell letraws"
 
-#: strings.hrc:35
+#: include/svx/strings.hrc:35
 msgctxt "STR_ObjNamePluralLINE"
 msgid "Lines"
 msgstr "Llinellau"
 
-#: strings.hrc:36
+#: include/svx/strings.hrc:36
 msgctxt "STR_ObjNameSingulRECT"
 msgid "Rectangle"
 msgstr "Petryal"
 
-#: strings.hrc:37
+#: include/svx/strings.hrc:37
 msgctxt "STR_ObjNamePluralRECT"
 msgid "Rectangles"
 msgstr "Petryalau"
 
-#: strings.hrc:38
+#: include/svx/strings.hrc:38
 msgctxt "STR_ObjNameSingulQUAD"
 msgid "Square"
 msgstr "Sgwâr"
 
-#: strings.hrc:39
+#: include/svx/strings.hrc:39
 msgctxt "STR_ObjNamePluralQUAD"
 msgid "Squares"
 msgstr "Sgwariau"
 
-#: strings.hrc:40
+#: include/svx/strings.hrc:40
 msgctxt "STR_ObjNameSingulPARAL"
 msgid "Parallelogram"
 msgstr "Paralelogram"
 
-#: strings.hrc:41
+#: include/svx/strings.hrc:41
 msgctxt "STR_ObjNamePluralPARAL"
 msgid "Parallelograms"
 msgstr "Paralelogramau"
 
-#: strings.hrc:42
-msgctxt "STR_ObjNameSingulRAUTE"
-msgid "Rhombus"
-msgstr "Rhombws"
-
-#: strings.hrc:43
-msgctxt "STR_ObjNamePluralRAUTE"
-msgid "Rhombuses"
-msgstr "Rhombi"
-
-#: strings.hrc:44
+#: include/svx/strings.hrc:42
 msgctxt "STR_ObjNameSingulRECTRND"
 msgid "Rounded rectangle"
 msgstr "Petryal crwn"
 
-#: strings.hrc:45
+#: include/svx/strings.hrc:43
 msgctxt "STR_ObjNamePluralRECTRND"
 msgid "Rounded Rectangles"
 msgstr "Petryalau crwn"
 
-#: strings.hrc:46
+#: include/svx/strings.hrc:44
 msgctxt "STR_ObjNameSingulQUADRND"
 msgid "rounded square"
 msgstr "sgwâr crwn"
 
-#: strings.hrc:47
+#: include/svx/strings.hrc:45
 msgctxt "STR_ObjNamePluralQUADRND"
 msgid "Rounded Squares"
 msgstr "Sgwariau crwn"
 
-#: strings.hrc:48
+#: include/svx/strings.hrc:46
 msgctxt "STR_ObjNameSingulPARALRND"
 msgid "Rounded Parallelogram"
 msgstr "Paralelogram crwn"
 
-#: strings.hrc:49
+#: include/svx/strings.hrc:47
 msgctxt "STR_ObjNamePluralPARALRND"
 msgid "Rounded parallelograms"
 msgstr "Paralelogramau crwn"
 
-#: strings.hrc:50
-msgctxt "STR_ObjNameSingulRAUTERND"
-msgid "rounded rhombus"
-msgstr "rhombws crwn"
-
-#: strings.hrc:51
-msgctxt "STR_ObjNamePluralRAUTERND"
-msgid "Rounded rhombuses"
-msgstr "Rhombi crwn"
-
-#: strings.hrc:52
+#: include/svx/strings.hrc:48
 msgctxt "STR_ObjNameSingulCIRC"
 msgid "Circle"
 msgstr "Cylch"
 
-#: strings.hrc:53
+#: include/svx/strings.hrc:49
 msgctxt "STR_ObjNamePluralCIRC"
 msgid "Circles"
 msgstr "Cylchoedd"
 
-#: strings.hrc:54
+#: include/svx/strings.hrc:50
 msgctxt "STR_ObjNameSingulSECT"
 msgid "Circle sector"
 msgstr "Sector cylch"
 
-#: strings.hrc:55
+#: include/svx/strings.hrc:51
 msgctxt "STR_ObjNamePluralSECT"
 msgid "Circle sectors"
 msgstr "Sectorau cylch"
 
-#: strings.hrc:56
+#: include/svx/strings.hrc:52
 msgctxt "STR_ObjNameSingulCARC"
 msgid "Arc"
 msgstr "Arc"
 
-#: strings.hrc:57
+#: include/svx/strings.hrc:53
 msgctxt "STR_ObjNamePluralCARC"
 msgid "Arcs"
 msgstr "Arcau"
 
-#: strings.hrc:58
+#: include/svx/strings.hrc:54
 msgctxt "STR_ObjNameSingulCCUT"
 msgid "Circle segment"
 msgstr "Segment cylch"
 
-#: strings.hrc:59
+#: include/svx/strings.hrc:55
 msgctxt "STR_ObjNamePluralCCUT"
 msgid "Circle segments"
 msgstr "Segmentau cylch"
 
-#: strings.hrc:60
+#: include/svx/strings.hrc:56
 msgctxt "STR_ObjNameSingulCIRCE"
 msgid "Ellipse"
 msgstr "Elips"
 
-#: strings.hrc:61
+#: include/svx/strings.hrc:57
 msgctxt "STR_ObjNamePluralCIRCE"
 msgid "Ellipses"
 msgstr "Elipsau"
 
-#: strings.hrc:62
+#: include/svx/strings.hrc:58
 msgctxt "STR_ObjNameSingulSECTE"
 msgid "Ellipse Pie"
 msgstr "Siart Cylch Elips"
 
-#: strings.hrc:63
+#: include/svx/strings.hrc:59
 msgctxt "STR_ObjNamePluralSECTE"
 msgid "Ellipse Pies"
 msgstr "Siart Elips"
 
-#: strings.hrc:64
+#: include/svx/strings.hrc:60
 msgctxt "STR_ObjNameSingulCARCE"
 msgid "Elliptical arc"
 msgstr "Arc elipsaidd"
 
-#: strings.hrc:65
+#: include/svx/strings.hrc:61
 msgctxt "STR_ObjNamePluralCARCE"
 msgid "Elliptical arcs"
 msgstr "Arcau elipsaidd"
 
-#: strings.hrc:66
+#: include/svx/strings.hrc:62
 msgctxt "STR_ObjNameSingulCCUTE"
 msgid "Ellipse Segment"
 msgstr "Segment Elips"
 
-#: strings.hrc:67
+#: include/svx/strings.hrc:63
 msgctxt "STR_ObjNamePluralCCUTE"
 msgid "Ellipse Segments"
 msgstr "Segmentau Elips"
 
-#: strings.hrc:68
+#: include/svx/strings.hrc:64
 msgctxt "STR_ObjNameSingulPOLY"
 msgid "Polygon"
 msgstr "Polygon"
 
-#: strings.hrc:69
+#: include/svx/strings.hrc:65
 msgctxt "STR_ObjNameSingulPOLY_PointCount"
 msgid "Polygon %2 corners"
 msgstr "Polygon %2 cornel"
 
-#: strings.hrc:70
+#: include/svx/strings.hrc:66
 msgctxt "STR_ObjNamePluralPOLY"
 msgid "Polygons"
 msgstr "Polygonau"
 
-#: strings.hrc:71
+#: include/svx/strings.hrc:67
 msgctxt "STR_ObjNameSingulPLIN"
 msgid "Polyline"
 msgstr "Polylin"
 
-#: strings.hrc:72
+#: include/svx/strings.hrc:68
 msgctxt "STR_ObjNameSingulPLIN_PointCount"
 msgid "Polyline with %2 corners"
 msgstr "Polylin gyda %2 cornel"
 
-#: strings.hrc:73
+#: include/svx/strings.hrc:69
 msgctxt "STR_ObjNamePluralPLIN"
 msgid "Polylines"
 msgstr "Polylinau"
 
-#: strings.hrc:74
+#: include/svx/strings.hrc:70
 msgctxt "STR_ObjNameSingulPATHLINE"
 msgid "Bézier curve"
 msgstr "Cromlin Bézier"
 
-#: strings.hrc:75
+#: include/svx/strings.hrc:71
 msgctxt "STR_ObjNamePluralPATHLINE"
 msgid "Bézier curves"
 msgstr "Cromlinau Bézier"
 
-#: strings.hrc:76
+#: include/svx/strings.hrc:72
 msgctxt "STR_ObjNameSingulPATHFILL"
 msgid "Bézier curve"
 msgstr "Cromlin Bézier"
 
-#: strings.hrc:77
+#: include/svx/strings.hrc:73
 msgctxt "STR_ObjNamePluralPATHFILL"
 msgid "Bézier curves"
 msgstr "Cromlinau Bézier"
 
-#: strings.hrc:78
+#: include/svx/strings.hrc:74
 msgctxt "STR_ObjNameSingulFREELINE"
 msgid "Freeform Line"
 msgstr "Llinell Rhyddffurf"
 
-#: strings.hrc:79
+#: include/svx/strings.hrc:75
 msgctxt "STR_ObjNamePluralFREELINE"
 msgid "Freeform Lines"
 msgstr "Llinellau Ffurf Rhydd"
 
-#: strings.hrc:80
+#: include/svx/strings.hrc:76
 msgctxt "STR_ObjNameSingulFREEFILL"
 msgid "Freeform Line"
 msgstr "Llinell Rhyddffurf"
 
-#: strings.hrc:81
+#: include/svx/strings.hrc:77
 msgctxt "STR_ObjNamePluralFREEFILL"
 msgid "Freeform Lines"
 msgstr "Llinellau Ffurf Rhydd"
 
-#: strings.hrc:82
+#: include/svx/strings.hrc:78
 msgctxt "STR_ObjNameSingulCOMBLINE"
 msgid "Curve"
 msgstr "Cromlin"
 
-#: strings.hrc:83
+#: include/svx/strings.hrc:79
 msgctxt "STR_ObjNameSingulNATSPLN"
 msgid "Natural Spline"
 msgstr "Sblein Naturiol"
 
-#: strings.hrc:84
+#: include/svx/strings.hrc:80
 msgctxt "STR_ObjNamePluralNATSPLN"
 msgid "Natural Splines"
 msgstr "Sblein Naturiol"
 
-#: strings.hrc:85
+#: include/svx/strings.hrc:81
 msgctxt "STR_ObjNameSingulPERSPLN"
 msgid "Periodic Spline"
 msgstr "Sblein Cyfnodol"
 
-#: strings.hrc:86
+#: include/svx/strings.hrc:82
 msgctxt "STR_ObjNamePluralPERSPLN"
 msgid "Periodic Splines"
 msgstr "Sblein Cyfnodol"
 
-#: strings.hrc:87
+#: include/svx/strings.hrc:83
 msgctxt "STR_ObjNameSingulTEXT"
 msgid "Text Frame"
 msgstr "Ffrâm Testun"
 
-#: strings.hrc:88
+#: include/svx/strings.hrc:84
 msgctxt "STR_ObjNamePluralTEXT"
 msgid "Text Frame"
 msgstr "Ffrâm Testun"
 
-#: strings.hrc:89
+#: include/svx/strings.hrc:85
 msgctxt "STR_ObjNameSingulTEXTLNK"
 msgid "Linked text frame"
 msgstr "Ffrâm testun cysylltiedig"
 
-#: strings.hrc:90
+#: include/svx/strings.hrc:86
 msgctxt "STR_ObjNamePluralTEXTLNK"
 msgid "Linked text frames"
 msgstr "Ffrâm testun cysylltiedig"
 
-#: strings.hrc:91
+#: include/svx/strings.hrc:87
 msgctxt "STR_ObjNameSingulTITLETEXT"
 msgid "Title text"
 msgstr "Testun teitl"
 
-#: strings.hrc:92
+#: include/svx/strings.hrc:88
 msgctxt "STR_ObjNamePluralTITLETEXT"
 msgid "Title texts"
 msgstr "Testunau teitl"
 
-#: strings.hrc:93
+#: include/svx/strings.hrc:89
 msgctxt "STR_ObjNameSingulOUTLINETEXT"
 msgid "Outline Text"
 msgstr "Amlinell Testun"
 
-#: strings.hrc:94
+#: include/svx/strings.hrc:90
 msgctxt "STR_ObjNamePluralOUTLINETEXT"
 msgid "Outline Texts"
 msgstr "Amlinell Testunau"
 
-#: strings.hrc:95
+#: include/svx/strings.hrc:91
 msgctxt "STR_ObjNameSingulGRAF"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:96
+#: include/svx/strings.hrc:92
 msgctxt "STR_ObjNamePluralGRAF"
 msgid "Images"
 msgstr "Delweddau"
 
-#: strings.hrc:97
+#: include/svx/strings.hrc:93
 msgctxt "STR_ObjNameSingulGRAFLNK"
 msgid "Linked image"
 msgstr "Delwedd cysylltiedig"
 
-#: strings.hrc:98
+#: include/svx/strings.hrc:94
 msgctxt "STR_ObjNamePluralGRAFLNK"
 msgid "Linked images"
 msgstr "Delweddau cysylltiedig"
 
-#: strings.hrc:99
+#: include/svx/strings.hrc:95
 msgctxt "STR_ObjNameSingulGRAFNONE"
 msgid "Blank image object"
 msgstr "Gwrthrych delwedd gwag"
 
-#: strings.hrc:100
+#: include/svx/strings.hrc:96
 msgctxt "STR_ObjNamePluralGRAFNONE"
 msgid "Blank image objects"
 msgstr "Gwrthrychau delwedd gwag"
 
-#: strings.hrc:101
+#: include/svx/strings.hrc:97
 msgctxt "STR_ObjNameSingulGRAFNONELNK"
 msgid "Blank linked image"
 msgstr "Delwedd cysylltiedig gwag"
 
-#: strings.hrc:102
+#: include/svx/strings.hrc:98
 msgctxt "STR_ObjNamePluralGRAFNONELNK"
 msgid "Blank linked images"
 msgstr "Delwedd cysylltiedig gwag"
 
-#: strings.hrc:103
+#: include/svx/strings.hrc:99
 msgctxt "STR_ObjNameSingulGRAFMTF"
 msgid "Metafile"
 msgstr "Metaffile"
 
-#: strings.hrc:104
+#: include/svx/strings.hrc:100
 msgctxt "STR_ObjNamePluralGRAFMTF"
 msgid "Metafiles"
 msgstr "Metaffeilau"
 
-#: strings.hrc:105
+#: include/svx/strings.hrc:101
 msgctxt "STR_ObjNameSingulGRAFMTFLNK"
 msgid "Linked Metafile"
 msgstr "Metaffeil cysylltiedig"
 
-#: strings.hrc:106
+#: include/svx/strings.hrc:102
 msgctxt "STR_ObjNamePluralGRAFMTFLNK"
 msgid "Linked Metafiles"
 msgstr "Metaffeiliau cysylltiedig"
 
-#: strings.hrc:107
+#: include/svx/strings.hrc:103
 msgctxt "STR_ObjNameSingulGRAFBMP"
 msgid "Image"
 msgstr "Delwedd"
 
-#: strings.hrc:108
+#: include/svx/strings.hrc:104
 msgctxt "STR_ObjNameSingulGRAFBMPTRANS"
 msgid "Image with transparency"
 msgstr "Didfap gyda thryloywder"
 
-#: strings.hrc:109
+#: include/svx/strings.hrc:105
 msgctxt "STR_ObjNameSingulGRAFBMPLNK"
 msgid "Linked Image"
 msgstr "Delwedd Gysylltiedig"
 
-#: strings.hrc:110
+#: include/svx/strings.hrc:106
 msgctxt "STR_ObjNameSingulGRAFBMPTRANSLNK"
 msgid "Linked image with transparency"
 msgstr "Didfap cysylltiedig gyda thryloywder"
 
-#: strings.hrc:111
+#: include/svx/strings.hrc:107
 msgctxt "STR_ObjNamePluralGRAFBMP"
 msgid "Images"
 msgstr "Delweddau"
 
-#: strings.hrc:112
+#: include/svx/strings.hrc:108
 msgctxt "STR_ObjNamePluralGRAFBMPTRANS"
 msgid "Images with transparency"
 msgstr "Didfap gyda thryloywder"
 
-#: strings.hrc:113
+#: include/svx/strings.hrc:109
 msgctxt "STR_ObjNamePluralGRAFBMPLNK"
 msgid "Linked images"
 msgstr "Delweddau cysylltiedig"
 
-#: strings.hrc:114
+#: include/svx/strings.hrc:110
 msgctxt "STR_ObjNamePluralGRAFBMPTRANSLNK"
 msgid "Linked images with transparency"
 msgstr "Didfap cysylltiedig gyda thryloywder"
 
-#: strings.hrc:115
+#: include/svx/strings.hrc:111
 msgctxt "STR_ObjNameSingulCUSTOMSHAPE"
 msgid "Shape"
 msgstr "Siâp"
 
-#: strings.hrc:116
+#: include/svx/strings.hrc:112
 msgctxt "STR_ObjNamePluralCUSTOMSHAPE"
 msgid "Shapes"
 msgstr "Siapiau"
 
-#: strings.hrc:117
+#: include/svx/strings.hrc:113
 msgctxt "STR_ObjNameSingulGRAFSVG"
 msgid "SVG"
 msgstr "SVG"
 
-#: strings.hrc:118
+#: include/svx/strings.hrc:114
 msgctxt "STR_ObjNamePluralGRAFSVG"
 msgid "SVGs"
 msgstr "SVGs"
 
-#: strings.hrc:119
+#: include/svx/strings.hrc:115
 msgctxt "STR_ObjNameSingulGRAFWMF"
 msgid "WMF"
 msgstr "WMF"
 
-#: strings.hrc:120
+#: include/svx/strings.hrc:116
 msgctxt "STR_ObjNamePluralGRAFWMF"
 msgid "WMFs"
 msgstr "WMF"
 
-#: strings.hrc:121
+#: include/svx/strings.hrc:117
 msgctxt "STR_ObjNameSingulGRAFEMF"
 msgid "EMF"
 msgstr "EMF"
 
-#: strings.hrc:122
+#: include/svx/strings.hrc:118
 msgctxt "STR_ObjNamePluralGRAFEMF"
 msgid "EMFs"
 msgstr "EMF"
 
-#: strings.hrc:123
+#: include/svx/strings.hrc:119
 msgctxt "STR_ObjNameSingulOLE2"
 msgid "embedded object (OLE)"
 msgstr "gwrthrych mewnosodedig (OLE)"
 
-#: strings.hrc:124
+#: include/svx/strings.hrc:120
 msgctxt "STR_ObjNamePluralOLE2"
 msgid "Embedded objects (OLE)"
 msgstr "Gwrthrychau mewnosodedig (OLE)"
 
-#: strings.hrc:125
+#: include/svx/strings.hrc:121
 msgctxt "STR_ObjNameSingulUno"
 msgid "Control"
 msgstr "Rheolydd"
 
-#: strings.hrc:126
+#: include/svx/strings.hrc:122
 msgctxt "STR_ObjNamePluralUno"
 msgid "Controls"
 msgstr "Rheolyddion"
 
-#: strings.hrc:127
+#: include/svx/strings.hrc:123
 msgctxt "STR_ObjNameSingulFrame"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: strings.hrc:128
+#: include/svx/strings.hrc:124
 msgctxt "STR_ObjNamePluralFrame"
 msgid "Frames"
 msgstr "Fframiau"
 
-#: strings.hrc:129
+#: include/svx/strings.hrc:125
 msgctxt "STR_ObjNameSingulEDGE"
 msgid "Object Connectors"
 msgstr "Cysylltydd Gwrthrych"
 
-#: strings.hrc:130
+#: include/svx/strings.hrc:126
 msgctxt "STR_ObjNamePluralEDGE"
 msgid "Object Connectors"
 msgstr "Cysylltydd Gwrthrych"
 
-#: strings.hrc:131
+#: include/svx/strings.hrc:127
 msgctxt "STR_ObjNameSingulCAPTION"
 msgid "Callout"
 msgstr "Galwr"
 
-#: strings.hrc:132
+#: include/svx/strings.hrc:128
 msgctxt "STR_ObjNamePluralCAPTION"
 msgid "Callouts"
 msgstr "Ffeithynnau"
 
-#: strings.hrc:133
+#: include/svx/strings.hrc:129
 msgctxt "STR_ObjNameSingulPAGE"
 msgid "Preview object"
 msgstr "Rhagolwg gwrthrych"
 
-#: strings.hrc:134
+#: include/svx/strings.hrc:130
 msgctxt "STR_ObjNamePluralPAGE"
 msgid "Preview objects"
 msgstr "Rhagolwg gwrthrychau"
 
-#: strings.hrc:135
+#: include/svx/strings.hrc:131
 msgctxt "STR_ObjNameSingulMEASURE"
 msgid "Dimension line"
 msgstr "Linell dimensiwn"
 
-#: strings.hrc:136
+#: include/svx/strings.hrc:132
 msgctxt "STR_ObjNamePluralMEASURE"
 msgid "Dimensioning objects"
 msgstr "Gwrthrychau dimensiynu"
 
-#: strings.hrc:137
+#: include/svx/strings.hrc:133
 msgctxt "STR_ObjNamePlural"
 msgid "Drawing objects"
 msgstr "Gwrthrychau lluniadu"
 
-#: strings.hrc:138
+#: include/svx/strings.hrc:134
 msgctxt "STR_ObjNameNoObj"
 msgid "No draw object"
 msgstr "Dim gwrthrych lluniadu"
 
-#: strings.hrc:139
+#: include/svx/strings.hrc:135
 msgctxt "STR_ObjNameSingulPlural"
 msgid "Draw object(s)"
 msgstr "Gwrthrych(au) llunio"
 
-#: strings.hrc:140
+#: include/svx/strings.hrc:136
 msgctxt "STR_ObjNameSingulCube3d"
 msgid "3D cube"
 msgstr "ciwb 3D"
 
-#: strings.hrc:141
+#: include/svx/strings.hrc:137
 msgctxt "STR_ObjNamePluralCube3d"
 msgid "3D cubes"
 msgstr "ciwbiau 3D"
 
-#: strings.hrc:142
+#: include/svx/strings.hrc:138
 msgctxt "STR_ObjNameSingulExtrude3d"
 msgid "Extrusion object"
 msgstr "Gwrthrych allwthiad"
 
-#: strings.hrc:143
+#: include/svx/strings.hrc:139
 msgctxt "STR_ObjNamePluralExtrude3d"
 msgid "Extrusion objects"
 msgstr "Gwrthrychau allwthiad"
 
-#: strings.hrc:144
+#: include/svx/strings.hrc:140
 msgctxt "STR_ObjNameSingulLathe3d"
 msgid "Rotation object"
 msgstr "Gwrthrych troi"
 
-#: strings.hrc:145
+#: include/svx/strings.hrc:141
 msgctxt "STR_ObjNamePluralLathe3d"
 msgid "Rotation objects"
 msgstr "Gwrthrychau troi"
 
-#: strings.hrc:146
+#: include/svx/strings.hrc:142
 msgctxt "STR_ObjNameSingulObj3d"
 msgid "3D object"
 msgstr "gwrthrych 3D"
 
-#: strings.hrc:147
+#: include/svx/strings.hrc:143
 msgctxt "STR_ObjNamePluralObj3d"
 msgid "3D objects"
 msgstr "gwrthrychau 3D"
 
-#: strings.hrc:148
+#: include/svx/strings.hrc:144
 msgctxt "STR_ObjNameSingulScene3d"
 msgid "3D scene"
 msgstr "Golygfa 3D"
 
-#: strings.hrc:149
+#: include/svx/strings.hrc:145
 msgctxt "STR_ObjNamePluralScene3d"
 msgid "3D scenes"
 msgstr "Golygfeydd 3D"
 
-#: strings.hrc:150
+#: include/svx/strings.hrc:146
 msgctxt "STR_ObjNameSingulSphere3d"
 msgid "Sphere"
 msgstr "Sffêr"
 
-#: strings.hrc:151
+#: include/svx/strings.hrc:147
 msgctxt "STR_ObjNamePluralSphere3d"
 msgid "Spheres"
 msgstr "Sfferau"
 
-#: strings.hrc:152
+#: include/svx/strings.hrc:148
 msgctxt "STR_EditWithCopy"
 msgid "with copy"
 msgstr "gyda copi"
 
-#: strings.hrc:153
+#: include/svx/strings.hrc:149
 msgctxt "STR_EditPosSize"
 msgid "Set position and size for %1"
 msgstr "Gosod safle a maint ar gyfer %1"
 
-#: strings.hrc:154
+#: include/svx/strings.hrc:150
 msgctxt "STR_EditDelete"
 msgid "Delete %1"
 msgstr "Dileu %1"
 
-#: strings.hrc:155
+#: include/svx/strings.hrc:151
 msgctxt "STR_EditMovToTop"
 msgid "Move %1 forward"
 msgstr "Symud %1 ymlaen"
 
-#: strings.hrc:156
+#: include/svx/strings.hrc:152
 msgctxt "STR_EditMovToBtm"
 msgid "Move %1 further back"
 msgstr "Symud %1 nôl ymhellach"
 
-#: strings.hrc:157
+#: include/svx/strings.hrc:153
 msgctxt "STR_EditPutToTop"
 msgid "Move %1 to front"
 msgstr "Symud %1 i'r blaen"
 
-#: strings.hrc:158
+#: include/svx/strings.hrc:154
 msgctxt "STR_EditPutToBtm"
 msgid "Move %1 to back"
 msgstr "Symud %1 i'r cefn"
 
-#: strings.hrc:159
+#: include/svx/strings.hrc:155
 msgctxt "STR_EditRevOrder"
 msgid "Reverse order of %1"
 msgstr "Gwyrdroi trefn %1"
 
-#: strings.hrc:160
+#: include/svx/strings.hrc:156
 msgctxt "STR_EditMove"
 msgid "Move %1"
 msgstr "Symud %1"
 
-#: strings.hrc:161
+#: include/svx/strings.hrc:157
 msgctxt "STR_EditResize"
 msgid "Resize %1"
 msgstr "Newid maint %1"
 
-#: strings.hrc:162
+#: include/svx/strings.hrc:158
 msgctxt "STR_EditRotate"
 msgid "Rotate %1"
 msgstr "Cylchdroi %1"
 
-#: strings.hrc:163
+#: include/svx/strings.hrc:159
 msgctxt "STR_EditMirrorHori"
 msgid "Flip %1 horizontal"
 msgstr "Gwrthdroi %1 yn llorweddol"
 
-#: strings.hrc:164
+#: include/svx/strings.hrc:160
 msgctxt "STR_EditMirrorVert"
 msgid "Flip %1 vertical"
 msgstr "Gwrthdroi %1 yn fertigol"
 
-#: strings.hrc:165
+#: include/svx/strings.hrc:161
 msgctxt "STR_EditMirrorDiag"
 msgid "Flip %1 diagonal"
 msgstr "Gwrthdroi %1 yn groeslin"
 
-#: strings.hrc:166
+#: include/svx/strings.hrc:162
 msgctxt "STR_EditMirrorFree"
 msgid "Flip %1 freehand"
 msgstr "Gwrthdroi %1 llaw rydd"
 
-#: strings.hrc:167
+#: include/svx/strings.hrc:163
 msgctxt "STR_EditShear"
 msgid "Distort %1 (slant)"
 msgstr "Aflunio %1(goleddfu)"
 
-#: strings.hrc:168
+#: include/svx/strings.hrc:164
 msgctxt "STR_EditCrook"
 msgid "Arrange %1 in circle"
 msgstr "Trefnu %1 mewn cylch"
 
-#: strings.hrc:169
+#: include/svx/strings.hrc:165
 msgctxt "STR_EditCrookContortion"
 msgid "Curve %1 in circle"
 msgstr "Cromlin %1 mewn cylch"
 
-#: strings.hrc:170
+#: include/svx/strings.hrc:166
 msgctxt "STR_EditDistort"
 msgid "Distort %1"
 msgstr "Aflunio %1"
 
-#: strings.hrc:171
+#: include/svx/strings.hrc:167
 msgctxt "STR_EditRipUp"
 msgid "Undo %1"
 msgstr "Dadwneud %1"
 
-#: strings.hrc:172
+#: include/svx/strings.hrc:168
 msgctxt "STR_EditSetPointsSmooth"
 msgid "Modify bézier properties of %1"
 msgstr "Newid priodweddau bézier %1"
 
-#: strings.hrc:173
+#: include/svx/strings.hrc:169
 msgctxt "STR_EditSetSegmentsKind"
 msgid "Modify bézier properties of %1"
 msgstr "Newid priodweddau bézier %1"
 
-#: strings.hrc:174
+#: include/svx/strings.hrc:170
 msgctxt "STR_EditSetGlueEscDir"
 msgid "Set exit direction for %1"
 msgstr "Gosod cyfeiriad gadael ar gyfer %1"
 
-#: strings.hrc:175
+#: include/svx/strings.hrc:171
 msgctxt "STR_EditSetGluePercent"
 msgid "Set relative attribute at %1"
 msgstr "Gosod priodoleddau perthynol yn %1"
 
-#: strings.hrc:176
+#: include/svx/strings.hrc:172
 msgctxt "STR_EditSetGlueAlign"
 msgid "Set reference point for %1"
 msgstr "Gosod pwynt cyfeirio ar gyfer %1"
 
-#: strings.hrc:177
+#: include/svx/strings.hrc:173
 msgctxt "STR_EditGroup"
 msgid "Group %1"
 msgstr "Grŵp %1"
 
-#: strings.hrc:178
+#: include/svx/strings.hrc:174
 msgctxt "STR_EditUngroup"
 msgid "Ungroup %1"
 msgstr "Dad-grwpio %1"
 
-#: strings.hrc:179
+#: include/svx/strings.hrc:175
 msgctxt "STR_EditSetAttributes"
 msgid "Apply attributes to %1"
 msgstr "Gosod priodoleddau i %1"
 
-#: strings.hrc:180
+#: include/svx/strings.hrc:176
 msgctxt "STR_EditSetStylesheet"
 msgid "Apply Styles to %1"
 msgstr "Gosod Arddulliau i %1"
 
-#: strings.hrc:181
+#: include/svx/strings.hrc:177
 msgctxt "STR_EditDelStylesheet"
 msgid "Remove Style from %1"
 msgstr "Tynnu Arddull o %1"
 
-#: strings.hrc:182
+#: include/svx/strings.hrc:178
 msgctxt "STR_EditConvToPoly"
 msgid "Convert %1 to polygon"
 msgstr "Trosi %1 i bolygon"
 
-#: strings.hrc:183
+#: include/svx/strings.hrc:179
 msgctxt "STR_EditConvToPolys"
 msgid "Convert %1 to polygons"
 msgstr "Trosi %1 yn bolygonau"
 
-#: strings.hrc:184
+#: include/svx/strings.hrc:180
 msgctxt "STR_EditConvToCurve"
 msgid "Convert %1 to curve"
 msgstr "Trosi %1 yn gromlin"
 
-#: strings.hrc:185
+#: include/svx/strings.hrc:181
 msgctxt "STR_EditConvToCurves"
 msgid "Convert %1 to curves"
 msgstr "Trosi %1 yn gromliniau"
 
-#: strings.hrc:186
+#: include/svx/strings.hrc:182
 msgctxt "STR_EditConvToContour"
 msgid "Convert %1 to contour"
 msgstr "Trosi %1 yn amlinell"
 
-#: strings.hrc:187
+#: include/svx/strings.hrc:183
 msgctxt "STR_EditConvToContours"
 msgid "Convert %1 to contours"
 msgstr "Trosi %1 yn amlinellau"
 
-#: strings.hrc:188
+#: include/svx/strings.hrc:184
 msgctxt "STR_EditAlign"
 msgid "Align %1"
 msgstr "Alinio %1"
 
-#: strings.hrc:189
+#: include/svx/strings.hrc:185
 msgctxt "STR_EditAlignVTop"
 msgid "Align %1 to top"
 msgstr "Alinio %1 i'r brig"
 
-#: strings.hrc:190
+#: include/svx/strings.hrc:186
 msgctxt "STR_EditAlignVBottom"
 msgid "Align %1 to bottom"
 msgstr "Alinio %1 i'r gwaelod"
 
-#: strings.hrc:191
+#: include/svx/strings.hrc:187
 msgctxt "STR_EditAlignVCenter"
 msgid "Horizontally center %1"
 msgstr "Canoli %1 yn llorweddol"
 
-#: strings.hrc:192
+#: include/svx/strings.hrc:188
 msgctxt "STR_EditAlignHLeft"
 msgid "Align %1 to left"
 msgstr "Alinio %1 i'r chwith"
 
-#: strings.hrc:193
+#: include/svx/strings.hrc:189
 msgctxt "STR_EditAlignHRight"
 msgid "Align %1 to right"
 msgstr "Alinio %1 i'r dde"
 
-#: strings.hrc:194
+#: include/svx/strings.hrc:190
 msgctxt "STR_EditAlignHCenter"
 msgid "Vertically center %1"
 msgstr "Canoli %1 yn fertigol"
 
-#: strings.hrc:195
+#: include/svx/strings.hrc:191
 msgctxt "STR_EditAlignCenter"
 msgid "Center %1"
 msgstr "Canoli %1"
 
-#: strings.hrc:196
+#: include/svx/strings.hrc:192
 msgctxt "STR_EditTransform"
 msgid "Transform %1"
 msgstr "Trawsnewid %1"
 
-#: strings.hrc:197
+#: include/svx/strings.hrc:193
 msgctxt "STR_EditCombine_PolyPoly"
 msgid "Combine %1"
 msgstr "Cyfuno %1"
 
-#: strings.hrc:198
+#: include/svx/strings.hrc:194
 msgctxt "STR_EditMergeMergePoly"
 msgid "Merge %1"
 msgstr "Uno %1"
 
-#: strings.hrc:199
+#: include/svx/strings.hrc:195
 msgctxt "STR_EditMergeSubstractPoly"
 msgid "Subtract %1"
 msgstr "Tynnu %1"
 
-#: strings.hrc:200
+#: include/svx/strings.hrc:196
 msgctxt "STR_EditMergeIntersectPoly"
 msgid "Intersect %1"
 msgstr "Croestorri %1"
 
-#: strings.hrc:201
+#: include/svx/strings.hrc:197
 msgctxt "STR_DistributeMarkedObjects"
 msgid "Distribute selected objects"
 msgstr "Dosbarthu gwrthrychau dewis"
 
-#: strings.hrc:202
+#: include/svx/strings.hrc:198
 msgctxt "STR_EqualizeWidthMarkedObjects"
 msgid "Equalize Width %1"
 msgstr "Cysoni Lled %1"
 
-#: strings.hrc:203
+#: include/svx/strings.hrc:199
 msgctxt "STR_EqualizeHeightMarkedObjects"
 msgid "Equalize Height %1"
 msgstr "Cysoni Uchder %1"
 
-#: strings.hrc:204
+#: include/svx/strings.hrc:200
 msgctxt "STR_EditCombine_OnePoly"
 msgid "Combine %1"
 msgstr "Cyfuno %1"
 
-#: strings.hrc:205
+#: include/svx/strings.hrc:201
 msgctxt "STR_EditDismantle_Polys"
 msgid "Split %1"
 msgstr "Hollti %1"
 
-#: strings.hrc:206
+#: include/svx/strings.hrc:202
 msgctxt "STR_EditDismantle_Lines"
 msgid "Split %1"
 msgstr "Hollti %1"
 
-#: strings.hrc:207
+#: include/svx/strings.hrc:203
 msgctxt "STR_EditImportMtf"
 msgid "Split %1"
 msgstr "Hollti %1"
 
-#: strings.hrc:208
+#: include/svx/strings.hrc:204
 msgctxt "STR_ExchangePaste"
 msgid "Insert object(s)"
 msgstr "Mewnosod gwrthrych(au)"
 
-#: strings.hrc:209
+#: include/svx/strings.hrc:205
 msgctxt "STR_DragInsertPoint"
 msgid "Insert point to %1"
 msgstr "Mewnosod pwynt i %1"
 
-#: strings.hrc:210
+#: include/svx/strings.hrc:206
 msgctxt "STR_DragInsertGluePoint"
 msgid "Insert glue point to %1"
 msgstr "Mewnosod pwynt gludo i %1"
 
-#: strings.hrc:211
+#: include/svx/strings.hrc:207
 msgctxt "STR_DragMethMovHdl"
 msgid "Move reference-point"
 msgstr "Symud pwynt cyfeirio"
 
-#: strings.hrc:212
+#: include/svx/strings.hrc:208
 msgctxt "STR_DragMethObjOwn"
 msgid "Geometrically change %1"
 msgstr "Newid %1 yn geometraidd"
 
-#: strings.hrc:213
+#: include/svx/strings.hrc:209
 msgctxt "STR_DragMethMove"
 msgid "Move %1"
 msgstr "Symud %1"
 
-#: strings.hrc:214
+#: include/svx/strings.hrc:210
 msgctxt "STR_DragMethResize"
 msgid "Resize %1"
 msgstr "Newid maint %1"
 
-#: strings.hrc:215
+#: include/svx/strings.hrc:211
 msgctxt "STR_DragMethRotate"
 msgid "Rotate %1"
 msgstr "Cylchdroi %1"
 
-#: strings.hrc:216
+#: include/svx/strings.hrc:212
 msgctxt "STR_DragMethMirrorHori"
 msgid "Flip %1 horizontal"
 msgstr "Gwrthdroi %1 yn llorweddol"
 
-#: strings.hrc:217
+#: include/svx/strings.hrc:213
 msgctxt "STR_DragMethMirrorVert"
 msgid "Flip %1 vertical"
 msgstr "Gwrthdroi %1 yn fertigol"
 
-#: strings.hrc:218
+#: include/svx/strings.hrc:214
 msgctxt "STR_DragMethMirrorDiag"
 msgid "Flip %1 diagonal"
 msgstr "Gwrthdroi %1 yn groeslin"
 
-#: strings.hrc:219
+#: include/svx/strings.hrc:215
 msgctxt "STR_DragMethMirrorFree"
 msgid "Flip %1 freehand"
 msgstr "Gwrthdroi %1 llaw rydd"
 
-#: strings.hrc:220
+#: include/svx/strings.hrc:216
 msgctxt "STR_DragMethGradient"
 msgid "Interactive gradient for %1"
 msgstr "Graddiant rhyngweithiol %1"
 
-#: strings.hrc:221
+#: include/svx/strings.hrc:217
 msgctxt "STR_DragMethTransparence"
 msgid "Interactive transparency for %1"
 msgstr "Tryloywder rhyngweithiol %1"
 
-#: strings.hrc:222
+#: include/svx/strings.hrc:218
 msgctxt "STR_DragMethShear"
 msgid "Distort %1 (slant)"
 msgstr "Aflunio %1(goleddfu)"
 
-#: strings.hrc:223
+#: include/svx/strings.hrc:219
 msgctxt "STR_DragMethCrook"
 msgid "Arrange %1 in circle"
 msgstr "Trefnu %1 mewn cylch"
 
-#: strings.hrc:224
+#: include/svx/strings.hrc:220
 msgctxt "STR_DragMethCrookContortion"
 msgid "Curve %1 in circle"
 msgstr "Cromlin %1 mewn cylch"
 
-#: strings.hrc:225
+#: include/svx/strings.hrc:221
 msgctxt "STR_DragMethDistort"
 msgid "Distort %1"
 msgstr "Aflunio %1"
 
-#: strings.hrc:226
+#: include/svx/strings.hrc:222
 msgctxt "STR_DragMethCrop"
 msgid "Crop %1"
 msgstr "Tocio %1"
 
-#: strings.hrc:227
+#: include/svx/strings.hrc:223
 msgctxt "STR_DragRectEckRad"
 msgid "Alter radius by %1"
 msgstr "Newid radiws yn ôl %1"
 
-#: strings.hrc:228
+#: include/svx/strings.hrc:224
 msgctxt "STR_DragPathObj"
 msgid "Change %1"
 msgstr "Newid %1"
 
-#: strings.hrc:229
+#: include/svx/strings.hrc:225
 msgctxt "STR_DragRectResize"
 msgid "Resize %1"
 msgstr "Newid maint %1"
 
-#: strings.hrc:230
+#: include/svx/strings.hrc:226
 msgctxt "STR_DragCaptFram"
 msgid "Move %1"
 msgstr "Symud %1"
 
-#: strings.hrc:231
+#: include/svx/strings.hrc:227
 msgctxt "STR_DragCaptTail"
 msgid "Move end point of %1"
 msgstr "Symud pwynt diwedd %1"
 
-#: strings.hrc:232
+#: include/svx/strings.hrc:228
 msgctxt "STR_DragCircAngle"
 msgid "Adjust angle by %1"
 msgstr "Newid ongl %1"
 
-#: strings.hrc:233
+#: include/svx/strings.hrc:229
 msgctxt "STR_DragEdgeTail"
 msgid "Change %1"
 msgstr "Newid %1"
 
-#: strings.hrc:234
+#: include/svx/strings.hrc:230
 msgctxt "STR_ViewTextEdit"
 msgid "TextEdit: Paragraph %1, Row %2, Column %3"
 msgstr "Golygu Testun: Paragraff %1, Rhes %2, Colofn %3"
 
-#: strings.hrc:235
+#: include/svx/strings.hrc:231
 msgctxt "STR_ViewMarked"
 msgid "%1 selected"
 msgstr "Dewis %1"
 
-#: strings.hrc:236
+#: include/svx/strings.hrc:232
 msgctxt "STR_ViewMarkedPoint"
 msgid "Point from %1"
 msgstr "Pwynt o %1"
 
-#: strings.hrc:237
+#: include/svx/strings.hrc:233
 msgctxt "STR_ViewMarkedPoints"
 msgid "%2 points from %1"
 msgstr "%2 pwynt o %1"
 
-#: strings.hrc:238
+#: include/svx/strings.hrc:234
 msgctxt "STR_ViewMarkedGluePoint"
 msgid "Glue point from %1"
 msgstr "Pwynt gludo o %1"
 
-#: strings.hrc:239
+#: include/svx/strings.hrc:235
 msgctxt "STR_ViewMarkedGluePoints"
 msgid "%2 glue points from %1"
 msgstr "%2 pwynt gludo o %1"
 
-#: strings.hrc:240
+#: include/svx/strings.hrc:236
 msgctxt "STR_ViewMarkObjs"
 msgid "Mark objects"
 msgstr "Marcio gwrthrychau"
 
-#: strings.hrc:241
+#: include/svx/strings.hrc:237
 msgctxt "STR_ViewMarkMoreObjs"
 msgid "Mark additional objects"
 msgstr "Marcio gwrthrychau ychwanegol"
 
-#: strings.hrc:242
+#: include/svx/strings.hrc:238
 msgctxt "STR_ViewMarkPoints"
 msgid "Mark points"
 msgstr "Pwyntiau marcio"
 
-#: strings.hrc:243
+#: include/svx/strings.hrc:239
 msgctxt "STR_ViewMarkMorePoints"
 msgid "Mark additional points"
 msgstr "Marcio pwyntiau ychwanegol"
 
-#: strings.hrc:244
+#: include/svx/strings.hrc:240
 msgctxt "STR_ViewMarkGluePoints"
 msgid "Mark glue points"
 msgstr "Marcio pwyntiau gludo"
 
-#: strings.hrc:245
+#: include/svx/strings.hrc:241
 msgctxt "STR_ViewMarkMoreGluePoints"
 msgid "Mark additional glue points"
 msgstr "Marcio pwyntiau gludo ychwanegol"
 
-#: strings.hrc:246
+#: include/svx/strings.hrc:242
 msgctxt "STR_ViewCreateObj"
 msgid "Create %1"
 msgstr "Creu %1"
 
-#: strings.hrc:247
+#: include/svx/strings.hrc:243
 msgctxt "STR_UndoInsertObj"
 msgid "Insert %1"
 msgstr "Mewnosod %1"
 
-#: strings.hrc:248
+#: include/svx/strings.hrc:244
 msgctxt "STR_UndoCopyObj"
 msgid "Copy %1"
 msgstr "Copïo %1"
 
-#: strings.hrc:249
+#: include/svx/strings.hrc:245
 msgctxt "STR_UndoObjOrdNum"
 msgid "Change object order of %1"
 msgstr "Newid trefn gwrthrych %1"
 
-#: strings.hrc:250
+#: include/svx/strings.hrc:246
 msgctxt "STR_UndoObjSetText"
 msgid "Edit text of %1"
 msgstr "Golygu testun %1"
 
-#: strings.hrc:251
+#: include/svx/strings.hrc:247
 msgctxt "STR_UndoNewPage"
 msgid "Insert page"
 msgstr "Mewnosod tudalen"
 
-#: strings.hrc:252
+#: include/svx/strings.hrc:248
 msgctxt "STR_UndoDelPage"
 msgid "Delete page"
 msgstr "Dileu tudalen"
 
-#: strings.hrc:253
+#: include/svx/strings.hrc:249
 msgctxt "STR_UndoCopPage"
 msgid "Copy page"
 msgstr "Copïo dudalen"
 
-#: strings.hrc:254
+#: include/svx/strings.hrc:250
 msgctxt "STR_UndoMovPage"
 msgid "Change order of pages"
 msgstr "Newid trefn tudalennau"
 
-#: strings.hrc:255
+#: include/svx/strings.hrc:251
 msgctxt "STR_UndoDelPageMasterDscr"
 msgid "Clear background page assignment"
 msgstr "Clirio aseiniad tudalen cefndir"
 
-#: strings.hrc:256
+#: include/svx/strings.hrc:252
 msgctxt "STR_UndoChgPageMasterDscr"
 msgid "Change background page assignment"
 msgstr "Newid neilltuad tudalen cefndir"
 
-#: strings.hrc:257
+#: include/svx/strings.hrc:253
 msgctxt "STR_UndoMergeModel"
 msgid "Insert document"
 msgstr "Mewnosod dogfen"
 
-#: strings.hrc:258
+#: include/svx/strings.hrc:254
 msgctxt "STR_UndoNewLayer"
 msgid "Insert Layer"
 msgstr "Mewnosod Haen"
 
-#: strings.hrc:259
+#: include/svx/strings.hrc:255
 msgctxt "STR_UndoDelLayer"
 msgid "Delete layer"
 msgstr "Dileu haen"
 
-#: strings.hrc:260
+#: include/svx/strings.hrc:256
 msgctxt "STR_UndoMovLayer"
 msgid "Change order of layers"
 msgstr "Newid trefn haenau"
 
 #. Undo/Redo for setting object's name (#i73249#)
-#: strings.hrc:262
+#: include/svx/strings.hrc:258
 msgctxt "STR_UndoObjName"
 msgid "Change object name of %1 to"
 msgstr "Newid enw gwrthrych %1 i"
 
-#: strings.hrc:263
+#: include/svx/strings.hrc:259
 msgctxt "STR_UndoObjTitle"
 msgid "Change object title of %1"
 msgstr "Newid teitl gwrthrych %1"
 
-#: strings.hrc:264
+#: include/svx/strings.hrc:260
 msgctxt "STR_UndoObjDescription"
 msgid "Change object description of %1"
 msgstr "Newid disgrifiad gwrthrych %1"
 
-#: strings.hrc:265
+#: include/svx/strings.hrc:261
 msgctxt "STR_StandardLayerName"
 msgid "Standard"
 msgstr "Safonol"
 
-#: strings.hrc:266
+#: include/svx/strings.hrc:262
 msgctxt "STR_ItemValON"
 msgid "on"
 msgstr "ymlaen"
 
-#: strings.hrc:267
+#: include/svx/strings.hrc:263
 msgctxt "STR_ItemValOFF"
 msgid "off"
 msgstr "diffodd"
 
-#: strings.hrc:268
+#: include/svx/strings.hrc:264
 msgctxt "STR_ItemValYES"
 msgid "yes"
 msgstr "iawn"
 
-#: strings.hrc:269
+#: include/svx/strings.hrc:265
 msgctxt "STR_ItemValNO"
 msgid "No"
 msgstr "Na"
 
-#: strings.hrc:270
+#: include/svx/strings.hrc:266
 msgctxt "STR_ItemValCAPTIONTYPE1"
 msgid "Type 1"
 msgstr "Math 1"
 
-#: strings.hrc:271
+#: include/svx/strings.hrc:267
 msgctxt "STR_ItemValCAPTIONTYPE2"
 msgid "Type 2"
 msgstr "Math 2"
 
-#: strings.hrc:272
+#: include/svx/strings.hrc:268
 msgctxt "STR_ItemValCAPTIONTYPE3"
 msgid "Type 3"
 msgstr "Math 3"
 
-#: strings.hrc:273
+#: include/svx/strings.hrc:269
 msgctxt "STR_ItemValCAPTIONTYPE4"
 msgid "Type 4"
 msgstr "Math 4"
 
-#: strings.hrc:274
+#: include/svx/strings.hrc:270
 msgctxt "STR_ItemValCAPTIONESCHORI"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: strings.hrc:275
+#: include/svx/strings.hrc:271
 msgctxt "STR_ItemValCAPTIONESCVERT"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: strings.hrc:276
+#: include/svx/strings.hrc:272
 msgctxt "STR_ItemValCAPTIONESCBESTFIT"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: strings.hrc:277
+#: include/svx/strings.hrc:273
 msgctxt "STR_ItemValFITTOSIZENONE"
 msgid "Off"
 msgstr "Diffodd"
 
-#: strings.hrc:278
+#: include/svx/strings.hrc:274
 msgctxt "STR_ItemValFITTOSIZEPROP"
 msgid "Proportional"
 msgstr "Cymesur"
 
-#: strings.hrc:279
+#: include/svx/strings.hrc:275
 msgctxt "STR_ItemValFITTOSIZEALLLINES"
 msgid "Fit to size (all rows separately) "
 msgstr "Ffitio i'r maint (pob rhes ar wahân) "
 
-#: strings.hrc:280
+#: include/svx/strings.hrc:276
 msgctxt "STR_ItemValFITTOSIZERESIZEAT"
 msgid "Use hard attributes"
 msgstr "Defnyddio priodoleddau caled"
 
-#: strings.hrc:281
+#: include/svx/strings.hrc:277
 msgctxt "STR_ItemValTEXTVADJTOP"
 msgid "Top"
 msgstr "Brig"
 
-#: strings.hrc:282
+#: include/svx/strings.hrc:278
 msgctxt "STR_ItemValTEXTVADJCENTER"
 msgid "Center"
 msgstr "Canol"
 
-#: strings.hrc:283
+#: include/svx/strings.hrc:279
 msgctxt "STR_ItemValTEXTVADJBOTTOM"
 msgid "Bottom"
 msgstr "Gwaelod"
 
-#: strings.hrc:284
+#: include/svx/strings.hrc:280
 msgctxt "STR_ItemValTEXTVADJBLOCK"
 msgid "Use entire height"
 msgstr "Ddefnyddio uchder llawn"
 
-#: strings.hrc:285
+#: include/svx/strings.hrc:281
 msgctxt "STR_ItemValTEXTVADJSTRETCH"
 msgid "Stretched"
 msgstr "Estynedig"
 
-#: strings.hrc:286
+#: include/svx/strings.hrc:282
 msgctxt "STR_ItemValTEXTHADJLEFT"
 msgid "Left"
 msgstr "Chwith"
 
-#: strings.hrc:287
+#: include/svx/strings.hrc:283
 msgctxt "STR_ItemValTEXTHADJCENTER"
 msgid "Center"
 msgstr "Canol"
 
-#: strings.hrc:288
+#: include/svx/strings.hrc:284
 msgctxt "STR_ItemValTEXTHADJRIGHT"
 msgid "Right"
 msgstr "De"
 
-#: strings.hrc:289
+#: include/svx/strings.hrc:285
 msgctxt "STR_ItemValTEXTHADJBLOCK"
 msgid "Use entire width"
 msgstr "Defnyddio'r lled llawn"
 
-#: strings.hrc:290
+#: include/svx/strings.hrc:286
 msgctxt "STR_ItemValTEXTHADJSTRETCH"
 msgid "Stretched"
 msgstr "Estynedig"
 
-#: strings.hrc:291
+#: include/svx/strings.hrc:287
 msgctxt "STR_ItemValTEXTANI_NONE"
 msgid "off"
 msgstr "diffodd"
 
-#: strings.hrc:292
+#: include/svx/strings.hrc:288
 msgctxt "STR_ItemValTEXTANI_BLINK"
 msgid "flash"
 msgstr "fflash"
 
-#: strings.hrc:293
+#: include/svx/strings.hrc:289
 msgctxt "STR_ItemValTEXTANI_SCROLL"
 msgid "Scroll Through"
 msgstr "Sgrolio Drwodd"
 
-#: strings.hrc:294
+#: include/svx/strings.hrc:290
 msgctxt "STR_ItemValTEXTANI_ALTERNATE"
 msgid "alternating"
 msgstr "bob yn ail"
 
-#: strings.hrc:295
+#: include/svx/strings.hrc:291
 msgctxt "STR_ItemValTEXTANI_SLIDE"
 msgid "Scroll In"
 msgstr "Sgrolio i Mewn"
 
-#: strings.hrc:296
+#: include/svx/strings.hrc:292
 msgctxt "STR_ItemValTEXTANI_LEFT"
 msgid "left"
 msgstr "chwith"
 
-#: strings.hrc:297
+#: include/svx/strings.hrc:293
 msgctxt "STR_ItemValTEXTANI_UP"
 msgid "up"
 msgstr "i fyny"
 
-#: strings.hrc:298
+#: include/svx/strings.hrc:294
 msgctxt "STR_ItemValTEXTANI_RIGHT"
 msgid "right"
 msgstr "de"
 
-#: strings.hrc:299
+#: include/svx/strings.hrc:295
 msgctxt "STR_ItemValTEXTANI_DOWN"
 msgid "down"
 msgstr "i lawr"
 
-#: strings.hrc:300
+#: include/svx/strings.hrc:296
 msgctxt "STR_ItemValEDGE_ORTHOLINES"
 msgid "Standard Connector"
 msgstr "Cysylltydd Safonol"
 
-#: strings.hrc:301
+#: include/svx/strings.hrc:297
 msgctxt "STR_ItemValEDGE_THREELINES"
 msgid "Line Connector"
 msgstr "Cysylltydd Llinell"
 
-#: strings.hrc:302
+#: include/svx/strings.hrc:298
 msgctxt "STR_ItemValEDGE_ONELINE"
 msgid "Straight Connector"
 msgstr "Cysylltydd Syth"
 
-#: strings.hrc:303
+#: include/svx/strings.hrc:299
 msgctxt "STR_ItemValEDGE_BEZIER"
 msgid "Curved Connector"
 msgstr "Cysylltydd Cromlin"
 
-#: strings.hrc:304
+#: include/svx/strings.hrc:300
 msgctxt "STR_ItemValMEASURE_STD"
 msgid "Standard"
 msgstr "Safonol"
 
-#: strings.hrc:305
+#: include/svx/strings.hrc:301
 msgctxt "STR_ItemValMEASURE_RADIUS"
 msgid "Radius"
 msgstr "Radiws"
 
-#: strings.hrc:306
+#: include/svx/strings.hrc:302
 msgctxt "STR_ItemValMEASURE_TEXTHAUTO"
 msgid "automatic"
 msgstr "awtomatig"
 
-#: strings.hrc:307
+#: include/svx/strings.hrc:303
 msgctxt "STR_ItemValMEASURE_TEXTLEFTOUTSIDE"
 msgid "left outside"
 msgstr "chwith allanol"
 
-#: strings.hrc:308
+#: include/svx/strings.hrc:304
 msgctxt "STR_ItemValMEASURE_TEXTINSIDE"
 msgid "inside (centered)"
 msgstr "o fewn (canol)"
 
-#: strings.hrc:309
+#: include/svx/strings.hrc:305
 msgctxt "STR_ItemValMEASURE_TEXTRIGHTOUTSID"
 msgid "right outside"
 msgstr "de allanol"
 
-#: strings.hrc:310
+#: include/svx/strings.hrc:306
 msgctxt "STR_ItemValMEASURE_TEXTVAUTO"
 msgid "automatic"
 msgstr "awtomatig"
 
-#: strings.hrc:311
+#: include/svx/strings.hrc:307
 msgctxt "STR_ItemValMEASURE_ABOVE"
 msgid "on the line"
 msgstr "ar y llinell"
 
-#: strings.hrc:312
+#: include/svx/strings.hrc:308
 msgctxt "STR_ItemValMEASURETEXT_BREAKEDLINE"
 msgid "broken line"
 msgstr "llinell doredig"
 
-#: strings.hrc:313
+#: include/svx/strings.hrc:309
 msgctxt "STR_ItemValMEASURE_BELOW"
 msgid "below the line"
 msgstr "islaw'r llinell"
 
-#: strings.hrc:314
+#: include/svx/strings.hrc:310
 msgctxt "STR_ItemValMEASURETEXT_VERTICALCEN"
 msgid "centered"
 msgstr "canoli"
 
-#: strings.hrc:315
+#: include/svx/strings.hrc:311
 msgctxt "STR_ItemValCIRC_FULL"
 msgid "full circle"
 msgstr "cylch llawn"
 
-#: strings.hrc:316
+#: include/svx/strings.hrc:312
 msgctxt "STR_ItemValCIRC_SECT"
 msgid "Circle Pie"
 msgstr "Siart Cylch"
 
-#: strings.hrc:317
+#: include/svx/strings.hrc:313
 msgctxt "STR_ItemValCIRC_CUT"
 msgid "Circle segment"
 msgstr "Segment cylch"
 
-#: strings.hrc:318
+#: include/svx/strings.hrc:314
 msgctxt "STR_ItemValCIRC_ARC"
 msgid "Arc"
 msgstr "Arc"
 
 #. Strings for the templates dialog
-#: strings.hrc:320
+#: include/svx/strings.hrc:316
 msgctxt "SIP_UNKNOWN_ATTR"
 msgid "Unknown attribute"
 msgstr "Priodoledd anhysbys"
 
 #. Strings for the templates dialog
-#: strings.hrc:322
+#: include/svx/strings.hrc:318
 msgctxt "SIP_XA_LINESTYLE"
 msgid "Line style"
 msgstr "Llinell"
 
-#: strings.hrc:323
+#: include/svx/strings.hrc:319
 msgctxt "SIP_XA_LINEDASH"
 msgid "Line pattern"
 msgstr "Patrwm llinell"
 
-#: strings.hrc:324
+#: include/svx/strings.hrc:320
 msgctxt "SIP_XA_LINEWIDTH"
 msgid "Line width"
 msgstr "Lled llinell"
 
-#: strings.hrc:325
+#: include/svx/strings.hrc:321
 msgctxt "SIP_XA_LINECOLOR"
 msgid "Line color"
 msgstr "Lliw llinell"
 
-#: strings.hrc:326
+#: include/svx/strings.hrc:322
 msgctxt "SIP_XA_LINESTART"
 msgid "Line head"
 msgstr "Pen llinell"
 
-#: strings.hrc:327
+#: include/svx/strings.hrc:323
 msgctxt "SIP_XA_LINEEND"
 msgid "Line end"
 msgstr "Diwedd llinell"
 
-#: strings.hrc:328
+#: include/svx/strings.hrc:324
 msgctxt "SIP_XA_LINESTARTWIDTH"
 msgid "Line head width"
 msgstr "Lled pen llinell"
 
-#: strings.hrc:329
+#: include/svx/strings.hrc:325
 msgctxt "SIP_XA_LINEENDWIDTH"
 msgid "Line end width"
 msgstr "Lled diwedd llinell"
 
-#: strings.hrc:330
+#: include/svx/strings.hrc:326
 msgctxt "SIP_XA_LINESTARTCENTER"
 msgid "Center arrowhead"
 msgstr "Canoli pen saeth"
 
-#: strings.hrc:331
+#: include/svx/strings.hrc:327
 msgctxt "SIP_XA_LINEENDCENTER"
 msgid "Center arrowend"
 msgstr "Canoli diwedd saeth"
 
-#: strings.hrc:332
+#: include/svx/strings.hrc:328
 msgctxt "SIP_XA_LINETRANSPARENCE"
 msgid "Line transparency"
 msgstr "Tryloywder llinell"
 
-#: strings.hrc:333
+#: include/svx/strings.hrc:329
 msgctxt "SIP_XA_LINEJOINT"
 msgid "Line joint"
 msgstr "Uniad llinell"
 
-#: strings.hrc:334
+#: include/svx/strings.hrc:330
 msgctxt "SIP_XATTRSET_LINE"
 msgid "Line attributes"
 msgstr "Priodoleddau llinell"
 
-#: strings.hrc:335
+#: include/svx/strings.hrc:331
 msgctxt "SIP_XA_FILLSTYLE"
 msgid "Fill style"
 msgstr "Llanw"
 
-#: strings.hrc:336
+#: include/svx/strings.hrc:332
 msgctxt "SIP_XA_FILLCOLOR"
 msgid "Fillcolor"
 msgstr "Lliw llanw"
 
-#: strings.hrc:337
+#: include/svx/strings.hrc:333
 msgctxt "SIP_XA_FILLGRADIENT"
 msgid "Gradient"
 msgstr "Graddiant"
 
-#: strings.hrc:338
+#: include/svx/strings.hrc:334
 msgctxt "SIP_XA_FILLHATCH"
 msgid "Hatching"
 msgstr "Croes-liniogi"
 
-#: strings.hrc:339
+#: include/svx/strings.hrc:335
 msgctxt "SIP_XA_FILLBITMAP"
 msgid "Fillbitmap"
 msgstr "Llanw didfap"
 
-#: strings.hrc:340
+#: include/svx/strings.hrc:336
 msgctxt "SIP_XA_FILLTRANSPARENCE"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: strings.hrc:341
+#: include/svx/strings.hrc:337
 msgctxt "SIP_XA_GRADIENTSTEPCOUNT"
 msgid "Number of gradient steps"
 msgstr "Nifer o gamau graddiant"
 
-#: strings.hrc:342
+#: include/svx/strings.hrc:338
 msgctxt "SIP_XA_FILLBMP_TILE"
 msgid "Tile fill"
 msgstr "Llanw teil"
 
-#: strings.hrc:343
+#: include/svx/strings.hrc:339
 msgctxt "SIP_XA_FILLBMP_POS"
 msgid "Fillbitmap position"
 msgstr "Safle llanw didfap"
 
-#: strings.hrc:344
+#: include/svx/strings.hrc:340
 msgctxt "SIP_XA_FILLBMP_SIZEX"
 msgid "Fillbitmap width"
 msgstr "Lled llanw didfap"
 
-#: strings.hrc:345
+#: include/svx/strings.hrc:341
 msgctxt "SIP_XA_FILLBMP_SIZEY"
 msgid "Height of fillbitmap"
 msgstr "Uchder didfap llawn"
 
-#: strings.hrc:346
+#: include/svx/strings.hrc:342
 msgctxt "SIP_XA_FILLFLOATTRANSPARENCE"
 msgid "Transparent gradient"
 msgstr "Graddiant tryloywder"
 
-#: strings.hrc:347
+#: include/svx/strings.hrc:343
 msgctxt "SIP_XA_SECONDARYFILLCOLOR"
 msgid "Fill reserved for 2"
 msgstr "Llanw ar gadw ar gyfer 2"
 
-#: strings.hrc:348
+#: include/svx/strings.hrc:344
 msgctxt "SIP_XA_FILLBMP_SIZELOG"
 msgid "Tile size not in %"
 msgstr "Maint teil nid mewn %"
 
-#: strings.hrc:349
+#: include/svx/strings.hrc:345
 msgctxt "SIP_XA_FILLBMP_TILEOFFSETX"
 msgid "Tile offset X in %"
 msgstr "Atred teil X mewn %"
 
-#: strings.hrc:350
+#: include/svx/strings.hrc:346
 msgctxt "SIP_XA_FILLBMP_TILEOFFSETY"
 msgid "Tile offset Y in %"
 msgstr "Atred teil I mewn %"
 
-#: strings.hrc:351
+#: include/svx/strings.hrc:347
 msgctxt "SIP_XA_FILLBMP_STRETCH"
 msgid "Bitmap scaling"
 msgstr "Graddio didfap"
 
-#: strings.hrc:352
+#: include/svx/strings.hrc:348
 msgctxt "SIP_XA_FILLBMP_POSOFFSETX"
 msgid "Tile position X in %"
 msgstr "Safle teil X mewn %"
 
-#: strings.hrc:353
+#: include/svx/strings.hrc:349
 msgctxt "SIP_XA_FILLBMP_POSOFFSETY"
 msgid "Tile position Y in %"
 msgstr "Safle teil Y mewn %"
 
-#: strings.hrc:354
+#: include/svx/strings.hrc:350
 msgctxt "SIP_XA_FILLBACKGROUND"
 msgid "Background fill"
 msgstr "Llanw cefndir"
 
-#: strings.hrc:355
+#: include/svx/strings.hrc:351
 msgctxt "SIP_XATTRSET_FILL"
 msgid "Area attributes"
 msgstr "Priodoleddau ardal"
 
-#: strings.hrc:356
+#: include/svx/strings.hrc:352
 msgctxt "SIP_XA_FORMTXTSTYLE"
 msgid "Fontwork style"
 msgstr "Arddull Fontwork"
 
-#: strings.hrc:357
+#: include/svx/strings.hrc:353
 msgctxt "SIP_XA_FORMTXTADJUST"
 msgid "Fontwork alignment"
 msgstr "Aliniad Fontwork"
 
-#: strings.hrc:358
+#: include/svx/strings.hrc:354
 msgctxt "SIP_XA_FORMTXTDISTANCE"
 msgid "Fontwork spacing"
 msgstr "Bylchu Fontwork"
 
-#: strings.hrc:359
+#: include/svx/strings.hrc:355
 msgctxt "SIP_XA_FORMTXTSTART"
 msgid "Fontwork font begin"
 msgstr "Cychwyn ffont Fontwork"
 
-#: strings.hrc:360
+#: include/svx/strings.hrc:356
 msgctxt "SIP_XA_FORMTXTMIRROR"
 msgid "Fontwork mirror"
 msgstr "Drych o Fontwork"
 
-#: strings.hrc:361
+#: include/svx/strings.hrc:357
 msgctxt "SIP_XA_FORMTXTOUTLINE"
 msgid "Fontwork outline"
 msgstr "Amlinell Fontwork"
 
-#: strings.hrc:362
+#: include/svx/strings.hrc:358
 msgctxt "SIP_XA_FORMTXTSHADOW"
 msgid "Fontwork shadow"
 msgstr "Cysgod Fontwork"
 
-#: strings.hrc:363
+#: include/svx/strings.hrc:359
 msgctxt "SIP_XA_FORMTXTSHDWCOLOR"
 msgid "Fontwork shadow color"
 msgstr "Lliw cysgod Fontwork"
 
-#: strings.hrc:364
+#: include/svx/strings.hrc:360
 msgctxt "SIP_XA_FORMTXTSHDWXVAL"
 msgid "Fontwork shadow offset X"
 msgstr "Atred X cysgod Fontwork"
 
-#: strings.hrc:365
+#: include/svx/strings.hrc:361
 msgctxt "SIP_XA_FORMTXTSHDWYVAL"
 msgid "Fontwork shadow offset Y"
 msgstr "Atred Y cysgod Fontwork"
 
-#: strings.hrc:366
+#: include/svx/strings.hrc:362
 msgctxt "SIP_XA_FORMTXTHIDEFORM"
 msgid "Hide fontwork outline"
 msgstr "Cuddio amlinell fontwork"
 
-#: strings.hrc:367
+#: include/svx/strings.hrc:363
 msgctxt "SIP_XA_FORMTXTSHDWTRANSP"
 msgid "Fontwork shadow transparency"
 msgstr "Tryloywder cysgod Fontwork"
 
-#: strings.hrc:368
+#: include/svx/strings.hrc:364
 msgctxt "SIP_SA_SHADOW"
 msgid "Shadow"
 msgstr "Cysgod"
 
-#: strings.hrc:369
+#: include/svx/strings.hrc:365
 msgctxt "SIP_SA_SHADOWCOLOR"
 msgid "Shadow color"
 msgstr "Lliw cysgod"
 
-#: strings.hrc:370
+#: include/svx/strings.hrc:366
 msgctxt "SIP_SA_SHADOWXDIST"
 msgid "Shadow spacing X"
 msgstr "Bylchu cysgod X"
 
-#: strings.hrc:371
+#: include/svx/strings.hrc:367
 msgctxt "SIP_SA_SHADOWYDIST"
 msgid "Shadow spacing Y"
 msgstr "Bylchu cysgod Y"
 
-#: strings.hrc:372
+#: include/svx/strings.hrc:368
 msgctxt "SIP_SA_SHADOWTRANSPARENCE"
 msgid "Shadow transparency"
 msgstr "Tryloywder cysgod"
 
-#: strings.hrc:373
+#: include/svx/strings.hrc:369
 msgctxt "SIP_SA_SHADOW3D"
 msgid "3D shadow"
 msgstr "Cysgod 3D"
 
-#: strings.hrc:374
+#: include/svx/strings.hrc:370
 msgctxt "SIP_SA_SHADOWPERSP"
 msgid "Perspective shadow"
 msgstr "Cysgod persbectif"
 
-#: strings.hrc:375
+#: include/svx/strings.hrc:371
 msgctxt "SIP_SA_CAPTIONTYPE"
 msgid "Type of legend"
 msgstr "Math fynegai"
 
-#: strings.hrc:376
+#: include/svx/strings.hrc:372
 msgctxt "SIP_SA_CAPTIONFIXEDANGLE"
 msgid "Fixed legend angle"
 msgstr "Dewis ongl fwyaf"
 
-#: strings.hrc:377
+#: include/svx/strings.hrc:373
 msgctxt "SIP_SA_CAPTIONANGLE"
 msgid "Legend angle"
 msgstr "Ongl mynegai"
 
-#: strings.hrc:378
+#: include/svx/strings.hrc:374
 msgctxt "SIP_SA_CAPTIONGAP"
 msgid "Legend lines spacing"
 msgstr "Bylchu i linellau mynegai"
 
-#: strings.hrc:379
+#: include/svx/strings.hrc:375
 msgctxt "SIP_SA_CAPTIONESCDIR"
 msgid "Legend exit alignment"
 msgstr "Aliniad gadael mynegai"
 
-#: strings.hrc:380
+#: include/svx/strings.hrc:376
 msgctxt "SIP_SA_CAPTIONESCISREL"
 msgid "Relative exit legend"
 msgstr "Mynegai gadael perthynol"
 
-#: strings.hrc:381
+#: include/svx/strings.hrc:377
 msgctxt "SIP_SA_CAPTIONESCREL"
 msgid "Relative exit legend"
 msgstr "Mynegai gadael perthynol"
 
-#: strings.hrc:382
+#: include/svx/strings.hrc:378
 msgctxt "SIP_SA_CAPTIONESCABS"
 msgid "Absolute exit of legend"
 msgstr "Diwedd terfynol mynegai"
 
-#: strings.hrc:383
+#: include/svx/strings.hrc:379
 msgctxt "SIP_SA_CAPTIONLINELEN"
 msgid "Legend line length"
 msgstr "Hyd llinell mynegai"
 
-#: strings.hrc:384
+#: include/svx/strings.hrc:380
 msgctxt "SIP_SA_CAPTIONFITLINELEN"
 msgid "AutoLength of legend lines"
 msgstr "AwtoHyd llinellau mynegai"
 
-#: strings.hrc:385
+#: include/svx/strings.hrc:381
 msgctxt "SIP_SA_ECKENRADIUS"
 msgid "Corner radius"
 msgstr "Radiws cornel"
 
-#: strings.hrc:386
+#: include/svx/strings.hrc:382
 msgctxt "SIP_SA_TEXT_MINFRAMEHEIGHT"
 msgid "Minimal frame height"
 msgstr "Uchder ffrâm lleiaf"
 
-#: strings.hrc:387
+#: include/svx/strings.hrc:383
 msgctxt "SIP_SA_TEXT_AUTOGROWHEIGHT"
 msgid "AutoFit height"
 msgstr "AwtoFfitio uchder"
 
-#: strings.hrc:388
+#: include/svx/strings.hrc:384
 msgctxt "SIP_SA_TEXT_FITTOSIZE"
 msgid "Fit text to frame"
 msgstr "Ffitio'r testun i'r ffrâm"
 
-#: strings.hrc:389
+#: include/svx/strings.hrc:385
 msgctxt "SIP_SA_TEXT_LEFTDIST"
 msgid "Left text frame spacing"
 msgstr "Bylchu ffrâm testun chwith"
 
-#: strings.hrc:390
+#: include/svx/strings.hrc:386
 msgctxt "SIP_SA_TEXT_RIGHTDIST"
 msgid "Right text frame spacing"
 msgstr "Bylchu ffrâm testun de"
 
-#: strings.hrc:391
+#: include/svx/strings.hrc:387
 msgctxt "SIP_SA_TEXT_UPPERDIST"
 msgid "Upper text frame spacing"
 msgstr "Bylchu ffrâm testun uchaf"
 
-#: strings.hrc:392
+#: include/svx/strings.hrc:388
 msgctxt "SIP_SA_TEXT_LOWERDIST"
 msgid "Lower text frame spacing"
 msgstr "Bylchu ffrâm testun isaf"
 
-#: strings.hrc:393
+#: include/svx/strings.hrc:389
 msgctxt "SIP_SA_TEXT_VERTADJUST"
 msgid "Vertical text anchor"
 msgstr "Angor testun fertigol"
 
-#: strings.hrc:394
+#: include/svx/strings.hrc:390
 msgctxt "SIP_SA_TEXT_MAXFRAMEHEIGHT"
 msgid "Maximal frame height"
 msgstr "Uchder ffrâm mwyaf"
 
-#: strings.hrc:395
+#: include/svx/strings.hrc:391
 msgctxt "SIP_SA_TEXT_MINFRAMEWIDTH"
 msgid "Minimal frame width"
 msgstr "Uchder lleiaf ffrâm"
 
-#: strings.hrc:396
+#: include/svx/strings.hrc:392
 msgctxt "SIP_SA_TEXT_MAXFRAMEWIDTH"
 msgid "Maximal frame width"
 msgstr "Lled ffrâm mwyaf"
 
-#: strings.hrc:397
+#: include/svx/strings.hrc:393
 msgctxt "SIP_SA_TEXT_AUTOGROWWIDTH"
 msgid "AutoFit width"
 msgstr "AwtoFfitio lled"
 
-#: strings.hrc:398
+#: include/svx/strings.hrc:394
 msgctxt "SIP_SA_TEXT_HORZADJUST"
 msgid "Horizontal text anchor"
 msgstr "Angor testun llorweddol"
 
-#: strings.hrc:399
+#: include/svx/strings.hrc:395
 msgctxt "SIP_SA_TEXT_ANIKIND"
 msgid "Ticker"
 msgstr "Ticiwr"
 
-#: strings.hrc:400
+#: include/svx/strings.hrc:396
 msgctxt "SIP_SA_TEXT_ANIDIRECTION"
 msgid "Ticker direction"
 msgstr "Cyfeiriad ticiwr"
 
-#: strings.hrc:401
+#: include/svx/strings.hrc:397
 msgctxt "SIP_SA_TEXT_ANISTARTINSIDE"
 msgid "Ticker start inside"
 msgstr "Ticiwr yn cychwyn o fewn"
 
-#: strings.hrc:402
+#: include/svx/strings.hrc:398
 msgctxt "SIP_SA_TEXT_ANISTOPINSIDE"
 msgid "Ticker stop inside"
 msgstr "Ticiwr yn atal o fewn"
 
-#: strings.hrc:403
+#: include/svx/strings.hrc:399
 msgctxt "SIP_SA_TEXT_ANICOUNT"
 msgid "Number of ticker runs"
 msgstr "Nifer o rediadau ticiwr"
 
-#: strings.hrc:404
+#: include/svx/strings.hrc:400
 msgctxt "SIP_SA_TEXT_ANIDELAY"
 msgid "Speed of ticker"
 msgstr "Cyflymder ticiwr"
 
-#: strings.hrc:405
+#: include/svx/strings.hrc:401
 msgctxt "SIP_SA_TEXT_ANIAMOUNT"
 msgid "Ticker step size"
 msgstr "Maint cam ticiwr"
 
-#: strings.hrc:406
+#: include/svx/strings.hrc:402
 msgctxt "SIP_SA_TEXT_CONTOURFRAME"
 msgid "Outline text flow"
 msgstr "Amlinell llif testun"
 
-#: strings.hrc:407
+#: include/svx/strings.hrc:403
 msgctxt "SIP_SA_XMLATTRIBUTES"
 msgid "User-defined attributes"
 msgstr "Priodoleddau defnyddiwr diffiniedig"
 
-#: strings.hrc:408
+#: include/svx/strings.hrc:404
 msgctxt "SIP_SA_TEXT_USEFIXEDCELLHEIGHT"
 msgid "Use font-independent line spacing"
 msgstr "Defnyddio bylchu llinell ffont annibynnol"
 
-#: strings.hrc:409
+#: include/svx/strings.hrc:405
 msgctxt "SIP_SA_WORDWRAP"
 msgid "Word wrap text in shape"
 msgstr "Amlapio testun mewn siâp"
 
-#: strings.hrc:410
+#: include/svx/strings.hrc:406
 msgctxt "SIP_SA_CHAINNEXTNAME"
 msgid "Next link in text chain"
 msgstr "Cysylltiad nesaf yng nghadwyn testun"
 
-#: strings.hrc:411
+#: include/svx/strings.hrc:407
 msgctxt "SIP_SA_EDGEKIND"
 msgid "Type of connector"
 msgstr "Math o gysylltydd"
 
-#: strings.hrc:412
+#: include/svx/strings.hrc:408
 msgctxt "SIP_SA_EDGENODE1HORZDIST"
 msgid "Horz. spacing object 1"
 msgstr "Gwrthrych bylchu llorweddol 1"
 
-#: strings.hrc:413
+#: include/svx/strings.hrc:409
 msgctxt "SIP_SA_EDGENODE1VERTDIST"
 msgid "Vert. spacing object 1"
 msgstr "Gwrthrych bylchu fertigol 1"
 
-#: strings.hrc:414
+#: include/svx/strings.hrc:410
 msgctxt "SIP_SA_EDGENODE2HORZDIST"
 msgid "Horz. spacing object 2"
 msgstr "Gwrthrych bylchu llorweddol 2"
 
-#: strings.hrc:415
+#: include/svx/strings.hrc:411
 msgctxt "SIP_SA_EDGENODE2VERTDIST"
 msgid "Vert. spacing object 2"
 msgstr "Gwrthrych bylchu fertigol 2"
 
-#: strings.hrc:416
+#: include/svx/strings.hrc:412
 msgctxt "SIP_SA_EDGENODE1GLUEDIST"
 msgid "Glue spacing object 1"
 msgstr "Gwrthrych bylchu gludo 1"
 
-#: strings.hrc:417
+#: include/svx/strings.hrc:413
 msgctxt "SIP_SA_EDGENODE2GLUEDIST"
 msgid "Glue spacing object 2"
 msgstr "Gwrthrych bylchu gludo 2"
 
-#: strings.hrc:418
+#: include/svx/strings.hrc:414
 msgctxt "SIP_SA_EDGELINEDELTACOUNT"
 msgid "Number of movable lines"
 msgstr "Nifer o linellau symudadwy"
 
-#: strings.hrc:419
+#: include/svx/strings.hrc:415
 msgctxt "SIP_SA_EDGELINE1DELTA"
 msgid "Offset line 1"
 msgstr "Llinell atred 1"
 
-#: strings.hrc:420
+#: include/svx/strings.hrc:416
 msgctxt "SIP_SA_EDGELINE2DELTA"
 msgid "Offset line 2"
 msgstr "Llinell atred 2"
 
-#: strings.hrc:421
+#: include/svx/strings.hrc:417
 msgctxt "SIP_SA_EDGELINE3DELTA"
 msgid "Offset line 3"
 msgstr "Llinell atred 3"
 
-#: strings.hrc:422
+#: include/svx/strings.hrc:418
 msgctxt "SIP_SA_MEASUREKIND"
 msgid "Type of dimensioning"
 msgstr "Math o ddimensiynu"
 
-#: strings.hrc:423
+#: include/svx/strings.hrc:419
 msgctxt "SIP_SA_MEASURETEXTHPOS"
 msgid "Dimension value - horizontal position"
 msgstr "Gwerth dimensiwn - safle llorweddol"
 
-#: strings.hrc:424
+#: include/svx/strings.hrc:420
 msgctxt "SIP_SA_MEASURETEXTVPOS"
 msgid "Dimension value - vertical position"
 msgstr "Gwerth dimensiwn - safle fertigol"
 
-#: strings.hrc:425
+#: include/svx/strings.hrc:421
 msgctxt "SIP_SA_MEASURELINEDIST"
 msgid "Dimension line space"
 msgstr "Bwlch llinell dimensiwn"
 
-#: strings.hrc:426
+#: include/svx/strings.hrc:422
 msgctxt "SIP_SA_MEASUREHELPLINEOVERHANG"
 msgid "Dimension help line overhang"
 msgstr "Bargodi llinell cymorth dimensiwn"
 
-#: strings.hrc:427
+#: include/svx/strings.hrc:423
 msgctxt "SIP_SA_MEASUREHELPLINEDIST"
 msgid "Dimension help line spacing"
 msgstr "Bylchu llinell cymorth dimensiwn"
 
-#: strings.hrc:428
+#: include/svx/strings.hrc:424
 msgctxt "SIP_SA_MEASUREHELPLINE1LEN"
 msgid "Backlog of dimension help line 1"
 msgstr "Gwaith i'w wneud ar gyfer llinell gymorth dimensiwn 1"
 
-#: strings.hrc:429
+#: include/svx/strings.hrc:425
 msgctxt "SIP_SA_MEASUREHELPLINE2LEN"
 msgid "Backlog of dimension help line 2"
 msgstr "Gwaith i'w wneud ar gyfer llinell gymorth dimensiwn 2"
 
-#: strings.hrc:430
+#: include/svx/strings.hrc:426
 msgctxt "SIP_SA_MEASUREBELOWREFEDGE"
 msgid "Lower edge dimensioning"
 msgstr "Ddimensiynu ymyl isaf"
 
-#: strings.hrc:431
+#: include/svx/strings.hrc:427
 msgctxt "SIP_SA_MEASURETEXTROTA90"
 msgid "Dimension value across dimension line"
 msgstr "Gwerth dimensiwn ar ddrws llinell dimensiwn"
 
-#: strings.hrc:432
+#: include/svx/strings.hrc:428
 msgctxt "SIP_SA_MEASURETEXTUPSIDEDOWN"
 msgid "Rotate dimension value by 180 degree"
 msgstr "Cylchdroi gwerth dimeniwn 180 gradd"
 
-#: strings.hrc:433
+#: include/svx/strings.hrc:429
 msgctxt "SIP_SA_MEASUREOVERHANG"
 msgid "Dimension line overhang"
 msgstr "Bargod llinell dimensiwn"
 
-#: strings.hrc:434
+#: include/svx/strings.hrc:430
 msgctxt "SIP_SA_MEASUREUNIT"
 msgid "Measure unit"
 msgstr "Uned fesur"
 
-#: strings.hrc:435
+#: include/svx/strings.hrc:431
 msgctxt "SIP_SA_MEASURESCALE"
 msgid "Additional scale factor"
 msgstr "Ffactor graddio ychwanegol"
 
-#: strings.hrc:436
+#: include/svx/strings.hrc:432
 msgctxt "SIP_SA_MEASURESHOWUNIT"
 msgid "Measure unit display"
 msgstr "Dangos uned fesur"
 
-#: strings.hrc:437
+#: include/svx/strings.hrc:433
 msgctxt "SIP_SA_MEASUREFORMATSTRING"
 msgid "Dimension value format"
 msgstr "Fformat gwerth dimensiwn"
 
-#: strings.hrc:438
+#: include/svx/strings.hrc:434
 msgctxt "SIP_SA_MEASURETEXTAUTOANGLE"
 msgid "AutoPositioning of the dimension value"
 msgstr "AwtoLeoli gwerth dimensiwn"
 
-#: strings.hrc:439
+#: include/svx/strings.hrc:435
 msgctxt "SIP_SA_MEASURETEXTAUTOANGLEVIEW"
 msgid "Angle for the automatic positioning of the dimension value"
 msgstr "Ongl lleoli awtomatig gwerth y dimensiwn"
 
-#: strings.hrc:440
+#: include/svx/strings.hrc:436
 msgctxt "SIP_SA_MEASURETEXTISFIXEDANGLE"
 msgid "Determination of the dimension value angle"
 msgstr "Pennu ongl gwerth dimensiwn"
 
-#: strings.hrc:441
+#: include/svx/strings.hrc:437
 msgctxt "SIP_SA_MEASURETEXTFIXEDANGLE"
 msgid "Angle of the dimension value"
 msgstr "Ongl gwerth dimensiwn"
 
-#: strings.hrc:442
+#: include/svx/strings.hrc:438
 msgctxt "SIP_SA_MEASUREDECIMALPLACES"
 msgid "Decimal places"
 msgstr "Lleoedd degol"
 
-#: strings.hrc:443
+#: include/svx/strings.hrc:439
 msgctxt "SIP_SA_CIRCKIND"
 msgid "Type of circle"
 msgstr "Math o gylch"
 
-#: strings.hrc:444
+#: include/svx/strings.hrc:440
 msgctxt "SIP_SA_CIRCSTARTANGLE"
 msgid "Start angle"
 msgstr "Ongl cychwyn"
 
-#: strings.hrc:445
+#: include/svx/strings.hrc:441
 msgctxt "SIP_SA_CIRCENDANGLE"
 msgid "End angle"
 msgstr "Ongl diwedd"
 
-#: strings.hrc:446
+#: include/svx/strings.hrc:442
 msgctxt "SIP_SA_OBJMOVEPROTECT"
 msgid "Protected object position"
 msgstr "Safle gwrthrych diogel"
 
-#: strings.hrc:447
+#: include/svx/strings.hrc:443
 msgctxt "SIP_SA_OBJSIZEPROTECT"
 msgid "Protected object size"
 msgstr "Maint gwrthrych diogel"
 
-#: strings.hrc:448
+#: include/svx/strings.hrc:444
 msgctxt "SIP_SA_OBJPRINTABLE"
 msgid "Object, printable"
 msgstr "Gwrthrych argraffadwy"
 
-#: strings.hrc:449
+#: include/svx/strings.hrc:445
 msgctxt "SIP_SA_OBJVISIBLE"
 msgid "Object, visible"
 msgstr "Gwrthrych, gweladwy"
 
-#: strings.hrc:450
+#: include/svx/strings.hrc:446
 msgctxt "SIP_SA_LAYERID"
 msgid "Level ID"
 msgstr "Enw Lefel"
 
-#: strings.hrc:451
+#: include/svx/strings.hrc:447
 msgctxt "SIP_SA_LAYERNAME"
 msgid "Layer"
 msgstr "Haen"
 
-#: strings.hrc:452
+#: include/svx/strings.hrc:448
 msgctxt "SIP_SA_OBJECTNAME"
 msgid "Object name"
 msgstr "Enw gwrthrych"
 
-#: strings.hrc:453
+#: include/svx/strings.hrc:449
 msgctxt "SIP_SA_ALLPOSITIONX"
 msgid "Position X, complete"
 msgstr "Gorffen safle X"
 
-#: strings.hrc:454
+#: include/svx/strings.hrc:450
 msgctxt "SIP_SA_ALLPOSITIONY"
 msgid "Position Y, complete"
 msgstr "Gorffen safle Y"
 
-#: strings.hrc:455
+#: include/svx/strings.hrc:451
 msgctxt "SIP_SA_ALLSIZEWIDTH"
 msgid "Total Width"
 msgstr "Cyfanswm Lled"
 
-#: strings.hrc:456
+#: include/svx/strings.hrc:452
 msgctxt "SIP_SA_ALLSIZEHEIGHT"
 msgid "Height, complete"
 msgstr "Uchder, gorffen"
 
-#: strings.hrc:457
+#: include/svx/strings.hrc:453
 msgctxt "SIP_SA_ONEPOSITIONX"
 msgid "Single position X"
 msgstr "Safle sengl X"
 
-#: strings.hrc:458
+#: include/svx/strings.hrc:454
 msgctxt "SIP_SA_ONEPOSITIONY"
 msgid "Single position Y"
 msgstr "Safle sengl Y"
 
-#: strings.hrc:459
+#: include/svx/strings.hrc:455
 msgctxt "SIP_SA_ONESIZEWIDTH"
 msgid "Single width"
 msgstr "Lled sengl"
 
-#: strings.hrc:460
+#: include/svx/strings.hrc:456
 msgctxt "SIP_SA_ONESIZEHEIGHT"
 msgid "Single height"
 msgstr "Uchder sengl"
 
-#: strings.hrc:461
+#: include/svx/strings.hrc:457
 msgctxt "SIP_SA_LOGICSIZEWIDTH"
 msgid "Logical width"
 msgstr "Lled resymegol"
 
-#: strings.hrc:462
+#: include/svx/strings.hrc:458
 msgctxt "SIP_SA_LOGICSIZEHEIGHT"
 msgid "Logical height"
 msgstr "Uchder rhesymegol"
 
-#: strings.hrc:463
+#: include/svx/strings.hrc:459
 msgctxt "SIP_SA_ROTATEANGLE"
 msgid "Single rotation angle"
 msgstr "Ongl troi sengl"
 
-#: strings.hrc:464
+#: include/svx/strings.hrc:460
 msgctxt "SIP_SA_SHEARANGLE"
 msgid "Single shear angle"
 msgstr "Ongl torri sengl"
 
-#: strings.hrc:465
+#: include/svx/strings.hrc:461
 msgctxt "SIP_SA_MOVEX"
 msgid "Move horizontally"
 msgstr "Symud yn llorweddol"
 
-#: strings.hrc:466
+#: include/svx/strings.hrc:462
 msgctxt "SIP_SA_MOVEY"
 msgid "Move vertically"
 msgstr "Symud yn fertigol"
 
-#: strings.hrc:467
+#: include/svx/strings.hrc:463
 msgctxt "SIP_SA_RESIZEXONE"
 msgid "Resize X, single"
 msgstr "Newid maint X, sengl"
 
-#: strings.hrc:468
+#: include/svx/strings.hrc:464
 msgctxt "SIP_SA_RESIZEYONE"
 msgid "Resize Y, single"
 msgstr "Newid maint Y, sengl"
 
-#: strings.hrc:469
+#: include/svx/strings.hrc:465
 msgctxt "SIP_SA_ROTATEONE"
 msgid "Single rotation"
 msgstr "Troad sengl"
 
-#: strings.hrc:470
+#: include/svx/strings.hrc:466
 msgctxt "SIP_SA_HORZSHEARONE"
 msgid "Single horizontal shear"
 msgstr "Toriad llorweddol sengl"
 
-#: strings.hrc:471
+#: include/svx/strings.hrc:467
 msgctxt "SIP_SA_VERTSHEARONE"
 msgid "Single vertical shear"
 msgstr "Toriad fertigol sengl"
 
-#: strings.hrc:472
+#: include/svx/strings.hrc:468
 msgctxt "SIP_SA_RESIZEXALL"
 msgid "Resize X, complete"
 msgstr "Newid maint X, llawn"
 
-#: strings.hrc:473
+#: include/svx/strings.hrc:469
 msgctxt "SIP_SA_RESIZEYALL"
 msgid "Resize Y, complete"
 msgstr "Newid maint Y, llawn"
 
-#: strings.hrc:474
+#: include/svx/strings.hrc:470
 msgctxt "SIP_SA_ROTATEALL"
 msgid "Rotate all"
 msgstr "Cylchdroi popeth"
 
-#: strings.hrc:475
+#: include/svx/strings.hrc:471
 msgctxt "SIP_SA_HORZSHEARALL"
 msgid "Shear horizontal, complete"
 msgstr "Cwblhawyd toriad llorweddol"
 
-#: strings.hrc:476
+#: include/svx/strings.hrc:472
 msgctxt "SIP_SA_VERTSHEARALL"
 msgid "Shear vertical, complete"
 msgstr "Cwblhawyd toriad fertigol"
 
-#: strings.hrc:477
+#: include/svx/strings.hrc:473
 msgctxt "SIP_SA_TRANSFORMREF1X"
 msgid "Reference point 1 X"
 msgstr "Pwynt cyfeirnod 1 X"
 
-#: strings.hrc:478
+#: include/svx/strings.hrc:474
 msgctxt "SIP_SA_TRANSFORMREF1Y"
 msgid "Reference point 1 Y"
 msgstr "Pwynt cyfeirnod 1 Y"
 
-#: strings.hrc:479
+#: include/svx/strings.hrc:475
 msgctxt "SIP_SA_TRANSFORMREF2X"
 msgid "Reference point 2 X"
 msgstr "Pwynt cyfeirnod 2 X"
 
-#: strings.hrc:480
+#: include/svx/strings.hrc:476
 msgctxt "SIP_SA_TRANSFORMREF2Y"
 msgid "Reference point 2 Y"
 msgstr "Pwynt cyfeirnod 2 Y"
 
-#: strings.hrc:481
+#: include/svx/strings.hrc:477
 msgctxt "SIP_EE_PARA_HYPHENATE"
 msgid "Hyphenation"
 msgstr "Cysylltnodi"
 
-#: strings.hrc:482
+#: include/svx/strings.hrc:478
 msgctxt "SIP_EE_PARA_BULLETSTATE"
 msgid "Display bullets"
 msgstr "Dangos bwledi"
 
-#: strings.hrc:483
+#: include/svx/strings.hrc:479
 msgctxt "SIP_EE_PARA_OUTLLRSPACE"
 msgid "Numbering indents"
 msgstr "Mewnoliad rhifo"
 
-#: strings.hrc:484
+#: include/svx/strings.hrc:480
 msgctxt "SIP_EE_PARA_OUTLLEVEL"
 msgid "Numbering level"
 msgstr "Lefel rhifo"
 
-#: strings.hrc:485
+#: include/svx/strings.hrc:481
 msgctxt "SIP_EE_PARA_BULLET"
 msgid "Bullets and Numberings"
 msgstr "Bwledi a Rhifo"
 
-#: strings.hrc:486
+#: include/svx/strings.hrc:482
 msgctxt "SIP_EE_PARA_LRSPACE"
 msgid "Indents"
 msgstr "Mewnoliadau"
 
-#: strings.hrc:487
+#: include/svx/strings.hrc:483
 msgctxt "SIP_EE_PARA_ULSPACE"
 msgid "Paragraph spacing"
 msgstr "Bylchu paragraff"
 
-#: strings.hrc:488
+#: include/svx/strings.hrc:484
 msgctxt "SIP_EE_PARA_SBL"
 msgid "Line spacing"
 msgstr "Bylchu llinell"
 
-#: strings.hrc:489
+#: include/svx/strings.hrc:485
 msgctxt "SIP_EE_PARA_JUST"
 msgid "Paragraph alignment"
 msgstr "Aliniad paragraff"
 
-#: strings.hrc:490
+#: include/svx/strings.hrc:486
 msgctxt "SIP_EE_PARA_TABS"
 msgid "Tabulators"
 msgstr "Tablwyr"
 
-#: strings.hrc:491
+#: include/svx/strings.hrc:487
 msgctxt "SIP_EE_CHAR_COLOR"
 msgid "Font color"
 msgstr "Lliw ffont"
 
-#: strings.hrc:492
+#: include/svx/strings.hrc:488
 msgctxt "SIP_EE_CHAR_FONTINFO"
 msgid "Character set"
 msgstr "Set nod"
 
-#: strings.hrc:493
+#: include/svx/strings.hrc:489
 msgctxt "SIP_EE_CHAR_FONTHEIGHT"
 msgid "Font size"
 msgstr "Maint ffont"
 
-#: strings.hrc:494
+#: include/svx/strings.hrc:490
 msgctxt "SIP_EE_CHAR_FONTWIDTH"
 msgid "Font width"
 msgstr "Lled ffont"
 
-#: strings.hrc:495
+#: include/svx/strings.hrc:491
 msgctxt "SIP_EE_CHAR_WEIGHT"
 msgid "Bold (thickness)"
 msgstr "Trwm (trwch)"
 
-#: strings.hrc:496
+#: include/svx/strings.hrc:492
 msgctxt "SIP_EE_CHAR_UNDERLINE"
 msgid "Underline"
 msgstr "Tanlinellu"
 
-#: strings.hrc:497
+#: include/svx/strings.hrc:493
 msgctxt "SIP_EE_CHAR_OVERLINE"
 msgid "Overline"
 msgstr "Troslinelll"
 
-#: strings.hrc:498
+#: include/svx/strings.hrc:494
 msgctxt "SIP_EE_CHAR_STRIKEOUT"
 msgid "Strikethrough"
 msgstr "Taro drwodd"
 
-#: strings.hrc:499
+#: include/svx/strings.hrc:495
 msgctxt "SIP_EE_CHAR_ITALIC"
 msgid "Italic"
 msgstr "Italig"
 
-#: strings.hrc:500
+#: include/svx/strings.hrc:496
 msgctxt "SIP_EE_CHAR_OUTLINE"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: strings.hrc:501
+#: include/svx/strings.hrc:497
 msgctxt "SIP_EE_CHAR_SHADOW"
 msgid "Font shadow"
 msgstr "Cysgod ffont"
 
-#: strings.hrc:502
+#: include/svx/strings.hrc:498
 msgctxt "SIP_EE_CHAR_ESCAPEMENT"
 msgid "Superscript/subscript"
 msgstr "Uwchysgrif/isysgrif"
 
-#: strings.hrc:503
+#: include/svx/strings.hrc:499
 msgctxt "SIP_EE_CHAR_PAIRKERNING"
 msgid "Kerning"
 msgstr "Gorgyffyrddiad"
 
-#: strings.hrc:504
+#: include/svx/strings.hrc:500
 msgctxt "SIP_EE_CHAR_KERNING"
 msgid "Manual kerning"
 msgstr "Gorgyffyrddiad llaw"
 
-#: strings.hrc:505
+#: include/svx/strings.hrc:501
 msgctxt "SIP_EE_CHAR_WLM"
 msgid "No underline for spaces"
 msgstr "Dim tanlinellu ar gyfer bylchau"
 
-#: strings.hrc:506
+#: include/svx/strings.hrc:502
 msgctxt "SIP_EE_FEATURE_TAB"
 msgid "Tabulator"
 msgstr "Tablwr"
 
-#: strings.hrc:507
+#: include/svx/strings.hrc:503
 msgctxt "SIP_EE_FEATURE_LINEBR"
 msgid "Optional line break"
 msgstr "Toriad llinell ddewisol"
 
-#: strings.hrc:508
+#: include/svx/strings.hrc:504
 msgctxt "SIP_EE_FEATURE_NOTCONV"
 msgid "Non-convertible character"
 msgstr "Nod anrhosadwy"
 
-#: strings.hrc:509
+#: include/svx/strings.hrc:505
 msgctxt "SIP_EE_FEATURE_FIELD"
 msgid "Fields"
 msgstr "Meysydd"
 
-#: strings.hrc:510
+#: include/svx/strings.hrc:506
 msgctxt "SIP_SA_GRAFRED"
 msgid "Red"
 msgstr "Coch"
 
-#: strings.hrc:511
+#: include/svx/strings.hrc:507
 msgctxt "SIP_SA_GRAFGREEN"
 msgid "Green"
 msgstr "Gwyrdd"
 
-#: strings.hrc:512
+#: include/svx/strings.hrc:508
 msgctxt "SIP_SA_GRAFBLUE"
 msgid "Blue"
 msgstr "Glas"
 
-#: strings.hrc:513
+#: include/svx/strings.hrc:509
 msgctxt "SIP_SA_GRAFLUMINANCE"
 msgid "Brightness"
 msgstr "Disgleirdeb"
 
-#: strings.hrc:514
+#: include/svx/strings.hrc:510
 msgctxt "SIP_SA_GRAFCONTRAST"
 msgid "Contrast"
 msgstr "Cyferbyniad"
 
-#: strings.hrc:515
+#: include/svx/strings.hrc:511
 msgctxt "SIP_SA_GRAFGAMMA"
 msgid "Gamma"
 msgstr "Gama"
 
-#: strings.hrc:516
+#: include/svx/strings.hrc:512
 msgctxt "SIP_SA_GRAFTRANSPARENCE"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: strings.hrc:517
+#: include/svx/strings.hrc:513
 msgctxt "SIP_SA_GRAFINVERT"
 msgid "Invert"
 msgstr "Gwrthdroi"
 
-#: strings.hrc:518
+#: include/svx/strings.hrc:514
 msgctxt "SIP_SA_GRAFMODE"
 msgid "Image mode"
 msgstr "Modd delwedd"
 
-#: strings.hrc:519
+#: include/svx/strings.hrc:515
 msgctxt "SIP_SA_GRAFCROP"
 msgid "Crop"
 msgstr "Tocio"
 
-#: strings.hrc:520
+#: include/svx/strings.hrc:516
 msgctxt "STR_ObjNameSingulMEDIA"
 msgid "Media object"
 msgstr "Gwrthrych cyfrwng"
 
-#: strings.hrc:521
+#: include/svx/strings.hrc:517
 msgctxt "STR_ObjNamePluralMEDIA"
 msgid "Media objects"
 msgstr "Gwrthrychau cyfrwng"
 
 #. drawing layer table strings
-#: strings.hrc:523
+#: include/svx/strings.hrc:519
 msgctxt "STR_TABLE_INSCOL"
 msgid "Insert column"
 msgstr "Mewnosod colofn"
 
-#: strings.hrc:524
+#: include/svx/strings.hrc:520
 msgctxt "STR_TABLE_INSROW"
 msgid "Insert row"
 msgstr "Mewnosod rhes"
 
-#: strings.hrc:525
+#: include/svx/strings.hrc:521
 msgctxt "STR_UNDO_COL_DELETE"
 msgid "Delete column"
 msgstr "Dileu colofn"
 
-#: strings.hrc:526
+#: include/svx/strings.hrc:522
 msgctxt "STR_UNDO_ROW_DELETE"
 msgid "Delete row"
 msgstr "Dileu rhes"
 
-#: strings.hrc:527
+#: include/svx/strings.hrc:523
 msgctxt "STR_TABLE_SPLIT"
 msgid "Split cells"
 msgstr "Hollti celloedd"
 
-#: strings.hrc:528
+#: include/svx/strings.hrc:524
 msgctxt "STR_TABLE_MERGE"
 msgid "Merge cells"
 msgstr "Uno celloedd"
 
-#: strings.hrc:529
+#: include/svx/strings.hrc:525
 msgctxt "STR_TABLE_NUMFORMAT"
 msgid "Format cell"
 msgstr "Fformatio cell"
 
-#: strings.hrc:530
+#: include/svx/strings.hrc:526
 msgctxt "STR_TABLE_DISTRIBUTE_ROWS"
 msgid "Distribute rows"
 msgstr "Dosbarthu rhesi"
 
-#: strings.hrc:531
+#: include/svx/strings.hrc:527
 msgctxt "STR_TABLE_DISTRIBUTE_COLUMNS"
 msgid "Distribute columns"
 msgstr "Dosbarthu colofnau"
 
-#: strings.hrc:532
+#: include/svx/strings.hrc:528
 msgctxt "STR_TABLE_DELETE_CELL_CONTENTS"
 msgid "Delete cell contents"
 msgstr "Dileu cynnwys celloedd"
 
-#: strings.hrc:533
+#: include/svx/strings.hrc:529
 msgctxt "STR_TABLE_STYLE"
 msgid "Table style"
 msgstr "Arddull tabl"
 
-#: strings.hrc:534
+#: include/svx/strings.hrc:530
 msgctxt "STR_TABLE_STYLE_SETTINGS"
 msgid "Table style settings"
 msgstr "Gosodiadau arddull tabl"
 
-#: strings.hrc:535
+#: include/svx/strings.hrc:531
 msgctxt "STR_ObjNameSingulTable"
 msgid "Table"
 msgstr "Tabl"
 
-#: strings.hrc:536
+#: include/svx/strings.hrc:532
 msgctxt "STR_ObjNamePluralTable"
 msgid "Tables"
 msgstr "Tablau"
 
-#: strings.hrc:537
+#: include/svx/strings.hrc:533
 msgctxt "STR_ObjNameSingulFONTWORK"
 msgid "Font work"
 msgstr "Font work"
 
 #. Strings for the Draw-Dialog --------------------------------------------
-#: strings.hrc:539
+#: include/svx/strings.hrc:535
 msgctxt "RID_SVXSTR_SOLID"
 msgid "Continuous"
 msgstr "Parhaus"
 
-#: strings.hrc:540
+#: include/svx/strings.hrc:536
 msgctxt "RID_SVXSTR_GRADIENT"
 msgid "Gradient"
 msgstr "Graddiant"
 
-#: strings.hrc:541
+#: include/svx/strings.hrc:537
 msgctxt "RID_SVXSTR_BITMAP"
 msgid "Bitmap"
 msgstr "Didfap"
 
-#: strings.hrc:542
+#: include/svx/strings.hrc:538
 msgctxt "RID_SVXSTR_PATTERN"
 msgid "Pattern"
 msgstr "Patrwm"
 
-#: strings.hrc:543
+#: include/svx/strings.hrc:539
 msgctxt "RID_SVXSTR_PATTERN_UNTITLED"
 msgid "Untitled Pattern"
 msgstr "Patrwm Heb Deitl"
 
-#: strings.hrc:544
+#: include/svx/strings.hrc:540
 msgctxt "RID_SVXSTR_LINESTYLE"
 msgid "Line Style"
 msgstr "Arddull Llinell"
 
-#: strings.hrc:545
+#: include/svx/strings.hrc:541
 msgctxt "RID_SVXSTR_INVISIBLE"
 msgid "None"
 msgstr "Dim"
 
-#: strings.hrc:546
+#: include/svx/strings.hrc:542
 msgctxt "RID_SVXSTR_COLOR"
 msgid "Color"
 msgstr "Lliw"
 
-#: strings.hrc:547
+#: include/svx/strings.hrc:543
 msgctxt "RID_SVXSTR_HATCH"
 msgid "Hatching"
 msgstr "Croes-liniogi"
 
-#: strings.hrc:548
+#: include/svx/strings.hrc:544
 msgctxt "RID_SVXSTR_LINEEND"
 msgid "Arrowheads"
 msgstr "Pensaethau"
 
-#: strings.hrc:549
+#: include/svx/strings.hrc:545
 msgctxt "RID_SVXSTR_ARROW"
 msgid "Arrow"
 msgstr "Saeth"
 
-#: strings.hrc:550
+#: include/svx/strings.hrc:546
 msgctxt "RID_SVXSTR_SQUARE"
 msgid "Square"
 msgstr "Sgwâr"
 
-#: strings.hrc:551
+#: include/svx/strings.hrc:547
 msgctxt "RID_SVXSTR_CIRCLE"
 msgid "Circle"
 msgstr "Cylch"
 
-#: strings.hrc:552
+#: include/svx/strings.hrc:548
 msgctxt "RID_SVXSTR_NONE"
 msgid "- none -"
 msgstr "- dim -"
 
-#: strings.hrc:553
+#: include/svx/strings.hrc:549
 msgctxt "RID_SVXSTR_TRANSPARENCE"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: strings.hrc:554
+#: include/svx/strings.hrc:550
 msgctxt "RID_SVXSTR_CENTERED"
 msgid "Centered"
 msgstr "Canoli"
 
-#: strings.hrc:555
+#: include/svx/strings.hrc:551
 msgctxt "RID_SVXSTR_NOTCENTERED"
 msgid "Not centered"
 msgstr "Heb ei ganoli"
 
-#: strings.hrc:556
+#: include/svx/strings.hrc:552
 msgctxt "RID_SVXSTR_GRAFMODE_STANDARD"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: strings.hrc:557
+#: include/svx/strings.hrc:553
 msgctxt "RID_SVXSTR_GRAFMODE_GREYS"
 msgid "Grayscale"
 msgstr "Graddlwyd"
 
-#: strings.hrc:558
+#: include/svx/strings.hrc:554
 msgctxt "RID_SVXSTR_GRAFMODE_MONO"
 msgid "Black/White"
 msgstr "Du/Gwyn"
 
-#: strings.hrc:559
+#: include/svx/strings.hrc:555
 msgctxt "RID_SVXSTR_GRAFMODE_WATERMARK"
 msgid "Watermark"
 msgstr "Dyfrnod"
 
 #. Elements of the standard color palette
-#: strings.hrc:561
+#: include/svx/strings.hrc:557
 msgctxt "RID_SVXSTR_COLOR_BLACK"
 msgid "Black"
 msgstr "Du"
 
-#: strings.hrc:562
+#: include/svx/strings.hrc:558
 msgctxt "RID_SVXSTR_COLOR_GREY"
 msgid "Gray"
 msgstr "Llwyd"
 
-#: strings.hrc:563
+#: include/svx/strings.hrc:559
 msgctxt "RID_SVXSTR_COLOR_WHITE"
 msgid "White"
 msgstr "Gwyn"
 
-#: strings.hrc:564
+#: include/svx/strings.hrc:560
 msgctxt "RID_SVXSTR_COLOR_YELLOW"
 msgid "Yellow"
 msgstr "Melyn"
 
-#: strings.hrc:565
+#: include/svx/strings.hrc:561
 msgctxt "RID_SVXSTR_COLOR_GOLD"
 msgid "Gold"
 msgstr "Aur"
 
-#: strings.hrc:566
+#: include/svx/strings.hrc:562
 msgctxt "RID_SVXSTR_COLOR_ORANGE"
 msgid "Orange"
 msgstr "Oren"
 
-#: strings.hrc:567
+#: include/svx/strings.hrc:563
 msgctxt "RID_SVXSTR_COLOR_BRICK"
 msgid "Brick"
 msgstr "Bric"
 
-#: strings.hrc:568
+#: include/svx/strings.hrc:564
 msgctxt "RID_SVXSTR_COLOR_RED"
 msgid "Red"
 msgstr "Coch"
 
-#: strings.hrc:569
+#: include/svx/strings.hrc:565
 msgctxt "RID_SVXSTR_COLOR_VIOLET"
 msgid "Violet"
 msgstr "Fioled"
 
-#: strings.hrc:570
+#: include/svx/strings.hrc:566
 msgctxt "RID_SVXSTR_COLOR_PURPLE"
 msgid "Purple"
 msgstr "Porffor"
 
-#: strings.hrc:571
+#: include/svx/strings.hrc:567
 msgctxt "RID_SVXSTR_COLOR_INDIGO"
 msgid "Indigo"
 msgstr "Indigo"
 
-#: strings.hrc:572
+#: include/svx/strings.hrc:568
 msgctxt "RID_SVXSTR_COLOR_BLUE"
 msgid "Blue"
 msgstr "Glas"
 
-#: strings.hrc:573
+#: include/svx/strings.hrc:569
 msgctxt "RID_SVXSTR_COLOR_TEAL"
 msgid "Teal"
 msgstr "Gwyrddlas"
 
-#: strings.hrc:574
+#: include/svx/strings.hrc:570
 msgctxt "RID_SVXSTR_COLOR_GREEN"
 msgid "Green"
 msgstr "Gwyrdd"
 
-#: strings.hrc:575
+#: include/svx/strings.hrc:571
 msgctxt "RID_SVXSTR_COLOR_LIME"
 msgid "Lime"
 msgstr "Leim"
 
 #. Light variants of the standard color palette
-#: strings.hrc:577
+#: include/svx/strings.hrc:573
 msgctxt "RID_SVXSTR_COLOR_LIGHTGRAY"
 msgid "Light Gray"
 msgstr "Llwyd Golau"
 
-#: strings.hrc:578
+#: include/svx/strings.hrc:574
 msgctxt "RID_SVXSTR_COLOR_LIGHTYELLOW"
 msgid "Light Yellow"
 msgstr "Melyn Golau"
 
-#: strings.hrc:579
+#: include/svx/strings.hrc:575
 msgctxt "RID_SVXSTR_COLOR_LIGHTGOLD"
 msgid "Light Gold"
 msgstr "Aur Golau"
 
-#: strings.hrc:580
+#: include/svx/strings.hrc:576
 msgctxt "RID_SVXSTR_COLOR_LIGHTORANGE"
 msgid "Light Orange"
 msgstr "Oren Golau"
 
-#: strings.hrc:581
+#: include/svx/strings.hrc:577
 msgctxt "RID_SVXSTR_COLOR_LIGHTBRICK"
 msgid "Light Brick"
 msgstr "Bric Golau"
 
-#: strings.hrc:582
+#: include/svx/strings.hrc:578
 msgctxt "RID_SVXSTR_COLOR_LIGHTRED"
 msgid "Light Red"
 msgstr "Coch Golau"
 
-#: strings.hrc:583
+#: include/svx/strings.hrc:579
 msgctxt "RID_SVXSTR_COLOR_LIGHTVIOLET"
 msgid "Light Violet"
 msgstr "Fioled Golau"
 
-#: strings.hrc:584
+#: include/svx/strings.hrc:580
 msgctxt "RID_SVXSTR_COLOR_LIGHTPURPLE"
 msgid "Light Purple"
 msgstr "Porffor Golau"
 
-#: strings.hrc:585
+#: include/svx/strings.hrc:581
 msgctxt "RID_SVXSTR_COLOR_LIGHTINDIGO"
 msgid "Light Indigo"
 msgstr "Indigo Golau"
 
-#: strings.hrc:586
+#: include/svx/strings.hrc:582
 msgctxt "RID_SVXSTR_COLOR_LIGHTBLUE"
 msgid "Light Blue"
 msgstr "Glas Golau"
 
-#: strings.hrc:587
+#: include/svx/strings.hrc:583
 msgctxt "RID_SVXSTR_COLOR_LIGHTTEAL"
 msgid "Light Teal"
 msgstr "Gwyrddlas Golau"
 
-#: strings.hrc:588
+#: include/svx/strings.hrc:584
 msgctxt "RID_SVXSTR_COLOR_LIGHTGREEN"
 msgid "Light Green"
 msgstr "Gwyrdd Golau"
 
-#: strings.hrc:589
+#: include/svx/strings.hrc:585
 msgctxt "RID_SVXSTR_COLOR_LIGHTLIME"
 msgid "Light Lime"
 msgstr "Leim Golau"
 
 #. Dark variants of the standard color palette
-#: strings.hrc:591
+#: include/svx/strings.hrc:587
 msgctxt "RID_SVXSTR_COLOR_DARKGRAY"
 msgid "Dark Gray"
 msgstr "Llwyd Tywyll"
 
-#: strings.hrc:592
+#: include/svx/strings.hrc:588
 msgctxt "RID_SVXSTR_COLOR_DARKYELLOW"
 msgid "Dark Yellow"
 msgstr "Melyn Tywyll"
 
-#: strings.hrc:593
+#: include/svx/strings.hrc:589
 msgctxt "RID_SVXSTR_COLOR_DARKGOLD"
 msgid "Dark Gold"
 msgstr "Aur Tywyll"
 
-#: strings.hrc:594
+#: include/svx/strings.hrc:590
 msgctxt "RID_SVXSTR_COLOR_DARKORANGE"
 msgid "Dark Orange"
 msgstr "Oren Tywyll"
 
-#: strings.hrc:595
+#: include/svx/strings.hrc:591
 msgctxt "RID_SVXSTR_COLOR_DARKBRICK"
 msgid "Dark Brick"
 msgstr "Bric Tywyll"
 
-#: strings.hrc:596
+#: include/svx/strings.hrc:592
 msgctxt "RID_SVXSTR_COLOR_DARKRED"
 msgid "Dark Red"
 msgstr "Coch Tywyll"
 
-#: strings.hrc:597
+#: include/svx/strings.hrc:593
 msgctxt "RID_SVXSTR_COLOR_DARKVIOLET1"
 msgid "Dark Violet"
 msgstr "Fioled Tywyll"
 
-#: strings.hrc:598
+#: include/svx/strings.hrc:594
 msgctxt "RID_SVXSTR_COLOR_DARKPURPLE"
 msgid "Dark Purple"
 msgstr "Porffor Tywyll"
 
-#: strings.hrc:599
+#: include/svx/strings.hrc:595
 msgctxt "RID_SVXSTR_COLOR_DARKINDIGO"
 msgid "Dark Indigo"
 msgstr "Indigo Tywyll"
 
-#: strings.hrc:600
+#: include/svx/strings.hrc:596
 msgctxt "RID_SVXSTR_COLOR_DARKBLUE"
 msgid "Dark Blue"
 msgstr "Glas Tywyll"
 
-#: strings.hrc:601
+#: include/svx/strings.hrc:597
 msgctxt "RID_SVXSTR_COLOR_DARKTEAL"
 msgid "Dark Teal"
 msgstr "Gwyrddlas Tywyll"
 
-#: strings.hrc:602
+#: include/svx/strings.hrc:598
 msgctxt "RID_SVXSTR_COLOR_DARKGREEN"
 msgid "Dark Green"
 msgstr "Gwyrdd Tywyll"
 
-#: strings.hrc:603
+#: include/svx/strings.hrc:599
 msgctxt "RID_SVXSTR_COLOR_DARKLIME"
 msgid "Dark Lime"
 msgstr "Leim Tywyll"
 
 #. Elements of the Tonal color palette
-#: strings.hrc:605
+#: include/svx/strings.hrc:601
 msgctxt "RID_SVXSTR_COLOR_VIOLET_OUG"
 msgid "Violet (Out of Gamut)"
-msgstr ""
+msgstr "Fioled (Allan o'r Gamut)"
 
-#: strings.hrc:606
+#: include/svx/strings.hrc:602
 msgctxt "RID_SVXSTR_COLOR_BLUE_OUG"
 msgid "Blue (Out of Gamut)"
-msgstr ""
+msgstr "Glas (Allan o'r Gamut)"
 
-#: strings.hrc:607
+#: include/svx/strings.hrc:603
 msgctxt "RID_SVXSTR_COLOR_AZURE_OUG"
 msgid "Azure (Out of Gamut)"
-msgstr ""
+msgstr "Glas y Môr (Allan o'r Gamut)"
 
-#: strings.hrc:608
+#: include/svx/strings.hrc:604
 msgctxt "RID_SVXSTR_COLOR_SPRINGGREEN_OUG"
 msgid "Spring Green (Out of Gamut)"
-msgstr ""
+msgstr "Gwyrdd y Gwanwyn (Allan o'r Gamut)"
 
-#: strings.hrc:609
+#: include/svx/strings.hrc:605
 msgctxt "RID_SVXSTR_COLOR_GREEN_OUG"
 msgid "Green (Out of Gamut)"
-msgstr ""
+msgstr "Gwyrdd (Allan o'r Gamut)"
 
-#: strings.hrc:610
+#: include/svx/strings.hrc:606
 msgctxt "RID_SVXSTR_COLOR_CHARTREUSEGREEN_OUG"
 msgid "Chartreuse Green (Out of Gamut)"
-msgstr ""
+msgstr "Gwyrdd Chartreuse Allan o'r Gamut)"
 
-#: strings.hrc:611
+#: include/svx/strings.hrc:607
 msgctxt "RID_SVXSTR_COLOR_ORANGE_OUG"
 msgid "Orange (Out of Gamut)"
-msgstr ""
+msgstr "Oren (Allan o'r Gamut)"
 
-#: strings.hrc:612
+#: include/svx/strings.hrc:608
 msgctxt "RID_SVXSTR_COLOR_RED_OUG"
 msgid "Red (Out of Gamut)"
-msgstr ""
+msgstr "Coch (Allan o'r Gamut)"
 
-#: strings.hrc:613
+#: include/svx/strings.hrc:609
 msgctxt "RID_SVXSTR_COLOR_ROSE_OUG"
 msgid "Rose (Out of Gamut)"
-msgstr ""
+msgstr "Rhosgoch (Allan o'r Gamut)"
 
-#: strings.hrc:614
+#: include/svx/strings.hrc:610
 msgctxt "RID_SVXSTR_COLOR_MAGENTA"
 msgid "Magenta"
 msgstr "Magenta"
 
-#: strings.hrc:615
+#: include/svx/strings.hrc:611
 msgctxt "RID_SVXSTR_COLOR_AZURE"
 msgid "Azure"
-msgstr ""
+msgstr "Glas y Môr"
 
-#: strings.hrc:616
+#: include/svx/strings.hrc:612
 msgctxt "RID_SVXSTR_COLOR_CYAN"
 msgid "Cyan"
 msgstr "Cyan"
 
-#: strings.hrc:617
+#: include/svx/strings.hrc:613
 msgctxt "RID_SVXSTR_COLOR_SPRINGGREEN"
 msgid "Spring Green"
-msgstr ""
+msgstr "Gwyrdd y Gwanwyn"
 
-#: strings.hrc:618
+#: include/svx/strings.hrc:614
 msgctxt "RID_SVXSTR_COLOR_CHARTREUSEGREEN"
 msgid "Chartreuse Green"
-msgstr ""
+msgstr "Gwyrdd Chartreuse"
 
-#: strings.hrc:619
+#: include/svx/strings.hrc:615
 msgctxt "RID_SVXSTR_COLOR_ROSE"
 msgid "Rose"
-msgstr ""
+msgstr "Rhosgoch"
 
 #. Old default color names, probably often used in saved files
-#: strings.hrc:621
+#: include/svx/strings.hrc:617
 msgctxt "RID_SVXSTR_COLOR_BLUE_CLASSIC"
 msgid "Blue classic"
 msgstr "Glas clasurol"
 
-#: strings.hrc:622
+#: include/svx/strings.hrc:618
 msgctxt "RID_SVXSTR_COLOR_BLUEGREY"
 msgid "Blue gray"
 msgstr "Glaslwyd"
 
-#: strings.hrc:623
+#: include/svx/strings.hrc:619
 msgctxt "RID_SVXSTR_COLOR_BORDEAUX"
 msgid "Bordeaux"
 msgstr "Bordeaux"
 
-#: strings.hrc:624
+#: include/svx/strings.hrc:620
 msgctxt "RID_SVXSTR_COLOR_PALE_YELLOW"
 msgid "Pale yellow"
 msgstr "Melyn golau"
 
-#: strings.hrc:625
+#: include/svx/strings.hrc:621
 msgctxt "RID_SVXSTR_COLOR_PALE_GREEN"
 msgid "Pale green"
 msgstr "Gwyrdd golau"
 
-#: strings.hrc:626
+#: include/svx/strings.hrc:622
 msgctxt "RID_SVXSTR_COLOR_DARKVIOLET"
 msgid "Dark violet"
 msgstr "Fioled tywyll"
 
-#: strings.hrc:627
+#: include/svx/strings.hrc:623
 msgctxt "RID_SVXSTR_COLOR_SALMON"
 msgid "Salmon"
 msgstr "Samwn"
 
-#: strings.hrc:628
+#: include/svx/strings.hrc:624
 msgctxt "RID_SVXSTR_COLOR_SEABLUE"
 msgid "Sea blue"
 msgstr "Glas y môr"
 
-#: strings.hrc:629
+#: include/svx/strings.hrc:625
 msgctxt "RID_SVXSTR_COLOR_CHART"
 msgid "Chart"
 msgstr "Siart"
 
-#: strings.hrc:630
+#: include/svx/strings.hrc:626
 msgctxt "RID_SVXSTR_COLOR_SKYBLUE"
 msgid "Sky blue"
 msgstr "Glas yr awyr"
 
-#: strings.hrc:631
+#: include/svx/strings.hrc:627
 msgctxt "RID_SVXSTR_COLOR_YELLOWGREEN"
 msgid "Yellow green"
 msgstr "Melyn gwyrdd"
 
-#: strings.hrc:632
+#: include/svx/strings.hrc:628
 msgctxt "RID_SVXSTR_COLOR_PINK"
 msgid "Pink"
 msgstr "Pinc"
 
-#: strings.hrc:633
+#: include/svx/strings.hrc:629
 msgctxt "RID_SVXSTR_COLOR_TURQUOISE"
 msgid "Turquoise"
 msgstr "Glaswyrdd"
 
 #. 16 old AutoFormat Table Styles
-#: strings.hrc:635
+#: include/svx/strings.hrc:631
 msgctxt "RID_SVXSTR_TBLAFMT_3D"
 msgid "3D"
 msgstr "3D"
 
-#: strings.hrc:636
+#: include/svx/strings.hrc:632
 msgctxt "RID_SVXSTR_TBLAFMT_BLACK1"
 msgid "Black 1"
 msgstr "Du 1"
 
-#: strings.hrc:637
+#: include/svx/strings.hrc:633
 msgctxt "RID_SVXSTR_TBLAFMT_BLACK2"
 msgid "Black 2"
 msgstr "Du 2"
 
-#: strings.hrc:638
+#: include/svx/strings.hrc:634
 msgctxt "RID_SVXSTR_TBLAFMT_BLUE"
 msgid "Blue"
 msgstr "Glas"
 
-#: strings.hrc:639
+#: include/svx/strings.hrc:635
 msgctxt "RID_SVXSTR_TBLAFMT_BROWN"
 msgid "Brown"
 msgstr "Brown"
 
-#: strings.hrc:640
+#: include/svx/strings.hrc:636
 msgctxt "RID_SVXSTR_TBLAFMT_CURRENCY"
 msgid "Currency"
 msgstr "Arian"
 
-#: strings.hrc:641
+#: include/svx/strings.hrc:637
 msgctxt "RID_SVXSTR_TBLAFMT_CURRENCY_3D"
 msgid "Currency 3D"
 msgstr "3D Arian"
 
-#: strings.hrc:642
+#: include/svx/strings.hrc:638
 msgctxt "RID_SVXSTR_TBLAFMT_CURRENCY_GRAY"
 msgid "Currency Gray"
 msgstr "Llwyd Arian"
 
-#: strings.hrc:643
+#: include/svx/strings.hrc:639
 msgctxt "RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER"
 msgid "Currency Lavender"
 msgstr "Lafant Arian"
 
-#: strings.hrc:644
+#: include/svx/strings.hrc:640
 msgctxt "RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE"
 msgid "Currency Turquoise"
 msgstr "Glaswyrdd Arian"
 
-#: strings.hrc:645
+#: include/svx/strings.hrc:641
 msgctxt "RID_SVXSTR_TBLAFMT_GRAY"
 msgid "Gray"
 msgstr "Llwyd"
 
-#: strings.hrc:646
+#: include/svx/strings.hrc:642
 msgctxt "RID_SVXSTR_TBLAFMT_GREEN"
 msgid "Green"
 msgstr "Gwyrdd"
 
-#: strings.hrc:647
+#: include/svx/strings.hrc:643
 msgctxt "RID_SVXSTR_TBLAFMT_LAVENDER"
 msgid "Lavender"
 msgstr "Lafant"
 
-#: strings.hrc:648
+#: include/svx/strings.hrc:644
 msgctxt "RID_SVXSTR_TBLAFMT_RED"
 msgid "Red"
 msgstr "Coch"
 
-#: strings.hrc:649
+#: include/svx/strings.hrc:645
 msgctxt "RID_SVXSTR_TBLAFMT_TURQUOISE"
 msgid "Turquoise"
 msgstr "Glaswyrdd"
 
-#: strings.hrc:650
+#: include/svx/strings.hrc:646
 msgctxt "RID_SVXSTR_TBLAFMT_YELLOW"
 msgid "Yellow"
 msgstr "Melyn"
 
 #. 10 new AutoFormat Table Styles since LibreOffice 6.0
-#: strings.hrc:652
+#: include/svx/strings.hrc:648
 msgctxt "RID_SVXSTR_TBLAFMT_LO6_ACADEMIC"
 msgid "Academic"
 msgstr "Academaidd"
 
-#: strings.hrc:653
+#: include/svx/strings.hrc:649
 msgctxt "RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_BLUE"
 msgid "Box List Blue"
 msgstr "Blwch Glas"
 
-#: strings.hrc:654
+#: include/svx/strings.hrc:650
 msgctxt "RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_GREEN"
 msgid "Box List Green"
 msgstr "Blwch Gwyrdd"
 
-#: strings.hrc:655
+#: include/svx/strings.hrc:651
 msgctxt "RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_RED"
 msgid "Box List Red"
 msgstr "Blwch Coch"
 
-#: strings.hrc:656
+#: include/svx/strings.hrc:652
 msgctxt "RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_YELLOW"
 msgid "Box List Yellow"
 msgstr "Blwch Melyn"
 
-#: strings.hrc:657
+#: include/svx/strings.hrc:653
 msgctxt "RID_SVXSTR_TBLAFMT_LO6_ELEGANT"
 msgid "Elegant"
 msgstr "Coeth"
 
-#: strings.hrc:658
+#: include/svx/strings.hrc:654
 msgctxt "RID_SVXSTR_TBLAFMT_LO6_FINANCIAL"
 msgid "Financial"
 msgstr "Cyllid"
 
-#: strings.hrc:659
+#: include/svx/strings.hrc:655
 msgctxt "RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_COLUMNS"
 msgid "Simple Grid Columns"
 msgstr "Colofnau Grid Syml"
 
-#: strings.hrc:660
+#: include/svx/strings.hrc:656
 msgctxt "RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_ROWS"
 msgid "Simple Grid Rows"
 msgstr "Rhesi Grid Syml"
 
-#: strings.hrc:661
+#: include/svx/strings.hrc:657
 msgctxt "RID_SVXSTR_TBLAFMT_LO6_SIMPLE_LIST_SHADED"
 msgid "Simple List Shaded"
 msgstr "Rhesi Cysgodol Syml"
 
-#: strings.hrc:662
+#: include/svx/strings.hrc:658
 msgctxt "RID_SVXSTR_LINEJOINT_MIDDLE"
 msgid "Line joint averaged"
 msgstr "Cyfartalu uniadau llinell"
 
-#: strings.hrc:663
+#: include/svx/strings.hrc:659
 msgctxt "RID_SVXSTR_LINEJOINT_BEVEL"
 msgid "Line joint bevel"
 msgstr "Befel uniad llinell"
 
-#: strings.hrc:664
+#: include/svx/strings.hrc:660
 msgctxt "RID_SVXSTR_LINEJOINT_MITER"
 msgid "Line joint miter"
 msgstr "Meitr uniad llinell"
 
-#: strings.hrc:665
+#: include/svx/strings.hrc:661
 msgctxt "RID_SVXSTR_LINEJOINT_ROUND"
 msgid "Line joint round"
 msgstr "Crwn uniad llinell"
 
 #. the familiar name for it
-#: strings.hrc:667
+#: include/svx/strings.hrc:663
 msgctxt "RID_SVXSTR_LINECAP_BUTT"
 msgid "Line cap flat"
 msgstr "Llinell cap gwastad"
 
-#: strings.hrc:668
+#: include/svx/strings.hrc:664
 msgctxt "RID_SVXSTR_LINECAP_ROUND"
 msgid "Line cap round"
 msgstr "Llinell cap crwn"
 
-#: strings.hrc:669
+#: include/svx/strings.hrc:665
 msgctxt "RID_SVXSTR_LINECAP_SQUARE"
 msgid "Line cap square"
 msgstr "Llinell cap sgwâr"
 
-#: strings.hrc:670
+#: include/svx/strings.hrc:666
 msgctxt "RID_SVXSTR_GRDT0"
 msgid "Gradient"
 msgstr "Graddiant"
 
-#: strings.hrc:671
+#: include/svx/strings.hrc:667
 msgctxt "RID_SVXSTR_GRDT1"
 msgid "Linear blue/white"
 msgstr "Glas/gwyn llinol"
 
-#: strings.hrc:672
+#: include/svx/strings.hrc:668
 msgctxt "RID_SVXSTR_GRDT2"
 msgid "Linear magenta/green"
 msgstr "Magenta/gwyrdd llinol"
 
-#: strings.hrc:673
+#: include/svx/strings.hrc:669
 msgctxt "RID_SVXSTR_GRDT3"
 msgid "Linear yellow/brown"
 msgstr "Melyn/brown llinol"
 
-#: strings.hrc:674
+#: include/svx/strings.hrc:670
 msgctxt "RID_SVXSTR_GRDT4"
 msgid "Radial green/black"
 msgstr "Gwyrdd/du rheiddiol"
 
-#: strings.hrc:675
+#: include/svx/strings.hrc:671
 msgctxt "RID_SVXSTR_GRDT5"
 msgid "Radial red/yellow"
 msgstr "Coch/melyn rheiddiol"
 
-#: strings.hrc:676
+#: include/svx/strings.hrc:672
 msgctxt "RID_SVXSTR_GRDT6"
 msgid "Rectangular red/white"
 msgstr "Coch/gwyn petryal"
 
-#: strings.hrc:677
+#: include/svx/strings.hrc:673
 msgctxt "RID_SVXSTR_GRDT7"
 msgid "Square yellow/white"
 msgstr "Melyn/gwyn sgwâr"
 
-#: strings.hrc:678
+#: include/svx/strings.hrc:674
 msgctxt "RID_SVXSTR_GRDT8"
 msgid "Ellipsoid blue gray/light blue"
 msgstr "Llwydlas/glas golau elipsoid"
 
-#: strings.hrc:679
+#: include/svx/strings.hrc:675
 msgctxt "RID_SVXSTR_GRDT9"
 msgid "Axial light red/white"
 msgstr "Coch golau/gwyn echelinol"
 
 #. l means left
-#: strings.hrc:681
+#: include/svx/strings.hrc:677
 msgctxt "RID_SVXSTR_GRDT10"
 msgid "Diagonal 1l"
 msgstr "Croeslin 1l"
 
 #. r means right
-#: strings.hrc:683
+#: include/svx/strings.hrc:679
 msgctxt "RID_SVXSTR_GRDT11"
 msgid "Diagonal 1r"
 msgstr "Croeslin 1r"
 
 #. l means left
-#: strings.hrc:685
+#: include/svx/strings.hrc:681
 msgctxt "RID_SVXSTR_GRDT12"
 msgid "Diagonal 2l"
 msgstr "Croeslin 2l"
 
 #. r means right
-#: strings.hrc:687
+#: include/svx/strings.hrc:683
 msgctxt "RID_SVXSTR_GRDT13"
 msgid "Diagonal 2r"
 msgstr "Croeslin 2r"
 
 #. l means left
-#: strings.hrc:689
+#: include/svx/strings.hrc:685
 msgctxt "RID_SVXSTR_GRDT14"
 msgid "Diagonal 3l"
 msgstr "Croeslin 3l"
 
 #. r means right
-#: strings.hrc:691
+#: include/svx/strings.hrc:687
 msgctxt "RID_SVXSTR_GRDT15"
 msgid "Diagonal 3r"
 msgstr "Croeslin 3r"
 
 #. l means left
-#: strings.hrc:693
+#: include/svx/strings.hrc:689
 msgctxt "RID_SVXSTR_GRDT16"
 msgid "Diagonal 4l"
 msgstr "Croeslin 4l"
 
 #. r means right
-#: strings.hrc:695
+#: include/svx/strings.hrc:691
 msgctxt "RID_SVXSTR_GRDT17"
 msgid "Diagonal 4r"
 msgstr "Croeslin 4r"
 
-#: strings.hrc:696
+#: include/svx/strings.hrc:692
 msgctxt "RID_SVXSTR_GRDT18"
 msgid "Diagonal Blue"
 msgstr "Croeslin Glas"
 
-#: strings.hrc:697
+#: include/svx/strings.hrc:693
 msgctxt "RID_SVXSTR_GRDT19"
 msgid "Diagonal Green"
 msgstr "Croeslin Gwyrdd"
 
-#: strings.hrc:698
+#: include/svx/strings.hrc:694
 msgctxt "RID_SVXSTR_GRDT20"
 msgid "Diagonal Orange"
 msgstr "Croeslin Oren"
 
-#: strings.hrc:699
+#: include/svx/strings.hrc:695
 msgctxt "RID_SVXSTR_GRDT21"
 msgid "Diagonal Red"
 msgstr "Croeslin Coch"
 
-#: strings.hrc:700
+#: include/svx/strings.hrc:696
 msgctxt "RID_SVXSTR_GRDT22"
 msgid "Diagonal Turquoise"
 msgstr "Croeslin Gwyrddlas"
 
-#: strings.hrc:701
+#: include/svx/strings.hrc:697
 msgctxt "RID_SVXSTR_GRDT23"
 msgid "Diagonal Violet"
 msgstr "Croeslin Fioled"
 
-#: strings.hrc:702
+#: include/svx/strings.hrc:698
 msgctxt "RID_SVXSTR_GRDT24"
 msgid "From a Corner"
 msgstr "O Gornel"
 
-#: strings.hrc:703
+#: include/svx/strings.hrc:699
 msgctxt "RID_SVXSTR_GRDT25"
 msgid "From a Corner, Blue"
 msgstr "O Gornel, Glas"
 
-#: strings.hrc:704
+#: include/svx/strings.hrc:700
 msgctxt "RID_SVXSTR_GRDT26"
 msgid "From a Corner, Green"
 msgstr "O Gornel, Gwyrdd"
 
-#: strings.hrc:705
+#: include/svx/strings.hrc:701
 msgctxt "RID_SVXSTR_GRDT27"
 msgid "From a Corner, Orange"
 msgstr "O Gornel, Oren"
 
-#: strings.hrc:706
+#: include/svx/strings.hrc:702
 msgctxt "RID_SVXSTR_GRDT28"
 msgid "From a Corner, Red"
 msgstr "O Gornel, Coch"
 
-#: strings.hrc:707
+#: include/svx/strings.hrc:703
 msgctxt "RID_SVXSTR_GRDT29"
 msgid "From a Corner, Turquoise"
 msgstr "O Gornel, Glaswyrdd"
 
-#: strings.hrc:708
+#: include/svx/strings.hrc:704
 msgctxt "RID_SVXSTR_GRDT30"
 msgid "From a Corner, Violet"
 msgstr "O Gornel, Fioled"
 
-#: strings.hrc:709
+#: include/svx/strings.hrc:705
 msgctxt "RID_SVXSTR_GRDT31"
 msgid "From the Middle"
 msgstr "O'r Canol"
 
-#: strings.hrc:710
+#: include/svx/strings.hrc:706
 msgctxt "RID_SVXSTR_GRDT32"
 msgid "From the Middle, Blue"
 msgstr "O'r Canol, Glas"
 
-#: strings.hrc:711
+#: include/svx/strings.hrc:707
 msgctxt "RID_SVXSTR_GRDT33"
 msgid "From the Middle, Green"
 msgstr "O'r Canol, Gwyrdd"
 
-#: strings.hrc:712
+#: include/svx/strings.hrc:708
 msgctxt "RID_SVXSTR_GRDT34"
 msgid "From the Middle, Orange"
 msgstr "O'r Canol, Oren"
 
-#: strings.hrc:713
+#: include/svx/strings.hrc:709
 msgctxt "RID_SVXSTR_GRDT35"
 msgid "From the Middle, Red"
 msgstr "O'r Canol, Coch"
 
-#: strings.hrc:714
+#: include/svx/strings.hrc:710
 msgctxt "RID_SVXSTR_GRDT36"
 msgid "From the Middle, Turquoise"
 msgstr "O'r Canol, Gwyrddlas"
 
-#: strings.hrc:715
+#: include/svx/strings.hrc:711
 msgctxt "RID_SVXSTR_GRDT37"
 msgid "From the Middle, Violet"
 msgstr "O'r Canol, Fioled"
 
-#: strings.hrc:716
+#: include/svx/strings.hrc:712
 msgctxt "RID_SVXSTR_GRDT38"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: strings.hrc:717
+#: include/svx/strings.hrc:713
 msgctxt "RID_SVXSTR_GRDT39"
 msgid "Horizontal Blue"
 msgstr "Glas Llorweddol"
 
-#: strings.hrc:718
+#: include/svx/strings.hrc:714
 msgctxt "RID_SVXSTR_GRDT40"
 msgid "Horizontal Green"
 msgstr "Gwyrdd Llorweddol"
 
-#: strings.hrc:719
+#: include/svx/strings.hrc:715
 msgctxt "RID_SVXSTR_GRDT41"
 msgid "Horizontal Orange"
 msgstr "Oren Llorweddol"
 
-#: strings.hrc:720
+#: include/svx/strings.hrc:716
 msgctxt "RID_SVXSTR_GRDT42"
 msgid "Horizontal Red"
 msgstr "Coch Llorweddol"
 
-#: strings.hrc:721
+#: include/svx/strings.hrc:717
 msgctxt "RID_SVXSTR_GRDT43"
 msgid "Horizontal Turquoise"
 msgstr "Gwyrddlas Llorweddol"
 
-#: strings.hrc:722
+#: include/svx/strings.hrc:718
 msgctxt "RID_SVXSTR_GRDT44"
 msgid "Horizontal Violet"
 msgstr "Fioled Llorweddol"
 
-#: strings.hrc:723
+#: include/svx/strings.hrc:719
 msgctxt "RID_SVXSTR_GRDT45"
 msgid "Radial"
 msgstr "Rheiddiol"
 
-#: strings.hrc:724
+#: include/svx/strings.hrc:720
 msgctxt "RID_SVXSTR_GRDT46"
 msgid "Radial Blue"
 msgstr "Glas Rheiddiol"
 
-#: strings.hrc:725
+#: include/svx/strings.hrc:721
 msgctxt "RID_SVXSTR_GRDT47"
 msgid "Radial Green"
 msgstr "Gwyrdd Rheiddiol"
 
-#: strings.hrc:726
+#: include/svx/strings.hrc:722
 msgctxt "RID_SVXSTR_GRDT48"
 msgid "Radial Orange"
 msgstr "Oren Rheiddiol"
 
-#: strings.hrc:727
+#: include/svx/strings.hrc:723
 msgctxt "RID_SVXSTR_GRDT49"
 msgid "Radial Red"
 msgstr "Coch Rheiddiol"
 
-#: strings.hrc:728
+#: include/svx/strings.hrc:724
 msgctxt "RID_SVXSTR_GRDT50"
 msgid "Radial Turquoise"
 msgstr "Glaswyrdd Rheiddiol"
 
-#: strings.hrc:729
+#: include/svx/strings.hrc:725
 msgctxt "RID_SVXSTR_GRDT51"
 msgid "Radial Violet"
 msgstr "Fioled Rheiddiol"
 
-#: strings.hrc:730
+#: include/svx/strings.hrc:726
 msgctxt "RID_SVXSTR_GRDT52"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: strings.hrc:731
+#: include/svx/strings.hrc:727
 msgctxt "RID_SVXSTR_GRDT53"
 msgid "Vertical Blue"
 msgstr "Glas Fertigol"
 
-#: strings.hrc:732
+#: include/svx/strings.hrc:728
 msgctxt "RID_SVXSTR_GRDT54"
 msgid "Vertical Green"
 msgstr "Gwyrdd Fertigo"
 
-#: strings.hrc:733
+#: include/svx/strings.hrc:729
 msgctxt "RID_SVXSTR_GRDT55"
 msgid "Vertical Orange"
 msgstr "Oren Fertigol"
 
-#: strings.hrc:734
+#: include/svx/strings.hrc:730
 msgctxt "RID_SVXSTR_GRDT56"
 msgid "Vertical Red"
 msgstr "Coch Fertigol"
 
-#: strings.hrc:735
+#: include/svx/strings.hrc:731
 msgctxt "RID_SVXSTR_GRDT57"
 msgid "Vertical Turquoise"
 msgstr "Gwyrddlas Fertigol"
 
-#: strings.hrc:736
+#: include/svx/strings.hrc:732
 msgctxt "RID_SVXSTR_GRDT58"
 msgid "Vertical Violet"
 msgstr "Fioled Fertigol"
 
-#: strings.hrc:737
+#: include/svx/strings.hrc:733
 msgctxt "RID_SVXSTR_GRDT59"
 msgid "Gray Gradient"
 msgstr "Graddiant Llwyd"
 
-#: strings.hrc:738
+#: include/svx/strings.hrc:734
 msgctxt "RID_SVXSTR_GRDT60"
 msgid "Yellow Gradient"
 msgstr "Graddiant Melyn"
 
-#: strings.hrc:739
+#: include/svx/strings.hrc:735
 msgctxt "RID_SVXSTR_GRDT61"
 msgid "Orange Gradient"
 msgstr "Graddiant Oren"
 
-#: strings.hrc:740
+#: include/svx/strings.hrc:736
 msgctxt "RID_SVXSTR_GRDT62"
 msgid "Red Gradient"
 msgstr "Graddiant Coch"
 
-#: strings.hrc:741
+#: include/svx/strings.hrc:737
 msgctxt "RID_SVXSTR_GRDT63"
 msgid "Pink Gradient"
 msgstr "Graddiant Pinc"
 
-#: strings.hrc:742
+#: include/svx/strings.hrc:738
 msgctxt "RID_SVXSTR_GRDT64"
 msgid "Sky"
 msgstr "Awyr"
 
-#: strings.hrc:743
+#: include/svx/strings.hrc:739
 msgctxt "RID_SVXSTR_GRDT65"
 msgid "Cyan Gradient"
 msgstr "Graddiant Cyan"
 
-#: strings.hrc:744
+#: include/svx/strings.hrc:740
 msgctxt "RID_SVXSTR_GRDT66"
 msgid "Blue Gradient"
 msgstr "Graddiant Glas"
 
-#: strings.hrc:745
+#: include/svx/strings.hrc:741
 msgctxt "RID_SVXSTR_GRDT67"
 msgid "Purple Pipe"
 msgstr "Peipen Biws"
 
-#: strings.hrc:746
+#: include/svx/strings.hrc:742
 msgctxt "RID_SVXSTR_GRDT68"
 msgid "Night"
 msgstr "Nos"
 
-#: strings.hrc:747
+#: include/svx/strings.hrc:743
 msgctxt "RID_SVXSTR_GRDT69"
 msgid "Green Gradient"
 msgstr "Graddiant Gwyrdd"
 
-#: strings.hrc:748
+#: include/svx/strings.hrc:744
 msgctxt "RID_SVXSTR_GRDT70"
 msgid "Tango Green"
 msgstr "Gwyrdd Tango"
 
-#: strings.hrc:749
+#: include/svx/strings.hrc:745
 msgctxt "RID_SVXSTR_GRDT71"
 msgid "Subtle Tango Green"
 msgstr "Gwyrdd Tango Cynnil"
 
-#: strings.hrc:750
+#: include/svx/strings.hrc:746
 msgctxt "RID_SVXSTR_GRDT72"
 msgid "Tango Purple"
 msgstr "Tango Porffor"
 
-#: strings.hrc:751
+#: include/svx/strings.hrc:747
 msgctxt "RID_SVXSTR_GRDT73"
 msgid "Tango Red"
 msgstr "Tango Coch"
 
-#: strings.hrc:752
+#: include/svx/strings.hrc:748
 msgctxt "RID_SVXSTR_GRDT74"
 msgid "Tango Blue"
 msgstr "Tango Glas"
 
-#: strings.hrc:753
+#: include/svx/strings.hrc:749
 msgctxt "RID_SVXSTR_GRDT75"
 msgid "Tango Yellow"
 msgstr "Tango Melyn"
 
-#: strings.hrc:754
+#: include/svx/strings.hrc:750
 msgctxt "RID_SVXSTR_GRDT76"
 msgid "Tango Orange"
 msgstr "Tango Oren"
 
-#: strings.hrc:755
+#: include/svx/strings.hrc:751
 msgctxt "RID_SVXSTR_GRDT77"
 msgid "Tango Gray"
 msgstr "Tango Llwyd"
 
-#: strings.hrc:756
+#: include/svx/strings.hrc:752
 msgctxt "RID_SVXSTR_GRDT78"
 msgid "Clay"
 msgstr "Clai"
 
-#: strings.hrc:757
+#: include/svx/strings.hrc:753
 msgctxt "RID_SVXSTR_GRDT79"
 msgid "Olive Green"
 msgstr "Gwyrdd Olewydd"
 
-#: strings.hrc:758
+#: include/svx/strings.hrc:754
 msgctxt "RID_SVXSTR_GRDT80"
 msgid "Silver"
 msgstr "Arian"
 
-#: strings.hrc:759
+#: include/svx/strings.hrc:755
 msgctxt "RID_SVXSTR_GRDT81"
 msgid "Sunburst"
 msgstr "Heulwen"
 
-#: strings.hrc:760
+#: include/svx/strings.hrc:756
 msgctxt "RID_SVXSTR_GRDT82"
 msgid "Brownie"
 msgstr "Brown"
 
-#: strings.hrc:761
+#: include/svx/strings.hrc:757
 msgctxt "RID_SVXSTR_GRDT83"
 msgid "Sunset"
 msgstr "Machlud Haul"
 
-#: strings.hrc:762
+#: include/svx/strings.hrc:758
 msgctxt "RID_SVXSTR_GRDT84"
 msgid "Deep Green"
 msgstr "Gwyrdd Dwfn"
 
-#: strings.hrc:763
+#: include/svx/strings.hrc:759
 msgctxt "RID_SVXSTR_GRDT85"
 msgid "Deep Orange"
 msgstr "Oren Defn"
 
-#: strings.hrc:764
+#: include/svx/strings.hrc:760
 msgctxt "RID_SVXSTR_GRDT86"
 msgid "Deep Blue"
 msgstr "Glas Dwfn"
 
-#: strings.hrc:765
+#: include/svx/strings.hrc:761
 msgctxt "RID_SVXSTR_GRDT87"
 msgid "Purple Haze"
 msgstr "Tarth Porffor"
 
-#: strings.hrc:766
+#: include/svx/strings.hrc:762
 msgctxt "RID_SVXSTR_HATCH0"
 msgid "Black 45 Degrees Wide"
 msgstr "Du 45 Gradd o Led"
 
-#: strings.hrc:767
+#: include/svx/strings.hrc:763
 msgctxt "RID_SVXSTR_HATCH1"
 msgid "Black 45 Degrees"
 msgstr "Du 45 Gradd"
 
-#: strings.hrc:768
+#: include/svx/strings.hrc:764
 msgctxt "RID_SVXSTR_HATCH2"
 msgid "Black -45 Degrees"
 msgstr "Du -45 Gradd"
 
-#: strings.hrc:769
+#: include/svx/strings.hrc:765
 msgctxt "RID_SVXSTR_HATCH3"
 msgid "Black 90 Degrees"
 msgstr "Du 90 Gradd"
 
-#: strings.hrc:770
+#: include/svx/strings.hrc:766
 msgctxt "RID_SVXSTR_HATCH4"
 msgid "Red Crossed 45 Degrees"
 msgstr "Coch Croes 45 Gradd"
 
-#: strings.hrc:771
+#: include/svx/strings.hrc:767
 msgctxt "RID_SVXSTR_HATCH5"
 msgid "Red Crossed 0 Degrees"
 msgstr "Coch Croes 0 Gradd"
 
-#: strings.hrc:772
+#: include/svx/strings.hrc:768
 msgctxt "RID_SVXSTR_HATCH6"
 msgid "Blue Crossed 45 Degrees"
 msgstr "Glas Croes 45 Gradd"
 
-#: strings.hrc:773
+#: include/svx/strings.hrc:769
 msgctxt "RID_SVXSTR_HATCH7"
 msgid "Blue Crossed 0 Degrees"
 msgstr "Glas Croes 0 Gradd"
 
-#: strings.hrc:774
+#: include/svx/strings.hrc:770
 msgctxt "RID_SVXSTR_HATCH8"
 msgid "Blue Triple 90 Degrees"
 msgstr "Glas Triphlyg 90 Gradd"
 
-#: strings.hrc:775
+#: include/svx/strings.hrc:771
 msgctxt "RID_SVXSTR_HATCH9"
 msgid "Black 0 Degrees"
 msgstr "Du 0 Gradd"
 
-#: strings.hrc:776
+#: include/svx/strings.hrc:772
 msgctxt "RID_SVXSTR_HATCH10"
 msgid "Hatching"
 msgstr "Croes-liniogi"
 
-#: strings.hrc:777
+#: include/svx/strings.hrc:773
 msgctxt "RID_SVXSTR_BMP0"
 msgid "Empty"
 msgstr "Gwag"
 
-#: strings.hrc:778
+#: include/svx/strings.hrc:774
 msgctxt "RID_SVXSTR_BMP1"
-msgid "Sky"
-msgstr "Awyr"
+msgid "Painted White"
+msgstr "Gwyn Paent"
 
-#: strings.hrc:779
+#: include/svx/strings.hrc:775
 msgctxt "RID_SVXSTR_BMP2"
-msgid "Water"
-msgstr "Dwr"
+msgid "Paper Texture"
+msgstr "Ansawdd Papur"
 
-#: strings.hrc:780
+#: include/svx/strings.hrc:776
 msgctxt "RID_SVXSTR_BMP3"
-msgid "Coarse grained"
-msgstr "Graen bras"
+msgid "Paper Crumpled"
+msgstr "Papur Plyg"
 
-#: strings.hrc:781
+#: include/svx/strings.hrc:777
 msgctxt "RID_SVXSTR_BMP4"
-msgid "Mercury"
-msgstr "Arian byw"
+msgid "Paper Graph"
+msgstr "Papur Graff"
 
-#: strings.hrc:782
+#: include/svx/strings.hrc:778
 msgctxt "RID_SVXSTR_BMP5"
-msgid "Space"
-msgstr "Gofod"
+msgid "Parchment Paper"
+msgstr "Papur Memrwn"
 
-#: strings.hrc:783
+#: include/svx/strings.hrc:779
 msgctxt "RID_SVXSTR_BMP6"
-msgid "Metal"
-msgstr "Metal"
+msgid "Fence"
+msgstr "Clawdd"
 
-#: strings.hrc:784
+#: include/svx/strings.hrc:780
 msgctxt "RID_SVXSTR_BMP7"
-msgid "Droplets"
-msgstr "Defnynnau"
+msgid "Wooden Board"
+msgstr "Bwrdd Pren"
 
-#: strings.hrc:785
+#: include/svx/strings.hrc:781
 msgctxt "RID_SVXSTR_BMP8"
-msgid "Marble"
-msgstr "Marmor"
+msgid "Maple Leaves"
+msgstr "Dail Masarnen"
 
-#: strings.hrc:786
+#: include/svx/strings.hrc:782
 msgctxt "RID_SVXSTR_BMP9"
-msgid "Linen"
-msgstr "Llin"
+msgid "Lawn"
+msgstr "Lawnt"
 
-#: strings.hrc:787
+#: include/svx/strings.hrc:783
 msgctxt "RID_SVXSTR_BMP10"
-msgid "Stone"
-msgstr "Carreg"
+msgid "Colorful Pebbles"
+msgstr "Cerrig Lliwgar"
 
-#: strings.hrc:788
+#: include/svx/strings.hrc:784
 msgctxt "RID_SVXSTR_BMP11"
-msgid "Gravel"
-msgstr "Graean"
+msgid "Coffee Beans"
+msgstr "Ffa Coffi"
 
-#: strings.hrc:789
+#: include/svx/strings.hrc:785
 msgctxt "RID_SVXSTR_BMP12"
-msgid "Wall"
-msgstr "Wal"
+msgid "Little Clouds"
+msgstr "Cymylau Bach"
 
-#: strings.hrc:790
+#: include/svx/strings.hrc:786
 msgctxt "RID_SVXSTR_BMP13"
-msgid "Brownstone"
-msgstr "Carreg Frown"
+msgid "Bathroom Tiles"
+msgstr "Teils Ystafell Ymolchi"
 
-#: strings.hrc:791
+#: include/svx/strings.hrc:787
 msgctxt "RID_SVXSTR_BMP14"
-msgid "Netting"
-msgstr "Rhwyd"
+msgid "Wall of Rock"
+msgstr "Wal o Gerrig"
 
-#: strings.hrc:792
+#: include/svx/strings.hrc:788
 msgctxt "RID_SVXSTR_BMP15"
-msgid "Leaves"
-msgstr "Dail"
+msgid "Zebra"
+msgstr "Sebra"
 
-#: strings.hrc:793
+#: include/svx/strings.hrc:789
 msgctxt "RID_SVXSTR_BMP16"
-msgid "Artificial Turf"
-msgstr "Tyweirch Artiffisial"
+msgid "Color Stripes"
+msgstr "Stribedi Lliw"
 
-#: strings.hrc:794
+#: include/svx/strings.hrc:790
 msgctxt "RID_SVXSTR_BMP17"
-msgid "Daisy"
-msgstr "Llygad y Dydd"
+msgid "Gravel"
+msgstr "Graean"
 
-#: strings.hrc:795
+#: include/svx/strings.hrc:791
 msgctxt "RID_SVXSTR_BMP18"
-msgid "Orange"
-msgstr "Oren"
+msgid "Parchment Studio"
+msgstr "Stiwdio Memrwn"
 
-#: strings.hrc:796
+#: include/svx/strings.hrc:792
 msgctxt "RID_SVXSTR_BMP19"
-msgid "Fiery"
-msgstr "Tanllyd"
+msgid "Night Sky"
+msgstr "Wybren y Nos"
 
-#: strings.hrc:797
+#: include/svx/strings.hrc:793
 msgctxt "RID_SVXSTR_BMP20"
-msgid "Roses"
-msgstr "Rhosynnau"
+msgid "Pool"
+msgstr "Pwll"
 
-#: strings.hrc:798
+#: include/svx/strings.hrc:794
 msgctxt "RID_SVXSTR_BMP21"
 msgid "Bitmap"
 msgstr "Didfap"
 
-#: strings.hrc:799
+#: include/svx/strings.hrc:795
 msgctxt "RID_SVXSTR_BMP22"
 msgid "5 Percent"
 msgstr "5 y Cant"
 
-#: strings.hrc:800
+#: include/svx/strings.hrc:796
 msgctxt "RID_SVXSTR_BMP23"
 msgid "10 Percent"
 msgstr "10 y Cant"
 
-#: strings.hrc:801
+#: include/svx/strings.hrc:797
 msgctxt "RID_SVXSTR_BMP24"
 msgid "20 Percent"
 msgstr "20 y Cant"
 
-#: strings.hrc:802
+#: include/svx/strings.hrc:798
 msgctxt "RID_SVXSTR_BMP25"
 msgid "25 Percent"
 msgstr "25 y Cant"
 
-#: strings.hrc:803
+#: include/svx/strings.hrc:799
 msgctxt "RID_SVXSTR_BMP26"
 msgid "30 Percent"
 msgstr "30 y Cant"
 
-#: strings.hrc:804
+#: include/svx/strings.hrc:800
 msgctxt "RID_SVXSTR_BMP27"
 msgid "40 Percent"
 msgstr "40 y Cant"
 
-#: strings.hrc:805
+#: include/svx/strings.hrc:801
 msgctxt "RID_SVXSTR_BMP28"
 msgid "50 Percent"
 msgstr "50 y Cant"
 
-#: strings.hrc:806
+#: include/svx/strings.hrc:802
 msgctxt "RID_SVXSTR_BMP29"
 msgid "60 Percent"
 msgstr "60 y Cant"
 
-#: strings.hrc:807
+#: include/svx/strings.hrc:803
 msgctxt "RID_SVXSTR_BMP30"
 msgid "70 Percent"
 msgstr "70 y Cant"
 
-#: strings.hrc:808
+#: include/svx/strings.hrc:804
 msgctxt "RID_SVXSTR_BMP31"
 msgid "75 Percent"
 msgstr "75 y Cant"
 
-#: strings.hrc:809
+#: include/svx/strings.hrc:805
 msgctxt "RID_SVXSTR_BMP32"
 msgid "80 Percent"
 msgstr "80 y Cant"
 
-#: strings.hrc:810
+#: include/svx/strings.hrc:806
 msgctxt "RID_SVXSTR_BMP33"
 msgid "90 Percent"
 msgstr "90 y Cant"
 
-#: strings.hrc:811
+#: include/svx/strings.hrc:807
 msgctxt "RID_SVXSTR_BMP34"
 msgid "Light Downward Diagonal"
 msgstr "Croeslin i Lawr Golau"
 
-#: strings.hrc:812
+#: include/svx/strings.hrc:808
 msgctxt "RID_SVXSTR_BMP35"
 msgid "Light Upward Diagonal"
 msgstr "Croeslin i Fyny Golau"
 
-#: strings.hrc:813
+#: include/svx/strings.hrc:809
 msgctxt "RID_SVXSTR_BMP36"
 msgid "Dark Downward Diagonal"
 msgstr "Croeslin i Lawr Tywyll"
 
-#: strings.hrc:814
+#: include/svx/strings.hrc:810
 msgctxt "RID_SVXSTR_BMP37"
 msgid "Dark Upward Diagonal"
 msgstr "Croeslin i Fyny Tywyll"
 
-#: strings.hrc:815
+#: include/svx/strings.hrc:811
 msgctxt "RID_SVXSTR_BMP38"
 msgid "Wide Downward Diagonal"
 msgstr "Croeslin i Lawr Llydan"
 
-#: strings.hrc:816
+#: include/svx/strings.hrc:812
 msgctxt "RID_SVXSTR_BMP39"
 msgid "Wide Upward Diagonal"
 msgstr "Croeslin i Fyny Llydan"
 
-#: strings.hrc:817
+#: include/svx/strings.hrc:813
 msgctxt "RID_SVXSTR_BMP40"
 msgid "Light Vertical"
 msgstr "Fertigol Golau"
 
-#: strings.hrc:818
+#: include/svx/strings.hrc:814
 msgctxt "RID_SVXSTR_BMP41"
 msgid "Light Horizontal"
 msgstr "Llorweddol Golau"
 
-#: strings.hrc:819
+#: include/svx/strings.hrc:815
 msgctxt "RID_SVXSTR_BMP42"
 msgid "Narrow Vertical"
 msgstr "Llorweddol Fertigol"
 
-#: strings.hrc:820
+#: include/svx/strings.hrc:816
 msgctxt "RID_SVXSTR_BMP43"
 msgid "Narrow Horizontal"
 msgstr "Llorweddol Cul"
 
-#: strings.hrc:821
+#: include/svx/strings.hrc:817
 msgctxt "RID_SVXSTR_BMP44"
 msgid "Dark Vertical"
 msgstr "Fertigol Tywyll"
 
-#: strings.hrc:822
+#: include/svx/strings.hrc:818
 msgctxt "RID_SVXSTR_BMP45"
 msgid "Dark Horizontal"
 msgstr "Llorweddol Tywyll"
 
-#: strings.hrc:823
+#: include/svx/strings.hrc:819
 msgctxt "RID_SVXSTR_BMP46"
 msgid "Dashed Downward Diagonal"
 msgstr "Croeslin i Lawr Toredig"
 
-#: strings.hrc:824
+#: include/svx/strings.hrc:820
 msgctxt "RID_SVXSTR_BMP47"
 msgid "Dashed Upward Diagonal"
 msgstr "Croeslin I Fyny Toredig"
 
-#: strings.hrc:825
+#: include/svx/strings.hrc:821
 msgctxt "RID_SVXSTR_BMP48"
 msgid "Dashed Horizontal"
 msgstr "Llorweddol Toredig"
 
-#: strings.hrc:826
+#: include/svx/strings.hrc:822
 msgctxt "RID_SVXSTR_BMP49"
 msgid "Dashed Vertical"
 msgstr "Fertigol Toredig"
 
-#: strings.hrc:827
+#: include/svx/strings.hrc:823
 msgctxt "RID_SVXSTR_BMP50"
 msgid "Small Confetti"
 msgstr "Conffeti Bach"
 
-#: strings.hrc:828
+#: include/svx/strings.hrc:824
 msgctxt "RID_SVXSTR_BMP51"
 msgid "Large Confetti"
 msgstr "Conffeti Mawr"
 
-#: strings.hrc:829
+#: include/svx/strings.hrc:825
 msgctxt "RID_SVXSTR_BMP52"
 msgid "Zig Zag"
 msgstr "Igam Ogam"
 
-#: strings.hrc:830
+#: include/svx/strings.hrc:826
 msgctxt "RID_SVXSTR_BMP53"
 msgid "Wave"
 msgstr "Ton"
 
-#: strings.hrc:831
+#: include/svx/strings.hrc:827
 msgctxt "RID_SVXSTR_BMP54"
 msgid "Diagonal Brick"
 msgstr "Bric Croeslin"
 
-#: strings.hrc:832
+#: include/svx/strings.hrc:828
 msgctxt "RID_SVXSTR_BMP55"
 msgid "Horizontal Brick"
 msgstr "Bric Llorweddol"
 
-#: strings.hrc:833
+#: include/svx/strings.hrc:829
 msgctxt "RID_SVXSTR_BMP56"
 msgid "Weave"
 msgstr "Ton"
 
-#: strings.hrc:834
+#: include/svx/strings.hrc:830
 msgctxt "RID_SVXSTR_BMP57"
 msgid "Plaid"
 msgstr "Plad"
 
-#: strings.hrc:835
+#: include/svx/strings.hrc:831
 msgctxt "RID_SVXSTR_BMP58"
 msgid "Divot"
 msgstr "Tywarchen"
 
-#: strings.hrc:836
+#: include/svx/strings.hrc:832
 msgctxt "RID_SVXSTR_BMP59"
 msgid "Dotted Grid"
 msgstr "Grid Dotiog"
 
-#: strings.hrc:837
+#: include/svx/strings.hrc:833
 msgctxt "RID_SVXSTR_BMP60"
 msgid "Dotted Diamond"
 msgstr "Diemwnt Dotiog"
 
-#: strings.hrc:838
+#: include/svx/strings.hrc:834
 msgctxt "RID_SVXSTR_BMP61"
 msgid "Shingle"
 msgstr "Graean bras"
 
-#: strings.hrc:839
+#: include/svx/strings.hrc:835
 msgctxt "RID_SVXSTR_BMP62"
 msgid "Trellis"
 msgstr "Delltwaith"
 
-#: strings.hrc:840
+#: include/svx/strings.hrc:836
 msgctxt "RID_SVXSTR_BMP63"
 msgid "Sphere"
 msgstr "Sffêr"
 
-#: strings.hrc:841
+#: include/svx/strings.hrc:837
 msgctxt "RID_SVXSTR_BMP64"
 msgid "Small Grid"
 msgstr "Grid Bach"
 
-#: strings.hrc:842
+#: include/svx/strings.hrc:838
 msgctxt "RID_SVXSTR_BMP65"
 msgid "Large Grid"
 msgstr "Grid Mawr"
 
-#: strings.hrc:843
+#: include/svx/strings.hrc:839
 msgctxt "RID_SVXSTR_BMP66"
 msgid "Small Checker Board"
 msgstr "Bwrdd Sgwariog Bach"
 
-#: strings.hrc:844
+#: include/svx/strings.hrc:840
 msgctxt "RID_SVXSTR_BMP67"
 msgid "Large Checker Board"
 msgstr "Bwrdd Sgwariog Mawr"
 
-#: strings.hrc:845
+#: include/svx/strings.hrc:841
 msgctxt "RID_SVXSTR_BMP68"
 msgid "Outlined Diamond"
 msgstr "Amlinell Diemwnt"
 
-#: strings.hrc:846
+#: include/svx/strings.hrc:842
 msgctxt "RID_SVXSTR_BMP69"
 msgid "Solid Diamond"
 msgstr "Diemwnt Solet"
 
-#: strings.hrc:847
+#: include/svx/strings.hrc:843
 msgctxt "RID_SVXSTR_BMP70"
 msgid "Vertical"
 msgstr "Fertigol"
 
-#: strings.hrc:848
+#: include/svx/strings.hrc:844
 msgctxt "RID_SVXSTR_BMP71"
 msgid "Horizontal"
 msgstr "Llorweddol"
 
-#: strings.hrc:849
+#: include/svx/strings.hrc:845
 msgctxt "RID_SVXSTR_BMP72"
 msgid "Downward Diagonal"
 msgstr "Croeslin i Lawr"
 
-#: strings.hrc:850
+#: include/svx/strings.hrc:846
 msgctxt "RID_SVXSTR_BMP73"
 msgid "Upward Diagonal"
 msgstr "Croeslin i Fyny"
 
-#: strings.hrc:851
+#: include/svx/strings.hrc:847
 msgctxt "RID_SVXSTR_BMP74"
 msgid "Cross"
 msgstr "Croes"
 
-#: strings.hrc:852
+#: include/svx/strings.hrc:848
 msgctxt "RID_SVXSTR_BMP75"
 msgid "Diagonal Cross"
 msgstr "Croes Croeslin"
 
-#: strings.hrc:853
+#: include/svx/strings.hrc:849
 msgctxt "RID_SVXSTR_DASH0"
 msgid "Ultrafine Dashed"
 msgstr "Llinell Doredig Mân Iawn"
 
-#: strings.hrc:854
+#: include/svx/strings.hrc:850
 msgctxt "RID_SVXSTR_DASH1"
 msgid "Fine Dashed"
 msgstr "Llinell Doredig Mân"
 
-#: strings.hrc:855
+#: include/svx/strings.hrc:851
 msgctxt "RID_SVXSTR_DASH2"
 msgid "2 Dots 3 Dashes"
 msgstr "2 Ddot 3 Llinell Doredig"
 
-#: strings.hrc:856
+#: include/svx/strings.hrc:852
 msgctxt "RID_SVXSTR_DASH3"
 msgid "Fine Dotted"
 msgstr "Dotiog Mân"
 
-#: strings.hrc:857
+#: include/svx/strings.hrc:853
 msgctxt "RID_SVXSTR_DASH4"
 msgid "Line with Fine Dots"
 msgstr "Llinell gyda Dotiau Mân"
 
-#: strings.hrc:858
+#: include/svx/strings.hrc:854
 msgctxt "RID_SVXSTR_DASH5"
 msgid "Fine Dashed"
 msgstr "Llinell Doredig Mân"
 
-#: strings.hrc:859
+#: include/svx/strings.hrc:855
 msgctxt "RID_SVXSTR_DASH6"
 msgid "3 Dashes 3 Dots"
 msgstr "3 Toriad 3 Dot"
 
-#: strings.hrc:860
+#: include/svx/strings.hrc:856
 msgctxt "RID_SVXSTR_DASH7"
 msgid "Ultrafine Dotted"
 msgstr "Dotiog Mân"
 
-#: strings.hrc:861
+#: include/svx/strings.hrc:857
 msgctxt "RID_SVXSTR_DASH8"
 msgid "Line Style 9"
 msgstr "Arddull Llinell 9"
 
-#: strings.hrc:862
+#: include/svx/strings.hrc:858
 msgctxt "RID_SVXSTR_DASH9"
 msgid "2 Dots 1 Dash"
 msgstr "2 Ddot 1 Toriad"
 
-#: strings.hrc:863
+#: include/svx/strings.hrc:859
 msgctxt "RID_SVXSTR_DASH10"
 msgid "Dashed"
 msgstr "Toredig"
 
-#: strings.hrc:864
+#: include/svx/strings.hrc:860
 msgctxt "RID_SVXSTR_DASH11"
 msgid "Dashed"
 msgstr "Toredig"
 
-#: strings.hrc:865
+#: include/svx/strings.hrc:861
 msgctxt "RID_SVXSTR_DASH12"
 msgid "Line Style"
 msgstr "Arddull Llinell"
 
-#: strings.hrc:866
+#: include/svx/strings.hrc:862
 msgctxt "RID_SVXSTR_IMAP_ALL_FILTER"
 msgid "All formats"
-msgstr ""
+msgstr "Pob fformat"
 
-#: strings.hrc:867
+#: include/svx/strings.hrc:863
 msgctxt "RID_SVXSTR_LEND0"
 msgid "Arrow concave"
 msgstr "Ceugrwm saeth"
 
-#: strings.hrc:868
+#: include/svx/strings.hrc:864
 msgctxt "RID_SVXSTR_LEND1"
 msgid "Square 45"
 msgstr "Sgwâr 45"
 
-#: strings.hrc:869
+#: include/svx/strings.hrc:865
 msgctxt "RID_SVXSTR_LEND2"
 msgid "Small arrow"
 msgstr "Saeth fechan"
 
-#: strings.hrc:870
+#: include/svx/strings.hrc:866
 msgctxt "RID_SVXSTR_LEND3"
 msgid "Dimension lines"
 msgstr "Llinellau dimensiwn"
 
-#: strings.hrc:871
+#: include/svx/strings.hrc:867
 msgctxt "RID_SVXSTR_LEND4"
 msgid "Double Arrow"
 msgstr "Saeth Ddwbl"
 
-#: strings.hrc:872
+#: include/svx/strings.hrc:868
 msgctxt "RID_SVXSTR_LEND5"
 msgid "Rounded short arrow"
 msgstr "Saeth fer grom"
 
-#: strings.hrc:873
+#: include/svx/strings.hrc:869
 msgctxt "RID_SVXSTR_LEND6"
 msgid "Symmetric arrow"
 msgstr "Saeth gymesur"
 
-#: strings.hrc:874
+#: include/svx/strings.hrc:870
 msgctxt "RID_SVXSTR_LEND7"
 msgid "Line arrow"
 msgstr "Saeth llinell"
 
-#: strings.hrc:875
+#: include/svx/strings.hrc:871
 msgctxt "RID_SVXSTR_LEND8"
 msgid "Rounded large arrow"
 msgstr "Saeth fawr grom"
 
-#: strings.hrc:876
+#: include/svx/strings.hrc:872
 msgctxt "RID_SVXSTR_LEND9"
 msgid "Circle"
 msgstr "Cylch"
 
-#: strings.hrc:877
+#: include/svx/strings.hrc:873
 msgctxt "RID_SVXSTR_LEND10"
 msgid "Square"
 msgstr "Sgwâr"
 
-#: strings.hrc:878
+#: include/svx/strings.hrc:874
 msgctxt "RID_SVXSTR_LEND11"
 msgid "Arrow"
 msgstr "Saeth"
 
-#: strings.hrc:879
+#: include/svx/strings.hrc:875
 msgctxt "RID_SVXSTR_LEND12"
 msgid "Short line arrow"
 msgstr "Saeth llinell fer"
 
-#: strings.hrc:880
+#: include/svx/strings.hrc:876
 msgctxt "RID_SVXSTR_LEND13"
 msgid "Triangle unfilled"
 msgstr "Triongl gwag"
 
-#: strings.hrc:881
+#: include/svx/strings.hrc:877
 msgctxt "RID_SVXSTR_LEND14"
 msgid "Diamond unfilled"
 msgstr "Diemwnt gwag"
 
-#: strings.hrc:882
+#: include/svx/strings.hrc:878
 msgctxt "RID_SVXSTR_LEND15"
 msgid "Diamond"
 msgstr "Diemwnt"
 
-#: strings.hrc:883
+#: include/svx/strings.hrc:879
 msgctxt "RID_SVXSTR_LEND16"
 msgid "Circle unfilled"
 msgstr "Cylch gwag"
 
-#: strings.hrc:884
+#: include/svx/strings.hrc:880
 msgctxt "RID_SVXSTR_LEND17"
 msgid "Square 45 unfilled"
 msgstr "Sgwâr 45 gwag"
 
-#: strings.hrc:885
+#: include/svx/strings.hrc:881
 msgctxt "RID_SVXSTR_LEND18"
 msgid "Square unfilled"
 msgstr "Sgwâr gwag"
 
-#: strings.hrc:886
+#: include/svx/strings.hrc:882
 msgctxt "RID_SVXSTR_LEND19"
 msgid "Half circle unfilled"
 msgstr "Hanner cylch gwag"
 
-#: strings.hrc:887
+#: include/svx/strings.hrc:883
 msgctxt "RID_SVXSTR_LEND20"
 msgid "Arrowhead"
 msgstr "Pen saeth"
 
-#: strings.hrc:888
+#: include/svx/strings.hrc:884
 msgctxt "RID_SVXSTR_TRASNGR0"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: strings.hrc:889
+#: include/svx/strings.hrc:885
 msgctxt "RID_SVXSTR_COLOR_LIBRE_GREEN_1"
 msgid "Green 1 (%PRODUCTNAME Main Color)"
 msgstr "Gwyrdd 1 (Prif Liw %PRODUCTNAME)"
 
-#: strings.hrc:890
+#: include/svx/strings.hrc:886
 msgctxt "RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT"
 msgid "Green Accent"
 msgstr "Arlliw Gwyrdd"
 
-#: strings.hrc:891
+#: include/svx/strings.hrc:887
 msgctxt "RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT"
 msgid "Blue Accent"
 msgstr "Arlliw Glas"
 
-#: strings.hrc:892
+#: include/svx/strings.hrc:888
 msgctxt "RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT"
 msgid "Orange Accent"
 msgstr "Arlliw Oren"
 
-#: strings.hrc:893
+#: include/svx/strings.hrc:889
 msgctxt "RID_SVXSTR_COLOR_LIBRE_PURPLE"
 msgid "Purple"
 msgstr "Porffor"
 
-#: strings.hrc:894
+#: include/svx/strings.hrc:890
 msgctxt "RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT"
 msgid "Purple Accent"
 msgstr "Arlliw Porffor"
 
-#: strings.hrc:895
+#: include/svx/strings.hrc:891
 msgctxt "RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT"
 msgid "Yellow Accent"
 msgstr "Arlliw Melyn"
 
 #. Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
-#: strings.hrc:898
+#: include/svx/strings.hrc:894
 msgctxt "RID_SVXSTR_COLOR_TANGO_BUTTER"
 msgid "Tango: Butter"
 msgstr "Tango: Menyn"
 
 #. Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
-#: strings.hrc:900
+#: include/svx/strings.hrc:896
 msgctxt "RID_SVXSTR_COLOR_TANGO_ORANGE"
 msgid "Tango: Orange"
 msgstr "Tango: Oren"
 
 #. Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
-#: strings.hrc:902
+#: include/svx/strings.hrc:898
 msgctxt "RID_SVXSTR_COLOR_TANGO_CHOCOLATE"
 msgid "Tango: Chocolate"
 msgstr "Tango: Siocled"
 
 #. Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
-#: strings.hrc:904
+#: include/svx/strings.hrc:900
 msgctxt "RID_SVXSTR_COLOR_TANGO_CHAMELEON"
 msgid "Tango: Chameleon"
 msgstr "Tango: Cameleon"
 
 #. Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
-#: strings.hrc:906
+#: include/svx/strings.hrc:902
 msgctxt "RID_SVXSTR_COLOR_TANGO_SKY_BLUE"
 msgid "Tango: Sky Blue"
 msgstr "Tango: Glas yr Awyr"
 
 #. Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
-#: strings.hrc:908
+#: include/svx/strings.hrc:904
 msgctxt "RID_SVXSTR_COLOR_TANGO_PLUM"
 msgid "Tango: Plum"
 msgstr "Tango: Porffor"
 
 #. Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
-#: strings.hrc:910
+#: include/svx/strings.hrc:906
 msgctxt "RID_SVXSTR_COLOR_TANGO_SCARLET_RED"
 msgid "Tango: Scarlet Red"
 msgstr "Tango: Coch Ysgarlad"
 
 #. Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
-#: strings.hrc:912
+#: include/svx/strings.hrc:908
 msgctxt "RID_SVXSTR_COLOR_TANGO_ALUMINIUM"
 msgid "Tango: Aluminium"
 msgstr "Tango: Aliwminiwm"
 
-#: strings.hrc:913
+#: include/svx/strings.hrc:909
 msgctxt "RID_SVXSTR_GALLERYPROPS_GALTHEME"
 msgid "Gallery Theme"
 msgstr "Oriel Themâu"
 
-#: strings.hrc:914
+#: include/svx/strings.hrc:910
 msgctxt "RID_SVXSTR_GALLERY_THEMEITEMS"
 msgid "Theme Items"
 msgstr "Eitemau Themâu"
 
-#: strings.hrc:915
+#: include/svx/strings.hrc:911
 msgctxt "RID_SVXSTR_GALLERY_PREVIEW"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: strings.hrc:916
+#: include/svx/strings.hrc:912
 msgctxt "RID_SVXSTR_SUCCESSRECOV"
 msgid "Successfully recovered"
 msgstr "Adferwyd yn llwyddiannus"
 
-#: strings.hrc:917
+#: include/svx/strings.hrc:913
 msgctxt "RID_SVXSTR_ORIGDOCRECOV"
 msgid "Original document recovered"
 msgstr "Adferwyd y ddogfen wreiddiol"
 
-#: strings.hrc:918
+#: include/svx/strings.hrc:914
 msgctxt "RID_SVXSTR_RECOVFAILED"
 msgid "Recovery failed"
 msgstr "Methu adfer"
 
-#: strings.hrc:919
+#: include/svx/strings.hrc:915
 msgctxt "RID_SVXSTR_RECOVINPROGR"
 msgid "Recovery in progress"
 msgstr "Wrthi'n adfer"
 
-#: strings.hrc:920
+#: include/svx/strings.hrc:916
 msgctxt "RID_SVXSTR_NOTRECOVYET"
 msgid "Not recovered yet"
 msgstr "Heb ei adfer eto"
 
-#: strings.hrc:921
+#: include/svx/strings.hrc:917
 msgctxt "RID_SVXSTR_RECOVERY_INPROGRESS"
 msgid "%PRODUCTNAME %PRODUCTVERSION has begun recovering your documents. Depending on the size of the documents this process can take some time."
 msgstr "Bydd %PRODUCTNAME %PRODUCTVERSION yn cychwyn ceisio adfer eich dogfennau. Yn ddibynnol ar faint eich dogfennau gall y broses gymryd peth amser."
 
-#: strings.hrc:922
+#: include/svx/strings.hrc:918
 msgctxt "RID_SVXSTR_RECOVERYONLY_FINISH_DESCR"
 msgid "Recovery of your documents was finished. Click 'Finish' to see your documents."
 msgstr "Cwblhawyd adfer eich dogfennau. Cliciwch 'Gorffen' i weld eich dogfennau."
 
-#: strings.hrc:923
+#: include/svx/strings.hrc:919
 msgctxt "RID_SVXSTR_RECOVERYONLY_FINISH"
 msgid "~Finish"
 msgstr "~Gorffen"
 
-#: strings.hrc:924
+#: include/svx/strings.hrc:920
 msgctxt "RID_SVXSTR_WIDTH_LAST_CUSTOM"
 msgid "Last Custom Value"
 msgstr "Gwerth Cyfaddas Diwethaf"
 
-#: strings.hrc:925
+#: include/svx/strings.hrc:921
 msgctxt "RID_SVXSTR_PT"
 msgid "pt"
 msgstr "pt"
 
-#: strings.hrc:927
+#: include/svx/strings.hrc:923
 msgctxt "RID_SVXSTR_EXPORT_GRAPHIC_TITLE"
 msgid "Image Export"
 msgstr "Allforio Delwedd"
 
-#: strings.hrc:928
+#: include/svx/strings.hrc:924
 msgctxt "RID_SVXSTR_SAVEAS_IMAGE"
 msgid "Save as Image"
 msgstr "Cadw fel Delwedd"
 
 #. Strings for the Draw Dialog --------------------------------------------
-#: strings.hrc:931
+#: include/svx/strings.hrc:927
 msgctxt "RID_SVX_3D_UNDO_EXCHANGE_PASTE"
 msgid "Insert object(s)"
 msgstr "Mewnosod gwrthrych(au)"
 
-#: strings.hrc:932
+#: include/svx/strings.hrc:928
 msgctxt "RID_SVX_3D_UNDO_ROTATE"
 msgid "Rotate 3D object"
 msgstr "Cylchdroi'r gwrthrych 3D"
 
-#: strings.hrc:933
+#: include/svx/strings.hrc:929
 msgctxt "RID_SVX_3D_UNDO_EXTRUDE"
 msgid "Create extrusion object"
 msgstr "Creu gwrthrych allwthiad"
 
-#: strings.hrc:934
+#: include/svx/strings.hrc:930
 msgctxt "RID_SVX_3D_UNDO_LATHE"
 msgid "Create rotation object"
 msgstr "Creu gwrthrych troi"
 
-#: strings.hrc:935
+#: include/svx/strings.hrc:931
 msgctxt "RID_SVX_3D_UNDO_BREAK_LATHE"
 msgid "Split 3D object"
 msgstr "Hollti gwrthrych 3D"
 
 #. Language-Strings ------------------------------------------------------
-#: strings.hrc:938
+#: include/svx/strings.hrc:934
 msgctxt "RID_SVXSTR_LANGUAGE_ALL"
 msgid "[All]"
 msgstr "[All]"
 
-#: strings.hrc:940
+#: include/svx/strings.hrc:936
 msgctxt "RID_SVXSTR_GALLERY_FILTER"
 msgid "Graphics filter"
 msgstr "Hidl graffigau"
 
-#: strings.hrc:941
+#: include/svx/strings.hrc:937
 msgctxt "RID_SVXSTR_GALLERY_NEWTHEME"
 msgid "New Theme"
 msgstr "Thema Newydd"
 
-#: strings.hrc:942
+#: include/svx/strings.hrc:938
 msgctxt "RID_SVXSTR_GALLERY_CREATETHEME"
 msgid "New Theme..."
 msgstr "Thema Newydd..."
 
-#: strings.hrc:943
+#: include/svx/strings.hrc:939
 msgctxt "RID_SVXSTR_GALLERY_TITLE"
 msgid "Title"
 msgstr "Teitl"
 
-#: strings.hrc:944
+#: include/svx/strings.hrc:940
 msgctxt "RID_SVXSTR_GALLERY_ICONVIEW"
 msgid "Icon View"
 msgstr "Golwg Eicon"
 
-#: strings.hrc:945
+#: include/svx/strings.hrc:941
 msgctxt "RID_SVXSTR_GALLERY_LISTVIEW"
 msgid "Detailed View"
 msgstr "Golwg Manwl"
 
-#: strings.hrc:947
+#: include/svx/strings.hrc:943
 msgctxt "RID_GALLERYSTR_THEME_3D"
 msgid "3D Effects"
 msgstr "Effeithiau 3D"
 
-#: strings.hrc:948
+#: include/svx/strings.hrc:944
 msgctxt "RID_GALLERYSTR_THEME_ANIMATIONS"
 msgid "Animations"
 msgstr "Animeiddiadau"
 
-#: strings.hrc:949
+#: include/svx/strings.hrc:945
 msgctxt "RID_GALLERYSTR_THEME_BULLETS"
 msgid "Bullets"
 msgstr "Bwledi"
 
-#: strings.hrc:950
+#: include/svx/strings.hrc:946
 msgctxt "RID_GALLERYSTR_THEME_OFFICE"
 msgid "Office"
 msgstr "Swyddfa"
 
-#: strings.hrc:951
+#: include/svx/strings.hrc:947
 msgctxt "RID_GALLERYSTR_THEME_FLAGS"
 msgid "Flags"
 msgstr "Baneri"
 
-#: strings.hrc:952
+#: include/svx/strings.hrc:948
 msgctxt "RID_GALLERYSTR_THEME_FLOWCHARTS"
 msgid "Flow Charts"
 msgstr "Siartiau Llif"
 
-#: strings.hrc:953
+#: include/svx/strings.hrc:949
 msgctxt "RID_GALLERYSTR_THEME_EMOTICONS"
 msgid "Emoticons"
 msgstr "Emoticons"
 
-#: strings.hrc:954
+#: include/svx/strings.hrc:950
 msgctxt "RID_GALLERYSTR_THEME_PHOTOS"
 msgid "Images"
 msgstr "Delweddau"
 
-#: strings.hrc:955
+#: include/svx/strings.hrc:951
 msgctxt "RID_GALLERYSTR_THEME_BACKGROUNDS"
 msgid "Backgrounds"
 msgstr "Cefndiroedd"
 
-#: strings.hrc:956
+#: include/svx/strings.hrc:952
 msgctxt "RID_GALLERYSTR_THEME_HOMEPAGE"
 msgid "Homepage"
 msgstr "Tudalen Cartref"
 
-#: strings.hrc:957
+#: include/svx/strings.hrc:953
 msgctxt "RID_GALLERYSTR_THEME_INTERACTION"
 msgid "Interaction"
 msgstr "Rhyngweithiad"
 
-#: strings.hrc:958
+#: include/svx/strings.hrc:954
 msgctxt "RID_GALLERYSTR_THEME_MAPS"
 msgid "Maps"
 msgstr "Mapiau"
 
-#: strings.hrc:959
+#: include/svx/strings.hrc:955
 msgctxt "RID_GALLERYSTR_THEME_PEOPLE"
 msgid "People"
 msgstr "Pobl"
 
-#: strings.hrc:960
+#: include/svx/strings.hrc:956
 msgctxt "RID_GALLERYSTR_THEME_SURFACES"
 msgid "Surfaces"
 msgstr "Arwynebau"
 
-#: strings.hrc:961
+#: include/svx/strings.hrc:957
 msgctxt "RID_GALLERYSTR_THEME_COMPUTERS"
 msgid "Computers"
 msgstr "Cyfrifiaduron"
 
-#: strings.hrc:962
+#: include/svx/strings.hrc:958
 msgctxt "RID_GALLERYSTR_THEME_DIAGRAMS"
 msgid "Diagrams"
 msgstr "Diagramau"
 
-#: strings.hrc:963
+#: include/svx/strings.hrc:959
 msgctxt "RID_GALLERYSTR_THEME_ENVIRONMENT"
 msgid "Environment"
 msgstr "Amgylchedd"
 
-#: strings.hrc:964
+#: include/svx/strings.hrc:960
 msgctxt "RID_GALLERYSTR_THEME_FINANCE"
 msgid "Finance"
 msgstr "Cyllid"
 
-#: strings.hrc:965
+#: include/svx/strings.hrc:961
 msgctxt "RID_GALLERYSTR_THEME_TRANSPORT"
 msgid "Transport"
 msgstr "Cludiant"
 
-#: strings.hrc:966
+#: include/svx/strings.hrc:962
 msgctxt "RID_GALLERYSTR_THEME_TXTSHAPES"
 msgid "Textshapes"
 msgstr "Siapiau Testun"
 
-#: strings.hrc:967
+#: include/svx/strings.hrc:963
 msgctxt "RID_GALLERYSTR_THEME_SOUNDS"
 msgid "Sounds"
 msgstr "Seiniau"
 
-#: strings.hrc:968
+#: include/svx/strings.hrc:964
 msgctxt "RID_GALLERYSTR_THEME_SYMBOLS"
 msgid "Symbols"
 msgstr "Symbolau"
 
-#: strings.hrc:969
+#: include/svx/strings.hrc:965
 msgctxt "RID_GALLERYSTR_THEME_MYTHEME"
 msgid "My Theme"
 msgstr "Fy Thema"
 
-#: strings.hrc:970
+#: include/svx/strings.hrc:966
 msgctxt "RID_GALLERYSTR_THEME_ARROWS"
 msgid "Arrows"
 msgstr "Saethau"
 
-#: strings.hrc:971
+#: include/svx/strings.hrc:967
 msgctxt "RID_GALLERYSTR_THEME_BALLOONS"
 msgid "Balloons"
 msgstr "Balwns"
 
-#: strings.hrc:972
+#: include/svx/strings.hrc:968
 msgctxt "RID_GALLERYSTR_THEME_KEYBOARD"
 msgid "Keyboard"
 msgstr "Bysellfwrdd"
 
-#: strings.hrc:973
+#: include/svx/strings.hrc:969
 msgctxt "RID_GALLERYSTR_THEME_TIME"
 msgid "Time"
 msgstr "Amser"
 
-#: strings.hrc:974
+#: include/svx/strings.hrc:970
 msgctxt "RID_GALLERYSTR_THEME_PRESENTATION"
 msgid "Presentation"
 msgstr "Cyflwyniad"
 
-#: strings.hrc:975
+#: include/svx/strings.hrc:971
 msgctxt "RID_GALLERYSTR_THEME_CALENDAR"
 msgid "Calendar"
 msgstr "Calendr"
 
-#: strings.hrc:976
+#: include/svx/strings.hrc:972
 msgctxt "RID_GALLERYSTR_THEME_NAVIGATION"
 msgid "Navigation"
 msgstr "Dewis"
 
-#: strings.hrc:977
+#: include/svx/strings.hrc:973
 msgctxt "RID_GALLERYSTR_THEME_COMMUNICATION"
 msgid "Communication"
 msgstr "Cyfathrebu"
 
-#: strings.hrc:978
+#: include/svx/strings.hrc:974
 msgctxt "RID_GALLERYSTR_THEME_FINANCES"
 msgid "Finances"
 msgstr "Cyllid"
 
-#: strings.hrc:979
+#: include/svx/strings.hrc:975
 msgctxt "RID_GALLERYSTR_THEME_COMPUTER"
 msgid "Computers"
 msgstr "Cyfrifiaduron"
 
-#: strings.hrc:980
+#: include/svx/strings.hrc:976
 msgctxt "RID_GALLERYSTR_THEME_CLIMA"
 msgid "Climate"
 msgstr "Hinsawdd"
 
-#: strings.hrc:981
+#: include/svx/strings.hrc:977
 msgctxt "RID_GALLERYSTR_THEME_EDUCATION"
 msgid "School & University"
 msgstr "Ysgol a Phrifysgol"
 
-#: strings.hrc:982
+#: include/svx/strings.hrc:978
 msgctxt "RID_GALLERYSTR_THEME_TROUBLE"
 msgid "Problem Solving"
 msgstr "Datrys Problemau"
 
-#: strings.hrc:983
+#: include/svx/strings.hrc:979
 msgctxt "RID_GALLERYSTR_THEME_SCREENBEANS"
 msgid "Screen Beans"
 msgstr "Ffa Sgrin"
 
-#: strings.hrc:985
+#: include/svx/strings.hrc:981
 msgctxt "RID_SVXSTR_ALIGN_LEFT"
 msgid "~Left Align"
 msgstr "Alinio i'r ~Chwith"
 
-#: strings.hrc:986
+#: include/svx/strings.hrc:982
 msgctxt "RID_SVXSTR_ALIGN_CENTER"
 msgid "~Center"
 msgstr "~Canol"
 
-#: strings.hrc:987
+#: include/svx/strings.hrc:983
 msgctxt "RID_SVXSTR_ALIGN_RIGHT"
 msgid "~Right Align"
 msgstr "Alinio i'r ~Dde"
 
-#: strings.hrc:988
+#: include/svx/strings.hrc:984
 msgctxt "RID_SVXSTR_ALIGN_WORD"
 msgid "~Word Justify"
 msgstr "~Unioni Geiriau"
 
-#: strings.hrc:989
+#: include/svx/strings.hrc:985
 msgctxt "RID_SVXSTR_ALIGN_STRETCH"
 msgid "S~tretch Justify"
 msgstr "~Ymestyn Unioni"
 
-#: strings.hrc:990
+#: include/svx/strings.hrc:986
 msgctxt "RID_SVXSTR_CHARS_SPACING_VERY_TIGHT"
 msgid "~Very Tight"
 msgstr "~Tynn Iawn"
 
-#: strings.hrc:991
+#: include/svx/strings.hrc:987
 msgctxt "RID_SVXSTR_CHARS_SPACING_TIGHT"
 msgid "~Tight"
 msgstr "~Tynn"
 
-#: strings.hrc:992
+#: include/svx/strings.hrc:988
 msgctxt "RID_SVXSTR_CHARS_SPACING_NORMAL"
 msgid "~Normal"
 msgstr "~Normal"
 
-#: strings.hrc:993
+#: include/svx/strings.hrc:989
 msgctxt "RID_SVXSTR_CHARS_SPACING_LOOSE"
 msgid "~Loose"
 msgstr "~Llac"
 
-#: strings.hrc:994
+#: include/svx/strings.hrc:990
 msgctxt "RID_SVXSTR_CHARS_SPACING_VERY_LOOSE"
 msgid "Very ~Loose"
 msgstr "Llac ~Iawn"
 
-#: strings.hrc:995
+#: include/svx/strings.hrc:991
 msgctxt "RID_SVXSTR_CHARS_SPACING_CUSTOM"
 msgid "~Custom..."
 msgstr "~Cyfaddas..."
 
-#: strings.hrc:996
+#: include/svx/strings.hrc:992
 msgctxt "RID_SVXSTR_CHARS_SPACING_KERN_PAIRS"
 msgid "~Kern Character Pairs"
 msgstr "~Gorgyffwrch Par Nodau"
 
-#: strings.hrc:998
+#: include/svx/strings.hrc:994
 msgctxt "RID_SVXSTR_QRY_PRINT_TITLE"
 msgid "Printing selection"
 msgstr "Adran argraffu"
 
-#: strings.hrc:999
+#: include/svx/strings.hrc:995
 msgctxt "RID_SVXSTR_QRY_PRINT_MSG"
 msgid "Do you want to print the selection or the entire document?"
 msgstr "Hoffech chi argraffu rhan neu'r ddogfen gyfan?"
 
-#: strings.hrc:1000
+#: include/svx/strings.hrc:996
 msgctxt "RID_SVXSTR_QRY_PRINT_ALL"
 msgid "~All"
 msgstr "P~opeth"
 
-#: strings.hrc:1001
+#: include/svx/strings.hrc:997
 msgctxt "RID_SVXSTR_QRY_PRINT_SELECTION"
 msgid "~Selection"
 msgstr "~Dewis"
 
-#: strings.hrc:1003
+#: include/svx/strings.hrc:999
 msgctxt "RID_SVXSTR_PERSPECTIVE"
 msgid "~Perspective"
 msgstr "~Persbectif"
 
-#: strings.hrc:1004
+#: include/svx/strings.hrc:1000
 msgctxt "RID_SVXSTR_PARALLEL"
 msgid "P~arallel"
 msgstr "~Paralel"
 
-#: strings.hrc:1005
+#: include/svx/strings.hrc:1001
 msgctxt "RID_SVXSTR_DIRECTION_NW"
 msgid "Extrusion North-West"
 msgstr "Allwthiad Gogledd Orllewin"
 
-#: strings.hrc:1006
+#: include/svx/strings.hrc:1002
 msgctxt "RID_SVXSTR_DIRECTION_N"
 msgid "Extrusion North"
 msgstr "Allwthiad Gogledd"
 
-#: strings.hrc:1007
+#: include/svx/strings.hrc:1003
 msgctxt "RID_SVXSTR_DIRECTION_NE"
 msgid "Extrusion North-East"
 msgstr "Allwthiad Gogledd Ddwyrain"
 
-#: strings.hrc:1008
+#: include/svx/strings.hrc:1004
 msgctxt "RID_SVXSTR_DIRECTION_W"
 msgid "Extrusion West"
 msgstr "Allwthiad Gorllewin"
 
-#: strings.hrc:1009
+#: include/svx/strings.hrc:1005
 msgctxt "RID_SVXSTR_DIRECTION_NONE"
 msgid "Extrusion Backwards"
 msgstr "Allwthiad yn Ôl"
 
-#: strings.hrc:1010
+#: include/svx/strings.hrc:1006
 msgctxt "RID_SVXSTR_DIRECTION_E"
 msgid "Extrusion East"
 msgstr "Allwthiad Dwyrain"
 
-#: strings.hrc:1011
+#: include/svx/strings.hrc:1007
 msgctxt "RID_SVXSTR_DIRECTION_SW"
 msgid "Extrusion South-West"
 msgstr "Allwthiad De Orllewin"
 
-#: strings.hrc:1012
+#: include/svx/strings.hrc:1008
 msgctxt "RID_SVXSTR_DIRECTION_S"
 msgid "Extrusion South"
 msgstr "Allwthiad De"
 
-#: strings.hrc:1013
+#: include/svx/strings.hrc:1009
 msgctxt "RID_SVXSTR_DIRECTION_SE"
 msgid "Extrusion South-East"
 msgstr "Allwthiad De Ddwyrain"
 
-#: strings.hrc:1014
+#: include/svx/strings.hrc:1010
 msgctxt "RID_SVXSTR_BRIGHT"
 msgid "~Bright"
 msgstr "~Llachar"
 
-#: strings.hrc:1015
+#: include/svx/strings.hrc:1011
 msgctxt "RID_SVXSTR_NORMAL"
 msgid "~Normal"
 msgstr "~Normal"
 
-#: strings.hrc:1016
+#: include/svx/strings.hrc:1012
 msgctxt "RID_SVXSTR_DIM"
 msgid "~Dim"
 msgstr "~Pwl"
 
-#: strings.hrc:1017
+#: include/svx/strings.hrc:1013
 msgctxt "RID_SVXSTR_WIREFRAME"
 msgid "~Wire Frame"
 msgstr "~Ffrâm Gwifrau"
 
-#: strings.hrc:1018
+#: include/svx/strings.hrc:1014
 msgctxt "RID_SVXSTR_MATTE"
 msgid "~Matt"
 msgstr "~Mat"
 
-#: strings.hrc:1019
+#: include/svx/strings.hrc:1015
 msgctxt "RID_SVXSTR_PLASTIC"
 msgid "~Plastic"
 msgstr "~Plastig"
 
-#: strings.hrc:1020
+#: include/svx/strings.hrc:1016
 msgctxt "RID_SVXSTR_METAL"
 msgid "Me~tal"
 msgstr "Me~tal"
 
-#: strings.hrc:1021
+#: include/svx/strings.hrc:1017
 msgctxt "RID_SVXSTR_DEPTH_0"
 msgid "~0 cm"
 msgstr "~0 cm"
 
-#: strings.hrc:1022
+#: include/svx/strings.hrc:1018
 msgctxt "RID_SVXSTR_DEPTH_1"
 msgid "~1 cm"
 msgstr "~1 cm"
 
-#: strings.hrc:1023
+#: include/svx/strings.hrc:1019
 msgctxt "RID_SVXSTR_DEPTH_2"
 msgid "~2.5 cm"
 msgstr "~2.5 cm"
 
-#: strings.hrc:1024
+#: include/svx/strings.hrc:1020
 msgctxt "RID_SVXSTR_DEPTH_3"
 msgid "~5 cm"
 msgstr "~5 cm"
 
-#: strings.hrc:1025
+#: include/svx/strings.hrc:1021
 msgctxt "RID_SVXSTR_DEPTH_4"
 msgid "10 ~cm"
 msgstr "10 ~cm"
 
-#: strings.hrc:1026
+#: include/svx/strings.hrc:1022
 msgctxt "RID_SVXSTR_DEPTH_0_INCH"
 msgid "0 inch"
 msgstr "0 modfedd"
 
-#: strings.hrc:1027
+#: include/svx/strings.hrc:1023
 msgctxt "RID_SVXSTR_DEPTH_1_INCH"
 msgid "0.~5 inch"
 msgstr "0.~5 modfedd"
 
-#: strings.hrc:1028
+#: include/svx/strings.hrc:1024
 msgctxt "RID_SVXSTR_DEPTH_2_INCH"
 msgid "~1 inch"
 msgstr "~1 modfedd"
 
-#: strings.hrc:1029
+#: include/svx/strings.hrc:1025
 msgctxt "RID_SVXSTR_DEPTH_3_INCH"
 msgid "~2 inch"
 msgstr "~2 modfedd"
 
-#: strings.hrc:1030
+#: include/svx/strings.hrc:1026
 msgctxt "RID_SVXSTR_DEPTH_4_INCH"
 msgid "~4 inch"
 msgstr "~4 modfedd"
 
-#: strings.hrc:1031
+#: include/svx/strings.hrc:1027
 msgctxt "RID_SVXSTR_CUSTOM"
 msgid "~Custom..."
 msgstr "~Cyfaddas..."
 
-#: strings.hrc:1032
+#: include/svx/strings.hrc:1028
 msgctxt "RID_SVXSTR_INFINITY"
 msgid "~Infinity"
 msgstr "~Anfeidredd"
 
-#: strings.hrc:1034
+#: include/svx/strings.hrc:1030
 msgctxt "RID_SVXSTR_NOFILL"
 msgid "No Fill"
 msgstr "Dim Llanw"
 
-#: strings.hrc:1035
+#: include/svx/strings.hrc:1031
 msgctxt "RID_SVXSTR_TRANSPARENT"
 msgid "Transparent"
 msgstr "Tryloyw"
 
-#: strings.hrc:1036
+#: include/svx/strings.hrc:1032
 msgctxt "RID_SVXSTR_DEFAULT"
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: strings.hrc:1037
+#: include/svx/strings.hrc:1033
 msgctxt "RID_SVXSTR_FRAME"
 msgid "Borders"
 msgstr "Borderi"
 
-#: strings.hrc:1038
+#: include/svx/strings.hrc:1034
 msgctxt "RID_SVXSTR_FRAME_STYLE"
 msgid "Border Style"
 msgstr "Arddull Border"
 
-#: strings.hrc:1039
+#: include/svx/strings.hrc:1035
 msgctxt "RID_SVXSTR_MORENUMBERING"
 msgid "More Numbering..."
 msgstr "Rhagor o Rifo..."
 
-#: strings.hrc:1040
+#: include/svx/strings.hrc:1036
 msgctxt "RID_SVXSTR_MOREBULLETS"
 msgid "More Bullets..."
 msgstr "Rhagor o Fwledi..."
 
-#: strings.hrc:1041
+#: include/svx/strings.hrc:1037
 msgctxt "RID_SVXSTR_BY_AUTHOR"
 msgid "By author"
 msgstr "Gan yr awdur"
 
-#: strings.hrc:1042
+#: include/svx/strings.hrc:1038
 msgctxt "RID_SVXSTR_PAGES"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: strings.hrc:1043
+#: include/svx/strings.hrc:1039
 msgctxt "RID_SVXSTR_CLEARFORM"
 msgid "Clear formatting"
 msgstr "Clirio fformatio"
 
-#: strings.hrc:1044
+#: include/svx/strings.hrc:1040
 msgctxt "RID_SVXSTR_MORE_STYLES"
 msgid "More Styles..."
 msgstr "Rhagor o Arddulliau..."
 
-#: strings.hrc:1045
+#: include/svx/strings.hrc:1041
 msgctxt "RID_SVXSTR_MORE"
 msgid "More Options..."
 msgstr "Rhagor o Ddewisiadau..."
 
 #. This is duplicated in GenericCommands.xcu in officecfg.
-#: strings.hrc:1047
+#: include/svx/strings.hrc:1043
 msgctxt "RID_SVXSTR_CHARFONTNAME"
 msgid "Font Name"
 msgstr "Enw Ffont"
 
-#: strings.hrc:1048
+#: include/svx/strings.hrc:1044
 msgctxt "RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE"
 msgid "Font Name. The current font is not available and will be substituted."
 msgstr "Enw Ffont. Nid yw'r ffont cyfredol ar gael a bydd yn cael ei newid."
 
-#: strings.hrc:1049
+#: include/svx/strings.hrc:1045
 msgctxt "RID_SVXSTR_CUSTOM_PAL"
 msgid "custom"
 msgstr "cyfaddas"
 
-#: strings.hrc:1050
+#: include/svx/strings.hrc:1046
 msgctxt "RID_SVXSTR_DOC_COLORS"
 msgid "Document colors"
 msgstr "Lliwiau dogfen"
 
-#: strings.hrc:1051
+#: include/svx/strings.hrc:1047
 msgctxt "RID_SVXSTR_DOC_COLOR_PREFIX"
 msgid "Document Color"
 msgstr "Lliw Dogfen"
 
-#: strings.hrc:1053
+#: include/svx/strings.hrc:1049
 msgctxt "RID_SVX_EXTRUSION_BAR"
 msgid "Extrusion"
 msgstr "Allwthiad"
 
-#: strings.hrc:1054
+#: include/svx/strings.hrc:1050
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF"
 msgid "Apply Extrusion On/Off"
 msgstr "Gosod Allwthiad Ymlaen/Diffodd"
 
-#: strings.hrc:1055
+#: include/svx/strings.hrc:1051
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN"
 msgid "Tilt Down"
 msgstr "Gogwyddo i Lawr"
 
-#: strings.hrc:1056
+#: include/svx/strings.hrc:1052
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP"
 msgid "Tilt Up"
 msgstr "Gogwyddo i Fyny"
 
-#: strings.hrc:1057
+#: include/svx/strings.hrc:1053
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT"
 msgid "Tilt Left"
 msgstr "Gogwyddo i'r Chwith"
 
-#: strings.hrc:1058
+#: include/svx/strings.hrc:1054
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT"
 msgid "Tilt Right"
 msgstr "Gogwyddo i'r Dde"
 
-#: strings.hrc:1059
+#: include/svx/strings.hrc:1055
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH"
 msgid "Change Extrusion Depth"
 msgstr "Newid Dyfnder Allwthiad"
 
-#: strings.hrc:1060
+#: include/svx/strings.hrc:1056
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION"
 msgid "Change Orientation"
 msgstr "Newid Cyfeiriadedd"
 
-#: strings.hrc:1061
+#: include/svx/strings.hrc:1057
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION"
 msgid "Change Projection Type"
 msgstr "Newid Math o Dafluniad"
 
-#: strings.hrc:1062
+#: include/svx/strings.hrc:1058
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING"
 msgid "Change Lighting"
 msgstr "Newid Goleuo"
 
-#: strings.hrc:1063
+#: include/svx/strings.hrc:1059
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS"
 msgid "Change Brightness"
 msgstr "Newid Disgleirdeb"
 
-#: strings.hrc:1064
+#: include/svx/strings.hrc:1060
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE"
 msgid "Change Extrusion Surface"
 msgstr "Newid Gwyneb Allwthiad"
 
-#: strings.hrc:1065
+#: include/svx/strings.hrc:1061
 msgctxt "RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR"
 msgid "Change Extrusion Color"
 msgstr "Newid Lliw Allwthiad"
 
-#: strings.hrc:1067
+#: include/svx/strings.hrc:1063
 msgctxt "RID_SVXFLOAT3D_FAVORITE"
 msgid "Favorite"
 msgstr "Ffefryn"
 
-#: strings.hrc:1068
+#: include/svx/strings.hrc:1064
 msgctxt "RID_SVXFLOAT3D_FIX_R"
 msgid "R:"
 msgstr "R:"
 
-#: strings.hrc:1069
+#: include/svx/strings.hrc:1065
 msgctxt "RID_SVXFLOAT3D_FIX_G"
 msgid "G:"
 msgstr "G:"
 
-#: strings.hrc:1070
+#: include/svx/strings.hrc:1066
 msgctxt "RID_SVXFLOAT3D_FIX_B"
 msgid "B:"
 msgstr "B:"
 
-#: strings.hrc:1072
+#: include/svx/strings.hrc:1068
 msgctxt "RID_SVX_FONTWORK_BAR"
 msgid "Fontwork"
 msgstr "Fontwork"
 
-#: strings.hrc:1073
+#: include/svx/strings.hrc:1069
 msgctxt "RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE"
 msgid "Apply Fontwork Shape"
 msgstr "Gosod Siâp Fontwork"
 
-#: strings.hrc:1074
+#: include/svx/strings.hrc:1070
 msgctxt "RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT"
 msgid "Apply Fontwork Same Letter Heights"
 msgstr "Gosod Llythrennau Fontwork yr Un Uchder"
 
-#: strings.hrc:1075
+#: include/svx/strings.hrc:1071
 msgctxt "RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT"
 msgid "Apply Fontwork Alignment"
 msgstr "Gosod Aliniad Fontwork"
 
-#: strings.hrc:1076
+#: include/svx/strings.hrc:1072
 msgctxt "RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING"
 msgid "Apply Fontwork Character Spacing"
 msgstr "Gosod Bylchu Nod Fontwork"
 
-#: strings.hrc:1078
+#: include/svx/strings.hrc:1074
 msgctxt "RID_SVXSTR_A11Y_3D_MATERIAL_COLOR"
 msgid "3D material color"
 msgstr "Lliw defnydd 3D"
 
-#: strings.hrc:1079
+#: include/svx/strings.hrc:1075
 msgctxt "RID_SVXSTR_A11Y_FILLSTYLE_NONE"
 msgid "None"
 msgstr "Dim"
 
-#: strings.hrc:1080
+#: include/svx/strings.hrc:1076
 msgctxt "RID_SVXSTR_A11Y_FILLSTYLE_SOLID"
 msgid "Solid"
 msgstr "Solet"
 
-#: strings.hrc:1081
+#: include/svx/strings.hrc:1077
 msgctxt "RID_SVXSTR_A11Y_FILLSTYLE_HATCH"
 msgid "With hatching"
 msgstr "Gyda lliniogi"
 
-#: strings.hrc:1082
+#: include/svx/strings.hrc:1078
 msgctxt "RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT"
 msgid "Gradient"
 msgstr "Graddiant"
 
-#: strings.hrc:1083
+#: include/svx/strings.hrc:1079
 msgctxt "RID_SVXSTR_A11Y_FILLSTYLE_BITMAP"
 msgid "Bitmap"
 msgstr "Didfap"
 
-#: strings.hrc:1084
+#: include/svx/strings.hrc:1080
 msgctxt "RID_SVXSTR_A11Y_WITH"
 msgid "with"
 msgstr "gyda"
 
-#: strings.hrc:1085
+#: include/svx/strings.hrc:1081
 msgctxt "RID_SVXSTR_A11Y_STYLE"
 msgid "Style"
 msgstr "Arddull"
 
-#: strings.hrc:1086
+#: include/svx/strings.hrc:1082
 msgctxt "RID_SVXSTR_A11Y_AND"
 msgid "and"
 msgstr "a"
 
 #. SvxRectCtl
-#: strings.hrc:1088
+#: include/svx/strings.hrc:1084
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CORN_NAME"
 msgid "Corner control"
 msgstr "Rheoli cornel"
 
-#: strings.hrc:1089
+#: include/svx/strings.hrc:1085
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CORN_DESCR"
 msgid "Selection of a corner point."
 msgstr "Dewis pwynt cornel."
 
-#: strings.hrc:1090
-msgctxt "RID_SVXSTR_RECTCTL_ACC_ANGL_NAME"
-msgid "Angle control"
-msgstr "Rheoli ongl"
-
-#: strings.hrc:1091
-msgctxt "RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR"
-msgid "Selection of a major angle."
-msgstr "Dewis ongl fwyaf."
-
-#: strings.hrc:1092
+#: include/svx/strings.hrc:1086
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_LT"
 msgid "Top left"
 msgstr "Brig chwith"
 
-#: strings.hrc:1093
+#: include/svx/strings.hrc:1087
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_MT"
 msgid "Top middle"
 msgstr "Brig canol"
 
-#: strings.hrc:1094
+#: include/svx/strings.hrc:1088
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_RT"
 msgid "Top right"
 msgstr "Brig de"
 
-#: strings.hrc:1095
+#: include/svx/strings.hrc:1089
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_LM"
 msgid "Left center"
 msgstr "Canol chwith"
 
-#: strings.hrc:1096
+#: include/svx/strings.hrc:1090
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_MM"
 msgid "Center"
 msgstr "Canol"
 
-#: strings.hrc:1097
+#: include/svx/strings.hrc:1091
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_RM"
 msgid "Right center"
 msgstr "Canol de"
 
-#: strings.hrc:1098
+#: include/svx/strings.hrc:1092
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_LB"
 msgid "Bottom left"
 msgstr "Gwaelod chwith"
 
-#: strings.hrc:1099
+#: include/svx/strings.hrc:1093
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_MB"
 msgid "Bottom middle"
 msgstr "Gwaelod canol"
 
-#: strings.hrc:1100
+#: include/svx/strings.hrc:1094
 msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_RB"
 msgid "Bottom right"
 msgstr "Gwaelod de"
 
-#: strings.hrc:1101
-msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_A000"
-msgid "0 degrees"
-msgstr "0 gradd"
-
-#: strings.hrc:1102
-msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_A045"
-msgid "45 degrees"
-msgstr "45 gradd"
-
-#: strings.hrc:1103
-msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_A090"
-msgid "90 degrees"
-msgstr "90 gradd"
-
-#: strings.hrc:1104
-msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_A135"
-msgid "135 degrees"
-msgstr "135 gradd"
-
-#: strings.hrc:1105
-msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_A180"
-msgid "180 degrees"
-msgstr "180 gradd"
-
-#: strings.hrc:1106
-msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_A225"
-msgid "225 degrees"
-msgstr "225 gradd"
-
-#: strings.hrc:1107
-msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_A270"
-msgid "270 degrees"
-msgstr "270 gradd"
-
-#: strings.hrc:1108
-msgctxt "RID_SVXSTR_RECTCTL_ACC_CHLD_A315"
-msgid "315 degrees"
-msgstr "315 gradd"
-
 #. SvxGraphCtrlAccessibleContext
-#: strings.hrc:1110
+#: include/svx/strings.hrc:1096
 msgctxt "RID_SVXSTR_GRAPHCTRL_ACC_NAME"
 msgid "Contour control"
 msgstr "Rheoli amlinell"
 
-#: strings.hrc:1111
+#: include/svx/strings.hrc:1097
 msgctxt "RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION"
 msgid "This is where you can edit the contour."
 msgstr "Dyma lle mae rheoli'r amlinell."
 
-#: strings.hrc:1112
+#: include/svx/strings.hrc:1098
 msgctxt "RID_SVXSTR_CHARACTER_SELECTION"
 msgid "Special character selection"
 msgstr "Dewis nod arbennig"
 
-#: strings.hrc:1113
+#: include/svx/strings.hrc:1099
 msgctxt "RID_SVXSTR_CHAR_SEL_DESC"
 msgid "Select special characters in this area."
 msgstr "Dewis nodau arbennig yma."
 
 #. The space behind is a must.
-#: strings.hrc:1115
+#: include/svx/strings.hrc:1101
 msgctxt "RID_SVXSTR_CHARACTER_CODE"
 msgid "Character code "
 msgstr "Cod nodau "
 
-#: strings.hrc:1117
+#: include/svx/strings.hrc:1103
 msgctxt "RID_ERR_FIELDREQUIRED"
 msgid "Input required in field '#'. Please enter a value."
 msgstr "Angen mewnbwn ym maes '#'. Rhowch werth."
 
-#: strings.hrc:1118
+#: include/svx/strings.hrc:1104
 msgctxt "RID_STR_FORMS"
 msgid "Forms"
 msgstr "Ffurflenni"
 
-#: strings.hrc:1119
+#: include/svx/strings.hrc:1105
 msgctxt "RID_STR_NO_PROPERTIES"
 msgid "No control selected"
 msgstr "Heb ddewis rheolydd"
 
-#: strings.hrc:1120
+#: include/svx/strings.hrc:1106
 msgctxt "RID_STR_PROPERTIES_CONTROL"
 msgid "Properties: "
 msgstr "Priodweddau: "
 
-#: strings.hrc:1121
+#: include/svx/strings.hrc:1107
 msgctxt "RID_STR_PROPERTIES_FORM"
 msgid "Form Properties"
 msgstr "Priodweddau Ffurflen"
 
-#: strings.hrc:1122
+#: include/svx/strings.hrc:1108
 msgctxt "RID_STR_FMEXPLORER"
 msgid "Form Navigator"
 msgstr "Llywiwr Ffurflen"
 
-#: strings.hrc:1123
+#: include/svx/strings.hrc:1109
 msgctxt "RID_STR_FORM"
 msgid "Form"
 msgstr "Ffurflen"
 
-#: strings.hrc:1124
+#: include/svx/strings.hrc:1110
 msgctxt "RID_STR_STDFORMNAME"
 msgid "Form"
 msgstr "Ffurflen"
 
-#: strings.hrc:1125
+#: include/svx/strings.hrc:1111
 msgctxt "RID_STR_PROPTITLE_HIDDEN"
 msgid "Hidden Control"
 msgstr "Rheolaeth Gudd"
 
-#: strings.hrc:1126
+#: include/svx/strings.hrc:1112
 msgctxt "RID_STR_CONTROL"
 msgid "Control"
 msgstr "Rheolaeth"
 
-#: strings.hrc:1127
+#: include/svx/strings.hrc:1113
 msgctxt "RID_STR_REC_TEXT"
 msgid "Record"
 msgstr "Cofnod"
 
-#: strings.hrc:1128
+#: include/svx/strings.hrc:1114
 msgctxt "RID_STR_REC_FROM_TEXT"
 msgid "of"
 msgstr "o"
 
-#: strings.hrc:1129
+#: include/svx/strings.hrc:1115
 msgctxt "RID_STR_FIELDSELECTION"
 msgid "Add field:"
 msgstr "Ychwanegu maes:"
 
-#: strings.hrc:1130
+#: include/svx/strings.hrc:1116
 msgctxt "RID_STR_WRITEERROR"
 msgid "Error writing data to database"
 msgstr "Gwall wrth ysgrifennu data i'r gronfa ddata"
 
-#: strings.hrc:1131
+#: include/svx/strings.hrc:1117
 msgctxt "RID_STR_SYNTAXERROR"
 msgid "Syntax error in query expression"
 msgstr "Gwall cystrawen ym mynegiant yr ymholiad"
 
-#: strings.hrc:1132
+#: include/svx/strings.hrc:1118
 msgctxt "RID_STR_DELETECONFIRM_RECORD"
 msgid "You intend to delete 1 record."
 msgstr "Eich bwriad yw dileu 1 cofnod."
 
-#: strings.hrc:1133
+#: include/svx/strings.hrc:1119
 msgctxt "RID_STR_DELETECONFIRM_RECORDS"
 msgid "# records will be deleted."
 msgstr "# cofnod i'w dileu."
 
-#: strings.hrc:1134
+#: include/svx/strings.hrc:1120
 msgctxt "RID_STR_DELETECONFIRM"
 msgid ""
 "If you click Yes, you won't be able to undo this operation.\n"
@@ -11372,277 +11343,277 @@ msgstr ""
 "Os cliciwch Iawn ni fydd modd dadwneud y weithred!\n"
 "Parhau beth bynnag?"
 
-#: strings.hrc:1135
+#: include/svx/strings.hrc:1121
 msgctxt "RID_STR_NAVIGATIONBAR"
 msgid "Navigation bar"
 msgstr "Bar llywio"
 
-#: strings.hrc:1136
+#: include/svx/strings.hrc:1122
 msgctxt "RID_STR_COLUMN"
 msgid "Col"
 msgstr "Col"
 
-#: strings.hrc:1137
+#: include/svx/strings.hrc:1123
 msgctxt "RID_STR_UNDO_PROPERTY"
 msgid "Set property '#'"
 msgstr "Gosod priodwedd '#'"
 
-#: strings.hrc:1138
+#: include/svx/strings.hrc:1124
 msgctxt "RID_STR_UNDO_CONTAINER_INSERT"
 msgid "Insert in container"
 msgstr "Mewnosod i gynhwysydd"
 
-#: strings.hrc:1139
+#: include/svx/strings.hrc:1125
 msgctxt "RID_STR_UNDO_CONTAINER_REMOVE"
 msgid "Delete #"
 msgstr "Dileu #"
 
-#: strings.hrc:1140
+#: include/svx/strings.hrc:1126
 msgctxt "RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE"
 msgid "Delete # objects"
 msgstr "Dileu # gwrthrychau"
 
-#: strings.hrc:1141
+#: include/svx/strings.hrc:1127
 msgctxt "RID_STR_UNDO_CONTAINER_REPLACE"
 msgid "Replace a container element"
 msgstr "Newid elfen cynhwysydd"
 
-#: strings.hrc:1142
+#: include/svx/strings.hrc:1128
 msgctxt "RID_STR_UNDO_MODEL_REPLACE"
 msgid "Replace Control"
 msgstr "Newid Rheolaeth"
 
-#: strings.hrc:1143
+#: include/svx/strings.hrc:1129
 msgctxt "RID_STR_PROPTITLE_PUSHBUTTON"
 msgid "Push Button"
 msgstr "Botwm"
 
-#: strings.hrc:1144
+#: include/svx/strings.hrc:1130
 msgctxt "RID_STR_PROPTITLE_RADIOBUTTON"
 msgid "Option Button"
 msgstr "Botwm Dewis"
 
-#: strings.hrc:1145
+#: include/svx/strings.hrc:1131
 msgctxt "RID_STR_PROPTITLE_CHECKBOX"
 msgid "Check Box"
 msgstr "Blwch Ticio"
 
-#: strings.hrc:1146
+#: include/svx/strings.hrc:1132
 msgctxt "RID_STR_PROPTITLE_FIXEDTEXT"
 msgid "Label Field"
 msgstr "Maes label"
 
-#: strings.hrc:1147
+#: include/svx/strings.hrc:1133
 msgctxt "RID_STR_PROPTITLE_GROUPBOX"
 msgid "Group Box"
 msgstr "Blwch Grŵp"
 
-#: strings.hrc:1148
+#: include/svx/strings.hrc:1134
 msgctxt "RID_STR_PROPTITLE_EDIT"
 msgid "Text Box"
 msgstr "Blwch Testun"
 
-#: strings.hrc:1149
+#: include/svx/strings.hrc:1135
 msgctxt "RID_STR_PROPTITLE_FORMATTED"
 msgid "Formatted Field"
 msgstr "Maes wedi ei Fformatio"
 
-#: strings.hrc:1150
+#: include/svx/strings.hrc:1136
 msgctxt "RID_STR_PROPTITLE_LISTBOX"
 msgid "List Box"
 msgstr "Blwch Rhestr"
 
-#: strings.hrc:1151
+#: include/svx/strings.hrc:1137
 msgctxt "RID_STR_PROPTITLE_COMBOBOX"
 msgid "Combo Box"
 msgstr "Blwch Cyfun"
 
-#: strings.hrc:1152
+#: include/svx/strings.hrc:1138
 msgctxt "RID_STR_PROPTITLE_IMAGEBUTTON"
 msgid "Image Button"
 msgstr "Botwm Delwedd"
 
-#: strings.hrc:1153
+#: include/svx/strings.hrc:1139
 msgctxt "RID_STR_PROPTITLE_IMAGECONTROL"
 msgid "Image Control"
 msgstr "Rheolaeth Delwedd"
 
-#: strings.hrc:1154
+#: include/svx/strings.hrc:1140
 msgctxt "RID_STR_PROPTITLE_FILECONTROL"
 msgid "File Selection"
 msgstr "Dewis Ffeil"
 
-#: strings.hrc:1155
+#: include/svx/strings.hrc:1141
 msgctxt "RID_STR_PROPTITLE_DATEFIELD"
 msgid "Date Field"
 msgstr "Maes Dyddiad"
 
-#: strings.hrc:1156
+#: include/svx/strings.hrc:1142
 msgctxt "RID_STR_PROPTITLE_TIMEFIELD"
 msgid "Time Field"
 msgstr "Maes Amser"
 
-#: strings.hrc:1157
+#: include/svx/strings.hrc:1143
 msgctxt "RID_STR_PROPTITLE_NUMERICFIELD"
 msgid "Numeric Field"
 msgstr "Maes Rhifol"
 
-#: strings.hrc:1158
+#: include/svx/strings.hrc:1144
 msgctxt "RID_STR_PROPTITLE_CURRENCYFIELD"
 msgid "Currency Field"
 msgstr "Maes Arian"
 
-#: strings.hrc:1159
+#: include/svx/strings.hrc:1145
 msgctxt "RID_STR_PROPTITLE_PATTERNFIELD"
 msgid "Pattern Field"
 msgstr "Maes Patrwm"
 
-#: strings.hrc:1160
+#: include/svx/strings.hrc:1146
 msgctxt "RID_STR_PROPTITLE_DBGRID"
 msgid "Table Control "
 msgstr "Rheolaeth Tabl "
 
-#: strings.hrc:1161
+#: include/svx/strings.hrc:1147
 msgctxt "RID_STR_PROPTITLE_SCROLLBAR"
 msgid "Scrollbar"
 msgstr "Bar sgrolio"
 
-#: strings.hrc:1162
+#: include/svx/strings.hrc:1148
 msgctxt "RID_STR_PROPTITLE_SPINBUTTON"
 msgid "Spin Button"
 msgstr "Botwm Troi"
 
-#: strings.hrc:1163
+#: include/svx/strings.hrc:1149
 msgctxt "RID_STR_PROPTITLE_NAVBAR"
 msgid "Navigation Bar"
 msgstr "Bar Dewis"
 
-#: strings.hrc:1164
+#: include/svx/strings.hrc:1150
 msgctxt "RID_STR_PROPTITLE_MULTISELECT"
 msgid "Multiselection"
 msgstr "Amladran"
 
-#: strings.hrc:1165
+#: include/svx/strings.hrc:1151
 msgctxt "RID_STR_NODATACONTROLS"
 msgid "No data-related controls in the current form!"
 msgstr "Dim rheolyddion data yn y ffurflen bresennol!"
 
-#: strings.hrc:1166
+#: include/svx/strings.hrc:1152
 msgctxt "RID_STR_POSTFIX_DATE"
 msgid " (Date)"
 msgstr " (Dyddiad)"
 
-#: strings.hrc:1167
+#: include/svx/strings.hrc:1153
 msgctxt "RID_STR_POSTFIX_TIME"
 msgid " (Time)"
 msgstr " (Amser)"
 
-#: strings.hrc:1168
+#: include/svx/strings.hrc:1154
 msgctxt "RID_STR_FILTER_NAVIGATOR"
 msgid "Filter navigator"
 msgstr "Porwr hidl"
 
-#: strings.hrc:1169
+#: include/svx/strings.hrc:1155
 msgctxt "RID_STR_FILTER_FILTER_FOR"
 msgid "Filter for"
 msgstr "Hidlo am"
 
-#: strings.hrc:1170
+#: include/svx/strings.hrc:1156
 msgctxt "RID_STR_FILTER_FILTER_OR"
 msgid "Or"
 msgstr "Neu"
 
-#: strings.hrc:1171
+#: include/svx/strings.hrc:1157
 msgctxt "RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY"
 msgid "Valid bound controls which can be used in the table view do not exist in the current form."
 msgstr "Nid oes rheolyddion dilysu i'w defnyddio mewn tabl yn bodoli yn y ffurflen bresennol."
 
-#: strings.hrc:1172
+#: include/svx/strings.hrc:1158
 msgctxt "RID_STR_AUTOFIELD"
 msgid "<AutoField>"
 msgstr "<AwtoFaes>"
 
-#: strings.hrc:1173
+#: include/svx/strings.hrc:1159
 msgctxt "RID_STR_SVT_SQL_SYNTAX_ERROR"
 msgid "Syntax error in SQL statement"
 msgstr "Gwall cystrawen yn natganiad SQL"
 
-#: strings.hrc:1174
+#: include/svx/strings.hrc:1160
 msgctxt "RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE"
 msgid "The value #1 cannot be used with LIKE."
 msgstr "Nid oes modd defnyddio gwerth #1 gyda LIKE."
 
-#: strings.hrc:1175
+#: include/svx/strings.hrc:1161
 msgctxt "RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE"
 msgid "LIKE cannot be used with this field."
 msgstr "Methu defnyddio LIKE gyda'r maes hwn."
 
-#: strings.hrc:1176
+#: include/svx/strings.hrc:1162
 msgctxt "RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID"
 msgid "The value entered is not a valid date. Please enter a date in a valid format, for example, MM/DD/YY."
 msgstr "Nid yw'r gwerth rhoddwyd yn ddyddiad dilys. Rhowch ddyddiad mewn fformat dilys, ee MM/DD/BB."
 
-#: strings.hrc:1177
+#: include/svx/strings.hrc:1163
 msgctxt "RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID"
 msgid "The field cannot be compared with an integer."
 msgstr "Methu cymharu'r maes gyda chyfanrif."
 
-#: strings.hrc:1178
+#: include/svx/strings.hrc:1164
 msgctxt "RID_STR_SVT_SQL_SYNTAX_TABLE"
 msgid "The database does not contain a table named \"#\"."
 msgstr "Nid yw'r gronfa ddata yn cynnwys tabl o'r enw \"#\"."
 
-#: strings.hrc:1179
+#: include/svx/strings.hrc:1165
 msgctxt "RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY"
 msgid "The database does contain neither a table nor a query named \"#\"."
 msgstr "Nid yw'r gronfa ddata yn cynnwys tabl nac ymholiad o'r enw \"#\"."
 
-#: strings.hrc:1180
+#: include/svx/strings.hrc:1166
 msgctxt "RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS"
 msgid "The database already contains a table or view with name \"#\"."
 msgstr "Mae'r gronfa ddata yn cynnwys tabl neu olwg o'r enw \"#\"."
 
-#: strings.hrc:1181
+#: include/svx/strings.hrc:1167
 msgctxt "RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS"
 msgid "The database already contains a query with name \"#\"."
 msgstr "Mae'r gronfa ddata eisoes yn cynnwys ymholiad o'r enw \"#\"."
 
-#: strings.hrc:1182
+#: include/svx/strings.hrc:1168
 msgctxt "RID_STR_SVT_SQL_SYNTAX_COLUMN"
 msgid "The column \"#1\" is unknown in the table \"#2\"."
 msgstr "Mae'r golofn \"#1\" yn anhysbys yn nhabl \"#2\"."
 
-#: strings.hrc:1183
+#: include/svx/strings.hrc:1169
 msgctxt "RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID"
 msgid "The field cannot be compared with a floating point number."
 msgstr "Methu cymharu'r maes gyda rhif pwynt arnofio."
 
-#: strings.hrc:1184
+#: include/svx/strings.hrc:1170
 msgctxt "RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE"
 msgid "The entered criterion cannot be compared with this field."
 msgstr "Methu cymharu'r meini prawf osodwyd gyda'r maes."
 
-#: strings.hrc:1185
+#: include/svx/strings.hrc:1171
 msgctxt "RID_STR_DATANAVIGATOR"
 msgid "Data Navigator"
 msgstr "Dewisydd Data"
 
-#: strings.hrc:1186
+#: include/svx/strings.hrc:1172
 msgctxt "RID_STR_READONLY_VIEW"
 msgid " (read-only)"
 msgstr " (darllen yn unig)"
 
-#: strings.hrc:1187
+#: include/svx/strings.hrc:1173
 msgctxt "RID_STR_ALREADYEXISTOVERWRITE"
 msgid "The file already exists. Overwrite?"
 msgstr "Mae'r ffeil yn bodoli eisoes. Trosysgrifo?"
 
-#: strings.hrc:1188
+#: include/svx/strings.hrc:1174
 msgctxt "RID_STR_OBJECT_LABEL"
 msgid "#object# label"
 msgstr "label #object#"
 
-#: strings.hrc:1190
+#: include/svx/strings.hrc:1176
 msgctxt "RID_STR_QRY_REMOVE_MODEL"
 msgid ""
 "Deleting the model '$MODELNAME' affects all controls currently bound to this model.\n"
@@ -11651,7 +11622,7 @@ msgstr ""
 "Mae dileu'r model '$MODELNAME' yn effeithio holl reolyddion sydd wedi eu rhwymo i'r model hwn.\n"
 "Hoffech chi ddileu'r model?"
 
-#: strings.hrc:1191
+#: include/svx/strings.hrc:1177
 msgctxt "RID_STR_QRY_REMOVE_INSTANCE"
 msgid ""
 "Deleting the instance '$INSTANCENAME' affects all controls currently bound to this instance.\n"
@@ -11660,7 +11631,7 @@ msgstr ""
 "Mae dileu'r model '$INSTANCENAME' yn effeithio holl reolyddion sydd wedi eu rhwymo i'r model hwn.\n"
 "Hoffech chi ddileu'r model?"
 
-#: strings.hrc:1192
+#: include/svx/strings.hrc:1178
 msgctxt "RID_STR_QRY_REMOVE_ELEMENT"
 msgid ""
 "Deleting the element '$ELEMENTNAME' affects all controls currently bound to this element.\n"
@@ -11669,12 +11640,12 @@ msgstr ""
 "Mae dileu'r model '$ELEMENTNAME' yn effeithio holl reolyddion sydd wedi eu rhwymo i'r model hwn.\n"
 "Hoffech chi ddileu'r model?"
 
-#: strings.hrc:1193
+#: include/svx/strings.hrc:1179
 msgctxt "RID_STR_QRY_REMOVE_ATTRIBUTE"
 msgid "Do you really want to delete the attribute '$ATTRIBUTENAME'?"
 msgstr "Ydych chi wir am ddileu'r priodoledd '$ATTRIBUTENAME'?"
 
-#: strings.hrc:1194
+#: include/svx/strings.hrc:1180
 msgctxt "RID_STR_QRY_REMOVE_SUBMISSION"
 msgid ""
 "Deleting the submission '$SUBMISSIONNAME' affects all controls currently bound to this submission.\n"
@@ -11685,7 +11656,7 @@ msgstr ""
 "\n"
 "Ydych chi wir am ddileu'r argymhelliad?"
 
-#: strings.hrc:1195
+#: include/svx/strings.hrc:1181
 msgctxt "RID_STR_QRY_REMOVE_BINDING"
 msgid ""
 "Deleting the binding '$BINDINGNAME' affects all controls currently bound to this binding.\n"
@@ -11696,2513 +11667,2534 @@ msgstr ""
 "\n"
 "Ydych chi wir am ddileu'r argymhelliad?"
 
-#: strings.hrc:1196
+#: include/svx/strings.hrc:1182
 msgctxt "RID_STR_INVALID_XMLNAME"
 msgid "The name '%1' is not valid in XML. Please enter a different name."
 msgstr "Nid yw'r enw '%1' yn ddilys ar gyfer XML. Rhowch enw arall."
 
-#: strings.hrc:1197
+#: include/svx/strings.hrc:1183
 msgctxt "RID_STR_INVALID_XMLPREFIX"
 msgid "The prefix '%1' is not valid in XML. Please enter a different prefix."
 msgstr "Nid yw rhagddodiad '%1' yn ddilys ar gyfer XML. Rhowch ragddodiad arall."
 
-#: strings.hrc:1198
+#: include/svx/strings.hrc:1184
 msgctxt "RID_STR_DOUBLE_MODELNAME"
 msgid "The name '%1' already exists. Please enter a new name."
 msgstr "Mae'r enw '%1' yn bodoli eisoes. Rhowch enw newydd."
 
-#: strings.hrc:1199
+#: include/svx/strings.hrc:1185
 msgctxt "RID_STR_EMPTY_SUBMISSIONNAME"
 msgid "The submission must have a name."
 msgstr "Rhaid cynnig enw i'r argymhelliad."
 
-#: strings.hrc:1200
+#: include/svx/strings.hrc:1186
 msgctxt "RID_STR_METHOD_POST"
 msgid "Post"
 msgstr "Cofnod"
 
-#: strings.hrc:1201
+#: include/svx/strings.hrc:1187
 msgctxt "RID_STR_METHOD_PUT"
 msgid "Put"
 msgstr "Gosod"
 
-#: strings.hrc:1202
+#: include/svx/strings.hrc:1188
 msgctxt "RID_STR_METHOD_GET"
 msgid "Get"
 msgstr "Estyn"
 
-#: strings.hrc:1203
+#: include/svx/strings.hrc:1189
 msgctxt "RID_STR_REPLACE_NONE"
 msgid "None"
 msgstr "Dim"
 
-#: strings.hrc:1204
+#: include/svx/strings.hrc:1190
 msgctxt "RID_STR_REPLACE_INST"
 msgid "Instance"
 msgstr "Enghraifft"
 
-#: strings.hrc:1205
+#: include/svx/strings.hrc:1191
 msgctxt "RID_STR_REPLACE_DOC"
 msgid "Document"
 msgstr "Dogfen"
 
-#: strings.hrc:1206
+#: include/svx/strings.hrc:1192
 msgctxt "RID_STR_DATANAV_SUBM_BIND"
 msgid "Binding: "
 msgstr "Rhwymiad: "
 
-#: strings.hrc:1207
+#: include/svx/strings.hrc:1193
 msgctxt "RID_STR_DATANAV_SUBM_REF"
 msgid "Reference: "
 msgstr "Cyfeirnod: "
 
-#: strings.hrc:1208
+#: include/svx/strings.hrc:1194
 msgctxt "RID_STR_DATANAV_SUBM_ACTION"
 msgid "Action: "
 msgstr "Gweithred: "
 
-#: strings.hrc:1209
+#: include/svx/strings.hrc:1195
 msgctxt "RID_STR_DATANAV_SUBM_METHOD"
 msgid "Method: "
 msgstr "Dull: "
 
-#: strings.hrc:1210
+#: include/svx/strings.hrc:1196
 msgctxt "RID_STR_DATANAV_SUBM_REPLACE"
 msgid "Replace: "
 msgstr "Newid: "
 
-#: strings.hrc:1211
+#: include/svx/strings.hrc:1197
 msgctxt "RID_STR_DATANAV_ADD_ELEMENT"
 msgid "Add Element"
 msgstr "Ychwanegu Elfen"
 
-#: strings.hrc:1212
+#: include/svx/strings.hrc:1198
 msgctxt "RID_STR_DATANAV_EDIT_ELEMENT"
 msgid "Edit Element"
 msgstr "Golygu Elfen"
 
-#: strings.hrc:1213
+#: include/svx/strings.hrc:1199
 msgctxt "RID_STR_DATANAV_REMOVE_ELEMENT"
 msgid "Delete Element"
 msgstr "Dileu Elfen"
 
-#: strings.hrc:1214
+#: include/svx/strings.hrc:1200
 msgctxt "RID_STR_DATANAV_ADD_ATTRIBUTE"
 msgid "Add Attribute"
 msgstr "Ychwanegu Priodoledd"
 
-#: strings.hrc:1215
+#: include/svx/strings.hrc:1201
 msgctxt "RID_STR_DATANAV_EDIT_ATTRIBUTE"
 msgid "Edit Attribute"
 msgstr "Golygu Priodoledd"
 
-#: strings.hrc:1216
+#: include/svx/strings.hrc:1202
 msgctxt "RID_STR_DATANAV_REMOVE_ATTRIBUTE"
 msgid "Delete Attribute"
 msgstr "Dileu Priodoledd"
 
-#: strings.hrc:1217
+#: include/svx/strings.hrc:1203
 msgctxt "RID_STR_DATANAV_ADD_BINDING"
 msgid "Add Binding"
 msgstr "Ychwanegu Rhwymiad"
 
-#: strings.hrc:1218
+#: include/svx/strings.hrc:1204
 msgctxt "RID_STR_DATANAV_EDIT_BINDING"
 msgid "Edit Binding"
 msgstr "Golygu Rhwymiad"
 
-#: strings.hrc:1219
+#: include/svx/strings.hrc:1205
 msgctxt "RID_STR_DATANAV_REMOVE_BINDING"
 msgid "Delete Binding"
 msgstr "Dileu Argymhelliad"
 
-#: strings.hrc:1220
+#: include/svx/strings.hrc:1206
 msgctxt "RID_STR_DATANAV_ADD_SUBMISSION"
 msgid "Add Submission"
 msgstr "Ychwanegu Argymhelliad"
 
-#: strings.hrc:1221
+#: include/svx/strings.hrc:1207
 msgctxt "RID_STR_DATANAV_EDIT_SUBMISSION"
 msgid "Edit Submission"
 msgstr "Golygu Argymhelliad"
 
-#: strings.hrc:1222
+#: include/svx/strings.hrc:1208
 msgctxt "RID_STR_DATANAV_REMOVE_SUBMISSION"
 msgid "Delete Submission"
 msgstr "Dileu Argymhelliad"
 
-#: strings.hrc:1223
+#: include/svx/strings.hrc:1209
 msgctxt "RID_STR_ELEMENT"
 msgid "Element"
 msgstr "Elfen"
 
-#: strings.hrc:1224
+#: include/svx/strings.hrc:1210
 msgctxt "RID_STR_ATTRIBUTE"
 msgid "Attribute"
 msgstr "Priodoledd"
 
-#: strings.hrc:1225
+#: include/svx/strings.hrc:1211
 msgctxt "RID_STR_BINDING"
 msgid "Binding"
 msgstr "Rhwymiad"
 
-#: strings.hrc:1226
+#: include/svx/strings.hrc:1212
 msgctxt "RID_STR_BINDING_EXPR"
 msgid "Binding expression"
 msgstr "Mynegiant rhwymo"
 
-#: strings.hrc:1228
+#: include/svx/strings.hrc:1214
 msgctxt "RID_SVXSTR_QUERY_EXIT_RECOVERY"
 msgid "Are you sure you want to discard the %PRODUCTNAME document recovery data?"
 msgstr "Ydych chi'n siŵr eich bod am ddiddymu adfer dogfen %PRODUCTNAME?"
 
-#: strings.hrc:1230
+#: include/svx/strings.hrc:1216
 msgctxt "RID_SVXSTR_RULER_TAB_LEFT"
 msgid "Left"
 msgstr "Chwith"
 
-#: strings.hrc:1231
+#: include/svx/strings.hrc:1217
 msgctxt "RID_SVXSTR_RULER_TAB_RIGHT"
 msgid "Right"
 msgstr "De"
 
-#: strings.hrc:1232
+#: include/svx/strings.hrc:1218
 msgctxt "RID_SVXSTR_RULER_TAB_CENTER"
 msgid "Center"
 msgstr "Canol"
 
-#: strings.hrc:1233
+#: include/svx/strings.hrc:1219
 msgctxt "RID_SVXSTR_RULER_TAB_DECIMAL"
 msgid "Decimal"
 msgstr "Degol"
 
-#: strings.hrc:1235
+#: include/svx/strings.hrc:1221
 msgctxt "RID_SVXSTR_INSERT_HELPTEXT"
 msgid "Insert mode. Click to change to overwrite mode."
 msgstr "Modd mewnosod. Cliciwch i newid i'r modd trosysgrifennu."
 
-#: strings.hrc:1236
+#: include/svx/strings.hrc:1222
 msgctxt "RID_SVXSTR_OVERWRITE_HELPTEXT"
 msgid "Overwrite mode. Click to change to insert mode."
 msgstr "Modd trosysgrifennu. Cliciwch i newid i'r modd mewnosod."
 
 #. To be shown in the status bar when in overwrite mode, please try to make it not longer than the word 'Overwrite'.
-#: strings.hrc:1238
+#: include/svx/strings.hrc:1224
 msgctxt "RID_SVXSTR_OVERWRITE_TEXT"
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: strings.hrc:1239
+#: include/svx/strings.hrc:1225
 msgctxt "RID_SVXSTR_XMLSEC_SIG_OK"
 msgid "Digital Signature: The document signature is OK."
 msgstr "Llofnod Digidol: Mae llofnod y ddogfen yn Iawn."
 
-#: strings.hrc:1240
+#: include/svx/strings.hrc:1226
 msgctxt "RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY"
 msgid "Digital Signature: The document signature is OK, but the certificates could not be validated."
 msgstr "Llofnod Digidol: Mae llofnod y ddogfen yn iawn, ond nid oedd modd dilysu'r tystysgrifau."
 
-#: strings.hrc:1241
+#: include/svx/strings.hrc:1227
 msgctxt "RID_SVXSTR_XMLSEC_SIG_NOT_OK"
 msgid "Digital Signature: The document signature does not match the document content. We strongly recommend you to do not trust this document."
 msgstr "Llofnod Digidol: Nid yw llofnod y ddogfen yn cyd-fynd â chynnwys y ddogfen. Peidiwch ymddiried yn y ddogfen hon."
 
-#: strings.hrc:1242
+#: include/svx/strings.hrc:1228
 msgctxt "RID_SVXSTR_XMLSEC_NO_SIG"
 msgid "Digital Signature: The document is not signed."
 msgstr "Llofnod Digidol: Nid yw'r ddogfen wedi ei llofnodi."
 
-#: strings.hrc:1243
+#: include/svx/strings.hrc:1229
 msgctxt "RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG"
 msgid "Digital Signature: The document signature and the certificate are OK, but not all parts of the document are signed."
 msgstr "Llofnod Digidol: Mae llofnod y ddogfen a'r dystysgrif yn iawn ond nid oedd pob rhan o'r ddogfen wedi ei lofnodi."
 
-#: strings.hrc:1244
+#: include/svx/strings.hrc:1230
 msgctxt "RID_SVXSTR_DOC_MODIFIED_YES"
 msgid "The document has been modified. Click to save the document."
 msgstr "Mae'r ddogfen wedi ei haddasu. Cliciwch i gadw'r ddogfen."
 
-#: strings.hrc:1245
+#: include/svx/strings.hrc:1231
 msgctxt "RID_SVXSTR_DOC_MODIFIED_NO"
 msgid "The document has not been modified since the last save."
 msgstr "Nid yw'r ddogfen wedi ei haddasu ers ei chadw diwethaf."
 
-#: strings.hrc:1246
+#: include/svx/strings.hrc:1232
 msgctxt "RID_SVXSTR_DOC_LOAD"
 msgid "Loading document..."
 msgstr "Llwytho dogfen..."
 
-#: strings.hrc:1247
+#: include/svx/strings.hrc:1233
 msgctxt "RID_SVXSTR_FIT_SLIDE"
 msgid "Fit slide to current window."
 msgstr "Addasu'r sleid i'r ffenestr gyfredol."
 
-#: strings.hrc:1248
+#: include/svx/strings.hrc:1234
 msgctxt "RID_SVXSTR_WARN_MISSING_SMARTART"
 msgid "Could not load all SmartArts. Saving in Microsoft Office 2010 or later would avoid this issue."
 msgstr "Methu llwytho'r holl SmartArts. Bydd cadw yn Microsoft Office 2010 neu hwyrach yn osgoi'r mater yma."
 
-#: strings.hrc:1249
+#: include/svx/strings.hrc:1235
 msgctxt "RID_SVXSTR_ZOOMTOOL_HINT"
 msgid "Zoom factor. Right-click to change zoom factor or click to open Zoom dialog."
 msgstr "Lefel chwyddo. Rhowch glic de i newid lefel y chwyddo neu glicio i agor y deialog Chwyddo."
 
-#: strings.hrc:1250
+#: include/svx/strings.hrc:1236
 msgctxt "RID_SVXSTR_ZOOM_IN"
 msgid "Zoom In"
 msgstr "Chwyddo i Mewn"
 
-#: strings.hrc:1251
+#: include/svx/strings.hrc:1237
 msgctxt "RID_SVXSTR_ZOOM_OUT"
 msgid "Zoom Out"
 msgstr "Chwyddo Allan"
 
-#: strings.hrc:1252
+#: include/svx/strings.hrc:1238
 msgctxt "RID_SVXSTR_ZOOM_25"
 msgid "25%"
 msgstr "25%"
 
-#: strings.hrc:1253
+#: include/svx/strings.hrc:1239
 msgctxt "RID_SVXSTR_ZOOM_50"
 msgid "50%"
 msgstr "50%"
 
-#: strings.hrc:1254
+#: include/svx/strings.hrc:1240
 msgctxt "RID_SVXSTR_ZOOM_75"
 msgid "75%"
 msgstr "75%"
 
-#: strings.hrc:1255
+#: include/svx/strings.hrc:1241
 msgctxt "RID_SVXSTR_ZOOM_100"
 msgid "100%"
 msgstr "100%"
 
-#: strings.hrc:1256
+#: include/svx/strings.hrc:1242
 msgctxt "RID_SVXSTR_ZOOM_150"
 msgid "150%"
 msgstr "150%"
 
-#: strings.hrc:1257
+#: include/svx/strings.hrc:1243
 msgctxt "RID_SVXSTR_ZOOM_200"
 msgid "200%"
 msgstr "200%"
 
-#: strings.hrc:1258
+#: include/svx/strings.hrc:1244
 msgctxt "RID_SVXSTR_ZOOM_WHOLE_PAGE"
 msgid "Entire Page"
 msgstr "Tudalen Gyfan"
 
-#: strings.hrc:1259
+#: include/svx/strings.hrc:1245
 msgctxt "RID_SVXSTR_ZOOM_PAGE_WIDTH"
 msgid "Page Width"
 msgstr "Lled Tudalen"
 
-#: strings.hrc:1260
+#: include/svx/strings.hrc:1246
 msgctxt "RID_SVXSTR_ZOOM_OPTIMAL_VIEW"
 msgid "Optimal View"
 msgstr "Golwg Orau"
 
-#: strings.hrc:1261
+#: include/svx/strings.hrc:1247
 msgctxt "RID_SIDEBAR_EMPTY_PANEL_TEXT"
 msgid "Properties for the task that you are performing are not available for the current selection"
 msgstr "Nid yw priodweddau'r dasg rydych yn ei chyflawni ar gael ar gyfer y dewis cyfredol"
 
-#: strings.hrc:1263
+#: include/svx/strings.hrc:1249
 msgctxt "RID_SVXSTR_SEARCH_STYLES"
 msgid "Including Styles"
 msgstr "Cynnwys Arddulliau"
 
-#: strings.hrc:1264
+#: include/svx/strings.hrc:1250
 msgctxt "RID_SVXSTR_WRITER_STYLES"
 msgid "Paragraph St~yles"
 msgstr "Arddulliau ~Paragraff"
 
-#: strings.hrc:1265
+#: include/svx/strings.hrc:1251
 msgctxt "RID_SVXSTR_CALC_STYLES"
 msgid "Cell St~yles"
 msgstr "Arddulliau ~Celloedd"
 
-#: strings.hrc:1266
+#: include/svx/strings.hrc:1252
 msgctxt "RID_SVXSTR_SEARCH"
-msgid "(Search)"
-msgstr "(Chwilio)"
+msgid "Search for formatting"
+msgstr "Chwilio am fformatio"
 
-#: strings.hrc:1267
+#: include/svx/strings.hrc:1253
 msgctxt "RID_SVXSTR_REPLACE"
-msgid "(Replace)"
-msgstr "(Newid)"
+msgid "Replace with formatting"
+msgstr "Amnewid gyda fformatio"
 
-#: strings.hrc:1268
+#: include/svx/strings.hrc:1254
 msgctxt "RID_SVXSTR_SEARCH_END"
 msgid "Reached the end of the document"
 msgstr "Wedi cyrraedd diwedd y ddogfen"
 
-#: strings.hrc:1269
+#: include/svx/strings.hrc:1255
+msgctxt "RID_SVXSTR_SEARCH_END_WRAPPED"
+msgid "Reached the end of the document, continued from the beginning"
+msgstr "Wedi cyrraedd diwedd y ddogfen, yn parhau o'r cychwyn"
+
+#: include/svx/strings.hrc:1256
 msgctxt "RID_SVXSTR_SEARCH_END_SHEET"
 msgid "Reached the end of the sheet"
 msgstr "Wedi cyrraedd diwedd y ddalen"
 
-#: strings.hrc:1270
+#: include/svx/strings.hrc:1257
 msgctxt "RID_SVXSTR_SEARCH_NOT_FOUND"
 msgid "Search key not found"
 msgstr "Heb ganfod yr allwedd chwilio"
 
-#: strings.hrc:1271
+#: include/svx/strings.hrc:1258
+msgctxt "RID_SVXSTR_SEARCH_NAV_ELEMENT_NOT_FOUND"
+msgid "Navigation Element not found"
+msgstr "Heb ganfod Elfen Llywio"
+
+#: include/svx/strings.hrc:1259
 msgctxt "RID_SVXSTR_SEARCH_START"
 msgid "Reached the beginning of the document"
 msgstr "Wedi cyrraedd dechrau'r ddogfen"
 
-#: strings.hrc:1273
+#: include/svx/strings.hrc:1260
+msgctxt "RID_SVXSTR_SEARCH_START_WRAPPED"
+msgid "Reached the beginning of the document, continued from the end"
+msgstr "Wedi cyrraedd diwedd y ddogfen, yn parhau o'r diwedd"
+
+#: include/svx/strings.hrc:1262
 msgctxt "RID_SVXDLG_BMPMASK_STR_PALETTE"
 msgid "Color Palette"
 msgstr "Palet Lliw"
 
-#: strings.hrc:1275
+#: include/svx/strings.hrc:1264
 msgctxt "RID_SVXSTR_ERR_OLD_PASSWD"
 msgid "Invalid password"
 msgstr "Cyfrinair annilys"
 
-#: strings.hrc:1276
+#: include/svx/strings.hrc:1265
 msgctxt "RID_SVXSTR_ERR_REPEAT_PASSWD"
 msgid "Passwords do not match"
 msgstr "Nid yw'r cyfrineiriau'n cydweddu"
 
-#: strings.hrc:1278
+#: include/svx/strings.hrc:1267
 msgctxt "RID_SVXSTR_BULLET_DESCRIPTION_0"
 msgid "Solid small circular bullets"
 msgstr "Bwledi crwn bach solet"
 
-#: strings.hrc:1279
+#: include/svx/strings.hrc:1268
 msgctxt "RID_SVXSTR_BULLET_DESCRIPTION_1"
 msgid "Solid large circular bullets"
 msgstr "Bwledi crwn mawr solet"
 
-#: strings.hrc:1280
+#: include/svx/strings.hrc:1269
 msgctxt "RID_SVXSTR_BULLET_DESCRIPTION_2"
 msgid "Solid diamond bullets"
 msgstr "Bwledi diemwnt solet"
 
-#: strings.hrc:1281
+#: include/svx/strings.hrc:1270
 msgctxt "RID_SVXSTR_BULLET_DESCRIPTION_3"
 msgid "Solid large square bullets"
 msgstr "Bwledi sgwâr mawr solet"
 
-#: strings.hrc:1282
+#: include/svx/strings.hrc:1271
 msgctxt "RID_SVXSTR_BULLET_DESCRIPTION_4"
 msgid "Right pointing arrow bullets filled out"
 msgstr "Bwledi saeth pwyntio i'r dde llawn"
 
-#: strings.hrc:1283
+#: include/svx/strings.hrc:1272
 msgctxt "RID_SVXSTR_BULLET_DESCRIPTION_5"
 msgid "Right pointing arrow bullets"
 msgstr "Bwledi saeth pwyntio i'r dde"
 
-#: strings.hrc:1284
+#: include/svx/strings.hrc:1273
 msgctxt "RID_SVXSTR_BULLET_DESCRIPTION_6"
 msgid "Check mark bullets"
 msgstr "Bwledi marc siec"
 
-#: strings.hrc:1285
+#: include/svx/strings.hrc:1274
 msgctxt "RID_SVXSTR_BULLET_DESCRIPTION_7"
 msgid "Tick mark bullets"
 msgstr "Bwledi marc tic"
 
-#: strings.hrc:1286
+#: include/svx/strings.hrc:1275
 msgctxt "RID_SVXSTR_SINGLENUM_DESCRIPTION_0"
 msgid "Number 1) 2) 3)"
 msgstr "Rhif 1) 2) 3)"
 
-#: strings.hrc:1287
+#: include/svx/strings.hrc:1276
 msgctxt "RID_SVXSTR_SINGLENUM_DESCRIPTION_1"
 msgid "Number 1. 2. 3."
 msgstr "Rhif 1. 2. 3."
 
-#: strings.hrc:1288
+#: include/svx/strings.hrc:1277
 msgctxt "RID_SVXSTR_SINGLENUM_DESCRIPTION_2"
 msgid "Number (1) (2) (3)"
 msgstr "Rhif (1) (2) (3)"
 
-#: strings.hrc:1289
+#: include/svx/strings.hrc:1278
 msgctxt "RID_SVXSTR_SINGLENUM_DESCRIPTION_3"
 msgid "Uppercase Roman number I. II. III."
 msgstr "Rhif Rhufeinig mawr I. II. III."
 
-#: strings.hrc:1290
+#: include/svx/strings.hrc:1279
 msgctxt "RID_SVXSTR_SINGLENUM_DESCRIPTION_4"
 msgid "Uppercase letter A) B) C)"
 msgstr "Llythrennau mawr A) B) C)"
 
-#: strings.hrc:1291
+#: include/svx/strings.hrc:1280
 msgctxt "RID_SVXSTR_SINGLENUM_DESCRIPTION_5"
 msgid "Lowercase letter a) b) c)"
 msgstr "Llythrennau bach a) b) c)"
 
-#: strings.hrc:1292
+#: include/svx/strings.hrc:1281
 msgctxt "RID_SVXSTR_SINGLENUM_DESCRIPTION_6"
 msgid "Lowercase letter (a) (b) (c)"
 msgstr "Llythrennau bach (a) (b) (c)"
 
-#: strings.hrc:1293
+#: include/svx/strings.hrc:1282
 msgctxt "RID_SVXSTR_SINGLENUM_DESCRIPTION_7"
 msgid "Lowercase Roman number i. ii. iii."
 msgstr "Rhifau Rhufeinig bach i. ii. iii."
 
-#: strings.hrc:1294
+#: include/svx/strings.hrc:1283
 msgctxt "RID_SVXSTR_OUTLINENUM_DESCRIPTION_0"
 msgid "Numeric, numeric, lowercase letters, solid small circular bullet"
 msgstr "Rhifol, rhifol, llythrennau bach, bwled gron fach solet"
 
-#: strings.hrc:1295
+#: include/svx/strings.hrc:1284
 msgctxt "RID_SVXSTR_OUTLINENUM_DESCRIPTION_1"
 msgid "Numeric, lowercase letters, solid small circular bullet"
 msgstr "Rhifol, llythrennau bach, bwled gron fach solet"
 
-#: strings.hrc:1296
+#: include/svx/strings.hrc:1285
 msgctxt "RID_SVXSTR_OUTLINENUM_DESCRIPTION_2"
 msgid "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet"
 msgstr "Rhifol, llythrennau bach, Rhufeinig bach, llythrennau mawr, bwled gron fach solet"
 
-#: strings.hrc:1297
+#: include/svx/strings.hrc:1286
 msgctxt "RID_SVXSTR_OUTLINENUM_DESCRIPTION_3"
 msgid "Numeric"
 msgstr "Rhifol"
 
-#: strings.hrc:1298
+#: include/svx/strings.hrc:1287
 msgctxt "RID_SVXSTR_OUTLINENUM_DESCRIPTION_4"
 msgid "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet"
 msgstr "Rhufeinig mawr, llythrennau mawr, Rhufeinig bach, llythrennau bach, bwled gron fach solet"
 
-#: strings.hrc:1299
+#: include/svx/strings.hrc:1288
 msgctxt "RID_SVXSTR_OUTLINENUM_DESCRIPTION_5"
 msgid "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet"
 msgstr "Llythrennau mawr, Rhufeinig mawr, llythrennau bach, Rhufeinig bach, bwled gron fach solet"
 
-#: strings.hrc:1300
+#: include/svx/strings.hrc:1289
 msgctxt "RID_SVXSTR_OUTLINENUM_DESCRIPTION_6"
 msgid "Numeric with all sublevels"
 msgstr "Rhifol gyda phob is lefel"
 
-#: strings.hrc:1301
+#: include/svx/strings.hrc:1290
 msgctxt "RID_SVXSTR_OUTLINENUM_DESCRIPTION_7"
 msgid "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet"
 msgstr "Bwled pwyntio i'r dde, bwled saeth pwyntio i'r dde, bwled diemwnt solet, bwled gron fechan solet"
 
-#: strings.hrc:1303
+#: include/svx/strings.hrc:1292
 msgctxt "RID_SVXSTR_SAFEMODE_ZIP_FAILURE"
 msgid "The zip file could not be created."
 msgstr "Methu creu'r ffeil zip."
 
-#: strings.hrc:1305
+#: include/svx/strings.hrc:1294
 msgctxt "RID_SVXSTR_STYLEFAMILY_TABLEDESIGN"
 msgid "Table Design Styles"
 msgstr "Ardduliau Cynllunio Tabl"
 
-#: strings.hrc:1307
+#: include/svx/strings.hrc:1296
 msgctxt "RID_SVXSTR_NUM_UNDO_ACTIONS"
 msgid "Actions to undo: $(ARG1)"
 msgstr "Gweithredoedd i'w dadwneud: $(ARG1)"
 
-#: strings.hrc:1308
+#: include/svx/strings.hrc:1297
 msgctxt "RID_SVXSTR_NUM_UNDO_ACTION"
 msgid "Actions to undo: $(ARG1)"
 msgstr "Gweithredoedd i'w dadwneud: $(ARG1)"
 
-#: strings.hrc:1309
+#: include/svx/strings.hrc:1298
 msgctxt "RID_SVXSTR_NUM_REDO_ACTIONS"
 msgid "Actions to redo: $(ARG1)"
 msgstr "Gweithredoedd i'w hail-wneud: $(ARG1)"
 
-#: strings.hrc:1310
+#: include/svx/strings.hrc:1299
 msgctxt "RID_SVXSTR_NUM_REDO_ACTION"
 msgid "Actions to redo: $(ARG1)"
 msgstr "Gweithredoedd i'w hail-wneud: $(ARG1)"
 
-#: strings.hrc:1312
+#: include/svx/strings.hrc:1301
 msgctxt "RID_SVXSTR_FINDBAR_FIND"
 msgid "Find"
 msgstr "Canfod"
 
-#: strings.hrc:1313
+#: include/svx/strings.hrc:1302
 msgctxt "RID_SVXSTR_FINDBAR_MATCHCASE"
 msgid "Match Case"
 msgstr "Cydweddu Maint"
 
-#: strings.hrc:1314
+#: include/svx/strings.hrc:1303
 msgctxt "RID_SVXSTR_FINDBAR_SEARCHFORMATTED"
 msgid "Formatted Display"
 msgstr "Dangosydd a Fformatiwyd"
 
-#: strings.hrc:1316
+#: include/svx/strings.hrc:1305
 msgctxt "STR_IMAGE_ORIGINAL_SIZE"
 msgid "$(WIDTH) x $(HEIGHT) ($(WIDTH_IN_PX) x $(HEIGHT_IN_PX) px)"
 msgstr "$(WIDTH) x $(HEIGHT) ($(WIDTH_IN_PX) x $(HEIGHT_IN_PX) px)"
 
-#: strings.hrc:1317
+#: include/svx/strings.hrc:1306
 msgctxt "STR_IMAGE_VIEW_SIZE"
 msgid "$(WIDTH) x $(HEIGHT) at $(DPI) DPI"
 msgstr "$(WIDTH) x $(HEIGHT) at $(DPI) DPI"
 
-#: strings.hrc:1318
+#: include/svx/strings.hrc:1307
 msgctxt "STR_IMAGE_CAPACITY"
 msgid "$(CAPACITY) kiB"
 msgstr "$(CAPACITY) kiB"
 
-#: strings.hrc:1319
+#: include/svx/strings.hrc:1308
 msgctxt "STR_IMAGE_GIF"
 msgid "Gif image"
 msgstr "Delwedd Gif"
 
-#: strings.hrc:1320
+#: include/svx/strings.hrc:1309
 msgctxt "STR_IMAGE_JPEG"
 msgid "Jpeg image"
 msgstr "Delwedd Jpeg"
 
-#: strings.hrc:1321
+#: include/svx/strings.hrc:1310
 msgctxt "STR_IMAGE_PNG"
 msgid "PNG image"
 msgstr "Delwedd PNG"
 
-#: strings.hrc:1322
+#: include/svx/strings.hrc:1311
 msgctxt "STR_IMAGE_TIFF"
 msgid "TIFF image"
 msgstr "Delwedd TIFF"
 
-#: strings.hrc:1323
+#: include/svx/strings.hrc:1312
 msgctxt "STR_IMAGE_WMF"
 msgid "WMF image"
 msgstr "Delwedd WMF"
 
-#: strings.hrc:1324
+#: include/svx/strings.hrc:1313
 msgctxt "STR_IMAGE_MET"
 msgid "MET image"
 msgstr "Delwedd MET"
 
-#: strings.hrc:1325
+#: include/svx/strings.hrc:1314
 msgctxt "STR_IMAGE_PCT"
 msgid "PCT image"
 msgstr "Delwedd PCT"
 
-#: strings.hrc:1326
+#: include/svx/strings.hrc:1315
 msgctxt "STR_IMAGE_SVG"
 msgid "SVG image"
 msgstr "Delwedd SVG"
 
-#: strings.hrc:1327
+#: include/svx/strings.hrc:1316
 msgctxt "STR_IMAGE_BMP"
 msgid "BMP image"
 msgstr "Delwedd BMP"
 
-#: strings.hrc:1328
+#: include/svx/strings.hrc:1317
 msgctxt "STR_IMAGE_UNKNOWN"
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: strings.hrc:1330
+#: include/svx/strings.hrc:1319
 msgctxt "STR_SWITCH"
 msgid "Switch"
 msgstr "Newid"
 
-#: strings.hrc:1332
+#: include/svx/strings.hrc:1321
 msgctxt "RID_SVXSTR_UNDO_GRAFMODE"
 msgid "Image Mode"
 msgstr "Modd Delwedd"
 
-#: strings.hrc:1333
+#: include/svx/strings.hrc:1322
 msgctxt "RID_SVXSTR_UNDO_GRAFRED"
 msgid "Red"
 msgstr "Coch"
 
-#: strings.hrc:1334
+#: include/svx/strings.hrc:1323
 msgctxt "RID_SVXSTR_UNDO_GRAFGREEN"
 msgid "Green"
 msgstr "Gwyrdd"
 
-#: strings.hrc:1335
+#: include/svx/strings.hrc:1324
 msgctxt "RID_SVXSTR_UNDO_GRAFBLUE"
 msgid "Blue"
 msgstr "Glas"
 
-#: strings.hrc:1336
+#: include/svx/strings.hrc:1325
 msgctxt "RID_SVXSTR_UNDO_GRAFLUMINANCE"
 msgid "Brightness"
 msgstr "Disgleirdeb"
 
-#: strings.hrc:1337
+#: include/svx/strings.hrc:1326
 msgctxt "RID_SVXSTR_UNDO_GRAFCONTRAST"
 msgid "Contrast"
 msgstr "Cyferbyniad"
 
-#: strings.hrc:1338
+#: include/svx/strings.hrc:1327
 msgctxt "RID_SVXSTR_UNDO_GRAFGAMMA"
 msgid "Gamma"
 msgstr "Gama"
 
-#: strings.hrc:1339
+#: include/svx/strings.hrc:1328
 msgctxt "RID_SVXSTR_UNDO_GRAFTRANSPARENCY"
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: strings.hrc:1340
+#: include/svx/strings.hrc:1329
 msgctxt "RID_SVXSTR_GRAFCROP"
 msgid "Crop"
 msgstr "Tocio"
 
-#: strings.hrc:1342
+#: include/svx/strings.hrc:1331
 msgctxt "RID_SVXITEMS_ORI_STANDARD"
 msgid "Default orientation"
 msgstr "Cyfeiriadedd rhagosodedig"
 
-#: strings.hrc:1343
+#: include/svx/strings.hrc:1332
 msgctxt "RID_SVXITEMS_ORI_TOPBOTTOM"
 msgid "From top to bottom"
 msgstr "O'r brig i'r gwaelod"
 
-#: strings.hrc:1344
+#: include/svx/strings.hrc:1333
 msgctxt "RID_SVXITEMS_ORI_BOTTOMTOP"
 msgid "Bottom to Top"
 msgstr "Gwaelod i'r Brig"
 
-#: strings.hrc:1345
+#: include/svx/strings.hrc:1334
 msgctxt "RID_SVXITEMS_ORI_STACKED"
 msgid "Stacked"
 msgstr "Staciwyd"
 
-#: strings.hrc:1346
+#: include/svx/strings.hrc:1335
 msgctxt "RID_SVXITEMS_MARGIN_LEFT"
 msgid "Left margin: "
 msgstr "Ymyl chwith: "
 
-#: strings.hrc:1347
+#: include/svx/strings.hrc:1336
 msgctxt "RID_SVXITEMS_MARGIN_TOP"
 msgid "Top margin: "
 msgstr "Ymyl uchaf: "
 
-#: strings.hrc:1348
+#: include/svx/strings.hrc:1337
 msgctxt "RID_SVXITEMS_MARGIN_RIGHT"
 msgid "Right margin: "
 msgstr "Ymyl de: "
 
-#: strings.hrc:1349
+#: include/svx/strings.hrc:1338
 msgctxt "RID_SVXITEMS_MARGIN_BOTTOM"
 msgid "Bottom margin: "
 msgstr "Ymyl gwaelod: "
 
-#: strings.hrc:1350
+#: include/svx/strings.hrc:1339
 msgctxt "RID_SVXITEMS_PAGE_COMPLETE"
 msgid "Page Description: "
 msgstr "Disgrifiad Tudalen: "
 
-#: strings.hrc:1351
+#: include/svx/strings.hrc:1340
 msgctxt "RID_SVXITEMS_PAGE_NUM_CHR_UPPER"
 msgid "Capitals"
 msgstr "Prif Lythrennau"
 
-#: strings.hrc:1352
+#: include/svx/strings.hrc:1341
 msgctxt "RID_SVXITEMS_PAGE_NUM_CHR_LOWER"
 msgid "Lowercase"
 msgstr "Llythyren is"
 
-#: strings.hrc:1353
+#: include/svx/strings.hrc:1342
 msgctxt "RID_SVXITEMS_PAGE_NUM_ROM_UPPER"
 msgid "Uppercase Roman"
 msgstr "Lythyren uwch Rhufeinig"
 
-#: strings.hrc:1354
+#: include/svx/strings.hrc:1343
 msgctxt "RID_SVXITEMS_PAGE_NUM_ROM_LOWER"
 msgid "Lowercase Roman"
 msgstr "Llythyren is Rhufeinig"
 
-#: strings.hrc:1355
+#: include/svx/strings.hrc:1344
 msgctxt "RID_SVXITEMS_PAGE_NUM_ARABIC"
 msgid "Arabic"
 msgstr "Arabeg"
 
-#: strings.hrc:1356
+#: include/svx/strings.hrc:1345
 msgctxt "RID_SVXITEMS_PAGE_NUM_NONE"
 msgid "None"
 msgstr "Dim"
 
-#: strings.hrc:1357
+#: include/svx/strings.hrc:1346
 msgctxt "RID_SVXITEMS_PAGE_LAND_TRUE"
 msgid "Landscape"
 msgstr "Tirlun"
 
-#: strings.hrc:1358
+#: include/svx/strings.hrc:1347
 msgctxt "RID_SVXITEMS_PAGE_LAND_FALSE"
 msgid "Portrait"
 msgstr "Portread"
 
-#: strings.hrc:1359
+#: include/svx/strings.hrc:1348
 msgctxt "RID_SVXITEMS_PAGE_USAGE_LEFT"
 msgid "Left"
 msgstr "Chwith"
 
-#: strings.hrc:1360
+#: include/svx/strings.hrc:1349
 msgctxt "RID_SVXITEMS_PAGE_USAGE_RIGHT"
 msgid "Right"
 msgstr "De"
 
-#: strings.hrc:1361
+#: include/svx/strings.hrc:1350
 msgctxt "RID_SVXITEMS_PAGE_USAGE_ALL"
 msgid "All"
 msgstr "Popeth"
 
-#: strings.hrc:1362
+#: include/svx/strings.hrc:1351
 msgctxt "RID_SVXITEMS_PAGE_USAGE_MIRROR"
 msgid "Mirrored"
 msgstr "Drychu"
 
-#: strings.hrc:1363
+#: include/svx/strings.hrc:1352
 msgctxt "RID_SVXITEMS_AUTHOR_COMPLETE"
 msgid "Author: "
 msgstr "Awdur: "
 
-#: strings.hrc:1364
+#: include/svx/strings.hrc:1353
 msgctxt "RID_SVXITEMS_DATE_COMPLETE"
 msgid "Date: "
 msgstr "Dyddiad: "
 
-#: strings.hrc:1365
+#: include/svx/strings.hrc:1354
 msgctxt "RID_SVXITEMS_TEXT_COMPLETE"
 msgid "Text: "
 msgstr "Testun: "
 
-#: strings.hrc:1366
+#: include/svx/strings.hrc:1355
 msgctxt "RID_SVXITEMS_BRUSH_CHAR"
 msgid "Character background"
 msgstr "Cefndir nod"
 
-#: strings.hrc:1368
+#: include/svx/strings.hrc:1357
 msgctxt "STR_COLORTABLE"
 msgid "Color Palette"
 msgstr "Palet Lliw"
 
 #. String for saving modified image (instead of original)
-#: strings.hrc:1371
+#: include/svx/strings.hrc:1360
 msgctxt "RID_SVXSTR_SAVE_MODIFIED_IMAGE"
 msgid ""
 "The image has been modified. By default the original image will be saved.\n"
-"Do you want to save the modified version instead ?"
+"Do you want to save the modified version instead?"
 msgstr ""
 "Mae'r ddelwedd wedi ei newid. Bydd y ddelwedd wreiddiol yn cael ei chadw.\n"
 "Hoffech chi gadw'r fersiwn newydd y ei lle ?"
 
-#: strings.hrc:1373
-msgctxt "RID_SUBSETMAP"
-msgid "Add to favorites"
-msgstr "Ychwanegu i'r ffefrynnau"
-
-#: strings.hrc:1374
-msgctxt "RID_SUBSETMAP"
-msgid "Remove from favorites"
-msgstr "Tynnu o'r ffefrynnau"
-
-#: strings.hrc:1375
-msgctxt "RID_SUBSETMAP"
-msgid "Insert into document"
-msgstr "Mewnosod i ddogfen"
-
-#: strings.hrc:1376
-msgctxt "RID_SUBSETMAP"
-msgid "Copy to clipboard"
-msgstr "Copïo i'r clipfwrdd"
-
-#: strings.hrc:1378
+#: include/svx/strings.hrc:1362
 msgctxt "RID_SUBSETMAP"
 msgid "Basic Latin"
 msgstr "Lladin Sylfaenol"
 
-#: strings.hrc:1379
+#: include/svx/strings.hrc:1363
 msgctxt "RID_SUBSETMAP"
 msgid "Latin-1"
 msgstr "Latin-1"
 
-#: strings.hrc:1380
+#: include/svx/strings.hrc:1364
 msgctxt "RID_SUBSETMAP"
 msgid "Latin Extended-A"
 msgstr "Latin Extended-A"
 
-#: strings.hrc:1381
+#: include/svx/strings.hrc:1365
 msgctxt "RID_SUBSETMAP"
 msgid "Latin Extended-B"
 msgstr "Latin Extended-B"
 
-#: strings.hrc:1382
+#: include/svx/strings.hrc:1366
 msgctxt "RID_SUBSETMAP"
 msgid "IPA Extensions"
 msgstr "Estyniad IPA"
 
-#: strings.hrc:1383
+#: include/svx/strings.hrc:1367
 msgctxt "RID_SUBSETMAP"
 msgid "Spacing Modifier Letters"
 msgstr "Llythrennau Addasydd Bylchu"
 
-#: strings.hrc:1384
+#: include/svx/strings.hrc:1368
 msgctxt "RID_SUBSETMAP"
 msgid "Combining Diacritical Marks"
 msgstr "Marciau Deiacritig Cyfunol"
 
-#: strings.hrc:1385
+#: include/svx/strings.hrc:1369
 msgctxt "RID_SUBSETMAP"
 msgid "Basic Greek"
 msgstr "Groeg Sylfaenol"
 
-#: strings.hrc:1386
+#: include/svx/strings.hrc:1370
 msgctxt "RID_SUBSETMAP"
 msgid "Greek Symbols And Coptic"
 msgstr "Symbolau Groegaidd a Choptig"
 
-#: strings.hrc:1387
+#: include/svx/strings.hrc:1371
 msgctxt "RID_SUBSETMAP"
 msgid "Cyrillic"
 msgstr "Syrilig"
 
-#: strings.hrc:1388
+#: include/svx/strings.hrc:1372
 msgctxt "RID_SUBSETMAP"
 msgid "Armenian"
 msgstr "Armeneg"
 
-#: strings.hrc:1389
+#: include/svx/strings.hrc:1373
 msgctxt "RID_SUBSETMAP"
 msgid "Basic Hebrew"
 msgstr "Hebraeg Sylfaenol"
 
-#: strings.hrc:1390
+#: include/svx/strings.hrc:1374
 msgctxt "RID_SUBSETMAP"
 msgid "Hebrew Extended"
 msgstr "Hebraeg Estynedig"
 
-#: strings.hrc:1391
+#: include/svx/strings.hrc:1375
 msgctxt "RID_SUBSETMAP"
 msgid "Basic Arabic"
 msgstr "Arabeg Sylfaenol"
 
-#: strings.hrc:1392
+#: include/svx/strings.hrc:1376
 msgctxt "RID_SUBSETMAP"
 msgid "Arabic Extended"
 msgstr "Arabeg Estynedig"
 
-#: strings.hrc:1393
+#: include/svx/strings.hrc:1377
 msgctxt "RID_SUBSETMAP"
 msgid "Devanagari"
 msgstr "Devanagari"
 
-#: strings.hrc:1394
+#: include/svx/strings.hrc:1378
 msgctxt "RID_SUBSETMAP"
 msgid "Bengali"
 msgstr "Bengali"
 
-#: strings.hrc:1395
+#: include/svx/strings.hrc:1379
 msgctxt "RID_SUBSETMAP"
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: strings.hrc:1396
+#: include/svx/strings.hrc:1380
 msgctxt "RID_SUBSETMAP"
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: strings.hrc:1397
+#: include/svx/strings.hrc:1381
 msgctxt "RID_SUBSETMAP"
 msgid "Odia"
 msgstr "Odia"
 
-#: strings.hrc:1398
+#: include/svx/strings.hrc:1382
 msgctxt "RID_SUBSETMAP"
 msgid "Tamil"
 msgstr "Tamil"
 
-#: strings.hrc:1399
+#: include/svx/strings.hrc:1383
 msgctxt "RID_SUBSETMAP"
 msgid "Telugu"
 msgstr "Telugu"
 
-#: strings.hrc:1400
+#: include/svx/strings.hrc:1384
 msgctxt "RID_SUBSETMAP"
 msgid "Kannada"
 msgstr "Kannada"
 
-#: strings.hrc:1401
+#: include/svx/strings.hrc:1385
 msgctxt "RID_SUBSETMAP"
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: strings.hrc:1402
+#: include/svx/strings.hrc:1386
 msgctxt "RID_SUBSETMAP"
 msgid "Thai"
 msgstr "Thai"
 
-#: strings.hrc:1403
+#: include/svx/strings.hrc:1387
 msgctxt "RID_SUBSETMAP"
 msgid "Lao"
 msgstr "Lao"
 
-#: strings.hrc:1404
+#: include/svx/strings.hrc:1388
 msgctxt "RID_SUBSETMAP"
 msgid "Basic Georgian"
 msgstr "Georgaidd Sylfaenol"
 
-#: strings.hrc:1405
+#: include/svx/strings.hrc:1389
 msgctxt "RID_SUBSETMAP"
 msgid "Georgian Extended"
 msgstr "Georgaidd Estynedig"
 
-#: strings.hrc:1406
+#: include/svx/strings.hrc:1390
 msgctxt "RID_SUBSETMAP"
 msgid "Hangul Jamo"
 msgstr "Hangul Jamo"
 
-#: strings.hrc:1407
+#: include/svx/strings.hrc:1391
 msgctxt "RID_SUBSETMAP"
 msgid "Latin Extended Additionals"
 msgstr "Lladin Estynedig Ychwanegol"
 
-#: strings.hrc:1408
+#: include/svx/strings.hrc:1392
 msgctxt "RID_SUBSETMAP"
 msgid "Greek Extended"
 msgstr "Groeg Estynedig"
 
-#: strings.hrc:1409
+#: include/svx/strings.hrc:1393
 msgctxt "RID_SUBSETMAP"
 msgid "General punctuation"
 msgstr "Atalnodi cyffredinol"
 
-#: strings.hrc:1410
+#: include/svx/strings.hrc:1394
 msgctxt "RID_SUBSETMAP"
 msgid "Superscripts and Subscripts"
 msgstr "Uwch ac Is Sgriptiau"
 
-#: strings.hrc:1411
+#: include/svx/strings.hrc:1395
 msgctxt "RID_SUBSETMAP"
 msgid "Currency Symbols"
 msgstr "Symbolau Arian"
 
-#: strings.hrc:1412
+#: include/svx/strings.hrc:1396
 msgctxt "RID_SUBSETMAP"
 msgid "Combining Diacritical Symbols"
 msgstr "Symbolau Deicritig Cyfunol"
 
-#: strings.hrc:1413
+#: include/svx/strings.hrc:1397
 msgctxt "RID_SUBSETMAP"
 msgid "Letterlike Symbols"
 msgstr "Symbolau Llythrennog"
 
-#: strings.hrc:1414
+#: include/svx/strings.hrc:1398
 msgctxt "RID_SUBSETMAP"
 msgid "Number Forms"
 msgstr "Ffurfiau Rhif"
 
-#: strings.hrc:1415
+#: include/svx/strings.hrc:1399
 msgctxt "RID_SUBSETMAP"
 msgid "Arrows"
 msgstr "Saethau"
 
-#: strings.hrc:1416
+#: include/svx/strings.hrc:1400
 msgctxt "RID_SUBSETMAP"
 msgid "Mathematical Operators"
 msgstr "Mathematical Operators"
 
-#: strings.hrc:1417
+#: include/svx/strings.hrc:1401
 msgctxt "RID_SUBSETMAP"
 msgid "Miscellaneous Technical"
 msgstr "Technegol Amrywiol"
 
-#: strings.hrc:1418
+#: include/svx/strings.hrc:1402
 msgctxt "RID_SUBSETMAP"
 msgid "Control Pictures"
 msgstr "Lluniau'r Rheolydd"
 
-#: strings.hrc:1419
+#: include/svx/strings.hrc:1403
 msgctxt "RID_SUBSETMAP"
 msgid "Optical Character Recognition"
 msgstr "Adnabod Nodau Optegol (OCR)"
 
-#: strings.hrc:1420
+#: include/svx/strings.hrc:1404
 msgctxt "RID_SUBSETMAP"
 msgid "Enclosed Alphanumerics"
 msgstr "Alffaniwmerig Amgaeedig"
 
-#: strings.hrc:1421
+#: include/svx/strings.hrc:1405
 msgctxt "RID_SUBSETMAP"
 msgid "Box Drawing"
 msgstr "Llunio Blychau"
 
-#: strings.hrc:1422
+#: include/svx/strings.hrc:1406
 msgctxt "RID_SUBSETMAP"
 msgid "Block Elements"
 msgstr "Elfennau Bloc"
 
-#: strings.hrc:1423
+#: include/svx/strings.hrc:1407
 msgctxt "RID_SUBSETMAP"
 msgid "Geometric Shapes"
 msgstr "Siapiau Geometrig"
 
-#: strings.hrc:1424
+#: include/svx/strings.hrc:1408
 msgctxt "RID_SUBSETMAP"
 msgid "Miscellaneous Symbols"
 msgstr "Symbolau Amrywiol"
 
-#: strings.hrc:1425
+#: include/svx/strings.hrc:1409
 msgctxt "RID_SUBSETMAP"
 msgid "Dingbats"
 msgstr "Dingbatiau"
 
-#: strings.hrc:1426
+#: include/svx/strings.hrc:1410
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Symbols And Punctuation"
 msgstr "Symbolau ac Atalnodi CJK"
 
-#: strings.hrc:1427
+#: include/svx/strings.hrc:1411
 msgctxt "RID_SUBSETMAP"
 msgid "Hiragana"
 msgstr "Hiragana"
 
-#: strings.hrc:1428
+#: include/svx/strings.hrc:1412
 msgctxt "RID_SUBSETMAP"
 msgid "Katakana"
 msgstr "Katakana"
 
-#: strings.hrc:1429
+#: include/svx/strings.hrc:1413
 msgctxt "RID_SUBSETMAP"
 msgid "Bopomofo"
 msgstr "Bopomofo"
 
-#: strings.hrc:1430
+#: include/svx/strings.hrc:1414
 msgctxt "RID_SUBSETMAP"
 msgid "Hangul Compatibility Jamo"
 msgstr "Hangul Cydweddu Jamo"
 
-#: strings.hrc:1431
+#: include/svx/strings.hrc:1415
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Miscellaneous"
 msgstr "CJK Amrywiol"
 
-#: strings.hrc:1432
+#: include/svx/strings.hrc:1416
 msgctxt "RID_SUBSETMAP"
 msgid "Enclosed CJK Letters And Months"
 msgstr "Llythrennau CJK Amgaeedig a Misoedd"
 
-#: strings.hrc:1433
+#: include/svx/strings.hrc:1417
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Compatibility"
 msgstr "Cydnawsedd CJK"
 
-#: strings.hrc:1434
+#: include/svx/strings.hrc:1418
 msgctxt "RID_SUBSETMAP"
 msgid "Hangul"
 msgstr "Hangul"
 
-#: strings.hrc:1435
+#: include/svx/strings.hrc:1419
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Unified Ideographs"
 msgstr "Ideograffau Unedig CJK"
 
-#: strings.hrc:1436
+#: include/svx/strings.hrc:1420
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Unified Ideographs Extension A"
 msgstr "Ideograffau Unedig CJK Estyniad A"
 
-#: strings.hrc:1437
+#: include/svx/strings.hrc:1421
 msgctxt "RID_SUBSETMAP"
 msgid "Private Use Area"
 msgstr "Ardal Defnydd Preifat"
 
-#: strings.hrc:1438
+#: include/svx/strings.hrc:1422
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Compatibility Ideographs"
 msgstr "Ideograffau Cydweddu CJK"
 
-#: strings.hrc:1439
+#: include/svx/strings.hrc:1423
 msgctxt "RID_SUBSETMAP"
 msgid "Alphabetic Presentation Forms"
 msgstr "Ffurfiau Cyflwyniad Alffabetig"
 
-#: strings.hrc:1440
+#: include/svx/strings.hrc:1424
 msgctxt "RID_SUBSETMAP"
 msgid "Arabic Presentation Forms-A"
 msgstr "Cyflwyniad Arabeg Ffurfiau-A"
 
-#: strings.hrc:1441
+#: include/svx/strings.hrc:1425
 msgctxt "RID_SUBSETMAP"
 msgid "Combining Half Marks"
 msgstr "Cyfuno Hanner Marciau"
 
-#: strings.hrc:1442
+#: include/svx/strings.hrc:1426
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Compatibility Forms"
 msgstr "Ffurfiau Cydnawsedd CJK"
 
-#: strings.hrc:1443
+#: include/svx/strings.hrc:1427
 msgctxt "RID_SUBSETMAP"
 msgid "Small Form Variants"
 msgstr "Amrywiolyn Ffurf Bychan"
 
-#: strings.hrc:1444
+#: include/svx/strings.hrc:1428
 msgctxt "RID_SUBSETMAP"
 msgid "Arabic Presentation Forms-B"
 msgstr "Cyflwyniad Arabeg Ffurfiau-B"
 
-#: strings.hrc:1445
+#: include/svx/strings.hrc:1429
 msgctxt "RID_SUBSETMAP"
 msgid "Half-width and Full-width Forms"
 msgstr "Ffurfiau Hanner Lled a Lled Llawn"
 
-#: strings.hrc:1446
+#: include/svx/strings.hrc:1430
 msgctxt "RID_SUBSETMAP"
 msgid "Specials"
 msgstr "Arbenigol"
 
-#: strings.hrc:1447
+#: include/svx/strings.hrc:1431
 msgctxt "RID_SUBSETMAP"
 msgid "Yi Syllables"
 msgstr "Sillafau Yi"
 
-#: strings.hrc:1448
+#: include/svx/strings.hrc:1432
 msgctxt "RID_SUBSETMAP"
 msgid "Yi Radicals"
 msgstr "Cysefin Yi"
 
-#: strings.hrc:1449
+#: include/svx/strings.hrc:1433
 msgctxt "RID_SUBSETMAP"
 msgid "Old Italic"
 msgstr "Hen Italig"
 
-#: strings.hrc:1450
+#: include/svx/strings.hrc:1434
 msgctxt "RID_SUBSETMAP"
 msgid "Gothic"
 msgstr "Gotheg"
 
-#: strings.hrc:1451
+#: include/svx/strings.hrc:1435
 msgctxt "RID_SUBSETMAP"
 msgid "Deseret"
 msgstr "Deseret"
 
-#: strings.hrc:1452
+#: include/svx/strings.hrc:1436
 msgctxt "RID_SUBSETMAP"
 msgid "Byzantine Musical Symbols"
 msgstr "Symbolau Cerddoriaeth Bysantaidd"
 
-#: strings.hrc:1453
+#: include/svx/strings.hrc:1437
 msgctxt "RID_SUBSETMAP"
 msgid "Musical Symbols"
 msgstr "Symbolau Cerddoriaeth"
 
-#: strings.hrc:1454
+#: include/svx/strings.hrc:1438
 msgctxt "RID_SUBSETMAP"
 msgid "Mathematical Alphanumeric Symbols"
 msgstr "Symbolau Alffaniwmerig Mathamategol"
 
-#: strings.hrc:1455
+#: include/svx/strings.hrc:1439
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Unified Ideographs Extension B"
 msgstr "Ideograffau Unedig CJK Estyniad B"
 
-#: strings.hrc:1456
+#: include/svx/strings.hrc:1440
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Unified Ideographs Extension C"
 msgstr "Ideograffau Unedig CJK Estyniad C"
 
-#: strings.hrc:1457
+#: include/svx/strings.hrc:1441
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Unified Ideographs Extension D"
 msgstr "Ideograffau Unedig CJK Estyniad D"
 
-#: strings.hrc:1458
+#: include/svx/strings.hrc:1442
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr "Ideograffau Cydweddus CJK Atodol"
 
-#: strings.hrc:1459
+#: include/svx/strings.hrc:1443
 msgctxt "RID_SUBSETMAP"
 msgid "Tags"
 msgstr "Tagiau"
 
-#: strings.hrc:1460
+#: include/svx/strings.hrc:1444
 msgctxt "RID_SUBSETMAP"
 msgid "Cyrillic Supplement"
 msgstr "Atodiad Cyrilig"
 
-#: strings.hrc:1461
+#: include/svx/strings.hrc:1445
 msgctxt "RID_SUBSETMAP"
 msgid "Variation Selectors"
 msgstr "Dewiswyr Amrywiad"
 
-#: strings.hrc:1462
+#: include/svx/strings.hrc:1446
 msgctxt "RID_SUBSETMAP"
 msgid "Supplementary Private Use Area-A"
 msgstr "Defnydd Preifat Atodol, Ardal-A"
 
-#: strings.hrc:1463
+#: include/svx/strings.hrc:1447
 msgctxt "RID_SUBSETMAP"
 msgid "Supplementary Private Use Area-B"
 msgstr "Defnydd Preifat Atodol, Ardal-B"
 
-#: strings.hrc:1464
+#: include/svx/strings.hrc:1448
 msgctxt "RID_SUBSETMAP"
 msgid "Limbu"
 msgstr "Limbu"
 
-#: strings.hrc:1465
+#: include/svx/strings.hrc:1449
 msgctxt "RID_SUBSETMAP"
 msgid "Tai Le"
 msgstr "Tai Le"
 
-#: strings.hrc:1466
+#: include/svx/strings.hrc:1450
 msgctxt "RID_SUBSETMAP"
 msgid "Khmer Symbols"
 msgstr "Symbolau Khmer"
 
-#: strings.hrc:1467
+#: include/svx/strings.hrc:1451
 msgctxt "RID_SUBSETMAP"
 msgid "Phonetic Extensions"
 msgstr "Estyniadau Ffoneteg"
 
-#: strings.hrc:1468
+#: include/svx/strings.hrc:1452
 msgctxt "RID_SUBSETMAP"
 msgid "Miscellaneous Symbols And Arrows"
 msgstr "Symbolau a Saethau Amrywiol"
 
-#: strings.hrc:1469
+#: include/svx/strings.hrc:1453
 msgctxt "RID_SUBSETMAP"
 msgid "Yijing Hexagram Symbols"
 msgstr "Symbolau Hecsagram Yijing"
 
-#: strings.hrc:1470
+#: include/svx/strings.hrc:1454
 msgctxt "RID_SUBSETMAP"
 msgid "Linear B Syllabary"
 msgstr "Syllwyddor Llinellog B"
 
-#: strings.hrc:1471
+#: include/svx/strings.hrc:1455
 msgctxt "RID_SUBSETMAP"
 msgid "Linear B Ideograms"
 msgstr "Ideogramau Llinellog B"
 
-#: strings.hrc:1472
+#: include/svx/strings.hrc:1456
 msgctxt "RID_SUBSETMAP"
 msgid "Aegean Numbers"
 msgstr "Rhifau Ageaidd"
 
-#: strings.hrc:1473
+#: include/svx/strings.hrc:1457
 msgctxt "RID_SUBSETMAP"
 msgid "Ugaritic"
 msgstr "Ugaritig"
 
-#: strings.hrc:1474
+#: include/svx/strings.hrc:1458
 msgctxt "RID_SUBSETMAP"
 msgid "Shavian"
 msgstr "Shafiaidd"
 
-#: strings.hrc:1475
+#: include/svx/strings.hrc:1459
 msgctxt "RID_SUBSETMAP"
 msgid "Osmanya"
 msgstr "Osmanya"
 
-#: strings.hrc:1476
+#: include/svx/strings.hrc:1460
 msgctxt "RID_SUBSETMAP"
 msgid "Sinhala"
 msgstr "Sinhala"
 
-#: strings.hrc:1477
+#: include/svx/strings.hrc:1461
 msgctxt "RID_SUBSETMAP"
 msgid "Tibetan"
 msgstr "Tibetaidd"
 
-#: strings.hrc:1478
+#: include/svx/strings.hrc:1462
 msgctxt "RID_SUBSETMAP"
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: strings.hrc:1479
+#: include/svx/strings.hrc:1463
 msgctxt "RID_SUBSETMAP"
 msgid "Khmer"
 msgstr "Khmer"
 
-#: strings.hrc:1480
+#: include/svx/strings.hrc:1464
 msgctxt "RID_SUBSETMAP"
 msgid "Ogham"
 msgstr "Ogham"
 
-#: strings.hrc:1481
+#: include/svx/strings.hrc:1465
 msgctxt "RID_SUBSETMAP"
 msgid "Runic"
 msgstr "Runic"
 
-#: strings.hrc:1482
+#: include/svx/strings.hrc:1466
 msgctxt "RID_SUBSETMAP"
 msgid "Syriac"
 msgstr "Syriac"
 
-#: strings.hrc:1483
+#: include/svx/strings.hrc:1467
 msgctxt "RID_SUBSETMAP"
 msgid "Thaana"
 msgstr "Thaana"
 
-#: strings.hrc:1484
+#: include/svx/strings.hrc:1468
 msgctxt "RID_SUBSETMAP"
 msgid "Ethiopic"
 msgstr "Ethioptig"
 
-#: strings.hrc:1485
+#: include/svx/strings.hrc:1469
 msgctxt "RID_SUBSETMAP"
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: strings.hrc:1486
+#: include/svx/strings.hrc:1470
 msgctxt "RID_SUBSETMAP"
 msgid "Canadian Aboriginal Syllables"
 msgstr "Sillafyddion Cynfrodorol Canada"
 
-#: strings.hrc:1487
+#: include/svx/strings.hrc:1471
 msgctxt "RID_SUBSETMAP"
 msgid "Mongolian"
 msgstr "Mongoleg"
 
-#: strings.hrc:1488
+#: include/svx/strings.hrc:1472
 msgctxt "RID_SUBSETMAP"
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr "Mathemategol Amrywiol Symbolau-A"
 
-#: strings.hrc:1489
+#: include/svx/strings.hrc:1473
 msgctxt "RID_SUBSETMAP"
 msgid "Supplemental Arrows-A"
 msgstr "Saethau-A Ychwanegol"
 
-#: strings.hrc:1490
+#: include/svx/strings.hrc:1474
 msgctxt "RID_SUBSETMAP"
 msgid "Braille Patterns"
 msgstr "Patrymau Braille"
 
-#: strings.hrc:1491
+#: include/svx/strings.hrc:1475
 msgctxt "RID_SUBSETMAP"
 msgid "Supplemental Arrows-B"
 msgstr "Saethau-B Ychwanegol"
 
-#: strings.hrc:1492
+#: include/svx/strings.hrc:1476
 msgctxt "RID_SUBSETMAP"
 msgid "Miscellaneous Mathematical Symbols-B"
 msgstr "Mathemategol Amrywiol Symbolau-B"
 
-#: strings.hrc:1493
+#: include/svx/strings.hrc:1477
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Radical Supplement"
 msgstr "CJK Radical Ychwanegol"
 
-#: strings.hrc:1494
+#: include/svx/strings.hrc:1478
 msgctxt "RID_SUBSETMAP"
 msgid "Kangxi Radicals"
 msgstr "Radical Kangxi"
 
-#: strings.hrc:1495
+#: include/svx/strings.hrc:1479
 msgctxt "RID_SUBSETMAP"
 msgid "Ideographic Description Characters"
 msgstr "Nodau Disgrifiadol Ideograffig"
 
-#: strings.hrc:1496
+#: include/svx/strings.hrc:1480
 msgctxt "RID_SUBSETMAP"
 msgid "Tagalog"
 msgstr "Tagalog"
 
-#: strings.hrc:1497
+#: include/svx/strings.hrc:1481
 msgctxt "RID_SUBSETMAP"
 msgid "Hanunoo"
 msgstr "Hanunoo"
 
-#: strings.hrc:1498
+#: include/svx/strings.hrc:1482
 msgctxt "RID_SUBSETMAP"
 msgid "Tagbanwa"
 msgstr "Tagbanwa"
 
-#: strings.hrc:1499
+#: include/svx/strings.hrc:1483
 msgctxt "RID_SUBSETMAP"
 msgid "Buhid"
 msgstr "Buhid"
 
-#: strings.hrc:1500
+#: include/svx/strings.hrc:1484
 msgctxt "RID_SUBSETMAP"
 msgid "Kanbun"
 msgstr "Kanbun"
 
-#: strings.hrc:1501
+#: include/svx/strings.hrc:1485
 msgctxt "RID_SUBSETMAP"
 msgid "Bopomofo Extended"
 msgstr "Bopomofo Estynedig"
 
-#: strings.hrc:1502
+#: include/svx/strings.hrc:1486
 msgctxt "RID_SUBSETMAP"
 msgid "Katakana Phonetics"
 msgstr "Katakana Phoneteg"
 
-#: strings.hrc:1503
+#: include/svx/strings.hrc:1487
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Strokes"
 msgstr "Strociau CJK"
 
-#: strings.hrc:1504
+#: include/svx/strings.hrc:1488
 msgctxt "RID_SUBSETMAP"
 msgid "Cypriot Syllabary"
 msgstr "Cyllwyddor Cypriaidd"
 
-#: strings.hrc:1505
+#: include/svx/strings.hrc:1489
 msgctxt "RID_SUBSETMAP"
 msgid "Tai Xuan Jing Symbols"
 msgstr "Symbolau Tai Xuan Jing"
 
-#: strings.hrc:1506
+#: include/svx/strings.hrc:1490
 msgctxt "RID_SUBSETMAP"
 msgid "Variation Selectors Supplement"
 msgstr "Dewiswyr Amrywiad Atodol"
 
-#: strings.hrc:1507
+#: include/svx/strings.hrc:1491
 msgctxt "RID_SUBSETMAP"
 msgid "Ancient Greek Musical Notation"
 msgstr "Nodiant Cerddorol Groegaidd Hynafol"
 
-#: strings.hrc:1508
+#: include/svx/strings.hrc:1492
 msgctxt "RID_SUBSETMAP"
 msgid "Ancient Greek Numbers"
 msgstr "Rhifau Groegaidd Hynafol"
 
-#: strings.hrc:1509
+#: include/svx/strings.hrc:1493
 msgctxt "RID_SUBSETMAP"
 msgid "Arabic Supplement"
 msgstr "Arabeg Atodol"
 
-#: strings.hrc:1510
+#: include/svx/strings.hrc:1494
 msgctxt "RID_SUBSETMAP"
 msgid "Buginese"
 msgstr "Bugineg"
 
-#: strings.hrc:1511
+#: include/svx/strings.hrc:1495
 msgctxt "RID_SUBSETMAP"
 msgid "Combining Diacritical Marks Supplement"
 msgstr "Atodiad Cyfuno Marciau Deiacritig"
 
-#: strings.hrc:1512
+#: include/svx/strings.hrc:1496
 msgctxt "RID_SUBSETMAP"
 msgid "Coptic"
 msgstr "Copteg"
 
-#: strings.hrc:1513
+#: include/svx/strings.hrc:1497
 msgctxt "RID_SUBSETMAP"
 msgid "Ethiopic Extended"
 msgstr "Ethiopeg Estynedig"
 
-#: strings.hrc:1514
+#: include/svx/strings.hrc:1498
 msgctxt "RID_SUBSETMAP"
 msgid "Ethiopic Supplement"
 msgstr "Ethiopeg Atodol"
 
-#: strings.hrc:1515
+#: include/svx/strings.hrc:1499
 msgctxt "RID_SUBSETMAP"
 msgid "Georgian Supplement"
 msgstr "Beorgiaidd Atodol"
 
-#: strings.hrc:1516
+#: include/svx/strings.hrc:1500
 msgctxt "RID_SUBSETMAP"
 msgid "Glagolitic"
 msgstr "Glagolitig"
 
-#: strings.hrc:1517
+#: include/svx/strings.hrc:1501
 msgctxt "RID_SUBSETMAP"
 msgid "Kharoshthi"
 msgstr "Kharoshthi"
 
-#: strings.hrc:1518
+#: include/svx/strings.hrc:1502
 msgctxt "RID_SUBSETMAP"
 msgid "Modifier Tone Letters"
 msgstr "Llythrennau Ton Newidiol"
 
-#: strings.hrc:1519
+#: include/svx/strings.hrc:1503
 msgctxt "RID_SUBSETMAP"
 msgid "New Tai Lue"
 msgstr "New Tai Lue"
 
-#: strings.hrc:1520
+#: include/svx/strings.hrc:1504
 msgctxt "RID_SUBSETMAP"
 msgid "Old Persian"
 msgstr "Persiaidd Hynafol"
 
-#: strings.hrc:1521
+#: include/svx/strings.hrc:1505
 msgctxt "RID_SUBSETMAP"
 msgid "Phonetic Extensions Supplement"
 msgstr "Estyniadau Ffonetig Atodol"
 
-#: strings.hrc:1522
+#: include/svx/strings.hrc:1506
 msgctxt "RID_SUBSETMAP"
 msgid "Supplemental Punctuation"
 msgstr "Atalnodi Atodol"
 
-#: strings.hrc:1523
+#: include/svx/strings.hrc:1507
 msgctxt "RID_SUBSETMAP"
 msgid "Syloti Nagri"
 msgstr "Syloti Nagri"
 
-#: strings.hrc:1524
+#: include/svx/strings.hrc:1508
 msgctxt "RID_SUBSETMAP"
 msgid "Tifinagh"
 msgstr "Tifinagh"
 
-#: strings.hrc:1525
+#: include/svx/strings.hrc:1509
 msgctxt "RID_SUBSETMAP"
 msgid "Vertical Forms"
 msgstr "Ffurfiau Fertigol"
 
-#: strings.hrc:1526
+#: include/svx/strings.hrc:1510
 msgctxt "RID_SUBSETMAP"
 msgid "Nko"
 msgstr "Nko"
 
-#: strings.hrc:1527
+#: include/svx/strings.hrc:1511
 msgctxt "RID_SUBSETMAP"
 msgid "Balinese"
 msgstr "Balineg"
 
-#: strings.hrc:1528
+#: include/svx/strings.hrc:1512
 msgctxt "RID_SUBSETMAP"
 msgid "Latin Extended-C"
 msgstr "Lladin Estynedig-C"
 
-#: strings.hrc:1529
+#: include/svx/strings.hrc:1513
 msgctxt "RID_SUBSETMAP"
 msgid "Latin Extended-D"
 msgstr "Lladin Estynedig-D"
 
-#: strings.hrc:1530
+#: include/svx/strings.hrc:1514
 msgctxt "RID_SUBSETMAP"
 msgid "Phags-Pa"
 msgstr "Phags-Pa"
 
-#: strings.hrc:1531
+#: include/svx/strings.hrc:1515
 msgctxt "RID_SUBSETMAP"
 msgid "Phoenician"
 msgstr "Pheneciaidd"
 
-#: strings.hrc:1532
+#: include/svx/strings.hrc:1516
 msgctxt "RID_SUBSETMAP"
 msgid "Cuneiform"
 msgstr "Cuneiform"
 
-#: strings.hrc:1533
+#: include/svx/strings.hrc:1517
 msgctxt "RID_SUBSETMAP"
 msgid "Cuneiform Numbers And Punctuation"
 msgstr "Rhifau ac Atalnodi Cuneiform"
 
-#: strings.hrc:1534
+#: include/svx/strings.hrc:1518
 msgctxt "RID_SUBSETMAP"
 msgid "Counting Rod Numerals"
 msgstr "Rhifau Ffon Cyfrif"
 
-#: strings.hrc:1535
+#: include/svx/strings.hrc:1519
 msgctxt "RID_SUBSETMAP"
 msgid "Sundanese"
 msgstr "Sudanaidd"
 
-#: strings.hrc:1536
+#: include/svx/strings.hrc:1520
 msgctxt "RID_SUBSETMAP"
 msgid "Lepcha"
 msgstr "Lepcha"
 
-#: strings.hrc:1537
+#: include/svx/strings.hrc:1521
 msgctxt "RID_SUBSETMAP"
 msgid "Ol Chiki"
 msgstr "Ol Chiki"
 
-#: strings.hrc:1538
+#: include/svx/strings.hrc:1522
 msgctxt "RID_SUBSETMAP"
 msgid "Cyrillic Extended-A"
 msgstr "Cyrillig Estynedig-A"
 
-#: strings.hrc:1539
+#: include/svx/strings.hrc:1523
 msgctxt "RID_SUBSETMAP"
 msgid "Vai"
 msgstr "Vai"
 
-#: strings.hrc:1540
+#: include/svx/strings.hrc:1524
 msgctxt "RID_SUBSETMAP"
 msgid "Cyrillic Extended-B"
 msgstr "Cyrillig Estynedig-B"
 
-#: strings.hrc:1541
+#: include/svx/strings.hrc:1525
 msgctxt "RID_SUBSETMAP"
 msgid "Saurashtra"
 msgstr "Saurashtra"
 
-#: strings.hrc:1542
+#: include/svx/strings.hrc:1526
 msgctxt "RID_SUBSETMAP"
 msgid "Kayah Li"
 msgstr "Kayah Li"
 
-#: strings.hrc:1543
+#: include/svx/strings.hrc:1527
 msgctxt "RID_SUBSETMAP"
 msgid "Rejang"
 msgstr "Rejang"
 
-#: strings.hrc:1544
+#: include/svx/strings.hrc:1528
 msgctxt "RID_SUBSETMAP"
 msgid "Cham"
 msgstr "Cham"
 
-#: strings.hrc:1545
+#: include/svx/strings.hrc:1529
 msgctxt "RID_SUBSETMAP"
 msgid "Ancient Symbols"
 msgstr "Symbolau Hynafol"
 
-#: strings.hrc:1546
+#: include/svx/strings.hrc:1530
 msgctxt "RID_SUBSETMAP"
 msgid "Phaistos Disc"
 msgstr "Disg Phaisatos"
 
-#: strings.hrc:1547
+#: include/svx/strings.hrc:1531
 msgctxt "RID_SUBSETMAP"
 msgid "Lycian"
 msgstr "Lyciaidd"
 
-#: strings.hrc:1548
+#: include/svx/strings.hrc:1532
 msgctxt "RID_SUBSETMAP"
 msgid "Carian"
 msgstr "Canariaidd"
 
-#: strings.hrc:1549
+#: include/svx/strings.hrc:1533
 msgctxt "RID_SUBSETMAP"
 msgid "Lydian"
 msgstr "Lydiaidd"
 
-#: strings.hrc:1550
+#: include/svx/strings.hrc:1534
 msgctxt "RID_SUBSETMAP"
 msgid "Mahjong Tiles"
 msgstr "Teiliau Mahjong"
 
-#: strings.hrc:1551
+#: include/svx/strings.hrc:1535
 msgctxt "RID_SUBSETMAP"
 msgid "Domino Tiles"
 msgstr "Teiliau Domino"
 
-#: strings.hrc:1552
+#: include/svx/strings.hrc:1536
 msgctxt "RID_SUBSETMAP"
 msgid "Samaritan"
 msgstr "Samaritaidd"
 
-#: strings.hrc:1553
+#: include/svx/strings.hrc:1537
 msgctxt "RID_SUBSETMAP"
 msgid "Canadian Aboriginal Syllabics Extended"
 msgstr "Syllafwyddor Cynfrodorol Canada Estynedig"
 
-#: strings.hrc:1554
+#: include/svx/strings.hrc:1538
 msgctxt "RID_SUBSETMAP"
 msgid "Tai Tham"
 msgstr "Tai Tham"
 
-#: strings.hrc:1555
+#: include/svx/strings.hrc:1539
 msgctxt "RID_SUBSETMAP"
 msgid "Vedic Extensions"
 msgstr "Estyniadau Verdig"
 
-#: strings.hrc:1556
+#: include/svx/strings.hrc:1540
 msgctxt "RID_SUBSETMAP"
 msgid "Lisu"
 msgstr "Lisu"
 
-#: strings.hrc:1557
+#: include/svx/strings.hrc:1541
 msgctxt "RID_SUBSETMAP"
 msgid "Bamum"
 msgstr "Bamum"
 
-#: strings.hrc:1558
+#: include/svx/strings.hrc:1542
 msgctxt "RID_SUBSETMAP"
 msgid "Common Indic Number Forms"
 msgstr "Ffurf Rhifau Cyffredin Indig"
 
-#: strings.hrc:1559
+#: include/svx/strings.hrc:1543
 msgctxt "RID_SUBSETMAP"
 msgid "Devanagari Extended"
 msgstr "Devanagari Estynedig"
 
-#: strings.hrc:1560
+#: include/svx/strings.hrc:1544
 msgctxt "RID_SUBSETMAP"
 msgid "Hangul Jamo Extended-A"
 msgstr "Hangul Jamo Estynedig-A"
 
-#: strings.hrc:1561
+#: include/svx/strings.hrc:1545
 msgctxt "RID_SUBSETMAP"
 msgid "Javanese"
 msgstr "Javaneaidd"
 
-#: strings.hrc:1562
+#: include/svx/strings.hrc:1546
 msgctxt "RID_SUBSETMAP"
 msgid "Myanmar Extended-A"
 msgstr "Myanmar Estynedig-A"
 
-#: strings.hrc:1563
+#: include/svx/strings.hrc:1547
 msgctxt "RID_SUBSETMAP"
 msgid "Tai Viet"
 msgstr "Tai Viet"
 
-#: strings.hrc:1564
+#: include/svx/strings.hrc:1548
 msgctxt "RID_SUBSETMAP"
 msgid "Meetei Mayek"
 msgstr "Meetei Mayek"
 
-#: strings.hrc:1565
+#: include/svx/strings.hrc:1549
 msgctxt "RID_SUBSETMAP"
 msgid "Hangul Jamo Extended-B"
 msgstr "Hangul Jamo Estynedig-B"
 
-#: strings.hrc:1566
+#: include/svx/strings.hrc:1550
 msgctxt "RID_SUBSETMAP"
 msgid "Imperial Aramaic"
 msgstr "Arameaidd Ymerodrol"
 
-#: strings.hrc:1567
+#: include/svx/strings.hrc:1551
 msgctxt "RID_SUBSETMAP"
 msgid "Old South Arabian"
 msgstr "De Arabaidd Hynafol"
 
-#: strings.hrc:1568
+#: include/svx/strings.hrc:1552
 msgctxt "RID_SUBSETMAP"
 msgid "Avestan"
 msgstr "Afestanaidd"
 
-#: strings.hrc:1569
+#: include/svx/strings.hrc:1553
 msgctxt "RID_SUBSETMAP"
 msgid "Inscriptional Parthian"
 msgstr "Parinthaidd Ysgrifol"
 
-#: strings.hrc:1570
+#: include/svx/strings.hrc:1554
 msgctxt "RID_SUBSETMAP"
 msgid "Inscriptional Pahlavi"
 msgstr "Pahlafaidd Ysgrifol"
 
-#: strings.hrc:1571
+#: include/svx/strings.hrc:1555
 msgctxt "RID_SUBSETMAP"
 msgid "Old Turkic"
 msgstr "Twrceg Hynafol"
 
-#: strings.hrc:1572
+#: include/svx/strings.hrc:1556
 msgctxt "RID_SUBSETMAP"
 msgid "Rumi Numeral Symbols"
 msgstr "Symbolau Rhifol Rumi"
 
-#: strings.hrc:1573
+#: include/svx/strings.hrc:1557
 msgctxt "RID_SUBSETMAP"
 msgid "Kaithi"
 msgstr "Kaithi"
 
-#: strings.hrc:1574
+#: include/svx/strings.hrc:1558
 msgctxt "RID_SUBSETMAP"
 msgid "Egyptian Hieroglyphs"
 msgstr "Hieroglyphau Eifftaidd"
 
-#: strings.hrc:1575
+#: include/svx/strings.hrc:1559
 msgctxt "RID_SUBSETMAP"
 msgid "Enclosed Alphanumeric Supplement"
 msgstr "Affaniwmerig Caëedig Atodol"
 
-#: strings.hrc:1576
+#: include/svx/strings.hrc:1560
 msgctxt "RID_SUBSETMAP"
 msgid "Enclosed Ideographic Supplement"
 msgstr "Ideograffig Caëedig Atodol"
 
-#: strings.hrc:1577
+#: include/svx/strings.hrc:1561
 msgctxt "RID_SUBSETMAP"
 msgid "Mandaic"
 msgstr "Mandaic"
 
-#: strings.hrc:1578
+#: include/svx/strings.hrc:1562
 msgctxt "RID_SUBSETMAP"
 msgid "Batak"
 msgstr "Batak"
 
-#: strings.hrc:1579
+#: include/svx/strings.hrc:1563
 msgctxt "RID_SUBSETMAP"
 msgid "Ethiopic Extended-A"
 msgstr "Ethiopaidd Estynedig-A"
 
-#: strings.hrc:1580
+#: include/svx/strings.hrc:1564
 msgctxt "RID_SUBSETMAP"
 msgid "Brahmi"
 msgstr "Brahmi"
 
-#: strings.hrc:1581
+#: include/svx/strings.hrc:1565
 msgctxt "RID_SUBSETMAP"
 msgid "Bamum Supplement"
 msgstr "Bamum Atodol"
 
-#: strings.hrc:1582
+#: include/svx/strings.hrc:1566
 msgctxt "RID_SUBSETMAP"
 msgid "Kana Supplement"
 msgstr "Kana Atodol"
 
-#: strings.hrc:1583
+#: include/svx/strings.hrc:1567
 msgctxt "RID_SUBSETMAP"
 msgid "Playing Cards"
 msgstr "Cardiau Chwarae"
 
-#: strings.hrc:1584
+#: include/svx/strings.hrc:1568
 msgctxt "RID_SUBSETMAP"
 msgid "Miscellaneous Symbols And Pictographs"
 msgstr "Symbolau a Phictograffau Amrywiol"
 
-#: strings.hrc:1585
+#: include/svx/strings.hrc:1569
 msgctxt "RID_SUBSETMAP"
 msgid "Emoticons"
 msgstr "Emoticons"
 
-#: strings.hrc:1586
+#: include/svx/strings.hrc:1570
 msgctxt "RID_SUBSETMAP"
 msgid "Transport And Map Symbols"
 msgstr "Symbolau Trafnidiaeth a Mapiau"
 
-#: strings.hrc:1587
+#: include/svx/strings.hrc:1571
 msgctxt "RID_SUBSETMAP"
 msgid "Alchemical Symbols"
 msgstr "Symbolau Alcemegol"
 
-#: strings.hrc:1588
+#: include/svx/strings.hrc:1572
 msgctxt "RID_SUBSETMAP"
 msgid "Arabic Extended-A"
 msgstr "Arabeg Estynedig-A"
 
-#: strings.hrc:1589
+#: include/svx/strings.hrc:1573
 msgctxt "RID_SUBSETMAP"
 msgid "Arabic Mathematical Alphabetic Symbols"
 msgstr "Symbolau Gwyddor Mathamategol Arabaidd"
 
-#: strings.hrc:1590
+#: include/svx/strings.hrc:1574
 msgctxt "RID_SUBSETMAP"
 msgid "Chakma"
 msgstr "Chakma"
 
-#: strings.hrc:1591
+#: include/svx/strings.hrc:1575
 msgctxt "RID_SUBSETMAP"
 msgid "Meetei Mayek Extensions"
 msgstr "Estyniadau Meetei Mayek"
 
-#: strings.hrc:1592
+#: include/svx/strings.hrc:1576
 msgctxt "RID_SUBSETMAP"
 msgid "Meroitic Cursive"
 msgstr "Meroitig Rhedol"
 
-#: strings.hrc:1593
+#: include/svx/strings.hrc:1577
 msgctxt "RID_SUBSETMAP"
 msgid "Meroitic Hieroglyphs"
 msgstr "Hieroglyphau Meroitig"
 
-#: strings.hrc:1594
+#: include/svx/strings.hrc:1578
 msgctxt "RID_SUBSETMAP"
 msgid "Miao"
 msgstr "Miao"
 
-#: strings.hrc:1595
+#: include/svx/strings.hrc:1579
 msgctxt "RID_SUBSETMAP"
 msgid "Sharada"
 msgstr "Sharada"
 
-#: strings.hrc:1596
+#: include/svx/strings.hrc:1580
 msgctxt "RID_SUBSETMAP"
 msgid "Sora Sompeng"
 msgstr "Cursive"
 
-#: strings.hrc:1597
+#: include/svx/strings.hrc:1581
 msgctxt "RID_SUBSETMAP"
 msgid "Sundanese Supplement"
 msgstr "Sudaneg Atodol"
 
-#: strings.hrc:1598
+#: include/svx/strings.hrc:1582
 msgctxt "RID_SUBSETMAP"
 msgid "Takri"
 msgstr "Takri"
 
-#: strings.hrc:1599
+#: include/svx/strings.hrc:1583
 msgctxt "RID_SUBSETMAP"
 msgid "Bassa Vah"
 msgstr "Bassa Vah"
 
-#: strings.hrc:1600
+#: include/svx/strings.hrc:1584
 msgctxt "RID_SUBSETMAP"
 msgid "Caucasian Albanian"
 msgstr "Albanieg Cawcsasaidd"
 
-#: strings.hrc:1601
+#: include/svx/strings.hrc:1585
 msgctxt "RID_SUBSETMAP"
 msgid "Coptic Epact Numbers"
 msgstr "Rhifau Epact Copteg"
 
-#: strings.hrc:1602
+#: include/svx/strings.hrc:1586
 msgctxt "RID_SUBSETMAP"
 msgid "Combining Diacritical Marks Extended"
 msgstr "Cyfuno Marciau Deiacritig Estynedig"
 
-#: strings.hrc:1603
+#: include/svx/strings.hrc:1587
 msgctxt "RID_SUBSETMAP"
 msgid "Duployan"
 msgstr "Duployan"
 
-#: strings.hrc:1604
+#: include/svx/strings.hrc:1588
 msgctxt "RID_SUBSETMAP"
 msgid "Elbasan"
 msgstr "Elbasan"
 
-#: strings.hrc:1605
+#: include/svx/strings.hrc:1589
 msgctxt "RID_SUBSETMAP"
 msgid "Geometric Shapes Extended"
 msgstr "Siapiau Geometrig Estynedig"
 
-#: strings.hrc:1606
+#: include/svx/strings.hrc:1590
 msgctxt "RID_SUBSETMAP"
 msgid "Grantha"
 msgstr "Grantha"
 
-#: strings.hrc:1607
+#: include/svx/strings.hrc:1591
 msgctxt "RID_SUBSETMAP"
 msgid "Khojki"
 msgstr "Khojki"
 
-#: strings.hrc:1608
+#: include/svx/strings.hrc:1592
 msgctxt "RID_SUBSETMAP"
 msgid "Khudawadi"
 msgstr "Khudawadi"
 
-#: strings.hrc:1609
+#: include/svx/strings.hrc:1593
 msgctxt "RID_SUBSETMAP"
 msgid "Latin Extended-E"
 msgstr "Lladin Estynedig-E"
 
-#: strings.hrc:1610
+#: include/svx/strings.hrc:1594
 msgctxt "RID_SUBSETMAP"
 msgid "Linear A"
 msgstr "Linear A"
 
-#: strings.hrc:1611
+#: include/svx/strings.hrc:1595
 msgctxt "RID_SUBSETMAP"
 msgid "Mahajani"
 msgstr "Mahajani"
 
-#: strings.hrc:1612
+#: include/svx/strings.hrc:1596
 msgctxt "RID_SUBSETMAP"
 msgid "Manichaean"
 msgstr "Manichaean"
 
-#: strings.hrc:1613
+#: include/svx/strings.hrc:1597
 msgctxt "RID_SUBSETMAP"
 msgid "Mende Kikakui"
 msgstr "Mende Kikakui"
 
-#: strings.hrc:1614
+#: include/svx/strings.hrc:1598
 msgctxt "RID_SUBSETMAP"
 msgid "Modi"
 msgstr "Modi"
 
-#: strings.hrc:1615
+#: include/svx/strings.hrc:1599
 msgctxt "RID_SUBSETMAP"
 msgid "Mro"
 msgstr "Mro"
 
-#: strings.hrc:1616
+#: include/svx/strings.hrc:1600
 msgctxt "RID_SUBSETMAP"
 msgid "Myanmar Extended-B"
 msgstr "Myanmar Estynedig-B"
 
-#: strings.hrc:1617
+#: include/svx/strings.hrc:1601
 msgctxt "RID_SUBSETMAP"
 msgid "Nabataean"
 msgstr "Nabataean"
 
-#: strings.hrc:1618
+#: include/svx/strings.hrc:1602
 msgctxt "RID_SUBSETMAP"
 msgid "Old North Arabian"
 msgstr "Arabaidd Hynafol Gogleddol"
 
-#: strings.hrc:1619
+#: include/svx/strings.hrc:1603
 msgctxt "RID_SUBSETMAP"
 msgid "Old Permic"
 msgstr "Hen Bermic"
 
-#: strings.hrc:1620
+#: include/svx/strings.hrc:1604
 msgctxt "RID_SUBSETMAP"
 msgid "Ornamental Dingbats"
 msgstr "Dingbatiau Addurniadol"
 
-#: strings.hrc:1621
+#: include/svx/strings.hrc:1605
 msgctxt "RID_SUBSETMAP"
 msgid "Pahawh Hmong"
 msgstr "Pahawh Hmong"
 
-#: strings.hrc:1622
+#: include/svx/strings.hrc:1606
 msgctxt "RID_SUBSETMAP"
 msgid "Palmyrene"
 msgstr "Palmyrene"
 
-#: strings.hrc:1623
+#: include/svx/strings.hrc:1607
 msgctxt "RID_SUBSETMAP"
 msgid "Pau Cin Hau"
 msgstr "Pau Cin Hau"
 
-#: strings.hrc:1624
+#: include/svx/strings.hrc:1608
 msgctxt "RID_SUBSETMAP"
 msgid "Psalter Pahlavi"
 msgstr "Psalter Pahlavi"
 
-#: strings.hrc:1625
+#: include/svx/strings.hrc:1609
 msgctxt "RID_SUBSETMAP"
 msgid "Shorthand Format Controls"
 msgstr "Rheoli Fformat Llawfer"
 
-#: strings.hrc:1626
+#: include/svx/strings.hrc:1610
 msgctxt "RID_SUBSETMAP"
 msgid "Siddham"
 msgstr "Siddham"
 
-#: strings.hrc:1627
+#: include/svx/strings.hrc:1611
 msgctxt "RID_SUBSETMAP"
 msgid "Sinhala Archaic Numbers"
 msgstr "Hen Rifau Sinhala"
 
-#: strings.hrc:1628
+#: include/svx/strings.hrc:1612
 msgctxt "RID_SUBSETMAP"
 msgid "Supplemental Arrows-C"
 msgstr "Saethau Atodol - C"
 
-#: strings.hrc:1629
+#: include/svx/strings.hrc:1613
 msgctxt "RID_SUBSETMAP"
 msgid "Tirhuta"
 msgstr "Tirhuta"
 
-#: strings.hrc:1630
+#: include/svx/strings.hrc:1614
 msgctxt "RID_SUBSETMAP"
 msgid "Warang Citi"
 msgstr "Warang Citi"
 
-#: strings.hrc:1631
+#: include/svx/strings.hrc:1615
 msgctxt "RID_SUBSETMAP"
 msgid "Ahom"
 msgstr "Ahom"
 
-#: strings.hrc:1632
+#: include/svx/strings.hrc:1616
 msgctxt "RID_SUBSETMAP"
 msgid "Anatolian Hieroglyphs"
 msgstr "Hieroglyffau Anatolia"
 
-#: strings.hrc:1633
+#: include/svx/strings.hrc:1617
 msgctxt "RID_SUBSETMAP"
 msgid "Cherokee Supplement"
 msgstr "Cherokee Ychwanegol"
 
-#: strings.hrc:1634
+#: include/svx/strings.hrc:1618
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Unified Ideographs Extension E"
 msgstr "Ideograffau Unedig CJK Estyniad E"
 
-#: strings.hrc:1635
+#: include/svx/strings.hrc:1619
 msgctxt "RID_SUBSETMAP"
 msgid "Early Dynastic Cuneiform"
 msgstr "Cwnifform Llinachyddol Cynnar"
 
-#: strings.hrc:1636
+#: include/svx/strings.hrc:1620
 msgctxt "RID_SUBSETMAP"
 msgid "Hatran"
 msgstr "Hatran"
 
-#: strings.hrc:1637
+#: include/svx/strings.hrc:1621
 msgctxt "RID_SUBSETMAP"
 msgid "Multani"
 msgstr "Multani"
 
-#: strings.hrc:1638
+#: include/svx/strings.hrc:1622
 msgctxt "RID_SUBSETMAP"
 msgid "Old Hungarian"
 msgstr "Hen Hwngareg"
 
-#: strings.hrc:1639
+#: include/svx/strings.hrc:1623
 msgctxt "RID_SUBSETMAP"
 msgid "Supplemental Symbols And Pictographs"
 msgstr "Symbolau a Phictograffau Ychwanegol"
 
-#: strings.hrc:1640
+#: include/svx/strings.hrc:1624
 msgctxt "RID_SUBSETMAP"
 msgid "Sutton Signwriting"
 msgstr "Ysgrif Arwydd Sutton"
 
-#: strings.hrc:1641
+#: include/svx/strings.hrc:1625
 msgctxt "RID_SUBSETMAP"
 msgid "Adlam"
 msgstr "Adlam"
 
-#: strings.hrc:1642
+#: include/svx/strings.hrc:1626
 msgctxt "RID_SUBSETMAP"
 msgid "Bhaiksuki"
 msgstr "Bhaiksuki"
 
-#: strings.hrc:1643
+#: include/svx/strings.hrc:1627
 msgctxt "RID_SUBSETMAP"
 msgid "Cyrillic Extended-C"
 msgstr "Cyrillig Estynedig-C"
 
-#: strings.hrc:1644
+#: include/svx/strings.hrc:1628
 msgctxt "RID_SUBSETMAP"
 msgid "Glagolitic Supplement"
 msgstr "Atodiad Glagolitig"
 
-#: strings.hrc:1645
+#: include/svx/strings.hrc:1629
 msgctxt "RID_SUBSETMAP"
 msgid "Ideographic Symbols and Punctuation"
 msgstr "Symbolau ac Atalnodi Ideograffeg"
 
-#: strings.hrc:1646
+#: include/svx/strings.hrc:1630
 msgctxt "RID_SUBSETMAP"
 msgid "Marchen"
 msgstr "Marchen"
 
-#: strings.hrc:1647
+#: include/svx/strings.hrc:1631
 msgctxt "RID_SUBSETMAP"
 msgid "Mongolian Supplement"
 msgstr "Atodiad Mongoleg"
 
-#: strings.hrc:1648
+#: include/svx/strings.hrc:1632
 msgctxt "RID_SUBSETMAP"
 msgid "Newa"
 msgstr "Newa"
 
-#: strings.hrc:1649
+#: include/svx/strings.hrc:1633
 msgctxt "RID_SUBSETMAP"
 msgid "Osage"
 msgstr "Osage"
 
-#: strings.hrc:1650
+#: include/svx/strings.hrc:1634
 msgctxt "RID_SUBSETMAP"
 msgid "Tangut"
 msgstr "Tangut"
 
-#: strings.hrc:1651
+#: include/svx/strings.hrc:1635
 msgctxt "RID_SUBSETMAP"
 msgid "Tangut Components"
 msgstr "Cydrannau Tangut"
 
-#: strings.hrc:1652
+#: include/svx/strings.hrc:1636
 msgctxt "RID_SUBSETMAP"
 msgid "CJK Unified Ideographs Extension F"
 msgstr "Ideograffau Unedig CJK Estyniad F"
 
-#: strings.hrc:1653
+#: include/svx/strings.hrc:1637
 msgctxt "RID_SUBSETMAP"
 msgid "Kana Extended-A"
 msgstr "Kana Estynedig-A"
 
-#: strings.hrc:1654
+#: include/svx/strings.hrc:1638
 msgctxt "RID_SUBSETMAP"
 msgid "Masaram Gondi"
 msgstr "Masaram Gondi"
 
-#: strings.hrc:1655
+#: include/svx/strings.hrc:1639
 msgctxt "RID_SUBSETMAP"
 msgid "Nushu"
 msgstr "Nushu"
 
-#: strings.hrc:1656
+#: include/svx/strings.hrc:1640
 msgctxt "RID_SUBSETMAP"
 msgid "Soyombo"
 msgstr "Soyombo"
 
-#: strings.hrc:1657
+#: include/svx/strings.hrc:1641
 msgctxt "RID_SUBSETMAP"
 msgid "Syriac Supplement"
 msgstr "Atodiad Syriag"
 
-#: strings.hrc:1658
+#: include/svx/strings.hrc:1642
 msgctxt "RID_SUBSETMAP"
 msgid "Zanabazar Square"
 msgstr "Sgwâr Zanabazar"
 
-#: svxitems.hrc:33
+#: include/svx/strings.hrc:1644
+msgctxt "RID_SVXSTR_FRAMEDIR_LTR"
+msgid "Left-to-right (LTR)"
+msgstr "Chwith i'r dde (LTR)"
+
+#: include/svx/strings.hrc:1645
+msgctxt "RID_SVXSTR_FRAMEDIR_RTL"
+msgid "Right-to-left (RTL)"
+msgstr "De i'r chwith (RTL)"
+
+#: include/svx/strings.hrc:1646
+msgctxt "RID_SVXSTR_FRAMEDIR_SUPER"
+msgid "Use superordinate object settings"
+msgstr "Defnyddio gosodiadau gwrthrych uwcholyn"
+
+#. page direction
+#: include/svx/strings.hrc:1648
+msgctxt "RID_SVXSTR_PAGEDIR_LTR_HORI"
+msgid "Left-to-right (horizontal)"
+msgstr "Chwith i dde (llorweddol)"
+
+#: include/svx/strings.hrc:1649
+msgctxt "RID_SVXSTR_PAGEDIR_RTL_HORI"
+msgid "Right-to-left (horizontal)"
+msgstr "De i chwith (llorweddol)"
+
+#: include/svx/strings.hrc:1650
+msgctxt "RID_SVXSTR_PAGEDIR_RTL_VERT"
+msgid "Right-to-left (vertical)"
+msgstr "De i chwith (fertigol)"
+
+#: include/svx/strings.hrc:1651
+msgctxt "RID_SVXSTR_PAGEDIR_LTR_VERT"
+msgid "Left-to-right (vertical)"
+msgstr "Chwith i'r dde (fertigol)"
+
+#: include/svx/svxitems.hrc:33
 msgctxt "RID_ATTR_NAMES"
 msgid "Scale"
 msgstr "Graddfa"
 
-#: svxitems.hrc:34
+#: include/svx/svxitems.hrc:34
 msgctxt "RID_ATTR_NAMES"
 msgid "Brush"
 msgstr "Brwsh"
 
-#: svxitems.hrc:35
+#: include/svx/svxitems.hrc:35
 msgctxt "RID_ATTR_NAMES"
 msgid "Tab stops"
 msgstr "Stop tab"
 
-#: svxitems.hrc:36
+#: include/svx/svxitems.hrc:36
 msgctxt "RID_ATTR_NAMES"
 msgid "Character"
 msgstr "Nod"
 
-#: svxitems.hrc:37
+#: include/svx/svxitems.hrc:37
 msgctxt "RID_ATTR_NAMES"
 msgid "Font"
 msgstr "Ffont"
 
-#: svxitems.hrc:38
+#: include/svx/svxitems.hrc:38
 msgctxt "RID_ATTR_NAMES"
 msgid "Font posture"
 msgstr "Osgo ffont"
 
-#: svxitems.hrc:39
+#: include/svx/svxitems.hrc:39
 msgctxt "RID_ATTR_NAMES"
 msgid "Font weight"
 msgstr "Pwysau ffont"
 
-#: svxitems.hrc:40
+#: include/svx/svxitems.hrc:40
 msgctxt "RID_ATTR_NAMES"
 msgid "Shadowed"
 msgstr "Cysgodi"
 
-#: svxitems.hrc:41
+#: include/svx/svxitems.hrc:41
 msgctxt "RID_ATTR_NAMES"
 msgid "Individual words"
 msgstr "Geiriau unigol"
 
-#: svxitems.hrc:42
+#: include/svx/svxitems.hrc:42
 msgctxt "RID_ATTR_NAMES"
 msgid "Outline"
 msgstr "Amlinell"
 
-#: svxitems.hrc:43
+#: include/svx/svxitems.hrc:43
 msgctxt "RID_ATTR_NAMES"
 msgid "Strikethrough"
 msgstr "Taro drwodd"
 
-#: svxitems.hrc:44
+#: include/svx/svxitems.hrc:44
 msgctxt "RID_ATTR_NAMES"
 msgid "Underline"
 msgstr "Tanlinellu"
 
-#: svxitems.hrc:45
+#: include/svx/svxitems.hrc:45
 msgctxt "RID_ATTR_NAMES"
 msgid "Font size"
 msgstr "Maint ffont"
 
-#: svxitems.hrc:46
-msgctxt "RID_ATTR_NAMES"
-msgid "Rel. Font size"
-msgstr "Maint Ffont Cymharol"
-
-#: svxitems.hrc:47
+#: include/svx/svxitems.hrc:46
 msgctxt "RID_ATTR_NAMES"
 msgid "Font color"
 msgstr "Lliw ffont"
 
-#: svxitems.hrc:48
+#: include/svx/svxitems.hrc:47
 msgctxt "RID_ATTR_NAMES"
 msgid "Kerning"
 msgstr "Gorgyffyrddiad"
 
-#: svxitems.hrc:49
+#: include/svx/svxitems.hrc:48
 msgctxt "RID_ATTR_NAMES"
 msgid "Effects"
 msgstr "Effeithiau"
 
-#: svxitems.hrc:50
+#: include/svx/svxitems.hrc:49
 msgctxt "RID_ATTR_NAMES"
 msgid "Language"
 msgstr "Iaith"
 
-#: svxitems.hrc:51
+#: include/svx/svxitems.hrc:50
 msgctxt "RID_ATTR_NAMES"
 msgid "Position"
 msgstr "Safle"
 
-#: svxitems.hrc:52
+#: include/svx/svxitems.hrc:51
 msgctxt "RID_ATTR_NAMES"
 msgid "Character blinking"
 msgstr "Chwincio nod"
 
-#: svxitems.hrc:53
+#: include/svx/svxitems.hrc:52
 msgctxt "RID_ATTR_NAMES"
 msgid "Character set color"
 msgstr "Lliw set nod"
 
-#: svxitems.hrc:54
+#: include/svx/svxitems.hrc:53
 msgctxt "RID_ATTR_NAMES"
 msgid "Overline"
 msgstr "Troslinell"
 
-#: svxitems.hrc:55
-msgctxt "RID_ATTR_NAMES"
-msgid "Paragraph"
-msgstr "Paragraff"
-
-#: svxitems.hrc:56
+#: include/svx/svxitems.hrc:54
 msgctxt "RID_ATTR_NAMES"
 msgid "Alignment"
 msgstr "Aliniad"
 
-#: svxitems.hrc:57
+#: include/svx/svxitems.hrc:55
 msgctxt "RID_ATTR_NAMES"
 msgid "Line spacing"
 msgstr "Bylchu llinell"
 
-#: svxitems.hrc:58
+#: include/svx/svxitems.hrc:56
 msgctxt "RID_ATTR_NAMES"
 msgid "Page Break"
 msgstr "Toriad Tudalen"
 
-#: svxitems.hrc:59
+#: include/svx/svxitems.hrc:57
 msgctxt "RID_ATTR_NAMES"
 msgid "Hyphenation"
 msgstr "Cysylltnodi"
 
-#: svxitems.hrc:60
+#: include/svx/svxitems.hrc:58
 msgctxt "RID_ATTR_NAMES"
 msgid "Do not split paragraph"
 msgstr "Peidio hollti paragraff"
 
-#: svxitems.hrc:61
+#: include/svx/svxitems.hrc:59
 msgctxt "RID_ATTR_NAMES"
 msgid "Orphans"
 msgstr "Gweddw"
 
-#: svxitems.hrc:62
+#: include/svx/svxitems.hrc:60
 msgctxt "RID_ATTR_NAMES"
 msgid "Widows"
 msgstr "Amddifad"
 
-#: svxitems.hrc:63
+#: include/svx/svxitems.hrc:61
 msgctxt "RID_ATTR_NAMES"
 msgid "Paragraph spacing"
 msgstr "Bylchu paragraff"
 
-#: svxitems.hrc:64
+#: include/svx/svxitems.hrc:62
 msgctxt "RID_ATTR_NAMES"
 msgid "Paragraph indent"
 msgstr "Mewnoliad paragraff"
 
-#: svxitems.hrc:65
+#: include/svx/svxitems.hrc:63
 msgctxt "RID_ATTR_NAMES"
 msgid "Indent"
 msgstr "Mewnoliad"
 
-#: svxitems.hrc:66
+#: include/svx/svxitems.hrc:64
 msgctxt "RID_ATTR_NAMES"
 msgid "Spacing"
 msgstr "Bylchu"
 
-#: svxitems.hrc:67
+#: include/svx/svxitems.hrc:65
 msgctxt "RID_ATTR_NAMES"
 msgid "Page"
 msgstr "Tudalen"
 
-#: svxitems.hrc:68
+#: include/svx/svxitems.hrc:66
 msgctxt "RID_ATTR_NAMES"
 msgid "Page Style"
 msgstr "Arddull Tudalen"
 
-#: svxitems.hrc:69
+#: include/svx/svxitems.hrc:67
 msgctxt "RID_ATTR_NAMES"
 msgid "Keep with next paragraph"
 msgstr "Cadw gyda'r paragraff nesaf"
 
-#: svxitems.hrc:70
+#: include/svx/svxitems.hrc:68
 msgctxt "RID_ATTR_NAMES"
 msgid "Blinking"
 msgstr "Blincio"
 
-#: svxitems.hrc:71
+#: include/svx/svxitems.hrc:69
 msgctxt "RID_ATTR_NAMES"
 msgid "Register-true"
 msgstr "Cofrestr cywir"
 
-#: svxitems.hrc:72
+#: include/svx/svxitems.hrc:70
 msgctxt "RID_ATTR_NAMES"
 msgid "Character background"
 msgstr "Cefndir nod"
 
-#: svxitems.hrc:73
+#: include/svx/svxitems.hrc:71
 msgctxt "RID_ATTR_NAMES"
 msgid "Asian font"
 msgstr "Ffont Asiaidd"
 
-#: svxitems.hrc:74
+#: include/svx/svxitems.hrc:72
 msgctxt "RID_ATTR_NAMES"
 msgid "Size of Asian font"
 msgstr "Maint ffont Asiaidd"
 
-#: svxitems.hrc:75
+#: include/svx/svxitems.hrc:73
 msgctxt "RID_ATTR_NAMES"
 msgid "Language of Asian font"
 msgstr "Iaith ffontiau Asiaidd"
 
-#: svxitems.hrc:76
+#: include/svx/svxitems.hrc:74
 msgctxt "RID_ATTR_NAMES"
 msgid "Posture of Asian font"
 msgstr "Osgo ffontiau Asiaidd"
 
-#: svxitems.hrc:77
+#: include/svx/svxitems.hrc:75
 msgctxt "RID_ATTR_NAMES"
 msgid "Weight of Asian font"
 msgstr "Pwysau ffontiau Asiaidd"
 
-#: svxitems.hrc:78
+#: include/svx/svxitems.hrc:76
 msgctxt "RID_ATTR_NAMES"
 msgid "CTL"
 msgstr "CTL"
 
-#: svxitems.hrc:79
+#: include/svx/svxitems.hrc:77
 msgctxt "RID_ATTR_NAMES"
 msgid "Size of complex scripts"
 msgstr "Maint sgriptiau cymhleth"
 
-#: svxitems.hrc:80
+#: include/svx/svxitems.hrc:78
 msgctxt "RID_ATTR_NAMES"
 msgid "Language of complex scripts"
 msgstr "Iaith sgriptiau cymhleth"
 
-#: svxitems.hrc:81
+#: include/svx/svxitems.hrc:79
 msgctxt "RID_ATTR_NAMES"
 msgid "Posture of complex scripts"
 msgstr "Osgo sgriptiau cymhleth"
 
-#: svxitems.hrc:82
+#: include/svx/svxitems.hrc:80
 msgctxt "RID_ATTR_NAMES"
 msgid "Weight of complex scripts"
 msgstr "Pwysau sgriptiau cymhleth"
 
-#: svxitems.hrc:83
+#: include/svx/svxitems.hrc:81
 msgctxt "RID_ATTR_NAMES"
 msgid "Double-lined"
 msgstr "Llinellu Dwbl"
 
-#: svxitems.hrc:84
+#: include/svx/svxitems.hrc:82
 msgctxt "RID_ATTR_NAMES"
 msgid "Emphasis mark"
 msgstr "Marc pwyslais"
 
-#: svxitems.hrc:85
+#: include/svx/svxitems.hrc:83
 msgctxt "RID_ATTR_NAMES"
 msgid "Text spacing"
 msgstr "Bylchu testun"
 
-#: svxitems.hrc:86
+#: include/svx/svxitems.hrc:84
 msgctxt "RID_ATTR_NAMES"
 msgid "Hanging punctuation"
 msgstr "Atalnodi crog"
 
-#: svxitems.hrc:87
+#: include/svx/svxitems.hrc:85
 msgctxt "RID_ATTR_NAMES"
 msgid "Forbidden characters"
 msgstr "Nodau gwaharddedig"
 
-#: svxitems.hrc:88
+#: include/svx/svxitems.hrc:86
 msgctxt "RID_ATTR_NAMES"
 msgid "Rotation"
 msgstr "Cylchdro"
 
-#: svxitems.hrc:89
+#: include/svx/svxitems.hrc:87
 msgctxt "RID_ATTR_NAMES"
 msgid "Character scaling"
 msgstr "Graddio nod"
 
-#: svxitems.hrc:90
+#: include/svx/svxitems.hrc:88
 msgctxt "RID_ATTR_NAMES"
 msgid "Relief"
 msgstr "Cerfweddol"
 
-#: svxitems.hrc:91
+#: include/svx/svxitems.hrc:89
 msgctxt "RID_ATTR_NAMES"
 msgid "Vertical text alignment"
 msgstr "Aliniad testun fertigol"
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"
diff --git a/source/cy/swext/mediawiki/help.po b/source/cy/swext/mediawiki/help.po
index d505b819b95..960404b6eb6 100644
--- a/source/cy/swext/mediawiki/help.po
+++ b/source/cy/swext/mediawiki/help.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2016-11-09 14:10+0100\n"
+"POT-Creation-Date: 2018-03-28 16:46+0200\n"
 "PO-Revision-Date: 2017-01-13 16:35+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1484325307.000000\n"
 
 #: help.tree
@@ -515,22 +515,6 @@ msgstr "Mae arddull nodau yn newid golwg rhannau o baragraffau. Mae'r trawsnewid
 #: wikiformats.xhp
 msgctxt ""
 "wikiformats.xhp\n"
-"hd_id5152745\n"
-"help.text"
-msgid "Footnotes"
-msgstr "Troednodau"
-
-#: wikiformats.xhp
-msgctxt ""
-"wikiformats.xhp\n"
-"par_id5238196\n"
-"help.text"
-msgid "Note: The transformation uses the new style of footnotes with <ref> and <references> tags that requires the Cite.php extension to be installed into MediaWiki. If those tags are shown as plain text in the transformation result, ask the wiki administrator to install this extension."
-msgstr "Nodyn: Mae'r trawsnewid yn defnyddio arddull newydd o droednodiadau gyda thagiau <ref> a <references> sy'n gofyn am estyniad Cite.php gael eu gosod yn MediaWiki. Os yw'r tagiau yn digwydd fel testun plaen yng nghanlyniad y trawsnewid, gofynnwch i weinyddwr y wiki i osod yr estyniad."
-
-#: wikiformats.xhp
-msgctxt ""
-"wikiformats.xhp\n"
 "hd_id9405499\n"
 "help.text"
 msgid "Images"
diff --git a/source/cy/uui/messages.po b/source/cy/uui/messages.po
index f87e1d45f79..4f672e1a9e4 100644
--- a/source/cy/uui/messages.po
+++ b/source/cy/uui/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: 2017-11-22 13:53+0100\n"
-"PO-Revision-Date: 2017-12-29 14:53+0000\n"
+"POT-Creation-Date: 2018-04-24 12:21+0200\n"
+"PO-Revision-Date: 2018-04-09 16:26+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,30 +13,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1514559200.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1523291203.000000\n"
 
-#: ids.hrc:27
+#: uui/inc/ids.hrc:27
 msgctxt "RID_UUI_ERRHDL"
 msgid "The operation executed on $(ARG1) was aborted."
 msgstr "Terfynodd y weithred wnaed yn $(ARG1)."
 
-#: ids.hrc:29
+#: uui/inc/ids.hrc:29
 msgctxt "RID_UUI_ERRHDL"
 msgid "Access to $(ARG1) was denied."
 msgstr "Gwrthodwyd mynediad i $(ARG1)."
 
-#: ids.hrc:31
+#: uui/inc/ids.hrc:31
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) already exists."
 msgstr "Mae $(ARG1) yn bodoli eisoes."
 
-#: ids.hrc:33
+#: uui/inc/ids.hrc:33
 msgctxt "RID_UUI_ERRHDL"
 msgid "Target already exists."
 msgstr "Targed yn bodoli eisoes."
 
-#: ids.hrc:35
+#: uui/inc/ids.hrc:35
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "You are about to save/export a password protected basic library containing module(s) \n"
@@ -47,242 +47,261 @@ msgstr ""
 "$(ARG1)\n"
 "sy'n rhy fawr i'w cadw mewn ffurf didol. Os ydych am i ddefnyddwyr sydd heb fynediad i gyfrinair y llyfrgell allu rhedeg macros yn y modiwl(au) hyn bydd yn rhaid hollti'r modiwlau i nifer o fodiwlau llai. Hoffech chi barhau i gadw/allforio i'r llyfrgell?"
 
-#: ids.hrc:37
+#: uui/inc/ids.hrc:37
+msgctxt "RID_UUI_ERRHDL"
+msgid ""
+"Beware!\n"
+"\n"
+"You are about to load a very unusual sort of file ($(ARG2)) from the URL:\n"
+"\n"
+"$(ARG1)\n"
+"\n"
+"Are you certain that this file is a legacy document created many years ago?"
+msgstr ""
+"Gofal!\n"
+"\n"
+"Rydych ar fin llwytho math anarferol o ffeil ($(ARG2)) o'r URL:\n"
+"\n"
+"$(ARG1)\n"
+"\n"
+"Ydych chi'n siŵr fod y ffeil yn hen ddogfen grëwyd flynyddoedd maith yn ôl?"
+
+#: uui/inc/ids.hrc:39
 msgctxt "RID_UUI_ERRHDL"
 msgid "The data from $(ARG1) has an incorrect checksum."
 msgstr "Mae gan ddata o $(ARG1) checksum anghywir."
 
-#: ids.hrc:39
+#: uui/inc/ids.hrc:41
 msgctxt "RID_UUI_ERRHDL"
 msgid "The object $(ARG1) cannot be created in directory $(ARG2)."
 msgstr "Methu creu $(ARG1) yng nghyfeiriadur $(ARG2)."
 
-#: ids.hrc:41
+#: uui/inc/ids.hrc:43
 msgctxt "RID_UUI_ERRHDL"
 msgid "Data of $(ARG1) could not be read."
 msgstr "Methu darllen data $(ARG1)."
 
-#: ids.hrc:43
+#: uui/inc/ids.hrc:45
 msgctxt "RID_UUI_ERRHDL"
 msgid "The seek operation on $(ARG1) could not be performed."
 msgstr "Methu cyflawni'r weithred o ymholi ar $(ARG1)."
 
-#: ids.hrc:45
+#: uui/inc/ids.hrc:47
 msgctxt "RID_UUI_ERRHDL"
 msgid "The tell operation on $(ARG1) could not be performed."
 msgstr "Methu cyflawni'r weithred dweud ar $(ARG1)."
 
-#: ids.hrc:47
+#: uui/inc/ids.hrc:49
 msgctxt "RID_UUI_ERRHDL"
 msgid "Data for $(ARG1) could not be written."
 msgstr "Methu ysgrifennu data $(ARG1)."
 
-#: ids.hrc:49
+#: uui/inc/ids.hrc:51
 msgctxt "RID_UUI_ERRHDL"
 msgid "Action impossible: $(ARG1) is the current directory."
 msgstr "Gweithred amhosibl: $(ARG1) yw'r cyfeiriadur presennol."
 
-#: ids.hrc:51
+#: uui/inc/ids.hrc:53
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is not ready."
 msgstr "Nid yw $(ARG1) yn barod."
 
-#: ids.hrc:53
+#: uui/inc/ids.hrc:55
 msgctxt "RID_UUI_ERRHDL"
 msgid "Action impossible: $(ARG1) and $(ARG2) are different devices (drives)."
 msgstr "Gweithred amhosibl: Mae $(ARG1) a $(ARG2) yn nyfeisiau (disgiau) gwahanol."
 
-#: ids.hrc:55
+#: uui/inc/ids.hrc:57
 msgctxt "RID_UUI_ERRHDL"
 msgid "General input/output error while accessing $(ARG1)."
 msgstr "Gwall mewnbwn/allbwn cyffredinol wrth gael mynediad i $(ARG1)."
 
-#: ids.hrc:57
+#: uui/inc/ids.hrc:59
 msgctxt "RID_UUI_ERRHDL"
 msgid "An attempt was made to access $(ARG1) in an invalid way."
 msgstr "Gwnaed ymgais i gael mynediad at $(ARG1) mewn ffordd annilys."
 
-#: ids.hrc:59
+#: uui/inc/ids.hrc:61
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) contains invalid characters."
 msgstr "Mae $(ARG1) yn cynnwys nodau annilys."
 
-#: ids.hrc:61
+#: uui/inc/ids.hrc:63
 msgctxt "RID_UUI_ERRHDL"
 msgid "The device (drive) $(ARG1) is invalid."
 msgstr "Mae'r ddyfais (disg) $(ARG1) yn annilys."
 
-#: ids.hrc:63
+#: uui/inc/ids.hrc:65
 msgctxt "RID_UUI_ERRHDL"
 msgid "The data from $(ARG1) has an invalid length."
 msgstr "Mae i ddata o $(ARG1) hyd annilys."
 
-#: ids.hrc:65
+#: uui/inc/ids.hrc:67
 msgctxt "RID_UUI_ERRHDL"
 msgid "The operation on $(ARG1) was started with an invalid parameter."
 msgstr "Cychwynnwyd gweithred ar $(ARG1) gyda pharamedr annilys."
 
-#: ids.hrc:67
+#: uui/inc/ids.hrc:69
 msgctxt "RID_UUI_ERRHDL"
 msgid "The operation cannot be performed because $(ARG1) contains wildcards."
 msgstr "Nid oes modd cyflawni'r weithred am fod $(ARG1) yn cynnwys cardiau gwyllt."
 
-#: ids.hrc:69
+#: uui/inc/ids.hrc:71
 msgctxt "RID_UUI_ERRHDL"
 msgid "Error during shared access to $(ARG1)."
 msgstr "Gwall yn ystod mynediad rhanedig i $(ARG1)."
 
-#: ids.hrc:71
+#: uui/inc/ids.hrc:73
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) contains misplaced characters."
 msgstr "Mae $(ARG1) yn cynnwys nodau o'u lle."
 
-#: ids.hrc:73
+#: uui/inc/ids.hrc:75
 msgctxt "RID_UUI_ERRHDL"
 msgid "The name $(ARG1) contains too many characters."
 msgstr "Mae'r enw $(ARG1) yn cynnwys gormod o nodau."
 
-#: ids.hrc:75
+#: uui/inc/ids.hrc:77
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) does not exist."
 msgstr "Nid yw $(ARG1) yn bodoli."
 
-#: ids.hrc:77
+#: uui/inc/ids.hrc:79
 msgctxt "RID_UUI_ERRHDL"
 msgid "The path $(ARG1) does not exist."
 msgstr "Nid yw llwybr $(ARG1) yn bodoli."
 
-#: ids.hrc:79
+#: uui/inc/ids.hrc:81
 msgctxt "RID_UUI_ERRHDL"
 msgid "The operation on $(ARG1) is not supported on this operating system."
 msgstr "Nid yw'r weithred ar $(ARG1) yn cael ei gynnal gan y system weithredu."
 
-#: ids.hrc:81
+#: uui/inc/ids.hrc:83
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is not a directory."
 msgstr "Nid yw $(ARG1) yn gyfeiriadur."
 
-#: ids.hrc:83
+#: uui/inc/ids.hrc:85
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is not a file."
 msgstr "Nid yw $(ARG1) yn ffeil."
 
-#: ids.hrc:85
+#: uui/inc/ids.hrc:87
 msgctxt "RID_UUI_ERRHDL"
 msgid "There is no space left on device $(ARG1)."
 msgstr "Nid oes gofod ar ôl ar ddyfais $(ARG1)."
 
-#: ids.hrc:87
+#: uui/inc/ids.hrc:89
 msgctxt "RID_UUI_ERRHDL"
 msgid "The operation on $(ARG1) cannot be performed because too many files are already open."
 msgstr "Nid oes posibl cyflawni'r weithred ar $(ARG1) am fod gormod o ffeiliau ar agor eisoes."
 
-#: ids.hrc:89
+#: uui/inc/ids.hrc:91
 msgctxt "RID_UUI_ERRHDL"
 msgid "The operation on $(ARG1) cannot be performed because there is no more memory available."
 msgstr "Nid oes posibl cyflawni'r weithred ar $(ARG1) am nad oes rhagor o gof ar gael."
 
-#: ids.hrc:91
+#: uui/inc/ids.hrc:93
 msgctxt "RID_UUI_ERRHDL"
 msgid "The operation on $(ARG1) cannot continue because more data is pending."
 msgstr "Nid oes posibl cyflawni'r weithred ar $(ARG1) am fod rhagor o ddata ar ei ffordd."
 
-#: ids.hrc:93
+#: uui/inc/ids.hrc:95
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) cannot be copied into itself."
 msgstr "Methu copïo $(ARG1) iddo'i hun."
 
-#: ids.hrc:95
+#: uui/inc/ids.hrc:97
 msgctxt "RID_UUI_ERRHDL"
 msgid "Unknown input/output error while accessing $(ARG1)."
 msgstr "Gwall mewnbwn/allbwn anhysbys wrth gael mynediad i $(ARG1)."
 
-#: ids.hrc:97
+#: uui/inc/ids.hrc:99
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is write protected."
 msgstr "$(ARG1) wedi ei ddiogelu rhag ysgrifennu."
 
-#: ids.hrc:99
+#: uui/inc/ids.hrc:101
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is not in the correct format."
 msgstr "Nid yw $(ARG1) yn y fformat cywir."
 
-#: ids.hrc:101
+#: uui/inc/ids.hrc:103
 msgctxt "RID_UUI_ERRHDL"
 msgid "The version of $(ARG1) is not correct."
 msgstr "Nid yw'r fersiwn o $(ARG1) yn gywir."
 
-#: ids.hrc:103
+#: uui/inc/ids.hrc:105
 msgctxt "RID_UUI_ERRHDL"
 msgid "Drive $(ARG1) does not exist."
 msgstr "Nid yw gyrrwr $(ARG1) yn bodoli."
 
-#: ids.hrc:105
+#: uui/inc/ids.hrc:107
 msgctxt "RID_UUI_ERRHDL"
 msgid "Folder $(ARG1) does not exist."
 msgstr "Nid yw'r ffolder $(ARG1) yn bodoli."
 
-#: ids.hrc:107
+#: uui/inc/ids.hrc:109
 msgctxt "RID_UUI_ERRHDL"
 msgid "The installed Java version is not supported."
 msgstr "Nid yw'r fersiwn gosodedig o Java'n cael ei gynnal."
 
-#: ids.hrc:109
+#: uui/inc/ids.hrc:111
 msgctxt "RID_UUI_ERRHDL"
 msgid "The installed Java version $(ARG1) is not supported."
 msgstr "Nid yw'r fersiwn gosodedig o Java $(ARG1) yn cael ei gynnal."
 
-#: ids.hrc:111
+#: uui/inc/ids.hrc:113
 msgctxt "RID_UUI_ERRHDL"
 msgid "The installed Java version is not supported, at least version $(ARG1) is required."
 msgstr "Nid yw'r fersiwn gosodedig o Java yn cael ei gynnal, mae angen o leiaf fersiwn $(ARG1)."
 
-#: ids.hrc:113
+#: uui/inc/ids.hrc:115
 msgctxt "RID_UUI_ERRHDL"
 msgid "The installed Java version $(ARG1) is not supported, at least version $(ARG2) is required."
 msgstr "Nid yw'r fersiwn gosodedig o Java $(ARG1) yn cael ei gynnal, mae angen o leiaf fersiwn $(ARG2)."
 
-#: ids.hrc:115
+#: uui/inc/ids.hrc:117
 msgctxt "RID_UUI_ERRHDL"
 msgid "The data associated with the partnership is corrupted."
 msgstr "Mae'r data sy'n gysylltiedig â'r bartneriaeth yn llygredig."
 
-#: ids.hrc:117
+#: uui/inc/ids.hrc:119
 msgctxt "RID_UUI_ERRHDL"
 msgid "The data associated with the partnership $(ARG1) is corrupted."
 msgstr "Mae'r data sy'n gysylltiedig â phartneriaeth $(ARG1) yn llygredig."
 
-#: ids.hrc:119
+#: uui/inc/ids.hrc:121
 msgctxt "RID_UUI_ERRHDL"
 msgid "Volume $(ARG1) is not ready."
 msgstr "Nid yw cyfrol $(ARG1) yn barod."
 
-#: ids.hrc:121
+#: uui/inc/ids.hrc:123
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is not ready; please insert a storage medium."
 msgstr "Nid yw $(ARG1) yn barod: rhowch gyfrwng cof i mewn."
 
-#: ids.hrc:123
+#: uui/inc/ids.hrc:125
 msgctxt "RID_UUI_ERRHDL"
 msgid "Volume $(ARG1) is not ready; please insert a storage medium."
 msgstr "Nid yw cyfrol $(ARG1) yn barod: rhowch gyfrwng cof i mewn."
 
-#: ids.hrc:125
+#: uui/inc/ids.hrc:127
 msgctxt "RID_UUI_ERRHDL"
 msgid "Please insert disk $(ARG1)."
 msgstr "Rhowch ddisg $(ARG1) i mewn."
 
-#: ids.hrc:127
+#: uui/inc/ids.hrc:129
 msgctxt "RID_UUI_ERRHDL"
 msgid "The object cannot be created in directory $(ARG1)."
 msgstr "Methu creu'r gwrthrych yng nghyfeiriadur $(ARG1)."
 
-#: ids.hrc:129
+#: uui/inc/ids.hrc:131
 msgctxt "RID_UUI_ERRHDL"
 msgid "%PRODUCTNAME cannot keep files from being overwritten when this transmission protocol is used. Do you want to continue anyway?"
 msgstr "Nid yw %PRODUCTNAME yn gallu atal ffeiliau rhag cael eu tros ysgrifennu pan fydd y protocol darlledu hwn yn cael ei ddefnyddio. Hoffech chi barhau beth bynnag?"
 
-#: ids.hrc:131
+#: uui/inc/ids.hrc:133
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "The file '$(ARG1)' is corrupt and therefore cannot be opened. %PRODUCTNAME can try to repair the file.\n"
@@ -303,12 +322,12 @@ msgstr ""
 "\n"
 "A ddylai %PRODUCTNAME drwsio'r ffeil?\n"
 
-#: ids.hrc:133
+#: uui/inc/ids.hrc:135
 msgctxt "RID_UUI_ERRHDL"
 msgid "The file '$(ARG1)' could not be repaired and therefore cannot be opened."
 msgstr "Methu trwsio ffeil '$(ARG1)' ac felly methu ei hagor."
 
-#: ids.hrc:135
+#: uui/inc/ids.hrc:137
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "Configuration data in '$(ARG1)' is corrupted. Without this data some functions may not operate correctly.\n"
@@ -317,7 +336,7 @@ msgstr ""
 "Mae data ffurfweddiad yn '$(ARG1)' wedi ei lygru. Heb y data hwn ni fydd rhai swyddogaethau'n gweithio.\n"
 "Ydych chi am barhau i gychwyn %PRODUCTNAME heb y data ffurfweddiad llygredig?"
 
-#: ids.hrc:137
+#: uui/inc/ids.hrc:139
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "The personal configuration file '$(ARG1)' is corrupted and must be deleted to continue. Some of your personal settings may be lost.\n"
@@ -326,12 +345,12 @@ msgstr ""
 "Mae'r ffeil ffurfweddu personol '$(ARG1)' wedi ei lygru ac mae'n rhaid ei ddileu i barhau. Efallai bydd rhai o'ch gosodiadau personol yn cael eu colli.\n"
 "Hoffech chi barhau i gychwyn %PRODUCTNAME heb y data ffurfweddu llygredig?"
 
-#: ids.hrc:139
+#: uui/inc/ids.hrc:141
 msgctxt "RID_UUI_ERRHDL"
 msgid "The configuration data source '$(ARG1)' is unavailable. Without this data some functions may not operate correctly."
 msgstr "Nid yw'r ffynhonnell data ffurfweddu '$(ARG1)' ar gael. Heb y data yma efallai na fydd rhai swyddogaethau'n gweithio'n iawn."
 
-#: ids.hrc:141
+#: uui/inc/ids.hrc:143
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "The configuration data source '$(ARG1)' is unavailable. Without this data some functions may not operate correctly.\n"
@@ -340,27 +359,27 @@ msgstr ""
 "Nid yw'r ffynhonnell data ffurfweddu '$(ARG1)' ar gael. Heb y data yma efallai na fydd rhai swyddogaethau'n gweithio'n iawn.\n"
 "Hoffech chi barhau i gychwyn %PRODUCTNAME heb y data ffurfweddu coll?"
 
-#: ids.hrc:143
+#: uui/inc/ids.hrc:145
 msgctxt "RID_UUI_ERRHDL"
 msgid "The form contains invalid data. Do you still want to continue?"
 msgstr "Mae'r ffurflen yn cynnwys data annilys. Ydych chi am barhau?"
 
-#: ids.hrc:145
+#: uui/inc/ids.hrc:147
 msgctxt "RID_UUI_ERRHDL"
 msgid "The file $(ARG1) is locked by another user. Currently, another write access to this file cannot be granted."
 msgstr "Mae'r ffeil $(ARG1) wedi ei chloi gan ddefnyddiwr arall. Ar hyn o bryd nid oes modd darparu mynediad ysgrifennu i'r ffeil."
 
-#: ids.hrc:147
+#: uui/inc/ids.hrc:149
 msgctxt "RID_UUI_ERRHDL"
 msgid "The file $(ARG1) is locked by yourself. Currently, another write access to this file cannot be granted."
 msgstr "Mae'r ffeil $(ARG1) wedi ei chloi gennych chi. Ar hyn o bryd nid oes modd darparu mynediad ysgrifennu i'r ffeil."
 
-#: ids.hrc:149
+#: uui/inc/ids.hrc:151
 msgctxt "RID_UUI_ERRHDL"
 msgid "The file $(ARG1) is currently not locked by yourself."
 msgstr "Nid yw'r ffeil $(ARG1) wedi ei chloi gennych chi."
 
-#: ids.hrc:151
+#: uui/inc/ids.hrc:153
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "The previously obtained lock for file $(ARG1) has expired.\n"
@@ -369,7 +388,7 @@ msgstr ""
 "Mae'r clo a gafwyd ar gyfer ffeil $(ARG1) wedi dod i ben.\n"
 "Gall hyn ddigwydd oherwydd anawsterau ar y gweinydd sy'n rheoli clo'r ffeil. Nid oes gwarant fod gweithredoedd ysgrifennu ar y ffeil yn trosysgrifo'r newidiadau wnaed gan ddefnyddwyr eraill!"
 
-#: ids.hrc:153
+#: uui/inc/ids.hrc:155
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "Component cannot be loaded, possibly broken or incomplete installation.\n"
@@ -382,7 +401,7 @@ msgstr ""
 "\n"
 " $(ARG1)."
 
-#: ids.hrc:158
+#: uui/inc/ids.hrc:160
 msgctxt "STR_UUI_UNKNOWNAUTH_UNTRUSTED"
 msgid ""
 "Unable to verify the identity of $(ARG1) site.\n"
@@ -393,7 +412,7 @@ msgstr ""
 "\n"
 "Cyn derbyn y dystysgrif, dylech archwilio tystysgrif y wefan yn ofalus. A ydych yn barod i dderbyn y dystysgrif ar gyfer adnabod gwefan $(ARG1)?"
 
-#: ids.hrc:159
+#: uui/inc/ids.hrc:161
 msgctxt "STR_UUI_SSLWARN_EXPIRED"
 msgid ""
 "$(ARG1) is a site that uses a security certificate to encrypt data during transmission, but its certificate expired on $(ARG2).\n"
@@ -404,12 +423,12 @@ msgstr ""
 "\n"
 "Gwiriwch fod amser eich cyfrifiadur yn gywir."
 
-#: ids.hrc:160
+#: uui/inc/ids.hrc:162
 msgctxt "STR_UUI_SSLWARN_EXPIRED_TITLE"
 msgid "Security Warning: Server Certificate Invalid"
 msgstr "Rhybudd Diogelwch: Tystysgrif Gweinydd Annilys"
 
-#: ids.hrc:161
+#: uui/inc/ids.hrc:163
 msgctxt "STR_UUI_SSLWARN_DOMAINMISMATCH"
 msgid ""
 "You have attempted to establish a connection with $(ARG1). However, the security certificate presented belongs to $(ARG2). It is possible, though unlikely, that someone may be trying to intercept your communication with this web site.\n"
@@ -424,12 +443,12 @@ msgstr ""
 "\n"
 "Hoffech chi barhau?"
 
-#: ids.hrc:162
+#: uui/inc/ids.hrc:164
 msgctxt "STR_UUI_SSLWARN_DOMAINMISMATCH_TITLE"
 msgid "Security Warning: Server Certificate Expired"
 msgstr "Rhybudd Diogelwch: Tystysgrif Gweinydd wedi dod i Ben"
 
-#: ids.hrc:163
+#: uui/inc/ids.hrc:165
 msgctxt "STR_UUI_SSLWARN_INVALID"
 msgid ""
 "The certificate could not be validated. You should examine this site's certificate carefully.\n"
@@ -440,133 +459,129 @@ msgstr ""
 "\n"
 "Os ydych yn amau'r dystysgrif, diddymwch y cysylltiad a hysbysu gweinyddwr y wefan."
 
-#: ids.hrc:164
+#: uui/inc/ids.hrc:166
 msgctxt "STR_UUI_SSLWARN_INVALID_TITLE"
 msgid "Security Warning: Domain Name Mismatch"
 msgstr "Rhybudd Diogelwch: Anghydweddiad Enw Parth"
 
-#: strings.hrc:25
+#: uui/inc/strings.hrc:25
 msgctxt "STR_ENTER_PASSWORD_TO_OPEN"
 msgid "Enter password to open file: \n"
 msgstr "Rhowch y cyfrinair i agor ffeil: \n"
 
-#: strings.hrc:26
+#: uui/inc/strings.hrc:26
 msgctxt "STR_ENTER_PASSWORD_TO_MODIFY"
 msgid "Enter password to modify file: \n"
 msgstr "Rhowch y cyfrinair i newid ffeil: \n"
 
-#: strings.hrc:27
+#: uui/inc/strings.hrc:27
 msgctxt "STR_ENTER_SIMPLE_PASSWORD"
 msgid "Enter password: "
 msgstr "Rhowch gyfrinair: "
 
-#: strings.hrc:28
+#: uui/inc/strings.hrc:28
 msgctxt "STR_CONFIRM_SIMPLE_PASSWORD"
 msgid "Confirm password: "
 msgstr "Cadarnhau'r cyfrinair: "
 
-#: strings.hrc:29
+#: uui/inc/strings.hrc:29
 msgctxt "STR_TITLE_CREATE_PASSWORD"
 msgid "Set Password"
 msgstr "Gosod Cyfrinair"
 
-#: strings.hrc:30
+#: uui/inc/strings.hrc:30
 msgctxt "STR_TITLE_ENTER_PASSWORD"
 msgid "Enter Password"
 msgstr "Rhowch Gyfrinair"
 
-#: strings.hrc:31
+#: uui/inc/strings.hrc:31
 msgctxt "STR_PASSWORD_MISMATCH"
 msgid "The confirmation password did not match the password. Set the password again by entering the same password in both boxes."
 msgstr "Nid yw'r cyfrinair cadarnhad yn cydweddu a'r cyfrinair. Rhowch y cyfrinair eto drwy rhoi'r un cyfrinair yn y ddau flwch."
 
-#: strings.hrc:33
+#: uui/inc/strings.hrc:33
 msgctxt "STR_ALREADYOPEN_TITLE"
 msgid "Document in Use"
 msgstr "Dogfen ar Waith"
 
-#: strings.hrc:34
+#: uui/inc/strings.hrc:34
 msgctxt "STR_ALREADYOPEN_MSG"
 msgid ""
 "Document file '$(ARG1)' is locked for editing by yourself on a different system since $(ARG2)\n"
 "\n"
-"Open document read-only, or ignore own file locking and open the document for editing.\n"
-"\n"
+"Open document read-only, or ignore own file locking and open the document for editing."
 msgstr ""
 "Mae ffeil dogfen '$(ARG1)' wedi ei chloi ar gyfer golygu gennych chi ar system wahanol ers $(ARG2)\n"
 "\n"
-"Agorwch y ddogfen ym modd darllen yn unig neu anwybyddu'r clo ffeil ac agor copi o'r ddogfen ar gyfer ei golygu.\n"
-"\n"
+"Agorwch y ddogfen ym modd darllen yn unig neu anwybyddu'r clo ffeil ac agor copi o'r ddogfen ar gyfer ei golygu."
 
-#: strings.hrc:35
+#: uui/inc/strings.hrc:35
 msgctxt "STR_ALREADYOPEN_READONLY_BTN"
 msgid "Open ~Read-Only"
 msgstr "Agor ~Dogfen darllen yn unig"
 
-#: strings.hrc:36
+#: uui/inc/strings.hrc:36
 msgctxt "STR_ALREADYOPEN_OPEN_BTN"
 msgid "~Open"
 msgstr "~Agor"
 
-#: strings.hrc:37
+#: uui/inc/strings.hrc:37
 msgctxt "STR_ALREADYOPEN_SAVE_MSG"
 msgid ""
 "Document file '$(ARG1)' is locked for editing by yourself on a different system since $(ARG2)\n"
 "\n"
-"Close document on other system and retry saving or ignore own file locking and save current document.\n"
-"\n"
+"Close document on other system and retry saving or ignore own file locking and save current document."
 msgstr ""
-"Mae ffeil dogfen '$(ARG1)' wedi ei chloi gennych ar system wanhaol ers $(ARG2)\n"
-"\n"
-"Caewch y ddogfen ar y system arall a cheisiwch ei ail chadw neu anwybyddu cloi'r ffeil a chadw'r ffeil bresennol.\n"
+"Mae ffeil dogfen '$(ARG1)' wedi ei chloi ar gyfer golygu gennych chi ar system wahanol ers $(ARG2)\n"
 "\n"
+"Agorwch y ddogfen ym modd darllen yn unig neu anwybyddu'r clo ffeil ac agor copi o'r ddogfen ar gyfer ei golygu."
 
-#: strings.hrc:38
+#: uui/inc/strings.hrc:38
 msgctxt "STR_ALREADYOPEN_RETRY_SAVE_BTN"
 msgid "~Retry Saving"
 msgstr "~Ceisio Cadw Eto"
 
-#: strings.hrc:39
+#: uui/inc/strings.hrc:39
 msgctxt "STR_ALREADYOPEN_SAVE_BTN"
 msgid "~Save"
 msgstr "~Cadw"
 
-#: strings.hrc:41
+#: uui/inc/strings.hrc:41
 msgctxt "RID_KEEP_PASSWORD"
 msgid "~Remember password until end of session"
 msgstr "~Cofio cyfrinair tan ddiwedd y sesiwn"
 
-#: strings.hrc:42
+#: uui/inc/strings.hrc:42
 msgctxt "RID_SAVE_PASSWORD"
 msgid "~Remember password"
 msgstr "~Cofio cyfrinair"
 
-#: strings.hrc:43
+#: uui/inc/strings.hrc:43
 msgctxt "STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE"
 msgid "Non-Encrypted Streams"
 msgstr "Llif Heb eu Hamgryptio"
 
-#: strings.hrc:45
+#: uui/inc/strings.hrc:45
 msgctxt "STR_LOCKFAILED_TITLE"
 msgid "Document Could Not Be Locked"
 msgstr "Nid Oedd Modd Cloi'r Ddogfen"
 
-#: strings.hrc:46
+#: uui/inc/strings.hrc:46
 msgctxt "STR_LOCKFAILED_MSG"
 msgid "The lock file could not be created for exclusive access by %PRODUCTNAME, due to missing permission to create a lock file on that file location or lack of free disk space."
 msgstr "Nid oedd modd cloi'r ffeil ar gyfer mynediad anghynhwysol gan %PRODUCTNAME, oherwydd caniatâd coll i greu'r ffeil cloi yn lleoliad y ffeil."
 
-#: strings.hrc:47
+#: uui/inc/strings.hrc:47
 msgctxt "STR_LOCKFAILED_OPENREADONLY_BTN"
 msgid "Open ~Read-Only"
 msgstr "Agor ~Dogfen darllen yn unig"
 
-#: strings.hrc:49
+#: uui/inc/strings.hrc:49
 msgctxt "STR_OPENLOCKED_TITLE"
 msgid "Document in Use"
 msgstr "Cronfeydd Data ar waith"
 
-#: strings.hrc:50
+#: uui/inc/strings.hrc:50
 msgctxt "STR_OPENLOCKED_MSG"
 msgid ""
 "Document file '$(ARG1)' is locked for editing by:\n"
@@ -575,6 +590,7 @@ msgid ""
 "\n"
 "Open document read-only or open a copy of the document for editing.\n"
 "\n"
+"$(ARG3)"
 msgstr ""
 "Mae ffeil dogfen '$(ARG1)' wedi ei chloi ar gyfer golygu gan:\n"
 "\n"
@@ -582,78 +598,95 @@ msgstr ""
 "\n"
 "Agorwch y ddogfen fel darllen yn unig neu agor copi o'r ddogfen i'w golygu.\n"
 "\n"
+"$(ARG3)"
+
+#: uui/inc/strings.hrc:51
+msgctxt "STR_OPENLOCKED_ALLOWIGNORE_MSG"
+msgid "You may also ignore the file locking and open the document for editing."
+msgstr "Gallwch hefyd anwybyddu'r cloi ffeiliau ac agor dogfen ar gyfer ei golygu."
 
-#: strings.hrc:51
+#: uui/inc/strings.hrc:52
 msgctxt "STR_OPENLOCKED_OPENREADONLY_BTN"
 msgid "Open ~Read-Only"
 msgstr "Agor ~Dogfen darllen yn unig"
 
-#: strings.hrc:52
+#: uui/inc/strings.hrc:53
 msgctxt "STR_OPENLOCKED_OPENCOPY_BTN"
 msgid "Open ~Copy"
 msgstr "Agor ~Copi"
 
-#: strings.hrc:53
+#: uui/inc/strings.hrc:54
 msgctxt "STR_UNKNOWNUSER"
 msgid "Unknown User"
 msgstr "Defnyddiwr Anhysbys"
 
-#: strings.hrc:55
+#: uui/inc/strings.hrc:56
 msgctxt "STR_FILECHANGED_TITLE"
 msgid "Document Has Been Changed by Others"
 msgstr "Dogfen wedi ei Newid gan Eraill"
 
-#: strings.hrc:56
+#: uui/inc/strings.hrc:57
 msgctxt "STR_FILECHANGED_MSG"
 msgid ""
 "The file has been changed since it was opened for editing in %PRODUCTNAME. Saving your version of the document will overwrite changes made by others.\n"
 "\n"
-"Do you want to save anyway?\n"
-"\n"
+"Do you want to save anyway?"
 msgstr ""
 "Mae'r ffeil wedi newid ers iddi gael ei hagor ar gyfer ei golygu gan %PRODUCTNAME. Bydd cadw eich fersiwn yn trosysgrifo'r newidiadau wnaed gan eraill.\n"
 "\n"
-"Hoffech chi ei gadw beth bynnag?\n"
-"\n"
+"Hoffech chi ei chadw beth bynnag?"
 
-#: strings.hrc:57
+#: uui/inc/strings.hrc:58
 msgctxt "STR_FILECHANGED_SAVEANYWAY_BTN"
 msgid "~Save Anyway"
 msgstr "~Cadw Beth Bynnag"
 
-#: strings.hrc:59
+#: uui/inc/strings.hrc:60
 msgctxt "STR_TRYLATER_TITLE"
 msgid "Document in Use"
 msgstr "Cronfeydd Data ar waith"
 
-#: strings.hrc:60
+#: uui/inc/strings.hrc:61
 msgctxt "STR_TRYLATER_MSG"
 msgid ""
 "Document file '$(ARG1)' is locked for editing by:\n"
 "\n"
 "$(ARG2)\n"
 "\n"
-"Try again later to save document or save a copy of that document.\n"
-"\n"
+"Try again later to save document or save a copy of that document."
 msgstr ""
 "Mae ffeil dogfen '$(ARG1)' wedi ei chloi ar gyfer golygu gan:\n"
 "\n"
 "$(ARG2)\n"
 "\n"
-"Ceisiwch eto i gadw'r ddogfen neu gadw copi o'r ddogfen.\n"
+"Ceisiwch eto i gadw'r ddogfen neu gadw copi o'r ddogfen."
+
+#: uui/inc/strings.hrc:62
+msgctxt "STR_OVERWRITE_IGNORELOCK_MSG"
+msgid ""
+"Document file '$(ARG1)' is locked for editing by:\n"
+"\n"
+"$(ARG2)\n"
+"\n"
+"You may try to ignore the file locking and overwrite the existing document."
+msgstr ""
+"Mae ffeil dogfen '$(ARG1)' wedi ei chloi ar gyfer golygu gan:\n"
+"\n"
+"$(ARG2)\n"
 "\n"
+"Gallwch geisio anwybyddu'r cloi ffeil a thros ysgrifennu'r ddogfen gyfredol."
 
-#: strings.hrc:61
+#: uui/inc/strings.hrc:63
 msgctxt "STR_TRYLATER_RETRYSAVING_BTN"
 msgid "~Retry Saving"
 msgstr "~Ceisio Cadw Eto"
 
-#: strings.hrc:62
+#: uui/inc/strings.hrc:64
 msgctxt "STR_TRYLATER_SAVEAS_BTN"
 msgid "~Save As..."
 msgstr "Cadw ~Fel..."
 
-#: strings.hrc:64
+#: uui/inc/strings.hrc:66
 msgctxt "STR_RENAME_OR_REPLACE"
 msgid ""
 "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\n"
@@ -662,7 +695,7 @@ msgstr ""
 "Mae ffeil gyda'r enw \"%NAME\" yn bodoli eisoes yn y lleoliad \"%FOLDER\".\n"
 "Dewiswch Newid i drosysgrifo'r ffeil bresennol neu ddarparwch enw newydd."
 
-#: strings.hrc:65
+#: uui/inc/strings.hrc:67
 msgctxt "STR_NAME_CLASH_RENAME_ONLY"
 msgid ""
 "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\n"
@@ -671,107 +704,97 @@ msgstr ""
 "Mae ffeil gyda'r enw \"%NAME\" yn bodoli eisoes yn y lleoliad \"%FOLDER\".\n"
 "Darparwch enw newydd."
 
-#: strings.hrc:66
+#: uui/inc/strings.hrc:68
 msgctxt "STR_SAME_NAME_USED"
 msgid "Please provide a different file name!"
 msgstr "Darparwch enw ffeil gwahanol!"
 
-#: strings.hrc:68
+#: uui/inc/strings.hrc:70
 msgctxt "STR_ERROR_PASSWORD_TO_OPEN_WRONG"
 msgid "The password is incorrect. The file cannot be opened."
 msgstr "Mae'r cyfrinair yn anghywir. Nid oes modd agor y ffeil."
 
-#: strings.hrc:69
+#: uui/inc/strings.hrc:71
 msgctxt "STR_ERROR_PASSWORD_TO_MODIFY_WRONG"
 msgid "The password is incorrect. The file cannot be modified."
 msgstr "Mae'r cyfrinair yn anghywir. Nid oes modd newid y ffeil."
 
-#: strings.hrc:70
+#: uui/inc/strings.hrc:72
 msgctxt "STR_ERROR_MASTERPASSWORD_WRONG"
 msgid "The master password is incorrect."
 msgstr "Mae'r prif gyfrinair yn anghywir."
 
-#: strings.hrc:71
+#: uui/inc/strings.hrc:73
 msgctxt "STR_ERROR_SIMPLE_PASSWORD_WRONG"
 msgid "The password is incorrect."
 msgstr "Mae'r cyfrinair yn anghywir."
 
-#: strings.hrc:72
+#: uui/inc/strings.hrc:74
 msgctxt "STR_ERROR_PASSWORDS_NOT_IDENTICAL"
 msgid "The password confirmation does not match."
 msgstr "Nid oedd y cadarnhad cyfrinair yn cydweddu."
 
-#: strings.hrc:74
+#: uui/inc/strings.hrc:76
 msgctxt "STR_LOCKCORRUPT_TITLE"
 msgid "Lock file is corrupted"
 msgstr "Mae'r ffeil cloi wedi ei llygru"
 
-#: strings.hrc:75
+#: uui/inc/strings.hrc:77
 msgctxt "STR_LOCKCORRUPT_MSG"
 msgid "The lock file is corrupted and probably empty. Opening the document read-only and closing it again removes the corrupted lock file."
 msgstr "Mae'r ffeil cloi wedi ei llygru ac yn debygol o fod y wag. Bydd angor a chau'r ddogfen darllen yn unig yn tynnu'r ffeil llwgr."
 
-#: strings.hrc:76
+#: uui/inc/strings.hrc:78
 msgctxt "STR_LOCKCORRUPT_OPENREADONLY_BTN"
 msgid "Open ~Read-Only"
 msgstr "Agor ~Dogfen darllen yn unig"
 
-#: authfallback.ui:8
+#: uui/uiconfig/ui/authfallback.ui:8
 msgctxt "authfallback|AuthFallbackDlg"
 msgid "Authentication Code"
 msgstr "Cod Dilysu"
 
-#: authfallback.ui:130
+#: uui/uiconfig/ui/authfallback.ui:128
 msgctxt "authfallback|label1"
 msgid "Enter the 6 digit PIN:"
 msgstr "Rhowch PIN 6 nod:"
 
-#: filterselect.ui:7
+#: uui/uiconfig/ui/filterselect.ui:7
 msgctxt "filterselect|FilterSelectDialog"
 msgid "Filter Selection"
 msgstr "Dewis Hidl"
 
-#: logindialog.ui:8
+#: uui/uiconfig/ui/logindialog.ui:8
 msgctxt "logindialog|LoginDialog"
 msgid "Authentication Required"
 msgstr "Mae Angen Dilysiad"
 
-#: logindialog.ui:80
+#: uui/uiconfig/ui/logindialog.ui:83
 msgctxt "logindialog|syscreds"
 msgid "_Use system credentials"
 msgstr "_Defnyddio manylion y system"
 
-#: logindialog.ui:96
+#: uui/uiconfig/ui/logindialog.ui:99
 msgctxt "logindialog|remember"
 msgid "_Remember password"
 msgstr "C_ofio'r cyfrinair"
 
-#: logindialog.ui:127
+#: uui/uiconfig/ui/logindialog.ui:129
 msgctxt "logindialog|accountft"
 msgid "A_ccount:"
 msgstr "C_yfrif:"
 
-#: logindialog.ui:141
+#: uui/uiconfig/ui/logindialog.ui:143
 msgctxt "logindialog|passwordft"
 msgid "Pass_word:"
 msgstr "Cy_frinair:"
 
-#: logindialog.ui:180
+#: uui/uiconfig/ui/logindialog.ui:182
 msgctxt "logindialog|nameft"
 msgid "_User name:"
 msgstr "_Enw defnyddiwr:"
 
-#: logindialog.ui:194
-msgctxt "logindialog|pathft"
-msgid "_Path:"
-msgstr "_Llwybr:"
-
-#: logindialog.ui:222
-msgctxt "logindialog|pathbtn"
-msgid "_Browse…"
-msgstr "_Pori…"
-
-#: logindialog.ui:244
+#: uui/uiconfig/ui/logindialog.ui:196
 msgctxt "logindialog|loginrealm"
 msgid ""
 "Enter user name and password for:\n"
@@ -780,7 +803,7 @@ msgstr ""
 "Rhoi cyfrinair newydd i ddefnyddiwr:\n"
 "“%2” ar %1"
 
-#: logindialog.ui:258
+#: uui/uiconfig/ui/logindialog.ui:210
 msgctxt "logindialog|wrongloginrealm"
 msgid ""
 "Wrong user name and password for:\n"
@@ -789,7 +812,7 @@ msgstr ""
 "Enw defnyddiwr a chyfrinair ar gyfer defnyddiwr:\n"
 "“%2” ar %1"
 
-#: logindialog.ui:272
+#: uui/uiconfig/ui/logindialog.ui:224
 msgctxt "logindialog|wrongrequestinfo"
 msgid ""
 "Wrong user name and password for:\n"
@@ -798,7 +821,7 @@ msgstr ""
 "Enw defnyddiwr a chyfrinair anghywir ar gyfer:\n"
 "%1"
 
-#: logindialog.ui:286
+#: uui/uiconfig/ui/logindialog.ui:238
 msgctxt "logindialog|requestinfo"
 msgid ""
 "Enter user name and password for:\n"
@@ -807,142 +830,143 @@ msgstr ""
 "Rhowch eich enw defnyddiwr a chyfrinair\n"
 "%1"
 
-#: logindialog.ui:300
+#: uui/uiconfig/ui/logindialog.ui:252
 msgctxt "logindialog|errorft"
 msgid "Message from server:"
 msgstr "Neges gan y gweinydd:"
 
-#: macrowarnmedium.ui:9
+#: uui/uiconfig/ui/macrowarnmedium.ui:8
 msgctxt "macrowarnmedium|MacroWarnMedium"
 msgid "%PRODUCTNAME - Security Warning"
 msgstr "%PRODUCTNAME - Rhybudd Diogelwch"
 
-#: macrowarnmedium.ui:25
-msgctxt "macrowarnmedium|ok"
-msgid "_Enable Macros"
-msgstr "_Galluogi Macros"
+#: uui/uiconfig/ui/macrowarnmedium.ui:14
+msgctxt "macrowarnmedium|descr2Label"
+msgid ""
+"The document contains document macros.\n"
+"\n"
+"Macros may contain viruses. Disabling macros for a document is always safe. If you disable macros you may lose functionality provided by the document macros."
+msgstr ""
+"Mae'r ddogfen yn cynnwys macros dogfennau\n"
+"\n"
+"Gall facros gynnwys firysau. Mae diffodd macros ar gyfer dogfen yn beth ddiogel. Os fyddwch yn diffodd macro gallwch golli swyddogaethau sy'n cael eu darparu ganddynt."
 
-#: macrowarnmedium.ui:39
+#: uui/uiconfig/ui/macrowarnmedium.ui:28
 msgctxt "macrowarnmedium|cancel"
 msgid "_Disable Macros"
 msgstr "_Anablu Macros"
 
-#: macrowarnmedium.ui:127
+#: uui/uiconfig/ui/macrowarnmedium.ui:44
+msgctxt "macrowarnmedium|ok"
+msgid "_Enable Macros"
+msgstr "_Galluogi Macros"
+
+#: uui/uiconfig/ui/macrowarnmedium.ui:89
 msgctxt "macrowarnmedium|descr1Label"
 msgid "The document contains document macros signed by:"
 msgstr "Mae'r ddogfen yn cynnwys macros dogfennau llofnodwyd gan:"
 
-#: macrowarnmedium.ui:141
-msgctxt "macrowarnmedium|descr1aLabel"
-msgid "The document contains document macros."
-msgstr "Mae'r ddogfen yn cynnwys macros dogfennau."
+#: uui/uiconfig/ui/macrowarnmedium.ui:98
+msgctxt "macrowarnmedium|alwaysTrustCheckbutton"
+msgid "_Always trust macros from this source"
+msgstr "_Ymddiried mewn macro o fan hyn bob tro"
 
-#: macrowarnmedium.ui:168
+#: uui/uiconfig/ui/macrowarnmedium.ui:129
 msgctxt "macrowarnmedium|viewSignsButton"
 msgid "_View Signatures…"
 msgstr "_Gweld Llofnodion…"
 
-#: macrowarnmedium.ui:196
-msgctxt "macrowarnmedium|descr2Label"
-msgid "Macros may contain viruses. Disabling macros for a document is always safe. If you disable macros you may lose functionality provided by the document macros."
-msgstr "Gall facros gynnwys firysau. Mae analluogi macros ar gyfer dogfen yn fwy diogel. Os fyddwch yn analluogi macro gallwch golli swyddogaethau sy'n cael eu darparu ganddynt."
-
-#: macrowarnmedium.ui:208
-msgctxt "macrowarnmedium|alwaysTrustCheckbutton"
-msgid "_Always trust macros from this source"
-msgstr "_Ymddiried mewn macro o fan hyn bob tro"
-
-#: masterpassworddlg.ui:8
+#: uui/uiconfig/ui/masterpassworddlg.ui:8
 msgctxt "masterpassworddlg|MasterPasswordDialog"
 msgid "Enter Master Password"
 msgstr "Rhowch Brif Gyfrinair"
 
-#: masterpassworddlg.ui:86
+#: uui/uiconfig/ui/masterpassworddlg.ui:86
 msgctxt "masterpassworddlg|label1"
 msgid "_Enter password:"
 msgstr "_Rhowch gyfrinair:"
 
-#: password.ui:8
+#: uui/uiconfig/ui/password.ui:8
 msgctxt "password|PasswordDialog"
 msgid "Set Password"
 msgstr "Gosod Cyfrinair"
 
-#: setmasterpassworddlg.ui:8
+#: uui/uiconfig/ui/setmasterpassworddlg.ui:8
 msgctxt "setmasterpassworddlg|SetMasterPasswordDialog"
 msgid "Set Master Password"
 msgstr "Gosod Prif Gyfrinair"
 
-#: setmasterpassworddlg.ui:84
+#: uui/uiconfig/ui/setmasterpassworddlg.ui:84
 msgctxt "setmasterpassworddlg|label1"
 msgid "Passwords for web connections are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list."
 msgstr "Mae cyfrineiriau ar gyfer cysylltiadau gwe yn cael eu diogelu gan brif gyfrinair. Bydd gofyn i chi ei roi unwaith ymhob sesiwn, os bydd %PRODUCTNAME yn adalw cyfrinair o'r rhestr cyfrinair diogelwyd."
 
-#: setmasterpassworddlg.ui:100
+#: uui/uiconfig/ui/setmasterpassworddlg.ui:100
 msgctxt "setmasterpassworddlg|label2"
 msgid "_Enter password:"
 msgstr "_Rhowch gyfrinair:"
 
-#: setmasterpassworddlg.ui:128
+#: uui/uiconfig/ui/setmasterpassworddlg.ui:127
 msgctxt "setmasterpassworddlg|label3"
 msgid "_Reenter password:"
 msgstr "_Ail rhoi cyfrinair:"
 
-#: setmasterpassworddlg.ui:157
+#: uui/uiconfig/ui/setmasterpassworddlg.ui:155
 msgctxt "setmasterpassworddlg|label4"
 msgid "Caution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case sensitive."
 msgstr "Rhybudd: Os fyddwch yn anghofio'r prif gyfrinair, ni fydd modd i chi gael mynediad at y manylion sy'n cael ei ddiogelu ganddo. Mae cyfrineiriau’n ymwybodol o faint nodau."
 
-#: simplenameclash.ui:8
+#: uui/uiconfig/ui/simplenameclash.ui:8
 msgctxt "simplenameclash|SimpleNameClashDialog"
 msgid "File Exists"
 msgstr "Ffeil yn Bodoli"
 
-#: simplenameclash.ui:37
+#: uui/uiconfig/ui/simplenameclash.ui:37
 msgctxt "simplenameclash|replace"
 msgid "Replace"
 msgstr "Newid"
 
-#: simplenameclash.ui:51
+#: uui/uiconfig/ui/simplenameclash.ui:51
 msgctxt "simplenameclash|rename"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: sslwarndialog.ui:8
+#: uui/uiconfig/ui/sslwarndialog.ui:8
 msgctxt "sslwarndialog|SSLWarnDialog"
 msgid "Security Warning: "
 msgstr "Rhybudd Diogelwch: "
 
-#: sslwarndialog.ui:24
+#: uui/uiconfig/ui/sslwarndialog.ui:25
 msgctxt "sslwarndialog|ok"
 msgid "Continue"
 msgstr "Parhau"
 
-#: sslwarndialog.ui:38
+#: uui/uiconfig/ui/sslwarndialog.ui:39
 msgctxt "sslwarndialog|cancel"
 msgid "Cancel Connection"
 msgstr "Diddymu'r Cysylltiad"
 
-#: sslwarndialog.ui:52
+#: uui/uiconfig/ui/sslwarndialog.ui:53
 msgctxt "sslwarndialog|view"
 msgid "View Certificate"
 msgstr "Darllen y Dystysgrif"
 
-#: unknownauthdialog.ui:8
+#: uui/uiconfig/ui/unknownauthdialog.ui:8
 msgctxt "unknownauthdialog|UnknownAuthDialog"
 msgid "Website Certified by an Unknown Authority"
 msgstr "Gwefan wedi ei Dilysu gan Awdurdod Anhysbys"
 
-#: unknownauthdialog.ui:80
+#: uui/uiconfig/ui/unknownauthdialog.ui:81
 msgctxt "unknownauthdialog|accept"
 msgid "Accept this certificate temporarily for this session"
 msgstr "Derbyn y dystysgrif dros dro ar gyfer y sesiwn hon"
 
-#: unknownauthdialog.ui:97
+#: uui/uiconfig/ui/unknownauthdialog.ui:97
 msgctxt "unknownauthdialog|reject"
 msgid "Do not accept this certificate and do not connect to this Web site"
 msgstr "Peidio derbyn y dystysgrif hon a pheidio cysylltu â'r wefan hon"
 
-#: unknownauthdialog.ui:112
+#: uui/uiconfig/ui/unknownauthdialog.ui:113
 msgctxt "unknownauthdialog|examine"
 msgid "Examine Certificate…"
 msgstr "Archwilio'r Dystysgrif…"
diff --git a/source/cy/vcl/messages.po b/source/cy/vcl/messages.po
index 9d673ec977f..e7b5bd38047 100644
--- a/source/cy/vcl/messages.po
+++ b/source/cy/vcl/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: 2017-11-24 14:55+0100\n"
-"PO-Revision-Date: 2017-12-29 15:03+0000\n"
+"POT-Creation-Date: 2018-04-17 15:54+0200\n"
+"PO-Revision-Date: 2018-03-01 11:34+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,481 +13,481 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1514559833.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1519904048.000000\n"
 
 #. To translators: This is the first entry of a sequence of paper size names
-#: print.hrc:28
+#: vcl/inc/print.hrc:28
 msgctxt "RID_STR_PAPERNAMES"
 msgid "A0"
 msgstr "A0"
 
-#: print.hrc:29
+#: vcl/inc/print.hrc:29
 msgctxt "RID_STR_PAPERNAMES"
 msgid "A1"
 msgstr "A1"
 
-#: print.hrc:30
+#: vcl/inc/print.hrc:30
 msgctxt "RID_STR_PAPERNAMES"
 msgid "A2"
 msgstr "A2"
 
-#: print.hrc:31
+#: vcl/inc/print.hrc:31
 msgctxt "RID_STR_PAPERNAMES"
 msgid "A3"
 msgstr "A3"
 
-#: print.hrc:32
+#: vcl/inc/print.hrc:32
 msgctxt "RID_STR_PAPERNAMES"
 msgid "A4"
 msgstr "A4"
 
-#: print.hrc:33
+#: vcl/inc/print.hrc:33
 msgctxt "RID_STR_PAPERNAMES"
 msgid "A5"
 msgstr "A5"
 
-#: print.hrc:34
+#: vcl/inc/print.hrc:34
 msgctxt "RID_STR_PAPERNAMES"
 msgid "B4 (ISO)"
 msgstr "B4 (ISO)"
 
-#: print.hrc:35
+#: vcl/inc/print.hrc:35
 msgctxt "RID_STR_PAPERNAMES"
 msgid "B5 (ISO)"
 msgstr "B5 (ISO)"
 
-#: print.hrc:36
+#: vcl/inc/print.hrc:36
 msgctxt "RID_STR_PAPERNAMES"
 msgid "Letter"
 msgstr "Llythyr"
 
-#: print.hrc:37
+#: vcl/inc/print.hrc:37
 msgctxt "RID_STR_PAPERNAMES"
 msgid "Legal"
 msgstr "Legal"
 
-#: print.hrc:38
+#: vcl/inc/print.hrc:38
 msgctxt "RID_STR_PAPERNAMES"
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: print.hrc:39
+#: vcl/inc/print.hrc:39
 msgctxt "RID_STR_PAPERNAMES"
 msgid "User Defined"
 msgstr "Defnyddiwr Diffiniedig"
 
-#: print.hrc:40
+#: vcl/inc/print.hrc:40
 msgctxt "RID_STR_PAPERNAMES"
 msgid "B6 (ISO)"
 msgstr "B6 (ISO)"
 
-#: print.hrc:41
+#: vcl/inc/print.hrc:41
 msgctxt "RID_STR_PAPERNAMES"
 msgid "C4 Envelope"
 msgstr "Amlen C4"
 
-#: print.hrc:42
+#: vcl/inc/print.hrc:42
 msgctxt "RID_STR_PAPERNAMES"
 msgid "C5 Envelope"
 msgstr "Amlen C5"
 
-#: print.hrc:43
+#: vcl/inc/print.hrc:43
 msgctxt "RID_STR_PAPERNAMES"
 msgid "C6 Envelope"
 msgstr "Amlen C6"
 
-#: print.hrc:44
+#: vcl/inc/print.hrc:44
 msgctxt "RID_STR_PAPERNAMES"
 msgid "C6/5 Envelope"
 msgstr "Amlen C6/5"
 
-#: print.hrc:45
+#: vcl/inc/print.hrc:45
 msgctxt "RID_STR_PAPERNAMES"
 msgid "DL Envelope"
 msgstr "Amlen DL"
 
-#: print.hrc:46
+#: vcl/inc/print.hrc:46
 msgctxt "RID_STR_PAPERNAMES"
 msgid "Dia Slide"
 msgstr "Dia Slide"
 
-#: print.hrc:47
+#: vcl/inc/print.hrc:47
 msgctxt "RID_STR_PAPERNAMES"
 msgid "C"
 msgstr "C"
 
-#: print.hrc:48
+#: vcl/inc/print.hrc:48
 msgctxt "RID_STR_PAPERNAMES"
 msgid "D"
 msgstr "D"
 
-#: print.hrc:49
+#: vcl/inc/print.hrc:49
 msgctxt "RID_STR_PAPERNAMES"
 msgid "E"
 msgstr "E"
 
-#: print.hrc:50
+#: vcl/inc/print.hrc:50
 msgctxt "RID_STR_PAPERNAMES"
 msgid "Executive"
 msgstr "Executive"
 
-#: print.hrc:51
+#: vcl/inc/print.hrc:51
 msgctxt "RID_STR_PAPERNAMES"
 msgid "Long Bond"
 msgstr "Long Bond"
 
-#: print.hrc:52
+#: vcl/inc/print.hrc:52
 msgctxt "RID_STR_PAPERNAMES"
 msgid "#8 (Monarch) Envelope"
 msgstr "Amlen #8 (Monarch)"
 
-#: print.hrc:53
+#: vcl/inc/print.hrc:53
 msgctxt "RID_STR_PAPERNAMES"
 msgid "#6 3/4 (Personal) Envelope"
 msgstr "Amlen #6 3/4 (Personal)"
 
-#: print.hrc:54
+#: vcl/inc/print.hrc:54
 msgctxt "RID_STR_PAPERNAMES"
 msgid "#9 Envelope"
 msgstr "Amlen #9"
 
-#: print.hrc:55
+#: vcl/inc/print.hrc:55
 msgctxt "RID_STR_PAPERNAMES"
 msgid "#10 Envelope"
 msgstr "Amlen #10"
 
-#: print.hrc:56
+#: vcl/inc/print.hrc:56
 msgctxt "RID_STR_PAPERNAMES"
 msgid "#11 Envelope"
 msgstr "Amlen #11"
 
-#: print.hrc:57
+#: vcl/inc/print.hrc:57
 msgctxt "RID_STR_PAPERNAMES"
 msgid "#12 Envelope"
 msgstr "Amlen #12"
 
-#: print.hrc:58
+#: vcl/inc/print.hrc:58
 msgctxt "RID_STR_PAPERNAMES"
 msgid "16 Kai"
 msgstr "16 Kai"
 
-#: print.hrc:59
+#: vcl/inc/print.hrc:59
 msgctxt "RID_STR_PAPERNAMES"
 msgid "32 Kai"
 msgstr "32 Kai"
 
-#: print.hrc:60
+#: vcl/inc/print.hrc:60
 msgctxt "RID_STR_PAPERNAMES"
 msgid "Big 32 Kai"
 msgstr "Big 32 Kai"
 
-#: print.hrc:61
+#: vcl/inc/print.hrc:61
 msgctxt "RID_STR_PAPERNAMES"
 msgid "B4 (JIS)"
 msgstr "B4 (JIS)"
 
-#: print.hrc:62
+#: vcl/inc/print.hrc:62
 msgctxt "RID_STR_PAPERNAMES"
 msgid "B5 (JIS)"
 msgstr "B5 (JIS)"
 
-#: print.hrc:63
+#: vcl/inc/print.hrc:63
 msgctxt "RID_STR_PAPERNAMES"
 msgid "B6 (JIS)"
 msgstr "B6 (JIS)"
 
 #. To translators: This is the last entry of the sequence of paper size names
-#: print.hrc:65
+#: vcl/inc/print.hrc:65
 msgctxt "RID_STR_PAPERNAMES"
 msgid "Japanese Postcard"
 msgstr "Cerdyn Post Japaneaidd"
 
-#: printaccessoryview.hrc:27
+#: vcl/inc/printaccessoryview.hrc:27
 msgctxt "SV_PRINT_NATIVE_STRINGS"
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: printaccessoryview.hrc:28
+#: vcl/inc/printaccessoryview.hrc:28
 msgctxt "SV_PRINT_NATIVE_STRINGS"
 msgid "Page number"
 msgstr "Rhif tudalen"
 
-#: printaccessoryview.hrc:29
+#: vcl/inc/printaccessoryview.hrc:29
 msgctxt "SV_PRINT_NATIVE_STRINGS"
 msgid "Number of pages"
 msgstr "Nifer o dudalennau"
 
-#: printaccessoryview.hrc:30
+#: vcl/inc/printaccessoryview.hrc:30
 msgctxt "SV_PRINT_NATIVE_STRINGS"
 msgid "More"
 msgstr "Rhagor"
 
-#: printaccessoryview.hrc:31
+#: vcl/inc/printaccessoryview.hrc:31
 msgctxt "SV_PRINT_NATIVE_STRINGS"
 msgid "Print selection only"
 msgstr "Argraffu'r dewis presennol yn unig"
 
-#: strings.hrc:25
+#: vcl/inc/strings.hrc:25
 msgctxt "SV_RESID_STRING_NOSELECTIONPOSSIBLE"
 msgid "<No selection possible>"
 msgstr "<Dim dewis posibl>"
 
-#: strings.hrc:27
+#: vcl/inc/strings.hrc:27
 msgctxt "SV_MENU_MAC_SERVICES"
 msgid "Services"
 msgstr "Gwasanaethau"
 
-#: strings.hrc:28
+#: vcl/inc/strings.hrc:28
 msgctxt "SV_MENU_MAC_HIDEAPP"
 msgid "Hide %PRODUCTNAME"
 msgstr "Cuddio %PRODUCTNAME"
 
-#: strings.hrc:29
+#: vcl/inc/strings.hrc:29
 msgctxt "SV_MENU_MAC_HIDEALL"
 msgid "Hide Others"
 msgstr "Cuddio Eraill"
 
-#: strings.hrc:30
+#: vcl/inc/strings.hrc:30
 msgctxt "SV_MENU_MAC_SHOWALL"
 msgid "Show All"
 msgstr "Dangos Popeth"
 
-#: strings.hrc:31
+#: vcl/inc/strings.hrc:31
 msgctxt "SV_MENU_MAC_QUITAPP"
 msgid "Quit %PRODUCTNAME"
 msgstr "Gadael %PRODUCTNAME"
 
-#: strings.hrc:33
+#: vcl/inc/strings.hrc:33
 msgctxt "SV_HELPTEXT_CLOSE"
 msgid "Close"
 msgstr "Cau"
 
-#: strings.hrc:34
+#: vcl/inc/strings.hrc:34
 msgctxt "SV_HELPTEXT_MINIMIZE"
 msgid "Minimize"
 msgstr "Lleihau"
 
-#: strings.hrc:35
+#: vcl/inc/strings.hrc:35
 msgctxt "SV_HELPTEXT_MAXIMIZE"
 msgid "Maximize"
 msgstr "Mwyhau"
 
-#: strings.hrc:36
+#: vcl/inc/strings.hrc:36
 msgctxt "SV_HELPTEXT_RESTORE"
 msgid "Restore"
 msgstr "Adfer"
 
-#: strings.hrc:37
+#: vcl/inc/strings.hrc:37
 msgctxt "SV_HELPTEXT_ROLLDOWN"
 msgid "Drop down"
 msgstr "Gostwng"
 
-#: strings.hrc:38
+#: vcl/inc/strings.hrc:38
 msgctxt "SV_HELPTEXT_ROLLUP"
 msgid "Roll up"
 msgstr "Rholio i fyny"
 
-#: strings.hrc:39
+#: vcl/inc/strings.hrc:39
 msgctxt "SV_HELPTEXT_HELP"
 msgid "Help"
 msgstr "Cymorth"
 
-#: strings.hrc:40
+#: vcl/inc/strings.hrc:40
 msgctxt "SV_HELPTEXT_SCREENSHOT"
 msgid "Take and annotate a screenshot"
 msgstr "Cymryd ac anodi llun sgrin"
 
-#: strings.hrc:41
+#: vcl/inc/strings.hrc:41
 msgctxt "SV_HELPTEXT_FADEIN"
 msgid "Show"
 msgstr "Dangos"
 
-#: strings.hrc:42
+#: vcl/inc/strings.hrc:42
 msgctxt "SV_HELPTEXT_FADEOUT"
 msgid "Hide"
 msgstr "Cuddio"
 
-#: strings.hrc:43
+#: vcl/inc/strings.hrc:43
 msgctxt "SV_HELPTEXT_CLOSEDOCUMENT"
 msgid "Close Document"
 msgstr "Cau Dogfen"
 
 #. To translators: This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string
-#: strings.hrc:46
+#: vcl/inc/strings.hrc:46
 msgctxt "SV_BUTTONTEXT_OK"
 msgid "~OK"
 msgstr "~Iawn"
 
 #. To translators: This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string
-#: strings.hrc:48
+#: vcl/inc/strings.hrc:48
 msgctxt "SV_BUTTONTEXT_CANCEL"
 msgid "~Cancel"
 msgstr "~Diddymu"
 
 #. To translators: This is used on buttons for Windows, there should be no ~ mnemonic in this string
-#: strings.hrc:50
+#: vcl/inc/strings.hrc:50
 msgctxt "SV_BUTTONTEXT_OK_NOMNEMONIC"
 msgid "OK"
 msgstr "Iawn"
 
 #. To translators: This is used on buttons for Windows, there should be no ~ mnemonic in this string
-#: strings.hrc:52
+#: vcl/inc/strings.hrc:52
 msgctxt "SV_BUTTONTEXT_CANCEL_NOMNEMONIC"
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: strings.hrc:53
+#: vcl/inc/strings.hrc:53
 msgctxt "SV_BUTTONTEXT_YES"
 msgid "~Yes"
 msgstr "~Iawn"
 
-#: strings.hrc:54
+#: vcl/inc/strings.hrc:54
 msgctxt "SV_BUTTONTEXT_NO"
 msgid "~No"
 msgstr "~Na"
 
-#: strings.hrc:55
+#: vcl/inc/strings.hrc:55
 msgctxt "SV_BUTTONTEXT_RETRY"
 msgid "~Retry"
 msgstr "~Ceisio Eto"
 
-#: strings.hrc:56
+#: vcl/inc/strings.hrc:56
 msgctxt "SV_BUTTONTEXT_HELP"
 msgid "~Help"
 msgstr "~Cymorth"
 
-#: strings.hrc:57
+#: vcl/inc/strings.hrc:57
 msgctxt "SV_BUTTONTEXT_CLOSE"
 msgid "~Close"
 msgstr "~Cau"
 
-#: strings.hrc:58
+#: vcl/inc/strings.hrc:58
 msgctxt "SV_BUTTONTEXT_MORE"
 msgid "~More"
 msgstr "M~wy"
 
-#: strings.hrc:59
+#: vcl/inc/strings.hrc:59
 msgctxt "SV_BUTTONTEXT_IGNORE"
 msgid "~Ignore"
 msgstr "A~nwybyddu"
 
-#: strings.hrc:60
+#: vcl/inc/strings.hrc:60
 msgctxt "SV_BUTTONTEXT_ABORT"
 msgid "~Abort"
 msgstr "~Atal"
 
-#: strings.hrc:61
+#: vcl/inc/strings.hrc:61
 msgctxt "SV_BUTTONTEXT_LESS"
 msgid "~Less"
 msgstr "~Llai"
 
-#: strings.hrc:62
+#: vcl/inc/strings.hrc:62
 msgctxt "SV_BUTTONTEXT_RESET"
 msgid "R~eset"
 msgstr "~Ailosod"
 
-#: strings.hrc:63
+#: vcl/inc/strings.hrc:63
 msgctxt "SV_BUTTONTEXT_ADD"
 msgid "~Add"
 msgstr "~Ychwanegu"
 
-#: strings.hrc:64
+#: vcl/inc/strings.hrc:64
 msgctxt "SV_BUTTONTEXT_DELETE"
 msgid "~Delete"
 msgstr "~Dileu"
 
-#: strings.hrc:65
+#: vcl/inc/strings.hrc:65
 msgctxt "SV_BUTTONTEXT_REMOVE"
 msgid "~Remove"
 msgstr "~Tynnu"
 
-#: strings.hrc:66
+#: vcl/inc/strings.hrc:66
 msgctxt "SV_BUTTONTEXT_NEW"
 msgid "~New"
 msgstr "~Newydd"
 
-#: strings.hrc:67
+#: vcl/inc/strings.hrc:67
 msgctxt "SV_BUTTONTEXT_EDIT"
 msgid "~Edit"
 msgstr "~Golygu"
 
-#: strings.hrc:68
+#: vcl/inc/strings.hrc:68
 msgctxt "SV_BUTTONTEXT_APPLY"
 msgid "~Apply"
 msgstr "~Gosod"
 
-#: strings.hrc:69
+#: vcl/inc/strings.hrc:69
 msgctxt "SV_BUTTONTEXT_SAVE"
 msgid "~Save"
 msgstr "C~adw"
 
-#: strings.hrc:70
+#: vcl/inc/strings.hrc:70
 msgctxt "SV_BUTTONTEXT_UNDO"
 msgid "~Undo"
 msgstr "~Dadwneud"
 
-#: strings.hrc:71
+#: vcl/inc/strings.hrc:71
 msgctxt "SV_BUTTONTEXT_PASTE"
 msgid "~Paste"
 msgstr "~Gludo"
 
-#: strings.hrc:72
+#: vcl/inc/strings.hrc:72
 msgctxt "SV_BUTTONTEXT_NEXT"
 msgid "~Next"
 msgstr "~Next"
 
-#: strings.hrc:73
+#: vcl/inc/strings.hrc:73
 msgctxt "SV_BUTTONTEXT_PREV"
 msgid "~Previous"
 msgstr "~Blaenorol"
 
-#: strings.hrc:74
+#: vcl/inc/strings.hrc:74
 msgctxt "SV_BUTTONTEXT_GO_UP"
 msgid "~Up"
 msgstr "~Fyny"
 
-#: strings.hrc:75
+#: vcl/inc/strings.hrc:75
 msgctxt "SV_BUTTONTEXT_GO_DOWN"
 msgid "Do~wn"
 msgstr "~Lawr"
 
-#: strings.hrc:76
+#: vcl/inc/strings.hrc:76
 msgctxt "SV_BUTTONTEXT_CLEAR"
 msgid "~Clear"
 msgstr "~Clirio"
 
-#: strings.hrc:77
+#: vcl/inc/strings.hrc:77
 msgctxt "SV_BUTTONTEXT_OPEN"
 msgid "~Open"
 msgstr "~Agor"
 
-#: strings.hrc:78
+#: vcl/inc/strings.hrc:78
 msgctxt "SV_BUTTONTEXT_PLAY"
 msgid "~Play"
 msgstr "~Chwarae"
 
-#: strings.hrc:79
+#: vcl/inc/strings.hrc:79
 msgctxt "SV_BUTTONTEXT_FIND"
 msgid "~Find"
 msgstr "~Canfod"
 
-#: strings.hrc:80
+#: vcl/inc/strings.hrc:80
 msgctxt "SV_BUTTONTEXT_STOP"
 msgid "~Stop"
 msgstr "~Atal"
 
-#: strings.hrc:81
+#: vcl/inc/strings.hrc:81
 msgctxt "SV_BUTTONTEXT_CONNECT"
 msgid "C~onnect"
 msgstr "C~ysylltu"
 
-#: strings.hrc:82
+#: vcl/inc/strings.hrc:82
 msgctxt "SV_BUTTONTEXT_SCREENSHOT"
 msgid "~Screenshot"
 msgstr "~Llun Sgrin"
 
-#: strings.hrc:84
+#: vcl/inc/strings.hrc:84
 #, c-format
 msgctxt "SV_STDTEXT_SERVICENOTAVAILABLE"
 msgid ""
@@ -497,911 +497,911 @@ msgstr ""
 "Nid oedd modd llwytho cydran (%s).\n"
 "Rhaid cychwyn gosod gyda'r dewis i drwsio."
 
-#: strings.hrc:86
-msgctxt "SV_STDTEXT_DONTASKAGAIN"
-msgid "Do not show this question again."
-msgstr "Peidio dangos y cwestiwn yma eto."
-
-#: strings.hrc:87
-msgctxt "SV_STDTEXT_DONTWARNAGAIN"
-msgid "Do not show warning again."
-msgstr "Peidio dangos y rhybudd eto."
-
-#: strings.hrc:89
+#: vcl/inc/strings.hrc:86
 msgctxt "SV_STDTEXT_ABOUT"
 msgid "About %PRODUCTNAME"
 msgstr "Ynghylch %PRODUCTNAME"
 
-#: strings.hrc:90
+#: vcl/inc/strings.hrc:87
 msgctxt "SV_STDTEXT_PREFERENCES"
 msgid "Preferences..."
 msgstr "Dewisiadau..."
 
-#: strings.hrc:91
+#: vcl/inc/strings.hrc:88
 msgctxt "SV_STDTEXT_ALLFILETYPES"
 msgid "Any type"
 msgstr "Unrhyw fath"
 
-#: strings.hrc:93
+#: vcl/inc/strings.hrc:90
 msgctxt "STR_FPICKER_AUTO_EXTENSION"
 msgid "~Automatic file name extension"
 msgstr "~Estyniad enw ffeil awtomatig"
 
-#: strings.hrc:94
+#: vcl/inc/strings.hrc:91
 msgctxt "STR_FPICKER_PASSWORD"
 msgid "Save with pass~word"
 msgstr "Cadw gyda ~chyfrinair"
 
 #. dear loplugins, please don't remove this constant, it will be used in follow-up commits
-#: strings.hrc:96
+#: vcl/inc/strings.hrc:93
 msgctxt "STR_FPICKER_GPGENCRYPT"
 msgid "Encrypt with ~GPG key"
 msgstr "Amgryptio gydag allwedd ~GPG"
 
-#: strings.hrc:97
+#: vcl/inc/strings.hrc:94
 msgctxt "STR_FPICKER_FILTER_OPTIONS"
 msgid "~Edit filter settings"
 msgstr "~Golygu gosodiadau hidl"
 
-#: strings.hrc:98
+#: vcl/inc/strings.hrc:95
 msgctxt "STR_FPICKER_READONLY"
 msgid "~Read-only"
 msgstr "~Darllen yn unig"
 
-#: strings.hrc:99
+#: vcl/inc/strings.hrc:96
 msgctxt "STR_FPICKER_INSERT_AS_LINK"
 msgid "Insert as ~Link"
 msgstr "Mewnosod fel ~Cysylltiad"
 
-#: strings.hrc:100
+#: vcl/inc/strings.hrc:97
 msgctxt "STR_FPICKER_SHOW_PREVIEW"
 msgid "Pr~eview"
 msgstr "~Rhagolwg"
 
-#: strings.hrc:101
+#: vcl/inc/strings.hrc:98
 msgctxt "STR_FPICKER_PLAY"
 msgid "~Play"
 msgstr "~Chwarae"
 
-#: strings.hrc:102
+#: vcl/inc/strings.hrc:99
 msgctxt "STR_FPICKER_VERSION"
 msgid "~Version:"
 msgstr "~Fersiwn:"
 
-#: strings.hrc:103
+#: vcl/inc/strings.hrc:100
 msgctxt "STR_FPICKER_TEMPLATES"
 msgid "S~tyles:"
 msgstr "~Arddulliau:"
 
-#: strings.hrc:104
+#: vcl/inc/strings.hrc:101
 msgctxt "STR_FPICKER_IMAGE_TEMPLATE"
 msgid "Frame Style: "
 msgstr "Arddull Ffrâm: "
 
-#: strings.hrc:105
+#: vcl/inc/strings.hrc:102
+msgctxt "STR_FPICKER_IMAGE_ANCHOR"
+msgid "A~nchor: "
+msgstr "~Angor:"
+
+#: vcl/inc/strings.hrc:103
 msgctxt "STR_FPICKER_SELECTION"
 msgid "~Selection"
 msgstr "~Dewis"
 
-#: strings.hrc:106
+#: vcl/inc/strings.hrc:104
 msgctxt "STR_FPICKER_FOLDER_DEFAULT_TITLE"
 msgid "Select Path"
 msgstr "Dewis Llwybr"
 
-#: strings.hrc:107
+#: vcl/inc/strings.hrc:105
 msgctxt "STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION"
 msgid "Please select a folder."
 msgstr "Dewiswch ffolder."
 
-#: strings.hrc:108
+#: vcl/inc/strings.hrc:106
 msgctxt "STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY"
 msgid "A file named \"$filename$\" already exists. Do you want to replace it?"
 msgstr "Mae ffeil o'r enw \"$filename$\" yn bodoli eisoes. Hoffech chi ei newid?"
 
-#: strings.hrc:109
+#: vcl/inc/strings.hrc:107
 msgctxt "STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY"
 msgid "The file already exists in \"$dirname$\". Replacing it will overwrite its contents."
 msgstr "Mae'r ffeil yn bodoli eisoes yn \"$dirname$\". Bydd ei newid yn trosysgrifo ei gynnwys."
 
-#: strings.hrc:110
+#: vcl/inc/strings.hrc:108
 msgctxt "STR_FPICKER_ALLFORMATS"
 msgid "All Formats"
 msgstr "Pob Fformat"
 
-#: strings.hrc:111
+#: vcl/inc/strings.hrc:109
 msgctxt "STR_FPICKER_OPEN"
 msgid "Open"
 msgstr "Agor"
 
-#: strings.hrc:112
+#: vcl/inc/strings.hrc:110
 msgctxt "STR_FPICKER_SAVE"
 msgid "Save"
 msgstr "Cadw"
 
-#: strings.hrc:113
+#: vcl/inc/strings.hrc:111
 msgctxt "STR_FPICKER_TYPE"
 msgid "File ~type"
 msgstr "Math o ~ffeil"
 
-#: strings.hrc:115
+#: vcl/inc/strings.hrc:113
 msgctxt "SV_ACCESSERROR_NO_FONTS"
 msgid "No fonts could be found on the system."
 msgstr "Methu canfod ffontiau ar y system."
 
-#: strings.hrc:117
+#: vcl/inc/strings.hrc:115
 msgctxt "SV_PRINT_NOPAGES"
 msgid "No pages"
 msgstr "Dim tudalennau"
 
-#: strings.hrc:118
+#: vcl/inc/strings.hrc:116
 msgctxt "SV_PRINT_TOFILE_TXT"
 msgid "Print to File..."
 msgstr "Argraffu i Ffeil..."
 
-#: strings.hrc:119
+#: vcl/inc/strings.hrc:117
 msgctxt "SV_PRINT_DEFPRT_TXT"
 msgid "Default printer"
 msgstr "Argraffydd rhagosodedig"
 
-#: strings.hrc:120
+#: vcl/inc/strings.hrc:118
 msgctxt "SV_PRINT_PRINTPREVIEW_TXT"
 msgid "Print preview"
 msgstr "Rhagolwg argraffu"
 
-#: strings.hrc:121
+#: vcl/inc/strings.hrc:119
 msgctxt "SV_PRINT_QUERYFAXNUMBER_TXT"
 msgid "Please enter the fax number"
 msgstr "Rhowch y rhif ffacs"
 
-#: strings.hrc:122
+#: vcl/inc/strings.hrc:120
 msgctxt "SV_PRINT_INVALID_TXT"
 msgid "<ignore>"
 msgstr "<anwybyddu>"
 
-#: strings.hrc:123
+#: vcl/inc/strings.hrc:121
 msgctxt "SV_PRINT_CUSTOM_TXT"
 msgid "Custom"
 msgstr "Cyfaddas"
 
-#: strings.hrc:125
+#: vcl/inc/strings.hrc:123
 msgctxt "SV_EDIT_WARNING_STR"
 msgid "The inserted text exceeded the maximum length of this text field. The text was truncated."
 msgstr "Mae'r testun a osodwyd yn hirach na hyd eithaf y maes testun. Talfyrrwyd y testun."
 
-#: strings.hrc:127
+#: vcl/inc/strings.hrc:125
 msgctxt "SV_APP_CPUTHREADS"
 msgid "CPU threads: "
 msgstr "Trywyddau CPU: "
 
-#: strings.hrc:128
+#: vcl/inc/strings.hrc:126
 msgctxt "SV_APP_OSVERSION"
 msgid "OS: "
 msgstr "System Weithredu: "
 
-#: strings.hrc:129
+#: vcl/inc/strings.hrc:127
 msgctxt "SV_APP_UIRENDER"
 msgid "UI render: "
 msgstr "Lluniwr y Rhyngwyneb: "
 
-#: strings.hrc:130
+#: vcl/inc/strings.hrc:128
 msgctxt "SV_APP_GL"
 msgid "GL"
 msgstr "GL"
 
-#: strings.hrc:131
+#: vcl/inc/strings.hrc:129
 msgctxt "SV_APP_DEFAULT"
 msgid "default"
 msgstr "rhagosodedig"
 
-#: strings.hrc:133
+#: vcl/inc/strings.hrc:131
 msgctxt "SV_MSGBOX_INFO"
 msgid "Information"
 msgstr "Gwybodaeth"
 
-#: strings.hrc:134
+#: vcl/inc/strings.hrc:132
 msgctxt "SV_MSGBOX_WARNING"
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: strings.hrc:135
+#: vcl/inc/strings.hrc:133
 msgctxt "SV_MSGBOX_ERROR"
 msgid "Error"
 msgstr "Gwall"
 
-#: strings.hrc:136
+#: vcl/inc/strings.hrc:134
 msgctxt "SV_MSGBOX_QUERY"
 msgid "Confirmation"
 msgstr "Cadarnhad"
 
-#: strings.hrc:138
+#: vcl/inc/strings.hrc:136
 msgctxt "STR_TEXTUNDO_DELPARA"
 msgid "delete line"
 msgstr "dileu llinell"
 
-#: strings.hrc:139
+#: vcl/inc/strings.hrc:137
 msgctxt "STR_TEXTUNDO_CONNECTPARAS"
 msgid "delete multiple lines"
 msgstr "dileu llinellau lluosog"
 
-#: strings.hrc:140
+#: vcl/inc/strings.hrc:138
 msgctxt "STR_TEXTUNDO_SPLITPARA"
 msgid "insert multiple lines"
 msgstr "mewnosod llinellau lluosog"
 
-#: strings.hrc:141
+#: vcl/inc/strings.hrc:139
 msgctxt "STR_TEXTUNDO_INSERTCHARS"
 msgid "insert '$1'"
 msgstr "mewnosod '$1'"
 
-#: strings.hrc:142
+#: vcl/inc/strings.hrc:140
 msgctxt "STR_TEXTUNDO_REMOVECHARS"
 msgid "delete '$1'"
 msgstr "dileu '$1'"
 
 #. To translators: This is the first entry of a sequence of measurement unit names
-#: units.hrc:28
+#: vcl/inc/units.hrc:28
 msgctxt "SV_FUNIT_STRINGS"
 msgid "mm"
 msgstr "mm"
 
-#: units.hrc:29
+#: vcl/inc/units.hrc:29
 msgctxt "SV_FUNIT_STRINGS"
 msgid "cm"
 msgstr "cm"
 
-#: units.hrc:30
+#: vcl/inc/units.hrc:30
 msgctxt "SV_FUNIT_STRINGS"
 msgid "m"
 msgstr "m"
 
-#: units.hrc:31
+#: vcl/inc/units.hrc:31
 msgctxt "SV_FUNIT_STRINGS"
 msgid "km"
 msgstr "km"
 
-#: units.hrc:32
+#: vcl/inc/units.hrc:32
 msgctxt "SV_FUNIT_STRINGS"
 msgid "twips"
 msgstr "twips"
 
-#: units.hrc:33
+#: vcl/inc/units.hrc:33
 msgctxt "SV_FUNIT_STRINGS"
 msgid "twip"
 msgstr "twip"
 
-#: units.hrc:34
+#: vcl/inc/units.hrc:34
 msgctxt "SV_FUNIT_STRINGS"
 msgid "pt"
 msgstr "pt"
 
-#: units.hrc:35
+#: vcl/inc/units.hrc:35
 msgctxt "SV_FUNIT_STRINGS"
 msgid "pc"
 msgstr "pc"
 
-#: units.hrc:36
+#: vcl/inc/units.hrc:36
 msgctxt "SV_FUNIT_STRINGS"
 msgid "\""
 msgstr "\""
 
-#: units.hrc:37
+#: vcl/inc/units.hrc:37
 msgctxt "SV_FUNIT_STRINGS"
 msgid "in"
 msgstr "mod"
 
-#: units.hrc:38
+#: vcl/inc/units.hrc:38
 msgctxt "SV_FUNIT_STRINGS"
 msgid "inch"
 msgstr "modfedd"
 
-#: units.hrc:39
+#: vcl/inc/units.hrc:39
 msgctxt "SV_FUNIT_STRINGS"
 msgid "'"
 msgstr "'"
 
-#: units.hrc:40
+#: vcl/inc/units.hrc:40
 msgctxt "SV_FUNIT_STRINGS"
 msgid "ft"
 msgstr "tr"
 
-#: units.hrc:41
+#: vcl/inc/units.hrc:41
 msgctxt "SV_FUNIT_STRINGS"
 msgid "foot"
 msgstr "troedfedd"
 
-#: units.hrc:42
+#: vcl/inc/units.hrc:42
 msgctxt "SV_FUNIT_STRINGS"
 msgid "feet"
 msgstr "troedfeddi"
 
-#: units.hrc:43
+#: vcl/inc/units.hrc:43
 msgctxt "SV_FUNIT_STRINGS"
 msgid "miles"
 msgstr "milltiroedd"
 
-#: units.hrc:44
+#: vcl/inc/units.hrc:44
 msgctxt "SV_FUNIT_STRINGS"
 msgid "mile"
 msgstr "milltir"
 
-#: units.hrc:45
+#: vcl/inc/units.hrc:45
 msgctxt "SV_FUNIT_STRINGS"
 msgid "ch"
 msgstr "ch"
 
-#: units.hrc:46
+#: vcl/inc/units.hrc:46
 msgctxt "SV_FUNIT_STRINGS"
 msgid "line"
 msgstr "llinell"
 
-#: units.hrc:47
+#: vcl/inc/units.hrc:47
 msgctxt "SV_FUNIT_STRINGS"
 msgid "pixels"
 msgstr "picseli"
 
-#: units.hrc:48
+#: vcl/inc/units.hrc:48
 msgctxt "SV_FUNIT_STRINGS"
 msgid "pixel"
 msgstr "picsel"
 
 #. To translators: degree
-#: units.hrc:50
+#: vcl/inc/units.hrc:50
 msgctxt "SV_FUNIT_STRINGS"
 msgid "°"
 msgstr "°"
 
-#: units.hrc:51
+#: vcl/inc/units.hrc:51
 msgctxt "SV_FUNIT_STRINGS"
 msgid "sec"
 msgstr "eil"
 
 #. To translators: This is the last entry of the sequence of measurement unit names
-#: units.hrc:53
+#: vcl/inc/units.hrc:53
 msgctxt "SV_FUNIT_STRINGS"
 msgid "ms"
 msgstr "ms"
 
-#: cupspassworddialog.ui:8
+#: vcl/uiconfig/ui/cupspassworddialog.ui:8
 msgctxt "cupspassworddialog|CUPSPasswordDialog"
 msgid "Authentication Request"
 msgstr "Cais i Wirio"
 
-#: cupspassworddialog.ui:70
+#: vcl/uiconfig/ui/cupspassworddialog.ui:72
 msgctxt "cupspassworddialog|label1"
 msgid "_User:"
 msgstr "_Defnyddiwr:"
 
-#: cupspassworddialog.ui:84
+#: vcl/uiconfig/ui/cupspassworddialog.ui:86
 msgctxt "cupspassworddialog|label2"
 msgid "_Password:"
 msgstr "C_yfrinair:"
 
-#: cupspassworddialog.ui:98
+#: vcl/uiconfig/ui/cupspassworddialog.ui:100
 msgctxt "cupspassworddialog|text"
 msgid "Please enter your authentication data for server “%s”"
 msgstr "Rhowch eich data dilysu ar gyfer gweinydd “%s”"
 
-#: editmenu.ui:12
+#: vcl/uiconfig/ui/editmenu.ui:12
 msgctxt "editmenu|undo"
 msgid "_Undo"
 msgstr "_Dadwneud"
 
-#: editmenu.ui:26
+#: vcl/uiconfig/ui/editmenu.ui:26
 msgctxt "editmenu|cut"
 msgid "Cu_t"
 msgstr "_Torri"
 
-#: editmenu.ui:34
+#: vcl/uiconfig/ui/editmenu.ui:34
 msgctxt "editmenu|copy"
 msgid "_Copy"
 msgstr "­_Copïo"
 
-#: editmenu.ui:42
+#: vcl/uiconfig/ui/editmenu.ui:42
 msgctxt "editmenu|paste"
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: editmenu.ui:50
+#: vcl/uiconfig/ui/editmenu.ui:50
 msgctxt "editmenu|delete"
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: editmenu.ui:64
+#: vcl/uiconfig/ui/editmenu.ui:64
 msgctxt "editmenu|selectall"
 msgid "Select _All"
 msgstr "Dewis _Popeth"
 
-#: editmenu.ui:73
+#: vcl/uiconfig/ui/editmenu.ui:73
 msgctxt "editmenu|specialchar"
 msgid "_Special Character..."
 msgstr "_Nod Arbennig..."
 
-#: errornocontentdialog.ui:8
+#: vcl/uiconfig/ui/errornocontentdialog.ui:7
 msgctxt "errornocontentdialog|ErrorNoContentDialog"
 msgid "%PRODUCTNAME"
 msgstr "%PRODUCTNAME"
 
-#: errornocontentdialog.ui:14
+#: vcl/uiconfig/ui/errornocontentdialog.ui:14
 msgctxt "errornocontentdialog|ErrorNoContentDialog"
 msgid "There are no pages to be printed."
 msgstr "Nid oes tudalennau i'w hargraffu."
 
-#: errornocontentdialog.ui:15
+#: vcl/uiconfig/ui/errornocontentdialog.ui:15
 msgctxt "errornocontentdialog|ErrorNoContentDialog"
 msgid "Please check your document for ranges relevant to printing."
 msgstr "Gwiriwch eich dogfennau ar gyfer ystod berthnasol i argraffu."
 
-#: errornoprinterdialog.ui:8
+#: vcl/uiconfig/ui/errornoprinterdialog.ui:7
 msgctxt "errornoprinterdialog|ErrorNoPrinterDialog"
 msgid "%PRODUCTNAME"
 msgstr "%PRODUCTNAME"
 
-#: errornoprinterdialog.ui:14
+#: vcl/uiconfig/ui/errornoprinterdialog.ui:14
 msgctxt "errornoprinterdialog|ErrorNoPrinterDialog"
 msgid "No default printer found."
 msgstr "Heb ganfod argraffydd rhagosodedig."
 
-#: errornoprinterdialog.ui:15
+#: vcl/uiconfig/ui/errornoprinterdialog.ui:15
 msgctxt "errornoprinterdialog|ErrorNoPrinterDialog"
 msgid "Please choose a printer and try again."
 msgstr "Dewiswch argraffydd a cheisiwch eto."
 
-#: printdialog.ui:46
+#: vcl/uiconfig/ui/printdialog.ui:46
 msgctxt "printdialog|liststore1"
 msgid "1"
 msgstr "1"
 
-#: printdialog.ui:50
+#: vcl/uiconfig/ui/printdialog.ui:50
 msgctxt "printdialog|liststore1"
 msgid "2"
 msgstr "2"
 
-#: printdialog.ui:54
+#: vcl/uiconfig/ui/printdialog.ui:54
 msgctxt "printdialog|liststore1"
 msgid "4"
 msgstr "4"
 
-#: printdialog.ui:58
+#: vcl/uiconfig/ui/printdialog.ui:58
 msgctxt "printdialog|liststore1"
 msgid "6"
 msgstr "6"
 
-#: printdialog.ui:62
+#: vcl/uiconfig/ui/printdialog.ui:62
 msgctxt "printdialog|liststore1"
 msgid "9"
 msgstr "9"
 
-#: printdialog.ui:66
+#: vcl/uiconfig/ui/printdialog.ui:66
 msgctxt "printdialog|liststore1"
 msgid "16"
 msgstr "16"
 
-#: printdialog.ui:70
+#: vcl/uiconfig/ui/printdialog.ui:70
 msgctxt "printdialog|liststore1"
 msgid "Custom"
 msgstr "Cyfaddasu"
 
-#: printdialog.ui:82
+#: vcl/uiconfig/ui/printdialog.ui:82
 msgctxt "printdialog|liststore2"
 msgid "left to right, then down"
 msgstr "chwith i'r dde, ac yna i lawr"
 
-#: printdialog.ui:85
+#: vcl/uiconfig/ui/printdialog.ui:85
 msgctxt "printdialog|liststore2"
 msgid "top to bottom, then right"
 msgstr "brig i'r gwaelod, yna i'r dde"
 
-#: printdialog.ui:88
+#: vcl/uiconfig/ui/printdialog.ui:88
 msgctxt "printdialog|liststore2"
 msgid "top to bottom, then left"
 msgstr "o'r brig i'r gwaelod, yna i'r chwith"
 
-#: printdialog.ui:91
+#: vcl/uiconfig/ui/printdialog.ui:91
 msgctxt "printdialog|liststore2"
 msgid "right to left, then down"
 msgstr "de i'r chwith, yna lawr"
 
-#: printdialog.ui:102
+#: vcl/uiconfig/ui/printdialog.ui:102
 msgctxt "printdialog|liststore3"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: printdialog.ui:105
+#: vcl/uiconfig/ui/printdialog.ui:105
 msgctxt "printdialog|liststore3"
 msgid "Portrait"
 msgstr "Portread"
 
-#: printdialog.ui:108
+#: vcl/uiconfig/ui/printdialog.ui:108
 msgctxt "printdialog|liststore3"
 msgid "Landscape"
 msgstr "Tirlun"
 
-#: printdialog.ui:115
+#: vcl/uiconfig/ui/printdialog.ui:115
 msgctxt "printdialog|PrintDialog"
 msgid "Print"
 msgstr "Argraffu"
 
-#: printdialog.ui:233
+#: vcl/uiconfig/ui/printdialog.ui:232
 msgctxt "printdialog|totalnumpages"
 msgid "/ %n"
 msgstr "/ %n"
 
-#: printdialog.ui:332
+#: vcl/uiconfig/ui/printdialog.ui:331
 msgctxt "printdialog|label7"
 msgid "Status:"
 msgstr "Statws:"
 
-#: printdialog.ui:344
+#: vcl/uiconfig/ui/printdialog.ui:343
 msgctxt "printdialog|label8"
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: printdialog.ui:356
+#: vcl/uiconfig/ui/printdialog.ui:355
 msgctxt "printdialog|label9"
 msgid "Comment:"
 msgstr "Sylw:"
 
-#: printdialog.ui:368
+#: vcl/uiconfig/ui/printdialog.ui:367
 msgctxt "printdialog|status"
 msgid "Default printer"
 msgstr "Argraffydd rhagosodedig"
 
-#: printdialog.ui:380
+#: vcl/uiconfig/ui/printdialog.ui:379
 msgctxt "printdialog|location"
 msgid "Place"
 msgstr "Man"
 
-#: printdialog.ui:392
+#: vcl/uiconfig/ui/printdialog.ui:391
 msgctxt "printdialog|comment"
 msgid "Long printer name"
 msgstr "Enw hir argraffydd"
 
-#: printdialog.ui:406
+#: vcl/uiconfig/ui/printdialog.ui:405
 msgctxt "printdialog|label6"
 msgid "Details"
 msgstr "Manylion"
 
-#: printdialog.ui:417
+#: vcl/uiconfig/ui/printdialog.ui:416
 msgctxt "printdialog|setup"
 msgid "Properties..."
 msgstr "Priodweddau..."
 
-#: printdialog.ui:453
+#: vcl/uiconfig/ui/printdialog.ui:452
 msgctxt "printdialog|label5"
 msgid "Printer"
 msgstr "Argraffydd"
 
-#: printdialog.ui:493
+#: vcl/uiconfig/ui/printdialog.ui:492
 msgctxt "printdialog|label14"
 msgid "Number of copies"
 msgstr "Nifer o gopïau"
 
-#: printdialog.ui:531
+#: vcl/uiconfig/ui/printdialog.ui:529
 msgctxt "printdialog|collate"
 msgid "Collate"
 msgstr "Coladu"
 
-#: printdialog.ui:588
+#: vcl/uiconfig/ui/printdialog.ui:587
 msgctxt "printdialog|printallsheets"
 msgid "All sheets"
 msgstr "Pob dalen"
 
-#: printdialog.ui:605
+#: vcl/uiconfig/ui/printdialog.ui:605
 msgctxt "printdialog|printselectedsheets"
 msgid "Selected sheets"
 msgstr "Dalenni dewiswyd"
 
-#: printdialog.ui:621
+#: vcl/uiconfig/ui/printdialog.ui:622
 msgctxt "printdialog|printselectedcells"
 msgid "Selected cells"
 msgstr "Celloedd dewiswyd"
 
-#: printdialog.ui:646
+#: vcl/uiconfig/ui/printdialog.ui:648
 msgctxt "printdialog|fromwhich"
 msgid "From which print"
 msgstr "O'r hyn i'w argraffu"
 
-#: printdialog.ui:664
+#: vcl/uiconfig/ui/printdialog.ui:666
 msgctxt "printdialog|printallpages"
 msgid "All pages"
 msgstr "Popeth"
 
-#: printdialog.ui:685
+#: vcl/uiconfig/ui/printdialog.ui:688
 msgctxt "printdialog|printpages"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: printdialog.ui:720
+#: vcl/uiconfig/ui/printdialog.ui:723
 msgctxt "printdialog|printselection"
 msgid "Selection"
 msgstr "Dewis"
 
-#: printdialog.ui:736
+#: vcl/uiconfig/ui/printdialog.ui:740
 msgctxt "printdialog|reverseorder"
 msgid "Print in reverse page order"
 msgstr "Argraffu mewn trefn croes"
 
-#: printdialog.ui:768
+#: vcl/uiconfig/ui/printdialog.ui:773
 msgctxt "printdialog|label13"
 msgid "Range and Copies"
 msgstr "Ystod a Chopïau"
 
-#: printdialog.ui:801
+#: vcl/uiconfig/ui/printdialog.ui:806
 msgctxt "printdialog|label16"
 msgid "Comments"
 msgstr "Sylwadau"
 
-#: printdialog.ui:830
+#: vcl/uiconfig/ui/printdialog.ui:835
 msgctxt "printdialog|label15"
 msgid "Print"
 msgstr "Argraffu"
 
-#: printdialog.ui:869
+#: vcl/uiconfig/ui/printdialog.ui:874
 msgctxt "printdialog|label10"
 msgid "Document"
 msgstr "Dogfen"
 
-#: printdialog.ui:906
+#: vcl/uiconfig/ui/printdialog.ui:911
 msgctxt "printdialog|label12"
 msgid "Slides per page"
 msgstr "Sleidiau i'r dudalen"
 
-#: printdialog.ui:931
+#: vcl/uiconfig/ui/printdialog.ui:936
 msgctxt "printdialog|label19"
 msgid "Order"
 msgstr "Trefn"
 
-#: printdialog.ui:967
+#: vcl/uiconfig/ui/printdialog.ui:972
 msgctxt "printdialog|label11"
 msgid "Print"
 msgstr "Argraffu"
 
-#: printdialog.ui:985
+#: vcl/uiconfig/ui/printdialog.ui:990
 msgctxt "printdialog|label1"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: printdialog.ui:1009
+#: vcl/uiconfig/ui/printdialog.ui:1014
 msgctxt "printdialog|customlabel"
 msgid "custom"
 msgstr "cyfaddas"
 
-#: printdialog.ui:1059
+#: vcl/uiconfig/ui/printdialog.ui:1064
 msgctxt "printdialog|pagespersheetbtn"
 msgid "Pages per sheet"
 msgstr "Tudalennau i'r ddalen"
 
-#: printdialog.ui:1092
+#: vcl/uiconfig/ui/printdialog.ui:1098
 msgctxt "printdialog|brochure"
 msgid "Brochure"
 msgstr "Llyfryn"
 
-#: printdialog.ui:1112
+#: vcl/uiconfig/ui/printdialog.ui:1119
 msgctxt "printdialog|pagestxt"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: printdialog.ui:1127
+#: vcl/uiconfig/ui/printdialog.ui:1134
 msgctxt "printdialog|sheetmargintxt1"
 msgid "Margin"
 msgstr "Ymyl"
 
-#: printdialog.ui:1142
+#: vcl/uiconfig/ui/printdialog.ui:1149
 msgctxt "printdialog|orientationtxt"
 msgid "Orientation"
 msgstr "Cyfeiriadedd"
 
-#: printdialog.ui:1157
+#: vcl/uiconfig/ui/printdialog.ui:1164
 msgctxt "printdialog|pagemargintxt1"
 msgid "Distance"
 msgstr "Pellter"
 
-#: printdialog.ui:1244
+#: vcl/uiconfig/ui/printdialog.ui:1247
 msgctxt "printdialog|by"
 msgid "by"
 msgstr "gan"
 
-#: printdialog.ui:1258
+#: vcl/uiconfig/ui/printdialog.ui:1261
 msgctxt "printdialog|pagemargintxt2"
 msgid "between pages"
 msgstr "rhwng tudalennau"
 
-#: printdialog.ui:1271
+#: vcl/uiconfig/ui/printdialog.ui:1274
 msgctxt "printdialog|sheetmargintxt2"
 msgid "to sheet border"
 msgstr "i forder y ddalen"
 
-#: printdialog.ui:1281
+#: vcl/uiconfig/ui/printdialog.ui:1284
 msgctxt "printdialog|bordercb"
 msgid "Draw a border around each page"
 msgstr "Gosod border o amgylch pob tudalen"
 
-#: printdialog.ui:1302
+#: vcl/uiconfig/ui/printdialog.ui:1306
 msgctxt "printdialog|ordertxt"
 msgid "Order"
 msgstr "Trefn"
 
-#: printdialog.ui:1341
+#: vcl/uiconfig/ui/printdialog.ui:1345
 msgctxt "printdialog|label18"
 msgid "Layout"
 msgstr "Cynllun"
 
-#: printdialog.ui:1375
+#: vcl/uiconfig/ui/printdialog.ui:1379
 msgctxt "printdialog|label17"
 msgid "Include"
 msgstr "Cynnwys"
 
-#: printdialog.ui:1404
+#: vcl/uiconfig/ui/printdialog.ui:1408
 msgctxt "printdialog|label3"
 msgid "Page Sides"
 msgstr "Ochrau Tudalen"
 
-#: printdialog.ui:1426
+#: vcl/uiconfig/ui/printdialog.ui:1430
 msgctxt "printdialog|label2"
 msgid "Page Layout"
 msgstr "Cynllun Tudalen"
 
-#: printdialog.ui:1453
+#: vcl/uiconfig/ui/printdialog.ui:1457
 msgctxt "printdialog|singleprintjob"
 msgid "Create single print jobs for collated output"
 msgstr "Creu un dasg argraffu ar gyfer allbwn coladu"
 
-#: printdialog.ui:1467
+#: vcl/uiconfig/ui/printdialog.ui:1472
 msgctxt "printdialog|printpaperfromsetup"
 msgid "Use only paper tray from printer preferences"
 msgstr "Defnyddio'r ddrôr papur o'r dewisiadau argraffu"
 
-#: printdialog.ui:1480
+#: vcl/uiconfig/ui/printdialog.ui:1486
 msgctxt "printdialog|papersizefromsetup"
 msgid "Use only paper size from printer preferences"
 msgstr "Defnyddio dim ond maint papur o ddewis yr argraffydd"
 
-#: printdialog.ui:1501
+#: vcl/uiconfig/ui/printdialog.ui:1508
 msgctxt "printdialog|label21"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: printdialog.ui:1516
+#: vcl/uiconfig/ui/printdialog.ui:1523
 msgctxt "printdialog|label20"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: printerdevicepage.ui:14
+#: vcl/uiconfig/ui/printerdevicepage.ui:34
+msgctxt "printerdevicepage|label7"
+msgid "_Option:"
+msgstr "_Dewis:"
+
+#: vcl/uiconfig/ui/printerdevicepage.ui:48
+msgctxt "printerdevicepage|label8"
+msgid "Current _value:"
+msgstr "Gwerth c_yfredol:"
+
+#: vcl/uiconfig/ui/printerdevicepage.ui:170
+msgctxt "printerdevicepage|label11"
+msgid "Color _depth:"
+msgstr "_Dyfnder lliw:"
+
+#: vcl/uiconfig/ui/printerdevicepage.ui:184
+msgctxt "printerdevicepage|label10"
+msgid "Co_lor:"
+msgstr "_Lliw:"
+
+#: vcl/uiconfig/ui/printerdevicepage.ui:198
+msgctxt "printerdevicepage|label9"
+msgid "Printer language _type:"
+msgstr "Math _Iaith Argraffydd:"
+
+#: vcl/uiconfig/ui/printerdevicepage.ui:214
 msgctxt "printerdevicepage|liststore1"
 msgid "Automatic : %s"
 msgstr "Awtomatig : %s"
 
-#: printerdevicepage.ui:18
+#: vcl/uiconfig/ui/printerdevicepage.ui:215
 msgctxt "printerdevicepage|liststore1"
 msgid "PostScript (Level from driver)"
 msgstr "PostScript (Lefel o'r gyrrwr)"
 
-#: printerdevicepage.ui:22
+#: vcl/uiconfig/ui/printerdevicepage.ui:216
 msgctxt "printerdevicepage|liststore1"
 msgid "PostScript Level 1"
 msgstr "PostScript Lefel 1"
 
-#: printerdevicepage.ui:26
+#: vcl/uiconfig/ui/printerdevicepage.ui:217
 msgctxt "printerdevicepage|liststore1"
 msgid "PostScript Level 2"
 msgstr "PostScript Lefel 2"
 
-#: printerdevicepage.ui:30
+#: vcl/uiconfig/ui/printerdevicepage.ui:218
 msgctxt "printerdevicepage|liststore1"
 msgid "PostScript Level 3"
 msgstr "PostScript Lefel 3"
 
-#: printerdevicepage.ui:34
+#: vcl/uiconfig/ui/printerdevicepage.ui:219
 msgctxt "printerdevicepage|liststore1"
 msgid "PDF"
 msgstr "PDF"
 
-#: printerdevicepage.ui:53
-msgctxt "printerdevicepage|label7"
-msgid "_Option:"
-msgstr "_Dewis:"
-
-#: printerdevicepage.ui:67
-msgctxt "printerdevicepage|label8"
-msgid "Current _value:"
-msgstr "Gwerth c_yfredol:"
-
-#: printerdevicepage.ui:140
-msgctxt "printerdevicepage|label11"
-msgid "Color _depth:"
-msgstr "_Dyfnder lliw:"
-
-#: printerdevicepage.ui:154
-msgctxt "printerdevicepage|label10"
-msgid "Co_lor:"
-msgstr "_Lliw:"
-
-#: printerdevicepage.ui:168
-msgctxt "printerdevicepage|label9"
-msgid "Printer language _type:"
-msgstr "Math _Iaith Argraffydd:"
-
-#: printerdevicepage.ui:194
+#: vcl/uiconfig/ui/printerdevicepage.ui:232
 msgctxt "printerdevicepage|colorspace"
 msgid "From driver"
 msgstr "O'r gyrrwr"
 
-#: printerdevicepage.ui:195
+#: vcl/uiconfig/ui/printerdevicepage.ui:233
 msgctxt "printerdevicepage|colorspace"
 msgid "Color"
 msgstr "Lliw"
 
-#: printerdevicepage.ui:196
+#: vcl/uiconfig/ui/printerdevicepage.ui:234
 msgctxt "printerdevicepage|colorspace"
 msgid "Grayscale"
 msgstr "Graddlwyd"
 
-#: printerdevicepage.ui:209
+#: vcl/uiconfig/ui/printerdevicepage.ui:247
 msgctxt "printerdevicepage|colordepth"
 msgid "8 Bit"
 msgstr "8 Did"
 
-#: printerdevicepage.ui:210
+#: vcl/uiconfig/ui/printerdevicepage.ui:248
 msgctxt "printerdevicepage|colordepth"
 msgid "24 Bit"
 msgstr "24 Did"
 
-#: printerpaperpage.ui:20
+#: vcl/uiconfig/ui/printerpaperpage.ui:19
 msgctxt "printerpaperpage|paperft"
 msgid "_Paper size:"
 msgstr "Maint _papur:"
 
-#: printerpaperpage.ui:33
-msgctxt "printerpaperpage|label4"
+#: vcl/uiconfig/ui/printerpaperpage.ui:32
+msgctxt "printerpaperpage|orientft"
 msgid "_Orientation:"
-msgstr "Cy_feiriadedd:"
+msgstr "Cy_feiriadedd"
 
-#: printerpaperpage.ui:46
+#: vcl/uiconfig/ui/printerpaperpage.ui:45
 msgctxt "printerpaperpage|duplexft"
 msgid "_Duplex:"
 msgstr "_Dwy Ochr:"
 
-#: printerpaperpage.ui:59
+#: vcl/uiconfig/ui/printerpaperpage.ui:58
 msgctxt "printerpaperpage|slotft"
 msgid "Paper tray:"
 msgstr "Dror papur:"
 
-#: printerpaperpage.ui:82
+#: vcl/uiconfig/ui/printerpaperpage.ui:82
 msgctxt "printerpaperpage|orientlb"
 msgid "Portrait"
 msgstr "Portread"
 
-#: printerpaperpage.ui:83
+#: vcl/uiconfig/ui/printerpaperpage.ui:83
 msgctxt "printerpaperpage|orientlb"
 msgid "Landscape"
 msgstr "Tirlun"
 
-#: printerpropertiesdialog.ui:8
+#: vcl/uiconfig/ui/printerpaperpage.ui:113
+msgctxt "printerpaperpage|papersizefromsetup"
+msgid "Use only paper size from printer preferences"
+msgstr "Defnyddio dim ond maint papur o ddewis yr argraffydd"
+
+#: vcl/uiconfig/ui/printerpropertiesdialog.ui:8
 msgctxt "printerpropertiesdialog|PrinterPropertiesDialog"
 msgid "Properties of %s"
 msgstr "Priodweddau %s"
 
-#: printerpropertiesdialog.ui:77
+#: vcl/uiconfig/ui/printerpropertiesdialog.ui:103
 msgctxt "printerpropertiesdialog|paper"
 msgid "Paper"
 msgstr "Papur"
 
-#: printerpropertiesdialog.ui:100
+#: vcl/uiconfig/ui/printerpropertiesdialog.ui:150
 msgctxt "printerpropertiesdialog|device"
 msgid "Device"
 msgstr "Dyfais"
 
-#: printprogressdialog.ui:8
+#: vcl/uiconfig/ui/printprogressdialog.ui:8
 msgctxt "printprogressdialog|PrintProgressDialog"
 msgid "Printing"
 msgstr "Argraffu"
 
-#: printprogressdialog.ui:54
+#: vcl/uiconfig/ui/printprogressdialog.ui:54
 msgctxt "printprogressdialog|label"
 msgid "Page %p of %n"
 msgstr "Tudalen %p o %n"
 
-#: querydialog.ui:8
+#: vcl/uiconfig/ui/querydialog.ui:8
 msgctxt "querydialog|QueryDialog"
 msgid "New Data Type"
 msgstr "Math Newydd o Ddata"
diff --git a/source/cy/wizards/messages.po b/source/cy/wizards/messages.po
index d3b85fa6201..0dde8df40ff 100644
--- a/source/cy/wizards/messages.po
+++ b/source/cy/wizards/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2018-01-10 11:50+0100\n"
+"POT-Creation-Date: 2018-02-27 15:07+0100\n"
 "PO-Revision-Date: 2017-12-29 15:05+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,112 +16,112 @@ msgstr ""
 "X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1514559943.000000\n"
 
-#: strings.hrc:32
+#: wizards/com/sun/star/wizards/common/strings.hrc:32
 msgctxt "RID_COMMON_START_0"
 msgid "The directory '%1' could not be created.<BR>There may not be enough space left on your hard disk."
 msgstr "Methu creu cyfeiriadur '%1'.<BR>Efallai nad oes digon o le ar eich disg caled."
 
-#: strings.hrc:33
+#: wizards/com/sun/star/wizards/common/strings.hrc:33
 msgctxt "RID_COMMON_START_1"
 msgid "The text document could not be created.<BR>Please check if the module 'PRODUCTNAME Writer' is installed."
 msgstr "Methu creu'r ddogfen testun.<BR>Gwnewch yn siŵr fod y modiwl 'PRODUCTNAME Writer' wedi ei osod."
 
-#: strings.hrc:34
+#: wizards/com/sun/star/wizards/common/strings.hrc:34
 msgctxt "RID_COMMON_START_2"
 msgid "The spreadsheet could not be created.<BR>Please check if the module 'PRODUCTNAME Calc' is installed."
 msgstr "Methu creu'r daenlen.<BR>Gwnewch yn siŵr fod y modiwl 'PRODUCTNAME Calc' wedi ei osod."
 
-#: strings.hrc:35
+#: wizards/com/sun/star/wizards/common/strings.hrc:35
 msgctxt "RID_COMMON_START_3"
 msgid "The presentation could not be created.<BR>Please check if the module 'PRODUCTNAME Impress' is installed."
 msgstr "Methu creu'r cyflwyniad.<BR>Gwnewch yn siŵr fod y modiwl 'PRODUCTNAME Impress' wedi ei osod."
 
-#: strings.hrc:36
+#: wizards/com/sun/star/wizards/common/strings.hrc:36
 msgctxt "RID_COMMON_START_4"
 msgid "The drawing could not be created.<BR>Please check if the module 'PRODUCTNAME Draw' is installed."
 msgstr "Methu creu'r llun.<BR>Gwnewch yn siŵr fod y modiwl 'PRODUCTNAME Draw' wedi ei osod."
 
-#: strings.hrc:37
+#: wizards/com/sun/star/wizards/common/strings.hrc:37
 msgctxt "RID_COMMON_START_5"
 msgid "The formula could not be created.<BR>Please check if the module 'PRODUCTNAME Math' is installed."
 msgstr "Methu creu'r fformiwla.<BR>Gwnewch yn siŵr fod y modiwl 'PRODUCTNAME Math' wedi ei osod."
 
-#: strings.hrc:38
+#: wizards/com/sun/star/wizards/common/strings.hrc:38
 msgctxt "RID_COMMON_START_6"
 msgid "The files required could not be found.<BR>Please start the %PRODUCTNAME Setup and choose 'Repair'."
 msgstr "Methu canfod y ffeiliau angenrheidiol.<BR>Cychwynnwch drefn osod %PRODUCTNAME a dewis 'Trwsio'."
 
-#: strings.hrc:39
+#: wizards/com/sun/star/wizards/common/strings.hrc:39
 msgctxt "RID_COMMON_START_7"
 msgid "The file '<PATH>' already exists.<BR><BR>Would you like to overwrite the existing file?"
 msgstr "Mae'r ffeil '<PATH>' yn bod eisoes.<BR><BR>Hoffech chi ei throsysgrifo?"
 
-#: strings.hrc:40
+#: wizards/com/sun/star/wizards/common/strings.hrc:40
 msgctxt "RID_COMMON_START_8"
 msgid "Yes"
 msgstr "Iawn"
 
-#: strings.hrc:41
+#: wizards/com/sun/star/wizards/common/strings.hrc:41
 msgctxt "RID_COMMON_START_9"
 msgid "Yes to All"
 msgstr "Iawn i Bopeth"
 
-#: strings.hrc:42
+#: wizards/com/sun/star/wizards/common/strings.hrc:42
 msgctxt "RID_COMMON_START_10"
 msgid "No"
 msgstr "Na"
 
-#: strings.hrc:43
+#: wizards/com/sun/star/wizards/common/strings.hrc:43
 msgctxt "RID_COMMON_START_11"
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: strings.hrc:44
+#: wizards/com/sun/star/wizards/common/strings.hrc:44
 msgctxt "RID_COMMON_START_12"
 msgid "~Finish"
 msgstr "~Gorffen"
 
-#: strings.hrc:45
+#: wizards/com/sun/star/wizards/common/strings.hrc:45
 msgctxt "RID_COMMON_START_13"
 msgid "< ~Back"
 msgstr "< ~Nôl"
 
-#: strings.hrc:46
+#: wizards/com/sun/star/wizards/common/strings.hrc:46
 msgctxt "RID_COMMON_START_14"
 msgid "~Next >"
 msgstr "~Nesaf >"
 
-#: strings.hrc:47
+#: wizards/com/sun/star/wizards/common/strings.hrc:47
 msgctxt "RID_COMMON_START_15"
 msgid "~Help"
 msgstr "~Cymorth"
 
-#: strings.hrc:48
+#: wizards/com/sun/star/wizards/common/strings.hrc:48
 msgctxt "RID_COMMON_START_16"
 msgid "Steps"
 msgstr "Camau"
 
-#: strings.hrc:49
+#: wizards/com/sun/star/wizards/common/strings.hrc:49
 msgctxt "RID_COMMON_START_17"
 msgid "Close"
 msgstr "Cau"
 
-#: strings.hrc:50
+#: wizards/com/sun/star/wizards/common/strings.hrc:50
 msgctxt "RID_COMMON_START_18"
 msgid "OK"
 msgstr "Iawn"
 
-#: strings.hrc:51
+#: wizards/com/sun/star/wizards/common/strings.hrc:51
 msgctxt "RID_COMMON_START_19"
 msgid "The file already exists. Do you want to overwrite it?"
 msgstr "Mae'r ffeil yn bodoli eisoes. Hoffech chi ei throsysgrifo?"
 
-#: strings.hrc:52
+#: wizards/com/sun/star/wizards/common/strings.hrc:52
 msgctxt "RID_COMMON_START_20"
 msgid "Template created via <wizard_name> on <current_date>."
 msgstr "Crewyd templed drwy <wizard_name> ar <current_date>."
 
-#: strings.hrc:53
+#: wizards/com/sun/star/wizards/common/strings.hrc:53
 msgctxt "RID_COMMON_START_21"
 msgid ""
 "The wizard could not be run, because important files were not found.\n"
@@ -132,1217 +132,1217 @@ msgstr ""
 "O dan 'Offer - Dewisiadau - %PRODUCTNAME - Llwybrau' cliciwch y botwm 'Rhagosodedig' i ailosod y llwybrau i'r gosodiadau gwreiddiol.\n"
 "Yna rhedwch y dewin eto."
 
-#: strings.hrc:56
+#: wizards/com/sun/star/wizards/common/strings.hrc:56
 msgctxt "RID_LETTERWIZARDDIALOG_START_1"
 msgid "Letter Wizard"
 msgstr "Dewin Llythyr"
 
-#: strings.hrc:57
+#: wizards/com/sun/star/wizards/common/strings.hrc:57
 msgctxt "RID_LETTERWIZARDDIALOG_START_2"
 msgid "Label9"
 msgstr "Label9"
 
-#: strings.hrc:58
+#: wizards/com/sun/star/wizards/common/strings.hrc:58
 msgctxt "RID_LETTERWIZARDDIALOG_START_3"
 msgid "~Business letter"
 msgstr "~Llythyr busnes"
 
-#: strings.hrc:59
+#: wizards/com/sun/star/wizards/common/strings.hrc:59
 msgctxt "RID_LETTERWIZARDDIALOG_START_4"
 msgid "~Formal personal letter"
 msgstr "~Llythyr personol ffurfiol"
 
-#: strings.hrc:60
+#: wizards/com/sun/star/wizards/common/strings.hrc:60
 msgctxt "RID_LETTERWIZARDDIALOG_START_5"
 msgid "~Personal letter"
 msgstr "Llythyr ~personol"
 
-#: strings.hrc:61
+#: wizards/com/sun/star/wizards/common/strings.hrc:61
 msgctxt "RID_LETTERWIZARDDIALOG_START_6"
 msgid "~Use letterhead paper with pre-printed elements"
 msgstr "~Defnyddio papur pennawd gydag elfennau wedi eu rhagargraffu"
 
-#: strings.hrc:62
+#: wizards/com/sun/star/wizards/common/strings.hrc:62
 msgctxt "RID_LETTERWIZARDDIALOG_START_7"
 msgid "~Logo"
 msgstr "~Logo"
 
-#: strings.hrc:63
+#: wizards/com/sun/star/wizards/common/strings.hrc:63
 msgctxt "RID_LETTERWIZARDDIALOG_START_8"
 msgid "Return address"
 msgstr "Cyfeiriad dychwelyd"
 
-#: strings.hrc:64
+#: wizards/com/sun/star/wizards/common/strings.hrc:64
 msgctxt "RID_LETTERWIZARDDIALOG_START_9"
 msgid "~Include footer"
 msgstr "~Cynnwys troedyn"
 
-#: strings.hrc:65
+#: wizards/com/sun/star/wizards/common/strings.hrc:65
 msgctxt "RID_LETTERWIZARDDIALOG_START_10"
 msgid "~Return address in envelope window"
 msgstr "~Cyfeiriad dychwelyd mewn ffenestr amlen"
 
-#: strings.hrc:66
+#: wizards/com/sun/star/wizards/common/strings.hrc:66
 msgctxt "RID_LETTERWIZARDDIALOG_START_11"
 msgid "~Logo"
 msgstr "~Logo"
 
-#: strings.hrc:67
+#: wizards/com/sun/star/wizards/common/strings.hrc:67
 msgctxt "RID_LETTERWIZARDDIALOG_START_12"
 msgid "~Return address in envelope window"
 msgstr "~Cyfeiriad dychwelyd mewn ffenestr amlen"
 
-#: strings.hrc:68
+#: wizards/com/sun/star/wizards/common/strings.hrc:68
 msgctxt "RID_LETTERWIZARDDIALOG_START_13"
 msgid "Letter Signs"
 msgstr "Arwydd Llythyren"
 
-#: strings.hrc:69
+#: wizards/com/sun/star/wizards/common/strings.hrc:69
 msgctxt "RID_LETTERWIZARDDIALOG_START_14"
 msgid "S~ubject line"
 msgstr "~Llinell pwnc"
 
-#: strings.hrc:70
+#: wizards/com/sun/star/wizards/common/strings.hrc:70
 msgctxt "RID_LETTERWIZARDDIALOG_START_15"
 msgid "Salu~tation"
 msgstr "~Cyfarchiad"
 
-#: strings.hrc:71
+#: wizards/com/sun/star/wizards/common/strings.hrc:71
 msgctxt "RID_LETTERWIZARDDIALOG_START_16"
 msgid "Fold ~marks"
 msgstr "~Marciau plygu"
 
-#: strings.hrc:72
+#: wizards/com/sun/star/wizards/common/strings.hrc:72
 msgctxt "RID_LETTERWIZARDDIALOG_START_17"
 msgid "~Complimentary close"
 msgstr "~Cyfarchion wrth gloi"
 
-#: strings.hrc:73
+#: wizards/com/sun/star/wizards/common/strings.hrc:73
 msgctxt "RID_LETTERWIZARDDIALOG_START_18"
 msgid "~Footer"
 msgstr "~Troedyn"
 
-#: strings.hrc:74
+#: wizards/com/sun/star/wizards/common/strings.hrc:74
 msgctxt "RID_LETTERWIZARDDIALOG_START_19"
 msgid "~Use user data for return address"
 msgstr "~Defnyddio data defnyddiwr fel cyfeiriad dychwelyd"
 
-#: strings.hrc:75
+#: wizards/com/sun/star/wizards/common/strings.hrc:75
 msgctxt "RID_LETTERWIZARDDIALOG_START_20"
 msgid "~New sender address:"
 msgstr "~Cyfeiriad anfonwr newydd:"
 
-#: strings.hrc:76
+#: wizards/com/sun/star/wizards/common/strings.hrc:76
 msgctxt "RID_LETTERWIZARDDIALOG_START_21"
 msgid "Use placeholders for ~recipient's address"
 msgstr "Defnyddio dalfan am gyfeiriad y ~derbynnydd"
 
-#: strings.hrc:77
+#: wizards/com/sun/star/wizards/common/strings.hrc:77
 msgctxt "RID_LETTERWIZARDDIALOG_START_22"
 msgid "Use address database for ~mail merge"
 msgstr "Defnyddio cronfa ddata cyfeiriad ar gyfer ~cyfuno post"
 
-#: strings.hrc:78
+#: wizards/com/sun/star/wizards/common/strings.hrc:78
 msgctxt "RID_LETTERWIZARDDIALOG_START_23"
 msgid "Include ~only on second and following pages"
 msgstr "Cynnwys dim ~ond ail dudalen a'r canlynol"
 
-#: strings.hrc:79
+#: wizards/com/sun/star/wizards/common/strings.hrc:79
 msgctxt "RID_LETTERWIZARDDIALOG_START_24"
 msgid "~Include page number"
 msgstr "~Cynnwys rhif tudalen"
 
-#: strings.hrc:80
+#: wizards/com/sun/star/wizards/common/strings.hrc:80
 msgctxt "RID_LETTERWIZARDDIALOG_START_25"
 msgid "Letter Template"
 msgstr "Templed Llythyr"
 
-#: strings.hrc:81
+#: wizards/com/sun/star/wizards/common/strings.hrc:81
 msgctxt "RID_LETTERWIZARDDIALOG_START_26"
 msgid "Create a ~letter from this template"
 msgstr "Creu ~llythyr o'r templed yma"
 
-#: strings.hrc:82
+#: wizards/com/sun/star/wizards/common/strings.hrc:82
 msgctxt "RID_LETTERWIZARDDIALOG_START_27"
 msgid "Make ~manual changes to this letter template"
 msgstr "Gwneud newidiadau â ~llawn i'r templed llythyr hwn"
 
-#: strings.hrc:83
+#: wizards/com/sun/star/wizards/common/strings.hrc:83
 msgctxt "RID_LETTERWIZARDDIALOG_START_28"
 msgid "Page design"
 msgstr "Cynllun tudalen"
 
-#: strings.hrc:84
+#: wizards/com/sun/star/wizards/common/strings.hrc:84
 msgctxt "RID_LETTERWIZARDDIALOG_START_29"
 msgid "Page design"
 msgstr "Cynllun tudalen"
 
-#: strings.hrc:85
+#: wizards/com/sun/star/wizards/common/strings.hrc:85
 msgctxt "RID_LETTERWIZARDDIALOG_START_30"
 msgid "Page design"
 msgstr "Cynllun tudalen"
 
-#: strings.hrc:86
+#: wizards/com/sun/star/wizards/common/strings.hrc:86
 msgctxt "RID_LETTERWIZARDDIALOG_START_31"
 msgid "This wizard helps you to create a letter template. You can then use the template as the basis for writing letters as often as desired."
 msgstr "Mae'r dewin yn eich cynorthwyo i greu templed llythyr. Gallwch ddefnyddio'r templed fel sail ar gyfer ysgrifennu llythyron mor aml a bo angen."
 
-#: strings.hrc:87
+#: wizards/com/sun/star/wizards/common/strings.hrc:87
 msgctxt "RID_LETTERWIZARDDIALOG_START_32"
 msgid "~Height:"
 msgstr "~Uchder:"
 
-#: strings.hrc:88
+#: wizards/com/sun/star/wizards/common/strings.hrc:88
 msgctxt "RID_LETTERWIZARDDIALOG_START_33"
 msgid "~Width:"
 msgstr "~Lled:"
 
-#: strings.hrc:89
+#: wizards/com/sun/star/wizards/common/strings.hrc:89
 msgctxt "RID_LETTERWIZARDDIALOG_START_34"
 msgid "S~pacing to left margin:"
 msgstr "~Bwlch i'r ymyl chwith:"
 
-#: strings.hrc:90
+#: wizards/com/sun/star/wizards/common/strings.hrc:90
 msgctxt "RID_LETTERWIZARDDIALOG_START_35"
 msgid "Spacing ~to top margin:"
 msgstr "Bylchu i'r ymyl ~brig:"
 
-#: strings.hrc:91
+#: wizards/com/sun/star/wizards/common/strings.hrc:91
 msgctxt "RID_LETTERWIZARDDIALOG_START_36"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: strings.hrc:92
+#: wizards/com/sun/star/wizards/common/strings.hrc:92
 msgctxt "RID_LETTERWIZARDDIALOG_START_37"
 msgid "Width:"
 msgstr "Lled:"
 
-#: strings.hrc:93
+#: wizards/com/sun/star/wizards/common/strings.hrc:93
 msgctxt "RID_LETTERWIZARDDIALOG_START_38"
 msgid "S~pacing to left margin:"
 msgstr "~Bwlch i'r ymyl chwith:"
 
-#: strings.hrc:94
+#: wizards/com/sun/star/wizards/common/strings.hrc:94
 msgctxt "RID_LETTERWIZARDDIALOG_START_39"
 msgid "Spacing ~to top margin:"
 msgstr "Bylchu i'r ymyl ~brig:"
 
-#: strings.hrc:95
+#: wizards/com/sun/star/wizards/common/strings.hrc:95
 msgctxt "RID_LETTERWIZARDDIALOG_START_40"
 msgid "Height:"
 msgstr "Uchder:"
 
-#: strings.hrc:96
+#: wizards/com/sun/star/wizards/common/strings.hrc:96
 msgctxt "RID_LETTERWIZARDDIALOG_START_42"
 msgid "Sender's address"
 msgstr "Cyfeiriad yr anfonwr"
 
-#: strings.hrc:97
+#: wizards/com/sun/star/wizards/common/strings.hrc:97
 msgctxt "RID_LETTERWIZARDDIALOG_START_43"
 msgid "Name:"
 msgstr "Enw:"
 
-#: strings.hrc:98
+#: wizards/com/sun/star/wizards/common/strings.hrc:98
 msgctxt "RID_LETTERWIZARDDIALOG_START_44"
 msgid "Street:"
 msgstr "Stryd:"
 
-#: strings.hrc:99
+#: wizards/com/sun/star/wizards/common/strings.hrc:99
 msgctxt "RID_LETTERWIZARDDIALOG_START_45"
 msgid "ZIP code/State/City:"
 msgstr "Cod Post/Sir/Talaith/Tref/Dinas:"
 
-#: strings.hrc:100
+#: wizards/com/sun/star/wizards/common/strings.hrc:100
 msgctxt "RID_LETTERWIZARDDIALOG_START_46"
 msgid "Recipient's address"
 msgstr "Cyfeiriad y derbynnydd"
 
-#: strings.hrc:101
+#: wizards/com/sun/star/wizards/common/strings.hrc:101
 msgctxt "RID_LETTERWIZARDDIALOG_START_47"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: strings.hrc:102
+#: wizards/com/sun/star/wizards/common/strings.hrc:102
 msgctxt "RID_LETTERWIZARDDIALOG_START_48"
 msgid "This wizard creates a letter template which enables you to create multiple letters with the same layout and settings."
 msgstr "Mae'r dewin yma'n creu templed llythyr fydd yn galluogi i chi greu llythyron lluosog gyda'r un cynllun a gosodiadau."
 
-#: strings.hrc:103
+#: wizards/com/sun/star/wizards/common/strings.hrc:103
 msgctxt "RID_LETTERWIZARDDIALOG_START_49"
 msgid "To create another new letter out of the template just navigate to the template location and double-click it."
 msgstr "I greu llythyr arall newydd o'r templed ewch i leoliad y templed a rhoi clic dwbl arno."
 
-#: strings.hrc:104
+#: wizards/com/sun/star/wizards/common/strings.hrc:104
 msgctxt "RID_LETTERWIZARDDIALOG_START_50"
 msgid "Template name:"
 msgstr "Enw'r templed:"
 
-#: strings.hrc:105
+#: wizards/com/sun/star/wizards/common/strings.hrc:105
 msgctxt "RID_LETTERWIZARDDIALOG_START_51"
 msgid "Location and file name:"
 msgstr "Lleoliad ac enw'r ffeil:"
 
-#: strings.hrc:106
+#: wizards/com/sun/star/wizards/common/strings.hrc:106
 msgctxt "RID_LETTERWIZARDDIALOG_START_52"
 msgid "How do you want to proceed?"
 msgstr "Sut hoffech chi barhau?"
 
-#: strings.hrc:107
+#: wizards/com/sun/star/wizards/common/strings.hrc:107
 msgctxt "RID_LETTERWIZARDDIALOG_START_53"
 msgid "Please choose the type of letter and page design"
 msgstr "Dewiswch y math o lythyr o'r cynllun tudalen"
 
-#: strings.hrc:108
+#: wizards/com/sun/star/wizards/common/strings.hrc:108
 msgctxt "RID_LETTERWIZARDDIALOG_START_54"
 msgid "Select the items to be printed"
 msgstr "Dewis eitem i'w argraffu"
 
-#: strings.hrc:109
+#: wizards/com/sun/star/wizards/common/strings.hrc:109
 msgctxt "RID_LETTERWIZARDDIALOG_START_55"
 msgid "Specify items already on your letterhead paper"
 msgstr "Pennu eitemau sydd ar eich papur pennawd yn barod"
 
-#: strings.hrc:110
+#: wizards/com/sun/star/wizards/common/strings.hrc:110
 msgctxt "RID_LETTERWIZARDDIALOG_START_56"
 msgid "Specify the sender and recipient information"
 msgstr "Pennu'r anfonwr a manylion y derbynnydd"
 
-#: strings.hrc:111
+#: wizards/com/sun/star/wizards/common/strings.hrc:111
 msgctxt "RID_LETTERWIZARDDIALOG_START_57"
 msgid "Fill in the information you would like in the footer"
 msgstr "Llanwch fanylion y troedyn"
 
-#: strings.hrc:112
+#: wizards/com/sun/star/wizards/common/strings.hrc:112
 msgctxt "RID_LETTERWIZARDDIALOG_START_58"
 msgid "Please specify last settings"
 msgstr "Enwch eich gosodiadau olaf"
 
-#: strings.hrc:113
+#: wizards/com/sun/star/wizards/common/strings.hrc:113
 msgctxt "RID_LETTERWIZARDDIALOG_START_59"
 msgid "Subject:"
 msgstr "Pwnc:"
 
-#: strings.hrc:114
+#: wizards/com/sun/star/wizards/common/strings.hrc:114
 msgctxt "RID_LETTERWIZARDDIALOG_START_60"
 msgid "Elegant"
 msgstr "Coeth"
 
-#: strings.hrc:115
+#: wizards/com/sun/star/wizards/common/strings.hrc:115
 msgctxt "RID_LETTERWIZARDDIALOG_START_61"
 msgid "Modern"
 msgstr "Modern"
 
-#: strings.hrc:116
+#: wizards/com/sun/star/wizards/common/strings.hrc:116
 msgctxt "RID_LETTERWIZARDDIALOG_START_62"
 msgid "Office"
 msgstr "Swyddfa"
 
-#: strings.hrc:117
+#: wizards/com/sun/star/wizards/common/strings.hrc:117
 msgctxt "RID_LETTERWIZARDDIALOG_START_63"
 msgid "Bottle"
 msgstr "Potel"
 
-#: strings.hrc:118
+#: wizards/com/sun/star/wizards/common/strings.hrc:118
 msgctxt "RID_LETTERWIZARDDIALOG_START_64"
 msgid "Mail"
 msgstr "E-bost"
 
-#: strings.hrc:119
+#: wizards/com/sun/star/wizards/common/strings.hrc:119
 msgctxt "RID_LETTERWIZARDDIALOG_START_65"
 msgid "Marine"
 msgstr "Morwrol"
 
-#: strings.hrc:120
+#: wizards/com/sun/star/wizards/common/strings.hrc:120
 msgctxt "RID_LETTERWIZARDDIALOG_START_66"
 msgid "Red Line"
 msgstr "Llinell Goch"
 
-#: strings.hrc:123
+#: wizards/com/sun/star/wizards/common/strings.hrc:123
 msgctxt "RID_LETTERWIZARDSALUTATION_START_1"
 msgid "To Whom it May Concern"
 msgstr "At"
 
-#: strings.hrc:124
+#: wizards/com/sun/star/wizards/common/strings.hrc:124
 msgctxt "RID_LETTERWIZARDSALUTATION_START_2"
 msgid "Dear Sir or Madam"
 msgstr "Annwyl Syr neu Fadam"
 
-#: strings.hrc:125
+#: wizards/com/sun/star/wizards/common/strings.hrc:125
 msgctxt "RID_LETTERWIZARDSALUTATION_START_3"
 msgid "Hello"
 msgstr "Helo"
 
-#: strings.hrc:128
+#: wizards/com/sun/star/wizards/common/strings.hrc:128
 msgctxt "RID_LETTERWIZARDGREETING_START_1"
 msgid "Sincerely"
 msgstr "Yn gywir"
 
-#: strings.hrc:129
+#: wizards/com/sun/star/wizards/common/strings.hrc:129
 msgctxt "RID_LETTERWIZARDGREETING_START_2"
 msgid "Best regards"
 msgstr "Cofion gorau"
 
-#: strings.hrc:130
+#: wizards/com/sun/star/wizards/common/strings.hrc:130
 msgctxt "RID_LETTERWIZARDGREETING_START_3"
 msgid "Cheers"
 msgstr "Hwyl"
 
-#: strings.hrc:133
+#: wizards/com/sun/star/wizards/common/strings.hrc:133
 msgctxt "RID_LETTERWIZARDROADMAP_START_1"
 msgid "Page design"
 msgstr "Cynllun tudalen"
 
-#: strings.hrc:134
+#: wizards/com/sun/star/wizards/common/strings.hrc:134
 msgctxt "RID_LETTERWIZARDROADMAP_START_2"
 msgid "Letterhead layout"
 msgstr "Cynllun pen llythyr"
 
-#: strings.hrc:135
+#: wizards/com/sun/star/wizards/common/strings.hrc:135
 msgctxt "RID_LETTERWIZARDROADMAP_START_3"
 msgid "Printed items"
 msgstr "Eitemau argraffwyd"
 
-#: strings.hrc:136
+#: wizards/com/sun/star/wizards/common/strings.hrc:136
 msgctxt "RID_LETTERWIZARDROADMAP_START_4"
 msgid "Recipient and sender"
 msgstr "Derbynnydd ac anfonwr"
 
-#: strings.hrc:137
+#: wizards/com/sun/star/wizards/common/strings.hrc:137
 msgctxt "RID_LETTERWIZARDROADMAP_START_5"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: strings.hrc:138
+#: wizards/com/sun/star/wizards/common/strings.hrc:138
 msgctxt "RID_LETTERWIZARDROADMAP_START_6"
 msgid "Name and location"
 msgstr "Enw a lleoliad"
 
-#: strings.hrc:141
+#: wizards/com/sun/star/wizards/common/strings.hrc:141
 msgctxt "RID_FAXWIZARDDIALOG_START_1"
 msgid "Fax Wizard"
 msgstr "Dewin Ffacs"
 
-#: strings.hrc:142
+#: wizards/com/sun/star/wizards/common/strings.hrc:142
 msgctxt "RID_FAXWIZARDDIALOG_START_2"
 msgid "Label9"
 msgstr "Label9"
 
-#: strings.hrc:143
+#: wizards/com/sun/star/wizards/common/strings.hrc:143
 msgctxt "RID_FAXWIZARDDIALOG_START_3"
 msgid "~Business Fax"
 msgstr "~Ffacs Busnes"
 
-#: strings.hrc:144
+#: wizards/com/sun/star/wizards/common/strings.hrc:144
 msgctxt "RID_FAXWIZARDDIALOG_START_4"
 msgid "~Personal Fax"
 msgstr "Ffacs ~Personol"
 
-#: strings.hrc:145
+#: wizards/com/sun/star/wizards/common/strings.hrc:145
 msgctxt "RID_FAXWIZARDDIALOG_START_5"
 msgid "~Logo"
 msgstr "~Logo"
 
-#: strings.hrc:146
+#: wizards/com/sun/star/wizards/common/strings.hrc:146
 msgctxt "RID_FAXWIZARDDIALOG_START_6"
 msgid "S~ubject line"
 msgstr "~Llinell pwnc"
 
-#: strings.hrc:147
+#: wizards/com/sun/star/wizards/common/strings.hrc:147
 msgctxt "RID_FAXWIZARDDIALOG_START_7"
 msgid "S~alutation"
 msgstr "C~yfarchiad"
 
-#: strings.hrc:148
+#: wizards/com/sun/star/wizards/common/strings.hrc:148
 msgctxt "RID_FAXWIZARDDIALOG_START_8"
 msgid "~Complimentary close"
 msgstr "~Cyfarchion wrth gloi"
 
-#: strings.hrc:149
+#: wizards/com/sun/star/wizards/common/strings.hrc:149
 msgctxt "RID_FAXWIZARDDIALOG_START_9"
 msgid "~Footer"
 msgstr "~Troedyn"
 
-#: strings.hrc:150
+#: wizards/com/sun/star/wizards/common/strings.hrc:150
 msgctxt "RID_FAXWIZARDDIALOG_START_10"
 msgid "~Use user data for return address"
 msgstr "~Defnyddio data defnyddiwr fel cyfeiriad dychwelyd"
 
-#: strings.hrc:151
+#: wizards/com/sun/star/wizards/common/strings.hrc:151
 msgctxt "RID_FAXWIZARDDIALOG_START_11"
 msgid "~New return address"
 msgstr "~Cyfeiriad dychwelyd newydd"
 
-#: strings.hrc:152
+#: wizards/com/sun/star/wizards/common/strings.hrc:152
 msgctxt "RID_FAXWIZARDDIALOG_START_12"
 msgid "My Fax Template"
 msgstr "Templed Fy Ffacs"
 
-#: strings.hrc:153
+#: wizards/com/sun/star/wizards/common/strings.hrc:153
 msgctxt "RID_FAXWIZARDDIALOG_START_13"
 msgid "Create a ~fax from this template"
 msgstr "Creu ~ffacs o'r templed"
 
-#: strings.hrc:154
+#: wizards/com/sun/star/wizards/common/strings.hrc:154
 msgctxt "RID_FAXWIZARDDIALOG_START_14"
 msgid "Make ~manual changes to this fax template"
 msgstr "Gwneud newidiadau gyda ~llaw i'r templed ffacs"
 
-#: strings.hrc:155
+#: wizards/com/sun/star/wizards/common/strings.hrc:155
 msgctxt "RID_FAXWIZARDDIALOG_START_15"
 msgid "Page design"
 msgstr "Cynllun tudalen"
 
-#: strings.hrc:156
+#: wizards/com/sun/star/wizards/common/strings.hrc:156
 msgctxt "RID_FAXWIZARDDIALOG_START_16"
 msgid "Page design"
 msgstr "Cynllun tudalen"
 
-#: strings.hrc:157
+#: wizards/com/sun/star/wizards/common/strings.hrc:157
 msgctxt "RID_FAXWIZARDDIALOG_START_17"
 msgid "This wizard helps you to create a fax template. The template can then be used to create a fax whenever needed."
 msgstr "Mae'r dewin yn eich cynorthwyo i greu templed ffacs. Bydd y templed ar gael i greu ffacs yn ôl yr angen."
 
-#: strings.hrc:158
+#: wizards/com/sun/star/wizards/common/strings.hrc:158
 msgctxt "RID_FAXWIZARDDIALOG_START_18"
 msgid "Return address"
 msgstr "Cyfeiriad dychwelyd"
 
-#: strings.hrc:159
+#: wizards/com/sun/star/wizards/common/strings.hrc:159
 msgctxt "RID_FAXWIZARDDIALOG_START_19"
 msgid "Name:"
 msgstr "Enw:"
 
-#: strings.hrc:160
+#: wizards/com/sun/star/wizards/common/strings.hrc:160
 msgctxt "RID_FAXWIZARDDIALOG_START_20"
 msgid "Street:"
 msgstr "Stryd:"
 
-#: strings.hrc:161
+#: wizards/com/sun/star/wizards/common/strings.hrc:161
 msgctxt "RID_FAXWIZARDDIALOG_START_21"
 msgid "ZIP code/State/City:"
 msgstr "Cod Post/Sir/Talaith/Tref/Dinas:"
 
-#: strings.hrc:162
+#: wizards/com/sun/star/wizards/common/strings.hrc:162
 msgctxt "RID_FAXWIZARDDIALOG_START_22"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: strings.hrc:163
+#: wizards/com/sun/star/wizards/common/strings.hrc:163
 msgctxt "RID_FAXWIZARDDIALOG_START_23"
 msgid "This wizard creates a fax template which enables you to create multiple faxes with the same layout and settings."
 msgstr "Mae'r dewin yma'n creu templed ffacs fydd yn galluogi i chi greu ffacs lluosog gyda'r un cynllun a gosodiadau."
 
-#: strings.hrc:164
+#: wizards/com/sun/star/wizards/common/strings.hrc:164
 msgctxt "RID_FAXWIZARDDIALOG_START_24"
 msgid "To create another new fax out of the template, go to the location where you saved the template and double-click the file."
 msgstr "I greu ffacs newydd o'r templed, ewch i leoliad lle gadwyd y templed a rhoi clic dwbl i'r ffeil."
 
-#: strings.hrc:165
+#: wizards/com/sun/star/wizards/common/strings.hrc:165
 msgctxt "RID_FAXWIZARDDIALOG_START_25"
 msgid "Template Name:"
 msgstr "Enw'r Templed:"
 
-#: strings.hrc:166
+#: wizards/com/sun/star/wizards/common/strings.hrc:166
 msgctxt "RID_FAXWIZARDDIALOG_START_26"
 msgid "Location and file name:"
 msgstr "Lleoliad ac enw'r ffeil:"
 
-#: strings.hrc:167
+#: wizards/com/sun/star/wizards/common/strings.hrc:167
 msgctxt "RID_FAXWIZARDDIALOG_START_27"
 msgid "What do you want to do next?"
 msgstr "Beth hoffech chi wneud nesaf?"
 
-#: strings.hrc:168
+#: wizards/com/sun/star/wizards/common/strings.hrc:168
 msgctxt "RID_FAXWIZARDDIALOG_START_28"
 msgid "Choose the type of fax and a page design"
 msgstr "Dewiswch y math o ffacs a chynllun tudalen"
 
-#: strings.hrc:169
+#: wizards/com/sun/star/wizards/common/strings.hrc:169
 msgctxt "RID_FAXWIZARDDIALOG_START_29"
 msgid "Select items to include in the fax template"
 msgstr "Dewiswch eitemau i'w cynnwys mewn templed ffacs"
 
-#: strings.hrc:170
+#: wizards/com/sun/star/wizards/common/strings.hrc:170
 msgctxt "RID_FAXWIZARDDIALOG_START_30"
 msgid "Specify sender and recipient information"
 msgstr "Enwi anfonwr a manylion defnyddiwr"
 
-#: strings.hrc:171
+#: wizards/com/sun/star/wizards/common/strings.hrc:171
 msgctxt "RID_FAXWIZARDDIALOG_START_31"
 msgid "Enter text for the footer"
 msgstr "Rhoi testun y troedyn"
 
-#: strings.hrc:172
+#: wizards/com/sun/star/wizards/common/strings.hrc:172
 msgctxt "RID_FAXWIZARDDIALOG_START_32"
 msgid "Choose a name and save the template"
 msgstr "Dewiswch enw a chadw'r templed"
 
-#: strings.hrc:173
+#: wizards/com/sun/star/wizards/common/strings.hrc:173
 msgctxt "RID_FAXWIZARDDIALOG_START_33"
 msgid "Include ~only on second and following pages"
 msgstr "Cynnwys dim ~ond ail dudalen a'r canlynol"
 
-#: strings.hrc:174
+#: wizards/com/sun/star/wizards/common/strings.hrc:174
 msgctxt "RID_FAXWIZARDDIALOG_START_34"
 msgid "~Include page number"
 msgstr "~Cynnwys rhif tudalen"
 
-#: strings.hrc:175
+#: wizards/com/sun/star/wizards/common/strings.hrc:175
 msgctxt "RID_FAXWIZARDDIALOG_START_35"
 msgid "~Date"
 msgstr "~Dyddiad"
 
-#: strings.hrc:176
+#: wizards/com/sun/star/wizards/common/strings.hrc:176
 msgctxt "RID_FAXWIZARDDIALOG_START_36"
 msgid "~Type of message"
 msgstr "~Math o neges"
 
-#: strings.hrc:177
+#: wizards/com/sun/star/wizards/common/strings.hrc:177
 msgctxt "RID_FAXWIZARDDIALOG_START_37"
 msgid "Fax Number:"
 msgstr "Rhif Ffacs:"
 
-#: strings.hrc:178
+#: wizards/com/sun/star/wizards/common/strings.hrc:178
 msgctxt "RID_FAXWIZARDDIALOG_START_38"
 msgid "Use placeholders for ~recipient's address"
 msgstr "Defnyddio dalfan am gyfeiriad y ~derbynnydd"
 
-#: strings.hrc:179
+#: wizards/com/sun/star/wizards/common/strings.hrc:179
 msgctxt "RID_FAXWIZARDDIALOG_START_39"
 msgid "Use address database for ~mail merge"
 msgstr "Defnyddio cronfa ddata cyfeiriad ar gyfer ~cyfuno post"
 
-#: strings.hrc:180
+#: wizards/com/sun/star/wizards/common/strings.hrc:180
 msgctxt "RID_FAXWIZARDDIALOG_START_40"
 msgid "~New return address"
 msgstr "~Cyfeiriad dychwelyd newydd"
 
-#: strings.hrc:181
+#: wizards/com/sun/star/wizards/common/strings.hrc:181
 msgctxt "RID_FAXWIZARDDIALOG_START_41"
 msgid "To:"
 msgstr "At:"
 
-#: strings.hrc:182
+#: wizards/com/sun/star/wizards/common/strings.hrc:182
 msgctxt "RID_FAXWIZARDDIALOG_START_42"
 msgid "From:"
 msgstr "Oddi wrth:"
 
-#: strings.hrc:183
+#: wizards/com/sun/star/wizards/common/strings.hrc:183
 msgctxt "RID_FAXWIZARDDIALOG_START_43"
 msgid "Fax:"
 msgstr "Ffacs:"
 
-#: strings.hrc:184
+#: wizards/com/sun/star/wizards/common/strings.hrc:184
 msgctxt "RID_FAXWIZARDDIALOG_START_44"
 msgid "Tel:"
 msgstr "Ffôn:"
 
-#: strings.hrc:185
+#: wizards/com/sun/star/wizards/common/strings.hrc:185
 msgctxt "RID_FAXWIZARDDIALOG_START_45"
 msgid "E-mail:"
 msgstr "E-bost:"
 
-#: strings.hrc:186
+#: wizards/com/sun/star/wizards/common/strings.hrc:186
 msgctxt "RID_FAXWIZARDDIALOG_START_46"
 msgid "This template consists of"
 msgstr "Mae'r templed yn cynnwys"
 
-#: strings.hrc:187
+#: wizards/com/sun/star/wizards/common/strings.hrc:187
 msgctxt "RID_FAXWIZARDDIALOG_START_47"
 msgid "page"
 msgstr "tudalennau"
 
-#: strings.hrc:188
+#: wizards/com/sun/star/wizards/common/strings.hrc:188
 msgctxt "RID_FAXWIZARDDIALOG_START_48"
 msgid "Please inform us if transmission errors occur."
 msgstr "Dywedwch wrthym os fydd gwall trosglwyddo yn digwydd."
 
-#: strings.hrc:189
+#: wizards/com/sun/star/wizards/common/strings.hrc:189
 msgctxt "RID_FAXWIZARDDIALOG_START_49"
 msgid "Bottle"
 msgstr "Potel"
 
-#: strings.hrc:190
+#: wizards/com/sun/star/wizards/common/strings.hrc:190
 msgctxt "RID_FAXWIZARDDIALOG_START_50"
 msgid "Lines"
 msgstr "Llinellau"
 
-#: strings.hrc:191
+#: wizards/com/sun/star/wizards/common/strings.hrc:191
 msgctxt "RID_FAXWIZARDDIALOG_START_51"
 msgid "Marine"
 msgstr "Morwrol"
 
-#: strings.hrc:192
+#: wizards/com/sun/star/wizards/common/strings.hrc:192
 msgctxt "RID_FAXWIZARDDIALOG_START_52"
 msgid "Classic Fax"
 msgstr "Ffacs Clasurol"
 
-#: strings.hrc:193
+#: wizards/com/sun/star/wizards/common/strings.hrc:193
 msgctxt "RID_FAXWIZARDDIALOG_START_53"
 msgid "Classic Fax from Private"
 msgstr "Ffacs Clasurol o Preifat"
 
-#: strings.hrc:194
+#: wizards/com/sun/star/wizards/common/strings.hrc:194
 msgctxt "RID_FAXWIZARDDIALOG_START_54"
 msgid "Modern Fax"
 msgstr "Ffacs Modern"
 
-#: strings.hrc:195
+#: wizards/com/sun/star/wizards/common/strings.hrc:195
 msgctxt "RID_FAXWIZARDDIALOG_START_55"
 msgid "Modern Fax from Private"
 msgstr "Ffacs Modern o Preifat"
 
-#: strings.hrc:196
+#: wizards/com/sun/star/wizards/common/strings.hrc:196
 msgctxt "RID_FAXWIZARDDIALOG_START_56"
 msgid "Fax"
 msgstr "Ffacs"
 
-#: strings.hrc:199
+#: wizards/com/sun/star/wizards/common/strings.hrc:199
 msgctxt "RID_FAXWIZARDCOMMUNICATION_START_1"
 msgid "Important Information!"
 msgstr "Gwybodaeth Bwysig!"
 
-#: strings.hrc:200
+#: wizards/com/sun/star/wizards/common/strings.hrc:200
 msgctxt "RID_FAXWIZARDCOMMUNICATION_START_2"
 msgid "For your information"
 msgstr "Er gwybodaeth"
 
-#: strings.hrc:201
+#: wizards/com/sun/star/wizards/common/strings.hrc:201
 msgctxt "RID_FAXWIZARDCOMMUNICATION_START_3"
 msgid "News!"
 msgstr "Newyddion!"
 
-#: strings.hrc:204
+#: wizards/com/sun/star/wizards/common/strings.hrc:204
 msgctxt "RID_FAXWIZARDSALUTATION_START_1"
 msgid "To whom it may concern,"
 msgstr "At"
 
-#: strings.hrc:205
+#: wizards/com/sun/star/wizards/common/strings.hrc:205
 msgctxt "RID_FAXWIZARDSALUTATION_START_2"
 msgid "Dear Sir or Madam,"
 msgstr "Annwyl Syr neu Fadam,"
 
-#: strings.hrc:206
+#: wizards/com/sun/star/wizards/common/strings.hrc:206
 msgctxt "RID_FAXWIZARDSALUTATION_START_3"
 msgid "Hello,"
 msgstr "Helo,"
 
-#: strings.hrc:207
+#: wizards/com/sun/star/wizards/common/strings.hrc:207
 msgctxt "RID_FAXWIZARDSALUTATION_START_4"
 msgid "Hi,"
 msgstr "Smae,"
 
-#: strings.hrc:210
+#: wizards/com/sun/star/wizards/common/strings.hrc:210
 msgctxt "RID_FAXWIZARDGREETING_START_1"
 msgid "Sincerely"
 msgstr "Yn gywir"
 
-#: strings.hrc:211
+#: wizards/com/sun/star/wizards/common/strings.hrc:211
 msgctxt "RID_FAXWIZARDGREETING_START_2"
 msgid "Yours faithfully"
 msgstr "Yr eiddoch yn gywir"
 
-#: strings.hrc:212
+#: wizards/com/sun/star/wizards/common/strings.hrc:212
 msgctxt "RID_FAXWIZARDGREETING_START_3"
 msgid "Regards"
 msgstr "Cofion"
 
-#: strings.hrc:213
+#: wizards/com/sun/star/wizards/common/strings.hrc:213
 msgctxt "RID_FAXWIZARDGREETING_START_4"
 msgid "Love"
 msgstr "Cariad"
 
-#: strings.hrc:216
+#: wizards/com/sun/star/wizards/common/strings.hrc:216
 msgctxt "RID_FAXWIZARDROADMAP_START_1"
 msgid "Page design"
 msgstr "Cynllun tudalen"
 
-#: strings.hrc:217
+#: wizards/com/sun/star/wizards/common/strings.hrc:217
 msgctxt "RID_FAXWIZARDROADMAP_START_2"
 msgid "Items to include"
 msgstr "Eitemau i'w cynnwys"
 
-#: strings.hrc:218
+#: wizards/com/sun/star/wizards/common/strings.hrc:218
 msgctxt "RID_FAXWIZARDROADMAP_START_3"
 msgid "Sender and Recipient"
 msgstr "Anfonwr a Derbynnydd"
 
-#: strings.hrc:219
+#: wizards/com/sun/star/wizards/common/strings.hrc:219
 msgctxt "RID_FAXWIZARDROADMAP_START_4"
 msgid "Footer"
 msgstr "Troedyn"
 
-#: strings.hrc:220
+#: wizards/com/sun/star/wizards/common/strings.hrc:220
 msgctxt "RID_FAXWIZARDROADMAP_START_5"
 msgid "Name and location"
 msgstr "Enw a lleoliad"
 
-#: strings.hrc:223
+#: wizards/com/sun/star/wizards/common/strings.hrc:223
 msgctxt "RID_AGENDAWIZARDDIALOG_START_1"
 msgid "Agenda Wizard"
 msgstr "Dewin Agenda"
 
-#: strings.hrc:224
+#: wizards/com/sun/star/wizards/common/strings.hrc:224
 msgctxt "RID_AGENDAWIZARDDIALOG_START_2"
 msgid "Make ~manual changes to this agenda template"
 msgstr "Gwneud newidiadau â ~llaw i'r templed agenda hwn"
 
-#: strings.hrc:225
+#: wizards/com/sun/star/wizards/common/strings.hrc:225
 msgctxt "RID_AGENDAWIZARDDIALOG_START_3"
 msgid "Template name:"
 msgstr "Enw'r templed:"
 
-#: strings.hrc:226
+#: wizards/com/sun/star/wizards/common/strings.hrc:226
 msgctxt "RID_AGENDAWIZARDDIALOG_START_4"
 msgid "Location and file name:"
 msgstr "Lleoliad ac enw'r ffeil:"
 
-#: strings.hrc:227
+#: wizards/com/sun/star/wizards/common/strings.hrc:227
 msgctxt "RID_AGENDAWIZARDDIALOG_START_5"
 msgid "What do you want to do next?"
 msgstr "Beth hoffech chi wneud nesaf?"
 
-#: strings.hrc:228
+#: wizards/com/sun/star/wizards/common/strings.hrc:228
 msgctxt "RID_AGENDAWIZARDDIALOG_START_6"
 msgid "Please choose the page design for the agenda"
 msgstr "Dewiswch gynllun tudalen ar gyfer yr agenda"
 
-#: strings.hrc:229
+#: wizards/com/sun/star/wizards/common/strings.hrc:229
 msgctxt "RID_AGENDAWIZARDDIALOG_START_7"
 msgid "Please select the headings you wish to include in your agenda template"
 msgstr "Dewiswch benawdau i'w cynnwys yn eich templed agenda"
 
-#: strings.hrc:230
+#: wizards/com/sun/star/wizards/common/strings.hrc:230
 msgctxt "RID_AGENDAWIZARDDIALOG_START_8"
 msgid "Please enter general information for the event"
 msgstr "Rhowch fanylion cyffredinol am y digwyddiad"
 
-#: strings.hrc:231
+#: wizards/com/sun/star/wizards/common/strings.hrc:231
 msgctxt "RID_AGENDAWIZARDDIALOG_START_9"
 msgid "Please specify items for the agenda"
 msgstr "Rhowch eitemau ar gyfer yr agenda"
 
-#: strings.hrc:232
+#: wizards/com/sun/star/wizards/common/strings.hrc:232
 msgctxt "RID_AGENDAWIZARDDIALOG_START_10"
 msgid "Please select the names you wish to include in your agenda template"
 msgstr "Dewiswch enwau i'w cynnwys yn eich templed agenda"
 
-#: strings.hrc:233
+#: wizards/com/sun/star/wizards/common/strings.hrc:233
 msgctxt "RID_AGENDAWIZARDDIALOG_START_11"
 msgid "Choose a name and save the template"
 msgstr "Dewiswch enw a chadw'r templed"
 
-#: strings.hrc:234
+#: wizards/com/sun/star/wizards/common/strings.hrc:234
 msgctxt "RID_AGENDAWIZARDDIALOG_START_12"
 msgid "Include form for recording minutes"
 msgstr "Cynnwys ffurflen i gofnodi cofnodion"
 
-#: strings.hrc:235
+#: wizards/com/sun/star/wizards/common/strings.hrc:235
 msgctxt "RID_AGENDAWIZARDDIALOG_START_13"
 msgid "This wizard helps you to create an agenda template. The template can then be used to create an agenda whenever needed."
 msgstr "Mae'r dewin yn eich cynorthwyo i greu templed agenda. Bydd y templed ar gael i greu agenda yn ôl yr angen."
 
-#: strings.hrc:236
+#: wizards/com/sun/star/wizards/common/strings.hrc:236
 msgctxt "RID_AGENDAWIZARDDIALOG_START_14"
 msgid "Time:"
 msgstr "Amser:"
 
-#: strings.hrc:237
+#: wizards/com/sun/star/wizards/common/strings.hrc:237
 msgctxt "RID_AGENDAWIZARDDIALOG_START_15"
 msgid "Name:"
 msgstr "Enw:"
 
-#: strings.hrc:238
+#: wizards/com/sun/star/wizards/common/strings.hrc:238
 msgctxt "RID_AGENDAWIZARDDIALOG_START_16"
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: strings.hrc:239
+#: wizards/com/sun/star/wizards/common/strings.hrc:239
 msgctxt "RID_AGENDAWIZARDDIALOG_START_17"
 msgid "Placeholders will be used in empty fields. You can replace placeholders with text later."
 msgstr "Bydd dalfannau yn cael eu defnyddio mewn meysydd gwag. Bydd modd newid i destun yn nes ymlaen."
 
-#: strings.hrc:240
+#: wizards/com/sun/star/wizards/common/strings.hrc:240
 msgctxt "RID_AGENDAWIZARDDIALOG_START_18"
 msgid "..."
 msgstr "..."
 
-#: strings.hrc:241
+#: wizards/com/sun/star/wizards/common/strings.hrc:241
 msgctxt "RID_AGENDAWIZARDDIALOG_START_19"
 msgid "Create an ~agenda from this template"
 msgstr "Crëwch ~agenda o'r templed yma"
 
-#: strings.hrc:242
+#: wizards/com/sun/star/wizards/common/strings.hrc:242
 msgctxt "RID_AGENDAWIZARDDIALOG_START_20"
 msgid "To create a new agenda out of the template, go to the location where you saved the template and double-click the file."
 msgstr "I greu agenda newydd o'r templed, ewch i leoliad lle gadwyd y templed a rhoi clic dwbl i'r ffeil."
 
-#: strings.hrc:243
+#: wizards/com/sun/star/wizards/common/strings.hrc:243
 msgctxt "RID_AGENDAWIZARDDIALOG_START_21"
 msgid "Agenda item"
 msgstr "Eitem i'r agenda"
 
-#: strings.hrc:244
+#: wizards/com/sun/star/wizards/common/strings.hrc:244
 msgctxt "RID_AGENDAWIZARDDIALOG_START_22"
 msgid "Responsible"
 msgstr "Cyfrifol"
 
-#: strings.hrc:245
+#: wizards/com/sun/star/wizards/common/strings.hrc:245
 msgctxt "RID_AGENDAWIZARDDIALOG_START_23"
 msgid "Duration"
 msgstr "Hyd"
 
-#: strings.hrc:246
+#: wizards/com/sun/star/wizards/common/strings.hrc:246
 msgctxt "RID_AGENDAWIZARDDIALOG_START_24"
 msgid "Meeting called by"
 msgstr "Galwyd y cyfarfod gan"
 
-#: strings.hrc:247
+#: wizards/com/sun/star/wizards/common/strings.hrc:247
 msgctxt "RID_AGENDAWIZARDDIALOG_START_25"
 msgid "Chairperson"
 msgstr "Cadeirydd"
 
-#: strings.hrc:248
+#: wizards/com/sun/star/wizards/common/strings.hrc:248
 msgctxt "RID_AGENDAWIZARDDIALOG_START_26"
 msgid "Minute keeper"
 msgstr "Cofnodwr"
 
-#: strings.hrc:249
+#: wizards/com/sun/star/wizards/common/strings.hrc:249
 msgctxt "RID_AGENDAWIZARDDIALOG_START_27"
 msgid "Moderator"
 msgstr "Cymedrolwr"
 
-#: strings.hrc:250
+#: wizards/com/sun/star/wizards/common/strings.hrc:250
 msgctxt "RID_AGENDAWIZARDDIALOG_START_28"
 msgid "Attendees"
 msgstr "Mynychwyr"
 
-#: strings.hrc:251
+#: wizards/com/sun/star/wizards/common/strings.hrc:251
 msgctxt "RID_AGENDAWIZARDDIALOG_START_29"
 msgid "Observers"
 msgstr "Arsylwyr"
 
-#: strings.hrc:252
+#: wizards/com/sun/star/wizards/common/strings.hrc:252
 msgctxt "RID_AGENDAWIZARDDIALOG_START_30"
 msgid "Facility personnel"
 msgstr "Staff y cyfleuster"
 
-#: strings.hrc:253
+#: wizards/com/sun/star/wizards/common/strings.hrc:253
 msgctxt "RID_AGENDAWIZARDDIALOG_START_31"
 msgid "The agenda template will include placeholders for the names of the selected people. When creating an agenda from the template, you can replace these placeholder with the appropriate names."
 msgstr "Bydd templed yr agenda yn cynnwys dalfannau ar gyfer enwau pobl unigol. Wrth greu agenda o'r templed, gallwch newid y dalfannau hyn gyda'r enwau priodol."
 
-#: strings.hrc:254
+#: wizards/com/sun/star/wizards/common/strings.hrc:254
 msgctxt "RID_AGENDAWIZARDDIALOG_START_32"
 msgid "Type of meeting"
 msgstr "Math o gyfarfod"
 
-#: strings.hrc:255
+#: wizards/com/sun/star/wizards/common/strings.hrc:255
 msgctxt "RID_AGENDAWIZARDDIALOG_START_33"
 msgid "Please read"
 msgstr "Darllenwch"
 
-#: strings.hrc:256
+#: wizards/com/sun/star/wizards/common/strings.hrc:256
 msgctxt "RID_AGENDAWIZARDDIALOG_START_34"
 msgid "Please bring"
 msgstr "Dewch â"
 
-#: strings.hrc:257
+#: wizards/com/sun/star/wizards/common/strings.hrc:257
 msgctxt "RID_AGENDAWIZARDDIALOG_START_35"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: strings.hrc:258
+#: wizards/com/sun/star/wizards/common/strings.hrc:258
 msgctxt "RID_AGENDAWIZARDDIALOG_START_36"
 msgid "The agenda template will include placeholders for the selected items."
 msgstr "Bydd templed yr agenda yn cynnwys dalfannau ar gyfer eitemau penodol."
 
-#: strings.hrc:259
+#: wizards/com/sun/star/wizards/common/strings.hrc:259
 msgctxt "RID_AGENDAWIZARDDIALOG_START_38"
 msgid "Date:"
 msgstr "Dyddiad:"
 
-#: strings.hrc:260
+#: wizards/com/sun/star/wizards/common/strings.hrc:260
 msgctxt "RID_AGENDAWIZARDDIALOG_START_39"
 msgid "This wizard creates an agenda template which enables you to create multiple agendas with the same layout and settings."
 msgstr "Mae'r dewin yma'n creu templed agenda fydd yn galluogi i chi greu agenda lluosog gyda'r un cynllun a gosodiadau."
 
-#: strings.hrc:261
+#: wizards/com/sun/star/wizards/common/strings.hrc:261
 msgctxt "RID_AGENDAWIZARDDIALOG_START_40"
 msgid "Page design:"
 msgstr "Cynllun tudalen:"
 
-#: strings.hrc:262
+#: wizards/com/sun/star/wizards/common/strings.hrc:262
 msgctxt "RID_AGENDAWIZARDDIALOG_START_41"
 msgid "myAgendaTemplate.stw"
 msgstr "fyNhempledAgenda.stw"
 
-#: strings.hrc:263
+#: wizards/com/sun/star/wizards/common/strings.hrc:263
 msgctxt "RID_AGENDAWIZARDDIALOG_START_42"
 msgid "My Agenda Template"
 msgstr "Templed Fy Agenda"
 
-#: strings.hrc:264
+#: wizards/com/sun/star/wizards/common/strings.hrc:264
 msgctxt "RID_AGENDAWIZARDDIALOG_START_43"
 msgid "An unexpected error occurred while saving the agenda template."
 msgstr "Digwyddodd gwall annisgwyl wrth gadw templed yr agenda."
 
-#: strings.hrc:265
+#: wizards/com/sun/star/wizards/common/strings.hrc:265
 msgctxt "RID_AGENDAWIZARDDIALOG_START_44"
 msgid "Name"
 msgstr "Enw"
 
-#: strings.hrc:266
+#: wizards/com/sun/star/wizards/common/strings.hrc:266
 msgctxt "RID_AGENDAWIZARDDIALOG_START_45"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: strings.hrc:267
+#: wizards/com/sun/star/wizards/common/strings.hrc:267
 msgctxt "RID_AGENDAWIZARDDIALOG_START_46"
 msgid "Time"
 msgstr "Amser"
 
-#: strings.hrc:268
+#: wizards/com/sun/star/wizards/common/strings.hrc:268
 msgctxt "RID_AGENDAWIZARDDIALOG_START_47"
 msgid "Location"
 msgstr "Lleoliad"
 
-#: strings.hrc:269
+#: wizards/com/sun/star/wizards/common/strings.hrc:269
 msgctxt "RID_AGENDAWIZARDDIALOG_START_48"
 msgid "Click to replace this text"
 msgstr "Cliciwch i newid y testun"
 
-#: strings.hrc:270
+#: wizards/com/sun/star/wizards/common/strings.hrc:270
 msgctxt "RID_AGENDAWIZARDDIALOG_START_50"
 msgid "Page design"
 msgstr "Cynllun tudalen"
 
-#: strings.hrc:271
+#: wizards/com/sun/star/wizards/common/strings.hrc:271
 msgctxt "RID_AGENDAWIZARDDIALOG_START_51"
 msgid "General information"
 msgstr "Gwybodaeth gyffredinol"
 
-#: strings.hrc:272
+#: wizards/com/sun/star/wizards/common/strings.hrc:272
 msgctxt "RID_AGENDAWIZARDDIALOG_START_52"
 msgid "Headings to include"
 msgstr "Penawdau i'w cynnwys"
 
-#: strings.hrc:273
+#: wizards/com/sun/star/wizards/common/strings.hrc:273
 msgctxt "RID_AGENDAWIZARDDIALOG_START_53"
 msgid "Names"
 msgstr "Enwau"
 
-#: strings.hrc:274
+#: wizards/com/sun/star/wizards/common/strings.hrc:274
 msgctxt "RID_AGENDAWIZARDDIALOG_START_54"
 msgid "Agenda items"
 msgstr "Eitemau i'r agenda"
 
-#: strings.hrc:275
+#: wizards/com/sun/star/wizards/common/strings.hrc:275
 msgctxt "RID_AGENDAWIZARDDIALOG_START_55"
 msgid "Name and location"
 msgstr "Enw a lleoliad"
 
-#: strings.hrc:276
+#: wizards/com/sun/star/wizards/common/strings.hrc:276
 msgctxt "RID_AGENDAWIZARDDIALOG_START_56"
 msgid "An unexpected error occurred while opening the agenda template."
 msgstr "Digwyddodd gwall annisgwyl wrth agor y templed agenda."
 
-#: strings.hrc:277
+#: wizards/com/sun/star/wizards/common/strings.hrc:277
 msgctxt "RID_AGENDAWIZARDDIALOG_START_57"
 msgid "Type of meeting"
 msgstr "Math o gyfarfod"
 
-#: strings.hrc:278
+#: wizards/com/sun/star/wizards/common/strings.hrc:278
 msgctxt "RID_AGENDAWIZARDDIALOG_START_58"
 msgid "Please bring"
 msgstr "Dewch â"
 
-#: strings.hrc:279
+#: wizards/com/sun/star/wizards/common/strings.hrc:279
 msgctxt "RID_AGENDAWIZARDDIALOG_START_59"
 msgid "Please read"
 msgstr "Darllenwch"
 
-#: strings.hrc:280
+#: wizards/com/sun/star/wizards/common/strings.hrc:280
 msgctxt "RID_AGENDAWIZARDDIALOG_START_60"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: strings.hrc:281
+#: wizards/com/sun/star/wizards/common/strings.hrc:281
 msgctxt "RID_AGENDAWIZARDDIALOG_START_61"
 msgid "Meeting called by"
 msgstr "Galwyd y cyfarfod gan"
 
-#: strings.hrc:282
+#: wizards/com/sun/star/wizards/common/strings.hrc:282
 msgctxt "RID_AGENDAWIZARDDIALOG_START_62"
 msgid "Chairperson"
 msgstr "Cadeirydd"
 
-#: strings.hrc:283
+#: wizards/com/sun/star/wizards/common/strings.hrc:283
 msgctxt "RID_AGENDAWIZARDDIALOG_START_63"
 msgid "Attendees"
 msgstr "Mynychwyr"
 
-#: strings.hrc:284
+#: wizards/com/sun/star/wizards/common/strings.hrc:284
 msgctxt "RID_AGENDAWIZARDDIALOG_START_64"
 msgid "Minute keeper"
 msgstr "Cofnodwr"
 
-#: strings.hrc:285
+#: wizards/com/sun/star/wizards/common/strings.hrc:285
 msgctxt "RID_AGENDAWIZARDDIALOG_START_65"
 msgid "Moderator"
 msgstr "Cymedrolwr"
 
-#: strings.hrc:286
+#: wizards/com/sun/star/wizards/common/strings.hrc:286
 msgctxt "RID_AGENDAWIZARDDIALOG_START_66"
 msgid "Observers"
 msgstr "Arsylwyr"
 
-#: strings.hrc:287
+#: wizards/com/sun/star/wizards/common/strings.hrc:287
 msgctxt "RID_AGENDAWIZARDDIALOG_START_67"
 msgid "Facility personnel"
 msgstr "Staff y cyfleuster"
 
-#: strings.hrc:288
+#: wizards/com/sun/star/wizards/common/strings.hrc:288
 msgctxt "RID_AGENDAWIZARDDIALOG_START_68"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: strings.hrc:289
+#: wizards/com/sun/star/wizards/common/strings.hrc:289
 msgctxt "RID_AGENDAWIZARDDIALOG_START_69"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: strings.hrc:290
+#: wizards/com/sun/star/wizards/common/strings.hrc:290
 msgctxt "RID_AGENDAWIZARDDIALOG_START_70"
 msgid "Move up"
 msgstr "Symud i fyny"
 
-#: strings.hrc:291
+#: wizards/com/sun/star/wizards/common/strings.hrc:291
 msgctxt "RID_AGENDAWIZARDDIALOG_START_71"
 msgid "Move down"
 msgstr "Symud i lawr"
 
-#: strings.hrc:292
+#: wizards/com/sun/star/wizards/common/strings.hrc:292
 msgctxt "RID_AGENDAWIZARDDIALOG_START_72"
 msgid "Date:"
 msgstr "Dyddiad:"
 
-#: strings.hrc:293
+#: wizards/com/sun/star/wizards/common/strings.hrc:293
 msgctxt "RID_AGENDAWIZARDDIALOG_START_73"
 msgid "Time:"
 msgstr "Amser:"
 
-#: strings.hrc:294
+#: wizards/com/sun/star/wizards/common/strings.hrc:294
 msgctxt "RID_AGENDAWIZARDDIALOG_START_74"
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: strings.hrc:295
+#: wizards/com/sun/star/wizards/common/strings.hrc:295
 msgctxt "RID_AGENDAWIZARDDIALOG_START_75"
 msgid "Topics"
 msgstr "Pynciau"
 
-#: strings.hrc:296
+#: wizards/com/sun/star/wizards/common/strings.hrc:296
 msgctxt "RID_AGENDAWIZARDDIALOG_START_76"
 msgid "Num."
 msgstr "Rhif"
 
-#: strings.hrc:297
+#: wizards/com/sun/star/wizards/common/strings.hrc:297
 msgctxt "RID_AGENDAWIZARDDIALOG_START_77"
 msgid "Topic"
 msgstr "Pwnc"
 
-#: strings.hrc:298
+#: wizards/com/sun/star/wizards/common/strings.hrc:298
 msgctxt "RID_AGENDAWIZARDDIALOG_START_78"
 msgid "Responsible"
 msgstr "Cyfrifol"
 
-#: strings.hrc:299
+#: wizards/com/sun/star/wizards/common/strings.hrc:299
 msgctxt "RID_AGENDAWIZARDDIALOG_START_79"
 msgid "Time"
 msgstr "Amser"
 
-#: strings.hrc:300
+#: wizards/com/sun/star/wizards/common/strings.hrc:300
 msgctxt "RID_AGENDAWIZARDDIALOG_START_80"
 msgid "Additional information"
 msgstr "Gwybodaeth bellach"
 
-#: strings.hrc:301
+#: wizards/com/sun/star/wizards/common/strings.hrc:301
 msgctxt "RID_AGENDAWIZARDDIALOG_START_81"
 msgid "Minutes for"
 msgstr "Cofnodion"
 
-#: strings.hrc:302
+#: wizards/com/sun/star/wizards/common/strings.hrc:302
 msgctxt "RID_AGENDAWIZARDDIALOG_START_82"
 msgid "Discussion:"
 msgstr "Trafodaeth:"
 
-#: strings.hrc:303
+#: wizards/com/sun/star/wizards/common/strings.hrc:303
 msgctxt "RID_AGENDAWIZARDDIALOG_START_83"
 msgid "Conclusion:"
 msgstr "Casgliad:"
 
-#: strings.hrc:304
+#: wizards/com/sun/star/wizards/common/strings.hrc:304
 msgctxt "RID_AGENDAWIZARDDIALOG_START_84"
 msgid "To do:"
 msgstr "I'w wneud:"
 
-#: strings.hrc:305
+#: wizards/com/sun/star/wizards/common/strings.hrc:305
 msgctxt "RID_AGENDAWIZARDDIALOG_START_85"
 msgid "Responsible party:"
 msgstr "Parti cyfrifol:"
 
-#: strings.hrc:306
+#: wizards/com/sun/star/wizards/common/strings.hrc:306
 msgctxt "RID_AGENDAWIZARDDIALOG_START_86"
 msgid "Deadline:"
 msgstr "Terfyn amser:"
 
-#: strings.hrc:307
+#: wizards/com/sun/star/wizards/common/strings.hrc:307
 msgctxt "RID_AGENDAWIZARDDIALOG_START_87"
 msgid "Blue"
 msgstr "Glas"
 
-#: strings.hrc:308
+#: wizards/com/sun/star/wizards/common/strings.hrc:308
 msgctxt "RID_AGENDAWIZARDDIALOG_START_88"
 msgid "Classic"
 msgstr "Clasurol"
 
-#: strings.hrc:309
+#: wizards/com/sun/star/wizards/common/strings.hrc:309
 msgctxt "RID_AGENDAWIZARDDIALOG_START_89"
 msgid "Colorful"
 msgstr "Lliwgar"
 
-#: strings.hrc:310
+#: wizards/com/sun/star/wizards/common/strings.hrc:310
 msgctxt "RID_AGENDAWIZARDDIALOG_START_90"
 msgid "Elegant"
 msgstr "Coeth"
 
-#: strings.hrc:311
+#: wizards/com/sun/star/wizards/common/strings.hrc:311
 msgctxt "RID_AGENDAWIZARDDIALOG_START_91"
 msgid "Green"
 msgstr "Gwyrdd"
 
-#: strings.hrc:312
+#: wizards/com/sun/star/wizards/common/strings.hrc:312
 msgctxt "RID_AGENDAWIZARDDIALOG_START_92"
 msgid "Grey"
 msgstr "Llwyd"
 
-#: strings.hrc:313
+#: wizards/com/sun/star/wizards/common/strings.hrc:313
 msgctxt "RID_AGENDAWIZARDDIALOG_START_93"
 msgid "Modern"
 msgstr "Modern"
 
-#: strings.hrc:314
+#: wizards/com/sun/star/wizards/common/strings.hrc:314
 msgctxt "RID_AGENDAWIZARDDIALOG_START_94"
 msgid "Orange"
 msgstr "Oren"
 
-#: strings.hrc:315
+#: wizards/com/sun/star/wizards/common/strings.hrc:315
 msgctxt "RID_AGENDAWIZARDDIALOG_START_95"
 msgid "Red"
 msgstr "Coch"
 
-#: strings.hrc:316
+#: wizards/com/sun/star/wizards/common/strings.hrc:316
 msgctxt "RID_AGENDAWIZARDDIALOG_START_96"
 msgid "Simple"
 msgstr "Syml"
diff --git a/source/cy/writerperfect/messages.po b/source/cy/writerperfect/messages.po
index 1c06ffd4397..ff524735bcc 100644
--- a/source/cy/writerperfect/messages.po
+++ b/source/cy/writerperfect/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: 2017-11-22 13:53+0100\n"
-"PO-Revision-Date: 2017-12-29 12:00+0000\n"
+"POT-Creation-Date: 2018-04-24 12:22+0200\n"
+"PO-Revision-Date: 2018-03-01 11:35+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -13,80 +13,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1514548841.000000\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1519904158.000000\n"
 
-#: strings.hrc:15
+#: writerperfect/inc/strings.hrc:15
 msgctxt "STR_ENCODING_DIALOG_TITLE"
 msgid "Import file"
 msgstr "Mewnforio Ffeil"
 
-#: strings.hrc:16
+#: writerperfect/inc/strings.hrc:16
 msgctxt "STR_ENCODING_DIALOG_TITLE_MSWORKS"
 msgid "Import MS Works file"
 msgstr "Mewnforio ffeil MS Word"
 
-#: strings.hrc:17
+#: writerperfect/inc/strings.hrc:17
 msgctxt "STR_ENCODING_DIALOG_TITLE_MSWRITE"
 msgid "Import MS Write file"
 msgstr "Mewnforio ffeil MS Write"
 
-#: strings.hrc:18
+#: writerperfect/inc/strings.hrc:18
 msgctxt "STR_ENCODING_DIALOG_TITLE_DOSWORD"
 msgid "Import MS Word for DOS file"
 msgstr "Mewnforio ffeil MS Word for DOS"
 
-#: strings.hrc:19
+#: writerperfect/inc/strings.hrc:19
 msgctxt "STR_ENCODING_DIALOG_TITLE_LOTUS"
 msgid "Import Lotus file"
 msgstr "Mewnforio ffeil Lotus"
 
-#: strings.hrc:20
+#: writerperfect/inc/strings.hrc:20
 msgctxt "STR_ENCODING_DIALOG_TITLE_SYMPHONY"
 msgid "Import Symphony file"
 msgstr "Mewnforio ffeil Symphony"
 
-#: strings.hrc:21
+#: writerperfect/inc/strings.hrc:21
 msgctxt "STR_ENCODING_DIALOG_TITLE_QUATTROPRO"
 msgid "Import Quattro Pro file"
 msgstr "Mewnforio ffeil Quattro Pro"
 
-#: exportepub.ui:8
+#: writerperfect/uiconfig/ui/exportepub.ui:8
 msgctxt "exportepub|EpubDialog"
 msgid "EPUB Export"
 msgstr "Allforio EPUB"
 
-#: exportepub.ui:91
+#: writerperfect/uiconfig/ui/exportepub.ui:91
+msgctxt "exportepub|generalft"
+msgid "General"
+msgstr "Cyffredinol"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:122
 msgctxt "exportepub|versionft"
 msgid "Version:"
 msgstr "Fersiwn:"
 
-#: exportepub.ui:108
+#: writerperfect/uiconfig/ui/exportepub.ui:139
 msgctxt "exportepub|epub3"
 msgid "EPUB 3.0"
 msgstr "EPUB 3.0"
 
-#: exportepub.ui:109
+#: writerperfect/uiconfig/ui/exportepub.ui:140
 msgctxt "exportepub|epub2"
 msgid "EPUB 2.0"
 msgstr "EPUB 2.0"
 
-#: exportepub.ui:144
+#: writerperfect/uiconfig/ui/exportepub.ui:175
 msgctxt "exportepub|splitft"
 msgid "Split method:"
 msgstr "Dull hollt:"
 
-#: exportepub.ui:161
+#: writerperfect/uiconfig/ui/exportepub.ui:192
 msgctxt "exportepub|splitpage"
 msgid "Page break"
 msgstr "Toriad tudalen"
 
-#: exportepub.ui:162
+#: writerperfect/uiconfig/ui/exportepub.ui:193
 msgctxt "exportepub|splitheading"
 msgid "Heading"
 msgstr "Pennawd"
 
-#: wpftencodingdialog.ui:63
+#: writerperfect/uiconfig/ui/exportepub.ui:228
+msgctxt "exportepub|layoutft"
+msgid "Layout method:"
+msgstr "Dull cynllun:"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:245
+msgctxt "exportepub|layoutreflowable"
+msgid "Reflowable"
+msgstr "Ail lifadwy"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:246
+msgctxt "exportepub|layoutfixed"
+msgid "Fixed"
+msgstr "Gosodedig"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:281
+msgctxt "exportepub|coverimageft"
+msgid "Custom cover image:"
+msgstr "Delwedd clawr cyfaddas:"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:311
+msgctxt "exportepub|coverbutton"
+msgid "Browse..."
+msgstr "Pori..."
+
+#: writerperfect/uiconfig/ui/exportepub.ui:355
+msgctxt "exportepub|mediadirft"
+msgid "Custom media directory:"
+msgstr "Cyfeiriadur cyfrwng cyfaddas:"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:385
+msgctxt "exportepub|mediabutton"
+msgid "Browse..."
+msgstr "Pori..."
+
+#: writerperfect/uiconfig/ui/exportepub.ui:429
+msgctxt "exportepub|metadataft"
+msgid "Metadata"
+msgstr "Metadata"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:470
+msgctxt "exportepub|identifierft"
+msgid "Identifier:"
+msgstr "Dynodydd:"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:485
+msgctxt "exportepub|titleft"
+msgid "Title:"
+msgstr "Teitl:"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:511
+msgctxt "exportepub|authorft"
+msgid "Author:"
+msgstr "Awdur:"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:537
+msgctxt "exportepub|languageft"
+msgid "Language:"
+msgstr "Iaith:"
+
+#: writerperfect/uiconfig/ui/exportepub.ui:563
+msgctxt "exportepub|dateft"
+msgid "Date:"
+msgstr "Dyddiad:"
+
+#: writerperfect/uiconfig/ui/wpftencodingdialog.ui:63
 msgctxt "wpftencodingdialog|label"
 msgid "_Character set:"
 msgstr "_Set nod:"
diff --git a/source/cy/xmlsecurity/messages.po b/source/cy/xmlsecurity/messages.po
index f4b0e1e3f2e..0a93a238c7a 100644
--- a/source/cy/xmlsecurity/messages.po
+++ b/source/cy/xmlsecurity/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: 2017-11-22 13:53+0100\n"
-"PO-Revision-Date: 2017-12-29 15:05+0000\n"
+"POT-Creation-Date: 2018-02-27 15:07+0100\n"
+"PO-Revision-Date: 2018-03-01 11:36+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,79 +14,79 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1514559920.000000\n"
+"X-POOTLE-MTIME: 1519904166.000000\n"
 
-#: strings.hrc:25
+#: xmlsecurity/inc/strings.hrc:25
 msgctxt "STR_CERTIFICATE_NOT_VALIDATED"
 msgid "The certificate could not be validated."
 msgstr "Methu dilysu'r dystysgrif."
 
-#: strings.hrc:26
+#: xmlsecurity/inc/strings.hrc:26
 msgctxt "STR_HEADERBAR"
 msgid "Field\tValue"
 msgstr "Maes\tGwerth"
 
-#: strings.hrc:27
+#: xmlsecurity/inc/strings.hrc:27
 msgctxt "STR_VERSION"
 msgid "Version"
 msgstr "Fersiwn"
 
-#: strings.hrc:28
+#: xmlsecurity/inc/strings.hrc:28
 msgctxt "STR_SERIALNUM"
 msgid "Serial Number"
 msgstr "Rhif Cyfresol"
 
-#: strings.hrc:29
+#: xmlsecurity/inc/strings.hrc:29
 msgctxt "STR_ISSUER"
 msgid "Issuer"
 msgstr "Cyhoeddwr"
 
-#: strings.hrc:30
+#: xmlsecurity/inc/strings.hrc:30
 msgctxt "STR_VALIDFROM"
 msgid "Valid From"
 msgstr "Dilys o"
 
-#: strings.hrc:31
+#: xmlsecurity/inc/strings.hrc:31
 msgctxt "STR_VALIDTO"
 msgid "Valid to"
 msgstr "Dilys hyd"
 
-#: strings.hrc:32
+#: xmlsecurity/inc/strings.hrc:32
 msgctxt "STR_SUBJECT"
 msgid "Subject"
 msgstr "Pwnc"
 
-#: strings.hrc:33
+#: xmlsecurity/inc/strings.hrc:33
 msgctxt "STR_SUBJECT_PUBKEY_ALGO"
 msgid "Subject Algorithm"
 msgstr "Algorithm Pwnc"
 
-#: strings.hrc:34
+#: xmlsecurity/inc/strings.hrc:34
 msgctxt "STR_SUBJECT_PUBKEY_VAL"
 msgid "Public Key"
 msgstr "Allwedd gyhoeddus"
 
-#: strings.hrc:35
+#: xmlsecurity/inc/strings.hrc:35
 msgctxt "STR_SIGNATURE_ALGO"
 msgid "Signature Algorithm"
 msgstr "Algorithm Llofnod"
 
-#: strings.hrc:36
+#: xmlsecurity/inc/strings.hrc:36
 msgctxt "STR_USE"
 msgid "Certificate Use"
 msgstr "Defnydd Tystysgrif"
 
-#: strings.hrc:37
+#: xmlsecurity/inc/strings.hrc:37
 msgctxt "STR_THUMBPRINT_SHA1"
 msgid "Thumbprint SHA1"
 msgstr "Ôl bawd SHA1"
 
-#: strings.hrc:38
+#: xmlsecurity/inc/strings.hrc:38
 msgctxt "STR_THUMBPRINT_MD5"
 msgid "Thumbprint MD5"
 msgstr "Ôl bawd MD5"
 
-#: strings.hrc:40
+#: xmlsecurity/inc/strings.hrc:40
 msgctxt "STR_XMLSECDLG_OLD_ODF_FORMAT"
 msgid ""
 "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. Thus no signatures can be added or removed to this document.\n"
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "Cadwch y ddogfen yn fformat ODF 1.2 ac ychwanegwch y llofnodion angenrheidiol eto."
 
-#: strings.hrc:44
+#: xmlsecurity/inc/strings.hrc:44
 msgctxt "STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN"
 msgid ""
 "Adding or removing a macro signature will remove all document signatures.\n"
@@ -106,7 +106,7 @@ msgstr ""
 "Bydd ychwanegu neu dynnu llofnod macro yn tynnu pob llofnod dogfen.\n"
 "Hoffech chi barhau?"
 
-#: strings.hrc:46
+#: xmlsecurity/inc/strings.hrc:46
 msgctxt "STR_XMLSECDLG_QUERY_REALLYREMOVE"
 msgid ""
 "Document signature cannot be restored, once removed.\n"
@@ -115,192 +115,192 @@ msgstr ""
 "Nid oes modd adfer llofnod y ddogfen, unwaith iddo gael ei dynnu.\n"
 "Ydych chi wir eisiau tynnu'r llofnod hwn?"
 
-#: strings.hrc:49
+#: xmlsecurity/inc/strings.hrc:49
 msgctxt "STR_XMLSECDLG_SIGNING_FAILED"
 msgid "An error occurred while adding the signature."
 msgstr "Digwyddodd gwall wrth ychwanegu llofnod."
 
-#: strings.hrc:50
+#: xmlsecurity/inc/strings.hrc:50
 msgctxt "STR_XMLSECDLG_NO_CERT_MANAGER"
 msgid "Could not find any certificate manager."
 msgstr "Methu canfod unrhyw reolwr tystysgrifau."
 
-#: strings.hrc:51
+#: xmlsecurity/inc/strings.hrc:51
 msgctxt "STR_XMLSECDLG_NO_CERT_FOUND"
 msgid "Could not find the certificate."
 msgstr "Methu canfod y dystysgrif."
 
-#: strings.hrc:53
+#: xmlsecurity/inc/strings.hrc:53
 msgctxt "RID_XMLSECWB_NO_MOZILLA_PROFILE"
 msgid "Digital signatures functionality could not be used, because no Mozilla user profile was found. Please check the Mozilla installation."
 msgstr "Methu defnyddio swyddogaethau llofnod gan nad oes proffil defnyddiwr Mozilla ar gael. Gwiriwch eich gosodiad Mozilla."
 
-#: certgeneral.ui:32
+#: xmlsecurity/uiconfig/ui/certgeneral.ui:32
 msgctxt "certgeneral|label1"
 msgid "Certificate Information"
 msgstr "Gwybodaeth Tystysgrif"
 
-#: certgeneral.ui:70
+#: xmlsecurity/uiconfig/ui/certgeneral.ui:70
 msgctxt "certgeneral|hintnotrust"
 msgid "This certificate is validated."
 msgstr "Mae'r dystysgrif yn ddilys."
 
-#: certgeneral.ui:103
+#: xmlsecurity/uiconfig/ui/certgeneral.ui:103
 msgctxt "certgeneral|issued_to"
 msgid "Issued to: "
 msgstr "Cyhoeddwyd i: "
 
-#: certgeneral.ui:130
+#: xmlsecurity/uiconfig/ui/certgeneral.ui:130
 msgctxt "certgeneral|issued_by"
 msgid "Issued by: "
 msgstr "Cyhoeddwyd gan: "
 
-#: certgeneral.ui:156
+#: xmlsecurity/uiconfig/ui/certgeneral.ui:156
 msgctxt "certgeneral|valid_from"
 msgid "Valid from:"
 msgstr "Dilys o:"
 
-#: certgeneral.ui:187
+#: xmlsecurity/uiconfig/ui/certgeneral.ui:187
 msgctxt "certgeneral|privatekey"
 msgid "You have a private key that corresponds to this certificate."
 msgstr "Mae gennych allwedd breifat sy'n cyfateb i'r dystysgrif hon."
 
-#: certgeneral.ui:207
+#: xmlsecurity/uiconfig/ui/certgeneral.ui:207
 msgctxt "certgeneral|valid_to"
 msgid "Valid to:"
 msgstr "Dilys hyd:"
 
-#: certpage.ui:26
+#: xmlsecurity/uiconfig/ui/certpage.ui:26
 msgctxt "certpage|label1"
 msgid "Certification path"
 msgstr "Llwybr tystysgrifo"
 
-#: certpage.ui:39
+#: xmlsecurity/uiconfig/ui/certpage.ui:39
 msgctxt "certpage|viewcert"
 msgid "View Certificate..."
 msgstr "Darllen y Dystysgrif..."
 
-#: certpage.ui:90
+#: xmlsecurity/uiconfig/ui/certpage.ui:90
 msgctxt "certpage|label2"
 msgid "Certification status"
 msgstr "Statws tystysgrifo"
 
-#: certpage.ui:127
+#: xmlsecurity/uiconfig/ui/certpage.ui:127
 msgctxt "certpage|certok"
 msgid "The certificate is OK."
 msgstr "Mae'r dystysgrif yn iawn."
 
-#: certpage.ui:139
+#: xmlsecurity/uiconfig/ui/certpage.ui:139
 msgctxt "certpage|certnotok"
 msgid "The certificate could not be validated."
 msgstr "Nid oedd modd dilysu'r dystysgrif."
 
-#: digitalsignaturesdialog.ui:9
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:9
 msgctxt "digitalsignaturesdialog|DigitalSignaturesDialog"
 msgid "Digital Signatures"
 msgstr "Llofnodion Digidol"
 
-#: digitalsignaturesdialog.ui:70
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:70
 msgctxt "digitalsignaturesdialog|dochint"
 msgid "The following have signed the document content: "
 msgstr "Mae'r canlynol wedi llofnodi cynnwys y ddogfen: "
 
-#: digitalsignaturesdialog.ui:102
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:102
 msgctxt "digitalsignaturesdialog|view"
 msgid "View Certificate..."
 msgstr "Darllen y Dystysgrif..."
 
-#: digitalsignaturesdialog.ui:115
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:115
 msgctxt "digitalsignaturesdialog|sign"
 msgid "Sign Document..."
 msgstr "Llofnodi Dogfen..."
 
-#: digitalsignaturesdialog.ui:129
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:129
 msgctxt "digitalsignaturesdialog|remove"
 msgid "Remove"
 msgstr "Tynnu"
 
-#: digitalsignaturesdialog.ui:142
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:142
 msgctxt "digitalsignaturesdialog|start_certmanager"
 msgid "Start Certificate Manager..."
 msgstr "Cychwyn y Rheolwr Tystysgrifau..."
 
-#: digitalsignaturesdialog.ui:170
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:170
 msgctxt "digitalsignaturesdialog|signed"
 msgid "Signed by "
 msgstr "Llofnodwyd gan "
 
-#: digitalsignaturesdialog.ui:182
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:182
 msgctxt "digitalsignaturesdialog|issued"
 msgid "Digital ID issued by "
 msgstr "Enw Digidol wedi ei gyhoeddi gan "
 
-#: digitalsignaturesdialog.ui:194
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:194
 msgctxt "digitalsignaturesdialog|date"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: digitalsignaturesdialog.ui:205
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:205
 msgctxt "digitalsignaturesdialog|description"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: digitalsignaturesdialog.ui:216
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:216
 msgctxt "digitalsignaturesdialog|type"
 msgid "Signature type"
 msgstr "Math o lofnod"
 
-#: digitalsignaturesdialog.ui:233
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:233
 msgctxt "digitalsignaturesdialog|macrohint"
 msgid "The following have signed the document macro:"
 msgstr "Mae'r canlynol wedi llofnodi macro'r ddogfen:"
 
-#: digitalsignaturesdialog.ui:245
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:245
 msgctxt "digitalsignaturesdialog|packagehint"
 msgid "The following have signed this package:"
 msgstr "Mae'r canlynol wedi llofnodi'r pecyn:"
 
-#: digitalsignaturesdialog.ui:263
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:263
 msgctxt "digitalsignaturesdialog|validft"
 msgid "The signatures in this document are valid"
 msgstr "Mae'r llofnodion yn y ddogfen yn ddilys"
 
-#: digitalsignaturesdialog.ui:287
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:287
 msgctxt "digitalsignaturesdialog|invalidft"
 msgid "The signatures in this document are invalid"
 msgstr "Mae'r llofnodion yn y ddogfen yn annilys"
 
-#: digitalsignaturesdialog.ui:300
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:300
 msgctxt "digitalsignaturesdialog|oldsignatureft"
 msgid "Not all parts of the document are signed"
 msgstr "Nid yw pob rhan o'r ddogfen wedi eu llofnodi"
 
-#: digitalsignaturesdialog.ui:313
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:313
 msgctxt "digitalsignaturesdialog|notvalidatedft"
 msgid "Certificate could not be validated"
 msgstr "Nid oedd modd dilysu'r ddogfen"
 
-#: digitalsignaturesdialog.ui:362
+#: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:362
 msgctxt "digitalsignaturesdialog|adescompliant"
 msgid "Use AdES-compliant signature when there is a choice"
 msgstr "Defnyddiwch lofnod cydnaws ag AdES pan fydd dewis"
 
-#: macrosecuritydialog.ui:8
+#: xmlsecurity/uiconfig/ui/macrosecuritydialog.ui:8
 msgctxt "macrosecuritydialog|MacroSecurityDialog"
 msgid "Macro Security"
 msgstr "Diogelwch Macro"
 
-#: macrosecuritydialog.ui:106
+#: xmlsecurity/uiconfig/ui/macrosecuritydialog.ui:106
 msgctxt "macrosecuritydialog|SecurityLevelPage"
 msgid "Security Level"
 msgstr "Lefel Diogelwch"
 
-#: macrosecuritydialog.ui:128
+#: xmlsecurity/uiconfig/ui/macrosecuritydialog.ui:128
 msgctxt "macrosecuritydialog|SecurityTrustPage"
 msgid "Trusted Sources"
 msgstr "Ffynonellau Dibynadwy"
 
-#: securitylevelpage.ui:14
+#: xmlsecurity/uiconfig/ui/securitylevelpage.ui:14
 msgctxt "securitylevelpage|low"
 msgid ""
 "_Low (not recommended).\n"
@@ -311,7 +311,7 @@ msgstr ""
 "Bydd pob macro'n cael eu gweithredu heb gadarnhad.\n"
 "Defnyddiwch y gosodiad hwn dim ond os ydych yn siŵr fod pob dogfen fydd yn cael ei hagor yn ddiogel."
 
-#: securitylevelpage.ui:32
+#: xmlsecurity/uiconfig/ui/securitylevelpage.ui:32
 msgctxt "securitylevelpage|med"
 msgid ""
 "_Medium.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "_Canolig.\n"
 "Mae angen cadarnhad cyn gweithredu macros o ffynonellau annibynadwy."
 
-#: securitylevelpage.ui:49
+#: xmlsecurity/uiconfig/ui/securitylevelpage.ui:49
 msgctxt "securitylevelpage|high"
 msgid ""
 "H_igh.\n"
@@ -331,7 +331,7 @@ msgstr ""
 "Dim ond macros wedi eu llofnodi o ffynonellau dibynadwy sy'n cael rhedeg.\n"
 "Macros heb lofnod wedi eu hanalluogi."
 
-#: securitylevelpage.ui:68
+#: xmlsecurity/uiconfig/ui/securitylevelpage.ui:68
 msgctxt "securitylevelpage|vhigh"
 msgid ""
 "_Very high.\n"
@@ -342,162 +342,162 @@ msgstr ""
 "Dim ond macros o leoliad ffeil dibynadwy sy'n cael rhedeg.\n"
 "Pob macro arall, p'un ai wedi ei lofnodi neu beidio, wedi eu hanalluogi."
 
-#: securitytrustpage.ui:43
+#: xmlsecurity/uiconfig/ui/securitytrustpage.ui:43
 msgctxt "securitytrustpage|viewcert"
 msgid "_View..."
 msgstr "_Golwg..."
 
-#: securitytrustpage.ui:86
+#: xmlsecurity/uiconfig/ui/securitytrustpage.ui:86
 msgctxt "securitytrustpage|to"
 msgid "Issued to"
 msgstr "Cyhoeddwyd i"
 
-#: securitytrustpage.ui:100
+#: xmlsecurity/uiconfig/ui/securitytrustpage.ui:100
 msgctxt "securitytrustpage|by"
 msgid "Issued by"
 msgstr "Cyhoeddwyd gan"
 
-#: securitytrustpage.ui:114
+#: xmlsecurity/uiconfig/ui/securitytrustpage.ui:114
 msgctxt "securitytrustpage|date"
 msgid "Expiration date"
 msgstr "Dyddiad daw i ben"
 
-#: securitytrustpage.ui:172
+#: xmlsecurity/uiconfig/ui/securitytrustpage.ui:172
 msgctxt "securitytrustpage|label3"
 msgid "Trusted Certificates"
 msgstr "Tystysgrifau Dibynadwy"
 
-#: securitytrustpage.ui:215
+#: xmlsecurity/uiconfig/ui/securitytrustpage.ui:215
 msgctxt "securitytrustpage|label8"
 msgid "Document macros are always executed if they have been opened from one of the following locations."
 msgstr "Bydd macros dogfennau yn cael eu gweithredu bob tro os ydynt wedi eu hagor o un o'r lleoliadau hyn."
 
-#: securitytrustpage.ui:234
+#: xmlsecurity/uiconfig/ui/securitytrustpage.ui:234
 msgctxt "securitytrustpage|addfile"
 msgid "A_dd..."
 msgstr "_Ychwanegu..."
 
-#: securitytrustpage.ui:321
+#: xmlsecurity/uiconfig/ui/securitytrustpage.ui:321
 msgctxt "securitytrustpage|label4"
 msgid "Trusted File Locations"
 msgstr "Lleoliadau Ffeiliau Dibynadwy"
 
-#: selectcertificatedialog.ui:9
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:9
 msgctxt "selectcertificatedialog|SelectCertificateDialog"
 msgid "Select Certificate"
 msgstr "Dewis Tystysgrif"
 
-#: selectcertificatedialog.ui:92
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:92
 msgctxt "selectcertificatedialog|issuedto"
-msgid "Issued to  "
-msgstr "Cyhoeddwyd i  "
+msgid "Issued to"
+msgstr "Cyhoeddwyd i"
 
-#: selectcertificatedialog.ui:103
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:103
 msgctxt "selectcertificatedialog|issuedby"
 msgid "Issued by"
 msgstr "Cyhoeddwyd gan"
 
-#: selectcertificatedialog.ui:114
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:114
 msgctxt "selectcertificatedialog|usage"
 msgid "Certificate usage"
 msgstr "Defnydd tystysgrif"
 
-#: selectcertificatedialog.ui:125
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:125
 msgctxt "selectcertificatedialog|expiration"
 msgid "Expiration date"
 msgstr "Dyddiad daw i ben"
 
-#: selectcertificatedialog.ui:136
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:136
 msgctxt "selectcertificatedialog|type"
 msgid "Type"
 msgstr "Math"
 
-#: selectcertificatedialog.ui:148
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:148
 msgctxt "selectcertificatedialog|STR_DIGITAL_SIGNATURE"
 msgid "Digital signature"
 msgstr "Llofnodion digidol"
 
-#: selectcertificatedialog.ui:153
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:153
 msgctxt "selectcertificatedialog|STR_NON_REPUDIATION"
 msgid "Non-repudiation"
 msgstr "An-wrthodiad"
 
-#: selectcertificatedialog.ui:158
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:158
 msgctxt "selectcertificatedialog|STR_KEY_ENCIPHERMENT"
 msgid "Key encipherment"
 msgstr "Seiffro allwedd"
 
-#: selectcertificatedialog.ui:163
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:163
 msgctxt "selectcertificatedialog|STR_DATA_ENCIPHERMENT"
 msgid "Data encipherment"
 msgstr "Seiffro data"
 
-#: selectcertificatedialog.ui:168
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:168
 msgctxt "selectcertificatedialog|STR_KEY_AGREEMENT"
 msgid "Key Agreement"
 msgstr "Cytundeb Allwedd"
 
-#: selectcertificatedialog.ui:173
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:173
 msgctxt "selectcertificatedialog|STR_KEY_CERT_SIGN"
 msgid "Certificate signature verification"
 msgstr "Dilysiad llofnod tystysgrif"
 
-#: selectcertificatedialog.ui:178
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:178
 msgctxt "selectcertificatedialog|STR_CRL_SIGN"
 msgid "CRL signature verification"
 msgstr "Dilysiad llofnod CRL"
 
-#: selectcertificatedialog.ui:183
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:183
 msgctxt "selectcertificatedialog|STR_ENCIPHER_ONLY"
 msgid "Only for encipherment"
 msgstr "Dim ond seiffro"
 
-#: selectcertificatedialog.ui:189
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:189
 msgctxt "selectcertificatedialog|str_sign"
 msgid "Sign"
 msgstr "Arwydd"
 
-#: selectcertificatedialog.ui:194
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:194
 msgctxt "selectcertificatedialog|str_encrypt"
 msgid "Encrypt"
 msgstr "Amgryptio"
 
-#: selectcertificatedialog.ui:209
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:209
 msgctxt "selectcertificatedialog|sign"
 msgid "Select the certificate you want to use for signing:"
 msgstr "Dewiswch y dystysgrif rydych am ei defnyddio ar gyfer llofnodi:"
 
-#: selectcertificatedialog.ui:222
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:222
 msgctxt "selectcertificatedialog|encrypt"
 msgid "Select the certificate you want to use for encryption:"
 msgstr "Dewiswch y dystysgrif rydych am ei defnyddio ar gyfer llofnodi:"
 
-#: selectcertificatedialog.ui:246
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:246
 msgctxt "selectcertificatedialog|viewcert"
 msgid "View Certificate..."
 msgstr "Gweld Tystysgrif..."
 
-#: selectcertificatedialog.ui:266
+#: xmlsecurity/uiconfig/ui/selectcertificatedialog.ui:266
 msgctxt "selectcertificatedialog|label2"
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: viewcertdialog.ui:8
+#: xmlsecurity/uiconfig/ui/viewcertdialog.ui:8
 msgctxt "viewcertdialog|ViewCertDialog"
 msgid "View Certificate"
 msgstr "Darllen y Dystysgrif"
 
-#: viewcertdialog.ui:78
+#: xmlsecurity/uiconfig/ui/viewcertdialog.ui:78
 msgctxt "viewcertdialog|general"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: viewcertdialog.ui:100
+#: xmlsecurity/uiconfig/ui/viewcertdialog.ui:100
 msgctxt "viewcertdialog|details"
 msgid "Details"
 msgstr "Manylion"
 
-#: viewcertdialog.ui:123
+#: xmlsecurity/uiconfig/ui/viewcertdialog.ui:123
 msgctxt "viewcertdialog|path"
 msgid "Certification Path"
 msgstr "Llwybr Tystysgrifo"