update translatiosn for 6.1.0 alpha1

Change-Id: I0ed5d948cf89a4260c8771057d463448b76a4527

1 files changed, 223 insertions, 199 deletions

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…"